Fixe merge

src/app/shared/agenda/approve-event/approve-event.component.html

@@ -25,7 +25,7 @@
       </ion-item>
       <ion-item (click)="emendTask(loadedEvent.serialNumber)">
         <ion-icon name="create-outline"></ion-icon>
-        <ion-label>Emendar</ion-label>
+        <ion-label>Adicionar Nota</ion-label>
       </ion-item>
       <ion-item (click)="rejectTask(loadedEvent.serialNumber)">
         <ion-icon name="close-sharp"></ion-icon>
@@ -99,7 +99,7 @@
       <div class="aside-buttons">
         <button hidden full class="btn-ok" shape="round" >Editar evento</button>
         <button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-ok" shape="round" >Aprovar</button>
-        <button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Emendar</button>
+        <button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Adicionar Nota</button>
         <div class="solid"></div>
         <button (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
       </div>
@@ -108,7 +108,7 @@
 </ion-content>
 <ion-footer class="display-none-{{showAside}}">
     <div class="buttons">
-      <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</button>
+      <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
       <ion-menu-button  (click)="openMenu()" autoHide="false">
         <ion-icon  name="ellipsis-vertical-outline"></ion-icon>
       </ion-menu-button>

src/app/shared/agenda/approve-event/approve-event.component.ts

@@ -74,7 +74,6 @@ export class ApproveEventComponent implements OnInit {
     let body = { "serialNumber": serialNumber, "action": "Aprovar" }
     console.log(body);
     this.processes.PostTaskAction(body);
-    this.alertService.presentAlert('Operação realizada com sucesso!');
     this.modalController.dismiss(serialNumber);
     /* this.approveEventDismiss.emit({ 
       "serialNumber": serialNumber,
@@ -99,7 +98,6 @@ export class ApproveEventComponent implements OnInit {
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
     console.log(body);
     this.processes.PostTaskAction(body);
-    this.alertService.presentAlert('Operação realizada com sucesso!');
     this.router.navigate(['/home/gabinete-digital/event-list']);
     this.modalController.dismiss(null);
   }
@@ -148,7 +146,6 @@ export class ApproveEventComponent implements OnInit {
       console.log(body);
       this.processes.PostTaskAction(body);
       //this.router.navigate(['/home/gabinete-digital/event-list']);
-      this.alertService.presentAlert('Operação realizada com sucesso!');
       this.goToEventsToApprove();
       }
       else{

src/app/shared/agenda/view-event/view-event.page.ts

@@ -104,7 +104,9 @@ export class ViewEventPage implements OnInit {
           buttons: ['OK']
         });
     
-        await alert.present();
+        setTimeout(()=>{
+          alert.dismiss();
+        }, 1500);
         this.close();
       });  
   }

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

@@ -66,8 +66,8 @@
         <ion-item 
             class="expediente ion-no-padding"  
             *ngFor = "let task of despachoList; let i = index"
+            (click)="viewExpedientDetail(task.SerialNumber)"
             >
-            <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
               <div class="item width-100">
                 <div class="exp-top-detail">
@@ -75,14 +75,15 @@
                     <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
                   </div>
                   <div class="exp-remetente">
-                    <ion-label>{{task.Remetente}}</ion-label>
+                    <ion-label>{{task.Senders}}</ion-label>
                   </div>
                   <div class="exp-icon">
-                    <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    <label>{{task.DocumentsQty}}</label>
+
+                    <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
                       <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    </ion-menu-button>
-                   
-                    <label></label>
+                    </ion-menu-button> -->
                   </div>
                 </div>
                 <div class="exp-bottom-detail">

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

@@ -7,10 +7,14 @@ import { formatDate } from '@angular/common';
 import { ModalController } from '@ionic/angular';
 import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 import { AlertService } from 'src/app/services/alert.service';
+
 import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
 import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 
+import { AuthService } from 'src/app/services/auth.service';
+import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
+
 @Component({
   selector: 'app-despachos',
   templateUrl: './despachos.page.html',
@@ -29,6 +33,7 @@ export class DespachosPage implements OnInit {
  
  taskType: string;
  serialNumber:string;
+ totalDocs:any;
 
  @Input() profile:string;
  segment:string;
@@ -41,83 +46,116 @@ export class DespachosPage implements OnInit {
    private processes:ProcessesService,
    private modalController: ModalController,
    private alertService: AlertService,
+   private authService: AuthService,
    ) { 
      this.profile = 'mdgpr';
    }
 
  ngOnInit() {
-    //Inicializar segment
-    this.segment = "despachos";
-    this.LoadList();
-  }
-  segmentChanged(ev: any) {
-    this.LoadList();
-  }
-
-  notImplemented(){
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-  }
-
-  openExpedientDetailPage(data) {
-    this.openExpedientDetail.emit(data);
-  }
-
- LoadList(){
-  this.processes.GetTasksList("Despacho", false).subscribe(result => {
-    console.log('Despacho', result);
-    
-    this.taskList = result;
-
-    this.despachoList = new Array();
-    let res = result.reverse();
-    res.forEach(element => {
-      let task: DailyWorkTask = {
-        "SerialNumber": element.serialNumber,
-        "Folio": element.workflowInstanceFolio,
-        "Senders": element.originator.email,
-        "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-        "Remetente": element.workflowInstanceDataFields.Remetente
-      }
-      this.despachoList.push(task);
-    });
+   //Inicializar segment
+   this.segment = "despachos";
+   this.LoadList();
+   this.authService.userData$.subscribe((res:any)=>{
+    console.log(res); 
   });
  }
+ segmentChanged(ev: any) {
+   this.LoadList();
+ }
 
-  doRefresh(event) {
-    this.LoadList();
+ notImplemented(){
+   this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+ }
 
-    setTimeout(() => {
-      event.target.complete();
-    }, 2000);
-  }
+ openExpedientDetailPage(data){
+   console.log(data);
+   this.openExpedientDetail.emit(data);
+ }
 
-  async viewExpedientDetail(serialNumber:any) {
-    console.log(this.profile);
+ LoadList(){
+     this.processes.GetTasksList("Despacho", false).subscribe(result => {
+       console.log(result);
+       
+       this.despachoList = new Array();
+       let res = result.reverse();
+       res.forEach(element => {
+         let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
+         let DocId = element.workflowInstanceDataFields.FolderID;
 
-    let classs;
-    if( window.innerWidth <= 800){
-      classs = 'modal'
-    } else  {
-      classs = 'modal modal-desktop'
-    }
+          this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
+            this.totalDocs = res.DocumentsTotal;
+            console.log(res.DocumentsTotal);
+            console.log(element);
+            
 
-    const modal = await this.modalController.create({
-      component: ExpedienteDetailPage,
-      componentProps:{
-        enterAnimation: "",
-        serialNumber: serialNumber,
-        profile: this.profile,
-      },
-      cssClass: classs,
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      console.log('refresh list');
-      this.LoadList();
-    });
-  }
+            let task: DailyWorkTask = {
+              "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,
+            }
+            this.despachoList.push(task);
+          },
+          (error)=>{
+            let task: DailyWorkTask = {
+              "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,
+            }
+            this.despachoList.push(task);
+            
+          });
+        });
 
+         //this
+
+         
+       console.log(this.despachoList);
+     });
+ }
+
+ doRefresh(event) {
+   this.LoadList();
+
+   setTimeout(() => {
+     event.target.complete();
+   }, 2000);
+ }
+
+ async viewExpedientDetail(serialNumber:any) {
+   console.log(this.profile);
+
+   let classs;
+   if( window.innerWidth <= 800){
+     classs = 'modal'
+   } else  {
+     classs = 'modal modal-desktop'
+   }
+
+   const modal = await this.modalController.create({
+     component: DespachoPage,
+     componentProps:{
+       enterAnimation: "",
+       serialNumber: serialNumber,
+       profile: this.profile,
+     },
+     cssClass: classs,
+   });
+   await modal.present();
+   modal.onDidDismiss().then((res)=>{
+     console.log('refresh list');
+     this.LoadList();
+   });
+ }
+
+  // old
   async openExpedientActionsModal(taskAction: any, task: any) {
     //this.modalController.dismiss();
     let classs;

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

@@ -2,17 +2,17 @@
   <div class="title">
     <div class="thetitle"><ion-label >Correspondência</ion-label></div>
     <div class="theicon">
-      <button class="btn-no-color" (click)="doRefresh($event)">
+      <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">
-      <ion-segment-button value="expediente">
+    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
+      <ion-segment-button value="expedientes">
         Expediente
       </ion-segment-button>
-      <ion-segment-button value="pendentes" (click)="notImplemented()">
+      <ion-segment-button value="pendentes">
         Pendentes
       </ion-segment-button>
     </ion-segment>
@@ -29,7 +29,7 @@
     </ion-refresher>
   
   <div class="width-100" [ngSwitch]="segment" *ngIf="taskslist">
-    <ion-list *ngSwitchCase="'expediente'">
+    <ion-list *ngSwitchCase="'expedientes'">
       <ion-item 
           class="expediente ion-no-padding"  
           *ngFor = "let task of taskslist"
@@ -56,10 +56,30 @@
           </ion-item>
     </ion-list>
     <ion-list *ngSwitchCase="'pendentes'">
-      <ion-item-group>
-        <ion-item-sliding>
-        </ion-item-sliding>
-      </ion-item-group>
+      <ion-item 
+          class="expediente ion-no-padding"  
+          *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>
   </div>
   <div *ngIf="!taskslist">

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

@@ -37,7 +37,13 @@ export class ExpedientsPage implements OnInit {
 
   ngOnInit() {
     //Inicializar segment
-    this.segment = "expediente";
+    this.segment = "expedientes";
+    this.LoadList();
+  }
+
+  segmentChanged(){
+    console.log(this.segment);
+    
     this.LoadList();
   }
 
@@ -51,22 +57,48 @@ export class ExpedientsPage implements OnInit {
   }
 
   LoadList(){
-    this.processes.GetTasksList("Expediente", false).subscribe(result => {
-      console.log(result);
-      this.taskslist = new Array();
-      let res = result.reverse();
-      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
-        }
-        this.taskslist.push(task);
-      });
-    });
+    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,
+            }
+            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,
+            }
+            this.taskslist.push(task);
+          });
+          console.log(this.taskslist);
+        });
+        break;
+    }
   }
 
   doRefresh(event) {

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

@@ -69,6 +69,7 @@
         <ion-item 
             class="expediente ion-no-padding"  
             *ngFor = "let task of parecerList; let i = index"
+            (click)="viewExpedientDetail(task.SerialNumber)"
             >
             <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->

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

@@ -79,11 +79,12 @@ export class PedidosPage implements OnInit {
         res.forEach(element => {
           let task: DailyWorkTask = {
             "SerialNumber": element.serialNumber,
-            "Folio": element.workflowInstanceFolio,
+            "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
+            "Remetente": element.workflowInstanceDataFields.Remetente,
+            "DocumentsQty": 0,
           }
           this.parecerList.push(task);
         });
@@ -103,11 +104,12 @@ export class PedidosPage implements OnInit {
         res.forEach(element => {
           let task: DailyWorkTask = {
             "SerialNumber": element.serialNumber,
-            "Folio": element.workflowInstanceFolio,
+            "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
+            "Remetente": element.workflowInstanceDataFields.Remetente,
+            "DocumentsQty": 0,
           }
           this.deferimentoList.push(task);
         });
@@ -115,14 +117,11 @@ export class PedidosPage implements OnInit {
         
       });
     }
-    console.log(this.taskType);
-    
-    
+    console.log(this.taskType); 
   }
 
   doRefresh(event) {
     this.LoadList();
-
     setTimeout(() => {
       event.target.complete();
     }, 2000);

src/app/shared/popover/chat-options-popover/chat-options-popover.page.html

@@ -8,7 +8,7 @@
     <button (click)="notImplemented()" full class="btn-ok" shape="round" >Tirar Fotografia</button>
     <button (click)="notImplemented()" class="btn-ok" shape="round" >Digitalizar Documento</button>
     <button (click)="notImplemented()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
-    <button (click)="notImplemented()" class="btn-ok" shape="round" >Anexar Documento</button>
+    <button (click)="getDoc()" class="btn-ok" shape="round" >Anexar Documento</button>
     <div class="solid"></div>
     <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
   </div>

src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts

@@ -1,5 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ModalController, PopoverController } from '@ionic/angular';
+import { SearchDocument } from 'src/app/models/search-document';
+import { SearchPage } from 'src/app/pages/search/search.page';
 import { AlertService } from 'src/app/services/alert.service';
 
 @Component({
@@ -9,6 +11,8 @@ import { AlertService } from 'src/app/services/alert.service';
 })
 export class ChatOptionsPopoverPage implements OnInit {
 
+  documents:SearchDocument[] = [];
+
   constructor(
     private popoverController: PopoverController,
     private modalController: ModalController,
@@ -31,4 +35,28 @@ export class ChatOptionsPopoverPage implements OnInit {
     }
   }
 
+  attachDocument(){
+    console.log('Anexar Documento');
+    
+  }
+
+  async getDoc(){
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect'
+      }
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res)=>{
+      if(res){
+        const data = res.data;
+        this.documents.push(data.selected);
+        console.log(res.data);
+        
+      }
+    });
+  }
+
 }

src/app/shared/popover/chat-popover/chat-popover.page.scss

@@ -20,10 +20,10 @@
   justify-content: space-around;
 }
 .solid {
-  display: none;
+  display: block;
   width: 90%;
   border-top: 1px solid #bbb;
-  margin: 0 auto !important;
+  margin: 10px auto !important;
 }
 @media only screen and (min-width: 1024px) {
   .arrow-right{
@@ -37,12 +37,10 @@
   }
   .btn-ok{
     width: 100% !important;
-    margin-bottom: 10px !important;
-}
+  }
   .btn-delete{
       width: 100% !important;
       margin-bottom: 10px !important;
-      margin-top: 10px !important;
   }
   .solid{
       display: block;

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -23,14 +23,15 @@ export class ChatPopoverPage implements OnInit {
 
   ngOnInit() {
     console.log(this.roomId);
-    
   }
+
   close(){
     if( window.innerWidth <= 1024){
-      //this.popoverController.dismiss();
+      this.popoverController.dismiss('cancel');
       this.modalController.dismiss('cancel');
     }
     else{
+      this.popoverController.dismiss('cancel');
       this.modalController.dismiss('cancel');
     }
   }
@@ -56,8 +57,10 @@ export class ChatPopoverPage implements OnInit {
         });
       }
     });
+    this.popoverController.dismiss('leave');
     this.modalController.dismiss('leave');
   }
+
   //Delete
   deleteGroup(){
     let body = { "roomId":this.roomId, }
@@ -75,6 +78,7 @@ export class ChatPopoverPage implements OnInit {
         });
       }
     });
+    this.popoverController.dismiss('delete');
     this.modalController.dismiss('delete');
   }