Feature/wn 137

resources/assets/js/pages/users/edit.vue

@@ -155,7 +155,7 @@
               <b-col cols="6">
               </b-col>
               <b-col cols="6">
-                <b-button type="submit" size="lg" class="float-right rtl-float-left mr-2 btn-outline-primary" @click="update = true">
+                <b-button type="submit" class="float-right rtl-float-left mr-2 btn-outline-primary" @click="update = true">
                   <fa :icon="['fas', 'spinner']" spin v-show="updating"/>
                   {{ $t('common.save_changes') }}
                 </b-button>

resources/assets/js/pages/users/list.vue

@@ -13,51 +13,52 @@
     <b-row class="pb-2 px-4 pt-4 bg-white" align-v="center">
       <b-col cols="3" xl="2">
         <p class="select-header"> {{ $t('users.list.select_status') }}</p>
-        <b-form-select
+        <v-select
           v-model="activatedFilter"
-          value-field="value"
-          class="v-form-select-custom"
-          text-field="name"
+          class="v-select-custom"
           :options="[
-          {
-            name: 'Status',
-            value: null
-          },
-          {
-            name: 'Activated',
-            value: 1
-          },
-          {
-            name: 'Deactivated',
-            value: 0
-          }]" />
+            { name: 'Status', value: null },
+            { name: 'Activated', value: 1 },
+            { name: 'Deactivated', value: 0 }
+                  ]"
+          label="name"
+          :reduce="option => option.value"
+          placeholder="Select Status">
+        </v-select>
+
       </b-col>
       <b-col cols="3" xl="2" v-if="!apiUsers">
         <p class="select-header"> {{ $t('users.list.select_role') }}</p>
-        <b-form-select
+        <v-select
           v-model="roleFilter"
-          value-field="id"
-          class="v-form-select-custom"
-          text-field="name"
-          :options="roleOptions"/>
+          class="v-select-custom"
+          :options="roleOptions"
+          label="name"
+          :reduce="option => option.id"
+          placeholder="Select Role">
+        </v-select>
       </b-col>
       <b-col cols="3" xl="2" v-if="apiUsers">
         <p class="select-header"> {{ $t('users.list.select_country') }}</p>
-        <b-form-select
+        <v-select
           v-model="countryFilter"
-          class="v-form-select-custom"
-          value-field="code"
-          text-field="name"
-          :options="countryList"/>
+          class="v-select-custom"
+          :options="countryList"
+          label="name"
+          :reduce="option => option.id"
+          placeholder="Select Country">
+        </v-select>
       </b-col>
       <b-col cols="3" xl="2" v-if="apiUsers">
         <p class="select-header"> {{ $t('users.list.select_terms') }}</p>
-        <b-form-select
+        <v-select
           v-model="termsFilter"
-          class="v-form-select-custom"
-          value-field="version"
-          text-field="version"
-          :options="termsList"/>
+          class="v-select-custom"
+          :options="termsList"
+          label="name"
+          :reduce="option => option.id"
+          placeholder="Select Terms">
+        </v-select>
       </b-col>
       <b-col>
         <p class="select-header" v-if="!apiUsers"> {{ $t('users.list.select_society') }}</p>
@@ -471,14 +472,6 @@ export default {
 }
 </script>
 <style scoped>
-  .v-form-select-custom {
-    background: #E9E9E9;
-    border: none;
-    border-radius: 10px;
-    padding: 8px 8px;
-    font-size: 18px;
-
-  }
   .select-header {
     font-size: 1rem;
   }

resources/lang/en.json

@@ -557,7 +557,7 @@
       "content_add_hazard_title": "Add Hazard",
       "anticipated_extra": "A hazardous event is occuring. It may be an immediate threat to life and property. These are protective actions to take as the hazardous even is occurring.",
       "prepare_to_respond_extra": "Develop response capacity by learning skills and storing provisions",
-      "asses_and_plan_extra": "Assess risks and plan activities to recognize, reduce, and respond to hazard events",
+      "assess_and_plan_extra": "Assess risks and plan activities to recognize, reduce, and respond to hazard events",
       "mitigate_risks_extra": "Take mitigation measures to make the built and natural environments safer and establishing early warning systems",
       "key_message_label": "Safety message title",
       "supporting_message_label": "Supporting message",