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

src/app/pages/agenda/agenda.page.html

@@ -417,7 +417,7 @@
       >
       </app-event-list>
 
-      
+      <!-- Edit event to approve -->
       <app-approve-event  class="d-flex flex-column" 
         *ngIf="mobileComponent.showEventToApprove" 
         [class.transparent]="mobileComponent.transparentEventToApprove"
@@ -437,6 +437,7 @@
         *ngIf="mobileComponent.showEditEventToApprove"
         [taskParticipants]="taskParticipants"
         [taskParticipantsCc]="taskParticipantsCc"
+        [saveData] = "eventToaprove.saveData"
         [serialNumber] = "eventToaprove.serialNumber"
         [saveData] = "eventToaprove.saveData"
         (setContact)="setContact($event)"

src/app/pages/agenda/agenda.page.ts

@@ -114,7 +114,7 @@ export class AgendaPage implements OnInit {
   eventsListOficial: Event[];
 
   // this will make  toggle add event and.
-  showEventEditOrOpen:  "edit" | "add" | "" = ""
+  showEventEditOrOpen:  "edit" | "add" | "" | "eventoToApprove" = ""
   prEventList: Event[];
   mdEventList: Event[];
 
@@ -232,8 +232,6 @@ export class AgendaPage implements OnInit {
     this.eventSelectedDate =  event.start;
     this.selectedEventId = event.id;
 
-    // this.viewEventDetail(event.id);
-
     this.cloneAllmobileComponent();
 
     
@@ -1190,11 +1188,11 @@ export class AgendaPage implements OnInit {
   }
 
   // open component
-  async viewEventDetailDismiss(data){
+  async viewEventDetailDismiss(data) {
     
     await this.cloneAllmobileComponent()
 
-    if (data.type == 'edit'){
+    if (data.type == 'edit') {
       
       this.selectedEvent = data.event;
       this.postEvent = data.event;
@@ -1221,7 +1219,6 @@ export class AgendaPage implements OnInit {
     }
   }
 
-
   approveEventDismissGoBack() {
 
     window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}
@@ -1231,33 +1228,42 @@ export class AgendaPage implements OnInit {
 
   }
 
-
-  approveEventDismiss({saveData, serialNumber, action}){
+  approveEventDismiss({saveData, serialNumber, action}) {
 
     window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}
     
-    if(action == 'Aprovar'){
+    if(action == 'Aprovar') {
       this.eventToaprove = {
         back: true,
         saveData: saveData,
         serialNumber:serialNumber,
+        action: action,
         InstanceId: saveData.workflowInstanceDataFields.InstanceId || ""
       }
-      // this.mobileComponent.showEventList = false;
+
       this.mobileComponent.transparentEventList = true;
       this.mobileComponent.showEventToApprove = true;
+
     }
 
-
+    this.showEventEditOrOpen = "eventoToApprove"
   }
 
   closeEventToApprove() {
-    
-    this.mobileComponent.showEventToApprove = false;
-    this.mobileComponent.showEventList = true;
+    if (this.eventToaprove.back ==true && this.mobileComponent.showEventList ==true) {
+      this.mobileComponent.transparentEventList = false;
+      this.mobileComponent.showEventToApprove = false;
+      this.eventToaprove.back = false;
+
+    }
+    else {
+
+      this.mobileComponent.showEventToApprove = false;
+      this.mobileComponent.showEventList = false;
+    }
 
   }
-
+    
   closeEventToApproveGoBack() {
     if( window.innerWidth <= 801){
       this.router.navigate(['/home/agenda/event-list']);
@@ -1269,12 +1275,14 @@ export class AgendaPage implements OnInit {
     }
   }
 
-  EditApproveEventDismiss(){
+  // called from emitters
+  /** @description open component to edit event to approve */
+  EditApproveEventDismiss() {
     this.cloneAllmobileComponent();
     this.mobileComponent.showEditEventToApprove = true;
   }
 
-  async cloneAllmobileComponent(){
+  async cloneAllmobileComponent() {
 
     this.mobileComponent.showAddNewEvent = false;
     this.mobileComponent.showEditEvent = false;
@@ -1288,7 +1296,7 @@ export class AgendaPage implements OnInit {
     this.closeEventToApprove();
   }
 
-  async AproveEventEditEvent(data){
+  async AproveEventEditEvent(data) {
     this.postEvent =data;
     this.mobileComponent.transparentEventToApprove= true;
     this.mobileComponent.showAddNewEvent = true;
@@ -1303,11 +1311,11 @@ export class AgendaPage implements OnInit {
     this.mobileComponent.showAttendees = true;
   }
 
-  async clearContact(){
+  async clearContact() {
     this.contacts = [];
   }
 
-  async setContact(data:EventPerson[]){
+  async setContact(data:EventPerson[]) {
     this.contacts = data;
   }
 
@@ -1319,7 +1327,7 @@ export class AgendaPage implements OnInit {
 
   async GoBackEditOrAdd() {
     
-    if(this.showEventEditOrOpen == "edit"){
+    if(this.showEventEditOrOpen == "edit") {
       this.cloneAllmobileComponent();
 
       this.mobileComponent.showEditEvent = true;
@@ -1327,7 +1335,11 @@ export class AgendaPage implements OnInit {
       this.cloneAllmobileComponent();
 
       this.mobileComponent.showAddNewEvent = true;
-    } else {
+    } else if(this.showEventEditOrOpen == "eventoToApprove") {
+      this.cloneAllmobileComponent();
+      this.mobileComponent.showEditEventToApprove = true
+    }
+    else {
       // do Nothings
     }
 

src/app/pages/publications/new-publication/new-publication.page.ts

@@ -66,7 +66,7 @@ export class NewPublicationPage implements OnInit {
     this.clear();
     // this.takePicture();
   }
-  takePicture(){
+  takePicture() {
     const options: CameraOptions = {
       quality: 90,
       destinationType: this.camera.DestinationType.DATA_URL,