Fix User and Agent Updates

src/components/user/updateAgentProfile.vue

@@ -10,20 +10,20 @@
           </div>
           <div class="row mb-4">
             <div class="col-md-6">
-              <float-label fixed label="username">
+              <float-label fixed label="Username">
                 <input
                   type="text"
                   name="username"
                   class="form-control uniinput"
                   id="username"
-                  placeholder="name"
+                  placeholder="Username"
                   data-rule="minlen:4"
-                  data-msg="please enter your name"
+                  data-msg="please enter your username"
                   v-model="agent.user.username"
                   v-bind:class="{
                     'is-valid': agent.user.username,
                     'is-invalid':
-                      !requiredfield(agent.user.username) && usernameload,
+                      !requiredField(agent.user.username) && usernameLoad,
                   }"
                   v-on:keyup="usernameLoad = true"
                   v-on:blur="usernameLoad = true"
@@ -32,7 +32,7 @@
               </float-label>
             </div>
             <div class="form-group col-md-6">
-              <float-label>
+              <float-label fixed label="Name">
                 <input
                   type="text"
                   name="name"
@@ -55,7 +55,7 @@
           </div>
           <div class="row mt-4">
             <div class="form-group col-md-6">
-              <float-label>
+              <float-label fixed label="Surname">
                 <input
                   type="text"
                   class="form-control uniInput"
@@ -75,7 +75,7 @@
               </float-label>
             </div>
             <div class="form-group col-md-6">
-              <float-label>
+              <float-label fixed label="Email">
                 <input
                   type="text"
                   class="form-control uniInput"
@@ -85,7 +85,7 @@
                   data-msg="Please enter your email address"
                   v-model="agent.email"
                   v-bind:class="{
-                    'is-valid': agent.email,
+                    'is-valid': agent.email && validEmail(agent.email),
                     'is-invalid': !validEmail(agent.email) && emailAddressLoad,
                   }"
                   v-on:keyup="emailAddressLoad = true"
@@ -99,7 +99,7 @@
           </div>
           <div class="row mt-4">
             <div class="form-group col-md-6">
-              <float-label>
+              <float-label fixed label="Cell Number">
                 <input
                   type="text"
                   name="cell"
@@ -110,11 +110,13 @@
                   data-msg="Please enter your cell number"
                   v-model="agent.cellNumber"
                   v-bind:class="{
-                    'is-valid': agent.cellNumber,
+                    'is-valid':
+                      agent.cellNumber && validPhoneNumber(agent.cellNumber),
                     'is-invalid':
-                      validPhoneNumber(agent.cellNumber) &&
-                      !requiredField(agent.cellNumber) &&
-                      cellNumberLoad,
+                      !requiredField(agent.cellNumber) ||
+                      (agent.cellNumber &&
+                        !validPhoneNumber(agent.cellNumber) &&
+                        cellNumberLoad),
                   }"
                   v-on:keyup="cellNumberLoad = true"
                   v-on:blur="cellNumberLoad = true"
@@ -125,7 +127,7 @@
               </float-label>
             </div>
             <div class="form-group col-md-6">
-              <float-label>
+              <float-label fixed label="Telephone Number">
                 <input
                   type="text"
                   class="form-control uniInput"
@@ -224,14 +226,24 @@
               </div>
             </div>
             <div class="row">
-              <div class="col">
-                <Alert :text="errorMessage" :type="errorOccurred" />
+              <div v-if="boolMessage" class="row">
+                <div class="col">
+                  <alert
+                    :text="'Your Information has been updated!'"
+                    :type="'SUCCESS'"
+                  />
+                </div>
+              </div>
+              <div v-if="boolValidationError" class="row">
+                <div class="col">
+                  <alert :text="errorMessage" :type="errorOccurred" />
+                </div>
               </div>
             </div>
             <div class="row mt-5 mb-5">
               <div class="col">
                 <button class="btn-white-border" @click="sendToApi()">
-                  Save
+                  Update
                 </button>
               </div>
               <div class="col">
