Merge pull request #77 from uatisdeproblem/development

Development
uatisdeproblem · Feb 12, 2024 · 07d8545 · 07d8545
2 parents 98232f6 + 7202c25
commit 07d8545
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 27 deletions.
diff --git a/back-end/package-lock.json b/back-end/package-lock.json
diff --git a/back-end/package.json b/back-end/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.3",
+  "version": "1.8.4",
   "name": "back-end",
   "scripts": {
     "lint": "eslint --ext .ts",

diff --git a/back-end/swagger.yaml b/back-end/swagger.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.3
 
 info:
   title: ESN Assembly app
-  version: 1.8.3
+  version: 1.8.4
   contact:
     name: Matteo Carbone
     email: [email protected]

diff --git a/front-end/package-lock.json b/front-end/package-lock.json
diff --git a/front-end/package.json b/front-end/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esn-assembly",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "author": "Matteo Carbone",
   "homepage": "https://matteocarbone.com/",
   "scripts": {

diff --git a/front-end/src/app/common/dateTimezone.pipe.ts b/front-end/src/app/common/dateTimezone.pipe.ts
@@ -11,22 +11,38 @@ export class DateTimezonePipe implements PipeTransform {
   constructor(private t: IDEATranslationsService, private app: AppService) {}
 
   transform(value: any, pattern: 'date' | 'datetime' | 'time' = 'date', timezone?: string): string | null {
-    if (!value) return null;
-    const d = new Date(value);
-    const lang = this.t.getCurrentLang();
-    const options = { timeZone: timezone ?? this.app.configurations.timezone };
-    if (pattern === 'datetime')
-      return d.toLocaleString(lang, {
-        ...options,
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric',
-        hour: 'numeric',
-        minute: 'numeric',
-        hour12: false
-      });
-    if (pattern === 'time')
-      return d.toLocaleTimeString(lang, { ...options, hour: 'numeric', minute: 'numeric', hour12: false });
-    else return d.toLocaleDateString(lang, { ...options, year: 'numeric', month: 'short', day: '2-digit' });
+    return formatDateWithLocaleAndTimeZone(
+      value,
+      this.t.getCurrentLang(),
+      timezone ?? this.app.configurations.timezone,
+      pattern
+    );
   }
 }
+
+/**
+ * Transform a date with a locale and a timezone in the app's standard.
+ */
+export const formatDateWithLocaleAndTimeZone = (
+  value: any,
+  locale: string,
+  timeZone: string,
+  pattern: 'date' | 'datetime' | 'time' = 'date'
+): string | null => {
+  if (!value) return null;
+  const d = new Date(value);
+  const options = { timeZone };
+  if (pattern === 'datetime')
+    return d.toLocaleString(locale, {
+      ...options,
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+      hour: 'numeric',
+      minute: 'numeric',
+      hour12: false
+    });
+  if (pattern === 'time')
+    return d.toLocaleTimeString(locale, { ...options, hour: 'numeric', minute: 'numeric', hour12: false });
+  return d.toLocaleDateString(locale, { ...options, year: 'numeric', month: 'short', day: '2-digit' });
+};
diff --git a/front-end/src/app/tabs/dashboard/deadlines/deadline.component.ts b/front-end/src/app/tabs/dashboard/deadlines/deadline.component.ts
@@ -4,7 +4,7 @@ import { IonicModule } from '@ionic/angular';
 import { isToday, isTomorrow } from 'date-fns';
 import { IDEATranslationsModule, IDEATranslationsService } from '@idea-ionic/common';
 
-import { DateTimezonePipe } from '@common/dateTimezone.pipe';
+import { DateTimezonePipe, formatDateWithLocaleAndTimeZone } from '@common/dateTimezone.pipe';
 
 import { AppService } from '@app/app.service';
 
@@ -99,6 +99,6 @@ export class DeadlineComponent {
     const date = new Date(this.deadline.at);
     if (isToday(date)) return this.t._('DEADLINES.TODAY');
     if (isTomorrow(date)) return this.t._('DEADLINES.TOMORROW');
-    else return this.t.formatDate(date);
+    else return formatDateWithLocaleAndTimeZone(date, this.t.getCurrentLang(), this.app.configurations.timezone);
   }
 }
diff --git a/front-end/src/environments/environment.idea.ts b/front-end/src/environments/environment.idea.ts
@@ -10,7 +10,7 @@ const STAGE = 'prod';
  */
 export const environment = {
   idea: {
-    app: { version: '1.8.3', mediaUrl: 'https://'.concat(parameters.mediaDomain), maxFileUploadSizeMB: 50 },
+    app: { version: '1.8.4', mediaUrl: 'https://'.concat(parameters.mediaDomain), maxFileUploadSizeMB: 50 },
     api: { url: parameters.apiDomain, stage: STAGE },
     socket: { url: parameters.webSocketApiDomain, stage: STAGE },
     ionicExtraModules: ['common']