diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod index e22bb9a99d975c94238326e50dfbd7e9211331a2..7b06c2208306af4c9c89a094d37716d718d212b2 100644 --- a/entity/SupportTicket_entity/SupportTicket_entity.aod +++ b/entity/SupportTicket_entity/SupportTicket_entity.aod @@ -399,33 +399,6 @@ <state>READONLY</state> <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/date_begin/valueProcess.js</valueProcess> </entityField> - <entityConsumer> - <name>ChecklistEntryValues</name> - <dependency> - <name>dependency</name> - <entityName>ChecklistEntryValue_entity</entityName> - <fieldName>ChecklistEntryValues</fieldName> - </dependency> - <children> - <entityParameter> - <name>ObjectRowId_param</name> - <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js</valueProcess> - <expose v="true" /> - </entityParameter> - <entityParameter> - <name>ObjectType_param</name> - <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/objecttype_param/valueProcess.js</valueProcess> - </entityParameter> - <entityParameter> - <name>ChecklistIds_param</name> - <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/checklistids_param/valueProcess.js</valueProcess> - </entityParameter> - <entityParameter> - <name>Presentationmode_param</name> - <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/presentationmode_param/valueProcess.js</valueProcess> - </entityParameter> - </children> - </entityConsumer> <entityParameter> <name>InitialInboxId_param</name> <expose v="true" /> @@ -1231,17 +1204,6 @@ </entityParameter> </children> </entityConsumer> - <entityField> - <name>isSupportticketAllowedToBeCompleted</name> - <description>TODO Checklist</description> - <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/issupportticketallowedtobecompleted/valueProcess.js</valueProcess> - </entityField> - <entityField> - <name>checklistWarningText</name> - <description>TODO Checklist</description> - <color>priority-high-color</color> - <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/checklistwarningtext/valueProcess.js</valueProcess> - </entityField> <entityParameter> <name>RequestorIsNotMandatory_param</name> <expose v="true" /> diff --git a/entity/SupportTicket_entity/afterUiInit.js b/entity/SupportTicket_entity/afterUiInit.js index 057455f23c392cf544f0efae91c047d3609a7788..8ebc0361edc17fed36a9b1f156b5b64d8a4a674c 100644 --- a/entity/SupportTicket_entity/afterUiInit.js +++ b/entity/SupportTicket_entity/afterUiInit.js @@ -74,11 +74,7 @@ else if(recordState == neon.OPERATINGSTATE_EDIT var conclusion = $SupportTicketKeywords.ticketConclusion$failur_custom(); modules.loadService("afterUiInit_service") .forEach(implementation => conclusion = implementation()(conclusion) || conclusion); - //TODO Checklist - if(Utils.toBoolean(vars.get("$field.isSupportticketAllowedToBeCompleted"))) - { - conclusion = $SupportTicketKeywords.ticketConclusion$success(); - } + vars.set("$field.CONCLUSION", conclusion); } } \ No newline at end of file diff --git a/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/checklistids_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/checklistids_param/valueProcess.js deleted file mode 100644 index 735ce3a54edcc700047a44e998065f7afc934e5d..0000000000000000000000000000000000000000 --- a/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/checklistids_param/valueProcess.js +++ /dev/null @@ -1,23 +0,0 @@ -import { result, vars } from "@aditosoftware/jdito-types"; -import { ChecklistUtils } from "Checklist_lib"; -import { ContextUtils } from "ContextUtils_lib"; -import { newSelect } from "SqlBuilder_lib"; - -var context = ContextUtils.getCurrentContextId(); -var checklistIds = [""]; -var select = ChecklistUtils.getCaseWhenSqlSelectWithConditions(context); - -if(select) -{ - checklistIds = newSelect(select) - .from("TICKET") - .where("TICKET.TICKETID", vars.get("$field.TICKETID")) - .arrayRow(); - - checklistIds.filter(function(checklistId) - { - return checklistId != ""; - }); -} - -result.string(JSON.stringify(checklistIds)); \ No newline at end of file diff --git a/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js deleted file mode 100644 index 14334199909700acf78e0ea935db85415d55fbc2..0000000000000000000000000000000000000000 --- a/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js +++ /dev/null @@ -1,3 +0,0 @@ -import { result, vars } from "@aditosoftware/jdito-types"; - -result.string(vars.get("$field.TICKETID")); \ No newline at end of file diff --git a/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/objecttype_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/objecttype_param/valueProcess.js deleted file mode 100644 index 3ed3e541161b234cc268134709a47c1dfd9812b5..0000000000000000000000000000000000000000 --- a/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/objecttype_param/valueProcess.js +++ /dev/null @@ -1,4 +0,0 @@ -import { result } from "@aditosoftware/jdito-types"; -import { ContextUtils } from "ContextUtils_lib"; - -result.string(ContextUtils.getCurrentContextId()); \ No newline at end of file diff --git a/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/presentationmode_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/presentationmode_param/valueProcess.js deleted file mode 100644 index f9183d6c85c5ffdd12d51c35697bece1424edd7b..0000000000000000000000000000000000000000 --- a/entity/SupportTicket_entity/entityfields/checklistentryvalues/children/presentationmode_param/valueProcess.js +++ /dev/null @@ -1,3 +0,0 @@ -import { result, vars } from "@aditosoftware/jdito-types"; - -result.string(vars.get("$sys.presentationmode")); \ No newline at end of file diff --git a/entity/SupportTicket_entity/entityfields/checklistwarningtext/valueProcess.js b/entity/SupportTicket_entity/entityfields/checklistwarningtext/valueProcess.js deleted file mode 100644 index d2046f499e48a016b752e6cfc33f021f15fb8384..0000000000000000000000000000000000000000 --- a/entity/SupportTicket_entity/entityfields/checklistwarningtext/valueProcess.js +++ /dev/null @@ -1,7 +0,0 @@ -import { result, translate, vars } from "@aditosoftware/jdito-types"; -import { Utils } from "Utils_lib"; - -if(!Utils.toBoolean(vars.get("$field.isSupportticketAllowedToBeCompleted"))) -{ - result.string(translate.text("SupportTicket_Mandatory specification in checklist open")); -} \ No newline at end of file diff --git a/entity/SupportTicket_entity/entityfields/issupportticketallowedtobecompleted/valueProcess.js b/entity/SupportTicket_entity/entityfields/issupportticketallowedtobecompleted/valueProcess.js deleted file mode 100644 index 6aa886a06c5d30cf13c37da89f62e05d1ee86bee..0000000000000000000000000000000000000000 --- a/entity/SupportTicket_entity/entityfields/issupportticketallowedtobecompleted/valueProcess.js +++ /dev/null @@ -1,4 +0,0 @@ -import { result, vars } from "@aditosoftware/jdito-types"; -import { ChecklistUtils } from "Checklist_lib"; - -result.string(ChecklistUtils.isSupportticketAllowedToBeCompleted(vars.get("$field.TICKETID"))); \ No newline at end of file diff --git a/entity/SupportTicket_entity/entityfields/keywordticketconclusion/children/blacklistids_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/keywordticketconclusion/children/blacklistids_param/valueProcess.js index 30d43afc5702eba34fad2a3d887dc61737fb5c4b..315d83cbd965b66e233c24930145a286aaac7c02 100644 --- a/entity/SupportTicket_entity/entityfields/keywordticketconclusion/children/blacklistids_param/valueProcess.js +++ b/entity/SupportTicket_entity/entityfields/keywordticketconclusion/children/blacklistids_param/valueProcess.js @@ -1,14 +1,8 @@ -import { modules, result, vars } from "@aditosoftware/jdito-types"; +import { modules, result } from "@aditosoftware/jdito-types"; import { $SupportTicketKeywords } from "SupportTicketKeywords_registry"; -import { Utils } from "Utils_lib"; var res = [$SupportTicketKeywords.ticketConclusion$merged()]; modules.loadService("keywordTicketConclusionBlacklistIds_service") .forEach(implementation => res = implementation()(res)); -//TODO Checklist -if(!Utils.toBoolean(vars.get("$field.isSupportticketAllowedToBeCompleted"))) -{ - res.push($SupportTicketKeywords.ticketConclusion$success()); -} result.object(res); \ No newline at end of file diff --git a/neonView/SupportTicketMain_view/SupportTicketMain_view.aod b/neonView/SupportTicketMain_view/SupportTicketMain_view.aod index 39e6fe5e88f9ca1b408deb80d8b364706a99ed48..14c9958975e4319f0f4455018309d72c9f4b7a8b 100644 --- a/neonView/SupportTicketMain_view/SupportTicketMain_view.aod +++ b/neonView/SupportTicketMain_view/SupportTicketMain_view.aod @@ -38,11 +38,9 @@ <entityField>#ENTITY</entityField> <view>SupportTicketResourceOverview_view</view> </neonViewReference> - <neonViewReference> - <name>af00a5c6-f79b-4673-b1cf-945734702ebd</name> - <entityField>ChecklistEntryValues</entityField> - <view>ChecklistEntryValueList_view</view> - </neonViewReference> + <neonViewExtensionPoint> + <name>ChecklistEntryValueListViewExtensionPoint</name> + </neonViewExtensionPoint> <neonViewReference> <name>6846f680-84ef-46da-a0ea-6797044cf693</name> <entityField>Documents</entityField> diff --git a/package-lock.json b/package-lock.json index 921e8d7763bff0e79cac8d8ec6283dce75b33c77..7556315b76e86c351919cb2226e52c954c416126 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@aditosoftware/supportticket", - "version": "0.1.0-SNAPSHOT.1", + "version": "0.1.0-SNAPSHOT.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@aditosoftware/supportticket", - "version": "0.1.0-SNAPSHOT.1", + "version": "0.1.0-SNAPSHOT.2", "devDependencies": { "@aditosoftware/devtools": "^2.0.0", "@aditosoftware/eslint-config-adito": "^3.3.0", diff --git a/package.json b/package.json index 0d3f94f72d396e820708c823267f9cc7ae8c1f6b..97a6e3ed349469bdf62cc46ea0b6c89972fd7376 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@aditosoftware/supportticket", - "version": "0.1.0-SNAPSHOT.1", + "version": "0.1.0-SNAPSHOT.2", "adito": { "type": "module" },