Allow overriding which format to use

opf · Jan 22, 2024 · ac2aa3c · ac2aa3c
1 parent 1f131bd
commit ac2aa3c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/frontend/src/app/core/datetime/timezone.service.ts b/frontend/src/app/core/datetime/timezone.service.ts
@@ -30,9 +30,7 @@ import { Injectable } from '@angular/core';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import * as moment from 'moment-timezone';
-import {
-  Moment,
-} from 'moment';
+import { Moment } from 'moment';
 
 @Injectable({ providedIn: 'root' })
 export class TimezoneService {
@@ -84,9 +82,9 @@ export class TimezoneService {
     return this.parseDate(date, 'YYYY-MM-DD');
   }
 
-  public formattedDate(date:string):string {
+  public formattedDate(date:string, format = this.getDateFormat()):string {
     const d = this.parseDate(date);
-    return d.format(this.getDateFormat());
+    return d.format(format);
   }
 
   /**

diff --git a/...atures/work-packages/components/wp-card-view/wp-single-card/wp-single-card.component.html b/...atures/work-packages/components/wp-card-view/wp-single-card/wp-single-card.component.html
@@ -141,7 +141,7 @@
     <display-field
       *ngIf="!showAsInlineCard"
       [resource]="workPackage"
-      [displayFieldOptions]="{ writable: false }"
+      [displayFieldOptions]="{ writable: false, dateFormat: 'MMM DD, YYYY' }"
       [displayClass]="combinedDateDisplayField"
       fieldName="dueDate"
       class="op-wp-single-card--content-dates"

diff --git a/frontend/src/app/shared/components/fields/display/field-types/combined-date-display.field.ts b/frontend/src/app/shared/components/fields/display/field-types/combined-date-display.field.ts
@@ -53,12 +53,8 @@ export class CombinedDateDisplayField extends DateDisplayField {
   private createDateDisplayField(date:'dueDate'|'startDate'):HTMLElement {
     const dateElement = document.createElement('span');
     const dateDisplayField = new DateDisplayField(date, this.context);
-    const text = this.resource[date]
-      ? this.timezoneService.formattedDate(this.resource[date])
-      : this.text.placeholder[date];
-
     dateDisplayField.apply(this.resource, this.schema);
-    dateDisplayField.render(dateElement, text);
+    dateDisplayField.render(dateElement, dateDisplayField.valueString);
 
     return dateElement;
   }

diff --git a/frontend/src/app/shared/components/fields/display/field-types/date-display-field.module.ts b/frontend/src/app/shared/components/fields/display/field-types/date-display-field.module.ts
@@ -26,8 +26,12 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Highlighting } from 'core-app/features/work-packages/components/wp-fast-table/builders/highlighting/highlighting.functions';
-import { HighlightableDisplayField } from 'core-app/shared/components/fields/display/field-types/highlightable-display-field.module';
+import {
+  Highlighting,
+} from 'core-app/features/work-packages/components/wp-fast-table/builders/highlighting/highlighting.functions';
+import {
+  HighlightableDisplayField,
+} from 'core-app/shared/components/fields/display/field-types/highlightable-display-field.module';
 import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
@@ -75,7 +79,7 @@ export class DateDisplayField extends HighlightableDisplayField {
 
   public get valueString() {
     if (this.value) {
-      return this.timezoneService.formattedDate(this.value);
+      return this.timezoneService.formattedDate(this.value, this.context.options.dateFormat);
     }
     return '';
   }