Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

config.xml

@@ -3,7 +3,7 @@
     <name>gabinete digital</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
-    <content src="index.html" />
+    <content original-src="index.html" src="http://localhost:8100" />
     <access origin="*" />
     <allow-navigation href="http://*/*" />
     <allow-navigation href="https://*/*" />

src/app/modals/profile/profile.page.ts

@@ -100,8 +100,8 @@ export class ProfilePage implements OnInit {
             IdObject: element.IdObject,
             FolderId: element.FolderId,
             desc: element.desc,
-            dateInit: this.getFormatedTime(element.dateInit),
+            dateInit: element.dateInit,
-            dateEnd: this.getFormatedTime(element.dateEnd),
+            dateEnd: element.dateEnd,
             Location: element.Location,
             TypeAgenda: element.TypeAgenda,
             Role: element.Role,
@@ -145,14 +145,16 @@ export class ProfilePage implements OnInit {
 
   notificatinsRoutes = (index, Service, Object, IdObject, FolderId) => {
 
-    if (Service === "agenda") {
+    if (Service === "agenda" && IdObject.length > 10) {
+      console.log("Id Lenght",IdObject.length)
       this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda']));
     }
     else if (Service === "gabinete-digital" && Object === "expediente") {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', IdObject, 'gabinete-digital']));
     }
-    else if (Service === "gabinete-digital" && Object === "event-list") {
+    else if (Service === "agenda" && Object === "event-list") {
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'gabinete-digital']));
+      //this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'agenda']));
+      this.zone.run(() =>this.router.navigate(['/home/agenda/event-list/approve-event',IdObject, 'agenda']));
       
     } else if (Service === "gabinete-digital" && Object === "despachos") {
 
@@ -180,12 +182,8 @@ export class ProfilePage implements OnInit {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', IdObject, 'gabinete-digital']));
     }
     else if (Service === "gabinete-digital" && Object === "diplomas-assinar") {
-      let navigationExtras: NavigationExtras = {
+      
-        queryParams: {
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar',IdObject,'gabinete-digital']));
-          "serialNumber": IdObject,
-        }
-      };
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras));
     }
     else if (Service === "gabinete-digital" && Object === "expedientes-pr") {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital']));

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

@@ -285,6 +285,7 @@ export class DespachoPage implements OnInit {
         if(actionName == 'Executado'){
 
           await this.executado(res.data.note, docs);
+          this.goBack();
         }
         else if(actionName == 'Arquivar'){
           await this.arquivar(res.data.note, docs);

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

@@ -19,6 +19,7 @@ import { PermissionService } from 'src/app/OtherService/permission.service';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { WaitForDomService } from 'src/app/services/dom/wait-for-dom.service';
 import { TotalDocumentStore } from 'src/app/store/total-document.service';
+import { DeplomasStore } from 'src/app/store/deplomas.service';
 
 @Component({
   selector: 'app-gabinete-digital',
@@ -96,6 +97,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck  {
   expedienteprstore = ExpedienteprStore;
   despachoprstore = DespachosprStore;
   totalDocumentStore = TotalDocumentStore
+  deplomasStore = DeplomasStore
 
   @ViewChild(ExpedientsPage) expedientesPage: ExpedientsPage;
   @ViewChild(PendentesPage) pendentesListPage: PendentesPage;
@@ -439,16 +441,22 @@ export class GabineteDigitalPage implements OnInit, DoCheck  {
     this.count_all_processes = Object.keys(allPreocesses_).length;
 
     let expedientes = await this.processesbackend.GetTasksList("Expediente", false).toPromise();
-    this.count_exp_dailywork = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
+    expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")
+    this.count_exp_dailywork = Object.keys(expedientes).length;
     this.expedientegbstore.count = this.count_exp_dailywork;
+    this.expedientegbstore.reset(expedientes)
 
     let expedientes_pr = await this.processesbackend.GetTasksList("Expediente", false).toPromise();
-    this.count_exp_pr = Object.keys(expedientes_pr.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
+    expedientes_pr = expedientes_pr.filter(data => data.workflowInstanceDataFields.Status == "Active")
+    this.count_exp_pr = Object.keys(expedientes_pr).length;
     this.expedienteprstore.count = this.count_exp_pr;
+    this.expedienteprstore.reset(expedientes_pr)
 
     let despachos = await this.processesbackend.GetTasksList("Despacho", false).toPromise();
-    this.count_desp_dailywork = Object.keys(despachos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
+    despachos = despachos.filter(data => data.workflowInstanceDataFields.Status == "Active")
+    this.count_desp_dailywork = Object.keys(despachos).length;
     this.despachoStore.count = this.count_desp_dailywork
+    this.despachoStore.reset(despachos)
 
     let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise();
     let pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
@@ -485,9 +493,11 @@ export class GabineteDigitalPage implements OnInit, DoCheck  {
 
     let diplomasAssinar = despachospr.filter(data => data.activityInstanceName == "Assinar Diploma");
     this.count_dip_as = Object.keys(diplomasAssinar).length;
+    this.deplomasStore.resetDiplomasList(diplomasAssinar)
 
     let diplomasAssinados = despachospr.filter(data => data.activityInstanceName == "Diploma Assinado");
     this.count_dip_as_pr = Object.keys(diplomasAssinados).length;
+    this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)
 
     this.processesbackend.GetToApprovedEvents('Agenda','true').subscribe(res=>{
       this.count_ev_apr = res;