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

Improve modal for mobile

Browse Source
This commit is contained in:
Peter Maquiran
2021-05-26 15:53:39 +01:00
parent 516e146b22
commit dd5407b391
16 changed files with 212 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+8 -6
View File
@@ -81,12 +81,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-pr/despachos-pr.page.html
+1 -1
View File
@@ -2,9 +2,9 @@
<app-header > </app-header>
</ion-header>
<ion-header class="ion-no-border header-2">
<div class="main-header">
<app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
<div class="thetitle">
<ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais</ion-label>
<ion-label *ngIf="loggeduser.Profile =='PR'" >Despachos</ion-label>
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss
+1 -1
View File
@@ -25,7 +25,7 @@ ion-content, .header-2, .main-content{
font-size: 25px;
color:#000;
overflow: auto;
padding: 30px 20px 0 20px !important;
// padding: 30px 20px 0 20px !important;
margin: 0;
.thetitle{
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+2 -1
View File
@@ -74,6 +74,7 @@ export class DespachosPrPage implements OnInit {
}
segmentChanged(ev: any) {
this.LoadList();
}
@@ -295,7 +296,7 @@ export class DespachosPrPage implements OnInit {
this.dicIndex = index;
}
goBack(){
goBack() {
this.router.navigate(['/home/gabinete-digital']);
}
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+18 -8
View File
@@ -83,13 +83,23 @@ export class DespachoPage implements OnInit {
this.modalController.dismiss();
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"despachos": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
goBack() {
// this.activatedRoute.queryParams.subscribe(params => {
// if(params["from"] == 'pendentes') {
// this.router.navigate(['/home/gabinete-digital/pendentes']);
// } else {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "despachos": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras);
// }
// });
window.history.back()
}
@@ -293,7 +303,7 @@ export class DespachoPage implements OnInit {
}
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
src/app/pages/gabinete-digital/despachos/despachos.page.html
-1
View File
@@ -4,7 +4,6 @@
<ion-header class="ion-no-border header-2">
<div class="title">
<app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
src/app/pages/gabinete-digital/despachos/despachos.page.ts
+12 -7
View File
@@ -69,16 +69,13 @@ export class DespachosPage implements OnInit {
this.LoadList();
}
goBack(){
this.router.navigate(['/home/gabinete-digital']);
}
notImplemented(){
notImplemented() {
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openExpedientDetailPage(data){
console.log(data);
openExpedientDetailPage(data) {
this.openExpedientDetail.emit(data);
}
@@ -142,7 +139,7 @@ export class DespachosPage implements OnInit {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
"serialNumber": serialNumber,
}
};
@@ -153,5 +150,13 @@ export class DespachosPage implements OnInit {
docIndex(index: number) {
this.dicIndex = index;
}
goBack() {
this.router.navigate(['/home/gabinete-digital']);
}
goToList() {
this.router.navigate(['/home/gabinete-digital/despachos']);
}
}
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+8 -6
View File
@@ -53,12 +53,14 @@ export class DiplomaPage implements OnInit {
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"diplomas": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "diplomas": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back()
}
async openOptions(taskAction?: any) {
src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+16 -2
View File
@@ -52,7 +52,18 @@ constructor(
}
segmentChanged(ev: any) {
this.LoadList();
let navigationExtras: NavigationExtras;
if (this.segment == 'assinados') {
navigationExtras= { queryParams: {"assinados": true,}};
} else if (this.segment == 'validar') {
navigationExtras = { queryParams: {"validar": true,}};
}
this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
// this.LoadList();
}
goToDiploma(serialNumber:any) {
@@ -150,8 +161,11 @@ constructor(
});
}
goBack(){
goBack() {
this.router.navigate(['/home/gabinete-digital']);
// window.history.back()
}
}
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+5
View File
@@ -296,6 +296,7 @@ export class BookMeetingModalPage implements OnInit {
setTimeout(()=>{
modal.dismiss()
this.goToGabinete()
},3000)
}
@@ -316,5 +317,9 @@ export class BookMeetingModalPage implements OnInit {
},3000)
}
goToGabinete() {
this.router.navigate(['/home/gabinete-digital']);
}
}
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+10 -7
View File
@@ -84,13 +84,16 @@ export class ExpedientePrPage implements OnInit {
this.modalController.dismiss();
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes-pr": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
goBack() {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "expedientes-pr": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back();
}
sendExpedienteToPending(){
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+10 -2
View File
@@ -144,8 +144,16 @@ export class ExpedientesPrPage implements OnInit {
});
}
goBack(){
this.router.navigate(['/home/gabinete-digital']);
goBack() {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "expedientes-pr": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
window.history.back();
}
}
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+9 -1
View File
@@ -356,7 +356,15 @@ export class GabineteDigitalPage implements OnInit {
this.closeAllDesktopComponents();
if( window.innerWidth <= 800) {
//this.openPedidoList();
let navigationExtras: NavigationExtras = { queryParams: {"deferimento": true,}};
let navigationExtras: NavigationExtras;
if (segment == 'deferimento') {
navigationExtras= { queryParams: {"deferimento": true,}};
} else if (segment == 'parecer') {
navigationExtras = { queryParams: {"parecer": true,}};
}
this.router.navigate(['/home/gabinete-digital/pedidos'], navigationExtras);
}
else{
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+6 -9
View File
@@ -63,15 +63,6 @@ export class PedidoPage implements OnInit {
this.LoadTaskDetail(this.serialnumber);
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"pedidos": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
close(){
this.modalController.dismiss();
}
@@ -396,4 +387,10 @@ export class PedidoPage implements OnInit {
});
}
goBack() {
window.history.back();
}
}
src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+47 -26
View File
@@ -68,17 +68,28 @@ export class PedidosPage implements OnInit {
}
segmentChanged(ev: any) {
this.LoadList();
let navigationExtras: NavigationExtras;
if (this.segment == 'deferimento') {
navigationExtras= { queryParams: {"deferimento": true,}};
} else if (this.segment == 'parecer') {
navigationExtras = { queryParams: {"parecer": true,}};
}
this.router.navigate(['/home/gabinete-digital/pedidos'], navigationExtras);
//this.LoadList();
}
goToPedido(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
}
goToPedido(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
@@ -154,24 +165,34 @@ export class PedidosPage implements OnInit {
}, 2000);
}
async viewPedidoDetail(serialNumber:any) {
console.log(this.profile);
async viewPedidoDetail(serialNumber:any) {
console.log(this.profile);
const modal = await this.modalController.create({
component: PedidoPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: 'modal modal-desktop',
});
await modal.present();
modal.onDidDismiss().then((res)=>{
console.log('refresh list');
this.LoadList();
});
}
// const modal = await this.modalController.create({
// component: PedidoPage,
// componentProps:{
// enterAnimation: "",
// serialNumber: serialNumber,
// profile: this.profile,
// },
// cssClass: 'modal modal-desktop',
// });
// await modal.present();
// modal.onDidDismiss().then((res)=>{
// console.log('refresh list');
// this.LoadList();
// });
let navigationExtras: NavigationExtras = {
queryParams: {
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
}
};
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
}
}
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+59 -55
View File
@@ -53,7 +53,8 @@ export class PendentesPage implements OnInit {
}
goBack() {
this.router.navigate(['/home/gabinete-digital']);
window.history.back();
}
notImplemented(){
@@ -66,54 +67,54 @@ export class PendentesPage implements OnInit {
}
async LoadList(){
this.processes.GetTasksList("Despacho", false).subscribe(despachos => {
//ParecerList
this.processes.GetTasksList("Pedido de Parecer", false).subscribe(pareceres => {
//DeferimentoList
this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(deferimentos => {
this.pendentesList = new Array();
//PendentesList
let pendentes = despachos.concat(pareceres, deferimentos).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
pendentes.forEach(element => {
let DocId = element.workflowInstanceDataFields.FolderID;
this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
this.totalDocs = res.DocumentsTotal;
console.log(res.DocumentsTotal);
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": this.totalDocs,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.pendentesList.push(task);
},
(error)=>{
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.pendentesList.push(task);
});
this.processes.GetTasksList("Despacho", false).subscribe(despachos => {
//ParecerList
this.processes.GetTasksList("Pedido de Parecer", false).subscribe(pareceres => {
//DeferimentoList
this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(deferimentos => {
this.pendentesList = new Array();
//PendentesList
let pendentes = despachos.concat(pareceres, deferimentos).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
pendentes.forEach(element => {
let DocId = element.workflowInstanceDataFields.FolderID;
this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
this.totalDocs = res.DocumentsTotal;
console.log(res.DocumentsTotal);
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": this.totalDocs,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.pendentesList.push(task);
},
(error)=>{
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.pendentesList.push(task);
});
console.log(pendentes);
console.log(this.pendentesList);
});//Fim deferimento
});//Fim parecer
});//Fim despacho
});
console.log(pendentes);
console.log(this.pendentesList);
});//Fim deferimento
});//Fim parecer
});//Fim despacho
}
doRefresh(event) {
@@ -141,17 +142,19 @@ export class PendentesPage implements OnInit {
goToDespacho(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
queryParams: {
"serialNumber": serialNumber,
"from": "pendentes"
}
};
this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
}
goToPedido(serialNumber:any){
goToPedido(serialNumber:any) {
let navigationExtras: NavigationExtras = {
queryParams: {
queryParams: {
"serialNumber": serialNumber,
"from": "pendentes"
}
};
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
@@ -161,6 +164,7 @@ export class PendentesPage implements OnInit {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
"from": "pendentes"
}
};
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);