Merge pull request #4880 from FinnStutzenstein/tslint

New linting rules and ordering of imports

.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"

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",

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

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;

client/src/app/app.component.ts

@@ -1,23 +1,23 @@
-import { Component, ApplicationRef } from '@angular/core';
+import { ApplicationRef, Component } from '@angular/core';
-import { TranslateService } from '@ngx-translate/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 { PrioritizeService } from './core/core-services/prioritize.service';
-import { Router } from '@angular/router';
-import { ViewUser } from './site/users/models/view-user';
 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<T> {
-        flatMap(o: any): Array<any>;
+        flatMap(o: any): any[];
     }
 }
 

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 { ServiceWorkerModule } from '@angular/service-worker';
-import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http';
+
 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.

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;

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';
 

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 { AgendaAppConfig } from '../../site/agenda/agenda.config';
-import { CommonAppConfig } from '../../site/common/common.config';
+import { AppConfig, ModelEntry, SearchableModelEntry } from '../app-config';
-import { AppConfig, SearchableModelEntry, ModelEntry } 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 { OnAfterAppsLoaded } from '../onAfterAppsLoaded';
-import { AgendaAppConfig } from '../../site/agenda/agenda.config';
+import { plugins } from '../../../plugins';
-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 { SearchService } from '../ui-services/search.service';
 import { isSearchable } from '../../site/base/searchable';
