MathiasHusum · MathiasHusum · commit 70ef93bdab18 · 2019-01-31T11:43:06.000+01:00
Adding date-formatter. Changing | date:' ' to date-formatter component-
diff --git a/eform-client/src/app/common/models/common/date-formatter.model.ts b/eform-client/src/app/common/models/common/date-formatter.model.ts
@@ -0,0 +1,4 @@
+export class DateFormatterModel {
+  date: Date;
+  time: Date;
+}
diff --git a/eform-client/src/app/common/models/common/index.ts b/eform-client/src/app/common/models/common/index.ts
@@ -3,3 +3,4 @@ export * from './common-dictionary.model';
 export * from './key-value.model';
 export * from './common-dictionary-text.model';
 export * from './status-bar.model';
+export * from './date-formatter.model';
diff --git a/eform-client/src/app/common/modules/eform-shared/components/date-formatter/date-formatter.component.html b/eform-client/src/app/common/modules/eform-shared/components/date-formatter/date-formatter.component.html
@@ -0,0 +1,9 @@
+<div *ngIf="format == 'date'">
+  {{dateFormatter.date | date : 'dd.MM.y'}}
+</div>
+<div *ngIf="format == 'time'">
+  {{dateFormatter.date | date : 'HH:mm:ss'}}
+</div>
+<div *ngIf="format == 'datetime'">
+  {{dateFormatter.date | date : 'dd.MM.y HH:mm:ss'}}
+</div>
diff --git a/eform-client/src/app/common/modules/eform-shared/components/date-formatter/date-formatter.component.scss b/eform-client/src/app/common/modules/eform-shared/components/date-formatter/date-formatter.component.scss
diff --git a/eform-client/src/app/common/modules/eform-shared/components/date-formatter/date-formatter.component.ts b/eform-client/src/app/common/modules/eform-shared/components/date-formatter/date-formatter.component.ts
@@ -0,0 +1,32 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { DateFormatterModel} from '../../../../models/common';
+import {formatDate} from '@angular/common';
+
+@Component({
+  selector: 'date-formatter',
+  templateUrl: './date-formatter.component.html',
+  styleUrls: ['./date-formatter.component.scss']
+})
+export class DateFormatterComponent implements OnInit {
+  dateFormatter: DateFormatterModel = new DateFormatterModel();
+  format: string;
+  constructor() { }
+
+  @Input()
+  get date() {
+    return this.dateFormatter.date;
+  }
+  set date(format) {
+    this.dateFormatter.date = format;
+  }
+  @Input()
+  get Format() {
+    return this.format;
+  }
+  set Format(format) {
+    this.format = format;
+  }
+  ngOnInit() {
+  }
+
+}
diff --git a/eform-client/src/app/common/modules/eform-shared/components/index.ts b/eform-client/src/app/common/modules/eform-shared/components/index.ts
@@ -3,3 +3,4 @@ export * from './eform-pagination/eform-pagination.component';
 export * from './eform-spinner/eform-spinner.component';
 export * from './eform-page-size/eform-page-size.component';
 export * from './status-bar/status-bar.component';
