diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index c35035314..853c561c7 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -22,7 +22,7 @@ export class ProfilePage implements OnInit { loggeduser: User; userLoginPreference = '' - notificationdata: any[]; + notificationdata: any[] = []; DataArray: Array = []; constructor(private modalController: ModalController, diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 9c7eb1c28..078f438c5 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -104,6 +104,7 @@ +
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html index 894da04f5..629b384e0 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -1,16 +1,29 @@ - +
-
- - - - - - +
+
+
+ + + + + + +
+
+ + + + + + +
+
+
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.scss b/src/app/shared/popover/opts-expediente/opts-expediente.page.scss index 6d4e6714f..7427f04c7 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.scss +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.scss @@ -3,6 +3,7 @@ --padding-bottom:20px !important; --padding-start:20px !important; --padding-end:20px !important; + width: 100%; } .arrow-right{ display: none; @@ -32,7 +33,7 @@ } @media only screen and (max-width: 800px) { .btn-ok, .btn-cancel, .btn-delete{ - width: 47% !important; + width: 100% !important; } } @media only screen and (min-width: 1024px) { @@ -53,4 +54,10 @@ /* .solid{ display: block; } */ +} + + +.desk{ + text-align: left; + background-color: white; } \ No newline at end of file diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 11b3f469f..9ffefcfc4 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ModalController, NavParams, PopoverController } from '@ionic/angular'; +import { PermissionService } from 'src/app/OtherService/permission.service'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; @@ -28,6 +29,7 @@ export class OptsExpedientePage implements OnInit { private toastService: ToastService, private router: Router, private activatedRoute: ActivatedRoute, + public p: PermissionService ) { this.task = this.navParams.get('task'); this.fulltask = this.navParams.get('fulltask');