pull made

src/app/home/home.page.html

@@ -21,7 +21,7 @@
         <ion-label style="margin-bottom: 2px;" class="overflow-visible font-12-em">Agenda</ion-label>
       </ion-tab-button>
 
-      <ion-tab-button *ngIf="p.userPermission([permissionList.Gabinete.access])" (click)="goto('/home/gabinete-digital')" [class.active]="ActiveTabService.pages.gabinete">
+      <ion-tab-button *ngIf="p.userPermission([permissionList.Gabinete.access])" (click)="goto('/home/gabinete-digital')" class="cypress-gabinete-tab" [class.active]="ActiveTabService.pages.gabinete">
         <!-- <ion-icon name="file-tray-stacked"></ion-icon> -->
         <ion-icon *ngIf="!ActiveTabService.pages.gabinete" class="nav-icon font-30-em" src="assets/images/icons-nav-gabinete-inactive.svg"></ion-icon>
         <ion-icon *ngIf="ActiveTabService.pages.gabinete" class="nav-icon font-30-em" src="assets/images/nav-hover/icons-nav-gabinete-active.svg"></ion-icon>

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -591,7 +591,7 @@
             <!-- List -->
             <div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])"
               [class.active]="selectedElement == 'Dispatches'"
-              class="box-hover exp-card d-flex flex-column justify-center"
+              class="box-hover exp-card d-flex flex-column justify-center cypress-despacho-item"
               (click)="openDespachosPage(); selectedElement='Dispatches'">
               <div class="d-flex justify-center">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' "

src/app/pages/login/login.page.html

@@ -20,11 +20,11 @@
       <form class="form">
         <p class="form-label">Email</p>
         <ion-item class="form-input">
-          <ion-input type="text" [(ngModel)]="username" name="input-username"></ion-input>
+          <ion-input class="cy-email" type="text" [(ngModel)]="username" name="input-username"></ion-input>
         </ion-item>
         <p class="form-label">Palavra-passe</p>
         <ion-item class="form-input">
-          <ion-input (keyup.enter)="Login()" [type]="showPassword ? 'text' : 'password' " [(ngModel)]="password" name="input-password" ></ion-input>
+          <ion-input class="cy-password" (keyup.enter)="Login()" [type]="showPassword ? 'text' : 'password' " [(ngModel)]="password" name="input-password" ></ion-input>
           <div (click)="togglePassword()">
             <ion-icon slot="end" [name]="passwordIcon" ></ion-icon>
           </div>

src/app/pages/search/search.page.ts

