Skip to content
Snippets Groups Projects
Commit 24fb6619 authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

Merge branch '1073510_FixCleanSalesProcessCode' into '2021.0' 

[Projekt: xRM-Sales][TicketNr.: 1073510][Vertriebsprozesse - Überarbeitung: Code refactoring]

See merge request xrm/basic!658
parents 774796bb 31f31654
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 220 additions and 101 deletions
.liquibase/Data_alias/basic/2021.0.2/Checklists/alter_ChecklistEntry.xml 0 → 100644
+ 35
− 0
View file @ 24fb6619
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<!--change datatype of title to nvarchar (derby doesn't have nvarchar)-->
<changeSet dbms="!derby" author="b.ulrich" id="77758b00-afe0-457d-886c-3cfe5bd6dca3">
<modifyDataType tableName="CHECKLISTENTRY" columnName="TITLE" newDataType="NVARCHAR(100)"/>
</changeSet>
<!--make automatic work as an boolean-->
<!--change "type" to "auto"-->
<changeSet author="b.ulrich" id="986053d4-8b69-4892-93cd-2f2defbc85d1">
<addColumn tableName="CHECKLISTENTRY">
<column name="AUTO" type="TINYINT" defaultValueNumeric="0"/>
</addColumn>
<!--update existing Data-->
<update tableName="CHECKLISTENTRY">
<column name="AUTO" valueNumeric="1"/>
<where>TYPE = ?</where>
<whereParams>
<param value="AUTO"/>
</whereParams>
</update>
<!--and add not Null constraint-->
<addNotNullConstraint
columnDataType="TINYINT"
columnName="AUTO"
tableName="CHECKLISTENTRY"/>
<!--drop old column-->
<dropColumn tableName="CHECKLISTENTRY">
<column name="TYPE"/>
</dropColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.0.2/Checklists/changelog.xml 0 → 100644
+ 6
− 0
View file @ 24fb6619
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include relativeToChangelogFile="true" file="alter_ChecklistEntry.xml"/>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.0.2/changelog.xml
+ 1
− 0
View file @ 24fb6619
......@@ -3,4 +3,5 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include relativeToChangelogFile="true" file="Event/changelog.xml"/>
<include relativeToChangelogFile="true" file="alter_CompetitionExpandReasonSize.xml"/>
<include relativeToChangelogFile="true" file="Checklists/changelog.xml"/>
</databaseChangeLog>
\ No newline at end of file
aliasDefinition/Data_alias/Data_alias.aod
+ 7
− 6
View file @ 24fb6619
......@@ -18106,11 +18106,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>TYPE</name>
<name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="10" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -18119,16 +18119,17 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>USER_EDIT</name>
<name>AUTO</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
......
entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod
+ 15
− 5
View file @ 24fb6619
......@@ -21,7 +21,6 @@
<name>CHECKLISTENTRY_ID</name>
<title>Checklist entry</title>
<state>READONLY</state>
<displayValueProcess>%aditoprj%/entity/ChecklistEntryValue_entity/entityfields/checklistentry_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
......@@ -103,11 +102,13 @@
</children>
</entityActionGroup>
<entityField>
<name>type</name>
<title>Type</title>
<valueProcess>%aditoprj%/entity/ChecklistEntryValue_entity/entityfields/type/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/ChecklistEntryValue_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
<name>AUTO</name>
<title>Automatically</title>
</entityField>
<entityParameter>
<name>ChecklistEntryValueId_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......@@ -146,6 +147,15 @@
<jDitoRecordFieldMapping>
<name>USER_NEW.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>CHECKLISTENTRY_ID.displayValue</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>AUTO.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>AUTO.displayValue</name>
</jDitoRecordFieldMapping>
</recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
......
entity/ChecklistEntryValue_entity/entityfields/checklistentry_id/displayValueProcess.js deleted 100644 → 0
+ 0
− 29
View file @ 774796bb
import("system.db");
import("system.result");
import("system.vars");
import("system.translate");
import("ChecklistEntryRegistry_basic");
import("Util_lib");
import("Sql_lib");
var alias = db.getCurrentAlias();
var checklistEntryId = vars.get("$field.CHECKLISTENTRY_ID");
var verfierFnName = newSelect("TITLE", alias)
.from("CHECKLISTENTRY")
.where("CHECKLISTENTRY.CHECKLISTENTRYID", checklistEntryId)
.cell();
var verifierFn = $ChecklistEntryRegistry[verfierFnName];
var displayValue;
if (Utils.isFunction(verifierFn))
displayValue = verifierFn().title;
else{
displayValue = translate.text(verfierFnName);
}
result.string(displayValue);
entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/children/setcompleted/onActionProcess.js
+ 21
− 4
View file @ 24fb6619
import("system.entities");
import("system.vars");
import("system.neon");
import("Sql_lib");
var loadConfig = entities.createConfigForLoadingRows()
.entity("ChecklistEntryValue_entity")
.fields(["CHECKLISTENTRYVALUEID"])
.addParameter("ObjectRowId_param", vars.get("$param.ObjectRowId_param"))
.addParameter("ChecklistEntryValueId_param", vars.get("$field.CHECKLISTENTRYVALUEID"))
.addParameter("ChecklistId_param", vars.get("$param.ChecklistId_param"));
newWhere("CHECKLISTENTRYVALUE.CHECKLISTENTRYVALUEID", "$field.CHECKLISTENTRYVALUEID")
.updateFields({"IS_FULFILLED":1});
neon.refreshAll();
\ No newline at end of file
var checklistEntryValueIds = entities.getRows(loadConfig);
var updateConfig = entities.createConfigForUpdatingRows()
.entity("ChecklistEntryValue_entity")
.fieldValues({"IS_FULFILLED": 1})
.uid(checklistEntryValueIds[0]["CHECKLISTENTRYVALUEID"])
.addParameter("ObjectRowId_param", vars.get("$param.ObjectRowId_param"))
.addParameter("ChecklistEntryValueId_param", vars.get("$field.CHECKLISTENTRYVALUEID"))
.addParameter("ChecklistId_param", vars.get("$param.ChecklistId_param"))
.ignorePermissions(true);
entities.updateRow(updateConfig);
neon.refresh();
\ No newline at end of file
entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/stateProcess.js
+ 2
− 3
View file @ 24fb6619
......@@ -4,12 +4,11 @@ import("system.neon");
import("KeywordRegistry_basic");
if (vars.get("$field.type") == $KeywordRegistry.checklistEntryType$auto())
if (vars.get("$field.AUTO") == 1)
{
result.string(neon.COMPONENTSTATE_DISABLED);
}
if (vars.get("$field.type") == $KeywordRegistry.checklistEntryType$manual())
else
{
result.string(neon.COMPONENTSTATE_EDITABLE);
}
\ No newline at end of file
entity/ChecklistEntryValue_entity/entityfields/type/displayValueProcess.js deleted 100644 → 0
+ 0
− 7
View file @ 774796bb
import("Keyword_lib");
import("system.vars");
import("system.result");
import("KeywordRegistry_basic");
result.string(KeywordUtils.getViewValue($KeywordRegistry.checklistEntryType(), vars.get("$field.type")));
\ No newline at end of file
entity/ChecklistEntryValue_entity/entityfields/type/valueProcess.js deleted 100644 → 0
+ 0
− 16
View file @ 774796bb
import("system.result");
import("system.vars");
import("Sql_lib");
var checklistEntryId = vars.get("$field.CHECKLISTENTRY_ID");
if (checklistEntryId)
{
var type = newSelect("TYPE")
.from("CHECKLISTENTRY")
.where("CHECKLISTENTRY.CHECKLISTENTRYID", checklistEntryId)
.cell();
result.string(type);
}
\ No newline at end of file
entity/ChecklistEntryValue_entity/recordcontainers/jdito/contentProcess.js
+ 96
− 19
View file @ 24fb6619
import("system.translate");
import("system.result");
import("system.vars");
import("system.util");
......@@ -5,10 +6,10 @@ import("system.db");
import("KeywordRegistry_basic");
import("Util_lib");
import("Sql_lib");
import("ChecklistEntryRegistry_basic");
var newUid;
var isExistent;
var doesExist;
var checklistEntryIds = [];
var preparedStatements = [];
var checklistEntryValues = [];
......@@ -19,11 +20,45 @@ var cols = ["CHECKLISTENTRYVALUEID", "CHECKLISTENTRY_ID", "OBJECT_ROWID", "OBJEC
var checklistId = vars.get("$param.ChecklistId_param");
var objectRowId = vars.get("$param.ObjectRowId_param");
//var objectType = vars.get("$param.ObjectType_param"); - necessary?
var checklistEntries = [];
if (checklistId)
var checklistEntryValueId = vars.get("$param.ChecklistEntryValueId_param");
if (checklistEntryValueId)
{
//get all entries of the current checklist
checklistEntries = newSelect([
"CHECKLISTENTRY.CHECKLISTENTRYID",
"CHECKLISTENTRY.CHECKLIST_ID",
"CHECKLISTENTRY.TITLE",
"CHECKLISTENTRY.AUTO",
"CHECKLISTENTRY.USER_NEW",
"CHECKLISTENTRY.USER_EDIT",
"CHECKLISTENTRY.DATE_NEW",
"CHECKLISTENTRY.DATE_EDIT"])
.from("CHECKLISTENTRY")
.join("CHECKLISTENTRYVALUE", "CHECKLISTENTRYVALUE.CHECKLISTENTRY_ID = CHECKLISTENTRY.CHECKLISTENTRYID")
.where("CHECKLISTENTRY.CHECKLIST_ID", checklistId)
.and("CHECKLISTENTRYVALUE.CHECKLISTENTRYVALUEID", checklistEntryValueId)
.table();
checklistEntries.forEach(function(pRow){
if (pRow[0])
{
checklistEntryIds.push(pRow[0]);
}
});
}
else if (checklistId)
{
checklistEntries = newSelect("CHECKLISTENTRYID, CHECKLIST_ID, TITLE, TYPE, USER_NEW, USER_EDIT, DATE_NEW, DATE_EDIT")
//get all entries of the current checklist
checklistEntries = newSelect([
"CHECKLISTENTRY.CHECKLISTENTRYID",
"CHECKLISTENTRY.CHECKLIST_ID",
"CHECKLISTENTRY.TITLE",
"CHECKLISTENTRY.AUTO",
"CHECKLISTENTRY.USER_NEW",
"CHECKLISTENTRY.USER_EDIT",
"CHECKLISTENTRY.DATE_NEW",
"CHECKLISTENTRY.DATE_EDIT"])
.from("CHECKLISTENTRY")
.where("CHECKLISTENTRY.CHECKLIST_ID", checklistId)
.table();
......@@ -36,13 +71,14 @@ if (checklistId)
});
}
for (i = 0; i < checklistEntries.length; i++)
//loop trough the checklistEntries and handle them according to their type
for (let i = 0; i < checklistEntries.length; i++)
{
for (j = 0; j < checklistEntries[i].length; j++)
for (let ii = 0; ii < checklistEntries[i].length; ii++)
{
checklistEntryValues[i] = new Array(10);
checklistEntryValues[i] = new Array(13);
if (checklistEntries[i][3] == $KeywordRegistry.checklistEntryType$auto())
if (checklistEntries[i][3] == 1)//if auto == true
{
newUid = util.getNewUUID();
vars.set("$param.VerifierFnName_param", checklistEntries[i][2]);
......@@ -50,28 +86,37 @@ for (i = 0; i < checklistEntries.length; i++)
Utils.toBoolean(vars.get("$param.Verifier_param")) ? 1 : 0, objectRowId,
"", "null", vars.get("$sys.user")];
}
else
else//else manual
{
isExistent = newSelect("CHECKLISTENTRYVALUEID, CHECKLISTENTRY_ID, CHECKLISTENTRYVALUEID,\n\
DATE_EDIT, DATE_NEW, IS_FULFILLED, OBJECT_ROWID, OBJECT_TYPE, USER_EDIT, USER_NEW")
doesExist = newSelect([
"CHECKLISTENTRYVALUE.CHECKLISTENTRYVALUEID",
"CHECKLISTENTRYVALUE.CHECKLISTENTRY_ID",
"CHECKLISTENTRYVALUE.CHECKLISTENTRYVALUEID",
"CHECKLISTENTRYVALUE.DATE_EDIT",
"CHECKLISTENTRYVALUE.DATE_NEW",
"CHECKLISTENTRYVALUE.IS_FULFILLED",
"CHECKLISTENTRYVALUE.OBJECT_ROWID",
"CHECKLISTENTRYVALUE.OBJECT_TYPE",
"CHECKLISTENTRYVALUE.USER_EDIT",
"CHECKLISTENTRYVALUE.USER_NEW"])
.from("CHECKLISTENTRYVALUE")
.where("CHECKLISTENTRYVALUE.CHECKLISTENTRY_ID", checklistEntries[i][0])
.and("CHECKLISTENTRYVALUE.OBJECT_ROWID", objectRowId)
.arrayRow();
if (isExistent.length > 0)
if (doesExist.length > 0)
{
checklistEntryValues[i] = isExistent;
checklistEntryValues[i] = doesExist;
}
else
{
newUid = util.getNewUUID();
checklistEntryValues[i] = [newUid, checklistEntries[i][0], newUid, "", vars.get("$sys.date"), "0", objectRowId, "",
"null", vars.get("$sys.user")];
isExistent = preparedStatements.some(function(pPreparedStatement){
"null", vars.get("$sys.user"), ""];
doesExist = preparedStatements.some(function(pPreparedStatement){
return pPreparedStatement[3].includes(checklistEntries[i][0]) && pPreparedStatement[3].includes(objectRowId);
});
if (!isExistent)
if (!doesExist)
{
preparedStatements.push(["CHECKLISTENTRYVALUE",
cols,
......@@ -89,7 +134,39 @@ for (i = 0; i < checklistEntries.length; i++)
}
}
}
checklistEntryValues[i][10] = _checklistEntryDisplayValue(checklistEntries[i][2]);
checklistEntryValues[i][11] = checklistEntries[i][3];
checklistEntryValues[i][12] = _autoDisplayValue(checklistEntries[i][3]);
}
db.inserts(preparedStatements, db.getCurrentAlias());
result.object(checklistEntryValues);
\ No newline at end of file
db.inserts(preparedStatements);//insert the ones that don't already exist
result.object(checklistEntryValues);
function _checklistEntryDisplayValue(pChecklistEntryTitle)
{
var displayValue;
var verfierFnName = pChecklistEntryTitle;
var verifierFn = $ChecklistEntryRegistry[verfierFnName];
if (Utils.isFunction(verifierFn))
displayValue = verifierFn().title;
else{
displayValue = translate.text(verfierFnName);
}
return displayValue;
}
function _autoDisplayValue(pAutoValue)
{
if(pAutoValue == 1)
{
return translate.text("Automatically");
}
else
{
return translate.text("Manually");
}
}
\ No newline at end of file
entity/ChecklistEntry_entity/ChecklistEntry_entity.aod
+ 11
− 7
View file @ 24fb6619
......@@ -19,13 +19,17 @@
<entityField>
<name>TITLE</name>
<title>Title</title>
<mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/title/dropDownProcess.js</dropDownProcess>
<displayValueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/title/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>TYPE</name>
<title>Type</title>
<dropDownProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/type/dropDownProcess.js</dropDownProcess>
<name>AUTO</name>
<title>Automatically</title>
<contentType>BOOLEAN</contentType>
<placeholderProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/auto/placeholderProcess.js</placeholderProcess>
<displayValueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/auto/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/ChecklistEntry_entity/entityfields/auto/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>USER_EDIT</name>
......@@ -99,10 +103,6 @@
<name>TITLE.value</name>
<recordfield>CHECKLISTENTRY.TITLE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TYPE.value</name>
<recordfield>CHECKLISTENTRY.TYPE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_EDIT.value</name>
<recordfield>CHECKLISTENTRY.USER_EDIT</recordfield>
......@@ -115,6 +115,10 @@
<name>CHECKLIST_ID.value</name>
<recordfield>CHECKLISTENTRY.CHECKLIST_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>AUTO.value</name>
<recordfield>CHECKLISTENTRY.AUTO</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/ChecklistEntry_entity/entityfields/type/dropDownProcess.js → entity/ChecklistEntry_entity/entityfields/auto/displayValueProcess.js
+ 14
− 0
View file @ 24fb6619
import("system.translate");
import("system.result");
import("system.vars");
import("system.translate");
result.object({"MANUAL":translate.text("Manually"), "AUTO":translate.text("Automatically")});
\ No newline at end of file
var auto = vars.get("$field.AUTO");
if(auto == 1)
{
result.string(translate.text("Automatically"));
}
else
{
result.string(translate.text("Manually"));
}
\ No newline at end of file
entity/ChecklistEntry_entity/entityfields/auto/onValueChange.js 0 → 100644
+ 3
− 0
View file @ 24fb6619
import("system.neon");
neon.setFieldValue("$field.TITLE", null);
\ No newline at end of file
entity/ChecklistEntry_entity/entityfields/auto/placeholderProcess.js 0 → 100644
+ 4
− 0
View file @ 24fb6619
import("system.translate");
import("system.result");
result.string(translate.text("Automatically"));
\ No newline at end of file
entity/ChecklistEntry_entity/entityfields/date_edit/valueProcess.js
+ 1
− 1
View file @ 24fb6619
......@@ -2,7 +2,7 @@ import("system.vars");
import("system.result");
import("system.neon");
if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
result.string(vars.get("$sys.date"));
}
\ No newline at end of file
entity/ChecklistEntry_entity/entityfields/date_new/valueProcess.js
+ 1
− 1
View file @ 24fb6619
......@@ -2,7 +2,7 @@ import("system.vars");
import("system.result");
import("system.neon");
if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
{
result.string(vars.get("$sys.date"));
}
\ No newline at end of file
entity/ChecklistEntry_entity/entityfields/title/displayValueProcess.js
+ 1
− 1
View file @ 24fb6619
......@@ -5,7 +5,7 @@ import("KeywordRegistry_basic");
var title = vars.get("$field.TITLE");
if (vars.get("$field.TYPE") == $KeywordRegistry.checklistEntryType$manual())
if (vars.get("$field.AUTO") != 1)
{
result.string(translate.text(title));
}
\ No newline at end of file
entity/ChecklistEntry_entity/entityfields/title/dropDownProcess.js
+ 1
− 1
View file @ 24fb6619
......@@ -4,7 +4,7 @@ import("KeywordRegistry_basic");
import("ChecklistEntryRegistry_basic");
if (vars.get("$field.TYPE") == $KeywordRegistry.checklistEntryType$auto())
if (vars.get("$field.AUTO") == 1)
{
result.object($ChecklistEntryRegistry.getEntryList());
}
\ No newline at end of file
entity/ChecklistEntry_entity/entityfields/user_edit/valueProcess.js
+ 1
− 1
View file @ 24fb6619
......@@ -2,7 +2,7 @@ import("system.vars");
import("system.result");
import("system.neon");
if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
result.string(vars.get("$sys.user"));
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment