-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #976 from PlanoramaEvents/development
3.4.0-rc2
- Loading branch information
Showing
24 changed files
with
458 additions
and
217 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,7 @@ def allowed_params | |
| lock_version | ||
| parameter | ||
| parameter_value | ||
| parameter_json | ||
| ] | ||
| end | ||
| end | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| <template> | ||
| <div class="d-flex w-100 p-3"> | ||
| <div class="d-flex flex-column w-100"> | ||
| <label :for="idA">{{ notSelectedLabel }}</label> | ||
| <b-select :id="idA" multiple :select-size="7" class="w-100" :options="optionsA" v-model="selectedA"></b-select> | ||
| </div> | ||
| <div class="d-flex flex-column justify-content-center p-2 mt-4"> | ||
| <button class="btn btn-primary m-2" :disabled="!selectedA.length" @click="moveToB()"><b-icon-chevron-right></b-icon-chevron-right></button> | ||
| <button class="btn btn-primary m-2" :disabled="!selectedB.length" @click="moveToA()"><b-icon-chevron-left></b-icon-chevron-left></button> | ||
| </div> | ||
| <div class="d-flex flex-column w-100"> | ||
| <label :for="idB">{{ selectedLabel }}</label> | ||
| <b-select :id="idB" multiple :select-size="7" class="w-100" :options="optionsB" v-model="selectedB"></b-select> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| import { v4 as uuid } from 'uuid'; | ||
| export default { | ||
| name: "TwoSidedMultiSelect", | ||
| props: { | ||
| value: { | ||
| type: Array, | ||
| default: () => [] | ||
| }, | ||
| options: { | ||
| type: Array, | ||
| default: () => [] | ||
| }, | ||
| notSelectedLabel: { | ||
| type: String, | ||
| default: 'Not Selected' | ||
| }, | ||
| selectedLabel: { | ||
| type: String, | ||
| default: 'Selected' | ||
| }, | ||
| id: { | ||
| type: String, | ||
| default: () => uuid() | ||
| } | ||
| }, | ||
| data: () => ({ | ||
| selectedA: [], | ||
| selectedB: [], | ||
| }), | ||
| computed: { | ||
| optionsValueSet() { | ||
| return new Set(this.options.map(o => o?.value ?? o)); | ||
| }, | ||
| valueSet() { | ||
| return new Set(this.value); | ||
| }, | ||
| optionsA() { | ||
| return this.options.filter(o => this.optionsValueSet.difference(this.valueSet).has(o?.value ?? o)) | ||
| }, | ||
| optionsB() { | ||
| return this.options.filter(o => this.valueSet.has(o?.value ?? o)); | ||
| }, | ||
| idA() { | ||
| return `${this.id}-select-a` | ||
| }, | ||
| idB() { | ||
| return `${this.id}-select-b` | ||
| } | ||
| }, | ||
| watch: { | ||
| selectedA(newVal, oldVal) { | ||
| if(!oldVal.length && newVal.length) { | ||
| this.selectedB = [] | ||
| } | ||
| }, | ||
| selectedB(newVal, oldVal) { | ||
| if(!oldVal.length && newVal.length) { | ||
| this.selectedA = [] | ||
| } | ||
| }, | ||
| }, | ||
| methods: { | ||
| emitAll(val) { | ||
| this.$emit('input', val) | ||
| this.$emit('change', val) | ||
| }, | ||
| moveToA() { | ||
| this.emitAll([...this.valueSet.difference(new Set(this.selectedB))]); | ||
| this.selectedB = []; | ||
| }, | ||
| moveToB() { | ||
| this.emitAll([...this.valueSet.union(new Set(this.selectedA))]); | ||
| this.selectedA = []; | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
| <style> | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
app/javascript/configurations/people_hidden_fields.mixin.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import { settingsMixin } from "@/store/settings.mixin"; | ||
| import { LINKED_FIELD_LABELS } from "@/constants/strings"; | ||
|
|
||
| export const peopleHiddenFieldsMixin = { | ||
| mixins: [ | ||
| settingsMixin | ||
| ], | ||
| computed: { | ||
| peopleHideableFieldsOptions() { | ||
| return Object.entries(this.currentSettings.attributes.Person).filter(([_, {hidable}]) => hidable ).map(([value, _]) => ({text: LINKED_FIELD_LABELS["Person"][value] || value, value})) | ||
| }, | ||
| // can't use configByName here because that's parameter_value centric | ||
| hiddenFields() { | ||
| return this.currentSettings.configs?.find(c => c.parameter === 'people_hidden_fields')?.parameter_json || [] | ||
| } | ||
| }, | ||
| methods: { | ||
| filterFieldList(fields) { | ||
| return fields.filter(field => !this.hiddenFields.includes(field)); | ||
| }, | ||
| isHidden(field) { | ||
| return this.hiddenFields.includes(field); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.