Settings page fixes: release dates, save new functions (#835)

liimaorg · Jan 29, 2025 · d23918e · d23918e
1 parent 7e4ebf6
commit d23918e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/AMW_angular/io/src/app/core/amw-constants.ts b/AMW_angular/io/src/app/core/amw-constants.ts
@@ -7,3 +7,4 @@ export const ENVIRONMENT = {
 // used for date-fns
 export const DATE_TIME_FORMAT = 'dd.MM.yyyy HH:mm';
 export const DATE_FORMAT = 'dd.MM.yyyy';
+export const ISO_FORMAT = 'yyyy-MM-dd';
diff --git a/AMW_angular/io/src/app/settings/releases/release-edit.component.ts b/AMW_angular/io/src/app/settings/releases/release-edit.component.ts
@@ -27,7 +27,7 @@ export class ReleaseEditComponent implements OnInit {
 
   ngOnInit(): void {
     if (this.release) {
-      this.installationDate = DateModel.fromEpoch(this.release.installationInProductionAt);
+      this.installationDate = DateModel.fromLocalString(this.release.installationInProductionAt);
     }
   }
 
@@ -45,14 +45,14 @@ export class ReleaseEditComponent implements OnInit {
 
   save() {
     if (this.hasInvalidDate()) {
-      return
+      return;
     }
     if (this.installationDate.toEpoch() != null) {
       const release: Release = {
         name: this.release.name,
         mainRelease: this.release.mainRelease,
         description: this.release.description,
-        installationInProductionAt: this.installationDate.toEpoch(),
+        installationInProductionAt: this.installationDate.toISOFormat(),
         id: this.release.id ? this.release.id : null,
         default: false,
         v: this.release.v ? this.release.v : null,

diff --git a/AMW_angular/io/src/app/settings/releases/release.ts b/AMW_angular/io/src/app/settings/releases/release.ts
@@ -2,7 +2,7 @@ export interface Release {
   name: string;
   mainRelease: boolean;
   description: string;
-  installationInProductionAt: number;
+  installationInProductionAt: string;
   id: number;
   v: number;
   default: boolean;

diff --git a/AMW_angular/io/src/app/shared/date-picker/date.model.ts b/AMW_angular/io/src/app/shared/date-picker/date.model.ts
@@ -1,6 +1,6 @@
 import { NgbTimeStruct, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
 import * as datefns from 'date-fns';
-import { DATE_FORMAT } from 'src/app/core/amw-constants';
+import { DATE_FORMAT, ISO_FORMAT } from 'src/app/core/amw-constants';
 
 export interface NgbDateTimeStruct extends NgbDateStruct, NgbTimeStruct {}
 
@@ -71,4 +71,8 @@ export class DateModel implements NgbDateStruct {
   public toJSON(): string {
     return this.toString();
   }
+
+  public toISOFormat(): string {
+    return datefns.format(this.thisToDate(), ISO_FORMAT);
+  }
 }
diff --git a/AMW_angular/io/src/app/shared/modal-header/modal-header.component.ts b/AMW_angular/io/src/app/shared/modal-header/modal-header.component.ts
@@ -7,7 +7,7 @@ import { Component, input, output } from '@angular/core';
   template: `<div class="modal-header">
     <h5 class="modal-title">{{ title() }}</h5>
     <button type="button" class="btn btn-light close" aria-label="Close" (click)="onCancel()">
-      <span aria-hidden="true">&times;</span>
+      <span>&times;</span>
     </button>
   </div> `,
 })

diff --git a/AMW_docker/README.md b/AMW_docker/README.md
@@ -1,6 +1,6 @@
 # Liima Docker image
 
-This image is meant to run liima code quickly on widlfly server provided on docker. 
+This image is meant to run liima code quickly on wildfly server provided on docker. 
 Data is stored in the embedded h2 database in the container and it will be lost if the container is removed.
 
 To run latest code on docker, build the latest ear package: