change value of Stats colors, fix typo in storageadmin in views

Known-Issues: Not all Forms have buttons Signed-off-by: Aleksandar Zivkovic <[email protected]>
anywaywayany · Feb 27, 2024 · cf55d79 · cf55d79
1 parent 9e4327b
commit cf55d79
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/src/main/java/com/samic/samic/views/abfragen/AbfragenView.java b/src/main/java/com/samic/samic/views/abfragen/AbfragenView.java
@@ -20,7 +20,7 @@
 
 @PageTitle("Abfragen")
 @Route(value = "abfragen", layout = MainLayout.class)
-@RolesAllowed({"MANAGMENT", "STORAGEADMINISTRATOR"})
+@RolesAllowed({"MANAGMENT", "STORAGEADMIN"})
 public class AbfragenView extends VerticalLayout {
 
   private static final List<String> MONTH_NAMES = List.of("Januar", "Februar", "März", "April",

diff --git a/src/main/java/com/samic/samic/views/dashboard/DashboardView.java b/src/main/java/com/samic/samic/views/dashboard/DashboardView.java
@@ -124,10 +124,8 @@ private void initStats() {
               .ifPresent(o -> objectTypeMin.set(o.getMinValue().intValue()));
           Span sp = new Span(key + " " + value + "/" + objectTypeMin);
 
-          if (objectTypeMin.get() - value < 5) {
+          if (value <= objectTypeMin.get()) {
             sp.getElement().getThemeList().add("badge error");
-          } else if (objectTypeMin.get() - value < 50) {
-            sp.getElement().getThemeList().add("badge contrast");
           } else {
             sp.getElement().getThemeList().add("badge success");
           }

diff --git a/src/main/java/com/samic/samic/views/lagerobjekt_aufnehmen/LagerobjektAufnehmenView.java b/src/main/java/com/samic/samic/views/lagerobjekt_aufnehmen/LagerobjektAufnehmenView.java
@@ -19,7 +19,7 @@
 
 @PageTitle("Lagerobjekt aufnehmen")
 @Route(value = "lagerobjektAufnehmen", layout = MainLayout.class)
-@RolesAllowed({"FIELDSERVICETECHNICIAN", "STORAGEADMINISTRATOR"})
+@RolesAllowed({"FIELDSERVICETECHNICIAN", "STORAGEADMIN"})
 public class LagerobjektAufnehmenView extends VerticalLayout {
 
   private final ServiceStorageObject storageObjectService;

diff --git a/src/main/java/com/samic/samic/views/lagerobjekt_erfassen/LagerobjektErfassenView.java b/src/main/java/com/samic/samic/views/lagerobjekt_erfassen/LagerobjektErfassenView.java
@@ -29,7 +29,7 @@
 
 @PageTitle("Lagerobjekt erfassen")
 @Route(value = "lagerobjektErfassen", layout = MainLayout.class)
-@RolesAllowed({"FIELDSERVICETECHNICIAN", "STORAGEADMINISTRATOR"})
+@RolesAllowed({"FIELDSERVICETECHNICIAN", "STORAGEADMIN"})
 public class LagerobjektErfassenView extends VerticalLayout {
 
   private final ServiceProducer producerService;

diff --git a/src/main/java/com/samic/samic/views/meine_hardware/MeineHardwareView.java b/src/main/java/com/samic/samic/views/meine_hardware/MeineHardwareView.java
@@ -29,7 +29,7 @@
 
 @PageTitle("Meine Hardware")
 @Route(value = "meineHardware", layout = MainLayout.class)
-@RolesAllowed({"FIELDSERVICETECHNICIAN", "STORAGEADMINISTRATOR"})
+@RolesAllowed({"FIELDSERVICETECHNICIAN", "STORAGEADMIN"})
 public class MeineHardwareView extends TabSheet {
 
   private final ReservationGrid reservationGrid;