Merge pull request #1388 from qbicsoftware/development

Create Release

Author: KochTobi

.github/workflows/build_package.yml

@@ -1,6 +1,7 @@
 name: Build Maven Package
 
 on:
+  pull_request:
   push:
     branches:
       - '**'

.github/workflows/codeql-analysis.yml

@@ -16,7 +16,7 @@ on:
     branches: [ main, master, development, release/*, hotfix/* ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ main, master ]
+    branches: [ main, master, development ]
   schedule:
     - cron: '21 1 * * 4'
 

.github/workflows/run_tests.yml

@@ -1,6 +1,7 @@
 name: Run Maven Tests
 
 on:
+  pull_request:
   push:
     branches:
       - '**'

AGENTS.md

@@ -0,0 +1,104 @@
+package life.qbic.application.commons.time;
+
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import org.springframework.lang.NonNull;
+
+/**
+ * Defines canonical date/time formats used consistently across the application.
+ *
+ * <p>This type acts as a cross-layer contract between:
+ * <ul>
+ *   <li>UI rendering (via {@link #asJavaFormatter(DateTimeFormat, ZoneId)})</li>
+ *   <li>Database-side filtering (via {@link #asMariaDbDatabasePattern(DateTimeFormat)})</li>
+ * </ul>
+ *
+ * <p>The goal is to ensure that textual date representations shown to the user
+ * exactly match the representations used for textual filtering in the database,
+ * allowing users to search for values as displayed.
+ *
+ * <p>Each format therefore provides both:
+ * <ul>
+ *   <li>A {@link DateTimeFormatter} correctly configured with the corresponding pattern</li>
+ *   <li>A MariaDB <a href="https://mariadb.com/docs/server/reference/sql-functions/date-time-functions/date_format">{@code DATE_FORMAT}</a> pattern to be used with correctly zoned dates</li>
+ * </ul>
+ */
+
+public enum DateTimeFormat {
+
+
+  /**
+   * A simple to read, textual date representation. E.g. {@code Wednesday, 11 February 2026}
+   * <p>
+   * Format: {@code <weekday_name>, <day> <month_name> <year>}}
+   */
+  SIMPLE_DATE,
+  /**
+   * A simple to read, textual date-time representation. E.g.
+   * {@code Wednesday, 11 February 2026 11:12:10}
+   * <p>
+   * Format: {@code <weekday_name>, <day> <month_name> <year>
+   * <hour>:<minute>:<seconds>}}
+   */
+  SIMPLE_DATE_TIME,
+  /**
+   * The ISO-8601 date format without an offset, such as '2011-12-03'.
+   * <p>
+   * Format: {@code <year>-<month>-<day>}
+   */
+  ISO_LOCAL_DATE,
+  /**
+   * The ISO-8601 date-time format without an offset, such as '2011-12-03T10:15:30'.
+   * <p>
+   * Format: {@code <year>-<month>-<day>T<hour>:<minute>:<second>}
+   */
+  ISO_LOCAL_DATE_TIME,
+  /**
+   * The ISO-8601 date-time format without an offset. Date and time are separated by a space instead of T, such as '2011-12-03 10:15:30'.
+   * <p>
+   * Format: {@code <year>-<month>-<day> <hour>:<minute>:<second>}
+   */
+  ISO_LOCAL_DATE_TIME_WHITESPACE_SEPARATED;
+
+  /**
+   * Creates a {@link DateTimeFormatter} for rendering Instants in the UI.
+   *
+   * <p>The formatter must produce a textual representation equivalent to thee
+   *    * MariaDB {@code DATE_FORMAT} pattern returned by {@link #asMariaDbDatabasePattern(DateTimeFormat)},
+   * so that user-entered search terms match the displayed values.
+   *
+   * @return formatter matching the database-side date representation
+   */
+
+  @NonNull
+  public static DateTimeFormatter asJavaFormatter(@NonNull DateTimeFormat format, ZoneId zoneId) {
+    return switch (format) {
+      case ISO_LOCAL_DATE -> DateTimeFormatter.ISO_LOCAL_DATE.withZone(zoneId);
+      case ISO_LOCAL_DATE_TIME -> DateTimeFormatter.ISO_LOCAL_DATE_TIME.withZone(zoneId);
+      case ISO_LOCAL_DATE_TIME_WHITESPACE_SEPARATED -> DateTimeFormatter.ofPattern(
+          "yyyy-MM-dd HH:mm").withZone(zoneId);
+      case SIMPLE_DATE -> DateTimeFormatter.ofPattern("EEEE, dd LLLL yyyy").withZone(zoneId);
+      case SIMPLE_DATE_TIME -> DateTimeFormatter.ofPattern("EEEE, dd LLLL yyyy HH:mm:ss").withZone(
+          zoneId);
+    };
+  }
+
+  /**
+   * Returns the MariaDB <a href="https://mariadb.com/docs/server/reference/sql-functions/date-time-functions/date_format">{@code DATE_FORMAT}</a> pattern corresponding to the UI format.
+   *
+   * <p>This pattern is used in JPA Specifications to transform Instants into
+   * textual representations that align with the UI rendering format.
+   *
+   * @return MariaDB date format pattern
+   */
+  @NonNull
+  public static String asMariaDbDatabasePattern(@NonNull DateTimeFormat format) {
+    return switch (format) {
+      case SIMPLE_DATE -> "%W, %d %M %Y";
+      case SIMPLE_DATE_TIME -> "%W, %d %M %Y %T";
+      case ISO_LOCAL_DATE -> "%Y-%m-%d";
+      case ISO_LOCAL_DATE_TIME -> "%Y-%m-%dT%T";
+      case ISO_LOCAL_DATE_TIME_WHITESPACE_SEPARATED -> "%Y-%m-%d %T";
+    };
+  }
+}

application-commons/src/main/java/life/qbic/application/commons/time/DateTimeFormat.java

@@ -42,11 +42,11 @@
 }
 
 .main.measurement {
-  grid-template-columns: minmax(max-content, 70%) minmax(max-content, 30%);
-  grid-template-rows: minmax(max-content, 25%) minmax(max-content, 70%);
+  grid-template-columns: 100%;
+  grid-template-rows: minmax(min-content, 10%) minmax(90%, 100%);
   grid-template-areas:
-    ". measurementtemplatelist"
-    "measurementdetails measurementdetails";
+    "."
+    "measurementdetails";
 }
 
 .main.project {
@@ -94,9 +94,8 @@
     grid-template-columns: minmax(min-content, 1fr);
     grid-template-areas:
     "."
-    "measurementtemplatelist"
     "measurementdetails";
-    grid-template-rows: minmax(min-content, 20%) minmax(min-content, 20%) minmax(min-content, 60%);
+    grid-template-rows: minmax(min-content, 10%) minmax(90%, 100%);
   }
 
   .main.project {

datamanager-app/frontend/themes/datamanager/components/grid-templates.css

@@ -161,10 +161,6 @@
   align-items: center;
 }
 
