Employee userId as uid

entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js

@@ -5,7 +5,7 @@ import("system.tools");
 var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
 var role = vars.get("$field.ROLE");
 
-if (userTitle)
+if (userTitle && tools.existUsers(userTitle))
 {    
     var user = tools.getUser(userTitle);
     var roles = tools.getRoles(userTitle);

entity/Employee_entity/Employee_entity.aod

@@ -6,7 +6,6 @@
   <contentTitleProcess>%aditoprj%/entity/Employee_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Employee_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
-  <afterOperatingState>%aditoprj%/entity/Employee_entity/afterOperatingState.js</afterOperatingState>
   <iconId>VAADIN:USER</iconId>
   <titlePlural>Employees</titlePlural>
   <recordContainer>jdito</recordContainer>
@@ -272,14 +271,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityField>
-      <name>USERID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>USERID_SMALL</name>
-      <searchable v="false" />
-    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
@@ -301,8 +292,6 @@
         <element>CONTACT_ID.value</element>
         <element>CONTACT_ID.displayValue</element>
         <element>DEPARTMENT.value</element>
-        <element>USERID.value</element>
-        <element>USERID_SMALL.value</element>
       </recordFields>
     </jDitoRecordContainer>
   </recordContainers>

entity/Employee_entity/afterOperatingState.js

-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    neon.setFieldValue("$field.UID", ""); //UID = user-title, should be initially empty
\ No newline at end of file

entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js

+import("Employee_lib");
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.USERID_SMALL"));
\ No newline at end of file
+result.string(EmployeeUtils.sliceUserId(vars.get("$field.UID")));
\ No newline at end of file

entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js

+import("Employee_lib");
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.USERID_SMALL"));
\ No newline at end of file
+result.string(EmployeeUtils.sliceUserId(vars.get("$field.UID")));
\ No newline at end of file

entity/Employee_entity/entityfields/contact_id/onValidation.js

@@ -6,7 +6,7 @@ import("system.translate");
 var contactId = vars.get("$field.CONTACT_ID");
 var isTaken = tools.getUserByAttribute(tools.CONTACTID, [contactId]);
 isTaken = isTaken 
-    ? isTaken[tools.NAME] != vars.get("$field.USERID")
+    ? isTaken[tools.NAME] != vars.get("$field.UID")
     : false;
 if (contactId && isTaken)
     result.string(translate.text("The person is already associated with another employee!"));
\ No newline at end of file

entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js

+import("Employee_lib");
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.USERID_SMALL"));
\ No newline at end of file
+result.string(EmployeeUtils.sliceUserId(vars.get("$field.UID")));
\ No newline at end of file

entity/Employee_entity/entityfields/email_address/onValidation.js

@@ -7,7 +7,7 @@ import("system.translate");
 var email = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.EMAIL_ADDRESS"));
 var isTaken = tools.getUserByAttribute(tools.EMAIL, [email]);
 isTaken = isTaken 
-    ? isTaken[tools.NAME] != vars.get("$field.USERID")
+    ? isTaken[tools.NAME] != vars.get("$field.UID")
     : false;
 if (email && isTaken)
     result.string(translate.text("Email must be unique!"));
\ No newline at end of file

entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js

 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.UID"));
\ No newline at end of file
+result.string(vars.get("$field.TITLE"));
\ No newline at end of file

entity/Employee_entity/entityfields/title/onValidation.js

@@ -6,8 +6,12 @@ import("system.tools");
 import("Entity_lib");
 
 var title = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.TITLE"));
-var oldTitle = tools.getUserByAttribute(tools.NAME, vars.get("$field.USERID"), tools.PROFILE_TITLE);
-oldTitle = oldTitle && oldTitle[tools.TITLE];
-if (!(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && title == oldTitle) 
-    && title != "" && tools.existUsers(title))
-        result.string(translate.text("Username already exists!"));
\ No newline at end of file
+var isOldTitle = false;
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+    let oldTitle = tools.getUserByAttribute(tools.NAME, [vars.get("$field.UID")], tools.PROFILE_TITLE);
+    oldTitle = oldTitle && oldTitle[tools.TITLE];
+    isOldTitle = title == oldTitle;
+}
+if (!isOldTitle && title != "" && tools.existUsers(title))
+    result.string(translate.text("Username already exists!"));
\ No newline at end of file

entity/Employee_entity/entityfields/uid/valueProcess.js

-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    && vars.get("$field.TITLE"))
-        result.string(vars.get("$field.TITLE"));
\ No newline at end of file
+import("system.tools");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string(tools.generateNewUserName());
\ No newline at end of file

entity/Employee_entity/recordcontainers/jdito/contentProcess.js

@@ -9,7 +9,7 @@ import("Employee_lib");
 
 var users;
 if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
-    users = [tools.getUser(vars.get("$local.idvalues"), tools.PROFILE_FULL)];
+    users = [tools.getUserByAttribute(tools.NAME, vars.get("$local.idvalues"), tools.PROFILE_FULL)];
 else
 {
     var values = ["true", "false"];
@@ -21,7 +21,7 @@ else
 users = users.map(function (user)
 {
     return [
-        user[tools.TITLE],
+        user[tools.NAME],
         user[tools.TITLE],
         user[tools.PARAMS][tools.ISACTIVE],
         user[tools.PARAMS][tools.FIRSTNAME],
@@ -31,9 +31,7 @@ users = users.map(function (user)
         user[tools.DESCRIPTION],
         user[tools.PARAMS][tools.CONTACTID],
         ContactUtils.getTitleByContactId(user[tools.PARAMS][tools.CONTACTID]), //TODO: get the names more efficiently
-        user[tools.PARAMS].department,
-        user[tools.NAME],
-        EmployeeUtils.sliceUserId(user[tools.NAME])
+        user[tools.PARAMS].department
     ];
 });
 

entity/Employee_entity/recordcontainers/jdito/onInsert.js

@@ -21,4 +21,4 @@ if (vars.get("$field.PASSWORD") && vars.get("$field.PASSWORD") == vars.get("$fie
 {
     user[tools.PASSWORD] = vars.getString("$field.PASSWORD");
 }
-tools.insertUser(user);
\ No newline at end of file
+tools.insertUser(user, vars.get("$field.UID"));
\ No newline at end of file

entity/Employee_entity/recordcontainers/jdito/onUpdate.js

@@ -17,7 +17,7 @@ FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function (state, value)
         PersUtils.removeImage(personId);
 });
 
-var user = tools.getUserByAttribute(tools.NAME, vars.get("$field.USERID"));
+var user = tools.getUserByAttribute(tools.NAME, vars.get("$field.UID"));
 
 user[tools.TITLE] = vars.get("$field.TITLE");
 user[tools.PARAMS][tools.ISACTIVE] = vars.get("$field.ISACTIVE");

process/Employee_lib/process.js

@@ -35,7 +35,7 @@ EmployeeUtils.getCurrentUserName = function ()
 
 EmployeeUtils.sliceUserId = function (pUserId)
 {
-    return pUserId.substr(10, 36);
+    return pUserId.slice(-36);
 }
 
 /**