Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

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

@@ -102,7 +102,7 @@ export class EditEventPage implements OnInit {
     public alertController: AlertController,
     private attachmentsService: AttachmentsService,
     private toastService: ToastService ) {
-      
+
   }
 
   ngOnInit() {
@@ -268,8 +268,13 @@ export class EditEventPage implements OnInit {
           "EventId": this.postEvent.EventId,
           "CalendarDestinationName": this.postEvent.CalendarName,
         }
+        
         console.log(body);
-        await this.eventsService.changeAgenda(body).toPromise();
+
+        try {
+          await this.eventsService.changeAgenda(body).toPromise();
+        } catch (e) {}
+        
       }
       this.showLoader = false;
       this.toastService.successMessage()

src/app/shared/popover/actions-options/actions-options.page.ts

@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ModalController, NavParams } from '@ionic/angular';
 import { PublicationsService } from 'src/app/services/publications.service';
+import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-actions-options',
@@ -15,6 +16,7 @@ export class ActionsOptionsPage implements OnInit {
     private modalController: ModalController,
     private navParams: NavParams,
     private publicationsService: PublicationsService,
+    private toastService: ToastService
   ) { 
     this.id = this.navParams.get('id');
   }
@@ -30,9 +32,21 @@ export class ActionsOptionsPage implements OnInit {
     this.modalController.dismiss('edit');
   }
 
-  deleteAction(){
-    this.publicationsService.DeletePresidentialAction(this.id).toPromise();
-    this.close();
+  async deleteAction() {
+
+    const loader = this.toastService.loading();
+
+    try {
+      await this.publicationsService.DeletePresidentialAction(this.id).toPromise();
+      this.modalController.dismiss('delete');
+    } catch(e) {
+      this.toastService.badRequest()
+    }
+    finally {
+      loader.remove()
+    }
+
+    
   }
 
 }

src/app/shared/publication/edit-action/edit-action.page.ts

@@ -34,6 +34,7 @@ export class EditActionPage implements OnInit {
   @Input() folderId: string;
   @Output() closeDesktopComponent= new EventEmitter<any>();
   @Output() updateDesktopComponent= new EventEmitter<any>();
+  @Output() getActions= new EventEmitter<any>();
 
   constructor(
     private publicationsService: PublicationsService,
@@ -103,6 +104,8 @@ export class EditActionPage implements OnInit {
       this.close();
       this.updateDesktopComponent.emit();
       this.toastService.successMessage('Acção presidencial atualizada')
+      this.getActions.emit()
+
     } catch (error) {
       this.toastService.badRequest('Não foi possivel atualizar a acção presidencial')
     }     finally {

src/app/shared/publication/new-action/new-action.page.html

@@ -45,7 +45,7 @@
           <mat-form-field  appearance="none" class="width-100 date-hour-picker  d-md-block">
             <input matInput [ngxMatDatetimePicker]="picker1" 
               placeholder="Choose a date*" 
-              [formControl]="dateControlStart"
+              [(ngModel)]="folder.DateBegin"
               [min]="minDate"
               [disabled]="disabled"
             >
@@ -81,14 +81,14 @@
           </ion-datetime>
 
           <mat-form-field appearance="none" class="width-100 date-hour-picker  d-md-block">
-            <input matInput [ngxMatDatetimePicker]="picker1" 
+            <input matInput [ngxMatDatetimePicker]="picker2" 
               placeholder="Choose a date*" 
-              [formControl]="dateControlEnd"
+              [(ngModel)]="folder.DateEnd"
               [min]="minDate"
               [disabled]="disabled"
             >
-            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
-            <ngx-mat-datetime-picker #picker1 
+            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker2"></mat-datepicker-toggle>
+            <ngx-mat-datetime-picker #picker2 
               [showSpinners]="showSpinners" 
               [showSeconds]="showSeconds"
               [stepHour]="stepHour" [stepMinute]="stepMinute" 

src/app/shared/publication/new-action/new-action.page.ts

@@ -39,6 +39,7 @@ export class NewActionPage implements OnInit {
 
   
   @Output() closeDesktopComponent= new EventEmitter<any>();
+  @Output() getActions= new EventEmitter<any>();
 
   constructor(
     private publication: PublicationsService,
@@ -46,8 +47,11 @@ export class NewActionPage implements OnInit {
   ) { 
     this.folder = new PublicationFolder();
 
-    this.dateControlStart = new FormControl(moment(new Date()));
-    this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
+
+    this.folder = Object.assign(this.folder, {
+      DateBegin: moment(new Date()),
+      DateEnd: moment(new Date(new Date().getTime() + 15 * 60000)),
+    })
 
   }
 
@@ -69,7 +73,7 @@ export class NewActionPage implements OnInit {
 
   get dateValid() {
     if (window.innerWidth >= 800) {
-      return this.folder.DateBegin < this.folder.DateEnd? ['ok']: []
+      return  new Date(this.folder.DateBegin).toLocaleString('pt')  <  new Date(this.folder.DateEnd).toLocaleString("pt")? ['ok'] : []
     } else {
       return ['ok']
     }
@@ -81,6 +85,8 @@ export class NewActionPage implements OnInit {
 
   injectValidation() {
 
+    console.log(this.dateValid)
+
     this.Form = new FormGroup({
       Subject: new FormControl(this.folder.Description, [
         Validators.required,
@@ -98,7 +104,13 @@ export class NewActionPage implements OnInit {
     this.injectValidation()
     this.runValidation()
 
-    if(this.Form.invalid) return false
+    if(this.Form.invalid) {
+      return false
+    } else {
+      console.log ('not passded')
+    }
+
+    console.log('pass')
 
     this.folder = {
       ProcessId: null,
@@ -116,6 +128,8 @@ export class NewActionPage implements OnInit {
       await this.publication.CreatePublicationFolder(this.folder).toPromise()
       this.close();
       this.toastService.successMessage('Acção presidencial criada')
+
+      this.getActions.emit()
     } catch (error) {
       this.toastService.badRequest('Não foi possivel criar a acção presidencial')
     }     finally {

src/app/shared/publication/view-publications/view-publications.page.html

@@ -9,7 +9,7 @@
       <div class="div-title flex-grow-1">
         <ion-label class="title">{{item.Description}}</ion-label>
         <p class="item-content-detail">{{item.Detail}}</p>
-        <p class="item-content-date">{{item.DateBegin}}</p>
+        <p class="item-content-date">{{ item.DateBegin | date: 'dd-MM-yy | hh:mm'}}</p>
       </div>
       <div class="actions-icon">
        <!--  <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
@@ -47,7 +47,7 @@
             <div class="post-title">
               <ion-label>{{publication.Title}}</ion-label>
             </div>
-            <div class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}</div>
+            <div class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | hh:mm'}}</div>
           </div>
           <div class="post-description">
             <p>{{publication.Message}}</p>