Merge pull request mariuspopovici#154 from mariuspopovici/dev

Merge mariuspopovici#153
MrDoe · Apr 13, 2024 · 1e403c7 · 1e403c7
2 parents 3ff1296 + 943158c
commit 1e403c7
Show file tree

Hide file tree

Showing 12 changed files with 1,204 additions and 1,135 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.85",
+  "version": "1.2.86",
   "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/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)
 
@@ -30,6 +30,7 @@ var _dgdProperties = form.All("_dgdProperties"); // DataGrid
 // variables for GUIFunctions.js
 var controlCounter = 0;
 var selectedControl;
+var pnlSelected;
 var htControls = new Hashtable();
 
 async function lbrControls_OnItemClick(sender, eventArgs)

diff --git a/src/backend/SCM_API/Applications/SCM/FormDesigner/Forms/HTML/FormDesigner.ver b/src/backend/SCM_API/Applications/SCM/FormDesigner/Forms/HTML/FormDesigner.ver
@@ -1 +1 @@
-update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 19, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
+update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 20, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
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
diff --git a/src/backend/SCM_API/Applications/SCM/FormDesigner/Server Scripts/scInitFormProperties.ver b/src/backend/SCM_API/Applications/SCM/FormDesigner/Server Scripts/scInitFormProperties.ver
@@ -1 +1 @@
-update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 5, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
+update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 6, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
diff --git a/src/backend/SCM_API/Client Scripts/FormDesigner/ReadXML.clientscript b/src/backend/SCM_API/Client Scripts/FormDesigner/ReadXML.clientscript
@@ -108,8 +108,12 @@ async function CreateControlFromXML(xmlNode, xmlParentNode, control)
     // get control type
     var sType = nodeElement[0].textContent.replace("Starlims", "");
 
-    // get control id
-    var sGuid = xmlNode.getElementsByTagName("Guid")[0].textContent;
+    // get control's guid
+    var sGuid;
+    if(xmlNode && xmlNode.getElementsByTagName("Guid").length > 0)
+        sGuid = xmlNode.getElementsByTagName("Guid")[0].textContent;
+    else
+        sGuid = System.Guid.NewGuid().ToString();
 
     if (sType === "Form")
     {
@@ -348,11 +352,22 @@ async function GetNodeFromXML(xmlNode, xmlParentNode)
 // get property value from xml node
 function GetProperty(column, name)
 {
-    let element = column.getElementsByTagName(name);
-    if (element.length > 0 && element[0].textContent)
-        return element[0].textContent;
+    if(!column && !column.childNodes[0])
+        return;
+
+    var nodes;
+
+    // use childNode if only one child
+    if(column.childNodes.length === 1)
+        nodes = column.childNodes[0].childNodes;
     else
-        return null;
+        nodes = column.childNodes;
+
+    for (let property of nodes)
+    {
+        if (property.nodeName === name)
+            return property.textContent;
+    }
 }
 
 // load control properties

diff --git a/src/backend/SCM_API/Client Scripts/FormDesigner/ReadXML.ver b/src/backend/SCM_API/Client Scripts/FormDesigner/ReadXML.ver
@@ -1 +1 @@
-update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 6, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
+update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 7, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
diff --git a/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.clientscript b/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.clientscript
@@ -76,7 +76,7 @@ async function GetXMLProperties(control, sIndentation = "")
         // skip id in brackets
         if(sPropertyName === "(Id)")
         {
-            control.itemId = value;
+            control.Id = control.itemId = value;
             continue;
         }
 
@@ -194,7 +194,7 @@ async function GetXMLControl(node, sIndentation = "")
             sXML += sIndentation + "\t\t</item>\n";
         }
         sXML += sIndentation + "\t</__array__Columns>\n";
-        sXML += sIndentation + "\t<__array__ChildTables />\n";
+        sXML += sIndentation + "\t<__array__ChildTables/>\n";
         sXML += sIndentation + "</RootTable>\n";
     }
 