@@ -111,12 +111,12 @@ export class SearchPage implements OnInit {
 
       if(this.type == null || this.type == undefined) {
 
-        if(this.currentPath  == '/home/agenda') {
+        if(this.currentPath.includes('/home/agenda')) {
           this.type = "Agenda"
-        } else if (this.currentPath  =='/home/gabinete-digital') {
+        } else if (this.currentPath.includes('/home/gabinete-digital')) {
           this.type = "AccoesPresidenciais & ArquivoDespachoElect"
 
-        } else if (this.currentPath  == '/home/publications') {
+        } else if (this.currentPath.includes('/home/publications')) {
           this.type = "AccoesPresidenciais"
         } else {
           
@@ -461,7 +461,7 @@ export class SearchPage implements OnInit {
       } else {
         let counter = 0;
 
-        this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
+        this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
           ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res => {
           res.Categories.forEach( e => {
             e['Active'] = false;
@@ -594,7 +594,7 @@ export class SearchPage implements OnInit {
       } else {
         let counter = 0;
 
-        this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
+        this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
           ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
 
           res.Categories.forEach( e => {
@@ -645,54 +645,50 @@ export class SearchPage implements OnInit {
       this.searchCategories = []
       this.searchDocuments = []
 
-      this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
+      // this.search.basicSearchPublication(this.searchSubject, searchDocumentDate, this.searchSender
-        ,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res=>{
+      //   ,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res=>{
         
 
-        res.Categories.forEach( e => {
+      //   res.Categories.forEach( e => {
-          e['Active'] = false;
+      //     e['Active'] = false;
-          if(!environment.presidential) {
+      //     e['Name'] = "Publicações"
-            e['Name'] = "Publicações"
+      //   });
-          }
-        });
 
-        // bind respose
+      //   // bind respose
-        for ( const a of res.Categories) {
+      //   for ( const a of res.Categories) {
-          this.searchCategories.push(a);
+      //     this.searchCategories.push(a);
-        }
+      //   }
 
-        for ( const a of this.sortArrayISODate(res.Documents)) {
+      //   for ( const a of this.sortArrayISODate(res.Documents)) {
-          if(!environment.presidential) {
+      //     a.DocTypeDesc = "Publicações"
-            a.DocTypeDesc = "Publicações"
+      //     this.searchDocuments.push(a);
-          }
+      //   }
-          this.searchDocuments.push(a);
-        }
 
-        this.reorderList(this.ordinance);
+      //   this.reorderList(this.ordinance);
 
-        // hide show document
+      //   // hide show document
-        if(this.searchDocuments.length >= 1){
+      //   if(this.searchDocuments.length >= 1){
-          this.showDocuments = true;
+      //     this.showDocuments = true;
-        } else {
+      //   } else {
-          this.showDocuments = false
+      //     this.showDocuments = false
-        }
+      //   }
 
-        counter++;
+      //   counter++;
 
-        if(counter ==2){
+      //   if(counter ==2){
-          this.showLoader = false;
+      //     this.showLoader = false;
-        }
+      //   }
           
-        this.loadWordCloud();
+      //   this.loadWordCloud();
-      }, error => {
+      // }, error => {
-        counter++;
+      //   counter++;
 
-        if(counter == 2) {
+      //   if(counter == 2) {
-          this.showLoader = false;
+      //     this.showLoader = false;
-        }
+      //   }
-        this.searchResult = "Registo não encontrado"
+      //   this.searchResult = "Registo não encontrado"
-        console.log(error)
+      //   console.log(error)
-      });
+      // });
 
 
 
@@ -702,9 +698,7 @@ export class SearchPage implements OnInit {
 
         res.Categories.forEach( e => {
           e['Active'] = false;
-          if(!environment.presidential) {
           e['Name'] = "Acções"
-          }
         });
 
         if(!environment.presidential) { 
@@ -717,11 +711,9 @@ export class SearchPage implements OnInit {
         
 
         for ( const a of this.sortArrayISODate(res.Documents)) {
-          if(!environment.presidential) { 
           a.DocTypeDesc = "Acções"
           this.searchDocuments.push(a);
         }
-        }
 
         this.reorderList(this.ordinance);
 
@@ -734,16 +726,13 @@ export class SearchPage implements OnInit {
 
         counter++;
 
-        if(counter ==2) {
         this.showLoader = false;
-        }
         this.loadWordCloud();
       }, error => {
         counter++;
 
-        if(counter ==2) {
         this.showLoader = false;
-        }
+
         this.searchResult = "Registo não encontrado"
         console.log(error)
       });

src/app/shared/gabinete-digital/despachos/despachos.page.html

@@ -39,12 +39,12 @@
       
       
       <div>
-        <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
+        <div class="d-flex cypress-list-order" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
 
           <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/crescente.svg" ></ion-icon>
         </div>
   
-        <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
+        <div class="d-flex cypress-list-order" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
           <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
         </div>
       </div>

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "c96aad213",
+  "shortSHA": "a05918788",
-  "SHA": "c96aad2136d71846600d94c92d4a2f82439a0e3c",
+  "SHA": "a0591878852492c56134ff984c8ce56a75329b28",
   "branch": "developer",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Mon Jul 31 16:58:36 2023 +0100'",
+  "lastCommitTime": "'Thu Aug 3 13:04:58 2023 +0100'",
-  "lastCommitMessage": "pull made and remove time from notification erro",
+  "lastCommitMessage": "duplication of notification solved",
-  "lastCommitNumber": "5133",
+  "lastCommitNumber": "5134",
   "change": "",
-  "changeStatus": "On branch developer\nYour branch is ahead of 'origin/developer' by 8 commits.\n  (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/profile/profile.page.ts\n\tmodified:   src/app/pages/login/login.page.ts\n\tmodified:   src/app/services/notifications.service.ts",
+  "changeStatus": "On branch developer\nYour branch and 'origin/developer' have diverged,\nand have 9 and 2 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/home/home.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/login/login.page.html\n\tmodified:   src/app/pages/search/search.page.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.page.html",
   "changeAuthor": "eudes.inacio"
 }