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

src/app/modals/create-process/create-process.page.ts

@@ -203,11 +203,12 @@ export class CreateProcessPage implements OnInit {
     let body = { 
       "serialNumber": this.task.serialNumber, 
       "action": "Conhecimento",
+      "ActionTypeId": 104,
       "dataFields": {
         "ReviewerUserComment": '',
       }
     }
-    this.processes.PostTaskAction(body);
+    this.processes.CompleteTask(body);
   }
 
   getAttachments() {

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts

@@ -70,7 +70,10 @@ export class ApproveEventModalPage implements OnInit {
     })
   }
   approveTask(serialNumber:string){
-    let body = { "serialNumber": serialNumber, "action": "Aprovar" }
+    let body = { 
+      "serialNumber": serialNumber, 
+      "action": "Aprovar" 
+    }
     this.processes.PostTaskAction(body);
     this.router.navigate(['/home/gabinete-digital/event-list']);
     this.modalController.dismiss(null);

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

@@ -155,11 +155,12 @@ export class DespachoPage implements OnInit {
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Conhecimento",
+      "ActionTypeId": 104,
       "dataFields": {
         "ReviewerUseComment": note,
       }
     }
-    this.processes.PostTaskAction(body);
+    this.processes.CompleteTask(body);
     this.close();
   }
 
@@ -220,13 +221,6 @@ export class DespachoPage implements OnInit {
     });
   }
 
-  discartExpedient() {
-    /* let body = { "serialNumber": this.serialnumber, "action": "Passivo" }
-    console.log(body);
-    this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/expediente']); */
-  }
-
   async distartExpedientModal2(task: any){
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,

src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts

@@ -41,12 +41,18 @@ export class DiscartExpedientModalPage implements OnInit {
   
   save(){
     if(this.action != 'discart'){
-      let body = { "serialNumber": this.serialNumber, "action": "Tratado" }
+      let body = { 
+        "serialNumber": this.serialNumber, 
+        "action": "Tratado" 
+      }
       console.log(body);
       this.processes.PostTaskAction(body);
     }
     else{
-      let body = { "serialNumber": this.serialNumber, "action": "Passivo" }
+      let body = { 
+        "serialNumber": this.serialNumber, 
+        "action": "Passivo" 
+      }
       console.log(body);
       this.processes.PostTaskAction(body);
     }

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

@@ -181,13 +181,6 @@ export class ExpedienteDetailPage implements OnInit {
     });
   }
 
-  discartExpedient() {
-    /* let body = { "serialNumber": this.serialnumber, "action": "Passivo" }
-    console.log(body);
-    this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/expediente']); */
-  }
-
   async distartExpedientModal2(task: any){
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,

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

@@ -178,11 +178,12 @@ export class PedidoPage implements OnInit {
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Arquivo",
+      "ActionTypeId": 95,
       "dataFields": {
         "ReviewerUseComment": '',
       }
     }
-    this.processes.PostTaskAction(body);
+    this.processes.CompleteTask(body);
   }
 
   sendExpedienteToPending(){
@@ -222,13 +223,6 @@ export class PedidoPage implements OnInit {
     });
   }
 
-  discartExpedient() {
-    /* let body = { "serialNumber": this.serialnumber, "action": "Passivo" }
-    console.log(body);
-    this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/expediente']); */
-  }
-
   async distartExpedientModal2(task: any){
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,

src/app/services/processes.service.ts

@@ -139,6 +139,14 @@ export class ProcessesService {
     };
     return this.http.post<any>(`${geturl}`, body, options).toPromise()
   }
