pull made2

src/app/models/dailyworktask.model.ts

@@ -151,8 +151,7 @@ export class customTask {
     Subject:  string
     Note: string
     InstanceID: string
-    
-
+    DeadlineType: string
 }
 
 

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts

@@ -69,6 +69,10 @@ export class DespachoPrPage implements OnInit {
       }
     });
 
+
+    window['tinyupdate'] = () => {
+      this.LoadTaskDetail(this.serialNumber);
+    }
     
   }
 
@@ -118,6 +122,7 @@ export class DespachoPrPage implements OnInit {
       let stringDraft = res.workflowInstanceDataFields.DraftIds;
       let split_stringDraft = stringDraft?.split(";").filter(Boolean);
 
+      this.mergedArray = []
       try {
         this.getDraft(split_stringDraft);
       } catch (error) {

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts

@@ -77,6 +77,11 @@ export class DespachoPage implements OnInit {
         this.caller = params["params"].caller;
       }
     });
+
+    window['tinyupdate'] = () => {
+      this.LoadTaskDetail(this.serialnumber);
+    }
+
   }
 
   ngOnInit() {
@@ -113,6 +118,7 @@ export class DespachoPage implements OnInit {
       console.log('sring to array', stringDraft)
       let split_stringDraft = stringDraft?.split(";").filter(Boolean);
 
+      this.mergedArray = []
       try {
         this.getDraft(split_stringDraft);
       } catch (error) {

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

@@ -1,85 +1,19 @@
-<ion-header class="ion-no-border">
-  <!-- <app-header > </app-header> -->
-</ion-header>
-
 <ion-content class="container-wrapper">
   <div class="main-content d-flex height-100 overflow-hidden">
-    <div class="content d-flex flex-column" *ngIf="task">
-      <div class="main-header">
-        <div class="title-content width-100 d-flex justify-space-between">
-          <div class="font-30-rem cursor-pointer" (click)="goBack()" defaultHref="#">
-            <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
-            <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
-            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
-          </div>
-          <div class="middle d-flex align-center flex-grow-1 ">
-            <ion-label class="title">{{ task.Folio}}</ion-label>
-          </div>
-          <div class="div-icon" (click)="openOptions()">
-              <!-- <ion-menu-button autoHide="false">
-                <ion-icon name="ellipsis-vertical-outline"></ion-icon>
-              </ion-menu-button> -->
-              <ion-icon class="font-25 cursor-pointer" name="ellipsis-vertical-outline"></ion-icon>
-          </div>
-        </div>
-      </div>
-      <div class="upper-content">
-        <div class="content-details">
-          <ion-label>
-            <p><span class="date">{{customDate}}</span></p>
-          </ion-label>
-          <ion-label>
-            <p><span class="color-red">{{ task.DeadlineType }}</span></p>
-          </ion-label>
-          <ion-label>
-            <p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
-          </ion-label>
-        </div>
-      </div>
-      <div class="line"></div>
-      <div class="middle-content">
-        <h5 *ngIf="intervenientes">Intervenientes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-          <ion-label>
-            <div *ngFor="let interveniente of intervenientes">
-              <p>{{interveniente.Name}}</p>
-            </div>
-          </ion-label>
-        </ion-item>
-        <div *ngIf="cc.length > 0">
-          <h5 class="font-17-rem">Com conhecimento</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-            <ion-label>
-              <div *ngFor="let c of cc">
-                <p>{{c.Name}}</p>
-              </div>
-            </ion-label>
-          </ion-item>
-        </div>
-        <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
-          <h5 class="font-17-rem">Detalhes</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-            <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
-          </ion-item>
-        </div>
-      </div>
-      <div class="bottom-content width-100">
-        <ion-list>
-          <h5 class="font-17-rem">Documentos Anexados</h5>
-          <ion-item *ngFor="let attachment of mergedArray"
-            class="ion-no-margin ion-no-padding cursor-pointer"
-          >
-            <ion-label
-              (click)="viewDocument(attachment.DocId, attachment,attachment.content)"
-            >
-              <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}  <span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
-              <p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
-              <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
-            </ion-label>
-        </ion-item>
-        </ion-list>
-      </div>
-    </div>
+
+    <app-task-details 
+      *ngIf="task"
+      [task]=task
+      [intervenientes]=intervenientes
+      [cc]=cc
+      [customDate]=customDate
+      [mergedArray]="mergedArray"
+      (openOptions)= openOptions()
+      (goBack)= goBack()
+      (viewDocument)=viewDocument($event)
+      class="content d-flex flex-column"
+      
+    ></app-task-details>
 
     <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons">

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

@@ -9,7 +9,7 @@
   border-top-left-radius: 24px;
 }
 
-ion-content, .header-2, .main-content{
+ion-content, .header-2{
   padding: 30px 20px 0 20px !important;
 }
 
@@ -37,7 +37,6 @@ ion-content, .header-2, .main-content{
   border-top-right-radius: 25px;
 }
 .content{
-  padding: 30px 20px 0 20px !important;
   margin: 0;
   float: left;
 }

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

@@ -61,6 +61,11 @@ export class DiplomaAssinarPage implements OnInit {
       }
     });
 
