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,

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

@@ -55,7 +55,6 @@ export class ApproveEventPage implements OnInit {
     this.getTask();
     this.getAttachments();
     
-    // console.log(this.showAside);
   }
 
   notImplemented() {
@@ -79,7 +78,7 @@ export class ApproveEventPage implements OnInit {
     })
   }
 
-  async approveTask(serialNumber:string){
+  async approveTask(serialNumber:string) {
     let body = { "serialNumber": serialNumber, "action": "Aprovar" }
 
     try {
@@ -101,8 +100,6 @@ export class ApproveEventPage implements OnInit {
     }); */
   }
 
-  
-
   async rejectTask(serialNumber:string) {
   
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
@@ -117,13 +114,13 @@ export class ApproveEventPage implements OnInit {
     }
 
   }
-  
-  async getAttachments(){
+   
+  async getAttachments() {
     this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise();
 
   }
 
-  viewDocument(sourceId){
+  viewDocument(sourceId) {
     this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{
       /* console.log(res); */
       const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
@@ -143,7 +140,7 @@ export class ApproveEventPage implements OnInit {
     return await popover.present();
   }
 
-  async emendTask(serialNumber:string){
+  async emendTask(serialNumber:string) {
     console.log('Desktop');
 
     const modal = await this.modalController.create({
@@ -186,7 +183,7 @@ export class ApproveEventPage implements OnInit {
     //this.goBack();
   }
 
-  goToEventsToApprove(){
+  goToEventsToApprove() {
     let navigationExtras: NavigationExtras = {
       queryParams: {
           "eventos": true,
@@ -196,32 +193,10 @@ export class ApproveEventPage implements OnInit {
   }
 
 
+  /** @description edit event to aprove */
   async editar(serialNumber: string) {
-    if(window.innerWidth > 800){
-      console.log('DESTOP');
-      
-      this.EditApproveEventDismiss.emit();
-    }
-    else{
-    /* const modal = await this.modalController.create({
-      component: EditEventToApproveComponent,
-      componentProps: {
-        serialNumber: serialNumber,
-        InstanceId:this.InstanceId
-      },
-      cssClass: 'modal modal-desktop',
-      // backdropDismiss: false
-    });
-    await modal.present();
-    modal.onDidDismiss().then(res => {
-      this.getTask();
-      this.getAttachments();
-    }); */
-    }
+
+    this.EditApproveEventDismiss.emit();
 
   }
-
-
-
-
 }

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html

@@ -13,7 +13,7 @@
           </div>
         </ion-header>
       </div>
-      <ion-item-sliding class="overflow-y-auto">
+      <ion-item-sliding class="overflow-y-auto" >
         <div class="px-20">
           <div class="ion-item-container width-100">
             <ion-input  placeholder="Assunto*" [(ngModel)]="eventProcess.workflowInstanceDataFields.Subject"></ion-input>

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts

@@ -41,7 +41,6 @@ export class EditEventToApprovePage implements OnInit {
   public stepHour = 1;
   public stepMinute = 5;
   public stepSecond = 5;
-
   public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
   public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
 
@@ -88,7 +87,6 @@ export class EditEventToApprovePage implements OnInit {
   show = false
   isRecurring:string;
   isEventEdited: boolean;
-  segment:string = "true";
   profile:string;
   eventAttendees: EventPerson[];
 
@@ -101,7 +99,7 @@ export class EditEventToApprovePage implements OnInit {
 
   showAttendees = false;
 
-  InstanceId: string
+  InstanceId: string;
 
   @Output() openAttendeesComponent = new EventEmitter<any>();
   @Output() clearContact = new EventEmitter<any>();
@@ -109,6 +107,8 @@ export class EditEventToApprovePage implements OnInit {
   @Output() setIntervenientCC = new EventEmitter<any>();
   @Output() closeComponent = new EventEmitter<any>();
 
+  @Input() saveData: any;
+
   constructor(
     private modalController: ModalController,
     private eventsService: EventsService,
@@ -117,9 +117,6 @@ export class EditEventToApprovePage implements OnInit {
     private processes:ProcessesService,
     private toastService: ToastService,
   ) {
-
-   /*  this.serialNumber = this.navParams.get('serialNumber'); */
-
     this.isEventEdited = false;
 
   }
@@ -127,8 +124,6 @@ export class EditEventToApprovePage implements OnInit {
   ngOnInit() {
 
     if(!this.restoreTemporaryData()){ 
-
-    } else {
       alert('restore!!')
     }
 
@@ -223,7 +218,6 @@ export class EditEventToApprovePage implements OnInit {
       ReviewUserComment: ''
     }
 
-    console.log(event);
     
     this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
       this.toastService.successMessage('Evento editado');
@@ -231,7 +225,6 @@ export class EditEventToApprovePage implements OnInit {
       this.toastService.badRequest('Evento não editado');
     })
 
-
     this.loadedAttachments.forEach((document:any)=>{
       if(document['action'] == 'add') {
         delete document.action
@@ -251,7 +244,6 @@ export class EditEventToApprovePage implements OnInit {
 
     })
 
-
     this.modalController.dismiss();
 
   }
@@ -283,21 +275,21 @@ export class EditEventToApprovePage implements OnInit {
   }
 
 
-  async addParticipants() {
+  // async addParticipants() {
 
-    //this.saveTemporaryData();
+  //   //this.saveTemporaryData();
 
-    this.openAttendeesComponent.emit({
-      type: "intervenient"
-    });
+  //   this.openAttendeesComponent.emit({
+  //     type: "intervenient"
+  //   });
 
-    this.clearContact.emit();
-  }
+  //   this.clearContact.emit();
+  // }
 
 
   async addParticipantsCC() {
 
-    //this.saveTemporaryData();
+  //   //this.saveTemporaryData();
 
     this.openAttendeesComponent.emit({
       type: "CC"
@@ -333,6 +325,8 @@ export class EditEventToApprovePage implements OnInit {
   }
   
 
+  //   this.clearContact.emit();
+  // }
 
   async getAttachments() {
 

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

@@ -20,7 +20,6 @@ import * as moment from 'moment';
 })
 export class EditEventPage implements OnInit {
 
-
   stEvent: Event;
   isRecurring:string;
   isEventEdited: boolean;
@@ -86,7 +85,6 @@ export class EditEventPage implements OnInit {
   public stepMinutes = [1, 5, 10, 15, 20, 25];
   public stepSeconds = [1, 5, 10, 15, 20, 25];
 
-
   constructor(
     private modalController: ModalController,
     private eventsService: EventsService,
@@ -96,12 +94,11 @@ export class EditEventPage implements OnInit {
   }
 
   ngOnInit() {
-    
 
-    if(!this.restoreTemporaryData()){
+    if(!this.restoreTemporaryData()) {
       // clear
  
-      if(this.postEvent){
+      if(this.postEvent) {
         if( this.postEvent.Body){
           if(typeof(this.postEvent.Body.Text) == 'string'){
             this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, '');
@@ -128,7 +125,7 @@ export class EditEventPage implements OnInit {
   
       this.isEventEdited = false;
   
-      if(this.postEvent.IsRecurring == false){
+      if(this.postEvent.IsRecurring == false) {
         this.isRecurring = "Não se repete";
       }
       else{
@@ -139,7 +136,6 @@ export class EditEventPage implements OnInit {
     this.getAttachments(this.postEvent.EventId);
 
     this.restoreDatepickerData()
-   
   }
   
   close() {
@@ -190,7 +186,6 @@ export class EditEventPage implements OnInit {
     this.clearContact.emit();
   }
 
-
   async addParticipantsCc() {
 
     this.saveTemporaryData();
@@ -245,7 +240,6 @@ export class EditEventPage implements OnInit {
       return false;
     }
     
-    
   }
 
   deleteTemporaryData(){

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

@@ -15,8 +15,8 @@ export class EventListPage implements OnInit {
   // [desktop] event list to approve
 
   showLoader: boolean;
-  eventsPRList: any;
-  eventsMDGPRList: any;
+  eventsPRList: any = []
+  eventsMDGPRList: any = []
   eventPerson: EventPerson;
   eventBody: EventBody;
   categories: string[];