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

Improve

Browse Source
This commit is contained in:
Peter Maquiran
2021-06-09 14:45:36 +01:00
parent 0be73beb6b
commit 1595d592e6
21 changed files with 162 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/create-process/create-process.page.ts
+4 -4
View File
@@ -131,16 +131,16 @@ export class CreateProcessPage implements OnInit {
}
async saveTask(){
if(this.postData.Priority=='99999861'){
if(this.postData.Priority=='99999861') {
this.dispatchFolder.DeadlineType = 'Normal';
}
else if(this.postData.Priority=='99999862'){
else if(this.postData.Priority=='99999862') {
this.dispatchFolder.DeadlineType = 'Urgente';
}
else if(this.postData.Priority=='99999863'){
else if(this.postData.Priority=='99999863') {
this.dispatchFolder.DeadlineType = 'Muito Urgente';
}
else if(this.postData.Priority=='99999864'){
else if(this.postData.Priority=='99999864') {
this.dispatchFolder.DeadlineType = 'Urgentíssimo';
}
src/app/modals/delegar/delegar.page.ts
+3 -6
View File
@@ -72,14 +72,12 @@ export class DelegarPage implements OnInit {
}
close(){
close() {
this.router.navigate(['/home/gabinete-digital/expediente']);
this.modalController.dismiss(null);
}
goBack() {
window.history.back()
}
cancelTask(){
cancelTask() {
this.modalController.dismiss(null);
}
@@ -104,7 +102,6 @@ export class DelegarPage implements OnInit {
(error)=>{
this.badRequest("Processo não delegado")
});
this.goBack();
}
}
src/app/pages/agenda/agenda.page.html
+1 -1
View File
@@ -226,7 +226,7 @@
<div *ngFor="let event of events.value" >
<div class="d-flex content-{{event.Profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)" *ngIf="eventListVisible(event.start)">
<div class="d-flex content-{{event.Profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)" >
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
<div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
src/app/pages/events/events.page.ts
+2 -1
View File
@@ -328,7 +328,8 @@ export class EventsPage implements OnInit {
goToExpediente(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
"serialNumber": serialNumber,
"from": "inicio"
}
};
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+7 -7
View File
@@ -83,14 +83,14 @@ export class DespachoPrPage implements OnInit {
}
goBack(){
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "despachospr": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
let navigationExtras: NavigationExtras = {
queryParams: {
"despachospr": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back()
}
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+12 -2
View File
@@ -85,7 +85,17 @@ export class DespachoPage implements OnInit {
}
goBack() {
window.history.back()
// window.history.back()
let navigationExtras: NavigationExtras = {
queryParams: {
// "serialNumber": serialNumber,
'despachos': true
}
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
@@ -231,7 +241,7 @@ export class DespachoPage implements OnInit {
}
sendExpedienteToPending(){
async sendExpedienteToPending() {
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
console.log(res);
this.close();
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+7 -1
View File
@@ -54,7 +54,13 @@ export class DiplomaAssinarPage implements OnInit {
}
goBack(){
window.history.back()
let navigationExtras: NavigationExtras = {
queryParams: {
"diplomas": true,
}
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
async openOptions(taskAction?: any) {
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+8 -7
View File
@@ -55,14 +55,15 @@ export class DiplomaPage implements OnInit {
}
goBack() {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "diplomas": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back()
let navigationExtras: NavigationExtras = {
queryParams: {
"diplomas": true,
}
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
async openOptions(taskAction?: any) {
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+6 -6
View File
@@ -71,7 +71,8 @@ export class ApproveEventModalPage implements OnInit {
this.modalController.dismiss(null);
}
getTask(){
getTask() {
this.processes.GetTask(this.serialNumber).subscribe(res => {
console.log('GET TASK SERIALNUMBER: ', this.serialNumber,'Approve event',res);
this.loadedEvent = res;
@@ -83,6 +84,7 @@ export class ApproveEventModalPage implements OnInit {
this.getAttachments()
})
}
viewDocument(docId:string, applicationId:string){
@@ -94,11 +96,11 @@ export class ApproveEventModalPage implements OnInit {
});
}
async approveTask(serialNumber:string){
async approveTask(serialNumber:string) {
console.log('approveTask SERIALNUMBER: ', serialNumber)
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
try {
try {
await this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
@@ -107,7 +109,6 @@ export class ApproveEventModalPage implements OnInit {
this.badRequest('Evento não aprovado')
}
}
emendTask(serialNumber:string){
@@ -119,9 +120,8 @@ export class ApproveEventModalPage implements OnInit {
}
async rejectTask(serialNumber:string) {
// console.log('rejectTask: ',serialNumber)
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
// console.log(body);
try {
await this.processes.PostTaskAction(body).toPromise()
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+9 -1
View File
@@ -63,7 +63,15 @@ export class ApproveEventPage implements OnInit {
}
goBack() {
window.history.back();
let navigationExtras: NavigationExtras = {
queryParams: {
"eventos": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
async getTask(){
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+31 -3
View File
@@ -39,6 +39,7 @@ export class ExpedienteDetailPage implements OnInit {
intervenientes: any;
cc: any = [];
constructor(private activateRoute: ActivatedRoute,
private processes: ProcessesService,
private iab: InAppBrowser,
@@ -79,16 +80,43 @@ export class ExpedienteDetailPage implements OnInit {
this.LoadRelatedEvents(this.serialnumber);
}
close(){
close() {
this.modalController.dismiss();
}
showToast(){
showToast() {
this.toastService.presentToast('Não foi possível fazer login"');
}
goBack() {
window.history.back()
this.activatedRoute.queryParams.subscribe(params => {
if(params["from"] == "inicio") {
this.router.navigate(['/home/events']);
} else {
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes": true
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
if (params["type"] == 'pendentes') {
}
});
}
/* goBack(){
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+11 -4
View File
@@ -91,17 +91,24 @@ export class ExpedientePage implements OnInit {
}, 2000);
}
goBack(){
goBack() {
this.router.navigate(['/home/gabinete-digital']);
}
goToExpediente(serialNumber:any){
goToExpediente(serialNumber:any) {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
"serialNumber": serialNumber,
"from": "gabinete",
"type": "pendentes"
}
};
}
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
}
async viewExpedientDetail(serialNumber:any) {
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+7 -7
View File
@@ -88,14 +88,14 @@ export class ExpedientePrPage implements OnInit {
}
goBack() {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "expedientes-pr": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes-pr": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back();
}
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+7 -7
View File
@@ -150,14 +150,14 @@ export class ExpedientesPrPage implements OnInit {
}
goBack() {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "expedientes-pr": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes-pr": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back();
// window.history.back();
}
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+8 -4
View File
@@ -407,12 +407,16 @@ export class PedidoPage implements OnInit {
}
goBack() {
window.history.back();
let navigationExtras: NavigationExtras = {
queryParams: {
"pedidos": true,
}
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
async successMessage(message?: string) {
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+9 -1
View File
@@ -54,8 +54,16 @@ export class PendentesPage implements OnInit {
}
goBack() {
let navigationExtras: NavigationExtras = {
queryParams: {
"pedidos": true,
}
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back();
// window.history.back();
}
notImplemented(){
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+1
View File
@@ -101,6 +101,7 @@ export class ExpedientsPage implements OnInit {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
"from": "gabinete"
}
};
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+3
View File
@@ -172,11 +172,14 @@ export class PendentesPage implements OnInit {
}
goToExpediente(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
"from": "gabinete"
}
};
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
}
src/app/shared/popover/despachos-options/despachos-options.page.ts
+7 -7
View File
@@ -365,14 +365,14 @@ export class DespachosOptionsPage implements OnInit {
goBack() {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "despachospr": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
let navigationExtras: NavigationExtras = {
queryParams: {
"despachospr": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back()
// window.history.back()
}
}
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+8 -7
View File
@@ -366,14 +366,15 @@ export class DespachosPrOptionsPage implements OnInit {
goBack() {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "despachospr": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back()
let navigationExtras: NavigationExtras = {
queryParams: {
"despachospr": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+11 -9
View File
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { User } from 'src/app/models/user.model';
@@ -42,7 +42,9 @@ export class OptsExpedientePrPage implements OnInit {
private activatedRoute: ActivatedRoute,
private userAuth: AuthService,
private navParams: NavParams,
private animationController: AnimationController
private animationController: AnimationController,
private router: Router
) {
this.task = this.navParams.get('task');
@@ -275,14 +277,14 @@ export class OptsExpedientePrPage implements OnInit {
}
goBack() {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "expedientes-pr": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes-pr": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back();
// window.history.back();
}