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

improve

Browse Source
This commit is contained in:
Peter Maquiran
2022-05-06 15:56:18 +01:00
parent 5552a0caad 169bf9bbda
commit 224ab442db
18 changed files with 102 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+10
View File
@@ -63,6 +63,16 @@ export class AllProcessesPage implements OnInit {
//
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Reexecutar Despacho por Delegação')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Editar Evento')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Retificar Expediente')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Agendar Reunião para o Ministro e Director')
this.skeletonLoader = true;
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+18 -3
View File
@@ -19,7 +19,7 @@ export class EventsToApprovePage implements OnInit {
showLoader: boolean;
eventsPRList: any = []
eventsMDGPRList: any = []
eventsMDGPRList;
eventPerson: EventPerson;
eventBody: EventBody;
categories: string[];
@@ -41,6 +41,7 @@ export class EventsToApprovePage implements OnInit {
}
ngOnInit() {
console.log('ERROR LEGN',this.eventsMDGPRList.length)
this.segment = this.loggeduser.Profile;
this.LoadToApproveEvents();
@@ -66,11 +67,18 @@ export class EventsToApprovePage implements OnInit {
this.showLoader = true;
this.getFromDB();
if(this.segment != 'PR') {
if(this.segment != 'PR'){
let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
console.log(mdEventsOficial)
console.log(mdEventsPessoal)
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
this.eventsMDGPRList = this.eventsMDGPRList.filter(function(item) {
return item.activityInstanceName != 'Editar Evento'
})
console.log(this.eventsMDGPRList)
this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => {
@@ -82,8 +90,13 @@ export class EventsToApprovePage implements OnInit {
else if(this.segment == 'PR') {
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
console.log(prEventsOficial)
console.log(prEventsPessoal)
this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
this.eventsPRList = this.eventsPRList.filter(function(item) {
return item.activityInstanceName != 'Editar Evento'
})
this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {
@@ -97,10 +110,12 @@ export class EventsToApprovePage implements OnInit {
getFromDB() {
this.storage.get('event-to-aproveMD').then((events) => {
this.eventsMDGPRList = events
console.log('DB',this.eventsMDGPRList)
})
this.storage.get('event-to-aprovePR').then((events) => {
this.eventsPRList = events
console.log('DB',this.eventsPRList)
})
}
@@ -153,7 +168,7 @@ export class EventsToApprovePage implements OnInit {
}, 1000)
}
close(){
close() {
this.modalController.dismiss(null);
src/app/shared/popover/opts-expediente/opts-expediente.page.html
+4 -4
View File
@@ -8,13 +8,13 @@
<div class="width-100">
<div class="d-flex width-100">
<div class="flex-grow-1">
<button *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" && loggeduser.Profile == 'MDGPR' class="btn-cancel desk" shape="round"> Enviar para o PR </button>
<button *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" && loggeduser.Profile == 'MDGPR' (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
<button *ngIf="loggeduser.Profile == 'MDGPR'" class="btn-cancel desk" shape="round"> Enviar para o PR </button>
<button *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Solicitar revisão </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) || p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="btn-cancel desk" shape="round">Outras opções </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round">Outras opções </button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
<!-- <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button> -->
</div>
<div class="flex-grow-1">
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+7 -1
View File
@@ -17,6 +17,8 @@ import { PermissionService } from 'src/app/services/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
import { RouteService } from 'src/app/services/route.service';
import { LoginUserRespose } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service';
@Component({
selector: 'app-opts-expediente',
@@ -34,6 +36,8 @@ export class OptsExpedientePage implements OnInit {
searchDocumentPipe = new SearchDocumentPipe()
documents:SearchList[] = [];
loggeduser: LoginUserRespose;
constructor(
private popoverController: PopoverController,
private modalController: ModalController,
@@ -45,8 +49,10 @@ export class OptsExpedientePage implements OnInit {
private attachmentsService: AttachmentsService,
private RouteService: RouteService,
private expedienteService: ExpedienteService,
public ThemeService: ThemeService
public ThemeService: ThemeService,
private userAuth: AuthService,
) {
this.loggeduser = userAuth.ValidatedUser
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');