peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tiago.kayaya
2021-05-07 14:01:56 +01:00
parent e3e29bbafe 8ba7199ce4
commit 3773041b1f
10 changed files with 177 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+8 -8
View File
@@ -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);
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+3 -3
View File
@@ -96,11 +96,11 @@
</div>
<div class="ion-item-container-no-border" (click)="getDoc()">
<ion-label class="d-flex ">
<div class="attach-icon">
<ion-label class="d-flex align-center">
<div class="attach-icon d-flex align-center">
<ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
</div>
<div class="attach-document">
<div class="attach-document pl-10">
<ion-label>Anexar Documentos</ion-label>
</div>
</ion-label>
src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+1 -8
View File
@@ -129,13 +129,6 @@ export class PedidosPage implements OnInit {
async viewPedidoDetail(serialNumber:any) {
console.log(this.profile);
let classs;
if( window.innerWidth <= 800){
classs = 'modal'
} else {
classs = 'modal modal-desktop'
}
const modal = await this.modalController.create({
component: PedidoPage,
componentProps:{
@@ -143,7 +136,7 @@ export class PedidosPage implements OnInit {
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: classs,
cssClass: 'modal modal-desktop',
});
await modal.present();
modal.onDidDismiss().then((res)=>{
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+2 -7
View File
@@ -151,12 +151,7 @@ export class PendentesPage implements OnInit {
}
async openPedido(serialNumber:string){
let classs;
if( window.innerWidth <= 800){
classs = 'modal'
} else {
classs = 'modal modal-desktop'
}
const modal = await this.modalController.create({
component: PedidoPage,
componentProps:{
@@ -164,7 +159,7 @@ export class PendentesPage implements OnInit {
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: classs,
cssClass: 'modal modal-desktop',
});
await modal.present();
modal.onDidDismiss().then((res)=>{
src/app/pages/publications/new-publication/new-publication.page.ts
+1 -1
View File
@@ -62,7 +62,7 @@ export class NewPublicationPage implements OnInit {
ngOnInit() {
this.setTitle();
this.clear();
this.takePicture();
// this.takePicture();
}
takePicture(){
const options: CameraOptions = {
src/app/pages/search/search.page.ts
+127 -43
View File
@@ -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"){