fix

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

@@ -31,18 +31,7 @@
             </div>
           </div>
 
-          <div class="container-div width-100" >
+
-            <div class="ion-item-class-2 d-flex width-100">
-              <div class="ion-icon-class">
-                <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
-              </div>
-              <div class="ion-input-class flex-grow-1 justify-center align-center material-inputs " [class.input-error]="Form?.get('CalendarName')?.invalid  && validateFrom ">
-      
-                <ion-input [disabled]=true autocomplete="on" autocorrect="on" spellcheck="true" placeholder="CalendarName*" [(ngModel)]="CalendarNameOwnerName"></ion-input>
-      
-              </div>
-            </div>
-          </div>
 
           <div class="container-div width-100">
             <div class="ion-item-class-2">
@@ -66,6 +55,19 @@
             </div>
           </div>
 
+          <div class="container-div width-100" >
+            <div class="ion-item-class-2 d-flex width-100">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class flex-grow-1 justify-center align-center material-inputs " >
+      
+                <ion-input [disabled]=true autocomplete="on" autocorrect="on" spellcheck="true" placeholder="CalendarName*" [(ngModel)]="CalendarNameOwnerName"></ion-input>
+      
+              </div>
+            </div>
+          </div>
+
           <div class="container-div width-100">
             <div class="ion-item-class-2 width-100 d-flex">
               <div class="ion-icon-class">

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

