From d49b796b29570daacb9b489d64eaf204c0dd2441 Mon Sep 17 00:00:00 2001 From: FinnStutzenstein Date: Thu, 29 Nov 2018 17:36:22 +0100 Subject: [PATCH] travis and prettify --- .../src/app/core/services/choice.service.ts | 14 +++- .../choice-dialog.component.html | 10 ++- .../choice-dialog.component.spec.ts | 12 +-- .../choice-dialog/choice-dialog.component.ts | 2 +- .../head-bar/head-bar.component.html | 47 +++++++---- .../agenda-list/agenda-list.component.html | 33 +++----- .../assignment-list.component.html | 28 +++---- .../mediafile-list.component.html | 21 ++--- .../motion-list/motion-list.component.html | 84 +++++++++---------- .../motion-list/motion-list.component.ts | 2 +- .../app/site/motions/models/view-motion.ts | 4 +- .../app/site/motions/models/view-workflow.ts | 2 +- .../motion-multiselect.service.spec.ts | 9 +- .../services/motion-multiselect.service.ts | 4 +- .../services/workflow-repository.service.ts | 5 +- .../user-list/user-list.component.html | 39 ++++----- .../user-list/user-list.component.ts | 4 +- .../users/services/user-repository.service.ts | 24 ++++-- 18 files changed, 173 insertions(+), 171 deletions(-) diff --git a/client/src/app/core/services/choice.service.ts b/client/src/app/core/services/choice.service.ts index 62dfc311d..358991913 100644 --- a/client/src/app/core/services/choice.service.ts +++ b/client/src/app/core/services/choice.service.ts @@ -1,13 +1,17 @@ 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'; +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' + providedIn: 'root' }) export class ChoiceService extends OpenSlidesComponent { /** @@ -25,7 +29,11 @@ export class ChoiceService extends OpenSlidesComponent { * @param choices The available choices * @returns an answer {@link ChoiceAnswer} */ - public async open(title: string, choices: ChoiceDialogOptions, multiSelect: boolean = false): Promise { + public async open( + title: string, + choices: ChoiceDialogOptions, + multiSelect: boolean = false + ): Promise { const dialogRef = this.dialog.open(ChoiceDialogComponent, { minWidth: '250px', data: { title: title, choices: choices, multiSelect: multiSelect } 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 index 979829e44..afc62f495 100644 --- a/client/src/app/shared/components/choice-dialog/choice-dialog.component.html +++ b/client/src/app/shared/components/choice-dialog/choice-dialog.component.html @@ -1,8 +1,14 @@

{{ data.title | translate }}

- + - {{ getChoiceTitle(choice) | translate}} + {{ getChoiceTitle(choice) | translate }} 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 index 5b07c62a4..add33c792 100644 --- 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 @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { async, TestBed } from '@angular/core/testing'; // import { ChoiceDialogComponent } from './choice-dialog.component'; import { E2EImportsModule } from 'e2e-imports.module'; @@ -13,14 +13,14 @@ describe('ChoiceDialogComponent', () => { }).compileComponents(); })); - // TODO: You cannot create this component in the standard way. Needs different testing. - beforeEach(() => { - /*fixture = TestBed.createComponent(PromptDialogComponent); + // 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', () => { + /*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 index 0cab85381..6ae8f2088 100644 --- a/client/src/app/shared/components/choice-dialog/choice-dialog.component.ts +++ b/client/src/app/shared/components/choice-dialog/choice-dialog.component.ts @@ -81,7 +81,7 @@ export class ChoiceDialogComponent { * For multiSelect: Activates/deactivates a multi-Choice option * @param choice */ - public toggleChoice(choice: Identifiable) : void { + public toggleChoice(choice: Identifiable): void { const idx = this.selectedMultiChoices.indexOf(choice.id); if (idx < 0) { this.selectedMultiChoices.push(choice.id); 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 9fe62d832..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/site/agenda/components/agenda-list/agenda-list.component.html b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html index d08aef20c..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 @@ - + @@ -75,7 +66,7 @@ -
+
+ {{ selectedRows.length }} selected
- +
- - - - + + {{ isSelected(assignment) ? 'check_circle' : '' }} @@ -58,8 +49,11 @@ - + 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 b4348caa7..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

@@ -46,21 +45,16 @@
- + {{ selectedRows.length }} selected
- +
- @@ -114,8 +108,11 @@ - + @@ -161,8 +158,8 @@
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 a2cd77cd5..a009f5260 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