Employee use rowdata in onInsert

(cherry picked from commit 2945588f)

entity/Employee_entity/Employee_entity.aod

@@ -383,6 +383,9 @@
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PASSWORD.value</name>
+        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>CONFIRM_PASSWORD.value</name>
         </jDitoRecordFieldMapping>
@@ -395,12 +398,6 @@
           <name>SHORT_UID.value</name>
         </jDitoRecordFieldMapping>
       </recordFieldMappings>
-      <filterExtensions>
-        <filterExtension>
-          <name>filterExtension</name>
-          <contentType>TEXT</contentType>
-        </filterExtension>
-      </filterExtensions>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>

entity/Employee_entity/recordcontainers/jdito/contentProcess.js

@@ -35,16 +35,17 @@ users = users.map(function (user)
         user[tools.DESCRIPTION],
         user[tools.PARAMS][tools.CONTACTID], //8
         user[tools.PARAMS].department,
-        null,                                
-        "",
-        fetchRoles ? tools.getRoles(user[tools.TITLE]) : [] //for filtering
+        "", //password
+        "", //confirm_password
+        fetchRoles ? tools.getRoles(user[tools.TITLE]) : [], //for filtering
+        EmployeeUtils.sliceUserId(user[tools.NAME])
     ];
 });
 
 var filter = vars.get("$local.filter"); 
 
 //TODO: this is a workaround that filters the records manually, it should be possible to filter the users with a tools.* method
-var filterFields = ["UID", "TITLE", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "", "DESCRIPTION", "CONTACT_ID", "", "DEPARTMENT", "", "ROLE_FILTER"];
+var filterFields = ["UID", "TITLE", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "", "DESCRIPTION", "CONTACT_ID", "DEPARTMENT", "", "", "ROLE_FILTER"];
 var filterFns = {
     "ROLE_FILTER" : function (pRecordVal, pFilterVal, pOperator)
     {
@@ -67,11 +68,7 @@ var filterFns = {
 };
 users = JditoFilterUtils.filterRecords(filterFields, users, filter.filter, filterFns);
 
-for (let i = 0, l = users.length; i < l; i++)
-{
-    users[i][11] = "";
-    users[i][12] = EmployeeUtils.sliceUserId(users[i][0]);
-}
+users.forEach(function (user) {user[12] = "";}); //clean up the ROLE_FILTER field, we don't need it after filtering
 
 var order = vars.get("$local.order");
 var columnOrder = {

entity/Employee_entity/recordcontainers/jdito/onInsert.js

@@ -3,22 +3,24 @@ import("system.vars");
 import("system.tools");
 import("Employee_lib");
 
+var rowdata = vars.get("$local.rowdata");
+
 var user = {};
 var params = []; //this has to be an array
-params[tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
-params[tools.LASTNAME] = vars.get("$field.LASTNAME");
-params[tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
-params[tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
-params[tools.CONTACTID] = vars.get("$field.CONTACT_ID");
-params[tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
-params[tools.ISACTIVE] = vars.get("$field.ISACTIVE");
-params.department = vars.get("$field.DEPARTMENT");
+params[tools.EMAIL] = rowdata["EMAIL_ADDRESS.value"];
+params[tools.CALENDARID] = rowdata["EMAIL_ADDRESS.value"];
+params[tools.DESCRIPTION] = rowdata["DESCRIPTION.value"];
+params[tools.CONTACTID] = rowdata["CONTACT_ID.value"];
+params[tools.FIRSTNAME] = rowdata["FIRSTNAME.value"];
+params[tools.LASTNAME] = rowdata["LASTNAME.value"];
+params[tools.ISACTIVE] = rowdata["ISACTIVE.value"];
+params.department = rowdata["DEPARTMENT.value"];
 
-user[tools.TITLE] = vars.get("$field.TITLE");
+user[tools.TITLE] = rowdata["TITLE.value"];
 user[tools.PARAMS] = params;
 
-if (vars.get("$field.PASSWORD") && vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
+if (rowdata["PASSWORD.value"] && rowdata["PASSWORD.value"] == rowdata["CONFIRM_PASSWORD.value"])
 {
-    user[tools.PASSWORD] = vars.getString("$field.PASSWORD");
+    user[tools.PASSWORD] = rowdata["PASSWORD.value"];
 }
-tools.insertUser(user, vars.get("$field.UID"));
\ No newline at end of file
+tools.insertUser(user, rowdata["UID.value"]);
\ No newline at end of file