diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts index 0691b51a2..7c7745185 100644 --- a/client/src/app/core/core.module.ts +++ b/client/src/app/core/core.module.ts @@ -13,6 +13,7 @@ import { DataSendService } from './services/data-send.service'; import { ViewportService } from './services/viewport.service'; import { PromptDialogComponent } from '../shared/components/prompt-dialog/prompt-dialog.component'; import { HttpService } from './services/http.service'; +import { ChoiceDialogComponent } from '../shared/components/choice-dialog/choice-dialog.component'; /** Global Core Module. Contains all global (singleton) services * @@ -31,7 +32,7 @@ import { HttpService } from './services/http.service'; ViewportService, WebsocketService ], - entryComponents: [PromptDialogComponent] + entryComponents: [PromptDialogComponent, ChoiceDialogComponent] }) export class CoreModule { /** make sure CoreModule is imported only by one NgModule, the AppModule */ diff --git a/client/src/app/core/services/choice.service.spec.ts b/client/src/app/core/services/choice.service.spec.ts new file mode 100644 index 000000000..891322fde --- /dev/null +++ b/client/src/app/core/services/choice.service.spec.ts @@ -0,0 +1,18 @@ +import { TestBed } from '@angular/core/testing'; + +import { ChoiceService } from './choice.service'; +import { E2EImportsModule } from 'e2e-imports.module'; + +describe('ChoiceService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [E2EImportsModule], + providers: [ChoiceService] + }); + }); + + it('should be created', () => { + const service: ChoiceService = TestBed.get(ChoiceService); + expect(service).toBeTruthy(); + }); +}); diff --git a/client/src/app/core/services/choice.service.ts b/client/src/app/core/services/choice.service.ts new file mode 100644 index 000000000..76fa7f4b6 --- /dev/null +++ b/client/src/app/core/services/choice.service.ts @@ -0,0 +1,44 @@ +import { Injectable } from '@angular/core'; +import { OpenSlidesComponent } from '../../openslides.component'; +import { MatDialog } from '@angular/material'; +import { + ChoiceDialogComponent, + ChoiceDialogOptions, + ChoiceAnswer +} from '../../shared/components/choice-dialog/choice-dialog.component'; + +/** + * A service for prompting the user to select a choice. + */ +@Injectable({ + providedIn: 'root' +}) +export class ChoiceService extends OpenSlidesComponent { + /** + * Ctor. + * + * @param dialog For opening the ChoiceDialog + */ + public constructor(private dialog: MatDialog) { + super(); + } + + /** + * Opens the dialog. Returns the chosen value after the user accepts. + * @param title The title to display in the dialog + * @param choices The available choices + * @returns an answer {@link ChoiceAnswer} + */ + public async open( + title: string, + choices: ChoiceDialogOptions, + multiSelect: boolean = false + ): Promise { + const dialogRef = this.dialog.open(ChoiceDialogComponent, { + minWidth: '250px', + maxHeight: '90vh', + data: { title: title, choices: choices, multiSelect: multiSelect } + }); + return dialogRef.afterClosed().toPromise(); + } +} diff --git a/client/src/app/core/services/config.service.spec.ts b/client/src/app/core/services/config.service.spec.ts index 90426ee20..81eea56a2 100644 --- a/client/src/app/core/services/config.service.spec.ts +++ b/client/src/app/core/services/config.service.spec.ts @@ -1,10 +1,12 @@ import { TestBed, inject } from '@angular/core/testing'; import { ConfigService } from './config.service'; +import { E2EImportsModule } from 'e2e-imports.module'; describe('ConfigService', () => { beforeEach(() => { TestBed.configureTestingModule({ + imports: [E2EImportsModule], providers: [ConfigService] }); }); diff --git a/client/src/app/shared/components/choice-dialog/choice-dialog.component.html b/client/src/app/shared/components/choice-dialog/choice-dialog.component.html new file mode 100644 index 000000000..b3f8cce8b --- /dev/null +++ b/client/src/app/shared/components/choice-dialog/choice-dialog.component.html @@ -0,0 +1,32 @@ +
+

{{ data.title | translate }}

+
+ + + {{ getChoiceTitle(choice) | translate }} + + + + + + + {{ getChoiceTitle(choice) | translate }} + + + + + No choices available +
+ + + + +
diff --git a/client/src/app/shared/components/choice-dialog/choice-dialog.component.scss b/client/src/app/shared/components/choice-dialog/choice-dialog.component.scss new file mode 100644 index 000000000..d504e250f --- /dev/null +++ b/client/src/app/shared/components/choice-dialog/choice-dialog.component.scss @@ -0,0 +1,17 @@ +mat-radio-group { + display: inline-flex; + flex-direction: column; + + mat-radio-button { + margin: 5px; + } +} + +.scrollmenu { + padding: 5px; + display: block; +} + +.scrollmenu-outer { + max-height: inherit; +} diff --git a/client/src/app/shared/components/choice-dialog/choice-dialog.component.spec.ts b/client/src/app/shared/components/choice-dialog/choice-dialog.component.spec.ts new file mode 100644 index 000000000..add33c792 --- /dev/null +++ b/client/src/app/shared/components/choice-dialog/choice-dialog.component.spec.ts @@ -0,0 +1,26 @@ +import { async, TestBed } from '@angular/core/testing'; + +// import { ChoiceDialogComponent } from './choice-dialog.component'; +import { E2EImportsModule } from 'e2e-imports.module'; + +describe('ChoiceDialogComponent', () => { + // let component: ChoiceDialogComponent; + // let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [E2EImportsModule] + }).compileComponents(); + })); + + // TODO: You cannot create this component in the standard way. Needs different testing. + beforeEach(() => { + /*fixture = TestBed.createComponent(PromptDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges();*/ + }); + + /*it('should create', () => { + expect(component).toBeTruthy(); +});*/ +}); diff --git a/client/src/app/shared/components/choice-dialog/choice-dialog.component.ts b/client/src/app/shared/components/choice-dialog/choice-dialog.component.ts new file mode 100644 index 000000000..c728bbb59 --- /dev/null +++ b/client/src/app/shared/components/choice-dialog/choice-dialog.component.ts @@ -0,0 +1,112 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; +import { Displayable } from 'app/shared/models/base/displayable'; +import { Identifiable } from 'app/shared/models/base/identifiable'; + +/** + * An option needs to be identifiable and should have a strnig to display. Either uses Displayble or + * a label property. + */ +type ChoiceDialogOption = (Identifiable & Displayable) | (Identifiable & { label: string }); + +/** + * All choices in the array should have the same type. + */ +export type ChoiceDialogOptions = (Identifiable & Displayable)[] | (Identifiable & { label: string })[]; + +/** + * All data needed for this dialog + */ +interface ChoiceDialogData { + /** + * A title to display + */ + title: string; + + /** + * The choices to display + */ + choices: ChoiceDialogOptions; + + /** + * Select, if this should be a multiselect choice + */ + multiSelect: boolean; +} + +/** + * undefined is returned, if the dialog is closed. If a choice is submitted, + * it might be a number oder an array of numbers for multiselect. + */ +export type ChoiceAnswer = undefined | number | number[]; + +/** + * A dialog with choice fields. + */ +@Component({ + selector: 'os-choice-dialog', + templateUrl: './choice-dialog.component.html', + styleUrls: ['./choice-dialog.component.scss'] +}) +export class ChoiceDialogComponent { + /** + * One number selected, if this is a single select choice + */ + public selectedChoice: number; + + /** + * All selected ids, if this is a multiselect choice + */ + public selectedMultiChoices: number[] = []; + + public constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: ChoiceDialogData + ) {} + + /** + * Get the title from a choice. Maybe saved in a label property or using getTitle(). + * + * @param choice The choice + * @return the title + */ + public getChoiceTitle(choice: ChoiceDialogOption): string { + if ('label' in choice) { + return choice.label; + } else { + return choice.getTitle(); + } + } + + /** + * Closes the dialog with the selected choices + */ + public closeDialog(ok: boolean): void { + if (ok) { + this.dialogRef.close(this.data.multiSelect ? this.selectedMultiChoices : this.selectedChoice); + } else { + this.dialogRef.close(); + } + } + + /** + * For multiSelect: Determines whether a choice has been activated + * @param choice + */ + public isChosen(choice: Identifiable): boolean { + return this.selectedMultiChoices.indexOf(choice.id) >= 0; + } + + /** + * For multiSelect: Activates/deactivates a multi-Choice option + * @param choice + */ + public toggleChoice(choice: Identifiable): void { + const idx = this.selectedMultiChoices.indexOf(choice.id); + if (idx < 0) { + this.selectedMultiChoices.push(choice.id); + } else { + this.selectedMultiChoices.splice(idx, 1); + } + } +} diff --git a/client/src/app/shared/components/head-bar/head-bar.component.html b/client/src/app/shared/components/head-bar/head-bar.component.html index 575dd3f56..2c299c05f 100644 --- a/client/src/app/shared/components/head-bar/head-bar.component.html +++ b/client/src/app/shared/components/head-bar/head-bar.component.html @@ -1,13 +1,23 @@ - - + +
- - @@ -22,12 +32,12 @@
- -
+ +
-
+
@@ -36,24 +46,31 @@
- - + - + - diff --git a/client/src/app/shared/models/motions/motion.ts b/client/src/app/shared/models/motions/motion.ts index f44e4523d..a6b06d847 100644 --- a/client/src/app/shared/models/motions/motion.ts +++ b/client/src/app/shared/models/motions/motion.ts @@ -23,7 +23,6 @@ export class Motion extends AgendaBaseModel { public motion_block_id: number; public origin: string; public submitters: MotionSubmitter[]; - public submitters_id: number[]; public supporters_id: number[]; public comments: MotionComment[]; public workflow_id: number; diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index 1100680e4..69fdc20a6 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts @@ -66,6 +66,7 @@ import { PromptDialogComponent } from './components/prompt-dialog/prompt-dialog. import { SortingListComponent } from './components/sorting-list/sorting-list.component'; import { SpeakerListComponent } from 'app/site/agenda/components/speaker-list/speaker-list.component'; import { SortingTreeComponent } from './components/sorting-tree/sorting-tree.component'; +import { ChoiceDialogComponent } from './components/choice-dialog/choice-dialog.component'; /** * Share Module for all "dumb" components and pipes. @@ -180,7 +181,8 @@ import { SortingTreeComponent } from './components/sorting-tree/sorting-tree.com PromptDialogComponent, SortingListComponent, SpeakerListComponent, - SortingTreeComponent + SortingTreeComponent, + ChoiceDialogComponent ], providers: [ { provide: DateAdapter, useClass: OpenSlidesDateAdapter }, diff --git a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html index 9c79e730e..b782337f2 100644 --- a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html +++ b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html @@ -1,32 +1,22 @@ - + -
-

Agenda

-
+

Agenda

- +
- + {{ selectedRows.length }} selected
- +
- - @@ -52,9 +42,7 @@ Speakers @@ -62,8 +50,11 @@ - + @@ -71,16 +62,12 @@
-
+
- + +
diff --git a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts index dc382bd79..1a3209411 100644 --- a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts +++ b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts @@ -100,6 +100,7 @@ export class AgendaListComponent extends ListViewBaseComponent impleme /** * Sets multiple entries' open/closed state. Needs items in selectedRows, which * is only filled with any data in multiSelect mode + * * @param closed true if the item is to be considered done */ public async setClosedSelected(closed: boolean): Promise { @@ -111,6 +112,7 @@ export class AgendaListComponent extends ListViewBaseComponent impleme /** * Sets multiple entries' visibility. Needs items in selectedRows, which * is only filled with any data in multiSelect mode. + * * @param visible true if the item is to be shown */ public async setVisibilitySelected(visible: boolean): Promise { diff --git a/client/src/app/site/assignments/assignment-list/assignment-list.component.html b/client/src/app/site/assignments/assignment-list/assignment-list.component.html index 125909d60..e0935fd33 100644 --- a/client/src/app/site/assignments/assignment-list/assignment-list.component.html +++ b/client/src/app/site/assignments/assignment-list/assignment-list.component.html @@ -1,9 +1,6 @@ - + -
- -

Elections

-
+

Elections

+ {{ selectedRows.length }} selected
- +
- - - - + + {{ isSelected(assignment) ? 'check_circle' : '' }} @@ -58,8 +49,11 @@ - + @@ -69,7 +63,7 @@
- + + diff --git a/client/src/app/site/login/components/reset-password-confirm/reset-password-confirm.component.spec.ts b/client/src/app/site/login/components/reset-password-confirm/reset-password-confirm.component.spec.ts index ca00e6c07..78ef346bb 100644 --- a/client/src/app/site/login/components/reset-password-confirm/reset-password-confirm.component.spec.ts +++ b/client/src/app/site/login/components/reset-password-confirm/reset-password-confirm.component.spec.ts @@ -25,7 +25,7 @@ describe('ResetPasswordConfirmComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ResetPasswordConfirmComponent); component = fixture.componentInstance; - fixture.detectChanges(); + // fixture.detectChanges(); }); it('should create', () => { diff --git a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html index a98624a83..2308382eb 100644 --- a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html +++ b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html @@ -5,7 +5,6 @@ (mainEvent)="onMainEvent()" (saveEvent)="onSaveEditedFile()" > -

Files

@@ -44,31 +43,18 @@ more_vert
- - -
- -
-
- + {{ selectedRows.length }} selected
- +
- @@ -122,8 +108,11 @@ - + @@ -167,14 +156,21 @@ - - - - + Multiselect + +
+
+ + + +
diff --git a/client/src/app/site/motions/components/amendment-create-wizard/amendment-create-wizard.component.ts b/client/src/app/site/motions/components/amendment-create-wizard/amendment-create-wizard.component.ts index 9161f8713..3482cb1e0 100644 --- a/client/src/app/site/motions/components/amendment-create-wizard/amendment-create-wizard.component.ts +++ b/client/src/app/site/motions/components/amendment-create-wizard/amendment-create-wizard.component.ts @@ -9,8 +9,8 @@ import { TranslateService } from '@ngx-translate/core'; import { MotionRepositoryService } from '../../services/motion-repository.service'; import { ViewMotion } from '../../models/view-motion'; import { LinenumberingService } from '../../services/linenumbering.service'; -import { Motion } from '../../../../shared/models/motions/motion'; import { BaseViewComponent } from '../../../base/base-view'; +import { CreateMotion } from '../../models/create-motion'; /** * Describes the single paragraphs from the base motion. @@ -167,10 +167,10 @@ export class AmendmentCreateWizardComponent extends BaseViewComponent { amendment_paragraphs: amendedParagraphs }; - const fromForm = new Motion(); - fromForm.deserialize(newMotionValues); + const motion = new CreateMotion(); + motion.deserialize(newMotionValues); - const response = await this.repo.create(fromForm); + const response = await this.repo.create(motion); this.router.navigate(['./motions/' + response.id]); } } diff --git a/client/src/app/site/motions/components/motion-detail/motion-detail.component.ts b/client/src/app/site/motions/components/motion-detail/motion-detail.component.ts index bc01dd23a..7f77a963e 100644 --- a/client/src/app/site/motions/components/motion-detail/motion-detail.component.ts +++ b/client/src/app/site/motions/components/motion-detail/motion-detail.component.ts @@ -29,6 +29,8 @@ import { ConfigService } from '../../../../core/services/config.service'; import { Workflow } from 'app/shared/models/motions/workflow'; import { take, takeWhile, multicast, skipWhile } from 'rxjs/operators'; import { LocalPermissionsService } from '../../services/local-permissions.service'; +import { ViewCreateMotion } from '../../models/view-create-motion'; +import { CreateMotion } from '../../models/create-motion'; /** * Component for the motion detail view @@ -260,28 +262,10 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit { } }); // load config variables - this.configService.get('motions_statutes_enabled').subscribe( - (enabled: boolean): void => { - this.statutesEnabled = enabled; - } - ); - this.configService.get('motions_min_supporters').subscribe( - (supporters: number): void => { - this.minSupporters = supporters; - } - ); - - this.configService.get('motions_preamble').subscribe( - (preamble: string): void => { - this.preamble = preamble; - } - ); - - this.configService.get('motions_amendments_enabled').subscribe( - (enabled: boolean): void => { - this.amendmentsEnabled = enabled; - } - ); + this.configService.get('motions_statutes_enabled').subscribe(enabled => (this.statutesEnabled = enabled)); + this.configService.get('motions_min_supporters').subscribe(supporters => (this.minSupporters = supporters)); + this.configService.get('motions_preamble').subscribe(preamble => (this.preamble = preamble)); + this.configService.get('motions_amendments_enabled').subscribe(enabled => (this.amendmentsEnabled = enabled)); } /** @@ -327,8 +311,8 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit { // creates a new motion this.newMotion = true; this.editMotion = true; - this.motion = new ViewMotion(); - this.motionCopy = new ViewMotion(); + this.motion = new ViewCreateMotion(); + this.motionCopy = new ViewCreateMotion(); } else { // load existing motion this.route.params.subscribe(params => { @@ -393,7 +377,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit { state_id: [''], recommendation_id: [''], submitters_id: [], - supporters_id: [], + supporters_id: [[]], workflow_id: [], origin: [''] }); @@ -419,45 +403,65 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit { } /** - * Save a motion. Calls the "patchValues" function in the MotionObject - * - * http:post the motion to the server. - * The AutoUpdate-Service should see a change once it arrives and show it - * in the list view automatically + * Before updating or creating, the motions needs to be prepared for paragraph based amendments. + * A motion of type T is created, prepared and deserialized from the given motionValues * + * @param motionValues valus for the new motion + * @param ctor The motion constructor, so different motion types can be created. */ - public async saveMotion(): Promise { - const newMotionValues = { ...this.metaInfoForm.value, ...this.contentForm.value }; - - const fromForm = new Motion(); + private prepareMotionForSave(motionValues: any, ctor: new (...args: any[]) => T): T { + const motion = new ctor(); if (this.motion.isParagraphBasedAmendment()) { - fromForm.amendment_paragraphs = this.motion.amendment_paragraphs.map( - (para: string): string => { - if (para === null) { + motion.amendment_paragraphs = this.motion.amendment_paragraphs.map( + (paragraph: string): string => { + if (paragraph === null) { return null; } else { - return newMotionValues.text; + return motionValues.text; } } ); - newMotionValues.text = ''; + motionValues.text = ''; } - fromForm.deserialize(newMotionValues); + motion.deserialize(motionValues); + return motion; + } + + /** + * Creates a motion. Calls the "patchValues" function in the MotionObject + */ + public async createMotion(): Promise { + const newMotionValues = { ...this.metaInfoForm.value, ...this.contentForm.value }; + const motion = this.prepareMotionForSave(newMotionValues, CreateMotion); try { - if (this.newMotion) { - const response = await this.repo.create(fromForm); - this.router.navigate(['./motions/' + response.id]); - } else { - await this.repo.update(fromForm, this.motionCopy); - // if the motion was successfully updated, change the edit mode. - this.editMotion = false; - } + const response = await this.repo.create(motion); + this.router.navigate(['./motions/' + response.id]); } catch (e) { this.raiseError(e); } } + /** + * Save a motion. Calls the "patchValues" function in the MotionObject + */ + public async updateMotion(): Promise { + const newMotionValues = { ...this.metaInfoForm.value, ...this.contentForm.value }; + const motion = this.prepareMotionForSave(newMotionValues, Motion); + this.repo.update(motion, this.motionCopy).then(() => (this.editMotion = false), this.raiseError); + } + + /** + * In the ui are no distinct buttons for update or create. This is decided here. + */ + public saveMotion(): void { + if (this.newMotion) { + this.createMotion(); + } else { + this.updateMotion(); + } + } + /** * get the formated motion text from the repository. */ diff --git a/client/src/app/site/motions/components/motion-list/motion-list.component.html b/client/src/app/site/motions/components/motion-list/motion-list.component.html index c3f0a0755..4bdf2baf2 100644 --- a/client/src/app/site/motions/components/motion-list/motion-list.component.html +++ b/client/src/app/site/motions/components/motion-list/motion-list.component.html @@ -1,8 +1,6 @@ - + -
-

Motions

-
+

Motions

@@ -13,31 +11,17 @@
- + {{ selectedRows.length }} selected
- -
- -
-
- - +
- + {{ isSelected(motion) ? 'check_circle' : '' }} @@ -48,9 +32,7 @@ Identifier -
- {{ motion.identifier }} -
+
{{ motion.identifier }}
 @@ -59,25 +41,28 @@ Title
- {{ motion.title }} -
- - by - {{ motion.submitters }} + {{ motion.title }}
+ + by {{ motion.submitters }} -
+
- + {{ motion.state.name | translate }} - - {{ motion.recommendation.recommendation_label | translate }} + + {{ + motion.recommendation.recommendation_label | translate + }}
@@ -86,10 +71,8 @@ State - -
- device_hub {{ motion.category }} -
+ +
device_hub{{ motion.category }}
 @@ -100,7 +83,8 @@ @@ -108,8 +92,12 @@ - + @@ -119,7 +107,7 @@
+
- - - + + + + + +
- + +
diff --git a/client/src/app/site/motions/components/motion-list/motion-list.component.ts b/client/src/app/site/motions/components/motion-list/motion-list.component.ts index 2284a622b..9c28a6eb8 100644 --- a/client/src/app/site/motions/components/motion-list/motion-list.component.ts +++ b/client/src/app/site/motions/components/motion-list/motion-list.component.ts @@ -3,15 +3,14 @@ import { Router, ActivatedRoute } from '@angular/router'; import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; +import { ConfigService } from '../../../../core/services/config.service'; +import { MotionCsvExportService } from '../../services/motion-csv-export.service'; +import { ListViewBaseComponent } from '../../../base/list-view-base'; +import { MatSnackBar } from '@angular/material'; import { MotionRepositoryService } from '../../services/motion-repository.service'; import { ViewMotion } from '../../models/view-motion'; import { WorkflowState } from '../../../../shared/models/motions/workflow-state'; -import { ListViewBaseComponent } from '../../../base/list-view-base'; -import { MatSnackBar } from '@angular/material'; -import { ConfigService } from '../../../../core/services/config.service'; -import { Category } from '../../../../shared/models/motions/category'; -import { PromptService } from '../../../../core/services/prompt.service'; -import { MotionCsvExportService } from '../../services/motion-csv-export.service'; +import { MotionMultiselectService } from '../../services/motion-multiselect.service'; /** * Component that displays all the motions in a Table using DataSource. @@ -51,8 +50,13 @@ export class MotionListComponent extends ListViewBaseComponent imple * @param route Current route * @param configService The configuration provider * @param repo Motion Repository - * @param csvExport CSV Export Service * @param promptService + * @param motionCsvExport + * @param workflowRepo Workflow Repository + * @param categoryRepo + * @param userRepo + * @param tagRepo + * @param choiceService */ public constructor( titleService: Title, @@ -62,8 +66,8 @@ export class MotionListComponent extends ListViewBaseComponent imple private route: ActivatedRoute, private configService: ConfigService, private repo: MotionRepositoryService, - private promptService: PromptService, - private motionCsvExport: MotionCsvExportService + private motionCsvExport: MotionCsvExportService, + public multiselectService: MotionMultiselectService ) { super(titleService, translate, matSnackBar); @@ -90,11 +94,7 @@ export class MotionListComponent extends ListViewBaseComponent imple } }); }); - this.configService.get('motions_statutes_enabled').subscribe( - (enabled: boolean): void => { - this.statutesEnabled = enabled; - } - ); + this.configService.get('motions_statutes_enabled').subscribe(enabled => (this.statutesEnabled = enabled)); } /** @@ -160,64 +160,25 @@ export class MotionListComponent extends ListViewBaseComponent imple * Export all motions as CSV */ public csvExportMotionList(): void { - this.motionCsvExport.exportMotionList(this.dataSource.data); + this.motionCsvExport.exportMotionList(this.dataSource.data); } /** - * Deletes the items selected. - * SelectedRows is only filled with data in multiSelect mode + * Returns current definitions for the listView table */ - public async deleteSelected(): Promise { - const content = this.translate.instant('This will delete all selected motions.'); - if (await this.promptService.open('Are you sure?', content)) { - for (const motion of this.selectedRows) { - await this.repo.delete(motion); - } - } - } - - /** - * Set the status in bulk. - * SelectedRows is only filled with data in multiSelect mode - * TODO: currently not yet functional, because no status (or state_id) is being selected - * in the ui - * @param status TODO: May still change type - */ - public async setStatusSelected(status: Partial): Promise { - // TODO: check if id is there - for (const motion of this.selectedRows) { - await this.repo.update({ state_id: status.id }, motion); - } - } - - /** - * Set the category for all selected items. - * SelectedRows is only filled with data in multiSelect mode - * TODO: currently not yet functional, because no category is being selected in the ui - * @param category TODO: May still change type - */ - public async setCategorySelected(category: Partial): Promise { - for (const motion of this.selectedRows) { - await this.repo.update({ state_id: category.id }, motion); - } - } - - /** - * TODO: Open an extra submenu. Design still undecided. Will be used for deciding - * the status of setStatusSelected - */ - public openSetStatusMenu(): void {} - - /** - * TODO: Open an extra submenu. Design still undecided. Will be used for deciding - * the status of setCategorySelected - */ - public openSetCategoryMenu(): void {} - public getColumnDefinition(): string[] { if (this.isMultiSelect) { return ['selector'].concat(this.columnsToDisplayMinWidth); } return this.columnsToDisplayMinWidth; } + + /** + * Wraps multiselect actions to close the multiselect mode or throw an error if one happens. + * + * @param multiselectPromise The promise returned by multiselect actions. + */ + public multiselectWrapper(multiselectPromise: Promise): void { + multiselectPromise.then(() => this.toggleMultiSelect(), this.raiseError); + } } diff --git a/client/src/app/site/motions/models/create-motion.ts b/client/src/app/site/motions/models/create-motion.ts new file mode 100644 index 000000000..cc9e8ef73 --- /dev/null +++ b/client/src/app/site/motions/models/create-motion.ts @@ -0,0 +1,13 @@ +import { Motion } from 'app/shared/models/motions/motion'; + +/** + * Representation of Motion during creation. The submitters_id is added to send this information + * as an array of user ids to the server. + */ +export class CreateMotion extends Motion { + public submitters_id: number[]; + + public constructor(input?: any) { + super(input); + } +} diff --git a/client/src/app/site/motions/models/view-create-motion.ts b/client/src/app/site/motions/models/view-create-motion.ts new file mode 100644 index 000000000..ff81bbb66 --- /dev/null +++ b/client/src/app/site/motions/models/view-create-motion.ts @@ -0,0 +1,62 @@ +import { Category } from '../../../shared/models/motions/category'; +import { User } from '../../../shared/models/users/user'; +import { Workflow } from '../../../shared/models/motions/workflow'; +import { WorkflowState } from '../../../shared/models/motions/workflow-state'; +import { Item } from 'app/shared/models/agenda/item'; +import { MotionBlock } from 'app/shared/models/motions/motion-block'; +import { ViewMotion } from './view-motion'; +import { CreateMotion } from './create-motion'; + +/** + * Create motion class for the View. Its different to ViewMotion in fact that the submitter handling is different + * on motion creation. + * + * @ignore + */ +export class ViewCreateMotion extends ViewMotion { + protected _motion: CreateMotion; + + public get motion(): CreateMotion { + return this._motion; + } + + public get submitters(): User[] { + return this._submitters; + } + + public get submitters_id(): number[] { + return this.motion ? this.motion.submitters_id : null; + } + + public set submitters(users: User[]) { + this._submitters = users; + this._motion.submitters_id = users.map(user => user.id); + } + + public constructor( + motion?: CreateMotion, + category?: Category, + submitters?: User[], + supporters?: User[], + workflow?: Workflow, + state?: WorkflowState, + item?: Item, + block?: MotionBlock + ) { + super(motion, category, submitters, supporters, workflow, state, item, block); + } + + /** + * Duplicate this motion into a copy of itself + */ + public copy(): ViewCreateMotion { + return new ViewCreateMotion( + this._motion, + this._category, + this._submitters, + this._supporters, + this._workflow, + this._state + ); + } +} diff --git a/client/src/app/site/motions/models/view-motion.ts b/client/src/app/site/motions/models/view-motion.ts index 91d93bbc6..006ad77b8 100644 --- a/client/src/app/site/motions/models/view-motion.ts +++ b/client/src/app/site/motions/models/view-motion.ts @@ -31,14 +31,14 @@ export enum ChangeRecoMode { * @ignore */ export class ViewMotion extends BaseViewModel { - private _motion: Motion; - private _category: Category; - private _submitters: User[]; - private _supporters: User[]; - private _workflow: Workflow; - private _state: WorkflowState; - private _item: Item; - private _block: MotionBlock; + protected _motion: Motion; + protected _category: Category; + protected _submitters: User[]; + protected _supporters: User[]; + protected _workflow: Workflow; + protected _state: WorkflowState; + protected _item: Item; + protected _block: MotionBlock; /** * Indicates the LineNumberingMode Mode. @@ -126,7 +126,7 @@ export class ViewMotion extends BaseViewModel { } public get submitters_id(): number[] { - return this.motion ? this.motion.submitters_id : null; + return this.motion ? this.motion.submitterIds : null; } public get supporters(): User[] { @@ -184,11 +184,6 @@ export class ViewMotion extends BaseViewModel { this._motion.supporters_id = users.map(user => user.id); } - public set submitters(users: User[]) { - this._submitters = users; - this._motion.submitters_id = users.map(user => user.id); - } - public get item(): Item { return this._item; } @@ -213,6 +208,10 @@ export class ViewMotion extends BaseViewModel { return this.motion && this.motion.amendment_paragraphs ? this.motion.amendment_paragraphs : []; } + public get tags_id(): number[] { + return this._motion ? this._motion.tags_id : null; + } + public constructor( motion?: Motion, category?: Category, diff --git a/client/src/app/site/motions/models/view-workflow.ts b/client/src/app/site/motions/models/view-workflow.ts new file mode 100644 index 000000000..95d792256 --- /dev/null +++ b/client/src/app/site/motions/models/view-workflow.ts @@ -0,0 +1,58 @@ +import { Workflow } from '../../../shared/models/motions/workflow'; +import { WorkflowState } from '../../../shared/models/motions/workflow-state'; +import { BaseViewModel } from '../../base/base-view-model'; + +/** + * class for the ViewWorkflow. Currently only a basic stub + * + * Stores a Category including all (implicit) references + * Provides "safe" access to variables and functions in {@link Category} + * @ignore + */ +export class ViewWorkflow extends BaseViewModel { + private _workflow: Workflow; + + public constructor(workflow?: Workflow) { + super(); + this._workflow = workflow; + } + + public get workflow(): Workflow { + return this._workflow; + } + + public get id(): number { + return this.workflow ? this.workflow.id : null; + } + + public get name(): string { + return this.workflow ? this.workflow.name : null; + } + + public get states(): WorkflowState[] { + return this.workflow ? this.workflow.states : null; + } + + public get first_state(): number { + return this.workflow ? this.workflow.first_state : null; + } + + public getTitle(): string { + return this.name; + } + + /** + * Duplicate this motion into a copy of itself + */ + public copy(): ViewWorkflow { + return new ViewWorkflow(this._workflow); + } + + /** + * Updates the local objects if required + * @param update + */ + public updateValues(update: Workflow): void { + this._workflow = update; + } +} diff --git a/client/src/app/site/motions/services/category-repository.service.ts b/client/src/app/site/motions/services/category-repository.service.ts index ec966d5ea..229531136 100644 --- a/client/src/app/site/motions/services/category-repository.service.ts +++ b/client/src/app/site/motions/services/category-repository.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; + import { Category } from '../../../shared/models/motions/category'; import { ViewCategory } from '../models/view-category'; import { DataSendService } from '../../../core/services/data-send.service'; diff --git a/client/src/app/site/motions/services/motion-multiselect.service.spec.ts b/client/src/app/site/motions/services/motion-multiselect.service.spec.ts new file mode 100644 index 000000000..3047481c0 --- /dev/null +++ b/client/src/app/site/motions/services/motion-multiselect.service.spec.ts @@ -0,0 +1,17 @@ +import { TestBed, inject } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionMultiselectService } from './motion-multiselect.service'; + +describe('MotionMultiselectService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [E2EImportsModule], + providers: [MotionMultiselectService] + }); + }); + + it('should be created', inject([MotionMultiselectService], (service: MotionMultiselectService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/client/src/app/site/motions/services/motion-multiselect.service.ts b/client/src/app/site/motions/services/motion-multiselect.service.ts new file mode 100644 index 000000000..180c889a1 --- /dev/null +++ b/client/src/app/site/motions/services/motion-multiselect.service.ts @@ -0,0 +1,224 @@ +import { Injectable } from '@angular/core'; + +import { TranslateService } from '@ngx-translate/core'; + +import { ViewMotion } from '../models/view-motion'; +import { ChoiceService } from 'app/core/services/choice.service'; +import { PromptService } from 'app/core/services/prompt.service'; +import { MotionRepositoryService } from './motion-repository.service'; +import { UserRepositoryService } from 'app/site/users/services/user-repository.service'; +import { WorkflowRepositoryService } from './workflow-repository.service'; +import { CategoryRepositoryService } from './category-repository.service'; +import { TagRepositoryService } from 'app/site/tags/services/tag-repository.service'; +import { HttpService } from 'app/core/services/http.service'; +import { AgendaRepositoryService } from 'app/site/agenda/services/agenda-repository.service'; +import { Displayable } from 'app/shared/models/base/displayable'; +import { Identifiable } from 'app/shared/models/base/identifiable'; + +/** + * Contains all multiselect actions for the motion list view. + */ +@Injectable({ + providedIn: 'root' +}) +export class MotionMultiselectService { + /** + * Does nothing. + * + * @param repo MotionRepositoryService + * @param translate TranslateService + * @param promptService + * @param choiceService + * @param userRepo + * @param workflowRepo + * @param categoryRepo + * @param tagRepo + */ + public constructor( + private repo: MotionRepositoryService, + private translate: TranslateService, + private promptService: PromptService, + private choiceService: ChoiceService, + private userRepo: UserRepositoryService, + private workflowRepo: WorkflowRepositoryService, + private categoryRepo: CategoryRepositoryService, + private tagRepo: TagRepositoryService, + private agendaRepo: AgendaRepositoryService, + private httpService: HttpService + ) {} + + /** + * Deletes the given motions. Asks for confirmation. + * + * @param motions The motions to delete + */ + public async delete(motions: ViewMotion[]): Promise { + const content = this.translate.instant('This will delete all selected motions.'); + if (await this.promptService.open('Are you sure?', content)) { + for (const motion of motions) { + await this.repo.delete(motion); + } + } + } + + /** + * Moves the related agenda items from the motions as childs under a selected (parent) agenda item. + */ + public async moveToItem(motions: ViewMotion[]): Promise { + const title = this.translate.instant('This will move all selected motions as childs to:'); + const choices: (Displayable & Identifiable)[] = this.agendaRepo.getViewModelList(); + const selectedChoice = await this.choiceService.open(title, choices); + if (selectedChoice) { + const requestData = { + items: motions.map(motion => motion.agenda_item_id), + parent_id: selectedChoice as number + }; + await this.httpService.post('/rest/agenda/item/assign', requestData); + } + } + + /** + * Opens a dialog and then sets the status for all motions. + * + * @param motions The motions to change + */ + public async setStatus(motions: ViewMotion[]): Promise { + const title = this.translate.instant('This will set the state of all selected motions to:'); + const choices = this.workflowRepo.getAllWorkflowStates().map(workflowState => ({ + id: workflowState.id, + label: workflowState.name + })); + const selectedChoice = await this.choiceService.open(title, choices); + if (selectedChoice) { + for (const motion of motions) { + await this.repo.setState(motion, selectedChoice as number); + } + } + } + + /** + * Opens a dialog and sets the recommendation to the users choice for all selected motions. + * + * @param motions The motions to change + */ + public async setRecommendation(motions: ViewMotion[]): Promise { + const title = this.translate.instant('This will set the recommendation for all selected motions to:'); + const choices = this.workflowRepo + .getAllWorkflowStates() + .filter(workflowState => !!workflowState.recommendation_label) + .map(workflowState => ({ + id: workflowState.id, + label: workflowState.recommendation_label + })); + choices.push({ id: 0, label: 'Delete recommendation' }); + const selectedChoice = await this.choiceService.open(title, choices); + if (typeof selectedChoice === 'number') { + const requestData = motions.map(motion => ({ + id: motion.id, + recommendation: selectedChoice + })); + await this.httpService.post('/rest/motions/motion/manage_multiple_recommendation', { + motions: requestData + }); + } + } + + /** + * Opens a dialog and sets the category for all given motions. + * + * @param motions The motions to change + */ + public async setCategory(motions: ViewMotion[]): Promise { + const title = this.translate.instant('This will set the category of all selected motions to:'); + const selectedChoice = await this.choiceService.open(title, this.categoryRepo.getViewModelList()); + if (selectedChoice) { + for (const motion of motions) { + await this.repo.update({ category_id: selectedChoice as number }, motion); + } + } + } + + /** + * Opens a dialog and adds the selected submitters for all given motions. + * + * @param motions The motions to add the sumbitters to + */ + public async addSubmitters(motions: ViewMotion[]): Promise { + const title = this.translate.instant('This will add the following submitters of all selected motions:'); + const selectedChoice = await this.choiceService.open(title, this.userRepo.getViewModelList(), true); + if (selectedChoice) { + const requestData = motions.map(motion => { + let submitterIds = [...motion.submitters_id, ...(selectedChoice as number[])]; + submitterIds = submitterIds.filter((id, index, self) => self.indexOf(id) === index); // remove duplicates + return { + id: motion.id, + submitters: submitterIds + }; + }); + await this.httpService.post('/rest/motions/motion/manage_multiple_submitters', { motions: requestData }); + } + } + + /** + * Opens a dialog and removes the selected submitters for all given motions. + * + * @param motions The motions to remove the submitters from + */ + public async removeSubmitters(motions: ViewMotion[]): Promise { + const title = this.translate.instant('This will remove the following submitters from all selected motions:'); + const selectedChoice = await this.choiceService.open(title, this.userRepo.getViewModelList(), true); + if (selectedChoice) { + const requestData = motions.map(motion => { + const submitterIdsToRemove = selectedChoice as number[]; + const submitterIds = motion.submitters_id.filter(id => !submitterIdsToRemove.includes(id)); + return { + id: motion.id, + submitters: submitterIds + }; + }); + await this.httpService.post('/rest/motions/motion/manage_multiple_submitters', { motions: requestData }); + } + } + + /** + * Opens a dialog and adds the selected tags for all given motions. + * + * @param motions The motions to add the tags to + */ + public async addTags(motions: ViewMotion[]): Promise { + const title = this.translate.instant('This will add the following tags to all selected motions:'); + const selectedChoice = await this.choiceService.open(title, this.tagRepo.getViewModelList(), true); + if (selectedChoice) { + const requestData = motions.map(motion => { + let tagIds = [...motion.tags_id, ...(selectedChoice as number[])]; + tagIds = tagIds.filter((id, index, self) => self.indexOf(id) === index); // remove duplicates + return { + id: motion.id, + tags: tagIds + }; + }); + await this.httpService.post('/rest/motions/motion/manage_multiple_tags', { motions: requestData }); + } + } + + /** + * Opens a dialog and removes the selected tags for all given motions. + * + * @param motions The motions to remove the tags from + */ + public async removeTags(motions: ViewMotion[]): Promise { + const title = this.translate.instant('This will remove the following tags from all selected motions:'); + const selectedChoice = await this.choiceService.open(title, this.tagRepo.getViewModelList(), true); + if (selectedChoice) { + const requestData = motions.map(motion => { + const tagIdsToRemove = selectedChoice as number[]; + const tagIds = motion.tags_id.filter(id => !tagIdsToRemove.includes(id)); + return { + id: motion.id, + tags: tagIds + }; + }); + await this.httpService.post('/rest/motions/motion/manage_multiple_tags', { motions: requestData }); + } + } +} diff --git a/client/src/app/site/motions/services/motion-repository.service.ts b/client/src/app/site/motions/services/motion-repository.service.ts index 15bd26d1a..9fe06bfa1 100644 --- a/client/src/app/site/motions/services/motion-repository.service.ts +++ b/client/src/app/site/motions/services/motion-repository.service.ts @@ -25,6 +25,7 @@ import { Item } from 'app/shared/models/agenda/item'; import { OSTreeSortEvent } from 'app/shared/components/sorting-tree/sorting-tree.component'; import { TreeService } from 'app/core/services/tree.service'; import { ViewMotionAmendedParagraph } from '../models/view-motion-amended-paragraph'; +import { CreateMotion } from '../models/create-motion'; /** * Repository Services for motions (and potentially categories) @@ -109,12 +110,8 @@ export class MotionRepositoryService extends BaseRepository * * @param update the form data containing the updated values * @param viewMotion The View Motion. If not present, a new motion will be created - * TODO: Remove the viewMotion and make it actually distignuishable from save() */ - public async create(motion: Motion): Promise { - if (!motion.supporters_id) { - delete motion.supporters_id; - } + public async create(motion: CreateMotion): Promise { return await this.dataSend.createModel(motion); } diff --git a/client/src/app/site/motions/services/workflow-repository.service.spec.ts b/client/src/app/site/motions/services/workflow-repository.service.spec.ts new file mode 100644 index 000000000..f8209ab4b --- /dev/null +++ b/client/src/app/site/motions/services/workflow-repository.service.spec.ts @@ -0,0 +1,17 @@ +import { TestBed, inject } from '@angular/core/testing'; + +import { WorkflowRepositoryService } from './workflow-repository.service'; +import { E2EImportsModule } from '../../../../e2e-imports.module'; + +describe('WorkflowRepositoryService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [E2EImportsModule], + providers: [WorkflowRepositoryService] + }); + }); + + it('should be created', inject([WorkflowRepositoryService], (service: WorkflowRepositoryService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/client/src/app/site/motions/services/workflow-repository.service.ts b/client/src/app/site/motions/services/workflow-repository.service.ts new file mode 100644 index 000000000..13245db59 --- /dev/null +++ b/client/src/app/site/motions/services/workflow-repository.service.ts @@ -0,0 +1,73 @@ +import { Injectable } from '@angular/core'; +import { Workflow } from '../../../shared/models/motions/workflow'; +import { ViewWorkflow } from '../models/view-workflow'; +import { DataSendService } from '../../../core/services/data-send.service'; +import { DataStoreService } from '../../../core/services/data-store.service'; +import { BaseRepository } from '../../base/base-repository'; +import { Identifiable } from '../../../shared/models/base/identifiable'; +import { CollectionStringModelMapperService } from '../../../core/services/collectionStringModelMapper.service'; +import { WorkflowState } from 'app/shared/models/motions/workflow-state'; + +/** + * Repository Services for Categories + * + * The repository is meant to process domain objects (those found under + * shared/models), so components can display them and interact with them. + * + * Rather than manipulating models directly, the repository is meant to + * inform the {@link DataSendService} about changes which will send + * them to the Server. + */ +@Injectable({ + providedIn: 'root' +}) +export class WorkflowRepositoryService extends BaseRepository { + /** + * Creates a WorkflowRepository + * Converts existing and incoming workflow to ViewWorkflows + * @param DS + * @param dataSend + */ + public constructor( + DS: DataStoreService, + mapperService: CollectionStringModelMapperService, + private dataSend: DataSendService + ) { + super(DS, mapperService, Workflow); + } + + protected createViewModel(workflow: Workflow): ViewWorkflow { + return new ViewWorkflow(workflow); + } + + public async create(newWorkflow: Workflow): Promise { + return await this.dataSend.createModel(newWorkflow); + } + + public async update(workflow: Partial, viewWorkflow: ViewWorkflow): Promise { + let updateWorkflow: Workflow; + if (viewWorkflow) { + updateWorkflow = viewWorkflow.workflow; + } else { + updateWorkflow = new Workflow(); + } + updateWorkflow.patchValues(workflow); + await this.dataSend.updateModel(updateWorkflow); + } + + public async delete(viewWorkflow: ViewWorkflow): Promise { + const workflow = viewWorkflow.workflow; + await this.dataSend.deleteModel(workflow); + } + + /** + * Collects all existing states from all workflows + */ + public getAllWorkflowStates(): WorkflowState[] { + let states: WorkflowState[] = []; + this.getViewModelList().forEach(workflow => { + states = states.concat(workflow.states); + }); + return states; + } +} diff --git a/client/src/app/site/tags/services/tag-repository.service.ts b/client/src/app/site/tags/services/tag-repository.service.ts index 902574335..81264e13d 100644 --- a/client/src/app/site/tags/services/tag-repository.service.ts +++ b/client/src/app/site/tags/services/tag-repository.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; + import { Tag } from '../../../shared/models/core/tag'; import { ViewTag } from '../models/view-tag'; import { DataSendService } from '../../../core/services/data-send.service'; diff --git a/client/src/app/site/users/components/user-detail/user-detail.component.ts b/client/src/app/site/users/components/user-detail/user-detail.component.ts index 57dd73600..7fe4494c5 100644 --- a/client/src/app/site/users/components/user-detail/user-detail.component.ts +++ b/client/src/app/site/users/components/user-detail/user-detail.component.ts @@ -259,18 +259,10 @@ export class UserDetailComponent extends BaseViewComponent implements OnInit { /** * Handler for the generate Password button. - * Generates a password using 8 pseudo-random letters - * from the `characters` const. */ public generatePassword(): void { - let pw = ''; - const characters = 'abcdefghijkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'; - const amount = 8; - for (let i = 0; i < amount; i++) { - pw += characters.charAt(Math.floor(Math.random() * characters.length)); - } this.personalInfoForm.patchValue({ - default_password: pw + default_password: this.repo.getRandomPassword() }); } diff --git a/client/src/app/site/users/components/user-list/user-list.component.html b/client/src/app/site/users/components/user-list/user-list.component.html index 336da2017..ed246b379 100644 --- a/client/src/app/site/users/components/user-list/user-list.component.html +++ b/client/src/app/site/users/components/user-list/user-list.component.html @@ -1,39 +1,25 @@ - + -
-

Participants

-
+

Participants

- +
- + {{ selectedRows.length }} selected
- +
-
- - +
@@ -54,12 +40,12 @@ Group -
+
people {{ user.groups }} -
+
flag {{ user.structure_level }} @@ -80,8 +66,11 @@ - + @@ -91,7 +80,7 @@
+
- + @@ -123,44 +120,41 @@ add_circle Set active - - - - - - - - - - + + diff --git a/client/src/app/site/users/components/user-list/user-list.component.ts b/client/src/app/site/users/components/user-list/user-list.component.ts index a0653dc0e..7b0ce337d 100644 --- a/client/src/app/site/users/components/user-list/user-list.component.ts +++ b/client/src/app/site/users/components/user-list/user-list.component.ts @@ -1,15 +1,16 @@ import { Component, OnInit } from '@angular/core'; +import { MatSnackBar } from '@angular/material'; +import { Router, ActivatedRoute } from '@angular/router'; import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { CsvExportService } from '../../../../core/services/csv-export.service'; -import { ViewUser } from '../../models/view-user'; -import { UserRepositoryService } from '../../services/user-repository.service'; +import { CsvExportService } from '../../../../core/services/csv-export.service'; import { ListViewBaseComponent } from '../../../base/list-view-base'; -import { Router, ActivatedRoute } from '@angular/router'; -import { MatSnackBar } from '@angular/material'; -import { Group } from '../../../../shared/models/users/group'; +import { GroupRepositoryService } from '../../services/group-repository.service'; import { PromptService } from '../../../../core/services/prompt.service'; +import { UserRepositoryService } from '../../services/user-repository.service'; +import { ViewUser } from '../../models/view-user'; +import { ChoiceService } from '../../../../core/services/choice.service'; /** * Component for the user list view. @@ -28,6 +29,7 @@ export class UserListComponent extends ListViewBaseComponent implement * @param translate Service for translation handling * @param matSnackBar Helper to diplay errors * @param repo the user repository + * @param groupRepo: The user group repository * @param router the router service * @param route the local route * @param csvExport CSV export Service, @@ -38,6 +40,8 @@ export class UserListComponent extends ListViewBaseComponent implement translate: TranslateService, matSnackBar: MatSnackBar, private repo: UserRepositoryService, + private groupRepo: GroupRepositoryService, + private choiceService: ChoiceService, private router: Router, private route: ActivatedRoute, protected csvExport: CsvExportService, @@ -124,31 +128,31 @@ export class UserListComponent extends ListViewBaseComponent implement } /** - * TODO: Not yet as expected - * Bulk sets the group for users. TODO: Group is still not decided in the ui - * @param group TODO: type may still change - * @param unset toggle for adding or removing from the group + * Opens a dialog and sets the group(s) for all selected users. + * SelectedRows is only filled with data in multiSelect mode */ - public async setGroupSelected(group: Partial, unset?: boolean): Promise { - this.selectedRows.forEach(vm => { - const groups = vm.groupIds; - const idx = groups.indexOf(group.id); - if (unset && idx >= 0) { - groups.slice(idx, 1); - } else if (!unset && idx < 0) { - groups.push(group.id); + public async setGroupSelected(add: boolean): Promise { + let content: string; + if (add) { + content = this.translate.instant('This will add the following groups to all selected users:'); + } else { + content = this.translate.instant('This will remove the following groups from all selected users:'); + } + const selectedChoice = await this.choiceService.open(content, this.groupRepo.getViewModelList(), true); + if (selectedChoice) { + for (const user of this.selectedRows) { + const newGroups = [...user.groups_id]; + (selectedChoice as number[]).forEach(newChoice => { + const idx = newGroups.indexOf(newChoice); + if (idx < 0 && add) { + newGroups.push(newChoice); + } else if (idx >= 0 && !add) { + newGroups.slice(idx, 1); + } + }); + await this.repo.update({ groups_id: newGroups }, user); } - }); - } - - /** - * Handler for bulk resetting passwords. Needs multiSelect mode. - * TODO: Not yet implemented (no service yet) - */ - public async resetPasswordsSelected(): Promise { - // for (const user of this.selectedRows) { - // await this.resetPassword(user); - // } + } } /** @@ -183,12 +187,20 @@ export class UserListComponent extends ListViewBaseComponent implement /** * Handler for bulk sending e-mail invitations. Uses selectedRows defined via - * multiSelect mode. TODO: Not yet implemented (no service) + * multiSelect mode. */ - public async sendInvitationSelected(): Promise { - // this.selectedRows.forEach(vm => { - // TODO if !vm.emailSent {vm.sendInvitation} - // }); + public sendInvitationEmailSelected(): void { + this.repo.sendInvitationEmail(this.selectedRows).then(this.raiseError, this.raiseError); + } + + /** + * Handler for bulk resetting passwords. Needs multiSelect mode. + */ + public async resetPasswordsSelected(): Promise { + for (const user of this.selectedRows) { + const password = this.repo.getRandomPassword(); + this.repo.resetPassword(user, password); + } } public getColumnDefinition(): string[] { diff --git a/client/src/app/site/users/models/view-user.ts b/client/src/app/site/users/models/view-user.ts index 47939abf7..0c330d479 100644 --- a/client/src/app/site/users/models/view-user.ts +++ b/client/src/app/site/users/models/view-user.ts @@ -39,6 +39,10 @@ export class ViewUser extends BaseViewModel { return this.user ? this.user.full_name : null; } + public get short_name(): string { + return this.user ? this.user.short_name : null; + } + public get email(): string { return this.user ? this.user.email : null; } diff --git a/client/src/app/site/users/services/group-repository.service.ts b/client/src/app/site/users/services/group-repository.service.ts index 9ea9b17a8..a40498a30 100644 --- a/client/src/app/site/users/services/group-repository.service.ts +++ b/client/src/app/site/users/services/group-repository.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; -import { ViewGroup } from '../models/view-group'; import { BaseRepository } from '../../base/base-repository'; -import { Group } from '../../../shared/models/users/group'; -import { DataStoreService } from '../../../core/services/data-store.service'; -import { DataSendService } from '../../../core/services/data-send.service'; -import { ConstantsService } from '../../../core/services/constants.service'; -import { Identifiable } from '../../../shared/models/base/identifiable'; import { CollectionStringModelMapperService } from '../../../core/services/collectionStringModelMapper.service'; +import { ConstantsService } from '../../../core/services/constants.service'; +import { DataSendService } from '../../../core/services/data-send.service'; +import { DataStoreService } from '../../../core/services/data-store.service'; +import { Group } from '../../../shared/models/users/group'; +import { Identifiable } from '../../../shared/models/base/identifiable'; +import { ViewGroup } from '../models/view-group'; /** * Set rules to define the shape of an app permission diff --git a/client/src/app/site/users/services/user-repository.service.ts b/client/src/app/site/users/services/user-repository.service.ts index 33acc7ec6..5f9e5d1c6 100644 --- a/client/src/app/site/users/services/user-repository.service.ts +++ b/client/src/app/site/users/services/user-repository.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; - import { BaseRepository } from '../../base/base-repository'; import { ViewUser } from '../models/view-user'; import { User } from '../../../shared/models/users/user'; @@ -8,6 +7,9 @@ import { DataStoreService } from '../../../core/services/data-store.service'; import { DataSendService } from '../../../core/services/data-send.service'; import { Identifiable } from '../../../shared/models/base/identifiable'; import { CollectionStringModelMapperService } from '../../../core/services/collectionStringModelMapper.service'; +import { ConfigService } from 'app/core/services/config.service'; +import { HttpService } from 'app/core/services/http.service'; +import { TranslateService } from '@ngx-translate/core'; /** * Repository service for users @@ -24,7 +26,10 @@ export class UserRepositoryService extends BaseRepository { public constructor( DS: DataStoreService, mapperService: CollectionStringModelMapperService, - private dataSend: DataSendService + private dataSend: DataSendService, + private translate: TranslateService, + private httpService: HttpService, + private configService: ConfigService ) { super(DS, mapperService, User, [Group]); } @@ -84,4 +89,93 @@ export class UserRepositoryService extends BaseRepository { const groups = this.DS.getMany(Group, user.groups_id); return new ViewUser(user, groups); } + + /** + * Generates a random password + * + * @param length THe length of the password to generate + * @returns a random password + */ + public getRandomPassword(length: number = 8): string { + let pw = ''; + const characters = 'abcdefghijkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'; + for (let i = 0; i < length; i++) { + pw += characters.charAt(Math.floor(Math.random() * characters.length)); + } + return pw; + } + + /** + * Updates the default password and sets the real password. + * + * @param user The user to update + * @param password The password to set + */ + public async resetPassword(user: ViewUser, password: string): Promise { + await this.update({ default_password: password }, user); + const path = `/rest/users/user/${user.id}/reset_password/`; + await this.httpService.post(path, { password: password }); + } + + /** + * Sends invitation emails to all given users. Returns a prepared string to show the user. + * This string should always be shown, becuase even in success cases, some users may not get + * an email and the user should be notified about this. + * + * @param users All affected users + */ + public async sendInvitationEmail(users: ViewUser[]): Promise { + const user_ids = users.map(user => user.id); + const subject = this.translate.instant(this.configService.instant('users_email_subject')); + const message = this.translate.instant(this.configService.instant('users_email_body')); + + const response = await this.httpService.post<{ count: Number; no_email_ids: number[] }>( + '/rest/users/user/mass_invite_email/', + { + user_ids: user_ids, + subject: subject, + message: message + } + ); + const numEmails = response.count; + const noEmailIds = response.no_email_ids; + let msg; + if (numEmails === 0) { + msg = this.translate.instant('No emails were send.'); + } else if (numEmails === 1) { + msg = this.translate.instant('One email was send sucessfully.'); + } else { + msg = this.translate.instant('%num% emails were send sucessfully.').replace('%num%', numEmails); + } + + if (noEmailIds.length) { + msg += ' '; + + if (noEmailIds.length === 1) { + msg += this.translate.instant( + 'The user %user% has no email, so the invitation email could not be send.' + ); + } else { + msg += this.translate.instant( + 'The users %user% have no email, so the invitation emails could not be send.' + ); + } + + // This one builds a username string like "user1, user2 and user3" with the full names. + const usernames = noEmailIds + .map(id => this.getViewModel(id)) + .filter(user => !!user) + .map(user => user.short_name); + let userString; + if (usernames.length > 1) { + const lastUsername = usernames.pop(); + userString = usernames.join(', ') + ' ' + this.translate.instant('and') + ' ' + lastUsername; + } else { + userString = usernames.join(', '); + } + msg = msg.replace('%user%', userString); + } + + return msg; + } }