+  CompleteTask(body:any){
+    const geturl = environment.apiURL + 'Tasks/CompleteTask';
+   
+    let options = { 
+      headers: this.headers,
+    };
+    return this.http.post<any>(`${geturl}`, body, options).toPromise()
+  }
 
   UpdateTaskStatus(FolderId:string): Observable<any>{
     const geturl = environment.apiURL + 'Tasks/UpdateTaskStatus';

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

@@ -123,13 +123,6 @@ export class ExpedientePage implements OnInit {
     modal.onDidDismiss();
   }
 
-  discartExpedient() {
-    let body = { "serialNumber": this.serialNumber, "action": "Task Completed" }
-    console.log(body);
-    this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/expediente']);
-  }
-
   async openBookMeetingModal(task: any) {
     const modal = await this.modalController.create({
       component: BookMeetingModalPage,

src/app/shared/header/header.page.html

@@ -28,28 +28,28 @@
       
       <div class="d-flex flex-1 pr-20 pl-50">
         
-        <div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/events')" [class.active]="locationPathname() == '/home/events'">
+        <div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/events')" [class.active]="locationPathname() == '/home/events'">
           <ion-icon class="font-40" src='assets/images/icons-nav-home-active.svg'></ion-icon>
-          <span>Ínicio</span>
+          <span>Início</span>
         </div>
 
-        <div class="tab mr-20 d-flex align-center " (click)="changeRoute('/home/agenda')"  [class.active]="locationPathname() == '/home/agenda'">
+        <div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/agenda')"  [class.active]="locationPathname() == '/home/agenda'">
           <ion-icon class="font-40" src='assets/images/icons-nav-agenda-inactive.svg'></ion-icon>
           <span>Agenda</span>
         </div>
 
-        <div class="tab mr-20  d-flex align-center" (click)="changeRoute('/home/gabinete-digital')" [class.active]="locationPathname() == '/home/gabinete-digital'">
+        <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/gabinete-digital')" [class.active]="locationPathname() == '/home/gabinete-digital'">
           <ion-icon class="font-40" src='assets/images/icons-nav-home-dk.svg'></ion-icon>
           <span>Gabinete</span>
         </div>
 
-        <div class="tab mr-20  d-flex align-center" (click)="changeRoute('/home/publications')"  [class.active]="locationPathname() == '/home/publications'">
+        <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/publications')"  [class.active]="locationPathname() == '/home/publications'">
           <ion-icon class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
           <span>Acções</span>
         </div>
 
 
-        <div class="tab mr-20  d-flex align-center" (click)="changeRoute('/home/chat')" [class.active]="locationPathname() == '/home/chat'">
+        <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/chat')" [class.active]="locationPathname() == '/home/chat'">
           <ion-icon class="font-40" src='assets/images/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
           <span>Chat</span>
         </div>
@@ -57,7 +57,7 @@
       </div>
 
       <div class="d-flex">
-        <div class="mr-10 d-flex align-center">
+        <div class="mr-10 d-flex align-center cursor-pointer">
           <button (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="btn-no-color">
             <ion-icon class="font-45"   src='assets/images/icons-search.svg'></ion-icon>
           </button>
@@ -66,7 +66,7 @@
           </button>
           
           <ion-form  *ngIf="showSearch">
-            <div class="d-flex search-input-container   ml-10 justify-between"  *ngIf="showSearch" >
+            <div class="d-flex search-input-container ml-10 justify-between"  *ngIf="showSearch" >
               <div class="icon" (click)="basicSearch()">
                 <ion-icon class="icon-z" slot="end" name="search"></ion-icon>
               </div>
@@ -80,7 +80,7 @@
           </ion-form>
         </div>
 
-        <div class="div-profile justify-end d-flex" (click)="openProfile()">
+        <div class="div-profile justify-end d-flex cursor-pointer" (click)="openProfile()">
           <ion-icon class="font-45" *ngIf="profile == 'mdgpr' " src='assets/images/icons-profile.svg'></ion-icon>
           <ion-icon class="font-45" *ngIf="profile == 'pr' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
         </div>

src/app/shared/headers/header-no-search/header-no-search.page.html

@@ -22,28 +22,28 @@
       
       <div class="d-flex flex-1 pr-20 pl-50">
         
-        <div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/events')" [class.active]="locationPathname() == '/home/events'">
+        <div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/events')" [class.active]="locationPathname() == '/home/events'">
           <ion-icon class="font-40" src='assets/images/icons-nav-home-active.svg'></ion-icon>
-          <span>Ínicio</span>
+          <span>Início</span>
         </div>
 
-        <div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/agenda')"  [class.active]="locationPathname() == '/home/agenda'">
+        <div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/agenda')"  [class.active]="locationPathname() == '/home/agenda'">
           <ion-icon class="font-40" src='assets/images/icons-nav-agenda-inactive.svg'></ion-icon>
           <span>Agenda</span>
         </div>
 
-        <div class="tab mr-20  d-flex align-center" (click)="changeRoute('/home/gabinete-digital')" [class.active]="locationPathname() == '/home/gabinete-digital'">
+        <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/gabinete-digital')" [class.active]="locationPathname() == '/home/gabinete-digital'">
           <ion-icon class="font-40" src='assets/images/icons-nav-home-dk.svg'></ion-icon>
           <span>Gabinete</span>
         </div>
 
-        <div class="tab mr-20  d-flex align-center" (click)="changeRoute('/home/publications')"  [class.active]="locationPathname() == '/home/publications'">
+        <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/publications')"  [class.active]="locationPathname() == '/home/publications'">
           <ion-icon class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
           <span>Acções</span>
         </div>
 
 
-        <div class="tab mr-20  d-flex align-center" (click)="changeRoute('/home/chat')" [class.active]="locationPathname() == '/home/chat'">
+        <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/chat')" [class.active]="locationPathname() == '/home/chat'">
           <ion-icon class="font-40" src='assets/images/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
           <span>Chat</span>
         </div>
@@ -55,7 +55,7 @@
           <ion-icon src='assets/images/icons-search.svg'></ion-icon>
         </div> -->
     
-        <div class="div-profile" (click)="openProfile()">
+        <div class="div-profile cursor-pointer" (click)="openProfile()">
           <ion-icon src='assets/images/icons-profile.svg'></ion-icon>
         </div>
       </div>

src/app/shared/popover/opts-expediente/opts-expediente.page.html

@@ -5,12 +5,12 @@
     </button>
   </div>
   <div class="buttons">
-    <button (click)="close()" full class="btn-ok" shape="round" >Efectuar Despacho</button>
-    <button (click)="close()" full class="btn-ok" shape="round" >Pedido de Parecer</button>
-    <button (click)="close()" full class="btn-ok" shape="round" >Pedido de Deferimento</button>
+    <button (click)="openExpedientActionsModal('0',fulltask)" full class="btn-ok" shape="round" >Efectuar Despacho</button>
+    <button (click)="openExpedientActionsModal('1',fulltask)" full class="btn-ok" shape="round" >Pedido de Parecer</button>
+    <button (click)="openExpedientActionsModal('2',fulltask)" full class="btn-ok" shape="round" >Pedido de Deferimento</button>
     <button (click)="openBookMeetingModal()" full class="btn-ok" shape="round" >Marcar reunião</button>
-    <button (click)="close()" full class="btn-ok" shape="round" >Descartar</button>
-    <button (click)="close()" full class="btn-ok" shape="round" >Enviar para pendentes</button>
+    <button (click)="distartExpedientModal(fulltask)" full class="btn-ok" shape="round" >Descartar</button>
+    <button (click)="sendExpedienteToPending()" full class="btn-ok" shape="round" >Enviar para pendentes</button>
     <div class="solid"></div>
     <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
   </div>

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -3,6 +3,7 @@ import { ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { ProcessesService } from 'src/app/services/processes.service';
 
 @Component({
   selector: 'app-opts-expediente',
@@ -18,12 +19,15 @@ export class OptsExpedientePage implements OnInit {
     private popoverController: PopoverController,
     private modalController: ModalController,
     private navParams: NavParams,
+    private processes: ProcessesService,
   ) { 
     this.task = this.navParams.get('task');
     this.fulltask = this.navParams.get('fulltask');
   }
 
   ngOnInit() {
+    console.log(this.task);
+    
     this.profile = "mdgpr";
   }
 
@@ -36,6 +40,13 @@ export class OptsExpedientePage implements OnInit {
     }
   }
 
+  sendExpedienteToPending(){
+    this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
+      console.log(res);
+      this.close();
+    });
+  }
+
   async openBookMeetingModal(task: any) {
     let classs;
     if( window.innerWidth <= 800){