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

fix ubgs

Browse Source
This commit is contained in:
Peter Maquiran
2023-09-19 10:21:23 +01:00
parent 527cc0f2a6
commit f51bd246fc
29 changed files with 754 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/create-process/create-process.page.ts
+8 -8
View File
@@ -110,9 +110,9 @@ export class CreateProcessPage implements OnInit {
console.log('this.fulltask', this.fulltask)
if(this.fulltask?.Documents) {
this.documents = this.fulltask.Documents
}
// if(this.fulltask?.Documents) {
// this.documents = this.fulltask.Documents
// }
if (this.task.SerialNumber) {
this.task.serialNumber = this.task.SerialNumber
@@ -355,7 +355,7 @@ export class CreateProcessPage implements OnInit {
DispatchFolder: this.dispatchFolder,
AttachmentList: docs
}
try {
if (this.task.activityInstanceName == 'Tarefa de Despacho' || this.task.activityInstanceName == 'Reexecutar Despacho') {
// create parecer
@@ -604,7 +604,7 @@ export class CreateProcessPage implements OnInit {
backdropDismiss: false
});
modal.onDidDismiss().then((data) => {
if (data) {
@@ -683,7 +683,7 @@ export class CreateProcessPage implements OnInit {
backdropDismiss: false
});
modal.onDidDismiss().then(res => {
if (res['data'] == 'close') {
this.modalController.dismiss(res['data'])
@@ -742,7 +742,7 @@ export class CreateProcessPage implements OnInit {
cssClass: classs,
backdropDismiss: false
});
modal.onDidDismiss().then((res) => {
}, (error) => {
@@ -770,7 +770,7 @@ export class CreateProcessPage implements OnInit {
select: true
}
});
modal.onDidDismiss().then((res) => {
if (res) {
const data = res.data;
src/app/modals/profile/profile.page.ts
+12 -9
View File
@@ -86,7 +86,7 @@ export class ProfilePage implements OnInit {
this.getNotificationData();
this.getProfilpicture();
}
@@ -259,7 +259,7 @@ export class ProfilePage implements OnInit {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', IdObject, 'gabinete-digital']));
}
else if (Service === "gabinete-digital" && Object === "diplomas-assinar") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar', IdObject, 'gabinete-digital']));
}
else if (Service === "gabinete-digital" && Object === "diploma-revisao") {
@@ -309,26 +309,26 @@ export class ProfilePage implements OnInit {
else if (Service === "agenda" && Object === "event-list") {
//this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'agenda']));
this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', IdObject, 'agenda']));
} else if (Service === "gabinete-digital" && Object === "despachos") {
this.processesService.GetTask(IdObject).subscribe((task) => {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', IdObject, 'gabinete-digital'], { replaceUrl: true }));
}, (error) => {
this.notificationdata[i].read = true;
})
}
else if (Service === "gabinete-digital" && Object === "parecer") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', IdObject, 'gabinete-digital']));
}
else if (Service === "gabinete-digital" && Object === "deferimento") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', IdObject, 'gabinete-digital']));
}
else if (Service === "gabinete-digital" && Object === "despachos-pr") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', IdObject, 'gabinete-digital']));
}
else if (Service === "accoes" && Object === "accao") {
@@ -341,7 +341,7 @@ export class ProfilePage implements OnInit {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', IdObject, 'gabinete-digital']));
}
else if (Service === "gabinete-digital" && Object === "diplomas-assinar") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar', IdObject, 'gabinete-digital']));
}
else if (Service === "gabinete-digital" && Object === "expedientes-pr") {
@@ -383,13 +383,16 @@ export class ProfilePage implements OnInit {
if (environment.production) {
window.location.pathname = '/auth'
this.notificationService.DeletePostToken()
} else {
const pathBeforeGoOut = window.location.pathname
this.router.navigateByUrl('/auth', { replaceUrl: true });
this.notificationService.DeletePostToken()
setTimeout(() => {
if (this.logoutOut == false || pathBeforeGoOut == window.location.pathname) {
window.location.pathname = '/auth'
this.notificationService.DeletePostToken()
} else {
}