add margin

src/app/pages/agenda/edit-event/edit-event.page.html

@@ -243,6 +243,7 @@
                     [(ngModel)]="postEvent.StartDate"
                     [max]="maxDate"
                     [disabled]="disabled"
+                    (ngModelChange)="onDateChange($event)"
                   >
                   <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
                   <ngx-mat-datetime-picker #picker1
@@ -273,6 +274,7 @@
                     [(ngModel)]="postEvent.StartDate"
                     [max]="maxDate"
                     [disabled]="disabled"
+                    (ngModelChange)="onDateChange($event)"
                   >
                   <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
                   <ngx-mat-datetime-picker #picker1

src/app/pages/agenda/edit-event/edit-event.page.ts

@@ -427,6 +427,19 @@ export class EditEventPage implements OnInit {
     }
   }
 
+
+  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
+    }
+
+  }
+
   @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)

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)"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1
@@ -220,6 +221,7 @@
               placeholder="Data Inicio*"
               [(ngModel)]="postEvent.StartDate"
               [disabled]="disabled"
+              (ngModelChange)="onDateChange($event)"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1

src/app/pages/agenda/new-event/new-event.page.ts

@@ -340,6 +340,19 @@ export class NewEventPage implements OnInit {
     }
   }
 
+
+  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
+    }
+
+  }
+
   onSelectedRecurringChanged(ev: any) {
 
     this.calculetedLastOccurrence(ev);

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)"
                 >
                 </ion-datetime>
 
