Przeglądaj źródła

feat: czech formating of dates and dates in filename

fzadrazil 4 lat temu
rodzic
commit
38374833f3

+ 2 - 2
src/app/shared/nav-bar/components/data-download/data-download-popup.component.html

@@ -16,13 +16,13 @@
     <div class="input-group form-group">
       <div class="input-group-prepend">
         <span class="input-group-text"><i class="far fa-calendar-alt"></i>From</span>
-        <p-calendar [monthNavigator]="true" [yearNavigator]="true" yearRange="2000:2021" inputId="navigators" formControlName="from"></p-calendar>
+        <p-calendar [monthNavigator]="true" [yearNavigator]="true" yearRange="2000:2021" dateFormat="d. m. yy" inputId="navigators" formControlName="from"></p-calendar>
       </div>
     </div>
     <div class="input-group form-group">
       <div class="input-group-prepend">
         <span class="input-group-text"><i class="far fa-calendar-alt"></i>To</span>
-        <p-calendar [monthNavigator]="true" [yearNavigator]="true" yearRange="2000:2021" inputId="navigators" formControlName="to"></p-calendar>
+        <p-calendar [monthNavigator]="true" [yearNavigator]="true" yearRange="2000:2021" dateFormat="d. m. yy" inputId="navigators" formControlName="to"></p-calendar>
       </div>
     </div>
     <p-listbox [options]="units" formControlName="selectedUnits" [metaKeySelection]="false" [checkbox]="true" [filter]="true" filterPlaceHolder="Search and select units"

+ 6 - 1
src/app/shared/nav-bar/components/data-download/data-download-popup.component.ts

@@ -85,7 +85,12 @@ export class DataDownloadPopupComponent implements OnInit {
           this.inProgress = false;
           if (response.status === 200) {
             console.log('Export successful');
-            this.saveAsFile(response.body, this.downloadForm.value.sensor_id + '.csv');
+            this.saveAsFile(
+              response.body,
+              this.downloadForm.value.sensor_id + '_' +
+              formatDate(this.downloadForm.value.from, 'dd-MM-yyyy', 'en-US') + '_' +
+              formatDate(this.downloadForm.value.to, 'dd-MM-yyyy', 'en-US') +
+              '.csv');
           } else {
             this.toastService.showError('Data download caused error!');
           }