Merge branch 'development' into feature-682/682-notification-system

# Conflicts: # user-interface/src/main/bundles/dev.bundle
qbicsoftware · Sep 4, 2024 · ff382b9 · ff382b9
2 parents 162fd67 + 1376430
commit ff382b9
Show file tree

Hide file tree

Showing 26 changed files with 197 additions and 95 deletions.
diff --git a/application-commons/pom.xml b/application-commons/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>application-commons</artifactId>

diff --git a/broadcasting/pom.xml b/broadcasting/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>broadcasting</artifactId>

diff --git a/domain-concept/pom.xml b/domain-concept/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
 
   <artifactId>domain-concept</artifactId>

diff --git a/email-service-provider/pom.xml b/email-service-provider/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
 
   <groupId>life.qbic.infrastructure</groupId>
@@ -21,13 +21,13 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>identity</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>project-management</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/finances-api/pom.xml b/finances-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
 
   <groupId>life.qbic.finances</groupId>

diff --git a/finances-infrastructure/pom.xml b/finances-infrastructure/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
 
   <artifactId>finances-infrastructure</artifactId>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>finances</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/finances/pom.xml b/finances/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>finances</artifactId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>life.qbic.finances</groupId>
       <artifactId>finances-api</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/identity-api/pom.xml b/identity-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
 
   <groupId>life.qbic.datamanager</groupId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/identity-infrastructure/pom.xml b/identity-infrastructure/pom.xml
@@ -6,14 +6,14 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
   <artifactId>identity-infrastructure</artifactId>
   <dependencies>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>identity</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/identity/pom.xml b/identity/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -45,25 +45,25 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>broadcasting</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>logging</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>domain-concept</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>identity-api</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/logging/pom.xml b/logging/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>logging</artifactId>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>life.qbic.logging</groupId>
       <artifactId>subscription-api</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <groupId>life.qbic</groupId>
   <artifactId>datamanager</artifactId>
   <name>Data Manager</name>
-  <version>1.3.1</version>
+  <version>1.4.0</version>
   <modules>
     <module>user-interface</module>
     <module>identity</module>

diff --git a/project-management-infrastructure/pom.xml b/project-management-infrastructure/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
 
   <groupId>life.qbic.identity</groupId>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>project-management</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/project-management/pom.xml b/project-management/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>project-management</artifactId>
@@ -37,13 +37,13 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>logging</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>domain-concept</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -77,13 +77,13 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>identity-api</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic.finances</groupId>
       <artifactId>finances-api</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/subscription-api/pom.xml b/subscription-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>life.qbic.logging</groupId>

diff --git a/subscription-provider/pom.xml b/subscription-provider/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>life.qbic.logging</groupId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>life.qbic.logging</groupId>
       <artifactId>subscription-api</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/user-interface/frontend/themes/datamanager/components/card.css b/user-interface/frontend/themes/datamanager/components/card.css
@@ -48,22 +48,13 @@
   opacity: 0.05;
 }
 
-.experimental-group {
-  display: flex;
-  flex-direction: column;
-  flex: auto;
-  font-size: var(--lumo-font-size-s);
-  padding: var(--lumo-space-l);
-  max-width: 300px;
-}
-
 .card-collection {
   display: flex;
   align-content: space-evenly;
   flex-flow: column;
   gap: 1rem;
-  margin-left: 1.5rem;
-  margin-top: 1.5rem;
+  padding-left: 1.5rem;
+  padding-top: 1.5rem;
 }
 
 .card-collection .collection-title {
@@ -79,11 +70,10 @@
 }
 
 .card-collection .collection-content {
-  display: flex;
-  align-content: space-evenly;
-  flex-flow: row wrap;
-  gap: 1rem;
-  flex-direction: row;
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  grid-auto-rows: auto;
+  grid-gap: 1rem;
 }
 
 .card-collection .collection-controls {
@@ -93,29 +83,37 @@
   gap: 0.5rem;
 }
 
-.experimental-group .header {
+.card-collection .experimental-group {
+  display: flex;
+  flex-direction: column;
+  font-size: var(--lumo-font-size-s);
+  padding: var(--lumo-space-l);
+}
+
+.card-collection .experimental-group .header {
   display: flex;
   justify-content: space-between;
   align-items: baseline;
   margin-bottom: var(--lumo-space-m);
 }
 
-.experimental-group .card-title {
+.card-collection.experimental-group .card-title {
   color: var(--lumo-secondary-text-color);
   font-size: var(--lumo-font-size-m);
   font-weight: bold;
   white-space: nowrap;
   margin-bottom: 0.5rem;
 }
 
-.experimental-group .content {
-  display: inline-flex;
+.card-collection .experimental-group .content {
+  display: flex;
   flex-wrap: wrap;
   gap: var(--lumo-space-m);
   margin-bottom: var(--lumo-space-m);
+  flex-direction: column;
 }
 
-.experimental-group vaadin-icon {
+.card-collection .experimental-group vaadin-icon {
   cursor: pointer;
   width: 1em;
   color: darkgrey;

diff --git a/user-interface/frontend/themes/datamanager/components/custom.css b/user-interface/frontend/themes/datamanager/components/custom.css
@@ -15,6 +15,7 @@
 @import "page-area.css";
 @import "span.css";
 @import "spreadsheet.css";
+@import "toggle-button.css";
 @import "vaadin-custom.css";
 @import "virtuallist.css";
 @import "toast.css";