Reorder the user imports fields

client/src/app/domain/models/users/user.constants.ts

@@ -0,0 +1,18 @@
+import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+
+import { User } from './user';
+
+export const userHeadersAndVerboseNames: { [key in keyof User]?: any } = {
+    title: _(`Title`),
+    first_name: _(`Given name`),
+    last_name: _(`Surname`),
+    email: _(`Email`),
+    member_number: _(`Member number`),
+    pronoun: _(`Pronoun`),
+    gender: _(`Gender`),
+    username: _(`Username`),
+    default_password: _(`Initial password`),
+    is_active: _(`Active`),
+    is_physical_person: _(`Natural person`),
+    saml_id: _(`SSO identification`)
+};

client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.spec.ts

@@ -114,7 +114,7 @@ describe(`CsvExportForBackendService`, () => {
 
     it(`test dummy export method with default settings`, () => {
         service.dummyCSVExport(
-            { proper: `Fancy`, tea: `Tea`, strength: `Muscle` },
+            Object.keys({ proper: `Fancy`, tea: `Tea`, strength: `Muscle` }),
             toDummyExport,
             `dummyAssortmentOfTeas`
         );

client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts

@@ -101,14 +101,15 @@ export class CsvExportForBackendService {
         }
     }
 
-    public dummyCSVExport<I>(headerAndVerboseNames: { [key in keyof I]: any }, rows: I[], filename: string): void {
+    public dummyCSVExport<I>(headers: string[], rows: I[], filename: string): void {
         const separator = DEFAULT_COLUMN_SEPARATOR;
         const encoding: `utf-8` | `iso-8859-15` = DEFAULT_ENCODING as any;
-        const headerRow = [Object.keys(headerAndVerboseNames).join(separator)];
+        const headerRow = [headers.join(separator)];
+
         const content = rows.map(row =>
-            Object.keys(headerAndVerboseNames)
+            headers
                 .map(key => {
-                    let value = row[key as keyof I] || ``;
+                    let value = row[key] || ``;
                     if (typeof value === `number`) {
                         value = value.toString(10);
                     } else if (typeof value === `boolean`) {

client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-export.service/topic-export.service.ts

@@ -27,7 +27,7 @@ export class TopicExportService {
         ];
 
         this.csvExportService.dummyCSVExport<TopicExport>(
-            topicHeadersAndVerboseNames,
+            Object.keys(topicHeadersAndVerboseNames),
             rows,
             `${this.translate.instant(`Agenda`)}-${this.translate.instant(`example`)}.csv`
         );

client/src/app/site/pages/meetings/pages/participants/export/participant-csv-export.service/participant-csv-export.service.ts

@@ -5,7 +5,10 @@ import { CsvColumnDefinitionProperty, CsvColumnsDefinition } from 'src/app/gatew
 import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
 
 import { MeetingCsvExportForBackendService } from '../../../../services/export/meeting-csv-export-for-backend.service';
-import { participantHeadersAndVerboseNames } from '../../pages/participant-import/definitions';
+import {
+    participantColumnsWeight,
+    participantHeadersAndVerboseNames
+} from '../../pages/participant-import/definitions';
 import { ParticipantExportModule } from '../participant-export.module';
 import { participantsExportExample } from '../participants-export-example';
 
@@ -40,12 +43,16 @@ export class ParticipantCsvExportService {
     //     ]
     // ]);
 
+    public columns = Object.keys(participantHeadersAndVerboseNames).sort(
+        (a, b) => participantColumnsWeight[a] - participantColumnsWeight[b]
+    );
+
     public constructor(private csvExport: MeetingCsvExportForBackendService, private translate: TranslateService) {}
 
     public export(participants: ViewUser[]): void {
         this.csvExport.export(
             participants,
-            Object.keys(participantHeadersAndVerboseNames).map(key => {
+            this.columns.map(key => {
                 return {
                     property: key
                 } as CsvColumnDefinitionProperty<ViewUser>;
@@ -57,7 +64,7 @@ export class ParticipantCsvExportService {
     public exportCsvExample(): void {
         const rows: UserExport[] = participantsExportExample;
         this.csvExport.dummyCSVExport<UserExport>(
-            participantHeadersAndVerboseNames,
+            this.columns,
             rows,
             `${this.translate.instant(`participants-example`)}.csv`
         );

client/src/app/site/pages/meetings/pages/participants/pages/participant-import/components/participant-import-list/participant-import-list.component.ts

@@ -3,7 +3,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { BaseViaBackendImportListMeetingComponent } from 'src/app/site/base/base-via-backend-import-list-meeting.component';
 import { ImportListHeaderDefinition } from 'src/app/ui/modules/import-list';
 
-import { participantHeadersAndVerboseNames } from '../../definitions';
+import { participantColumnsWeight, participantHeadersAndVerboseNames } from '../../definitions';
 import { ParticipantImportService } from '../../services';
 
 @Component({
@@ -12,9 +12,11 @@ import { ParticipantImportService } from '../../services';
     styleUrls: [`./participant-import-list.component.scss`]
 })
 export class ParticipantImportListComponent extends BaseViaBackendImportListMeetingComponent {
-    public possibleFields = Object.keys(participantHeadersAndVerboseNames);
+    public possibleFields = Object.keys(participantHeadersAndVerboseNames).sort(
+        (a, b) => participantColumnsWeight[a] - participantColumnsWeight[b]
+    );
 
-    public columns: ImportListHeaderDefinition[] = Object.keys(participantHeadersAndVerboseNames).map(header => ({
+    public columns: ImportListHeaderDefinition[] = this.possibleFields.map(header => ({
         property: header,
         label: (<any>participantHeadersAndVerboseNames)[header],
         isTableColumn: true

client/src/app/site/pages/meetings/pages/participants/pages/participant-import/definitions/index.ts

@@ -1,23 +1,33 @@
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { userHeadersAndVerboseNames } from 'src/app/domain/models/users/user.constants';
 import { GeneralUser } from 'src/app/gateways/repositories/users';
 
 export const participantHeadersAndVerboseNames: { [key in keyof GeneralUser]?: any } = {
-    title: _(`Title`),
-    first_name: _(`Given name`),
-    last_name: _(`Surname`),
-    email: _(`Email`),
-    member_number: _(`Member number`),
+    ...userHeadersAndVerboseNames,
     structure_level: `Structure levels`,
     groups: `Groups`,
     number: `Participant number`,
     vote_weight: `Vote weight`,
-    gender: _(`Gender`),
-    pronoun: _(`Pronoun`),
-    username: _(`Username`),
-    default_password: _(`Initial password`),
-    is_active: _(`Active`),
-    is_physical_person: _(`Natural person`),
     is_present: `Is present`,
-    saml_id: _(`SSO identification`),
     comment: `Comment`
 };
+
+export const participantColumnsWeight: { [key in keyof GeneralUser]?: any } = {
+    title: 1,
+    first_name: 2,
+    last_name: 3,
+    email: 4,
+    member_number: 5,
+    structure_level: 6,
+    groups: 7,
+    number: 8,
+    vote_weight: 9,
+    gender: 10,
+    pronoun: 11,
+    username: 12,
+    default_password: 13,
+    is_active: 14,
+    is_physical_person: 15,
+    is_present: 16,
+    saml_id: 17,
+    comment: 18
+};

client/src/app/site/pages/organization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.ts

@@ -5,7 +5,7 @@ import { BaseViaBackendImportListComponent } from 'src/app/site/base/base-via-ba
 import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service';
 import { ImportListHeaderDefinition } from 'src/app/ui/modules/import-list';
 
-import { accountHeadersAndVerboseNames } from '../../definitions';
+import { accountColumnsWeight, accountHeadersAndVerboseNames } from '../../definitions';
 import { AccountImportService } from '../../services/account-import.service/account-import.service';
 
 @Component({
@@ -14,9 +14,11 @@ import { AccountImportService } from '../../services/account-import.service/acco
     styleUrls: [`./account-import-list.component.scss`]
 })
 export class AccountImportListComponent extends BaseViaBackendImportListComponent {
-    public possibleFields = Object.keys(accountHeadersAndVerboseNames);
+    public possibleFields = Object.keys(accountHeadersAndVerboseNames).sort(
+        (a, b) => accountColumnsWeight[a] - accountColumnsWeight[b]
+    );
 
-    public columns: ImportListHeaderDefinition[] = Object.keys(accountHeadersAndVerboseNames).map(header => ({
+    public columns: ImportListHeaderDefinition[] = this.possibleFields.map(header => ({
         property: header,
         label: (<any>accountHeadersAndVerboseNames)[header],
         isTableColumn: true,

client/src/app/site/pages/organization/pages/accounts/pages/account-import/definitions/index.ts

@@ -1,18 +1,24 @@
 import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
 import { User } from 'src/app/domain/models/users/user';
+import { userHeadersAndVerboseNames } from 'src/app/domain/models/users/user.constants';
 
 export const accountHeadersAndVerboseNames: { [key in keyof User]?: any } = {
-    title: _(`Title`),
-    first_name: _(`Given name`),
-    last_name: _(`Surname`),
-    email: _(`Email`),
-    member_number: _(`Member number`),
-    default_vote_weight: _(`Vote weight`),
-    gender: _(`Gender`),
-    pronoun: _(`Pronoun`),
-    username: _(`Username`),
-    default_password: _(`Initial password`),
-    is_active: _(`Active`),
-    is_physical_person: _(`Natural person`),
-    saml_id: _(`SSO identification`)
+    ...userHeadersAndVerboseNames,
+    default_vote_weight: _(`Vote weight`)
+};
+
+export const accountColumnsWeight: { [key in keyof User]?: any } = {
+    title: 1,
+    first_name: 2,
+    last_name: 3,
+    email: 4,
+    member_number: 5,
+    default_vote_weight: 6,
+    gender: 7,
+    pronoun: 8,
+    username: 9,
+    default_password: 10,
+    is_active: 11,
+    is_physical_person: 12,
+    saml_id: 13
 };

client/src/app/site/pages/organization/pages/accounts/services/account-export.service/account-export.service.ts

@@ -5,18 +5,22 @@ import { CsvExportForBackendService } from 'src/app/gateways/export/csv-export.s
 import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
 
 import { AccountCsvExportExample } from '../../export/csv-export-example';
-import { accountHeadersAndVerboseNames } from '../../pages/account-import/definitions';
+import { accountColumnsWeight, accountHeadersAndVerboseNames } from '../../pages/account-import/definitions';
 import { AccountExportServiceModule } from '../account-export-service.module';
 
 @Injectable({
     providedIn: AccountExportServiceModule
 })
 export class AccountExportService {
+    public columns = Object.keys(accountHeadersAndVerboseNames).sort(
+        (a, b) => accountColumnsWeight[a] - accountColumnsWeight[b]
+    );
+
     public constructor(private csvExportService: CsvExportForBackendService, private translate: TranslateService) {}
 
     public downloadCsvImportExample(): void {
         this.csvExportService.dummyCSVExport<UserExport>(
-            accountHeadersAndVerboseNames,
+            this.columns,
             AccountCsvExportExample,
             `${this.translate.instant(`account-example`)}.csv`
         );
@@ -25,7 +29,7 @@ export class AccountExportService {
     public downloadAccountCsvFile(dataSource: ViewUser[]): void {
         this.csvExportService.export(
             dataSource,
-            Object.keys(accountHeadersAndVerboseNames).map(key => ({
+            this.columns.map(key => ({
                 property: key as keyof ViewUser
             })),
             `${this.translate.instant(`Accounts`)}.csv`

client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.ts

@@ -38,7 +38,7 @@ export class CommitteeImportService extends BaseBackendImportService {
 
     public downloadCsvExample(): void {
         this.exporter.dummyCSVExport(
-            committeeHeadersAndVerboseNames,
+            Object.keys(committeeHeadersAndVerboseNames),
             COMMITTEE_CSV_EXPORT_EXAMPLE,
             `${this.translate.instant(`committee-example`)}.csv`
         );