@@ -37,6 +37,8 @@ export class DiplomaAssinarPage implements OnInit {
   customDate: any;
   caller:string;
   mergedArray: any = [];
+  DraftIds = ""
+  DraftNames = ""
 
   constructor(
     private processes: ProcessesService,
@@ -78,7 +80,9 @@ export class DiplomaAssinarPage implements OnInit {
         serialNumber: this.task.SerialNumber,
         task: this.task,
         showEnviarPendentes: false,
-        fulltask: this.fulltask
+        fulltask: this.fulltask,
+        DraftNames: this.DraftNames,
+        DraftIds: this.DraftIds
 
       },
       translucent: true
@@ -110,11 +114,15 @@ export class DiplomaAssinarPage implements OnInit {
         "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
         "activityInstanceName": res.activityInstanceName,
         "Deadline": res.deadline,
-        "TaskStartDate": res.taskStartDate
+        "TaskStartDate": res.taskStartDate,
+        "InstanceID": res.workflowInstanceDataFields.InstanceID,
+        "FolderID": res.workflowInstanceDataFields.FolderID,
       }
 
       this.fulltask = res;
       let stringDraft = res.workflowInstanceDataFields.DraftIds;
+      this.DraftIds = stringDraft
+
       let split_stringDraft = stringDraft?.split(";").filter(Boolean);
 
       try {
@@ -233,10 +241,12 @@ export class DiplomaAssinarPage implements OnInit {
     let body = {
       "InstanceId": this.task.InstanceID,
       "FolderId": this.task.FolderID,
-      "DraftIds": "163;164;77",
+      "DraftIds": this.DraftIds,
-      "OriginalFileName": "Doc1;Doc2;Doc3"
+      "OriginalFileName": this.DraftNames
     }
 
+    console.log(body)
+
     const loader = this.toastService.loading()
 
     try {
@@ -244,7 +254,6 @@ export class DiplomaAssinarPage implements OnInit {
 
       this.httpErroHandle.httpsSucessMessagge('Assinado')
       this.TaskService.loadDiplomas()
-      this.goBack();
     } catch (error) {
     this.httpErroHandle.httpStatusHandle(error)
     }
@@ -418,29 +427,37 @@ export class DiplomaAssinarPage implements OnInit {
       this.mergedArray.push(docObject);
     });
   }
-  getDraft(split_stringDraft: string[]) {
-    split_stringDraft.forEach(element => {
-      console.log('List of ids', element)
-      this.processes.GetDraftByID(element).subscribe((resd) => {
-        let object = {
-          "ApplicationId": "",
-          "Assunto": resd.data.description,
-          "DocDate": "",
-          "DocId": resd.data.id,
-          "DocNumber": "",
-          "FolderId": "",
-          "Sender": "",
-          "SourceDocId": "",
-          "content": resd.data.content,
-          "path": resd.data.path,
-          "ownerId": resd.data.ownerId,
-          "status": resd.data.status,
-        }
-        this.mergedArray.push(object)
-        console.log('List of draff', resd)
-      })
 
-    });
+
+  async getDraft(split_stringDraft: string[]) {
+    this.DraftNames = ""
+
+    for(const strg of split_stringDraft) {
+      console.log('List of ids', strg)
+      const resd = await this.processes.GetDraftByID(strg).toPromise()
+
+      let object = {
+        "ApplicationId": "",
+        "Assunto": resd.data.description,
+        "DocDate": "",
+        "DocId": resd.data.id,
+        "DocNumber": "",
+        "FolderId": "",
+        "Sender": "",
+        "SourceDocId": "",
+        "content": resd.data.content,
+        "path": resd.data.path,
+        "ownerId": resd.data.ownerId,
+        "status": resd.data.status,
+      }
+      this.mergedArray.push(object)
+      this.DraftNames = this.DraftNames + resd.data.description+";"
+      console.log('List of draff', resd)
+    }
+
+    this.DraftNames = this.DraftNames.slice(0, -1);
+    this.DraftIds = this.DraftIds.slice(0, -1);
+
   }
 
 }

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

@@ -48,9 +48,9 @@
     <div class="container-div">
       <div class="ion-item-class-2 width-100 d-flex">
         <div class="ion-icon-class">
-          <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
+          <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
-        <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Location')?.invalid  && validateFrom ">
+        <div class="ion-input-class flex-grow-1" >
           <ion-input [disabled]=true autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="CalendarNameOwnerName"></ion-input>
         </div>
       </div>

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

@@ -25,6 +25,8 @@ export class DiplomaOptionsPage implements OnInit {
   profile: string;
   task: any
   fulltask: any
+  DraftIds = ""
+  DraftNames= ""
 
 
   constructor(
@@ -41,6 +43,13 @@ export class DiplomaOptionsPage implements OnInit {
       this.serialNumber = this.navParams.get('serialNumber');
       this.task = this.navParams.get('task');
       this.fulltask = this.navParams.get('fulltask');
+
+      this.DraftIds = this.navParams.get("DraftIds");
+      this.DraftNames = this.navParams.get("DraftNames");
+
+
+      console.log('this.task', this.task)
+
     }
 
   ngOnInit() {
@@ -200,6 +209,7 @@ export class DiplomaOptionsPage implements OnInit {
       "action": "Assinado",
       "ActionTypeId": 99999842,
       "dataFields": {
+        "DraftIds": "",
         "ReviewUserComment": note,
         "InstanceIDNew": this.task.InstanceID,
       },
@@ -229,10 +239,9 @@ export class DiplomaOptionsPage implements OnInit {
     let body = {
       "InstanceId": this.task.InstanceID,
       "FolderId": this.task.FolderID,
-      "DraftIds": "163;164;77",
+      "DraftIds": this.DraftIds,
-      "OriginalFileName": "Doc1;Doc2;Doc3"
+      "OriginalFileName": this.DraftNames
     }
-
     const loader = this.toastService.loading()
 
     try {
@@ -240,7 +249,7 @@ export class DiplomaOptionsPage implements OnInit {
 
       this.httpErroHandle.httpsSucessMessagge('Assinado')
       this.TaskService.loadDiplomas()
-      this.goBack();
+      this.popoverController.dismiss("")
     } catch (error) {
     this.httpErroHandle.httpStatusHandle(error)
     }

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "880f154ea",
+  "shortSHA": "4d7c80a73",
-  "SHA": "880f154ea20b89c3be29080f53b5e98033179df7",
+  "SHA": "4d7c80a739c13184c1b8769a41cd16ea7c180b7c",
   "branch": "developer-catch-merge",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Jul 17 17:19:55 2023 +0100'",
+  "lastCommitTime": "'Thu Jul 20 16:54:58 2023 +0100'",
-  "lastCommitMessage": "fix duplicate attachment",
+  "lastCommitMessage": "fix",
-  "lastCommitNumber": "5086",
+  "lastCommitNumber": "5087",
   "change": "",
-  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/app-routing.module.ts\n\tmodified:   src/app/models/Expediente.ts\n\tmodified:   src/app/models/beast-orm.ts\n\tmodified:   src/app/models/dailyworktask.model.ts\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diplomas.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/search/search.page.html\n\tmodified:   src/app/pipes/custom-task.pipe.ts\n\tmodified:   src/app/pipes/expediente-task.pipe.ts\n\tmodified:   src/app/services/events.service.ts\n\tmodified:   src/app/services/processes.service.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tnew file:   src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content-routing.module.ts\n\tnew file:   src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.module.ts\n\tnew file:   src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.html\n\tnew file:   src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss\n\tnew file:   src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.spec.ts\n\tnew file:   src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.ts\n\tnew file:   src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header-routing.module.ts\n\tnew file:   src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.module.ts\n\tnew file:   src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.html\n\tnew file:   src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss\n\tnew file:   src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.spec.ts\n\tnew file:   src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.ts\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.module.ts\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts\n\tmodified:   src/app/shared/gabinete-digital/generic/task-list/task-list.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:   src/app/shared/publication/view-publications/view-publications.page.ts\n\tmodified:   src/app/shared/shared.module.ts\n\tmodified:   src/app/store/localstore.service.ts\n\tmodified:   src/plugin/src/models/register-model.js",
+  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.ts",
   "changeAuthor": "peter.maquiran"
 }