diff --git a/codbex-methods/codbex-methods.edm b/codbex-methods/codbex-methods.edm index aeeb134..ed4db74 100644 --- a/codbex-methods/codbex-methods.edm +++ b/codbex-methods/codbex-methods.edm @@ -1,12 +1,12 @@ - - - + + + - - - + + + @@ -14,5 +14,5 @@ - + \ No newline at end of file diff --git a/codbex-methods/codbex-methods.gen b/codbex-methods/codbex-methods.gen index 67517ac..ff5d76b 100644 --- a/codbex-methods/codbex-methods.gen +++ b/codbex-methods/codbex-methods.gen @@ -15,7 +15,99 @@ "Methods": { "views": [ "PaymentMethod", - "SentMethod" + "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" ], "name": "Methods", "label": "Methods", @@ -33,7 +125,9 @@ "dataNullable": true, "dataPrimaryKey": true, "dataType": "INTEGER", + "description": "", "name": "Id", + "tooltip": "", "widgetIsMajor": true, "widgetLength": "20", "widgetSize": "", @@ -53,7 +147,9 @@ "dataName": "PAYMENTMETHOD_NAME", "dataNullable": true, "dataType": "VARCHAR", + "description": "", "name": "Name", + "tooltip": "", "widgetIsMajor": true, "widgetLength": "20", "widgetSize": "", @@ -77,9 +173,10 @@ "dataCount": "SELECT COUNT(*) AS COUNT FROM \"CODBEX_PAYMENTMETHOD\"", "dataName": "PAYMENTMETHOD", "dataQuery": "", + "description": "Manage entity PaymentMethod", "generateReport": "false", "icon": "/services/web/resources/unicons/file.svg", - "layoutType": "MANAGE", + "layoutType": "MANAGE_MASTER", "menuIndex": "100", "menuKey": "paymentmethod", "menuLabel": "PaymentMethod", @@ -98,7 +195,36 @@ "primaryKeys": [ "Id" ], - "primaryKeysString": "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": [] + } }, { "properties": [ @@ -108,7 +234,9 @@ "dataNullable": true, "dataPrimaryKey": true, "dataType": "INTEGER", + "description": "", "name": "Id", + "tooltip": "", "widgetIsMajor": true, "widgetLength": "20", "widgetSize": "", @@ -128,7 +256,9 @@ "dataName": "SENTMETHOD_NAME", "dataNullable": true, "dataType": "VARCHAR", + "description": "", "name": "Name", + "tooltip": "", "widgetIsMajor": true, "widgetLength": "20", "widgetSize": "", @@ -152,9 +282,10 @@ "dataCount": "SELECT COUNT(*) AS COUNT FROM \"CODBEX_SENTMETHOD\"", "dataName": "SENTMETHOD", "dataQuery": "", + "description": "Manage entity SentMethod", "generateReport": "false", "icon": "/services/web/resources/unicons/file.svg", - "layoutType": "MANAGE", + "layoutType": "MANAGE_MASTER", "menuIndex": "100", "menuKey": "sentmethod", "menuLabel": "SentMethod", @@ -173,7 +304,36 @@ "primaryKeys": [ "Id" ], - "primaryKeysString": "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": [] + } } ] } \ No newline at end of file diff --git a/codbex-methods/codbex-methods.model b/codbex-methods/codbex-methods.model index c2ed143..2388c58 100644 --- a/codbex-methods/codbex-methods.model +++ b/codbex-methods/codbex-methods.model @@ -9,7 +9,9 @@ "dataNullable": "true", "dataPrimaryKey": "true", "dataType": "INTEGER", + "description": "", "name": "Id", + "tooltip": "", "widgetIsMajor": "true", "widgetLength": "20", "widgetSize": "", @@ -20,7 +22,9 @@ "dataName": "PAYMENTMETHOD_NAME", "dataNullable": "true", "dataType": "VARCHAR", + "description": "", "name": "Name", + "tooltip": "", "widgetIsMajor": "true", "widgetLength": "20", "widgetSize": "", @@ -31,9 +35,10 @@ "dataCount": "SELECT COUNT(*) AS COUNT FROM \"${tablePrefix}PAYMENTMETHOD\"", "dataName": "PAYMENTMETHOD", "dataQuery": "", + "description": "Manage entity PaymentMethod", "generateReport": "false", "icon": "/services/web/resources/unicons/file.svg", - "layoutType": "MANAGE", + "layoutType": "MANAGE_MASTER", "menuIndex": "100", "menuKey": "paymentmethod", "menuLabel": "PaymentMethod", @@ -56,7 +61,9 @@ "dataNullable": "true", "dataPrimaryKey": "true", "dataType": "INTEGER", + "description": "", "name": "Id", + "tooltip": "", "widgetIsMajor": "true", "widgetLength": "20", "widgetSize": "", @@ -67,7 +74,9 @@ "dataName": "SENTMETHOD_NAME", "dataNullable": "true", "dataType": "VARCHAR", + "description": "", "name": "Name", + "tooltip": "", "widgetIsMajor": "true", "widgetLength": "20", "widgetSize": "", @@ -78,9 +87,10 @@ "dataCount": "SELECT COUNT(*) AS COUNT FROM \"${tablePrefix}SENTMETHOD\"", "dataName": "SENTMETHOD", "dataQuery": "", + "description": "Manage entity SentMethod", "generateReport": "false", "icon": "/services/web/resources/unicons/file.svg", - "layoutType": "MANAGE", + "layoutType": "MANAGE_MASTER", "menuIndex": "100", "menuKey": "sentmethod", "menuLabel": "SentMethod", diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/controller.js b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/controller.js index b216932..881248d 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/controller.js +++ b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/controller.js @@ -9,12 +9,13 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) $scope.dataPage = 1; $scope.dataCount = 0; - $scope.dataLimit = 20; + $scope.dataOffset = 0; + $scope.dataLimit = 10; + $scope.action = "select"; //-----------------Custom Actions-------------------// Extensions.get('dialogWindow', 'codbex-methods-custom-action').then(function (response) { $scope.pageActions = response.filter(e => e.perspective === "Methods" && e.view === "PaymentMethod" && (e.type === "page" || e.type === undefined)); - $scope.entityActions = response.filter(e => e.perspective === "Methods" && e.view === "PaymentMethod" && e.type === "entity"); }); $scope.triggerPageAction = function (action) { @@ -26,33 +27,35 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) action ); }; - - $scope.triggerEntityAction = function (action) { - messageHub.showDialogWindow( - action.id, - { - id: $scope.entity.Id - }, - null, - true, - action - ); - }; //-----------------Custom Actions-------------------// + function refreshData() { + $scope.dataReset = true; + $scope.dataPage--; + } + function resetPagination() { + $scope.dataReset = true; $scope.dataPage = 1; $scope.dataCount = 0; - $scope.dataLimit = 20; + $scope.dataLimit = 10; } - resetPagination(); //-----------------Events-------------------// + messageHub.onDidReceiveMessage("clearDetails", function (msg) { + $scope.$apply(function () { + $scope.selectedEntity = null; + $scope.action = "select"; + }); + }); + messageHub.onDidReceiveMessage("entityCreated", function (msg) { + refreshData(); $scope.loadPage($scope.dataPage, $scope.filter); }); messageHub.onDidReceiveMessage("entityUpdated", function (msg) { + refreshData(); $scope.loadPage($scope.dataPage, $scope.filter); }); @@ -68,7 +71,10 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) if (!filter && $scope.filter) { filter = $scope.filter; } - $scope.dataPage = pageNumber; + if (!filter) { + filter = {}; + } + $scope.selectedEntity = null; entityApi.count(filter).then(function (response) { if (response.status != 200) { messageHub.showAlertError("PaymentMethod", `Unable to count PaymentMethod: '${response.message}'`); @@ -77,22 +83,25 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) if (response.data) { $scope.dataCount = response.data; } - let offset = (pageNumber - 1) * $scope.dataLimit; - let limit = $scope.dataLimit; - let request; - if (filter) { - filter.$offset = offset; - filter.$limit = limit; - request = entityApi.search(filter); - } else { - request = entityApi.list(offset, limit); + $scope.dataPages = Math.ceil($scope.dataCount / $scope.dataLimit); + filter.$offset = ($scope.dataPage - 1) * $scope.dataLimit; + filter.$limit = $scope.dataLimit; + if ($scope.dataReset) { + filter.$offset = 0; + filter.$limit = $scope.dataPage * $scope.dataLimit; } - request.then(function (response) { + + entityApi.search(filter).then(function (response) { if (response.status != 200) { messageHub.showAlertError("PaymentMethod", `Unable to list/filter PaymentMethod: '${response.message}'`); return; } - $scope.data = response.data; + if ($scope.data == null || $scope.dataReset) { + $scope.data = []; + $scope.dataReset = false; + } + $scope.data = $scope.data.concat(response.data); + $scope.dataPage++; }); }); }; @@ -100,39 +109,28 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) $scope.selectEntity = function (entity) { $scope.selectedEntity = entity; - }; - - $scope.openDetails = function (entity) { - $scope.selectedEntity = entity; - messageHub.showDialogWindow("PaymentMethod-details", { - action: "select", + messageHub.postMessage("entitySelected", { entity: entity, - }); - }; - - $scope.openFilter = function (entity) { - messageHub.showDialogWindow("PaymentMethod-filter", { - entity: $scope.filterEntity, + selectedMainEntityId: entity.Id, }); }; $scope.createEntity = function () { $scope.selectedEntity = null; - messageHub.showDialogWindow("PaymentMethod-details", { - action: "create", - entity: {}, - }, null, false); + $scope.action = "create"; + + messageHub.postMessage("createEntity"); }; - $scope.updateEntity = function (entity) { - messageHub.showDialogWindow("PaymentMethod-details", { - action: "update", - entity: entity, - }, null, false); + $scope.updateEntity = function () { + $scope.action = "update"; + messageHub.postMessage("updateEntity", { + entity: $scope.selectedEntity, + }); }; - $scope.deleteEntity = function (entity) { - let id = entity.Id; + $scope.deleteEntity = function () { + let id = $scope.selectedEntity.Id; messageHub.showDialogAsync( 'Delete PaymentMethod?', `Are you sure you want to delete PaymentMethod? This action cannot be undone.`, @@ -153,6 +151,7 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) messageHub.showAlertError("PaymentMethod", `Unable to delete PaymentMethod: '${response.message}'`); return; } + refreshData(); $scope.loadPage($scope.dataPage, $scope.filter); messageHub.postMessage("clearDetails"); }); @@ -160,4 +159,10 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) }); }; + $scope.openFilter = function (entity) { + messageHub.showDialogWindow("PaymentMethod-filter", { + entity: $scope.filterEntity, + }); + }; + }]); diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/controller.js b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/controller.js index ecf7add..bccec6d 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/controller.js +++ b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/controller.js @@ -46,6 +46,7 @@ angular.module('page', ["ideUI", "ideView"]) entity: entity, filter: filter }); + messageHub.postMessage("clearDetails"); $scope.cancel(); }; diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/index.html b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/index.html index 528356c..0cebf03 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/index.html +++ b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/index.html @@ -50,16 +50,16 @@ - + - + - + diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/view.extension index 1a18a19..af63753 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/view.extension +++ b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/view.extension @@ -1,5 +1,5 @@ { "module": "codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/view.js", - "extensionPoint": "codbex-methods-dialog-window", + "extensionPoint": "dialog-window", "description": "codbex-methods - Application Dialog Window" } \ No newline at end of file diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/controller.js b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/controller.js index df4e0b8..3973a0f 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/controller.js +++ b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/controller.js @@ -5,7 +5,7 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) .config(["entityApiProvider", function (entityApiProvider) { entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/Methods/PaymentMethodService.ts"; }]) - .controller('PageController', ['$scope', 'messageHub', 'ViewParameters', 'entityApi', function ($scope, messageHub, ViewParameters, entityApi) { + .controller('PageController', ['$scope', 'messageHub', 'ViewParameters', 'entityApi', function ($scope, messageHub, ViewParameters, entityApi) { $scope.entity = {}; $scope.forms = { @@ -55,6 +55,7 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) }); }; + $scope.cancel = function () { $scope.entity = {}; $scope.action = 'select'; diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/index.html b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/index.html index 06b03a0..47f5bf5 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/index.html +++ b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/index.html @@ -47,6 +47,7 @@ The value doesn't match the required pattern '' + @@ -59,7 +60,7 @@ - + diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/view.extension index dea7130..2a666c0 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/view.extension +++ b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/view.extension @@ -1 +1 @@ -{"module":"codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/view.js","extensionPoint":"codbex-methods-dialog-window","description":"codbex-methods - Application Dialog Window"} \ No newline at end of file +{"module":"codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/view.js","extensionPoint":"dialog-window","description":"codbex-methods - Application Dialog Window"} \ No newline at end of file diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/index.html b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/index.html index a1c758b..2a51c7b 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/index.html +++ b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/index.html @@ -17,55 +17,48 @@ - Items ({{dataCount}}) - - + Items - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - -
Name
No data available.
{{next.Name}} - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + Load More ... + - - - diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/controller.js b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/controller.js new file mode 100644 index 0000000..2b0b2bf --- /dev/null +++ b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/controller.js @@ -0,0 +1,112 @@ +angular.module('page', ["ideUI", "ideView", "entityApi"]) + .config(["messageHubProvider", function (messageHubProvider) { + messageHubProvider.eventIdPrefix = 'codbex-methods.Methods.PaymentMethod'; + }]) + .config(["entityApiProvider", function (entityApiProvider) { + entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/Methods/PaymentMethodService.ts"; + }]) + .controller('PageController', ['$scope', 'Extensions', 'messageHub', 'entityApi', function ($scope, Extensions, messageHub, entityApi) { + + $scope.entity = {}; + $scope.forms = { + details: {}, + }; + $scope.formHeaders = { + select: "PaymentMethod Details", + create: "Create PaymentMethod", + update: "Update PaymentMethod" + }; + $scope.action = 'select'; + + //-----------------Custom Actions-------------------// + Extensions.get('dialogWindow', 'codbex-methods-custom-action').then(function (response) { + $scope.entityActions = response.filter(e => e.perspective === "Methods" && e.view === "PaymentMethod" && e.type === "entity"); + }); + + $scope.triggerEntityAction = function (action) { + messageHub.showDialogWindow( + action.id, + { + id: $scope.entity.Id + }, + null, + true, + action + ); + }; + //-----------------Custom Actions-------------------// + + //-----------------Events-------------------// + messageHub.onDidReceiveMessage("clearDetails", function (msg) { + $scope.$apply(function () { + $scope.entity = {}; + $scope.action = 'select'; + }); + }); + + messageHub.onDidReceiveMessage("entitySelected", function (msg) { + $scope.$apply(function () { + $scope.entity = msg.data.entity; + $scope.action = 'select'; + }); + }); + + messageHub.onDidReceiveMessage("createEntity", function (msg) { + $scope.$apply(function () { + $scope.entity = {}; + $scope.action = 'create'; + }); + }); + + messageHub.onDidReceiveMessage("updateEntity", function (msg) { + $scope.$apply(function () { + $scope.entity = msg.data.entity; + $scope.action = 'update'; + }); + }); + + + //-----------------Events-------------------// + + $scope.create = function () { + entityApi.create($scope.entity).then(function (response) { + if (response.status != 201) { + messageHub.showAlertError("PaymentMethod", `Unable to create PaymentMethod: '${response.message}'`); + return; + } + messageHub.postMessage("entityCreated", response.data); + messageHub.postMessage("clearDetails", response.data); + messageHub.showAlertSuccess("PaymentMethod", "PaymentMethod successfully created"); + }); + }; + + $scope.update = function () { + entityApi.update($scope.entity.Id, $scope.entity).then(function (response) { + if (response.status != 200) { + messageHub.showAlertError("PaymentMethod", `Unable to update PaymentMethod: '${response.message}'`); + return; + } + messageHub.postMessage("entityUpdated", response.data); + messageHub.postMessage("clearDetails", response.data); + messageHub.showAlertSuccess("PaymentMethod", "PaymentMethod successfully updated"); + }); + }; + + $scope.cancel = function () { + messageHub.postMessage("clearDetails"); + }; + + //-----------------Dialogs-------------------// + + + //-----------------Dialogs-------------------// + + + + //----------------Dropdowns-----------------// + + + //----------------Dropdowns-----------------// + + + }]); \ No newline at end of file diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/index.html b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/index.html new file mode 100644 index 0000000..0202678 --- /dev/null +++ b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/index.html @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + +
+ Name +
+
+ + + + The value doesn't match the required pattern '' + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.extension new file mode 100644 index 0000000..2ffed86 --- /dev/null +++ b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.extension @@ -0,0 +1 @@ +{"module":"codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.js","extensionPoint":"codbex-methods-view","description":"codbex-methods - Application View - Main Details"} \ No newline at end of file diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.js b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.js new file mode 100644 index 0000000..9cc22ba --- /dev/null +++ b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.js @@ -0,0 +1,19 @@ +/* + * Generated by Eclipse Dirigible based on model and template. + * + * Do not modify the content as it may be re-generated again. + */ +const viewData = { + id: "PaymentMethod-details", + label: "PaymentMethod", + factory: "frame", + region: "center", + link: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/index.html", + perspectiveName: "Methods", +}; + +if (typeof exports !== 'undefined') { + exports.getView = function () { + return viewData; + } +} diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/view.js b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/view.js index dfcd31d..5cf6a65 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/view.js +++ b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/view.js @@ -7,7 +7,7 @@ const viewData = { id: "PaymentMethod", label: "PaymentMethod", factory: "frame", - region: "center", + region: "left", link: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/index.html", perspectiveName: "Methods", }; diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/controller.js b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/controller.js index 09c11c7..3994a91 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/controller.js +++ b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/controller.js @@ -9,12 +9,13 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) $scope.dataPage = 1; $scope.dataCount = 0; - $scope.dataLimit = 20; + $scope.dataOffset = 0; + $scope.dataLimit = 10; + $scope.action = "select"; //-----------------Custom Actions-------------------// Extensions.get('dialogWindow', 'codbex-methods-custom-action').then(function (response) { $scope.pageActions = response.filter(e => e.perspective === "Methods" && e.view === "SentMethod" && (e.type === "page" || e.type === undefined)); - $scope.entityActions = response.filter(e => e.perspective === "Methods" && e.view === "SentMethod" && e.type === "entity"); }); $scope.triggerPageAction = function (action) { @@ -26,33 +27,35 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) action ); }; - - $scope.triggerEntityAction = function (action) { - messageHub.showDialogWindow( - action.id, - { - id: $scope.entity.Id - }, - null, - true, - action - ); - }; //-----------------Custom Actions-------------------// + function refreshData() { + $scope.dataReset = true; + $scope.dataPage--; + } + function resetPagination() { + $scope.dataReset = true; $scope.dataPage = 1; $scope.dataCount = 0; - $scope.dataLimit = 20; + $scope.dataLimit = 10; } - resetPagination(); //-----------------Events-------------------// + messageHub.onDidReceiveMessage("clearDetails", function (msg) { + $scope.$apply(function () { + $scope.selectedEntity = null; + $scope.action = "select"; + }); + }); + messageHub.onDidReceiveMessage("entityCreated", function (msg) { + refreshData(); $scope.loadPage($scope.dataPage, $scope.filter); }); messageHub.onDidReceiveMessage("entityUpdated", function (msg) { + refreshData(); $scope.loadPage($scope.dataPage, $scope.filter); }); @@ -68,7 +71,10 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) if (!filter && $scope.filter) { filter = $scope.filter; } - $scope.dataPage = pageNumber; + if (!filter) { + filter = {}; + } + $scope.selectedEntity = null; entityApi.count(filter).then(function (response) { if (response.status != 200) { messageHub.showAlertError("SentMethod", `Unable to count SentMethod: '${response.message}'`); @@ -77,22 +83,25 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) if (response.data) { $scope.dataCount = response.data; } - let offset = (pageNumber - 1) * $scope.dataLimit; - let limit = $scope.dataLimit; - let request; - if (filter) { - filter.$offset = offset; - filter.$limit = limit; - request = entityApi.search(filter); - } else { - request = entityApi.list(offset, limit); + $scope.dataPages = Math.ceil($scope.dataCount / $scope.dataLimit); + filter.$offset = ($scope.dataPage - 1) * $scope.dataLimit; + filter.$limit = $scope.dataLimit; + if ($scope.dataReset) { + filter.$offset = 0; + filter.$limit = $scope.dataPage * $scope.dataLimit; } - request.then(function (response) { + + entityApi.search(filter).then(function (response) { if (response.status != 200) { messageHub.showAlertError("SentMethod", `Unable to list/filter SentMethod: '${response.message}'`); return; } - $scope.data = response.data; + if ($scope.data == null || $scope.dataReset) { + $scope.data = []; + $scope.dataReset = false; + } + $scope.data = $scope.data.concat(response.data); + $scope.dataPage++; }); }); }; @@ -100,39 +109,28 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) $scope.selectEntity = function (entity) { $scope.selectedEntity = entity; - }; - - $scope.openDetails = function (entity) { - $scope.selectedEntity = entity; - messageHub.showDialogWindow("SentMethod-details", { - action: "select", + messageHub.postMessage("entitySelected", { entity: entity, - }); - }; - - $scope.openFilter = function (entity) { - messageHub.showDialogWindow("SentMethod-filter", { - entity: $scope.filterEntity, + selectedMainEntityId: entity.Id, }); }; $scope.createEntity = function () { $scope.selectedEntity = null; - messageHub.showDialogWindow("SentMethod-details", { - action: "create", - entity: {}, - }, null, false); + $scope.action = "create"; + + messageHub.postMessage("createEntity"); }; - $scope.updateEntity = function (entity) { - messageHub.showDialogWindow("SentMethod-details", { - action: "update", - entity: entity, - }, null, false); + $scope.updateEntity = function () { + $scope.action = "update"; + messageHub.postMessage("updateEntity", { + entity: $scope.selectedEntity, + }); }; - $scope.deleteEntity = function (entity) { - let id = entity.Id; + $scope.deleteEntity = function () { + let id = $scope.selectedEntity.Id; messageHub.showDialogAsync( 'Delete SentMethod?', `Are you sure you want to delete SentMethod? This action cannot be undone.`, @@ -153,6 +151,7 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) messageHub.showAlertError("SentMethod", `Unable to delete SentMethod: '${response.message}'`); return; } + refreshData(); $scope.loadPage($scope.dataPage, $scope.filter); messageHub.postMessage("clearDetails"); }); @@ -160,4 +159,10 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) }); }; + $scope.openFilter = function (entity) { + messageHub.showDialogWindow("SentMethod-filter", { + entity: $scope.filterEntity, + }); + }; + }]); diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/controller.js b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/controller.js index 8b531a6..f0ff585 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/controller.js +++ b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/controller.js @@ -46,6 +46,7 @@ angular.module('page', ["ideUI", "ideView"]) entity: entity, filter: filter }); + messageHub.postMessage("clearDetails"); $scope.cancel(); }; diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/index.html b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/index.html index 394587b..4ebf8bc 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/index.html +++ b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/index.html @@ -50,16 +50,16 @@ - + - + - + diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/view.extension index 48e10db..f97755f 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/view.extension +++ b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/view.extension @@ -1,5 +1,5 @@ { "module": "codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/view.js", - "extensionPoint": "codbex-methods-dialog-window", + "extensionPoint": "dialog-window", "description": "codbex-methods - Application Dialog Window" } \ No newline at end of file diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/controller.js b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/controller.js index 188e227..5470c22 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/controller.js +++ b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/controller.js @@ -5,7 +5,7 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) .config(["entityApiProvider", function (entityApiProvider) { entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/Methods/SentMethodService.ts"; }]) - .controller('PageController', ['$scope', 'messageHub', 'ViewParameters', 'entityApi', function ($scope, messageHub, ViewParameters, entityApi) { + .controller('PageController', ['$scope', 'messageHub', 'ViewParameters', 'entityApi', function ($scope, messageHub, ViewParameters, entityApi) { $scope.entity = {}; $scope.forms = { @@ -55,6 +55,7 @@ angular.module('page', ["ideUI", "ideView", "entityApi"]) }); }; + $scope.cancel = function () { $scope.entity = {}; $scope.action = 'select'; diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/index.html b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/index.html index 06b03a0..47f5bf5 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/index.html +++ b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/index.html @@ -47,6 +47,7 @@ The value doesn't match the required pattern '' + @@ -59,7 +60,7 @@ - + diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/view.extension index 7654396..8de2428 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/view.extension +++ b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/view.extension @@ -1 +1 @@ -{"module":"codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/view.js","extensionPoint":"codbex-methods-dialog-window","description":"codbex-methods - Application Dialog Window"} \ No newline at end of file +{"module":"codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/view.js","extensionPoint":"dialog-window","description":"codbex-methods - Application Dialog Window"} \ No newline at end of file diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/index.html b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/index.html index a1c758b..2a51c7b 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/index.html +++ b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/index.html @@ -17,55 +17,48 @@ - Items ({{dataCount}}) - - + Items - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - -
Name
No data available.
{{next.Name}} - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + Load More ... + - - - diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/controller.js b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/controller.js new file mode 100644 index 0000000..4964282 --- /dev/null +++ b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/controller.js @@ -0,0 +1,112 @@ +angular.module('page', ["ideUI", "ideView", "entityApi"]) + .config(["messageHubProvider", function (messageHubProvider) { + messageHubProvider.eventIdPrefix = 'codbex-methods.Methods.SentMethod'; + }]) + .config(["entityApiProvider", function (entityApiProvider) { + entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/Methods/SentMethodService.ts"; + }]) + .controller('PageController', ['$scope', 'Extensions', 'messageHub', 'entityApi', function ($scope, Extensions, messageHub, entityApi) { + + $scope.entity = {}; + $scope.forms = { + details: {}, + }; + $scope.formHeaders = { + select: "SentMethod Details", + create: "Create SentMethod", + update: "Update SentMethod" + }; + $scope.action = 'select'; + + //-----------------Custom Actions-------------------// + Extensions.get('dialogWindow', 'codbex-methods-custom-action').then(function (response) { + $scope.entityActions = response.filter(e => e.perspective === "Methods" && e.view === "SentMethod" && e.type === "entity"); + }); + + $scope.triggerEntityAction = function (action) { + messageHub.showDialogWindow( + action.id, + { + id: $scope.entity.Id + }, + null, + true, + action + ); + }; + //-----------------Custom Actions-------------------// + + //-----------------Events-------------------// + messageHub.onDidReceiveMessage("clearDetails", function (msg) { + $scope.$apply(function () { + $scope.entity = {}; + $scope.action = 'select'; + }); + }); + + messageHub.onDidReceiveMessage("entitySelected", function (msg) { + $scope.$apply(function () { + $scope.entity = msg.data.entity; + $scope.action = 'select'; + }); + }); + + messageHub.onDidReceiveMessage("createEntity", function (msg) { + $scope.$apply(function () { + $scope.entity = {}; + $scope.action = 'create'; + }); + }); + + messageHub.onDidReceiveMessage("updateEntity", function (msg) { + $scope.$apply(function () { + $scope.entity = msg.data.entity; + $scope.action = 'update'; + }); + }); + + + //-----------------Events-------------------// + + $scope.create = function () { + entityApi.create($scope.entity).then(function (response) { + if (response.status != 201) { + messageHub.showAlertError("SentMethod", `Unable to create SentMethod: '${response.message}'`); + return; + } + messageHub.postMessage("entityCreated", response.data); + messageHub.postMessage("clearDetails", response.data); + messageHub.showAlertSuccess("SentMethod", "SentMethod successfully created"); + }); + }; + + $scope.update = function () { + entityApi.update($scope.entity.Id, $scope.entity).then(function (response) { + if (response.status != 200) { + messageHub.showAlertError("SentMethod", `Unable to update SentMethod: '${response.message}'`); + return; + } + messageHub.postMessage("entityUpdated", response.data); + messageHub.postMessage("clearDetails", response.data); + messageHub.showAlertSuccess("SentMethod", "SentMethod successfully updated"); + }); + }; + + $scope.cancel = function () { + messageHub.postMessage("clearDetails"); + }; + + //-----------------Dialogs-------------------// + + + //-----------------Dialogs-------------------// + + + + //----------------Dropdowns-----------------// + + + //----------------Dropdowns-----------------// + + + }]); \ No newline at end of file diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/index.html b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/index.html new file mode 100644 index 0000000..0202678 --- /dev/null +++ b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/index.html @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + +
+ Name +
+
+ + + + The value doesn't match the required pattern '' + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.extension new file mode 100644 index 0000000..675f8cc --- /dev/null +++ b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.extension @@ -0,0 +1 @@ +{"module":"codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.js","extensionPoint":"codbex-methods-view","description":"codbex-methods - Application View - Main Details"} \ No newline at end of file diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.js b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.js new file mode 100644 index 0000000..84c4bb7 --- /dev/null +++ b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.js @@ -0,0 +1,19 @@ +/* + * Generated by Eclipse Dirigible based on model and template. + * + * Do not modify the content as it may be re-generated again. + */ +const viewData = { + id: "SentMethod-details", + label: "SentMethod", + factory: "frame", + region: "center", + link: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/index.html", + perspectiveName: "Methods", +}; + +if (typeof exports !== 'undefined') { + exports.getView = function () { + return viewData; + } +} diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/view.js b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/view.js index 79b7820..0591143 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/view.js +++ b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/view.js @@ -7,7 +7,7 @@ const viewData = { id: "SentMethod", label: "SentMethod", factory: "frame", - region: "center", + region: "left", link: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/index.html", perspectiveName: "Methods", }; diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/index.html b/codbex-methods/gen/codbex-methods/ui/Methods/index.html index 16545b0..e18a5b0 100644 --- a/codbex-methods/gen/codbex-methods/ui/Methods/index.html +++ b/codbex-methods/gen/codbex-methods/ui/Methods/index.html @@ -52,7 +52,7 @@ .constant('extensionPoint', { perspectives: 'codbex-methods', views: 'codbex-methods-view', - dialogWindows: 'codbex-methods-dialog-window' + dialogWindows: 'dialog-window' }) .controller('ApplicationController', ['$scope', 'messageHub', 'Extensions', function ($scope, messageHub, Extensions) { $scope.state = { diff --git a/codbex-methods/gen/codbex-methods/ui/launchpad/Home/controller.js b/codbex-methods/gen/codbex-methods/ui/launchpad/Home/controller.js index 53e0717..7bdfb57 100644 --- a/codbex-methods/gen/codbex-methods/ui/launchpad/Home/controller.js +++ b/codbex-methods/gen/codbex-methods/ui/launchpad/Home/controller.js @@ -88,6 +88,7 @@ angular.module('page', ['ideUI', 'ideView', 'entityApi']) return; } + $scope.modules = response.data.modules.filter(module => (module.name !== 'Reports')); for (let i = 0; i < response.data.referenceData.length; i++) { $scope.referenceData.push(...response.data.referenceData[i].settings); } diff --git a/codbex-methods/gen/codbex-methods/ui/launchpad/Home/index.html b/codbex-methods/gen/codbex-methods/ui/launchpad/Home/index.html index c1abfd2..792a294 100644 --- a/codbex-methods/gen/codbex-methods/ui/launchpad/Home/index.html +++ b/codbex-methods/gen/codbex-methods/ui/launchpad/Home/index.html @@ -36,6 +36,15 @@

Methods Managing module

General
+ + + + + Applications Portal + Central entry point to installed applications + + + @@ -89,7 +98,7 @@
Modules
+ ng-repeat="setting in referenceData track by $index" ng-click="openView(setting.location)"> diff --git a/codbex-methods/gen/codbex-methods/ui/launchpad/Home/styles.css b/codbex-methods/gen/codbex-methods/ui/launchpad/Home/styles.css index 6b6b502..ae6a001 100644 --- a/codbex-methods/gen/codbex-methods/ui/launchpad/Home/styles.css +++ b/codbex-methods/gen/codbex-methods/ui/launchpad/Home/styles.css @@ -1,3 +1,8 @@ +/** + * Generated by Eclipse Dirigible based on model and template. + * + * Do not modify the content as it may be re-generated again. + */ .wrap-list { align-self: start; flex-wrap: wrap; diff --git a/codbex-methods/gen/codbex-methods/ui/launchpad/menu-help.js b/codbex-methods/gen/codbex-methods/ui/launchpad/menu-help.js index 76750e4..9051c09 100644 --- a/codbex-methods/gen/codbex-methods/ui/launchpad/menu-help.js +++ b/codbex-methods/gen/codbex-methods/ui/launchpad/menu-help.js @@ -4,6 +4,8 @@ * Do not modify the content as it may be re-generated again. */ +import { Configurations as config } from "sdk/core"; + const defaultMenuItems = [ { label: "Applications Portal", @@ -49,9 +51,7 @@ const defaultMenuItems = [ } ]; -let config = dirigibleRequire("core/configurations"); - -exports.getMenu = function () { +export function getMenu() { let menu = { label: "Help", order: 900, diff --git a/codbex-methods/gen/codbex-methods/ui/launchpad/perspective.js b/codbex-methods/gen/codbex-methods/ui/launchpad/perspective.js index b38cf4b..44b6ca8 100644 --- a/codbex-methods/gen/codbex-methods/ui/launchpad/perspective.js +++ b/codbex-methods/gen/codbex-methods/ui/launchpad/perspective.js @@ -6,7 +6,7 @@ const perspectiveData = { id: 'home', name: 'Home', - link: '/services/web/codbex-methods/gen/codbex-methods/index.html', + link: '/services/web/portal/index.html', icon: '/services/web/resources/unicons/estate.svg', order: 1, };