diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index a85775c8a..dcc5c5cf7 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -27,17 +27,6 @@
-
-
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 779851bbe..5508e2f65 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -236,16 +236,6 @@ export class EventsPage implements OnInit {
modal.onDidDismiss();
}
- async openEventDetail(id:any) {
- const modal = await this.modalController.create({
- component: EventDetailModalPage,
- componentProps: {
- eventId: id,
- },
- cssClass: 'my-custom-class'
- });
- return await modal.present();
- }
LoadList(){
switch (this.loggeduser.Profile) {
@@ -260,12 +250,10 @@ export class EventsPage implements OnInit {
this.expedientList = result.reverse();
console.log(this.expedientList);
});
- break;
-
+ break;
default:
break;
}
-
}
sortArrayISODate(myArray: any){
@@ -278,93 +266,19 @@ export class EventsPage implements OnInit {
this.router.navigate(['/home/events', eventId, 'events']);
}
-
- async editEventDetail(eventId:any) {
-
- let classs;
- if( window.innerWidth <= 800){
- classs = 'modal modal-desktop'
- } else {
- classs = 'modal modal-desktop showAsideOptions'
- }
-
- const modal = await this.modalController.create({
- component: EventEditPage,
- componentProps:{
- eventId: eventId,
- profile: this.profile,
- },
- cssClass: classs,
- });
-
- await modal.present();
- modal.onDidDismiss().then((res)=>{
- if(res){
- console.log(res);
- this.RefreshEvents();
- }
- });
- }
-
goToExpediente(SerialNumber:any){
- let navigationExtras: NavigationExtras = {
- queryParams: {
- "serialNumber": SerialNumber,
- "caller": "agenda"
- }
- };
this.router.navigate(['/home/events/expediente', SerialNumber, 'events']);
}
- async viewExpedientDetail(serialNumber:any) {
- let classs;
- if( window.innerWidth <= 800){
- classs = 'modal modal-desktop'
- } else {
- classs = 'modal modal-desktop showAsideOptions'
- }
-
- const modal = await this.modalController.create({
- component: ExpedienteDetailPage,
- componentProps:{
- serialNumber: serialNumber,
- profile: this.profile,
- },
- cssClass: classs,
- });
- await modal.present();
- modal.onDidDismiss().then((res)=>{
- if(res){
- /* console.log(res); */
- this.RefreshEvents();
- }
- });
- }
-
viewExpedientListPage(){
if( window.innerWidth <= 1024){
- this.openExpedientList();
+ this.router.navigate(['/home/gabinete-digital/expediente']);
}
else{
let navigationExtras: NavigationExtras = { queryParams: {"expedientes": true,} };
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
-
- async openExpedientList(){
-
-
- const modal = await this.modalController.create({
- component: ExpedientePage,
- componentProps:{
- profile: this.profile,
- },
- cssClass: 'modal modal-desktop',
- });
- await modal.present();
- modal.onDidDismiss();
- }
-
}
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
index 9ef217a0d..ede493f6a 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
@@ -173,16 +173,8 @@ export class PendentesPage implements OnInit {
}
goToExpediente(serialNumber:any){
- /* let navigationExtras: NavigationExtras = {
- queryParams: {
- "serialNumber": serialNumber,
- "from": "pendentes",
- "type": "pendentes"
- }
- };
- this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras); */
- this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
- }
+ this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
+ }
async openDespacho(serialNumber:string){
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index 69acf33a4..b709a7ceb 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -92,41 +92,12 @@ export class ExpedientsPage implements OnInit {
doRefresh() {
console.log('refresh expedientes1');
-
this.LoadList();
-
- setTimeout(() => {
- }, 2000);
}
goToExpediente(serialNumber:any){
- let navigationExtras: NavigationExtras = {
- queryParams: {
- "serialNumber": serialNumber,
- "from": "gabinete",
- "type": "pendentes"
- }
- };
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
}
- async viewExpedientDetail(serialNumber:any) {
- console.log(this.profile);
- const modal = await this.modalController.create({
- component: ExpedienteDetailPage,
- componentProps:{
- enterAnimation: "",
- serialNumber: serialNumber,
- profile: this.profile,
- },
- cssClass: 'modal modal-desktop',
- });
- await modal.present();
- modal.onDidDismiss().then((res)=>{
- console.log('refresh list');
- this.LoadList();
- });
- }
-
}
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index 540687507..b8fe76c37 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -172,20 +172,9 @@ export class PendentesPage implements OnInit {
}
goToExpediente(serialNumber:any){
-
- /* let navigationExtras: NavigationExtras = {
- queryParams: {
- "serialNumber": serialNumber,
- "from": "gabinete",
- "type": "pendentes"
- }
+ this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
}
- this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras) */
- this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
-
- }
-
async openDespacho(serialNumber:string){
const modal = await this.modalController.create({