save

src/app/pages/events/events.page.ts

@@ -344,12 +344,7 @@ export class EventsPage implements OnInit {
       this.openExpedientList();
     }
     else{
-      console.log('ttt');
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-            "show": true,
-        }
-      };
+      let navigationExtras: NavigationExtras = { queryParams: {"expedientes": true,} };
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
   }

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html

@@ -60,14 +60,16 @@
       </div>
       <div class="line"></div>
       <div class="middle-content">
-        <h5 *ngIf="intervenientes">Intervenientes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-          <ion-label>
-            <div *ngFor="let interveniente of intervenientes">
-              <p>{{interveniente.Name}}</p>
-            </div>
-          </ion-label>
-        </ion-item>
+        <div *ngIf="intervenientes.length > 0">
+          <h5 >Intervenientes</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+            <ion-label *ngIf="intervenientes">
+              <div *ngFor="let interveniente of intervenientes">
+                <p>{{interveniente.Name}}</p>
+              </div>
+            </ion-label>
+          </ion-item>
+        </div>
         <div *ngIf="cc.length > 0">
           <h5>Com conhecimento</h5>
           <ion-item class="ion-no-margin ion-no-padding">
@@ -86,7 +88,7 @@
         </div>
       </div>
       <div class="bottom-content width-100">
-        <ion-list>
+        <ion-list *ngIf="attachments">
           <h5>Documentos Anexados</h5>
           <ion-item *ngFor="let attachment of attachments" class="ion-no-margin ion-no-padding">
           <ion-label

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

@@ -180,6 +180,19 @@ export class DespachoPrPage implements OnInit {
     this.processes.CompleteTask(body);
     this.close();
   }
+  generateDiploma(note:string, documents:any){
+    let body = { 
+      "serialNumber": this.serialnumber, 
+      "action": "Reencaminhar",
+      "ActionTypeId": 98,
+      "dataFields": {
+        "ReviewUserComent": note,
+      },
+      "AttachmentList" :documents,
+    }
+    this.processes.CompleteTask(body);
+    this.close();
+  }
 
   sendExpedienteToPending(){
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
@@ -214,6 +227,9 @@ export class DespachoPrPage implements OnInit {
         else if(actionName == 'Arquivar'){
           this.arquivar(res.data.note,res.data.documents);
         }
+        else if(actionName == 'Gerar Diploma'){
+          this.generateDiploma(res.data.note,res.data.documents);
+        }
       }
     });
   }

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

@@ -132,48 +132,6 @@
         <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
       </div>
     </div>
-
-    <div *ngIf="!task">
-      <ion-list>
-        <ion-list-header>
-          <ion-label>
-            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-          </ion-label>
-        </ion-list-header>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p>
-              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-            </p>
-          </ion-label>
-        </ion-item>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          </ion-label>
-        </ion-item>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p>
-              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-            </p>
-          </ion-label>
-        </ion-item>
-        <ion-button color="medium" shape="round" expand="block">
-          <!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
-          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-        </ion-button>
-      </ion-list>
-    </div>
   </div>
 </ion-content>
 

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

@@ -4,7 +4,7 @@ import { AlertService } from 'src/app/services/alert.service';
 import { ModalController } from '@ionic/angular';
 import { EventListPage } from './event-list/event-list.page';
 import { ExpedientePage } from './expediente/expediente.page';
-import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
+import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
 import { DespachosPage } from './despachos/despachos.page';
 import { PedidosPage } from './pedidos/pedidos.page';
 import { PendentesPage } from './pendentes/pendentes.page';
