diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html index fd9aeef03..10874bfd1 100644 --- a/src/app/modals/document-detail/document-detail.page.html +++ b/src/app/modals/document-detail/document-detail.page.html @@ -56,7 +56,7 @@
- + diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index 7532fd2f7..d4ea3191e 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -39,7 +39,7 @@ export class DocumentDetailPage implements OnInit { private menu: MenuController, private iab: InAppBrowser, public p: PermissionService, - private popoverController: PopoverController, + private popoverController: PopoverController ) { this.docId = this.navParams.get('docId'); this.applicationId = this.navParams.get('applicationId'); @@ -135,6 +135,7 @@ export class DocumentDetailPage implements OnInit { componentProps: { taskAction: taskAction, task: this.task, + seachDocuments: this.LoadedDocument }, cssClass: classs, }); diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index 817b1ba1f..af7837b0c 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -20,6 +20,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar import { DocumentService } from 'src/app/Rules/document.service'; import { DocumentSetUpMeeting, Attachments } from 'src/app/models/CallMeeting'; import { EventsService } from 'src/app/services/events.service'; +import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe'; const moment = _rollupMoment || _moment; @@ -115,6 +116,8 @@ export class DocumentSetUpMeetingPage implements OnInit { document: any; + private searchDocumentPipe = SearchDocumentPipe + constructor( private modalController: ModalController, private router:Router, @@ -123,7 +126,7 @@ export class DocumentSetUpMeetingPage implements OnInit { authService: AuthService, private toastService: ToastService, private documentService: DocumentService, - private calendarService: EventsService + private calendarService: EventsService, ) { this.loggeduser = authService.ValidatedUser; diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 9e6bb4f18..6ea2a843d 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -316,7 +316,7 @@ export class BookMeetingModalPage implements OnInit { } } - async addParticipants(){ + async addParticipants() { this.adding = "intervenient"; @@ -408,8 +408,7 @@ export class BookMeetingModalPage implements OnInit { modal.onDidDismiss(); } - - async getDoc(){ + async getDoc() { const modal = await this.modalController.create({ component: SearchPage, cssClass: 'modal-width-100-width-background modal', @@ -432,7 +431,7 @@ export class BookMeetingModalPage implements OnInit { this.documents = this.documents.filter( (e, i) => index != i); } - validateFormInputs(){ + validateFormInputs() { let formLocation = this.postData.Location.trim(); if(!this.postData.Location && formLocation.length <= 0){ this.formLocationSatus = true; @@ -456,5 +455,4 @@ export class BookMeetingModalPage implements OnInit { this.taskParticipantsCc = data; } - } diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 91d3e02c4..adbabd92e 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -21,6 +21,7 @@ import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-pick import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { task } from 'src/app/models/ExpedientTaskModalPage'; import { DespachoService } from 'src/app/Rules/despacho.service'; +import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -64,6 +65,7 @@ export class ExpedientTaskModalPage implements OnInit { subjectTypes:any[] = []; selectedTypes: string[]=[]; + seachDocuments: any = [] postData: Despacho; dispatchFolder: Folder; @@ -91,6 +93,8 @@ export class ExpedientTaskModalPage implements OnInit { return this.toppings.value; } + private searchDocumentPipe = SearchDocumentPipe + constructor( private modalController: ModalController, private router:Router, @@ -107,8 +111,7 @@ export class ExpedientTaskModalPage implements OnInit { this.loggeduser = userAuth.ValidatedUser; this.task = this.navParams.get('task'); - - console.log(this.task) + this.seachDocuments = this.navParams.get('seachDocuments'); this.taskType = this.navParams.get('taskAction'); @@ -138,7 +141,7 @@ export class ExpedientTaskModalPage implements OnInit { this.profile = this.navParams.get('profile'); } - async setAdding(type: "intervenient" | "CC"){ + async setAdding(type: "intervenient" | "CC") { this.adding = type; } @@ -215,7 +218,7 @@ export class ExpedientTaskModalPage implements OnInit { }) } // - async saveTask(){ + async saveTask() { if(this.loggeduser.Profile == 'MDGPR') { this.injectValidation() @@ -259,6 +262,29 @@ export class ExpedientTaskModalPage implements OnInit { docs.Attachments = DocumentToSave; + if(this.seachDocuments) { + if(this.seachDocuments.Documents) { + this.seachDocuments.Documents.forEach( (ele) => { + docs.Attachments.push({ + ApplicationId: 361, + Source: 1, + SourceId: ele.docID || ele.docId || ele.DocId, + SourceName: ele.Assunto + }) + }); + } else { + docs.Attachments.push({ + ApplicationId: 8, + Source: 1, + SourceId: this.seachDocuments.docID || this.seachDocuments.docId || this.seachDocuments.DocId, + SourceName: this.seachDocuments.Assunto + }) + } + } + + + + this.dispatchFolder.SubjectTypes = this.selectedTypes; const loader = this.toastService.loading() @@ -266,7 +292,7 @@ export class ExpedientTaskModalPage implements OnInit { case 'MDGPR': if(this.taskParticipants.length > 0) { switch (this.taskType) { - case '0': + case '0': // Despacho this.postData = { DistributionType: "Paralelo", CountryCode: 'AO', @@ -303,7 +329,7 @@ export class ExpedientTaskModalPage implements OnInit { console.log('this.taskResult', this.taskResult); break; - case '1': + case '1': // Parecer this.postData = { DistributionType: "Paralelo", CountryCode: 'AO', @@ -334,7 +360,7 @@ export class ExpedientTaskModalPage implements OnInit { loader.remove() } break; - case '2': + case '2': // Deferimento this.postData = { DistributionType: "Paralelo", CountryCode: 'AO', @@ -409,7 +435,7 @@ export class ExpedientTaskModalPage implements OnInit { console.log('this.taskResult', this.taskResult); break; - case '1': + case '1': // parecer this.postData = { DistributionType: "Paralelo", CountryCode: 'AO', diff --git a/src/app/pipes/pipes.module.ts b/src/app/pipes/pipes.module.ts index 0d9ad52be..3867629f9 100644 --- a/src/app/pipes/pipes.module.ts +++ b/src/app/pipes/pipes.module.ts @@ -1,9 +1,10 @@ import { NgModule } from '@angular/core'; import { FilterPipe } from './filter.pipe'; +import { SearchDocumentPipe } from './search-document.pipe'; @NgModule({ - declarations: [FilterPipe], + declarations: [FilterPipe, SearchDocumentPipe], exports: [FilterPipe], imports: [] }) diff --git a/src/app/pipes/search-document.pipe.spec.ts b/src/app/pipes/search-document.pipe.spec.ts new file mode 100644 index 000000000..732f93f5b --- /dev/null +++ b/src/app/pipes/search-document.pipe.spec.ts @@ -0,0 +1,8 @@ +import { SearchDocumentPipe } from './search-document.pipe'; + +describe('SearchDocumentPipe', () => { + it('create an instance', () => { + const pipe = new SearchDocumentPipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/src/app/pipes/search-document.pipe.ts b/src/app/pipes/search-document.pipe.ts new file mode 100644 index 000000000..1e6757287 --- /dev/null +++ b/src/app/pipes/search-document.pipe.ts @@ -0,0 +1,39 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'searchDocument' +}) +export class SearchDocumentPipe implements PipeTransform { + + transform(document): unknown { + return null; + } + + + transformToAttachment(document): unknown { + + const attachments = [] + + if(document.Documents) { + document.Documents.forEach( (ele) => { + console.log(ele) + attachments.push({ + ApplicationId: 361, + Source: 1, + SourceId: ele.docID || ele.docId || ele.DocId, + SourceName: ele.Assunto + }) + }); + } else { + attachments.push({ + ApplicationId: 8, + Source: 1, + SourceId: document.docID || document.docId || document.DocId, + SourceName: document.Assunto + }) + } + + return attachments; + } + +}