improve

src/app/pages/chat/new-group/new-group.page.ts

@@ -87,7 +87,6 @@ export class NewGroupPage implements OnInit {
 
     this.wsChatMethodsService.subscribeToRoomUpdate(res.result.rid, res.result);
 
-    //this.addGroupMessage.emit(res.result.rid);
   }
 
   async addContacts(room){

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -88,17 +88,17 @@ export class EventListPage implements OnInit {
 
 
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-      this.storage.get('event-to-aproveMD').then((events) => {
+      this.storage.get('event-to-aproveMD').then((events = []) => {
         this.eventsMDGPRList = events
       })
 
-      this.storage.get('event-to-aprovePR').then((events) => {
+      this.storage.get('event-to-aprovePR').then((events = []) => {
         this.eventsPRList = events
       })
     } else {
       this.platform.ready().then(() => {
 
-        this.sqliteservice.getListOfEventAprove('Agenda Oficial MDGPR', 'Agenda Pessoal MDGPR').then((event: any[]) => {
+        this.sqliteservice.getListOfEventAprove('Agenda Oficial MDGPR', 'Agenda Pessoal MDGPR').then((event: any[] = []) => {
 
           this.eventsMDGPRList = this.sortService.sortDate(this.transformaDataDB(event), 'taskStartDate')
           //this.eventsMDGPRList = this.eventsMDGPRList.filter(element => element.interveners != null)
@@ -161,7 +161,7 @@ export class EventListPage implements OnInit {
         this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
         this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate')
         this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
-        this.eventsMDGPRList = this.eventsMDGPRList.filter(function(item) {
+        this.eventsMDGPRList = ( this.eventsMDGPRList || []).filter(function(item) {
           return item.activityInstanceName != 'Editar Evento'
       })
         
@@ -176,9 +176,9 @@ export class EventListPage implements OnInit {
         this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
         this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate')
         this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
-        this.eventsPRList = this.eventsPRList.filter(function(item) {
+        this.eventsPRList = (this.eventsPRList || []).filter(function(item) {
           return item.activityInstanceName != 'Editar Evento'
-      })
+        })
         
         this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {
           

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -148,7 +148,6 @@ export class BookMeetingModalPage implements OnInit {
 
      this.postData.Category = 'Reunião'
 
-
   }
 
   ngOnInit() {

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

@@ -31,33 +31,40 @@
               </ion-segment>
           </div>
         </div>
+
         <div  [ngSwitch]="segmentVista" class="overflow-y-auto">
           <!-- This is the list view -->
-
           <div *ngSwitchCase="'listview'">
 
-            <ion-item-sliding *ngIf="loadCount">
+            <ion-item-sliding *ngIf="AllProcess">
               <div class="listview" >
-                <ion-list *ngIf="allProcessesList">
+                <ion-list *ngIf="AllProcess">
+
+                  
+
                   <div
                     class="item-wrapper box-hover ion-no-padding cursor-pointer"
-                    *ngFor = "let task of allProcessesList"
-                    (click)="goToProcess(task.SerialNumber, task.WorkflowName, task.activityInstanceName)">
+                    *ngFor = "let task of AllProcess"
+                    (click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)">
                     <div class="item width-100">
                       <div class="item-top-detail">
                         <div class="item-subject">
-                          <ion-label>{{ task.Folio }}</ion-label>
+                          <!-- ... {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName }} {{ task.activityInstanceName }} -->
+                          <ion-label *ngIf="task.Folio">{{ task.Folio }}</ion-label>
+                          <ion-label *ngIf="task.Subject">{{  task.Subject  }}</ion-label>
+                          <ion-label *ngIf="task.workflowInstanceDataFields">{{ task.workflowInstanceDataFields.Subject   }}</ion-label>
                         </div>
                         <div *ngIf="task.DocumentsQty != 0" class="item-icon">
                           <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
                           <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                           <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
-                          <label>{{task.DocumentsQty}}</label>
+                          <label>{{task.DocumentsQty || task.totalDocuments}}</label>
                         </div>
                       </div>
                       <div class="item-middle-detail">
                         <div class="item-remetente">
-                          <ion-label>{{task.Senders}}</ion-label>
+                          <ion-label *ngIf="task.Senders">{{task.Senders }}</ion-label>
+                          <ion-label *ngIf="task.workflowInstanceDataFields">{{ task.workflowInstanceDataFields.Sender }}</ion-label>
                         </div>
                       </div>
                       <div *ngIf="task.Agenda" class="item-middle-detail">
@@ -68,10 +75,10 @@
                       <div *ngIf="task.Agenda" class="item-middle-detail-extra">
                         <div class="item-middle-detail-extra-text">
                           <ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
-                            Agenda {{task.Agenda}} do Presidente da República
+                            Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Presidente da República
                           </ion-label>
                           <ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial MDGPR' || task.WorkflowName == 'Agenda Pessoal MDGPR'">
-                            A sua agenda {{task.Agenda}}
+                            A sua agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}}
                           </ion-label>
                         </div>
                       </div>
@@ -80,7 +87,7 @@
                           <span class="label">{{task.activityInstanceName}}</span>
                         </div>
                         <div class="item-date">
-                          <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                          <ion-label>{{ task.CreateDate || task.taskStartDate  | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                         </div>
                       </div>
                     </div>
@@ -90,7 +97,7 @@
             </ion-item-sliding>
 
 
-            <ion-item-sliding  *ngIf="!loadCount" class="width-100">
+            <ion-item-sliding  *ngIf="!AllProcess" class="width-100">
                 <ion-item lines="none"
                   class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
 
@@ -139,7 +146,7 @@
                   <fa-icon class="icon-selected" icon="align-justify"></fa-icon>
                 </div>
                 <p class="text-center exp-card-title ">Todas as tarefas</p>
-                <p class="text-center exp-card-content">{{ allProcessesList.length }} <span class="title1">Documentos</span></p>
+                <p class="text-center exp-card-content"> {{ getAllProcessCount }} <span class="title1">Documentos</span></p>
               </div>
   
               <div *ngIf="p.userPermission([p.permissionList.Gabinete.aprove_event])" (click)="openEventsToApprovePage();selectedElement='approval'" [class.active]="selectedElement == 'approval'"  class="box-hover exp-card d-flex flex-column">
@@ -174,20 +181,6 @@
                 <p class="text-center exp-card-content"><span class="number">{{pendentesstore.count}} </span> <span class="title1">Documentos</span></p>
               </div>
 
-
-              
-  
-              <!-- <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) || p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDespachosPrPage(); selectedElement='DispatchesPr'" [class.active]="selectedElement == 'DispatchesPr'" class="box-hover exp-card d-md-flex flex-column justify-center" >
-                <div class="d-flex justify-center">
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-despachos-presidente.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DispatchesPr'"  src="assets/images/theme/gov/icons-despachos-presidente.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DispatchesPr'"  src="assets/images/theme/gov/icons-despachos-presidente-hover.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' && selectedElement != 'DispatchesPr'"  src="assets/images/theme/gov/icons-despachos-presidente.svg"></ion-icon>
-                </div>
-                <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Despacho do Presidente da República</p>
-                <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Despachos criados por mim</p>
-                <p class="text-center exp-card-content">{{ despachoprstore.count }} <span class="title1">Documentos</span> </p>
-              </div> -->
   
               <div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" [class.active]="selectedElement == 'Dispatches'" class="box-hover exp-card d-flex flex-column justify-center" (click)="openDespachosPage(); selectedElement='Dispatches'">
                 <div class="d-flex justify-center">

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

@@ -382,6 +382,9 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
   }
 
   goToProcess(serialNumber: string, workflowName: string, activityName: string) {
+
+    alert('nice!!!')
+
     if (workflowName == 'Despacho') {
       if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
         this.router.navigate(['/home/gabinete-digital/despachos', serialNumber, 'gabinete-digital']);
@@ -537,13 +540,30 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     this.showSignedDiploma = false
   }
 
+
+  get AllProcess() {
+    return this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
+    .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr)
+    .concat(this.deplomasStore.diplomasList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
+  }
+
+  get getAllProcessCount() {
+    return this.AllProcess.length
+  }
+
   async LoadCounts() {
 
+    let allPreocesses_;
+
+    try {
+      allPreocesses_ = await this.processesbackend.GetTasksList("", false).toPromise();
+      this.loadCount = true;
+    } catch(error) {
+      this.loadCount = true;
+    }
 
-    let allPreocesses_ = await this.processesbackend.GetTasksList("", false).toPromise();
     let allProcessesList = allPreocesses_;
 
-    this.loadCount = true;
     console.log(allProcessesList)
     allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
     allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
@@ -596,11 +616,12 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
 
     this.allProcessesList = removeDuplicate(this.allProcessesList);
     this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
-    console.log('All PROCESS', this.allProcessesList)
 
     let expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise();
     expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")
+    
     this.expedientegbstore.count = expedientes.length
+    this.expedientegbstore.reset(expedientes);
 
 
     let despachos = await this.despachoRule.getList({ updateStore: true })
@@ -613,17 +634,25 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     let pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
 
     let allParecer = pareceres.concat(pareceresPr);
+
     this.count_par_dailywork = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
     this.pedidosstore.countparecer = this.count_par_dailywork;
+    
+    this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active"));    
 
     let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise();
     this.count_def_dailywork = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
     this.pedidosstore.countdeferimento = this.count_def_dailywork;
 
+    this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active"));
+
+
     let pendentes = await this.processesbackend.GetPendingTasks(false).toPromise();
     this.count_total_pending = Object.keys(pendentes).length;
     this.pendentesstore.count = this.count_total_pending;
 
+    this.pendentesstore.reset(pendentes);
+
     let despachospr = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
     let despachosPr;
 
@@ -631,27 +660,28 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
       despachosPr = despachospr.filter(data => data.activityInstanceName == "Tarefa de Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active");
       this.count_de_pr = Object.keys(despachosPr).length;
       this.despachoprstore.count = this.count_de_pr;
+      this.despachoprstore.reset(despachosPr)
     } else if(this.loggeduser.Profile == 'PR') {
       despachosPr = despachospr.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
       this.count_de_pr = Object.keys(despachosPr).length;
       this.despachoprstore.count = this.count_de_pr;
+      this.despachoprstore.reset(despachosPr)
     }
 
     let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
     let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
     let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
-    eventsMDGPRList = eventsMDGPRList.filter(function(item) {
-      return item.activityInstanceName != 'Editar Evento'
-  })
+    
+    eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
+
     this.eventoaprovacaostore.countMd = eventsMDGPRList.length
     this.eventoaprovacaostore.resetmd(eventsMDGPRList);
 
     let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise();
     let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise();
     let eventsPRList = prEventsOficial.concat(prEventsPessoal);
-    eventsPRList = eventsPRList.filter(function(item) {
-      return item.activityInstanceName != 'Editar Evento'
-  })
+    eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
+
     this.eventoaprovacaostore.countPr = eventsPRList.length
     this.eventoaprovacaostore.resetpr(eventsPRList);
 

src/app/pages/search/search.page.html

@@ -198,6 +198,8 @@
                     <span class="organic-entity">{{ searchDocument.EntidadeOrganicaNome }}</span>
                     <span class="documente-date">{{ formateIsoDate(searchDocument.Data) }}</span>
                   </div>
+
+                  <div *ngIf="select" (click)="view(searchDocument)"> Ver</div>
                 </div>
               </li>
 

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

@@ -10,6 +10,7 @@ import { PublicationDetailPage } from '../publications/view-publications/publica
 import { DocumentDetailPage } from 'src/app/modals/document-detail/document-detail.page';
 import { SearchCategory, SearchList } from 'src/app/models/search-document';
 import { ThemeService } from 'src/app/services/theme.service'
+import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 
 @Component({
   selector: 'app-search',
@@ -94,8 +95,36 @@ export class SearchPage implements OnInit {
         selected: item
       });
     }
+  }
 
-    return this.select;
+  async view(item: SearchList) {
+
+    const ApplicationType = item.ApplicationType.toString()
+    const Id = item.Id
+
+    if(ApplicationType == '8' ) {
+      
+      this.viewDocumentDetail(Id, ApplicationType);
+
+    } else if (ApplicationType == '361') {
+
+      const modal = await this.modalController.create({
+        component: ViewDocumentPage,
+        componentProps: {
+          trustedUrl: '',
+          file: {
+            title: item.Assunto,
+            url: '',
+            title_link: '',
+          },
+          applicationId: ApplicationType,
+          docId: item.Id,
+        },
+        cssClass: 'modal modal-desktop'
+      });
+      await modal.present();
+    } 
+    
   }
 
   ngOnInit() {
@@ -665,7 +694,7 @@ export class SearchPage implements OnInit {
 
     const ApplicationType = searchDocument.ApplicationType.toString()
     const Id =  searchDocument.Id
-    if(this.select == false){
+    if(this.select == false) {
       if(this.type == "Agenda") {
 
         const modal = await this.modalCtrl.create({
@@ -680,15 +709,16 @@ export class SearchPage implements OnInit {
         await modal.present();
         modal.onDidDismiss().then((res)=>{});
 
-      } else if(this.type == "AccoesPresidenciais"){
+      } else if(this.type == "AccoesPresidenciais") {
 
         this.viewPublicationDetail(Id);
       }
-      else if(this.type == "AccoesPresidenciais & ArquivoDespachoElect"){
+      else if(this.type == "AccoesPresidenciais & ArquivoDespachoElect") {
 
         if(ApplicationType == '8' || ApplicationType == '361') {
+
+          alert('view!!')
           this.viewDocumentDetail(Id, ApplicationType);
-          // this.openExpedientActionsModal(searchDocument)
         }
       }
     }