From 1b3cce62158cf7b74ef65e181f2171c1167852b0 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 28 May 2021 16:39:03 +0100 Subject: [PATCH 1/3] improve --- src/app/modals/create-process/create-process.page.html | 1 + src/app/modals/delegar/delegar.page.html | 1 + src/app/pages/agenda/agenda.page.html | 1 + src/app/pages/agenda/edit-event/edit-event.page.html | 2 ++ .../book-meeting-modal/book-meeting-modal.page.html | 1 + .../expedient-task-modal/expedient-task-modal.page.html | 1 + src/app/shared/event/attendee-modal/attendee-modal.page.html | 4 ++-- src/app/shared/event/attendee-modal/attendee-modal.page.ts | 2 ++ .../edit-event-to-approve/edit-event.page.html | 1 + 9 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 41bc90eb1..dde835def 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -133,6 +133,7 @@ diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 3e75c8c3a..783e665b7 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -190,6 +190,7 @@
- - + + Cancelar diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts index 3913f5ea7..418700419 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts @@ -26,6 +26,8 @@ export class AttendeeModalPage implements OnInit { @Input() taskParticipants:EventPerson[] = []; @Input() taskParticipantsCc:EventPerson[] = []; + @Input() footer: boolean; + LtaskParticipants: EventPerson[] = []; LtaskParticipantsCc: EventPerson[] = []; diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index ff85d3890..fe73c5832 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -231,6 +231,7 @@ [taskParticipants]="taskParticipants" [taskParticipantsCc]="taskParticipantsCc" [adding]="adding" + [footer]="false" (dynamicSetIntervenient)="dynamicSetIntervenient($event)" > From 93beab74d2c55ba81c5deef8e3b8c921220fd6fd Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 28 May 2021 16:47:03 +0100 Subject: [PATCH 2/3] Improve --- src/app/pages/login/login.page.scss | 1 + src/app/shared/fingerprint/fingerprint.page.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss index adebb92b2..46e8c0371 100644 --- a/src/app/pages/login/login.page.scss +++ b/src/app/pages/login/login.page.scss @@ -89,6 +89,7 @@ ion-content{ border-radius: 56px; margin-left: 30px; margin-bottom: 15px; + user-select: none; } .title{ diff --git a/src/app/shared/fingerprint/fingerprint.page.scss b/src/app/shared/fingerprint/fingerprint.page.scss index 2d1c08ebc..86cf9fdc3 100644 --- a/src/app/shared/fingerprint/fingerprint.page.scss +++ b/src/app/shared/fingerprint/fingerprint.page.scss @@ -42,6 +42,7 @@ border-radius: 56px; margin-left: 30px; margin-bottom: 15px; + user-select: none; } .title{ From c33bf69414bc47fb794b87be360e42b66e2dbe84 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 28 May 2021 16:53:42 +0100 Subject: [PATCH 3/3] Improve --- src/app/pages/login/login.page.html | 2 +- src/app/pages/login/login.page.scss | 4 ++++ src/app/shared/pin/pin.page.ts | 4 +--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index 389b0d19a..83f620dee 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -53,7 +53,7 @@
-
+
Voltar
diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss index 46e8c0371..b0073b636 100644 --- a/src/app/pages/login/login.page.scss +++ b/src/app/pages/login/login.page.scss @@ -136,4 +136,8 @@ ion-content{ background-position: center; background-position-y: 78px; background-repeat: no-repeat; +} + +.voltar{ + user-select: none; } \ No newline at end of file diff --git a/src/app/shared/pin/pin.page.ts b/src/app/shared/pin/pin.page.ts index da54c69c2..5aa3e5b3b 100644 --- a/src/app/shared/pin/pin.page.ts +++ b/src/app/shared/pin/pin.page.ts @@ -67,7 +67,6 @@ export class PinPage implements OnInit { modal.dismiss() - } async badRequest(message?: string) { @@ -87,5 +86,4 @@ export class PinPage implements OnInit { },3000) } - -} +} \ No newline at end of file