From 36c12ae95aae07b7489a643081a8158f9ec16570 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Jul 2021 11:10:06 +0100
Subject: [PATCH 1/8] save

---
 .../create-process/create-process.page.html   | 19 +++++++++++++------
 .../agenda/edit-event/edit-event.page.html    | 13 ++++++++-----
 .../expedient-task-modal.page.html            |  2 +-
 src/global.scss                               |  2 +-
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html
index 1b7e61a2d..233f7568d 100644
--- a/src/app/modals/create-process/create-process.page.html
+++ b/src/app/modals/create-process/create-process.page.html
@@ -29,19 +29,26 @@
             </div>
             <div class="ion-input-class" [class.input-error]="Form?.get('Priority')?.invalid && validateFrom">
 
-              <ion-select class="d-block d-md-none" [(ngModel)]="postData.Priority" interface="action-sheet" Cancel-text="Cancelar" required>
+              <ion-select 
+                placeholder="Prazo*" 
+                [(ngModel)]="postData.Priority" 
+                interface="action-sheet" 
+                Cancel-text="Cancelar" 
+                required
+                class="d-block d-md-none"
+                >
                 <ion-select-option value="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999863"><b>Muito Urgente</b> (1 dia para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</ion-select-option>
               </ion-select>
 
-              <mat-form-field appearance="fill" class="width-100 d-none d-md-block" floatLabel="never">
+              <mat-form-field appearance="fill" class="width-100 d-none d-md-block" floatLabel="never" appearance="none">
                 <mat-select placeholder="Prazo*" [(value)]="postData.Priority">
-                  <mat-option [value]="99999861">Normal</mat-option>
-                  <mat-option  [value]="99999862">Urgente</mat-option>
-                  <mat-option  [value]="99999863">Muito Urgente</mat-option>
-                  <mat-option [value]="99999864">Urgentíssimo</mat-option>
+                  <mat-option [value]="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</mat-option>
+                  <mat-option  [value]="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</mat-option>
+                  <mat-option  [value]="99999863"><b>Muito Urgente</b> (1 dia para a execução da tarefa)</mat-option>
+                  <mat-option [value]="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</mat-option>
                 </mat-select>
               </mat-form-field>
 
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 7f978618c..7e4e6e787 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -241,15 +241,18 @@
               <ion-label class="width-100">
                 <p class="d-flex ion-justify-content-between"> 
                   <span class="attach-title-item">{{document.SourceName}}</span> 
-                  <span class="app-name" *ngIf="document.ApplicationId  == 8"> Correspondencia </span>
-                  <span class="app-name" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
-                  <span class="app-name" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
                   <span class="close-button text-black" (click)="deleteAttachment(document.Id)" >
                     <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                   </span>
       
-                </p> 
-                <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
+                </p>
+                <p><span class="span-left">{{document.Stakeholders}}</span></p> 
+                <p>
+                  <span class="app-name span-left" *ngIf="document.ApplicationId  == 8"> Correspondencia </span>
+                  <span class="app-name span-left" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
+                  <span class="app-name span-left" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
+
+                  <span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
               </ion-label>
             </ion-item>
             </ion-list>
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 35d8b3c39..b33c3e8a5 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -65,7 +65,7 @@
                 <ion-select-option value="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</ion-select-option>
               </ion-select>
 
-              <mat-form-field appearance="fill" class="width-100 d-none d-md-block" appearance="none">
+              <mat-form-field appearance="fill" class="width-100 d-none d-md-block" floatLabel="never" appearance="none">
                 <mat-select placeholder="Prazo*" [(ngModel)]="postData.Priority">
                   <mat-option [value]="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</mat-option>
                   <mat-option  [value]="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</mat-option>
diff --git a/src/global.scss b/src/global.scss
index f63fca173..ee039bdf7 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -288,7 +288,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
         display: none;
     }
     .attach-title-item{
-        width: 200px !important;
+        width: 300px !important;
         border: 1px solid red;
     }
 }

