Edit process to approve

src/app/home/home-routing.module.ts

@@ -136,6 +136,15 @@ const routes: Routes = [
               },
             ]  
           },
+          {
+            path: 'events-to-approve',
+            children: [
+              {
+                path: '',
+                loadChildren: ()=> import('../shared/gabinete-digital/edit-event-to-approve/edit-event.module')
+              }
+            ]
+          }
         ]
       },
       {

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

@@ -469,6 +469,7 @@
       
       <app-approve-event  class="d-flex flex-column" *ngIf="mobileComponent.showEventToApprove" [class.transparent]="mobileComponent.transparentEventToApprove"
         [serialNumber] = "eventToaprove.serialNumber"
+        [InstanceId] = "eventToaprove.InstanceId"
         (cloneAllmobileComponent)="viewEventDetailDismiss($event)"
         (closeEventToApprove)="closeEventToApprove()"
         (AproveEventEditEvent)="AproveEventEditEvent($event)"

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

@@ -1042,7 +1042,8 @@ export class AgendaPage implements OnInit {
       this.eventToaprove = {
         back: true,
         saveData: saveData,
-        serialNumber:serialNumber
+        serialNumber:serialNumber,
+        InstanceId: saveData.workflowInstanceDataFields.InstanceId || ""
       }
       // this.mobileComponent.showEventList = false;
       this.mobileComponent.transparentEventList = true;

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

@@ -115,33 +115,34 @@ export class EditEventPage implements OnInit {
 
   async openAttendees() {
 
-    if(window.innerWidth <= 1024) {
-      const modal = await this.modalController.create({
-        component: AttendeesPage,
-         componentProps: {
-          adding: this.adding,
-          taskParticipants: this.taskParticipants,
-          taskParticipantsCc: this.taskParticipantsCc
-        },
-        cssClass: 'attendee',
-        backdropDismiss: false
-      });
-  
-      await modal.present();
-  
-      modal.onDidDismiss().then((data) => {
-        
-        if(data){
-          data = data['data'];
 
-          const newAttendees: EventPerson[] = data['taskParticipants'];
-          const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
+    const modal = await this.modalController.create({
+      component: AttendeesPage,
+        componentProps: {
+        adding: this.adding,
+        taskParticipants: this.taskParticipants,
+        taskParticipantsCc: this.taskParticipantsCc
+      },
+      cssClass: 'attendee',
+      backdropDismiss: false
+    });
+
+    await modal.present();
+
+    modal.onDidDismiss().then((data) => {
+      
+      if(data){
+        data = data['data'];
+
+        const newAttendees: EventPerson[] = data['taskParticipants'];
+        const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
+
+        this.setIntervenient(newAttendees);
+        this.setIntervenientCC(newAttendeesCC);
+      }
+    });
+
 
-          this.setIntervenient(newAttendees);
-          this.setIntervenientCC(newAttendeesCC);
-        }
-      });
-    }
   }
 
   setIntervenient(data){

src/app/pages/agenda/new-event/new-event.page.ts

@@ -153,6 +153,7 @@ export class NewEventPage implements OnInit {
 
 
   async openAttendees() {
+    
     const modal = await this.modalController.create({
       component: AttendeesPage,
        componentProps: {

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html

@@ -8,8 +8,8 @@
     <div class="header-title flex-grow-1">
       <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
     </div>
-    <div class="header-icon-right cursor-pointer">
-      <ion-icon (click)="notImplemented()" src="assets/images/icons-edit.svg"></ion-icon>
+    <div class="header-icon-right cursor-pointer" (click)="editar(loadedEvent.serialNumber)">
+      <ion-icon  src="assets/images/icons-edit.svg"></ion-icon>
     </div>
   </div>
 </ion-header>
@@ -72,17 +72,26 @@
   </div>
   <div class="line"></div>
 
-  <div *ngIf="loadedAttachments" class="bottom-content">
-    <ion-list>
-      <h3>Documentos Anexados</h3>
-      <ion-item class="ion-no-padding ion-no-margin">
-      <ion-label>
-        <p class="attach-title-item">Receita por Natureza</p>
-        <p><span class="span-left">{{loadedAttachments.Remetente}}</span><span class="span-right">{{loadedAttachments.CreateDate}}<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
-      </ion-label>
-    </ion-item>
+  <div class="d-flex container-div width-100"  > 
+    <ion-list class="width-100 " >
+      <ion-item class="width-100"   *ngFor="let document of loadedAttachments">
+        <ion-label class="width-100 d-block list">
+          <p class="d-flex ion-justify-content-between"> 
+            <span class="attach-title-item">{{document.SourceName}}</span> 
+            <span class="app-name" *ngIf="document.ApplicationId  == 8"> Correspondencia </span>
+            <span class="app-name" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
+            <span class="app-name" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
+            <span class="close-button text-black" >
+              <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
+            </span>
+
+          </p> 
+          <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
+        </ion-label>
+      </ion-item>
     </ion-list>
-  </div>
+  </div> 
+
 </ion-content>
 <ion-footer>
   <!-- <ion-toolbar>

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss

@@ -140,3 +140,56 @@ ion-menu{
   padding: 20px;
   overflow: auto;
 }
+
+
+
+
+.app-name{
+  background: #42b9f2;
+  border-radius: 18px;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  padding: 0px 5px;
+  color: white;
+  font-size: 9pt;
+  font-weight: 500;
+  height: 19px;
+  -webkit-border-radius: 18px;
+  -moz-border-radius: 18px;
+  -ms-border-radius: 18px;
+  -o-border-radius: 18px;
+}
+
+
+.close-button {
+display: none;
+}
+
+
+.list:hover {
+
+.app-name {
+  display: none;
+}
+
+.close-button {
+  display: block !important;
+}
+}
+
+.attach-title-item{
+  width: 100%;
+  font-size: 15px;
+  color:#0d89d1;
+}
+/* SPAN */
+.span-left{
+  float: left;
+  font-size: 15x;
+}
+.span-right{
+text-align: right;
+float: right;
+font-size: 13px;
+}

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts

@@ -5,6 +5,7 @@ import { Event } from 'src/app/models/event.model';
 import { AlertService } from 'src/app/services/alert.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { ProcessesService } from 'src/app/services/processes.service';
+import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
 import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend-message-modal.page';
 import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page';
 
@@ -24,7 +25,7 @@ export class ApproveEventModalPage implements OnInit {
 
   months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
   days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
-
+  InstanceId: string
 
   constructor(
     private router: Router,
@@ -37,6 +38,8 @@ export class ApproveEventModalPage implements OnInit {
     private alertService: AlertService,
     private activatedRoute: ActivatedRoute,
   ) {
+
+
     this.activatedRoute.paramMap.subscribe(paramMap =>
     {
       if (!paramMap.has("serialNumber")){
@@ -73,8 +76,13 @@ export class ApproveEventModalPage implements OnInit {
       console.log(new Date(this.today));
       this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
       
+      this.InstanceId = res.workflowInstanceDataFields.InstanceId
+      this.getAttachments()
+
     })
   }
+
+  
   approveTask(serialNumber:string){
     console.log('approveTask SERIALNUMBER: ', serialNumber)
     let body = { "serialNumber": serialNumber, "action": "Aprovar" }
@@ -100,12 +108,10 @@ export class ApproveEventModalPage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/event-list']);
     this.modalController.dismiss(null);
   }
-  getAttachments(){
-    this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{
-      console.log('getAttachments: ',this.serialNumber)
-      this.loadedAttachments = res;
-      console.log(res);
-    });
+  async getAttachments(){
+
+    this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise();
+
   }
 
   async openOptions(ev:any) {
@@ -149,5 +155,27 @@ export class ApproveEventModalPage implements OnInit {
     }
   });
 }
+
+
+
+  async editar(serialNumber: string) {
+
+    const modal = await this.modalController.create({
+      component: EditEventToApproveComponent,
+      componentProps: {
+        serialNumber: serialNumber
+      },
+      cssClass: 'modal modal-desktop',
+      // backdropDismiss: false
+    });
+
+    await modal.present();
+
+    modal.onDidDismiss().then(res => {
+      this.getTask();
+      this.getAttachments();
+    });
+
+  } 
   
 }

src/app/pages/gabinete-digital/event-list/event-list.page.html

@@ -33,7 +33,7 @@
         <ion-list>
           <ion-item-sliding>
             <ion-item class="Rectangle cursor-pointer" lines="none" 
-              *ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
+              *ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber, event)">
               
               <div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                 <div class="approve-event-time">
@@ -55,7 +55,7 @@
       <div *ngIf="eventsPRList">
         <ion-item-sliding>
           <ion-item class="Rectangle cursor-pointer" lines="none" 
-              *ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber)">
+              *ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber, event)">
               <div class="content-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                 <div class="approve-event-time">
                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -72,7 +72,7 @@ export class EventListPage implements OnInit {
     });
   }
 
-  async openApproveModal(eventSerialNumber){
+  async openApproveModal(eventSerialNumber, event){
 
 
     const modal = await this.modalController.create({
@@ -86,7 +86,7 @@ export class EventListPage implements OnInit {
 
     await modal.present();
 
-    modal.onDidDismiss();
+
   }
 
   doRefresh(event) {

src/app/shared/agenda/approve-event/approve-event.component.html

@@ -49,7 +49,7 @@
         <div class="header-title flex-grow-1">
           <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
         </div>
-        <div  (click)="notImplemented()" class="header-icon-right display-none-{{showAside}}">
+        <div  (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
           <ion-icon src="assets/images/icons-edit.svg"></ion-icon>
         </div>
       </div>
@@ -129,7 +129,6 @@
         <ion-icon  name="ellipsis-vertical-outline"></ion-icon>
       </ion-menu-button>
       <button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
-      <button full  class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
       <button hidden class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</button>
 
     </div>

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

@@ -180,9 +180,10 @@ export class ApproveEventComponent implements OnInit {
 
   async editar(serialNumber: string) {
     
+
     const modal = await this.modalController.create({
       component: EditEventToApproveComponent,
-      componentProps:{
+      componentProps: {
         serialNumber: serialNumber,
         InstanceId:this.InstanceId
       },
@@ -193,7 +194,8 @@ export class ApproveEventComponent implements OnInit {
     await modal.present();
 
     modal.onDidDismiss().then(res => {
-
+      this.getTask();
+      this.getAttachments();
     });
 
   } 

src/app/shared/agenda/event-list/event-list.component.html

@@ -30,7 +30,7 @@
        <ion-item 
          class="item ion-no-padding width-100 cursor-pointer" 
          *ngFor="let event of eventsMDGPRList" 
-         (click)="openApproveModal(event.serialNumber)">
+         (click)="openApproveModal(event.serialNumber, event)">
          <div class="event-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
              <div class="approve-event-time">
                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>

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

@@ -1,6 +1,6 @@
 <ion-content>
   <!-- Edit event for Inicio -->
-  <div class="main-content height-100">
+  <div class="main-content height-100 d-flex">
 
     <div class="content d-flex flex-column width-md-100 height-100">
       
@@ -19,7 +19,6 @@
           <div class="ion-item-container width-100">
             <ion-input  placeholder="Assunto" [(ngModel)]="eventProcess.workflowInstanceDataFields.Subject"></ion-input>
           </div>
-          {{eventProcess.workflowInstanceDataFields.Subject}}
           <div class="container-div width-100">
             <div class="ion-item-class-2">
               <div class="ion-icon-class">
@@ -150,7 +149,7 @@
                     </ion-list>
                   </ion-item>
                 </div>
-                <div class="add-people cursor-pointer"  (click)="addParticipants();showAttendees=true">
+                <div class="add-people cursor-pointer"  (click)="addParticipants()">
                   <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
                 </div>
               </div>
@@ -171,7 +170,7 @@
                     </ion-list>
                   </ion-item>
                 </div>
-                <div class="add-people cursor-pointer" (click)="addParticipantsCC();showAttendees=true">
+                <div class="add-people cursor-pointer" (click)="addParticipantsCC()">
                   <ion-icon  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
                 </div>
               </div>
@@ -189,23 +188,23 @@
             </ion-label>
           </div>
           
-          <div class="d-flex container-div width-100"  *ngFor="let document of loadedEventAttachments" > 
-            <ion-list class="width-100 list" >
-              <ion-item class="width-100">
-              <ion-label class="width-100">
-                <p class="d-flex ion-justify-content-between"> 
-                  <span class="attach-title-item">{{document.SourceName}}</span> 
-                  <span class="app-name" *ngIf="document.ApplicationId  == 8"> Correspondencia </span>
-                  <span class="app-name" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
-                  <span class="app-name" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
-                  <span class="close-button text-black" (click)="deleteAttachment(document.Id)" >
-                    <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
-                  </span>
-      
-                </p> 
-                <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
-              </ion-label>
-            </ion-item>
+          <div class="d-flex container-div width-100"  > 
+            <ion-list class="width-100 " >
+              <ion-item class="width-100"   *ngFor="let document of loadedAttachments">
+                <ion-label class="width-100 d-block list">
+                  <p class="d-flex ion-justify-content-between"> 
+                    <span class="attach-title-item">{{document.SourceName}}</span> 
+                    <span class="app-name" *ngIf="document.ApplicationId  == 8"> Correspondencia </span>
+                    <span class="app-name" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
+                    <span class="app-name" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
+                    <span class="close-button text-black" (click)="deleteAttachment(document.Id)" >
+                      <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
+                    </span>
+        
+                  </p> 
+                  <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
+                </ion-label>
+              </ion-item>
             </ion-list>
           </div> 
 
@@ -217,13 +216,13 @@
 
     </div>
 
-    <!-- <app-attendee-modal class="aside-right flex-column height-100 d-none d-md-flex pt-10"
+    <app-attendee-modal class="aside-right flex-column height-100 d-none d-md-flex pt-10"
       *ngIf="showAttendees"
       [taskParticipants]="taskParticipants"
       [taskParticipantsCc]="taskParticipantsCc"
       [adding]="adding"
       (dynamicSetIntervenient)="dynamicSetIntervenient($event)"
-    ></app-attendee-modal> -->
+    ></app-attendee-modal>
 
   </div>    
 </ion-content>

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss

@@ -4,11 +4,11 @@
   display: none;
 }
 
-.content{
-  margin: 0;
-  float: left;
-  border-left: 1px solid #d8d8d8 !important;
-}
+  .content {
+    margin: 0;
+    float: left;
+    border-right: 1px solid #d8d8d8 !important;
+  }
   .main-header{
     font-family: Roboto;
     background-color: #fff;

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

@@ -29,7 +29,8 @@ export class EditEventToApproveComponent implements OnInit {
       Agenda: '',
       EndDate: '',
       Location: '',
-      Subject: ''
+      Subject: '',
+      InstanceId: ''
     }
   }
 
@@ -63,17 +64,12 @@ export class EditEventToApproveComponent implements OnInit {
   ) {
 
     this.serialNumber = this.navParams.get('serialNumber');
-    this.postEvent = this.navParams.get('event');
-    this.profile = this.navParams.get('profile');
-    this.InstanceId = this.navParams.get('InstanceId')
+    // this.profile = this.navParams.get('profile');
 
     this.isEventEdited = false;
 
-    console.log(this.eventProcess.workflowInstanceDataFields.Subject)
-
 
     this.getTask()
-    this.getAttachments()
 
   }
 
@@ -90,7 +86,11 @@ export class EditEventToApproveComponent implements OnInit {
       let body : any =this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '')
       this.eventProcess.workflowInstanceDataFields.Body = body
       this.Location = this.eventProcess.workflowInstanceDataFields.Location
-      
+
+      this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId
+      this.getAttachments()
+
+
       // attendees
       //this.eventProcess.workflowInstanceDataFields.ParticipantsList
       // subject
@@ -121,10 +121,6 @@ export class EditEventToApproveComponent implements OnInit {
         }
       })
     })
-
-
-
-
   }
 
   ngOnInit() {
@@ -147,7 +143,6 @@ export class EditEventToApproveComponent implements OnInit {
 
     this.eventProcess.workflowInstanceDataFields.ParticipantsList = this.taskParticipants.concat(this.taskParticipantsCc)
 
-
   }
 
   async openAttendees() {
@@ -178,6 +173,8 @@ export class EditEventToApproveComponent implements OnInit {
           this.setIntervenientCC(newAttendeesCC);
         }
       });
+    } else {
+      this.showAttendees = true
     }
   }
 
@@ -197,6 +194,7 @@ export class EditEventToApproveComponent implements OnInit {
   }
 
   addParticipantsCC(){
+    
     this.adding = 'CC'
     this.openAttendees();
   }
@@ -206,12 +204,11 @@ export class EditEventToApproveComponent implements OnInit {
     this.taskParticipantsCc = taskParticipantsCc;
   }
 
-  
-  async getAttachments(){
+
+  async getAttachments() {
     this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise();
 
     console.log(this.loadedAttachments)
-
   }
 
   deleteAttachment(attachmentID: string) {
@@ -235,18 +232,19 @@ export class EditEventToApproveComponent implements OnInit {
     await modal.present();
     modal.onDidDismiss().then( async (res)=>{
       if(res){
-
+        
         const data = res.data;
+
         //data.selected
         const DocumentToSave = {
           SourceTitle: data.selected.Assunto,
-          ParentId: this.postEvent.EventId,
+          ParentId: this.InstanceId,
           Source: '1',
           SourceId: data.selected.Id,
           ApplicationId: data.selected.ApplicationType.toString(),
-          Id: '0',
+          Id: '',
           Link: '',
-          SerialNumber: '',
+          SerialNumber: ''
         };
 
         await this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(()=>{