-.main.measurement .measurement-template-list-component {
-  grid-area: measurementtemplatelist;
-}
-
 
 .main.measurement .measurement-details-component {
   grid-area: measurementdetails

datamanager-app/frontend/themes/datamanager/components/main.css

@@ -123,7 +123,6 @@
 }
 
 .measurement-details-component {
-  height: 100%;
   justify-content: center;
   align-items: center;
 }

datamanager-app/frontend/themes/datamanager/components/page-area.css

@@ -287,10 +287,10 @@ public MeasurementCreatedPolicy measurementCreatedPolicy(
 
   @Bean
   public MeasurementUpdatedPolicy measurementUpdatedPolicy(
-      MeasurementLookupService measurementLookupService,
       ProjectInformationService projectInformationService, JobScheduler jobScheduler) {
     var updateProjectUponMeasurementUpdate = new UpdateProjectUponMeasurementUpdate(
-        measurementLookupService, projectInformationService, jobScheduler);
+        projectInformationService,
+        jobScheduler);
     return new MeasurementUpdatedPolicy(updateProjectUponMeasurementUpdate);
   }
 

datamanager-app/src/main/java/life/qbic/datamanager/AppConfig.java

@@ -7,7 +7,6 @@
 import java.util.StringJoiner;
 import life.qbic.projectmanagement.domain.model.experiment.ExperimentId;
 import life.qbic.projectmanagement.domain.model.project.ProjectId;
-import org.springframework.lang.NonNull;
 
 /**
  * The current context information
@@ -118,6 +117,7 @@ public String toString() {
     return new StringJoiner(", ", Context.class.getSimpleName() + "[", "]")
         .add("projectId=" + projectId)
         .add("experimentId=" + experimentId)
+        .add("projectCode=" + projectCode)
         .toString();
   }
 }