diff --git a/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.ver b/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.ver
@@ -1 +1 @@
-update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 5, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
+update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 7, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
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.83";
+sVersion := "1.2.85";
 
 :DECLARE oResponse;
 oResponse := CreateUDObject({

diff --git a/src/backend/scm_package.xml b/src/backend/scm_package.xml
@@ -225,7 +225,7 @@
               <ItemCategory>FormDesigner</ItemCategory>
               <IsMandatory>false</IsMandatory>
               <ItemBehaviour>overwrite</ItemBehaviour>
-              <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+              <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
               <ItemIsOwned>Y</ItemIsOwned>
               <IsReferred>false</IsReferred>
             </ClientScript>
@@ -237,7 +237,7 @@
               <ItemCategory>FormDesigner</ItemCategory>
               <IsMandatory>false</IsMandatory>
               <ItemBehaviour>overwrite</ItemBehaviour>
-              <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+              <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
               <ItemIsOwned>Y</ItemIsOwned>
               <IsReferred>false</IsReferred>
             </ClientScript>
@@ -249,7 +249,7 @@
               <ItemCategory>FormDesigner</ItemCategory>
               <IsMandatory>false</IsMandatory>
               <ItemBehaviour>overwrite</ItemBehaviour>
-              <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+              <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
               <ItemIsOwned>Y</ItemIsOwned>
               <IsReferred>false</IsReferred>
             </ClientScript>
@@ -261,7 +261,7 @@
               <ItemCategory>FormDesigner</ItemCategory>
               <IsMandatory>false</IsMandatory>
               <ItemBehaviour>overwrite</ItemBehaviour>
-              <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+              <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
               <ItemIsOwned>Y</ItemIsOwned>
               <IsReferred>false</IsReferred>
             </ClientScript>
@@ -273,7 +273,7 @@
               <ItemCategory>FormDesigner</ItemCategory>
               <IsMandatory>false</IsMandatory>
               <ItemBehaviour>overwrite</ItemBehaviour>
-              <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+              <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
               <ItemIsOwned>Y</ItemIsOwned>
               <IsReferred>false</IsReferred>
             </ClientScript>
@@ -614,7 +614,7 @@
           <ItemContent>Client Scripts\FormDesigner\ContextMenu.clientscript</ItemContent>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -627,7 +627,7 @@
           <ItemContent>Client Scripts\FormDesigner\GUIFunctions.clientscript</ItemContent>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -640,7 +640,7 @@
           <ItemContent>Client Scripts\FormDesigner\ReadXML.clientscript</ItemContent>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -653,7 +653,7 @@
           <ItemContent>Client Scripts\FormDesigner\SaveXML.clientscript</ItemContent>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -666,7 +666,7 @@
           <ItemContent>Client Scripts\FormDesigner\TreeView.clientscript</ItemContent>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -690,7 +690,7 @@
           <ItemCategory>FormDesigner</ItemCategory>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -702,7 +702,7 @@
           <ItemCategory>FormDesigner</ItemCategory>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -714,7 +714,7 @@
           <ItemCategory>FormDesigner</ItemCategory>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -726,7 +726,7 @@
           <ItemCategory>FormDesigner</ItemCategory>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -738,7 +738,7 @@
           <ItemCategory>FormDesigner</ItemCategory>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -762,7 +762,7 @@
           <ItemCategory>FormDesigner</ItemCategory>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -774,7 +774,7 @@
           <ItemCategory>FormDesigner</ItemCategory>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -786,7 +786,7 @@
           <ItemCategory>FormDesigner</ItemCategory>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -798,7 +798,7 @@
           <ItemCategory>FormDesigner</ItemCategory>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
@@ -810,7 +810,7 @@
           <ItemCategory>FormDesigner</ItemCategory>
           <IsMandatory>false</IsMandatory>
           <ItemBehaviour>overwrite</ItemBehaviour>
-          <ItemProgrammingLanguage>JS        </ItemProgrammingLanguage>
+          <ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
           <ItemIsOwned>N</ItemIsOwned>
           <IsReferred>false</IsReferred>
         </ClientScript>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 19, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
		update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 20, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?