From 474c6f1d5f52a06bd04ae05e8873a4c4a8444939 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 7 Jul 2021 11:13:31 +0100
Subject: [PATCH 2/8] Remove build errors

---
 .../agenda/edit-event/edit-event.page.ts      |  4 +-
 .../edit-action/edit-action.module.ts         | 31 ++++++++++-
 .../edit-action/edit-action.page.html         | 46 +++++++++++++++--
 .../edit-action/edit-action.page.ts           | 51 +++++++++++++++++--
 .../new-action/new-action.page.html           |  4 +-
 .../publication/new-action/new-action.page.ts | 15 +++++-
 6 files changed, 135 insertions(+), 16 deletions(-)

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 c917fd3ff..40972b507 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -193,7 +193,6 @@ export class EditEventPage implements OnInit {
     this.runValidation()
 
     if(this.Form.invalid) {
-      alert('error')
       return false
     }
 
@@ -202,7 +201,7 @@ export class EditEventPage implements OnInit {
 
     this.showLoader = true
     await this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
-      if(this.initCalendarName != this.postEvent.CalendarName){
+      if(this.initCalendarName != this.postEvent.CalendarName) {
         let body = {
           "EventId": this.postEvent.EventId,
           "CalendarDestinationName": this.postEvent.CalendarName,
@@ -258,7 +257,6 @@ export class EditEventPage implements OnInit {
       this.dateControlStart = new FormControl(moment(this.postEvent.StartDate));
       this.dateControlEnd = new FormControl(moment(this.postEvent.EndDate));
     }
-
   }
 
   saveTemporaryData() {
diff --git a/src/app/shared/publication/edit-action/edit-action.module.ts b/src/app/shared/publication/edit-action/edit-action.module.ts
index 87961f035..085695a63 100644
--- a/src/app/shared/publication/edit-action/edit-action.module.ts
+++ b/src/app/shared/publication/edit-action/edit-action.module.ts
@@ -8,12 +8,41 @@ import { EditActionPageRoutingModule } from './edit-action-routing.module';
 
 import { EditActionPage } from './edit-action.page';
 
+
+import { MatNativeDateModule } from '@angular/material/core';
+import {
+  NgxMatDatetimePickerModule,
+  NgxMatNativeDateModule,
+  NgxMatTimepickerModule
+} from '@angular-material-components/datetime-picker';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
+import { MAT_DATE_LOCALE } from '@angular/material/core';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatInputModule } from '@angular/material/input';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatMenuModule } from '@angular/material/menu';
+
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    EditActionPageRoutingModule
+    EditActionPageRoutingModule,
+    // Angular material
+    MatDatepickerModule,
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
+    ReactiveFormsModule,
+    MatDialogModule,
   ],
   exports: [EditActionPage],
   declarations: [EditActionPage]
diff --git a/src/app/shared/publication/edit-action/edit-action.page.html b/src/app/shared/publication/edit-action/edit-action.page.html
index ecf256aaa..747d001a2 100644
--- a/src/app/shared/publication/edit-action/edit-action.page.html
+++ b/src/app/shared/publication/edit-action/edit-action.page.html
@@ -1,7 +1,7 @@
 <ion-header class="ion-no-border pt-20 px-20">
   <div class="title-content d-flex align-center justify-space-between ">
     <div class="div-title">
-      <ion-label class="title"> Editar acção presidencial</ion-label>
+      <ion-label class="title">123 Editar acção presidencial</ion-label>
     </div>
     <!-- <div class="actionType">
       <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
@@ -30,15 +30,36 @@
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
         <div class="ion-input-class flex-grow-1">
-          <ion-datetime 
+          <ion-datetime
+            class="d-block d-md-none"
             [(ngModel)]="folder.DateBegin"
             placeholder="Início"
             displayFormat="D MMM YYYY H:mm"
             minuteValues="0,15,30,45"
             monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
             min="2018" 
-            max="2025">
+            max="2025"
+            class="d-block d-md-none">
           </ion-datetime>
+
+
+          <mat-form-field class="width-100 date-hour-picker d-none  d-md-block">
+            <input matInput [ngxMatDatetimePicker]="picker1" 
+              placeholder="Choose a date*" 
+              [formControl]="dateControlEnd"
+              [min]="minDate"
+              [disabled]="disabled"
+            >
+            <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">
+            </ngx-mat-datetime-picker>
+          </mat-form-field>
+
         </div>
       </div>
     </div>
@@ -50,7 +71,7 @@
         </div>
         <div class="ion-input-class d-flex flex-grow-1">
           <ion-datetime 
-            class="flex-grow-1"
+            class="flex-grow-1 d-block d-md-none"
             [(ngModel)]="folder.DateEnd"
             placeholder="Fim"
             displayFormat="D MMM YYYY H:mm"
@@ -59,6 +80,23 @@
             min="2018" 
             max="2022">
           </ion-datetime>
+
+          <mat-form-field class="width-100 date-hour-picker d-none d-md-block">
+            <input matInput [ngxMatDatetimePicker]="picker1" 
+              placeholder="Choose a date*" 
+              [formControl]="dateControlEnd"
+              [min]="minDate"
+              [disabled]="disabled"
+            >
+            <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">
+            </ngx-mat-datetime-picker>
+          </mat-form-field>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/publication/edit-action/edit-action.page.ts b/src/app/shared/publication/edit-action/edit-action.page.ts
index 8147f10cb..ecb6cb135 100644
--- a/src/app/shared/publication/edit-action/edit-action.page.ts
+++ b/src/app/shared/publication/edit-action/edit-action.page.ts
@@ -1,4 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import * as moment from 'moment';
 import { PublicationFolder } from 'src/app/models/publicationfolder';
 import { PublicationsService } from 'src/app/services/publications.service';
 import { ToastService } from 'src/app/services/toast.service';
@@ -10,6 +12,24 @@ import { ToastService } from 'src/app/services/toast.service';
 })
 export class EditActionPage implements OnInit {
 
+  Form: FormGroup;
+  validateFrom = false
+
+  
+  public date: any;
+  public disabled = false;
+  public showSpinners = true;
+  public showSeconds = false;
+  public touchUi = false;
+  public enableMeridian = false;
+  public minDate: any;
+  public maxDate: any;
+  public stepHour = 1;
+  public stepMinute = 5;
+  public stepSecond = 5;
+  public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
+  public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
+  
   folder: PublicationFolder;
   @Input() folderId: string;
   @Output() closeDesktopComponent= new EventEmitter<any>();
@@ -26,16 +46,41 @@ export class EditActionPage implements OnInit {
     this.getPublicationDetail();
   }
 
-  close(){
+  close() {
     this.closeDesktopComponent.emit();
   }
 
-  getPublicationDetail(){
+  getPublicationDetail() {
     this.publicationsService.GetPresidentialAction(this.folderId).subscribe(res=>{
       this.folder = res; 
     });
   }
 
+  get dateValid() {
+    if (window.innerWidth <= 800) {
+      return this.folder.DateBegin < this.folder.DateEnd? ['ok']: []
+    } else {
+      return ['ok']
+    }
+  }
+
+  runValidation() {
+    this.validateFrom  = true
+  }
+
+  injectValidation() {
+
+    this.Form = new FormGroup({
+      Subject: new FormControl(this.folder.Description, [
+        Validators.required,
+        // Validators.minLength(4)
+      ]),
+      Date: new FormControl(this.dateValid, [
+        Validators.required
+      ]),
+    })
+  }
+
   async save() {
     let body = {
       ProcessId: this.folderId,
@@ -55,7 +100,5 @@ export class EditActionPage implements OnInit {
     } catch (error) {
       this.toastService.badRequest('Não foi possivel atualizar a acção presidencial')
     }
-
   }
-
 }
diff --git a/src/app/shared/publication/new-action/new-action.page.html b/src/app/shared/publication/new-action/new-action.page.html
index 68b0171d1..940a74a85 100644
--- a/src/app/shared/publication/new-action/new-action.page.html
+++ b/src/app/shared/publication/new-action/new-action.page.html
@@ -80,7 +80,6 @@
             max="2025">
           </ion-datetime>
 
-
           <mat-form-field class="width-100 date-hour-picker  d-md-block">
             <input matInput [ngxMatDatetimePicker]="picker1" 
               placeholder="Choose a date*" 
@@ -93,8 +92,7 @@
               [showSpinners]="showSpinners" 
               [showSeconds]="showSeconds"
               [stepHour]="stepHour" [stepMinute]="stepMinute" 
-              [stepSecond]="stepSecond"
-              [touchUi]="touchUi">
+              [stepSecond]="stepSecond">
             </ngx-mat-datetime-picker>
           </mat-form-field>
         </div>
diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts
index 1b728dac1..c86bce7d4 100644
--- a/src/app/shared/publication/new-action/new-action.page.ts
+++ b/src/app/shared/publication/new-action/new-action.page.ts
@@ -17,7 +17,20 @@ export class NewActionPage implements OnInit {
 
   folder: PublicationFolder;
   segment:string;
-  public minDate = new Date();
+
+
+  
+  public date: any;
+  public disabled = false;
+  public showSpinners = true;
+  public showSeconds = false;
+  public touchUi = false;
+  public enableMeridian = false;
+  public minDate: any;
+  public maxDate: any;
+  public stepHour = 1;
+  public stepMinute = 5;
+  public stepSecond = 5;
   public endMinDate = new Date(new Date().getTime() + 15 * 60000);
   
   Form: FormGroup;

From b1f6e5bf47e1ea5513e4790e6cc09ce30cc73fbc Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 7 Jul 2021 11:27:20 +0100
Subject: [PATCH 3/8] Improve publication validation

---
 .../shared/publication/edit-action/edit-action.page.ts    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/publication/edit-action/edit-action.page.ts b/src/app/shared/publication/edit-action/edit-action.page.ts
index ecb6cb135..4de495f97 100644
--- a/src/app/shared/publication/edit-action/edit-action.page.ts
+++ b/src/app/shared/publication/edit-action/edit-action.page.ts
@@ -51,8 +51,12 @@ export class EditActionPage implements OnInit {
   }
 
   getPublicationDetail() {
-    this.publicationsService.GetPresidentialAction(this.folderId).subscribe(res=>{
-      this.folder = res; 
+    this.publicationsService.GetPresidentialAction(this.folderId).subscribe( res => {
+      this.folder = res;
+      
+      this.dateControlStart = new FormControl(moment(new Date(this.folder.DateBegin)));
+      this.dateControlEnd = new FormControl(moment(new Date(this.folder.DateEnd)));
+
     });
   }
 

From 3e629efcc7b55dee511faa1303c3c946259a1fe5 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Jul 2021 11:49:27 +0100
Subject: [PATCH 4/8] save

---
 src/app/pages/agenda/edit-event/edit-event.page.html | 11 +++++------
 src/global.scss                                      |  8 ++++++--
 2 files changed, 11 insertions(+), 8 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 7e4e6e787..a6cee6e16 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -237,20 +237,19 @@
           
           <div class="d-flex container-div width-100"  *ngFor="let document of loadedEventAttachments" > 
             <ion-list class="width-100 list">
-              <ion-item class="width-100">
+              <ion-item class="width-100 ion-no-border ion-no-padding">
               <ion-label class="width-100">
-                <p class="d-flex ion-justify-content-between"> 
+                <p class="p-item-title d-flex ion-justify-content-between"> 
                   <span class="attach-title-item">{{document.SourceName}}</span> 
                   <span class="close-button text-black" (click)="deleteAttachment(document.Id)" >
                     <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                   </span>
-      
                 </p>
                 <p><span class="span-left">{{document.Stakeholders}}</span></p> 
                 <p>
-                  <span class="app-name span-left" *ngIf="document.ApplicationId  == 8"> Correspondencia </span>
-                  <span class="app-name span-left" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
-                  <span class="app-name span-left" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
+                  <span class="app-name span-left" *ngIf="document.ApplicationId  == 8"> Correspondência </span>
+                  <span class="app-name span-left" *ngIf="document.ApplicationId == 386"> Acções Presidenciais </span>
+                  <span class="app-name span-left" *ngIf="document.ApplicationId == 361 "> Arquivo Despacho Electrónico </span>
 
                   <span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
               </ion-label>
diff --git a/src/global.scss b/src/global.scss
index ee039bdf7..14f917116 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -287,9 +287,13 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
     .btn-refresh{
         display: none;
     }
+    .p-item-title{
+        width: 100% !important;
+    }
     .attach-title-item{
-        width: 300px !important;
-        border: 1px solid red;
+        white-space: nowrap;
+        overflow: hidden !important;
+        text-overflow: ellipsis !important;
     }
 }
 

From d1606da2cdca754dcbf3ecf352c982ad62b36c4d Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Jul 2021 11:51:39 +0100
Subject: [PATCH 5/8] save

---
 src/app/pages/agenda/view-event/view-event.page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index fbff5023d..10cd89e2d 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -64,7 +64,7 @@
         <div *ngIf="loadedAttachments" class="bottom-content width-100">
           <h5>Documentos Anexados</h5>
           <ion-list class="width-100">
-            <ion-item *ngFor="let attach of loadedAttachments; let i = index" class="width-100" lines="none" class="ion-no-margin ion-no-padding">
+            <ion-item *ngFor="let attach of loadedAttachments; let i = index" class="width-100" class="ion-no-margin ion-no-padding">
               <ion-label class="width-100 d-flex " >
                 <p class="flex-grow-1"  (click)="viewDocument(attach.SourceId)">
                   <span class="attach-title-item d-block">{{attach.SourceName}}</span>

From aafc976b762ace9d66a4b22a5bc46643122ee0da Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Jul 2021 11:58:23 +0100
Subject: [PATCH 6/8] save

---
 src/app/shared/popover/opts-expediente/opts-expediente.page.ts | 1 +
 1 file changed, 1 insertion(+)

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 53c562db9..fd58bd2bb 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -163,6 +163,7 @@ export class OptsExpedientePage implements OnInit {
   }
 
   async distartExpedientModal(body:any){
+    this.close();
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
        componentProps: {

From 2590e84e1d6bc9d4fadd7a877ada8016092fdc6c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 7 Jul 2021 12:31:43 +0100
Subject: [PATCH 7/8] improve

---
 src/app/shared/publication/edit-action/edit-action.page.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/shared/publication/edit-action/edit-action.page.ts b/src/app/shared/publication/edit-action/edit-action.page.ts
index 4de495f97..140f17adb 100644
--- a/src/app/shared/publication/edit-action/edit-action.page.ts
+++ b/src/app/shared/publication/edit-action/edit-action.page.ts
@@ -15,7 +15,6 @@ export class EditActionPage implements OnInit {
   Form: FormGroup;
   validateFrom = false
 
-  
   public date: any;
   public disabled = false;
   public showSpinners = true;

From 8ae9f2978253f7e8242b534d87c25d96b594845d Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 7 Jul 2021 12:46:19 +0100
Subject: [PATCH 8/8] Improve

---
 .../expedient-task-modal/expedient-task-modal.page.html   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 3053faa1b..2c071472b 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -67,10 +67,10 @@
 
               <mat-form-field appearance="fill" class="width-100 d-none d-md-block" floatLabel="never" appearance="none">
                 <mat-select placeholder="Prazo*" [(ngModel)]="postData.Priority">
-                  <mat-option [value]="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</mat-option>
-                  <mat-option  [value]="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</mat-option>
-                  <mat-option  [value]="99999863"><b>Muito Urgente</b> (1 dia para a execução da tarefa)</mat-option>
-                  <mat-option [value]="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</mat-option>
+                  <mat-option value="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</mat-option>
+                  <mat-option  value="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</mat-option>
+                  <mat-option  value="99999863"><b>Muito Urgente</b> (1 dia para a execução da tarefa)</mat-option>
+                  <mat-option value="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</mat-option>
                 </mat-select>
               </mat-form-field>