Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

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

@@ -42,10 +42,7 @@
       </ion-item>
       </ion-list>
     </div>
-    <ion-item hidden lines="none">
-      <ion-textarea [(ngModel)]="note" rows="4" cols="20" placeholder="Adicionar um comentário para execução..."></ion-textarea>
-    </ion-item>
-</div>
+  </div>
 </ion-content>
 <ion-footer class="ion-no-border">
   <div class="buttons width-100">

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

@@ -2,8 +2,6 @@ import { Component, OnInit } from '@angular/core';
 import { AnimationController, ModalController, NavParams } from '@ionic/angular';
 import { SearchDocument } from 'src/app/models/search-document';
 import { SearchPage } from 'src/app/pages/search/search.page';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 
 @Component({
   selector: 'app-add-note',
@@ -12,7 +10,7 @@ import { SuccessMessagePage } from 'src/app/shared/popover/success-message/succe
 })
 export class AddNotePage implements OnInit {
   note: string = '';
-  documents:SearchDocument[] = [];
+  documents: SearchDocument[] = [];
   loadedAttachments:any;
   hideThisFeature: boolean = true;
 
@@ -32,11 +30,11 @@ export class AddNotePage implements OnInit {
 
   }
 
-  close(){
+  close() {
     this.modalController.dismiss('');
   }
 
-  save(){
+  save() {
     let body = {
       "note":this.note,
       "documents":this.documents,

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

@@ -101,6 +101,10 @@ export class CreateProcessPage implements OnInit {
       this.loggeduser = userAuth.ValidatedUser;
       this.task = this.navParams.get('task');
 
+      if (this.task.SerialNumber) {
+        this.task.serialNumber = this.task.SerialNumber
+      }
+
 
       this.taskType = this.navParams.get('taskAction');
 

src/app/modals/delegar/delegar.page.html

@@ -41,8 +41,8 @@
           </div>
         </div>
 
-        <div hidden class="ion-item-container-no-border">
-          <ion-label>
+        <div *ngIf="hideThisFeature" class="ion-item-container-no-border">
+          <ion-label (click)="getDoc()">
             <div class="attach-icon">
               <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
             </div>
@@ -52,18 +52,23 @@
           </ion-label>
         </div>
 
-        <div *ngIf="loadedAttachments">
-          <ion-item>
-            <ion-label>Documentos Anexados</ion-label>
-          </ion-item>
-          <ion-list>
-            <ion-item *ngFor="let attachment of loadedAttachments">
-            <ion-label>
-              <h4 class="attach-title-item">{{attachment.Description}}</h4>
-              <p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right"> {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}</span></p>
-            </ion-label>
-          </ion-item>
-          </ion-list>
+        <div class="content width-100 overflow-y-auto height-100">
+          <div class="list">
+            <ion-list  *ngFor="let document of documents; let i = index">
+              <ion-item>
+              <ion-label>
+                <p class="d-flex ion-justify-content-between">
+                  <span class="attach-title-item">{{document.Assunto}}</span>
+                  <span class="app-name">{{document.appName}}</span>
+                  <span class="close-button text-black cursor-pointer" (click)="removeAttachment(i)" >
+                    <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
+                  </span>
+                </p>
+                <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
+              </ion-label>
+            </ion-item>
+            </ion-list>
+          </div>
         </div>
       </div>
       

src/app/modals/delegar/delegar.page.ts

@@ -9,10 +9,10 @@ import { EventsService } from 'src/app/services/events.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { AlertService } from 'src/app/services/alert.service';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
+import { SearchDocument } from 'src/app/models/search-document';
+import { SearchPage } from 'src/app/pages/search/search.page';
 
 @Component({
   selector: 'app-delegar',
@@ -38,6 +38,9 @@ export class DelegarPage implements OnInit {
   formLocationSatus: boolean = false;
   showAttendees= false;
 
+  hideThisFeature: boolean = true;
+  documents: SearchDocument[] = [];
+
   constructor(
     private modalController: ModalController,
     private router:Router,
@@ -63,6 +66,7 @@ export class DelegarPage implements OnInit {
       let selectedEndDate = new Date();
      /*  this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */
 
+     this.hideThisFeature = this.navParams.get('showAttachmentBtn');
     }
 
   ngOnInit() {
@@ -187,4 +191,32 @@ export class DelegarPage implements OnInit {
     this.taskParticipants = taskParticipants;
   }
 
+
+  async getDoc() {
+
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'modal-width-100-width-background modal',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: true,
+        select: true
+      }
+    });
+    await modal.present();
+      modal.onDidDismiss().then((res)=>{
+        if(res){
+          const data = res.data;
+          this.documents.push(data.selected);
+        }
+    });
+
+  }
+
+  removeAttachment(index: number){
+
+    this.documents = this.documents.filter( (e, i) =>  index != i);
+  }
+
+
 }

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

@@ -70,10 +70,12 @@ export class DocumentDetailPage implements OnInit {
           taskStartDate: folder.DateDispatch,
           isEvent: true,
           workflowInstanceDataFields: {
-            FsId: folder.ApplicationID || folder.ApplicationId,
             FolderID: folder['FolderId'] || folder['FolderID'] || folder.folderId,
-            DocId: folder.DispatchNumber, // not used
-            Subject: folder.Assunto
+            Subject: folder.Assunto,
+            SourceSecFsID: folder.ApplicationID || folder['ApplicationId'],
+            SourceType: 'FOLDER',
+            SourceID: folder.folderId,
+            DispatchNumber: folder.DispatchNumber
           },
         }
       } else if (document.ApplicationID == 8 || document.ApplicationId == 8) {
@@ -82,10 +84,12 @@ export class DocumentDetailPage implements OnInit {
           taskStartDate: document.DocDate,
           isEvent: true,
           workflowInstanceDataFields: {
-            FsId: document.ApplicationID || document.ApplicationId,
             FolderID: null,
-            DocId: document.DocId || document['DocID'],
-            Subject: document.Assunto
+            Subject: document.Assunto,
+            DispatchNumber: null,
+            SourceSecFsID: document.ApplicationID || document.ApplicationId,
+            SourceType: 'DOC',
+            SourceID: document.DocId,
           }
         }
       } else {