+export * from './date-formatter/date-formatter.component';
diff --git a/eform-client/src/app/common/modules/eform-shared/eform-shared.module.ts b/eform-client/src/app/common/modules/eform-shared/eform-shared.module.ts
@@ -9,8 +9,8 @@ import {
   EformPaginationComponent,
   EformSpinnerComponent,
   EformPageSizeComponent,
-  StatusBarComponent
-} from './components';
+  StatusBarComponent,
+  DateFormatterComponent} from './components';
 
 @NgModule({
   imports: [
@@ -24,14 +24,16 @@ import {
     EformPaginationComponent,
     EformSpinnerComponent,
     EformPageSizeComponent,
-    StatusBarComponent
+    StatusBarComponent,
+    DateFormatterComponent
   ],
   exports: [
     EformPageSubheaderComponent,
     EformPaginationComponent,
     EformSpinnerComponent,
     EformPageSizeComponent,
-    StatusBarComponent
+    StatusBarComponent,
+    DateFormatterComponent
   ]
 })
 export class EformSharedModule {
diff --git a/eform-client/src/app/modules/advanced/components/entity-search/entity-search-remove/entity-search-remove.component.html b/eform-client/src/app/modules/advanced/components/entity-search/entity-search-remove/entity-search-remove.component.html
@@ -19,7 +19,9 @@ <h6><strong>{{selectedGroupModel.microtingUUID}}</strong></h6>
               <h6>{{'Creation date' | translate}}</h6>
             </div>
             <div class="col-md-6">
-              <h6><strong>{{selectedGroupModel.createdAt | date:'dd.MM.y HH:mm:ss'}}</strong></h6>
+              <h6><strong>
+                <date-formatter [date]="selectedGroupModel.createdAt" [Format]="'datetime'"></date-formatter>
+              </strong></h6>
             </div>
           </div>
           <div class="row">
diff --git a/eform-client/src/app/modules/advanced/components/entity-select/entity-select-remove/entity-select-remove.component.html b/eform-client/src/app/modules/advanced/components/entity-select/entity-select-remove/entity-select-remove.component.html
@@ -19,7 +19,9 @@ <h6><strong>{{selectedGroupModel.microtingUUID}}</strong></h6>
               <h6>{{'Creation date' | translate}}</h6>
             </div>
             <div class="col-md-6">
-              <h6><strong>{{selectedGroupModel.createdAt | date:'dd.MM.y HH:mm:ss'}}</strong></h6>
+              <h6><strong>
+                <date-formatter [date]="selectedGroupModel.createdAt" [Format]="'datetime'"></date-formatter>
+              </strong></h6>
             </div>
           </div>
           <div class="row">
diff --git a/eform-client/src/app/modules/advanced/components/sites/site-delete/site-delete.component.html b/eform-client/src/app/modules/advanced/components/sites/site-delete/site-delete.component.html
@@ -20,7 +20,7 @@ <h6>{{siteNameDto.siteUId}}</h6>
               <h6>{{'Creation Date' | translate}}</h6>
             </div>
             <div class="col-md-6">
-              {{siteNameDto.createdAt | date:'dd.MM.y HH:mm:ss'}}
+              <date-formatter [date]="siteNameDto.createdAt" [Format]="'datetime'"></date-formatter>
             </div>
           </div>
 
diff --git a/eform-client/src/app/modules/advanced/components/sites/sites/sites.component.html b/eform-client/src/app/modules/advanced/components/sites/sites/sites.component.html
@@ -18,10 +18,10 @@
       <tbody>
       <tr *ngFor="let siteDto of sitesDto">
         <td scope="row">
-          {{siteDto.createdAt | date:'dd.MM.y HH:mm:ss'}}
+          <date-formatter [date]="siteDto.createdAt" [Format]="'datetime'"></date-formatter>
         </td>
         <td>
-          {{siteDto.updatedAt | date:'dd.MM.y HH:mm:ss'}}
+          <date-formatter [date]="siteDto.updatedAt" [Format]="'datetime'"></date-formatter>
         </td>
         <td>{{siteDto.siteName}}</td>
         <td>
diff --git a/eform-client/src/app/modules/advanced/components/units/units.component.html b/eform-client/src/app/modules/advanced/components/units/units.component.html
@@ -16,8 +16,12 @@
       </thead>
       <tbody>
       <tr *ngFor="let unitModel of unitModels">
-        <td scope="row">{{unitModel.createdAt | date:'dd.MM.y HH:mm:ss'}}</td>
-        <td> {{unitModel.updatedAt | date:'dd.MM.y HH:mm:ss'}}</td>
+        <td scope="row">
+          <date-formatter [date]="unitModel.createdAt" [Format]="'datetime'"></date-formatter>
+        </td>
+        <td>
+          <date-formatter [date]="unitModel.updatedAt" [Format]="'datetime'"></date-formatter>
+        </td>
         <td>
           <div class="d-flex flex-row justify-content-center">
             <div *ngIf="unitModel.otpCode != 0">
diff --git a/eform-client/src/app/modules/advanced/components/workers/worker-delete/worker-delete.component.html b/eform-client/src/app/modules/advanced/components/workers/worker-delete/worker-delete.component.html
@@ -20,7 +20,9 @@ <h6>{{selectedWorkerDto.workerUId}}</h6>
               <h6>{{'Creation Date' | translate}}</h6>
             </div>
             <div class="col-md-6">
-              <h6>{{selectedWorkerDto.createdAt | date:'dd.MM.y HH:mm:ss'}}</h6>
+              <h6>
+                <date-formatter [date]="selectedWorkerDto.createdAt" [Format]="'datetime'"></date-formatter>
+              </h6>
             </div>
           </div>
 
diff --git a/eform-client/src/app/modules/advanced/components/workers/workers/workers.component.html b/eform-client/src/app/modules/advanced/components/workers/workers/workers.component.html
@@ -22,8 +22,12 @@
       </thead>
       <tbody>
       <tr *ngFor="let workerDto of workersDto">
-        <td scope="row">{{workerDto.createdAt | date:'dd.MM.y HH:mm:ss'}}</td>
-        <td>{{workerDto.updatedAt | date:'dd.MM.y HH:mm:ss'}}</td>
+        <td scope="row">
+          <date-formatter [date]="workerDto.createdAt" [Format]="'datetime'"></date-formatter>
+        </td>
+        <td>
+          <date-formatter [date]="workerDto.updatedAt" [Format]="'datetime'"></date-formatter>
+        </td>
         <td>{{workerDto.firstName}}</td>
         <td>
           {{workerDto.lastName}}
diff --git a/eform-client/src/app/modules/cases/components/cases-table/cases-table.component.html b/eform-client/src/app/modules/cases/components/cases-table/cases-table.component.html
@@ -156,8 +156,12 @@
       <tbody>
       <tr *ngFor="let caseModel of caseListModel.cases">
         <td scope="row">{{caseModel.id}}</td>
-        <td> {{caseModel.doneAt | date:'dd.MM.y HH:mm:ss'}}</td>
-        <td> {{caseModel.createdAt | date:'dd.MM.y HH:mm:ss'}}</td>
+        <td>
+          <date-formatter [date]="caseModel.doneAt" [Format]="'datetime'"></date-formatter>
+        </td>
+        <td>
+          <date-formatter [date]="caseModel.createdAt" [Format]="'datetime'"></date-formatter>
+        </td>
         <td> {{caseModel.workerName}}</td>
         <td *ngIf="currentTemplate.field1" class="text-center">
           {{caseModel.fieldValue1}}
diff --git a/eform-client/src/app/modules/cases/components/remove-case-modal/remove-case-modal.component.html b/eform-client/src/app/modules/cases/components/remove-case-modal/remove-case-modal.component.html
@@ -20,7 +20,9 @@ <h6><strong>{{selectedCaseModel.id}}</strong></h6>
               <h6>{{'Accessible at' | translate}}</h6>
             </div>
             <div class="col-md-6">
-              <h6><strong>{{selectedCaseModel.createdAt | date:'dd.MM.y HH:mm:ss'}}</strong></h6>
+              <h6><strong>
+                <date-formatter [date]="selectedCaseModel.createdAt" [Format]="'datetime'"></date-formatter>
+              </strong></h6>
             </div>
           </div>
 
@@ -29,7 +31,9 @@ <h6><strong>{{selectedCaseModel.createdAt | date:'dd.MM.y HH:mm:ss'}}</strong></
               <h6>{{'Finished at' | translate}}</h6>
             </div>
             <div class="col-md-6">
-              <h6><strong>{{selectedCaseModel.doneAt | date:'dd.MM.y HH:mm:ss'}}</strong></h6>
+              <h6><strong>
+                <date-formatter [date]="selectedCaseModel.doneAt" [Format]="'datetime'"></date-formatter>
+              </strong></h6>
             </div>
           </div>
 
diff --git a/eform-client/src/app/modules/eforms/components/eform-remove-eform-modal/eform-remove-eform-modal.component.html b/eform-client/src/app/modules/eforms/components/eform-remove-eform-modal/eform-remove-eform-modal.component.html
@@ -21,7 +21,9 @@ <h6>ID</h6>
               <h6>{{'Creation Date' | translate}}</h6>
             </div>
             <div class="col-md-6">
-              <strong>{{selectedTemplateDto.createdAt | date:'dd.MM.y HH:mm:ss'}}</strong>
+              <strong>
+                <date-formatter [date]="selectedTemplateDto.createdAt" [Format]="'datetime'"></date-formatter>
+              </strong>
             </div>
           </div>
 
diff --git a/eform-client/src/app/modules/eforms/components/eforms-page/eforms-page.component.html b/eform-client/src/app/modules/eforms/components/eforms-page/eforms-page.component.html
@@ -76,7 +76,8 @@
       <tbody id="mainPageEFormsTableBody">
       <tr *ngFor="let templateDto of templateListModel.templates">
         <td scope="row" id="eform-id">{{templateDto.id}}</td>
-        <td id="eform-created-at">{{templateDto.createdAt | date:'dd.MM.y HH:mm:ss'}}</td>
+        <!--<td id="eform-created-at">{{templateDto.createdAt | date:'dd.MM.y HH:mm:ss'}}</td>-->
+        <td id="eform-created-at"><date-formatter [date]="templateDto.createdAt" [Format]="'datetime'"></date-formatter></td>
         <td id="eform-label">{{templateDto.label}}</td>
         <td>
           <div class="d-flex justify-content-center">
diff --git a/eform-client/src/app/modules/security/components/security-group-permissions/security-group-eforms-add/security-group-eforms-add.component.html b/eform-client/src/app/modules/security/components/security-group-permissions/security-group-eforms-add/security-group-eforms-add.component.html
@@ -31,7 +31,8 @@ <h3>{{ 'Bind Eform' | translate }}</h3>
               <!--<td scope="row" id="eform-id">{{templateDto.id}}</td>-->
               <td scope="row" id="eform-id">{{template.id}}</td>
               <!--<td id="eform-created-at">{{templateDto.createdAt | date:'dd.MM.y HH:mm:ss'}}</td>-->
-              <td id="eform-created-at">{{template.createdAt | date:'dd.MM.y HH:mm:ss'}}</td>
+              <td id="eform-created-at">
+                <date-formatter [date]="template.createdAt" [Format]="'datetime'"></date-formatter></td>
               <!--<td id="eform-label">{{templateDto.label}}</td>-->
               <td id="eform-label">{{template.label}}</td>
             </tr>
diff --git a/eform-client/src/app/modules/security/components/security-group-permissions/security-group-eforms-delete/security-group-eforms-delete.component.html b/eform-client/src/app/modules/security/components/security-group-permissions/security-group-eforms-delete/security-group-eforms-delete.component.html
@@ -21,7 +21,9 @@ <h6>ID</h6>
               <h6>{{'Creation Date' | translate}}</h6>
             </div>
             <div class="col-md-6">
-              <strong>{{eformSecurityModel.createdAt | date:'dd.MM.y HH:mm:ss'}}</strong>
+              <strong>
+                <date-formatter [date]="eformSecurityModel.createdAt" [Format]="'datetime'"></date-formatter>
+              </strong>
             </div>
           </div>
 
diff --git a/eform-client/src/app/modules/security/components/security-group-permissions/security-group-eforms-permissions/security-group-eforms-permissions.component.html b/eform-client/src/app/modules/security/components/security-group-permissions/security-group-eforms-permissions/security-group-eforms-permissions.component.html
@@ -34,7 +34,7 @@
       <tbody id="mainPageEFormsTableBody">
       <tr *ngFor="let eform of eformSecurityModel.eformsList">
         <td scope="row" id="eform-id">{{eform.templateId}}</td>
-        <td id="eform-created-at">{{eform.createdAt | date:'dd.MM.y HH:mm:ss'}}</td>
+        <td id="eform-created-at"><date-formatter [date]="eform.createdAt" [Format]="'datetime'"></date-formatter></td>
         <td id="eform-label">{{eform.label}}</td>
         <td>
           <div class="d-flex flex-row justify-content-center">
