diff --git a/package.json b/package.json
index 05dbb12..8907b8f 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.86",
+ "version": "1.2.87",
"icon": "resources/extension/starlimsvscode.png",
"publisher": "MariusPopovici",
"author": {
@@ -425,12 +425,12 @@
},
{
"command": "STARLIMS.Rename",
- "when": "view == STARLIMSMainTree && viewItem != SERVERLOG && viewItem != CATEGORY && viewItem != TABLE && viewItem != ENT_TABLES_DATABASE && viewItem != ENT_TABLES_DICTIONARY",
+ "when": "(view == STARLIMSMainTree || view == STARLIMSCheckedOutTree) && viewItem != SERVERLOG && viewItem != CATEGORY && viewItem != TABLE && viewItem != ENT_TABLES_DATABASE && viewItem != ENT_TABLES_DICTIONARY",
"group": "addRemove"
},
{
"command": "STARLIMS.Move",
- "when": "view == STARLIMSMainTree && viewItem != SERVERLOG && viewItem != CATEGORY && viewItem != TABLE && viewItem != ENT_TABLES_DATABASE && viewItem != ENT_TABLES_DICTIONARY && !(viewItem =~ /cat/i)",
+ "when": "(view == STARLIMSMainTree || view == STARLIMSCheckedOutTree) && viewItem != SERVERLOG && viewItem != CATEGORY && viewItem != TABLE && viewItem != ENT_TABLES_DATABASE && viewItem != ENT_TABLES_DICTIONARY && !(viewItem =~ /cat/i)",
"group": "addRemove"
}
],
diff --git a/src/backend/SCM_API.sdp b/src/backend/SCM_API.sdp
index 4831dac..b15fcb3 100644
Binary files a/src/backend/SCM_API.sdp and b/src/backend/SCM_API.sdp differ
diff --git a/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/GUIFunctions.clientscript b/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/GUIFunctions.clientscript
index 728dc9e..c5e51b0 100644
--- a/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/GUIFunctions.clientscript
+++ b/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/GUIFunctions.clientscript
@@ -108,6 +108,7 @@ async function AddControl(controlType)
control.Width = 100;
control.Height = 26;
control.xType = "DateTimePicker";
+ control.Value = new Date();
break;
case "Frame":
control = new Frame();
@@ -296,7 +297,7 @@ async function AddControl(controlType)
control.Id = id;
}
- if(control.xType != "TabControl")
+ if(control.xType != "TabControl" && control.xType != "DateTimePicker")
control.Text = control.Id;
control.Top = 20;
diff --git a/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/GUIFunctions.comments b/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/GUIFunctions.comments
index 57e9bd7..5075e2c 100644
--- a/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/GUIFunctions.comments
+++ b/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/GUIFunctions.comments
@@ -1 +1 @@
-update limsSOURCECONTROL set REASONFORCHECKOUT = '' where versionID = ?
\ No newline at end of file
+update limsSOURCECONTROL set REASONFORCHECKOUT = 'Checked in from VSCode' where versionID = ?
\ No newline at end of file
diff --git a/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/GUIFunctions.ver b/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/GUIFunctions.ver
index f921948..3b34339 100644
--- a/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/GUIFunctions.ver
+++ b/src/backend/SCM_API/Applications/SCM/FormDesigner/Client Scripts/GUIFunctions.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 = ?
\ No newline at end of file
+update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 7, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
\ No newline at end of file
diff --git a/src/backend/SCM_API/Applications/SCM/FormDesigner/Forms/HTML/FormDesigner.ENG.xfd b/src/backend/SCM_API/Applications/SCM/FormDesigner/Forms/HTML/FormDesigner.ENG.xfd
index 107883a..fdaabd3 100644
--- a/src/backend/SCM_API/Applications/SCM/FormDesigner/Forms/HTML/FormDesigner.ENG.xfd
+++ b/src/backend/SCM_API/Applications/SCM/FormDesigner/Forms/HTML/FormDesigner.ENG.xfd
@@ -766,4 +766,4 @@
false
frmFormDesigner_OnCmdKeyPress
false
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/backend/SCM_API/Applications/SCM/FormDesigner/Forms/HTML/dlgAnchor.ENG.xfd b/src/backend/SCM_API/Applications/SCM/FormDesigner/Forms/HTML/dlgAnchor.ENG.xfd
index 2f0a63f..6320d6a 100644
--- a/src/backend/SCM_API/Applications/SCM/FormDesigner/Forms/HTML/dlgAnchor.ENG.xfd
+++ b/src/backend/SCM_API/Applications/SCM/FormDesigner/Forms/HTML/dlgAnchor.ENG.xfd
@@ -142,4 +142,4 @@
Form1_OnShow
false
false
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/backend/SCM_API/Client Scripts/FormDesigner/GUIFunctions.clientscript b/src/backend/SCM_API/Client Scripts/FormDesigner/GUIFunctions.clientscript
index 728dc9e..c5e51b0 100644
--- a/src/backend/SCM_API/Client Scripts/FormDesigner/GUIFunctions.clientscript
+++ b/src/backend/SCM_API/Client Scripts/FormDesigner/GUIFunctions.clientscript
@@ -108,6 +108,7 @@ async function AddControl(controlType)
control.Width = 100;
control.Height = 26;
control.xType = "DateTimePicker";
+ control.Value = new Date();
break;
case "Frame":
control = new Frame();
@@ -296,7 +297,7 @@ async function AddControl(controlType)
control.Id = id;
}
- if(control.xType != "TabControl")
+ if(control.xType != "TabControl" && control.xType != "DateTimePicker")
control.Text = control.Id;
control.Top = 20;
diff --git a/src/backend/SCM_API/Client Scripts/FormDesigner/GUIFunctions.comments b/src/backend/SCM_API/Client Scripts/FormDesigner/GUIFunctions.comments
index 57e9bd7..5075e2c 100644
--- a/src/backend/SCM_API/Client Scripts/FormDesigner/GUIFunctions.comments
+++ b/src/backend/SCM_API/Client Scripts/FormDesigner/GUIFunctions.comments
@@ -1 +1 @@
-update limsSOURCECONTROL set REASONFORCHECKOUT = '' where versionID = ?
\ No newline at end of file
+update limsSOURCECONTROL set REASONFORCHECKOUT = 'Checked in from VSCode' where versionID = ?
\ No newline at end of file
diff --git a/src/backend/SCM_API/Client Scripts/FormDesigner/GUIFunctions.ver b/src/backend/SCM_API/Client Scripts/FormDesigner/GUIFunctions.ver
index f921948..3b34339 100644
--- a/src/backend/SCM_API/Client Scripts/FormDesigner/GUIFunctions.ver
+++ b/src/backend/SCM_API/Client Scripts/FormDesigner/GUIFunctions.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 = ?
\ No newline at end of file
+update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 7, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
\ No newline at end of file
diff --git a/src/backend/SCM_API/Client Scripts/FormDesigner/ReadXML.ver b/src/backend/SCM_API/Client Scripts/FormDesigner/ReadXML.ver
index 3b34339..f921948 100644
--- 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 = 7, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
\ No newline at end of file
+update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 6, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
\ No newline at end of file
diff --git a/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.clientscript b/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.clientscript
index 1248d09..71d70b9 100644
--- a/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.clientscript
+++ b/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.clientscript
@@ -194,7 +194,7 @@ async function GetXMLControl(node, sIndentation = "")
sXML += sIndentation + "\t\t\n";
}
sXML += sIndentation + "\t\n";
- sXML += sIndentation + "\t<__array__ChildTables/>\n";
+ sXML += sIndentation + "\t<__array__ChildTables />\n";
sXML += sIndentation + "\n";
}
diff --git a/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.ver b/src/backend/SCM_API/Client Scripts/FormDesigner/SaveXML.ver
index 3b34339..fc1e4e0 100644
--- 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 = 7, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
\ No newline at end of file
+update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 5, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
\ No newline at end of file
diff --git a/src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.comments b/src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.comments
index 0a48a93..5075e2c 100644
--- a/src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.comments
+++ b/src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.comments
@@ -1 +1 @@
-update limsSOURCECONTROL set REASONFORCHECKOUT = '(DC - 18.01.2024 15:19:55) - Checked in without any comments.' where versionID = ?
\ No newline at end of file
+update limsSOURCECONTROL set REASONFORCHECKOUT = 'Checked in from VSCode' where versionID = ?
\ No newline at end of file
diff --git a/src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.srvscr b/src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.srvscr
index 032f870..b5c2f41 100644
--- a/src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.srvscr
+++ b/src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.srvscr
@@ -40,7 +40,7 @@ sType := oEnterpriseItem:Type;
sAppName := oEnterpriseItem:AppName;
:ENDIF;
-usrmes("sItemID", sItemID);
+/*usrmes("sItemID", sItemID);
:BEGINCASE;
:CASE sType == "SS";
diff --git a/src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.ver b/src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.ver
index c4e3d43..5272a47 100644
--- a/src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.ver
+++ b/src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.ver
@@ -1 +1 @@
-update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 12, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
\ No newline at end of file
+update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 13, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
\ No newline at end of file
diff --git a/src/backend/SCM_API/Server Scripts/SCM_API/GetEnterpriseItems.comments b/src/backend/SCM_API/Server Scripts/SCM_API/GetEnterpriseItems.comments
index 182d3b8..57e9bd7 100644
--- a/src/backend/SCM_API/Server Scripts/SCM_API/GetEnterpriseItems.comments
+++ b/src/backend/SCM_API/Server Scripts/SCM_API/GetEnterpriseItems.comments
@@ -1 +1 @@
-update limsSOURCECONTROL set REASONFORCHECKOUT = '(DC - 06.07.2023 16:29:20) - Checked in without any comments.' where versionID = ?
\ No newline at end of file
+update limsSOURCECONTROL set REASONFORCHECKOUT = '' where versionID = ?
\ No newline at end of file
diff --git a/src/backend/SCM_API/Server Scripts/SCM_API/GetEnterpriseItems.srvscr b/src/backend/SCM_API/Server Scripts/SCM_API/GetEnterpriseItems.srvscr
index f39d4b2..fa8d5c5 100644
--- a/src/backend/SCM_API/Server Scripts/SCM_API/GetEnterpriseItems.srvscr
+++ b/src/backend/SCM_API/Server Scripts/SCM_API/GetEnterpriseItems.srvscr
@@ -17,7 +17,7 @@ oUtils := CreateUDObject("SCM_API.Utils", {});
oEnterpriseItem := oUtils:ParseURI(sURI);
-:IF Empty(oEnterpriseItem:Type);
+:IF !oEnterpriseItem:IsProperty("Type") .OR. Empty(oEnterpriseItem:Type);
oResult := CreateUDObject({
{"success", .F.},
{"error", "Invalid Type"}
@@ -26,8 +26,6 @@ oEnterpriseItem := oUtils:ParseURI(sURI);
:RETURN oResult;
:ENDIF;
-/*usrmes("type:", oEnterpriseItem:Type);
-
aItems := {};
aEnterpriseCategories := {
diff --git a/src/backend/SCM_API/Server Scripts/SCM_API/GetEnterpriseItems.ver b/src/backend/SCM_API/Server Scripts/SCM_API/GetEnterpriseItems.ver
index 42c3b1e..b7a37ca 100644
--- a/src/backend/SCM_API/Server Scripts/SCM_API/GetEnterpriseItems.ver
+++ b/src/backend/SCM_API/Server Scripts/SCM_API/GetEnterpriseItems.ver
@@ -1 +1 @@
-update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 10, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
\ No newline at end of file
+update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 21, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
\ No newline at end of file
diff --git a/src/backend/SCM_API/Server Scripts/SCM_API/Version.srvscr b/src/backend/SCM_API/Server Scripts/SCM_API/Version.srvscr
index 3ffb40c..30bfd02 100644
--- 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.85";
+sVersion := "1.2.87";
:DECLARE oResponse;
oResponse := CreateUDObject({
diff --git a/src/backend/SCM_API/content.txt b/src/backend/SCM_API/content.txt
index 56f435c..dda8ab2 100644
--- a/src/backend/SCM_API/content.txt
+++ b/src/backend/SCM_API/content.txt
@@ -1,5 +1,5 @@
Package Name: SCM_API
-Package Date: 2024-01-22 16:11:17
+Package Date: 2024-05-16 14:48:44
Exported languages: English.
diff --git a/src/backend/SCM_API/manifest.xml b/src/backend/SCM_API/manifest.xml
index 59f1e24..e8d8ff6 100644
--- a/src/backend/SCM_API/manifest.xml
+++ b/src/backend/SCM_API/manifest.xml
@@ -1,10 +1,10 @@
- 9B1DD5E2-8C17-4321-84A8-303EC2FAACE2
+ 5DA2C1BC-6757-4F6E-869E-BB8B3CB2573E
SCM_API
false
merge
- 2024-01-22T16:11:17.2573553+01:00
+ 2024-05-16T14:48:44.6566746+02:00
@@ -240,7 +240,7 @@
Applications\SCM\FormDesigner\Client Scripts\ContextMenu.clientscript
false
overwrite
- JS
+ JSCRIPT
Y
false
@@ -253,7 +253,7 @@
Applications\SCM\FormDesigner\Client Scripts\GUIFunctions.clientscript
false
overwrite
- JS
+ JSCRIPT
Y
false
@@ -266,7 +266,7 @@
Applications\SCM\FormDesigner\Client Scripts\ReadXML.clientscript
false
overwrite
- JS
+ JSCRIPT
Y
false
@@ -279,7 +279,7 @@
Applications\SCM\FormDesigner\Client Scripts\SaveXML.clientscript
false
overwrite
- JS
+ JSCRIPT
Y
false
@@ -292,7 +292,7 @@
Applications\SCM\FormDesigner\Client Scripts\TreeView.clientscript
false
overwrite
- JS
+ JSCRIPT
Y
false
@@ -305,7 +305,7 @@
7C117241-417D-442D-80B6-BAD7797E8EF2
SCM_API
- 300
+ 200
false
merge
@@ -658,7 +658,7 @@
Client Scripts\FormDesigner\ContextMenu.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -671,7 +671,7 @@
Client Scripts\FormDesigner\GUIFunctions.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -684,7 +684,7 @@
Client Scripts\FormDesigner\ReadXML.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -697,7 +697,7 @@
Client Scripts\FormDesigner\SaveXML.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -710,7 +710,7 @@
Client Scripts\FormDesigner\TreeView.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -735,7 +735,7 @@
Client Scripts\FormDesigner\ContextMenu.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -748,7 +748,7 @@
Client Scripts\FormDesigner\GUIFunctions.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -761,7 +761,7 @@
Client Scripts\FormDesigner\ReadXML.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -774,7 +774,7 @@
Client Scripts\FormDesigner\SaveXML.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -787,7 +787,7 @@
Client Scripts\FormDesigner\TreeView.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -812,7 +812,7 @@
Client Scripts\FormDesigner\ContextMenu.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -825,7 +825,7 @@
Client Scripts\FormDesigner\GUIFunctions.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -838,7 +838,7 @@
Client Scripts\FormDesigner\ReadXML.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -851,7 +851,7 @@
Client Scripts\FormDesigner\SaveXML.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -864,7 +864,7 @@
Client Scripts\FormDesigner\TreeView.clientscript
false
overwrite
- JS
+ JSCRIPT
N
false
@@ -900,7 +900,7 @@
DICTIONARY
DICTIONARY
- 300
+ 200
Connection to DICTIONARY
false
merge
diff --git a/src/extension.ts b/src/extension.ts
index b235abe..e0f349c 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -1060,6 +1060,9 @@ export async function activate(context: vscode.ExtensionContext) {
}
);
language = oReturn.label;
+
+ // add item language to the selected item type
+ selectedItemType = `${selectedItemType}/${itemLanguage}`;
}
// check out the item
@@ -1582,6 +1585,7 @@ export async function activate(context: vscode.ExtensionContext) {
}
);
+ // move item
vscode.commands.registerCommand(
"STARLIMS.Move",
async () => {