merge

src/app/modals/add-note/add-note.page.html

@@ -5,7 +5,7 @@
     </div>
   </div>
   <div class="ion-input-class-no-height">
-    <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="note" placeholder="Comentário*" rows="6" cols="20"></ion-textarea>
+    <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="note" placeholder="Comentário" rows="6" cols="20"></ion-textarea>
   </div>
 
   <div *ngIf="hideThisFeature" class="ion-item-container-no-border">
@@ -53,6 +53,7 @@
     <button *ngIf="actionName == 'Executado'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Executado</button>
     <button *ngIf="actionName == 'Gerar Diploma'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Gerar</button>
     <button *ngIf="actionName == 'Arquivar'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Arquivar</button>
+    <button *ngIf="actionName == 'Arquivo'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Arquivar</button>
     <button *ngIf="actionName == 'Reexecução'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Enviar</button>
     <button *ngIf="actionName == 'Concluido'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Concluído</button>
     <button *ngIf="actionName == 'Solicitar assinatura'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Solicitar</button>

src/app/modals/create-process/create-process.page.ts

@@ -103,7 +103,8 @@ export class CreateProcessPage implements OnInit {
   ) {
     this.loggeduser = SessionStore.user;
     this.task = this.navParams.get('task');
-
+    this.fulltask = this.navParams.get('fulltask');
+    console.log(this.task)
     if (this.task.SerialNumber) {
       this.task.serialNumber = this.task.SerialNumber
     }
@@ -127,9 +128,10 @@ export class CreateProcessPage implements OnInit {
     let SourceId;
     let SourceType;
     let SourceSecFsId;
+    const taskId = this.task.workflowInstanceDataFields?.FolderID || this.task?.FolderId || this.task?.FolderID
 
-      if(this.task.workflowInstanceDataFields.FolderID || this.task.FolderId || this.task.FolderID) {
+    if (taskId) {
-        SourceId = this.task.workflowInstanceDataFields.FolderID
+      SourceId = taskId
       SourceType = 'FOLDER'
       SourceSecFsId = 361
     } else {
@@ -147,7 +149,7 @@ export class CreateProcessPage implements OnInit {
       SourceId: SourceId,
       DeadlineType: '',
       SubjectTypes: this.selectedTypes,
-        NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber || NumberPDPP
+      NumberPDPP: this.task?.workflowInstanceDataFields?.DispatchNumber || NumberPDPP || this.fulltask?.workflowInstanceDataFields?.DispatchNumber
     };
 
     this.postData.DispatchFolder = this.dispatchFolder;
@@ -155,7 +157,8 @@ export class CreateProcessPage implements OnInit {
     /* By Default TypeDeadline should be 'Normal' */
     this.postData.Priority = '99999861';
     /* Initialize 'Subject' with the title of the expedient */
-      this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject;
+    console.log('Subject', this.fulltask)
+    this.postData.DispatchFolder.Subject = this.task?.workflowInstanceDataFields?.Subject || this.fulltask?.workflowInstanceDataFields?.Subject;
     this.profile = this.navParams.get('profile');
   }
 
@@ -281,6 +284,29 @@ export class CreateProcessPage implements OnInit {
     const loader = this.toastService.loading()
 
 
+    if (this.fulltask.activityInstanceName == "Assinar Diploma") {
+      this.postData = {
+        DistributionType: "Paralelo",
+        CountryCode: 'AO',
+        Priority: this.postData.Priority,
+        UserEmail: this.loggeduser.Email,
+        UsersSelected: attendees,
+        DispatchFolder: this.dispatchFolder,
+        AttachmentList: docs
+      }
+
+      try {
+        // await this.processes.postDespatcho(this.postData).toPromise();
+        await this.despachoService.createDespacho(this.postData).toPromise();
+        this.executado(this.dispatchFolder.Message, docs.Attachments)
+        this.httpsErrorHanlde.httpsSucessMessagge('Efetuar Despacho')
+        loader.remove();
+      } catch (error) {
+        this.httpsErrorHanlde.httpStatusHandle(error)
+        loader.remove()
+      }
+
+    } else {
       if (this.loggeduser.Profile != 'PR') {
         switch (this.taskType) {
           case '0': // Despacho
@@ -455,6 +481,38 @@ export class CreateProcessPage implements OnInit {
             break;
         }
       }
+    }
+
+
+  }
+
+  async executado(note: string, documents: any) {
+    let body = {
+      "serialNumber": this.fulltask.serialNumber,
+      "action": "Conhecimento",
+      "ActionTypeId": 104,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList": documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.close();
+      this.toastService._successMessage()
+    } catch (error) {
+      if (error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    } finally {
+      loader.remove()
+    }
 
   }
 

src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts

@@ -73,7 +73,9 @@ export class DiplomaAssinarPage implements OnInit {
       componentProps: {
         serialNumber: this.task.SerialNumber,
         task: this.task,
-        showEnviarPendentes: false
+        showEnviarPendentes: false,
+        fulltask: this.fulltask
+
       },
       translucent: true
     });
@@ -83,6 +85,7 @@ export class DiplomaAssinarPage implements OnInit {
   async LoadTaskDetail(serial: string) {
 
     this.processes.GetTask(serial).subscribe(res => {
+      console.log("res", res)
       this.task = {
         "SerialNumber": res.serialNumber,
         "Folio": res.workflowInstanceDataFields.Subject,

src/app/shared/popover/deploma-options/deploma-options.page.html

@@ -13,6 +13,8 @@
         <button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>
         <button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar despacho</button>
         <div class="solid"></div>
       </div>
       <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Diploma Assinado'">
@@ -21,6 +23,12 @@
       <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
         <button (click)="openAddNoteModal('Assinar Diploma')" class="btn-cancel" shape="round" >Assinado</button>
       </div>
+      <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
+        <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivo</button>
+      </div>
+      <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
+        <button (click)="openExpedientActionsModal('0',task)" class="btn-cancel" shape="round" >Efetuar despacho</button>
+      </div>
     </div>
   </div>
 

src/app/shared/popover/deploma-options/deploma-options.page.ts

@@ -6,6 +6,11 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { RouteService } from 'src/app/services/route.service';
 import { PermissionService } from 'src/app/services/permission.service';
+import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+import { AttachmentList } from 'src/app/models/Excludetask';
+import { DespachoService } from 'src/app/Rules/despacho.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 
 @Component({
   selector: 'app-deploma-options',
@@ -28,14 +33,17 @@ export class DeplomaOptionsPage implements OnInit {
     private navParams: NavParams,
     private toastService: ToastService,
     private RouteService: RouteService,
-    public p: PermissionService,) {
+    public p: PermissionService,
+    private despachoService: DespachoService,
+    private httpErroHandle: HttpErrorHandle) {
       this.serialNumber = this.navParams.get('serialNumber');
       this.task = this.navParams.get('task');
       this.fulltask = this.navParams.get('fulltask');
     }
 
   ngOnInit() {
-    
+    console.log(this.fulltask)
+    console.log(this.task)
   }
 
   async openAddNoteModal(actionName:string) {
@@ -85,6 +93,9 @@ export class DeplomaOptionsPage implements OnInit {
         } else if(actionName == 'Concluir diploma'){
           await this.finish(res.data.note, docs);
           this.goBack();
+        } else if (actionName == 'Arquivo') {
+          await this.arquivar(res.data.note, docs);
+          this.goBack();
         }
       }
     });
@@ -233,6 +244,80 @@ export class DeplomaOptionsPage implements OnInit {
 
   }
 
+  async arquivar(note: string, documents: AttachmentList) {
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.despachoService.arquivar(note, documents, this.serialNumber).toPromise()
+      this.httpErroHandle.httpsSucessMessagge('Arquivar')
+      this.close();
+    } catch (error) {
+      this.httpErroHandle.httpStatusHandle(error)
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
+  async openExpedientActionsModal(taskAction: any, task: any) {
+
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    console.log("fulltask options", this.fulltask)
+    const modal = await this.modalController.create({
+      component: CreateProcessPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then(async (res) => {
+      
+
+      if (res['data'] == 'openDiscart') {
+        await this.distartExpedientModal();
+      }
+
+      this.goBack();
+    });
+  }
+
+  async distartExpedientModal() {
+    
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+      componentProps: {
+        serialNumber: this.fulltask.serialNumber,
+        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+
+    await modal.present();
+    modal.onDidDismiss().then(res => {
+      if (res['data'] == 'close') {
+        this.close();
+        /* 
+        this.close();
+        this.openMenu(); */
+      }
+
+    });
+  }
+
   goBack() {
     this.RouteService.goBack()
   }

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "070edbd4f",
+  "shortSHA": "66be958e2",
-  "SHA": "070edbd4faf94338eccc488162df486371263948",
+  "SHA": "66be958e2d7b21b9a80e567bcfc995ec9e53d7cc",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Mar 7 12:31:43 2023 +0100'",
+  "lastCommitTime": "'Thu Mar 9 12:21:09 2023 +0100'",
-  "lastCommitMessage": "fix begin date html erro",
+  "lastCommitMessage": "fix eventos para approvação not opening",
-  "lastCommitNumber": "4848",
+  "lastCommitNumber": "4849",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pages/publications/publications.page.ts\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.ts",
+  "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/modals/add-note/add-note.page.html\n\tmodified:   src/app/modals/create-process/create-process.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified:   version/git-version.ts",
   "changeAuthor": "peter.maquiran"
 }