@@ -87,28 +87,55 @@ export class GabineteDigitalPage implements OnInit {
       };
 
       this.activatedRoute.queryParams.subscribe(params => {
-        if(params["show"]) {
-          this.openExpedientListPage();
-          this.selectedElement='Correspondence'
-        }
-        else if(params["events"]) {
-          this.openEventsToApprovePage("MDGPR");
-          this.selectedElement='approval'
-          
-        }
-        else if(params["pedidos"]) {
-          console.log(params["pedidos"]);
-          
-          this.openPedidosPage('parecer');
-          this.selectedElement='RequestsForOpinion'
-          
-        }
-         else if (window.innerWidth >= 800 && this.loggeduser.Profile == 'MDGPR') {
-          this.openEventsToApprovePage('MDGPR');
-          this.selectedElement='approval'
+        switch (params)
+        {
+          case params["eventos"]:
+            this.openEventsToApprovePage("MDGPR");
+            this.selectedElement='approval'
+            break;
+
+          case params["expedientes"]:
+            this.openExpedientListPage();
+            this.selectedElement='Correspondence'
+            break;
+
+          case params["pendentes"]:
+            this.openPendentesPage('');
+            this.selectedElement='Pending'
+            break;
+    
+          case params["despachos"]:
+            this.openDespachosPage('');
+            this.selectedElement='Dispatches';
+            break;
+
+          case params["pedidos"]:
+            this.openPedidosPage('parecer');
+            this.selectedElement='RequestsForOpinion';
+            break;
+
+          case params["expedientespr"]:
+            this.openEventsToApprovePage("MDGPR");
+            this.selectedElement='Expediente Presidente'
+            break;
+
+          case params["despachospr"]:
+            this.openDespachosPrPage('');
+            this.selectedElement='DispatchesPr'
+            break;
+
+          case params["diplomas"]:
+            this.openDiplomasPage('');
+            this.selectedElement='DiplomasPorAssinar'
+            break;
         }
       });
 
+      if (window.innerWidth >= 800 && this.loggeduser.Profile == 'MDGPR') {
+        this.openEventsToApprovePage('MDGPR');
+        this.selectedElement='approval'
+      }
+
       
   }
 
@@ -241,6 +268,8 @@ export class GabineteDigitalPage implements OnInit {
       this.openEventsToApproveList(profile);
     }
     else{
+      let navigationExtras: NavigationExtras = { queryParams: {"eventos": true,}};
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showEventsToApprove = true;
     }
   }
@@ -272,6 +301,8 @@ export class GabineteDigitalPage implements OnInit {
     }
     else{
       this.selectedElement='Correspondence'
+      let navigationExtras: NavigationExtras = { queryParams: {"expedientes": true,}};
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showExpedients = true;
     }
   }
@@ -296,6 +327,8 @@ export class GabineteDigitalPage implements OnInit {
     }
     else{
       this.segment = segment;
+      let navigationExtras: NavigationExtras = { queryParams: {"pedidos": true,}};
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showPedidos = true;
     }
   }
@@ -306,6 +339,8 @@ export class GabineteDigitalPage implements OnInit {
       this.openDespachoList();
     }
     else{
+      let navigationExtras: NavigationExtras = {queryParams: {"despachos": true,}};
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showDespachos = true;
     }
   }
@@ -316,6 +351,8 @@ export class GabineteDigitalPage implements OnInit {
       this.openDespachoListPr();
     }
     else{
+      let navigationExtras: NavigationExtras = {queryParams: {"despachospr": true,}};
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showDespachosPr = true;
     }
   }
@@ -326,6 +363,8 @@ export class GabineteDigitalPage implements OnInit {
       this.openPendenteList();
     }
     else{
+      let navigationExtras: NavigationExtras = { queryParams: {"pendentes": true,}};
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showPendentes = true;
     }
   }
@@ -336,6 +375,8 @@ export class GabineteDigitalPage implements OnInit {
       //this.openDespachoList();
     }
     else{
+      let navigationExtras: NavigationExtras = {queryParams: {"expedientespr": true,}};
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showExpedientesPr = true;
     }
   }
@@ -347,6 +388,8 @@ export class GabineteDigitalPage implements OnInit {
     }
     else{
       this.segment = segment;
+      let navigationExtras: NavigationExtras = { queryParams: {"diplomas": true,}};
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showDiplomas = true;
     }
   }

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

@@ -119,48 +119,6 @@
         </div>
       </div>
     </div>
-
-    <div *ngIf="!task">
-      <ion-list>
-        <ion-list-header>
-          <ion-label>
-            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-          </ion-label>
-        </ion-list-header>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p>
-              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-            </p>
-          </ion-label>
-        </ion-item>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          </ion-label>
-        </ion-item>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p>
-              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-            </p>
-          </ion-label>
-        </ion-item>
-        <ion-button color="medium" shape="round" expand="block">
-          <!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
-          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-        </ion-button>
-      </ion-list>
-    </div>
   </div>
 </ion-content>
 

src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -128,11 +128,11 @@ segmentChanged(ev: any) {
    });
  }
 
-doRefresh(event) {
+doRefresh() {
   this.LoadList();
 
   setTimeout(() => {
-    event.target.complete();
+    //event.target.complete();
   }, 2000);
 }
 

src/app/shared/gabinete-digital/pedidos/pedidos.page.ts

@@ -114,6 +114,7 @@ export class PedidosPage implements OnInit {
             "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
             "FolderId": element.workflowInstanceDataFields.FolderId,
             "WorkflowName": element.workflowDisplayName,
+            "activityInstanceName": element.activityInstanceName,
           }
           this.deferimentoList.push(task);
         });