improve

src/app/modals/document-detail/document-detail.page.html

@@ -49,18 +49,15 @@
         </ion-item>
         </ion-list>
       </div>
-
     </div>
 
-    {{ LoadedDocument | json }}
-
     <div *ngIf="LoadedDocument" class="aside-right flex-column height-100">
       <div class="buttons">
         <button (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Efectuar Despacho</button>
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('0')"  class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
-        <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <!-- <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button> -->
       </div>
     </div>
 

src/app/modals/document-detail/document-detail.page.ts

@@ -89,16 +89,16 @@ export class DocumentDetailPage implements OnInit {
           Subject: this.LoadedDocument.Assunto
         },
       }
-    } else if (this.LoadedDocument.ApplicationID == 8) {
+    } else if (this.LoadedDocument.ApplicationID == 8 || this.LoadedDocument.ApplicationId == 8) {
       task = {
-        serialNumber: this.LoadedDocument.SourceId,
+        serialNumber: this.LoadedDocument.DocId,
-        taskStartDate: this.LoadedDocument.CreateDate,
+        taskStartDate: this.LoadedDocument.DocDate,
         isEvent: true,
         workflowInstanceDataFields: {
-          FsId: this.LoadedDocument.ApplicationID,
+          FsId: this.LoadedDocument.ApplicationID || this.LoadedDocument.ApplicationId,
           FolderID: null,
-          DocId: this.LoadedDocument.SourceId,
+          DocId: this.LoadedDocument.DocId,
-          Subject: this.LoadedDocument.SourceName
+          Subject: this.LoadedDocument.Assunto
         }
       }
     }
@@ -120,10 +120,8 @@ export class DocumentDetailPage implements OnInit {
     await modal.present();
     modal.onDidDismiss().then( async(res)=>{});
 
-
   }
 
-
   async openBookMeetingModal() {
 
     let task;
@@ -133,6 +131,8 @@ export class DocumentDetailPage implements OnInit {
         serialNumber: this.LoadedDocument.DispatchNumber,
         taskStartDate: this.LoadedDocument.DateDispatch,
         isEvent: true,
+        Folio: this.LoadedDocument.Assunto,
+        FsId: this.LoadedDocument.ApplicationID,
         workflowInstanceDataFields: {
           FsId: this.LoadedDocument.ApplicationID,
           FolderID: null,
@@ -140,11 +140,13 @@ export class DocumentDetailPage implements OnInit {
           Subject: this.LoadedDocument.Assunto
         },
       }
-    } else if (this.LoadedDocument.ApplicationID == 8) {
+    } else if (this.LoadedDocument.ApplicationID == 8 || this.LoadedDocument.ApplicationId == 8) {
       task = {
         serialNumber: this.LoadedDocument.SourceId,
         taskStartDate: this.LoadedDocument.CreateDate,
         isEvent: true,
+        Folio: this.LoadedDocument.Assunto,
+        FsId: this.LoadedDocument.ApplicationID,
         workflowInstanceDataFields: {
           FsId: this.LoadedDocument.ApplicationID,
           FolderID: null,
@@ -172,5 +174,4 @@ export class DocumentDetailPage implements OnInit {
     modal.onDidDismiss();
   }
 
-
 }

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -215,7 +215,6 @@ export class BookMeetingModalPage implements OnInit {
     })
   }
 
-
   async saveTask(){
 
     if(this.loggeduser.Profile == 'MDGPR') {
@@ -224,8 +223,9 @@ export class BookMeetingModalPage implements OnInit {
     }
 
 
-    if(this.Form.invalid) return false
 
+    // if(this.Form.invalid) return false
+    alert('!')
     
     let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
 

src/app/pages/search/search.page.html

@@ -158,7 +158,7 @@
                   <div class="content ion-align-items-center">
                     
                     <div class="d-flex ion-justify-content-between ">
-                      <span class="result-name">{{ searchDocument.Assunto}} -- {{ searchDocument.ApplicationType}} </span>
+                      <span class="result-name">{{ searchDocument.Assunto}}</span>
                       <span class="app-name" *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' ">{{ searchDocument.appName}}</span>
                     </div>
                     <div class="d-flex ion-justify-content-between ">

src/app/shared/gabinete-digital/pedidos/pedidos.page.html

@@ -61,6 +61,9 @@
                 <span class="label">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
+                
+                {{ task.CreateDate }}
+
                 <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
               </div>
             </div>