Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DEV: Test model adjustments #1651

Merged
merged 3 commits into from Jun 13, 2023
Merged

DEV: Test model adjustments #1651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df1b9c1
NEW: add screen for master data - taginput source and then create a s…
Jun 13, 2023
22c32c0
Add forgotten files
Jun 13, 2023
cfd374c
Remove OrigamSettings.config
Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions model-tests/model/AutomaticTests/.origamPackage
View file
Open in desktop
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<x:file xmlns:x="http://schemas.origam.com/model-persistence/1.0.0" xmlns:p="http://schemas.origam.com/Origam.Schema.Package/6.1.0" xmlns:pr="http://schemas.origam.com/Origam.Schema.PackageReference/6.0.0">
<x:file
xmlns:x="http://schemas.origam.com/model-persistence/1.0.0"
xmlns:p="http://schemas.origam.com/Origam.Schema.Package/6.1.0"
xmlns:pr="http://schemas.origam.com/Origam.Schema.PackageReference/6.0.0">
<p:package
x:id="c130ecd2-3b61-48fe-bac0-b721f86b0a0f"
x:isFolder="true"
p:name="AutomaticTests"
p:version="1.0.0">
<pr:packageReference
x:id="db733777-7509-40bd-a910-a2cfc2219857"
pr:referencedPackage="Root/.origamPackage#147fa70d-6519-4393-b5d0-87931f9fd609" />
p:version="1.0.1">
<pr:packageReference
x:id="db67be0a-ccca-4869-a2ea-426d7669c73e"
pr:referencedPackage="Widgets/.origamPackage#f17329d6-3143-420a-a2e6-30e431eea51d" />
<pr:packageReference
x:id="db733777-7509-40bd-a910-a2cfc2219857"
pr:referencedPackage="Root/.origamPackage#147fa70d-6519-4393-b5d0-87931f9fd609" />
</p:package>
</x:file>
23 changes: 23 additions & 0 deletions model-tests/model/AutomaticTests/DeploymentVersion/AutomaticTests/1.0.1.origam
View file
Open in desktop
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<x:file
xmlns:x="http://schemas.origam.com/model-persistence/1.0.0"
xmlns:asi="http://schemas.origam.com/Origam.Schema.AbstractSchemaItem/6.0.0"
xmlns:ausa="http://schemas.origam.com/Origam.Schema.DeploymentModel.AbstractUpdateScriptActivity/6.0.0"
xmlns:dv="http://schemas.origam.com/Origam.Schema.DeploymentModel.DeploymentVersion/6.0.0"
xmlns:scusa="http://schemas.origam.com/Origam.Schema.DeploymentModel.ServiceCommandUpdateScriptActivity/6.0.0">
<dv:DeploymentVersion
asi:abstract="false"
dv:deploymentDependenciesCsv="&#xD;&#xA;147fa70d-6519-4393-b5d0-87931f9fd609, 5.2&#xD;&#xA;951f2cda-2867-4b99-8824-071fa8749ead, 5.4&#xD;&#xA;b9ab12fe-7f7d-43f7-bedc-93747647d6e4, 1.2.3&#xD;&#xA;bb8c67fb-44c1-4b41-8fce-4d50cd5a759d, 1.0.0&#xD;&#xA;255eec22-89c5-479a-b48d-e7bc9baa564a, 1.0.0&#xD;&#xA;f17329d6-3143-420a-a2e6-30e431eea51d, 1.5.4"
x:id="06fc98d9-8c36-4693-9b10-46ea243952dc"
asi:name="1.0.1"
dv:version="1.0.1">
<scusa:DeploymentUpdateScriptActivity
asi:abstract="false"
ausa:activityOrder="60"
scusa:commandText="-***-ExternalFile:1.0.1.origam___commandText___7075d987-d6b8-4dd7-b3e3-3f14ff3f5434.txt"
x:id="7075d987-d6b8-4dd7-b3e3-3f14ff3f5434"
asi:name="00060_Create_SP_replicateWideDropdownHorizontalScrollError"
scusa:platform="MsSql"
scusa:service="Root/Service/DataService.origam#DataService/bbd7bd32-d40b-441a-bb5b-0b0fa89169d4" />
</dv:DeploymentVersion>
</x:file>
11 changes: 11 additions & 0 deletions ...sion/AutomaticTests/1.0.1.origam___commandText___7075d987-d6b8-4dd7-b3e3-3f14ff3f5434.txt
View file
Open in desktop
@@ -0,0 +1,11 @@

