Merge branch 'develop' of bitbucket.org:equilibriumito/gabinete-digital-fo into develop

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

@@ -41,9 +41,9 @@
           </ion-datetime> -->
 
 
-          <mat-form-field  appearance="none" class="width-100 date-hour-picker  d-md-block">
+          <mat-form-field appearance="none" class="width-100 date-hour-picker  d-md-block">
             <input matInput [ngxMatDatetimePicker]="picker1"
-              placeholder="Choose a date*"
+              placeholder="Data inicio*"
               [(ngModel)]="folder.DateBegin"
               [disabled]="disabled"
               [min]="currentDate"
@@ -80,12 +80,12 @@
 
           <mat-form-field appearance="none" class="width-100 date-hour-picker  d-md-block">
             <input matInput [ngxMatDatetimePicker]="picker2"
-              placeholder="Choose a date*"
+              placeholder="Data de fim*"
               [(ngModel)]="folder.DateEnd"
               [disabled]="disabled"
               [min]="currentDate"
             >
-            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker2"></mat-datepicker-toggle>
+            <mat-datepicker-toggle id="new-fim" matSuffix [for]="picker2"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker2
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"

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

@@ -45,10 +45,10 @@ export class NewActionPage implements OnInit {
     this.folder = new PublicationFolder();
 
 
-    this.folder = Object.assign(this.folder, {
+    /* this.folder = Object.assign(this.folder, {
       DateBegin: new Date().toISOString(),
       DateEnd: (new Date(new Date().getTime() + 15 * 60000)).toISOString(),
-    })
+    }) */
 
   }