diff --git a/mocha-common/data/libraries/yaml/com.auralux.core/001-Fixture.yaml b/mocha-common/data/libraries/yaml/com.auralux.core/001-Fixture.yaml new file mode 100644 index 0000000..9a923fe --- /dev/null +++ b/mocha-common/data/libraries/yaml/com.auralux.core/001-Fixture.yaml @@ -0,0 +1,30 @@ +# Copyright (C) 2024 Michael Becker +# +# This file is part of Auralux. +# +# Auralux is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Auralux is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Auralux. If not, see . + +--- +- entityDefinitions: + - IDC_Fixture: '{0810c7aa-1317-40c2-b4be-0602bc12a145}' + +- library: '&IDL_AuraluxCore;' + instances: + - class: '&IDC_Fixture;' + name: Fixture + customTagName: fixture + index: 30001 + attributes: + - instance: '&IDA_Name;' + customTagName: 'name' diff --git a/mocha-common/data/libraries/yaml/com.auralux.core/002-Manufacturer.yaml b/mocha-common/data/libraries/yaml/com.auralux.core/002-Manufacturer.yaml new file mode 100644 index 0000000..06ee27c --- /dev/null +++ b/mocha-common/data/libraries/yaml/com.auralux.core/002-Manufacturer.yaml @@ -0,0 +1,36 @@ +# Copyright (C) 2024 Michael Becker +# +# This file is part of Auralux. +# +# Auralux is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Auralux is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Auralux. If not, see . + + +--- +- entityDefinitions: + - IDC_FixtureManufacturer: '{5d148a9e-43bf-4049-af64-9559e676736f}' + + - IDI_Manufacturer_Chauvet: '{5c1cc69b-8e28-4068-bf56-0e1b6c0434e5}' + +- library: '&IDL_AuraluxCore;' + instances: + - class: '&IDC_FixtureManufacturer;' + name: Manufacturer + customTagName: fixtureManufacturer + index: 30002 + attributes: + - instance: '&IDA_Name;' + customTagName: 'name' + + - fixtureManufacturer: '&IDI_Manufacturer_Chauvet;' + name: 'Chauvet' \ No newline at end of file diff --git a/mocha-common/data/libraries/yaml/com.auralux.core/003-FixtureType.yaml b/mocha-common/data/libraries/yaml/com.auralux.core/003-FixtureType.yaml new file mode 100644 index 0000000..4106b19 --- /dev/null +++ b/mocha-common/data/libraries/yaml/com.auralux.core/003-FixtureType.yaml @@ -0,0 +1,58 @@ +# Copyright (C) 2024 Michael Becker +# +# This file is part of Auralux. +# +# Auralux is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Auralux is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Auralux. If not, see . + +--- +- entityDefinitions: + - IDC_FixtureType: '{b6a84f41-7069-426d-853a-5e345cea3ec8}' + + - IDR_Fixture_Type__has__Manufacturer: '{20a7429b-bd9a-4252-9f46-83026860f3b7}' + - IDR_Manufacturer__for__Fixture_Type: '{c34f0b80-2b96-45ae-a858-ea844a40b250}' + + - IDI_FixtureType_ChauvetIntimidatorSpot250: '{183a251a-d0a7-46fd-9ddc-ceb893481489}' + +- library: '&IDL_AuraluxCore;' + instances: + - class: '&IDC_FixtureType;' + name: Fixture Type + customTagName: fixtureType + index: 30003 + attributes: + - instance: '&IDA_Name;' + customTagName: 'name'` + relationships: + - instance: '&IDR_Fixture_Type__has__Manufacturer;' + customTagName: 'manufacturerId' + + - relationship: '&IDR_Fixture_Type__has__Manufacturer;' + # index: 9 + sourceClassId: '&IDC_FixtureType;' + type: 'has' + destinationClassId: '&IDC_Manufacturer;' + siblingRelationshipId: '&IDR_Manufacturer__for__Fixture_Type;' + singular: yes + + - relationship: '&IDR_Manufacturer__for__Fixture_Type;' + # index: 9 + sourceClassId: '&IDC_Manufacturer;' + type: 'for' + destinationClassId: '&IDC_FixtureType;' + siblingRelationshipId: '&IDR_Fixture_Type__has__Manufacturer;' + singular: no + + - fixtureType: '&IDI_FixtureType_ChauvetIntimidatorSpot250;' + name: 'Intimidator Spot 250' + manufacturerId: '&IDI_Manufacturer_Chauvet;' \ No newline at end of file diff --git a/mocha-common/data/libraries/yaml/com.auralux.core/Library.yaml b/mocha-common/data/libraries/yaml/com.auralux.core/Library.yaml new file mode 100644 index 0000000..e6ac721 --- /dev/null +++ b/mocha-common/data/libraries/yaml/com.auralux.core/Library.yaml @@ -0,0 +1,25 @@ +# Copyright (C) 2024 Michael Becker +# +# This file is part of Auralux. +# +# Auralux is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Auralux is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Auralux. If not, see . + +--- +- entityDefinitions: + - IDL_AuraluxCore: '{017890c7-2323-4dc9-b7e0-cb4f23e1424f}' + +- library: '&IDL_AuraluxCore;' + libraryReferences: + - name: net.alcetech.Mocha.System + globalIdentifier: '&IDL_MochaBaseSystem;' \ No newline at end of file diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/000-EntityDefinitions/003-Relationships.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/000-EntityDefinitions/003-Relationships.yaml index 4f0abf1..81a4d06 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/000-EntityDefinitions/003-Relationships.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/000-EntityDefinitions/003-Relationships.yaml @@ -255,6 +255,9 @@ - IDR_Element_Content__has__Instance: "{315b71ba-953d-45fc-87e5-4f0a268242a9}" - IDR_Instance__for__Element_Content: "{c3959f84-248d-4ede-a3f2-f262917c7b56}" + - IDR_Element__has__Layout: "{11070799-46bd-4201-ba09-6109c68e61ad}" + - IDR_Layout__for__Element: "{05ced0ff-1dc2-41bc-b460-4773da080fc0}" + - IDR_Element_Content__has__Layout: "{1ab74120-05ea-4aca-b6d3-c7e0133e0c4f}" - IDR_Layout__for__Element_Content: "{efdce6d8-c6aa-4019-a6e4-fff5db1224aa}" diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/003-Classes/00004-TextAttribute.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/003-Classes/00004-TextAttribute.yaml index f6a2a71..ba20671 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/003-Classes/00004-TextAttribute.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/003-Classes/00004-TextAttribute.yaml @@ -106,6 +106,7 @@ index: 51 - textAttribute: '&IDA_CSSValue;' + name: 'CSS Value' index: 57 - textAttribute: '&IDA_MethodBindingType;' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Debugging/000-EntityDefinitions/003-Relationships.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Debugging/000-EntityDefinitions/003-Relationships.yaml index 4f0abf1..81a4d06 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Debugging/000-EntityDefinitions/003-Relationships.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Debugging/000-EntityDefinitions/003-Relationships.yaml @@ -255,6 +255,9 @@ - IDR_Element_Content__has__Instance: "{315b71ba-953d-45fc-87e5-4f0a268242a9}" - IDR_Instance__for__Element_Content: "{c3959f84-248d-4ede-a3f2-f262917c7b56}" + - IDR_Element__has__Layout: "{11070799-46bd-4201-ba09-6109c68e61ad}" + - IDR_Layout__for__Element: "{05ced0ff-1dc2-41bc-b460-4773da080fc0}" + - IDR_Element_Content__has__Layout: "{1ab74120-05ea-4aca-b6d3-c7e0133e0c4f}" - IDR_Layout__for__Element_Content: "{efdce6d8-c6aa-4019-a6e4-fff5db1224aa}" diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml index 4f0abf1..81a4d06 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml @@ -255,6 +255,9 @@ - IDR_Element_Content__has__Instance: "{315b71ba-953d-45fc-87e5-4f0a268242a9}" - IDR_Instance__for__Element_Content: "{c3959f84-248d-4ede-a3f2-f262917c7b56}" + - IDR_Element__has__Layout: "{11070799-46bd-4201-ba09-6109c68e61ad}" + - IDR_Layout__for__Element: "{05ced0ff-1dc2-41bc-b460-4773da080fc0}" + - IDR_Element_Content__has__Layout: "{1ab74120-05ea-4aca-b6d3-c7e0133e0c4f}" - IDR_Layout__for__Element_Content: "{efdce6d8-c6aa-4019-a6e4-fff5db1224aa}" diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00006-Element.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00006-Element.yaml index d04da4e..ae456d9 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00006-Element.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00006-Element.yaml @@ -24,6 +24,8 @@ customTagNameCreatesInstanceOf: '&IDC_ControlTransactionMethod;' - instance: '&IDR_Element__processed_by__Process_Related_Updates_Method;' customTagName: 'processedByPRUMethod' + - instance: '&IDR_Element__has__Layout;' + customTagName: 'layout' - relationship: '&IDR_Process_Related_Updates_Method__processes__Element;' index: 97 diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00008-ControlTransactionMethod.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00008-ControlTransactionMethod.yaml index 762f7be..970fb94 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00008-ControlTransactionMethod.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00008-ControlTransactionMethod.yaml @@ -7,6 +7,9 @@ instancesLabeledByRAMB: '&IDMB_Method__get__Fully_Qualified_Name_CT;' customTagName: 'controlTransactionMethod' registerForTemplate: yes + attributes: + - instance: '&IDA_TargetURL;' + customTagName: 'destinationUrl' relationships: - instance: '&IDR_Control_Transaction_Method__uses__Build_Response_Method_Binding;' customTagName: 'buildsResponseWithBRMB' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00056-ElementContent.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00056-ElementContent.yaml index 2483ab4..937ae6a 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00056-ElementContent.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00056-ElementContent.yaml @@ -24,23 +24,38 @@ siblingRelationshipId: '&IDR_Element_Content__has__Instance;' singular: no + - relationship: '&IDR_Layout__for__Element;' + index: 2553 + sourceClassId: '&IDC_Layout;' + type: 'for' + destinationClassId: '&IDC_Element;' + siblingRelationshipId: '&IDR_Element__has__Layout;' + singular: no - - relationship: '&IDR_Element_Content__has__Layout;' - index: 105 - sourceClassId: '&IDC_ElementContent;' + - relationship: '&IDR_Element__has__Layout;' + index: 2554 + sourceClassId: '&IDC_Element;' type: 'has' destinationClassId: '&IDC_Layout;' - siblingRelationshipId: '&IDR_Layout__for__Element_Content;' + siblingRelationshipId: '&IDR_Layout__for__Element;' singular: no - relationship: '&IDR_Layout__for__Element_Content;' - index: 106 + index: 2555 sourceClassId: '&IDC_Layout;' type: 'for' destinationClassId: '&IDC_ElementContent;' siblingRelationshipId: '&IDR_Element_Content__has__Layout;' singular: no + - relationship: '&IDR_Element_Content__has__Layout;' + index: 2556 + sourceClassId: '&IDC_ElementContent;' + type: 'has' + destinationClassId: '&IDC_Layout;' + siblingRelationshipId: '&IDR_Layout__for__Element_Content;' + singular: no + - relationship: '&IDR_Element_Content__has__EC_Dynamic_Display_Option;' index: 259 sourceClassId: '&IDC_ElementContent;' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00068-UpdateBySystemRoutineMethod.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00068-UpdateBySystemRoutineMethod.yaml new file mode 100644 index 0000000..943526a --- /dev/null +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00068-UpdateBySystemRoutineMethod.yaml @@ -0,0 +1,50 @@ +--- +- entityDefinitions: + - IDR_Update_By_System_Routine_Method__uses__System_Update_Routine: '{9424a253-cb40-4c7d-bebd-0d0373458154}' + - IDR_System_Update_Routine__used_by__Update_By_System_Routine_Method: '{fd717c2c-04e9-4a80-afbb-126a3906465f}' + +- library: '&IDL_MochaBaseSystem;' + instances: + - class: '&IDC_UpdateBySystemRoutineMethod;' + inherits: '&IDC_Method;' + name: US - Update by System Routine Method + index: 65 + customTagName: updateBySystemRoutineMethod + instancesLabeledByRAMB: '&IDMB_Method__get__Fully_Qualified_Name_US;' + superclasses: + - instance: '&IDC_Method;' + # - instance: '&IDC_ExecuteUpdateMethod;' + attributes: + - instance: '&IDA_Verb;' + customTagName: 'verb' + - instance: '&IDA_Name;' + customTagName: 'name' + - instance: '&IDA_Static;' + customTagName: 'static' + - instance: '&IDA_Final;' + customTagName: 'final' + relationships: + - instance: '&IDR_Method__for__Class;' + customTagName: 'forClassId' + - instance: '&IDR_Metadata_With_Access_Modifier__has__Access_Modifier;' + customTagName: 'accessModifierId' + - instance: '&IDR_Update_By_System_Routine_Method__uses__System_Update_Routine;' + customTagName: 'systemUpdateRoutineId' + - instance: '&IDR_Instance__for__Module;' + customTagName: 'moduleId' + + - relationship: '&IDR_Update_By_System_Routine_Method__uses__System_Update_Routine;' + index: 137 + sourceClassId: '&IDC_UpdateBySystemRoutineMethod;' + type: 'uses' + destinationClassId: '&IDC_SystemUpdateRoutine;' + siblingRelationshipId: '&IDR_System_Update_Routine__used_by__Update_By_System_Routine_Method;' + singular: yes + + - relationship: '&IDR_System_Update_Routine__used_by__Update_By_System_Routine_Method;' + index: 138 + sourceClassId: '&IDC_SystemUpdateRoutine;' + type: 'used by' + destinationClassId: '&IDC_UpdateBySystemRoutineMethod;' + siblingRelationshipId: '&IDR_Get_Instance_Set_By_System_Routine_Method__returns__Instance_Set;' + singular: no diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00072-SystemUpdateRoutine.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00072-SystemUpdateRoutine.yaml new file mode 100644 index 0000000..a501d68 --- /dev/null +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00072-SystemUpdateRoutine.yaml @@ -0,0 +1,13 @@ +--- +- entityDefinitions: + - IDC_SystemUpdateRoutine: '{0dad3e78-084f-4894-a4a3-006aab2035df}' + +- library: '&IDL_MochaBaseSystem;' + instances: + - class: '&IDC_SystemUpdateRoutine;' + name: System Update Routine + index: 72 + customTagName: 'systemUpdateRoutine' + attributes: + - instance: '&IDA_Name;' + customTagName: 'name' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00073-AssignAttributeMethod.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00073-AssignAttributeMethod.yaml index 4162f06..58dabac 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00073-AssignAttributeMethod.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00073-AssignAttributeMethod.yaml @@ -17,6 +17,8 @@ - instance: '&IDA_Final;' customTagName: 'final' relationships: + - instance: '&IDR_Method__for__Class;' + customTagName: 'forClassId' - instance: '&IDR_Assign_Attribute_Method__uses__Executable_returning_Attribute;' customTagName: 'usesExecutableReturningAttribute' - instance: '&IDR_Assign_Attribute_Method__assigns__Attribute;' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01422-CustomReportDefinition.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01422-CustomReportDefinition.yaml index 83b3b0e..949f729 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01422-CustomReportDefinition.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01422-CustomReportDefinition.yaml @@ -30,6 +30,7 @@ - class: '&IDC_ReportObject;' name: 'Report Object' customTagName: 'reportObject' + index: attributes: - instance: '&IDA_Name;' customTagName: 'name' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Method/Method__get__Fully_Qualified_Name/Method__get__Fully_Qualified_Name_US.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Method/Method__get__Fully_Qualified_Name/Method__get__Fully_Qualified_Name_US.yaml new file mode 100644 index 0000000..bcf4e17 --- /dev/null +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Method/Method__get__Fully_Qualified_Name/Method__get__Fully_Qualified_Name_US.yaml @@ -0,0 +1,12 @@ +--- +- entityDefinitions: + - IDMB_Method__get__Fully_Qualified_Name_US: '{b2e824fa-1962-4026-9193-5ba950e0675b}' + +- library: '&IDL_MochaBaseSystem;' + instances: + - returnAttributeMethodBinding: '&IDMB_Method__get__Fully_Qualified_Name_US;' + executesMethod: '&IDM_Method__get__Fully_Qualified_Name;' + parameterAssignments: + - globalIdentifier: '{1af0d8f9-6c6f-4cc2-82ae-16ea958f3a68}' + assignsToParameter: '&IDC_Method;' + assignsFromWorkData: '&IDC_UpdateBySystemRoutineMethod;' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Method/Method__get__Method_Abbreviation.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Method/Method__get__Method_Abbreviation.yaml index 5b8329c..8883f49 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Method/Method__get__Method_Abbreviation.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Method/Method__get__Method_Abbreviation.yaml @@ -108,6 +108,12 @@ returnsAttributeId: '&IDMB_Method__get__GR_Method_Suffix;' comment: 'If Method is GR, return the "GR" suffix' + - globalIdentifier: '{641fba3a-41fb-427b-bdc3-4e876b6f72ab}' + trueConditions: + - instance: '&IDMB_Method__is__US;' + returnsAttributeId: '&IDMB_Method__get__US_Method_Suffix;' + comment: 'If Method is US, return the "US" suffix' + - globalIdentifier: '{570dd2ff-38d6-4615-b033-880b8dda9f5b}' returnsAttributeId: '&IDMB_Common_Text__get__Empty_String;' comment: 'If nothing else matches, just return empty string' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Method/Method__get__US_Method_Suffix.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Method/Method__get__US_Method_Suffix.yaml new file mode 100644 index 0000000..2edb890 --- /dev/null +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Method/Method__get__US_Method_Suffix.yaml @@ -0,0 +1,15 @@ +- entityDefinitions: + - IDM_Method__get__US_Method_Suffix: '{ebdff678-7341-462c-bb23-1d659a42f57a}' + - IDMB_Method__get__US_Method_Suffix: '{91f94a5f-6a6c-43ac-b446-97b71fc11f18}' +- library: '&IDL_MochaBaseSystem;' + instances: + - buildAttributeMethod: '&IDM_Method__get__US_Method_Suffix;' + forClassId: '&IDC_Method;' + returnsAttributeId: '&IDA_MethodType;' + verb: 'get' + name: 'US Method Suffix' + accessModifierId: '&IDI_AccessModifier_Public;' + initialValue: 'US' + static: yes + - returnAttributeMethodBinding: '&IDMB_Method__get__US_Method_Suffix;' + executesMethod: '&IDM_Method__get__US_Method_Suffix;' \ No newline at end of file diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Method/Method__is__US.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Method/Method__is__US.yaml new file mode 100644 index 0000000..7243116 --- /dev/null +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Method/Method__is__US.yaml @@ -0,0 +1,18 @@ +- entityDefinitions: + - IDM_Method__is__US: '{fcd97be4-1785-4943-8fac-853ba013e318}' + - IDMB_Method__is__US: '{f27fec9a-e6a0-4423-8267-04f5093c78d3}' + +- library: '&IDL_MochaBaseSystem;' + instances: + - evaluateBooleanExpressionMethod: '&IDM_Method__is__US;' + forClassId: '&IDC_Method;' + verb: 'is' + name: 'US' + accessModifierId: '&IDI_AccessModifier_RootA2;' + returnsAttributeId: '&IDA_MethodIsOfTypeSpecified;' + source: '&IDMB_Method__get__Parent_Class;' + operator: '&IDI_RelationalOperator_ExactMatch;' + target: '&IDC_UpdateBySystemRoutineMethod;' + + - returnAttributeMethodBinding: '&IDMB_Method__is__US;' + executesMethod: '&IDM_Method__is__US;' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/MethodBinding/Method_Binding__get__Executes_Method_and_Method_Type.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/MethodBinding/Method_Binding__get__Executes_Method_and_Method_Type.yaml index f7ea8f8..ed34934 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/MethodBinding/Method_Binding__get__Executes_Method_and_Method_Type.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/MethodBinding/Method_Binding__get__Executes_Method_and_Method_Type.yaml @@ -6,6 +6,9 @@ - IDMB_Method_Binding__get__Executes_Method_and_Method_Type_BRMB: '{c1c102cb-d59b-45d0-84a2-967dbdf127f7}' + - IDM_Method_Binding__get__Method_Binding_Type: '{4ed614a8-5e81-4ab6-bd8c-6b0091c60bf8}' + - IDMB_Method_Binding__get__Method_Binding_Type: '{c49696b2-4f54-4838-afe0-f1df59a4de75}' + - library: '&IDL_MochaBaseSystem;' instances: - buildAttributeMethod: '&IDM_Method_Binding__get__RAMB;' @@ -69,6 +72,17 @@ referenceInstanceSet: '&IDMB_Method_Binding__get__Executes_Method;' answerAttribute: '&IDMB_Method__get__Fully_Qualified_Name;' singular: yes + + - getAttributeMethod: '&IDM_Method_Binding__get__Method_Binding_Type;' + # initialValue: 'Method Example@get Dummy Method Name (BA)*S*P(public)' + forClassId: '&IDC_MethodBinding;' + returnsAttributeId: '&IDA_MethodBindingType;' + verb: 'get' + name: 'Method Binding Type' + accessModifierId: '&IDI_AccessModifier_RootA2;' + + - returnAttributeMethodBinding: '&IDMB_Method_Binding__get__Method_Binding_Type;' + executesMethod: '&IDM_Method_Binding__get__Method_Binding_Type;' - returnAttributeMethodBinding: '&IDMB_Method_Binding__get__Executes_Method_Name;' executesMethod: '&IDM_Method_Binding__get__Executes_Method_Name;' @@ -86,7 +100,7 @@ - order: b executes: '&IDMB_Common_Text__get__Open_Bracket;' - order: c - executes: '&IDA_MethodBindingType;' + executes: '&IDMB_Method_Binding__get__Method_Binding_Type;' - order: d executes: '&IDMB_Common_Text__get__Close_Bracket;' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml index 58fb63f..48e1d4d 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml @@ -1,8 +1,71 @@ +- entityDefinitions: + - IDM_LoginPage: '{2193a8f1-c8ac-4b85-bc0c-f9c5b47e2e8d}' + + - IDM_LoginPageResponse: '{1d2448c3-d37e-496e-9114-4aae8daff077}' + - IDMB_LoginPageResponse: '{9ceb0dc5-3601-4fe5-aa5b-1f11990cbc29}' + + - IDM_LoginPagePRU: '{880789c8-1f61-4a95-a693-971bdf96dcd1}' + - IDI_SystemUpdateRoutine_LoginUser: '{f36f8f87-0d2b-4e62-b85f-abb7e94d952c}' + + - IDM_User__update__Login: '{e01638d0-0101-45e3-8673-e15a3b192733}' + - IDMB_User__update__Login: '{3a9ad7fd-f90d-4b4b-aaf5-93e7710f34d2}' + - library: '&IDL_MochaBaseSystem;' instances: + - buildUIResponseMethod: '&IDM_LoginPageResponse;' + # usesExecutableReturningElement: '&IDE_BuildAttributeMethod_View;' + # FIXME!: this should trigger a write user session, then redirect to home page + + - buildResponseMethodBinding: '&IDMB_LoginPageResponse;' + executesMethod: '&IDM_LoginPageResponse;' + + - controlTransactionMethod: '&IDM_LoginPage;' + forClassId: '&IDC_Tenant;' + verb: '' + name: 'Login Page' + # buildsResponseWithBRMB: '&IDMB_LoginPageResponse;' + destinationUrl: '~/d/home.htmld' + + - systemUpdateRoutine: '&IDI_SystemUpdateRoutine_LoginUser;' + name: 'Log in user' + + - executeUpdateMethodBinding: '&IDMB_User__update__Login;' + executesMethod: '&IDM_User__update__Login;' + + # !!! FIXME !!! implement *** ALL *** of this and get it out of the PHP !!! + - processRelatedUpdatesMethod: '&IDM_LoginPagePRU;' + name: 'Login Page PRU' + processesForClass: '&IDC_UserLogin;' + usesExecutableForPUMB: + # - instance: '&IDMB_User__update__Login;' + - type: '&IDC_UpdateBySystemRoutineMethod;' + globalIdentifier: '&IDM_User__update__Login;' + forClassId: '&IDC_User;' + verb: 'update' + name: 'User Login and Session Credentials' + systemUpdateRoutineId: '&IDI_SystemUpdateRoutine_LoginUser;' + # comment: 'Calls into the OMS system update routine to save user login details. The resulting login token can be accessed with `OMS@get User Login Token(GAS)*S(public)`.' + + # - type: 'assignAttributeMethod' + # globalIdentifier: '{710f1b81-edf6-423d-bb49-423b814dd1de}' + # usesExecutableReturningAttribute: '&IDMB_User_Login__get__New_Randomly_Generated_Login_Token;' # GAS - generates a new randomly-generated login token via system routine + # assignsAttribute: '&IDA_Token;' + + # - type: 'assignAttributeMethod' + # globalIdentifier: '{9d88fce8-c566-4e0e-8c67-ac7130d3cbf2}' + # usesExecutableReturningAttribute: '&IDMB_OMS__get__Processing_User_IP_Address;' # GAS - get IP address of session user + # assignsAttribute: '&IDA_IPAddress;' + + # - type: 'assignRelationshipMethod' + # globalIdentifier: '{71d7b2ab-8d6a-44ba-a184-a605e240345f}' + # usesExecutableReturningInstanceSet: '&IDMB_User__get__User_by_User_Name_parm;' # GRS + # assignsRelationshipId: '&IDR_User_Login__has__User;' + - element: '&IDE_LoginPageSubedit;' name: login page subedit moduleId: '&IDI_Module_MochaBaseSystem;' + processedByCTMethod: '&IDM_LoginPage;' + processedByPRUMethod: '&IDM_LoginPagePRU;' elementContents: - instance: '{4a827e38-e07a-4b8b-a19f-9217299f5c45}' - instance: '{c67f305e-bd4d-4628-816b-55fb85ea1b67}' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/113800-ElementTests.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/113800-ElementTests.yaml index 209736d..b2029bd 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/113800-ElementTests.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/113800-ElementTests.yaml @@ -6,7 +6,14 @@ index: 113800 processedByPRUMethod: '{2aa20384-4132-49d3-a661-ae7d9a2e2feb}' elementContents: - - instance: '{91b1a767-08ac-47f0-9f30-620de6374d12}' + - globalIdentifier: '{91b1a767-08ac-47f0-9f30-620de6374d12}' + order: 'a' + label: 'Element Content Test Class' + defaultDataType: '{cce471d6-5fe7-4202-b678-9fcab20fd864}' + value: '{98e038eb-ad55-4259-a4c5-8e82c221270c}' + #displayOptions: + #- instance: '&IDI_DisplayOption_DoNotShow;' + - globalIdentifier: '{628550d8-673d-4156-8983-447ea2ee6d1b}' layout: '&IDI_ButtonLayout_DefaultButtonGroup;' label: 'Test Method Binding' @@ -68,16 +75,16 @@ name: 'PRU for Element Tests Class 1' processesForClass: '{cce471d6-5fe7-4202-b678-9fcab20fd864}' usesExecutableForPUMB: - - instance: '{0063c073-28be-4e81-a9bc-b551a17e75e0}' - - instance: '{d6aea527-d0a8-4070-9332-9101ee14c656}' - - - assignAttributeMethod: '{0063c073-28be-4e81-a9bc-b551a17e75e0}' - usesExecutableReturningAttribute: '{1a907d6e-b3fd-4f8e-a170-550aeb2faea5}' # EC - assignsAttribute: '{1a907d6e-b3fd-4f8e-a170-550aeb2faea5}' # req field test - - - assignAttributeMethod: '{d6aea527-d0a8-4070-9332-9101ee14c656}' - usesExecutableReturningAttribute: '{d53d7283-92a2-4a62-b8f2-cf0a0b975634}' # EC - assignsAttribute: '{d53d7283-92a2-4a62-b8f2-cf0a0b975634}' # req field test + - type: '&IDC_AssignAttributeMethod;' + globalIdentifier: '{0063c073-28be-4e81-a9bc-b551a17e75e0}' + forClassId: '{cce471d6-5fe7-4202-b678-9fcab20fd864}' + usesExecutableReturningAttribute: '{8c69fd8c-28fa-4f3c-a283-5d0006c1027d}' # EC + assignsAttribute: '{1a907d6e-b3fd-4f8e-a170-550aeb2faea5}' # req field test + - type: '&IDC_AssignAttributeMethod;' + globalIdentifier: '{d6aea527-d0a8-4070-9332-9101ee14c656}' + forClassId: '{cce471d6-5fe7-4202-b678-9fcab20fd864}' + usesExecutableReturningAttribute: '{d74123b5-9fde-4c2a-bd28-8cd00ce86734}' # EC + assignsAttribute: '{d53d7283-92a2-4a62-b8f2-cf0a0b975634}' # req field test - buttonLayout: '&IDI_ButtonLayout_DefaultButtonGroup;' executesTask: '&IDI_SequenceTask_TestMethodBinding;' @@ -93,14 +100,6 @@ name: 'Not Enterable Text Attribute Test' value: 'This element content is `Not Enterable`, and will always have its default value' - - elementContent: '{91b1a767-08ac-47f0-9f30-620de6374d12}' - order: 'a' - label: 'Element Content Test Class' - defaultDataType: '{cce471d6-5fe7-4202-b678-9fcab20fd864}' - value: '{98e038eb-ad55-4259-a4c5-8e82c221270c}' - #displayOptions: - #- instance: '&IDI_DisplayOption_DoNotShow;' - - elementContent: '{535b1507-68ed-4981-8cd4-e8e843a24916}' order: 'b' label: 'Label Override for Not Enterable' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/AccessModifier.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/AccessModifier.yaml index a8d5e69..05f2a0e 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/AccessModifier.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/AccessModifier.yaml @@ -23,6 +23,11 @@ - globalIdentifier: '{5d7e2991-e14a-4fe3-bc07-e40bfc03784f}' name: 'Access Modifier Edit Start' processedByCTMethod: '{4999e50e-1c7a-438f-8691-08f2cff3b976}' + layout: + - type: '&IDC_GroupLayout;' + globalIdentifier: '{c2f3edc8-c25c-493d-b8e0-3443f425fd0c}' + options: + - instance: '&IDI_GroupLayoutOption_FieldSet;' elementContents: - globalIdentifier: '{5794a213-81ad-4c0c-8d82-529188b824d4}' defaultDataType: '&IDE_AccessModifier_Select;' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/TextAttribute/Edit.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/TextAttribute/Edit.yaml index 126a6af..1a19f2d 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/TextAttribute/Edit.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/TextAttribute/Edit.yaml @@ -23,6 +23,11 @@ displayOptions: - instance: '&IDI_DisplayOption_ShowSubelementsVertically;' - instance: '&IDI_DisplayOption_Singular;' + layout: + - type: '&IDC_GroupLayout;' + globalIdentifier: '{b6feea6c-265b-4bc1-b4f1-7753c9ef24ea}' + options: + - instance: '&IDI_GroupLayoutOption_FieldSet;' - controlTransactionMethod: '&IDM_TextAttribute_Edit_Start;' forClassId: '&IDC_TextAttribute;' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/TextAttribute/TextAttribute.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/TextAttribute/TextAttribute.yaml index f05fc75..a540d29 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/TextAttribute/TextAttribute.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/TextAttribute/TextAttribute.yaml @@ -15,6 +15,11 @@ displayOptions: - instance: '&IDI_DisplayOption_NotEnterable;' - instance: '&IDI_DisplayOption_DoNotShow;' + layout: + - type: '&IDC_GroupLayout;' + globalIdentifier: '{6f3229ee-8e2e-4d3a-8e1c-0e28b109a044}' + options: + - instance: '&IDI_GroupLayoutOption_FieldSet;' - globalIdentifier: '{5c84b1c3-0e10-4eab-b5d7-cdcbd0c31184}' defaultDataType: '&IDA_Name;' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/TextAttribute/View.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/TextAttribute/View.yaml index 1f02bf4..5236917 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/TextAttribute/View.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/TextAttribute/View.yaml @@ -23,6 +23,11 @@ displayOptions: - instance: '&IDI_DisplayOption_ShowSubelementsVertically;' - instance: '&IDI_DisplayOption_Singular;' + layout: + - type: '&IDC_GroupLayout;' + globalIdentifier: '{284bb1e5-2753-444c-9ae9-aeb387b175da}' + options: + - instance: '&IDI_GroupLayoutOption_FieldSet;' - controlTransactionMethod: '&IDM_TextAttribute_View_Start;' forClassId: '&IDC_TextAttribute;' @@ -41,6 +46,11 @@ elementContents: - globalIdentifier: '{5075600b-178a-46eb-8a45-4ba0c3d7a0ce}' defaultDataType: '&IDE_TextAttribute_Subedits;' + layout: + - type: '&IDC_GroupLayout;' + globalIdentifier: '{6f3229ee-8e2e-4d3a-8e1c-0e28b109a044}' + options: + - instance: '&IDI_GroupLayoutOption_FieldSet;' displayOptions: - instance: '&IDI_DisplayOption_NotEnterable;' - instance: '&IDI_DisplayOption_ShowSubelementsVertically;'