Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions codbex-methods/codbex-methods.edm
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<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" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="true" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-methods.PaymentMethod.PaymentMethodReadOnly" roleWrite="codbex-methods.PaymentMethod.PaymentMethodFullAccess">
<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>
<property name="Id" description="" tooltip="" dataName="PAYMENTMETHOD_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
<property name="Name" description="" tooltip="" dataName="PAYMENTMETHOD_NAME" dataType="VARCHAR" dataLength="20" dataNullable="false" dataUnique="true" isRequiredProperty="true" auditType="NONE" 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" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="true" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-methods.SentMethod.SentMethodReadOnly" roleWrite="codbex-methods.SentMethod.SentMethodFullAccess">
<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>
<property name="Id" description="" tooltip="" dataName="SENTMETHOD_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
<property name="Name" description="" tooltip="" dataName="SENTMETHOD_NAME" dataType="VARCHAR" dataLength="20" dataNullable="false" dataUnique="true" isRequiredProperty="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
</entity>
</entities>
<perspectives>
</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="Settings" entityType="SETTING" description="Manage entity PaymentMethod" generateDefaultRoles="true" roleRead="codbex-methods.PaymentMethod.PaymentMethodReadOnly" roleWrite="codbex-methods.PaymentMethod.PaymentMethodFullAccess" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" multilingual="true" as="value"/><mxGeometry x="20" y="20" 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="Settings" entityType="SETTING" description="Manage entity SentMethod" generateDefaultRoles="true" roleRead="codbex-methods.SentMethod.SentMethodReadOnly" roleWrite="codbex-methods.SentMethod.SentMethodFullAccess" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" multilingual="true" as="value"/><mxGeometry x="270" y="20" 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="Settings" entityType="SETTING" description="Manage entity PaymentMethod" generateDefaultRoles="true" roleRead="codbex-methods.PaymentMethod.PaymentMethodReadOnly" roleWrite="codbex-methods.PaymentMethod.PaymentMethodFullAccess" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" multilingual="true" as="value"/><mxGeometry x="20" y="20" 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" isRequiredProperty="true" dataNotNull="true" dataUnique="true" 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="Settings" entityType="SETTING" description="Manage entity SentMethod" generateDefaultRoles="true" roleRead="codbex-methods.SentMethod.SentMethodReadOnly" roleWrite="codbex-methods.SentMethod.SentMethodFullAccess" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" multilingual="true" as="value"/><mxGeometry x="270" y="20" 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" isRequiredProperty="true" dataNotNull="true" dataUnique="true" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell></root></mxGraphModel>
</model>
52 changes: 28 additions & 24 deletions codbex-methods/codbex-methods.gen
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,26 @@
"brandUrl": "https://www.codbex.com/",
"title": "Methods Management Module",
"description": "Managing Methods Data",
"fileName": "codbex-methods",
"genFolderName": "codbex-methods",
"dataSource": "DefaultDB",
"roles": [
{
"entityName": "PaymentMethod",
"roleRead": "codbex-methods.PaymentMethod.PaymentMethodReadOnly",
"roleWrite": "codbex-methods.PaymentMethod.PaymentMethodFullAccess"
},
{
"entityName": "SentMethod",
"roleRead": "codbex-methods.SentMethod.SentMethodReadOnly",
"roleWrite": "codbex-methods.SentMethod.SentMethodFullAccess"
}
],
"tprefix": "codbex-methods-model",
"projectName": "codbex-methods",
"workspaceName": "workspace",
"filePath": "codbex-methods.model",
"templateId": "template-application-angular-v2/template/template.js",
"fileName": "codbex-methods",
"genFolderName": "codbex-methods",
"dataSource": "DefaultDB",
"perspectives": {
"Settings": {
"views": [
Expand All @@ -26,23 +39,11 @@
"role": ""
}
},
"roles": [
{
"entityName": "PaymentMethod",
"roleRead": "codbex-methods.PaymentMethod.PaymentMethodReadOnly",
"roleWrite": "codbex-methods.PaymentMethod.PaymentMethodFullAccess"
},
{
"entityName": "SentMethod",
"roleRead": "codbex-methods.SentMethod.SentMethodReadOnly",
"roleWrite": "codbex-methods.SentMethod.SentMethodFullAccess"
}
],
"tprefix": "codbex-methods-model",
"models": [
{
"properties": [
{
"auditType": "NONE",
"dataAutoIncrement": true,
"dataName": "PAYMENTMETHOD_ID",
"dataNullable": true,
Expand All @@ -67,22 +68,23 @@
"inputRule": ""
},
{
"auditType": "NONE",
"dataLength": "20",
"dataName": "PAYMENTMETHOD_NAME",
"dataNullable": true,
"dataNullable": false,
"dataType": "VARCHAR",
"dataUnique": true,
"description": "",
"isRequiredProperty": true,
"name": "Name",
"tooltip": "",
"widgetIsMajor": true,
"widgetLength": "20",
"widgetSize": "",
"widgetType": "TEXTBOX",
"dataNotNull": false,
"dataNotNull": true,
"dataAutoIncrement": false,
"dataPrimaryKey": false,
"dataUnique": false,
"isRequiredProperty": false,
"isCalculatedProperty": false,
"widgetLabel": "Name",
"widgetDropdownUrl": "",
Expand Down Expand Up @@ -130,6 +132,7 @@
{
"properties": [
{
"auditType": "NONE",
"dataAutoIncrement": true,
"dataName": "SENTMETHOD_ID",
"dataNullable": true,
Expand All @@ -154,22 +157,23 @@
"inputRule": ""
},
{
"auditType": "NONE",
"dataLength": "20",
"dataName": "SENTMETHOD_NAME",
"dataNullable": true,
"dataNullable": false,
"dataType": "VARCHAR",
"dataUnique": true,
"description": "",
"isRequiredProperty": true,
"name": "Name",
"tooltip": "",
"widgetIsMajor": true,
"widgetLength": "20",
"widgetSize": "",
"widgetType": "TEXTBOX",
"dataNotNull": false,
"dataNotNull": true,
"dataAutoIncrement": false,
"dataPrimaryKey": false,
"dataUnique": false,
"isRequiredProperty": false,
"isCalculatedProperty": false,
"widgetLabel": "Name",
"widgetDropdownUrl": "",
Expand Down
12 changes: 10 additions & 2 deletions codbex-methods/codbex-methods.model
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{
"properties": [
{
"auditType": "NONE",
"dataAutoIncrement": "true",
"dataName": "PAYMENTMETHOD_ID",
"dataNullable": "true",
Expand All @@ -18,11 +19,14 @@
"widgetType": "TEXTBOX"
},
{
"auditType": "NONE",
"dataLength": "20",
"dataName": "PAYMENTMETHOD_NAME",
"dataNullable": "true",
"dataNullable": "false",
"dataType": "VARCHAR",
"dataUnique": "true",
"description": "",
"isRequiredProperty": "true",
"name": "Name",
"tooltip": "",
"widgetIsMajor": "true",
Expand Down Expand Up @@ -63,6 +67,7 @@
{
"properties": [
{
"auditType": "NONE",
"dataAutoIncrement": "true",
"dataName": "SENTMETHOD_ID",
"dataNullable": "true",
Expand All @@ -77,11 +82,14 @@
"widgetType": "TEXTBOX"
},
{
"auditType": "NONE",
"dataLength": "20",
"dataName": "SENTMETHOD_NAME",
"dataNullable": "true",
"dataNullable": "false",
"dataType": "VARCHAR",
"dataUnique": "true",
"description": "",
"isRequiredProperty": "true",
"name": "Name",
"tooltip": "",
"widgetIsMajor": "true",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ class PaymentMethodController {
}

private validateEntity(entity: any): void {
if (entity.Name === null || entity.Name === undefined) {
throw new ValidationError(`The 'Name' property is required, provide a valid value`);
}
if (entity.Name?.length > 20) {
throw new ValidationError(`The 'Name' exceeds the maximum length of [20] characters`);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ class SentMethodController {
}

private validateEntity(entity: any): void {
if (entity.Name === null || entity.Name === undefined) {
throw new ValidationError(`The 'Name' property is required, provide a valid value`);
}
if (entity.Name?.length > 20) {
throw new ValidationError(`The 'Name' exceeds the maximum length of [20] characters`);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import { dao as daoApi } from "@aerokit/sdk/db";

export interface PaymentMethodEntity {
readonly Id: number;
Name?: string;
Name: string;
}

export interface PaymentMethodCreateEntity {
readonly Name?: string;
readonly Name: string;
}

export interface PaymentMethodUpdateEntity extends PaymentMethodCreateEntity {
Expand Down Expand Up @@ -86,6 +86,7 @@ export class PaymentMethodRepository {
name: "Name",
column: "PAYMENTMETHOD_NAME",
type: "VARCHAR",
required: true
}
]
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import { dao as daoApi } from "@aerokit/sdk/db";

export interface SentMethodEntity {
readonly Id: number;
Name?: string;
Name: string;
}

export interface SentMethodCreateEntity {
readonly Name?: string;
readonly Name: string;
}

export interface SentMethodUpdateEntity extends SentMethodCreateEntity {
Expand Down Expand Up @@ -86,6 +86,7 @@ export class SentMethodRepository {
name: "Name",
column: "SENTMETHOD_NAME",
type: "VARCHAR",
required: true
}
]
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Entity, Table, Id, Generated, Column, Documentation } from '@aerokit/sdk/db'
import { Entity, Table, Id, Generated, Column, Documentation, CreatedAt, CreatedBy, UpdatedAt, UpdatedBy} from '@aerokit/sdk/db'

@Entity('PaymentMethodEntity')
@Table('CODBEX_PAYMENTMETHOD')
Expand All @@ -19,9 +19,8 @@ export class PaymentMethodEntity {
name: 'PAYMENTMETHOD_NAME',
type: 'string',
length: 20,
nullable: true,
})
public Name?: string;
public Name!: string;

}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Entity, Table, Id, Generated, Column, Documentation } from '@aerokit/sdk/db'
import { Entity, Table, Id, Generated, Column, Documentation, CreatedAt, CreatedBy, UpdatedAt, UpdatedBy} from '@aerokit/sdk/db'

@Entity('SentMethodEntity')
@Table('CODBEX_SENTMETHOD')
Expand All @@ -19,9 +19,8 @@ export class SentMethodEntity {
name: 'SENTMETHOD_NAME',
type: 'string',
length: 20,
nullable: true,
})
public Name?: string;
public Name!: string;

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{
"type": "VARCHAR",
"length": 20,
"nullable": true,
"unique": true,
"name": "PAYMENTMETHOD_NAME"
}
]
Expand All @@ -34,7 +34,7 @@
{
"type": "VARCHAR",
"length": 20,
"nullable": true,
"unique": true,
"name": "SENTMETHOD_NAME"
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
<bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
<bk-form-item class="fd-row">
<div class="fd-col fd-col-md--2">
<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-methods:codbex-methods-model.t.PAYMENTMETHOD_NAME' | t }}</bk-form-label>
<bk-form-label for="idName" ng-required="true" colon="true">{{ 'codbex-methods:codbex-methods-model.t.PAYMENTMETHOD_NAME' | t }}</bk-form-label>
</div>
<div class="fd-col fd-col-md--8 ">
<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-methods:codbex-methods-model.messages.error.pattern' | t:{'rule':''} }}">
<bk-input id="idName"
name="Name"
state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
ng-required="false"
ng-required="true"
ng-model="entity.Name"
ng-readonly="action === 'select'"
ng-maxlength="20.0"
Expand Down
Loading