Skip to content

Add regex to IBAN field #46

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 1 commit into from
Mar 29, 2026
Merged

Add regex to IBAN field #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions codbex-employees/codbex-employees.edm
View file
Open in desktop

Large diffs are not rendered by default.

66 changes: 34 additions & 32 deletions codbex-employees/codbex-employees.gen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,13 @@
"brandUrl": "https://www.codbex.com/",
"title": "Employees Management Module",
"description": "Managing Employees Data",
"fileName": "codbex-employees",
"genFolderName": "codbex-employees",
"dataSource": "DefaultDB",
"roles": [
{
"entityName": "Employee",
"roleRead": "codbex-employees.Employees.EmployeeReadOnly",
"roleWrite": "codbex-employees.Employees.EmployeeFullAccess"
},
{
"entityName": "Gender",
"roleRead": "codbex-employees.EmployeesSettings.GenderReadOnly",
"roleWrite": "codbex-employees.EmployeesSettings.GenderFullAccess"
},
{
"entityName": "MartialStatus",
"roleRead": "codbex-employees.EmployeesSettings.MartialStatusReadOnly",
"roleWrite": "codbex-employees.EmployeesSettings.MartialStatusFullAccess"
},
{
"entityName": "Contact",
"roleRead": "codbex-employees.Employees.ContactReadOnly",
"roleWrite": "codbex-employees.Employees.ContactFullAccess"
}
],
"tprefix": "codbex-employees-model",
"projectName": "codbex-employees",
"workspaceName": "workspace",
"filePath": "codbex-employees.model",
"templateId": "template-application-angular-v2/template/template.js",
"fileName": "codbex-employees",
"genFolderName": "codbex-employees",
"dataSource": "DefaultDB",
"perspectives": {
"Employees": {
"views": [
Expand Down Expand Up @@ -84,6 +61,29 @@
"role": ""
}
},
"roles": [
{
"entityName": "Employee",
"roleRead": "codbex-employees.Employees.EmployeeReadOnly",
"roleWrite": "codbex-employees.Employees.EmployeeFullAccess"
},
{
"entityName": "Gender",
"roleRead": "codbex-employees.EmployeesSettings.GenderReadOnly",
"roleWrite": "codbex-employees.EmployeesSettings.GenderFullAccess"
},
{
"entityName": "MartialStatus",
"roleRead": "codbex-employees.EmployeesSettings.MartialStatusReadOnly",
"roleWrite": "codbex-employees.EmployeesSettings.MartialStatusFullAccess"
},
{
"entityName": "Contact",
"roleRead": "codbex-employees.Employees.ContactReadOnly",
"roleWrite": "codbex-employees.Employees.ContactFullAccess"
}
],
"tprefix": "codbex-employees-model",
"models": [
{
"properties": [
Expand Down Expand Up @@ -398,7 +398,7 @@
"relationshipName": "Employee_Gender",
"relationshipEntityName": "Gender",
"relationshipEntityPerspectiveName": "Settings",
"relationshipEntityPerspectiveLabel": "Entities",
"relationshipEntityPerspectiveLabel": "Settings",
"dataNotNull": true,
"dataAutoIncrement": false,
"dataPrimaryKey": false,
Expand Down Expand Up @@ -430,7 +430,7 @@
"relationshipName": "Employee_MartialStatus",
"relationshipEntityName": "MartialStatus",
"relationshipEntityPerspectiveName": "Settings",
"relationshipEntityPerspectiveLabel": "Entities",
"relationshipEntityPerspectiveLabel": "Settings",
"dataNotNull": true,
"dataAutoIncrement": false,
"dataPrimaryKey": false,
Expand All @@ -457,6 +457,7 @@
"tooltip": "",
"widgetIsMajor": true,
"widgetLength": "34",
"widgetPattern": "^[A-Z]{2}[0-9]{2}[A-Z0-9]{11,30}$",
"widgetSize": "fd-col-md--4 fd-col--6",
"widgetType": "TEXTBOX",
"dataNotNull": true,
Expand All @@ -471,7 +472,7 @@
"dataTypeTypescript": "string",
"minLength": 0,
"maxLength": 34,
"inputRule": ""
"inputRule": "^[A-Z]{2}[0-9]{2}[A-Z0-9]{11,30}$"
}
],
"caption": "Manage entity Employee",
Expand Down Expand Up @@ -799,7 +800,7 @@
"relationshipName": "Employee_Gender",
"relationshipEntityName": "Gender",
"relationshipEntityPerspectiveName": "Settings",
"relationshipEntityPerspectiveLabel": "Entities",
"relationshipEntityPerspectiveLabel": "Settings",
"dataNotNull": true,
"dataAutoIncrement": false,
"dataPrimaryKey": false,
Expand Down Expand Up @@ -831,7 +832,7 @@
"relationshipName": "Employee_MartialStatus",
"relationshipEntityName": "MartialStatus",
"relationshipEntityPerspectiveName": "Settings",
"relationshipEntityPerspectiveLabel": "Entities",
"relationshipEntityPerspectiveLabel": "Settings",
"dataNotNull": true,
"dataAutoIncrement": false,
"dataPrimaryKey": false,
Expand All @@ -858,6 +859,7 @@
"tooltip": "",
"widgetIsMajor": true,
"widgetLength": "34",
"widgetPattern": "^[A-Z]{2}[0-9]{2}[A-Z0-9]{11,30}$",
"widgetSize": "fd-col-md--4 fd-col--6",
"widgetType": "TEXTBOX",
"dataNotNull": true,
Expand All @@ -872,7 +874,7 @@
"dataTypeTypescript": "string",
"minLength": 0,
"maxLength": 34,
"inputRule": ""
"inputRule": "^[A-Z]{2}[0-9]{2}[A-Z0-9]{11,30}$"
}
]
},
Expand Down
1 change: 1 addition & 0 deletions codbex-employees/codbex-employees.model
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@
"tooltip": "",
"widgetIsMajor": "true",
"widgetLength": "34",
"widgetPattern": "^[A-Z]{2}[0-9]{2}[A-Z0-9]{11,30}$",
"widgetSize": "fd-col-md--4 fd-col--6",
"widgetType": "TEXTBOX"
}
Expand Down
3 changes: 3 additions & 0 deletions codbex-employees/gen/codbex-employees/api/Employees/EmployeeController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@ class EmployeeController {
if (entity.IBAN?.length > 34) {
throw new ValidationError(`The 'IBAN' exceeds the maximum length of [34] characters`);
}
if (!RegExp(/^[A-Z]{2}[0-9]{2}[A-Z0-9]{11,30}$/).test(entity.IBAN)) {
throw new ValidationError(`The value provided for the 'IBAN' property ('[${entity.IBAN}]') doesn't match the required pattern '^[A-Z]{2}[0-9]{2}[A-Z0-9]{11,30}$'`);
}
for (const next of validationModules) {
next.validate(entity);
}
Expand Down
3 changes: 2 additions & 1 deletion codbex-employees/gen/codbex-employees/ui/Employees/Employee/dialog-window/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,14 +238,15 @@
<div class="fd-col fd-col-md--4 fd-col--6">
<bk-form-input-message
state="{{ forms.details['IBAN'].$valid ? '' : 'error' }}"
text="{{ 'codbex-employees:codbex-employees-model.messages.error.lengthMax' | t:{'max':'34.0'} }}">
text="{{ 'codbex-employees:codbex-employees-model.messages.error.pattern' | t:{'rule':'^[A-Z]{2}[0-9]{2}[A-Z0-9]{11,30}$'} }}">
<bk-input id="idIBAN"
name="IBAN"
state="{{ forms.details['IBAN'].$valid ? '' : 'error' }}"
ng-required="true"
ng-model="entity.IBAN"
ng-readonly="action === 'select'"
ng-maxlength="34.0"
input-rules="{ patterns: ['^[A-Z]{2}[0-9]{2}[A-Z0-9]{11,30}$'] }"
type="text"
placeholder="{{ 'codbex-employees:codbex-employees-model.messages.inputEnter' | t:{'name':'$t(codbex-employees:codbex-employees-model.t.EMPLOYEE_IBAN)'} }}">
</bk-input>
Expand Down
3 changes: 2 additions & 1 deletion codbex-employees/gen/codbex-employees/ui/Employees/Employee/main-details/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,14 +248,15 @@
<div class="fd-col fd-col-md--4 fd-col--6">
<bk-form-input-message
state="{{ forms.details['IBAN'].$valid ? '' : 'error' }}"
text="{{ 'codbex-employees:codbex-employees-model.messages.error.lengthMax' | t:{'max':'34.0'} }}">
text="{{ 'codbex-employees:codbex-employees-model.messages.error.pattern' | t:{'rule':'^[A-Z]{2}[0-9]{2}[A-Z0-9]{11,30}$'} }}">
<bk-input id="idIBAN"
name="IBAN"
state="{{ forms.details['IBAN'].$valid ? '' : 'error' }}"
ng-required="true"
ng-model="entity.IBAN"
ng-readonly="action === 'select'"
ng-maxlength="34.0"
input-rules="{ patterns: ['^[A-Z]{2}[0-9]{2}[A-Z0-9]{11,30}$'] }"
type="text"
placeholder="{{ 'codbex-employees:codbex-employees-model.messages.inputEnter' | t:{'name':'$t(codbex-employees:codbex-employees-model.t.EMPLOYEE_IBAN)'} }}">
</bk-input>
Expand Down
Loading