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

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

@@ -6,34 +6,26 @@
   </ion-header>
   <ion-content>
     <ion-list>
-      <ion-item (click)="openExpedientActionsModal('0',fulltask)">
+      <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-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-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(task)">
+      <ion-item  (click)="openBookMeetingModal(task)">
         <ion-icon name="calendar" slot="start"></ion-icon>
         <ion-label>Marcar reunião</ion-label>
       </ion-item>
-      <ion-item (click)="deleteEvent()">
+      <!-- <ion-item (click)="deleteEvent()">
         <ion-icon name="trash" slot="start"></ion-icon>
         <ion-label>Descartar</ion-label>
-      </ion-item>
-      <ion-item (click)="editEvent()">
-        <ion-icon name="create-outline" slot="start"></ion-icon>
-        <ion-label>Editar</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-item> -->
     </ion-list>
   </ion-content>
 </ion-menu>
@@ -54,7 +46,7 @@
           <ion-label class="title">{{loadedEvent.Subject}}</ion-label>
         </div>
 
-        <div class="div-icon d-none">
+        <div class="div-icon">
           <button class="btn-no-color" (click)="editEvent()">
             <ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
           </button>
@@ -64,10 +56,6 @@
           
         </div>
 
-        <ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
-          <ion-icon  name="ellipsis-vertical-outline"></ion-icon>
-        </ion-menu-button>
-
       </div>
     </div>
   </ion-toolbar>
@@ -112,10 +100,21 @@
     <div *ngIf="loadedAttachments" class="bottom-content width-100">
       <h5>Documentos Anexados</h5>
       <ion-list class="width-100">
-        <ion-item *ngFor="let attach of loadedAttachments" class="width-100" lines="none" class="ion-no-margin ion-no-padding">
-          <ion-label class="width-100"  (click)="viewDocument(attach.SourceId)">
-            <p class="attach-title-item">{{attach.SourceName}}</p>
-            <p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span></p>
+        <ion-item *ngFor="let attach of loadedAttachments; let i = index" class="width-100" lines="none" class="ion-no-margin ion-no-padding">
+          <ion-label class="width-100 d-flex " >
+            <div class="flex-grow-1"  (click)="viewDocument(attach.SourceId)">
+              <p class="attach-title-item">{{attach.SourceName}}</p>
+              <span class="span-left">{{attach.Stakeholders}}</span>
+            </div>
+
+            <div class="d-flex align-end">
+              <span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span>
+            </div>
+
+            <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+              <ion-icon  name="ellipsis-vertical-outline"></ion-icon>
+            </ion-menu-button>
+
           </ion-label>
         </ion-item>
       </ion-list>

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

@@ -5,10 +5,11 @@ import { EventBody } from 'src/app/models/eventbody.model';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { Event } from 'src/app/models/event.model';
-import { EditEventPage } from 'src/app/pages/agenda/edit-event/edit-event.page';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { momentG }  from 'src/plugin/momentG';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 
 @Component({
   selector: 'app-view-event',
@@ -34,13 +35,13 @@ export class ViewEventPage implements OnInit {
   days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
   
   documents: Attachment[] = [];
+  dicIndex = 0;
 
   @Input() profile:string;
   @Input() eventId: string;
 
   @Output() viewEventDetailDismiss = new EventEmitter<any>();
 
-
   constructor(
     private eventsService: EventsService,
     private attachmentsService: AttachmentsService,
@@ -54,7 +55,6 @@ export class ViewEventPage implements OnInit {
     this.loadedEvent = new Event();
     this.eventBody = { BodyType : "1", Text : ""};
     this.loadedEvent.Body = this.eventBody;
-    
   }
 
   ngOnInit() {
@@ -69,6 +69,10 @@ export class ViewEventPage implements OnInit {
     this.loadEvent();
   }
 
+  docIndex(index: number) {
+    this.dicIndex = index;
+  }
+
   close(){
     console.log(this.isEventEdited);
     
@@ -86,10 +90,8 @@ export class ViewEventPage implements OnInit {
       this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
       this.getAttachments(this.loadedEvent.EventId);
     });
-
-
-
   }
+
   deleteEvent(){
     this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () => 
       {
@@ -131,7 +133,6 @@ export class ViewEventPage implements OnInit {
     });
   }
 
-
   async openExpedientActionsModal(taskAction: any, task: any) {
     //this.modalController.dismiss();
     let classs;
@@ -140,6 +141,21 @@ export class ViewEventPage implements OnInit {
     } else  {
       classs = 'modal modal-desktop showAsideOptions'
     }
+
+    const doc = this.loadedAttachments[ this.dicIndex];
+
+    task = {
+      serialNumber: doc.SourceId,
+      taskStartDate: doc.CreateDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.ApplicationId, 
+        FolderID: null,
+        DocId: doc.SourceId, 
+        Subject: doc.SourceName
+      },
+    }
+
     const modal = await this.modalController.create({
       component: ExpedientTaskModalPage,
       componentProps: {
@@ -162,4 +178,38 @@ export class ViewEventPage implements OnInit {
     });
   }
 
-}
+  async openBookMeetingModal(task: any) {
+
+    const doc = this.loadedAttachments[ this.dicIndex];
+
+    task = {
+      serialNumber: doc.SourceId,
+      taskStartDate: doc.CreateDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.ApplicationId, 
+        FolderID: null,
+        DocId: doc.SourceId, 
+        Subject: doc.SourceName
+      },
+    }
+    
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+}