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; break;
case 'PR': case 'PR':
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => { this.processes.GetTasksList("Expediente", false).subscribe(result => {
this.expedienteStorage.reset(result) this.expedienteStorage.reset(result)
}); });
break; 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.taskParticipants = [];
this.loggeduser = authService.ValidatedUser; this.loggeduser = authService.ValidatedUser;
this.task = this.navParams.get('task'); this.task = this.navParams.get('task');
console.log(this.task)
this.postData = new Event(); this.postData = new Event();
this.eventBody = { BodyType : "1", Text : ""}; this.eventBody = { BodyType : "1", Text : ""};
this.postData.Body = this.eventBody; this.postData.Body = this.eventBody;
@@ -140,7 +142,6 @@ export class BookMeetingModalPage implements OnInit {
this.postData.CalendarName = "Oficial"; this.postData.CalendarName = "Oficial";
/* this.postData.StartDate = new Date(); */ /* this.postData.StartDate = new Date(); */
/* Set + 30minutes to seleted datetime */ /* Set + 30minutes to seleted datetime */
let selectedEndDate = new Date();
/* this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */ /* this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */
this.dateControlStart = new FormControl(moment(new Date())); this.dateControlStart = new FormControl(moment(new Date()));
@@ -279,7 +280,7 @@ export class BookMeetingModalPage implements OnInit {
} }
this.modalController.dismiss(); this.modalController.dismiss();
this.distartExpedientModal(); // this.distartExpedientModal();
this.toastService.successMessage('Reunião criada'); this.toastService.successMessage('Reunião criada');
} catch (error) { } 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 this.skeletonLoader = true
try { 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 expedienteMD: object[] = await this.processes.GetTasksList("Expediente", false).toPromise()
const result = expedientePr.concat(expedienteMD) 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, "Note": res.workflowInstanceDataFields.Note,
"FolderId": res.workflowInstanceDataFields.FolderID, "FolderId": res.workflowInstanceDataFields.FolderID,
"FsId": res.workflowInstanceDataFields.FsId, "FsId": res.workflowInstanceDataFields.FsId,
"DocId": res.workflowInstanceDataFields.DocIdD, "DocId": res.workflowInstanceDataFields.DocId || res.workflowInstanceDataFields.DocID,
"WorkflowName": res.workflowDisplayName, "WorkflowName": res.workflowDisplayName,
"activityInstanceName": res.activityInstanceName, "activityInstanceName": res.activityInstanceName,
"Status": res.workflowInstanceDataFields.Status, "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(){ LoadList(){
this.skeletonLoader = true this.skeletonLoader = true
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => { this.processes.GetTasksList("Expediente", false).subscribe(result => {
console.log(result); console.log(result);
this.skeletonLoader = false this.skeletonLoader = false
this.showLoader =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') { else if(workflowName == 'Expediente') {
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); 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']); this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
} }
else if (workflowName == "Pedido de Parecer do Presidente") { 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.count_exp_dailywork = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
this.expedientegbstore.count = this.count_exp_dailywork; 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.count_exp_pr = Object.keys(expedientes_pr.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
this.expedienteprstore.count = this.count_exp_pr; 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'){ else if(workflowName == 'Expediente'){
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); 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']); this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
} }
src/app/services/events.service.ts
+10 -14
View File
@@ -26,31 +26,28 @@ export class EventsService {
headersSharedPessoal: HttpHeaders; headersSharedPessoal: HttpHeaders;
//lastloadedevent: Event; //lastloadedevent: Event;
constructor(private http: HttpClient, user: AuthService) { constructor(private http: HttpClient, user: AuthService) {
this.loggeduser = user.ValidatedUser; this.loggeduser = user.ValidatedUser;
this.headersMdOficial = new HttpHeaders(); this.headersMdOficial = new HttpHeaders();
this.headersMdPessoal = new HttpHeaders(); this.headersMdPessoal = new HttpHeaders();
this.headersPrOficial = new HttpHeaders(); this.headersPrOficial = new HttpHeaders();
this.headersPrPessoal = new HttpHeaders(); this.headersPrPessoal = new HttpHeaders();
this.headersSharedOficial = new HttpHeaders(); this.headersSharedOficial = new HttpHeaders();
this.headersSharedPessoal = new HttpHeaders(); this.headersSharedPessoal = new HttpHeaders();
if(this.loggeduser){ if(this.loggeduser){
if(this.loggeduser.Profile == 'MDGPR'){ if(this.loggeduser.Profile == 'MDGPR') {
this.loggeduser.OwnerCalendars.forEach(calendar =>{ this.loggeduser.OwnerCalendars.forEach(calendar => {
if(calendar.CalendarName == 'Oficial'){ if(calendar.CalendarName == 'Oficial') {
this.headersMdOficial = this.headersMdOficial.set('Authorization', this.loggeduser.BasicAuthKey); this.headersMdOficial = this.headersMdOficial.set('Authorization', this.loggeduser.BasicAuthKey);
this.headersMdOficial = this.headersMdOficial.set('CalendarId', calendar.CalendarId); this.headersMdOficial = this.headersMdOficial.set('CalendarId', calendar.CalendarId);
this.headersMdOficial = this.headersMdOficial.set('CalendarRoleId', calendar.CalendarRoleId); this.headersMdOficial = this.headersMdOficial.set('CalendarRoleId', calendar.CalendarRoleId);
} }
else if(calendar.CalendarName == 'Pessoal'){ else if(calendar.CalendarName == 'Pessoal') {
this.headersMdPessoal = this.headersMdPessoal.set('Authorization', this.loggeduser.BasicAuthKey); this.headersMdPessoal = this.headersMdPessoal.set('Authorization', this.loggeduser.BasicAuthKey);
this.headersMdPessoal = this.headersMdPessoal.set('CalendarId', calendar.CalendarId); this.headersMdPessoal = this.headersMdPessoal.set('CalendarId', calendar.CalendarId);
this.headersMdPessoal = this.headersMdPessoal.set('CalendarRoleId', calendar.CalendarRoleId); this.headersMdPessoal = this.headersMdPessoal.set('CalendarRoleId', calendar.CalendarRoleId);
@@ -58,21 +55,20 @@ export class EventsService {
} }
}); });
this.loggeduser.SharedCalendars.forEach(sharedCalendar =>{ this.loggeduser.SharedCalendars.forEach(sharedCalendar => {
if(sharedCalendar.CalendarName == 'Oficial'){ if(sharedCalendar.CalendarName == 'Oficial') {
this.headersSharedOficial = this.headersSharedOficial.set('Authorization', this.loggeduser.BasicAuthKey); this.headersSharedOficial = this.headersSharedOficial.set('Authorization', this.loggeduser.BasicAuthKey);
this.headersSharedOficial = this.headersSharedOficial.set('CalendarId', sharedCalendar.CalendarId); this.headersSharedOficial = this.headersSharedOficial.set('CalendarId', sharedCalendar.CalendarId);
this.headersSharedOficial = this.headersSharedOficial.set('CalendarRoleId', sharedCalendar.CalendarRoleId); this.headersSharedOficial = this.headersSharedOficial.set('CalendarRoleId', sharedCalendar.CalendarRoleId);
} }
else if(sharedCalendar.CalendarName == 'Pessoal'){ else if(sharedCalendar.CalendarName == 'Pessoal') {
this.headersSharedPessoal = this.headersSharedPessoal.set('Authorization', this.loggeduser.BasicAuthKey); this.headersSharedPessoal = this.headersSharedPessoal.set('Authorization', this.loggeduser.BasicAuthKey);
this.headersSharedPessoal = this.headersSharedPessoal.set('CalendarId', sharedCalendar.CalendarId); this.headersSharedPessoal = this.headersSharedPessoal.set('CalendarId', sharedCalendar.CalendarId);
this.headersSharedPessoal = this.headersSharedPessoal.set('CalendarRoleId', sharedCalendar.CalendarRoleId); this.headersSharedPessoal = this.headersSharedPessoal.set('CalendarRoleId', sharedCalendar.CalendarRoleId);
} }
}); });
} }
else if(this.loggeduser.Profile == 'PR'){ else if(this.loggeduser.Profile == 'PR') {
this.loggeduser.OwnerCalendars.forEach(calendar =>{ this.loggeduser.OwnerCalendars.forEach(calendar =>{
if(calendar.CalendarName == 'Oficial'){ if(calendar.CalendarName == 'Oficial'){
@@ -80,7 +76,7 @@ export class EventsService {
this.headersPrOficial = this.headersPrOficial.set('CalendarId', calendar.CalendarId); this.headersPrOficial = this.headersPrOficial.set('CalendarId', calendar.CalendarId);
this.headersPrOficial = this.headersPrOficial.set('CalendarRoleId', calendar.CalendarRoleId); this.headersPrOficial = this.headersPrOficial.set('CalendarRoleId', calendar.CalendarRoleId);
} }
else if(calendar.CalendarName == 'Pessoal'){ else if(calendar.CalendarName == 'Pessoal') {
this.headersPrPessoal = this.headersPrPessoal.set('Authorization', this.loggeduser.BasicAuthKey); this.headersPrPessoal = this.headersPrPessoal.set('Authorization', this.loggeduser.BasicAuthKey);
this.headersPrPessoal = this.headersPrPessoal.set('CalendarId', calendar.CalendarId); this.headersPrPessoal = this.headersPrPessoal.set('CalendarId', calendar.CalendarId);
this.headersPrPessoal = this.headersPrPessoal.set('CalendarRoleId', calendar.CalendarRoleId); this.headersPrPessoal = this.headersPrPessoal.set('CalendarRoleId', calendar.CalendarRoleId);
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+1 -1
View File
@@ -151,7 +151,7 @@ export class AllProcessesPage implements OnInit {
else if(workflowName == 'Expediente') { else if(workflowName == 'Expediente') {
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); 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']); this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
} }
else if (workflowName == "Pedido de Parecer do Presidente") { else if (workflowName == "Pedido de Parecer do Presidente") {
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+5 -7
View File
@@ -1,12 +1,10 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core';
import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router'; import { NavigationStart, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar'; import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model'; import { DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common'; import { ModalController } from '@ionic/angular';
import { LoadingService } from 'src/app/services/loading.service';
import { ModalController, NavParams } from '@ionic/angular';
import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { User } from 'src/app/models/user.model'; import { User } from 'src/app/models/user.model';
@@ -66,8 +64,8 @@ export class ExpedientesPrPage implements OnInit {
LoadList(){ LoadList(){
this.skeletonLoader = true; this.skeletonLoader = true;
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => { this.processes.GetTasksList("Expediente", false).subscribe(result => {
console.log(result);
this.taskslist = []; this.taskslist = [];
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => { res.forEach(element => {
src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+1 -1
View File
@@ -131,7 +131,7 @@ export class PendentesPage implements OnInit {
else if(workflowName == 'Expediente') { else if(workflowName == 'Expediente') {
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); 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']); this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
} }
else if (task.activityInstanceName == "Tarefa de Parecer") { else if (task.activityInstanceName == "Tarefa de Parecer") {