From 0e12b5de5e32ff09a2fa53b7f69a9bff30e20d57 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 3 Jul 2024 10:15:53 +0100 Subject: [PATCH] add margin --- .../agenda/edit-event/edit-event.page.html | 2 + .../agenda/edit-event/edit-event.page.ts | 15 +- .../agenda/new-event/new-event.page.html | 2 + .../pages/agenda/new-event/new-event.page.ts | 13 + .../edit-event-to-approve.page.html | 2 + .../edit-event-to-approve.page.ts | 21 +- .../agenda/edit-event/edit-event.page.html | 8 +- .../agenda/edit-event/edit-event.page.ts | 11 + .../edit-event.page.html | 3 +- .../edit-event-to-approve/edit-event.page.ts | 15 +- version/Pedido_de_evento 1.html | 596 +++++++++--------- version/event-da-semana.html | 19 +- version/evento-revisao.html | 21 +- version/git-version.ts | 12 +- 14 files changed, 401 insertions(+), 339 deletions(-) diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 5399d11d1..3be7db240 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -243,6 +243,7 @@ [(ngModel)]="postEvent.StartDate" [max]="maxDate" [disabled]="disabled" + (ngModelChange)="onDateChange($event)" > = cloneDateEndDate.getTime()) { + cloneDateStartDate.setHours(cloneDateStartDate.getHours() + 1); + this.postEvent.EndDate = cloneDateStartDate + } + + } + @XTracerAsync({name:'mobile/create-event', bugPrint: true, daley: 4000}) async save_v2(tracing?: TracingType) { this.injectValidation() @@ -674,7 +687,7 @@ export class EditEventPage implements OnInit { } onCheckboxChange(event: any) { - console.log(this.postEvent.CalendarId) + if (this.allDayCheck) { this.postEvent.IsAllDayEvent = this.allDayCheck; this.postEvent.StartDate = this.setAlldayTime(this.postEvent.StartDate) diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index ab2df2fc3..8e3bb3b21 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -196,6 +196,7 @@ placeholder="Data Inicio*" [(ngModel)]="postEvent.StartDate" [disabled]="disabled" + (ngModelChange)="onDateChange($event)" > = cloneDateEndDate.getTime()) { + cloneDateStartDate.setHours(cloneDateStartDate.getHours() + 1); + this.postEvent.EndDate = cloneDateStartDate + } + + } + onSelectedRecurringChanged(ev: any) { this.calculetedLastOccurrence(ev); diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 6a48283ef..120a689be 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -152,6 +152,7 @@ displayFormat="D MMM YYYY H:mm" minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" + (ngModelChange)="onDateChange($event)" > @@ -160,6 +161,7 @@ placeholder="Choose a date" [(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate" [disabled]="disabled" + (ngModelChange)="onDateChange($event)" > = cloneDateEndDate.getTime()) { + cloneDateStartDate.setHours(cloneDateStartDate.getHours() + 1); + this.eventProcess.workflowInstanceDataFields.EndDate = cloneDateStartDate as any + } + + } + + defineLastOccurrence(valor: number, opcao: boolean) { var time = new Date(this.eventProcess.workflowInstanceDataFields.EndDate); if (opcao == true) { @@ -513,12 +527,7 @@ export class EditEventToApprovePage implements OnInit { async gravasAction() { await this.save(); - - if (this.eventProcess['activityInstanceName'] == 'Editar Evento') { - this.reenviar(); - } else { - this.toastService._badRequest('Pedimos desculpa mas não foi possível executar a acção. Por favor, contacte o apoio técnico. #this.eventProcess["activityInstanceName"] == "Editar Evento"') - } + this.reenviar(); } diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index 6f19d299d..39f34fbf4 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -232,7 +232,9 @@ + [(ngModel)]="_postEvent.StartDate" [max]="maxDate" [disabled]="disabled" + (ngModelChange)="onDateChange($event)" + > @@ -252,7 +254,7 @@ + [(ngModel)]="_postEvent.StartDate" [max]="maxDate" [disabled]="disabled" (ngModelChange)="onDateChange($event)"> @@ -272,7 +274,7 @@ + [max]="maxDate" [disabled]="disabled" [min]="_postEvent.StartDate" > diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 2e21bb110..59c4073f4 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -519,6 +519,17 @@ export class EditEventPage implements OnInit { this.clearContact.emit(); } + onDateChange(e) { + + const cloneDateStartDate = new Date(this._postEvent.StartDate); + const cloneDateEndDate = new Date(this._postEvent.EndDate); + + if(cloneDateStartDate.getTime() >= cloneDateEndDate.getTime()) { + cloneDateStartDate.setHours(cloneDateStartDate.getHours() + 1); + this._postEvent.EndDate = cloneDateStartDate + } + + } saveTemporaryData() { 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 7dc7e8b69..2a9c2e660 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 @@ -113,6 +113,7 @@ placeholder="Choose a date" [(ngModel)]="startDate" [disabled]="disabled" + (ngModelChange)="onDateChange($event)" > - +
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index b50ce81dc..e26578625 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -259,12 +259,23 @@ export class EditEventToApproveComponent implements OnInit { } } - - close() { this.modalController.dismiss(); } + + onDateChange(e) { + + const cloneDateStartDate = new Date(this.startDate); + const cloneDateEndDate = new Date(this.endDate); + + if(cloneDateStartDate.getTime() >= cloneDateEndDate.getTime()) { + cloneDateStartDate.setHours(cloneDateStartDate.getHours() + 1); + this.endDate = cloneDateStartDate as any + } + + } + @XTracerAsync({name:'desktop/edit-event', bugPrint: true, daley: 4000}) async save(tracing?: TracingType) { // set dates to eventProcess object diff --git a/version/Pedido_de_evento 1.html b/version/Pedido_de_evento 1.html index 5985bf78e..17493007b 100644 --- a/version/Pedido_de_evento 1.html +++ b/version/Pedido_de_evento 1.html @@ -1,298 +1,298 @@ -
- - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - -
- - - - - - -
-

-
-

-
-
-
- - - - - - -
- - - - - - - - - -
- Logo -
-

República de Angola

-

- Gabinete do Presidente da  - - - República - - -

-

- Convite para reunião -

-
-
-
- - - - - - -
- - - - - - -
- - - - - - -
-
-
-
-
- - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - -
-
-
-

- - Tipo de evento - -

-

- -   EventType
- - -

-

- - Data/Hora - -

-

- De  StartDate  a   EndDate        - -

-

- - Localização - -

-

  Location
-

- - Participantes - -

-

-

   Participants
-

-   If
- - - Assunto - -

-

-

  Subject
-

-
- - - - - - -
-
-
-

- Mensagem -

-

Exmo. Sr. MDGPR,
-
Cordiais saudações.
-
Recebeu um novo pedido de evento, no qual requer Vossa aprovação.
-

-
- - - - - - -
-
-
-

- - -
Importante - - - - -

-

- - Caso tenha recebido esta mensagem por engano, por favor informe por o e-mail: - - - - - - - - notificacoes@oapr.gov.ao - - -
-

-
- - - - - - -
-
-
-
-
-
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - -
-

- Gabinete Digital - Uma iniciativa do Presidente da República -

-
-
-
-
-
-
\ No newline at end of file +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + +
+

+
+

+
+
+
+ + + + + + +
+ + + + + + + + + +
+ Logo +
+

Rep�blica de Angola

+

+ Gabinete do Presidente da  + + + Rep�blica + + +

+

+ Convite para reuni�o +

+
+
+
+ + + + + + +
+ + + + + + +
+ + + + + + +
+
+
+
+
+ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+
+
+

+ + Tipo de evento + +

+

+ + � EventType
+ + +

+

+ + Data/Hora + +

+

+ De  StartDate  a ï¿½ EndDate        + +

+

+ + Localiza��o + +

+

  Location
+

+ + Participantes + +

+

+

   Participants
+

+ � If
+ + + Assunto + +

+

+

  Subject
+

+
+ + + + + + +
+
+
+

+ Mensagem +

+

Exmo. Sr. MDGPR,
+
Cordiais sauda��es.
+
Recebeu um novo pedido de evento, no qual requer Vossa aprova��o.
+

+
+ + + + + + +
+
+
+

+ + +
Importante + + + + +

+

+ + Caso tenha recebido esta mensagem por engano, por favor informe por o e-mail: + + + + + + + + notificacoes@oapr.gov.ao + + +
+

+
+ + + + + + +
+
+
+
+
+
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+

+ Gabinete Digital - Uma iniciativa do Presidente da Rep�blica +

+
+
+
+
+
+
diff --git a/version/event-da-semana.html b/version/event-da-semana.html index a2b9423df..1b052171a 100644 --- a/version/event-da-semana.html +++ b/version/event-da-semana.html @@ -45,10 +45,6 @@ background-color: white !important; margin: auto 0px; margin: 0px auto; - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; } main { background-color: white !important; @@ -66,10 +62,12 @@ margin: 20px 0; } + .m-auto { margin: 0px auto; } .px-40 { padding: 0px 40px; } .pb-40 { padding-bottom: 40px; } .pa-40 { padding: 40px; } .pa-30 { padding: 30px; } + .pa-15 { padding: 15px; } .f-22 { font-size: 22px; } .f-13 { font-size: 13px;} @@ -79,6 +77,7 @@ .width-100 { width: 100%; } .text-gray { color: rgb(169, 169, 169); } + .link-color { color:rgb(0, 0, 255); } @@ -87,10 +86,10 @@
- Logo -

República De Angola

-

Gabinete do Presidente da República

-

Convite para reunião

+ Logo +

República De Angola

+

Gabinete do Presidente da República

+

Convite para reunião

@@ -136,13 +135,13 @@

Importante

Caso tenha recebido esta mensagem por engano, por favor informe por o e-mail: - notificacoes@oapr.gov.ao + notificacoes@oapr.gov.ao
-

   Gabinete Digital - Uma iniciativa do Presidente da República

+

   Gabinete Digital - Uma iniciativa do Presidente da República

diff --git a/version/evento-revisao.html b/version/evento-revisao.html index 6a12cd754..c14797080 100644 --- a/version/evento-revisao.html +++ b/version/evento-revisao.html @@ -45,10 +45,6 @@ background-color: white !important; margin: auto 0px; margin: 0px auto; - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; } main { background-color: white !important; @@ -67,22 +63,23 @@ margin: 20px 0; } + .m-auto { margin: 0px auto; } .d-block { display: block; } .px-40 { padding: 0px 40px; } .pb-40 { padding-bottom: 40px; } .pa-40 { padding: 40px; } .pa-30 { padding: 30px; } + .pa-15 { padding: 15px; } .f-22 { font-size: 22px; } .f-13 { font-size: 13px;} - .f-weight-600 { font-weight: 600; } .ma-15 { margin: 15px; } .text-center { text-align:center } .width-100 { width: 100%; } .text-gray { color: rgb(169, 169, 169); } - + .link-color { color:rgb(0, 0, 255); } @@ -90,10 +87,10 @@
- Logo -

República De Angola

-

Gabinete do Presidente da República

-

Convite para reunião

+ Logo +

República De Angola

+

Gabinete do Presidente da República

+

Convite para reunião

@@ -138,13 +135,13 @@

Importante

Caso tenha recebido esta mensagem por engano, por favor informe por o e-mail: - notificacoes@oapr.gov.ao + notificacoes@oapr.gov.ao
-

   Gabinete Digital - Uma iniciativa do Presidente da República

+

   Gabinete Digital - Uma iniciativa do Presidente da República

diff --git a/version/git-version.ts b/version/git-version.ts index 52390e997..2ec4878ed 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "fea0279ad", - "SHA": "fea0279ad79b15630652e0d39507d5499435c5ed", + "shortSHA": "6d3887076", + "SHA": "6d3887076102243aa85ee1ff6abb0b00b6bf2771", "branch": "feature/agenda-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jul 2 14:15:06 2024 +0100'", - "lastCommitMessage": "Melhorias\nAlterar a ordem de apresentação do pop up sobre a recorrencia - Apresentar logo após o click no botão de edição do evento;\nA app não envia o comentario na revisão de eventos;\nAo remover a recorrência do evento a app não remove os eventos da Agenda", - "lastCommitNumber": "5856", - "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 3 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: version/git-version.ts", + "lastCommitTime": "'Tue Jul 2 14:16:36 2024 +0100'", + "lastCommitMessage": "git chage", + "lastCommitNumber": "5857", + "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 4 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts\n\tmodified: version/Pedido_de_evento 1.html\n\tmodified: version/event-da-semana.html\n\tmodified: version/evento-revisao.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file