@@ -160,6 +161,7 @@
                     placeholder="Choose a date"
                     [(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
                     [disabled]="disabled"
+                    (ngModelChange)="onDateChange($event)"
                   >
                   <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
                   <ngx-mat-datetime-picker #picker1

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts

@@ -75,6 +75,7 @@ export class EditEventToApprovePage implements OnInit {
     Attachments: [],
     serialNumber: "",
     taskStartDate: "",
+    activityInstanceName: "",
     workflowInstanceDataFields: {
       Body: "",
       OccurrenceType: '',
@@ -234,6 +235,19 @@ export class EditEventToApprovePage implements OnInit {
   }
 
 
+  onDateChange(e) {
+
+    const cloneDateStartDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate);
+    const cloneDateEndDate = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);
+
+    if(cloneDateStartDate.getTime() >= 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();
-
+    this.reenviar();
-    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"')
-    }
 
   }
 

src/app/shared/agenda/edit-event/edit-event.page.html

@@ -232,7 +232,9 @@
 
           <mat-form-field appearance="none" floatLabel="never" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1" placeholder="Choose a date"
-              [(ngModel)]="_postEvent.StartDate" [max]="maxDate" [disabled]="disabled">
+              [(ngModel)]="_postEvent.StartDate" [max]="maxDate" [disabled]="disabled"
+              (ngModelChange)="onDateChange($event)"
+            >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1 [showSpinners]="showSpinners" [showSeconds]="showSeconds"
               [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" [touchUi]="touchUi" [hideTime]="true">
@@ -252,7 +254,7 @@
 
           <mat-form-field appearance="none" floatLabel="never" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1" placeholder="Choose a date"
-              [(ngModel)]="_postEvent.StartDate" [max]="maxDate" [disabled]="disabled">
+              [(ngModel)]="_postEvent.StartDate" [max]="maxDate" [disabled]="disabled"  (ngModelChange)="onDateChange($event)">
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1 [showSpinners]="showSpinners" [showSeconds]="showSeconds"
               [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" [touchUi]="touchUi" [hideTime]="false">
@@ -272,7 +274,7 @@
 
           <mat-form-field appearance="none" floatLabel="never" floatLabel="never" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="fim" placeholder="Choose a date" [(ngModel)]="_postEvent.EndDate"
-              [max]="maxDate" [disabled]="disabled" [min]="_postEvent.StartDate">
+              [max]="maxDate" [disabled]="disabled" [min]="_postEvent.StartDate" >
             <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #fim [showSpinners]="showSpinners" [showSeconds]="showSeconds"
               [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" [hideTime]="true">

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() {
 

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)"
                   >
                   <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
                   <ngx-mat-datetime-picker #picker1

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

version/Pedido_de_evento 1.html

@@ -47,17 +47,17 @@
  </tr>
  <tr style="border-collapse:collapse;">
  <td align="center" style="padding:0; padding-top:15px; padding-bottom:15px;">
- <h1 style="font-family:arial, 'helvetica neue', helvetica, sans-serif; font-size:22px; font-style:normal; font-weight:bold; color:#000000;">República de Angola</h1> 
+ <h1 style="font-family:arial, 'helvetica neue', helvetica, sans-serif; font-size:22px; font-style:normal; font-weight:bold; color:#000000;">Rep<EFBFBD>blica de Angola</h1>
  <p style="font-family:arial, 'helvetica neue', helvetica, sans-serif; color:#000000; font-size:22px;">
  <strong> Gabinete do Presidente da&nbsp;</strong>
  <span style="background-color:transparent; font-size:22px;">
  <font color="#000000" face="arial, helvetica neue, helvetica, sans-serif">
- <b>República</b> 
+ <b>Rep<EFBFBD>blica</b>
  </font>
  </span>
  </p>
  <p style="font-family:arial, 'helvetica neue', helvetica, sans-serif; color:#000000; font-size:22px;">
- <strong>Convite para reunião</strong> 
+ <strong>Convite para reuni<EFBFBD>o</strong>
  </p>
  </td>
  </tr>
@@ -129,7 +129,7 @@
  </p>
  <p style="color:#0000ff;">
  <font face="Arial" style="">
- <font size="2">  EventType <br> 
+ <font size="2"><EFBFBD> EventType <br>
  </font>
  </font>
  </p>
@@ -139,12 +139,12 @@
  </strong>
  </p>
  <p style="color:rgb(0, 0, 0);">
- <font face="Arial" style="">De&nbsp; StartDate &nbsp;a&nbsp;  EndDate &nbsp; &nbsp;&nbsp;<font size="3">   &nbsp;   </font> 
+ <font face="Arial" style="">De&nbsp; StartDate &nbsp;a&nbsp;<EFBFBD> EndDate &nbsp; &nbsp;&nbsp;<font size="3">   &nbsp;   </font>
  </font>
  </p>
  <p style="color:rgb(169, 169, 169);">
  <strong style="">
- <font face="Arial" style="" size="2">Localização</font> 
+ <font face="Arial" style="" size="2">Localiza<EFBFBD><EFBFBD>o</font>
  </strong>
  </p>
  <p style="color:rgb(0, 0, 0);">&nbsp; Location <br>
@@ -156,7 +156,7 @@
  </p>
  <p style="color:rgb(0, 0, 0);">&nbsp;&nbsp; Participants <br>
  </p>
- <font face="Arial" size="3">  If <br> 
+ <font face="Arial" size="3"><EFBFBD> If <br>
  </font>
  <strong style="">
  <font face="Arial" style="" size="2">Assunto</font>
@@ -185,8 +185,8 @@
  <strong>Mensagem</strong>
  </p>
  <p style="color:rgb(0, 0, 0);">Exmo. Sr. MDGPR,<br>
- <br>Cordiais saudações.<br> 
+ <br>Cordiais sauda<EFBFBD><EFBFBD>es.<br>
- <br>Recebeu um novo pedido de evento, no qual requer Vossa aprovação.<br> 
+ <br>Recebeu um novo pedido de evento, no qual requer Vossa aprova<EFBFBD><EFBFBD>o.<br>
  </p>
  </td>
  </tr>
@@ -273,7 +273,7 @@
  <tr style="border-collapse:collapse;">
  <td align="left" style="padding:0;">
  <p style="font-family:arial, 'helvetica neue', helvetica, sans-serif; color:#000000; font-size:12px;">
- <strong>Gabinete Digital - Uma iniciativa do Presidente da República</strong> 
+ <strong>Gabinete Digital - Uma iniciativa do Presidente da Rep<EFBFBD>blica</strong>
  </p>
  </td>
  </tr>

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); }
 
   </style>
 </head>
@@ -87,10 +86,10 @@
   <main >
 
     <div class="header" class="pa-40">
-      <img class="ma-15" src="https://gwjkdh.stripocdn.email/content/guids/videoImgGuid/images/governo_de_angola_horizontal_logo_MH1.png" style="display:block; border:0; text-decoration:none;" alt="Logo" title="Logo" width="160" height="136">
+      <img class="pa-15 m-auto" src="https://gwjkdh.stripocdn.email/content/guids/videoImgGuid/images/governo_de_angola_horizontal_logo_MH1.png" style="display:block; border:0; text-decoration:none;" alt="Logo" title="Logo" width="160" height="136">
-      <p class="f-weight-600 f-22 ma-15">República De Angola</p>
+      <p class="f-22 ma-15 text-center"><b>República De Angola</b></p>
-      <p class="f-weight-600 f-22 ma-15">Gabinete do Presidente da República</p>
+      <p class="f-22 ma-15 text-center"><b>Gabinete do Presidente da República</b></p>
-      <p class="f-weight-600 f-22 ma-15">Convite para reunião</p>
+      <p class="f-22 ma-15 text-center"><b>Convite para reunião</b></p>
     </div>
 
     <hr/>
@@ -136,13 +135,13 @@
       <div>
         <p class="text-gray f-13 d-block ">Importante</p>
         <span class="d-block ">Caso tenha recebido esta mensagem por engano, por favor informe por o e-mail:</span>
-        <span class="d-block "> <a href="notificacoes@oapr.gov.ao" target="_blank">notificacoes@oapr.gov.ao</a></span>
+        <span class="d-block link-color" > <u>notificacoes@oapr.gov.ao</u> </span>
       </div>
     </div>
 
 
   </main>
   <footer>
-    <p>&nbsp;&nbsp;&nbsp;Gabinete Digital - Uma iniciativa do Presidente da República</p>
+    <p>&nbsp;&nbsp;&nbsp;<b>Gabinete Digital - Uma iniciativa do Presidente da República</b></p>
   </footer>
 </body>

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); }
   </style>
 </head>
 <body>
@@ -90,10 +87,10 @@
   <main>
 
     <div class="header" class="pa-40">
-      <img class="ma-15" src="https://gwjkdh.stripocdn.email/content/guids/videoImgGuid/images/governo_de_angola_horizontal_logo_MH1.png" style="display:block; border:0; text-decoration:none;" alt="Logo" title="Logo" width="160" height="136">
+      <img class="pa-15 m-auto" src="https://gwjkdh.stripocdn.email/content/guids/videoImgGuid/images/governo_de_angola_horizontal_logo_MH1.png" style="display:block; border:0; text-decoration:none;" alt="Logo" title="Logo" width="160" height="136">
-      <p class="f-weight-600 f-22 ma-15">República De Angola</p>
+      <p class="f-22 ma-15 text-center"><b>República De Angola</b></p>
-      <p class="f-weight-600 f-22 ma-15">Gabinete do Presidente da República</p>
+      <p class="f-22 ma-15 text-center"><b>Gabinete do Presidente da República</b></p>
-      <p class="f-weight-600 f-22 ma-15">Convite para reunião</p>
+      <p class="f-22 ma-15 text-center"><b>Convite para reunião</b></p>
     </div>
 
     <hr/>
@@ -138,13 +135,13 @@
       <div>
         <p class="text-gray f-13 d-block ">Importante</p>
         <span class="d-block ">Caso tenha recebido esta mensagem por engano, por favor informe por o e-mail:</span>
-        <span class="d-block "> <a href="notificacoes@oapr.gov.ao" target="_blank">notificacoes@oapr.gov.ao</a></span>
+        <span class="d-block link-color" > <u>notificacoes@oapr.gov.ao</u> </span>
       </div>
     </div>
 
   </main>
   <footer>
-    <p>&nbsp;&nbsp;&nbsp;Gabinete Digital - Uma iniciativa do Presidente da República</p>
+    <p>&nbsp;&nbsp;&nbsp;<b>Gabinete Digital - Uma iniciativa do Presidente da República</b></p>
   </footer>
 
 

version/git-version.ts

@@ -1,11 +1,11 @@
 export let versionData = {
-  "shortSHA": "fea0279ad",
+  "shortSHA": "6d3887076",
-  "SHA": "fea0279ad79b15630652e0d39507d5499435c5ed",
+  "SHA": "6d3887076102243aa85ee1ff6abb0b00b6bf2771",
   "branch": "feature/agenda-api-peter",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Jul 2 14:15:06 2024 +0100'",
+  "lastCommitTime": "'Tue Jul 2 14:16:36 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",
+  "lastCommitMessage": "git chage",
-  "lastCommitNumber": "5856",
+  "lastCommitNumber": "5857",
-  "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 <file>...\" to unstage)\n\tmodified:   version/git-version.ts",
+  "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 <file>...\" 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"
 }