From b5d40ab63e722c58c6434abfc9b366c5ce0fe66a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20D=C3=B6llinger?= Date: Fri, 2 Feb 2024 10:17:02 +0100 Subject: [PATCH 1/3] Fixed typo in button properties --- .../SCM/FormDesigner/Server Scripts/scInitFormProperties.srvscr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index f916eed..eee2ecc 100644 --- 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'}, From 47d78e66351411ea60423f513ffe3ff7836afddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20D=C3=B6llinger?= Date: Fri, 2 Feb 2024 16:17:53 +0100 Subject: [PATCH 2/3] fixed id handling --- src/backend/SCM_API.sdp | Bin 165327 -> 165362 bytes .../FormDesigner/SaveXML.clientscript | 21 +++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/backend/SCM_API.sdp b/src/backend/SCM_API.sdp index fbfc7e51ad88fc0efeb1c725dd40b4c03e7a2545..565caa000031d60c4fddc57d7528bed2b2825769 100644 GIT binary patch delta 10330 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 YKw?4XP(T3k7Ay+|sL=>v0AgGFKYG$*jsO4v delta 10454 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 B3A+FQ diff --git a/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.clientscript b/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.clientscript index c0ca09d..f45c581 100644 --- 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 + "" + control.Guid + "\n"; - - if(control.Id) - sXML += sIndentation + "" + control.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 + "\n"; } + + // add control id + sXML += sIndentation + "" + control.Id + "\n"; + return sXML; } From 3809fa51ba46d4cbda1880eb91372fcf506342f8 Mon Sep 17 00:00:00 2001 From: Marius Popovici Date: Sat, 3 Feb 2024 08:18:54 -0500 Subject: [PATCH 3/3] bump version and update change log --- CHANGELOG.md | 8 ++++++++ package.json | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ce3b8e..db7bc75 100644 --- 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 index e772ede..577bb2d 100644 --- 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"