diff --git a/.travis.yml b/.travis.yml index 07ff0535d..6775e6021 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ matrix: install: - npm install script: - - npm run lint + - npm run lint-check - language: node_js name: "Client: Code Formatting Check" diff --git a/client/package.json b/client/package.json index b03be0269..4f6d35375 100644 --- a/client/package.json +++ b/client/package.json @@ -14,7 +14,8 @@ "start": "ng serve --proxy-config proxy.conf.json --host=0.0.0.0", "build": "ng build --prod", "test": "ng test", - "lint": "ng lint", + "lint-check": "ng lint", + "lint-write": "ng lint --fix", "e2e": "ng e2e", "licenses": "node src/crawler.js", "compodoc": "./node_modules/.bin/compodoc --hideGenerator -p src/tsconfig.app.json -n 'OpenSlides Documentation' -d ../Compodoc -s -w -t -o --port", @@ -22,7 +23,8 @@ "po2json": "./node_modules/.bin/po2json -f mf src/assets/i18n/de.po src/assets/i18n/de.json && ./node_modules/.bin/po2json -f mf src/assets/i18n/cs.po src/assets/i18n/cs.json", "po2json-tempfix": "./node_modules/.bin/po2json -f mf src/assets/i18n/de.po /dev/stdout | sed -f sed_replacements > src/assets/i18n/de.json && ./node_modules/.bin/po2json -f mf src/assets/i18n/cs.po /dev/stdout | sed -f sed_replacements > src/assets/i18n/cs.json", "prettify-check": "prettier --config ./.prettierrc --list-different \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\"", - "prettify-write": "prettier --config ./.prettierrc --write \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\"" + "prettify-write": "prettier --config ./.prettierrc --write \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\"", + "cleanup": "npm run lint-write; npm run prettify-write" }, "dependencies": { "@angular/animations": "^8.0.3", diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts index 86f493725..d823ee84b 100644 --- a/client/src/app/app-routing.module.ts +++ b/client/src/app/app-routing.module.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { LoginWrapperComponent } from './site/login/components/login-wrapper/login-wrapper.component'; -import { LoginMaskComponent } from './site/login/components/login-mask/login-mask.component'; import { LoginLegalNoticeComponent } from './site/login/components/login-legal-notice/login-legal-notice.component'; +import { LoginMaskComponent } from './site/login/components/login-mask/login-mask.component'; import { LoginPrivacyPolicyComponent } from './site/login/components/login-privacy-policy/login-privacy-policy.component'; -import { ResetPasswordComponent } from './site/login/components/reset-password/reset-password.component'; +import { LoginWrapperComponent } from './site/login/components/login-wrapper/login-wrapper.component'; import { ResetPasswordConfirmComponent } from './site/login/components/reset-password-confirm/reset-password-confirm.component'; +import { ResetPasswordComponent } from './site/login/components/reset-password/reset-password.component'; /** * Global app routing diff --git a/client/src/app/app.component.spec.ts b/client/src/app/app.component.spec.ts index c933cf019..6b8ec8865 100644 --- a/client/src/app/app.component.spec.ts +++ b/client/src/app/app.component.spec.ts @@ -1,8 +1,10 @@ -import { TestBed, async, fakeAsync, tick } from '@angular/core/testing'; +import { async, fakeAsync, TestBed, tick } from '@angular/core/testing'; + +import { TranslateService } from '@ngx-translate/core'; + import { AppComponent } from './app.component'; import { E2EImportsModule } from './../e2e-imports.module'; import { ServertimeService } from './core/core-services/servertime.service'; -import { TranslateService } from '@ngx-translate/core'; describe('AppComponent', () => { let servertimeService, translate; diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index a9b404688..6cd6b3a05 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts @@ -1,23 +1,23 @@ -import { Component, ApplicationRef } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; +import { ApplicationRef, Component } from '@angular/core'; +import { Router } from '@angular/router'; -import { take, filter, auditTime } from 'rxjs/operators'; +import { TranslateService } from '@ngx-translate/core'; +import { auditTime, filter, take } from 'rxjs/operators'; import { ConfigService } from './core/ui-services/config.service'; import { ConstantsService } from './core/core-services/constants.service'; import { CountUsersService } from './core/ui-services/count-users.service'; +import { DataStoreUpgradeService } from './core/core-services/data-store-upgrade.service'; import { LoadFontService } from './core/ui-services/load-font.service'; import { LoginDataService } from './core/ui-services/login-data.service'; import { OperatorService } from './core/core-services/operator.service'; -import { ServertimeService } from './core/core-services/servertime.service'; -import { ThemeService } from './core/ui-services/theme.service'; -import { DataStoreUpgradeService } from './core/core-services/data-store-upgrade.service'; -import { PrioritizeService } from './core/core-services/prioritize.service'; import { PingService } from './core/core-services/ping.service'; -import { SpinnerService } from './core/ui-services/spinner.service'; -import { Router } from '@angular/router'; -import { ViewUser } from './site/users/models/view-user'; +import { PrioritizeService } from './core/core-services/prioritize.service'; import { RoutingStateService } from './core/ui-services/routing-state.service'; +import { ServertimeService } from './core/core-services/servertime.service'; +import { SpinnerService } from './core/ui-services/spinner.service'; +import { ThemeService } from './core/ui-services/theme.service'; +import { ViewUser } from './site/users/models/view-user'; /** * Enhance array with own functions @@ -25,7 +25,7 @@ import { RoutingStateService } from './core/ui-services/routing-state.service'; */ declare global { interface Array { - flatMap(o: any): Array; + flatMap(o: any): any[]; } } diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts index 20d00beed..9bc00e7b2 100644 --- a/client/src/app/app.module.ts +++ b/client/src/app/app.module.ts @@ -1,23 +1,20 @@ -// angular modules +import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http'; +import { APP_INITIALIZER, NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { NgModule, APP_INITIALIZER } from '@angular/core'; -import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http'; +import { ServiceWorkerModule } from '@angular/service-worker'; + import { PapaParseModule } from 'ngx-papaparse'; -// Elementary App Components +import { AppLoadService } from './core/core-services/app-load.service'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; -import { LoginModule } from './site/login/login.module'; -import { AppLoadService } from './core/core-services/app-load.service'; -import { SlidesModule } from './slides/slides.module'; -import { OpenSlidesTranslateModule } from './core/translate/openslides-translate-module'; - -// PWA -import { ServiceWorkerModule } from '@angular/service-worker'; import { environment } from '../environments/environment'; import { GlobalSpinnerComponent } from './site/common/components/global-spinner/global-spinner.component'; +import { LoginModule } from './site/login/login.module'; +import { OpenSlidesTranslateModule } from './core/translate/openslides-translate-module'; +import { SlidesModule } from './slides/slides.module'; /** * Returns a function that returns a promis that will be resolved, if all apps are loaded. diff --git a/client/src/app/core/app-config.ts b/client/src/app/core/app-config.ts index b1a9d433f..3f2f84aa7 100644 --- a/client/src/app/core/app-config.ts +++ b/client/src/app/core/app-config.ts @@ -1,10 +1,10 @@ import { Type } from '@angular/core'; -import { ModelConstructor, BaseModel } from '../shared/models/base/base-model'; +import { BaseViewModel, ViewModelConstructor } from 'app/site/base/base-view-model'; +import { BaseModel, ModelConstructor } from '../shared/models/base/base-model'; +import { BaseRepository } from './repositories/base-repository'; import { MainMenuEntry } from './core-services/main-menu.service'; import { Searchable } from '../site/base/searchable'; -import { BaseRepository } from './repositories/base-repository'; -import { BaseViewModel, ViewModelConstructor } from 'app/site/base/base-view-model'; interface BaseModelEntry { collectionString: string; diff --git a/client/src/app/core/core-services/app-load.service.spec.ts b/client/src/app/core/core-services/app-load.service.spec.ts index 9c620678f..111c09cd0 100644 --- a/client/src/app/core/core-services/app-load.service.spec.ts +++ b/client/src/app/core/core-services/app-load.service.spec.ts @@ -1,4 +1,5 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + import { AppLoadService } from './app-load.service'; import { E2EImportsModule } from '../../../e2e-imports.module'; diff --git a/client/src/app/core/core-services/app-load.service.ts b/client/src/app/core/core-services/app-load.service.ts index 804680683..a71cb41f3 100644 --- a/client/src/app/core/core-services/app-load.service.ts +++ b/client/src/app/core/core-services/app-load.service.ts @@ -1,25 +1,25 @@ import { Injectable, Injector } from '@angular/core'; -import { plugins } from '../../../plugins'; -import { CommonAppConfig } from '../../site/common/common.config'; -import { AppConfig, SearchableModelEntry, ModelEntry } from '../app-config'; +import { AgendaAppConfig } from '../../site/agenda/agenda.config'; +import { AppConfig, ModelEntry, SearchableModelEntry } from '../app-config'; +import { BaseRepository } from 'app/core/repositories/base-repository'; +import { HistoryAppConfig } from 'app/site/history/history.config'; +import { ProjectorAppConfig } from 'app/site/projector/projector.config'; +import { TopicsAppConfig } from 'app/site/topics/topics.config'; +import { AssignmentsAppConfig } from '../../site/assignments/assignments.config'; import { CollectionStringMapperService } from './collection-string-mapper.service'; +import { CommonAppConfig } from '../../site/common/common.config'; +import { ConfigAppConfig } from '../../site/config/config.config'; +import { ServicesToLoadOnAppsLoaded } from '../core.module'; +import { MainMenuService } from './main-menu.service'; import { MediafileAppConfig } from '../../site/mediafiles/mediafile.config'; import { MotionsAppConfig } from '../../site/motions/motions.config'; -import { ConfigAppConfig } from '../../site/config/config.config'; -import { AgendaAppConfig } from '../../site/agenda/agenda.config'; -import { AssignmentsAppConfig } from '../../site/assignments/assignments.config'; -import { UsersAppConfig } from '../../site/users/users.config'; -import { TagAppConfig } from '../../site/tags/tag.config'; -import { MainMenuService } from './main-menu.service'; -import { HistoryAppConfig } from 'app/site/history/history.config'; +import { OnAfterAppsLoaded } from '../onAfterAppsLoaded'; +import { plugins } from '../../../plugins'; import { SearchService } from '../ui-services/search.service'; import { isSearchable } from '../../site/base/searchable'; -import { ProjectorAppConfig } from 'app/site/projector/projector.config'; -import { BaseRepository } from 'app/core/repositories/base-repository'; -import { OnAfterAppsLoaded } from '../onAfterAppsLoaded'; -import { ServicesToLoadOnAppsLoaded } from '../core.module'; -import { TopicsAppConfig } from 'app/site/topics/topics.config'; +import { TagAppConfig } from '../../site/tags/tag.config'; +import { UsersAppConfig } from '../../site/users/users.config'; /** * A list of all app configurations of all delivered apps. diff --git a/client/src/app/core/core-services/auth-guard.service.ts b/client/src/app/core/core-services/auth-guard.service.ts index 10eba1a4d..3487b4cab 100644 --- a/client/src/app/core/core-services/auth-guard.service.ts +++ b/client/src/app/core/core-services/auth-guard.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { CanActivate, ActivatedRouteSnapshot, CanActivateChild, Router } from '@angular/router'; +import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, Router } from '@angular/router'; -import { OperatorService } from './operator.service'; import { OpenSlidesService } from './openslides.service'; +import { OperatorService } from './operator.service'; /** * Classical Auth-Guard. Checks if the user has to correct permissions to enter a page, and forwards to login if not. diff --git a/client/src/app/core/core-services/auth.service.spec.ts b/client/src/app/core/core-services/auth.service.spec.ts index ace8870fe..2228d4b3a 100644 --- a/client/src/app/core/core-services/auth.service.spec.ts +++ b/client/src/app/core/core-services/auth.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { AuthService } from './auth.service'; import { E2EImportsModule } from '../../../e2e-imports.module'; diff --git a/client/src/app/core/core-services/auth.service.ts b/client/src/app/core/core-services/auth.service.ts index 02755cc09..887467742 100644 --- a/client/src/app/core/core-services/auth.service.ts +++ b/client/src/app/core/core-services/auth.service.ts @@ -1,11 +1,12 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; -import { OperatorService, WhoAmI } from 'app/core/core-services/operator.service'; import { environment } from 'environments/environment'; -import { OpenSlidesService } from './openslides.service'; -import { HttpService } from './http.service'; + +import { OperatorService, WhoAmI } from 'app/core/core-services/operator.service'; import { DataStoreService } from './data-store.service'; +import { HttpService } from './http.service'; +import { OpenSlidesService } from './openslides.service'; /** * Authenticates an OpenSlides user with username and password diff --git a/client/src/app/core/core-services/autoupdate.service.spec.ts b/client/src/app/core/core-services/autoupdate.service.spec.ts index 2b8de2be9..54e4b9c81 100644 --- a/client/src/app/core/core-services/autoupdate.service.spec.ts +++ b/client/src/app/core/core-services/autoupdate.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { AutoupdateService } from './autoupdate.service'; import { E2EImportsModule } from '../../../e2e-imports.module'; diff --git a/client/src/app/core/core-services/autoupdate.service.ts b/client/src/app/core/core-services/autoupdate.service.ts index 46bc9dc8f..2ff1b4908 100644 --- a/client/src/app/core/core-services/autoupdate.service.ts +++ b/client/src/app/core/core-services/autoupdate.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { WebsocketService, WEBSOCKET_ERROR_CODES } from './websocket.service'; +import { BaseModel } from '../../shared/models/base/base-model'; import { CollectionStringMapperService } from './collection-string-mapper.service'; import { DataStoreService, DataStoreUpdateManagerService } from './data-store.service'; -import { BaseModel } from '../../shared/models/base/base-model'; +import { WEBSOCKET_ERROR_CODES, WebsocketService } from './websocket.service'; interface AutoupdateFormat { /** diff --git a/client/src/app/core/core-services/collection-string-mapper.service.spec.ts b/client/src/app/core/core-services/collection-string-mapper.service.spec.ts index 9a626e707..78e42ef78 100644 --- a/client/src/app/core/core-services/collection-string-mapper.service.spec.ts +++ b/client/src/app/core/core-services/collection-string-mapper.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { E2EImportsModule } from '../../../e2e-imports.module'; import { CollectionStringMapperService } from './collection-string-mapper.service'; +import { E2EImportsModule } from '../../../e2e-imports.module'; describe('CollectionStringMapperService', () => { beforeEach(() => { diff --git a/client/src/app/core/core-services/collection-string-mapper.service.ts b/client/src/app/core/core-services/collection-string-mapper.service.ts index 20f2f7304..b1dab001e 100644 --- a/client/src/app/core/core-services/collection-string-mapper.service.ts +++ b/client/src/app/core/core-services/collection-string-mapper.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { ModelConstructor, BaseModel } from '../../shared/models/base/base-model'; import { BaseRepository } from 'app/core/repositories/base-repository'; -import { ViewModelConstructor, BaseViewModel, TitleInformation } from 'app/site/base/base-view-model'; +import { BaseViewModel, TitleInformation, ViewModelConstructor } from 'app/site/base/base-view-model'; +import { BaseModel, ModelConstructor } from '../../shared/models/base/base-model'; /** * Unifies the ModelConstructor and ViewModelConstructor. diff --git a/client/src/app/core/core-services/constants.service.spec.ts b/client/src/app/core/core-services/constants.service.spec.ts index fe64f02fb..be5e869ad 100644 --- a/client/src/app/core/core-services/constants.service.spec.ts +++ b/client/src/app/core/core-services/constants.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { ConstantsService } from './constants.service'; import { E2EImportsModule } from '../../../e2e-imports.module'; diff --git a/client/src/app/core/core-services/constants.service.ts b/client/src/app/core/core-services/constants.service.ts index 0ca12df7a..58de7dd1f 100644 --- a/client/src/app/core/core-services/constants.service.ts +++ b/client/src/app/core/core-services/constants.service.ts @@ -1,8 +1,9 @@ import { Injectable } from '@angular/core'; -import { WebsocketService } from './websocket.service'; import { Observable, of, Subject } from 'rxjs'; +import { WebsocketService } from './websocket.service'; + /** * constants have a key associated with the data. */ diff --git a/client/src/app/core/core-services/data-send.service.spec.ts b/client/src/app/core/core-services/data-send.service.spec.ts index ab16545ac..7cbbdb228 100644 --- a/client/src/app/core/core-services/data-send.service.spec.ts +++ b/client/src/app/core/core-services/data-send.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { DataSendService } from './data-send.service'; import { E2EImportsModule } from '../../../e2e-imports.module'; diff --git a/client/src/app/core/core-services/data-store-upgrade.service.spec.ts b/client/src/app/core/core-services/data-store-upgrade.service.spec.ts index 091233bfb..87a23df92 100644 --- a/client/src/app/core/core-services/data-store-upgrade.service.spec.ts +++ b/client/src/app/core/core-services/data-store-upgrade.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { E2EImportsModule } from '../../../e2e-imports.module'; import { DataStoreUpgradeService } from './data-store-upgrade.service'; +import { E2EImportsModule } from '../../../e2e-imports.module'; describe('DataStoreUpgradeService', () => { beforeEach(() => { diff --git a/client/src/app/core/core-services/data-store-upgrade.service.ts b/client/src/app/core/core-services/data-store-upgrade.service.ts index f3aad3a75..58eb74766 100644 --- a/client/src/app/core/core-services/data-store-upgrade.service.ts +++ b/client/src/app/core/core-services/data-store-upgrade.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@angular/core'; import { take } from 'rxjs/operators'; -import { ConstantsService } from './constants.service'; import { AutoupdateService } from './autoupdate.service'; +import { ConstantsService } from './constants.service'; import { StorageService } from './storage.service'; const DB_SCHEMA_VERSION = 'DbSchemaVersion'; diff --git a/client/src/app/core/core-services/data-store.service.ts b/client/src/app/core/core-services/data-store.service.ts index 63da25038..bc40264ec 100644 --- a/client/src/app/core/core-services/data-store.service.ts +++ b/client/src/app/core/core-services/data-store.service.ts @@ -1,11 +1,12 @@ -import { Injectable, EventEmitter } from '@angular/core'; +import { EventEmitter, Injectable } from '@angular/core'; + import { Observable, Subject } from 'rxjs'; import { BaseModel, ModelConstructor } from '../../shared/models/base/base-model'; +import { BaseRepository } from '../repositories/base-repository'; import { CollectionStringMapperService } from './collection-string-mapper.service'; import { Deferred } from '../deferred'; import { StorageService } from './storage.service'; -import { BaseRepository } from '../repositories/base-repository'; /** * Represents information about a deleted model. diff --git a/client/src/app/core/core-services/http.service.ts b/client/src/app/core/core-services/http.service.ts index 6c124e726..a6aeccab7 100644 --- a/client/src/app/core/core-services/http.service.ts +++ b/client/src/app/core/core-services/http.service.ts @@ -1,10 +1,10 @@ -import { Injectable } from '@angular/core'; import { HttpClient, HttpErrorResponse, HttpHeaders } from '@angular/common/http'; +import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { formatQueryParams, QueryParams } from '../query-params'; import { OpenSlidesStatusService } from './openslides-status.service'; +import { formatQueryParams, QueryParams } from '../query-params'; /** * Enum for different HTTPMethods diff --git a/client/src/app/core/core-services/main-menu.service.spec.ts b/client/src/app/core/core-services/main-menu.service.spec.ts index 7b6ce8a2c..e28c1e32a 100644 --- a/client/src/app/core/core-services/main-menu.service.spec.ts +++ b/client/src/app/core/core-services/main-menu.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { MainMenuService } from './main-menu.service'; diff --git a/client/src/app/core/core-services/notify.service.spec.ts b/client/src/app/core/core-services/notify.service.spec.ts index 7c8250d01..c66e1de9c 100644 --- a/client/src/app/core/core-services/notify.service.spec.ts +++ b/client/src/app/core/core-services/notify.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { NotifyService } from './notify.service'; import { E2EImportsModule } from '../../../e2e-imports.module'; +import { NotifyService } from './notify.service'; describe('NotifyService', () => { beforeEach(() => { diff --git a/client/src/app/core/core-services/notify.service.ts b/client/src/app/core/core-services/notify.service.ts index 54bce4539..e09ddee7f 100644 --- a/client/src/app/core/core-services/notify.service.ts +++ b/client/src/app/core/core-services/notify.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Subject, Observable } from 'rxjs'; +import { Observable, Subject } from 'rxjs'; -import { WebsocketService } from './websocket.service'; import { OperatorService } from './operator.service'; +import { WebsocketService } from './websocket.service'; /** * Encapslates the name and content of every message regardless of being a request or response. diff --git a/client/src/app/core/core-services/offline.service.spec.ts b/client/src/app/core/core-services/offline.service.spec.ts index 1f0d94aed..f8531b93f 100644 --- a/client/src/app/core/core-services/offline.service.spec.ts +++ b/client/src/app/core/core-services/offline.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { OfflineService } from './offline.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('OfflineService', () => { beforeEach(() => { diff --git a/client/src/app/core/core-services/offline.service.ts b/client/src/app/core/core-services/offline.service.ts index 71ac6af68..9af961e4a 100644 --- a/client/src/app/core/core-services/offline.service.ts +++ b/client/src/app/core/core-services/offline.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; + import { WebsocketService } from './websocket.service'; /** diff --git a/client/src/app/core/core-services/openslides-status.service.spec.ts b/client/src/app/core/core-services/openslides-status.service.spec.ts index aae2d5e9b..06638ae25 100644 --- a/client/src/app/core/core-services/openslides-status.service.spec.ts +++ b/client/src/app/core/core-services/openslides-status.service.spec.ts @@ -1,6 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { OpenSlidesStatusService } from './openslides-status.service'; describe('OpenSlidesStatusService', () => { diff --git a/client/src/app/core/core-services/openslides.service.spec.ts b/client/src/app/core/core-services/openslides.service.spec.ts index 972373b2f..e2e08abe2 100644 --- a/client/src/app/core/core-services/openslides.service.spec.ts +++ b/client/src/app/core/core-services/openslides.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { OpenSlidesService } from './openslides.service'; import { E2EImportsModule } from '../../../e2e-imports.module'; +import { OpenSlidesService } from './openslides.service'; describe('OpenSlidesService', () => { beforeEach(() => { diff --git a/client/src/app/core/core-services/openslides.service.ts b/client/src/app/core/core-services/openslides.service.ts index addaee317..c3c958bda 100644 --- a/client/src/app/core/core-services/openslides.service.ts +++ b/client/src/app/core/core-services/openslides.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; -import { WebsocketService } from './websocket.service'; -import { OperatorService } from './operator.service'; -import { StorageService } from './storage.service'; import { AutoupdateService } from './autoupdate.service'; -import { DataStoreService } from './data-store.service'; import { ConstantsService } from './constants.service'; import { DataStoreUpgradeService } from './data-store-upgrade.service'; +import { DataStoreService } from './data-store.service'; +import { OperatorService } from './operator.service'; +import { StorageService } from './storage.service'; +import { WebsocketService } from './websocket.service'; /** * Handles the bootup/showdown of this application. diff --git a/client/src/app/core/core-services/operator.service.spec.ts b/client/src/app/core/core-services/operator.service.spec.ts index 50c1757bf..6115dd5fc 100644 --- a/client/src/app/core/core-services/operator.service.spec.ts +++ b/client/src/app/core/core-services/operator.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { OperatorService } from './operator.service'; import { E2EImportsModule } from '../../../e2e-imports.module'; +import { OperatorService } from './operator.service'; describe('OperatorService', () => { beforeEach(() => { diff --git a/client/src/app/core/core-services/operator.service.ts b/client/src/app/core/core-services/operator.service.ts index e1e9b8ba6..16bf9a6fc 100644 --- a/client/src/app/core/core-services/operator.service.ts +++ b/client/src/app/core/core-services/operator.service.ts @@ -1,21 +1,21 @@ import { Injectable } from '@angular/core'; -import { Observable, BehaviorSubject, Subscription } from 'rxjs'; +import { environment } from 'environments/environment'; +import { BehaviorSubject, Observable, Subscription } from 'rxjs'; +import { auditTime, filter } from 'rxjs/operators'; import { Group } from 'app/shared/models/users/group'; -import { User } from '../../shared/models/users/user'; -import { environment } from 'environments/environment'; +import { ViewUser } from 'app/site/users/models/view-user'; +import { CollectionStringMapperService } from './collection-string-mapper.service'; import { DataStoreService } from './data-store.service'; import { Deferred } from '../deferred'; -import { OfflineService } from './offline.service'; -import { OpenSlidesStatusService } from './openslides-status.service'; -import { ViewUser } from 'app/site/users/models/view-user'; -import { OnAfterAppsLoaded } from '../onAfterAppsLoaded'; -import { UserRepositoryService } from '../repositories/users/user-repository.service'; -import { CollectionStringMapperService } from './collection-string-mapper.service'; -import { StorageService } from './storage.service'; import { HttpService } from './http.service'; -import { filter, auditTime } from 'rxjs/operators'; +import { OfflineService } from './offline.service'; +import { OnAfterAppsLoaded } from '../onAfterAppsLoaded'; +import { OpenSlidesStatusService } from './openslides-status.service'; +import { StorageService } from './storage.service'; +import { User } from '../../shared/models/users/user'; +import { UserRepositoryService } from '../repositories/users/user-repository.service'; /** * Permissions on the client are just strings. This makes clear, that diff --git a/client/src/app/core/core-services/ping.service.spec.ts b/client/src/app/core/core-services/ping.service.spec.ts index c9121d692..39e2e713f 100644 --- a/client/src/app/core/core-services/ping.service.spec.ts +++ b/client/src/app/core/core-services/ping.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from '../../../e2e-imports.module'; import { PingService } from './ping.service'; diff --git a/client/src/app/core/core-services/ping.service.ts b/client/src/app/core/core-services/ping.service.ts index c2872afb5..fd770edb9 100644 --- a/client/src/app/core/core-services/ping.service.ts +++ b/client/src/app/core/core-services/ping.service.ts @@ -1,11 +1,11 @@ -import { Injectable, ApplicationRef } from '@angular/core'; +import { ApplicationRef, Injectable } from '@angular/core'; import { first, take } from 'rxjs/operators'; -import { WebsocketService } from './websocket.service'; -import { TimeoutPromise } from '../timeout-promise'; import { ConstantsService } from './constants.service'; import { Deferred } from '../deferred'; +import { TimeoutPromise } from '../timeout-promise'; +import { WebsocketService } from './websocket.service'; interface OpenSlidesSettings { PING_INTERVAL?: number; diff --git a/client/src/app/core/core-services/prioritize.service.spec.ts b/client/src/app/core/core-services/prioritize.service.spec.ts index 764290a72..08b34266c 100644 --- a/client/src/app/core/core-services/prioritize.service.spec.ts +++ b/client/src/app/core/core-services/prioritize.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { PrioritizeService } from './prioritize.service'; import { E2EImportsModule } from '../../../e2e-imports.module'; +import { PrioritizeService } from './prioritize.service'; describe('PrioritizeService', () => { beforeEach(() => { diff --git a/client/src/app/core/core-services/prioritize.service.ts b/client/src/app/core/core-services/prioritize.service.ts index 41c95c77e..a4bcf744d 100644 --- a/client/src/app/core/core-services/prioritize.service.ts +++ b/client/src/app/core/core-services/prioritize.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; -import { WebsocketService } from './websocket.service'; import { ConstantsService } from './constants.service'; +import { DataStoreService } from './data-store.service'; import { OpenSlidesStatusService } from './openslides-status.service'; import { OperatorService } from './operator.service'; -import { DataStoreService } from './data-store.service'; +import { WebsocketService } from './websocket.service'; interface OpenSlidesSettings { PRIORITIZED_GROUP_IDS?: number[]; diff --git a/client/src/app/core/core-services/projector-data.service.spec.ts b/client/src/app/core/core-services/projector-data.service.spec.ts index 2af4f63ba..a810375e9 100644 --- a/client/src/app/core/core-services/projector-data.service.spec.ts +++ b/client/src/app/core/core-services/projector-data.service.spec.ts @@ -1,4 +1,5 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + import { E2EImportsModule } from '../../../e2e-imports.module'; import { ProjectorDataService } from './projector-data.service'; diff --git a/client/src/app/core/core-services/projector-data.service.ts b/client/src/app/core/core-services/projector-data.service.ts index ab5a4d6a2..237bdc8e1 100644 --- a/client/src/app/core/core-services/projector-data.service.ts +++ b/client/src/app/core/core-services/projector-data.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; -import { Observable, BehaviorSubject, Subject } from 'rxjs'; +import { BehaviorSubject, Observable, Subject } from 'rxjs'; +import { auditTime } from 'rxjs/operators'; import { WebsocketService } from 'app/core/core-services/websocket.service'; -import { ProjectorElement, Projector } from 'app/shared/models/core/projector'; -import { auditTime } from 'rxjs/operators'; +import { Projector, ProjectorElement } from 'app/shared/models/core/projector'; export interface SlideData { data: T; diff --git a/client/src/app/core/core-services/projector.service.spec.ts b/client/src/app/core/core-services/projector.service.spec.ts index b9c04e830..457ec5aec 100644 --- a/client/src/app/core/core-services/projector.service.spec.ts +++ b/client/src/app/core/core-services/projector.service.spec.ts @@ -1,6 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { ProjectorService } from './projector.service'; describe('ProjectorService', () => { diff --git a/client/src/app/core/core-services/projector.service.ts b/client/src/app/core/core-services/projector.service.ts index 4e958b5b0..5982833d6 100644 --- a/client/src/app/core/core-services/projector.service.ts +++ b/client/src/app/core/core-services/projector.service.ts @@ -2,28 +2,28 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { BaseModel } from 'app/shared/models/base/base-model'; +import { ProjectionDefault } from 'app/shared/models/core/projection-default'; import { - Projectable, - ProjectorElementBuildDeskriptor, - isProjectable, - isProjectorElementBuildDeskriptor -} from 'app/site/base/projectable'; -import { DataStoreService } from './data-store.service'; -import { + elementIdentifies, + IdentifiableProjectorElement, Projector, ProjectorElement, - ProjectorElements, - IdentifiableProjectorElement, - elementIdentifies + ProjectorElements } from 'app/shared/models/core/projector'; -import { HttpService } from './http.service'; -import { SlideManager } from 'app/slides/services/slide-manager.service'; -import { BaseModel } from 'app/shared/models/base/base-model'; -import { ViewModelStoreService } from './view-model-store.service'; import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model'; +import { + isProjectable, + isProjectorElementBuildDeskriptor, + Projectable, + ProjectorElementBuildDeskriptor +} from 'app/site/base/projectable'; +import { SlideManager } from 'app/slides/services/slide-manager.service'; import { ConfigService } from '../ui-services/config.service'; +import { DataStoreService } from './data-store.service'; +import { HttpService } from './http.service'; import { ProjectorDataService } from './projector-data.service'; -import { ProjectionDefault } from 'app/shared/models/core/projection-default'; +import { ViewModelStoreService } from './view-model-store.service'; /** * This service cares about Projectables being projected and manage all projection-related diff --git a/client/src/app/core/core-services/pwa.service.spec.ts b/client/src/app/core/core-services/pwa.service.spec.ts index de53e7233..fba8dcb1e 100644 --- a/client/src/app/core/core-services/pwa.service.spec.ts +++ b/client/src/app/core/core-services/pwa.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { PwaService } from './pwa.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('PwaService', () => { beforeEach(() => diff --git a/client/src/app/core/core-services/servertime.service.spec.ts b/client/src/app/core/core-services/servertime.service.spec.ts index 2e94c5a48..dab68fed8 100644 --- a/client/src/app/core/core-services/servertime.service.spec.ts +++ b/client/src/app/core/core-services/servertime.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from '../../../e2e-imports.module'; import { ServertimeService } from './servertime.service'; diff --git a/client/src/app/core/core-services/servertime.service.ts b/client/src/app/core/core-services/servertime.service.ts index aaa7a7d0b..79273b92e 100644 --- a/client/src/app/core/core-services/servertime.service.ts +++ b/client/src/app/core/core-services/servertime.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; +import { environment } from 'environments/environment.prod'; import { BehaviorSubject, Observable } from 'rxjs'; import { HttpService } from './http.service'; -import { environment } from 'environments/environment.prod'; /** * This service provides the timeoffset to the server and a user of this service diff --git a/client/src/app/core/core-services/storage.service.spec.ts b/client/src/app/core/core-services/storage.service.spec.ts index 6181f407c..996cffb71 100644 --- a/client/src/app/core/core-services/storage.service.spec.ts +++ b/client/src/app/core/core-services/storage.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { StorageService } from './storage.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('StorageService', () => { beforeEach(() => { diff --git a/client/src/app/core/core-services/time-travel.service.spec.ts b/client/src/app/core/core-services/time-travel.service.spec.ts index a02eee565..4ca042ce4 100644 --- a/client/src/app/core/core-services/time-travel.service.spec.ts +++ b/client/src/app/core/core-services/time-travel.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { TimeTravelService } from './time-travel.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { TimeTravelService } from './time-travel.service'; + describe('TimeTravelService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/core/core-services/time-travel.service.ts b/client/src/app/core/core-services/time-travel.service.ts index 08c96133c..c2f42fd67 100644 --- a/client/src/app/core/core-services/time-travel.service.ts +++ b/client/src/app/core/core-services/time-travel.service.ts @@ -1,14 +1,15 @@ import { Injectable } from '@angular/core'; import { environment } from 'environments/environment'; -import { CollectionStringMapperService } from './collection-string-mapper.service'; -import { History } from 'app/shared/models/core/history'; -import { DataStoreService, DataStoreUpdateManagerService } from './data-store.service'; -import { WebsocketService } from './websocket.service'; + import { BaseModel } from 'app/shared/models/base/base-model'; +import { History } from 'app/shared/models/core/history'; +import { CollectionStringMapperService } from './collection-string-mapper.service'; +import { DataStoreService, DataStoreUpdateManagerService } from './data-store.service'; +import { HttpService } from './http.service'; import { OpenSlidesStatusService } from './openslides-status.service'; import { OpenSlidesService } from './openslides.service'; -import { HttpService } from './http.service'; +import { WebsocketService } from './websocket.service'; /** * Interface for full history data objects. diff --git a/client/src/app/core/core-services/view-model-store.service.spec.ts b/client/src/app/core/core-services/view-model-store.service.spec.ts index 73284ca13..581c802eb 100644 --- a/client/src/app/core/core-services/view-model-store.service.spec.ts +++ b/client/src/app/core/core-services/view-model-store.service.spec.ts @@ -1,6 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; -import { ViewModelStoreService } from './view-model-store.service'; +import { inject, TestBed } from '@angular/core/testing'; + import { E2EImportsModule } from '../../../e2e-imports.module'; +import { ViewModelStoreService } from './view-model-store.service'; describe('ViewModelStoreService', () => { beforeEach(() => { diff --git a/client/src/app/core/core-services/view-model-store.service.ts b/client/src/app/core/core-services/view-model-store.service.ts index 9dc19be41..27ab075df 100644 --- a/client/src/app/core/core-services/view-model-store.service.ts +++ b/client/src/app/core/core-services/view-model-store.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { CollectionStringMapperService } from './collection-string-mapper.service'; + import { BaseViewModel, ViewModelConstructor } from 'app/site/base/base-view-model'; import { BaseRepository } from '../repositories/base-repository'; +import { CollectionStringMapperService } from './collection-string-mapper.service'; /** * This service takes care of handling view models. diff --git a/client/src/app/core/core-services/websocket.service.spec.ts b/client/src/app/core/core-services/websocket.service.spec.ts index 4bf7316e4..887ef988f 100644 --- a/client/src/app/core/core-services/websocket.service.spec.ts +++ b/client/src/app/core/core-services/websocket.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { WebsocketService } from './websocket.service'; import { E2EImportsModule } from '../../../e2e-imports.module'; +import { WebsocketService } from './websocket.service'; describe('WebsocketService', () => { beforeEach(() => { diff --git a/client/src/app/core/core-services/websocket.service.ts b/client/src/app/core/core-services/websocket.service.ts index 13c7b6df9..582031b5e 100644 --- a/client/src/app/core/core-services/websocket.service.ts +++ b/client/src/app/core/core-services/websocket.service.ts @@ -1,15 +1,15 @@ -import { Injectable, NgZone, EventEmitter } from '@angular/core'; +import { EventEmitter, Injectable, NgZone } from '@angular/core'; import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; +import { compress, decompress } from 'lz4js'; import { Observable, Subject } from 'rxjs'; import { take } from 'rxjs/operators'; -import { compress, decompress } from 'lz4js'; import { TextDecoder, TextEncoder } from 'text-encoding'; -import { formatQueryParams, QueryParams } from '../query-params'; import { OpenSlidesStatusService } from './openslides-status.service'; +import { formatQueryParams, QueryParams } from '../query-params'; /** * The generic message format in which messages are send and recieved by the server. diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts index 031a4140a..acbfdd456 100644 --- a/client/src/app/core/core.module.ts +++ b/client/src/app/core/core.module.ts @@ -1,14 +1,12 @@ -import { NgModule, Optional, SkipSelf, Type } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule, Optional, SkipSelf, Type } from '@angular/core'; import { Title } from '@angular/platform-browser'; -// Shared Components -import { PromptDialogComponent } from '../shared/components/prompt-dialog/prompt-dialog.component'; -import { ChoiceDialogComponent } from '../shared/components/choice-dialog/choice-dialog.component'; import { ProjectionDialogComponent } from 'app/shared/components/projection-dialog/projection-dialog.component'; - -import { OperatorService } from './core-services/operator.service'; +import { ChoiceDialogComponent } from '../shared/components/choice-dialog/choice-dialog.component'; import { OnAfterAppsLoaded } from './onAfterAppsLoaded'; +import { OperatorService } from './core-services/operator.service'; +import { PromptDialogComponent } from '../shared/components/prompt-dialog/prompt-dialog.component'; export const ServicesToLoadOnAppsLoaded: Type[] = [OperatorService]; diff --git a/client/src/app/core/repositories/agenda/item-repository.service.spec.ts b/client/src/app/core/repositories/agenda/item-repository.service.spec.ts index 7b99f19d3..e6154697e 100644 --- a/client/src/app/core/repositories/agenda/item-repository.service.spec.ts +++ b/client/src/app/core/repositories/agenda/item-repository.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { ItemRepositoryService } from './item-repository.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('ItemRepositoryService', () => { beforeEach(() => { diff --git a/client/src/app/core/repositories/agenda/item-repository.service.ts b/client/src/app/core/repositories/agenda/item-repository.service.ts index a522e6571..40d058bb5 100644 --- a/client/src/app/core/repositories/agenda/item-repository.service.ts +++ b/client/src/app/core/repositories/agenda/item-repository.service.ts @@ -2,28 +2,28 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; -import { ConfigService } from 'app/core/ui-services/config.service'; import { DataSendService } from 'app/core/core-services/data-send.service'; -import { DataStoreService } from '../../core-services/data-store.service'; import { HttpService } from 'app/core/core-services/http.service'; -import { Item } from 'app/shared/models/agenda/item'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; import { TreeIdNode } from 'app/core/ui-services/tree.service'; -import { ViewItem, ItemTitleInformation } from 'app/site/agenda/models/view-item'; +import { Item } from 'app/shared/models/agenda/item'; +import { Identifiable } from 'app/shared/models/base/identifiable'; +import { ItemTitleInformation, ViewItem } from 'app/site/agenda/models/view-item'; +import { ViewAssignment } from 'app/site/assignments/models/view-assignment'; import { BaseViewModelWithAgendaItem, - isBaseViewModelWithAgendaItem, - IBaseViewModelWithAgendaItem + IBaseViewModelWithAgendaItem, + isBaseViewModelWithAgendaItem } from 'app/site/base/base-view-model-with-agenda-item'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; -import { BaseIsAgendaItemContentObjectRepository } from '../base-is-agenda-item-content-object-repository'; -import { BaseHasContentObjectRepository, GenericRelationDefinition } from '../base-has-content-object-repository'; -import { Identifiable } from 'app/shared/models/base/identifiable'; -import { RelationDefinition } from '../base-repository'; import { ViewMotion } from 'app/site/motions/models/view-motion'; import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block'; import { ViewTopic } from 'app/site/topics/models/view-topic'; -import { ViewAssignment } from 'app/site/assignments/models/view-assignment'; +import { BaseHasContentObjectRepository, GenericRelationDefinition } from '../base-has-content-object-repository'; +import { BaseIsAgendaItemContentObjectRepository } from '../base-is-agenda-item-content-object-repository'; +import { RelationDefinition } from '../base-repository'; +import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; +import { DataStoreService } from '../../core-services/data-store.service'; const ItemRelations: (RelationDefinition | GenericRelationDefinition)[] = [ { diff --git a/client/src/app/core/repositories/agenda/list-of-speakers-repository.service.spec.ts b/client/src/app/core/repositories/agenda/list-of-speakers-repository.service.spec.ts index 2a6616665..218953bf6 100644 --- a/client/src/app/core/repositories/agenda/list-of-speakers-repository.service.spec.ts +++ b/client/src/app/core/repositories/agenda/list-of-speakers-repository.service.spec.ts @@ -1,6 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { ListOfSpeakersRepositoryService } from './list-of-speakers-repository.service'; describe('ListOfSpeakersRepositoryService', () => { diff --git a/client/src/app/core/repositories/agenda/list-of-speakers-repository.service.ts b/client/src/app/core/repositories/agenda/list-of-speakers-repository.service.ts index 316cf2839..5454edc66 100644 --- a/client/src/app/core/repositories/agenda/list-of-speakers-repository.service.ts +++ b/client/src/app/core/repositories/agenda/list-of-speakers-repository.service.ts @@ -2,29 +2,29 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; import { DataSendService } from 'app/core/core-services/data-send.service'; -import { DataStoreService } from '../../core-services/data-store.service'; +import { HttpService } from 'app/core/core-services/http.service'; import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; -import { ViewListOfSpeakers, ListOfSpeakersTitleInformation } from 'app/site/agenda/models/view-list-of-speakers'; import { ListOfSpeakers } from 'app/shared/models/agenda/list-of-speakers'; +import { Identifiable } from 'app/shared/models/base/identifiable'; +import { ListOfSpeakersTitleInformation, ViewListOfSpeakers } from 'app/site/agenda/models/view-list-of-speakers'; +import { ViewSpeaker } from 'app/site/agenda/models/view-speaker'; +import { ViewAssignment } from 'app/site/assignments/models/view-assignment'; import { BaseViewModelWithListOfSpeakers, isBaseViewModelWithListOfSpeakers } from 'app/site/base/base-view-model-with-list-of-speakers'; -import { ViewSpeaker } from 'app/site/agenda/models/view-speaker'; -import { Identifiable } from 'app/shared/models/base/identifiable'; -import { HttpService } from 'app/core/core-services/http.service'; -import { BaseIsListOfSpeakersContentObjectRepository } from '../base-is-list-of-speakers-content-object-repository'; -import { BaseHasContentObjectRepository, GenericRelationDefinition } from '../base-has-content-object-repository'; -import { ItemRepositoryService } from './item-repository.service'; +import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; import { ViewMotion } from 'app/site/motions/models/view-motion'; -import { RelationDefinition } from '../base-repository'; import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block'; import { ViewTopic } from 'app/site/topics/models/view-topic'; -import { ViewAssignment } from 'app/site/assignments/models/view-assignment'; -import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; import { ViewUser } from 'app/site/users/models/view-user'; +import { BaseHasContentObjectRepository, GenericRelationDefinition } from '../base-has-content-object-repository'; +import { BaseIsListOfSpeakersContentObjectRepository } from '../base-is-list-of-speakers-content-object-repository'; +import { RelationDefinition } from '../base-repository'; +import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; +import { DataStoreService } from '../../core-services/data-store.service'; +import { ItemRepositoryService } from './item-repository.service'; const ListOfSpeakersRelations: (RelationDefinition | GenericRelationDefinition)[] = [ { diff --git a/client/src/app/core/repositories/assignments/assignment-repository.service.spec.ts b/client/src/app/core/repositories/assignments/assignment-repository.service.spec.ts index 97f1dcb96..b5aff88a3 100644 --- a/client/src/app/core/repositories/assignments/assignment-repository.service.spec.ts +++ b/client/src/app/core/repositories/assignments/assignment-repository.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { AssignmentRepositoryService } from './assignment-repository.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { AssignmentRepositoryService } from './assignment-repository.service'; + describe('AssignmentRepositoryService', () => { beforeEach(() => TestBed.configureTestingModule({ imports: [E2EImportsModule] })); diff --git a/client/src/app/core/repositories/assignments/assignment-repository.service.ts b/client/src/app/core/repositories/assignments/assignment-repository.service.ts index c18e8593d..fdde87fa9 100644 --- a/client/src/app/core/repositories/assignments/assignment-repository.service.ts +++ b/client/src/app/core/repositories/assignments/assignment-repository.service.ts @@ -2,22 +2,22 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Assignment } from 'app/shared/models/assignments/assignment'; -import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; import { DataSendService } from 'app/core/core-services/data-send.service'; -import { DataStoreService } from '../../core-services/data-store.service'; import { HttpService } from 'app/core/core-services/http.service'; -import { AssignmentPoll } from 'app/shared/models/assignments/assignment-poll'; -import { ViewAssignment, AssignmentTitleInformation } from 'app/site/assignments/models/view-assignment'; import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { Assignment } from 'app/shared/models/assignments/assignment'; +import { AssignmentPoll } from 'app/shared/models/assignments/assignment-poll'; +import { AssignmentTitleInformation, ViewAssignment } from 'app/site/assignments/models/view-assignment'; +import { ViewAssignmentPoll } from 'app/site/assignments/models/view-assignment-poll'; +import { ViewAssignmentPollOption } from 'app/site/assignments/models/view-assignment-poll-option'; +import { ViewAssignmentRelatedUser } from 'app/site/assignments/models/view-assignment-related-user'; +import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; import { ViewTag } from 'app/site/tags/models/view-tag'; import { ViewUser } from 'app/site/users/models/view-user'; -import { ViewAssignmentRelatedUser } from 'app/site/assignments/models/view-assignment-related-user'; -import { ViewAssignmentPoll } from 'app/site/assignments/models/view-assignment-poll'; import { BaseIsAgendaItemAndListOfSpeakersContentObjectRepository } from '../base-is-agenda-item-and-list-of-speakers-content-object-repository'; import { RelationDefinition } from '../base-repository'; -import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; -import { ViewAssignmentPollOption } from 'app/site/assignments/models/view-assignment-poll-option'; +import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; +import { DataStoreService } from '../../core-services/data-store.service'; const AssignmentRelations: RelationDefinition[] = [ { diff --git a/client/src/app/core/repositories/base-has-content-object-repository.ts b/client/src/app/core/repositories/base-has-content-object-repository.ts index e3ff9845e..97c0e7fa8 100644 --- a/client/src/app/core/repositories/base-has-content-object-repository.ts +++ b/client/src/app/core/repositories/base-has-content-object-repository.ts @@ -1,14 +1,15 @@ -import { BaseRepository, RelationDefinition } from './base-repository'; +import { TranslateService } from '@ngx-translate/core'; + +import { ModelConstructor } from 'app/shared/models/base/base-model'; import { BaseModelWithContentObject } from 'app/shared/models/base/base-model-with-content-object'; -import { BaseViewModelWithContentObject } from 'app/site/base/base-view-model-with-content-object'; import { ContentObject } from 'app/shared/models/base/content-object'; import { BaseViewModel, TitleInformation, ViewModelConstructor } from 'app/site/base/base-view-model'; -import { DataStoreService } from '../core-services/data-store.service'; -import { DataSendService } from '../core-services/data-send.service'; +import { BaseViewModelWithContentObject } from 'app/site/base/base-view-model-with-content-object'; +import { BaseRepository, RelationDefinition } from './base-repository'; import { CollectionStringMapperService } from '../core-services/collection-string-mapper.service'; +import { DataSendService } from '../core-services/data-send.service'; +import { DataStoreService } from '../core-services/data-store.service'; import { ViewModelStoreService } from '../core-services/view-model-store.service'; -import { TranslateService } from '@ngx-translate/core'; -import { ModelConstructor } from 'app/shared/models/base/base-model'; /** * A generic relation for models with a content_object diff --git a/client/src/app/core/repositories/base-is-agenda-item-and-list-of-speakers-content-object-repository.ts b/client/src/app/core/repositories/base-is-agenda-item-and-list-of-speakers-content-object-repository.ts index 5e8fd43bb..056926745 100644 --- a/client/src/app/core/repositories/base-is-agenda-item-and-list-of-speakers-content-object-repository.ts +++ b/client/src/app/core/repositories/base-is-agenda-item-and-list-of-speakers-content-object-repository.ts @@ -1,27 +1,27 @@ import { TranslateService } from '@ngx-translate/core'; -import { BaseModel, ModelConstructor } from '../../shared/models/base/base-model'; -import { BaseRepository, RelationDefinition } from './base-repository'; -import { - isBaseIsAgendaItemContentObjectRepository, - IBaseIsAgendaItemContentObjectRepository -} from './base-is-agenda-item-content-object-repository'; -import { - isBaseIsListOfSpeakersContentObjectRepository, - IBaseIsListOfSpeakersContentObjectRepository -} from './base-is-list-of-speakers-content-object-repository'; -import { DataStoreService } from '../core-services/data-store.service'; -import { DataSendService } from '../core-services/data-send.service'; -import { ViewModelStoreService } from '../core-services/view-model-store.service'; -import { CollectionStringMapperService } from '../core-services/collection-string-mapper.service'; -import { - TitleInformationWithAgendaItem, - IBaseViewModelWithAgendaItem -} from 'app/site/base/base-view-model-with-agenda-item'; -import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model'; -import { IBaseViewModelWithListOfSpeakers } from 'app/site/base/base-view-model-with-list-of-speakers'; +import { BaseModel, ModelConstructor } from 'app/shared/models/base/base-model'; import { ViewItem } from 'app/site/agenda/models/view-item'; import { ViewListOfSpeakers } from 'app/site/agenda/models/view-list-of-speakers'; +import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model'; +import { + IBaseViewModelWithAgendaItem, + TitleInformationWithAgendaItem +} from 'app/site/base/base-view-model-with-agenda-item'; +import { IBaseViewModelWithListOfSpeakers } from 'app/site/base/base-view-model-with-list-of-speakers'; +import { + IBaseIsAgendaItemContentObjectRepository, + isBaseIsAgendaItemContentObjectRepository +} from './base-is-agenda-item-content-object-repository'; +import { + IBaseIsListOfSpeakersContentObjectRepository, + isBaseIsListOfSpeakersContentObjectRepository +} from './base-is-list-of-speakers-content-object-repository'; +import { BaseRepository, RelationDefinition } from './base-repository'; +import { CollectionStringMapperService } from '../core-services/collection-string-mapper.service'; +import { DataSendService } from '../core-services/data-send.service'; +import { DataStoreService } from '../core-services/data-store.service'; +import { ViewModelStoreService } from '../core-services/view-model-store.service'; export function isBaseIsAgendaItemAndListOfSpeakersContentObjectRepository( obj: any diff --git a/client/src/app/core/repositories/base-is-agenda-item-content-object-repository.ts b/client/src/app/core/repositories/base-is-agenda-item-content-object-repository.ts index 5c90bef62..af90b4cb6 100644 --- a/client/src/app/core/repositories/base-is-agenda-item-content-object-repository.ts +++ b/client/src/app/core/repositories/base-is-agenda-item-content-object-repository.ts @@ -1,16 +1,16 @@ import { TranslateService } from '@ngx-translate/core'; +import { ViewItem } from 'app/site/agenda/models/view-item'; +import { + BaseViewModelWithAgendaItem, + TitleInformationWithAgendaItem +} from 'app/site/base/base-view-model-with-agenda-item'; import { BaseModel, ModelConstructor } from '../../shared/models/base/base-model'; +import { BaseRepository, RelationDefinition } from './base-repository'; import { CollectionStringMapperService } from '../core-services/collection-string-mapper.service'; import { DataSendService } from '../core-services/data-send.service'; -import { BaseRepository, RelationDefinition } from './base-repository'; import { DataStoreService } from '../core-services/data-store.service'; import { ViewModelStoreService } from '../core-services/view-model-store.service'; -import { - TitleInformationWithAgendaItem, - BaseViewModelWithAgendaItem -} from 'app/site/base/base-view-model-with-agenda-item'; -import { ViewItem } from 'app/site/agenda/models/view-item'; export function isBaseIsAgendaItemContentObjectRepository( obj: any diff --git a/client/src/app/core/repositories/base-is-list-of-speakers-content-object-repository.ts b/client/src/app/core/repositories/base-is-list-of-speakers-content-object-repository.ts index 5a351a4d7..f552381db 100644 --- a/client/src/app/core/repositories/base-is-list-of-speakers-content-object-repository.ts +++ b/client/src/app/core/repositories/base-is-list-of-speakers-content-object-repository.ts @@ -1,14 +1,14 @@ import { TranslateService } from '@ngx-translate/core'; -import { TitleInformation } from '../../site/base/base-view-model'; +import { ViewListOfSpeakers } from 'app/site/agenda/models/view-list-of-speakers'; +import { BaseViewModelWithListOfSpeakers } from 'app/site/base/base-view-model-with-list-of-speakers'; import { BaseModel, ModelConstructor } from '../../shared/models/base/base-model'; import { BaseRepository, RelationDefinition } from './base-repository'; -import { DataStoreService } from '../core-services/data-store.service'; -import { DataSendService } from '../core-services/data-send.service'; +import { TitleInformation } from '../../site/base/base-view-model'; import { CollectionStringMapperService } from '../core-services/collection-string-mapper.service'; +import { DataSendService } from '../core-services/data-send.service'; +import { DataStoreService } from '../core-services/data-store.service'; import { ViewModelStoreService } from '../core-services/view-model-store.service'; -import { BaseViewModelWithListOfSpeakers } from 'app/site/base/base-view-model-with-list-of-speakers'; -import { ViewListOfSpeakers } from 'app/site/agenda/models/view-list-of-speakers'; export function isBaseIsListOfSpeakersContentObjectRepository( obj: any diff --git a/client/src/app/core/repositories/base-repository.ts b/client/src/app/core/repositories/base-repository.ts index ecdeb590b..3a2f577fb 100644 --- a/client/src/app/core/repositories/base-repository.ts +++ b/client/src/app/core/repositories/base-repository.ts @@ -1,16 +1,16 @@ +import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, Observable, Subject } from 'rxjs'; import { auditTime } from 'rxjs/operators'; -import { TranslateService } from '@ngx-translate/core'; -import { BaseViewModel, TitleInformation, ViewModelConstructor } from '../../site/base/base-view-model'; +import { Collection } from 'app/shared/models/base/collection'; import { BaseModel, ModelConstructor } from '../../shared/models/base/base-model'; +import { BaseViewModel, TitleInformation, ViewModelConstructor } from '../../site/base/base-view-model'; import { CollectionStringMapperService } from '../core-services/collection-string-mapper.service'; import { DataSendService } from '../core-services/data-send.service'; -import { DataStoreService, CollectionIds } from '../core-services/data-store.service'; +import { CollectionIds, DataStoreService } from '../core-services/data-store.service'; import { Identifiable } from '../../shared/models/base/identifiable'; -import { ViewModelStoreService } from '../core-services/view-model-store.service'; import { OnAfterAppsLoaded } from '../onAfterAppsLoaded'; -import { Collection } from 'app/shared/models/base/collection'; +import { ViewModelStoreService } from '../core-services/view-model-store.service'; // All "standard" relations. export type RelationDefinition = diff --git a/client/src/app/core/repositories/config/config-repository.service.spec.ts b/client/src/app/core/repositories/config/config-repository.service.spec.ts index 978ab6abd..9cc74183d 100644 --- a/client/src/app/core/repositories/config/config-repository.service.spec.ts +++ b/client/src/app/core/repositories/config/config-repository.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { ConfigRepositoryService } from './config-repository.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('ConfigRepositoryService', () => { beforeEach(() => { diff --git a/client/src/app/core/repositories/config/config-repository.service.ts b/client/src/app/core/repositories/config/config-repository.service.ts index 51e2d63d9..99ac54c85 100644 --- a/client/src/app/core/repositories/config/config-repository.service.ts +++ b/client/src/app/core/repositories/config/config-repository.service.ts @@ -1,18 +1,18 @@ import { Injectable } from '@angular/core'; -import { Observable, BehaviorSubject } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; +import { BehaviorSubject, Observable } from 'rxjs'; -import { BaseRepository } from 'app/core/repositories/base-repository'; -import { Config } from 'app/shared/models/core/config'; +import { CollectionStringMapperService } from 'app/core/core-services/collection-string-mapper.service'; +import { ConstantsService } from 'app/core/core-services/constants.service'; import { DataSendService } from 'app/core/core-services/data-send.service'; import { DataStoreService } from 'app/core/core-services/data-store.service'; -import { ConstantsService } from 'app/core/core-services/constants.service'; import { HttpService } from 'app/core/core-services/http.service'; -import { Identifiable } from 'app/shared/models/base/identifiable'; -import { CollectionStringMapperService } from 'app/core/core-services/collection-string-mapper.service'; import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; -import { ViewConfig, ConfigTitleInformation } from 'app/site/config/models/view-config'; +import { BaseRepository } from 'app/core/repositories/base-repository'; +import { Identifiable } from 'app/shared/models/base/identifiable'; +import { Config } from 'app/shared/models/core/config'; +import { ConfigTitleInformation, ViewConfig } from 'app/site/config/models/view-config'; /** * Holds a single config item. diff --git a/client/src/app/core/repositories/mediafiles/mediafile-repository.service.spec.ts b/client/src/app/core/repositories/mediafiles/mediafile-repository.service.spec.ts index 5dcf53097..3fccb824c 100644 --- a/client/src/app/core/repositories/mediafiles/mediafile-repository.service.spec.ts +++ b/client/src/app/core/repositories/mediafiles/mediafile-repository.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { MediafileRepositoryService } from './mediafile-repository.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MediafileRepositoryService } from './mediafile-repository.service'; + describe('FileRepositoryService', () => { beforeEach(() => TestBed.configureTestingModule({ imports: [E2EImportsModule] })); diff --git a/client/src/app/core/repositories/mediafiles/mediafile-repository.service.ts b/client/src/app/core/repositories/mediafiles/mediafile-repository.service.ts index 035b412b6..8a4f05404 100644 --- a/client/src/app/core/repositories/mediafiles/mediafile-repository.service.ts +++ b/client/src/app/core/repositories/mediafiles/mediafile-repository.service.ts @@ -1,21 +1,21 @@ -import { Injectable } from '@angular/core'; import { HttpHeaders } from '@angular/common/http'; +import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { map, first } from 'rxjs/operators'; -import { Observable, BehaviorSubject } from 'rxjs'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { first, map } from 'rxjs/operators'; -import { ViewMediafile, MediafileTitleInformation } from 'app/site/mediafiles/models/view-mediafile'; -import { Mediafile } from 'app/shared/models/mediafiles/mediafile'; -import { DataStoreService } from '../../core-services/data-store.service'; -import { Identifiable } from 'app/shared/models/base/identifiable'; -import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; import { DataSendService } from 'app/core/core-services/data-send.service'; import { HttpService } from 'app/core/core-services/http.service'; import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; -import { BaseIsListOfSpeakersContentObjectRepository } from '../base-is-list-of-speakers-content-object-repository'; +import { Identifiable } from 'app/shared/models/base/identifiable'; +import { Mediafile } from 'app/shared/models/mediafiles/mediafile'; +import { MediafileTitleInformation, ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; import { ViewGroup } from 'app/site/users/models/view-group'; +import { BaseIsListOfSpeakersContentObjectRepository } from '../base-is-list-of-speakers-content-object-repository'; import { RelationDefinition } from '../base-repository'; +import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; +import { DataStoreService } from '../../core-services/data-store.service'; const MediafileRelations: RelationDefinition[] = [ { diff --git a/client/src/app/core/repositories/motions/category-repository.service.spec.ts b/client/src/app/core/repositories/motions/category-repository.service.spec.ts index 2ba9befb7..b70ba1bac 100644 --- a/client/src/app/core/repositories/motions/category-repository.service.spec.ts +++ b/client/src/app/core/repositories/motions/category-repository.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { CategoryRepositoryService } from './category-repository.service'; import { E2EImportsModule } from '../../../../e2e-imports.module'; diff --git a/client/src/app/core/repositories/motions/category-repository.service.ts b/client/src/app/core/repositories/motions/category-repository.service.ts index 2a6cf55aa..7cdf5f515 100644 --- a/client/src/app/core/repositories/motions/category-repository.service.ts +++ b/client/src/app/core/repositories/motions/category-repository.service.ts @@ -2,16 +2,16 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { BaseRepository, RelationDefinition } from '../base-repository'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { TreeIdNode } from 'app/core/ui-services/tree.service'; import { Category } from 'app/shared/models/motions/category'; +import { Motion } from 'app/shared/models/motions/motion'; +import { CategoryTitleInformation, ViewCategory } from 'app/site/motions/models/view-category'; +import { BaseRepository, RelationDefinition } from '../base-repository'; import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; import { DataSendService } from '../../core-services/data-send.service'; import { DataStoreService } from '../../core-services/data-store.service'; import { HttpService } from '../../core-services/http.service'; -import { ViewCategory, CategoryTitleInformation } from 'app/site/motions/models/view-category'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; -import { Motion } from 'app/shared/models/motions/motion'; -import { TreeIdNode } from 'app/core/ui-services/tree.service'; const CategoryRelations: RelationDefinition[] = [ { diff --git a/client/src/app/core/repositories/motions/change-recommendation-repository.service.spec.ts b/client/src/app/core/repositories/motions/change-recommendation-repository.service.spec.ts index 2bb662d6f..20578657f 100644 --- a/client/src/app/core/repositories/motions/change-recommendation-repository.service.spec.ts +++ b/client/src/app/core/repositories/motions/change-recommendation-repository.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { ChangeRecommendationRepositoryService } from './change-recommendation-repository.service'; import { E2EImportsModule } from '../../../../e2e-imports.module'; diff --git a/client/src/app/core/repositories/motions/change-recommendation-repository.service.ts b/client/src/app/core/repositories/motions/change-recommendation-repository.service.ts index 79fefa586..edce8bee0 100644 --- a/client/src/app/core/repositories/motions/change-recommendation-repository.service.ts +++ b/client/src/app/core/repositories/motions/change-recommendation-repository.service.ts @@ -1,23 +1,23 @@ import { Injectable } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { TranslateService } from '@ngx-translate/core'; +import { CollectionStringMapperService } from 'app/core/core-services/collection-string-mapper.service'; import { DataSendService } from 'app/core/core-services/data-send.service'; -import { BaseRepository } from '../base-repository'; import { DataStoreService } from 'app/core/core-services/data-store.service'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { Identifiable } from 'app/shared/models/base/identifiable'; import { MotionChangeRecommendation } from 'app/shared/models/motions/motion-change-reco'; import { - ViewMotionChangeRecommendation, - MotionChangeRecommendationTitleInformation + MotionChangeRecommendationTitleInformation, + ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; -import { Identifiable } from 'app/shared/models/base/identifiable'; -import { CollectionStringMapperService } from 'app/core/core-services/collection-string-mapper.service'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { BaseRepository } from '../base-repository'; +import { DiffService, LineRange, ModificationType } from '../../ui-services/diff.service'; import { ChangeRecoMode, ViewMotion } from '../../../site/motions/models/view-motion'; import { ViewUnifiedChange } from '../../../shared/models/motions/view-unified-change'; -import { DiffService, LineRange, ModificationType } from '../../ui-services/diff.service'; /** * Repository Services for change recommendations diff --git a/client/src/app/core/repositories/motions/motion-block-repository.service.spec.ts b/client/src/app/core/repositories/motions/motion-block-repository.service.spec.ts index 9463afffe..a95db9da6 100644 --- a/client/src/app/core/repositories/motions/motion-block-repository.service.spec.ts +++ b/client/src/app/core/repositories/motions/motion-block-repository.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { MotionBlockRepositoryService } from './motion-block-repository.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionBlockRepositoryService } from './motion-block-repository.service'; + describe('MotionBlockRepositoryService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/core/repositories/motions/motion-block-repository.service.ts b/client/src/app/core/repositories/motions/motion-block-repository.service.ts index 453fa28da..1436dc92c 100644 --- a/client/src/app/core/repositories/motions/motion-block-repository.service.ts +++ b/client/src/app/core/repositories/motions/motion-block-repository.service.ts @@ -1,20 +1,20 @@ import { Injectable } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { TranslateService } from '@ngx-translate/core'; import { CollectionStringMapperService } from 'app/core/core-services/collection-string-mapper.service'; import { DataSendService } from 'app/core/core-services/data-send.service'; import { DataStoreService } from 'app/core/core-services/data-store.service'; import { HttpService } from 'app/core/core-services/http.service'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; import { Motion } from 'app/shared/models/motions/motion'; import { MotionBlock } from 'app/shared/models/motions/motion-block'; -import { MotionRepositoryService } from './motion-repository.service'; import { ViewMotion } from 'app/site/motions/models/view-motion'; -import { ViewMotionBlock, MotionBlockTitleInformation } from 'app/site/motions/models/view-motion-block'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { MotionBlockTitleInformation, ViewMotionBlock } from 'app/site/motions/models/view-motion-block'; import { BaseIsAgendaItemAndListOfSpeakersContentObjectRepository } from '../base-is-agenda-item-and-list-of-speakers-content-object-repository'; +import { MotionRepositoryService } from './motion-repository.service'; /** * Repository service for motion blocks diff --git a/client/src/app/core/repositories/motions/motion-comment-section-repository.service.spec.ts b/client/src/app/core/repositories/motions/motion-comment-section-repository.service.spec.ts index ec2a984ad..89815173f 100644 --- a/client/src/app/core/repositories/motions/motion-comment-section-repository.service.spec.ts +++ b/client/src/app/core/repositories/motions/motion-comment-section-repository.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { MotionCommentSectionRepositoryService } from './motion-comment-section-repository.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('MotionCommentSectionRepositoryService', () => { beforeEach(() => { diff --git a/client/src/app/core/repositories/motions/motion-comment-section-repository.service.ts b/client/src/app/core/repositories/motions/motion-comment-section-repository.service.ts index 600d33650..5c3aec650 100644 --- a/client/src/app/core/repositories/motions/motion-comment-section-repository.service.ts +++ b/client/src/app/core/repositories/motions/motion-comment-section-repository.service.ts @@ -2,19 +2,19 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { DataSendService } from '../../core-services/data-send.service'; -import { DataStoreService } from '../../core-services/data-store.service'; -import { BaseRepository, RelationDefinition } from '../base-repository'; -import { - ViewMotionCommentSection, - MotionCommentSectionTitleInformation -} from 'app/site/motions/models/view-motion-comment-section'; -import { MotionCommentSection } from 'app/shared/models/motions/motion-comment-section'; -import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; import { HttpService } from 'app/core/core-services/http.service'; import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; -import { ViewGroup } from 'app/site/users/models/view-group'; +import { MotionCommentSection } from 'app/shared/models/motions/motion-comment-section'; import { ViewMotion } from 'app/site/motions/models/view-motion'; +import { + MotionCommentSectionTitleInformation, + ViewMotionCommentSection +} from 'app/site/motions/models/view-motion-comment-section'; +import { ViewGroup } from 'app/site/users/models/view-group'; +import { BaseRepository, RelationDefinition } from '../base-repository'; +import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; +import { DataSendService } from '../../core-services/data-send.service'; +import { DataStoreService } from '../../core-services/data-store.service'; const MotionCommentSectionRelations: RelationDefinition[] = [ { diff --git a/client/src/app/core/repositories/motions/motion-repository.service.spec.ts b/client/src/app/core/repositories/motions/motion-repository.service.spec.ts index 7f2fbf3ee..2d7b6657c 100644 --- a/client/src/app/core/repositories/motions/motion-repository.service.spec.ts +++ b/client/src/app/core/repositories/motions/motion-repository.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { MotionRepositoryService } from './motion-repository.service'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { MotionRepositoryService } from './motion-repository.service'; describe('MotionRepositoryService', () => { beforeEach(() => { diff --git a/client/src/app/core/repositories/motions/motion-repository.service.ts b/client/src/app/core/repositories/motions/motion-repository.service.ts index 7648c54b1..74b0b4b6f 100644 --- a/client/src/app/core/repositories/motions/motion-repository.service.ts +++ b/client/src/app/core/repositories/motions/motion-repository.service.ts @@ -5,35 +5,35 @@ import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { ChangeRecoMode, MotionTitleInformation, ViewMotion } from 'app/site/motions/models/view-motion'; -import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; -import { ConfigService } from 'app/core/ui-services/config.service'; -import { DataSendService } from '../../core-services/data-send.service'; import { DataStoreService } from 'app/core/core-services/data-store.service'; -import { DiffService, DiffLinesInParagraph } from 'app/core/ui-services/diff.service'; import { HttpService } from 'app/core/core-services/http.service'; -import { LinenumberingService, LineNumberRange } from '../../ui-services/linenumbering.service'; +import { OperatorService } from 'app/core/core-services/operator.service'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; +import { DiffLinesInParagraph, DiffService } from 'app/core/ui-services/diff.service'; +import { TreeIdNode } from 'app/core/ui-services/tree.service'; import { Motion } from 'app/shared/models/motions/motion'; import { MotionPoll } from 'app/shared/models/motions/motion-poll'; -import { TreeIdNode } from 'app/core/ui-services/tree.service'; -import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; -import { ViewMotionAmendedParagraph } from 'app/site/motions/models/view-motion-amended-paragraph'; import { ViewUnifiedChange } from 'app/shared/models/motions/view-unified-change'; -import { ViewStatuteParagraph } from 'app/site/motions/models/view-statute-paragraph'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; -import { ViewCategory } from 'app/site/motions/models/view-category'; -import { ViewUser } from 'app/site/users/models/view-user'; -import { ViewWorkflow } from 'app/site/motions/models/view-workflow'; -import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block'; +import { PersonalNoteContent } from 'app/shared/models/users/personal-note'; import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; +import { ViewCategory } from 'app/site/motions/models/view-category'; +import { ChangeRecoMode, MotionTitleInformation, ViewMotion } from 'app/site/motions/models/view-motion'; +import { ViewMotionAmendedParagraph } from 'app/site/motions/models/view-motion-amended-paragraph'; +import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block'; +import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; +import { ViewState } from 'app/site/motions/models/view-state'; +import { ViewStatuteParagraph } from 'app/site/motions/models/view-statute-paragraph'; +import { ViewSubmitter } from 'app/site/motions/models/view-submitter'; +import { ViewWorkflow } from 'app/site/motions/models/view-workflow'; import { ViewTag } from 'app/site/tags/models/view-tag'; import { ViewPersonalNote } from 'app/site/users/models/view-personal-note'; -import { OperatorService } from 'app/core/core-services/operator.service'; -import { PersonalNoteContent } from 'app/shared/models/users/personal-note'; +import { ViewUser } from 'app/site/users/models/view-user'; import { BaseIsAgendaItemAndListOfSpeakersContentObjectRepository } from '../base-is-agenda-item-and-list-of-speakers-content-object-repository'; import { RelationDefinition } from '../base-repository'; -import { ViewState } from 'app/site/motions/models/view-state'; -import { ViewSubmitter } from 'app/site/motions/models/view-submitter'; +import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; +import { DataSendService } from '../../core-services/data-send.service'; +import { LinenumberingService, LineNumberRange } from '../../ui-services/linenumbering.service'; type SortProperty = 'weight' | 'identifier'; diff --git a/client/src/app/core/repositories/motions/state-repository.service.spec.ts b/client/src/app/core/repositories/motions/state-repository.service.spec.ts index f69a058ba..3f939c4be 100644 --- a/client/src/app/core/repositories/motions/state-repository.service.spec.ts +++ b/client/src/app/core/repositories/motions/state-repository.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from '../../../../e2e-imports.module'; import { StateRepositoryService } from './state-repository.service'; diff --git a/client/src/app/core/repositories/motions/state-repository.service.ts b/client/src/app/core/repositories/motions/state-repository.service.ts index 66f05f21c..550d18c23 100644 --- a/client/src/app/core/repositories/motions/state-repository.service.ts +++ b/client/src/app/core/repositories/motions/state-repository.service.ts @@ -2,14 +2,14 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { WorkflowTitleInformation, ViewWorkflow } from 'app/site/motions/models/view-workflow'; -import { DataSendService } from '../../core-services/data-send.service'; -import { DataStoreService } from '../../core-services/data-store.service'; -import { BaseRepository, RelationDefinition } from '../base-repository'; -import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; import { State } from 'app/shared/models/motions/state'; -import { ViewState, StateTitleInformation } from 'app/site/motions/models/view-state'; +import { StateTitleInformation, ViewState } from 'app/site/motions/models/view-state'; +import { ViewWorkflow, WorkflowTitleInformation } from 'app/site/motions/models/view-workflow'; +import { BaseRepository, RelationDefinition } from '../base-repository'; +import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; +import { DataSendService } from '../../core-services/data-send.service'; +import { DataStoreService } from '../../core-services/data-store.service'; const StateRelations: RelationDefinition[] = [ { diff --git a/client/src/app/core/repositories/motions/statute-paragraph-repository.service.spec.ts b/client/src/app/core/repositories/motions/statute-paragraph-repository.service.spec.ts index 3411d9637..1db18ba30 100644 --- a/client/src/app/core/repositories/motions/statute-paragraph-repository.service.spec.ts +++ b/client/src/app/core/repositories/motions/statute-paragraph-repository.service.spec.ts @@ -1,6 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { StatuteParagraphRepositoryService } from './statute-paragraph-repository.service'; describe('StatuteParagraphRepositoryService', () => { diff --git a/client/src/app/core/repositories/motions/statute-paragraph-repository.service.ts b/client/src/app/core/repositories/motions/statute-paragraph-repository.service.ts index 16b1976c9..ee10005e1 100644 --- a/client/src/app/core/repositories/motions/statute-paragraph-repository.service.ts +++ b/client/src/app/core/repositories/motions/statute-paragraph-repository.service.ts @@ -2,13 +2,13 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { StatuteParagraph } from 'app/shared/models/motions/statute-paragraph'; +import { StatuteParagraphTitleInformation, ViewStatuteParagraph } from 'app/site/motions/models/view-statute-paragraph'; +import { BaseRepository } from '../base-repository'; +import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; import { DataSendService } from '../../core-services/data-send.service'; import { DataStoreService } from '../../core-services/data-store.service'; -import { BaseRepository } from '../base-repository'; -import { ViewStatuteParagraph, StatuteParagraphTitleInformation } from 'app/site/motions/models/view-statute-paragraph'; -import { StatuteParagraph } from 'app/shared/models/motions/statute-paragraph'; -import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; /** * Repository Services for statute paragraphs diff --git a/client/src/app/core/repositories/motions/workflow-repository.service.spec.ts b/client/src/app/core/repositories/motions/workflow-repository.service.spec.ts index f8209ab4b..1754c2e8c 100644 --- a/client/src/app/core/repositories/motions/workflow-repository.service.spec.ts +++ b/client/src/app/core/repositories/motions/workflow-repository.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { WorkflowRepositoryService } from './workflow-repository.service'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { WorkflowRepositoryService } from './workflow-repository.service'; describe('WorkflowRepositoryService', () => { beforeEach(() => { diff --git a/client/src/app/core/repositories/motions/workflow-repository.service.ts b/client/src/app/core/repositories/motions/workflow-repository.service.ts index 8d7a16f5e..fa840a3b1 100644 --- a/client/src/app/core/repositories/motions/workflow-repository.service.ts +++ b/client/src/app/core/repositories/motions/workflow-repository.service.ts @@ -2,15 +2,15 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; import { Workflow } from 'app/shared/models/motions/workflow'; +import { ViewMotion } from 'app/site/motions/models/view-motion'; +import { ViewState } from 'app/site/motions/models/view-state'; import { ViewWorkflow, WorkflowTitleInformation } from 'app/site/motions/models/view-workflow'; -import { DataSendService } from '../../core-services/data-send.service'; -import { DataStoreService } from '../../core-services/data-store.service'; import { BaseRepository, RelationDefinition } from '../base-repository'; import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; -import { ViewMotion } from 'app/site/motions/models/view-motion'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; -import { ViewState } from 'app/site/motions/models/view-state'; +import { DataSendService } from '../../core-services/data-send.service'; +import { DataStoreService } from '../../core-services/data-store.service'; const WorkflowRelations: RelationDefinition[] = [ { diff --git a/client/src/app/core/repositories/projector/countdown-repository.service.spec.ts b/client/src/app/core/repositories/projector/countdown-repository.service.spec.ts index 0af2379b6..5adc1d724 100644 --- a/client/src/app/core/repositories/projector/countdown-repository.service.spec.ts +++ b/client/src/app/core/repositories/projector/countdown-repository.service.spec.ts @@ -1,6 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { CountdownRepositoryService } from './countdown-repository.service'; describe('CountdownRepositoryService', () => { diff --git a/client/src/app/core/repositories/projector/countdown-repository.service.ts b/client/src/app/core/repositories/projector/countdown-repository.service.ts index 0ab0740db..5f1fc78dc 100644 --- a/client/src/app/core/repositories/projector/countdown-repository.service.ts +++ b/client/src/app/core/repositories/projector/countdown-repository.service.ts @@ -2,14 +2,14 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { DataSendService } from '../../core-services/data-send.service'; -import { DataStoreService } from '../../core-services/data-store.service'; +import { ServertimeService } from 'app/core/core-services/servertime.service'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { Countdown } from 'app/shared/models/core/countdown'; +import { CountdownTitleInformation, ViewCountdown } from 'app/site/projector/models/view-countdown'; import { BaseRepository } from '../base-repository'; import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; -import { ViewCountdown, CountdownTitleInformation } from 'app/site/projector/models/view-countdown'; -import { Countdown } from 'app/shared/models/core/countdown'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; -import { ServertimeService } from 'app/core/core-services/servertime.service'; +import { DataSendService } from '../../core-services/data-send.service'; +import { DataStoreService } from '../../core-services/data-store.service'; @Injectable({ providedIn: 'root' diff --git a/client/src/app/core/repositories/projector/projection-default-repository.service.spec.ts b/client/src/app/core/repositories/projector/projection-default-repository.service.spec.ts index 18b50c2ec..8c3e3b4b1 100644 --- a/client/src/app/core/repositories/projector/projection-default-repository.service.spec.ts +++ b/client/src/app/core/repositories/projector/projection-default-repository.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from '../../../../e2e-imports.module'; import { ProjectionDefaultRepositoryService } from './projection-default-repository.service'; diff --git a/client/src/app/core/repositories/projector/projection-default-repository.service.ts b/client/src/app/core/repositories/projector/projection-default-repository.service.ts index 4f9eaf6e6..f85649248 100644 --- a/client/src/app/core/repositories/projector/projection-default-repository.service.ts +++ b/client/src/app/core/repositories/projector/projection-default-repository.service.ts @@ -2,17 +2,17 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { Identifiable } from 'app/shared/models/base/identifiable'; +import { ProjectionDefault } from 'app/shared/models/core/projection-default'; +import { + ProjectionDefaultTitleInformation, + ViewProjectionDefault +} from 'app/site/projector/models/view-projection-default'; import { BaseRepository } from '../base-repository'; import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; import { DataSendService } from '../../core-services/data-send.service'; import { DataStoreService } from '../../core-services/data-store.service'; -import { Identifiable } from 'app/shared/models/base/identifiable'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; -import { ProjectionDefault } from 'app/shared/models/core/projection-default'; -import { - ViewProjectionDefault, - ProjectionDefaultTitleInformation -} from 'app/site/projector/models/view-projection-default'; /** * Manages all projection default instances. diff --git a/client/src/app/core/repositories/projector/projector-message-repository.service.spec.ts b/client/src/app/core/repositories/projector/projector-message-repository.service.spec.ts index ac0b49fb7..6b1d8b55e 100644 --- a/client/src/app/core/repositories/projector/projector-message-repository.service.spec.ts +++ b/client/src/app/core/repositories/projector/projector-message-repository.service.spec.ts @@ -1,6 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { ProjectorMessageRepositoryService } from './projector-message-repository.service'; describe('ProjectorMessageRepositoryService', () => { diff --git a/client/src/app/core/repositories/projector/projector-message-repository.service.ts b/client/src/app/core/repositories/projector/projector-message-repository.service.ts index 4bce308b6..18a886b0d 100644 --- a/client/src/app/core/repositories/projector/projector-message-repository.service.ts +++ b/client/src/app/core/repositories/projector/projector-message-repository.service.ts @@ -2,16 +2,16 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { DataStoreService } from '../../core-services/data-store.service'; -import { BaseRepository } from '../base-repository'; -import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; +import { DataSendService } from 'app/core/core-services/data-send.service'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; import { ProjectorMessage } from 'app/shared/models/core/projector-message'; import { - ViewProjectorMessage, - ProjectorMessageTitleInformation + ProjectorMessageTitleInformation, + ViewProjectorMessage } from 'app/site/projector/models/view-projector-message'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; -import { DataSendService } from 'app/core/core-services/data-send.service'; +import { BaseRepository } from '../base-repository'; +import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; +import { DataStoreService } from '../../core-services/data-store.service'; @Injectable({ providedIn: 'root' diff --git a/client/src/app/core/repositories/projector/projector-repository.service.spec.ts b/client/src/app/core/repositories/projector/projector-repository.service.spec.ts index 60dacf805..b5d599b91 100644 --- a/client/src/app/core/repositories/projector/projector-repository.service.spec.ts +++ b/client/src/app/core/repositories/projector/projector-repository.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { ProjectorRepositoryService } from './projector-repository.service'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { ProjectorRepositoryService } from './projector-repository.service'; describe('ProjectorRepositoryService', () => { beforeEach(() => diff --git a/client/src/app/core/repositories/projector/projector-repository.service.ts b/client/src/app/core/repositories/projector/projector-repository.service.ts index 0a03e83a2..65090bf0c 100644 --- a/client/src/app/core/repositories/projector/projector-repository.service.ts +++ b/client/src/app/core/repositories/projector/projector-repository.service.ts @@ -2,15 +2,15 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { HttpService } from 'app/core/core-services/http.service'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { Identifiable } from 'app/shared/models/base/identifiable'; +import { Projector } from 'app/shared/models/core/projector'; +import { ProjectorTitleInformation, ViewProjector } from 'app/site/projector/models/view-projector'; import { BaseRepository, RelationDefinition } from '../base-repository'; import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; import { DataSendService } from '../../core-services/data-send.service'; import { DataStoreService } from '../../core-services/data-store.service'; -import { Identifiable } from 'app/shared/models/base/identifiable'; -import { ViewProjector, ProjectorTitleInformation } from 'app/site/projector/models/view-projector'; -import { Projector } from 'app/shared/models/core/projector'; -import { HttpService } from 'app/core/core-services/http.service'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; /** * Directions for scale and scroll requests. diff --git a/client/src/app/core/repositories/tags/tag-repository.service.spec.ts b/client/src/app/core/repositories/tags/tag-repository.service.spec.ts index 92abad209..f2f5c466c 100644 --- a/client/src/app/core/repositories/tags/tag-repository.service.spec.ts +++ b/client/src/app/core/repositories/tags/tag-repository.service.spec.ts @@ -1,6 +1,7 @@ import { TestBed } from '@angular/core/testing'; -import { TagRepositoryService } from './tag-repository.service'; + import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { TagRepositoryService } from './tag-repository.service'; describe('TagRepositoryService', () => { beforeEach(() => { diff --git a/client/src/app/core/repositories/tags/tag-repository.service.ts b/client/src/app/core/repositories/tags/tag-repository.service.ts index eae1fb97f..85cd63f65 100644 --- a/client/src/app/core/repositories/tags/tag-repository.service.ts +++ b/client/src/app/core/repositories/tags/tag-repository.service.ts @@ -2,13 +2,13 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; import { Tag } from 'app/shared/models/core/tag'; -import { ViewTag, TagTitleInformation } from 'app/site/tags/models/view-tag'; -import { DataSendService } from '../../core-services/data-send.service'; -import { DataStoreService } from '../../core-services/data-store.service'; +import { TagTitleInformation, ViewTag } from 'app/site/tags/models/view-tag'; import { BaseRepository } from '../base-repository'; import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { DataSendService } from '../../core-services/data-send.service'; +import { DataStoreService } from '../../core-services/data-store.service'; /** * Repository Services for Tags diff --git a/client/src/app/core/repositories/topics/topic-repository.service.spec.ts b/client/src/app/core/repositories/topics/topic-repository.service.spec.ts index 201cac88b..afa05f043 100644 --- a/client/src/app/core/repositories/topics/topic-repository.service.spec.ts +++ b/client/src/app/core/repositories/topics/topic-repository.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; -import { TopicRepositoryService } from './topic-repository.service'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { TopicRepositoryService } from './topic-repository.service'; describe('TopicRepositoryService', () => { beforeEach(() => diff --git a/client/src/app/core/repositories/topics/topic-repository.service.ts b/client/src/app/core/repositories/topics/topic-repository.service.ts index 08627f2e5..d563c39d9 100644 --- a/client/src/app/core/repositories/topics/topic-repository.service.ts +++ b/client/src/app/core/repositories/topics/topic-repository.service.ts @@ -3,12 +3,12 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { CollectionStringMapperService } from 'app/core/core-services/collection-string-mapper.service'; -import { DataStoreService } from 'app/core/core-services/data-store.service'; import { DataSendService } from 'app/core/core-services/data-send.service'; -import { Topic } from 'app/shared/models/topics/topic'; -import { ViewTopic, TopicTitleInformation } from 'app/site/topics/models/view-topic'; +import { DataStoreService } from 'app/core/core-services/data-store.service'; import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { Topic } from 'app/shared/models/topics/topic'; import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; +import { TopicTitleInformation, ViewTopic } from 'app/site/topics/models/view-topic'; import { BaseIsAgendaItemAndListOfSpeakersContentObjectRepository } from '../base-is-agenda-item-and-list-of-speakers-content-object-repository'; import { RelationDefinition } from '../base-repository'; diff --git a/client/src/app/core/repositories/users/group-repository.service.spec.ts b/client/src/app/core/repositories/users/group-repository.service.spec.ts index 7716e2e35..46ff53a78 100644 --- a/client/src/app/core/repositories/users/group-repository.service.spec.ts +++ b/client/src/app/core/repositories/users/group-repository.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { GroupRepositoryService } from './group-repository.service'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { GroupRepositoryService } from './group-repository.service'; describe('GroupRepositoryService', () => { beforeEach(() => diff --git a/client/src/app/core/repositories/users/group-repository.service.ts b/client/src/app/core/repositories/users/group-repository.service.ts index b2ccdd584..fb0d920f0 100644 --- a/client/src/app/core/repositories/users/group-repository.service.ts +++ b/client/src/app/core/repositories/users/group-repository.service.ts @@ -2,15 +2,15 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { HttpService } from 'app/core/core-services/http.service'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { Group } from 'app/shared/models/users/group'; +import { GroupTitleInformation, ViewGroup } from 'app/site/users/models/view-group'; import { BaseRepository } from '../base-repository'; import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.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 'app/shared/models/users/group'; -import { ViewGroup, GroupTitleInformation } from 'app/site/users/models/view-group'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; -import { HttpService } from 'app/core/core-services/http.service'; /** * Shape of a permission diff --git a/client/src/app/core/repositories/users/personal-note-repository.service.spec.ts b/client/src/app/core/repositories/users/personal-note-repository.service.spec.ts index 6e4d1df80..4f5434f58 100644 --- a/client/src/app/core/repositories/users/personal-note-repository.service.spec.ts +++ b/client/src/app/core/repositories/users/personal-note-repository.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from '../../../../e2e-imports.module'; import { PersonalNoteRepositoryService } from './personal-note-repository.service'; diff --git a/client/src/app/core/repositories/users/personal-note-repository.service.ts b/client/src/app/core/repositories/users/personal-note-repository.service.ts index 3da376d12..7a54f0a27 100644 --- a/client/src/app/core/repositories/users/personal-note-repository.service.ts +++ b/client/src/app/core/repositories/users/personal-note-repository.service.ts @@ -3,13 +3,13 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { DataSendService } from 'app/core/core-services/data-send.service'; -import { DataStoreService } from '../../core-services/data-store.service'; -import { BaseRepository } from '../base-repository'; -import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; import { Identifiable } from 'app/shared/models/base/identifiable'; import { PersonalNote } from 'app/shared/models/users/personal-note'; -import { ViewPersonalNote, PersonalNoteTitleInformation } from 'app/site/users/models/view-personal-note'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { PersonalNoteTitleInformation, ViewPersonalNote } from 'app/site/users/models/view-personal-note'; +import { BaseRepository } from '../base-repository'; +import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; +import { DataStoreService } from '../../core-services/data-store.service'; /** */ diff --git a/client/src/app/core/repositories/users/user-repository.service.spec.ts b/client/src/app/core/repositories/users/user-repository.service.spec.ts index 33dcadfeb..f9f69132b 100644 --- a/client/src/app/core/repositories/users/user-repository.service.spec.ts +++ b/client/src/app/core/repositories/users/user-repository.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { UserRepositoryService } from './user-repository.service'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { UserRepositoryService } from './user-repository.service'; describe('UserRepositoryService', () => { beforeEach(() => { diff --git a/client/src/app/core/repositories/users/user-repository.service.ts b/client/src/app/core/repositories/users/user-repository.service.ts index 12662d817..af6a2c45e 100644 --- a/client/src/app/core/repositories/users/user-repository.service.ts +++ b/client/src/app/core/repositories/users/user-repository.service.ts @@ -2,18 +2,18 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { HttpService } from 'app/core/core-services/http.service'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { NewEntry } from 'app/core/ui-services/base-import.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; +import { User } from 'app/shared/models/users/user'; +import { ViewGroup } from 'app/site/users/models/view-group'; +import { UserTitleInformation, ViewUser } from 'app/site/users/models/view-user'; import { BaseRepository, RelationDefinition } from '../base-repository'; import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service'; -import { ConfigService } from 'app/core/ui-services/config.service'; import { DataSendService } from '../../core-services/data-send.service'; import { DataStoreService } from '../../core-services/data-store.service'; import { environment } from '../../../../environments/environment'; -import { HttpService } from 'app/core/core-services/http.service'; -import { NewEntry } from 'app/core/ui-services/base-import.service'; -import { User } from 'app/shared/models/users/user'; -import { ViewUser, UserTitleInformation } from 'app/site/users/models/view-user'; -import { ViewGroup } from 'app/site/users/models/view-group'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; /** * type for determining the user name from a string during import. diff --git a/client/src/app/core/translate/openslides-translate-module.ts b/client/src/app/core/translate/openslides-translate-module.ts index 607dc5b15..9d9d85d73 100644 --- a/client/src/app/core/translate/openslides-translate-module.ts +++ b/client/src/app/core/translate/openslides-translate-module.ts @@ -1,20 +1,22 @@ +import { HttpClient } from '@angular/common/http'; import { ModuleWithProviders, NgModule } from '@angular/core'; + import { - TranslateModule, - TranslateLoader, - TranslateFakeCompiler, - TranslateParser, - TranslateCompiler, FakeMissingTranslationHandler, MissingTranslationHandler, - TranslateStore, - USE_STORE, - USE_DEFAULT_LANG, - TranslateService, + TranslateCompiler, + TranslateDirective, + TranslateFakeCompiler, + TranslateLoader, + TranslateModule, + TranslateParser, TranslatePipe, - TranslateDirective + TranslateService, + TranslateStore, + USE_DEFAULT_LANG, + USE_STORE } from '@ngx-translate/core'; -import { HttpClient } from '@angular/common/http'; + import { OpenSlidesTranslateParser } from './translation-parser'; import { PruningTranslationLoader } from './translation-pruning-loader'; import { OpenSlidesTranslateService } from './translation-service'; diff --git a/client/src/app/core/translate/translation-parser.ts b/client/src/app/core/translate/translation-parser.ts index 54e98f2bd..0485ba94b 100644 --- a/client/src/app/core/translate/translation-parser.ts +++ b/client/src/app/core/translate/translation-parser.ts @@ -1,7 +1,9 @@ -import { TranslateDefaultParser, TranslateStore } from '@ngx-translate/core'; -import { ConfigService } from '../ui-services/config.service'; import { Injectable } from '@angular/core'; +import { TranslateDefaultParser, TranslateStore } from '@ngx-translate/core'; + +import { ConfigService } from '../ui-services/config.service'; + export interface CustomTranslation { original: string; translation: string; diff --git a/client/src/app/core/translate/translation-pruning-loader.ts b/client/src/app/core/translate/translation-pruning-loader.ts index 64b34c6d9..a3e782d2a 100644 --- a/client/src/app/core/translate/translation-pruning-loader.ts +++ b/client/src/app/core/translate/translation-pruning-loader.ts @@ -1,7 +1,8 @@ -import { TranslateLoader } from '@ngx-translate/core'; import { HttpClient } from '@angular/common/http'; -import { map } from 'rxjs/operators/'; + +import { TranslateLoader } from '@ngx-translate/core'; import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators/'; /** * Translation loader that replaces empty strings with nothing. diff --git a/client/src/app/core/translate/translation-service.ts b/client/src/app/core/translate/translation-service.ts index e76135e57..adb76b5fe 100644 --- a/client/src/app/core/translate/translation-service.ts +++ b/client/src/app/core/translate/translation-service.ts @@ -1,14 +1,15 @@ +import { Inject, Injectable } from '@angular/core'; + import { - TranslateStore, - TranslateService, - TranslateLoader, - TranslateCompiler, - TranslateParser, MissingTranslationHandler, + TranslateCompiler, + TranslateLoader, + TranslateParser, + TranslateService, + TranslateStore, USE_DEFAULT_LANG, USE_STORE } from '@ngx-translate/core'; -import { Inject, Injectable } from '@angular/core'; import { Observable, of } from 'rxjs'; /** diff --git a/client/src/app/core/ui-services/base-import.service.ts b/client/src/app/core/ui-services/base-import.service.ts index 523a5157f..42e1896e3 100644 --- a/client/src/app/core/ui-services/base-import.service.ts +++ b/client/src/app/core/ui-services/base-import.service.ts @@ -1,8 +1,9 @@ -import { BehaviorSubject, Observable } from 'rxjs'; -import { Injectable, EventEmitter } from '@angular/core'; +import { EventEmitter, Injectable } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { Papa, PapaParseConfig } from 'ngx-papaparse'; + import { TranslateService } from '@ngx-translate/core'; +import { Papa, PapaParseConfig } from 'ngx-papaparse'; +import { BehaviorSubject, Observable } from 'rxjs'; import { BaseViewModel } from 'app/site/base/base-view-model'; diff --git a/client/src/app/core/ui-services/base-sort-list.service.ts b/client/src/app/core/ui-services/base-sort-list.service.ts index 235fea21e..95c42ef2d 100644 --- a/client/src/app/core/ui-services/base-sort-list.service.ts +++ b/client/src/app/core/ui-services/base-sort-list.service.ts @@ -1,6 +1,5 @@ -import { BehaviorSubject, Subscription, Observable } from 'rxjs'; - import { TranslateService } from '@ngx-translate/core'; +import { BehaviorSubject, Observable, Subscription } from 'rxjs'; import { BaseViewModel } from '../../site/base/base-view-model'; import { StorageService } from '../core-services/storage.service'; diff --git a/client/src/app/core/ui-services/choice.service.spec.ts b/client/src/app/core/ui-services/choice.service.spec.ts index 891322fde..b071e6fca 100644 --- a/client/src/app/core/ui-services/choice.service.spec.ts +++ b/client/src/app/core/ui-services/choice.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { ChoiceService } from './choice.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { ChoiceService } from './choice.service'; + describe('ChoiceService', () => { beforeEach(() => { TestBed.configureTestingModule({ diff --git a/client/src/app/core/ui-services/choice.service.ts b/client/src/app/core/ui-services/choice.service.ts index ecaaa8c9d..c9622a846 100644 --- a/client/src/app/core/ui-services/choice.service.ts +++ b/client/src/app/core/ui-services/choice.service.ts @@ -2,9 +2,9 @@ import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { + ChoiceAnswer, ChoiceDialogComponent, - ChoiceDialogOptions, - ChoiceAnswer + ChoiceDialogOptions } from '../../shared/components/choice-dialog/choice-dialog.component'; /** diff --git a/client/src/app/core/ui-services/config.service.spec.ts b/client/src/app/core/ui-services/config.service.spec.ts index 81eea56a2..fecb98428 100644 --- a/client/src/app/core/ui-services/config.service.spec.ts +++ b/client/src/app/core/ui-services/config.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { ConfigService } from './config.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('ConfigService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/config.service.ts b/client/src/app/core/ui-services/config.service.ts index ca8a48a24..70fd61f69 100644 --- a/client/src/app/core/ui-services/config.service.ts +++ b/client/src/app/core/ui-services/config.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { Observable, BehaviorSubject } from 'rxjs'; +import { BehaviorSubject, Observable } from 'rxjs'; import { Config } from '../../shared/models/core/config'; import { DataStoreService } from '../core-services/data-store.service'; diff --git a/client/src/app/core/ui-services/count-users.service.spec.ts b/client/src/app/core/ui-services/count-users.service.spec.ts index e505d55d4..020c50e24 100644 --- a/client/src/app/core/ui-services/count-users.service.spec.ts +++ b/client/src/app/core/ui-services/count-users.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { E2EImportsModule } from '../../../e2e-imports.module'; import { CountUsersService } from './count-users.service'; +import { E2EImportsModule } from '../../../e2e-imports.module'; describe('CountUsersService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/csv-export.service.spec.ts b/client/src/app/core/ui-services/csv-export.service.spec.ts index 92060fee4..23b0e8189 100644 --- a/client/src/app/core/ui-services/csv-export.service.spec.ts +++ b/client/src/app/core/ui-services/csv-export.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { CsvExportService } from './csv-export.service'; import { E2EImportsModule } from '../../../e2e-imports.module'; diff --git a/client/src/app/core/ui-services/csv-export.service.ts b/client/src/app/core/ui-services/csv-export.service.ts index a5df9db93..0b3489971 100644 --- a/client/src/app/core/ui-services/csv-export.service.ts +++ b/client/src/app/core/ui-services/csv-export.service.ts @@ -1,9 +1,10 @@ import { Injectable } from '@angular/core'; + import { TranslateService } from '@ngx-translate/core'; import { BaseViewModel } from '../../site/base/base-view-model'; -import { FileExportService } from './file-export.service'; import { ConfigService } from './config.service'; +import { FileExportService } from './file-export.service'; /** * Defines a csv column with a property of the model and an optional label. If this is not given, the diff --git a/client/src/app/core/ui-services/diff.service.spec.ts b/client/src/app/core/ui-services/diff.service.spec.ts index 186f007d8..4b081f5e8 100644 --- a/client/src/app/core/ui-services/diff.service.spec.ts +++ b/client/src/app/core/ui-services/diff.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { DiffService, ModificationType } from './diff.service'; import { LinenumberingService } from './linenumbering.service'; diff --git a/client/src/app/core/ui-services/duration.service.spec.ts b/client/src/app/core/ui-services/duration.service.spec.ts index de2a5ac43..5755d351b 100644 --- a/client/src/app/core/ui-services/duration.service.spec.ts +++ b/client/src/app/core/ui-services/duration.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { DurationService } from './duration.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('DurationService', () => { beforeEach(() => diff --git a/client/src/app/core/ui-services/file-export.service.spec.ts b/client/src/app/core/ui-services/file-export.service.spec.ts index 5a2e09ff2..b118c84d9 100644 --- a/client/src/app/core/ui-services/file-export.service.spec.ts +++ b/client/src/app/core/ui-services/file-export.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { FileExportService } from './file-export.service'; import { E2EImportsModule } from '../../../e2e-imports.module'; +import { FileExportService } from './file-export.service'; describe('FileExportService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/file-export.service.ts b/client/src/app/core/ui-services/file-export.service.ts index a42b06c80..386004218 100644 --- a/client/src/app/core/ui-services/file-export.service.ts +++ b/client/src/app/core/ui-services/file-export.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; + import { saveAs } from 'file-saver'; @Injectable({ diff --git a/client/src/app/core/ui-services/html-to-pdf.service.spec.ts b/client/src/app/core/ui-services/html-to-pdf.service.spec.ts index 353d076d0..bc53669e1 100644 --- a/client/src/app/core/ui-services/html-to-pdf.service.spec.ts +++ b/client/src/app/core/ui-services/html-to-pdf.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { HtmlToPdfService } from './html-to-pdf.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('HtmlToPdfService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/html-to-pdf.service.ts b/client/src/app/core/ui-services/html-to-pdf.service.ts index 99a5465e5..f2664f296 100644 --- a/client/src/app/core/ui-services/html-to-pdf.service.ts +++ b/client/src/app/core/ui-services/html-to-pdf.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; + import { LineNumberingMode } from 'app/site/motions/models/view-motion'; /** @@ -407,7 +408,7 @@ export class HtmlToPdfService { * @param styles the styles array, usually just to parse back into the `parseElement` function * @returns an array of parsed children */ - private parseChildren(element: Element, styles?: Array): Element[] { + private parseChildren(element: Element, styles?: string[]): Element[] { const childNodes = Array.from(element.childNodes) as Element[]; const paragraph = []; if (childNodes.length > 0) { diff --git a/client/src/app/core/ui-services/linenumbering.service.spec.ts b/client/src/app/core/ui-services/linenumbering.service.spec.ts index 6c73938f5..e1049c625 100644 --- a/client/src/app/core/ui-services/linenumbering.service.spec.ts +++ b/client/src/app/core/ui-services/linenumbering.service.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { LinenumberingService } from './linenumbering.service'; diff --git a/client/src/app/core/ui-services/load-font.service.spec.ts b/client/src/app/core/ui-services/load-font.service.spec.ts index 063962f60..24e7d9ce6 100644 --- a/client/src/app/core/ui-services/load-font.service.spec.ts +++ b/client/src/app/core/ui-services/load-font.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { LoadFontService } from './load-font.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('LoadFontService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/login-data.service.spec.ts b/client/src/app/core/ui-services/login-data.service.spec.ts index 29b48fa69..bc3277722 100644 --- a/client/src/app/core/ui-services/login-data.service.spec.ts +++ b/client/src/app/core/ui-services/login-data.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { LoginDataService } from './login-data.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('LoginDataService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/login-data.service.ts b/client/src/app/core/ui-services/login-data.service.ts index 909c1a283..b54855c37 100644 --- a/client/src/app/core/ui-services/login-data.service.ts +++ b/client/src/app/core/ui-services/login-data.service.ts @@ -1,13 +1,13 @@ -import { Injectable, EventEmitter } from '@angular/core'; +import { EventEmitter, Injectable } from '@angular/core'; +import { environment } from 'environments/environment.prod'; import { BehaviorSubject, Observable } from 'rxjs'; +import { auditTime } from 'rxjs/operators'; import { ConfigService } from './config.service'; -import { StorageService } from '../core-services/storage.service'; -import { OpenSlidesStatusService } from '../core-services/openslides-status.service'; import { HttpService } from '../core-services/http.service'; -import { environment } from 'environments/environment.prod'; -import { auditTime } from 'rxjs/operators'; +import { OpenSlidesStatusService } from '../core-services/openslides-status.service'; +import { StorageService } from '../core-services/storage.service'; /** * The login data send by the server. diff --git a/client/src/app/core/ui-services/media-manage.service.spec.ts b/client/src/app/core/ui-services/media-manage.service.spec.ts index dbf68f3bf..4ad9cf28b 100644 --- a/client/src/app/core/ui-services/media-manage.service.spec.ts +++ b/client/src/app/core/ui-services/media-manage.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { MediaManageService } from './media-manage.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('MediaManageService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/pdf-document.service.spec.ts b/client/src/app/core/ui-services/pdf-document.service.spec.ts index 90cfb86a7..a3843c91c 100644 --- a/client/src/app/core/ui-services/pdf-document.service.spec.ts +++ b/client/src/app/core/ui-services/pdf-document.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { PdfDocumentService } from '../ui-services/pdf-document.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('PdfDocumentService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/pdf-document.service.ts b/client/src/app/core/ui-services/pdf-document.service.ts index 24c9c6087..4b7ffbbbc 100644 --- a/client/src/app/core/ui-services/pdf-document.service.ts +++ b/client/src/app/core/ui-services/pdf-document.service.ts @@ -1,13 +1,13 @@ import { HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { saveAs } from 'file-saver'; -import pdfMake from 'pdfmake/build/pdfmake'; import { TranslateService } from '@ngx-translate/core'; +import { saveAs } from 'file-saver'; +import pdfMake from 'pdfmake/build/pdfmake'; +import { ExportFormData } from 'app/site/motions/modules/motion-list/components/motion-export-dialog/motion-export-dialog.component'; import { ConfigService } from './config.service'; import { HttpService } from '../core-services/http.service'; -import { ExportFormData } from 'app/site/motions/modules/motion-list/components/motion-export-dialog/motion-export-dialog.component'; /** * Enumeration to define possible values for the styling. @@ -736,7 +736,7 @@ export class PdfDocumentService { pageReference: string, style: StyleType = StyleType.DEFAULT, ...subTitle: object[] - ): Array { + ): Object[] { return [ { text: identifier, diff --git a/client/src/app/core/ui-services/personal-note.service.spec.ts b/client/src/app/core/ui-services/personal-note.service.spec.ts index 64b29de59..7fff1fa67 100644 --- a/client/src/app/core/ui-services/personal-note.service.spec.ts +++ b/client/src/app/core/ui-services/personal-note.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { PersonalNoteService } from './personal-note.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('PersonalNoteService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/personal-note.service.ts b/client/src/app/core/ui-services/personal-note.service.ts index d6852173e..200a3e0df 100644 --- a/client/src/app/core/ui-services/personal-note.service.ts +++ b/client/src/app/core/ui-services/personal-note.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; -import { DataStoreService } from '../core-services/data-store.service'; -import { OperatorService } from '../core-services/operator.service'; -import { PersonalNote, PersonalNoteObject, PersonalNoteContent } from '../../shared/models/users/personal-note'; -import { BaseModel } from '../../shared/models/base/base-model'; -import { HttpService } from '../core-services/http.service'; import { BaseViewModel } from 'app/site/base/base-view-model'; +import { BaseModel } from '../../shared/models/base/base-model'; +import { DataStoreService } from '../core-services/data-store.service'; +import { HttpService } from '../core-services/http.service'; +import { OperatorService } from '../core-services/operator.service'; +import { PersonalNote, PersonalNoteContent, PersonalNoteObject } from '../../shared/models/users/personal-note'; /** * Handles saving personal notes. diff --git a/client/src/app/core/ui-services/poll-pdf-service.ts b/client/src/app/core/ui-services/poll-pdf-service.ts index 2347418c8..5e2e5de9e 100644 --- a/client/src/app/core/ui-services/poll-pdf-service.ts +++ b/client/src/app/core/ui-services/poll-pdf-service.ts @@ -1,5 +1,5 @@ -import { ConfigService } from 'app/core/ui-services/config.service'; import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; import { ViewAssignmentPoll } from 'app/site/assignments/models/view-assignment-poll'; /** diff --git a/client/src/app/core/ui-services/poll.service.spec.ts b/client/src/app/core/ui-services/poll.service.spec.ts index 1f92b8650..c04c5aff8 100644 --- a/client/src/app/core/ui-services/poll.service.spec.ts +++ b/client/src/app/core/ui-services/poll.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { PollService } from './poll.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('PollService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/projection-dialog.service.spec.ts b/client/src/app/core/ui-services/projection-dialog.service.spec.ts index d325ab3ff..dbc3d01ef 100644 --- a/client/src/app/core/ui-services/projection-dialog.service.spec.ts +++ b/client/src/app/core/ui-services/projection-dialog.service.spec.ts @@ -1,6 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { ProjectionDialogService } from './projection-dialog.service'; describe('ProjectionDialogService', () => { diff --git a/client/src/app/core/ui-services/projection-dialog.service.ts b/client/src/app/core/ui-services/projection-dialog.service.ts index 0e4ac8822..6c137b7cf 100644 --- a/client/src/app/core/ui-services/projection-dialog.service.ts +++ b/client/src/app/core/ui-services/projection-dialog.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { Projectable, ProjectorElementBuildDeskriptor, isProjectable } from 'app/site/base/projectable'; import { ProjectionDialogComponent, ProjectionDialogReturnType } from 'app/shared/components/projection-dialog/projection-dialog.component'; -import { ProjectorService } from '../core-services/projector.service'; +import { isProjectable, Projectable, ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; import { ConfigService } from './config.service'; +import { ProjectorService } from '../core-services/projector.service'; /** * Manages the projection dialog. Projects the result of the user's choice. diff --git a/client/src/app/core/ui-services/prompt.service.spec.ts b/client/src/app/core/ui-services/prompt.service.spec.ts index a13720e8e..044a32433 100644 --- a/client/src/app/core/ui-services/prompt.service.spec.ts +++ b/client/src/app/core/ui-services/prompt.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { PromptService } from './prompt.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('PromptService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/prompt.service.ts b/client/src/app/core/ui-services/prompt.service.ts index c81af7ff9..1d7bb8d93 100644 --- a/client/src/app/core/ui-services/prompt.service.ts +++ b/client/src/app/core/ui-services/prompt.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { PromptDialogComponent } from '../../shared/components/prompt-dialog/prompt-dialog.component'; import { MatDialog } from '@angular/material/dialog'; +import { PromptDialogComponent } from '../../shared/components/prompt-dialog/prompt-dialog.component'; + /** * A general service for prompting 'yes' or 'cancel' thinks from the user. */ diff --git a/client/src/app/core/ui-services/routing-state.service.spec.ts b/client/src/app/core/ui-services/routing-state.service.spec.ts index 54efeadf7..882264689 100644 --- a/client/src/app/core/ui-services/routing-state.service.spec.ts +++ b/client/src/app/core/ui-services/routing-state.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { RoutingStateService } from './routing-state.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('RoutingStateService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/routing-state.service.ts b/client/src/app/core/ui-services/routing-state.service.ts index 72cd4a2e9..7bb2d5a5d 100644 --- a/client/src/app/core/ui-services/routing-state.service.ts +++ b/client/src/app/core/ui-services/routing-state.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { Router, RoutesRecognized } from '@angular/router'; + import { filter, pairwise } from 'rxjs/operators'; /** diff --git a/client/src/app/core/ui-services/search.service.spec.ts b/client/src/app/core/ui-services/search.service.spec.ts index 9c9787e01..89dadbb0d 100644 --- a/client/src/app/core/ui-services/search.service.spec.ts +++ b/client/src/app/core/ui-services/search.service.spec.ts @@ -1,4 +1,5 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + import { E2EImportsModule } from '../../../e2e-imports.module'; import { SearchService } from './search.service'; diff --git a/client/src/app/core/ui-services/search.service.ts b/client/src/app/core/ui-services/search.service.ts index 36b22da36..23d5165af 100644 --- a/client/src/app/core/ui-services/search.service.ts +++ b/client/src/app/core/ui-services/search.service.ts @@ -2,9 +2,9 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Searchable } from '../../site/base/searchable'; import { BaseViewModel } from 'app/site/base/base-view-model'; import { BaseRepository } from '../repositories/base-repository'; +import { Searchable } from '../../site/base/searchable'; import { ViewModelStoreService } from '../core-services/view-model-store.service'; /** diff --git a/client/src/app/core/ui-services/spinner.service.spec.ts b/client/src/app/core/ui-services/spinner.service.spec.ts index c75923652..3e634e102 100644 --- a/client/src/app/core/ui-services/spinner.service.spec.ts +++ b/client/src/app/core/ui-services/spinner.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { SpinnerService } from './spinner.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('SpinnerService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/spinner.service.ts b/client/src/app/core/ui-services/spinner.service.ts index 8241eda9c..c3c4e1197 100644 --- a/client/src/app/core/ui-services/spinner.service.ts +++ b/client/src/app/core/ui-services/spinner.service.ts @@ -1,5 +1,6 @@ // External imports import { Injectable } from '@angular/core'; + import { Observable, Subject } from 'rxjs'; /** diff --git a/client/src/app/core/ui-services/theme.service.spec.ts b/client/src/app/core/ui-services/theme.service.spec.ts index a3cbebe95..ac5467963 100644 --- a/client/src/app/core/ui-services/theme.service.spec.ts +++ b/client/src/app/core/ui-services/theme.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { ThemeService } from './theme.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('ThemeService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/tree.service.spec.ts b/client/src/app/core/ui-services/tree.service.spec.ts index 46753f533..757cb0478 100644 --- a/client/src/app/core/ui-services/tree.service.spec.ts +++ b/client/src/app/core/ui-services/tree.service.spec.ts @@ -1,7 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; -import { TreeService } from './tree.service'; import { E2EImportsModule } from '../../../e2e-imports.module'; +import { TreeService } from './tree.service'; describe('TreeService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/tree.service.ts b/client/src/app/core/ui-services/tree.service.ts index ea65f2db1..92de6c810 100644 --- a/client/src/app/core/ui-services/tree.service.ts +++ b/client/src/app/core/ui-services/tree.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Displayable } from 'app/site/base/displayable'; import { Identifiable } from 'app/shared/models/base/identifiable'; +import { Displayable } from 'app/site/base/displayable'; /** * A basic representation of a tree node. This node does not stores any data. diff --git a/client/src/app/core/ui-services/update.service.spec.ts b/client/src/app/core/ui-services/update.service.spec.ts index 4355533c5..c0444750d 100644 --- a/client/src/app/core/ui-services/update.service.spec.ts +++ b/client/src/app/core/ui-services/update.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { UpdateService } from './update.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('UpdateService', () => { beforeEach(() => diff --git a/client/src/app/core/ui-services/update.service.ts b/client/src/app/core/ui-services/update.service.ts index d42ae564f..9a8aebd03 100644 --- a/client/src/app/core/ui-services/update.service.ts +++ b/client/src/app/core/ui-services/update.service.ts @@ -1,9 +1,10 @@ import { Injectable } from '@angular/core'; - import { SwUpdate, UpdateAvailableEvent } from '@angular/service-worker'; -import { NotifyService } from '../core-services/notify.service'; + import { Observable } from 'rxjs'; +import { NotifyService } from '../core-services/notify.service'; + /** * Handle Service Worker updates using the SwUpdate service form angular. */ diff --git a/client/src/app/core/ui-services/viewport.service.spec.ts b/client/src/app/core/ui-services/viewport.service.spec.ts index c58b2937f..5a828d113 100644 --- a/client/src/app/core/ui-services/viewport.service.spec.ts +++ b/client/src/app/core/ui-services/viewport.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { ViewportService } from './viewport.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('ViewportService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/viewport.service.ts b/client/src/app/core/ui-services/viewport.service.ts index d15c01bae..704dbaa86 100644 --- a/client/src/app/core/ui-services/viewport.service.ts +++ b/client/src/app/core/ui-services/viewport.service.ts @@ -1,5 +1,6 @@ -import { Injectable } from '@angular/core'; import { BreakpointObserver, Breakpoints, BreakpointState } from '@angular/cdk/layout'; +import { Injectable } from '@angular/core'; + import { BehaviorSubject } from 'rxjs'; /** diff --git a/client/src/app/core/ui-services/xlsx-export-service.service.spec.ts b/client/src/app/core/ui-services/xlsx-export-service.service.spec.ts index 4e7bfeefd..7e336a396 100644 --- a/client/src/app/core/ui-services/xlsx-export-service.service.spec.ts +++ b/client/src/app/core/ui-services/xlsx-export-service.service.spec.ts @@ -1,7 +1,8 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { XlsxExportServiceService } from './xlsx-export-service.service'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('XlsxExportServiceService', () => { beforeEach(() => { diff --git a/client/src/app/core/ui-services/xlsx-export-service.service.ts b/client/src/app/core/ui-services/xlsx-export-service.service.ts index 90f77eccb..a897e2ae9 100644 --- a/client/src/app/core/ui-services/xlsx-export-service.service.ts +++ b/client/src/app/core/ui-services/xlsx-export-service.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { Worksheet, Workbook, Color, FillPatterns } from 'exceljs/dist/exceljs.min.js'; +import { Color, FillPatterns, Workbook, Worksheet } from 'exceljs/dist/exceljs.min.js'; import { saveAs } from 'file-saver'; // interface required for filling cells (`cell.fill`) @@ -56,7 +56,7 @@ export class XlsxExportServiceService { return; } - const maxColumnLengths: Array = []; + const maxColumnLengths: number[] = []; sheet.eachRow((row, rowNum) => { if (rowNum < fromRow) { return; diff --git a/client/src/app/fullscreen-projector/fullscreen-projector-routing.module.ts b/client/src/app/fullscreen-projector/fullscreen-projector-routing.module.ts index c3380a051..020fd4966 100644 --- a/client/src/app/fullscreen-projector/fullscreen-projector-routing.module.ts +++ b/client/src/app/fullscreen-projector/fullscreen-projector-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { FullscreenProjectorComponent } from './fullscreen-projector/fullscreen-projector.component'; diff --git a/client/src/app/fullscreen-projector/fullscreen-projector.module.ts b/client/src/app/fullscreen-projector/fullscreen-projector.module.ts index 08c16c4d8..a35749d6b 100644 --- a/client/src/app/fullscreen-projector/fullscreen-projector.module.ts +++ b/client/src/app/fullscreen-projector/fullscreen-projector.module.ts @@ -1,9 +1,9 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { SharedModule } from 'app/shared/shared.module'; -import { FullscreenProjectorComponent } from './fullscreen-projector/fullscreen-projector.component'; import { FullscreenProjectorRoutingModule } from './fullscreen-projector-routing.module'; +import { FullscreenProjectorComponent } from './fullscreen-projector/fullscreen-projector.component'; @NgModule({ imports: [CommonModule, FullscreenProjectorRoutingModule, SharedModule], diff --git a/client/src/app/fullscreen-projector/fullscreen-projector/fullscreen-projector.component.spec.ts b/client/src/app/fullscreen-projector/fullscreen-projector/fullscreen-projector.component.spec.ts index 43f5d174f..45d6f9d2b 100644 --- a/client/src/app/fullscreen-projector/fullscreen-projector/fullscreen-projector.component.spec.ts +++ b/client/src/app/fullscreen-projector/fullscreen-projector/fullscreen-projector.component.spec.ts @@ -1,7 +1,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { FullscreenProjectorComponent } from './fullscreen-projector.component'; import { E2EImportsModule } from 'e2e-imports.module'; + +import { FullscreenProjectorComponent } from './fullscreen-projector.component'; import { FullscreenProjectorModule } from '../fullscreen-projector.module'; describe('FullscreenProjectorComponent', () => { diff --git a/client/src/app/fullscreen-projector/fullscreen-projector/fullscreen-projector.component.ts b/client/src/app/fullscreen-projector/fullscreen-projector/fullscreen-projector.component.ts index b36603ff7..e67120bb9 100644 --- a/client/src/app/fullscreen-projector/fullscreen-projector/fullscreen-projector.component.ts +++ b/client/src/app/fullscreen-projector/fullscreen-projector/fullscreen-projector.component.ts @@ -1,13 +1,13 @@ -import { Component, OnInit, ViewChild, ElementRef } from '@angular/core'; -import { AuthService } from 'app/core/core-services/auth.service'; +import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subject } from 'rxjs'; +import { AuthService } from 'app/core/core-services/auth.service'; import { OperatorService } from 'app/core/core-services/operator.service'; +import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service'; import { ViewProjector } from 'app/site/projector/models/view-projector'; import { Size } from 'app/site/projector/size'; -import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service'; /** * The fullscreen projector. Bootstraps OpenSlides, gets the requested projector, diff --git a/client/src/app/shared/animations.ts b/client/src/app/shared/animations.ts index 03399235a..c6fc3365a 100644 --- a/client/src/app/shared/animations.ts +++ b/client/src/app/shared/animations.ts @@ -1,4 +1,4 @@ -import { trigger, animate, transition, style, query, stagger, group } from '@angular/animations'; +import { animate, group, query, stagger, style, transition, trigger } from '@angular/animations'; const fadeVanish = [ style({ transform: 'translateY(0%)', opacity: 1 }), diff --git a/client/src/app/shared/components/agenda-content-object-form/agenda-content-object-form.component.spec.ts b/client/src/app/shared/components/agenda-content-object-form/agenda-content-object-form.component.spec.ts index 03dd39e6f..13e5aeaf6 100644 --- a/client/src/app/shared/components/agenda-content-object-form/agenda-content-object-form.component.spec.ts +++ b/client/src/app/shared/components/agenda-content-object-form/agenda-content-object-form.component.spec.ts @@ -1,8 +1,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { FormBuilder } from '@angular/forms'; import { E2EImportsModule } from 'e2e-imports.module'; + import { AgendaContentObjectFormComponent } from './agenda-content-object-form.component'; describe('AgendaContentObjectFormComponent', () => { diff --git a/client/src/app/shared/components/agenda-content-object-form/agenda-content-object-form.component.ts b/client/src/app/shared/components/agenda-content-object-form/agenda-content-object-form.component.ts index 26fc88988..d2a6cf940 100644 --- a/client/src/app/shared/components/agenda-content-object-form/agenda-content-object-form.component.ts +++ b/client/src/app/shared/components/agenda-content-object-form/agenda-content-object-form.component.ts @@ -1,12 +1,12 @@ import { Component, Input, OnInit } from '@angular/core'; -import { FormGroup, FormControl } from '@angular/forms'; +import { FormControl, FormGroup } from '@angular/forms'; import { BehaviorSubject } from 'rxjs'; -import { ConfigService } from 'app/core/ui-services/config.service'; -import { ViewItem } from 'app/site/agenda/models/view-item'; import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; import { ItemVisibilityChoices } from 'app/shared/models/agenda/item'; +import { ViewItem } from 'app/site/agenda/models/view-item'; type AgendaItemCreateChoices = 'always' | 'never' | 'default_yes' | 'default_no'; diff --git a/client/src/app/shared/components/attachment-control/attachment-control.component.spec.ts b/client/src/app/shared/components/attachment-control/attachment-control.component.spec.ts index 9a4fe10d0..3442f3767 100644 --- a/client/src/app/shared/components/attachment-control/attachment-control.component.spec.ts +++ b/client/src/app/shared/components/attachment-control/attachment-control.component.spec.ts @@ -1,7 +1,8 @@ -import { async, TestBed, ComponentFixture } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { AttachmentControlComponent } from './attachment-control.component'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('AttachmentControlComponent', () => { let component: AttachmentControlComponent; diff --git a/client/src/app/shared/components/attachment-control/attachment-control.component.ts b/client/src/app/shared/components/attachment-control/attachment-control.component.ts index 912a59c7f..250ab54f4 100644 --- a/client/src/app/shared/components/attachment-control/attachment-control.component.ts +++ b/client/src/app/shared/components/attachment-control/attachment-control.component.ts @@ -1,6 +1,7 @@ -import { Component, OnInit, TemplateRef, Output, EventEmitter, Input } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output, TemplateRef } from '@angular/core'; +import { ControlValueAccessor, FormControl } from '@angular/forms'; import { MatDialog } from '@angular/material'; -import { FormControl, ControlValueAccessor } from '@angular/forms'; + import { BehaviorSubject } from 'rxjs'; import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service'; diff --git a/client/src/app/shared/components/block-tile/block-tile.component.spec.ts b/client/src/app/shared/components/block-tile/block-tile.component.spec.ts index d29db644f..4e2b4c73b 100644 --- a/client/src/app/shared/components/block-tile/block-tile.component.spec.ts +++ b/client/src/app/shared/components/block-tile/block-tile.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { BlockTileComponent } from './block-tile.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { BlockTileComponent } from './block-tile.component'; + describe('BlockTileComponent', () => { let component: BlockTileComponent; let fixture: ComponentFixture; diff --git a/client/src/app/shared/components/block-tile/block-tile.component.ts b/client/src/app/shared/components/block-tile/block-tile.component.ts index a8383f3e8..7650577c8 100644 --- a/client/src/app/shared/components/block-tile/block-tile.component.ts +++ b/client/src/app/shared/components/block-tile/block-tile.component.ts @@ -1,4 +1,5 @@ -import { Component, TemplateRef, ContentChild, Input } from '@angular/core'; +import { Component, ContentChild, Input, TemplateRef } from '@angular/core'; + import { TileComponent } from '../tile/tile.component'; /** 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 b83c78fa7..dccf08c5e 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 @@ -1,8 +1,8 @@ import { Component, Inject, ViewEncapsulation } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { Displayable } from 'app/site/base/displayable'; import { Identifiable } from 'app/shared/models/base/identifiable'; +import { Displayable } from 'app/site/base/displayable'; /** * An option needs to be identifiable and should have a strnig to display. Either uses Displayble or diff --git a/client/src/app/shared/components/contdown-time/countdown-time.component.ts b/client/src/app/shared/components/contdown-time/countdown-time.component.ts index caf847ad3..213b07cc4 100644 --- a/client/src/app/shared/components/contdown-time/countdown-time.component.ts +++ b/client/src/app/shared/components/contdown-time/countdown-time.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, Input } from '@angular/core'; +import { Component, Input, OnDestroy } from '@angular/core'; import { ServertimeService } from 'app/core/core-services/servertime.service'; diff --git a/client/src/app/shared/components/copyright-sign/copyright-sign.component.ts b/client/src/app/shared/components/copyright-sign/copyright-sign.component.ts index 4d50dbb4d..8c03dee36 100644 --- a/client/src/app/shared/components/copyright-sign/copyright-sign.component.ts +++ b/client/src/app/shared/components/copyright-sign/copyright-sign.component.ts @@ -2,12 +2,14 @@ * Remember: Do not tell, Do not ask. */ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { MatDialogRef, MatDialog } from '@angular/material/dialog'; -import { OperatorService } from 'app/core/core-services/operator.service'; -import { NotifyService, NotifyResponse } from 'app/core/core-services/notify.service'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; + import { Subscription } from 'rxjs'; +import { NotifyResponse, NotifyService } from 'app/core/core-services/notify.service'; +import { OperatorService } from 'app/core/core-services/operator.service'; + /** * All player types. */ diff --git a/client/src/app/shared/components/extension-field/extension-field.component.spec.ts b/client/src/app/shared/components/extension-field/extension-field.component.spec.ts index 5294e9f8d..4d2868ccd 100644 --- a/client/src/app/shared/components/extension-field/extension-field.component.spec.ts +++ b/client/src/app/shared/components/extension-field/extension-field.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ExtensionFieldComponent } from './extension-field.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { ExtensionFieldComponent } from './extension-field.component'; + describe('ExtensionFieldComponent', () => { let component: ExtensionFieldComponent; let fixture: ComponentFixture; diff --git a/client/src/app/shared/components/extension-field/extension-field.component.ts b/client/src/app/shared/components/extension-field/extension-field.component.ts index 3cb2ac973..38232228b 100644 --- a/client/src/app/shared/components/extension-field/extension-field.component.ts +++ b/client/src/app/shared/components/extension-field/extension-field.component.ts @@ -1,7 +1,8 @@ -import { Component, OnInit, Input, Output, EventEmitter, OnDestroy } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { NavigationEnd, Router } from '@angular/router'; + import { BehaviorSubject, Subscription } from 'rxjs'; -import { FormGroup, FormBuilder } from '@angular/forms'; -import { Router, NavigationEnd } from '@angular/router'; @Component({ selector: 'os-extension-field', diff --git a/client/src/app/shared/components/grid-layout/grid-layout.component.spec.ts b/client/src/app/shared/components/grid-layout/grid-layout.component.spec.ts index 97682e139..fb0ef9034 100644 --- a/client/src/app/shared/components/grid-layout/grid-layout.component.spec.ts +++ b/client/src/app/shared/components/grid-layout/grid-layout.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { GridLayoutComponent } from './grid-layout.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { GridLayoutComponent } from './grid-layout.component'; + describe('GridLayoutComponent', () => { let component: GridLayoutComponent; let fixture: ComponentFixture; diff --git a/client/src/app/shared/components/head-bar/head-bar.component.spec.ts b/client/src/app/shared/components/head-bar/head-bar.component.spec.ts index e86cea296..39f7761ff 100644 --- a/client/src/app/shared/components/head-bar/head-bar.component.spec.ts +++ b/client/src/app/shared/components/head-bar/head-bar.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { HeadBarComponent } from './head-bar.component'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { HeadBarComponent } from './head-bar.component'; describe('HeadBarComponent', () => { let component: HeadBarComponent; diff --git a/client/src/app/shared/components/head-bar/head-bar.component.ts b/client/src/app/shared/components/head-bar/head-bar.component.ts index 8c0352bde..f644bbc54 100644 --- a/client/src/app/shared/components/head-bar/head-bar.component.ts +++ b/client/src/app/shared/components/head-bar/head-bar.component.ts @@ -1,9 +1,9 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { Router, ActivatedRoute } from '@angular/router'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; -import { ViewportService } from 'app/core/ui-services/viewport.service'; import { MainMenuService } from 'app/core/core-services/main-menu.service'; import { RoutingStateService } from 'app/core/ui-services/routing-state.service'; +import { ViewportService } from 'app/core/ui-services/viewport.service'; /** * Reusable head bar component for Apps. diff --git a/client/src/app/shared/components/icon-container/icon-container.component.spec.ts b/client/src/app/shared/components/icon-container/icon-container.component.spec.ts index f40c62ab0..e64441e6e 100644 --- a/client/src/app/shared/components/icon-container/icon-container.component.spec.ts +++ b/client/src/app/shared/components/icon-container/icon-container.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IconContainerComponent } from './icon-container.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { IconContainerComponent } from './icon-container.component'; + describe('IconContainerComponent', () => { let component: IconContainerComponent; let fixture: ComponentFixture; diff --git a/client/src/app/shared/components/icon-container/icon-container.component.ts b/client/src/app/shared/components/icon-container/icon-container.component.ts index 3dc68d5d6..7b4177c60 100644 --- a/client/src/app/shared/components/icon-container/icon-container.component.ts +++ b/client/src/app/shared/components/icon-container/icon-container.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, HostBinding, Output, EventEmitter } from '@angular/core'; +import { Component, EventEmitter, HostBinding, Input, Output } from '@angular/core'; @Component({ selector: 'os-icon-container', diff --git a/client/src/app/shared/components/legal-notice-content/legal-notice-content.component.spec.ts b/client/src/app/shared/components/legal-notice-content/legal-notice-content.component.spec.ts index b2a10a9a3..87acca27b 100644 --- a/client/src/app/shared/components/legal-notice-content/legal-notice-content.component.spec.ts +++ b/client/src/app/shared/components/legal-notice-content/legal-notice-content.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { LegalNoticeContentComponent } from './legal-notice-content.component'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { LegalNoticeContentComponent } from './legal-notice-content.component'; describe('LegalNoticeComponent', () => { let component: LegalNoticeContentComponent; diff --git a/client/src/app/shared/components/legal-notice-content/legal-notice-content.component.ts b/client/src/app/shared/components/legal-notice-content/legal-notice-content.component.ts index 7d47ad4e8..9a5be7199 100644 --- a/client/src/app/shared/components/legal-notice-content/legal-notice-content.component.ts +++ b/client/src/app/shared/components/legal-notice-content/legal-notice-content.component.ts @@ -1,8 +1,9 @@ import { Component, OnInit } from '@angular/core'; -import { LoginDataService } from 'app/core/ui-services/login-data.service'; import { environment } from 'environments/environment'; + import { HttpService } from 'app/core/core-services/http.service'; +import { LoginDataService } from 'app/core/ui-services/login-data.service'; /** * Characterize a plugin. This data is retrieved from the server diff --git a/client/src/app/shared/components/list-view-table/list-view-table.component.spec.ts b/client/src/app/shared/components/list-view-table/list-view-table.component.spec.ts index 03aa5198d..131ec7f62 100644 --- a/client/src/app/shared/components/list-view-table/list-view-table.component.spec.ts +++ b/client/src/app/shared/components/list-view-table/list-view-table.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ListViewTableComponent } from './list-view-table.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { ListViewTableComponent } from './list-view-table.component'; + describe('ListViewTableComponent', () => { let component: ListViewTableComponent; let fixture: ComponentFixture>; diff --git a/client/src/app/shared/components/list-view-table/list-view-table.component.ts b/client/src/app/shared/components/list-view-table/list-view-table.component.ts index d1fdfeda3..1276accdd 100644 --- a/client/src/app/shared/components/list-view-table/list-view-table.component.ts +++ b/client/src/app/shared/components/list-view-table/list-view-table.component.ts @@ -1,30 +1,30 @@ import { - Component, - OnInit, - Input, - ViewChild, - Output, - EventEmitter, ChangeDetectionStrategy, - ViewEncapsulation, - ChangeDetectorRef + ChangeDetectorRef, + Component, + EventEmitter, + Input, + OnInit, + Output, + ViewChild, + ViewEncapsulation } from '@angular/core'; -import { Observable } from 'rxjs'; -import { PblDataSource, columnFactory, PblNgridComponent, createDS } from '@pebula/ngrid'; +import { columnFactory, createDS, PblDataSource, PblNgridComponent } from '@pebula/ngrid'; import { PblColumnDefinition, PblNgridColumnSet } from '@pebula/ngrid/lib/table'; import { PblNgridDataMatrixRow } from '@pebula/ngrid/target-events'; +import { Observable } from 'rxjs'; -import { BaseViewModel } from 'app/site/base/base-view-model'; -import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model'; -import { BaseSortListService } from 'app/core/ui-services/base-sort-list.service'; -import { BaseViewModelWithContentObject } from 'app/site/base/base-view-model-with-content-object'; -import { BaseFilterListService } from 'app/core/ui-services/base-filter-list.service'; -import { BaseRepository } from 'app/core/repositories/base-repository'; -import { BaseModel } from 'app/shared/models/base/base-model'; -import { Permission, OperatorService } from 'app/core/core-services/operator.service'; +import { OperatorService, Permission } from 'app/core/core-services/operator.service'; import { StorageService } from 'app/core/core-services/storage.service'; +import { BaseRepository } from 'app/core/repositories/base-repository'; +import { BaseFilterListService } from 'app/core/ui-services/base-filter-list.service'; +import { BaseSortListService } from 'app/core/ui-services/base-sort-list.service'; import { ViewportService } from 'app/core/ui-services/viewport.service'; +import { BaseModel } from 'app/shared/models/base/base-model'; +import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model'; +import { BaseViewModel } from 'app/site/base/base-view-model'; +import { BaseViewModelWithContentObject } from 'app/site/base/base-view-model-with-content-object'; /** * To hide columns via restriction diff --git a/client/src/app/shared/components/logo/logo.component.spec.ts b/client/src/app/shared/components/logo/logo.component.spec.ts index acb109ee0..0bd82fba2 100644 --- a/client/src/app/shared/components/logo/logo.component.spec.ts +++ b/client/src/app/shared/components/logo/logo.component.spec.ts @@ -1,6 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { LogoComponent } from './logo.component'; describe('LogoComponent', () => { diff --git a/client/src/app/shared/components/logo/logo.component.ts b/client/src/app/shared/components/logo/logo.component.ts index b986bc639..2183c53dd 100644 --- a/client/src/app/shared/components/logo/logo.component.ts +++ b/client/src/app/shared/components/logo/logo.component.ts @@ -1,9 +1,10 @@ -import { Component, Input, OnInit, OnDestroy } from '@angular/core'; +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { ThemeService } from 'app/core/ui-services/theme.service'; -import { LoginDataService } from 'app/core/ui-services/login-data.service'; import { Subscription } from 'rxjs'; +import { LoginDataService } from 'app/core/ui-services/login-data.service'; +import { ThemeService } from 'app/core/ui-services/theme.service'; + /** * Component to hold the logo for the app. */ diff --git a/client/src/app/shared/components/media-upload-content/media-upload-content.component.spec.ts b/client/src/app/shared/components/media-upload-content/media-upload-content.component.spec.ts index 1bbab2ec6..c00a74915 100644 --- a/client/src/app/shared/components/media-upload-content/media-upload-content.component.spec.ts +++ b/client/src/app/shared/components/media-upload-content/media-upload-content.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MediaUploadContentComponent } from './media-upload-content.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MediaUploadContentComponent } from './media-upload-content.component'; + describe('MediaUploadContentComponent', () => { let component: MediaUploadContentComponent; let fixture: ComponentFixture; diff --git a/client/src/app/shared/components/media-upload-content/media-upload-content.component.ts b/client/src/app/shared/components/media-upload-content/media-upload-content.component.ts index 536c79c67..94bf3ae62 100644 --- a/client/src/app/shared/components/media-upload-content/media-upload-content.component.ts +++ b/client/src/app/shared/components/media-upload-content/media-upload-content.component.ts @@ -1,13 +1,13 @@ -import { Component, OnInit, ViewChild, Input, Output, EventEmitter } from '@angular/core'; -import { MatTableDataSource, MatTable } from '@angular/material/table'; +import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; +import { MatTable, MatTableDataSource } from '@angular/material/table'; import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop'; import { BehaviorSubject } from 'rxjs'; import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service'; -import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; +import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; import { ViewGroup } from 'app/site/users/models/view-group'; /** diff --git a/client/src/app/shared/components/meta-text-block/meta-text-block.component.spec.ts b/client/src/app/shared/components/meta-text-block/meta-text-block.component.spec.ts index e3dc79935..3218b8ce0 100644 --- a/client/src/app/shared/components/meta-text-block/meta-text-block.component.spec.ts +++ b/client/src/app/shared/components/meta-text-block/meta-text-block.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MetaTextBlockComponent } from './meta-text-block.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MetaTextBlockComponent } from './meta-text-block.component'; + describe('MetaTextBlockComponent', () => { let component: MetaTextBlockComponent; let fixture: ComponentFixture; diff --git a/client/src/app/shared/components/meta-text-block/meta-text-block.component.ts b/client/src/app/shared/components/meta-text-block/meta-text-block.component.ts index ce293a25a..bbf4dab29 100644 --- a/client/src/app/shared/components/meta-text-block/meta-text-block.component.ts +++ b/client/src/app/shared/components/meta-text-block/meta-text-block.component.ts @@ -3,8 +3,8 @@ import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { BaseComponent } from '../../../base.component'; import { ViewportService } from 'app/core/ui-services/viewport.service'; +import { BaseComponent } from '../../../base.component'; /** * Component for the motion comments view diff --git a/client/src/app/shared/components/privacy-policy-content/privacy-policy-content.component.spec.ts b/client/src/app/shared/components/privacy-policy-content/privacy-policy-content.component.spec.ts index a98f71297..a88a8c29a 100644 --- a/client/src/app/shared/components/privacy-policy-content/privacy-policy-content.component.spec.ts +++ b/client/src/app/shared/components/privacy-policy-content/privacy-policy-content.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { PrivacyPolicyContentComponent } from './privacy-policy-content.component'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { PrivacyPolicyContentComponent } from './privacy-policy-content.component'; describe('PrivacyPolicyComponent', () => { let component: PrivacyPolicyContentComponent; diff --git a/client/src/app/shared/components/projection-dialog/projection-dialog.component.ts b/client/src/app/shared/components/projection-dialog/projection-dialog.component.ts index e8a8acd88..ec35f7c58 100644 --- a/client/src/app/shared/components/projection-dialog/projection-dialog.component.ts +++ b/client/src/app/shared/components/projection-dialog/projection-dialog.component.ts @@ -1,16 +1,16 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; import { DataStoreService } from 'app/core/core-services/data-store.service'; -import { Projector, IdentifiableProjectorElement } from 'app/shared/models/core/projector'; import { ProjectorService } from 'app/core/core-services/projector.service'; +import { IdentifiableProjectorElement, Projector } from 'app/shared/models/core/projector'; +import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; import { - SlideOption, - isSlideDecisionOption, isSlideChoiceOption, - SlideDecisionOption, + isSlideDecisionOption, SlideChoiceOption, + SlideDecisionOption, + SlideOption, SlideOptions } from 'app/site/base/slide-options'; diff --git a/client/src/app/shared/components/projector-button/projector-button.component.spec.ts b/client/src/app/shared/components/projector-button/projector-button.component.spec.ts index 08c24275e..740a7a240 100644 --- a/client/src/app/shared/components/projector-button/projector-button.component.spec.ts +++ b/client/src/app/shared/components/projector-button/projector-button.component.spec.ts @@ -1,6 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { ProjectorButtonComponent } from './projector-button.component'; describe('ProjectorButtonComponent', () => { diff --git a/client/src/app/shared/components/projector-button/projector-button.component.ts b/client/src/app/shared/components/projector-button/projector-button.component.ts index 7debc9839..7291d8162 100644 --- a/client/src/app/shared/components/projector-button/projector-button.component.ts +++ b/client/src/app/shared/components/projector-button/projector-button.component.ts @@ -1,14 +1,14 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; -import { - Projectable, - ProjectorElementBuildDeskriptor, - isProjectable, - isProjectorElementBuildDeskriptor -} from 'app/site/base/projectable'; -import { Projector } from 'app/shared/models/core/projector'; import { ProjectorService } from 'app/core/core-services/projector.service'; import { ProjectionDialogService } from 'app/core/ui-services/projection-dialog.service'; +import { Projector } from 'app/shared/models/core/projector'; +import { + isProjectable, + isProjectorElementBuildDeskriptor, + Projectable, + ProjectorElementBuildDeskriptor +} from 'app/site/base/projectable'; /** * The projector button to project something on the projector. diff --git a/client/src/app/shared/components/projector/projector.component.spec.ts b/client/src/app/shared/components/projector/projector.component.spec.ts index 008a073fb..efe525e7c 100644 --- a/client/src/app/shared/components/projector/projector.component.spec.ts +++ b/client/src/app/shared/components/projector/projector.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ProjectorComponent } from './projector.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { ProjectorComponent } from './projector.component'; + describe('ProjectorComponent', () => { let component: ProjectorComponent; let fixture: ComponentFixture; diff --git a/client/src/app/shared/components/projector/projector.component.ts b/client/src/app/shared/components/projector/projector.component.ts index 9e579bafa..bca0cd4f6 100644 --- a/client/src/app/shared/components/projector/projector.component.ts +++ b/client/src/app/shared/components/projector/projector.component.ts @@ -1,16 +1,16 @@ -import { Component, Input, ViewChild, ElementRef, OnDestroy } from '@angular/core'; +import { Component, ElementRef, Input, OnDestroy, ViewChild } from '@angular/core'; import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { Subscription, Subject } from 'rxjs'; +import { Subject, Subscription } from 'rxjs'; import { BaseComponent } from 'app/base.component'; +import { OfflineService } from 'app/core/core-services/offline.service'; +import { ProjectorDataService, SlideData } from 'app/core/core-services/projector-data.service'; +import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service'; import { ConfigService } from 'app/core/ui-services/config.service'; import { ViewProjector } from 'app/site/projector/models/view-projector'; import { Size } from 'app/site/projector/size'; -import { OfflineService } from 'app/core/core-services/offline.service'; -import { SlideData, ProjectorDataService } from 'app/core/core-services/projector-data.service'; -import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service'; /** * THE projector. Cares about scaling and the right size and resolution. diff --git a/client/src/app/shared/components/search-value-selector/search-value-selector.component.spec.ts b/client/src/app/shared/components/search-value-selector/search-value-selector.component.spec.ts index 4b4bbd6e1..bdfa2788a 100644 --- a/client/src/app/shared/components/search-value-selector/search-value-selector.component.spec.ts +++ b/client/src/app/shared/components/search-value-selector/search-value-selector.component.spec.ts @@ -1,12 +1,13 @@ +import { Component, ViewChild } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { FormBuilder, FormControl } from '@angular/forms'; -import { SearchValueSelectorComponent } from './search-value-selector.component'; -import { E2EImportsModule } from '../../../../e2e-imports.module'; -import { ViewChild, Component } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; -import { FormControl, FormBuilder } from '@angular/forms'; -import { Selectable } from '../selectable'; + +import { E2EImportsModule } from '../../../../e2e-imports.module'; import { EmptySelectable } from '../empty-selectable'; +import { SearchValueSelectorComponent } from './search-value-selector.component'; +import { Selectable } from '../selectable'; describe('SearchValueSelectorComponent', () => { @Component({ diff --git a/client/src/app/shared/components/search-value-selector/search-value-selector.component.ts b/client/src/app/shared/components/search-value-selector/search-value-selector.component.ts index 23b9c2e45..64005a534 100644 --- a/client/src/app/shared/components/search-value-selector/search-value-selector.component.ts +++ b/client/src/app/shared/components/search-value-selector/search-value-selector.component.ts @@ -1,10 +1,10 @@ -import { Component, Input, ViewChild, OnDestroy, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, OnDestroy, ViewChild } from '@angular/core'; import { FormControl } from '@angular/forms'; import { MatSelect } from '@angular/material'; +import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, Subscription } from 'rxjs'; import { auditTime } from 'rxjs/operators'; -import { TranslateService } from '@ngx-translate/core'; import { Selectable } from '../selectable'; diff --git a/client/src/app/shared/components/slide-container/slide-container.component.spec.ts b/client/src/app/shared/components/slide-container/slide-container.component.spec.ts index 7b85179ad..d9792cf8d 100644 --- a/client/src/app/shared/components/slide-container/slide-container.component.spec.ts +++ b/client/src/app/shared/components/slide-container/slide-container.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SlideContainerComponent } from './slide-container.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { SlideContainerComponent } from './slide-container.component'; + describe('SlideContainerComponent', () => { let component: SlideContainerComponent; let fixture: ComponentFixture; diff --git a/client/src/app/shared/components/slide-container/slide-container.component.ts b/client/src/app/shared/components/slide-container/slide-container.component.ts index 8a97c1318..747616a67 100644 --- a/client/src/app/shared/components/slide-container/slide-container.component.ts +++ b/client/src/app/shared/components/slide-container/slide-container.component.ts @@ -1,14 +1,15 @@ -import { Component, Input, ViewChild, ViewContainerRef, ComponentRef } from '@angular/core'; +import { Component, ComponentRef, Input, ViewChild, ViewContainerRef } from '@angular/core'; import { Title } from '@angular/platform-browser'; + import { TranslateService } from '@ngx-translate/core'; import { BaseComponent } from 'app/base.component'; -import { SlideManager } from 'app/slides/services/slide-manager.service'; -import { BaseSlideComponent } from 'app/slides/base-slide-component'; import { SlideData } from 'app/core/core-services/projector-data.service'; import { ProjectorElement } from 'app/shared/models/core/projector'; import { ViewProjector } from 'app/site/projector/models/view-projector'; import { isBaseScaleScrollSlideComponent } from 'app/slides/base-scale-scroll-slide-component'; +import { BaseSlideComponent } from 'app/slides/base-slide-component'; +import { SlideManager } from 'app/slides/services/slide-manager.service'; function hasError(obj: object): obj is { error: string } { return (<{ error: string }>obj).error !== undefined; diff --git a/client/src/app/shared/components/sort-filter-bar/filter-menu/filter-menu.component.ts b/client/src/app/shared/components/sort-filter-bar/filter-menu/filter-menu.component.ts index 1a15344ac..ca6729e79 100644 --- a/client/src/app/shared/components/sort-filter-bar/filter-menu/filter-menu.component.ts +++ b/client/src/app/shared/components/sort-filter-bar/filter-menu/filter-menu.component.ts @@ -1,4 +1,4 @@ -import { Output, Component, OnInit, EventEmitter, Input } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { BaseFilterListService, OsFilterOption } from 'app/core/ui-services/base-filter-list.service'; import { BaseViewModel } from 'app/site/base/base-view-model'; diff --git a/client/src/app/shared/components/sort-filter-bar/sort-bottom-sheet/sort-bottom-sheet.component.spec.ts b/client/src/app/shared/components/sort-filter-bar/sort-bottom-sheet/sort-bottom-sheet.component.spec.ts index ccea1e84c..170cb0f2a 100644 --- a/client/src/app/shared/components/sort-filter-bar/sort-bottom-sheet/sort-bottom-sheet.component.spec.ts +++ b/client/src/app/shared/components/sort-filter-bar/sort-bottom-sheet/sort-bottom-sheet.component.spec.ts @@ -1,4 +1,5 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + import { E2EImportsModule } from 'e2e-imports.module'; import { SortBottomSheetComponent } from './sort-bottom-sheet.component'; diff --git a/client/src/app/shared/components/sort-filter-bar/sort-bottom-sheet/sort-bottom-sheet.component.ts b/client/src/app/shared/components/sort-filter-bar/sort-bottom-sheet/sort-bottom-sheet.component.ts index eb92ee6cc..8012dda34 100644 --- a/client/src/app/shared/components/sort-filter-bar/sort-bottom-sheet/sort-bottom-sheet.component.ts +++ b/client/src/app/shared/components/sort-filter-bar/sort-bottom-sheet/sort-bottom-sheet.component.ts @@ -1,5 +1,5 @@ -import { Inject, Component, OnInit } from '@angular/core'; -import { MatBottomSheetRef, MAT_BOTTOM_SHEET_DATA } from '@angular/material/bottom-sheet'; +import { Component, Inject, OnInit } from '@angular/core'; +import { MAT_BOTTOM_SHEET_DATA, MatBottomSheetRef } from '@angular/material/bottom-sheet'; import { BaseSortListService } from 'app/core/ui-services/base-sort-list.service'; import { BaseViewModel } from 'app/site/base/base-view-model'; diff --git a/client/src/app/shared/components/sort-filter-bar/sort-filter-bar.component.spec.ts b/client/src/app/shared/components/sort-filter-bar/sort-filter-bar.component.spec.ts index ac35ab901..f5ebbdc89 100644 --- a/client/src/app/shared/components/sort-filter-bar/sort-filter-bar.component.spec.ts +++ b/client/src/app/shared/components/sort-filter-bar/sort-filter-bar.component.spec.ts @@ -1,6 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { SortFilterBarComponent } from './sort-filter-bar.component'; describe('OsSortFilterBarComponent', () => { diff --git a/client/src/app/shared/components/sort-filter-bar/sort-filter-bar.component.ts b/client/src/app/shared/components/sort-filter-bar/sort-filter-bar.component.ts index b30af6975..cc762135c 100644 --- a/client/src/app/shared/components/sort-filter-bar/sort-filter-bar.component.ts +++ b/client/src/app/shared/components/sort-filter-bar/sort-filter-bar.component.ts @@ -1,15 +1,15 @@ -import { Input, Output, Component, ViewChild, EventEmitter, ViewEncapsulation } from '@angular/core'; +import { Component, EventEmitter, Input, Output, ViewChild, ViewEncapsulation } from '@angular/core'; import { MatBottomSheet } from '@angular/material/bottom-sheet'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewModel } from 'app/site/base/base-view-model'; -import { SortBottomSheetComponent } from './sort-bottom-sheet/sort-bottom-sheet.component'; -import { FilterMenuComponent } from './filter-menu/filter-menu.component'; +import { BaseFilterListService, OsFilterIndicator } from 'app/core/ui-services/base-filter-list.service'; import { OsSortingOption } from 'app/core/ui-services/base-sort-list.service'; import { BaseSortListService } from 'app/core/ui-services/base-sort-list.service'; import { ViewportService } from 'app/core/ui-services/viewport.service'; -import { BaseFilterListService, OsFilterIndicator } from 'app/core/ui-services/base-filter-list.service'; +import { BaseViewModel } from 'app/site/base/base-view-model'; +import { FilterMenuComponent } from './filter-menu/filter-menu.component'; +import { SortBottomSheetComponent } from './sort-bottom-sheet/sort-bottom-sheet.component'; /** * Reusable bar for list views, offering sorting and filter options. diff --git a/client/src/app/shared/components/sorting-list/sorting-list.component.spec.ts b/client/src/app/shared/components/sorting-list/sorting-list.component.spec.ts index c3c2d0dfd..7b2b42463 100644 --- a/client/src/app/shared/components/sorting-list/sorting-list.component.spec.ts +++ b/client/src/app/shared/components/sorting-list/sorting-list.component.spec.ts @@ -1,9 +1,10 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { E2EImportsModule } from '../../../../e2e-imports.module'; -import { SortingListComponent } from './sorting-list.component'; import { Component, ViewChild } from '@angular/core'; -import { Selectable } from '../selectable'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from '../../../../e2e-imports.module'; import { EmptySelectable } from '../empty-selectable'; +import { Selectable } from '../selectable'; +import { SortingListComponent } from './sorting-list.component'; describe('SortingListComponent', () => { @Component({ diff --git a/client/src/app/shared/components/sorting-list/sorting-list.component.ts b/client/src/app/shared/components/sorting-list/sorting-list.component.ts index b5774be2f..4f49e00fb 100644 --- a/client/src/app/shared/components/sorting-list/sorting-list.component.ts +++ b/client/src/app/shared/components/sorting-list/sorting-list.component.ts @@ -1,5 +1,5 @@ -import { Component, OnInit, Input, Output, EventEmitter, ContentChild, TemplateRef, OnDestroy } from '@angular/core'; import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; +import { Component, ContentChild, EventEmitter, Input, OnDestroy, OnInit, Output, TemplateRef } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { Observable, Subscription } from 'rxjs'; diff --git a/client/src/app/shared/components/sorting-tree/sorting-tree.component.spec.ts b/client/src/app/shared/components/sorting-tree/sorting-tree.component.spec.ts index 83f64536e..ec1aecbea 100644 --- a/client/src/app/shared/components/sorting-tree/sorting-tree.component.spec.ts +++ b/client/src/app/shared/components/sorting-tree/sorting-tree.component.spec.ts @@ -1,11 +1,13 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { E2EImportsModule } from 'e2e-imports.module'; -import { SortingTreeComponent } from './sorting-tree.component'; import { Component, ViewChild } from '@angular/core'; -import { Displayable } from 'app/site/base/displayable'; -import { Identifiable } from 'app/shared/models/base/identifiable'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { BehaviorSubject } from 'rxjs'; +import { Identifiable } from 'app/shared/models/base/identifiable'; +import { Displayable } from 'app/site/base/displayable'; +import { SortingTreeComponent } from './sorting-tree.component'; + /** * A test model for the sorting */ diff --git a/client/src/app/shared/components/sorting-tree/sorting-tree.component.ts b/client/src/app/shared/components/sorting-tree/sorting-tree.component.ts index b8a4cc1b4..02ee7954c 100644 --- a/client/src/app/shared/components/sorting-tree/sorting-tree.component.ts +++ b/client/src/app/shared/components/sorting-tree/sorting-tree.component.ts @@ -1,14 +1,14 @@ -import { Component, OnInit, Input, OnDestroy, Output, EventEmitter, ContentChild, TemplateRef } from '@angular/core'; -import { FlatTreeControl } from '@angular/cdk/tree'; import { ArrayDataSource } from '@angular/cdk/collections'; -import { CdkDragMove, CdkDragStart, CdkDragSortEvent } from '@angular/cdk/drag-drop'; +import { CdkDragMove, CdkDragSortEvent, CdkDragStart } from '@angular/cdk/drag-drop'; +import { FlatTreeControl } from '@angular/cdk/tree'; +import { Component, ContentChild, EventEmitter, Input, OnDestroy, OnInit, Output, TemplateRef } from '@angular/core'; import { Observable, Subscription } from 'rxjs'; import { auditTime } from 'rxjs/operators'; +import { FlatNode, TreeIdNode, TreeService } from 'app/core/ui-services/tree.service'; import { Identifiable } from 'app/shared/models/base/identifiable'; import { Displayable } from 'app/site/base/displayable'; -import { TreeService, FlatNode, TreeIdNode } from 'app/core/ui-services/tree.service'; /** * Enumaration to separate between the directions. diff --git a/client/src/app/shared/components/speaker-button/speaker-button.component.spec.ts b/client/src/app/shared/components/speaker-button/speaker-button.component.spec.ts index 23c7101a2..4007a58f5 100644 --- a/client/src/app/shared/components/speaker-button/speaker-button.component.spec.ts +++ b/client/src/app/shared/components/speaker-button/speaker-button.component.spec.ts @@ -1,6 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { SpeakerButtonComponent } from './speaker-button.component'; describe('SpeakerButtonComponent', () => { diff --git a/client/src/app/shared/components/speaker-button/speaker-button.component.ts b/client/src/app/shared/components/speaker-button/speaker-button.component.ts index c966fd1a2..334358d2c 100644 --- a/client/src/app/shared/components/speaker-button/speaker-button.component.ts +++ b/client/src/app/shared/components/speaker-button/speaker-button.component.ts @@ -1,12 +1,12 @@ import { Component, Input } from '@angular/core'; +import { ListOfSpeakersRepositoryService } from 'app/core/repositories/agenda/list-of-speakers-repository.service'; import { ContentObject, isContentObject } from 'app/shared/models/base/content-object'; import { ViewListOfSpeakers } from 'app/site/agenda/models/view-list-of-speakers'; import { BaseViewModelWithListOfSpeakers, isBaseViewModelWithListOfSpeakers } from 'app/site/base/base-view-model-with-list-of-speakers'; -import { ListOfSpeakersRepositoryService } from 'app/core/repositories/agenda/list-of-speakers-repository.service'; /** * A generic button to go to the list of speakers. Give the content object with diff --git a/client/src/app/shared/components/tile/tile.component.ts b/client/src/app/shared/components/tile/tile.component.ts index e720ca7d9..44ff3d503 100644 --- a/client/src/app/shared/components/tile/tile.component.ts +++ b/client/src/app/shared/components/tile/tile.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, TemplateRef, ContentChild, Output, EventEmitter, HostBinding } from '@angular/core'; +import { Component, ContentChild, EventEmitter, HostBinding, Input, OnInit, Output, TemplateRef } from '@angular/core'; /** * Interface, that defines the type of the `ClickEvent`. diff --git a/client/src/app/shared/directives/dom-change.directive.ts b/client/src/app/shared/directives/dom-change.directive.ts index 60938ff74..70dfe081c 100644 --- a/client/src/app/shared/directives/dom-change.directive.ts +++ b/client/src/app/shared/directives/dom-change.directive.ts @@ -1,4 +1,4 @@ -import { Directive, Output, EventEmitter, ElementRef, OnDestroy } from '@angular/core'; +import { Directive, ElementRef, EventEmitter, OnDestroy, Output } from '@angular/core'; /** * detects changes in DOM and emits a signal on changes. diff --git a/client/src/app/shared/directives/perms.directive.ts b/client/src/app/shared/directives/perms.directive.ts index 2001fcaff..cdb450285 100644 --- a/client/src/app/shared/directives/perms.directive.ts +++ b/client/src/app/shared/directives/perms.directive.ts @@ -1,4 +1,4 @@ -import { Directive, Input, TemplateRef, ViewContainerRef, OnDestroy, OnInit } from '@angular/core'; +import { Directive, Input, OnDestroy, OnInit, TemplateRef, ViewContainerRef } from '@angular/core'; import { Subscription } from 'rxjs'; diff --git a/client/src/app/shared/directives/resized.directive.ts b/client/src/app/shared/directives/resized.directive.ts index b513a305c..901f21de1 100644 --- a/client/src/app/shared/directives/resized.directive.ts +++ b/client/src/app/shared/directives/resized.directive.ts @@ -1,4 +1,4 @@ -import { OnInit, ElementRef, Directive, Input } from '@angular/core'; +import { Directive, ElementRef, Input, OnInit } from '@angular/core'; import { ResizeSensor } from 'css-element-queries'; import { Subject } from 'rxjs'; diff --git a/client/src/app/shared/models/agenda/item.ts b/client/src/app/shared/models/agenda/item.ts index 878107249..0dfea7598 100644 --- a/client/src/app/shared/models/agenda/item.ts +++ b/client/src/app/shared/models/agenda/item.ts @@ -1,5 +1,5 @@ -import { ContentObject } from '../base/content-object'; import { BaseModelWithContentObject } from '../base/base-model-with-content-object'; +import { ContentObject } from '../base/content-object'; /** * Determine visibility states for agenda items diff --git a/client/src/app/shared/models/agenda/list-of-speakers.ts b/client/src/app/shared/models/agenda/list-of-speakers.ts index b87f6c99d..e85c121ae 100644 --- a/client/src/app/shared/models/agenda/list-of-speakers.ts +++ b/client/src/app/shared/models/agenda/list-of-speakers.ts @@ -1,6 +1,6 @@ -import { Speaker } from './speaker'; -import { ContentObject } from '../base/content-object'; import { BaseModelWithContentObject } from '../base/base-model-with-content-object'; +import { ContentObject } from '../base/content-object'; +import { Speaker } from './speaker'; /** * Representations of agenda Item diff --git a/client/src/app/shared/models/assignments/assignment.ts b/client/src/app/shared/models/assignments/assignment.ts index d4f00306c..260e5491b 100644 --- a/client/src/app/shared/models/assignments/assignment.ts +++ b/client/src/app/shared/models/assignments/assignment.ts @@ -1,5 +1,5 @@ -import { AssignmentRelatedUser } from './assignment-related-user'; import { AssignmentPoll } from './assignment-poll'; +import { AssignmentRelatedUser } from './assignment-related-user'; import { BaseModelWithAgendaItemAndListOfSpeakers } from '../base/base-model-with-agenda-item-and-list-of-speakers'; /** diff --git a/client/src/app/shared/models/base/base-model-with-content-object.ts b/client/src/app/shared/models/base/base-model-with-content-object.ts index 14ee3cee1..1228e5115 100644 --- a/client/src/app/shared/models/base/base-model-with-content-object.ts +++ b/client/src/app/shared/models/base/base-model-with-content-object.ts @@ -1,5 +1,5 @@ -import { ContentObject } from './content-object'; import { BaseModel } from './base-model'; +import { ContentObject } from './content-object'; /** * A base model which has a content object, like items of list of speakers. diff --git a/client/src/app/shared/models/base/base-model.ts b/client/src/app/shared/models/base/base-model.ts index 6b7443217..ebcf52131 100644 --- a/client/src/app/shared/models/base/base-model.ts +++ b/client/src/app/shared/models/base/base-model.ts @@ -1,6 +1,6 @@ +import { Collection } from './collection'; import { Deserializable } from './deserializable'; import { Identifiable } from './identifiable'; -import { Collection } from './collection'; export interface ModelConstructor> { COLLECTIONSTRING: string; diff --git a/client/src/app/shared/models/motions/motion.ts b/client/src/app/shared/models/motions/motion.ts index 2d7f321d0..9e727ecb6 100644 --- a/client/src/app/shared/models/motions/motion.ts +++ b/client/src/app/shared/models/motions/motion.ts @@ -1,6 +1,6 @@ -import { Submitter } from './submitter'; -import { MotionPoll } from './motion-poll'; import { BaseModelWithAgendaItemAndListOfSpeakers } from '../base/base-model-with-agenda-item-and-list-of-speakers'; +import { MotionPoll } from './motion-poll'; +import { Submitter } from './submitter'; export interface MotionComment { id: number; diff --git a/client/src/app/shared/models/users/user.ts b/client/src/app/shared/models/users/user.ts index afaecb200..58ae9788d 100644 --- a/client/src/app/shared/models/users/user.ts +++ b/client/src/app/shared/models/users/user.ts @@ -1,6 +1,5 @@ -import { BaseModel } from '../base/base-model'; - import { _ } from 'app/core/translate/translation-marker'; +import { BaseModel } from '../base/base-model'; /** * Iterable pre selection of genders (sexes) diff --git a/client/src/app/shared/parent-error-state-matcher.ts b/client/src/app/shared/parent-error-state-matcher.ts index f55bf04d1..67cdca15e 100644 --- a/client/src/app/shared/parent-error-state-matcher.ts +++ b/client/src/app/shared/parent-error-state-matcher.ts @@ -1,5 +1,5 @@ -import { ErrorStateMatcher } from '@angular/material/core'; import { FormControl, FormGroupDirective, NgForm } from '@angular/forms'; +import { ErrorStateMatcher } from '@angular/material/core'; /** * Custom state matcher for mat-errors. Enables the error for an input, if one has set the error diff --git a/client/src/app/shared/pipes/precision.pipe.ts b/client/src/app/shared/pipes/precision.pipe.ts index cb1b3a19a..f35ae2b59 100644 --- a/client/src/app/shared/pipes/precision.pipe.ts +++ b/client/src/app/shared/pipes/precision.pipe.ts @@ -1,5 +1,5 @@ -import { Pipe, PipeTransform } from '@angular/core'; import { DecimalPipe } from '@angular/common'; +import { Pipe, PipeTransform } from '@angular/core'; /** * Formats floats to have a defined precision. diff --git a/client/src/app/shared/utils/recommendation-type-names.ts b/client/src/app/shared/utils/recommendation-type-names.ts index e1889a7f0..1aa0adeae 100644 --- a/client/src/app/shared/utils/recommendation-type-names.ts +++ b/client/src/app/shared/utils/recommendation-type-names.ts @@ -1,5 +1,5 @@ -import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; import { ModificationType } from 'app/core/ui-services/diff.service'; +import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; /** * Gets the name of the modification type diff --git a/client/src/app/shared/utils/watch-sorting-tree.guard.spec.ts b/client/src/app/shared/utils/watch-sorting-tree.guard.spec.ts index f1999dd86..131ef54cf 100644 --- a/client/src/app/shared/utils/watch-sorting-tree.guard.spec.ts +++ b/client/src/app/shared/utils/watch-sorting-tree.guard.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { WatchSortingTreeGuard } from './watch-sorting-tree.guard'; diff --git a/client/src/app/shared/validators/custom-validators.ts b/client/src/app/shared/validators/custom-validators.ts index 1bb858a05..5bb4e8f73 100644 --- a/client/src/app/shared/validators/custom-validators.ts +++ b/client/src/app/shared/validators/custom-validators.ts @@ -1,4 +1,4 @@ -import { ValidatorFn, FormGroup, ValidationErrors } from '@angular/forms'; +import { FormGroup, ValidationErrors, ValidatorFn } from '@angular/forms'; /** * Constant to validate a `duration` field. diff --git a/client/src/app/shared/validators/one-of-validator.ts b/client/src/app/shared/validators/one-of-validator.ts index 1c11cceff..57accf354 100644 --- a/client/src/app/shared/validators/one-of-validator.ts +++ b/client/src/app/shared/validators/one-of-validator.ts @@ -1,4 +1,4 @@ -import { ValidationErrors, AbstractControl } from '@angular/forms'; +import { AbstractControl, ValidationErrors } from '@angular/forms'; /** * Custom validator class diff --git a/client/src/app/site/agenda/agenda-routing.module.ts b/client/src/app/site/agenda/agenda-routing.module.ts index 9c46877b0..a2b9fb26c 100644 --- a/client/src/app/site/agenda/agenda-routing.module.ts +++ b/client/src/app/site/agenda/agenda-routing.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AgendaImportListComponent } from './components/agenda-import-list/agenda-import-list.component'; import { AgendaListComponent } from './components/agenda-list/agenda-list.component'; import { AgendaSortComponent } from './components/agenda-sort/agenda-sort.component'; -import { ListOfSpeakersComponent } from './components/list-of-speakers/list-of-speakers.component'; import { WatchSortingTreeGuard } from 'app/shared/utils/watch-sorting-tree.guard'; +import { ListOfSpeakersComponent } from './components/list-of-speakers/list-of-speakers.component'; const routes: Routes = [ { path: '', component: AgendaListComponent, pathMatch: 'full' }, diff --git a/client/src/app/site/agenda/agenda.config.ts b/client/src/app/site/agenda/agenda.config.ts index 495b104bb..63f81809b 100644 --- a/client/src/app/site/agenda/agenda.config.ts +++ b/client/src/app/site/agenda/agenda.config.ts @@ -1,10 +1,10 @@ import { AppConfig } from '../../core/app-config'; -import { Item } from '../../shared/models/agenda/item'; import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; -import { ViewItem } from './models/view-item'; -import { ListOfSpeakers } from 'app/shared/models/agenda/list-of-speakers'; -import { ViewListOfSpeakers } from './models/view-list-of-speakers'; import { ListOfSpeakersRepositoryService } from 'app/core/repositories/agenda/list-of-speakers-repository.service'; +import { ListOfSpeakers } from 'app/shared/models/agenda/list-of-speakers'; +import { Item } from '../../shared/models/agenda/item'; +import { ViewItem } from './models/view-item'; +import { ViewListOfSpeakers } from './models/view-list-of-speakers'; export const AgendaAppConfig: AppConfig = { name: 'agenda', diff --git a/client/src/app/site/agenda/agenda.module.ts b/client/src/app/site/agenda/agenda.module.ts index 7c548e660..aaaa04468 100644 --- a/client/src/app/site/agenda/agenda.module.ts +++ b/client/src/app/site/agenda/agenda.module.ts @@ -1,13 +1,13 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { AgendaImportListComponent } from './components/agenda-import-list/agenda-import-list.component'; import { AgendaListComponent } from './components/agenda-list/agenda-list.component'; -import { ItemInfoDialogComponent } from './components/item-info-dialog/item-info-dialog.component'; import { AgendaRoutingModule } from './agenda-routing.module'; -import { SharedModule } from '../../shared/shared.module'; import { AgendaSortComponent } from './components/agenda-sort/agenda-sort.component'; +import { ItemInfoDialogComponent } from './components/item-info-dialog/item-info-dialog.component'; import { ListOfSpeakersComponent } from './components/list-of-speakers/list-of-speakers.component'; +import { SharedModule } from '../../shared/shared.module'; /** * AppModule for the agenda and it's children. diff --git a/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.spec.ts b/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.spec.ts index 1194ad82f..681799867 100644 --- a/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.spec.ts +++ b/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { AgendaImportListComponent } from './agenda-import-list.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { AgendaImportListComponent } from './agenda-import-list.component'; + describe('AgendaImportListComponent', () => { let component: AgendaImportListComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.ts b/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.ts index 0de6c637e..7092aa1e9 100644 --- a/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.ts +++ b/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.ts @@ -1,14 +1,15 @@ import { Component } from '@angular/core'; -import { FormGroup, FormBuilder } from '@angular/forms'; +import { FormBuilder, FormGroup } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; + import { TranslateService } from '@ngx-translate/core'; import { AgendaImportService } from '../../services/agenda-import.service'; -import { BaseImportListComponent } from 'app/site/base/base-import-list'; import { CsvExportService } from 'app/core/ui-services/csv-export.service'; import { DurationService } from 'app/core/ui-services/duration.service'; import { ItemVisibilityChoices } from 'app/shared/models/agenda/item'; +import { BaseImportListComponent } from 'app/site/base/base-import-list'; import { ViewCreateTopic } from 'app/site/topics/models/view-create-topic'; /** 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 bf896ff94..a877423cb 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 @@ -1,33 +1,33 @@ import { Component, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { Router } from '@angular/router'; import { Title } from '@angular/platform-browser'; +import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { PblColumnDefinition } from '@pebula/ngrid'; -import { _ } from 'app/core/translate/translation-marker'; import { AgendaCsvExportService } from '../../services/agenda-csv-export.service'; import { AgendaFilterListService } from '../../services/agenda-filter-list.service'; import { AgendaPdfService } from '../../services/agenda-pdf.service'; -import { ConfigService } from 'app/core/ui-services/config.service'; -import { ColumnRestriction } from 'app/shared/components/list-view-table/list-view-table.component'; -import { DurationService } from 'app/core/ui-services/duration.service'; -import { ItemInfoDialogComponent } from '../item-info-dialog/item-info-dialog.component'; +import { OperatorService } from 'app/core/core-services/operator.service'; +import { StorageService } from 'app/core/core-services/storage.service'; import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; import { ListOfSpeakersRepositoryService } from 'app/core/repositories/agenda/list-of-speakers-repository.service'; -import { BaseListViewComponent } from 'app/site/base/base-list-view'; -import { OperatorService } from 'app/core/core-services/operator.service'; -import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; -import { PromptService } from 'app/core/ui-services/prompt.service'; -import { PdfDocumentService } from 'app/core/ui-services/pdf-document.service'; -import { StorageService } from 'app/core/core-services/storage.service'; import { TopicRepositoryService } from 'app/core/repositories/topics/topic-repository.service'; +import { _ } from 'app/core/translate/translation-marker'; +import { ConfigService } from 'app/core/ui-services/config.service'; +import { DurationService } from 'app/core/ui-services/duration.service'; +import { PdfDocumentService } from 'app/core/ui-services/pdf-document.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; import { ViewportService } from 'app/core/ui-services/viewport.service'; +import { ColumnRestriction } from 'app/shared/components/list-view-table/list-view-table.component'; +import { BaseListViewComponent } from 'app/site/base/base-list-view'; +import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; +import { ViewTopic } from 'app/site/topics/models/view-topic'; +import { ItemInfoDialogComponent } from '../item-info-dialog/item-info-dialog.component'; import { ViewItem } from '../../models/view-item'; import { ViewListOfSpeakers } from '../../models/view-list-of-speakers'; -import { ViewTopic } from 'app/site/topics/models/view-topic'; /** * List view for the agenda. diff --git a/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.spec.ts b/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.spec.ts index 5ff961314..ccc174c82 100644 --- a/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.spec.ts +++ b/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { AgendaSortComponent } from './agenda-sort.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { AgendaSortComponent } from './agenda-sort.component'; + describe('AgendaSortComponent', () => { let component: AgendaSortComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.ts b/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.ts index c4aa5e496..c9cbcfcbf 100644 --- a/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.ts +++ b/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.ts @@ -1,15 +1,15 @@ import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; -import { BehaviorSubject, Observable } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; +import { BehaviorSubject, Observable } from 'rxjs'; import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; -import { SortTreeViewComponent, SortTreeFilterOption } from 'app/site/base/sort-tree.component'; import { PromptService } from 'app/core/ui-services/prompt.service'; -import { ViewItem } from '../../models/view-item'; import { ItemVisibilityChoices } from 'app/shared/models/agenda/item'; +import { SortTreeFilterOption, SortTreeViewComponent } from 'app/site/base/sort-tree.component'; +import { ViewItem } from '../../models/view-item'; /** * Sort view for the agenda. diff --git a/client/src/app/site/agenda/components/item-info-dialog/item-info-dialog.component.ts b/client/src/app/site/agenda/components/item-info-dialog/item-info-dialog.component.ts index 952862279..6e15366ac 100644 --- a/client/src/app/site/agenda/components/item-info-dialog/item-info-dialog.component.ts +++ b/client/src/app/site/agenda/components/item-info-dialog/item-info-dialog.component.ts @@ -2,10 +2,10 @@ import { Component, Inject } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { ViewItem } from '../../models/view-item'; -import { ItemVisibilityChoices } from 'app/shared/models/agenda/item'; import { DurationService } from 'app/core/ui-services/duration.service'; +import { ItemVisibilityChoices } from 'app/shared/models/agenda/item'; import { durationValidator } from 'app/shared/validators/custom-validators'; +import { ViewItem } from '../../models/view-item'; /** * Dialog component to change agenda item details diff --git a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.spec.ts b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.spec.ts index 5a918e618..3b225f3b8 100644 --- a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.spec.ts +++ b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ListOfSpeakersComponent } from './list-of-speakers.component'; import { E2EImportsModule } from '../../../../../e2e-imports.module'; +import { ListOfSpeakersComponent } from './list-of-speakers.component'; describe('ListOfSpeakersComponent', () => { let component: ListOfSpeakersComponent; diff --git a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.ts b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.ts index 09ae4f011..900da72bc 100644 --- a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.ts +++ b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.ts @@ -1,29 +1,28 @@ -import { ActivatedRoute } from '@angular/router'; import { Component, OnInit } from '@angular/core'; -import { FormGroup, FormControl } from '@angular/forms'; +import { FormControl, FormGroup } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; +import { ActivatedRoute } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, Subscription } from 'rxjs'; -import { BaseViewComponent } from 'app/site/base/base-view'; import { CollectionStringMapperService } from 'app/core/core-services/collection-string-mapper.service'; +import { OperatorService } from 'app/core/core-services/operator.service'; +import { ListOfSpeakersRepositoryService } from 'app/core/repositories/agenda/list-of-speakers-repository.service'; +import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service'; +import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; import { ConfigService } from 'app/core/ui-services/config.service'; +import { DurationService } from 'app/core/ui-services/duration.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; +import { BaseViewComponent } from 'app/site/base/base-view'; +import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; +import { ViewProjector } from 'app/site/projector/models/view-projector'; import { CurrentListOfSpeakersService } from 'app/site/projector/services/current-agenda-item.service'; import { CurrentListOfSpeakersSlideService } from 'app/site/projector/services/current-list-of-of-speakers-slide.service'; -import { DurationService } from 'app/core/ui-services/duration.service'; -import { OperatorService } from 'app/core/core-services/operator.service'; -import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; -import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service'; -import { PromptService } from 'app/core/ui-services/prompt.service'; -import { ViewSpeaker, SpeakerState } from '../../models/view-speaker'; -import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; -import { ViewProjector } from 'app/site/projector/models/view-projector'; import { ViewUser } from 'app/site/users/models/view-user'; - -import { ListOfSpeakersRepositoryService } from 'app/core/repositories/agenda/list-of-speakers-repository.service'; import { ViewListOfSpeakers } from '../../models/view-list-of-speakers'; +import { SpeakerState, ViewSpeaker } from '../../models/view-speaker'; /** * The list of speakers for agenda items. diff --git a/client/src/app/site/agenda/models/view-item.ts b/client/src/app/site/agenda/models/view-item.ts index 837de6410..4ef6fd8de 100644 --- a/client/src/app/site/agenda/models/view-item.ts +++ b/client/src/app/site/agenda/models/view-item.ts @@ -1,7 +1,7 @@ import { Item, ItemVisibilityChoices } from 'app/shared/models/agenda/item'; +import { ContentObject } from 'app/shared/models/base/content-object'; import { BaseViewModelWithAgendaItem } from 'app/site/base/base-view-model-with-agenda-item'; import { BaseViewModelWithContentObject } from 'app/site/base/base-view-model-with-content-object'; -import { ContentObject } from 'app/shared/models/base/content-object'; export interface ItemTitleInformation { contentObject: BaseViewModelWithAgendaItem; diff --git a/client/src/app/site/agenda/models/view-list-of-speakers.ts b/client/src/app/site/agenda/models/view-list-of-speakers.ts index b95750caf..f01a55fdc 100644 --- a/client/src/app/site/agenda/models/view-list-of-speakers.ts +++ b/client/src/app/site/agenda/models/view-list-of-speakers.ts @@ -1,10 +1,10 @@ import { Item } from 'app/shared/models/agenda/item'; -import { ProjectorElementBuildDeskriptor, Projectable } from 'app/site/base/projectable'; import { ListOfSpeakers } from 'app/shared/models/agenda/list-of-speakers'; -import { ViewSpeaker, SpeakerState } from './view-speaker'; -import { BaseViewModelWithListOfSpeakers } from 'app/site/base/base-view-model-with-list-of-speakers'; -import { BaseViewModelWithContentObject } from 'app/site/base/base-view-model-with-content-object'; import { ContentObject } from 'app/shared/models/base/content-object'; +import { BaseViewModelWithContentObject } from 'app/site/base/base-view-model-with-content-object'; +import { BaseViewModelWithListOfSpeakers } from 'app/site/base/base-view-model-with-list-of-speakers'; +import { Projectable, ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; +import { SpeakerState, ViewSpeaker } from './view-speaker'; export interface ListOfSpeakersTitleInformation { contentObject: BaseViewModelWithListOfSpeakers; diff --git a/client/src/app/site/agenda/models/view-speaker.ts b/client/src/app/site/agenda/models/view-speaker.ts index ddf7d98d9..c004371a8 100644 --- a/client/src/app/site/agenda/models/view-speaker.ts +++ b/client/src/app/site/agenda/models/view-speaker.ts @@ -1,5 +1,5 @@ -import { BaseViewModel } from 'app/site/base/base-view-model'; import { Speaker } from 'app/shared/models/agenda/speaker'; +import { BaseViewModel } from 'app/site/base/base-view-model'; import { ViewUser } from 'app/site/users/models/view-user'; /** diff --git a/client/src/app/site/agenda/services/agenda-csv-export.service.spec.ts b/client/src/app/site/agenda/services/agenda-csv-export.service.spec.ts index 2c417b86e..94eae5dab 100644 --- a/client/src/app/site/agenda/services/agenda-csv-export.service.spec.ts +++ b/client/src/app/site/agenda/services/agenda-csv-export.service.spec.ts @@ -1,6 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { AgendaCsvExportService } from './agenda-csv-export.service'; describe('AgendaCsvExportService', () => { diff --git a/client/src/app/site/agenda/services/agenda-filter-list.service.ts b/client/src/app/site/agenda/services/agenda-filter-list.service.ts index 2df30f042..e4d8971df 100644 --- a/client/src/app/site/agenda/services/agenda-filter-list.service.ts +++ b/client/src/app/site/agenda/services/agenda-filter-list.service.ts @@ -2,10 +2,10 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { StorageService } from 'app/core/core-services/storage.service'; import { BaseFilterListService, OsFilter, OsFilterOption } from 'app/core/ui-services/base-filter-list.service'; import { ItemVisibilityChoices } from 'app/shared/models/agenda/item'; import { ViewItem } from '../models/view-item'; -import { StorageService } from 'app/core/core-services/storage.service'; /** * Filter the agenda list diff --git a/client/src/app/site/agenda/services/agenda-import.service.spec.ts b/client/src/app/site/agenda/services/agenda-import.service.spec.ts index 38cd89ada..39b05fc23 100644 --- a/client/src/app/site/agenda/services/agenda-import.service.spec.ts +++ b/client/src/app/site/agenda/services/agenda-import.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { AgendaImportService } from './agenda-import.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { AgendaImportService } from './agenda-import.service'; + describe('AgendaImportService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/site/agenda/services/agenda-import.service.ts b/client/src/app/site/agenda/services/agenda-import.service.ts index 2cf322d71..6bb51e07c 100644 --- a/client/src/app/site/agenda/services/agenda-import.service.ts +++ b/client/src/app/site/agenda/services/agenda-import.service.ts @@ -1,15 +1,15 @@ import { Injectable } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { Papa } from 'ngx-papaparse'; import { TranslateService } from '@ngx-translate/core'; +import { Papa } from 'ngx-papaparse'; +import { TopicRepositoryService } from 'app/core/repositories/topics/topic-repository.service'; import { BaseImportService, NewEntry } from 'app/core/ui-services/base-import.service'; -import { CreateTopic } from '../../topics/models/create-topic'; import { DurationService } from 'app/core/ui-services/duration.service'; import { ItemVisibilityChoices } from 'app/shared/models/agenda/item'; -import { TopicRepositoryService } from 'app/core/repositories/topics/topic-repository.service'; import { ViewCreateTopic } from 'app/site/topics/models/view-create-topic'; +import { CreateTopic } from '../../topics/models/create-topic'; @Injectable({ providedIn: 'root' diff --git a/client/src/app/site/agenda/services/agenda-pdf.service.spec.ts b/client/src/app/site/agenda/services/agenda-pdf.service.spec.ts index 30c42bb76..280120059 100644 --- a/client/src/app/site/agenda/services/agenda-pdf.service.spec.ts +++ b/client/src/app/site/agenda/services/agenda-pdf.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { AgendaPdfService } from './agenda-pdf.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { AgendaPdfService } from './agenda-pdf.service'; + describe('AgendaPdfService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/site/agenda/services/agenda-pdf.service.ts b/client/src/app/site/agenda/services/agenda-pdf.service.ts index be9945e98..798d81ac9 100644 --- a/client/src/app/site/agenda/services/agenda-pdf.service.ts +++ b/client/src/app/site/agenda/services/agenda-pdf.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { TreeService, OSTreeNode } from 'app/core/ui-services/tree.service'; +import { OSTreeNode, TreeService } from 'app/core/ui-services/tree.service'; import { ViewItem } from '../models/view-item'; /** diff --git a/client/src/app/site/assignments/assignments-routing.module.ts b/client/src/app/site/assignments/assignments-routing.module.ts index 021016010..85be8bddc 100644 --- a/client/src/app/site/assignments/assignments-routing.module.ts +++ b/client/src/app/site/assignments/assignments-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AssignmentDetailComponent } from './components/assignment-detail/assignment-detail.component'; import { AssignmentListComponent } from './components/assignment-list/assignment-list.component'; diff --git a/client/src/app/site/assignments/assignments.config.ts b/client/src/app/site/assignments/assignments.config.ts index 1a0a221e3..d504e457d 100644 --- a/client/src/app/site/assignments/assignments.config.ts +++ b/client/src/app/site/assignments/assignments.config.ts @@ -1,6 +1,6 @@ import { AppConfig } from '../../core/app-config'; -import { Assignment } from '../../shared/models/assignments/assignment'; import { AssignmentRepositoryService } from 'app/core/repositories/assignments/assignment-repository.service'; +import { Assignment } from '../../shared/models/assignments/assignment'; import { ViewAssignment } from './models/view-assignment'; export const AssignmentsAppConfig: AppConfig = { diff --git a/client/src/app/site/assignments/assignments.module.ts b/client/src/app/site/assignments/assignments.module.ts index d9a595259..70d8cf9da 100644 --- a/client/src/app/site/assignments/assignments.module.ts +++ b/client/src/app/site/assignments/assignments.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { AssignmentDetailComponent } from './components/assignment-detail/assignment-detail.component'; import { AssignmentListComponent } from './components/assignment-list/assignment-list.component'; -import { AssignmentPollComponent } from './components/assignment-poll/assignment-poll.component'; import { AssignmentPollDialogComponent } from './components/assignment-poll-dialog/assignment-poll-dialog.component'; +import { AssignmentPollComponent } from './components/assignment-poll/assignment-poll.component'; import { AssignmentsRoutingModule } from './assignments-routing.module'; import { SharedModule } from '../../shared/shared.module'; diff --git a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.spec.ts b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.spec.ts index fde354de9..a1788b75a 100644 --- a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.spec.ts +++ b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.spec.ts @@ -1,8 +1,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { E2EImportsModule } from '../../../../../e2e-imports.module'; import { AssignmentDetailComponent } from './assignment-detail.component'; import { AssignmentPollComponent } from '../assignment-poll/assignment-poll.component'; +import { E2EImportsModule } from '../../../../../e2e-imports.module'; describe('AssignmentDetailComponent', () => { let component: AssignmentDetailComponent; diff --git a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.ts b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.ts index cc8e695f4..90ea8e1e3 100644 --- a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.ts +++ b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.ts @@ -1,31 +1,31 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material'; -import { Router, ActivatedRoute } from '@angular/router'; -import { Title, DomSanitizer, SafeHtml } from '@angular/platform-browser'; +import { DomSanitizer, SafeHtml, Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject } from 'rxjs'; -import { Assignment } from 'app/shared/models/assignments/assignment'; -import { AssignmentPdfExportService } from '../../services/assignment-pdf-export.service'; -import { AssignmentPoll } from 'app/shared/models/assignments/assignment-poll'; -import { AssignmentPollService } from '../../services/assignment-poll.service'; -import { AssignmentRepositoryService } from 'app/core/repositories/assignments/assignment-repository.service'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; -import { LocalPermissionsService } from 'app/site/motions/services/local-permissions.service'; import { OperatorService } from 'app/core/core-services/operator.service'; -import { PromptService } from 'app/core/ui-services/prompt.service'; +import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; +import { AssignmentRepositoryService } from 'app/core/repositories/assignments/assignment-repository.service'; +import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service'; import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; -import { ViewAssignment, AssignmentPhases } from '../../models/view-assignment'; -import { ViewAssignmentRelatedUser } from '../../models/view-assignment-related-user'; +import { PromptService } from 'app/core/ui-services/prompt.service'; +import { Assignment } from 'app/shared/models/assignments/assignment'; +import { AssignmentPoll } from 'app/shared/models/assignments/assignment-poll'; import { ViewItem } from 'app/site/agenda/models/view-item'; +import { BaseViewComponent } from 'app/site/base/base-view'; +import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; +import { LocalPermissionsService } from 'app/site/motions/services/local-permissions.service'; import { ViewTag } from 'app/site/tags/models/view-tag'; import { ViewUser } from 'app/site/users/models/view-user'; -import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; -import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service'; +import { AssignmentPdfExportService } from '../../services/assignment-pdf-export.service'; +import { AssignmentPollService } from '../../services/assignment-poll.service'; +import { AssignmentPhases, ViewAssignment } from '../../models/view-assignment'; +import { ViewAssignmentRelatedUser } from '../../models/view-assignment-related-user'; /** * Component for the assignment detail view diff --git a/client/src/app/site/assignments/components/assignment-list/assignment-list.component.spec.ts b/client/src/app/site/assignments/components/assignment-list/assignment-list.component.spec.ts index 7a361498a..44c515b21 100644 --- a/client/src/app/site/assignments/components/assignment-list/assignment-list.component.spec.ts +++ b/client/src/app/site/assignments/components/assignment-list/assignment-list.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { AssignmentListComponent } from './assignment-list.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { AssignmentListComponent } from './assignment-list.component'; + describe('AssignmentListComponent', () => { let component: AssignmentListComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/assignments/components/assignment-list/assignment-list.component.ts b/client/src/app/site/assignments/components/assignment-list/assignment-list.component.ts index a875e3de5..b6a3e7dcf 100644 --- a/client/src/app/site/assignments/components/assignment-list/assignment-list.component.ts +++ b/client/src/app/site/assignments/components/assignment-list/assignment-list.component.ts @@ -1,20 +1,20 @@ import { Component, OnInit } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { Router, ActivatedRoute } from '@angular/router'; import { Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { PblColumnDefinition } from '@pebula/ngrid'; -import { AssignmentFilterListService } from '../../services/assignment-filter.service'; -import { AssignmentSortListService } from '../../services/assignment-sort-list.service'; -import { AssignmentRepositoryService } from 'app/core/repositories/assignments/assignment-repository.service'; -import { BaseListViewComponent } from 'app/site/base/base-list-view'; import { OperatorService } from 'app/core/core-services/operator.service'; -import { PromptService } from 'app/core/ui-services/prompt.service'; import { StorageService } from 'app/core/core-services/storage.service'; -import { ViewAssignment, AssignmentPhases } from '../../models/view-assignment'; +import { AssignmentRepositoryService } from 'app/core/repositories/assignments/assignment-repository.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; +import { BaseListViewComponent } from 'app/site/base/base-list-view'; +import { AssignmentFilterListService } from '../../services/assignment-filter.service'; import { AssignmentPdfExportService } from '../../services/assignment-pdf-export.service'; +import { AssignmentSortListService } from '../../services/assignment-sort-list.service'; +import { AssignmentPhases, ViewAssignment } from '../../models/view-assignment'; /** * List view for the assignments diff --git a/client/src/app/site/assignments/components/assignment-poll-dialog/assignment-poll-dialog.component.ts b/client/src/app/site/assignments/components/assignment-poll-dialog/assignment-poll-dialog.component.ts index 259e0ff88..84ae0633a 100644 --- a/client/src/app/site/assignments/components/assignment-poll-dialog/assignment-poll-dialog.component.ts +++ b/client/src/app/site/assignments/components/assignment-poll-dialog/assignment-poll-dialog.component.ts @@ -1,12 +1,13 @@ import { Component, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; + import { TranslateService } from '@ngx-translate/core'; +import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; +import { CalculablePollKey, PollVoteValue } from 'app/core/ui-services/poll.service'; import { AssignmentPollOption } from 'app/shared/models/assignments/assignment-poll-option'; import { AssignmentPollService, SummaryPollKey } from '../../services/assignment-poll.service'; -import { CalculablePollKey, PollVoteValue } from 'app/core/ui-services/poll.service'; -import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; import { ViewAssignmentPoll } from '../../models/view-assignment-poll'; import { ViewAssignmentPollOption } from '../../models/view-assignment-poll-option'; diff --git a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.spec.ts b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.spec.ts index 708ee596b..177e7506e 100644 --- a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.spec.ts +++ b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { AssignmentPollComponent } from './assignment-poll.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { AssignmentPollComponent } from './assignment-poll.component'; + describe('AssignmentPollComponent', () => { let component: AssignmentPollComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.ts b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.ts index ea7bdef21..4b6584305 100644 --- a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.ts +++ b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.ts @@ -1,19 +1,19 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { FormGroup, FormBuilder } from '@angular/forms'; +import { Component, Input, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; +import { OperatorService } from 'app/core/core-services/operator.service'; +import { AssignmentRepositoryService } from 'app/core/repositories/assignments/assignment-repository.service'; +import { CalculablePollKey, MajorityMethod } from 'app/core/ui-services/poll.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; +import { BaseViewComponent } from 'app/site/base/base-view'; import { AssignmentPollDialogComponent } from '../assignment-poll-dialog/assignment-poll-dialog.component'; import { AssignmentPollPdfService } from '../../services/assignment-poll-pdf.service'; import { AssignmentPollService } from '../../services/assignment-poll.service'; -import { AssignmentRepositoryService } from 'app/core/repositories/assignments/assignment-repository.service'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { MajorityMethod, CalculablePollKey } from 'app/core/ui-services/poll.service'; -import { OperatorService } from 'app/core/core-services/operator.service'; -import { PromptService } from 'app/core/ui-services/prompt.service'; import { ViewAssignment } from '../../models/view-assignment'; import { ViewAssignmentPoll } from '../../models/view-assignment-poll'; import { ViewAssignmentPollOption } from '../../models/view-assignment-poll-option'; diff --git a/client/src/app/site/assignments/models/view-assignment-poll-option.ts b/client/src/app/site/assignments/models/view-assignment-poll-option.ts index 126d294e2..9a7c606ca 100644 --- a/client/src/app/site/assignments/models/view-assignment-poll-option.ts +++ b/client/src/app/site/assignments/models/view-assignment-poll-option.ts @@ -1,6 +1,6 @@ -import { AssignmentPollOption, AssignmentOptionVote } from 'app/shared/models/assignments/assignment-poll-option'; -import { BaseViewModel } from 'app/site/base/base-view-model'; import { PollVoteValue } from 'app/core/ui-services/poll.service'; +import { AssignmentOptionVote, AssignmentPollOption } from 'app/shared/models/assignments/assignment-poll-option'; +import { BaseViewModel } from 'app/site/base/base-view-model'; import { ViewUser } from 'app/site/users/models/view-user'; /** diff --git a/client/src/app/site/assignments/models/view-assignment-poll.ts b/client/src/app/site/assignments/models/view-assignment-poll.ts index bec9fbedf..8353f18ed 100644 --- a/client/src/app/site/assignments/models/view-assignment-poll.ts +++ b/client/src/app/site/assignments/models/view-assignment-poll.ts @@ -1,9 +1,9 @@ import { AssignmentPoll } from 'app/shared/models/assignments/assignment-poll'; +import { AssignmentPollOption } from 'app/shared/models/assignments/assignment-poll-option'; +import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model'; +import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; import { AssignmentPollMethod } from '../services/assignment-poll.service'; import { ViewAssignmentPollOption } from './view-assignment-poll-option'; -import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; -import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model'; -import { AssignmentPollOption } from 'app/shared/models/assignments/assignment-poll-option'; export class ViewAssignmentPoll extends BaseProjectableViewModel { public static COLLECTIONSTRING = AssignmentPoll.COLLECTIONSTRING; diff --git a/client/src/app/site/assignments/models/view-assignment.ts b/client/src/app/site/assignments/models/view-assignment.ts index ae3964cc2..2b1a29027 100644 --- a/client/src/app/site/assignments/models/view-assignment.ts +++ b/client/src/app/site/assignments/models/view-assignment.ts @@ -1,13 +1,13 @@ -import { Assignment } from 'app/shared/models/assignments/assignment'; import { SearchRepresentation } from 'app/core/ui-services/search.service'; -import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; -import { ViewUser } from 'app/site/users/models/view-user'; -import { ViewTag } from 'app/site/tags/models/view-tag'; -import { ViewAssignmentRelatedUser } from './view-assignment-related-user'; -import { ViewAssignmentPoll } from './view-assignment-poll'; -import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; -import { BaseViewModelWithAgendaItemAndListOfSpeakers } from 'app/site/base/base-view-model-with-agenda-item-and-list-of-speakers'; +import { Assignment } from 'app/shared/models/assignments/assignment'; import { TitleInformationWithAgendaItem } from 'app/site/base/base-view-model-with-agenda-item'; +import { BaseViewModelWithAgendaItemAndListOfSpeakers } from 'app/site/base/base-view-model-with-agenda-item-and-list-of-speakers'; +import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; +import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; +import { ViewTag } from 'app/site/tags/models/view-tag'; +import { ViewUser } from 'app/site/users/models/view-user'; +import { ViewAssignmentPoll } from './view-assignment-poll'; +import { ViewAssignmentRelatedUser } from './view-assignment-related-user'; export interface AssignmentTitleInformation extends TitleInformationWithAgendaItem { title: string; diff --git a/client/src/app/site/assignments/services/assignment-filter.service.ts b/client/src/app/site/assignments/services/assignment-filter.service.ts index eea3b1915..81d709934 100644 --- a/client/src/app/site/assignments/services/assignment-filter.service.ts +++ b/client/src/app/site/assignments/services/assignment-filter.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { BaseFilterListService, OsFilter, OsFilterOption } from 'app/core/ui-services/base-filter-list.service'; import { StorageService } from 'app/core/core-services/storage.service'; -import { ViewAssignment, AssignmentPhases } from '../models/view-assignment'; +import { BaseFilterListService, OsFilter, OsFilterOption } from 'app/core/ui-services/base-filter-list.service'; +import { AssignmentPhases, ViewAssignment } from '../models/view-assignment'; /** * Filter service for the assignment list diff --git a/client/src/app/site/assignments/services/assignment-pdf-export.service.spec.ts b/client/src/app/site/assignments/services/assignment-pdf-export.service.spec.ts index 0239c5bcb..62588e8d5 100644 --- a/client/src/app/site/assignments/services/assignment-pdf-export.service.spec.ts +++ b/client/src/app/site/assignments/services/assignment-pdf-export.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { AssignmentPdfExportService } from './assignment-pdf-export.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { AssignmentPdfExportService } from './assignment-pdf-export.service'; + describe('AssignmentPdfExportService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/site/assignments/services/assignment-pdf-export.service.ts b/client/src/app/site/assignments/services/assignment-pdf-export.service.ts index ea12dc3c3..914d98979 100644 --- a/client/src/app/site/assignments/services/assignment-pdf-export.service.ts +++ b/client/src/app/site/assignments/services/assignment-pdf-export.service.ts @@ -1,8 +1,10 @@ import { Injectable } from '@angular/core'; -import { ViewAssignment } from '../models/view-assignment'; -import { AssignmentPdfService } from './assignment-pdf.service'; + import { TranslateService } from '@ngx-translate/core'; + import { PdfDocumentService, PdfError } from 'app/core/ui-services/pdf-document.service'; +import { AssignmentPdfService } from './assignment-pdf.service'; +import { ViewAssignment } from '../models/view-assignment'; /** * Controls PDF export for assignments diff --git a/client/src/app/site/assignments/services/assignment-pdf.service.spec.ts b/client/src/app/site/assignments/services/assignment-pdf.service.spec.ts index 521ec18a7..95de9866d 100644 --- a/client/src/app/site/assignments/services/assignment-pdf.service.spec.ts +++ b/client/src/app/site/assignments/services/assignment-pdf.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { AssignmentPdfService } from './assignment-pdf.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { AssignmentPdfService } from './assignment-pdf.service'; + describe('AssignmentPdfService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/site/assignments/services/assignment-pdf.service.ts b/client/src/app/site/assignments/services/assignment-pdf.service.ts index 4ae26bc0d..26d30091c 100644 --- a/client/src/app/site/assignments/services/assignment-pdf.service.ts +++ b/client/src/app/site/assignments/services/assignment-pdf.service.ts @@ -2,13 +2,13 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { AssignmentPollService } from './assignment-poll.service'; import { HtmlToPdfService } from 'app/core/ui-services/html-to-pdf.service'; import { PdfDocumentService } from 'app/core/ui-services/pdf-document.service'; import { PollVoteValue } from 'app/core/ui-services/poll.service'; +import { AssignmentPollService } from './assignment-poll.service'; import { ViewAssignment } from '../models/view-assignment'; -import { ViewAssignmentPollOption } from '../models/view-assignment-poll-option'; import { ViewAssignmentPoll } from '../models/view-assignment-poll'; +import { ViewAssignmentPollOption } from '../models/view-assignment-poll-option'; /** * Creates a PDF document from a single assignment diff --git a/client/src/app/site/assignments/services/assignment-poll-pdf.service.spec.ts b/client/src/app/site/assignments/services/assignment-poll-pdf.service.spec.ts index ba8f4435b..002c49c60 100644 --- a/client/src/app/site/assignments/services/assignment-poll-pdf.service.spec.ts +++ b/client/src/app/site/assignments/services/assignment-poll-pdf.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { AssignmentPollPdfService } from './assignment-poll-pdf.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { AssignmentPollPdfService } from './assignment-poll-pdf.service'; + describe('MotionPdfService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/site/assignments/services/assignment-poll-pdf.service.ts b/client/src/app/site/assignments/services/assignment-poll-pdf.service.ts index 49dc09d99..962df2e0c 100644 --- a/client/src/app/site/assignments/services/assignment-poll-pdf.service.ts +++ b/client/src/app/site/assignments/services/assignment-poll-pdf.service.ts @@ -2,13 +2,13 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { AssignmentRepositoryService } from 'app/core/repositories/assignments/assignment-repository.service'; +import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; import { ConfigService } from 'app/core/ui-services/config.service'; import { PdfDocumentService } from 'app/core/ui-services/pdf-document.service'; -import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; -import { AssignmentRepositoryService } from 'app/core/repositories/assignments/assignment-repository.service'; -import { ViewAssignmentPoll } from '../models/view-assignment-poll'; +import { AbstractPollData, BallotCountChoices, PollPdfService } from 'app/core/ui-services/poll-pdf-service'; import { AssignmentPollMethod } from './assignment-poll.service'; -import { PollPdfService, BallotCountChoices, AbstractPollData } from 'app/core/ui-services/poll-pdf-service'; +import { ViewAssignmentPoll } from '../models/view-assignment-poll'; /** * Creates a pdf for a motion poll. Takes as input any motionPoll diff --git a/client/src/app/site/assignments/services/assignment-poll.service.ts b/client/src/app/site/assignments/services/assignment-poll.service.ts index 99ab09694..ad964e421 100644 --- a/client/src/app/site/assignments/services/assignment-poll.service.ts +++ b/client/src/app/site/assignments/services/assignment-poll.service.ts @@ -1,16 +1,16 @@ import { Injectable } from '@angular/core'; -import { AssignmentOptionVote } from 'app/shared/models/assignments/assignment-poll-option'; import { ConfigService } from 'app/core/ui-services/config.service'; import { - PollService, - PollMajorityMethod, - MajorityMethod, CalculablePollKey, + MajorityMethod, + PollMajorityMethod, + PollService, PollVoteValue } from 'app/core/ui-services/poll.service'; -import { ViewAssignmentPollOption } from '../models/view-assignment-poll-option'; +import { AssignmentOptionVote } from 'app/shared/models/assignments/assignment-poll-option'; import { ViewAssignmentPoll } from '../models/view-assignment-poll'; +import { ViewAssignmentPollOption } from '../models/view-assignment-poll-option'; type AssignmentPollValues = 'auto' | 'votes' | 'yesnoabstain' | 'yesno'; export type AssignmentPollMethod = 'yn' | 'yna' | 'votes'; diff --git a/client/src/app/site/assignments/services/assignment-sort-list.service.ts b/client/src/app/site/assignments/services/assignment-sort-list.service.ts index bfd5a4d27..246be9589 100644 --- a/client/src/app/site/assignments/services/assignment-sort-list.service.ts +++ b/client/src/app/site/assignments/services/assignment-sort-list.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { BaseSortListService, OsSortingDefinition, OsSortingOption } from 'app/core/ui-services/base-sort-list.service'; import { StorageService } from 'app/core/core-services/storage.service'; +import { BaseSortListService, OsSortingDefinition, OsSortingOption } from 'app/core/ui-services/base-sort-list.service'; import { ViewAssignment } from '../models/view-assignment'; /** diff --git a/client/src/app/site/base/base-import-list.ts b/client/src/app/site/base/base-import-list.ts index 3cfeca25a..ca67876a8 100644 --- a/client/src/app/site/base/base-import-list.ts +++ b/client/src/app/site/base/base-import-list.ts @@ -1,15 +1,16 @@ +import { OnInit, ViewChild } from '@angular/core'; import { MatSelectChange } from '@angular/material/select'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { MatTableDataSource, MatTable } from '@angular/material/table'; -import { ViewChild, OnInit } from '@angular/core'; +import { MatTable, MatTableDataSource } from '@angular/material/table'; +import { Title } from '@angular/platform-browser'; +import { TranslateService } from '@ngx-translate/core'; +import { auditTime } from 'rxjs/operators'; + +import { BaseImportService, NewEntry, ValueLabelCombination } from 'app/core/ui-services/base-import.service'; +import { getLongPreview, getShortPreview } from 'app/shared/utils/previewStrings'; import { BaseViewComponent } from './base-view'; import { BaseViewModel } from './base-view-model'; -import { NewEntry, ValueLabelCombination, BaseImportService } from 'app/core/ui-services/base-import.service'; -import { Title } from '@angular/platform-browser'; -import { TranslateService } from '@ngx-translate/core'; -import { getLongPreview, getShortPreview } from 'app/shared/utils/previewStrings'; -import { auditTime } from 'rxjs/operators'; export abstract class BaseImportListComponent extends BaseViewComponent implements OnInit { /** diff --git a/client/src/app/site/base/base-list-view.ts b/client/src/app/site/base/base-list-view.ts index f1f6bf687..e23c695b3 100644 --- a/client/src/app/site/base/base-list-view.ts +++ b/client/src/app/site/base/base-list-view.ts @@ -1,13 +1,13 @@ +import { OnDestroy } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; -import { OnDestroy } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { PblDataSource, PblColumnDefinition } from '@pebula/ngrid'; +import { PblColumnDefinition, PblDataSource } from '@pebula/ngrid'; +import { StorageService } from 'app/core/core-services/storage.service'; import { BaseViewComponent } from './base-view'; import { BaseViewModel } from './base-view-model'; -import { StorageService } from 'app/core/core-services/storage.service'; import { ViewUser } from '../users/models/view-user'; export abstract class BaseListViewComponent extends BaseViewComponent implements OnDestroy { diff --git a/client/src/app/site/base/base-projectable-view-model.ts b/client/src/app/site/base/base-projectable-view-model.ts index 2c17da186..e647bf9af 100644 --- a/client/src/app/site/base/base-projectable-view-model.ts +++ b/client/src/app/site/base/base-projectable-view-model.ts @@ -1,7 +1,7 @@ -import { Projectable, ProjectorElementBuildDeskriptor } from './projectable'; -import { BaseViewModel } from './base-view-model'; import { ConfigService } from 'app/core/ui-services/config.service'; import { BaseModel } from 'app/shared/models/base/base-model'; +import { BaseViewModel } from './base-view-model'; +import { Projectable, ProjectorElementBuildDeskriptor } from './projectable'; /** * Base view class for projectable models. diff --git a/client/src/app/site/base/base-view-model-with-agenda-item-and-list-of-speakers.ts b/client/src/app/site/base/base-view-model-with-agenda-item-and-list-of-speakers.ts index 3e62be619..1eb2bd469 100644 --- a/client/src/app/site/base/base-view-model-with-agenda-item-and-list-of-speakers.ts +++ b/client/src/app/site/base/base-view-model-with-agenda-item-and-list-of-speakers.ts @@ -1,13 +1,13 @@ import { SearchRepresentation } from 'app/core/ui-services/search.service'; import { BaseModelWithAgendaItemAndListOfSpeakers } from 'app/shared/models/base/base-model-with-agenda-item-and-list-of-speakers'; +import { BaseProjectableViewModel } from './base-projectable-view-model'; +import { IBaseViewModelWithAgendaItem, isBaseViewModelWithAgendaItem } from './base-view-model-with-agenda-item'; +import { + IBaseViewModelWithListOfSpeakers, + isBaseViewModelWithListOfSpeakers +} from './base-view-model-with-list-of-speakers'; import { ViewItem } from '../agenda/models/view-item'; import { ViewListOfSpeakers } from '../agenda/models/view-list-of-speakers'; -import { BaseProjectableViewModel } from './base-projectable-view-model'; -import { isBaseViewModelWithAgendaItem, IBaseViewModelWithAgendaItem } from './base-view-model-with-agenda-item'; -import { - isBaseViewModelWithListOfSpeakers, - IBaseViewModelWithListOfSpeakers -} from './base-view-model-with-list-of-speakers'; export function isBaseViewModelWithAgendaItemAndListOfSpeakers( obj: any diff --git a/client/src/app/site/base/base-view-model-with-agenda-item.ts b/client/src/app/site/base/base-view-model-with-agenda-item.ts index 54f5f9c82..e8ff90b9c 100644 --- a/client/src/app/site/base/base-view-model-with-agenda-item.ts +++ b/client/src/app/site/base/base-view-model-with-agenda-item.ts @@ -1,9 +1,9 @@ -import { BaseProjectableViewModel } from './base-projectable-view-model'; import { SearchRepresentation } from 'app/core/ui-services/search.service'; -import { isDetailNavigable, DetailNavigable } from 'app/shared/models/base/detail-navigable'; -import { isSearchable, Searchable } from './searchable'; import { BaseModelWithAgendaItem } from 'app/shared/models/base/base-model-with-agenda-item'; +import { DetailNavigable, isDetailNavigable } from 'app/shared/models/base/detail-navigable'; +import { BaseProjectableViewModel } from './base-projectable-view-model'; import { TitleInformation } from './base-view-model'; +import { isSearchable, Searchable } from './searchable'; export function isBaseViewModelWithAgendaItem(obj: any): obj is BaseViewModelWithAgendaItem { const model = obj; diff --git a/client/src/app/site/base/base-view-model-with-content-object.ts b/client/src/app/site/base/base-view-model-with-content-object.ts index 3691e50ad..51cc22e8b 100644 --- a/client/src/app/site/base/base-view-model-with-content-object.ts +++ b/client/src/app/site/base/base-view-model-with-content-object.ts @@ -1,6 +1,6 @@ -import { BaseViewModel } from './base-view-model'; import { BaseModelWithContentObject } from 'app/shared/models/base/base-model-with-content-object'; import { ContentObject } from 'app/shared/models/base/content-object'; +import { BaseViewModel } from './base-view-model'; /** * Base class for view models with content objects. Ensures a content object attribute and diff --git a/client/src/app/site/base/base-view-model-with-list-of-speakers.ts b/client/src/app/site/base/base-view-model-with-list-of-speakers.ts index 33139619c..26f439702 100644 --- a/client/src/app/site/base/base-view-model-with-list-of-speakers.ts +++ b/client/src/app/site/base/base-view-model-with-list-of-speakers.ts @@ -1,6 +1,6 @@ -import { BaseProjectableViewModel } from './base-projectable-view-model'; -import { isDetailNavigable, DetailNavigable } from 'app/shared/models/base/detail-navigable'; import { BaseModelWithListOfSpeakers } from 'app/shared/models/base/base-model-with-list-of-speakers'; +import { DetailNavigable, isDetailNavigable } from 'app/shared/models/base/detail-navigable'; +import { BaseProjectableViewModel } from './base-projectable-view-model'; export function isBaseViewModelWithListOfSpeakers(obj: any): obj is BaseViewModelWithListOfSpeakers { const model = obj; diff --git a/client/src/app/site/base/base-view-model.ts b/client/src/app/site/base/base-view-model.ts index 7776eec09..3d545772c 100644 --- a/client/src/app/site/base/base-view-model.ts +++ b/client/src/app/site/base/base-view-model.ts @@ -1,7 +1,7 @@ +import { BaseModel } from 'app/shared/models/base/base-model'; +import { Collection } from 'app/shared/models/base/collection'; import { Displayable } from './displayable'; import { Identifiable } from '../../shared/models/base/identifiable'; -import { Collection } from 'app/shared/models/base/collection'; -import { BaseModel } from 'app/shared/models/base/base-model'; export type TitleInformation = object; diff --git a/client/src/app/site/base/base-view.ts b/client/src/app/site/base/base-view.ts index 5a0b35213..e63191839 100644 --- a/client/src/app/site/base/base-view.ts +++ b/client/src/app/site/base/base-view.ts @@ -1,11 +1,11 @@ import { OnDestroy } from '@angular/core'; -import { Title } from '@angular/platform-browser'; import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; +import { Subscription } from 'rxjs'; import { BaseComponent } from '../../base.component'; -import { Subscription } from 'rxjs'; /** * A base class for all views. Implements a generic error handling by raising a snack bar diff --git a/client/src/app/site/base/projectable.ts b/client/src/app/site/base/projectable.ts index f14057003..626840a07 100644 --- a/client/src/app/site/base/projectable.ts +++ b/client/src/app/site/base/projectable.ts @@ -1,7 +1,7 @@ -import { Displayable } from 'app/site/base/displayable'; -import { IdentifiableProjectorElement, ProjectorElementOptions } from 'app/shared/models/core/projector'; -import { SlideOptions } from './slide-options'; import { ConfigService } from 'app/core/ui-services/config.service'; +import { IdentifiableProjectorElement, ProjectorElementOptions } from 'app/shared/models/core/projector'; +import { Displayable } from 'app/site/base/displayable'; +import { SlideOptions } from './slide-options'; export function isProjectorElementBuildDeskriptor(obj: any): obj is ProjectorElementBuildDeskriptor { const deskriptor = obj; diff --git a/client/src/app/site/base/sort-tree.component.ts b/client/src/app/site/base/sort-tree.component.ts index b37fc47ea..8d5f7c076 100644 --- a/client/src/app/site/base/sort-tree.component.ts +++ b/client/src/app/site/base/sort-tree.component.ts @@ -1,15 +1,15 @@ -import { ViewChild, EventEmitter } from '@angular/core'; +import { EventEmitter, ViewChild } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewModel } from './base-view-model'; -import { BaseViewComponent } from './base-view'; -import { CanComponentDeactivate } from 'app/shared/utils/watch-sorting-tree.guard'; -import { Identifiable } from 'app/shared/models/base/identifiable'; import { PromptService } from 'app/core/ui-services/prompt.service'; import { SortingTreeComponent } from 'app/shared/components/sorting-tree/sorting-tree.component'; +import { Identifiable } from 'app/shared/models/base/identifiable'; +import { CanComponentDeactivate } from 'app/shared/utils/watch-sorting-tree.guard'; +import { BaseViewComponent } from './base-view'; +import { BaseViewModel } from './base-view-model'; export interface SortTreeFilterOption extends Identifiable { label: string; diff --git a/client/src/app/site/common/common-routing.module.ts b/client/src/app/site/common/common-routing.module.ts index 5d899b2a1..e271fea74 100644 --- a/client/src/app/site/common/common-routing.module.ts +++ b/client/src/app/site/common/common-routing.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; -import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component'; -import { StartComponent } from './components/start/start.component'; -import { LegalNoticeComponent } from './components/legal-notice/legal-notice.component'; -import { SearchComponent } from './components/search/search.component'; import { ErrorComponent } from './components/error/error.component'; +import { LegalNoticeComponent } from './components/legal-notice/legal-notice.component'; +import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component'; +import { SearchComponent } from './components/search/search.component'; +import { StartComponent } from './components/start/start.component'; const routes: Routes = [ { diff --git a/client/src/app/site/common/components/error/error.component.spec.ts b/client/src/app/site/common/components/error/error.component.spec.ts index 6ff74a71c..4c9d00716 100644 --- a/client/src/app/site/common/components/error/error.component.spec.ts +++ b/client/src/app/site/common/components/error/error.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ErrorComponent } from './error.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { ErrorComponent } from './error.component'; + describe('ErrorComponent', () => { let component: ErrorComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/common/components/global-spinner/global-spinner.component.spec.ts b/client/src/app/site/common/components/global-spinner/global-spinner.component.spec.ts index 1ce38d6d0..8cdc8f176 100644 --- a/client/src/app/site/common/components/global-spinner/global-spinner.component.spec.ts +++ b/client/src/app/site/common/components/global-spinner/global-spinner.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { GlobalSpinnerComponent } from './global-spinner.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { GlobalSpinnerComponent } from './global-spinner.component'; + describe('GlobalSpinnerComponent', () => { let component: GlobalSpinnerComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/common/components/global-spinner/global-spinner.component.ts b/client/src/app/site/common/components/global-spinner/global-spinner.component.ts index 0fb8211a7..ab668cbbd 100644 --- a/client/src/app/site/common/components/global-spinner/global-spinner.component.ts +++ b/client/src/app/site/common/components/global-spinner/global-spinner.component.ts @@ -1,10 +1,12 @@ // External imports -import { Component, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core'; -import { Subscription } from 'rxjs'; +import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; + import { TranslateService } from '@ngx-translate/core'; +import { Subscription } from 'rxjs'; + +import { SpinnerService } from 'app/core/ui-services/spinner.service'; // Internal imports -import { SpinnerService } from 'app/core/ui-services/spinner.service'; /** * Component for the global spinner. diff --git a/client/src/app/site/common/components/legal-notice/legal-notice.component.spec.ts b/client/src/app/site/common/components/legal-notice/legal-notice.component.spec.ts index 3a7016230..b0e31908b 100644 --- a/client/src/app/site/common/components/legal-notice/legal-notice.component.spec.ts +++ b/client/src/app/site/common/components/legal-notice/legal-notice.component.spec.ts @@ -1,8 +1,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { LegalNoticeComponent } from './legal-notice.component'; -import { E2EImportsModule } from '../../../../../e2e-imports.module'; import { CountUsersComponent } from '../count-users/count-users.component'; +import { E2EImportsModule } from '../../../../../e2e-imports.module'; +import { LegalNoticeComponent } from './legal-notice.component'; describe('LegalNoticeComponent', () => { let component: LegalNoticeComponent; diff --git a/client/src/app/site/common/components/legal-notice/legal-notice.component.ts b/client/src/app/site/common/components/legal-notice/legal-notice.component.ts index 3bc75188f..a4b8629e5 100644 --- a/client/src/app/site/common/components/legal-notice/legal-notice.component.ts +++ b/client/src/app/site/common/components/legal-notice/legal-notice.component.ts @@ -1,8 +1,10 @@ import { Component, OnInit } from '@angular/core'; +import { Title } from '@angular/platform-browser'; + +import { TranslateService } from '@ngx-translate/core'; + import { OpenSlidesService } from 'app/core/core-services/openslides.service'; import { UpdateService } from 'app/core/ui-services/update.service'; -import { Title } from '@angular/platform-browser'; -import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'os-legal-notice', diff --git a/client/src/app/site/common/components/privacy-policy/privacy-policy.component.spec.ts b/client/src/app/site/common/components/privacy-policy/privacy-policy.component.spec.ts index 3a1514125..4684719d4 100644 --- a/client/src/app/site/common/components/privacy-policy/privacy-policy.component.spec.ts +++ b/client/src/app/site/common/components/privacy-policy/privacy-policy.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { PrivacyPolicyComponent } from './privacy-policy.component'; import { E2EImportsModule } from '../../../../../e2e-imports.module'; +import { PrivacyPolicyComponent } from './privacy-policy.component'; describe('PrivacyPolicyComponent', () => { let component: PrivacyPolicyComponent; diff --git a/client/src/app/site/common/components/privacy-policy/privacy-policy.component.ts b/client/src/app/site/common/components/privacy-policy/privacy-policy.component.ts index 2843eaed9..9700e25ca 100644 --- a/client/src/app/site/common/components/privacy-policy/privacy-policy.component.ts +++ b/client/src/app/site/common/components/privacy-policy/privacy-policy.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { Title } from '@angular/platform-browser'; + import { TranslateService } from '@ngx-translate/core'; @Component({ diff --git a/client/src/app/site/common/components/search/search.component.spec.ts b/client/src/app/site/common/components/search/search.component.spec.ts index 08e7aff64..5d8c952fa 100644 --- a/client/src/app/site/common/components/search/search.component.spec.ts +++ b/client/src/app/site/common/components/search/search.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SearchComponent } from './search.component'; import { E2EImportsModule } from '../../../../../e2e-imports.module'; +import { SearchComponent } from './search.component'; describe('SearchComponent', () => { let component: SearchComponent; diff --git a/client/src/app/site/common/components/search/search.component.ts b/client/src/app/site/common/components/search/search.component.ts index e22dd7e42..381258b29 100644 --- a/client/src/app/site/common/components/search/search.component.ts +++ b/client/src/app/site/common/components/search/search.component.ts @@ -1,14 +1,14 @@ import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; +import { FormControl } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; -import { auditTime, debounceTime } from 'rxjs/operators'; import { TranslateService } from '@ngx-translate/core'; +import { auditTime, debounceTime } from 'rxjs/operators'; import { DataStoreService } from 'app/core/core-services/data-store.service'; -import { SearchService, SearchModel, SearchResult } from 'app/core/ui-services/search.service'; +import { SearchModel, SearchResult, SearchService } from 'app/core/ui-services/search.service'; import { BaseViewComponent } from '../../../base/base-view'; -import { FormControl } from '@angular/forms'; type SearchModelEnabled = SearchModel & { enabled: boolean }; diff --git a/client/src/app/site/common/components/start/start.component.spec.ts b/client/src/app/site/common/components/start/start.component.spec.ts index 252f5fa27..fb02bbeff 100644 --- a/client/src/app/site/common/components/start/start.component.spec.ts +++ b/client/src/app/site/common/components/start/start.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { StartComponent } from './start.component'; import { E2EImportsModule } from '../../../../../e2e-imports.module'; +import { StartComponent } from './start.component'; describe('StartComponent', () => { let component: StartComponent; diff --git a/client/src/app/site/common/components/start/start.component.ts b/client/src/app/site/common/components/start/start.component.ts index 876b1df85..0048373de 100644 --- a/client/src/app/site/common/components/start/start.component.ts +++ b/client/src/app/site/common/components/start/start.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Title, DomSanitizer, SafeHtml } from '@angular/platform-browser'; +import { DomSanitizer, SafeHtml, Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; // showcase diff --git a/client/src/app/site/common/os-common.module.ts b/client/src/app/site/common/os-common.module.ts index 7fa3e5d02..b5605532c 100644 --- a/client/src/app/site/common/os-common.module.ts +++ b/client/src/app/site/common/os-common.module.ts @@ -1,14 +1,14 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { CommonRoutingModule } from './common-routing.module'; -import { SharedModule } from '../../shared/shared.module'; -import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component'; -import { StartComponent } from './components/start/start.component'; -import { LegalNoticeComponent } from './components/legal-notice/legal-notice.component'; -import { SearchComponent } from './components/search/search.component'; import { CountUsersComponent } from './components/count-users/count-users.component'; import { ErrorComponent } from './components/error/error.component'; +import { LegalNoticeComponent } from './components/legal-notice/legal-notice.component'; +import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component'; +import { SearchComponent } from './components/search/search.component'; +import { SharedModule } from '../../shared/shared.module'; +import { StartComponent } from './components/start/start.component'; @NgModule({ imports: [CommonModule, CommonRoutingModule, SharedModule], diff --git a/client/src/app/site/common/services/count-user-statistics.service.ts b/client/src/app/site/common/services/count-user-statistics.service.ts index 3bdf33679..734e9ea7b 100644 --- a/client/src/app/site/common/services/count-user-statistics.service.ts +++ b/client/src/app/site/common/services/count-user-statistics.service.ts @@ -1,8 +1,9 @@ import { Injectable } from '@angular/core'; -import { CountUsersService, CountUserData } from 'app/core/ui-services/count-users.service'; -import { Observable, BehaviorSubject } from 'rxjs'; +import { BehaviorSubject, Observable } from 'rxjs'; + import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; +import { CountUserData, CountUsersService } from 'app/core/ui-services/count-users.service'; /** * The format of the count statistic diff --git a/client/src/app/site/config/components/config-field/config-field.component.ts b/client/src/app/site/config/components/config-field/config-field.component.ts index bff41ceb5..1da619738 100644 --- a/client/src/app/site/config/components/config-field/config-field.component.ts +++ b/client/src/app/site/config/components/config-field/config-field.component.ts @@ -1,14 +1,14 @@ -import { Component, OnInit, Input, ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core'; -import { FormGroup, FormBuilder } from '@angular/forms'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; import { Title } from '@angular/platform-browser'; -import { distinctUntilChanged } from 'rxjs/operators'; import { TranslateService } from '@ngx-translate/core'; +import { distinctUntilChanged } from 'rxjs/operators'; import { BaseComponent } from 'app/base.component'; +import { ConfigRepositoryService } from 'app/core/repositories/config/config-repository.service'; import { ParentErrorStateMatcher } from 'app/shared/parent-error-state-matcher'; import { ViewConfig } from '../../models/view-config'; -import { ConfigRepositoryService } from 'app/core/repositories/config/config-repository.service'; /** * Component for a config field, used by the {@link ConfigListComponent}. Handles diff --git a/client/src/app/site/config/components/config-list/config-list.component.spec.ts b/client/src/app/site/config/components/config-list/config-list.component.spec.ts index 24f611883..549052fed 100644 --- a/client/src/app/site/config/components/config-list/config-list.component.spec.ts +++ b/client/src/app/site/config/components/config-list/config-list.component.spec.ts @@ -1,9 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { E2EImportsModule } from '../../../../../e2e-imports.module'; -import { ConfigListComponent } from './config-list.component'; import { ConfigFieldComponent } from '../config-field/config-field.component'; +import { ConfigListComponent } from './config-list.component'; import { CustomTranslationComponent } from '../custom-translation/custom-translation.component'; +import { E2EImportsModule } from '../../../../../e2e-imports.module'; describe('ConfigListComponent', () => { let component: ConfigListComponent; diff --git a/client/src/app/site/config/components/config-list/config-list.component.ts b/client/src/app/site/config/components/config-list/config-list.component.ts index bbe9b69ff..d60575940 100644 --- a/client/src/app/site/config/components/config-list/config-list.component.ts +++ b/client/src/app/site/config/components/config-list/config-list.component.ts @@ -3,8 +3,8 @@ import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { ConfigRepositoryService, ConfigGroup } from 'app/core/repositories/config/config-repository.service'; import { BaseComponent } from 'app/base.component'; +import { ConfigGroup, ConfigRepositoryService } from 'app/core/repositories/config/config-repository.service'; /** * List view for the global settings diff --git a/client/src/app/site/config/components/custom-translation/custom-translation.component.spec.ts b/client/src/app/site/config/components/custom-translation/custom-translation.component.spec.ts index d48e687d6..c53721601 100644 --- a/client/src/app/site/config/components/custom-translation/custom-translation.component.spec.ts +++ b/client/src/app/site/config/components/custom-translation/custom-translation.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { CustomTranslationComponent } from './custom-translation.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { CustomTranslationComponent } from './custom-translation.component'; + describe('CustomTranslationComponent', () => { let component: CustomTranslationComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/config/config-routing.module.ts b/client/src/app/site/config/config-routing.module.ts index 86d4f421c..3ceb76e3a 100644 --- a/client/src/app/site/config/config-routing.module.ts +++ b/client/src/app/site/config/config-routing.module.ts @@ -1,5 +1,6 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; + import { ConfigListComponent } from './components/config-list/config-list.component'; const routes: Routes = [{ path: '', component: ConfigListComponent, pathMatch: 'full' }]; diff --git a/client/src/app/site/config/config.module.ts b/client/src/app/site/config/config.module.ts index 2d935b995..07db66d4c 100644 --- a/client/src/app/site/config/config.module.ts +++ b/client/src/app/site/config/config.module.ts @@ -1,10 +1,11 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { SharedModule } from '../../shared/shared.module'; -import { ConfigRoutingModule } from './config-routing.module'; -import { ConfigListComponent } from './components/config-list/config-list.component'; +import { NgModule } from '@angular/core'; + import { ConfigFieldComponent } from './components/config-field/config-field.component'; +import { ConfigListComponent } from './components/config-list/config-list.component'; +import { ConfigRoutingModule } from './config-routing.module'; import { CustomTranslationComponent } from './components/custom-translation/custom-translation.component'; +import { SharedModule } from '../../shared/shared.module'; @NgModule({ imports: [CommonModule, ConfigRoutingModule, SharedModule], diff --git a/client/src/app/site/config/models/view-config.ts b/client/src/app/site/config/models/view-config.ts index 13da70b5e..7addb905c 100644 --- a/client/src/app/site/config/models/view-config.ts +++ b/client/src/app/site/config/models/view-config.ts @@ -1,5 +1,5 @@ -import { BaseViewModel } from '../../base/base-view-model'; import { Config } from 'app/shared/models/core/config'; +import { BaseViewModel } from '../../base/base-view-model'; interface ConfigChoice { value: string; diff --git a/client/src/app/site/history/components/history-list/history-list.component.spec.ts b/client/src/app/site/history/components/history-list/history-list.component.spec.ts index edd96bac4..ef74ae8c2 100644 --- a/client/src/app/site/history/components/history-list/history-list.component.spec.ts +++ b/client/src/app/site/history/components/history-list/history-list.component.spec.ts @@ -1,6 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { HistoryListComponent } from './history-list.component'; describe('HistoryListComponent', () => { diff --git a/client/src/app/site/history/components/history-list/history-list.component.ts b/client/src/app/site/history/components/history-list/history-list.component.ts index 7cdf7accc..5ad845d42 100644 --- a/client/src/app/site/history/components/history-list/history-list.component.ts +++ b/client/src/app/site/history/components/history-list/history-list.component.ts @@ -1,28 +1,28 @@ import { Component, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; import { MatTableDataSource } from '@angular/material/table'; -import { Router, ActivatedRoute } from '@angular/router'; import { Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Subject, BehaviorSubject } from 'rxjs'; - import { environment } from 'environments/environment'; -import { isDetailNavigable } from 'app/shared/models/base/detail-navigable'; -import { OperatorService } from 'app/core/core-services/operator.service'; -import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; -import { langToLocale } from 'app/shared/utils/lang-to-locale'; -import { TimeTravelService } from 'app/core/core-services/time-travel.service'; -import { HttpService } from 'app/core/core-services/http.service'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { History } from 'app/shared/models/core/history'; -import { ViewUser } from 'app/site/users/models/view-user'; -import { FormGroup, FormBuilder } from '@angular/forms'; -import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; -import { BaseViewModel } from 'app/site/base/base-view-model'; -import { Motion } from 'app/shared/models/motions/motion'; -import { PromptService } from 'app/core/ui-services/prompt.service'; +import { BehaviorSubject, Subject } from 'rxjs'; + import { CollectionStringMapperService } from 'app/core/core-services/collection-string-mapper.service'; +import { HttpService } from 'app/core/core-services/http.service'; +import { OperatorService } from 'app/core/core-services/operator.service'; +import { TimeTravelService } from 'app/core/core-services/time-travel.service'; +import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; +import { isDetailNavigable } from 'app/shared/models/base/detail-navigable'; +import { History } from 'app/shared/models/core/history'; +import { Motion } from 'app/shared/models/motions/motion'; +import { langToLocale } from 'app/shared/utils/lang-to-locale'; +import { BaseViewComponent } from 'app/site/base/base-view'; +import { BaseViewModel } from 'app/site/base/base-view-model'; +import { ViewUser } from 'app/site/users/models/view-user'; /** * A list view for the history. diff --git a/client/src/app/site/history/history-routing.module.ts b/client/src/app/site/history/history-routing.module.ts index f56ca339c..167ea962c 100644 --- a/client/src/app/site/history/history-routing.module.ts +++ b/client/src/app/site/history/history-routing.module.ts @@ -1,5 +1,6 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; + import { HistoryListComponent } from './components/history-list/history-list.component'; /** diff --git a/client/src/app/site/history/history.module.ts b/client/src/app/site/history/history.module.ts index a8a2084a9..65697f120 100644 --- a/client/src/app/site/history/history.module.ts +++ b/client/src/app/site/history/history.module.ts @@ -1,9 +1,9 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { HistoryListComponent } from './components/history-list/history-list.component'; import { HistoryRoutingModule } from './history-routing.module'; import { SharedModule } from '../../shared/shared.module'; -import { HistoryListComponent } from './components/history-list/history-list.component'; /** * App module for the history feature. diff --git a/client/src/app/site/login/components/login-legal-notice/login-legal-notice.component.spec.ts b/client/src/app/site/login/components/login-legal-notice/login-legal-notice.component.spec.ts index bc643b025..c194f9522 100644 --- a/client/src/app/site/login/components/login-legal-notice/login-legal-notice.component.spec.ts +++ b/client/src/app/site/login/components/login-legal-notice/login-legal-notice.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { LoginLegalNoticeComponent } from './login-legal-notice.component'; import { E2EImportsModule } from '../../../../../e2e-imports.module'; +import { LoginLegalNoticeComponent } from './login-legal-notice.component'; describe('LoginLegalNoticeComponent', () => { let component: LoginLegalNoticeComponent; diff --git a/client/src/app/site/login/components/login-mask/login-mask.component.spec.ts b/client/src/app/site/login/components/login-mask/login-mask.component.spec.ts index d4c1ad3ef..1198ee6bc 100644 --- a/client/src/app/site/login/components/login-mask/login-mask.component.spec.ts +++ b/client/src/app/site/login/components/login-mask/login-mask.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { LoginMaskComponent } from './login-mask.component'; import { E2EImportsModule } from '../../../../../e2e-imports.module'; +import { LoginMaskComponent } from './login-mask.component'; describe('LoginMaskComponent', () => { let component: LoginMaskComponent; diff --git a/client/src/app/site/login/components/login-mask/login-mask.component.ts b/client/src/app/site/login/components/login-mask/login-mask.component.ts index 3b4243462..a22d46fb5 100644 --- a/client/src/app/site/login/components/login-mask/login-mask.component.ts +++ b/client/src/app/site/login/components/login-mask/login-mask.component.ts @@ -1,18 +1,18 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { Router, ActivatedRoute } from '@angular/router'; -import { FormGroup, Validators, FormBuilder } from '@angular/forms'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { MatSnackBar } from '@angular/material'; import { Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; -import { Subscription } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; +import { Subscription } from 'rxjs'; -import { BaseViewComponent } from 'app/site/base/base-view'; import { AuthService } from 'app/core/core-services/auth.service'; import { OperatorService } from 'app/core/core-services/operator.service'; import { LoginDataService } from 'app/core/ui-services/login-data.service'; -import { ParentErrorStateMatcher } from 'app/shared/parent-error-state-matcher'; import { SpinnerService } from 'app/core/ui-services/spinner.service'; -import { MatSnackBar } from '@angular/material'; +import { ParentErrorStateMatcher } from 'app/shared/parent-error-state-matcher'; +import { BaseViewComponent } from 'app/site/base/base-view'; /** * Login mask component. diff --git a/client/src/app/site/login/components/login-privacy-policy/login-privacy-policy.component.spec.ts b/client/src/app/site/login/components/login-privacy-policy/login-privacy-policy.component.spec.ts index 68be4f21c..0cb9d3846 100644 --- a/client/src/app/site/login/components/login-privacy-policy/login-privacy-policy.component.spec.ts +++ b/client/src/app/site/login/components/login-privacy-policy/login-privacy-policy.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { LoginPrivacyPolicyComponent } from './login-privacy-policy.component'; import { E2EImportsModule } from '../../../../../e2e-imports.module'; +import { LoginPrivacyPolicyComponent } from './login-privacy-policy.component'; describe('LoginPrivacyPolicyComponent', () => { let component: LoginPrivacyPolicyComponent; diff --git a/client/src/app/site/login/components/login-wrapper/login-wrapper.component.spec.ts b/client/src/app/site/login/components/login-wrapper/login-wrapper.component.spec.ts index a647e56f3..7a9bf3057 100644 --- a/client/src/app/site/login/components/login-wrapper/login-wrapper.component.spec.ts +++ b/client/src/app/site/login/components/login-wrapper/login-wrapper.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { LoginWrapperComponent } from './login-wrapper.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { LoginWrapperComponent } from './login-wrapper.component'; + describe('LoginComponent', () => { let component: LoginWrapperComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/login/components/login-wrapper/login-wrapper.component.ts b/client/src/app/site/login/components/login-wrapper/login-wrapper.component.ts index ccf68f32a..b9678e158 100644 --- a/client/src/app/site/login/components/login-wrapper/login-wrapper.component.ts +++ b/client/src/app/site/login/components/login-wrapper/login-wrapper.component.ts @@ -3,8 +3,8 @@ import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { BaseComponent } from '../../../../base.component'; import { LoginDataService } from 'app/core/ui-services/login-data.service'; +import { BaseComponent } from '../../../../base.component'; /** * Login component. 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 7e710bdb5..6abc340be 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 @@ -1,8 +1,9 @@ -import { async, ComponentFixture, TestBed, tick, fakeAsync, flush, flushMicrotasks } from '@angular/core/testing'; +import { async, ComponentFixture, fakeAsync, flush, flushMicrotasks, TestBed, tick } from '@angular/core/testing'; +import { MatSnackBar } from '@angular/material/snack-bar'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { ResetPasswordConfirmComponent } from './reset-password-confirm.component'; -import { E2EImportsModule } from 'e2e-imports.module'; -import { MatSnackBar } from '@angular/material/snack-bar'; let matSnackBarSpy: jasmine.SpyObj; diff --git a/client/src/app/site/login/components/reset-password-confirm/reset-password-confirm.component.ts b/client/src/app/site/login/components/reset-password-confirm/reset-password-confirm.component.ts index bc292b1fc..eb7120dee 100644 --- a/client/src/app/site/login/components/reset-password-confirm/reset-password-confirm.component.ts +++ b/client/src/app/site/login/components/reset-password-confirm/reset-password-confirm.component.ts @@ -1,14 +1,14 @@ import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; -import { ActivatedRoute, Router } from '@angular/router'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; - -import { BaseComponent } from '../../../../base.component'; import { environment } from 'environments/environment'; + import { HttpService } from 'app/core/core-services/http.service'; +import { BaseComponent } from '../../../../base.component'; /** * Reset password component. diff --git a/client/src/app/site/login/components/reset-password/reset-password.component.spec.ts b/client/src/app/site/login/components/reset-password/reset-password.component.spec.ts index 3ac3da139..c63e37f8a 100644 --- a/client/src/app/site/login/components/reset-password/reset-password.component.spec.ts +++ b/client/src/app/site/login/components/reset-password/reset-password.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ResetPasswordComponent } from './reset-password.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { ResetPasswordComponent } from './reset-password.component'; + describe('ResetPasswordComponent', () => { let component: ResetPasswordComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/login/components/reset-password/reset-password.component.ts b/client/src/app/site/login/components/reset-password/reset-password.component.ts index 33d75da7e..f3f705f10 100644 --- a/client/src/app/site/login/components/reset-password/reset-password.component.ts +++ b/client/src/app/site/login/components/reset-password/reset-password.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; - import { environment } from 'environments/environment'; + import { HttpService } from 'app/core/core-services/http.service'; import { BaseViewComponent } from 'app/site/base/base-view'; diff --git a/client/src/app/site/login/login.module.ts b/client/src/app/site/login/login.module.ts index a3b11eb3a..5b101d9ec 100644 --- a/client/src/app/site/login/login.module.ts +++ b/client/src/app/site/login/login.module.ts @@ -1,14 +1,14 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { LoginWrapperComponent } from './components/login-wrapper/login-wrapper.component'; -import { SharedModule } from '../../shared/shared.module'; -import { LoginMaskComponent } from './components/login-mask/login-mask.component'; import { LoginLegalNoticeComponent } from './components/login-legal-notice/login-legal-notice.component'; +import { LoginMaskComponent } from './components/login-mask/login-mask.component'; import { LoginPrivacyPolicyComponent } from './components/login-privacy-policy/login-privacy-policy.component'; -import { ResetPasswordComponent } from './components/reset-password/reset-password.component'; +import { LoginWrapperComponent } from './components/login-wrapper/login-wrapper.component'; import { ResetPasswordConfirmComponent } from './components/reset-password-confirm/reset-password-confirm.component'; +import { ResetPasswordComponent } from './components/reset-password/reset-password.component'; +import { SharedModule } from '../../shared/shared.module'; @NgModule({ imports: [CommonModule, RouterModule, SharedModule], diff --git a/client/src/app/site/mediafiles/components/media-upload/media-upload.component.spec.ts b/client/src/app/site/mediafiles/components/media-upload/media-upload.component.spec.ts index f8b5235ed..c82ab3fc6 100644 --- a/client/src/app/site/mediafiles/components/media-upload/media-upload.component.spec.ts +++ b/client/src/app/site/mediafiles/components/media-upload/media-upload.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MediaUploadComponent } from './media-upload.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MediaUploadComponent } from './media-upload.component'; + describe('MediaUploadComponent', () => { let component: MediaUploadComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/mediafiles/components/media-upload/media-upload.component.ts b/client/src/app/site/mediafiles/components/media-upload/media-upload.component.ts index 1ad22b941..080e2a0ae 100644 --- a/client/src/app/site/mediafiles/components/media-upload/media-upload.component.ts +++ b/client/src/app/site/mediafiles/components/media-upload/media-upload.component.ts @@ -1,13 +1,13 @@ -import { Component, OnInit } from '@angular/core'; import { Location } from '@angular/common'; +import { Component, OnInit } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; +import { ActivatedRoute } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { ActivatedRoute } from '@angular/router'; import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service'; +import { BaseViewComponent } from 'app/site/base/base-view'; /** * Handle file uploads from user diff --git a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.spec.ts b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.spec.ts index 85c41fa83..82ae84379 100644 --- a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.spec.ts +++ b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MediafileListComponent } from './mediafile-list.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MediafileListComponent } from './mediafile-list.component'; + describe('MediafileListComponent', () => { let component: MediafileListComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.ts b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.ts index a56e442fd..5a130d6c8 100644 --- a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.ts +++ b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.ts @@ -1,34 +1,34 @@ import { - Component, - OnInit, - ViewChild, - TemplateRef, - OnDestroy, - ViewEncapsulation, ChangeDetectionStrategy, - ChangeDetectorRef + ChangeDetectorRef, + Component, + OnDestroy, + OnInit, + TemplateRef, + ViewChild, + ViewEncapsulation } from '@angular/core'; -import { BehaviorSubject, Subscription } from 'rxjs'; -import { FormGroup, Validators, FormBuilder } from '@angular/forms'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { Router, ActivatedRoute } from '@angular/router'; import { Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { PblDataSource, columnFactory, createDS } from '@pebula/ngrid'; +import { columnFactory, createDS, PblDataSource } from '@pebula/ngrid'; +import { BehaviorSubject, Subscription } from 'rxjs'; -import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; -import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service'; -import { MediaManageService } from 'app/core/ui-services/media-manage.service'; -import { MediafilesSortListService } from '../../services/mediafiles-sort-list.service'; import { OperatorService } from 'app/core/core-services/operator.service'; +import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service'; +import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; +import { MediaManageService } from 'app/core/ui-services/media-manage.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; import { ViewportService } from 'app/core/ui-services/viewport.service'; import { Mediafile } from 'app/shared/models/mediafiles/mediafile'; -import { ViewGroup } from 'app/site/users/models/view-group'; -import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; import { BaseViewComponent } from 'app/site/base/base-view'; +import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; +import { ViewGroup } from 'app/site/users/models/view-group'; +import { MediafilesSortListService } from '../../services/mediafiles-sort-list.service'; /** * Lists all the uploaded files. diff --git a/client/src/app/site/mediafiles/mediafile.config.ts b/client/src/app/site/mediafiles/mediafile.config.ts index 1fc8597cc..5c408ac97 100644 --- a/client/src/app/site/mediafiles/mediafile.config.ts +++ b/client/src/app/site/mediafiles/mediafile.config.ts @@ -1,6 +1,6 @@ import { AppConfig } from '../../core/app-config'; -import { Mediafile } from '../../shared/models/mediafiles/mediafile'; import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service'; +import { Mediafile } from '../../shared/models/mediafiles/mediafile'; import { ViewMediafile } from './models/view-mediafile'; export const MediafileAppConfig: AppConfig = { diff --git a/client/src/app/site/mediafiles/mediafiles-routing.module.ts b/client/src/app/site/mediafiles/mediafiles-routing.module.ts index d6f3f4f24..a7fb99091 100644 --- a/client/src/app/site/mediafiles/mediafiles-routing.module.ts +++ b/client/src/app/site/mediafiles/mediafiles-routing.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { MediafileListComponent } from './components/mediafile-list/mediafile-list.component'; +import { RouterModule, Routes } from '@angular/router'; + import { MediaUploadComponent } from './components/media-upload/media-upload.component'; +import { MediafileListComponent } from './components/mediafile-list/mediafile-list.component'; const routes: Routes = [ { diff --git a/client/src/app/site/mediafiles/mediafiles.module.ts b/client/src/app/site/mediafiles/mediafiles.module.ts index 3261da26a..4ff1e8875 100644 --- a/client/src/app/site/mediafiles/mediafiles.module.ts +++ b/client/src/app/site/mediafiles/mediafiles.module.ts @@ -1,10 +1,10 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { MediaUploadComponent } from './components/media-upload/media-upload.component'; +import { MediafileListComponent } from './components/mediafile-list/mediafile-list.component'; import { MediafilesRoutingModule } from './mediafiles-routing.module'; import { SharedModule } from '../../shared/shared.module'; -import { MediafileListComponent } from './components/mediafile-list/mediafile-list.component'; -import { MediaUploadComponent } from './components/media-upload/media-upload.component'; @NgModule({ imports: [CommonModule, MediafilesRoutingModule, SharedModule], diff --git a/client/src/app/site/mediafiles/models/view-mediafile.ts b/client/src/app/site/mediafiles/models/view-mediafile.ts index 9607e5d43..d606e6c52 100644 --- a/client/src/app/site/mediafiles/models/view-mediafile.ts +++ b/client/src/app/site/mediafiles/models/view-mediafile.ts @@ -1,8 +1,8 @@ -import { Mediafile } from 'app/shared/models/mediafiles/mediafile'; -import { Searchable } from 'app/site/base/searchable'; import { SearchRepresentation } from 'app/core/ui-services/search.service'; -import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; +import { Mediafile } from 'app/shared/models/mediafiles/mediafile'; import { BaseViewModelWithListOfSpeakers } from 'app/site/base/base-view-model-with-list-of-speakers'; +import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; +import { Searchable } from 'app/site/base/searchable'; import { ViewGroup } from 'app/site/users/models/view-group'; export const IMAGE_MIMETYPES = ['image/png', 'image/jpeg', 'image/gif']; diff --git a/client/src/app/site/mediafiles/services/mediafiles-sort-list.service.ts b/client/src/app/site/mediafiles/services/mediafiles-sort-list.service.ts index 60022e821..7ea583698 100644 --- a/client/src/app/site/mediafiles/services/mediafiles-sort-list.service.ts +++ b/client/src/app/site/mediafiles/services/mediafiles-sort-list.service.ts @@ -1,8 +1,9 @@ import { Injectable } from '@angular/core'; -import { BaseSortListService, OsSortingDefinition, OsSortingOption } from 'app/core/ui-services/base-sort-list.service'; -import { StorageService } from 'app/core/core-services/storage.service'; import { TranslateService } from '@ngx-translate/core'; + +import { StorageService } from 'app/core/core-services/storage.service'; +import { BaseSortListService, OsSortingDefinition, OsSortingOption } from 'app/core/ui-services/base-sort-list.service'; import { ViewMediafile } from '../models/view-mediafile'; /** diff --git a/client/src/app/site/motions/models/view-category.ts b/client/src/app/site/motions/models/view-category.ts index 22b74deb8..17064a79a 100644 --- a/client/src/app/site/motions/models/view-category.ts +++ b/client/src/app/site/motions/models/view-category.ts @@ -1,7 +1,7 @@ -import { Category } from 'app/shared/models/motions/category'; -import { BaseViewModel } from '../../base/base-view-model'; import { SearchRepresentation } from 'app/core/ui-services/search.service'; +import { Category } from 'app/shared/models/motions/category'; import { Searchable } from 'app/site/base/searchable'; +import { BaseViewModel } from '../../base/base-view-model'; export interface CategoryTitleInformation { prefix: string; diff --git a/client/src/app/site/motions/models/view-create-motion.ts b/client/src/app/site/motions/models/view-create-motion.ts index 6c0551be7..aff2118fb 100644 --- a/client/src/app/site/motions/models/view-create-motion.ts +++ b/client/src/app/site/motions/models/view-create-motion.ts @@ -1,6 +1,6 @@ -import { ViewMotion } from './view-motion'; -import { CreateMotion } from './create-motion'; import { ViewUser } from 'app/site/users/models/view-user'; +import { CreateMotion } from './create-motion'; +import { ViewMotion } from './view-motion'; /** * Create motion class for the View. Its different to ViewMotion in fact that the submitter handling is different diff --git a/client/src/app/site/motions/models/view-csv-create-motion.ts b/client/src/app/site/motions/models/view-csv-create-motion.ts index 4d18fe13f..6f1d0c1c6 100644 --- a/client/src/app/site/motions/models/view-csv-create-motion.ts +++ b/client/src/app/site/motions/models/view-csv-create-motion.ts @@ -1,5 +1,5 @@ -import { ViewCreateMotion } from './view-create-motion'; import { CreateMotion } from './create-motion'; +import { ViewCreateMotion } from './view-create-motion'; /** * Interface for correlating between strings representing BaseModels and existing diff --git a/client/src/app/site/motions/models/view-motion-amended-paragraph.ts b/client/src/app/site/motions/models/view-motion-amended-paragraph.ts index 3d0125b24..1c365752b 100644 --- a/client/src/app/site/motions/models/view-motion-amended-paragraph.ts +++ b/client/src/app/site/motions/models/view-motion-amended-paragraph.ts @@ -1,7 +1,7 @@ -import { ViewUnifiedChange, ViewUnifiedChangeType } from '../../../shared/models/motions/view-unified-change'; -import { ViewMotion } from './view-motion'; import { LineRange } from 'app/core/ui-services/diff.service'; import { MergeAmendment } from 'app/shared/models/motions/state'; +import { ViewMotion } from './view-motion'; +import { ViewUnifiedChange, ViewUnifiedChangeType } from '../../../shared/models/motions/view-unified-change'; /** * This represents the Unified Diff part of an amendments. diff --git a/client/src/app/site/motions/models/view-motion-block.ts b/client/src/app/site/motions/models/view-motion-block.ts index f66ca7642..ff1bb8d6a 100644 --- a/client/src/app/site/motions/models/view-motion-block.ts +++ b/client/src/app/site/motions/models/view-motion-block.ts @@ -1,9 +1,9 @@ -import { MotionBlock } from 'app/shared/models/motions/motion-block'; import { SearchRepresentation } from 'app/core/ui-services/search.service'; +import { MotionBlock } from 'app/shared/models/motions/motion-block'; +import { TitleInformationWithAgendaItem } from 'app/site/base/base-view-model-with-agenda-item'; +import { BaseViewModelWithAgendaItemAndListOfSpeakers } from 'app/site/base/base-view-model-with-agenda-item-and-list-of-speakers'; import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; import { Searchable } from 'app/site/base/searchable'; -import { BaseViewModelWithAgendaItemAndListOfSpeakers } from 'app/site/base/base-view-model-with-agenda-item-and-list-of-speakers'; -import { TitleInformationWithAgendaItem } from 'app/site/base/base-view-model-with-agenda-item'; export interface MotionBlockTitleInformation extends TitleInformationWithAgendaItem { title: string; diff --git a/client/src/app/site/motions/models/view-motion-change-recommendation.ts b/client/src/app/site/motions/models/view-motion-change-recommendation.ts index 8bd43d60a..590d2c2d5 100644 --- a/client/src/app/site/motions/models/view-motion-change-recommendation.ts +++ b/client/src/app/site/motions/models/view-motion-change-recommendation.ts @@ -1,6 +1,6 @@ -import { BaseViewModel } from '../../base/base-view-model'; import { ModificationType } from 'app/core/ui-services/diff.service'; import { MotionChangeRecommendation } from 'app/shared/models/motions/motion-change-reco'; +import { BaseViewModel } from '../../base/base-view-model'; import { ViewUnifiedChange, ViewUnifiedChangeType } from '../../../shared/models/motions/view-unified-change'; export type MotionChangeRecommendationTitleInformation = object; diff --git a/client/src/app/site/motions/models/view-motion-comment-section.ts b/client/src/app/site/motions/models/view-motion-comment-section.ts index 11229a71a..f5894c520 100644 --- a/client/src/app/site/motions/models/view-motion-comment-section.ts +++ b/client/src/app/site/motions/models/view-motion-comment-section.ts @@ -1,6 +1,6 @@ -import { BaseViewModel } from '../../base/base-view-model'; import { MotionCommentSection } from 'app/shared/models/motions/motion-comment-section'; import { ViewGroup } from 'app/site/users/models/view-group'; +import { BaseViewModel } from '../../base/base-view-model'; export interface MotionCommentSectionTitleInformation { name: string; diff --git a/client/src/app/site/motions/models/view-motion.ts b/client/src/app/site/motions/models/view-motion.ts index 4b80c3fdd..25b898063 100644 --- a/client/src/app/site/motions/models/view-motion.ts +++ b/client/src/app/site/motions/models/view-motion.ts @@ -1,22 +1,22 @@ +import { _ } from 'app/core/translate/translation-marker'; +import { ConfigService } from 'app/core/ui-services/config.service'; +import { SearchRepresentation } from 'app/core/ui-services/search.service'; import { Motion, MotionComment } from 'app/shared/models/motions/motion'; import { PersonalNoteContent } from 'app/shared/models/users/personal-note'; -import { ViewMotionCommentSection } from './view-motion-comment-section'; +import { TitleInformationWithAgendaItem } from 'app/site/base/base-view-model-with-agenda-item'; +import { BaseViewModelWithAgendaItemAndListOfSpeakers } from 'app/site/base/base-view-model-with-agenda-item-and-list-of-speakers'; import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; -import { SearchRepresentation } from 'app/core/ui-services/search.service'; import { Searchable } from 'app/site/base/searchable'; -import { ViewUser } from 'app/site/users/models/view-user'; -import { ViewTag } from 'app/site/tags/models/view-tag'; import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; -import { ViewWorkflow } from './view-workflow'; +import { ViewTag } from 'app/site/tags/models/view-tag'; +import { ViewUser } from 'app/site/users/models/view-user'; import { ViewCategory } from './view-category'; import { ViewMotionBlock } from './view-motion-block'; -import { ConfigService } from 'app/core/ui-services/config.service'; import { ViewMotionChangeRecommendation } from './view-motion-change-recommendation'; -import { _ } from 'app/core/translate/translation-marker'; -import { BaseViewModelWithAgendaItemAndListOfSpeakers } from 'app/site/base/base-view-model-with-agenda-item-and-list-of-speakers'; -import { TitleInformationWithAgendaItem } from 'app/site/base/base-view-model-with-agenda-item'; +import { ViewMotionCommentSection } from './view-motion-comment-section'; import { ViewState } from './view-state'; import { ViewSubmitter } from './view-submitter'; +import { ViewWorkflow } from './view-workflow'; /** * The line numbering mode for the motion detail view. diff --git a/client/src/app/site/motions/models/view-state.ts b/client/src/app/site/motions/models/view-state.ts index e2adca5be..84316e81a 100644 --- a/client/src/app/site/motions/models/view-state.ts +++ b/client/src/app/site/motions/models/view-state.ts @@ -1,5 +1,5 @@ +import { MergeAmendment, State } from 'app/shared/models/motions/state'; import { BaseViewModel } from '../../base/base-view-model'; -import { State, MergeAmendment } from 'app/shared/models/motions/state'; import { ViewWorkflow } from './view-workflow'; export interface StateTitleInformation { diff --git a/client/src/app/site/motions/models/view-statute-paragraph.ts b/client/src/app/site/motions/models/view-statute-paragraph.ts index 43f039107..701a6ae56 100644 --- a/client/src/app/site/motions/models/view-statute-paragraph.ts +++ b/client/src/app/site/motions/models/view-statute-paragraph.ts @@ -1,7 +1,7 @@ -import { BaseViewModel } from '../../base/base-view-model'; +import { SearchRepresentation } from 'app/core/ui-services/search.service'; import { StatuteParagraph } from 'app/shared/models/motions/statute-paragraph'; import { Searchable } from 'app/site/base/searchable'; -import { SearchRepresentation } from 'app/core/ui-services/search.service'; +import { BaseViewModel } from '../../base/base-view-model'; export interface StatuteParagraphTitleInformation { title: string; diff --git a/client/src/app/site/motions/models/view-submitter.ts b/client/src/app/site/motions/models/view-submitter.ts index 564319dee..7c6e1e5eb 100644 --- a/client/src/app/site/motions/models/view-submitter.ts +++ b/client/src/app/site/motions/models/view-submitter.ts @@ -1,6 +1,6 @@ -import { ViewUser } from 'app/site/users/models/view-user'; import { Submitter } from 'app/shared/models/motions/submitter'; import { BaseViewModel } from 'app/site/base/base-view-model'; +import { ViewUser } from 'app/site/users/models/view-user'; export class ViewSubmitter extends BaseViewModel { public static COLLECTIONSTRING = Submitter.COLLECTIONSTRING; diff --git a/client/src/app/site/motions/modules/call-list/call-list-routing.module.ts b/client/src/app/site/motions/modules/call-list/call-list-routing.module.ts index af486f335..6a1b74fa1 100644 --- a/client/src/app/site/motions/modules/call-list/call-list-routing.module.ts +++ b/client/src/app/site/motions/modules/call-list/call-list-routing.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; -import { CallListComponent } from './call-list.component'; import { WatchSortingTreeGuard } from 'app/shared/utils/watch-sorting-tree.guard'; +import { CallListComponent } from './call-list.component'; const routes: Routes = [ { path: '', component: CallListComponent, pathMatch: 'full', canDeactivate: [WatchSortingTreeGuard] } diff --git a/client/src/app/site/motions/modules/call-list/call-list.component.spec.ts b/client/src/app/site/motions/modules/call-list/call-list.component.spec.ts index 0fa3f483d..1e25c48b8 100644 --- a/client/src/app/site/motions/modules/call-list/call-list.component.spec.ts +++ b/client/src/app/site/motions/modules/call-list/call-list.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { CallListComponent } from './call-list.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { CallListComponent } from './call-list.component'; + describe('CallListComponent', () => { let component: CallListComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/call-list/call-list.component.ts b/client/src/app/site/motions/modules/call-list/call-list.component.ts index 5e92fb1de..77ad71263 100644 --- a/client/src/app/site/motions/modules/call-list/call-list.component.ts +++ b/client/src/app/site/motions/modules/call-list/call-list.component.ts @@ -1,19 +1,19 @@ import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; -import { Observable, BehaviorSubject } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; +import { BehaviorSubject, Observable } from 'rxjs'; import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; +import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; +import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; import { FlatNode } from 'app/core/ui-services/tree.service'; +import { SortTreeFilterOption, SortTreeViewComponent } from 'app/site/base/sort-tree.component'; +import { ViewMotion } from 'app/site/motions/models/view-motion'; import { MotionCsvExportService } from 'app/site/motions/services/motion-csv-export.service'; import { MotionPdfExportService } from 'app/site/motions/services/motion-pdf-export.service'; -import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; -import { PromptService } from 'app/core/ui-services/prompt.service'; -import { SortTreeViewComponent, SortTreeFilterOption } from 'app/site/base/sort-tree.component'; -import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; -import { ViewMotion } from 'app/site/motions/models/view-motion'; import { ViewTag } from 'app/site/tags/models/view-tag'; /** diff --git a/client/src/app/site/motions/modules/call-list/call-list.module.ts b/client/src/app/site/motions/modules/call-list/call-list.module.ts index 52d3c83a8..4e45f8a14 100644 --- a/client/src/app/site/motions/modules/call-list/call-list.module.ts +++ b/client/src/app/site/motions/modules/call-list/call-list.module.ts @@ -1,9 +1,9 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { SharedModule } from 'app/shared/shared.module'; import { CallListRoutingModule } from './call-list-routing.module'; import { CallListComponent } from './call-list.component'; -import { SharedModule } from 'app/shared/shared.module'; @NgModule({ declarations: [CallListComponent], diff --git a/client/src/app/site/motions/modules/category/category-routing.module.ts b/client/src/app/site/motions/modules/category/category-routing.module.ts index be6726f70..bff084630 100644 --- a/client/src/app/site/motions/modules/category/category-routing.module.ts +++ b/client/src/app/site/motions/modules/category/category-routing.module.ts @@ -1,10 +1,11 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; + +import { WatchSortingTreeGuard } from 'app/shared/utils/watch-sorting-tree.guard'; +import { CategoriesSortComponent } from './components/categories-sort/categories-sort.component'; +import { CategoryDetailComponent } from './components/category-detail/category-detail.component'; import { CategoryListComponent } from './components/category-list/category-list.component'; import { CategoryMotionsSortComponent } from './components/category-motions-sort/category-motions-sort.component'; -import { WatchSortingTreeGuard } from 'app/shared/utils/watch-sorting-tree.guard'; -import { CategoryDetailComponent } from './components/category-detail/category-detail.component'; -import { CategoriesSortComponent } from './components/categories-sort/categories-sort.component'; const routes: Routes = [ { path: '', component: CategoryListComponent, pathMatch: 'full' }, diff --git a/client/src/app/site/motions/modules/category/category.module.ts b/client/src/app/site/motions/modules/category/category.module.ts index 3746983f1..62e1524f5 100644 --- a/client/src/app/site/motions/modules/category/category.module.ts +++ b/client/src/app/site/motions/modules/category/category.module.ts @@ -1,12 +1,12 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; -import { CategoryRoutingModule } from './category-routing.module'; import { SharedModule } from 'app/shared/shared.module'; +import { CategoriesSortComponent } from './components/categories-sort/categories-sort.component'; +import { CategoryDetailComponent } from './components/category-detail/category-detail.component'; import { CategoryListComponent } from './components/category-list/category-list.component'; import { CategoryMotionsSortComponent } from './components/category-motions-sort/category-motions-sort.component'; -import { CategoryDetailComponent } from './components/category-detail/category-detail.component'; -import { CategoriesSortComponent } from './components/categories-sort/categories-sort.component'; +import { CategoryRoutingModule } from './category-routing.module'; @NgModule({ declarations: [ diff --git a/client/src/app/site/motions/modules/category/components/categories-sort/categories-sort.component.spec.ts b/client/src/app/site/motions/modules/category/components/categories-sort/categories-sort.component.spec.ts index 723b00ef3..9a5fcbd68 100644 --- a/client/src/app/site/motions/modules/category/components/categories-sort/categories-sort.component.spec.ts +++ b/client/src/app/site/motions/modules/category/components/categories-sort/categories-sort.component.spec.ts @@ -1,6 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { CategoriesSortComponent } from './categories-sort.component'; describe('CategoriesSortComponent', () => { diff --git a/client/src/app/site/motions/modules/category/components/categories-sort/categories-sort.component.ts b/client/src/app/site/motions/modules/category/components/categories-sort/categories-sort.component.ts index 88d849519..60fee77af 100644 --- a/client/src/app/site/motions/modules/category/components/categories-sort/categories-sort.component.ts +++ b/client/src/app/site/motions/modules/category/components/categories-sort/categories-sort.component.ts @@ -1,16 +1,16 @@ import { Component, ViewChild } from '@angular/core'; -import { Title } from '@angular/platform-browser'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { CanComponentDeactivate } from 'app/shared/utils/watch-sorting-tree.guard'; +import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; import { SortingTreeComponent } from 'app/shared/components/sorting-tree/sorting-tree.component'; +import { CanComponentDeactivate } from 'app/shared/utils/watch-sorting-tree.guard'; +import { BaseViewComponent } from 'app/site/base/base-view'; import { ViewCategory } from 'app/site/motions/models/view-category'; -import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; /** * Sort view for the call list. diff --git a/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.spec.ts b/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.spec.ts index 5f999131e..6e329f3ef 100644 --- a/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.spec.ts +++ b/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { CategoryDetailComponent } from './category-detail.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { CategoryDetailComponent } from './category-detail.component'; + describe('CategoryDetailComponent', () => { let component: CategoryDetailComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.ts b/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.ts index 53982fe23..95e3e4688 100644 --- a/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.ts +++ b/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.ts @@ -1,20 +1,20 @@ -import { ActivatedRoute, Router } from '@angular/router'; -import { Component, OnInit, ViewChild, TemplateRef } from '@angular/core'; -import { FormGroup, Validators, FormBuilder } from '@angular/forms'; +import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { MatTableDataSource } from '@angular/material/table'; import { Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; import { OperatorService } from 'app/core/core-services/operator.service'; -import { PromptService } from 'app/core/ui-services/prompt.service'; -import { ViewMotion } from 'app/site/motions/models/view-motion'; -import { ViewCategory } from 'app/site/motions/models/view-category'; import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; +import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; import { BaseViewComponent } from 'app/site/base/base-view'; +import { ViewCategory } from 'app/site/motions/models/view-category'; +import { ViewMotion } from 'app/site/motions/models/view-motion'; /** * Detail component to display one motion block diff --git a/client/src/app/site/motions/modules/category/components/category-list/category-list.component.spec.ts b/client/src/app/site/motions/modules/category/components/category-list/category-list.component.spec.ts index ef4928662..f4a526df4 100644 --- a/client/src/app/site/motions/modules/category/components/category-list/category-list.component.spec.ts +++ b/client/src/app/site/motions/modules/category/components/category-list/category-list.component.spec.ts @@ -1,6 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { CategoryListComponent } from './category-list.component'; describe('CategoryListComponent', () => { diff --git a/client/src/app/site/motions/modules/category/components/category-list/category-list.component.ts b/client/src/app/site/motions/modules/category/components/category-list/category-list.component.ts index d0ccdc1be..defe562a1 100644 --- a/client/src/app/site/motions/modules/category/components/category-list/category-list.component.ts +++ b/client/src/app/site/motions/modules/category/components/category-list/category-list.component.ts @@ -1,15 +1,15 @@ import { Component, OnInit } from '@angular/core'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; -import { Title } from '@angular/platform-browser'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; import { MatTableDataSource } from '@angular/material/table'; +import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { OperatorService } from 'app/core/core-services/operator.service'; import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; -import { ViewCategory } from 'app/site/motions/models/view-category'; import { BaseViewComponent } from 'app/site/base/base-view'; +import { ViewCategory } from 'app/site/motions/models/view-category'; /** * Table for categories diff --git a/client/src/app/site/motions/modules/category/components/category-motions-sort/category-motions-sort.component.spec.ts b/client/src/app/site/motions/modules/category/components/category-motions-sort/category-motions-sort.component.spec.ts index 6c8304e3f..486c9b93f 100644 --- a/client/src/app/site/motions/modules/category/components/category-motions-sort/category-motions-sort.component.spec.ts +++ b/client/src/app/site/motions/modules/category/components/category-motions-sort/category-motions-sort.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { CategoryMotionsSortComponent } from './category-motions-sort.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { CategoryMotionsSortComponent } from './category-motions-sort.component'; + describe('CategoryMotionsSortComponent', () => { let component: CategoryMotionsSortComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/category/components/category-motions-sort/category-motions-sort.component.ts b/client/src/app/site/motions/modules/category/components/category-motions-sort/category-motions-sort.component.ts index e455c0fb0..9d1cb9484 100644 --- a/client/src/app/site/motions/modules/category/components/category-motions-sort/category-motions-sort.component.ts +++ b/client/src/app/site/motions/modules/category/components/category-motions-sort/category-motions-sort.component.ts @@ -1,17 +1,18 @@ -import { ActivatedRoute } from '@angular/router'; -import { BehaviorSubject, Observable } from 'rxjs'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { Title } from '@angular/platform-browser'; -import { TranslateService } from '@ngx-translate/core'; - -import { BaseViewComponent } from 'app/site/base/base-view'; -import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; -import { CanComponentDeactivate } from 'app/shared/utils/watch-sorting-tree.guard'; -import { ChoiceService } from 'app/core/ui-services/choice.service'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; +import { ActivatedRoute } from '@angular/router'; + +import { TranslateService } from '@ngx-translate/core'; +import { BehaviorSubject, Observable } from 'rxjs'; + +import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; +import { ChoiceService } from 'app/core/ui-services/choice.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; import { SortingListComponent } from 'app/shared/components/sorting-list/sorting-list.component'; +import { CanComponentDeactivate } from 'app/shared/utils/watch-sorting-tree.guard'; +import { BaseViewComponent } from 'app/site/base/base-view'; import { ViewCategory } from 'app/site/motions/models/view-category'; import { ViewMotion } from 'app/site/motions/models/view-motion'; diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.spec.ts b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.spec.ts index 7e1a14553..0587809f0 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MotionBlockDetailComponent } from './motion-block-detail.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionBlockDetailComponent } from './motion-block-detail.component'; + describe('MotionBlockDetailComponent', () => { let component: MotionBlockDetailComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.ts b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.ts index 33bc6a558..94b85a63e 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.ts +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.ts @@ -1,21 +1,21 @@ -import { ActivatedRoute, Router } from '@angular/router'; -import { Component, OnInit, ViewChild, TemplateRef } from '@angular/core'; -import { FormGroup, Validators, FormBuilder } from '@angular/forms'; +import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { PblColumnDefinition, PblDataSource, createDS, columnFactory } from '@pebula/ngrid'; +import { columnFactory, createDS, PblColumnDefinition, PblDataSource } from '@pebula/ngrid'; -import { MotionBlock } from 'app/shared/models/motions/motion-block'; +import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; +import { MotionBlock } from 'app/shared/models/motions/motion-block'; +import { BaseViewComponent } from 'app/site/base/base-view'; import { ViewMotion } from 'app/site/motions/models/view-motion'; import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; /** * Detail component to display one motion block diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.spec.ts b/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.spec.ts index fcdd2943d..f34996078 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MotionBlockListComponent } from './motion-block-list.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionBlockListComponent } from './motion-block-list.component'; + describe('MotionBlockListComponent', () => { let component: MotionBlockListComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts b/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts index 1e74d9758..2d33f766a 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts @@ -1,21 +1,21 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; -import { Title } from '@angular/platform-browser'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; -import { BehaviorSubject } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; import { PblColumnDefinition } from '@pebula/ngrid'; +import { BehaviorSubject } from 'rxjs'; -import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; -import { BaseListViewComponent } from 'app/site/base/base-list-view'; -import { MotionBlock } from 'app/shared/models/motions/motion-block'; -import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; -import { MotionBlockSortService } from 'app/site/motions/services/motion-block-sort.service'; import { OperatorService } from 'app/core/core-services/operator.service'; import { StorageService } from 'app/core/core-services/storage.service'; +import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; +import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; +import { MotionBlock } from 'app/shared/models/motions/motion-block'; import { ViewItem } from 'app/site/agenda/models/view-item'; +import { BaseListViewComponent } from 'app/site/base/base-list-view'; import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block'; +import { MotionBlockSortService } from 'app/site/motions/services/motion-block-sort.service'; /** * Table for the motion blocks diff --git a/client/src/app/site/motions/modules/motion-block/motion-block-routing.module.ts b/client/src/app/site/motions/modules/motion-block/motion-block-routing.module.ts index a56580ff6..8302759d8 100644 --- a/client/src/app/site/motions/modules/motion-block/motion-block-routing.module.ts +++ b/client/src/app/site/motions/modules/motion-block/motion-block-routing.module.ts @@ -1,5 +1,6 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; + import { MotionBlockDetailComponent } from './components/motion-block-detail/motion-block-detail.component'; import { MotionBlockListComponent } from './components/motion-block-list/motion-block-list.component'; diff --git a/client/src/app/site/motions/modules/motion-block/motion-block.module.ts b/client/src/app/site/motions/modules/motion-block/motion-block.module.ts index 109ca252e..8a695c3ea 100644 --- a/client/src/app/site/motions/modules/motion-block/motion-block.module.ts +++ b/client/src/app/site/motions/modules/motion-block/motion-block.module.ts @@ -1,10 +1,10 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; -import { MotionBlockRoutingModule } from './motion-block-routing.module'; -import { MotionBlockListComponent } from './components/motion-block-list/motion-block-list.component'; -import { MotionBlockDetailComponent } from './components/motion-block-detail/motion-block-detail.component'; import { SharedModule } from 'app/shared/shared.module'; +import { MotionBlockDetailComponent } from './components/motion-block-detail/motion-block-detail.component'; +import { MotionBlockListComponent } from './components/motion-block-list/motion-block-list.component'; +import { MotionBlockRoutingModule } from './motion-block-routing.module'; @NgModule({ declarations: [MotionBlockListComponent, MotionBlockDetailComponent], diff --git a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.spec.ts b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.spec.ts index a89c54d39..8c7b8a95e 100644 --- a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MotionCommentSectionListComponent } from './motion-comment-section-list.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionCommentSectionListComponent } from './motion-comment-section-list.component'; + describe('MotionCommentSectionListComponent', () => { let component: MotionCommentSectionListComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.ts b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.ts index e7e4aa640..9be7b7a3c 100644 --- a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.ts +++ b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.ts @@ -1,19 +1,18 @@ import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject } from 'rxjs'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; +import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; import { MotionCommentSection } from 'app/shared/models/motions/motion-comment-section'; import { BaseViewComponent } from 'app/site/base/base-view'; -import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; -import { PromptService } from 'app/core/ui-services/prompt.service'; - -import { ViewGroup } from 'app/site/users/models/view-group'; -import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; import { ViewMotionCommentSection } from 'app/site/motions/models/view-motion-comment-section'; +import { ViewGroup } from 'app/site/users/models/view-group'; /** * List view for the comment sections. diff --git a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-sort/motion-comment-section-sort.component.spec.ts b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-sort/motion-comment-section-sort.component.spec.ts index a2d0bde5b..c8079a44e 100644 --- a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-sort/motion-comment-section-sort.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-sort/motion-comment-section-sort.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MotionCommentSectionSortComponent } from './motion-comment-section-sort.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionCommentSectionSortComponent } from './motion-comment-section-sort.component'; + describe('MotionCommentSectionSortComponent', () => { let component: MotionCommentSectionSortComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-sort/motion-comment-section-sort.component.ts b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-sort/motion-comment-section-sort.component.ts index f5b604f88..7c14b03dc 100644 --- a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-sort/motion-comment-section-sort.component.ts +++ b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-sort/motion-comment-section-sort.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; import { MatSnackBar } from '@angular/material'; +import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewComponent } from 'app/site/base/base-view'; import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; +import { BaseViewComponent } from 'app/site/base/base-view'; import { ViewMotionCommentSection } from 'app/site/motions/models/view-motion-comment-section'; /** diff --git a/client/src/app/site/motions/modules/motion-comment-section/motion-comment-section-routing.module.ts b/client/src/app/site/motions/modules/motion-comment-section/motion-comment-section-routing.module.ts index e31328b1b..e9153808e 100644 --- a/client/src/app/site/motions/modules/motion-comment-section/motion-comment-section-routing.module.ts +++ b/client/src/app/site/motions/modules/motion-comment-section/motion-comment-section-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { MotionCommentSectionListComponent } from './components/motion-comment-section-list/motion-comment-section-list.component'; import { MotionCommentSectionSortComponent } from './components/motion-comment-section-sort/motion-comment-section-sort.component'; diff --git a/client/src/app/site/motions/modules/motion-comment-section/motion-comment-section.module.ts b/client/src/app/site/motions/modules/motion-comment-section/motion-comment-section.module.ts index fb703e038..ff8f3a3cb 100644 --- a/client/src/app/site/motions/modules/motion-comment-section/motion-comment-section.module.ts +++ b/client/src/app/site/motions/modules/motion-comment-section/motion-comment-section.module.ts @@ -1,9 +1,9 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; -import { MotionCommentSectionRoutingModule } from './motion-comment-section-routing.module'; import { SharedModule } from 'app/shared/shared.module'; import { MotionCommentSectionListComponent } from './components/motion-comment-section-list/motion-comment-section-list.component'; +import { MotionCommentSectionRoutingModule } from './motion-comment-section-routing.module'; import { MotionCommentSectionSortComponent } from './components/motion-comment-section-sort/motion-comment-section-sort.component'; @NgModule({ diff --git a/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.spec.ts b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.spec.ts index cb79ec285..bedd656de 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { AmendmentCreateWizardComponent } from './amendment-create-wizard.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { AmendmentCreateWizardComponent } from './amendment-create-wizard.component'; + describe('AmendmentCreateWizardComponent', () => { let component: AmendmentCreateWizardComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.ts b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.ts index cc71300f0..bcec5e492 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.ts @@ -1,15 +1,15 @@ import { Component } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { Title } from '@angular/platform-browser'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { ConfigService } from 'app/core/ui-services/config.service'; -import { CreateMotion } from 'app/site/motions/models/create-motion'; import { MotionRepositoryService, ParagraphToChoose } from 'app/core/repositories/motions/motion-repository.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; +import { BaseViewComponent } from 'app/site/base/base-view'; +import { CreateMotion } from 'app/site/motions/models/create-motion'; import { ViewMotion } from 'app/site/motions/models/view-motion'; /** diff --git a/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.spec.ts b/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.spec.ts index d8a5999e5..fc2069628 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.spec.ts @@ -1,11 +1,11 @@ +import { Component, ViewChild } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ManageSubmittersComponent } from './manage-submitters.component'; import { E2EImportsModule } from 'e2e-imports.module'; -import { ViewChild, Component } from '@angular/core'; -import { ViewMotion } from 'app/site/motions/models/view-motion'; import { Motion } from 'app/shared/models/motions/motion'; +import { ViewMotion } from 'app/site/motions/models/view-motion'; +import { ManageSubmittersComponent } from './manage-submitters.component'; describe('ManageSubmittersComponent', () => { @Component({ diff --git a/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.ts b/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.ts index e5f9bc190..086162543 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.ts @@ -1,19 +1,19 @@ import { Component, Input } from '@angular/core'; -import { FormGroup, FormControl } from '@angular/forms'; +import { FormControl, FormGroup } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; -import { BehaviorSubject, Observable } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; +import { BehaviorSubject, Observable } from 'rxjs'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { LocalPermissionsService } from 'app/site/motions/services/local-permissions.service'; -import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; -import { User } from 'app/shared/models/users/user'; -import { ViewUser } from 'app/site/users/models/view-user'; import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; +import { User } from 'app/shared/models/users/user'; +import { BaseViewComponent } from 'app/site/base/base-view'; import { ViewMotion } from 'app/site/motions/models/view-motion'; +import { LocalPermissionsService } from 'app/site/motions/services/local-permissions.service'; +import { ViewUser } from 'app/site/users/models/view-user'; /** * Component for the motion comments view diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component.spec.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component.spec.ts index 06e062c05..32817ad8e 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component.spec.ts @@ -1,15 +1,15 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { E2EImportsModule } from 'e2e-imports.module'; + +import { ModificationType } from 'app/core/ui-services/diff.service'; +import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; import { MotionChangeRecommendationDialogComponent, MotionChangeRecommendationDialogComponentData } from './motion-change-recommendation-dialog.component'; -import { E2EImportsModule } from 'e2e-imports.module'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { ModificationType } from 'app/core/ui-services/diff.service'; -import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; - describe('MotionChangeRecommendationComponent', () => { let component: MotionChangeRecommendationDialogComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component.ts index b1c80cf8f..d7d73cc41 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component.ts @@ -1,14 +1,14 @@ import { Component, Inject } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewComponent } from 'app/site/base/base-view'; import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service'; import { LineRange, ModificationType } from 'app/core/ui-services/diff.service'; +import { BaseViewComponent } from 'app/site/base/base-view'; import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; /** diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-comments/motion-comments.component.spec.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-comments/motion-comments.component.spec.ts index 3489bfeec..8ddfc024e 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-comments/motion-comments.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-comments/motion-comments.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MotionCommentsComponent } from './motion-comments.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionCommentsComponent } from './motion-comments.component'; + describe('MotionCommentsComponent', () => { let component: MotionCommentsComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-comments/motion-comments.component.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-comments/motion-comments.component.ts index ef6df157c..9e7062c64 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-comments/motion-comments.component.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-comments/motion-comments.component.ts @@ -1,17 +1,17 @@ import { Component, Input } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { Title, DomSanitizer, SafeHtml } from '@angular/platform-browser'; -import { FormGroup, FormBuilder } from '@angular/forms'; +import { DomSanitizer, SafeHtml, Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { MotionComment } from 'app/shared/models/motions/motion'; -import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; -import { MotionPdfExportService } from 'app/site/motions/services/motion-pdf-export.service'; import { OperatorService } from 'app/core/core-services/operator.service'; +import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; +import { MotionComment } from 'app/shared/models/motions/motion'; +import { BaseViewComponent } from 'app/site/base/base-view'; import { ViewMotion } from 'app/site/motions/models/view-motion'; import { ViewMotionCommentSection } from 'app/site/motions/models/view-motion-comment-section'; +import { MotionPdfExportService } from 'app/site/motions/services/motion-pdf-export.service'; /** * Component for the motion comments view diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.spec.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.spec.ts index 8c6ea7ae4..3e26395f5 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.spec.ts @@ -1,13 +1,14 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { Component } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { E2EImportsModule } from 'e2e-imports.module'; + +import { Motion } from 'app/shared/models/motions/motion'; +import { ViewUnifiedChange } from 'app/shared/models/motions/view-unified-change'; +import { LineNumberingMode, ViewMotion } from 'app/site/motions/models/view-motion'; +import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; import { MotionDetailDiffComponent } from './motion-detail-diff.component'; import { MotionDetailOriginalChangeRecommendationsComponent } from '../motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component'; -import { Motion } from 'app/shared/models/motions/motion'; -import { ViewMotion, LineNumberingMode } from 'app/site/motions/models/view-motion'; -import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; -import { ViewUnifiedChange } from 'app/shared/models/motions/view-unified-change'; -import { E2EImportsModule } from 'e2e-imports.module'; @Component({ template: ` diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.ts index 3f3a5df05..9d00c78d4 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.ts @@ -5,10 +5,15 @@ import { DomSanitizer, SafeHtml, Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { ConfigService } from 'app/core/ui-services/config.service'; import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; import { DiffService, LineRange } from 'app/core/ui-services/diff.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; +import { ViewUnifiedChange, ViewUnifiedChangeType } from 'app/shared/models/motions/view-unified-change'; +import { getRecommendationTypeName } from 'app/shared/utils/recommendation-type-names'; +import { BaseViewComponent } from 'app/site/base/base-view'; +import { LineNumberingMode, ViewMotion } from 'app/site/motions/models/view-motion'; +import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; import { MotionChangeRecommendationDialogComponent, MotionChangeRecommendationDialogComponentData @@ -17,11 +22,6 @@ import { MotionTitleChangeRecommendationDialogComponent, MotionTitleChangeRecommendationDialogComponentData } from '../motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component'; -import { PromptService } from 'app/core/ui-services/prompt.service'; -import { ViewMotion, LineNumberingMode } from 'app/site/motions/models/view-motion'; -import { ViewUnifiedChange, ViewUnifiedChangeType } from 'app/shared/models/motions/view-unified-change'; -import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; -import { getRecommendationTypeName } from 'app/shared/utils/recommendation-type-names'; /** * This component displays the original motion text with the change blocks inside. diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.spec.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.spec.ts index fb2c256ff..54281f7cb 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.spec.ts @@ -1,8 +1,9 @@ +import { Component } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MotionDetailOriginalChangeRecommendationsComponent } from './motion-detail-original-change-recommendations.component'; import { E2EImportsModule } from 'e2e-imports.module'; -import { Component } from '@angular/core'; + +import { MotionDetailOriginalChangeRecommendationsComponent } from './motion-detail-original-change-recommendations.component'; @Component({ template: ` diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.ts index 00754d4ec..16ee35660 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.ts @@ -1,17 +1,17 @@ import { + Component, ElementRef, - Renderer2, - OnInit, - Output, EventEmitter, Input, - Component, OnChanges, + OnInit, + Output, + Renderer2, SimpleChanges } from '@angular/core'; -import { LineRange, ModificationType } from 'app/core/ui-services/diff.service'; import { OperatorService } from 'app/core/core-services/operator.service'; +import { LineRange, ModificationType } from 'app/core/ui-services/diff.service'; import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; /** diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.spec.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.spec.ts index 622e9f7cf..6575de8bd 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.spec.ts @@ -1,13 +1,14 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MotionDetailComponent } from './motion-detail.component'; import { E2EImportsModule } from 'e2e-imports.module'; -import { MotionCommentsComponent } from '../motion-comments/motion-comments.component'; -import { PersonalNoteComponent } from '../personal-note/personal-note.component'; + import { ManageSubmittersComponent } from '../manage-submitters/manage-submitters.component'; -import { MotionPollComponent } from '../motion-poll/motion-poll.component'; -import { MotionDetailOriginalChangeRecommendationsComponent } from '../motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component'; +import { MotionCommentsComponent } from '../motion-comments/motion-comments.component'; import { MotionDetailDiffComponent } from '../motion-detail-diff/motion-detail-diff.component'; +import { MotionDetailOriginalChangeRecommendationsComponent } from '../motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component'; +import { MotionDetailComponent } from './motion-detail.component'; +import { MotionPollComponent } from '../motion-poll/motion-poll.component'; +import { PersonalNoteComponent } from '../personal-note/personal-note.component'; describe('MotionDetailComponent', () => { let component: MotionDetailComponent; diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts index e530da213..7d89d6923 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts @@ -1,64 +1,64 @@ -import { ActivatedRoute, Router, NavigationEnd } from '@angular/router'; -import { Component, OnInit, OnDestroy, ElementRef, HostListener } from '@angular/core'; -import { DomSanitizer, SafeHtml, Title } from '@angular/platform-browser'; -import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; +import { Component, ElementRef, HostListener, OnDestroy, OnInit } from '@angular/core'; +import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatCheckboxChange } from '@angular/material/checkbox'; import { ErrorStateMatcher } from '@angular/material/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { DomSanitizer, SafeHtml, Title } from '@angular/platform-browser'; +import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; -import { BehaviorSubject, Subscription } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; +import { BehaviorSubject, Subscription } from 'rxjs'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; -import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service'; -import { CreateMotion } from 'app/site/motions/models/create-motion'; -import { ConfigService } from 'app/core/ui-services/config.service'; -import { DiffLinesInParagraph, DiffService, LineRange } from 'app/core/ui-services/diff.service'; -import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; -import { LinenumberingService } from 'app/core/ui-services/linenumbering.service'; -import { LocalPermissionsService } from 'app/site/motions/services/local-permissions.service'; -import { Mediafile } from 'app/shared/models/mediafiles/mediafile'; -import { Motion } from 'app/shared/models/motions/motion'; -import { - MotionChangeRecommendationDialogComponentData, - MotionChangeRecommendationDialogComponent -} from '../motion-change-recommendation-dialog/motion-change-recommendation-dialog.component'; -import { - MotionTitleChangeRecommendationDialogComponentData, - MotionTitleChangeRecommendationDialogComponent -} from '../motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component'; -import { MotionPdfExportService } from 'app/site/motions/services/motion-pdf-export.service'; -import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; -import { MotionFilterListService } from 'app/site/motions/services/motion-filter-list.service'; -import { MotionRepositoryService, ParagraphToChoose } from 'app/core/repositories/motions/motion-repository.service'; -import { MotionSortListService } from 'app/site/motions/services/motion-sort-list.service'; import { NotifyService } from 'app/core/core-services/notify.service'; import { OperatorService } from 'app/core/core-services/operator.service'; -import { PersonalNoteService } from 'app/core/ui-services/personal-note.service'; -import { PromptService } from 'app/core/ui-services/prompt.service'; +import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; +import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; +import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service'; +import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; +import { MotionRepositoryService, ParagraphToChoose } from 'app/core/repositories/motions/motion-repository.service'; import { StatuteParagraphRepositoryService } from 'app/core/repositories/motions/statute-paragraph-repository.service'; +import { WorkflowRepositoryService } from 'app/core/repositories/motions/workflow-repository.service'; import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; -import { - ViewMotion, - ChangeRecoMode, - LineNumberingMode, - verboseChangeRecoMode -} from 'app/site/motions/models/view-motion'; -import { MotionEditNotification, MotionEditNotificationType } from 'app/site/motions/motion-edit-notification'; -import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block'; +import { ConfigService } from 'app/core/ui-services/config.service'; +import { DiffLinesInParagraph, DiffService, LineRange } from 'app/core/ui-services/diff.service'; +import { LinenumberingService } from 'app/core/ui-services/linenumbering.service'; +import { PersonalNoteService } from 'app/core/ui-services/personal-note.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; +import { ViewportService } from 'app/core/ui-services/viewport.service'; +import { Mediafile } from 'app/shared/models/mediafiles/mediafile'; +import { Motion } from 'app/shared/models/motions/motion'; +import { ViewUnifiedChange } from 'app/shared/models/motions/view-unified-change'; +import { BaseViewComponent } from 'app/site/base/base-view'; +import { CreateMotion } from 'app/site/motions/models/create-motion'; import { ViewCategory } from 'app/site/motions/models/view-category'; import { ViewCreateMotion } from 'app/site/motions/models/view-create-motion'; -import { ViewportService } from 'app/core/ui-services/viewport.service'; +import { + ChangeRecoMode, + LineNumberingMode, + verboseChangeRecoMode, + ViewMotion +} from 'app/site/motions/models/view-motion'; +import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block'; import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; import { ViewStatuteParagraph } from 'app/site/motions/models/view-statute-paragraph'; -import { ViewTag } from 'app/site/tags/models/view-tag'; -import { ViewUnifiedChange } from 'app/shared/models/motions/view-unified-change'; -import { ViewUser } from 'app/site/users/models/view-user'; import { ViewWorkflow } from 'app/site/motions/models/view-workflow'; -import { WorkflowRepositoryService } from 'app/core/repositories/motions/workflow-repository.service'; +import { MotionEditNotification, MotionEditNotificationType } from 'app/site/motions/motion-edit-notification'; +import { LocalPermissionsService } from 'app/site/motions/services/local-permissions.service'; +import { MotionFilterListService } from 'app/site/motions/services/motion-filter-list.service'; +import { MotionPdfExportService } from 'app/site/motions/services/motion-pdf-export.service'; +import { MotionSortListService } from 'app/site/motions/services/motion-sort-list.service'; +import { ViewTag } from 'app/site/tags/models/view-tag'; +import { ViewUser } from 'app/site/users/models/view-user'; +import { + MotionChangeRecommendationDialogComponent, + MotionChangeRecommendationDialogComponentData +} from '../motion-change-recommendation-dialog/motion-change-recommendation-dialog.component'; +import { + MotionTitleChangeRecommendationDialogComponent, + MotionTitleChangeRecommendationDialogComponentData +} from '../motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component'; /** * Component for the motion detail view diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-poll/motion-poll-dialog.component.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-poll/motion-poll-dialog.component.ts index cf2e71dae..b3c952ee2 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-poll/motion-poll-dialog.component.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-poll/motion-poll-dialog.component.ts @@ -1,11 +1,12 @@ import { Component, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; + import { TranslateService } from '@ngx-translate/core'; +import { CalculablePollKey } from 'app/core/ui-services/poll.service'; import { MotionPoll } from 'app/shared/models/motions/motion-poll'; import { MotionPollService } from 'app/site/motions/services/motion-poll.service'; -import { CalculablePollKey } from 'app/core/ui-services/poll.service'; /** * A dialog for updating the values of a poll. diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-poll/motion-poll.component.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-poll/motion-poll.component.ts index 7db0334c2..2710d1d51 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-poll/motion-poll.component.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-poll/motion-poll.component.ts @@ -1,17 +1,17 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; -import { CalculablePollKey } from 'app/core/ui-services/poll.service'; import { ConstantsService } from 'app/core/core-services/constants.service'; -import { LocalPermissionsService } from 'app/site/motions/services/local-permissions.service'; +import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; +import { CalculablePollKey } from 'app/core/ui-services/poll.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; import { MotionPoll } from 'app/shared/models/motions/motion-poll'; -import { MotionPollDialogComponent } from './motion-poll-dialog.component'; +import { LocalPermissionsService } from 'app/site/motions/services/local-permissions.service'; import { MotionPollPdfService } from 'app/site/motions/services/motion-poll-pdf.service'; import { MotionPollService } from 'app/site/motions/services/motion-poll.service'; -import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; -import { PromptService } from 'app/core/ui-services/prompt.service'; +import { MotionPollDialogComponent } from './motion-poll-dialog.component'; /** * A component used to display and edit polls of a motion. diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.spec.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.spec.ts index eac2fe607..9dc5e427d 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.spec.ts @@ -1,15 +1,15 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; +import { E2EImportsModule } from 'e2e-imports.module'; + +import { ModificationType } from 'app/core/ui-services/diff.service'; +import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; import { MotionTitleChangeRecommendationDialogComponent, MotionTitleChangeRecommendationDialogComponentData } from './motion-title-change-recommendation-dialog.component'; -import { E2EImportsModule } from 'e2e-imports.module'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; -import { ModificationType } from 'app/core/ui-services/diff.service'; -import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; - describe('MotionTitleChangeRecommendationDialogComponent', () => { let component: MotionTitleChangeRecommendationDialogComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.ts index 92d102a53..98738bb8f 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.ts @@ -1,13 +1,13 @@ import { Component, Inject, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef, MatSnackBar } from '@angular/material'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef, MatSnackBar } from '@angular/material'; import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewComponent } from 'app/site/base/base-view'; import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service'; import { ModificationType } from 'app/core/ui-services/diff.service'; +import { BaseViewComponent } from 'app/site/base/base-view'; import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-motion-change-recommendation'; /** diff --git a/client/src/app/site/motions/modules/motion-detail/components/personal-note/personal-note.component.spec.ts b/client/src/app/site/motions/modules/motion-detail/components/personal-note/personal-note.component.spec.ts index a3dd3835e..52f19d785 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/personal-note/personal-note.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/personal-note/personal-note.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { PersonalNoteComponent } from './personal-note.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { PersonalNoteComponent } from './personal-note.component'; + describe('PersonalNoteComponent', () => { let component: PersonalNoteComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/motion-detail/components/personal-note/personal-note.component.ts b/client/src/app/site/motions/modules/motion-detail/components/personal-note/personal-note.component.ts index f0e36a291..961b6b4c2 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/personal-note/personal-note.component.ts +++ b/client/src/app/site/motions/modules/motion-detail/components/personal-note/personal-note.component.ts @@ -1,14 +1,14 @@ import { Component, Input } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; -import { Title, SafeHtml, DomSanitizer } from '@angular/platform-browser'; +import { DomSanitizer, SafeHtml, Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { BaseComponent } from 'app/base.component'; -import { MotionPdfExportService } from 'app/site/motions/services/motion-pdf-export.service'; -import { PersonalNoteContent } from 'app/shared/models/users/personal-note'; import { PersonalNoteService } from 'app/core/ui-services/personal-note.service'; +import { PersonalNoteContent } from 'app/shared/models/users/personal-note'; import { ViewMotion } from 'app/site/motions/models/view-motion'; +import { MotionPdfExportService } from 'app/site/motions/services/motion-pdf-export.service'; /** * Component for the motion comments view diff --git a/client/src/app/site/motions/modules/motion-detail/motion-detail-routing.module.ts b/client/src/app/site/motions/modules/motion-detail/motion-detail-routing.module.ts index f81eba1df..4737ce640 100644 --- a/client/src/app/site/motions/modules/motion-detail/motion-detail-routing.module.ts +++ b/client/src/app/site/motions/modules/motion-detail/motion-detail-routing.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; -import { MotionDetailComponent } from './components/motion-detail/motion-detail.component'; import { AmendmentCreateWizardComponent } from './components/amendment-create-wizard/amendment-create-wizard.component'; +import { MotionDetailComponent } from './components/motion-detail/motion-detail.component'; const routes: Routes = [ { path: '', component: MotionDetailComponent, pathMatch: 'full', runGuardsAndResolvers: 'paramsChange' }, diff --git a/client/src/app/site/motions/modules/motion-detail/motion-detail.module.ts b/client/src/app/site/motions/modules/motion-detail/motion-detail.module.ts index 1a79bde83..518f37b1e 100644 --- a/client/src/app/site/motions/modules/motion-detail/motion-detail.module.ts +++ b/client/src/app/site/motions/modules/motion-detail/motion-detail.module.ts @@ -1,19 +1,19 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; -import { MotionDetailRoutingModule } from './motion-detail-routing.module'; -import { SharedModule } from 'app/shared/shared.module'; -import { MotionDetailComponent } from './components/motion-detail/motion-detail.component'; import { AmendmentCreateWizardComponent } from './components/amendment-create-wizard/amendment-create-wizard.component'; -import { MotionCommentsComponent } from './components/motion-comments/motion-comments.component'; -import { PersonalNoteComponent } from './components/personal-note/personal-note.component'; +import { SharedModule } from 'app/shared/shared.module'; import { ManageSubmittersComponent } from './components/manage-submitters/manage-submitters.component'; +import { MotionChangeRecommendationDialogComponent } from './components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component'; +import { MotionCommentsComponent } from './components/motion-comments/motion-comments.component'; +import { MotionDetailDiffComponent } from './components/motion-detail-diff/motion-detail-diff.component'; +import { MotionDetailOriginalChangeRecommendationsComponent } from './components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component'; +import { MotionDetailRoutingModule } from './motion-detail-routing.module'; +import { MotionDetailComponent } from './components/motion-detail/motion-detail.component'; import { MotionPollDialogComponent } from './components/motion-poll/motion-poll-dialog.component'; import { MotionPollComponent } from './components/motion-poll/motion-poll.component'; -import { MotionDetailOriginalChangeRecommendationsComponent } from './components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component'; -import { MotionDetailDiffComponent } from './components/motion-detail-diff/motion-detail-diff.component'; -import { MotionChangeRecommendationDialogComponent } from './components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component'; import { MotionTitleChangeRecommendationDialogComponent } from './components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component'; +import { PersonalNoteComponent } from './components/personal-note/personal-note.component'; @NgModule({ imports: [CommonModule, MotionDetailRoutingModule, SharedModule], diff --git a/client/src/app/site/motions/modules/motion-import/motion-import-list.component.spec.ts b/client/src/app/site/motions/modules/motion-import/motion-import-list.component.spec.ts index da4df5d01..425547cae 100644 --- a/client/src/app/site/motions/modules/motion-import/motion-import-list.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-import/motion-import-list.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MotionImportListComponent } from './motion-import-list.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionImportListComponent } from './motion-import-list.component'; + describe('MotionImportListComponent', () => { let component: MotionImportListComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/motion-import/motion-import-list.component.ts b/client/src/app/site/motions/modules/motion-import/motion-import-list.component.ts index 5b039beed..61c0facd7 100644 --- a/client/src/app/site/motions/modules/motion-import/motion-import-list.component.ts +++ b/client/src/app/site/motions/modules/motion-import/motion-import-list.component.ts @@ -5,9 +5,9 @@ import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { BaseImportListComponent } from 'app/site/base/base-import-list'; +import { ViewMotion } from 'app/site/motions/models/view-motion'; import { MotionCsvExportService } from 'app/site/motions/services/motion-csv-export.service'; import { MotionImportService } from 'app/site/motions/services/motion-import.service'; -import { ViewMotion } from 'app/site/motions/models/view-motion'; /** * Component for the motion import list view. diff --git a/client/src/app/site/motions/modules/motion-import/motion-import-routing.module.ts b/client/src/app/site/motions/modules/motion-import/motion-import-routing.module.ts index f63bba3aa..a3daf9257 100644 --- a/client/src/app/site/motions/modules/motion-import/motion-import-routing.module.ts +++ b/client/src/app/site/motions/modules/motion-import/motion-import-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { MotionImportListComponent } from './motion-import-list.component'; diff --git a/client/src/app/site/motions/modules/motion-import/motion-import.module.ts b/client/src/app/site/motions/modules/motion-import/motion-import.module.ts index 528a610a1..4f47ac7ed 100644 --- a/client/src/app/site/motions/modules/motion-import/motion-import.module.ts +++ b/client/src/app/site/motions/modules/motion-import/motion-import.module.ts @@ -1,9 +1,9 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { SharedModule } from 'app/shared/shared.module'; import { MotionImportListComponent } from './motion-import-list.component'; import { MotionImportRoutingModule } from './motion-import-routing.module'; -import { SharedModule } from 'app/shared/shared.module'; @NgModule({ declarations: [MotionImportListComponent], diff --git a/client/src/app/site/motions/modules/motion-list/components/motion-export-dialog/motion-export-dialog.component.spec.ts b/client/src/app/site/motions/modules/motion-list/components/motion-export-dialog/motion-export-dialog.component.spec.ts index 617c885a8..626fa8c32 100644 --- a/client/src/app/site/motions/modules/motion-list/components/motion-export-dialog/motion-export-dialog.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-list/components/motion-export-dialog/motion-export-dialog.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialogRef } from '@angular/material/dialog'; + +import { E2EImportsModule } from 'e2e-imports.module'; import { MotionExportDialogComponent } from './motion-export-dialog.component'; -import { E2EImportsModule } from 'e2e-imports.module'; -import { MatDialogRef } from '@angular/material/dialog'; describe('MotionExportDialogComponent', () => { let component: MotionExportDialogComponent; diff --git a/client/src/app/site/motions/modules/motion-list/components/motion-export-dialog/motion-export-dialog.component.ts b/client/src/app/site/motions/modules/motion-list/components/motion-export-dialog/motion-export-dialog.component.ts index fef1a6c93..9f681bb96 100644 --- a/client/src/app/site/motions/modules/motion-list/components/motion-export-dialog/motion-export-dialog.component.ts +++ b/client/src/app/site/motions/modules/motion-list/components/motion-export-dialog/motion-export-dialog.component.ts @@ -1,16 +1,17 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { FormGroup, FormBuilder } from '@angular/forms'; +import { FormBuilder, FormGroup } from '@angular/forms'; import { MatButtonToggle } from '@angular/material/button-toggle'; import { MatDialogRef } from '@angular/material/dialog'; -import { ConfigService } from 'app/core/ui-services/config.service'; +import { auditTime } from 'rxjs/operators'; + +import { StorageService } from 'app/core/core-services/storage.service'; import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; -import { LineNumberingMode, ChangeRecoMode } from 'app/site/motions/models/view-motion'; -import { InfoToExport } from 'app/site/motions/services/motion-pdf.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; +import { ChangeRecoMode, LineNumberingMode } from 'app/site/motions/models/view-motion'; import { ViewMotionCommentSection } from 'app/site/motions/models/view-motion-comment-section'; import { motionImportExportHeaderOrder, noMetaData } from 'app/site/motions/motion-import-export-order'; -import { StorageService } from 'app/core/core-services/storage.service'; -import { auditTime } from 'rxjs/operators'; +import { InfoToExport } from 'app/site/motions/services/motion-pdf.service'; /** * Determine the possible file format diff --git a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.spec.ts b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.spec.ts index 3b3caa7b7..7c1583633 100644 --- a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MotionListComponent } from './motion-list.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionListComponent } from './motion-list.component'; + describe('MotionListComponent', () => { let component: MotionListComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts index 9ba5f279c..121a5a50b 100644 --- a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts +++ b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts @@ -1,39 +1,39 @@ -import { Component, OnInit, ViewChild, TemplateRef } from '@angular/core'; -import { Router, ActivatedRoute } from '@angular/router'; -import { Title } from '@angular/platform-browser'; +import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { PblColumnDefinition } from '@pebula/ngrid'; +import { StorageService } from 'app/core/core-services/storage.service'; import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; -import { ConfigService } from 'app/core/ui-services/config.service'; -import { BaseListViewComponent } from 'app/site/base/base-list-view'; import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; -import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; -import { ViewTag } from 'app/site/tags/models/view-tag'; import { WorkflowRepositoryService } from 'app/core/repositories/motions/workflow-repository.service'; -import { - MotionExportDialogComponent, - FileFormat, - ExportFormData -} from '../motion-export-dialog/motion-export-dialog.component'; -import { ViewMotion } from 'app/site/motions/models/view-motion'; -import { ViewWorkflow } from 'app/site/motions/models/view-workflow'; -import { ViewCategory } from 'app/site/motions/models/view-category'; -import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block'; -import { MotionSortListService } from 'app/site/motions/services/motion-sort-list.service'; -import { MotionFilterListService } from 'app/site/motions/services/motion-filter-list.service'; -import { MotionCsvExportService } from 'app/site/motions/services/motion-csv-export.service'; -import { MotionPdfExportService } from 'app/site/motions/services/motion-pdf-export.service'; -import { MotionMultiselectService } from 'app/site/motions/services/motion-multiselect.service'; -import { MotionXlsxExportService } from 'app/site/motions/services/motion-xlsx-export.service'; -import { LocalPermissionsService } from 'app/site/motions/services/local-permissions.service'; -import { StorageService } from 'app/core/core-services/storage.service'; +import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; import { PdfError } from 'app/core/ui-services/pdf-document.service'; import { ColumnRestriction } from 'app/shared/components/list-view-table/list-view-table.component'; +import { BaseListViewComponent } from 'app/site/base/base-list-view'; +import { ViewCategory } from 'app/site/motions/models/view-category'; +import { ViewMotion } from 'app/site/motions/models/view-motion'; +import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block'; +import { ViewWorkflow } from 'app/site/motions/models/view-workflow'; +import { LocalPermissionsService } from 'app/site/motions/services/local-permissions.service'; +import { MotionCsvExportService } from 'app/site/motions/services/motion-csv-export.service'; +import { MotionFilterListService } from 'app/site/motions/services/motion-filter-list.service'; +import { MotionMultiselectService } from 'app/site/motions/services/motion-multiselect.service'; +import { MotionPdfExportService } from 'app/site/motions/services/motion-pdf-export.service'; +import { MotionSortListService } from 'app/site/motions/services/motion-sort-list.service'; +import { MotionXlsxExportService } from 'app/site/motions/services/motion-xlsx-export.service'; +import { ViewTag } from 'app/site/tags/models/view-tag'; +import { + ExportFormData, + FileFormat, + MotionExportDialogComponent +} from '../motion-export-dialog/motion-export-dialog.component'; interface TileCategoryInformation { filter: string; diff --git a/client/src/app/site/motions/modules/motion-list/motion-list-routing.module.ts b/client/src/app/site/motions/modules/motion-list/motion-list-routing.module.ts index 1a45e9508..8eaf306d1 100644 --- a/client/src/app/site/motions/modules/motion-list/motion-list-routing.module.ts +++ b/client/src/app/site/motions/modules/motion-list/motion-list-routing.module.ts @@ -1,5 +1,6 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; + import { MotionListComponent } from './components/motion-list/motion-list.component'; const routes: Routes = [{ path: '', component: MotionListComponent, pathMatch: 'full' }]; diff --git a/client/src/app/site/motions/modules/motion-list/motion-list.module.ts b/client/src/app/site/motions/modules/motion-list/motion-list.module.ts index 657481121..0e31530ce 100644 --- a/client/src/app/site/motions/modules/motion-list/motion-list.module.ts +++ b/client/src/app/site/motions/modules/motion-list/motion-list.module.ts @@ -1,9 +1,9 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; -import { MotionListRoutingModule } from './motion-list-routing.module'; import { SharedModule } from 'app/shared/shared.module'; import { MotionExportDialogComponent } from './components/motion-export-dialog/motion-export-dialog.component'; +import { MotionListRoutingModule } from './motion-list-routing.module'; import { MotionListComponent } from './components/motion-list/motion-list.component'; @NgModule({ diff --git a/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.spec.ts b/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.spec.ts index 40a857a3c..55021fcad 100644 --- a/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { WorkflowDetailComponent } from './workflow-detail.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { WorkflowDetailComponent } from './workflow-detail.component'; + describe('WorkflowDetailComponent', () => { let component: WorkflowDetailComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.ts b/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.ts index eb6d862ae..2cb97c964 100644 --- a/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.ts +++ b/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.ts @@ -1,21 +1,21 @@ -import { ActivatedRoute } from '@angular/router'; import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { MatCheckboxChange } from '@angular/material/checkbox'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { MatTableDataSource } from '@angular/material/table'; -import { Observable } from 'rxjs'; import { Title } from '@angular/platform-browser'; +import { ActivatedRoute } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; +import { Observable } from 'rxjs'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { ViewWorkflow } from 'app/site/motions/models/view-workflow'; +import { StateRepositoryService } from 'app/core/repositories/motions/state-repository.service'; import { WorkflowRepositoryService } from 'app/core/repositories/motions/workflow-repository.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; import { MergeAmendment, State } from 'app/shared/models/motions/state'; +import { BaseViewComponent } from 'app/site/base/base-view'; import { ViewState } from 'app/site/motions/models/view-state'; -import { StateRepositoryService } from 'app/core/repositories/motions/state-repository.service'; +import { ViewWorkflow } from 'app/site/motions/models/view-workflow'; /** * Declares data for the workflow dialog diff --git a/client/src/app/site/motions/modules/motion-workflow/components/workflow-list/workflow-list.component.spec.ts b/client/src/app/site/motions/modules/motion-workflow/components/workflow-list/workflow-list.component.spec.ts index 269e4401d..826d961bf 100644 --- a/client/src/app/site/motions/modules/motion-workflow/components/workflow-list/workflow-list.component.spec.ts +++ b/client/src/app/site/motions/modules/motion-workflow/components/workflow-list/workflow-list.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { WorkflowListComponent } from './workflow-list.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { WorkflowListComponent } from './workflow-list.component'; + describe('WorkflowListComponent', () => { let component: WorkflowListComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/motion-workflow/components/workflow-list/workflow-list.component.ts b/client/src/app/site/motions/modules/motion-workflow/components/workflow-list/workflow-list.component.ts index 1520fedaf..0ee19f0be 100644 --- a/client/src/app/site/motions/modules/motion-workflow/components/workflow-list/workflow-list.component.ts +++ b/client/src/app/site/motions/modules/motion-workflow/components/workflow-list/workflow-list.component.ts @@ -1,17 +1,17 @@ import { Component, OnInit, TemplateRef } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { PblColumnDefinition } from '@pebula/ngrid'; -import { BaseListViewComponent } from 'app/site/base/base-list-view'; -import { MatDialog } from '@angular/material/dialog'; -import { MatSnackBar } from '@angular/material/snack-bar'; -import { PromptService } from 'app/core/ui-services/prompt.service'; -import { ViewWorkflow } from 'app/site/motions/models/view-workflow'; -import { WorkflowRepositoryService } from 'app/core/repositories/motions/workflow-repository.service'; -import { Workflow } from 'app/shared/models/motions/workflow'; import { StorageService } from 'app/core/core-services/storage.service'; +import { WorkflowRepositoryService } from 'app/core/repositories/motions/workflow-repository.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; +import { Workflow } from 'app/shared/models/motions/workflow'; +import { BaseListViewComponent } from 'app/site/base/base-list-view'; +import { ViewWorkflow } from 'app/site/motions/models/view-workflow'; /** * List view for workflows diff --git a/client/src/app/site/motions/modules/motion-workflow/motion-workflow-routing.module.ts b/client/src/app/site/motions/modules/motion-workflow/motion-workflow-routing.module.ts index 0ac2fbb86..8e6969107 100644 --- a/client/src/app/site/motions/modules/motion-workflow/motion-workflow-routing.module.ts +++ b/client/src/app/site/motions/modules/motion-workflow/motion-workflow-routing.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { WorkflowListComponent } from './components/workflow-list/workflow-list.component'; +import { RouterModule, Routes } from '@angular/router'; + import { WorkflowDetailComponent } from './components/workflow-detail/workflow-detail.component'; +import { WorkflowListComponent } from './components/workflow-list/workflow-list.component'; const routes: Routes = [ { path: '', component: WorkflowListComponent, pathMatch: 'full' }, diff --git a/client/src/app/site/motions/modules/motion-workflow/motion-workflow.module.ts b/client/src/app/site/motions/modules/motion-workflow/motion-workflow.module.ts index 531142930..430bdcf58 100644 --- a/client/src/app/site/motions/modules/motion-workflow/motion-workflow.module.ts +++ b/client/src/app/site/motions/modules/motion-workflow/motion-workflow.module.ts @@ -1,10 +1,10 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; -import { MotionWorkflowRoutingModule } from './motion-workflow-routing.module'; import { SharedModule } from 'app/shared/shared.module'; -import { WorkflowListComponent } from './components/workflow-list/workflow-list.component'; +import { MotionWorkflowRoutingModule } from './motion-workflow-routing.module'; import { WorkflowDetailComponent } from './components/workflow-detail/workflow-detail.component'; +import { WorkflowListComponent } from './components/workflow-list/workflow-list.component'; @NgModule({ declarations: [WorkflowListComponent, WorkflowDetailComponent], diff --git a/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.spec.ts b/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.spec.ts index 4100f2536..90f053570 100644 --- a/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.spec.ts +++ b/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { StatuteImportListComponent } from './statute-import-list.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { StatuteImportListComponent } from './statute-import-list.component'; + describe('StatuteImportListComponent', () => { let component: StatuteImportListComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.ts b/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.ts index 2a7a611e4..a0652a18c 100644 --- a/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.ts +++ b/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.ts @@ -1,12 +1,13 @@ import { Component } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; + import { TranslateService } from '@ngx-translate/core'; import { BaseImportListComponent } from 'app/site/base/base-import-list'; import { ViewStatuteParagraph } from 'app/site/motions/models/view-statute-paragraph'; -import { StatuteImportService } from 'app/site/motions/services/statute-import.service'; import { StatuteCsvExportService } from 'app/site/motions/services/statute-csv-export.service'; +import { StatuteImportService } from 'app/site/motions/services/statute-import.service'; /** * Component for the statute paragraphs import list view. diff --git a/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.spec.ts b/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.spec.ts index c95db59c0..0eecf2055 100644 --- a/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.spec.ts +++ b/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { StatuteParagraphListComponent } from './statute-paragraph-list.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { StatuteParagraphListComponent } from './statute-paragraph-list.component'; + describe('StatuteParagraphListComponent', () => { let component: StatuteParagraphListComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.ts b/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.ts index 1c218cb7c..8463f4d40 100644 --- a/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.ts +++ b/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.ts @@ -1,16 +1,16 @@ import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { PromptService } from 'app/core/ui-services/prompt.service'; -import { StatuteCsvExportService } from 'app/site/motions/services/statute-csv-export.service'; -import { StatuteParagraph } from 'app/shared/models/motions/statute-paragraph'; import { StatuteParagraphRepositoryService } from 'app/core/repositories/motions/statute-paragraph-repository.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; +import { StatuteParagraph } from 'app/shared/models/motions/statute-paragraph'; +import { BaseViewComponent } from 'app/site/base/base-view'; import { ViewStatuteParagraph } from 'app/site/motions/models/view-statute-paragraph'; +import { StatuteCsvExportService } from 'app/site/motions/services/statute-csv-export.service'; /** * List view for the statute paragraphs. diff --git a/client/src/app/site/motions/modules/statute-paragraph/statute-paragraph-routing.module.ts b/client/src/app/site/motions/modules/statute-paragraph/statute-paragraph-routing.module.ts index 9328dad5e..7c1d89b1b 100644 --- a/client/src/app/site/motions/modules/statute-paragraph/statute-paragraph-routing.module.ts +++ b/client/src/app/site/motions/modules/statute-paragraph/statute-paragraph-routing.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { StatuteParagraphListComponent } from './components/statute-paragraph-list/statute-paragraph-list.component'; +import { RouterModule, Routes } from '@angular/router'; + import { StatuteImportListComponent } from './components/statute-import-list/statute-import-list.component'; +import { StatuteParagraphListComponent } from './components/statute-paragraph-list/statute-paragraph-list.component'; const routes: Routes = [ { path: '', component: StatuteParagraphListComponent, pathMatch: 'full' }, diff --git a/client/src/app/site/motions/modules/statute-paragraph/statute-paragraph.module.ts b/client/src/app/site/motions/modules/statute-paragraph/statute-paragraph.module.ts index f54a2fa22..f216ad50d 100644 --- a/client/src/app/site/motions/modules/statute-paragraph/statute-paragraph.module.ts +++ b/client/src/app/site/motions/modules/statute-paragraph/statute-paragraph.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { SharedModule } from 'app/shared/shared.module'; import { StatuteImportListComponent } from './components/statute-import-list/statute-import-list.component'; diff --git a/client/src/app/site/motions/motions-routing.module.ts b/client/src/app/site/motions/motions-routing.module.ts index 673cd9027..e6610d3ea 100644 --- a/client/src/app/site/motions/motions-routing.module.ts +++ b/client/src/app/site/motions/motions-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; const routes: Routes = [ { diff --git a/client/src/app/site/motions/motions.config.ts b/client/src/app/site/motions/motions.config.ts index bd7e2b537..3b1517719 100644 --- a/client/src/app/site/motions/motions.config.ts +++ b/client/src/app/site/motions/motions.config.ts @@ -1,28 +1,28 @@ import { AppConfig } from '../../core/app-config'; -import { Motion } from '../../shared/models/motions/motion'; -import { Category } from '../../shared/models/motions/category'; -import { Workflow } from '../../shared/models/motions/workflow'; -import { MotionCommentSection } from '../../shared/models/motions/motion-comment-section'; -import { MotionChangeRecommendation } from '../../shared/models/motions/motion-change-reco'; -import { MotionBlock } from '../../shared/models/motions/motion-block'; -import { StatuteParagraph } from '../../shared/models/motions/statute-paragraph'; -import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; -import { WorkflowRepositoryService } from 'app/core/repositories/motions/workflow-repository.service'; -import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; -import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; -import { StatuteParagraphRepositoryService } from 'app/core/repositories/motions/statute-paragraph-repository.service'; import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service'; -import { ViewCategory } from './models/view-category'; -import { ViewMotionCommentSection } from './models/view-motion-comment-section'; -import { ViewMotionChangeRecommendation } from './models/view-motion-change-recommendation'; -import { ViewMotionBlock } from './models/view-motion-block'; -import { ViewStatuteParagraph } from './models/view-statute-paragraph'; -import { ViewMotion } from './models/view-motion'; -import { ViewWorkflow } from './models/view-workflow'; -import { State } from 'app/shared/models/motions/state'; -import { ViewState } from './models/view-state'; +import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; +import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; +import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; import { StateRepositoryService } from 'app/core/repositories/motions/state-repository.service'; +import { StatuteParagraphRepositoryService } from 'app/core/repositories/motions/statute-paragraph-repository.service'; +import { WorkflowRepositoryService } from 'app/core/repositories/motions/workflow-repository.service'; +import { State } from 'app/shared/models/motions/state'; +import { Category } from '../../shared/models/motions/category'; +import { Motion } from '../../shared/models/motions/motion'; +import { MotionBlock } from '../../shared/models/motions/motion-block'; +import { MotionChangeRecommendation } from '../../shared/models/motions/motion-change-reco'; +import { MotionCommentSection } from '../../shared/models/motions/motion-comment-section'; +import { StatuteParagraph } from '../../shared/models/motions/statute-paragraph'; +import { ViewCategory } from './models/view-category'; +import { ViewMotion } from './models/view-motion'; +import { ViewMotionBlock } from './models/view-motion-block'; +import { ViewMotionChangeRecommendation } from './models/view-motion-change-recommendation'; +import { ViewMotionCommentSection } from './models/view-motion-comment-section'; +import { ViewState } from './models/view-state'; +import { ViewStatuteParagraph } from './models/view-statute-paragraph'; +import { ViewWorkflow } from './models/view-workflow'; +import { Workflow } from '../../shared/models/motions/workflow'; export const MotionsAppConfig: AppConfig = { name: 'motions', diff --git a/client/src/app/site/motions/motions.module.ts b/client/src/app/site/motions/motions.module.ts index 0b6bcf28c..c375186ab 100644 --- a/client/src/app/site/motions/motions.module.ts +++ b/client/src/app/site/motions/motions.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { MotionsRoutingModule } from './motions-routing.module'; import { SharedModule } from '../../shared/shared.module'; diff --git a/client/src/app/site/motions/services/local-permissions.service.spec.ts b/client/src/app/site/motions/services/local-permissions.service.spec.ts index 6376b3df1..3637d957d 100644 --- a/client/src/app/site/motions/services/local-permissions.service.spec.ts +++ b/client/src/app/site/motions/services/local-permissions.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; -import { LocalPermissionsService } from './local-permissions.service'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { LocalPermissionsService } from './local-permissions.service'; describe('LocalPermissionsService', () => { beforeEach(() => TestBed.configureTestingModule({ imports: [E2EImportsModule] })); diff --git a/client/src/app/site/motions/services/local-permissions.service.ts b/client/src/app/site/motions/services/local-permissions.service.ts index da2f36033..bd0232ebc 100644 --- a/client/src/app/site/motions/services/local-permissions.service.ts +++ b/client/src/app/site/motions/services/local-permissions.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { OperatorService } from 'app/core/core-services/operator.service'; -import { ViewMotion } from '../models/view-motion'; -import { ConfigService } from 'app/core/ui-services/config.service'; import { ConstantsService } from 'app/core/core-services/constants.service'; +import { OperatorService } from 'app/core/core-services/operator.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; +import { ViewMotion } from '../models/view-motion'; interface Settings { MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS: boolean; diff --git a/client/src/app/site/motions/services/motion-block-sort.service.spec.ts b/client/src/app/site/motions/services/motion-block-sort.service.spec.ts index e6e0275aa..b3b6680c6 100644 --- a/client/src/app/site/motions/services/motion-block-sort.service.spec.ts +++ b/client/src/app/site/motions/services/motion-block-sort.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { MotionBlockSortService } from './motion-block-sort.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionBlockSortService } from './motion-block-sort.service'; + describe('MotionBlockSortService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/site/motions/services/motion-block-sort.service.ts b/client/src/app/site/motions/services/motion-block-sort.service.ts index 5ab93c6c1..393f0f987 100644 --- a/client/src/app/site/motions/services/motion-block-sort.service.ts +++ b/client/src/app/site/motions/services/motion-block-sort.service.ts @@ -1,8 +1,9 @@ import { Injectable } from '@angular/core'; -import { BaseSortListService, OsSortingDefinition, OsSortingOption } from 'app/core/ui-services/base-sort-list.service'; -import { StorageService } from 'app/core/core-services/storage.service'; import { TranslateService } from '@ngx-translate/core'; + +import { StorageService } from 'app/core/core-services/storage.service'; +import { BaseSortListService, OsSortingDefinition, OsSortingOption } from 'app/core/ui-services/base-sort-list.service'; import { ViewMotionBlock } from '../models/view-motion-block'; @Injectable({ diff --git a/client/src/app/site/motions/services/motion-csv-export.service.spec.ts b/client/src/app/site/motions/services/motion-csv-export.service.spec.ts index 9070639be..95188bf2f 100644 --- a/client/src/app/site/motions/services/motion-csv-export.service.spec.ts +++ b/client/src/app/site/motions/services/motion-csv-export.service.spec.ts @@ -1,6 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { MotionCsvExportService } from './motion-csv-export.service'; describe('MotionCsvExportService', () => { diff --git a/client/src/app/site/motions/services/motion-csv-export.service.ts b/client/src/app/site/motions/services/motion-csv-export.service.ts index 6e09fc597..ef3388585 100644 --- a/client/src/app/site/motions/services/motion-csv-export.service.ts +++ b/client/src/app/site/motions/services/motion-csv-export.service.ts @@ -2,21 +2,21 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service'; +import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; +import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; import { CsvColumnDefinitionMap, CsvColumnDefinitionProperty, CsvExportService } from 'app/core/ui-services/csv-export.service'; -import { sortMotionPropertyList } from '../motion-import-export-order'; -import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; -import { ChangeRecoMode, ViewMotion } from '../models/view-motion'; -import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service'; -import { ConfigService } from 'app/core/ui-services/config.service'; -import { ViewUnifiedChange } from 'app/shared/models/motions/view-unified-change'; import { LinenumberingService } from 'app/core/ui-services/linenumbering.service'; -import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; +import { ViewUnifiedChange } from 'app/shared/models/motions/view-unified-change'; import { reconvertChars } from 'app/shared/utils/reconvert-chars'; import { stripHtmlTags } from 'app/shared/utils/strip-html-tags'; +import { sortMotionPropertyList } from '../motion-import-export-order'; +import { ChangeRecoMode, ViewMotion } from '../models/view-motion'; /** * Exports CSVs for motions. Collect all CSV types here to have them in one place. diff --git a/client/src/app/site/motions/services/motion-filter-list.service.ts b/client/src/app/site/motions/services/motion-filter-list.service.ts index 932c7b390..efd16ab0d 100644 --- a/client/src/app/site/motions/services/motion-filter-list.service.ts +++ b/client/src/app/site/motions/services/motion-filter-list.service.ts @@ -2,21 +2,21 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { OperatorService } from 'app/core/core-services/operator.service'; +import { StorageService } from 'app/core/core-services/storage.service'; +import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; +import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; +import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; +import { WorkflowRepositoryService } from 'app/core/repositories/motions/workflow-repository.service'; +import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; import { BaseFilterListService, OsFilter, - OsFilterOptions, - OsFilterOption + OsFilterOption, + OsFilterOptions } from 'app/core/ui-services/base-filter-list.service'; -import { ViewMotion } from '../models/view-motion'; -import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; -import { WorkflowRepositoryService } from 'app/core/repositories/motions/workflow-repository.service'; -import { StorageService } from 'app/core/core-services/storage.service'; -import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; -import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; -import { OperatorService } from 'app/core/core-services/operator.service'; -import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; import { ConfigService } from 'app/core/ui-services/config.service'; +import { ViewMotion } from '../models/view-motion'; /** * Filter description to easier parse dynamically occurring workflows diff --git a/client/src/app/site/motions/services/motion-import.service.ts b/client/src/app/site/motions/services/motion-import.service.ts index dfd9a42a9..c7c6f0b58 100644 --- a/client/src/app/site/motions/services/motion-import.service.ts +++ b/client/src/app/site/motions/services/motion-import.service.ts @@ -1,22 +1,22 @@ import { Injectable } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { Papa } from 'ngx-papaparse'; import { TranslateService } from '@ngx-translate/core'; +import { Papa } from 'ngx-papaparse'; -import { BaseImportService, NewEntry } from 'app/core/ui-services/base-import.service'; -import { Category } from 'app/shared/models/motions/category'; import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; -import { CreateMotion } from '../models/create-motion'; -import { MotionBlock } from 'app/shared/models/motions/motion-block'; import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; -import { motionExportOnly, motionImportExportHeaderOrder } from '../motion-import-export-order'; import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; -import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; -import { ViewCsvCreateMotion, CsvMapping } from '../models/view-csv-create-motion'; -import { ViewMotion } from '../models/view-motion'; import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; +import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; +import { BaseImportService, NewEntry } from 'app/core/ui-services/base-import.service'; import { Tag } from 'app/shared/models/core/tag'; +import { Category } from 'app/shared/models/motions/category'; +import { MotionBlock } from 'app/shared/models/motions/motion-block'; +import { CreateMotion } from '../models/create-motion'; +import { motionExportOnly, motionImportExportHeaderOrder } from '../motion-import-export-order'; +import { CsvMapping, ViewCsvCreateMotion } from '../models/view-csv-create-motion'; +import { ViewMotion } from '../models/view-motion'; /** * Service for motion imports 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 index 3047481c0..b894e0698 100644 --- a/client/src/app/site/motions/services/motion-multiselect.service.spec.ts +++ b/client/src/app/site/motions/services/motion-multiselect.service.spec.ts @@ -1,6 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { MotionMultiselectService } from './motion-multiselect.service'; describe('MotionMultiselectService', () => { diff --git a/client/src/app/site/motions/services/motion-multiselect.service.ts b/client/src/app/site/motions/services/motion-multiselect.service.ts index a8a2de746..dc003d680 100644 --- a/client/src/app/site/motions/services/motion-multiselect.service.ts +++ b/client/src/app/site/motions/services/motion-multiselect.service.ts @@ -2,23 +2,23 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; -import { ChoiceDialogOptions } from 'app/shared/components/choice-dialog/choice-dialog.component'; -import { ChoiceService } from 'app/core/ui-services/choice.service'; -import { Displayable } from 'app/site/base/displayable'; import { HttpService } from 'app/core/core-services/http.service'; -import { Identifiable } from 'app/shared/models/base/identifiable'; import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; +import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; +import { WorkflowRepositoryService } from 'app/core/repositories/motions/workflow-repository.service'; +import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; +import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; +import { ChoiceService } from 'app/core/ui-services/choice.service'; import { PersonalNoteService } from 'app/core/ui-services/personal-note.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; -import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; -import { TreeService } from 'app/core/ui-services/tree.service'; -import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; -import { ViewMotion } from '../models/view-motion'; -import { WorkflowRepositoryService } from 'app/core/repositories/motions/workflow-repository.service'; import { SpinnerService } from 'app/core/ui-services/spinner.service'; +import { TreeService } from 'app/core/ui-services/tree.service'; +import { ChoiceDialogOptions } from 'app/shared/components/choice-dialog/choice-dialog.component'; +import { Identifiable } from 'app/shared/models/base/identifiable'; +import { Displayable } from 'app/site/base/displayable'; +import { ViewMotion } from '../models/view-motion'; /** * Contains all multiselect actions for the motion list view. diff --git a/client/src/app/site/motions/services/motion-pdf-catalog.service.spec.ts b/client/src/app/site/motions/services/motion-pdf-catalog.service.spec.ts index 0c8a432fd..044c7a00e 100644 --- a/client/src/app/site/motions/services/motion-pdf-catalog.service.spec.ts +++ b/client/src/app/site/motions/services/motion-pdf-catalog.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { MotionPdfCatalogService } from './motion-pdf-catalog.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionPdfCatalogService } from './motion-pdf-catalog.service'; + describe('MotionPdfCatalogService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/site/motions/services/motion-pdf-catalog.service.ts b/client/src/app/site/motions/services/motion-pdf-catalog.service.ts index a6fbfc232..2982b6497 100644 --- a/client/src/app/site/motions/services/motion-pdf-catalog.service.ts +++ b/client/src/app/site/motions/services/motion-pdf-catalog.service.ts @@ -1,16 +1,16 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; +import { BehaviorSubject } from 'rxjs'; import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service'; -import { ConfigService } from 'app/core/ui-services/config.service'; -import { MotionPdfService } from './motion-pdf.service'; import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; -import { PdfError, PdfDocumentService, StyleType, BorderType } from 'app/core/ui-services/pdf-document.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; +import { BorderType, PdfDocumentService, PdfError, StyleType } from 'app/core/ui-services/pdf-document.service'; +import { ExportFormData } from '../modules/motion-list/components/motion-export-dialog/motion-export-dialog.component'; +import { MotionPdfService } from './motion-pdf.service'; import { ViewCategory } from '../models/view-category'; import { ViewMotion } from '../models/view-motion'; -import { ExportFormData } from '../modules/motion-list/components/motion-export-dialog/motion-export-dialog.component'; /** * Service to export a list of motions. @@ -238,7 +238,7 @@ export class MotionPdfCatalogService { * * @returns {Array} An array containing the `DocDefinitions` for `pdf-make`. */ - private appendSubmittersAndRecommendation(motion: ViewMotion, style: StyleType = StyleType.DEFAULT): Array { + private appendSubmittersAndRecommendation(motion: ViewMotion, style: StyleType = StyleType.DEFAULT): Object[] { const recommendation = this.motionRepo.getExtendedRecommendationLabel(motion); let submitterList = ''; for (let i = 0; i < motion.submitters.length; ++i) { diff --git a/client/src/app/site/motions/services/motion-pdf-export.service.spec.ts b/client/src/app/site/motions/services/motion-pdf-export.service.spec.ts index c0aec0d9f..cf9501d6b 100644 --- a/client/src/app/site/motions/services/motion-pdf-export.service.spec.ts +++ b/client/src/app/site/motions/services/motion-pdf-export.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { MotionPdfExportService } from './motion-pdf-export.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionPdfExportService } from './motion-pdf-export.service'; + describe('MotionPdfExportService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/site/motions/services/motion-pdf-export.service.ts b/client/src/app/site/motions/services/motion-pdf-export.service.ts index 84c379bc6..835cf803e 100644 --- a/client/src/app/site/motions/services/motion-pdf-export.service.ts +++ b/client/src/app/site/motions/services/motion-pdf-export.service.ts @@ -2,14 +2,14 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { MotionPdfService } from './motion-pdf.service'; -import { PdfDocumentService } from 'app/core/ui-services/pdf-document.service'; -import { ViewMotion } from '../models/view-motion'; import { ConfigService } from 'app/core/ui-services/config.service'; -import { MotionPdfCatalogService } from './motion-pdf-catalog.service'; +import { PdfDocumentService } from 'app/core/ui-services/pdf-document.service'; import { PersonalNoteContent } from 'app/shared/models/users/personal-note'; -import { ViewMotionCommentSection } from '../models/view-motion-comment-section'; import { ExportFormData } from '../modules/motion-list/components/motion-export-dialog/motion-export-dialog.component'; +import { MotionPdfCatalogService } from './motion-pdf-catalog.service'; +import { MotionPdfService } from './motion-pdf.service'; +import { ViewMotion } from '../models/view-motion'; +import { ViewMotionCommentSection } from '../models/view-motion-comment-section'; /** * Export service to handle various kind of exporting necessities. diff --git a/client/src/app/site/motions/services/motion-pdf.service.spec.ts b/client/src/app/site/motions/services/motion-pdf.service.spec.ts index e42e4a412..2828011de 100644 --- a/client/src/app/site/motions/services/motion-pdf.service.spec.ts +++ b/client/src/app/site/motions/services/motion-pdf.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { MotionPdfService } from './motion-pdf.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionPdfService } from './motion-pdf.service'; + describe('MotionPdfService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/site/motions/services/motion-pdf.service.ts b/client/src/app/site/motions/services/motion-pdf.service.ts index bd4e0ad47..2f6804fe9 100644 --- a/client/src/app/site/motions/services/motion-pdf.service.ts +++ b/client/src/app/site/motions/services/motion-pdf.service.ts @@ -2,22 +2,22 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { CalculablePollKey } from 'app/core/ui-services/poll.service'; import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service'; -import { ConfigService } from 'app/core/ui-services/config.service'; -import { getRecommendationTypeName } from 'app/shared/utils/recommendation-type-names'; -import { HtmlToPdfService } from 'app/core/ui-services/html-to-pdf.service'; -import { MotionPollService } from './motion-poll.service'; +import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; import { StatuteParagraphRepositoryService } from 'app/core/repositories/motions/statute-paragraph-repository.service'; -import { ChangeRecoMode, LineNumberingMode, ViewMotion } from '../models/view-motion'; +import { ConfigService } from 'app/core/ui-services/config.service'; +import { HtmlToPdfService } from 'app/core/ui-services/html-to-pdf.service'; import { LinenumberingService } from 'app/core/ui-services/linenumbering.service'; -import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; import { PdfDocumentService } from 'app/core/ui-services/pdf-document.service'; +import { CalculablePollKey } from 'app/core/ui-services/poll.service'; +import { ViewUnifiedChange, ViewUnifiedChangeType } from 'app/shared/models/motions/view-unified-change'; +import { getRecommendationTypeName } from 'app/shared/utils/recommendation-type-names'; +import { ExportFormData } from '../modules/motion-list/components/motion-export-dialog/motion-export-dialog.component'; +import { MotionPollService } from './motion-poll.service'; +import { ChangeRecoMode, LineNumberingMode, ViewMotion } from '../models/view-motion'; import { ViewMotionAmendedParagraph } from '../models/view-motion-amended-paragraph'; import { ViewMotionChangeRecommendation } from '../models/view-motion-change-recommendation'; -import { ViewUnifiedChange, ViewUnifiedChangeType } from 'app/shared/models/motions/view-unified-change'; -import { ExportFormData } from '../modules/motion-list/components/motion-export-dialog/motion-export-dialog.component'; /** * Type declaring which strings are valid options for metainfos to be exported into a pdf diff --git a/client/src/app/site/motions/services/motion-poll-pdf.service.spec.ts b/client/src/app/site/motions/services/motion-poll-pdf.service.spec.ts index ac1c4c912..5b9e4f6b0 100644 --- a/client/src/app/site/motions/services/motion-poll-pdf.service.spec.ts +++ b/client/src/app/site/motions/services/motion-poll-pdf.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { MotionPollPdfService } from './motion-poll-pdf.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionPollPdfService } from './motion-poll-pdf.service'; + describe('MotionPdfService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/site/motions/services/motion-poll-pdf.service.ts b/client/src/app/site/motions/services/motion-poll-pdf.service.ts index 28a744d75..5f7bcfa48 100644 --- a/client/src/app/site/motions/services/motion-poll-pdf.service.ts +++ b/client/src/app/site/motions/services/motion-poll-pdf.service.ts @@ -2,12 +2,12 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { ConfigService } from 'app/core/ui-services/config.service'; -import { MotionPoll } from 'app/shared/models/motions/motion-poll'; import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; -import { PdfDocumentService } from 'app/core/ui-services/pdf-document.service'; -import { PollPdfService, AbstractPollData } from 'app/core/ui-services/poll-pdf-service'; import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; +import { PdfDocumentService } from 'app/core/ui-services/pdf-document.service'; +import { AbstractPollData, PollPdfService } from 'app/core/ui-services/poll-pdf-service'; +import { MotionPoll } from 'app/shared/models/motions/motion-poll'; type BallotCountChoices = 'NUMBER_OF_DELEGATES' | 'NUMBER_OF_ALL_PARTICIPANTS' | 'CUSTOM_NUMBER'; diff --git a/client/src/app/site/motions/services/motion-poll.service.ts b/client/src/app/site/motions/services/motion-poll.service.ts index 1f623e163..eaf8ae99c 100644 --- a/client/src/app/site/motions/services/motion-poll.service.ts +++ b/client/src/app/site/motions/services/motion-poll.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { ConfigService } from 'app/core/ui-services/config.service'; +import { CalculablePollKey, PollMajorityMethod, PollService } from 'app/core/ui-services/poll.service'; import { MotionPoll } from 'app/shared/models/motions/motion-poll'; -import { PollService, PollMajorityMethod, CalculablePollKey } from 'app/core/ui-services/poll.service'; /** * Service class for motion polls. diff --git a/client/src/app/site/motions/services/motion-sort-list.service.ts b/client/src/app/site/motions/services/motion-sort-list.service.ts index 5122a10d1..05d0425f6 100644 --- a/client/src/app/site/motions/services/motion-sort-list.service.ts +++ b/client/src/app/site/motions/services/motion-sort-list.service.ts @@ -2,11 +2,11 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { StorageService } from 'app/core/core-services/storage.service'; +import { Deferred } from 'app/core/deferred'; import { _ } from 'app/core/translate/translation-marker'; import { BaseSortListService, OsSortingDefinition, OsSortingOption } from 'app/core/ui-services/base-sort-list.service'; import { ConfigService } from 'app/core/ui-services/config.service'; -import { Deferred } from 'app/core/deferred'; -import { StorageService } from 'app/core/core-services/storage.service'; import { ViewMotion } from '../models/view-motion'; /** diff --git a/client/src/app/site/motions/services/motion-xlsx-export.service.spec.ts b/client/src/app/site/motions/services/motion-xlsx-export.service.spec.ts index 78dec346d..7b3a728e1 100644 --- a/client/src/app/site/motions/services/motion-xlsx-export.service.spec.ts +++ b/client/src/app/site/motions/services/motion-xlsx-export.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { MotionXlsxExportService } from './motion-xlsx-export.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MotionXlsxExportService } from './motion-xlsx-export.service'; + describe('MotionXlsxExportService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/site/motions/services/motion-xlsx-export.service.ts b/client/src/app/site/motions/services/motion-xlsx-export.service.ts index c41d7acd2..77ca86459 100644 --- a/client/src/app/site/motions/services/motion-xlsx-export.service.ts +++ b/client/src/app/site/motions/services/motion-xlsx-export.service.ts @@ -1,16 +1,16 @@ import { Injectable } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; import { Workbook } from 'exceljs/dist/exceljs.min.js'; -import { InfoToExport } from './motion-pdf.service'; -import { sortMotionPropertyList } from '../motion-import-export-order'; -import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; -import { TranslateService } from '@ngx-translate/core'; -import { ViewMotion } from '../models/view-motion'; -import { XlsxExportServiceService, CellFillingDefinition } from 'app/core/ui-services/xlsx-export-service.service'; import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; -import { stripHtmlTags } from 'app/shared/utils/strip-html-tags'; +import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; +import { CellFillingDefinition, XlsxExportServiceService } from 'app/core/ui-services/xlsx-export-service.service'; import { reconvertChars } from 'app/shared/utils/reconvert-chars'; +import { stripHtmlTags } from 'app/shared/utils/strip-html-tags'; +import { sortMotionPropertyList } from '../motion-import-export-order'; +import { InfoToExport } from './motion-pdf.service'; +import { ViewMotion } from '../models/view-motion'; /** * Service to export motion elements to XLSX diff --git a/client/src/app/site/motions/services/statute-csv-export.service.spec.ts b/client/src/app/site/motions/services/statute-csv-export.service.spec.ts index 0da963dea..417687313 100644 --- a/client/src/app/site/motions/services/statute-csv-export.service.spec.ts +++ b/client/src/app/site/motions/services/statute-csv-export.service.spec.ts @@ -1,6 +1,7 @@ -import { TestBed, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { StatuteCsvExportService } from './statute-csv-export.service'; describe('StatuteCsvExportService', () => { diff --git a/client/src/app/site/motions/services/statute-csv-export.service.ts b/client/src/app/site/motions/services/statute-csv-export.service.ts index 20346622e..aa0a5e624 100644 --- a/client/src/app/site/motions/services/statute-csv-export.service.ts +++ b/client/src/app/site/motions/services/statute-csv-export.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { CsvExportService, CsvColumnDefinitionProperty } from 'app/core/ui-services/csv-export.service'; +import { CsvColumnDefinitionProperty, CsvExportService } from 'app/core/ui-services/csv-export.service'; import { ViewStatuteParagraph } from '../models/view-statute-paragraph'; /** diff --git a/client/src/app/site/motions/services/statute-import.service.ts b/client/src/app/site/motions/services/statute-import.service.ts index a6d2f0943..33e69a190 100644 --- a/client/src/app/site/motions/services/statute-import.service.ts +++ b/client/src/app/site/motions/services/statute-import.service.ts @@ -1,12 +1,13 @@ import { Injectable } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { Papa } from 'ngx-papaparse'; -import { TranslateService } from '@ngx-translate/core'; +import { TranslateService } from '@ngx-translate/core'; +import { Papa } from 'ngx-papaparse'; + +import { StatuteParagraphRepositoryService } from 'app/core/repositories/motions/statute-paragraph-repository.service'; import { BaseImportService, NewEntry } from 'app/core/ui-services/base-import.service'; import { StatuteParagraph } from 'app/shared/models/motions/statute-paragraph'; import { ViewStatuteParagraph } from '../models/view-statute-paragraph'; -import { StatuteParagraphRepositoryService } from 'app/core/repositories/motions/statute-paragraph-repository.service'; /** * Service for motion imports diff --git a/client/src/app/site/projector/components/countdown-controls/countdown-controls.component.spec.ts b/client/src/app/site/projector/components/countdown-controls/countdown-controls.component.spec.ts index b71c6a561..b49d425f8 100644 --- a/client/src/app/site/projector/components/countdown-controls/countdown-controls.component.spec.ts +++ b/client/src/app/site/projector/components/countdown-controls/countdown-controls.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { CountdownControlsComponent } from './countdown-controls.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { CountdownControlsComponent } from './countdown-controls.component'; + describe('CountdownControlsComponent', () => { let component: CountdownControlsComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/projector/components/countdown-controls/countdown-controls.component.ts b/client/src/app/site/projector/components/countdown-controls/countdown-controls.component.ts index 06d4cf7f6..732e515b8 100644 --- a/client/src/app/site/projector/components/countdown-controls/countdown-controls.component.ts +++ b/client/src/app/site/projector/components/countdown-controls/countdown-controls.component.ts @@ -1,16 +1,16 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { Title } from '@angular/platform-browser'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { ViewCountdown } from '../../models/view-countdown'; import { CountdownRepositoryService } from 'app/core/repositories/projector/countdown-repository.service'; import { ConfigService } from 'app/core/ui-services/config.service'; +import { ProjectionDialogService } from 'app/core/ui-services/projection-dialog.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; import { Projector } from 'app/shared/models/core/projector'; -import { ProjectionDialogService } from 'app/core/ui-services/projection-dialog.service'; +import { BaseViewComponent } from 'app/site/base/base-view'; +import { ViewCountdown } from '../../models/view-countdown'; /** * diff --git a/client/src/app/site/projector/components/countdown-dialog/countdown-dialog.component.spec.ts b/client/src/app/site/projector/components/countdown-dialog/countdown-dialog.component.spec.ts index e46479504..083bdaad4 100644 --- a/client/src/app/site/projector/components/countdown-dialog/countdown-dialog.component.spec.ts +++ b/client/src/app/site/projector/components/countdown-dialog/countdown-dialog.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { CountdownDialogComponent, CountdownData } from './countdown-dialog.component'; import { E2EImportsModule } from 'e2e-imports.module'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; + +import { CountdownData, CountdownDialogComponent } from './countdown-dialog.component'; describe('CountdownDialogComponent', () => { let component: CountdownDialogComponent; diff --git a/client/src/app/site/projector/components/countdown-dialog/countdown-dialog.component.ts b/client/src/app/site/projector/components/countdown-dialog/countdown-dialog.component.ts index cf81f6363..c91ee3e15 100644 --- a/client/src/app/site/projector/components/countdown-dialog/countdown-dialog.component.ts +++ b/client/src/app/site/projector/components/countdown-dialog/countdown-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Inject } from '@angular/core'; +import { Component, Inject, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; @@ -6,9 +6,9 @@ import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewComponent } from 'app/site/base/base-view'; import { ConfigService } from 'app/core/ui-services/config.service'; import { DurationService } from 'app/core/ui-services/duration.service'; +import { BaseViewComponent } from 'app/site/base/base-view'; /** * Countdown data for the form diff --git a/client/src/app/site/projector/components/message-controls/message-controls.component.spec.ts b/client/src/app/site/projector/components/message-controls/message-controls.component.spec.ts index d3a03e604..ceb5a8225 100644 --- a/client/src/app/site/projector/components/message-controls/message-controls.component.spec.ts +++ b/client/src/app/site/projector/components/message-controls/message-controls.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MessageControlsComponent } from './message-controls.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { MessageControlsComponent } from './message-controls.component'; + describe('MessageControlsComponent', () => { let component: MessageControlsComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/projector/components/message-controls/message-controls.component.ts b/client/src/app/site/projector/components/message-controls/message-controls.component.ts index 374404a2b..5a3b58160 100644 --- a/client/src/app/site/projector/components/message-controls/message-controls.component.ts +++ b/client/src/app/site/projector/components/message-controls/message-controls.component.ts @@ -1,14 +1,15 @@ -import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; - -import { BaseViewComponent } from 'app/site/base/base-view'; -import { Projector } from 'app/shared/models/core/projector'; -import { ProjectorMessageRepositoryService } from 'app/core/repositories/projector/projector-message-repository.service'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { ViewProjectorMessage } from '../../models/view-projector-message'; -import { PromptService } from 'app/core/ui-services/prompt.service'; -import { TranslateService } from '@ngx-translate/core'; import { Title } from '@angular/platform-browser'; + +import { TranslateService } from '@ngx-translate/core'; + +import { ProjectorMessageRepositoryService } from 'app/core/repositories/projector/projector-message-repository.service'; import { ProjectionDialogService } from 'app/core/ui-services/projection-dialog.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; +import { Projector } from 'app/shared/models/core/projector'; +import { BaseViewComponent } from 'app/site/base/base-view'; +import { ViewProjectorMessage } from '../../models/view-projector-message'; /** * Small controls component for messages. diff --git a/client/src/app/site/projector/components/message-dialog/message-dialog.component.spec.ts b/client/src/app/site/projector/components/message-dialog/message-dialog.component.spec.ts index f47ad6e29..6ae180c76 100644 --- a/client/src/app/site/projector/components/message-dialog/message-dialog.component.spec.ts +++ b/client/src/app/site/projector/components/message-dialog/message-dialog.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { MessageDialogComponent, MessageData } from './message-dialog.component'; import { E2EImportsModule } from 'e2e-imports.module'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; + +import { MessageData, MessageDialogComponent } from './message-dialog.component'; describe('MessageDialogComponent', () => { let component: MessageDialogComponent; diff --git a/client/src/app/site/projector/components/message-dialog/message-dialog.component.ts b/client/src/app/site/projector/components/message-dialog/message-dialog.component.ts index 5981bbb27..11dc1c136 100644 --- a/client/src/app/site/projector/components/message-dialog/message-dialog.component.ts +++ b/client/src/app/site/projector/components/message-dialog/message-dialog.component.ts @@ -1,5 +1,5 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { Component, Inject, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; diff --git a/client/src/app/site/projector/components/presentation-control/presentation-control.component.ts b/client/src/app/site/projector/components/presentation-control/presentation-control.component.ts index 8c36cead1..53476140e 100644 --- a/client/src/app/site/projector/components/presentation-control/presentation-control.component.ts +++ b/client/src/app/site/projector/components/presentation-control/presentation-control.component.ts @@ -4,14 +4,14 @@ import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { Mediafile } from 'app/shared/models/mediafiles/mediafile'; -import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service'; import { ProjectorService } from 'app/core/core-services/projector.service'; -import { SlideManager } from 'app/slides/services/slide-manager.service'; -import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; -import { ViewProjector } from '../../models/view-projector'; +import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service'; +import { Mediafile } from 'app/shared/models/mediafiles/mediafile'; +import { BaseViewComponent } from 'app/site/base/base-view'; import { MediafileProjectorElement } from 'app/site/mediafiles/models/mediafile-projector-element'; +import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; +import { SlideManager } from 'app/slides/services/slide-manager.service'; +import { ViewProjector } from '../../models/view-projector'; /** * The presentation controls. diff --git a/client/src/app/site/projector/components/projector-detail/projector-detail.component.spec.ts b/client/src/app/site/projector/components/projector-detail/projector-detail.component.spec.ts index 37e8db920..3f2d11ef1 100644 --- a/client/src/app/site/projector/components/projector-detail/projector-detail.component.spec.ts +++ b/client/src/app/site/projector/components/projector-detail/projector-detail.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { E2EImportsModule } from 'e2e-imports.module'; + import { ProjectorDetailComponent } from './projector-detail.component'; import { ProjectorModule } from '../../projector.module'; -import { E2EImportsModule } from 'e2e-imports.module'; describe('ProjectorDetailComponent', () => { let component: ProjectorDetailComponent; diff --git a/client/src/app/site/projector/components/projector-detail/projector-detail.component.ts b/client/src/app/site/projector/components/projector-detail/projector-detail.component.ts index 072045d5b..f9b1ccc7d 100644 --- a/client/src/app/site/projector/components/projector-detail/projector-detail.component.ts +++ b/client/src/app/site/projector/components/projector-detail/projector-detail.component.ts @@ -1,33 +1,33 @@ +import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; +import { ProjectorService } from 'app/core/core-services/projector.service'; +import { CountdownRepositoryService } from 'app/core/repositories/projector/countdown-repository.service'; +import { ProjectorMessageRepositoryService } from 'app/core/repositories/projector/projector-message-repository.service'; import { ProjectorRepositoryService, ScrollScaleDirection } from 'app/core/repositories/projector/projector-repository.service'; -import { ViewProjector } from '../../models/view-projector'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { Countdown } from 'app/shared/models/core/countdown'; -import { CountdownDialogComponent, CountdownData } from '../countdown-dialog/countdown-dialog.component'; -import { CurrentListOfSpeakersSlideService } from '../../services/current-list-of-of-speakers-slide.service'; -import { CurrentSpeakerChyronSlideService } from '../../services/current-speaker-chyron-slide.service'; import { DurationService } from 'app/core/ui-services/duration.service'; -import { ProjectorService } from 'app/core/core-services/projector.service'; -import { moveItemInArray, CdkDragDrop } from '@angular/cdk/drag-drop'; -import { Projectable } from 'app/site/base/projectable'; +import { Countdown } from 'app/shared/models/core/countdown'; import { ProjectorElement } from 'app/shared/models/core/projector'; import { ProjectorMessage } from 'app/shared/models/core/projector-message'; -import { SlideManager } from 'app/slides/services/slide-manager.service'; -import { CountdownRepositoryService } from 'app/core/repositories/projector/countdown-repository.service'; -import { ProjectorMessageRepositoryService } from 'app/core/repositories/projector/projector-message-repository.service'; -import { ViewProjectorMessage } from 'app/site/projector/models/view-projector-message'; +import { BaseViewComponent } from 'app/site/base/base-view'; +import { Projectable } from 'app/site/base/projectable'; import { ViewCountdown } from 'app/site/projector/models/view-countdown'; -import { MessageDialogComponent, MessageData } from '../message-dialog/message-dialog.component'; +import { ViewProjectorMessage } from 'app/site/projector/models/view-projector-message'; +import { SlideManager } from 'app/slides/services/slide-manager.service'; +import { CountdownData, CountdownDialogComponent } from '../countdown-dialog/countdown-dialog.component'; +import { CurrentListOfSpeakersSlideService } from '../../services/current-list-of-of-speakers-slide.service'; +import { CurrentSpeakerChyronSlideService } from '../../services/current-speaker-chyron-slide.service'; +import { MessageData, MessageDialogComponent } from '../message-dialog/message-dialog.component'; +import { ViewProjector } from '../../models/view-projector'; /** * The projector detail view. diff --git a/client/src/app/site/projector/components/projector-list-entry/projector-list-entry.component.spec.ts b/client/src/app/site/projector/components/projector-list-entry/projector-list-entry.component.spec.ts index 9223f6cb1..00649be1d 100644 --- a/client/src/app/site/projector/components/projector-list-entry/projector-list-entry.component.spec.ts +++ b/client/src/app/site/projector/components/projector-list-entry/projector-list-entry.component.spec.ts @@ -1,8 +1,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from '../../../../../e2e-imports.module'; -import { ProjectorModule } from '../../projector.module'; import { ProjectorListEntryComponent } from './projector-list-entry.component'; +import { ProjectorModule } from '../../projector.module'; describe('ProjectorListEntryComponent', () => { let component: ProjectorListEntryComponent; diff --git a/client/src/app/site/projector/components/projector-list-entry/projector-list-entry.component.ts b/client/src/app/site/projector/components/projector-list-entry/projector-list-entry.component.ts index a535fcd82..2611e93c6 100644 --- a/client/src/app/site/projector/components/projector-list-entry/projector-list-entry.component.ts +++ b/client/src/app/site/projector/components/projector-list-entry/projector-list-entry.component.ts @@ -1,21 +1,21 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; -import { Title } from '@angular/platform-browser'; +import { Component, Input, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { MatRadioChange } from '@angular/material'; import { MatSliderChange } from '@angular/material/slider'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; +import { OperatorService } from 'app/core/core-services/operator.service'; +import { ProjectionDefaultRepositoryService } from 'app/core/repositories/projector/projection-default-repository.service'; import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service'; -import { ViewProjector } from '../../models/view-projector'; +import { PromptService } from 'app/core/ui-services/prompt.service'; import { Projector } from 'app/shared/models/core/projector'; import { BaseViewComponent } from 'app/site/base/base-view'; -import { PromptService } from 'app/core/ui-services/prompt.service'; import { ClockSlideService } from '../../services/clock-slide.service'; -import { OperatorService } from 'app/core/core-services/operator.service'; import { ViewProjectionDefault } from '../../models/view-projection-default'; -import { ProjectionDefaultRepositoryService } from 'app/core/repositories/projector/projection-default-repository.service'; -import { MatRadioChange } from '@angular/material'; +import { ViewProjector } from '../../models/view-projector'; /** * All supported aspect rations for projectors. diff --git a/client/src/app/site/projector/components/projector-list/projector-list.component.spec.ts b/client/src/app/site/projector/components/projector-list/projector-list.component.spec.ts index a07e8866d..a3647a1c1 100644 --- a/client/src/app/site/projector/components/projector-list/projector-list.component.spec.ts +++ b/client/src/app/site/projector/components/projector-list/projector-list.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ProjectorListComponent } from './projector-list.component'; import { E2EImportsModule } from '../../../../../e2e-imports.module'; +import { ProjectorListComponent } from './projector-list.component'; import { ProjectorModule } from '../../projector.module'; describe('ProjectorListComponent', () => { diff --git a/client/src/app/site/projector/components/projector-list/projector-list.component.ts b/client/src/app/site/projector/components/projector-list/projector-list.component.ts index 4a0eb5140..d5c0c4edd 100644 --- a/client/src/app/site/projector/components/projector-list/projector-list.component.ts +++ b/client/src/app/site/projector/components/projector-list/projector-list.component.ts @@ -1,16 +1,16 @@ import { Component, OnInit } from '@angular/core'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; -import { Title } from '@angular/platform-browser'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatSelectChange } from '@angular/material/select'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; +import { OperatorService } from 'app/core/core-services/operator.service'; import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service'; -import { ViewProjector } from '../../models/view-projector'; import { Projector } from 'app/shared/models/core/projector'; import { BaseViewComponent } from 'app/site/base/base-view'; -import { OperatorService } from 'app/core/core-services/operator.service'; +import { ViewProjector } from '../../models/view-projector'; /** * List for all projectors. diff --git a/client/src/app/site/projector/models/view-projection-default.ts b/client/src/app/site/projector/models/view-projection-default.ts index 254f013e4..1b70835c9 100644 --- a/client/src/app/site/projector/models/view-projection-default.ts +++ b/client/src/app/site/projector/models/view-projection-default.ts @@ -1,5 +1,5 @@ -import { BaseViewModel } from '../../base/base-view-model'; import { ProjectionDefault } from 'app/shared/models/core/projection-default'; +import { BaseViewModel } from '../../base/base-view-model'; export interface ProjectionDefaultTitleInformation { display_name: string; diff --git a/client/src/app/site/projector/models/view-projector-message.ts b/client/src/app/site/projector/models/view-projector-message.ts index 0ba351cfe..0433946b5 100644 --- a/client/src/app/site/projector/models/view-projector-message.ts +++ b/client/src/app/site/projector/models/view-projector-message.ts @@ -1,7 +1,7 @@ -import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model'; -import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; import { ProjectorMessage } from 'app/shared/models/core/projector-message'; import { stripHtmlTags } from 'app/shared/utils/strip-html-tags'; +import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model'; +import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; export type ProjectorMessageTitleInformation = object; diff --git a/client/src/app/site/projector/models/view-projector.ts b/client/src/app/site/projector/models/view-projector.ts index 219e6b6f8..63b0835b3 100644 --- a/client/src/app/site/projector/models/view-projector.ts +++ b/client/src/app/site/projector/models/view-projector.ts @@ -1,5 +1,5 @@ -import { BaseViewModel } from '../../base/base-view-model'; import { Projector, ProjectorElements } from 'app/shared/models/core/projector'; +import { BaseViewModel } from '../../base/base-view-model'; export interface ProjectorTitleInformation { name: string; diff --git a/client/src/app/site/projector/projector-routing.module.ts b/client/src/app/site/projector/projector-routing.module.ts index f8eff741f..83d1f02b9 100644 --- a/client/src/app/site/projector/projector-routing.module.ts +++ b/client/src/app/site/projector/projector-routing.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { ProjectorListComponent } from './components/projector-list/projector-list.component'; +import { RouterModule, Routes } from '@angular/router'; + import { ProjectorDetailComponent } from './components/projector-detail/projector-detail.component'; +import { ProjectorListComponent } from './components/projector-list/projector-list.component'; const routes: Routes = [ { diff --git a/client/src/app/site/projector/projector.config.ts b/client/src/app/site/projector/projector.config.ts index 3bb36a46d..d8ce60ac0 100644 --- a/client/src/app/site/projector/projector.config.ts +++ b/client/src/app/site/projector/projector.config.ts @@ -1,16 +1,16 @@ import { AppConfig } from '../../core/app-config'; -import { Projector } from 'app/shared/models/core/projector'; -import { Countdown } from 'app/shared/models/core/countdown'; -import { ProjectorMessage } from 'app/shared/models/core/projector-message'; -import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service'; import { CountdownRepositoryService } from 'app/core/repositories/projector/countdown-repository.service'; -import { ProjectorMessageRepositoryService } from 'app/core/repositories/projector/projector-message-repository.service'; -import { ViewProjector } from './models/view-projector'; -import { ViewCountdown } from './models/view-countdown'; -import { ViewProjectorMessage } from './models/view-projector-message'; -import { ProjectionDefault } from 'app/shared/models/core/projection-default'; -import { ViewProjectionDefault } from './models/view-projection-default'; import { ProjectionDefaultRepositoryService } from 'app/core/repositories/projector/projection-default-repository.service'; +import { ProjectorMessageRepositoryService } from 'app/core/repositories/projector/projector-message-repository.service'; +import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service'; +import { Countdown } from 'app/shared/models/core/countdown'; +import { ProjectionDefault } from 'app/shared/models/core/projection-default'; +import { Projector } from 'app/shared/models/core/projector'; +import { ProjectorMessage } from 'app/shared/models/core/projector-message'; +import { ViewCountdown } from './models/view-countdown'; +import { ViewProjectionDefault } from './models/view-projection-default'; +import { ViewProjector } from './models/view-projector'; +import { ViewProjectorMessage } from './models/view-projector-message'; export const ProjectorAppConfig: AppConfig = { name: 'projector', diff --git a/client/src/app/site/projector/projector.module.ts b/client/src/app/site/projector/projector.module.ts index 7490309a7..92bfa0359 100644 --- a/client/src/app/site/projector/projector.module.ts +++ b/client/src/app/site/projector/projector.module.ts @@ -7,8 +7,8 @@ import { MessageControlsComponent } from './components/message-controls/message- import { MessageDialogComponent } from './components/message-dialog/message-dialog.component'; import { PresentationControlComponent } from './components/presentation-control/presentation-control.component'; import { ProjectorDetailComponent } from './components/projector-detail/projector-detail.component'; -import { ProjectorListComponent } from './components/projector-list/projector-list.component'; import { ProjectorListEntryComponent } from './components/projector-list-entry/projector-list-entry.component'; +import { ProjectorListComponent } from './components/projector-list/projector-list.component'; import { ProjectorRoutingModule } from './projector-routing.module'; import { SharedModule } from '../../shared/shared.module'; diff --git a/client/src/app/site/projector/services/clock-slide.service.ts b/client/src/app/site/projector/services/clock-slide.service.ts index 5a47c116f..e963256c2 100644 --- a/client/src/app/site/projector/services/clock-slide.service.ts +++ b/client/src/app/site/projector/services/clock-slide.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { ProjectorService } from 'app/core/core-services/projector.service'; -import { ViewProjector } from '../models/view-projector'; import { IdentifiableProjectorElement } from 'app/shared/models/core/projector'; +import { ViewProjector } from '../models/view-projector'; /** */ diff --git a/client/src/app/site/projector/services/current-agenda-item.service.ts b/client/src/app/site/projector/services/current-agenda-item.service.ts index e66201d30..08aa16099 100644 --- a/client/src/app/site/projector/services/current-agenda-item.service.ts +++ b/client/src/app/site/projector/services/current-agenda-item.service.ts @@ -3,11 +3,11 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; import { ProjectorService } from 'app/core/core-services/projector.service'; -import { ViewProjector } from '../models/view-projector'; import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service'; -import { SlideManager } from 'app/slides/services/slide-manager.service'; import { ViewListOfSpeakers } from 'app/site/agenda/models/view-list-of-speakers'; import { isBaseViewModelWithListOfSpeakers } from 'app/site/base/base-view-model-with-list-of-speakers'; +import { SlideManager } from 'app/slides/services/slide-manager.service'; +import { ViewProjector } from '../models/view-projector'; /** * Observes the projector config for a given projector and returns a observable of the diff --git a/client/src/app/site/projector/services/current-list-of-of-speakers-slide.service.ts b/client/src/app/site/projector/services/current-list-of-of-speakers-slide.service.ts index 184533884..c1b8a4327 100644 --- a/client/src/app/site/projector/services/current-list-of-of-speakers-slide.service.ts +++ b/client/src/app/site/projector/services/current-list-of-of-speakers-slide.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; import { ProjectorService } from 'app/core/core-services/projector.service'; -import { ViewProjector } from '../models/view-projector'; import { IdentifiableProjectorElement } from 'app/shared/models/core/projector'; import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; +import { ViewProjector } from '../models/view-projector'; /** * Handles the curent list of speakers slide. Manages the projection and provides diff --git a/client/src/app/site/projector/services/current-speaker-chyron-slide.service.ts b/client/src/app/site/projector/services/current-speaker-chyron-slide.service.ts index eec73bffc..c8f9ec0fb 100644 --- a/client/src/app/site/projector/services/current-speaker-chyron-slide.service.ts +++ b/client/src/app/site/projector/services/current-speaker-chyron-slide.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { ProjectorService } from 'app/core/core-services/projector.service'; -import { ViewProjector } from '../models/view-projector'; import { IdentifiableProjectorElement } from 'app/shared/models/core/projector'; +import { ViewProjector } from '../models/view-projector'; /** */ diff --git a/client/src/app/site/site-routing.module.ts b/client/src/app/site/site-routing.module.ts index efc826bdf..bda0023d9 100644 --- a/client/src/app/site/site-routing.module.ts +++ b/client/src/app/site/site-routing.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; -import { SiteComponent } from './site.component'; import { AuthGuard } from '../core/core-services/auth-guard.service'; +import { SiteComponent } from './site.component'; /** * Routung to all OpenSlides apps diff --git a/client/src/app/site/site.component.spec.ts b/client/src/app/site/site.component.spec.ts index 122b07186..d604fde57 100644 --- a/client/src/app/site/site.component.spec.ts +++ b/client/src/app/site/site.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SiteComponent } from './site.component'; import { E2EImportsModule } from '../../e2e-imports.module'; +import { SiteComponent } from './site.component'; describe('SiteComponent', () => { let component: SiteComponent; diff --git a/client/src/app/site/site.component.ts b/client/src/app/site/site.component.ts index 038a69e52..9d122078a 100644 --- a/client/src/app/site/site.component.ts +++ b/client/src/app/site/site.component.ts @@ -1,25 +1,25 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { Router, NavigationEnd, ActivationEnd } from '@angular/router'; -import { FormGroup, FormControl } from '@angular/forms'; +import { FormControl, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { MatSidenav } from '@angular/material/sidenav'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; +import { ActivationEnd, NavigationEnd, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; +import { filter } from 'rxjs/operators'; -import { AuthService } from '../core/core-services/auth.service'; -import { OperatorService } from '../core/core-services/operator.service'; -import { BaseComponent } from '../base.component'; -import { pageTransition, navItemAnim } from '../shared/animations'; -import { ViewportService } from '../core/ui-services/viewport.service'; -import { MainMenuService } from '../core/core-services/main-menu.service'; -import { OpenSlidesStatusService } from '../core/core-services/openslides-status.service'; -import { TimeTravelService } from '../core/core-services/time-travel.service'; -import { langToLocale } from 'app/shared/utils/lang-to-locale'; +import { navItemAnim, pageTransition } from '../shared/animations'; import { ConfigService } from 'app/core/ui-services/config.service'; import { UpdateService } from 'app/core/ui-services/update.service'; -import { filter } from 'rxjs/operators'; +import { langToLocale } from 'app/shared/utils/lang-to-locale'; +import { AuthService } from '../core/core-services/auth.service'; +import { BaseComponent } from '../base.component'; +import { MainMenuService } from '../core/core-services/main-menu.service'; +import { OpenSlidesStatusService } from '../core/core-services/openslides-status.service'; +import { OperatorService } from '../core/core-services/operator.service'; +import { TimeTravelService } from '../core/core-services/time-travel.service'; +import { ViewportService } from '../core/ui-services/viewport.service'; /** * Interface to describe possible routing data diff --git a/client/src/app/site/site.module.ts b/client/src/app/site/site.module.ts index bd6438e60..289add0f5 100644 --- a/client/src/app/site/site.module.ts +++ b/client/src/app/site/site.module.ts @@ -1,10 +1,9 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { SharedModule } from 'app/shared/shared.module'; - -import { SiteComponent } from './site.component'; import { SiteRoutingModule } from './site-routing.module'; +import { SiteComponent } from './site.component'; @NgModule({ imports: [CommonModule, SharedModule, SiteRoutingModule], diff --git a/client/src/app/site/tags/components/tag-list/tag-list.component.spec.ts b/client/src/app/site/tags/components/tag-list/tag-list.component.spec.ts index 639e810e7..2222eff5f 100644 --- a/client/src/app/site/tags/components/tag-list/tag-list.component.spec.ts +++ b/client/src/app/site/tags/components/tag-list/tag-list.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TagListComponent } from './tag-list.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { TagListComponent } from './tag-list.component'; + describe('TagListComponent', () => { let component: TagListComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/tags/components/tag-list/tag-list.component.ts b/client/src/app/site/tags/components/tag-list/tag-list.component.ts index 5576888bc..ae424b516 100644 --- a/client/src/app/site/tags/components/tag-list/tag-list.component.ts +++ b/client/src/app/site/tags/components/tag-list/tag-list.component.ts @@ -1,15 +1,15 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { FormGroup, FormControl, Validators } from '@angular/forms'; -import { Title } from '@angular/platform-browser'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { PblColumnDefinition } from '@pebula/ngrid'; -import { BaseListViewComponent } from 'app/site/base/base-list-view'; +import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; import { Tag } from 'app/shared/models/core/tag'; -import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; +import { BaseListViewComponent } from 'app/site/base/base-list-view'; import { ViewTag } from '../../models/view-tag'; /** diff --git a/client/src/app/site/tags/models/view-tag.ts b/client/src/app/site/tags/models/view-tag.ts index c91521078..4264b188a 100644 --- a/client/src/app/site/tags/models/view-tag.ts +++ b/client/src/app/site/tags/models/view-tag.ts @@ -1,7 +1,7 @@ -import { Tag } from 'app/shared/models/core/tag'; -import { BaseViewModel } from '../../base/base-view-model'; import { SearchRepresentation } from 'app/core/ui-services/search.service'; +import { Tag } from 'app/shared/models/core/tag'; import { Searchable } from 'app/site/base/searchable'; +import { BaseViewModel } from '../../base/base-view-model'; export interface TagTitleInformation { name: string; diff --git a/client/src/app/site/tags/tag-routing.module.ts b/client/src/app/site/tags/tag-routing.module.ts index d1ac3b371..838952ccf 100644 --- a/client/src/app/site/tags/tag-routing.module.ts +++ b/client/src/app/site/tags/tag-routing.module.ts @@ -1,5 +1,6 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; + import { TagListComponent } from './components/tag-list/tag-list.component'; const routes: Routes = [{ path: '', component: TagListComponent, pathMatch: 'full' }]; diff --git a/client/src/app/site/tags/tag.config.ts b/client/src/app/site/tags/tag.config.ts index 361455491..18ac98b0d 100644 --- a/client/src/app/site/tags/tag.config.ts +++ b/client/src/app/site/tags/tag.config.ts @@ -1,6 +1,6 @@ import { AppConfig } from '../../core/app-config'; -import { Tag } from '../../shared/models/core/tag'; import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; +import { Tag } from '../../shared/models/core/tag'; import { ViewTag } from './models/view-tag'; export const TagAppConfig: AppConfig = { diff --git a/client/src/app/site/tags/tag.module.ts b/client/src/app/site/tags/tag.module.ts index a87ed173a..6cffc72de 100644 --- a/client/src/app/site/tags/tag.module.ts +++ b/client/src/app/site/tags/tag.module.ts @@ -1,9 +1,9 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; -import { TagRoutingModule } from './tag-routing.module'; import { SharedModule } from '../../shared/shared.module'; import { TagListComponent } from './components/tag-list/tag-list.component'; +import { TagRoutingModule } from './tag-routing.module'; @NgModule({ imports: [CommonModule, TagRoutingModule, SharedModule], diff --git a/client/src/app/site/topics/components/topic-detail/topic-detail.component.spec.ts b/client/src/app/site/topics/components/topic-detail/topic-detail.component.spec.ts index c8e4beb97..e5108750b 100644 --- a/client/src/app/site/topics/components/topic-detail/topic-detail.component.spec.ts +++ b/client/src/app/site/topics/components/topic-detail/topic-detail.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TopicDetailComponent } from './topic-detail.component'; import { E2EImportsModule } from '../../../../../e2e-imports.module'; +import { TopicDetailComponent } from './topic-detail.component'; describe('TopicComponent', () => { let component: TopicDetailComponent; diff --git a/client/src/app/site/topics/components/topic-detail/topic-detail.component.ts b/client/src/app/site/topics/components/topic-detail/topic-detail.component.ts index 4a83fbb86..b9c8281c9 100644 --- a/client/src/app/site/topics/components/topic-detail/topic-detail.component.ts +++ b/client/src/app/site/topics/components/topic-detail/topic-detail.component.ts @@ -1,22 +1,22 @@ import { Component } from '@angular/core'; -import { FormGroup, Validators, FormBuilder } from '@angular/forms'; -import { ActivatedRoute, Router } from '@angular/router'; -import { Title, DomSanitizer, SafeHtml } from '@angular/platform-browser'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { DomSanitizer, SafeHtml, Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject } from 'rxjs'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { PromptService } from 'app/core/ui-services/prompt.service'; -import { TopicRepositoryService } from 'app/core/repositories/topics/topic-repository.service'; -import { ViewTopic } from '../../models/view-topic'; import { OperatorService } from 'app/core/core-services/operator.service'; -import { ItemVisibilityChoices } from 'app/shared/models/agenda/item'; -import { CreateTopic } from '../../models/create-topic'; -import { Topic } from 'app/shared/models/topics/topic'; import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; +import { TopicRepositoryService } from 'app/core/repositories/topics/topic-repository.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; +import { ItemVisibilityChoices } from 'app/shared/models/agenda/item'; +import { Topic } from 'app/shared/models/topics/topic'; import { ViewItem } from 'app/site/agenda/models/view-item'; +import { BaseViewComponent } from 'app/site/base/base-view'; +import { CreateTopic } from '../../models/create-topic'; +import { ViewTopic } from '../../models/view-topic'; /** * Detail page for topics. diff --git a/client/src/app/site/topics/models/view-topic.ts b/client/src/app/site/topics/models/view-topic.ts index e469eb35b..fdb640deb 100644 --- a/client/src/app/site/topics/models/view-topic.ts +++ b/client/src/app/site/topics/models/view-topic.ts @@ -1,9 +1,9 @@ -import { Topic } from 'app/shared/models/topics/topic'; import { SearchRepresentation } from 'app/core/ui-services/search.service'; +import { Topic } from 'app/shared/models/topics/topic'; +import { TitleInformationWithAgendaItem } from 'app/site/base/base-view-model-with-agenda-item'; +import { BaseViewModelWithAgendaItemAndListOfSpeakers } from 'app/site/base/base-view-model-with-agenda-item-and-list-of-speakers'; import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile'; -import { BaseViewModelWithAgendaItemAndListOfSpeakers } from 'app/site/base/base-view-model-with-agenda-item-and-list-of-speakers'; -import { TitleInformationWithAgendaItem } from 'app/site/base/base-view-model-with-agenda-item'; export interface TopicTitleInformation extends TitleInformationWithAgendaItem { title: string; diff --git a/client/src/app/site/topics/topics-routing.module.ts b/client/src/app/site/topics/topics-routing.module.ts index 10e0872bf..ab64d8cdc 100644 --- a/client/src/app/site/topics/topics-routing.module.ts +++ b/client/src/app/site/topics/topics-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { TopicDetailComponent } from './components/topic-detail/topic-detail.component'; diff --git a/client/src/app/site/topics/topics.config.ts b/client/src/app/site/topics/topics.config.ts index e00324137..9ba115fd7 100644 --- a/client/src/app/site/topics/topics.config.ts +++ b/client/src/app/site/topics/topics.config.ts @@ -1,6 +1,6 @@ import { AppConfig } from '../../core/app-config'; -import { Topic } from '../../shared/models/topics/topic'; import { TopicRepositoryService } from 'app/core/repositories/topics/topic-repository.service'; +import { Topic } from '../../shared/models/topics/topic'; import { ViewTopic } from './models/view-topic'; export const TopicsAppConfig: AppConfig = { diff --git a/client/src/app/site/topics/topics.module.ts b/client/src/app/site/topics/topics.module.ts index e135c4842..ec0cc7a2b 100644 --- a/client/src/app/site/topics/topics.module.ts +++ b/client/src/app/site/topics/topics.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { SharedModule } from 'app/shared/shared.module'; import { TopicDetailComponent } from './components/topic-detail/topic-detail.component'; diff --git a/client/src/app/site/users/components/group-list/group-list.component.spec.ts b/client/src/app/site/users/components/group-list/group-list.component.spec.ts index 23ac7194b..4b8fb4fe5 100644 --- a/client/src/app/site/users/components/group-list/group-list.component.spec.ts +++ b/client/src/app/site/users/components/group-list/group-list.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { GroupListComponent } from './group-list.component'; import { E2EImportsModule } from '../../../../../e2e-imports.module'; +import { GroupListComponent } from './group-list.component'; describe('GroupListComponent', () => { let component: GroupListComponent; diff --git a/client/src/app/site/users/components/group-list/group-list.component.ts b/client/src/app/site/users/components/group-list/group-list.component.ts index 47abe526c..6aee1617e 100644 --- a/client/src/app/site/users/components/group-list/group-list.component.ts +++ b/client/src/app/site/users/components/group-list/group-list.component.ts @@ -1,16 +1,17 @@ -import { Component, OnInit, ViewChild, TemplateRef } from '@angular/core'; -import { Title } from '@angular/platform-browser'; -import { TranslateService } from '@ngx-translate/core'; +import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { MatTableDataSource } from '@angular/material/table'; -import { FormGroup, Validators, FormBuilder } from '@angular/forms'; +import { Title } from '@angular/platform-browser'; -import { GroupRepositoryService, AppPermissions } from 'app/core/repositories/users/group-repository.service'; -import { ViewGroup } from '../../models/view-group'; +import { TranslateService } from '@ngx-translate/core'; + +import { AppPermissions, GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; import { Group } from 'app/shared/models/users/group'; import { BaseViewComponent } from 'app/site/base/base-view'; -import { PromptService } from 'app/core/ui-services/prompt.service'; +import { ViewGroup } from '../../models/view-group'; /** * Component for the Group-List and permission matrix diff --git a/client/src/app/site/users/components/password/password.component.spec.ts b/client/src/app/site/users/components/password/password.component.spec.ts index ff7e23a58..a2198930a 100644 --- a/client/src/app/site/users/components/password/password.component.spec.ts +++ b/client/src/app/site/users/components/password/password.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { PasswordComponent } from './password.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { PasswordComponent } from './password.component'; + describe('PasswordComponent', () => { let component: PasswordComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/users/components/password/password.component.ts b/client/src/app/site/users/components/password/password.component.ts index 5c3d37849..b640d1b4a 100644 --- a/client/src/app/site/users/components/password/password.component.ts +++ b/client/src/app/site/users/components/password/password.component.ts @@ -1,15 +1,15 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { ViewUser } from '../../models/view-user'; -import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; import { OperatorService } from 'app/core/core-services/operator.service'; +import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; import { BaseViewComponent } from 'app/site/base/base-view'; +import { ViewUser } from '../../models/view-user'; /** * Component for the Password-Reset Handling diff --git a/client/src/app/site/users/components/presence-detail/presence-detail.component.spec.ts b/client/src/app/site/users/components/presence-detail/presence-detail.component.spec.ts index ac918896f..00ffd6a2e 100644 --- a/client/src/app/site/users/components/presence-detail/presence-detail.component.spec.ts +++ b/client/src/app/site/users/components/presence-detail/presence-detail.component.spec.ts @@ -1,6 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { PresenceDetailComponent } from './presence-detail.component'; describe('PresenceDetailComponent', () => { diff --git a/client/src/app/site/users/components/presence-detail/presence-detail.component.ts b/client/src/app/site/users/components/presence-detail/presence-detail.component.ts index cab5c9fd5..7a48e437a 100644 --- a/client/src/app/site/users/components/presence-detail/presence-detail.component.ts +++ b/client/src/app/site/users/components/presence-detail/presence-detail.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; -import { Subscription } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; +import { Subscription } from 'rxjs'; -import { ConfigService } from 'app/core/ui-services/config.service'; import { OperatorService } from 'app/core/core-services/operator.service'; import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; import { ViewUser } from '../../models/view-user'; /** diff --git a/client/src/app/site/users/components/user-detail/user-detail.component.spec.ts b/client/src/app/site/users/components/user-detail/user-detail.component.spec.ts index 204d236f8..a5c675fdc 100644 --- a/client/src/app/site/users/components/user-detail/user-detail.component.spec.ts +++ b/client/src/app/site/users/components/user-detail/user-detail.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { UserDetailComponent } from './user-detail.component'; import { E2EImportsModule } from '../../../../../e2e-imports.module'; +import { UserDetailComponent } from './user-detail.component'; describe('UserDetailComponent', () => { let component: UserDetailComponent; 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 5e972466b..ef04a9115 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 @@ -1,21 +1,21 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { Title, SafeHtml, DomSanitizer } from '@angular/platform-browser'; +import { DomSanitizer, SafeHtml, Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { genders, User } from 'app/shared/models/users/user'; import { OperatorService } from 'app/core/core-services/operator.service'; -import { PromptService } from 'app/core/ui-services/prompt.service'; -import { UserPdfExportService } from '../../services/user-pdf-export.service'; -import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; -import { ViewUser } from '../../models/view-user'; -import { ViewGroup } from '../../models/view-group'; import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; +import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; +import { PromptService } from 'app/core/ui-services/prompt.service'; +import { genders, User } from 'app/shared/models/users/user'; import { OneOfValidator } from 'app/shared/validators/one-of-validator'; +import { BaseViewComponent } from 'app/site/base/base-view'; +import { UserPdfExportService } from '../../services/user-pdf-export.service'; +import { ViewGroup } from '../../models/view-group'; +import { ViewUser } from '../../models/view-user'; /** * Users detail component for both new and existing users diff --git a/client/src/app/site/users/components/user-import/user-import-list.component.spec.ts b/client/src/app/site/users/components/user-import/user-import-list.component.spec.ts index bddd6128c..da27933a7 100644 --- a/client/src/app/site/users/components/user-import/user-import-list.component.spec.ts +++ b/client/src/app/site/users/components/user-import/user-import-list.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { UserImportListComponent } from './user-import-list.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { UserImportListComponent } from './user-import-list.component'; + describe('UserImportListComponent', () => { let component: UserImportListComponent; let fixture: ComponentFixture; diff --git a/client/src/app/site/users/components/user-import/user-import-list.component.ts b/client/src/app/site/users/components/user-import/user-import-list.component.ts index 8a07e476d..34de72457 100644 --- a/client/src/app/site/users/components/user-import/user-import-list.component.ts +++ b/client/src/app/site/users/components/user-import/user-import-list.component.ts @@ -1,12 +1,13 @@ import { Component } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; + import { TranslateService } from '@ngx-translate/core'; -import { BaseImportListComponent } from 'app/site/base/base-import-list'; -import { CsvExportService } from 'app/core/ui-services/csv-export.service'; -import { FormBuilder, FormGroup } from '@angular/forms'; import { NewEntry } from 'app/core/ui-services/base-import.service'; +import { CsvExportService } from 'app/core/ui-services/csv-export.service'; +import { BaseImportListComponent } from 'app/site/base/base-import-list'; import { UserImportService } from '../../services/user-import.service'; import { ViewUser } from '../../models/view-user'; diff --git a/client/src/app/site/users/components/user-list/user-list.component.spec.ts b/client/src/app/site/users/components/user-list/user-list.component.spec.ts index 46c0d7274..e54185ada 100644 --- a/client/src/app/site/users/components/user-list/user-list.component.spec.ts +++ b/client/src/app/site/users/components/user-list/user-list.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { UserListComponent } from './user-list.component'; import { E2EImportsModule } from '../../../../../e2e-imports.module'; +import { UserListComponent } from './user-list.component'; describe('UserListComponent', () => { let component: UserListComponent; 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 8d661db4a..cd6171112 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,28 +1,28 @@ -import { Component, OnInit, ViewChild, TemplateRef } from '@angular/core'; +import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { Router, ActivatedRoute } from '@angular/router'; import { Title } from '@angular/platform-browser'; +import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { PblColumnDefinition } from '@pebula/ngrid'; +import { OperatorService } from 'app/core/core-services/operator.service'; +import { StorageService } from 'app/core/core-services/storage.service'; +import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; +import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; +import { _ } from 'app/core/translate/translation-marker'; import { ChoiceService } from 'app/core/ui-services/choice.service'; import { ConfigService } from 'app/core/ui-services/config.service'; import { CsvExportService } from 'app/core/ui-services/csv-export.service'; -import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; -import { BaseListViewComponent } from 'app/site/base/base-list-view'; import { PromptService } from 'app/core/ui-services/prompt.service'; +import { genders } from 'app/shared/models/users/user'; +import { BaseListViewComponent } from 'app/site/base/base-list-view'; import { UserFilterListService } from '../../services/user-filter-list.service'; -import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; import { UserPdfExportService } from '../../services/user-pdf-export.service'; import { UserSortListService } from '../../services/user-sort-list.service'; -import { OperatorService } from 'app/core/core-services/operator.service'; -import { ViewUser } from '../../models/view-user'; import { ViewGroup } from '../../models/view-group'; -import { genders } from 'app/shared/models/users/user'; -import { _ } from 'app/core/translate/translation-marker'; -import { StorageService } from 'app/core/core-services/storage.service'; +import { ViewUser } from '../../models/view-user'; /** * Interface for the short editing dialog. diff --git a/client/src/app/site/users/models/view-csv-create-user.ts b/client/src/app/site/users/models/view-csv-create-user.ts index da38c7213..91f9f383c 100644 --- a/client/src/app/site/users/models/view-csv-create-user.ts +++ b/client/src/app/site/users/models/view-csv-create-user.ts @@ -1,5 +1,5 @@ -import { ViewUser } from './view-user'; import { User } from 'app/shared/models/users/user'; +import { ViewUser } from './view-user'; /** * Interface for correlating between strings representing BaseModels and existing diff --git a/client/src/app/site/users/models/view-group.ts b/client/src/app/site/users/models/view-group.ts index 7bab5d7ad..8d783e6e3 100644 --- a/client/src/app/site/users/models/view-group.ts +++ b/client/src/app/site/users/models/view-group.ts @@ -1,5 +1,5 @@ -import { BaseViewModel } from '../../base/base-view-model'; import { Group } from 'app/shared/models/users/group'; +import { BaseViewModel } from '../../base/base-view-model'; export interface GroupTitleInformation { name: string; diff --git a/client/src/app/site/users/models/view-personal-note.ts b/client/src/app/site/users/models/view-personal-note.ts index 37b03da0b..ad54f2599 100644 --- a/client/src/app/site/users/models/view-personal-note.ts +++ b/client/src/app/site/users/models/view-personal-note.ts @@ -1,5 +1,5 @@ +import { PersonalNote, PersonalNoteContent, PersonalNotesFormat } from 'app/shared/models/users/personal-note'; import { BaseViewModel } from 'app/site/base/base-view-model'; -import { PersonalNote, PersonalNotesFormat, PersonalNoteContent } from 'app/shared/models/users/personal-note'; export type PersonalNoteTitleInformation = object; diff --git a/client/src/app/site/users/models/view-user.ts b/client/src/app/site/users/models/view-user.ts index a7ad0f5fd..bbea56037 100644 --- a/client/src/app/site/users/models/view-user.ts +++ b/client/src/app/site/users/models/view-user.ts @@ -1,8 +1,8 @@ +import { SearchRepresentation } from 'app/core/ui-services/search.service'; import { User } from 'app/shared/models/users/user'; import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model'; import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable'; import { Searchable } from 'app/site/base/searchable'; -import { SearchRepresentation } from 'app/core/ui-services/search.service'; import { ViewGroup } from './view-group'; export interface UserTitleInformation { diff --git a/client/src/app/site/users/services/user-filter-list.service.ts b/client/src/app/site/users/services/user-filter-list.service.ts index 513c97077..eb8f832e3 100644 --- a/client/src/app/site/users/services/user-filter-list.service.ts +++ b/client/src/app/site/users/services/user-filter-list.service.ts @@ -1,9 +1,10 @@ import { Injectable } from '@angular/core'; -import { BaseFilterListService, OsFilter } from 'app/core/ui-services/base-filter-list.service'; -import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; -import { StorageService } from 'app/core/core-services/storage.service'; import { TranslateService } from '@ngx-translate/core'; + +import { StorageService } from 'app/core/core-services/storage.service'; +import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; +import { BaseFilterListService, OsFilter } from 'app/core/ui-services/base-filter-list.service'; import { ViewUser } from '../models/view-user'; /** diff --git a/client/src/app/site/users/services/user-import.service.spec.ts b/client/src/app/site/users/services/user-import.service.spec.ts index 75f1c2e93..6732e4489 100644 --- a/client/src/app/site/users/services/user-import.service.spec.ts +++ b/client/src/app/site/users/services/user-import.service.spec.ts @@ -1,6 +1,7 @@ import { TestBed } from '@angular/core/testing'; import { E2EImportsModule } from 'e2e-imports.module'; + import { UserImportService } from './user-import.service'; describe('UserImportService', () => { diff --git a/client/src/app/site/users/services/user-import.service.ts b/client/src/app/site/users/services/user-import.service.ts index 79e2b542d..8722e19ba 100644 --- a/client/src/app/site/users/services/user-import.service.ts +++ b/client/src/app/site/users/services/user-import.service.ts @@ -1,14 +1,15 @@ import { Injectable } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; + +import { TranslateService } from '@ngx-translate/core'; import { Papa } from 'ngx-papaparse'; +import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; +import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; import { BaseImportService, NewEntry } from 'app/core/ui-services/base-import.service'; import { Group } from 'app/shared/models/users/group'; -import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; -import { TranslateService } from '@ngx-translate/core'; import { User } from 'app/shared/models/users/user'; -import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; -import { ViewCsvCreateUser, CsvMapping } from '../models/view-csv-create-user'; +import { CsvMapping, ViewCsvCreateUser } from '../models/view-csv-create-user'; import { ViewUser } from '../models/view-user'; @Injectable({ diff --git a/client/src/app/site/users/services/user-pdf-export.service.spec.ts b/client/src/app/site/users/services/user-pdf-export.service.spec.ts index 97bdbb497..4c6965b16 100644 --- a/client/src/app/site/users/services/user-pdf-export.service.spec.ts +++ b/client/src/app/site/users/services/user-pdf-export.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { UserPdfExportService } from './user-pdf-export.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { UserPdfExportService } from './user-pdf-export.service'; + describe('UserPdfExportService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/site/users/services/user-pdf.service.spec.ts b/client/src/app/site/users/services/user-pdf.service.spec.ts index 60a3a76a4..b24d83ced 100644 --- a/client/src/app/site/users/services/user-pdf.service.spec.ts +++ b/client/src/app/site/users/services/user-pdf.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { UserPdfService } from './user-pdf.service'; import { E2EImportsModule } from 'e2e-imports.module'; +import { UserPdfService } from './user-pdf.service'; + describe('UserPdfService', () => { beforeEach(() => TestBed.configureTestingModule({ diff --git a/client/src/app/site/users/services/user-pdf.service.ts b/client/src/app/site/users/services/user-pdf.service.ts index 3209048e0..e93130c83 100644 --- a/client/src/app/site/users/services/user-pdf.service.ts +++ b/client/src/app/site/users/services/user-pdf.service.ts @@ -3,8 +3,8 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { ConfigService } from 'app/core/ui-services/config.service'; -import { ViewUser } from '../models/view-user'; import { PdfDocumentService } from 'app/core/ui-services/pdf-document.service'; +import { ViewUser } from '../models/view-user'; /** * Creates a pdf for a user, containing greetings and initial login information diff --git a/client/src/app/site/users/services/user-sort-list.service.ts b/client/src/app/site/users/services/user-sort-list.service.ts index ecb9fa4ee..ef4684fa5 100644 --- a/client/src/app/site/users/services/user-sort-list.service.ts +++ b/client/src/app/site/users/services/user-sort-list.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { BaseSortListService, OsSortingDefinition, OsSortingOption } from 'app/core/ui-services/base-sort-list.service'; import { StorageService } from 'app/core/core-services/storage.service'; +import { BaseSortListService, OsSortingDefinition, OsSortingOption } from 'app/core/ui-services/base-sort-list.service'; import { ViewUser } from '../models/view-user'; /** diff --git a/client/src/app/site/users/users-routing.module.ts b/client/src/app/site/users/users-routing.module.ts index 88f90193c..f1a1411c1 100644 --- a/client/src/app/site/users/users-routing.module.ts +++ b/client/src/app/site/users/users-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { GroupListComponent } from './components/group-list/group-list.component'; import { PasswordComponent } from './components/password/password.component'; diff --git a/client/src/app/site/users/users.config.ts b/client/src/app/site/users/users.config.ts index 83823b0b1..74ddde762 100644 --- a/client/src/app/site/users/users.config.ts +++ b/client/src/app/site/users/users.config.ts @@ -1,13 +1,13 @@ import { AppConfig } from '../../core/app-config'; -import { User } from '../../shared/models/users/user'; -import { Group } from '../../shared/models/users/group'; -import { PersonalNote } from '../../shared/models/users/personal-note'; -import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; import { PersonalNoteRepositoryService } from 'app/core/repositories/users/personal-note-repository.service'; -import { ViewUser } from './models/view-user'; +import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service'; +import { Group } from '../../shared/models/users/group'; +import { PersonalNote } from '../../shared/models/users/personal-note'; +import { User } from '../../shared/models/users/user'; import { ViewGroup } from './models/view-group'; import { ViewPersonalNote } from './models/view-personal-note'; +import { ViewUser } from './models/view-user'; export const UsersAppConfig: AppConfig = { name: 'users', diff --git a/client/src/app/site/users/users.module.ts b/client/src/app/site/users/users.module.ts index 5cc943f5e..18cf937fb 100644 --- a/client/src/app/site/users/users.module.ts +++ b/client/src/app/site/users/users.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { GroupListComponent } from './components/group-list/group-list.component'; import { PasswordComponent } from './components/password/password.component'; diff --git a/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.ts b/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.ts index c2b8697a8..c5c340e23 100644 --- a/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.ts +++ b/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.ts @@ -1,10 +1,10 @@ import { Component, OnInit } from '@angular/core'; -import { BaseSlideComponent } from 'app/slides/base-slide-component'; -import { CommonListOfSpeakersSlideData } from './common-list-of-speakers-slide-data'; import { CollectionStringMapperService } from 'app/core/core-services/collection-string-mapper.service'; import { isBaseIsAgendaItemContentObjectRepository } from 'app/core/repositories/base-is-agenda-item-content-object-repository'; import { ConfigService } from 'app/core/ui-services/config.service'; +import { BaseSlideComponent } from 'app/slides/base-slide-component'; +import { CommonListOfSpeakersSlideData } from './common-list-of-speakers-slide-data'; @Component({ selector: 'os-common-list-of-speakers-slide', diff --git a/client/src/app/slides/agenda/common/common-list-of-speakers-slide.module.ts b/client/src/app/slides/agenda/common/common-list-of-speakers-slide.module.ts index 9efad369e..ab3e27605 100644 --- a/client/src/app/slides/agenda/common/common-list-of-speakers-slide.module.ts +++ b/client/src/app/slides/agenda/common/common-list-of-speakers-slide.module.ts @@ -1,8 +1,8 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; -import { CommonListOfSpeakersSlideComponent } from './common-list-of-speakers-slide.component'; import { SharedModule } from 'app/shared/shared.module'; +import { CommonListOfSpeakersSlideComponent } from './common-list-of-speakers-slide.component'; @NgModule({ declarations: [CommonListOfSpeakersSlideComponent], diff --git a/client/src/app/slides/agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.component.spec.ts b/client/src/app/slides/agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.component.spec.ts index 2d20bd5ee..92a58c45e 100644 --- a/client/src/app/slides/agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.component.spec.ts +++ b/client/src/app/slides/agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.component.spec.ts @@ -1,8 +1,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { CommonListOfSpeakersSlideModule } from '../common/common-list-of-speakers-slide.module'; import { CurrentListOfSpeakersOverlaySlideComponent } from './current-list-of-speakers-overlay-slide.component'; import { E2EImportsModule } from '../../../../e2e-imports.module'; -import { CommonListOfSpeakersSlideModule } from '../common/common-list-of-speakers-slide.module'; describe('CurrentListOfSpeakersOverlaySlideComponent', () => { let component: CurrentListOfSpeakersOverlaySlideComponent; diff --git a/client/src/app/slides/agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.module.ts b/client/src/app/slides/agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.module.ts index 9ce1e63b8..90490e395 100644 --- a/client/src/app/slides/agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.module.ts +++ b/client/src/app/slides/agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.module.ts @@ -1,10 +1,10 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; -import { CurrentListOfSpeakersOverlaySlideComponent } from './current-list-of-speakers-overlay-slide.component'; -import { CommonListOfSpeakersSlideModule } from '../common/common-list-of-speakers-slide.module'; import { SharedModule } from 'app/shared/shared.module'; import { SLIDE } from 'app/slides/slide-token'; +import { CommonListOfSpeakersSlideModule } from '../common/common-list-of-speakers-slide.module'; +import { CurrentListOfSpeakersOverlaySlideComponent } from './current-list-of-speakers-overlay-slide.component'; @NgModule({ imports: [CommonModule, SharedModule, CommonListOfSpeakersSlideModule], diff --git a/client/src/app/slides/agenda/item-list/item-list-slide.component.spec.ts b/client/src/app/slides/agenda/item-list/item-list-slide.component.spec.ts index f5dfb2cef..3256dad29 100644 --- a/client/src/app/slides/agenda/item-list/item-list-slide.component.spec.ts +++ b/client/src/app/slides/agenda/item-list/item-list-slide.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ItemListSlideComponent } from './item-list-slide.component'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { ItemListSlideComponent } from './item-list-slide.component'; describe('ItemListSlideComponent', () => { let component: ItemListSlideComponent; diff --git a/client/src/app/slides/agenda/item-list/item-list-slide.component.ts b/client/src/app/slides/agenda/item-list/item-list-slide.component.ts index 412c0c28c..f1ed6efc4 100644 --- a/client/src/app/slides/agenda/item-list/item-list-slide.component.ts +++ b/client/src/app/slides/agenda/item-list/item-list-slide.component.ts @@ -1,9 +1,9 @@ import { Component } from '@angular/core'; -import { BaseSlideComponent } from 'app/slides/base-slide-component'; -import { ItemListSlideData, SlideItem } from './item-list-slide-data'; import { CollectionStringMapperService } from 'app/core/core-services/collection-string-mapper.service'; import { isBaseIsAgendaItemContentObjectRepository } from 'app/core/repositories/base-is-agenda-item-content-object-repository'; +import { BaseSlideComponent } from 'app/slides/base-slide-component'; +import { ItemListSlideData, SlideItem } from './item-list-slide-data'; @Component({ selector: 'os-item-list-slide', diff --git a/client/src/app/slides/all-slide-configurations.ts b/client/src/app/slides/all-slide-configurations.ts index 327f52ac9..a81627a6d 100644 --- a/client/src/app/slides/all-slide-configurations.ts +++ b/client/src/app/slides/all-slide-configurations.ts @@ -1,8 +1,8 @@ import { TranslateService } from '@ngx-translate/core'; -import { SlideDynamicConfiguration, Slide } from './slide-manifest'; import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; import { ProjectorElement } from 'app/shared/models/core/projector'; +import { Slide, SlideDynamicConfiguration } from './slide-manifest'; export const allSlidesDynamicConfiguration: (SlideDynamicConfiguration & Slide)[] = [ { diff --git a/client/src/app/slides/assignments/assignment/assignment-slide.component.ts b/client/src/app/slides/assignments/assignment/assignment-slide.component.ts index 2b3eb096a..73347d7a0 100644 --- a/client/src/app/slides/assignments/assignment/assignment-slide.component.ts +++ b/client/src/app/slides/assignments/assignment/assignment-slide.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from '@angular/core'; +import { SlideData } from 'app/core/core-services/projector-data.service'; import { BaseSlideComponent } from 'app/slides/base-slide-component'; import { AssignmentSlideData } from './assignment-slide-data'; -import { SlideData } from 'app/core/core-services/projector-data.service'; @Component({ selector: 'os-assignment-slide', diff --git a/client/src/app/slides/assignments/poll/poll-slide-data.ts b/client/src/app/slides/assignments/poll/poll-slide-data.ts index 0c79c1d38..5a4b69462 100644 --- a/client/src/app/slides/assignments/poll/poll-slide-data.ts +++ b/client/src/app/slides/assignments/poll/poll-slide-data.ts @@ -1,5 +1,5 @@ -import { AssignmentPercentBase, AssignmentPollMethod } from 'app/site/assignments/services/assignment-poll.service'; import { PollVoteValue } from 'app/core/ui-services/poll.service'; +import { AssignmentPercentBase, AssignmentPollMethod } from 'app/site/assignments/services/assignment-poll.service'; export interface PollSlideOption { user: string; diff --git a/client/src/app/slides/assignments/poll/poll-slide.component.spec.ts b/client/src/app/slides/assignments/poll/poll-slide.component.spec.ts index ee19e7570..3d56db30e 100644 --- a/client/src/app/slides/assignments/poll/poll-slide.component.spec.ts +++ b/client/src/app/slides/assignments/poll/poll-slide.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { PollSlideComponent } from './poll-slide.component'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { PollSlideComponent } from './poll-slide.component'; describe('PollSlideComponent', () => { let component: PollSlideComponent; diff --git a/client/src/app/slides/assignments/poll/poll-slide.component.ts b/client/src/app/slides/assignments/poll/poll-slide.component.ts index e9c7722a3..4282af97b 100644 --- a/client/src/app/slides/assignments/poll/poll-slide.component.ts +++ b/client/src/app/slides/assignments/poll/poll-slide.component.ts @@ -1,5 +1,9 @@ import { Component, Input } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; + +import { SlideData } from 'app/core/core-services/projector-data.service'; +import { CalculablePollKey, PollVoteValue } from 'app/core/ui-services/poll.service'; import { AssignmentPollService, CalculationData, @@ -7,9 +11,6 @@ import { } from 'app/site/assignments/services/assignment-poll.service'; import { BaseSlideComponent } from 'app/slides/base-slide-component'; import { PollSlideData, PollSlideOption } from './poll-slide-data'; -import { PollVoteValue, CalculablePollKey } from 'app/core/ui-services/poll.service'; -import { SlideData } from 'app/core/core-services/projector-data.service'; -import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'os-poll-slide', diff --git a/client/src/app/slides/base-slide-component.ts b/client/src/app/slides/base-slide-component.ts index f83515b7f..a01c30a70 100644 --- a/client/src/app/slides/base-slide-component.ts +++ b/client/src/app/slides/base-slide-component.ts @@ -1,8 +1,8 @@ import { Input } from '@angular/core'; -import { ViewProjector } from 'app/site/projector/models/view-projector'; import { SlideData } from 'app/core/core-services/projector-data.service'; import { ProjectorElement } from 'app/shared/models/core/projector'; +import { ViewProjector } from 'app/site/projector/models/view-projector'; /** * Every slide has to extends this base class. It forces the slides diff --git a/client/src/app/slides/base-slide-module.ts b/client/src/app/slides/base-slide-module.ts index 1060294f8..b30813d9e 100644 --- a/client/src/app/slides/base-slide-module.ts +++ b/client/src/app/slides/base-slide-module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/compiler/src/core'; import { Type } from '@angular/core'; import { SharedModule } from 'app/shared/shared.module'; -import { SLIDE } from './slide-token'; import { BaseSlideComponent } from './base-slide-component'; +import { SLIDE } from './slide-token'; /** * Generates the configuration for a slide module. diff --git a/client/src/app/slides/core/clock/clock-slide.component.ts b/client/src/app/slides/core/clock/clock-slide.component.ts index febeb6e53..56f7a57be 100644 --- a/client/src/app/slides/core/clock/clock-slide.component.ts +++ b/client/src/app/slides/core/clock/clock-slide.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; -import { BaseSlideComponent } from 'app/slides/base-slide-component'; import { ServertimeService } from 'app/core/core-services/servertime.service'; +import { BaseSlideComponent } from 'app/slides/base-slide-component'; @Component({ selector: 'os-clock-slide', diff --git a/client/src/app/slides/mediafiles/mediafile/mediafile-slide.component.spec.ts b/client/src/app/slides/mediafiles/mediafile/mediafile-slide.component.spec.ts index 3cd1b9998..0c514793e 100644 --- a/client/src/app/slides/mediafiles/mediafile/mediafile-slide.component.spec.ts +++ b/client/src/app/slides/mediafiles/mediafile/mediafile-slide.component.spec.ts @@ -1,9 +1,10 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MediafileSlideComponent } from './mediafile-slide.component'; -import { E2EImportsModule } from '../../../../e2e-imports.module'; import { PdfViewerModule } from 'ng2-pdf-viewer'; +import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { MediafileSlideComponent } from './mediafile-slide.component'; + describe('MediafileSlideComponent', () => { let component: MediafileSlideComponent; let fixture: ComponentFixture; diff --git a/client/src/app/slides/mediafiles/mediafile/mediafile-slide.component.ts b/client/src/app/slides/mediafiles/mediafile/mediafile-slide.component.ts index 5a31c04e5..9f85591f3 100644 --- a/client/src/app/slides/mediafiles/mediafile/mediafile-slide.component.ts +++ b/client/src/app/slides/mediafiles/mediafile/mediafile-slide.component.ts @@ -1,9 +1,9 @@ import { Component } from '@angular/core'; +import { MediafileProjectorElement } from 'app/site/mediafiles/models/mediafile-projector-element'; +import { IMAGE_MIMETYPES, PDF_MIMETYPES } from 'app/site/mediafiles/models/view-mediafile'; import { BaseSlideComponent } from 'app/slides/base-slide-component'; import { MediafileSlideData } from './mediafile-slide-data'; -import { IMAGE_MIMETYPES, PDF_MIMETYPES } from 'app/site/mediafiles/models/view-mediafile'; -import { MediafileProjectorElement } from 'app/site/mediafiles/models/mediafile-projector-element'; @Component({ selector: 'os-mediafile-slide', diff --git a/client/src/app/slides/mediafiles/mediafile/mediafile-slide.module.ts b/client/src/app/slides/mediafiles/mediafile/mediafile-slide.module.ts index 9ad94d5a5..023bb26c1 100644 --- a/client/src/app/slides/mediafiles/mediafile/mediafile-slide.module.ts +++ b/client/src/app/slides/mediafiles/mediafile/mediafile-slide.module.ts @@ -1,11 +1,11 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { PdfViewerModule } from 'ng2-pdf-viewer'; -import { MediafileSlideComponent } from './mediafile-slide.component'; import { SharedModule } from 'app/shared/shared.module'; import { SLIDE } from 'app/slides/slide-token'; +import { MediafileSlideComponent } from './mediafile-slide.component'; @NgModule({ imports: [CommonModule, SharedModule, PdfViewerModule], diff --git a/client/src/app/slides/motions/base/base-motion-slide.ts b/client/src/app/slides/motions/base/base-motion-slide.ts index fd808d5c9..c3d09479d 100644 --- a/client/src/app/slides/motions/base/base-motion-slide.ts +++ b/client/src/app/slides/motions/base/base-motion-slide.ts @@ -1,8 +1,8 @@ import { TranslateService } from '@ngx-translate/core'; -import { BaseSlideComponent } from 'app/slides/base-slide-component'; import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; import { MotionTitleInformation } from 'app/site/motions/models/view-motion'; +import { BaseSlideComponent } from 'app/slides/base-slide-component'; /** * Format for referenced motions: A mapping of motion ids to their title information. diff --git a/client/src/app/slides/motions/motion-block/motion-block-slide.component.spec.ts b/client/src/app/slides/motions/motion-block/motion-block-slide.component.spec.ts index af610ae63..235e1ec95 100644 --- a/client/src/app/slides/motions/motion-block/motion-block-slide.component.spec.ts +++ b/client/src/app/slides/motions/motion-block/motion-block-slide.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MotionBlockSlideComponent } from './motion-block-slide.component'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { MotionBlockSlideComponent } from './motion-block-slide.component'; describe('MotionBlockSlideComponent', () => { let component: MotionBlockSlideComponent; diff --git a/client/src/app/slides/motions/motion-block/motion-block-slide.component.ts b/client/src/app/slides/motions/motion-block/motion-block-slide.component.ts index d42b8dc41..0256ef3b8 100644 --- a/client/src/app/slides/motions/motion-block/motion-block-slide.component.ts +++ b/client/src/app/slides/motions/motion-block/motion-block-slide.component.ts @@ -2,10 +2,10 @@ import { Component, Input } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { MotionBlockSlideData, MotionBlockSlideMotionRepresentation } from './motion-block-slide-data'; +import { SlideData } from 'app/core/core-services/projector-data.service'; import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; import { BaseMotionSlideComponent } from '../base/base-motion-slide'; -import { SlideData } from 'app/core/core-services/projector-data.service'; +import { MotionBlockSlideData, MotionBlockSlideMotionRepresentation } from './motion-block-slide-data'; // Layout: // 1) Long layout: Motion title is shown and the motions are diff --git a/client/src/app/slides/motions/motion/motion-slide-obj-amendment-paragraph.ts b/client/src/app/slides/motions/motion/motion-slide-obj-amendment-paragraph.ts index 46911f77d..fb465e45b 100644 --- a/client/src/app/slides/motions/motion/motion-slide-obj-amendment-paragraph.ts +++ b/client/src/app/slides/motions/motion/motion-slide-obj-amendment-paragraph.ts @@ -1,6 +1,6 @@ +import { LineRange } from 'app/core/ui-services/diff.service'; import { ViewUnifiedChange, ViewUnifiedChangeType } from 'app/shared/models/motions/view-unified-change'; import { MotionSlideDataAmendment } from './motion-slide-data'; -import { LineRange } from 'app/core/ui-services/diff.service'; /** * This class adds methods to the MotionsMotionSlideDataChangeReco data object diff --git a/client/src/app/slides/motions/motion/motion-slide.component.spec.ts b/client/src/app/slides/motions/motion/motion-slide.component.spec.ts index 55ee887fa..3c0095e7c 100644 --- a/client/src/app/slides/motions/motion/motion-slide.component.spec.ts +++ b/client/src/app/slides/motions/motion/motion-slide.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MotionSlideComponent } from './motion-slide.component'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { MotionSlideComponent } from './motion-slide.component'; describe('MotionsMotionSlideComponent', () => { let component: MotionSlideComponent; diff --git a/client/src/app/slides/motions/motion/motion-slide.component.ts b/client/src/app/slides/motions/motion/motion-slide.component.ts index 18883fdab..c5b55bfca 100644 --- a/client/src/app/slides/motions/motion/motion-slide.component.ts +++ b/client/src/app/slides/motions/motion/motion-slide.component.ts @@ -3,18 +3,18 @@ import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { MotionSlideData, MotionSlideDataAmendment } from './motion-slide-data'; -import { ChangeRecoMode, LineNumberingMode, MotionTitleInformation } from 'app/site/motions/models/view-motion'; +import { SlideData } from 'app/core/core-services/projector-data.service'; +import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service'; +import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; import { DiffLinesInParagraph, DiffService, LineRange } from 'app/core/ui-services/diff.service'; import { LinenumberingService } from 'app/core/ui-services/linenumbering.service'; import { ViewUnifiedChange } from 'app/shared/models/motions/view-unified-change'; -import { MotionSlideObjChangeReco } from './motion-slide-obj-change-reco'; -import { SlideData } from 'app/core/core-services/projector-data.service'; -import { MotionSlideObjAmendmentParagraph } from './motion-slide-obj-amendment-paragraph'; -import { BaseMotionSlideComponent } from '../base/base-motion-slide'; -import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; -import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service'; +import { ChangeRecoMode, LineNumberingMode, MotionTitleInformation } from 'app/site/motions/models/view-motion'; import { IBaseScaleScrollSlideComponent } from 'app/slides/base-scale-scroll-slide-component'; +import { BaseMotionSlideComponent } from '../base/base-motion-slide'; +import { MotionSlideData, MotionSlideDataAmendment } from './motion-slide-data'; +import { MotionSlideObjAmendmentParagraph } from './motion-slide-obj-amendment-paragraph'; +import { MotionSlideObjChangeReco } from './motion-slide-obj-change-reco'; @Component({ selector: 'os-motion-slide', diff --git a/client/src/app/slides/motions/motion/motion-slide.module.ts b/client/src/app/slides/motions/motion/motion-slide.module.ts index 16c3eba4d..a754fb366 100644 --- a/client/src/app/slides/motions/motion/motion-slide.module.ts +++ b/client/src/app/slides/motions/motion/motion-slide.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; -import { MotionSlideComponent } from './motion-slide.component'; import { makeSlideModule } from 'app/slides/base-slide-module'; +import { MotionSlideComponent } from './motion-slide.component'; @NgModule(makeSlideModule(MotionSlideComponent)) export class MotionSlideModule {} diff --git a/client/src/app/slides/services/slide-manager.service.ts b/client/src/app/slides/services/slide-manager.service.ts index 861e223e7..ae977b025 100644 --- a/client/src/app/slides/services/slide-manager.service.ts +++ b/client/src/app/slides/services/slide-manager.service.ts @@ -1,11 +1,11 @@ -import { Injectable, Inject, Injector, NgModuleFactoryLoader, ComponentFactory, Type } from '@angular/core'; +import { ComponentFactory, Inject, Injectable, Injector, NgModuleFactoryLoader, Type } from '@angular/core'; -import { SlideManifest, SlideDynamicConfiguration, Slide } from '../slide-manifest'; -import { SLIDE } from '../slide-token'; -import { SLIDE_MANIFESTS } from '../slide-manifest'; -import { BaseSlideComponent } from '../base-slide-component'; -import { ProjectorElement, IdentifiableProjectorElement } from 'app/shared/models/core/projector'; import { allSlidesDynamicConfiguration } from '../all-slide-configurations'; +import { IdentifiableProjectorElement, ProjectorElement } from 'app/shared/models/core/projector'; +import { BaseSlideComponent } from '../base-slide-component'; +import { Slide, SlideDynamicConfiguration, SlideManifest } from '../slide-manifest'; +import { SLIDE_MANIFESTS } from '../slide-manifest'; +import { SLIDE } from '../slide-token'; /** * Cares about loading slides dynamically. diff --git a/client/src/app/slides/slide-manifest.ts b/client/src/app/slides/slide-manifest.ts index b09577293..7ee9ae0bf 100644 --- a/client/src/app/slides/slide-manifest.ts +++ b/client/src/app/slides/slide-manifest.ts @@ -1,7 +1,9 @@ import { InjectionToken } from '@angular/core'; -import { IdentifiableProjectorElement, ProjectorElement } from 'app/shared/models/core/projector'; + import { TranslateService } from '@ngx-translate/core'; + import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service'; +import { IdentifiableProjectorElement, ProjectorElement } from 'app/shared/models/core/projector'; type BooleanOrFunction = boolean | ((element: ProjectorElement) => boolean); diff --git a/client/src/app/slides/slides.module.ts b/client/src/app/slides/slides.module.ts index 23933c44f..2129e13c7 100644 --- a/client/src/app/slides/slides.module.ts +++ b/client/src/app/slides/slides.module.ts @@ -1,10 +1,10 @@ -import { NgModule, NgModuleFactoryLoader, SystemJsNgModuleLoader } from '@angular/core'; import { ModuleWithProviders } from '@angular/compiler/src/core'; +import { NgModule, NgModuleFactoryLoader, SystemJsNgModuleLoader } from '@angular/core'; import { ROUTES } from '@angular/router'; +import { allSlides } from './all-slides'; import { SlideManager } from './services/slide-manager.service'; import { SLIDE_MANIFESTS } from './slide-manifest'; -import { allSlides } from './all-slides'; /** * This module takes care about all slides and dynamic loading of them. diff --git a/client/src/app/slides/topics/topic/topic-slide.component.spec.ts b/client/src/app/slides/topics/topic/topic-slide.component.spec.ts index 4cec18a57..477f4b67c 100644 --- a/client/src/app/slides/topics/topic/topic-slide.component.spec.ts +++ b/client/src/app/slides/topics/topic/topic-slide.component.spec.ts @@ -1,8 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TopicSlideComponent } from './topic-slide.component'; import { E2EImportsModule } from 'e2e-imports.module'; +import { TopicSlideComponent } from './topic-slide.component'; + describe('TopicSlideComponent', () => { let component: TopicSlideComponent; let fixture: ComponentFixture; diff --git a/client/src/app/slides/topics/topic/topic-slide.component.ts b/client/src/app/slides/topics/topic/topic-slide.component.ts index a232dfd65..6e2279ebe 100644 --- a/client/src/app/slides/topics/topic/topic-slide.component.ts +++ b/client/src/app/slides/topics/topic/topic-slide.component.ts @@ -1,7 +1,8 @@ import { Component } from '@angular/core'; +import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; + import { BaseSlideComponent } from 'app/slides/base-slide-component'; import { TopicSlideData } from './topic-slide-data'; -import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; @Component({ selector: 'os-topic-slide', diff --git a/client/src/app/slides/users/user/user-slide.component.spec.ts b/client/src/app/slides/users/user/user-slide.component.spec.ts index e5806c5ba..b6b894147 100644 --- a/client/src/app/slides/users/user/user-slide.component.spec.ts +++ b/client/src/app/slides/users/user/user-slide.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { UserSlideComponent } from './user-slide.component'; import { E2EImportsModule } from '../../../../e2e-imports.module'; +import { UserSlideComponent } from './user-slide.component'; describe('UserSlideComponent', () => { let component: UserSlideComponent; diff --git a/client/src/app/slides/users/user/user-slide.component.ts b/client/src/app/slides/users/user/user-slide.component.ts index cae620560..85d52aaec 100644 --- a/client/src/app/slides/users/user/user-slide.component.ts +++ b/client/src/app/slides/users/user/user-slide.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; + import { BaseSlideComponent } from 'app/slides/base-slide-component'; import { UserSlideData } from './user-slide-data'; diff --git a/client/src/e2e-imports.module.ts b/client/src/e2e-imports.module.ts index 8e55077ed..36e27edb7 100644 --- a/client/src/e2e-imports.module.ts +++ b/client/src/e2e-imports.module.ts @@ -1,12 +1,13 @@ -import { NgModule } from '@angular/core'; import { APP_BASE_HREF, CommonModule } from '@angular/common'; import { HttpClientModule } from '@angular/common/http'; -import { SharedModule } from 'app/shared/shared.module'; -import { AppModule } from 'app/app.module'; -import { AppRoutingModule } from 'app/app-routing.module'; -import { LoginModule } from 'app/site/login/login.module'; +import { NgModule } from '@angular/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + +import { AppRoutingModule } from 'app/app-routing.module'; +import { AppModule } from 'app/app.module'; import { OpenSlidesTranslateModule } from 'app/core/translate/openslides-translate-module'; +import { SharedModule } from 'app/shared/shared.module'; +import { LoginModule } from 'app/site/login/login.module'; /** * Share Module for all "dumb" components and pipes. diff --git a/client/src/test.ts b/client/src/test.ts index da9049dc6..bd5e2db80 100644 --- a/client/src/test.ts +++ b/client/src/test.ts @@ -1,5 +1,4 @@ // This file is required by karma.conf.js and loads recursively all the .spec and framework files - import 'zone.js/dist/zone-testing'; import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; diff --git a/client/tslint.json b/client/tslint.json index 7b35ad80b..3d6d3ebc7 100644 --- a/client/tslint.json +++ b/client/tslint.json @@ -1,7 +1,16 @@ { "rulesDirectory": ["node_modules/codelyzer"], + "linterOptions": { + "exclude": [ + "src/polyfills.ts", + "src/test.ts", + "src/app/shared/shared.module.ts" + ] + }, "rules": { + "array-type": [true, "array"], "arrow-return-shorthand": true, + "arrow-parens": false, "callable-types": true, "class-name": true, "deprecation": { @@ -9,6 +18,7 @@ }, "forin": true, "import-blacklist": [true, "rxjs/Rx"], + "interface-name": false, "interface-over-type-literal": true, "label-position": true, "member-access": false, @@ -21,6 +31,7 @@ "no-arg": true, "no-bitwise": true, "no-console": [true, "table", "clear", "count", "countReset", "info", "time", "timeEnd", "timeline", "timelineEnd", "trace"], + "no-consecutive-blank-lines": false, "no-construct": true, "no-debugger": true, "no-duplicate-super": true, @@ -38,7 +49,28 @@ "no-unused-expression": true, "no-use-before-declare": true, "no-var-keyword": true, + "object-literal-key-quotes": [true, "as-needed"], "object-literal-sort-keys": false, + "ordered-imports": [true, { + "import-source-order": "case-sensitive", + "grouped-imports": true, + "groups": [{ + "name": "angular", + "match": "^@angular", + "order": 10 + },{ + "name": "internal dependencies", + "match": "^(app/|\\.?\\./).*", + "order": 30 + },{ + "name": "external dependencies", + "_match": "^(?!(app/|\\.?\\./)).*", + "match": ".*", + "order": 20 + }], + "named-imports-order": "case-insensitive", + "module-source-path": "basename" + }], "prefer-const": true, "radix": true, "triple-equals": [true, "allow-null-check"],