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

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-08 16:58:21 +01:00
parent 45a0dc7f89 574aac6615
commit 8f809e41e2
26 changed files with 86 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/approve-event/approve-event.page.ts
+2 -2
View File
@@ -125,9 +125,9 @@ export class ApproveEventPage implements OnInit {
await this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
this.successMessage()
this.successMessage('Evento rejeitado')
} catch (error) {
this.badRequest()
this.badRequest('Evento não rejeitado')
}
}
src/app/shared/agenda/new-event/new-event.page.ts
+6 -6
View File
@@ -206,11 +206,11 @@ export class NewEventPage implements OnInit {
this.afterSave();
}
this.successMessage()
this.successMessage('Evento criado')
},
error => {
this.badRequest()
this.badRequest('Evento não criado')
});
}
else if(this.profile=='pr') {
@@ -247,7 +247,7 @@ export class NewEventPage implements OnInit {
this.afterSave();
}
this.successMessage()
this.successMessage('Evento criado')
});
}
}
@@ -359,7 +359,7 @@ export class NewEventPage implements OnInit {
}
async badRequest() {
async badRequest(message?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -389,9 +389,9 @@ export class NewEventPage implements OnInit {
leaveAnimation,
component: BadRequestPage,
componentProps: {
message: 'Processo não realizado com sucesso',
message: message || 'Processo não realizado com sucesso',
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+2 -2
View File
@@ -253,9 +253,9 @@ export class EditEventToApproveComponent implements OnInit {
}
this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
this.successMessage()
this.successMessage('Evento editado')
}, error =>{
this.badRequest()
this.badRequest('Evento não editado')
})
src/app/shared/popover/despachos-options/despachos-options.page.ts
+2 -2
View File
@@ -250,10 +250,10 @@ export class DespachosOptionsPage implements OnInit {
}
try {
await this.processes.CompleteTask(body).toPromise()
this.successMessage()
this.successMessage('Processo arquivado')
this.close();
} catch (error) {
this.badRequest()
this.badRequest('Processo não arquivado')
}
}
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+2 -2
View File
@@ -251,10 +251,10 @@ export class DespachosPrOptionsPage implements OnInit {
}
try {
await this.processes.CompleteTask(body).toPromise()
this.successMessage()
this.successMessage('Processo arquivado')
this.close();
} catch (error) {
this.badRequest()
this.badRequest('Processo não arquivado')
}
}
src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+1 -1
View File
@@ -331,7 +331,7 @@ export class OptsExpedientePrPage implements OnInit {
}
async badRequest() {
async badRequest(message?) {
const modal = await this.modalController.create({
component: BadRequestPage,
componentProps: {
src/app/shared/popover/request-options/request-options.page.ts
+2 -2
View File
@@ -232,9 +232,9 @@ export class RequestOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.successMessage()
this.successMessage('Processo arquivado')
} catch (error) {
this.badRequest()
this.badRequest('Processo não arquivado')
}
src/app/shared/publication/new-action/new-action.page.ts
+4 -4
View File
@@ -47,9 +47,9 @@ export class NewActionPage implements OnInit {
try {
await this.publication.CreatePublicationFolder(this.folder).toPromise()
this.close();
this.successMessage()
this.successMessage('Publicação criado')
} catch (error) {
this.badRequest()
this.badRequest('Publicação não criado')
}
}
@@ -103,7 +103,7 @@ export class NewActionPage implements OnInit {
}
async badRequest() {
async badRequest(message?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -135,7 +135,7 @@ export class NewActionPage implements OnInit {
componentProps: {
message: 'Processo não realizado com sucesso',
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
src/app/shared/publication/new-publication/new-publication.page.ts
+8 -8
View File
@@ -159,11 +159,11 @@ export class NewPublicationPage implements OnInit {
console.log(this.publication);
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
this.successMessage()
this.successMessage("Publicação criado")
this.goBack();
} catch (error) {
this.badRequest()
this.badRequest("Publicação não criado")
}
}
@@ -183,11 +183,11 @@ export class NewPublicationPage implements OnInit {
try {
console.log(this.publication);
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
this.successMessage()
this.successMessage("Publicação criado")
this.goBack();
} catch (error) {
this.badRequest()
this.badRequest("Publicação não criado")
}
}
@@ -209,11 +209,11 @@ export class NewPublicationPage implements OnInit {
try {
console.log(this.publication);
await this.publications.CreatePublication(this.folderId, this.publication).toPromise()
this.successMessage()
this.successMessage("Publicação criado")
this.goBackToViewPublications.emit();
} catch (error) {
this.badRequest()
this.badRequest("Publicação não criado")
}
}
@@ -319,7 +319,7 @@ export class NewPublicationPage implements OnInit {
}
async badRequest() {
async badRequest(message?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -351,7 +351,7 @@ export class NewPublicationPage implements OnInit {
componentProps: {
message: 'Processo não realizado com sucesso',
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+5 -5
View File
@@ -80,7 +80,7 @@ export class PublicationDetailPage implements OnInit {
});
}
close(){
close() {
this.modalController.dismiss();
}
@@ -88,10 +88,10 @@ export class PublicationDetailPage implements OnInit {
try {
await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
this.successMessage()
this.successMessage("Publicação eliminado")
this.goBackToViewPublications.emit();
} catch (error) {
this.badRequest()
this.badRequest("Publicação não eliminado")
}
}
@@ -185,7 +185,7 @@ export class PublicationDetailPage implements OnInit {
}
async badRequest() {
async badRequest(message?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -217,7 +217,7 @@ export class PublicationDetailPage implements OnInit {
componentProps: {
message: 'Processo não realizado com sucesso',
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()