CREATE PROCEDURE [dbo].[replicateWideDropdownHorizontalScrollError]
AS
DELETE FROM [dbo].[TagInputBinding]
DELETE FROM [dbo].[WidgetDropdownTest]
DELETE FROM [dbo].[AllDataTypes]
DELETE FROM [dbo].[TagInputSource]
INSERT [dbo].[TagInputSource] ([Label], [RecordCreatedBy], [RecordUpdatedBy], [Id], [RecordCreated], [RecordUpdated], [Number]) VALUES (N'Label 1', N'639fd781-4111-4c8f-97ec-85b3385895ff', NULL, N'72970893-5788-4c78-b0f8-afb8b2e76a82', CAST(N'2023-06-13T16:13:21.647' AS DateTime), NULL, 1)
INSERT [dbo].[TagInputSource] ([Label], [RecordCreatedBy], [RecordUpdatedBy], [Id], [RecordCreated], [RecordUpdated], [Number]) VALUES (N'Label 2 a very long label with a very descriptive text that could impress a lot of people', N'639fd781-4111-4c8f-97ec-85b3385895ff', NULL, N'e1bb068a-79c5-43c9-8cc2-ae239345ff5c', CAST(N'2023-06-13T16:13:42.590' AS DateTime), NULL, 2)
INSERT [dbo].[TagInputSource] ([Label], [RecordCreatedBy], [RecordUpdatedBy], [Id], [RecordCreated], [RecordUpdated], [Number]) VALUES (N'yet another label', N'639fd781-4111-4c8f-97ec-85b3385895ff', NULL, N'8b07c731-78dd-4076-b768-89f29b08dbad', CAST(N'2023-06-13T16:14:13.823' AS DateTime), NULL, 3)
INSERT [dbo].[AllDataTypes] ([Text1], [Date1], [Integer1], [Currency1], [Boolean1], [Long1], [RecordCreatedBy], [RecordUpdatedBy], [Id], [RecordCreated], [RecordUpdated], [Text2], [refTagInputSourceId]) VALUES (N'very long text 1 - a very long name of a machine', CAST(N'2023-06-13T00:00:00.000' AS DateTime), 100, 12.2500, 1, 12343, N'639fd781-4111-4c8f-97ec-85b3385895ff', N'639fd781-4111-4c8f-97ec-85b3385895ff', N'7725d1e5-5823-439b-9456-9d711f9f79ed', CAST(N'2023-06-13T16:04:28.063' AS DateTime), CAST(N'2023-06-13T16:15:11.843' AS DateTime), N'A very long description of a machine abc cba bca', N'e1bb068a-79c5-43c9-8cc2-ae239345ff5c')
21 changes: 21 additions & 0 deletions model-tests/model/Widgets/Control/TagInputSource.origam
View file
Open in desktop
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<x:file
xmlns:x="http://schemas.origam.com/model-persistence/1.0.0"
xmlns:asi="http://schemas.origam.com/Origam.Schema.AbstractSchemaItem/6.0.0"
xmlns:ci="http://schemas.origam.com/Origam.Schema.GuiModel.ControlItem/6.0.0"
xmlns:sia="http://schemas.origam.com/Origam.Schema.SchemaItemAncestor/6.0.0">
<ci:Control
asi:abstract="false"
x:id="fb4bd20a-b079-4570-87e2-b5fbc0dc1ebd"
ci:isComplex="true"
asi:name="TagInputSource"
ci:namespace="Origam.Schema.GuiModel"
ci:requestSaveAfterChangeAllowed="false"
ci:screenSection="Widgets/PanelControlSet/Widgets/TagInputSource.origam#TagInputSource/5c72bad4-b080-49aa-82f3-337362dc282c"
ci:toolboxVisibility="FormDesigner"
ci:typeName="Origam.Schema.GuiModel.PanelControlSet">
<sia:ancestor
sia:ancestor="Root/Control/_Basic Controls/AsPanel.origam#AsPanel/47a20d1a-ae4b-482c-949f-a81bee8ea28d"
x:id="547a2c93-c1fe-4ee1-919d-251a8101e2a6" />
</ci:Control>
</x:file>
25 changes: 25 additions & 0 deletions model-tests/model/Widgets/DataStructure/Widgets/TagInputSource.origam
View file
Open in desktop
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<x:file
xmlns:x="http://schemas.origam.com/model-persistence/1.0.0"
xmlns:ads="http://schemas.origam.com/Origam.Schema.EntityModel.AbstractDataStructure/6.0.0"
xmlns:asi="http://schemas.origam.com/Origam.Schema.AbstractSchemaItem/6.0.0"
xmlns:ds1="http://schemas.origam.com/Origam.Schema.EntityModel.DataStructure/6.0.0"
xmlns:dse="http://schemas.origam.com/Origam.Schema.EntityModel.DataStructureEntity/6.0.0">
<ds1:DataStructure
asi:abstract="false"
x:id="8fbfcb2c-eb8a-4932-ac5a-9a1a4d90df39"
ds1:localized="false"
asi:name="TagInputSource">
<dse:DataStructureEntity
asi:abstract="false"
dse:allFields="true"
dse:concurrencyHandling="Standard"
dse:entity="Widgets/DataEntity/Widgets/TagInputSource.origam#TagInputSource/c28f9bbe-76a1-4149-8141-680e7653086f"
x:id="10eb49c9-30bb-4341-9807-8697da7ef41e"
dse:ignoreCondition="None"
dse:ignoreImplicitFilters="false"
asi:name="TagInputSource"
dse:relationType="Normal"
dse:useUpsert="false" />
</ds1:DataStructure>
</x:file>