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

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

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-09 16:56:17 +01:00
parent c11e812098 967b207fde
commit 3676d22fbf
45 changed files with 572 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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/agenda/edit-event/edit-event.page.ts
+10 -4
View File
@@ -234,7 +234,7 @@ export class EditEventPage implements OnInit {
});
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -273,12 +273,15 @@ export class EditEventPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -316,8 +319,11 @@ export class EditEventPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
}
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+10 -4
View File
@@ -92,7 +92,7 @@ export class EventActionsPopoverPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -131,12 +131,15 @@ export class EventActionsPopoverPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -174,8 +177,11 @@ export class EventActionsPopoverPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
src/app/pages/agenda/new-event/new-event.page.ts
+10 -4
View File
@@ -169,7 +169,7 @@ export class NewEventPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -208,12 +208,15 @@ export class NewEventPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -251,8 +254,11 @@ export class NewEventPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async openAttendees() {
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
+18 -12
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()
}
@@ -174,7 +174,7 @@ export class DespachoPrPage implements OnInit {
this.modalController.dismiss();
}
async executado(note:string, documents:any){
async executado(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Conhecimento",
@@ -464,7 +464,7 @@ export class DespachoPrPage implements OnInit {
return await popover.present();
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -503,11 +503,14 @@ export class DespachoPrPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -545,7 +548,10 @@ export class DespachoPrPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
}
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+23 -7
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);
}
@@ -209,7 +219,7 @@ export class DespachoPage implements OnInit {
}
async reexecute(note:string, documents:any){
async reexecute(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Reencaminhar",
@@ -231,7 +241,7 @@ export class DespachoPage implements OnInit {
}
sendExpedienteToPending(){
async sendExpedienteToPending() {
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
console.log(res);
this.close();
@@ -414,7 +424,7 @@ export class DespachoPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -453,12 +463,15 @@ export class DespachoPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -496,7 +509,10 @@ export class DespachoPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
}
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+23 -9
View File
@@ -53,8 +53,14 @@ export class DiplomaAssinarPage implements OnInit {
this.LoadTaskDetail(this.serialnumber);
}
goBack(){
window.history.back()
goBack() {
let navigationExtras: NavigationExtras = {
queryParams: {
"diplomas": true,
}
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
async openOptions(taskAction?: any) {
@@ -144,18 +150,20 @@ export class DiplomaAssinarPage implements OnInit {
}
try {
await this.processes.CompleteTask(body).toPromise()
this.goBack();
this.successMessage()
this.successMessage(false, ()=>{
this.goBack();
})
} catch (error) {
this.badRequest()
}
}
close(){
close() {
this.modalController.dismiss();
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -194,12 +202,15 @@ export class DiplomaAssinarPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -237,8 +248,11 @@ export class DiplomaAssinarPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
}
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+23 -13
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) {
@@ -152,8 +153,11 @@ export class DiplomaPage implements OnInit {
}
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.successMessage()
this.successMessage(false, ()=>{
this.close();
})
} catch (error) {
this.badRequest()
}
@@ -271,7 +275,7 @@ export class DiplomaPage implements OnInit {
this.modalController.dismiss();
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -310,12 +314,15 @@ export class DiplomaPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -353,8 +360,11 @@ export class DiplomaPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
}
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+27 -15
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,20 +96,22 @@ 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);
this.successMessage('Evento aprovado')
this.successMessage('Evento aprovado', ()=>{
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
})
} catch (error) {
this.badRequest('Evento não aprovado')
}
}
emendTask(serialNumber:string){
@@ -119,15 +123,17 @@ 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()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.successMessage('Evento rejeitado')
this.successMessage('Evento rejeitado', () =>{
this.router.navigate(['/home/gabinete-digital/event-list']);
})
} catch (error) {
this.badRequest('Evento não rejeitado')
}
@@ -214,7 +220,7 @@ export class ApproveEventModalPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -253,12 +259,15 @@ export class ApproveEventModalPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -296,8 +305,11 @@ export class ApproveEventModalPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
}
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+33 -17
View File
@@ -63,10 +63,18 @@ export class ApproveEventPage implements OnInit {
}
goBack() {
window.history.back();
let navigationExtras: NavigationExtras = {
queryParams: {
"eventos": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
async getTask(){
async getTask() {
this.loadedEvent = await this.processes.GetTask(this.serialNumber).toPromise();
console.log(this.loadedEvent);
@@ -78,17 +86,17 @@ export class ApproveEventPage implements OnInit {
this.getAttachments(instanceId);
}
async approveTask(serialNumber:string){
async approveTask(serialNumber:string) {
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
try {
//await this.processes.PostTaskAction(body).toPromise()
this.toastService.successMessage('Evento aprovado');
setTimeout(()=>{
//this.successMessage()
this.toastService.successMessage('Evento aprovado', ()=>{
this.goBack();
},7000)
//this.goBack();
});
} catch (error) {
this.badRequest()
}
@@ -115,10 +123,12 @@ export class ApproveEventPage implements OnInit {
console.log(body);
this.successMessage('Process');
try {
//this.processes.PostTaskAction(body).toPromise();
await this.toastService.successMessage('Processo rejeitado');
this.goBack();
this.processes.PostTaskAction(body).toPromise();
await this.successMessage('Processo rejeitado');
await this.toastService.successMessage('Processo rejeitado', ()=>{
this.goBack();
});
} catch (error) {
this.badRequest()
}
@@ -193,14 +203,14 @@ export class ApproveEventPage implements OnInit {
});
}
/* goToEventsToApprove(){
goToEventsToApprove(){
let navigationExtras: NavigationExtras = {
queryParams: {
"eventos": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
} */
}
async editar(serialNumber: string) {
@@ -226,7 +236,7 @@ export class ApproveEventPage implements OnInit {
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -265,12 +275,15 @@ export class ApproveEventPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -308,8 +321,11 @@ export class ApproveEventPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
}
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+6 -3
View File
@@ -305,7 +305,7 @@ export class BookMeetingModalPage implements OnInit {
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -350,7 +350,7 @@ export class BookMeetingModalPage implements OnInit {
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -388,8 +388,11 @@ export class BookMeetingModalPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
goToGabinete() {
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+10 -4
View File
@@ -528,7 +528,7 @@ export class ExpedientTaskModalPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -567,12 +567,15 @@ export class ExpedientTaskModalPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -610,8 +613,11 @@ export class ExpedientTaskModalPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+1 -1
View File
@@ -109,7 +109,7 @@
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" *ngIf="hideSendToPendentes" >Enviar para Pendentes</button>
<div hidden class="solid"></div>
<button hidden class="btn-cancel" shape="round" >Delegar</button>
<button hidden (click)="showToast()" class="btn-cancel" shape="round" >ShowToast</button>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+52 -20
View File
@@ -39,6 +39,9 @@ export class ExpedienteDetailPage implements OnInit {
intervenientes: any;
cc: any = [];
hideSendToPendentes = true
constructor(private activateRoute: ActivatedRoute,
private processes: ProcessesService,
private iab: InAppBrowser,
@@ -53,12 +56,19 @@ export class ExpedienteDetailPage implements OnInit {
private toastService: ToastService,
private animationController: AnimationController
) {
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
console.log(params["serialNumber"]);
}
if(params["type"] == "pendentes") {
this.hideSendToPendentes = false
}
});
}
ngOnInit() {
@@ -76,29 +86,45 @@ 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()
} */
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes": true,
goBack() {
this.activatedRoute.queryParams.subscribe(params => {
if(params["from"] == "inicio") {
this.router.navigate(['/home/events']);
} else {
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes": true,
}
}
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/expediente']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
};
if( window.innerWidth < 801){
this.router.navigate(['/home/gabinete-digital/expediente']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
});
}
sendExpedienteToPending(){
@@ -334,7 +360,7 @@ export class ExpedienteDetailPage implements OnInit {
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -373,12 +399,15 @@ export class ExpedienteDetailPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -416,8 +445,11 @@ export class ExpedienteDetailPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
}
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+11 -4
View File
@@ -87,17 +87,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);
}
}
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+13 -10
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();
}
@@ -440,7 +440,7 @@ export class ExpedientePrPage implements OnInit {
return await popover.present();
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -479,12 +479,15 @@ export class ExpedientePrPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
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
+14 -7
View File
@@ -407,14 +407,18 @@ 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) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -453,12 +457,15 @@ export class PedidoPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+11 -2
View File
@@ -54,8 +54,16 @@ export class PendentesPage implements OnInit {
}
goBack() {
let navigationExtras: NavigationExtras = {
queryParams: {
"pedidos": true,
}
}
window.history.back();
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
// window.history.back();
}
notImplemented(){
@@ -168,7 +176,8 @@ export class PendentesPage implements OnInit {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
"from": "pendentes"
"from": "pendentes",
"type": "pendentes"
}
};
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
src/app/pages/login/login.page.html
+3 -3
View File
@@ -1,6 +1,6 @@
<ion-content class="text-white">
<div class="main-wrapper">
<div class="wrapper" *ngIf="userLoginPreference != 'pin' && userLoginPreference != 'fingerprint' && !setPint">
<div class="wrapper" *ngIf="userLoginPreference != 'pin' && userLoginPreference != 'fingerprint' && !setPint ">
<div class="bg-1 d-flex justify-center align-center">
<div class="bg-2 d-flex justify-center align-center">
@@ -71,11 +71,11 @@
</div>
<div *ngIf="!setPint" class="voltar d-flex align-center justify-center pt-35 clear" (click)="pin=!pin">
<div *ngIf="!setPint" class="voltar d-flex align-center justify-center pt-25 clear" (click)="setPint=false; userLoginPreference='none'">
Entrar com senha
</div>
<div *ngIf="setPint" class="voltar d-flex align-center justify-center pt-25 clear" (click)="pin=!pin">
<div *ngIf="setPint" class="voltar d-flex align-center justify-center pt-25 clear" (click)="pin=!pin;">
Limpar
</div>
src/app/pages/login/login.page.ts
+15 -5
View File
@@ -33,9 +33,9 @@ export class LoginPage implements OnInit {
password: string = environment.defaultuserpwd;
userattempt: UserForm;
code = []
setPint = false
pin = localStorage.getItem('PIN') != null
setPint = false
pin = false
userLoginPreference: any
@@ -57,9 +57,16 @@ export class LoginPage implements OnInit {
if (userData.hasOwnProperty('loginPreference')) {
this.userLoginPreference = userData.loginPreference
this.pin = true
} else {
this.userLoginPreference = ''
this.setPint = false
this.pin = false
}
}
ngOnInit() {}
@@ -198,7 +205,7 @@ export class LoginPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -237,12 +244,15 @@ export class LoginPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?: string) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
src/app/pages/publications/new-action/new-action.page.ts
+10 -4
View File
@@ -56,7 +56,7 @@ export class NewActionPage implements OnInit {
this.modalController.dismiss();
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -95,12 +95,15 @@ export class NewActionPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -138,8 +141,11 @@ export class NewActionPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
}
src/app/pages/publications/publication-detail/publication-detail.page.ts
+10 -4
View File
@@ -122,7 +122,7 @@ export class PublicationDetailPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -161,12 +161,15 @@ export class PublicationDetailPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -204,7 +207,10 @@ export class PublicationDetailPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
}
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+10 -4
View File
@@ -124,7 +124,7 @@ export class PublicationDetailPage implements OnInit {
}
async successMessage(message?: string) {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
@@ -163,12 +163,15 @@ export class PublicationDetailPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
async badRequest(message?) {
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
@@ -206,8 +209,11 @@ export class PublicationDetailPage implements OnInit {
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},3000)
},7000)
}
}