Merge pull request mariuspopovici#146 from mariuspopovici/dev

Merge mariuspopovici#145
MrDoe · Feb 1, 2024 · 515d713 · 515d713
2 parents 1b476a8 + bc43e9b
commit 515d713
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
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.81",
+  "version": "1.2.82",
   "icon": "resources/extension/starlimsvscode.png",
   "publisher": "MariusPopovici",
   "author": {

diff --git a/src/backend/SCM_API.sdp b/src/backend/SCM_API.sdp
diff --git a/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/SaveXML.clientscript b/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/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.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;
 }
 

diff --git a/src/backend/SCM_API/Applications/SCM/FormDesigner/Forms/HTML/FormDesigner.codeBehind b/src/backend/SCM_API/Applications/SCM/FormDesigner/Forms/HTML/FormDesigner.codeBehind
@@ -5,11 +5,11 @@ Description.. :	HTML Forms Designer
 Author....... :	DC
 Date......... : 2623-07-11
 */
-#include "FormDesigner.ContextMenu"
-#include "FormDesigner.GUIFunctions"
-#include "FormDesigner.TreeView"
-#include "FormDesigner.ReadXML"
-#include "FormDesigner.SaveXML"
+//#include "FormDesigner.ContextMenu"
+//#include "FormDesigner.GUIFunctions"
+//#include "FormDesigner.TreeView"
+//#include "FormDesigner.ReadXML"
+//#include "FormDesigner.SaveXML"
 
 //BEGIN_GLOBAL_DECLARATIONS (place global declarations inside this section)
 
@@ -56,6 +56,9 @@ async function dgdProperties_OnUpdatingCell(sender, eventArgs)
 
     switch (sPropertyName)
     {
+        case "(Id)":
+            selectedControl.itemId = value;
+            return;
         case "Visible":
             // change opacity
             if (value === "True")

diff --git a/src/backend/SCM_API/Server Scripts/SCM_API/Version.srvscr b/src/backend/SCM_API/Server Scripts/SCM_API/Version.srvscr
@@ -5,7 +5,7 @@ Author....... :	MARIUS
 Date......... : 2023-07-31
 ********************************************************************************/;
 :DECLARE sVersion;
-sVersion := "1.2.80";
+sVersion := "1.2.81";
 
 :DECLARE oResponse;
 oResponse := CreateUDObject({