Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/wn 137 #206

Merged
merged 2 commits into from
Feb 28, 2025
Merged

Feature/wn 137 #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d72ca0
btn save changes, selects
falezekiel Feb 28, 2025
a35bb37
Merge branch 'develop' into feature/WN-137
falezekiel Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/assets/js/pages/users/edit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
71 changes: 32 additions & 39 deletions resources/assets/js/pages/users/list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading