Edit process to approve

2026-04-19 04:57:52 +00:00 · 2021-05-04 15:44:48 +01:00
parent ab1954255e
commit 6a3fda279e
16 changed files with 203 additions and 102 deletions
@@ -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)"
@@ -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;
@@ -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){
@@ -153,6 +153,7 @@ export class NewEventPage implements OnInit {


  async openAttendees() {
+    
    const modal = await this.modalController.create({
      component: AttendeesPage,
       componentProps: {
@@ -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>
@@ -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;
+}
@@ -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();
+    });
+
+  } 
  
 }
@@ -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>
@@ -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) {