From e4fd02bbaabf9c1da972acb400ecf17bb824162e Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sun, 21 Jun 2020 20:06:07 +0000
Subject: [PATCH]

---
 ayanova/src/views/adm-user.vue  | 16 +++++++++-------
 ayanova/src/views/adm-users.vue |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 42fb5413..13bb8738 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -4,7 +4,8 @@
     <v-row v-if="formState.ready">
       <v-col>
         <v-form ref="form">
-          todo: set password, maybe set user options?
+          todo: set password, maybe set user options? todo: show lastlogin on
+          list and in form as readonly
           <v-row>
             <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
             <v-col cols="12" sm="6" lg="4" xl="3">
@@ -35,10 +36,7 @@
                 @click:clear="fieldValueChanged('employeeNumber')"
                 :counter="255"
                 :label="$ay.t('UserEmployeeNumber')"
-                :rules="[
-                  form().max255(this, 'employeeNumber'),
-                  form().required(this, 'employeeNumber')
-                ]"
+                :rules="[form().max255(this, 'employeeNumber')]"
                 :error-messages="form().serverErrors(this, 'employeeNumber')"
                 ref="employeeNumber"
                 :data-cy="!!$ay.dev ? 'employeeNumber' : false"
@@ -288,10 +286,10 @@ export default {
       obj: {
         id: 0,
         concurrency: 0,
-        active: null,
+        active: false,
         name: null,
         roles: null,
-        userType: 0,
+        userType: 3,
         employeeNumber: null,
         notes: null,
         customerId: null,
@@ -442,6 +440,10 @@ export default {
             submitObject.login = vm.login;
           }
 
+          if (submitObject.roles == null) {
+            submitObject.roles = 0;
+          }
+
           let res = await window.$gz.api.upsert(url, submitObject);
           vm.formState.loading = false;
           if (res.error) {
diff --git a/ayanova/src/views/adm-users.vue b/ayanova/src/views/adm-users.vue
index 1f1b47d6..ffb6f0de 100644
--- a/ayanova/src/views/adm-users.vue
+++ b/ayanova/src/views/adm-users.vue
@@ -25,7 +25,7 @@ export default {
   data() {
     return {
       currentListViewId: 1,
-      dataListKey: "TestUserDataList", //maybe special admin version?  More stuff on it
+      dataListKey: "UserDataList", 
       dataListFilter: "",
       dataListSort: "",
       rights: window.$gz.role.defaultRightsObject()
@@ -50,7 +50,7 @@ function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "user-edit",
+          name: "adm-user",
           params: { recordid: 0 }
         });
         break;