save

2026-04-19 21:06:06 +00:00 · 2021-05-12 16:15:30 +01:00
parent 597f9b2e71
commit 2c92ed26cf
18 changed files with 227 additions and 183 deletions
@@ -22,10 +22,6 @@
        <ion-icon name="calendar" slot="start"></ion-icon>
        <ion-label>Marcar reunião</ion-label>
      </ion-item>
-      <!-- <ion-item (click)="deleteEvent()">
-        <ion-icon name="trash" slot="start"></ion-icon>
-        <ion-label>Descartar</ion-label>
-      </ion-item> -->
    </ion-list>
  </ion-content>
 </ion-menu>
@@ -35,7 +35,7 @@ ion-menu{
        overflow: hidden;
      }
      .middle{
-          padding: 0!important;
+          padding: 0 0 0 10px !important;
          float: left;
          margin: 2.5px 0 0 0;
        }
@@ -46,8 +46,15 @@ ion-menu{

      }
      .div-icon{
+        width: 136px;
+        display: flex;
+        align-items: flex-start;
+        justify-content: start;
        float: right;
-        padding: 1px;
+        padding: 1px !important;
+        top: 0 !important;
+        margin: 0 !important;
+        overflow: hidden;
      }
      .div-icon .edit{
        font-size: 35px;
@@ -81,8 +88,9 @@ ion-menu{
      
        .content-location{
          width: 100%;
-          margin: 0 auto;
-          padding: 0;
+          margin: 0 auto !important;
+          padding: 0 !important;
+          overflow: auto;


          .date{
@@ -71,6 +71,10 @@ export class ViewEventPage implements OnInit {
    this.loadEvent();
  }

+  openOptions(){
+    
+  }
+
  docIndex(index: number) {
    this.dicIndex = index;
  }
@@ -1,22 +1,12 @@
 <ion-header class="ion-no-border">
  <div class="title">
-    <div class="thetitle"><ion-label >Correspondência</ion-label></div>
+    <div class="thetitle"><ion-label >Expediente</ion-label></div>
    <div class="theicon">
      <button class="btn-no-color" (click)="doRefresh()">
        <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
      </button>
    </div>
  </div>
-  <ion-toolbar>
-    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
-      <ion-segment-button value="expedientes">
-        Expedientes
-      </ion-segment-button>
-      <ion-segment-button value="pendentes">
-        Pendentes
-      </ion-segment-button>
-    </ion-segment>
-  </ion-toolbar>
 </ion-header>
 <ion-content>
  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
@@ -28,40 +18,13 @@
      </ion-refresher-content>
    </ion-refresher>
  
-  <div class="width-100" [ngSwitch]="segment" *ngIf="taskslist">
-    <ion-list *ngSwitchCase="'expedientes'">
+  <div class="width-100" *ngIf="taskslist">
+    <ion-list>
      <ion-item 
          class="expediente ion-no-padding cursor-pointer"  
          *ngFor = "let task of taskslist"
          (click)="viewExpedientDetail(task.SerialNumber)"
          >
-          <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-            <div class="item width-100">
-              <div class="exp-top-detail">
-                <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
-                </div>
-                <div class="exp-remetente">
-                  <ion-label>{{task.Remetente}}</ion-label>
-                </div>
-                <div class="exp-icon">
-                  <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                  <label></label>
-                </div>
-              </div>
-              <div class="exp-bottom-detail">
-                <ion-label>{{ task.Folio }}</ion-label>
-              </div>
-            </div>
-          </ion-item>
-    </ion-list>
-    <ion-list *ngSwitchCase="'pendentes'">
-      <ion-item 
-          class="expediente ion-no-padding cursor-pointer"  
-          *ngFor = "let task of taskslist"
-          (click)="viewExpedientDetail(task.SerialNumber)"
-          >
-          <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
            <div class="item width-100">
              <div class="exp-top-detail">
                <div class="exp-date">
@@ -57,50 +57,25 @@ export class ExpedientsPage implements OnInit {
  }

  LoadList(){
-    switch(this.segment){
-      case "expedientes":
-        this.processes.GetTasksList("Expediente", false).subscribe(result => {
-          console.log(result);
-          this.taskslist = new Array();
-          let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
-          res.forEach(element => {
-            let task: DailyWorkTask = {
-              "SerialNumber": element.serialNumber,
-              "Folio": element.workflowInstanceDataFields.Subject,
-              "Senders": element.originator.email,
-              "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-              "Remetente": element.workflowInstanceDataFields.Remetente,
-              "DocumentsQty": 0,
-              "WorkflowName": element.workflowDisplayName,
-            }
-            this.taskslist.push(task);
-          });
-          console.log(this.taskslist);
-        });
-        break;
-      case "pendentes":
-        this.processes.GetTasksList("Expediente", false).subscribe(result => {
-          console.log(result);
-          this.taskslist = new Array();
-          let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
-          res.forEach(element => {
-            let task: DailyWorkTask = {
-              "SerialNumber": element.serialNumber,
-              "Folio": element.workflowInstanceDataFields.Subject,
-              "Senders": element.originator.email,
-              "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-              "Remetente": element.workflowInstanceDataFields.Remetente,
-              "DocumentsQty": 0,
-              "WorkflowName": element.workflowDisplayName,
-            }
-            this.taskslist.push(task);
-          });
-          console.log(this.taskslist);
-        });
-        break;
-    }
+    this.processes.GetTasksList("Expediente", false).subscribe(result => {
+      console.log(result);
+      this.taskslist = new Array();
+      let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
+      res.forEach(element => {
+        let task: DailyWorkTask = {
+          "SerialNumber": element.serialNumber,
+          "Folio": element.workflowInstanceDataFields.Subject,
+          "Senders": element.originator.email,
+          "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+          "Remetente": element.workflowInstanceDataFields.Remetente,
+          "DocumentsQty": 0,
+          "WorkflowName": element.workflowDisplayName,
+        }
+        this.taskslist.push(task);
+      });
+      console.log(this.taskslist);
+    });
  }

  doRefresh(event) {
@@ -113,9 +88,6 @@ export class ExpedientsPage implements OnInit {

  async viewExpedientDetail(serialNumber:any) {
    console.log(this.profile);
-
-
-
    const modal = await this.modalController.create({
      component: ExpedienteDetailPage,
      componentProps:{
@@ -52,7 +52,7 @@

    </div>
  </div>
-  <div *ngIf="!pendentesList">
+  <div *ngIf="pendentesList.length < 1 || pendentesList.length == 0">
  
    <ion-list>
      <ion-item>
@@ -10,6 +10,7 @@ import { AlertService } from 'src/app/services/alert.service';
 import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
 import { AuthService } from 'src/app/services/auth.service';
 import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page';
+import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';


@Component({
@@ -24,6 +25,7 @@ export class PendentesPage implements OnInit {
  taskType: string;
  serialNumber:string;
  totalDocs:any;
+  showLoader: boolean;
 
  @Input() profile:string;
  segment:string;
@@ -59,53 +61,51 @@ export class PendentesPage implements OnInit {
    this.openExpedientDetail.emit(data);
  }
 
-  LoadList(){
-      this.processes.GetTasksList("Despacho", false).subscribe(despachos => {
-        //ParecerList
-        this.processes.GetTasksList("Pedido de Parecer", false).subscribe(pareceres => {
-          //DeferimentoList
-          this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(deferimentos => {
-            this.pendentesList = new Array();
-            //PendentesList
-            let pendentes = despachos.concat(pareceres, deferimentos).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
-            pendentes.forEach(element => {
-              let DocId = element.workflowInstanceDataFields.FolderID;
-              this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
-                this.totalDocs = res.DocumentsTotal;
-                console.log(res.DocumentsTotal);
-                let task = {
-                  "SerialNumber": element.serialNumber,
-                  "Folio": element.workflowInstanceDataFields.Subject,
-                  "Senders": element.workflowInstanceDataFields.Sender,
-                  "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-                  "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-                  "Remetente": element.workflowInstanceDataFields.Remetente,
-                  "DocumentsQty": this.totalDocs,
-                  "DocId": element.workflowInstanceDataFields.DocId,
-                  "WorkflowName": element.workflowDisplayName,
-                }
-                this.pendentesList.push(task);
-              },
-              (error)=>{
-                let task = {
-                  "SerialNumber": element.serialNumber,
-                  "Folio": element.workflowInstanceDataFields.Subject,
-                  "Senders": element.workflowInstanceDataFields.Sender,
-                  "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-                  "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-                  "Remetente": element.workflowInstanceDataFields.Remetente,
-                  "DocumentsQty": 0,
-                  "DocId": element.workflowInstanceDataFields.DocId,
-                  "WorkflowName": element.workflowDisplayName,
-                }
-                this.pendentesList.push(task);
-              });
-            });
-            console.log(pendentes);
-            console.log(this.pendentesList);
-          });//Fim deferimento
-        });//Fim parecer 
-      });//Fim despacho
+  async LoadList(){
+    this.showLoader = true;
+    this.pendentesList = new Array();
+
+    let despachos = await this.processes.GetTasksList("Despacho", false).toPromise();
+    let pareceres = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
+    let deferimentos = await this.processes.GetTasksList("Pedido de Deferimento", false).toPromise();
+    let expedientes = await this.processes.GetTasksList("Expediente", false).toPromise();
+
+    let pendentes = despachos.concat(pareceres, deferimentos, expedientes).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
+    pendentes.forEach(element => {
+      let DocId = element.workflowInstanceDataFields.FolderID;
+      let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+      this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
+        this.totalDocs = res.DocumentsTotal;
+        console.log(res.DocumentsTotal);
+        let task = {
+          "SerialNumber": element.serialNumber,
+          "Folio": element.workflowInstanceDataFields.Subject,
+          "Senders": element.workflowInstanceDataFields.Sender,
+          "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+          "Remetente": element.workflowInstanceDataFields.Remetente,
+          "DocumentsQty": this.totalDocs,
+          "DocId": element.workflowInstanceDataFields.DocId,
+          "WorkflowName": element.workflowDisplayName,
+        }
+        this.pendentesList.push(task);
+      },
+      (error)=>{
+        let task = {
+          "SerialNumber": element.serialNumber,
+          "Folio": element.workflowInstanceDataFields.Subject,
+          "Senders": element.workflowInstanceDataFields.Sender,
+          "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+          "Remetente": element.workflowInstanceDataFields.Remetente,
+          "DocumentsQty": 0,
+          "DocId": element.workflowInstanceDataFields.DocId,
+          "WorkflowName": element.workflowDisplayName,
+        }
+        this.pendentesList.push(task);
+      });
+    });
+    this.showLoader = false;
  }
 
  doRefresh(event) {
@@ -124,7 +124,9 @@ export class PendentesPage implements OnInit {
    else if(workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento'){
      this.openPedido(serialNumber);
    }
- 
+    else if(workflowName == 'Expediente'){
+      this.viewExpedientDetail(serialNumber);
+    }
  }

  async openDespacho(serialNumber:string){
@@ -162,6 +164,24 @@ export class PendentesPage implements OnInit {
      this.LoadList();
    });
  }
+
+  async viewExpedientDetail(serialNumber:any) {
+    console.log(this.profile);
+    const modal = await this.modalController.create({
+      component: ExpedienteDetailPage,
+      componentProps:{
+        enterAnimation: "",
+        serialNumber: serialNumber,
+        profile: this.profile,
+      },
+      cssClass: 'modal modal-desktop',
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res)=>{
+      console.log('refresh list');
+      this.LoadList();
+    });
+  }
 
 }