@@ -280,14 +292,13 @@ export default {
   props: {},
   created() {
     this.retrieveUserRoles()
-    console.log('created')
     this.getIndividual(Log.getUser().id).then(() => {
       if (this.$route.params.agent) {
         this.agent = this.$route.params.agent
 
-        //if (this.agent.address === null) {
-        //  this.agent.address = {}
-        //}
+        if (this.agent.address === null) {
+          this.agent.address = {}
+        }
 
         if (
           this.agent.user.role === 'Agent' ||
@@ -295,7 +306,7 @@ export default {
           this.agent.user.role === 'Management Agent'
         ) {
           this.getAgentById(this.agent.userId)
-          this.agent.agencyId = this.agent[0].agencyId
+          this.agent.agencyId = this.agent.agencyId
         }
       } else {
         this.agent = this.indiv
@@ -305,12 +316,11 @@ export default {
       }
     })
     this.getAgencies()
-    console.log('End created')
+    this.selectedItem = this.currentUser
   },
   computed: {
     ...mapState('individual', ['indiv']),
-    ...mapState('timeshare', ['agencies']),
-    ...mapState('authentication', ['isLoggedIn', 'user']),
+    ...mapState('register', ['agencies']),
     ...mapGetters({
       user: 'authentication/getUser',
       person: 'authentication/getPerson',
@@ -324,10 +334,14 @@ export default {
     },
   },
   methods: {
-    ...mapActions('individual', ['getIndividual']),
+    ...mapActions('individual', ['getIndividual', 'updateIndividual']),
     ...mapActions('role', ['retrieveUserRoles']),
-    ...mapActions('register', ['getAgentById', 'saveAgent']),
-    ...mapActions('timeshare', ['getAgencies', 'updateAgent']),
+    ...mapActions('register', [
+      'getAgentById',
+      'getAgencies',
+      'saveAgent',
+      'updateAgent',
+    ]),
     onSelectedItemItemChange(item) {
       this.currentUser = item
     },
@@ -365,11 +379,7 @@ export default {
                     localStorage.setItem('person', JSON.stringify(newPerson))
                     this.$router.go()
                   }
-                  if (Log.getUser().role === 'Super Admin') {
-                    this.$router.push('/status/userManagementPage')
-                  } else {
-                    this.$router.push('/')
-                  }
+                  //this.$router.push('/status/agentuserManagementPage')
                 } else {
                   var newPerson = {
                     id: JSON.parse(localStorage.getItem('person')).id,
@@ -397,6 +407,41 @@ export default {
                   }
                 }
               })
+          } else {
+            this.updateAgent(this.agent).then(() => {
+              this.boolMessage = true
+              if (Log.getUser().role === 'Super Admin') {
+                console.log('updateIndividual')
+                console.log(this.agent)
+                if (
+                  this.agent.id ===
+                  JSON.parse(localStorage.getItem('person')).id
+                ) {
+                  console.log('here 1')
+                  var newPerson = {
+                    id: JSON.parse(localStorage.getItem('person')).id,
+                    email: this.agent.email,
+                    fullname: this.agent.name + ' ' + this.agent.surname,
+                    name: this.agent.name,
+                    surname: this.agent.surname,
+                  }
+                  localStorage.setItem('person', JSON.stringify(newPerson))
+                  //this.$router.go()
+                }
+                //this.$router.push('/status/userManagementPage')
+              } else {
+                console.log('here 2')
+                var newPerson = {
+                  id: JSON.parse(localStorage.getItem('person')).id,
+                  email: this.agent.email,
+                  fullname: this.agent.name + ' ' + this.agent.surname,
+                  name: this.agent.name,
+                  surname: this.agent.surname,
+                }
+                localStorage.setItem('person', JSON.stringify(newPerson))
+                //this.$router.go()
+              }
+            })
           }
         }
       }

src/components/user/updateProfileInfo.vue

@@ -192,11 +192,14 @@
                 data-msg="Please enter your cell number"
                 v-model="individual.cellNumber"
                 v-bind:class="{
-                  'is-valid': individual.cellNumber,
+                  'is-valid':
+                    individual.cellNumber &&
+                    validPhoneNumber(individual.cellNumber),
                   'is-invalid':
-                    validPhoneNumber(individual.cellNumber) &&
-                    !requiredField(individual.cellNumber) &&
-                    cellNumberLoad,
+                    !requiredField(individual.cellNumber) ||
+                    (individual.cellNumber &&
+                      !validPhoneNumber(individual.cellNumber) &&
+                      cellNumberLoad),
                 }"
                 v-on:keyup="cellNumberLoad = true"
                 v-on:blur="cellNumberLoad = true"
