From 1bbf7a6d1f55eb0c869bef37272279c7265d22b5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= <vasary@elgekko.net>
Date: Thu, 15 Feb 2024 22:06:03 +0100
Subject: [PATCH] Version string modified

---
 .../src/main/java/hu/user/lis/ui/view/IndexViewModel.java | 8 ++++++--
 .../src/main/java/hu/user/lis/ui/view/LoginViewModel.java | 5 +++--
 lis-ui/src/main/resources/web/index.zul                   | 5 ++---
 lis-ui/src/main/resources/web/login.zul                   | 4 ++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/lis-ui/src/main/java/hu/user/lis/ui/view/IndexViewModel.java b/lis-ui/src/main/java/hu/user/lis/ui/view/IndexViewModel.java
index 0e51170..92bad75 100644
--- a/lis-ui/src/main/java/hu/user/lis/ui/view/IndexViewModel.java
+++ b/lis-ui/src/main/java/hu/user/lis/ui/view/IndexViewModel.java
@@ -5,12 +5,12 @@ import hu.user.lis.ui.Constants;
 import hu.user.lis.ui.auth.CurrentProfile;
 import hu.user.lis.ui.editor.common.Editors;
 import hu.user.lis.ui.event.EventBus;
+import hu.user.lis.ui.properties.BuildInformation;
 import hu.user.lis.ui.session.SessionSettings;
 import hu.user.lis.workflow.invoice.service.WorkflowManagerService;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.boot.info.BuildProperties;
 import org.zkoss.bind.BindUtils;
 import org.zkoss.bind.annotation.BindingParam;
 import org.zkoss.bind.annotation.Command;
@@ -59,12 +59,16 @@ public class IndexViewModel implements EventListener<Event> {
 
     @WireVariable
     private EventBus eventBus;
+
     @WireVariable
-    private BuildProperties buildProperties;
+    private BuildInformation buildInformation;
+
     @WireVariable
     private SessionSettings sessionSettings;
+
     @WireVariable
     private CurrentProfile currentProfile;
+
     @WireVariable
     private WorkflowManagerService workflowManagerService;
     private String searchPhrase;
diff --git a/lis-ui/src/main/java/hu/user/lis/ui/view/LoginViewModel.java b/lis-ui/src/main/java/hu/user/lis/ui/view/LoginViewModel.java
index 5302f3e..d8c8e31 100644
--- a/lis-ui/src/main/java/hu/user/lis/ui/view/LoginViewModel.java
+++ b/lis-ui/src/main/java/hu/user/lis/ui/view/LoginViewModel.java
@@ -1,9 +1,9 @@
 package hu.user.lis.ui.view;
 
 import hu.user.lis.ui.properties.ApplicationUIProperties;
+import hu.user.lis.ui.properties.BuildInformation;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.boot.info.BuildProperties;
 import org.zkoss.zk.ui.select.annotation.VariableResolver;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
 
@@ -11,8 +11,9 @@ import org.zkoss.zk.ui.select.annotation.WireVariable;
 @VariableResolver(org.zkoss.zkplus.spring.DelegatingVariableResolver.class)
 @Getter
 public class LoginViewModel {
+
     @WireVariable
-    BuildProperties buildProperties;
+    BuildInformation buildInformation;
 
     @WireVariable
     ApplicationUIProperties applicationUIProperties;
diff --git a/lis-ui/src/main/resources/web/index.zul b/lis-ui/src/main/resources/web/index.zul
index cfe0b89..8ec3888 100644
--- a/lis-ui/src/main/resources/web/index.zul
+++ b/lis-ui/src/main/resources/web/index.zul
@@ -36,10 +36,9 @@
                 <div style="display: inline; float: left">
                     <hlayout valign="middle">
                         <image width="24px" height="24px" src="~./static/images/logo.png"/>
-                        <label value="@load(vm.buildProperties.name)"/>
-                        <!--                        <label value="@load(vm.buildProperties.get('company'))"/>-->
+                        <label value="@load(vm.buildInformation.name)"/>
                         <separator orient="vertical"/>
-                        <label style="font-size: 0.8em" value="@load(vm.buildProperties.version)"/>
+                        <label style="font-size: 0.8em" value="@load(vm.buildInformation.buildVersion)"/>
                     </hlayout>
                 </div>
                 <div style="display: inline; float: right">
diff --git a/lis-ui/src/main/resources/web/login.zul b/lis-ui/src/main/resources/web/login.zul
index 8d01027..4d9f26e 100644
--- a/lis-ui/src/main/resources/web/login.zul
+++ b/lis-ui/src/main/resources/web/login.zul
@@ -31,9 +31,9 @@
                 <div style="display: block">
                     <hlayout valign="middle">
                         <image width="24px" height="24px" src="~./static/images/logo.png"/>
-                        <label value="SLY-CRM"/>
+                        <label value="@load(vm.buildInformation.name)"/>
                         <separator orient="vertical"/>
-                        <label style="font-size: 0.8em" value="@load(vm.buildProperties.version)"/>
+                        <label style="font-size: 0.8em" value="@load(vm.buildInformation.buildVersion)"/>
                     </hlayout>
                 </div>
             </caption>
-- 
2.54.0