Skip to content

Split the entities into two navigations - for Sent and Payment methods #10

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

Merged
TIVMOF merged 2 commits into from
Feb 20, 2025
Merged

Split the entities into two navigations - for Sent and Payment methods #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ca75ab
split payment method and sent method to two navigations
NicoleNG18 Feb 20, 2025
4cd6ff4
change sent method order
NicoleNG18 Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions codbex-methods/codbex-methods.edm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<model>
<entities>
<entity name="PaymentMethod" dataName="PAYMENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PAYMENTMETHOD&quot;" dataQuery="" type="SETTING" title="PaymentMethod" caption="Manage entity PaymentMethod" description="Manage entity PaymentMethod" tooltip="PaymentMethod" icon="/services/web/resources/unicons/file.svg" menuKey="paymentmethod" menuLabel="PaymentMethod" menuIndex="100" layoutType="MANAGE_MASTER" navigationPath="/Home" perspectiveName="Methods" perspectiveLabel="methods" perspectiveIcon="/services/web/resources/unicons/archive.svg" perspectiveOrder="100" perspectiveRole="" generateReport="false">
<entity name="PaymentMethod" dataName="PAYMENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PAYMENTMETHOD&quot;" dataQuery="" type="SETTING" title="PaymentMethod" caption="Manage entity PaymentMethod" description="Manage entity PaymentMethod" tooltip="PaymentMethod" icon="/services/web/resources/unicons/file.svg" menuKey="paymentmethod" menuLabel="PaymentMethod" menuIndex="100" layoutType="MANAGE" navigationPath="/Home" perspectiveName="PaymentMethod" perspectiveLabel="PaymentMethod" perspectiveIcon="/services/web/resources/unicons/archive.svg" perspectiveOrder="100" perspectiveRole="" generateReport="false" generateDefaultRoles="false">
<property name="Id" description="" tooltip="" dataName="PAYMENTMETHOD_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
<property name="Name" description="" tooltip="" dataName="PAYMENTMETHOD_NAME" dataType="VARCHAR" dataLength="20" dataNullable="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
</entity>
<entity name="SentMethod" dataName="SENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SENTMETHOD&quot;" dataQuery="" type="SETTING" title="SentMethod" caption="Manage entity SentMethod" description="Manage entity SentMethod" tooltip="SentMethod" icon="/services/web/resources/unicons/file.svg" menuKey="sentmethod" menuLabel="SentMethod" menuIndex="100" layoutType="MANAGE_MASTER" navigationPath="/Home" perspectiveName="Methods" perspectiveLabel="methods" perspectiveIcon="/services/web/resources/unicons/archive.svg" perspectiveOrder="100" perspectiveRole="" generateReport="false">
<entity name="SentMethod" dataName="SENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SENTMETHOD&quot;" dataQuery="" type="SETTING" title="SentMethod" caption="Manage entity SentMethod" description="Manage entity SentMethod" tooltip="SentMethod" icon="/services/web/resources/unicons/file.svg" menuKey="sentmethod" menuLabel="SentMethod" menuIndex="100" layoutType="MANAGE" navigationPath="/Home" perspectiveName="SentMethod" perspectiveLabel="SentMethod" perspectiveIcon="/services/web/resources/unicons/archive.svg" perspectiveOrder="200" perspectiveRole="" generateReport="false" generateDefaultRoles="false">
<property name="Id" description="" tooltip="" dataName="SENTMETHOD_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
<property name="Name" description="" tooltip="" dataName="SENTMETHOD_NAME" dataType="VARCHAR" dataLength="20" dataNullable="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
</entity>
</entities>
<perspectives>
<perspective><name>Methods</name><label>methods</label><icon>/services/web/resources/unicons/archive.svg</icon><order>100</order><role></role></perspective>
<perspective><name>PaymentMethod</name><label>PaymentMethod</label><icon>/services/web/resources/unicons/archive.svg</icon><order>100</order><role></role></perspective>
<perspective><name>SentMethod</name><label>SentMethod</label><icon>/services/web/resources/unicons/archive.svg</icon><order>200</order><role></role></perspective>
</perspectives>
<navigations>
</navigations>
<mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="2" style="entity" parent="1" vertex="1"><Entity name="PaymentMethod" dataName="PAYMENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PAYMENTMETHOD&quot;" title="PaymentMethod" caption="Manage entity PaymentMethod" tooltip="PaymentMethod" menuLabel="PaymentMethod" type="Entity" menuKey="paymentmethod" disableGeneration="false" perspectiveName="Methods" entityType="SETTING" description="Manage entity PaymentMethod" layoutType="MANAGE_MASTER" as="value"><Array as="referenceProjections"/></Entity><mxGeometry x="390" y="130" width="200" height="80" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="3" parent="2" vertex="1" connectable="0"><Property name="Id" dataName="PAYMENTMETHOD_ID" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="4" parent="2" vertex="1" connectable="0"><Property name="Name" dataName="PAYMENTMETHOD_NAME" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="5" style="entity" parent="1" vertex="1"><Entity name="SentMethod" dataName="SENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SENTMETHOD&quot;" title="SentMethod" caption="Manage entity SentMethod" tooltip="SentMethod" menuLabel="SentMethod" type="Entity" menuKey="sentmethod" disableGeneration="false" perspectiveName="Methods" entityType="SETTING" description="Manage entity SentMethod" layoutType="MANAGE_MASTER" as="value"><Array as="referenceProjections"/></Entity><mxGeometry x="750" y="130" width="200" height="80" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="6" parent="5" vertex="1" connectable="0"><Property name="Id" dataName="SENTMETHOD_ID" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" dataPrecision="NaN" dataScale="NaN" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="7" parent="5" vertex="1" connectable="0"><Property name="Name" dataName="SENTMETHOD_NAME" dataPrecision="NaN" dataScale="NaN" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell></root></mxGraphModel>
<mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="2" style="entity" parent="1" vertex="1"><Entity name="PaymentMethod" dataName="PAYMENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PAYMENTMETHOD&quot;" title="PaymentMethod" caption="Manage entity PaymentMethod" tooltip="PaymentMethod" menuLabel="PaymentMethod" type="Entity" menuKey="paymentmethod" disableGeneration="false" perspectiveName="PaymentMethod" entityType="SETTING" description="Manage entity PaymentMethod" as="value"><Array as="referenceProjections"/></Entity><mxGeometry x="20" y="80" width="200" height="80" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="3" parent="2" vertex="1" connectable="0"><Property name="Id" dataName="PAYMENTMETHOD_ID" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="4" parent="2" vertex="1" connectable="0"><Property name="Name" dataName="PAYMENTMETHOD_NAME" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="5" style="entity" parent="1" vertex="1"><Entity name="SentMethod" dataName="SENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SENTMETHOD&quot;" title="SentMethod" caption="Manage entity SentMethod" tooltip="SentMethod" menuLabel="SentMethod" type="Entity" menuKey="sentmethod" disableGeneration="false" perspectiveName="SentMethod" entityType="SETTING" description="Manage entity SentMethod" as="value"><Array as="referenceProjections"/></Entity><mxGeometry x="280" y="80" width="200" height="80" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="6" parent="5" vertex="1" connectable="0"><Property name="Id" dataName="SENTMETHOD_ID" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" dataPrecision="NaN" dataScale="NaN" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="7" parent="5" vertex="1" connectable="0"><Property name="Name" dataName="SENTMETHOD_NAME" dataPrecision="NaN" dataScale="NaN" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell></root></mxGraphModel>
</model>
190 changes: 26 additions & 164 deletions codbex-methods/codbex-methods.gen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,113 +7,31 @@
"dataSource": "DefaultDB",
"fileName": "codbex-methods",
"genFolderName": "codbex-methods",
"roles": [],
"projectName": "codbex-methods",
"workspaceName": "workspace",
"filePath": "codbex-methods.model",
"templateId": "template-application-angular/template/template.js",
"perspectives": {
"Methods": {
"PaymentMethod": {
"views": [
"PaymentMethod",
"SentMethod",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details",
"PaymentMethod-details",
"SentMethod-details"
"PaymentMethod"
],
"name": "Methods",
"label": "Methods",
"name": "PaymentMethod",
"label": "PaymentMethod",
"order": "100",
"icon": "/services/web/resources/unicons/archive.svg",
"role": ""
},
"SentMethod": {
"views": [
"SentMethod"
],
"name": "SentMethod",
"label": "SentMethod",
"order": "200",
"icon": "/services/web/resources/unicons/archive.svg",
"role": ""
}
},
"models": [
Expand Down Expand Up @@ -174,17 +92,18 @@
"dataName": "PAYMENTMETHOD",
"dataQuery": "",
"description": "Manage entity PaymentMethod",
"generateDefaultRoles": "false",
"generateReport": "false",
"icon": "/services/web/resources/unicons/file.svg",
"layoutType": "MANAGE_MASTER",
"layoutType": "MANAGE",
"menuIndex": "100",
"menuKey": "paymentmethod",
"menuLabel": "PaymentMethod",
"name": "PaymentMethod",
"navigationPath": "/Home",
"perspectiveIcon": "/services/web/resources/unicons/archive.svg",
"perspectiveLabel": "methods",
"perspectiveName": "Methods",
"perspectiveLabel": "PaymentMethod",
"perspectiveName": "PaymentMethod",
"perspectiveOrder": "100",
"perspectiveRole": "",
"title": "PaymentMethod",
Expand All @@ -195,36 +114,7 @@
"primaryKeys": [
"Id"
],
"primaryKeysString": "Id",
"masterProperties": {
"title": {
"dataLength": "20",
"dataName": "PAYMENTMETHOD_NAME",
"dataNullable": true,
"dataType": "VARCHAR",
"description": "",
"name": "Name",
"tooltip": "",
"widgetIsMajor": true,
"widgetLength": "20",
"widgetSize": "",
"widgetType": "TEXTBOX",
"dataNotNull": false,
"dataAutoIncrement": false,
"dataPrimaryKey": false,
"dataUnique": false,
"isRequiredProperty": false,
"isCalculatedProperty": false,
"widgetLabel": "Name",
"widgetDropdownUrl": "",
"dataTypeJava": "string",
"dataTypeTypescript": "string",
"minLength": 0,
"maxLength": 20,
"inputRule": ""
},
"properties": []
}
"primaryKeysString": "Id"
},
{
"properties": [
Expand Down Expand Up @@ -283,18 +173,19 @@
"dataName": "SENTMETHOD",
"dataQuery": "",
"description": "Manage entity SentMethod",
"generateDefaultRoles": "false",
"generateReport": "false",
"icon": "/services/web/resources/unicons/file.svg",
"layoutType": "MANAGE_MASTER",
"layoutType": "MANAGE",
"menuIndex": "100",
"menuKey": "sentmethod",
"menuLabel": "SentMethod",
"name": "SentMethod",
"navigationPath": "/Home",
"perspectiveIcon": "/services/web/resources/unicons/archive.svg",
"perspectiveLabel": "methods",
"perspectiveName": "Methods",
"perspectiveOrder": "100",
"perspectiveLabel": "SentMethod",
"perspectiveName": "SentMethod",
"perspectiveOrder": "200",
"perspectiveRole": "",
"title": "SentMethod",
"tooltip": "SentMethod",
Expand All @@ -304,36 +195,7 @@
"primaryKeys": [
"Id"
],
"primaryKeysString": "Id",
"masterProperties": {
"title": {
"dataLength": "20",
"dataName": "SENTMETHOD_NAME",
"dataNullable": true,
"dataType": "VARCHAR",
"description": "",
"name": "Name",
"tooltip": "",
"widgetIsMajor": true,
"widgetLength": "20",
"widgetSize": "",
"widgetType": "TEXTBOX",
"dataNotNull": false,
"dataAutoIncrement": false,
"dataPrimaryKey": false,
"dataUnique": false,
"isRequiredProperty": false,
"isCalculatedProperty": false,
"widgetLabel": "Name",
"widgetDropdownUrl": "",
"dataTypeJava": "string",
"dataTypeTypescript": "string",
"minLength": 0,
"maxLength": 20,
"inputRule": ""
},
"properties": []
}
"primaryKeysString": "Id"
}
]
}
27 changes: 18 additions & 9 deletions codbex-methods/codbex-methods.model
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,18 @@
"dataName": "PAYMENTMETHOD",
"dataQuery": "",
"description": "Manage entity PaymentMethod",
"generateDefaultRoles": "false",
"generateReport": "false",
"icon": "/services/web/resources/unicons/file.svg",
"layoutType": "MANAGE_MASTER",
"layoutType": "MANAGE",
"menuIndex": "100",
"menuKey": "paymentmethod",
"menuLabel": "PaymentMethod",
"name": "PaymentMethod",
"navigationPath": "/Home",
"perspectiveIcon": "/services/web/resources/unicons/archive.svg",
"perspectiveLabel": "methods",
"perspectiveName": "Methods",
"perspectiveLabel": "PaymentMethod",
"perspectiveName": "PaymentMethod",
"perspectiveOrder": "100",
"perspectiveRole": "",
"title": "PaymentMethod",
Expand Down Expand Up @@ -88,18 +89,19 @@
"dataName": "SENTMETHOD",
"dataQuery": "",
"description": "Manage entity SentMethod",
"generateDefaultRoles": "false",
"generateReport": "false",
"icon": "/services/web/resources/unicons/file.svg",
"layoutType": "MANAGE_MASTER",
"layoutType": "MANAGE",
"menuIndex": "100",
"menuKey": "sentmethod",
"menuLabel": "SentMethod",
"name": "SentMethod",
"navigationPath": "/Home",
"perspectiveIcon": "/services/web/resources/unicons/archive.svg",
"perspectiveLabel": "methods",
"perspectiveName": "Methods",
"perspectiveOrder": "100",
"perspectiveLabel": "SentMethod",
"perspectiveName": "SentMethod",
"perspectiveOrder": "200",
"perspectiveRole": "",
"title": "SentMethod",
"tooltip": "SentMethod",
Expand All @@ -108,11 +110,18 @@
],
"perspectives": [
{
"name": "Methods",
"label": "methods",
"name": "PaymentMethod",
"label": "PaymentMethod",
"icon": "/services/web/resources/unicons/archive.svg",
"order": "100",
"role": {}
},
{
"name": "SentMethod",
"label": "SentMethod",
"icon": "/services/web/resources/unicons/archive.svg",
"order": "200",
"role": {}
}
],
"navigations": []
Expand Down
Loading