@@ -568,7 +571,8 @@ export default {
 
         if (
           this.individual.user.role === 'Agent' ||
-          this.individual.user.role === 'Agency'
+          this.individual.user.role === 'Agency' ||
+          this.individual.user.role === 'Managment Agent'
         ) {
           this.getAgentById(this.individual.userId)
           this.individual.agencyId = this.agent[0].agencyId
@@ -583,22 +587,9 @@ export default {
     })
   },
   computed: {
-    ...mapState('timeshare', [
-      'resorts',
-      'regions',
-      'detailedRegion',
-      'seasons',
-      'result',
-      'resortBedrooms',
-      'maxSleep',
-      'bankedEntities',
-      'sellItem',
-      'agencies',
-      'agents',
-    ]),
     ...mapState('individual', ['indiv']),
     ...mapState('authentication', ['isLoggedIn', 'user']),
-    ...mapState('register', ['agent']),
+    ...mapState('register', ['agent', 'agencies']),
     ...mapGetters({
       user: 'authentication/getUser',
       person: 'authentication/getPerson',
@@ -614,8 +605,7 @@ export default {
   methods: {
     ...mapActions('individual', ['getIndividual', 'updateIndividual']),
     ...mapActions('role', ['retrieveUserRoles']),
-    ...mapActions('register', ['getAgentById', 'saveAgent']),
-    ...mapActions('timeshare', ['getAgencies']),
+    ...mapActions('register', ['getAgentById', 'getAgencies', 'saveAgent']),
     onSelectedItemItemChange(item) {
       this.currentUser = item
     },

src/store/modules/timeshare/timeshare.js

@@ -67,32 +67,32 @@ export default {
         filterStore(state, input) {
             state.timeshareFilter = input
         },
-        setAgency(state, agencies) {
-            state.agencies = agencies
+        setAgency(state, jstimesharetype) {
+            state.agencies = jstimesharetype
         },
-        setAgent(state, agents) {
-            state.agents = agents
+        setAgent(state, jstimesharetype) {
+            state.agents = jstimesharetype
         },
-        setSeason(state, seasons) {
-            state.seasons = seasons
+        setSeason(state, jstimesharetype) {
+            state.seasons = jstimesharetype
         },
-        setResortBedrooms(state, resortBedrooms) {
-            state.resortBedrooms = resortBedrooms
+        setResortBedrooms(state, jstimesharetype) {
+            state.resortBedrooms = jstimesharetype
         },
-        setMaxSleep(state, maxSleep) {
-            state.maxSleep = maxSleep
+        setMaxSleep(state, jstimesharetype) {
+            state.maxSleep = jstimesharetype
         },
-        setBankedEntities(state, bankedEntities) {
-            state.bankedEntities = bankedEntities
+        setBankedEntities(state, jstimesharetype) {
+            state.bankedEntities = jstimesharetype
         },
-        addResort(state, resorts) {
-            state.resorts = resorts
+        addResort(state, jstimesharetype) {
+            state.resorts = jstimesharetype
         },
-        addRegion(state, regions) {
-            state.regions = regions
+        addRegion(state, jstimesharetype) {
+            state.regions = jstimesharetype
         },
-        addDetailedRegion(state, detailedRegion) {
-            state.detailedRegion.push(detailedRegion)
+        addDetailedRegion(state, jstimesharetype) {
+            state.detailedRegion.push(jstimesharetype)
         },
         changeResort(state, resort) {
             for (const reg in state.detailedRegion) {

src/store/modules/user/register.js

@@ -39,45 +39,59 @@ export default {
         },
     },
     mutations: {
-        setIndividual(state, type) {
-            state.registerIndividual = type
+        setIndividual(state, jsregistertype) {
+            state.registerIndividual = jsregistertype
         },
-        setIndividuals(state, type) {
-            state.individuals = type
+        setIndividuals(state, jsregistertype) {
+            state.individuals = jsregistertype
         },
-        setAgents(state, type) {
-            state.agents = type
+        setAgents(state, jsregistertype) {
+            state.agents = jsregistertype
         },
-        setSingleAgent(state, agent) {
-            state.agent = agent
+        setSingleAgent(state, jsregistertype) {
+            state.agent = jsregistertype
         },
-        setAgencies(state, type) {
-            state.agencies = type
+        setAgencies(state, jsregistertype) {
+            state.agencies = jsregistertype
         },
-        setAgency(state, type) {
-            state.registerAgency = type
+        setAgency(state, jsregistertype) {
+            state.registerAgency = jsregistertype
         },
-        addIndividual(state, type) {
-            state.registerIndividual = type
+        addIndividual(state, jsregistertype) {
+            state.registerIndividual = jsregistertype
         },
-        addAgency(state, type) {
-            state.registerAgency = type
+        addAgency(state, jsregistertype) {
+            state.registerAgency = jsregistertype
         },
-        addAgent(state, type) {
-            state.registerIndividual = type
+        addAgent(state, jsregistertype) {
+            state.registerIndividual = jsregistertype
         },
-        updateIndividual(state, type) {
-            state.registerIndividual.find((item) => item.id === type.id).username =
-                type.username
-            state.registerIndividual.find((item) => item.id === type.id).password =
-                type.password
+        updateIndividual(state, jsregistertype) {
+            state.registerIndividual.find(
+                (item) => item.id === jsregistertype.id,
+            ).username = type.username
+            state.registerIndividual.find(
+                (item) => item.id === jsregistertype.id,
+            ).password = type.password
         },
-        updateAgency(state, type) {
-            state.registerAgency.find((item) => item.id === type.id).eaabeffcNumber =
-                type.eaabeffcNumber
+        updateAgency(state, jsregistertype) {
             state.registerAgency.find(
-                (item) => item.id === type.id,
-            ).companyRegNumber = type.companyRegNumber
+                (item) => item.id === jsregistertype.id,
+            ).eaabeffcNumber = jsregistertype.eaabeffcNumber
+            state.registerAgency.find(
+                (item) => item.id === jsregistertype.id,
+            ).companyRegNumber = jsregistertype.companyRegNumber
+        },
+        agentUpdate(state, jsregistertype) {
+            var index
+            var count = 0
+            state.agents.forEach((item) => {
+                if (item.id === jsregistertype.id) {
+                    index = count
+                }
+                count++
+            })
+            Object.assign(state.agents[index], jsregistertype)
         },
         clearIndividual(state) {
             state.registerIndividual = {
@@ -146,8 +160,6 @@ export default {
             axios
                 .get('/api/agent')
                 .then((result) => {
-                    //console.log('Agents')
-                    //console.log(result)
                     commit('setAgents', result.data)
                 })
                 .catch(console.error)
@@ -156,8 +168,7 @@ export default {
             await axios
                 .get('/api/agent/single/' + userId)
                 .then((result) => {
-                    console.log(result)
-                    commit('setSingleAgent', result.data)
+                    commit('setSingleAgent', result.data[0])
                 })
                 .catch((e) => {
                     console.log(e)
@@ -167,8 +178,6 @@ export default {
             axios
                 .get('/api/agency')
                 .then((result) => {
-                    //console.log('Agencies')
-                    //console.log(result)
                     commit('setAgencies', result.data)
                 })
                 .catch(console.error)
@@ -188,9 +197,7 @@ export default {
                     return promise.resolve()
                 })
                 .catch((ex) => {
-                    //console.log(ex.response)
                     return promise.reject(ex.response)
-                        //console.error;
                 })
         },
         async saveAgency({ commit }, item) {
@@ -198,13 +205,9 @@ export default {
                 .post('/api/register/registeragency', item)
                 .then((res) => {
                     commit('addAgency', res.data)
-                    console.log(promise.resolve())
-                    console.log('Agency Added')
                     return promise.resolve()
                 })
                 .catch((ex) => {
-                    console.log('regAgency API failed')
-                        //console.log(ex.response)
                     return promise.reject(ex.response)
                 })
         },
@@ -212,24 +215,17 @@ export default {
             await axios
                 .post('/api/agent/AgentFromUser', item)
                 .then((res) => {
-                    console.log('saveAgent')
-                    console.log(res)
                     commit('addAgent', res.data)
                     return Promise.resolve(res)
                 })
                 .catch((ex) => {
-                    console.log('saveAgent API failed')
-                    console.log(ex.response)
                     return Promise.reject(ex.response)
                 })
         },
         async updateIndividual({ commit }, userParam) {
             await axios
                 .put('/api/user/', userParam)
-                .then((result) => {
-                    console.log('register updateIndividuals')
-                    console.log(result)
-                })
+                .then((result) => {})
                 .catch(console.error)
         },
         updateAgency({ commit }, item) {
@@ -238,6 +234,16 @@ export default {
                 .then((result) => commit('updateAgency', item))
                 .catch(console.error)
         },
+        async updateAgent({ commit }, agent) {
+            await axios
+                .put('/api/agent', agent)
+                .then((result) => {
+                    commit('updateAgent', result.data)
+                })
+                .catch((ex) => {
+                    console.log(ex)
+                })
+        },
         // clearIndividual({
         //   commit,
         // }) {