-import { ProjectorAppConfig } from 'app/site/projector/projector.config';
+import { TagAppConfig } from '../../site/tags/tag.config';
-import { BaseRepository } from 'app/core/repositories/base-repository';
+import { UsersAppConfig } from '../../site/users/users.config';
-import { OnAfterAppsLoaded } from '../onAfterAppsLoaded';
-import { ServicesToLoadOnAppsLoaded } from '../core.module';
-import { TopicsAppConfig } from 'app/site/topics/topics.config';
 
 /**
  * A list of all app configurations of all delivered apps.

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.

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';

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

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';

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 {
     /**

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(() => {

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.

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';

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.
  */

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';

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(() => {

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';

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.

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

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';
 

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(() => {

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.

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(() => {

client/src/app/core/core-services/offline.service.ts

@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+
 import { WebsocketService } from './websocket.service';
 
 /**

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', () => {

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(() => {

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.

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(() => {

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 { ViewUser } from 'app/site/users/models/view-user';
-import { environment } from 'environments/environment';
+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

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';

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;

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(() => {

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[];

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';
 

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 { Projector, ProjectorElement } from 'app/shared/models/core/projector';
-import { auditTime } from 'rxjs/operators';
 
 export interface SlideData<T = { error?: string }, P extends ProjectorElement = ProjectorElement> {
     data: T;

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', () => {

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,
+    elementIdentifies,
-    ProjectorElementBuildDeskriptor,
+    IdentifiableProjectorElement,
-    isProjectable,
-    isProjectorElementBuildDeskriptor
-} from 'app/site/base/projectable';
-import { DataStoreService } from './data-store.service';
-import {
     Projector,
     ProjectorElement,
-    ProjectorElements,
+    ProjectorElements
-    IdentifiableProjectorElement,
-    elementIdentifies
 } 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

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(() =>

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';

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

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(() => {

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({

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.

client/src/app/core/core-services/view-model-store.service.spec.ts

@@ -1,6 +1,7 @@
-import { TestBed, inject } from '@angular/core/testing';
+import { inject, TestBed } from '@angular/core/testing';
-import { ViewModelStoreService } from './view-model-store.service';
+
 import { E2EImportsModule } from '../../../e2e-imports.module';
+import { ViewModelStoreService } from './view-model-store.service';
 
 describe('ViewModelStoreService', () => {
     beforeEach(() => {

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.

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(() => {

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.

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 { ChoiceDialogComponent } from '../shared/components/choice-dialog/choice-dialog.component';
-import { OperatorService } from './core-services/operator.service';
 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<OnAfterAppsLoaded>[] = [OperatorService];
 

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(() => {

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)[] = [
     {

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', () => {

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 { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile';
-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 { 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)[] = [
     {

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] }));
 

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 { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service';
-import { ViewAssignmentPollOption } from 'app/site/assignments/models/view-assignment-poll-option';
+import { DataStoreService } from '../../core-services/data-store.service';
 
 const AssignmentRelations: RelationDefinition[] = [
     {

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 { BaseViewModelWithContentObject } from 'app/site/base/base-view-model-with-content-object';
-import { DataSendService } from '../core-services/data-send.service';
+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

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 { BaseModel, ModelConstructor } from 'app/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 { 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

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

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 { TitleInformation } from '../../site/base/base-view-model';
-import { DataSendService } from '../core-services/data-send.service';
 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

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<VForeign extends BaseViewModel = BaseViewModel> =

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(() => {

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 { CollectionStringMapperService } from 'app/core/core-services/collection-string-mapper.service';
-import { Config } from 'app/shared/models/core/config';
+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.

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] }));
 

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 { BehaviorSubject, Observable } from 'rxjs';
-import { Observable, BehaviorSubject } 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[] = [
     {

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';

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[] = [
     {

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';

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 { BaseRepository } from '../base-repository';
-import { CollectionStringMapperService } from 'app/core/core-services/collection-string-mapper.service';
+import { DiffService, LineRange, ModificationType } from '../../ui-services/diff.service';
-import { ViewModelStoreService } from 'app/core/core-services/view-model-store.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

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({

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 { MotionBlockTitleInformation, ViewMotionBlock } from 'app/site/motions/models/view-motion-block';
-import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 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

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(() => {

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[] = [
     {

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(() => {

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 { PersonalNoteContent } from 'app/shared/models/users/personal-note';
-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 { 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 { ViewUser } from 'app/site/users/models/view-user';
-import { PersonalNoteContent } from 'app/shared/models/users/personal-note';
 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 { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service';
-import { ViewSubmitter } from 'app/site/motions/models/view-submitter';
+import { DataSendService } from '../../core-services/data-send.service';
+import { LinenumberingService, LineNumberRange } from '../../ui-services/linenumbering.service';
 
 type SortProperty = 'weight' | 'identifier';
 

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';

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[] = [
     {

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', () => {

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

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(() => {

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 { DataSendService } from '../../core-services/data-send.service';
-import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
+import { DataStoreService } from '../../core-services/data-store.service';
-import { ViewState } from 'app/site/motions/models/view-state';
 
 const WorkflowRelations: RelationDefinition[] = [
     {

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', () => {

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 { ServertimeService } from 'app/core/core-services/servertime.service';
-import { DataStoreService } from '../../core-services/data-store.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 { DataSendService } from '../../core-services/data-send.service';
-import { Countdown } from 'app/shared/models/core/countdown';
+import { DataStoreService } from '../../core-services/data-store.service';
-import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
-import { ServertimeService } from 'app/core/core-services/servertime.service';
 
 @Injectable({
     providedIn: 'root'

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';

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.

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', () => {

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 { DataSendService } from 'app/core/core-services/data-send.service';
-import { BaseRepository } from '../base-repository';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
-import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.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 { BaseRepository } from '../base-repository';
-import { DataSendService } from 'app/core/core-services/data-send.service';
+import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service';
+import { DataStoreService } from '../../core-services/data-store.service';
 
 @Injectable({
     providedIn: 'root'

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(() =>

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.

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(() => {

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 { TagTitleInformation, ViewTag } from 'app/site/tags/models/view-tag';
-import { DataSendService } from '../../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 { DataSendService } from '../../core-services/data-send.service';
+import { DataStoreService } from '../../core-services/data-store.service';
 
 /**
  * Repository Services for Tags

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(() =>

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 { DataStoreService } from 'app/core/core-services/data-store.service';
-import { ViewTopic, TopicTitleInformation } from 'app/site/topics/models/view-topic';
 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';
 

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(() =>

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

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';

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 { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
-import { BaseRepository } from '../base-repository';
-import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.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 { PersonalNoteTitleInformation, ViewPersonalNote } from 'app/site/users/models/view-personal-note';
-import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
+import { BaseRepository } from '../base-repository';
+import { CollectionStringMapperService } from '../../core-services/collection-string-mapper.service';
+import { DataStoreService } from '../../core-services/data-store.service';
 
 /**
  */

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(() => {