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

src/app/models/modal.ts

@@ -1,4 +1,11 @@
 interface BookMeetingModalPagecomponentProps {
     task: any
 }
-interface BookMeetingModalPageReturn {}
+interface BookMeetingModalPageReturn {}
+
+interface ExpedientTaskModalPageComponentProps {
+    taskAction: any
+    task: any
+    profile: any
+}
+interface ExpedientTaskModalPageReturn {}

src/app/pages/agenda/view-event/view-event.page.html

@@ -29,9 +29,24 @@
 
       <div class="overflow-y-auto">
         <div class="upper-content ml-45">
+          
           <div class="content-location">
-            <p><span class="date">{{loadedEvent.Location}}</span><span class="label">{{loadedEvent.CalendarName}}</span></p>
+            <span class="date">{{loadedEvent.Location}}</span>
+            
+            <div *ngIf="loadedEvent.Organizer">
+              <div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Presidente da República' ">
+                <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span>
+                <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span>
+              </div>
+      
+              <div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Ministro e Director do Gabinete do PR' ">
+                <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' "  style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span>
+                <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span>
+              </div>
+            </div>
+    
           </div>
+
           <div class="content-details">
             <ion-label>
               <p>{{customDate}}</p>

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

@@ -4,17 +4,84 @@
 
 <ion-content>
   <div class="main-content d-flex height-100">
+    <div class="content d-flex flex-column" *ngIf="task">
+      <div class="main-header">
+        <div class="title-content width-100 d-flex justify-space-between align-center">
+          <div class=" btn-dismiss font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
+            <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </div>
+          <div class="middle d-flex align-center flex-grow-1">
+            <ion-label class="title">{{ task.Folio}}</ion-label>
+          </div>
+          <div class="div-icon" (click)="openOptions()">
+            <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
+          </div>
+        </div>
+      </div>
+      <div class="upper-content">
+        <div class="content-details">
+          <ion-label>
+            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
+            <p><span class="color-red">{{ task.DeadlineType }}</span></p>
+          </ion-label>
+        </div>
+      </div>
+      <div class="line"></div>
+      
+      <div class="overflow-y-auto" style="margin-right: -20px; margin-right: -20px;">
+        <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="cc.length > 0">
+            <h5>Com conhecimento</h5>
+            <ion-item class="ion-no-margin ion-no-padding">
+              <ion-label>
+                <div *ngFor="let c of cc">
+                  <p>{{c.Name}}</p>
+                </div>
+              </ion-label>
+            </ion-item>
+          </div>
+          <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
+            <h5>Detalhes</h5>
+            <ion-item class="ion-no-margin ion-no-padding">
+                <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+            </ion-item>
+          </div>
+        </div>
+        <div class="bottom-content width-100">
+          <ion-list>
+            <h5>Documentos Anexados</h5>
+            <ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of fulltask.Documents">
+              <ion-label class="d-block" (click)="viewDocument(Document.DocId)">
+                <p class="attach-title-item">{{ Document.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+                <p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}</span></p>
+              </ion-label>
+            </ion-item>
+          </ion-list>
+        </div>
+      </div>
+
+    </div>
 
     <app-task-details class="content d-flex flex-column"
-      [task]="task"
-      [intervenientes]="intervenientes"
-      [cc]="cc"
-      [customDate]="customDate"
-      [fulltask]="fulltask"
-      (openOptions)="openOptions($event)"
-      (goBack)="goBack()"
-      (viewDocument)="viewDocument($event)"
-    ></app-task-details>
+    [task]="task"
+    [intervenientes]="intervenientes"
+    [cc]="cc"
+    [customDate]="customDate"
+    [fulltask]="fulltask"
+    (openOptions)="openOptions($event)"
+    (goBack)="goBack()"
+    (viewDocument)="viewDocument($event)"
+  >
+
+
 
     <div *ngIf="task" class="aside-right flex-column height-100">
       <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
@@ -48,7 +115,6 @@
         <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
       </div>
     </div>
-    
   </div>
 </ion-content>
 

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

@@ -1,7 +1,5 @@
 import { Component, OnInit } from '@angular/core';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { AttachmentsService } from 'src/app/services/attachments.service';
-import { EventsService } from 'src/app/services/events.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { Event } from '../../../../models/event.model';
@@ -43,7 +41,6 @@ export class PedidoPage implements OnInit {
   intervenientes: any;
   cc: any = [];
   loggeduser: User;
-  fromPeddingList = false
 
   constructor(private activatedRoute: ActivatedRoute,
     private processes: ProcessesService,

src/app/services/modal.service.ts

@@ -12,19 +12,28 @@ export class ModalService {
     private modalController: ModalController,
   ) { }
 
-
-  BookMeetingModalPage(e:BookMeetingModalPagecomponentProps, { classs, backdropDismiss = false }) {
+  BookMeetingModalPage(e:BookMeetingModalPagecomponentProps, { cssClass='', backdropDismiss = false }) {
     return this.modalController.create({
       component: BookMeetingModalPage,
       componentProps: {
         task: e.task,
       },
-      cssClass: classs,
+      cssClass,
       backdropDismiss
     });
   }
 
-  ExpedientTaskModalPage(task, { classs, backdropDismiss = false }) {
+  ExpedientTaskModalPage(e:ExpedientTaskModalPageComponentProps, { cssClass ="", backdropDismiss = false }) {
+    
+    return this.modalController.create({
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: e.taskAction,
+        task: e.task,
+        profile: e.profile,
+      },
+      cssClass,
+    });
 
   }