+
+    window['tinyupdate'] = () => {
+      this.LoadTaskDetail(this.serialnumber);
+    }
+
   }
 
   ngOnInit() {
@@ -125,6 +130,8 @@ export class DiplomaAssinarPage implements OnInit {
 
       let split_stringDraft = stringDraft?.split(";").filter(Boolean);
 
+      this.mergedArray = []
+
       try {
         this.getDraft(split_stringDraft);
       } catch (error) {
@@ -160,7 +167,7 @@ export class DiplomaAssinarPage implements OnInit {
 
   }
 
-  async viewDocument(docId: string, Document, content) {
+  async viewDocument({Document, content}) {
 
     if (Document.content == "") {
       const modal = await this.modalController.create({

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

@@ -69,6 +69,11 @@ export class DiplomaPage implements OnInit {
 
     });
 
+
+    window['tinyupdate'] = () => {
+      this.LoadTaskDetail(this.serialNumber);
+    }
+
   }
 
   ngOnInit() {
@@ -135,6 +140,7 @@ export class DiplomaPage implements OnInit {
       let stringDraft = res.workflowInstanceDataFields.DraftIds;
       let split_stringDraft = stringDraft?.split(";").filter(Boolean);
       
+      this.mergedArray = []
       try {
         this.getDraft(split_stringDraft);
       } catch (error) {

src/app/pages/gabinete-digital/gabinete-digital.page.scss

@@ -278,10 +278,12 @@ ion-content{
          width: 84%;
          float: left;
  
-         ion-label{
-           margin: 0 !important;
-           padding: 2.5px 10.5px 2.5px 10.5px;
-         }
+          ion-label{
+            float: left;
+            display: inline;
+            margin: 0 !important;
+            padding: 2.5px 10.5px 2.5px 10.5px;
+          }
        }
  
        .item-icon{
@@ -697,6 +699,9 @@ ion-content{
   font-size: rem(13);
 }
 
+.new-task {
+  float: left;
+}
 
 .search-input-container{
   background-color: white;

src/app/pipes/custom-task.pipe.ts

@@ -31,7 +31,8 @@ export class CustomTaskPipe implements PipeTransform {
       "TaskStatus": fullTask.taskStatus,
       "TaskReceiveDate": fullTask.taskReceiveDate,
       "Note": fullTask.workflowInstanceDataFields.TaskMessage,
-      "InstanceID": fullTask.workflowInstanceDataFields.InstanceID
+      "InstanceID": fullTask.workflowInstanceDataFields?.InstanceID,
+      "DeadlineType":  fullTask.workflowInstanceDataFields?.InstanceID
     }
   }
 

src/app/shared/gabinete-digital/generic/task-details/task-details.page.html

@@ -20,7 +20,7 @@
         <p><span class="date">{{customDate}}</span></p>
       </ion-label>
       <ion-label>
-        <p><span class="color-red">{{ task.Deadline }}</span></p>
+        <p><span class="color-red">{{ task.DeadlineType }}</span></p>
       </ion-label>
       <ion-label>
         <p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>

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

@@ -22,7 +22,7 @@
         <button (click)="openAddNoteModal('Concluir diploma')" class="btn-cancel" shape="round" >Concluir</button>
       </div>
       <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
-        <button (click)="openAddNoteModal('Assinar Diploma')" class="btn-cancel" shape="round" >Assinado</button>
+        <button (click)="AssinarNew()" class="btn-cancel" shape="round" >Assinado</button>
       </div>
       <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
         <button (click)="openAddNoteModal('AssinarNew')" class="btn-cancel" shape="round" >Assinar</button>

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

@@ -74,7 +74,7 @@ export class DiplomaOptionsPage implements OnInit {
     });
 
     modal.onDidDismiss().then(async (res) => {
-      if(res.data){
+      if(res.data) {
 
 
         const DocumentToSave = res.data.documents.map((e) => {
@@ -105,7 +105,7 @@ export class DiplomaOptionsPage implements OnInit {
           await this.arquivar(res.data.note, docs);
           this.goBack();
         } else if (actionName =='AssinarNew') {
-          await this.AssinarNew(res.data.note, docs)
+          await this.AssinarNew()
         }
       }
     }, (error) => {
@@ -235,7 +235,7 @@ export class DiplomaOptionsPage implements OnInit {
     }
   }
 
-  async AssinarNew(note:string, documents:any) {
+  async AssinarNew() {
     let body = {
       "InstanceId": this.task.InstanceID,
       "FolderId": this.task.FolderID,

src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts

@@ -76,10 +76,11 @@ export class EventDetailsDocumentsOptionsPage implements OnInit {
       "path": document.path,
       "ownerId": document.ownerId
     }
-    this.processService.SaveDraftByID(document.DocId, objectDraft).subscribe((res) => [
-      this.erroHandler.httpsSucessMessagge('Draft Save'),
-      this.modalController.dismiss()
-    ],(error) => {
+    this.processService.SaveDraftByID(document.DocId, objectDraft).subscribe((res) => {
+      this.erroHandler.httpsSucessMessagge('Draft Save');
+      this.modalController.dismiss();
+      window['tinyupdate']()
+    },(error) => {
       this.erroHandler.httpStatusHandle(error)
     })
     

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "21c5a1d9e",
-  "SHA": "21c5a1d9eb7be271dc2cb611d1d836f3f28302a1",
+  "shortSHA": "2e5b28735",
+  "SHA": "2e5b287359258af05812a1a4c5bbcbbcc260d09e",
   "branch": "developer-catch-merge",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Fri Jul 21 10:25:33 2023 +0100'",
-  "lastCommitMessage": "task details update css",
-  "lastCommitNumber": "5094",
+  "lastCommitTime": "'Fri Jul 21 12:57:42 2023 +0100'",
+  "lastCommitMessage": "pull made",
+  "lastCommitNumber": "5097",
   "change": "",
-  "changeStatus": "On branch developer-catch-merge\nYour branch and 'origin/developer-catch-merge' have diverged,\nand have 1 and 2 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\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",
+  "changeStatus": "On branch developer-catch-merge\nYour branch and 'origin/developer-catch-merge' have diverged,\nand have 2 and 2 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/models/dailyworktask.model.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.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.scss\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.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified:   src/app/pipes/custom-task.pipe.ts\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\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/popover/event-details-documents-options/event-details-documents-options.page.ts",
   "changeAuthor": "eudes.inacio"
 }