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

Improve

Browse Source
This commit is contained in:
Peter Maquiran
2021-08-10 09:40:14 +01:00
parent ca32bc3808
commit 62cd2e4f66
11 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/events/events.page.ts
+1 -1
View File
@@ -307,7 +307,7 @@ export class EventsPage implements OnInit {
});
break;
case 'PR':
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
this.processes.GetTasksList("Expediente", false).subscribe(result => {
this.expedienteStorage.reset(result)
});
break;
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+3 -2
View File
@@ -131,6 +131,8 @@ export class BookMeetingModalPage implements OnInit {
this.taskParticipants = [];
this.loggeduser = authService.ValidatedUser;
this.task = this.navParams.get('task');
console.log(this.task)
this.postData = new Event();
this.eventBody = { BodyType : "1", Text : ""};
this.postData.Body = this.eventBody;
@@ -140,7 +142,6 @@ export class BookMeetingModalPage implements OnInit {
this.postData.CalendarName = "Oficial";
/* this.postData.StartDate = new Date(); */
/* Set + 30minutes to seleted datetime */
let selectedEndDate = new Date();
/* this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */
this.dateControlStart = new FormControl(moment(new Date()));
@@ -279,7 +280,7 @@ export class BookMeetingModalPage implements OnInit {
}
this.modalController.dismiss();
this.distartExpedientModal();
// this.distartExpedientModal();
this.toastService.successMessage('Reunião criada');
} catch (error) {
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+1 -1
View File
@@ -56,7 +56,7 @@ export class ExpedientePage implements OnInit {
this.skeletonLoader = true
try {
const expedientePr: object[] = await this.processes.GetTasksList("Expediente do Presidente", false).toPromise()
const expedientePr: object[] = await this.processes.GetTasksList("Expediente", false).toPromise()
const expedienteMD: object[] = await this.processes.GetTasksList("Expediente", false).toPromise()
const result = expedientePr.concat(expedienteMD)
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+1 -1
View File
@@ -161,7 +161,7 @@ export class ExpedientePrPage implements OnInit {
"Note": res.workflowInstanceDataFields.Note,
"FolderId": res.workflowInstanceDataFields.FolderID,
"FsId": res.workflowInstanceDataFields.FsId,
"DocId": res.workflowInstanceDataFields.DocIdD,
"DocId": res.workflowInstanceDataFields.DocId || res.workflowInstanceDataFields.DocID,
"WorkflowName": res.workflowDisplayName,
"activityInstanceName": res.activityInstanceName,
"Status": res.workflowInstanceDataFields.Status,
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+1 -1
View File
@@ -64,7 +64,7 @@ export class ExpedientesPrPage implements OnInit {
LoadList(){
this.skeletonLoader = true
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
this.processes.GetTasksList("Expediente", false).subscribe(result => {
console.log(result);
this.skeletonLoader = false
this.showLoader =false
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+2 -2
View File
@@ -286,7 +286,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
else if(workflowName == 'Expediente') {
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
}
else if(workflowName == 'Expediente do Presidente' && this.loggeduser.Profile == 'PR') {
else if(workflowName == 'Expediente' && this.loggeduser.Profile == 'PR') {
this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
}
else if (workflowName == "Pedido de Parecer do Presidente") {
@@ -430,7 +430,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
this.count_exp_dailywork = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
this.expedientegbstore.count = this.count_exp_dailywork;
let expedientes_pr = await this.processesbackend.GetTasksList("Expediente do Presidente", false).toPromise();
let expedientes_pr = await this.processesbackend.GetTasksList("Expediente", false).toPromise();
this.count_exp_pr = Object.keys(expedientes_pr.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
this.expedienteprstore.count = this.count_exp_pr;
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+1 -1
View File
@@ -138,7 +138,7 @@ export class PendentesPage implements OnInit {
else if(workflowName == 'Expediente'){
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
}
else if(workflowName == 'Expediente do Presidente' && this.loggeduser.Profile == 'PR') {
else if(workflowName == 'Expediente' && this.loggeduser.Profile == 'PR') {
this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
}