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

entity/ChecklistEntry_entity/entityfields/user_new/valueProcess.js

@@ -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.user"));
 }
\ No newline at end of file

entity/Checklist_entity/entityfields/date_edit/valueProcess.js

@@ -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/Checklist_entity/entityfields/date_new/valueProcess.js

@@ -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)
 {
     result.string(vars.get("$sys.date"));
 }
\ No newline at end of file

entity/Checklist_entity/entityfields/user_edit/valueProcess.js

@@ -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

entity/Checklist_entity/entityfields/user_new/valueProcess.js

@@ -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.user"));
 }
\ No newline at end of file

entity/Member_entity/Member_entity.aod

@@ -456,7 +456,6 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <isFilterable v="true" />
-      <isSortable v="true" />
       <contentProcess>%aditoprj%/entity/Member_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <onInsert>%aditoprj%/entity/Member_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/Member_entity/recordcontainers/jdito/onUpdate.js</onUpdate>

entity/Member_entity/recordcontainers/jdito/contentProcess.js

@@ -128,7 +128,7 @@ if (Utils.isNullOrEmpty(idValues) || memberRows.length === 0)
             row[7],
             "VAADIN:GLOBE",
             "TEXT:" + row[4].substring(row[4].indexOf(" ", 0)+1, row[4].length),
-            "MEMBERROLEDISTRICTRESPONSIBLE",
+            "70cbad1b-eac6-4369-ba50-4946e0fbcb3a",
             translate.text("District Responsible"),
             vars.get("$param.ObjectRowId_param"),
             vars.get("$param.ObjectType_param"),

entity/SalesprojectPhaseDefinition_entity/entityfields/date_edit/valueProcess.js

@@ -5,7 +5,7 @@ import("system.result");
 
 var currentDate = null;
 
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
 {
     currentUser = vars.get("$sys.date");
 }

entity/SalesprojectPhaseDefinition_entity/entityfields/date_new/valueProcess.js

@@ -5,7 +5,7 @@ import("system.result");
 
 var currentDate = null;
 
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
 {
     currentUser = vars.get("$sys.date");
 }

entity/SalesprojectPhaseDefinition_entity/entityfields/phase/dropDownProcess.js

@@ -4,7 +4,6 @@ import("KeywordRegistry_basic");
 import("Keyword_lib");
 import("Sql_lib");
 
-
 var salesprojectPhases = KeywordUtils.getEntryNamesAndIdsByContainer($KeywordRegistry.salesprojectPhase());
 var dropDownEntries = [];
 var counter = 0;
@@ -13,11 +12,12 @@ var exisitingPhases = newSelect("PHASE")
                         .from("SALESPROJECTPHASEDEFINITION")
                         .arrayColumn();
 
-salesprojectPhases.forEach(function(pSalesprojectPhase){
-    
-    var isExistent = exisitingPhases.includes(pSalesprojectPhase[0]);
+salesprojectPhases.forEach(function(pSalesprojectPhase)
+{
+    var doesExist = exisitingPhases.includes(pSalesprojectPhase[0]);
     
-    if (!isExistent || (vars.get("$field.PHASE") == pSalesprojectPhase[0])) {
+    if (!doesExist)
+    {
         dropDownEntries[counter] = [pSalesprojectPhase[0], pSalesprojectPhase[1]];
     }
     

entity/SalesprojectPhaseDefinition_entity/entityfields/phase/onValidation.js

@@ -11,14 +11,14 @@ if(thisValue != null && thisValue != "" &&
     vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW &&
     thisValue != vars.get("$field.PHASE"))
 {
-   var isExistent = newSelect("COUNT(*)")
+   var doesExist = newSelect("COUNT(*)")
                     .from("SALESPROJECTPHASEDEFINITION")
                     .where("SALESPROJECTPHASEDEFINITION.SALESPROJECTPHASE", localValue)
                     .cell();
     
-    if (isExistent > 0)
+    if (doesExist > 0)
     {
-        result.string(translate.text("For this salesproject phase are already traits defined."));
+        result.string(translate.text("Traits have already been defined for this salesproject phase."));
     }
 }
                     

entity/SalesprojectPhaseDefinition_entity/entityfields/user_edit/valueProcess.js

@@ -5,7 +5,7 @@ import("system.result");
 
 var currentUser = null;
 
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
 {
     currentUser = vars.get("$sys.user");
 }

entity/SalesprojectPhaseDefinition_entity/entityfields/user_new/valueProcess.js

@@ -5,7 +5,7 @@ import("system.result");
 
 var currentUser = null;
 
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
 {
     currentUser = vars.get("$sys.user");
 }

entity/SalesprojectPhaseDefinition_entity/iconIdProcess.js

 import("system.vars");
 import("system.result");
 
-result.string("TEXT:" + vars.getString("$field.PHASE").substr(vars.getString("$field.PHASE").indexOf("PHASE",0)+5, vars.getString("$field.PHASE").length).trim());
+result.string("TEXT:" + vars.getString("$field.PHASE.displayValue"));
\ No newline at end of file

entity/SalesprojectPhaseDefinition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js

@@ -4,6 +4,5 @@ import("KeywordRegistry_basic");
 import("Sql_lib");
 
 var resolvingSql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "SALESPROJECTPHASEDEFINITION.SALESPROJECTPHASE");
-//var sql = "case when SALESPROJECT_PHASE = '" + $KeywordRegistry.salesprojectPhase$offer() + "' THEN 'Offer' ELSE (" + resolvingSql.toString() + ") end";
 
 result.string(resolvingSql);

entity/Salesproject_entity/entityfields/checklistentryvalues/children/checklistid_param/valueProcess.js

@@ -4,7 +4,7 @@ import("KeywordRegistry_basic");
 import("Sql_lib");
 
 
-var checklistId = newSelect("CHECKLIST_ID")
+var checklistId = newSelect("SALESPROJECTPHASEDEFINITION.CHECKLIST_ID")
                         .from("SALESPROJECTPHASEDEFINITION")
                         .where("SALESPROJECTPHASEDEFINITION.PHASE", vars.get("$field.PHASE"))
                         .cell();

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

@@ -8097,6 +8097,9 @@
     <entry>
       <key>Add %0 Observations</key>
     </entry>
+    <entry>
+      <key>Traits have already been defined for this salesproject phase.</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -10688,6 +10688,14 @@ Bitte Datumseingabe prüfen</value>
       <key>Add %0 Observations</key>
       <value>%0 Beobachtungen hinzufügen</value>
     </entry>
+    <entry>
+      <key>Traits have already been defined for this salesproject phase.</key>
+      <value>Für diese Vertriebsprojektphase wurden schon Merkmale festgelegt.</value>
+    </entry>
+    <entry>
+      <key>Automatically</key>
+      <value>Automatisch</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

@@ -8199,6 +8199,9 @@
     <entry>
       <key>Add %0 Observations</key>
     </entry>
+    <entry>
+      <key>Traits have already been defined for this salesproject phase.</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

neonView/ChecklistEntryList_view/ChecklistEntryList_view.aod

@@ -10,7 +10,7 @@
   <children>
     <titledListViewTemplate>
       <name>titledListViewTemplate</name>
-      <titleField>TYPE</titleField>
+      <titleField>AUTO</titleField>
       <columns>
         <neonTitledListTableColumn>
           <name>49ad66e3-645d-489a-8bf8-d56645cf5465</name>