Skip to content

Commit

Permalink
Merge pull request mariuspopovici#155 from MrDoe/master
Browse files Browse the repository at this point in the history
Minor improvements
  • Loading branch information
mariuspopovici authored May 24, 2024
2 parents 1e403c7 + bf6f54e commit 1a3afe7
Show file tree
Hide file tree
Showing 23 changed files with 52 additions and 48 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
}
],
Expand Down
Binary file modified src/backend/SCM_API.sdp
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
update limsSOURCECONTROL set REASONFORCHECKOUT = '' where versionID = ?
update limsSOURCECONTROL set REASONFORCHECKOUT = 'Checked in from VSCode' where versionID = ?
Original file line number Diff line number Diff line change
@@ -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 = ?
Original file line number Diff line number Diff line change
Expand Up @@ -766,4 +766,4 @@
<CloseOnEscape>false</CloseOnEscape>
<OnCmdKeyPress>frmFormDesigner_OnCmdKeyPress</OnCmdKeyPress>
<ValidateOnClose>false</ValidateOnClose>
</Form>
<ModeSet></ModeSet><BaseMode></BaseMode></Form>
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,4 @@
<OnShow>Form1_OnShow</OnShow>
<CloseOnEscape>false</CloseOnEscape>
<ValidateOnClose>false</ValidateOnClose>
</Form>
<ModeSet></ModeSet><BaseMode></BaseMode></Form>
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
update limsSOURCECONTROL set REASONFORCHECKOUT = '' where versionID = ?
update limsSOURCECONTROL set REASONFORCHECKOUT = 'Checked in from VSCode' where versionID = ?
Original file line number Diff line number Diff line change
@@ -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 = ?
Original file line number Diff line number Diff line change
@@ -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 = ?
update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 6, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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 = ?
update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 5, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
Original file line number Diff line number Diff line change
@@ -1 +1 @@
update limsSOURCECONTROL set REASONFORCHECKOUT = '(DC - 18.01.2024 15:19:55) - Checked in without any comments.' where versionID = ?
update limsSOURCECONTROL set REASONFORCHECKOUT = 'Checked in from VSCode' where versionID = ?
2 changes: 1 addition & 1 deletion src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.srvscr
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ sType := oEnterpriseItem:Type;
sAppName := oEnterpriseItem:AppName;
:ENDIF;

usrmes("sItemID", sItemID);
/*usrmes("sItemID", sItemID);

:BEGINCASE;
:CASE sType == "SS";
Expand Down
2 changes: 1 addition & 1 deletion src/backend/SCM_API/Server Scripts/SCM_API/CheckOut.ver
Original file line number Diff line number Diff line change
@@ -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 = ?
update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 13, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
Original file line number Diff line number Diff line change
@@ -1 +1 @@
update limsSOURCECONTROL set REASONFORCHECKOUT = '(DC - 06.07.2023 16:29:20) - Checked in without any comments.' where versionID = ?
update limsSOURCECONTROL set REASONFORCHECKOUT = '' where versionID = ?
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand All @@ -26,8 +26,6 @@ oEnterpriseItem := oUtils:ParseURI(sURI);
:RETURN oResult;
:ENDIF;

/*usrmes("type:", oEnterpriseItem:Type);

aItems := {};

aEnterpriseCategories := {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 = ?
update limsVERSIONS set MAJOR = 0, MINOR = 0, BUILD = 21, DMAJOR = 0, DMINOR = 0, DBUILD = 0, CMAJOR = 0, CMINOR = 0, CBUILD = 0 where versionID = ?
2 changes: 1 addition & 1 deletion src/backend/SCM_API/Server Scripts/SCM_API/Version.srvscr
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Author....... : MARIUS
Date......... : 2023-07-31
********************************************************************************/;
:DECLARE sVersion;
sVersion := "1.2.85";
sVersion := "1.2.87";

:DECLARE oResponse;
oResponse := CreateUDObject({
Expand Down
2 changes: 1 addition & 1 deletion src/backend/SCM_API/content.txt
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
48 changes: 24 additions & 24 deletions src/backend/SCM_API/manifest.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<ItemID>9B1DD5E2-8C17-4321-84A8-303EC2FAACE2</ItemID>
<ItemID>5DA2C1BC-6757-4F6E-869E-BB8B3CB2573E</ItemID>
<ItemName>SCM_API</ItemName>
<IsMandatory>false</IsMandatory>
<ItemBehaviour>merge</ItemBehaviour>
<PackageDate>2024-01-22T16:11:17.2573553+01:00</PackageDate>
<PackageDate>2024-05-16T14:48:44.6566746+02:00</PackageDate>
<PathReadMe />
<PathEULA />
<PathLogo />
Expand Down Expand Up @@ -240,7 +240,7 @@
<ItemContent>Applications\SCM\FormDesigner\Client Scripts\ContextMenu.clientscript</ItemContent>
<IsMandatory>false</IsMandatory>
<ItemBehaviour>overwrite</ItemBehaviour>
<ItemProgrammingLanguage>JS </ItemProgrammingLanguage>
<ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
<ItemIsOwned>Y</ItemIsOwned>
<IsReferred>false</IsReferred>
</ClientScript>
Expand All @@ -253,7 +253,7 @@
<ItemContent>Applications\SCM\FormDesigner\Client Scripts\GUIFunctions.clientscript</ItemContent>
<IsMandatory>false</IsMandatory>
<ItemBehaviour>overwrite</ItemBehaviour>
<ItemProgrammingLanguage>JS </ItemProgrammingLanguage>
<ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
<ItemIsOwned>Y</ItemIsOwned>
<IsReferred>false</IsReferred>
</ClientScript>
Expand All @@ -266,7 +266,7 @@
<ItemContent>Applications\SCM\FormDesigner\Client Scripts\ReadXML.clientscript</ItemContent>
<IsMandatory>false</IsMandatory>
<ItemBehaviour>overwrite</ItemBehaviour>
<ItemProgrammingLanguage>JS </ItemProgrammingLanguage>
<ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
<ItemIsOwned>Y</ItemIsOwned>
<IsReferred>false</IsReferred>
</ClientScript>
Expand All @@ -279,7 +279,7 @@
<ItemContent>Applications\SCM\FormDesigner\Client Scripts\SaveXML.clientscript</ItemContent>
<IsMandatory>false</IsMandatory>
<ItemBehaviour>overwrite</ItemBehaviour>
<ItemProgrammingLanguage>JS </ItemProgrammingLanguage>
<ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
<ItemIsOwned>Y</ItemIsOwned>
<IsReferred>false</IsReferred>
</ClientScript>
Expand All @@ -292,7 +292,7 @@
<ItemContent>Applications\SCM\FormDesigner\Client Scripts\TreeView.clientscript</ItemContent>
<IsMandatory>false</IsMandatory>
<ItemBehaviour>overwrite</ItemBehaviour>
<ItemProgrammingLanguage>JS </ItemProgrammingLanguage>
<ItemProgrammingLanguage>JSCRIPT</ItemProgrammingLanguage>
<ItemIsOwned>Y</ItemIsOwned>
<IsReferred>false</IsReferred>
</ClientScript>
Expand All @@ -305,7 +305,7 @@
<ServerScriptCategory>
<ItemID>7C117241-417D-442D-80B6-BAD7797E8EF2</ItemID>
<ItemName>SCM_API</ItemName>
<LayerId>300</LayerId>
<LayerId>200</LayerId>
<ItemDescription />
<IsMandatory>false</IsMandatory>
<ItemBehaviour>merge</ItemBehaviour>
Expand Down Expand Up @@ -658,7 +658,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>
Expand All @@ -671,7 +671,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>
Expand All @@ -684,7 +684,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>
Expand All @@ -697,7 +697,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>
Expand All @@ -710,7 +710,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>
Expand All @@ -735,7 +735,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>
Expand All @@ -748,7 +748,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>
Expand All @@ -761,7 +761,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>
Expand All @@ -774,7 +774,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>
Expand All @@ -787,7 +787,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>
Expand All @@ -812,7 +812,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>
Expand All @@ -825,7 +825,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>
Expand All @@ -838,7 +838,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>
Expand All @@ -851,7 +851,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>
Expand All @@ -864,7 +864,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>
Expand Down Expand Up @@ -900,7 +900,7 @@
<TableCategory>
<ItemID>DICTIONARY</ItemID>
<ItemName>DICTIONARY</ItemName>
<LayerId>300</LayerId>
<LayerId>200</LayerId>
<ItemDescription>Connection to DICTIONARY</ItemDescription>
<IsMandatory>false</IsMandatory>
<ItemBehaviour>merge</ItemBehaviour>
Expand Down
Loading

0 comments on commit 1a3afe7

Please sign in to comment.