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

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

@@ -205,7 +205,7 @@ export class EditEventComponent implements OnInit {
   async getDoc() {
     const modal = await this.modalController.create({
       component: SearchPage,
-      cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
+      cssClass: 'modal-width-100-width-background modal',
       componentProps: {
         type: 'AccoesPresidenciais & ArquivoDespachoElect'
       }

src/app/shared/agenda/new-event/new-event.component.ts

@@ -130,7 +130,7 @@ export class NewEventPage implements OnInit {
   async getDoc(){
     const modal = await this.modalController.create({
       component: SearchPage,
-      cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
+      cssClass: 'modal-width-100-width-background modal',
       componentProps: {
         type: 'AccoesPresidenciais & ArquivoDespachoElect'
       }
@@ -186,12 +186,18 @@ export class NewEventPage implements OnInit {
             this.attachmentsService.setEventAttachmentById(attachments).subscribe((res) =>{
               
               if(DocumentToSave.length == (i+1)){
-                this.close();
+                this.afterSave();
               }
             });
 
           });
 
+          
+          if(DocumentToSave.length == 0){
+
+            this.afterSave();
+          }
+
         });
     }
     else if(this.profile=='pr') {
@@ -217,17 +223,33 @@ export class NewEventPage implements OnInit {
             this.attachmentsService.setEventAttachmentById(attachments).subscribe((res) =>{
               
               if(DocumentToSave.length == (i+1)){
-                this.close();
+                this.afterSave();
               }
             });
 
           });
 
+          if(DocumentToSave.length == 0){
+
+            this.afterSave();
+          }
+
         });
     }
 
 
-    this.close();
+
+  }
+
+
+  afterSave(){
+    this.deleteTemporaryData();
+
+    this.onAddEvent.emit(this.postEvent);
+    this.GoBackEditOrAdd.emit();
+
+    this.setIntervenient.emit([]);
+    this.setIntervenientCC.emit([]);
   }
 
   removeAttachment(index: number){

src/app/shared/event/attendee-modal/attendee-modal.page.ts

@@ -38,6 +38,11 @@ export class AttendeeModalPage implements OnInit {
 
     }
 
+  ngOnChanges(){
+    this.LtaskParticipants  = this.taskParticipants;
+    this.LtaskParticipantsCc = this.taskParticipantsCc;
+  }
+
   
   currentPath = window.location.pathname;
   @Input() adding: "intervenient" | "CC";
@@ -56,11 +61,9 @@ export class AttendeeModalPage implements OnInit {
 
   }
   
-  ngOnChanges(event){
-    
-  }
 
   save(){
+
     this.setIntervenient.emit(this.LtaskParticipants);
     this.setIntervenientCC.emit(this.LtaskParticipantsCc);
 
@@ -77,8 +80,8 @@ export class AttendeeModalPage implements OnInit {
 
     /* console.log('data', this.LtaskParticipants, this.LtaskParticipantsCc ); */
     this.dynamicSetIntervenient.emit({
-      LtaskParticipants: this.LtaskParticipants,
-      LtaskParticipantsCc: this.LtaskParticipantsCc
+      taskParticipants: this.LtaskParticipants,
+      taskParticipantsCc: this.LtaskParticipantsCc
     })
 
   }

src/app/shared/headers/header-no-search/profile/profile.component.html

@@ -1,26 +1,24 @@
 
 
 <ion-content class=" bg-blue">
+
     <div class="profile-content">
 
-        <div class="d-flex justify-end">
-            <button class="btn-no-color" (click)="close()">
-                <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
-            </button>
-        </div>
-    
-    
-        <div class="go-back d-flex align-center" >
-            <button class="btn-no-color" (click)="close()">
+        
+        <div class="d-flex justify-space-between align-center">
+            <div class="go-back d-flex align-center"  (click)="close()">
                 <ion-icon class="icon" src="assets/images/icons-calendar-arrow-left.svg"></ion-icon> <div>Perfil</div>
-            </button>
+            </div>
+            
+            <div class="d-flex " (click)="close()">
+                <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+            </div>
         </div>
+
     
         <div >
             <div class="d-flex align-center">       
-                
                 <ion-icon  class="profile-pic"  name="add-circle-outline"></ion-icon>
-       
             </div>
         </div>