peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 05:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Peter Maquiran
2021-06-16 09:11:34 +01:00
parent b5fd1b4f23 3435354f55
commit 38daa11b54
8 changed files with 210 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+12 -78
View File
@@ -218,14 +218,8 @@ export class ExpedientTaskModalPage implements OnInit {
console.log(this.postData);
this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
await this.toastService.successMessage('Processo efetuado', () =>{
console.log('Hoje Teste T');
this.modalController.dismiss(action_despacho);
});
/* setInterval(()=>{
console.log('Hoje Teste T');
this.modalController.dismiss(action_despacho);
}, 7000); */
await this.toastService.successMessage('Processo efetuado');
this.modalController.dismiss();
} catch (error) {
await this.toastService.badRequest('Processo não efetuado')
@@ -253,11 +247,9 @@ export class ExpedientTaskModalPage implements OnInit {
"Note": "",
}
}
//this.taskResult = await this.processes.postParecer(this.postData).toPromise();
this.taskResult = await this.processes.postParecer(this.postData).toPromise();
await this.toastService.successMessage('Processo efetuado');
setInterval(()=>{
this.modalController.dismiss(action_parecer);
}, 7000);
this.modalController.dismiss(action_parecer);
} catch (error) {
await this.toastService.badRequest('Processo não efetuado')
@@ -284,9 +276,8 @@ export class ExpedientTaskModalPage implements OnInit {
}
}
this.taskResult = await this.processes.postDeferimento(this.postData).toPromise();
await this.toastService.successMessage('Processo efetuado', () =>{
this.modalController.dismiss(action_deferimento);
});
await this.toastService.successMessage('Processo efetuado');
this.modalController.dismiss(action_deferimento);
} catch (error) {
await this.toastService.badRequest('Processo não efetuado')
}
@@ -309,7 +300,6 @@ export class ExpedientTaskModalPage implements OnInit {
UsersSelected: attendees,
DispatchFolder: this.dispatchFolder,
AttachmentList: docs,
//SubjectTypes: [],
}
console.log(this.postData);
try {
@@ -323,9 +313,9 @@ export class ExpedientTaskModalPage implements OnInit {
}
this.taskResult = await this.processes.postDespatchoPr(this.postData).toPromise();
await this.toastService.successMessage('Processo efetuado', () =>{
this.modalController.dismiss(action_despacho_pr);
});
await this.toastService.successMessage('Processo efetuado');
this.modalController.dismiss(action_despacho_pr);
} catch (error) {
await this.toastService.badRequest('Processo não efetuado')
}
@@ -354,9 +344,9 @@ export class ExpedientTaskModalPage implements OnInit {
}
this.taskResult = await this.processes.postParecerPr(this.postData).toPromise();
await this.toastService.badRequest('Processo efetuado', () =>{
this.modalController.dismiss(action_parecer_pr);
})
await this.toastService.badRequest('Processo efetuado');
this.modalController.dismiss(action_parecer_pr);
} catch (error) {
await this.toastService.badRequest('Processo não efetuado')
}
@@ -406,17 +396,7 @@ export class ExpedientTaskModalPage implements OnInit {
this.showAttendees = true
}
}
/* setIntervenient(data){
this.taskParticipants = data;
//this.postData.UsersSelected = data;
}
setIntervenientCC(data){
this.taskParticipantsCc = data;
} */
async setIntervenient(data) {
this.taskParticipants = data;
}
@@ -530,50 +510,4 @@ export class ExpedientTaskModalPage implements OnInit {
}
async successMessage(message?: any, callback?) {
var notification = document.createElement('div')
notification.id = 'notification'
notification.innerHTML = `
<div class="main-content width-100 pa-20">
<p class="message d-flex align-center">
<ion-icon slot="end" class="title-icon pr-10" src="/assets/images/nofitication-success.svg"></ion-icon>
<p class="text">{{ message }}</p>
</p>
</div>
`
document.body.append(notification)
notification.querySelector('.text').innerHTML = message || 'Processo efetuado'
setTimeout(()=>{
notification.remove()
},7000)
}
async badRequest(message?: string, callback?) {
var notification = document.createElement('div')
notification.id = 'notification'
notification.innerHTML = `
<div class="main-content width-100 pa-20">
<p class="message d-flex align-center">
<ion-icon slot="end" class="title-icon pr-10" src="/assets/images/notification-error.svg"></ion-icon>
<p class="text">{{ message }}</p>
</p>
</div>
`
document.body.append(notification)
notification.querySelector('.text').innerHTML = message || 'Processo não efetuado'
setTimeout(()=>{
notification.remove()
},7000)
}
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+1 -1
View File
@@ -147,7 +147,7 @@ export class ExpedienteDetailPage implements OnInit {
"Note": res.workflowInstanceDataFields.Note,
"FolderId": res.workflowInstanceDataFields.FolderID,
"FsId": res.workflowInstanceDataFields.FsId,
"DocId": res.workflowInstanceDataFields.DocId,
"DocId": res.workflowInstanceDataFields.DocID,
"WorkflowName": res.workflowDisplayName,
}