From: elgekko <vasary@elgekko.net>
Date: Sun, 28 Jan 2024 21:55:28 +0000 (+0100)
Subject: Add new project status bug fixed
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=ec0a5ac859ad4ed7c04c6df921cebcceea577179;p=sly-crm.git

Add new project status bug fixed
---

diff --git a/lis-ui/src/main/java/hu/user/lis/ui/data/ProjectStatusDataModel.java b/lis-ui/src/main/java/hu/user/lis/ui/data/ProjectStatusDataModel.java
index 9d226d4..98bfaff 100644
--- a/lis-ui/src/main/java/hu/user/lis/ui/data/ProjectStatusDataModel.java
+++ b/lis-ui/src/main/java/hu/user/lis/ui/data/ProjectStatusDataModel.java
@@ -81,6 +81,7 @@ public class ProjectStatusDataModel extends CachedSpringDataModel<ProjectStatus>
         ProjectStatus entity = projectStatusService.createNew();
         long currentCount = projectStatusRepository.count();
         entity.setOrder((int) currentCount + 1);
+        entity.setName("STATUS" + entity.getOrder());
         projectStatusRepository.save(entity);
     }
 
diff --git a/lis-ui/src/main/java/hu/user/lis/ui/view/SettingsViewModel.java b/lis-ui/src/main/java/hu/user/lis/ui/view/SettingsViewModel.java
index 17bd88b..882fe3d 100644
--- a/lis-ui/src/main/java/hu/user/lis/ui/view/SettingsViewModel.java
+++ b/lis-ui/src/main/java/hu/user/lis/ui/view/SettingsViewModel.java
@@ -13,6 +13,7 @@ import org.zkoss.zk.ui.select.annotation.VariableResolver;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
 import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zkplus.spring.DelegatingVariableResolver;
+import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Panel;
 
 @Log4j2
@@ -69,7 +70,12 @@ public class SettingsViewModel extends AsyncBaseModel {
 
     @Command
     public void onProjectStatusChanged(@BindingParam("entity") ProjectStatus entity) {
-        projectStatusDataModel.save(entity);
+        try {
+            projectStatusDataModel.save(entity);
+            projectStatusDataModel.listAll();
+        } catch (Exception e) {
+            Messagebox.show("A mentés sikertelen! A elvárt az egyedi státusz elnevezés.", "Hiba", Messagebox.OK , Messagebox.ERROR);
+        }
     }
 
     public void setSelectedProjectStatus(ProjectStatus selectedProjectStatus) {
diff --git a/lis-ui/src/main/resources/web/settings.zul b/lis-ui/src/main/resources/web/settings.zul
index e296048..0869a7d 100644
--- a/lis-ui/src/main/resources/web/settings.zul
+++ b/lis-ui/src/main/resources/web/settings.zul
@@ -7,7 +7,7 @@
             <caption label="Projekt státusz" style="cursor: pointer"
                      onClick="@command('onClickFormPanel', parentPanel=centerPanel, panel=self.parent)"/>
             <panelchildren>
-                <borderlayout height="200px">
+                <borderlayout height="500px">
                     <north flex="true">
                         <toolbar>
                             <toolbarbutton label="Fel mozgat" iconSclass="z-icon-arrow-up"
@@ -22,8 +22,8 @@
                                            disabled="@load(empty vm.selectedProjectStatus)"/>
                         </toolbar>
                     </north>
-                    <center border="none" flex="true">
-                        <listbox vflex="true" model="@load(vm.projectStatusDataModel)"
+                    <center border="none" hflex="true" vflex="true">
+                        <listbox hflex="true" vflex="true" model="@load(vm.projectStatusDataModel)"
                                  autopaging="true" mold="paging" pagingPosition="top" multiple="false"
                                  selectedItem="@bind(vm.selectedProjectStatus)">
                             <listhead sizable="true">