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

src/app/pages/chat/chat.page.html

@@ -51,7 +51,7 @@
                       <div class="item-title-time">
                         <div class="item-title">
                           <ion-label *ngFor="let user of dm.usernames">
-                            <span *ngIf="user !=loggedUser.me.username">
+                            <span *ngIf="user !=loggedUserChat.me.username">
                             {{user}}
                           </span>
                           </ion-label>

src/app/pages/chat/chat.page.ts

@@ -90,6 +90,8 @@ export class ChatPage implements OnInit {
 
 
   /*  Fim websockets variables*/
+  loggedUserChat:any;
+
   constructor(
     private http:HttpClient,
     private chatService: ChatService,
@@ -98,11 +100,14 @@ export class ChatPage implements OnInit {
     private storage:Storage,
     private resolver: ComponentFactoryResolver,
     ){ 
+      this.loggedUserChat = authService.ValidatedUserChat['data'];
       this.headers = new HttpHeaders();
       this.loadMessage();
     }
 
   ngOnInit() {
+    console.log(this.loggedUserChat);
+    
     this.segment = "Contactos";
 
     this.authService.userData$.subscribe((res:any)=>{
@@ -255,7 +260,7 @@ sendMsg() {
   }
   getChatMembers(){
     this.chatService.getMembers(this.userDirectMessages[0]._id).subscribe(res=> {
-      this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
+      this.dmUsers = res['members'].filter(data => data.username != this.loggedUserChat.me.username)
     });
   }
   getGroups(){

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

@@ -6,7 +6,7 @@
   <div class="main-header">
     <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
     <div class="thetitle">
-      <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais</ion-label>
+      <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais !!</ion-label>
       <ion-label *ngIf="loggeduser.Profile =='PR'" >Despachos</ion-label>
     </div>
     <div class="theicon">
@@ -36,7 +36,7 @@
               (click)="goToDespachoPr(task.SerialNumber)"
               >
               <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-                <div class="item width-100" *ngIf="task.Status == 'Active'">
+                <div class="item width-100">
                   <div class="exp-top-detail">
                     <div class="exp-date">
                       <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>

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

@@ -64,8 +64,6 @@ export class DespachosPrPage implements OnInit {
   ngOnInit() {
     //Inicializar segment
     this.segment = "despachos";
-    this.LoadList();
-
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
         this.LoadList();
@@ -97,36 +95,48 @@ export class DespachosPrPage implements OnInit {
   }
 
   async LoadList() {
+
     this.despachoList = new Array();
-    
-    this.loading = true;
-
-    let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-    
-    console.log(result);
   
-    await result.forEach( (element, index) => {
-      
+    this.loading = true;
+  
+    let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+    console.log(result);
+    
+    let despachosPr;
+    switch (this.loggeduser.Profile) {
+      case 'MDGPR':
+        despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
+        break;
+      case 'PR':
+        despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
+        break;
+    }
+    console.log(despachosPr);
+    
+    despachosPr.forEach( (element, index) => {
+       
       let date = new Date(element.taskStartDate);
-        date.setMonth(date.getMonth() + 1);
-        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-
-        let task = {
-            "SerialNumber": element.serialNumber,
-            "Folio": element.workflowInstanceDataFields.Subject,
-            "Senders": element.workflowInstanceDataFields.Sender,
-            "CreateDate": taskDate,
-            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-            "Remetente": element.workflowInstanceDataFields.Remetente,
-            "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
-            "WorkflowName": element.workflowDisplayName,
-            "activityInstanceName": element.activityInstanceName,
-        }
-      
-      this.despachoList.push(task)
-      
+          date.setMonth(date.getMonth() + 1);
+          let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+  
+          let task = {
+              "SerialNumber": element.serialNumber,
+              "Folio": element.workflowInstanceDataFields.Subject,
+              "Senders": element.workflowInstanceDataFields.Sender,
+              "CreateDate": taskDate,
+              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+              "Remetente": element.workflowInstanceDataFields.Remetente,
+              "DocumentsQty": 0,
+              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
+          }
+  
+      this.despachoList.push(task);
+      console.log(this.despachoList);
     });
+    console.log(this.despachoList);
   
     this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
   
@@ -139,10 +149,10 @@ export class DespachosPrPage implements OnInit {
       })
   
     });
-
+  
     this.loading = false;
-
-  }
+  
+   }
   
     sortArrayISODate(myArray: any) {
       return myArray.sort(function(a, b) {

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

@@ -84,22 +84,7 @@ export class DespachoPage implements OnInit {
   }
 
   goBack() {
-
-    // this.activatedRoute.queryParams.subscribe(params => {
-    //   if(params["from"] == 'pendentes') {
-    //     this.router.navigate(['/home/gabinete-digital/pendentes']);
-    //   } else {
-    //     let navigationExtras: NavigationExtras = {
-    //       queryParams: {
-    //         "despachos": true,
-    //       }
-    //     };
-    //     this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras);
-    //   }
-    // });
-
     window.history.back()
-    
   }
 
 

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -17,7 +17,7 @@
               <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
             </div>
             <div class="ion-input-class">
-              <ion-input class="add-border" placeholder="Descrição" [(ngModel)]="postData.DispatchFolder.Message"></ion-input>
+              <ion-textarea class="add-border" placeholder="Descrição" [(ngModel)]="postData.DispatchFolder.Message"></ion-textarea>
             </div>
           </div>
         </div>

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

@@ -2,41 +2,6 @@
   <app-header></app-header>
 </ion-header>
 
-<!-- <ion-menu autoHide="false" side="end" content-id="main-content">
-  <ion-header>
-    <ion-toolbar translucent>
-      <ion-title>Menu</ion-title>
-    </ion-toolbar>
-  </ion-header>
-  <ion-content>
-    <ion-list>
-      <ion-item (click)="openExpedientActionsModal('0', fulltask)">
-        <ion-icon name="documents" slot="start"></ion-icon>
-        <ion-label>Efectuar Despacho</ion-label>
-      </ion-item>
-      <ion-item (click)="openExpedientActionsModal('1', fulltask)">
-        <ion-icon name="arrow-undo" slot="start"></ion-icon>
-        <ion-label>Pedido de Parecer</ion-label>
-      </ion-item>
-      <ion-item (click)="openExpedientActionsModal('2', fulltask)">
-        <ion-icon name="arrow-redo" slot="start"></ion-icon>
-        <ion-label>Pedido de Deferimento</ion-label>
-      </ion-item>
-      <ion-item (click)="openBookMeetingModal(fulltask)">
-        <ion-icon name="calendar" slot="start"></ion-icon>
-        <ion-label>Marcar reunião</ion-label>
-      </ion-item>
-      <ion-item (click)="discartExpedient()">
-        <ion-icon name="trash" slot="start"></ion-icon>
-        <ion-label>Descartar</ion-label>
-      </ion-item>
-      <ion-item hidden disabled>
-        <ion-icon name="paper-plane" slot="start"></ion-icon>
-        <ion-label>Enviar para pendentes</ion-label>
-      </ion-item>
-    </ion-list>
-  </ion-content>
-</ion-menu> -->
 <div class="ion-page d-none" id="main-content">
   <ion-menu-button></ion-menu-button>
 </div>

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

@@ -227,20 +227,19 @@ export class ExpedienteDetailPage implements OnInit {
     await modal.present();
     modal.onDidDismiss().then( async (res)=>{
       console.log(res['data']);
-      console.log(body);
 
       if(body == 'descartar'){
         if(res['data']== 'Yes'){
           let otherbody = {
             "serialNumber": this.task.SerialNumber,
             "action": "Passivo",
-            "ActionTypeId": 94,
+            "ActionTypeId": 99999877,
             "dataFields": {
               "Note": "",
             }
           }
 
-          try {          
+          try {     
             await this.processes.CompleteTask(otherbody).toPromise()
             this.successMessage()
           } catch (error) {
@@ -255,7 +254,7 @@ export class ExpedienteDetailPage implements OnInit {
       else{
         if(res['data']== 'Yes'){
           try {          
-            await this.processes.CompleteTask(body).toPromise()
+            //await this.processes.CompleteTask(body).toPromise()
             this.successMessage()
           } catch (error) {
             this.badRequest()

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts

@@ -313,21 +313,20 @@ export class ExpedientePrPage implements OnInit {
     await modal.present();
     modal.onDidDismiss().then( async (res)=>{
       console.log(res['data']);
-      console.log(body);
 
       if(body == 'descartar'){
         if(res['data']== 'Yes'){
           let otherbody = {
-            "serialNumber": body.serialNumber,
+            "serialNumber": this.task.SerialNumber,
             "action": "Passivo",
-            "ActionTypeId": 94,
+            "ActionTypeId": 99999877,
             "dataFields": {
               "Note": "",
             }
           }
 
           try {
-            await this.processes.CompleteTask(otherbody).toPromise()
+            await this.processes.CompleteTask(otherbody).toPromise();
             this.successMessage()
           } catch (error) {
             this.badRequest()
@@ -343,7 +342,7 @@ export class ExpedientePrPage implements OnInit {
         if(res['data']== 'Yes'){
 
           try {
-            await this.processes.CompleteTask(body).toPromise()
+            //await this.processes.CompleteTask(body).toPromise()
             this.successMessage()
             this.goBack();
           } catch (error) {

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

@@ -139,8 +139,8 @@
             <p class="text-center exp-card-title">Diplomas para Assinar</p>
             <p class="text-center exp-card-content">{{count_dip_as}} <span class="title1">Documentos</span></p>
           </div>
+          
         </div>
-
       </div>
 
       <!-- Aside right -->

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

@@ -107,7 +107,6 @@
         <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Parecer'">
           <button (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
           <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-          <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
           <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
         </div>
         <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Parecer'">

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

@@ -41,7 +41,6 @@ export class PedidoPage implements OnInit {
   fulltask: any;
   eventsList: Event[];
   serialnumber: string;
-  profile: string;
   intervenientes: any;
   cc: any = [];
   loggeduser: User;
@@ -61,15 +60,11 @@ export class PedidoPage implements OnInit {
       this.activatedRoute.queryParams.subscribe(params => {
           if(params["serialNumber"]) {
             this.serialnumber = params["serialNumber"];
-            // console.log(params["serialNumber"]);
           }
         });
     }
 
   ngOnInit() {
-    this.profile = "mdgpr";
-    // console.log(this.serialnumber);
-    
     this.LoadTaskDetail(this.serialnumber);
   }
 
@@ -255,7 +250,6 @@ export class PedidoPage implements OnInit {
       componentProps: {
         taskAction: taskAction,
         task: this.fulltask,
-        profile: this.profile,
       },
       cssClass: classs,
     });
@@ -286,13 +280,11 @@ export class PedidoPage implements OnInit {
   }
 
   async viewEventDetail(eventId: any) {
-    console.log(this.profile);
 
     const modal = await this.modalController.create({
       component: ViewEventPage,
       componentProps: {
         eventId: eventId,
-        profile: this.profile,
       },
       cssClass: 'modal modal-desktop',
       backdropDismiss: false
@@ -370,6 +362,7 @@ export class PedidoPage implements OnInit {
     await modal.present();
     modal.onDidDismiss();
   }
+
   async openAddNoteModal(actionName:string) {
     let classs;
     if( window.innerWidth <= 800){
@@ -384,25 +377,22 @@ export class PedidoPage implements OnInit {
       cssClass: classs,
       backdropDismiss: true
     });
+    
   
     await modal.present();
   
     modal.onDidDismiss().then(res => {
-
-
       const DocumentToSave = res.data.documents.map((e) => {
         return {
           ApplicationId: e.ApplicationType,
           SourceId: e.Id,
         }
       });
-  
       let docs = {
         ProcessInstanceID: "",
         Attachments: DocumentToSave,
       }
 
-
       if(res.data){
         if(actionName == 'Solicitar Reapreciação') {
 

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

@@ -56,6 +56,9 @@
                     <div class="exp-remetente">
                       <ion-label>{{task.Remetente}}</ion-label>
                     </div>
+                    <div class="exp-workflow">
+                      <span class="label">{{task.activityInstanceName}}</span>
+                    </div>
                     <div class="exp-icon">
                       <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
                       <label></label>
@@ -87,7 +90,7 @@
                       <ion-label>{{task.Remetente}}</ion-label>
                     </div>
                     <div class="exp-workflow">
-                      <span class="label">{{task.WorkflowName}}</span>
+                      <span class="label">{{task.activityInstanceName}}</span>
                     </div>
                     <div class="exp-icon">
                       <ion-menu-button style="width: 35px; height: 41px;" autoHide="false">

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

@@ -32,7 +32,6 @@ export class PedidosPage implements OnInit {
  taskType: string;
  serialNumber:string;
 
- @Input() profile:string;
  @Input() segment:string;
  @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
 
@@ -43,7 +42,6 @@ export class PedidosPage implements OnInit {
     private alertService: AlertService,
     private activatedRoute: ActivatedRoute,
    ) { 
-    this.profile = 'mdgpr';
   }
 
   ngOnInit() {
@@ -100,22 +98,25 @@ export class PedidosPage implements OnInit {
     this.openExpedientDetail.emit(data);
   }
 
-  LoadList(){
+  async LoadList(){
     if(this.segment == 'parecer'){
       this.taskType = "Pedido de Parecer";
-      this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => {
-        this.taskslist = result;
-        console.log(result);
-        
-        this.parecerList = new Array();
-        let res = result.reverse();
-        res.forEach(element => {
 
-          let date = new Date(element.taskStartDate);
-          date.setMonth(date.getMonth() + 1);
-          let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+      let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
+      let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
 
-          let task = {
+      let allParecer = parecer.concat(parecerPr).reverse();
+      console.log(allParecer);
+
+      this.parecerList = new Array();
+
+       allParecer.forEach(element => {
+
+        let date = new Date(element.taskStartDate);
+        date.setMonth(date.getMonth() + 1);
+        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+
+        let task = {
             "SerialNumber": element.serialNumber,
             "Folio": element.workflowInstanceDataFields.Subject,
             "Senders": element.originator.email,
@@ -126,14 +127,13 @@ export class PedidosPage implements OnInit {
             "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
-          }
-          this.parecerList.push(task);
-        });
-        console.log(this.parecerList);
-        
+        }
+        this.parecerList.push(task);
       });
+      console.log(this.parecerList);
+        
     }
-    else if(this.segment == 'deferimento'){
+    else if(this.segment == 'deferimento') {
       this.taskType = "Pedido de Deferimento";
       this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
         this.taskslist = result;
@@ -143,12 +143,11 @@ export class PedidosPage implements OnInit {
         this.deferimentoList = new Array();
         let res = result.reverse();
         res.forEach(element => {
-          
           let date = new Date(element.taskStartDate);
-          date.setMonth(date.getMonth() + 1);
-          let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+        date.setMonth(date.getMonth() + 1);
+        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
 
-          let task = {
+        let task = {
             "SerialNumber": element.serialNumber,
             "Folio": element.workflowInstanceDataFields.Subject,
             "Senders": element.workflowInstanceDataFields.Sender,
@@ -159,7 +158,7 @@ export class PedidosPage implements OnInit {
             "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
-          }
+        }
           this.deferimentoList.push(task);
         });
         console.log(this.deferimentoList);
@@ -176,28 +175,11 @@ export class PedidosPage implements OnInit {
   }
 
   async viewPedidoDetail(serialNumber:any) {
-    console.log(this.profile);
-
-    // const modal = await this.modalController.create({
-    //   component: PedidoPage,
-    //   componentProps:{
-    //     enterAnimation: "",
-    //     serialNumber: serialNumber,
-    //     profile: this.profile,
-    //   },
-    //   cssClass: 'modal modal-desktop',
-    // });
-    // await modal.present();
-    // modal.onDidDismiss().then((res)=>{
-    //   console.log('refresh list');
-    //   this.LoadList();
-    // });
 
     let navigationExtras: NavigationExtras = {
       queryParams: {
         enterAnimation: "",
         serialNumber: serialNumber,
-        profile: this.profile,
       }
     };
     this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);

src/app/pages/login/login.page.ts

@@ -59,7 +59,6 @@ export class LoginPage implements OnInit {
     } else {
       this.userLoginPreference = ''
     }
-    
   }
 
   ngOnInit() {}
@@ -72,7 +71,6 @@ export class LoginPage implements OnInit {
     );
   }
 
-
   async presentAlert(message: string) {
     const alert = await this.alertController.create({
       cssClass: 'my-custom-class',
@@ -84,7 +82,7 @@ export class LoginPage implements OnInit {
     await alert.present();
   }
 
-  loginRocketChat() {
+  /* loginRocketChat() {
 
     let postData = {
       "user": this.username,
@@ -99,7 +97,7 @@ export class LoginPage implements OnInit {
       console.log('Network error');
       this.presentAlert('Network error ' + error);
     });
-  }
+  } */
 
   getToken() {
     // this.notificatinsservice.getAndpostToken(this.username);
@@ -115,7 +113,8 @@ export class LoginPage implements OnInit {
         BasicAuthKey: ""
       }
       if (await this.authService.login(this.userattempt)) {
-        this.loginRocketChat();
+        //this.loginRocketChat();
+        this.authService.loginChat(this.userattempt);
         //this.getToken();
 
         if(!this.pin) {