Merge pull request #83 from uatisdeproblem/development

Development

.vscode/launch.json

@@ -5,7 +5,6 @@
       "type": "node",
       "request": "launch",
       "name": "Start local app",
-      "noDebug": true,
       "console": "integratedTerminal",
       "cwd": "${workspaceRoot}/front-end",
       "runtimeExecutable": "npm",

back-end/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.5",
+  "version": "1.8.6",
   "name": "back-end",
   "scripts": {
     "lint": "eslint --ext .ts",

back-end/src/models/votingSession.model.ts

@@ -141,12 +141,10 @@ export class VotingSession extends Resource {
         e.push('publishedSince');
       if (this.iE(this.ballots)) e.push('ballots');
       if (this.iE(this.voters)) e.push('voters');
-      const votersIds = this.voters.map(x => x.id);
-      const votersNames = this.voters.map(x => x.name);
-      const votersEmails = this.voters.map(x => x.email?.toLowerCase()).filter(x => x);
+      const votersIds = this.voters.map(x => x.id?.trim());
+      const votersNames = this.voters.map(x => x.name?.trim().toLowerCase());
       if (votersIds.length !== new Set(votersIds).size) e.push('voters.duplicatedIds');
       if (votersNames.length !== new Set(votersNames).size) e.push('voters.duplicatedNames');
-      if (votersEmails.length !== new Set(votersEmails).size) e.push('voters.duplicatedEmails');
       if (this.startsAt) {
         const tenMinutes = new Date();
         tenMinutes.setMinutes(tenMinutes.getMinutes() + 10);

back-end/swagger.yaml

@@ -2,7 +2,7 @@ openapi: 3.0.3
 
 info:
   title: ESN Assembly app
-  version: 1.8.5
+  version: 1.8.6
   contact:
     name: Matteo Carbone
     email: [email protected]

front-end/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esn-assembly",
-  "version": "1.8.5",
+  "version": "1.8.6",
   "author": "Matteo Carbone",
   "homepage": "https://matteocarbone.com/",
   "scripts": {

front-end/src/app/tabs/voting/manageSession.page.html

@@ -269,23 +269,38 @@ <h2>{{ 'VOTING.SCRUTINEERS' | translate }}</h2>
               [icon]="hasFieldAnError('voters.duplicatedIds') ? 'close' : 'checkmark'"
               [color]="hasFieldAnError('voters.duplicatedIds') ? 'danger' : 'success'"
             />
-            <ion-label class="ion-text-wrap">{{ 'VOTING.THERE_ARE_NO_DUPLICATE_VOTERS_IDS' | translate }}</ion-label>
+            <ion-label class="ion-text-wrap">
+              {{ 'VOTING.THERE_ARE_NO_DUPLICATE_VOTERS_IDS' | translate }}
+              <p>{{ getVotersDuplicatedIds().join(', ') }}</p>
+            </ion-label>
           </ion-item>
           <ion-item>
             <ion-icon
               slot="start"
               [icon]="hasFieldAnError('voters.duplicatedNames') ? 'close' : 'checkmark'"
               [color]="hasFieldAnError('voters.duplicatedNames') ? 'danger' : 'success'"
             />
-            <ion-label class="ion-text-wrap">{{ 'VOTING.THERE_ARE_NO_DUPLICATE_VOTERS_NAMES' | translate }}</ion-label>
+            <ion-label class="ion-text-wrap">
+              {{ 'VOTING.THERE_ARE_NO_DUPLICATE_VOTERS_NAMES' | translate }}
+              <p>{{ getVotersDuplicatedNames().join(', ') }}</p>
+            </ion-label>
           </ion-item>
           <ion-item>
             <ion-icon
               slot="start"
-              [icon]="hasFieldAnError('voters.duplicatedEmails') ? 'close' : 'checkmark'"
-              [color]="hasFieldAnError('voters.duplicatedEmails') ? 'danger' : 'success'"
+              [icon]="getVotersDuplicatedEmails().length ? 'warning' : 'checkmark'"
+              [color]="getVotersDuplicatedEmails().length ? 'warning' : 'success'"
+            />
+            <ion-label class="ion-text-wrap">
+              {{ 'VOTING.THERE_ARE_NO_DUPLICATE_VOTERS_EMAILS' | translate }}
+              <p>{{ getVotersDuplicatedEmails().join(', ') }}</p>
+            </ion-label>
+            <idea-show-hint-button
+              slot="end"
+              hint="VOTING.DUPLICATED_EMAILS_AVOID_CONFUSION"
+              *ngIf="getVotersDuplicatedEmails().length"
+              translate
             />
-            <ion-label class="ion-text-wrap">{{ 'VOTING.THERE_ARE_NO_DUPLICATE_VOTERS_EMAILS' | translate }}</ion-label>
           </ion-item>
           <ion-item>
             <ion-icon

front-end/src/app/tabs/voting/manageSession.page.ts

@@ -493,6 +493,27 @@ export class ManageVotingSessionPage implements OnDestroy {
   // START
   //
 
+  private getDuplicatesOfList(list: string[], includeEmptyElements = false): string[] {
+    if (!includeEmptyElements) list = list.filter(x => x);
+    const uniqueStack = new Set(list);
+    return Array.from(
+      new Set(
+        list.filter(x => {
+          if (uniqueStack.has(x)) uniqueStack.delete(x);
+          else return true;
+        })
+      )
+    );
+  }
+  getVotersDuplicatedIds(): string[] {
+    return this.getDuplicatesOfList(this.votingSession.voters.map(x => x.id?.trim()));
+  }
+  getVotersDuplicatedNames(): string[] {
+    return this.getDuplicatesOfList(this.votingSession.voters.map(x => x.name?.trim().toLowerCase()));
+  }
+  getVotersDuplicatedEmails(): string[] {
+    return this.getDuplicatesOfList(this.votingSession.voters.map(x => x.email?.trim().toLowerCase()));
+  }
   getNameOfVotersWithoutEmail(): string[] {
     return this.votingSession.voters.filter(x => !x.email).map(x => x.name);
   }

front-end/src/assets/i18n/en.json

@@ -108,7 +108,7 @@
     "LIVE_ON": "Live on",
     "STATUS": "Status",
     "STATUSES": {
-      "DRAFT":"Draft",
+      "DRAFT": "Draft",
       "OPEN": "Open",
       "CLOSED": "Closed"
     },
@@ -773,6 +773,8 @@
     "VOTERS_AUDIT": "Voters audit",
     "ABSENT": "Absent",
     "PARTICIPATION": "Participation",
+    "DUPLICATED_EMAILS_AVOID_CONFUSION": "There are repeated emails",
+    "DUPLICATED_EMAILS_AVOID_CONFUSION_I": "Receiving two or more voting links to the same email addresses may lead to confusion; it's suggested that each voter use a different email address.",
     "THESE_VOTERS_WONT_RECEIVE_VOTING_LINK": "The following voters won't receive a voting link:",
     "NO_VOTING_MEANS_ABSENT": "No vote means absent",
     "NO_VOTING_MEANS_ABSENT_I": "Without voting link, the voters won't be able to vote. That means they will count as absent.",

front-end/src/environments/environment.idea.ts

@@ -10,7 +10,7 @@ const STAGE = 'prod';
  */
 export const environment = {
   idea: {
-    app: { version: '1.8.5', mediaUrl: 'https://'.concat(parameters.mediaDomain), maxFileUploadSizeMB: 50 },
+    app: { version: '1.8.6', mediaUrl: 'https://'.concat(parameters.mediaDomain), maxFileUploadSizeMB: 50 },
     api: { url: parameters.apiDomain, stage: STAGE },
     socket: { url: parameters.webSocketApiDomain, stage: STAGE },
     ionicExtraModules: ['common']