diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 3f01d43e2..533396020 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -936,7 +936,7 @@ export class AgendaPage implements OnInit { } // change header profile picture - window['header'](this.profile); + // window['header'](this.profile); } @@ -981,13 +981,13 @@ export class AgendaPage implements OnInit { let postEvent: Event = data; if (postEvent.Subject != null) { - this.eventSource.push({ - title: postEvent.Subject, - startTime: new Date(postEvent.StartDate), - endTime: new Date(postEvent.EndDate), - allDay: false, - event: postEvent - }); + // this.eventSource.push({ + // title: postEvent.Subject, + // startTime: new Date(postEvent.StartDate), + // endTime: new Date(postEvent.EndDate), + // allDay: false, + // event: postEvent + // }); this.myCal.update(); this.myCal.loadEvents(); this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index c18ea8c21..e54eee8c0 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -96,11 +96,11 @@
- -
+ +
-
+
Anexar Documentos
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 976e8c80d..98e0a9e7f 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -62,7 +62,7 @@ export class NewPublicationPage implements OnInit { ngOnInit() { this.setTitle(); this.clear(); - this.takePicture(); + // this.takePicture(); } takePicture(){ const options: CameraOptions = { diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 8d60e675f..544890ff0 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -253,59 +253,143 @@ export class SearchPage implements OnInit { this.searchDocuments = []; this.showSearchDocuments = []; - this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender - ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{ - - res.Categories.forEach( e => { - e['Active'] = false; - this.searchCategories.push(e) + if(this.select) { + + let counter = 0; + + this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender + ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{ + + res.Categories.forEach( e => { + e['Active'] = false; + this.searchCategories.push(e) + }); + + // bind respose + + this.sortArrayISODate(res.Documents).forEach(e => { + e['appName'] = 'Correspondencia' + this.searchDocuments.push(e) + }); + + this.reorderList(this.ordinance); + + // hide show document + if(this.searchDocuments.length >= 1){ + this.showDocuments = true; + } else { + this.showDocuments = false + } + counter++; + + if(counter ==2){ + this.showLoader = false; + } + + this.loadWordCloud(); }); - - // bind respose + + this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender + ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{ + + res.Categories.forEach( e => { + e['Active'] = false; + this.searchCategories.push(e) + }); + + + this.sortArrayISODate(res.Documents).forEach(e => { + e['appName'] = 'ArquivoDespachoElect' + this.searchDocuments.push(e) + }); + + this.reorderList(this.ordinance); + + // hide show document + if(this.searchDocuments.length >= 1){ + this.showDocuments = true; + } else { + this.showDocuments = false + } + + this.loadWordCloud(); + counter++; - this.sortArrayISODate(res.Documents).forEach(e => { - e['appName'] = 'Correspondencia' - this.searchDocuments.push(e) + if(counter ==2){ + this.showLoader = false; + } }); + + } else { + let counter = 0; - this.reorderList(this.ordinance); + this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender + ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{ + + res.Categories.forEach( e => { + e['Active'] = false; + this.searchCategories.push(e) + }); + + // bind respose + + this.sortArrayISODate(res.Documents).forEach(e => { + e['appName'] = 'Correspondencia' + this.searchDocuments.push(e) + }); + + this.reorderList(this.ordinance); + + // hide show document + if(this.searchDocuments.length >= 1){ + this.showDocuments = true; + } else { + this.showDocuments = false + } + + counter++; - // hide show document - if(this.searchDocuments.length >= 1){ - this.showDocuments = true; - } else { - this.showDocuments = false - } - - this.loadWordCloud(); - }); + if(counter ==2){ + this.showLoader = false; + } - this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender - ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{ - - res.Categories.forEach( e => { - e['Active'] = false; - this.searchCategories.push(e) + this.loadWordCloud(); }); - + + this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender + ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{ + + res.Categories.forEach( e => { + e['Active'] = false; + this.searchCategories.push(e) + }); + + + this.sortArrayISODate(res.Documents).forEach(e => { + e['appName'] = 'ArquivoDespachoElect' + this.searchDocuments.push(e) + }); + + this.reorderList(this.ordinance); + + // hide show document + if(this.searchDocuments.length >= 1){ + this.showDocuments = true; + } else { + this.showDocuments = false + } + + + counter++; - this.sortArrayISODate(res.Documents).forEach(e => { - e['appName'] = 'ArquivoDespachoElect' - this.searchDocuments.push(e) + if(counter ==2){ + this.showLoader = false; + } + this.loadWordCloud(); }); + + } - this.reorderList(this.ordinance); - - // hide show document - if(this.searchDocuments.length >= 1){ - this.showDocuments = true; - } else { - this.showDocuments = false - } - - this.showLoader = false; - this.loadWordCloud(); - }); } else if (this.type == "AccoesPresidenciais"){ diff --git a/src/app/services/search.service.ts b/src/app/services/search.service.ts index 0f0cda70b..5f3194b90 100644 --- a/src/app/services/search.service.ts +++ b/src/app/services/search.service.ts @@ -72,4 +72,28 @@ export class SearchService { return this.http.get(`${geturl}`, options); } + searchForDoc(subject:string, date:string, sender:string, organicEntity:string, docTypeId:string, applicationType:string): Observable { + // Endpoint + const geturl = environment.apiURL + 'search/attachment?'; + // store params + let params = new HttpParams(); + // set https params + console.log(subject); + + params = params.set("assunto", subject); + params = params.set("data", date); + params = params.set("remetente", sender); + params = params.set("entidadeOrganica", organicEntity); + params = params.set("docTypeId", docTypeId); + params = params.set("applicationType", applicationType); + + + const options = { + headers: this.headers, + params: params + }; + + return this.http.get(`${geturl}`, options); + } + }