Merge pull request mariuspopovici#148 from mariuspopovici/dev

Merge PR mariuspopovici#147 to master
MrDoe · Feb 3, 2024 · 625ff70 · 625ff70
2 parents 515d713 + 3809fa5
commit 625ff70
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -162,3 +162,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.2.82] - 2024-01-31
 
 - Misc. fixes
+
+## [1.2.83] - 2024-02-01
+
+- Misc. fixes
+
+## [1.2.84] - 2024-02-03
+
+- Misc. fixes
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "displayName": "STARLIMS VS Code Extension",
   "description": "Unofficial dictionary explorer (and more) for STARLIMS.",
   "license": "SEE LICENSE IN LICENSE.md",
-  "version": "1.2.82",
+  "version": "1.2.83",
   "icon": "resources/extension/starlimsvscode.png",
   "publisher": "MariusPopovici",
   "author": {
@@ -120,7 +120,7 @@
       {
         "command": "STARLIMS.DebugForm",
         "title": "Debug Form"
-      },      
+      },
       {
         "command": "STARLIMS.DesignHTMLForm",
         "title": "Design Form"

diff --git a/src/backend/SCM_API.sdp b/src/backend/SCM_API.sdp
diff --git a/src/backend/SCM_API/Applications/SCM/FormDesigner/Server Scripts/scInitFormProperties.srvscr b/src/backend/SCM_API/Applications/SCM/FormDesigner/Server Scripts/scInitFormProperties.srvscr
@@ -34,7 +34,7 @@ aControlProperties := {
 	{'Button',	'Top',	NIL,	'Layout'},
 	{'Button',	'Width',	NIL,	'Layout'},
 	{'Button',	'Height',	NIL,	'Layout'},
-	{'Button',	'{Id)',	NIL,	'Other'},
+	{'Button',	'(Id)',	NIL,	'Other'},
 	{'ButtonBar',	'BackColor',	NIL,	'Appearance'},
 	{'ButtonBar',	'BorderStyle',	'SINGLE',	'Appearance'},
 	{'ButtonBar',	'Cursor',	NIL,	'Appearance'},

diff --git a/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.clientscript b/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.clientscript
@@ -1,8 +1,8 @@
-/********************************************************************************
+/*
 Description.. :	Save form as XML in database
 Author....... :	DC
 Date......... : 2023-11-16
-*******************************************************************************/
+*/
 
 // generate XML from form and save it to database
 async function SaveForm(sApplicationName, sFormName, sFormLang)
@@ -55,10 +55,8 @@ async function GetXMLProperties(control, sIndentation = "")
         control.Guid = System.Guid.NewGuid().ToString();
 
     sXML += sIndentation + "<Guid>" + control.Guid + "</Guid>\n";
-
-    if(control.Id)
-        sXML += sIndentation + "<Id>" + control.Id + "</Id>\n";
-
+
+
     // loop over control's properties
     for (let row of aProperties)
     {
@@ -75,6 +73,13 @@ async function GetXMLProperties(control, sIndentation = "")
         if (value === undefined || value === null || value === "" || value === "default")
             continue;
 
+        // skip id in brackets
+        if(sPropertyName === "(Id)")
+        {
+            control.itemId = value;
+            continue;
+        }
+
         if (control.xType === "TabPage" || control.xType === "Form")
         {
             if (sPropertyName === "Top")
@@ -98,6 +103,10 @@ async function GetXMLProperties(control, sIndentation = "")
 
         sXML += sIndentation + "<" + sPropertyName + ">" + value + "</" + sPropertyName + ">\n";
     }
+
+    // add control id
+    sXML += sIndentation + "<Id>" + control.Id + "</Id>\n";
+
     return sXML;
 }