Merge branch 'development' of github.com:SpeciesFileGroup/taxonworks …

…into development
SpeciesFileGroup · Jun 17, 2022 · bb33c24 · bb33c24
2 parents 1b23dc3 + 63c98bf
commit bb33c24
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 26 deletions.
diff --git a/app/controllers/collecting_events_controller.rb b/app/controllers/collecting_events_controller.rb
@@ -300,6 +300,7 @@ def filter_params
       :collection_objects,
       :collector_id,
       :collector_ids_or,
+      :determiner_name_regex,
       :depictions,
       :end_date,   # used in date range
       :geo_json,

diff --git a/app/javascript/vue/tasks/collecting_events/filter/components/Filter.vue b/app/javascript/vue/tasks/collecting_events/filter/components/Filter.vue
@@ -30,7 +30,8 @@
       />
       <filter-determinations
         class="margin-large-bottom"
-        v-model="params.determination"/>
+        v-model="params.determination"
+      />
       <filter-identifiers
         class="margin-large-bottom"
         v-model="params.identifier"
@@ -201,6 +202,7 @@ export default {
           determiner_id_or: [],
           determiner_id: [],
           otu_ids: [],
+          determiner_name_regex: undefined,
           current_determinations: undefined,
           ancestor_id: undefined,
           validity: undefined

diff --git a/app/javascript/vue/tasks/collection_objects/filter/components/filter.vue b/app/javascript/vue/tasks/collection_objects/filter/components/filter.vue
@@ -297,7 +297,7 @@ export default {
         },
         notes: {
           note_text: undefined,
-          note_exact: undefined,
+          note_exact: undefined
         },
         relationships: {
           biological_relationship_ids: []
@@ -332,6 +332,7 @@ export default {
           determiner_id_or: [],
           determiner_id: [],
           otu_ids: [],
+          determiner_name_regex: undefined,
           current_determinations: undefined,
           ancestor_id: undefined,
           validity: undefined

diff --git a/app/javascript/vue/tasks/collection_objects/filter/components/filters/otu.vue b/app/javascript/vue/tasks/collection_objects/filter/components/filters/otu.vue
@@ -69,7 +69,9 @@
         klass="CollectionObject"
         param-people="determiner_id"
         param-any="determiner_id_or"
-        v-model="determination"/>
+        toggle
+        v-model="determination"
+      />
     </div>
 
     <div class="field">
@@ -110,7 +112,7 @@ export default {
   props: {
     modelValue: {
       type: Object,
-      default: undefined
+      default: () => ({})
     }
   },
 

diff --git a/app/javascript/vue/tasks/collection_objects/filter/components/filters/shared/people.vue b/app/javascript/vue/tasks/collection_objects/filter/components/filters/shared/people.vue
@@ -1,30 +1,52 @@
 <template>
   <div>
-    <h4>{{ title }}</h4>
-    <smart-selector
-      :autocomplete-params="{'roles[]' : role }"
-      model="people"
-      :klass="klass"
-      pin-section="People"
-      pin-type="People"
-      label="cached"
-      @selected="addPerson"/>
-    <label>
+    <div class="flex-separate middle">
+      <h3>{{ title }}</h3>
+      <SwitchButtom
+        v-if="toggle"
+        v-model="isPeopleView"
+        :options="switchOptions"
+      />
+    </div>
+    <div v-if="isPeopleView">
+      <smart-selector
+        :autocomplete-params="{'roles[]' : role }"
+        model="people"
+        :klass="klass"
+        pin-section="People"
+        pin-type="People"
+        label="cached"
+        @selected="addPerson"
+      />
+      <label>
+        <input
+          v-model="params[paramAny]"
+          type="checkbox"
+        >
+        Any
+      </label>
+      <display-list
+        :list="list"
+        label="cached"
+        :delete-warning="false"
+        @delete-index="removePerson"
+      />
+    </div>
+    <div v-else>
+      <label class="display-block">Matches</label>
+      <i class="display-block">Allows regular expressions</i>
       <input
-        v-model="params[paramAny]"
-        type="checkbox">
-      Any
-    </label>
-    <display-list
-      :list="list"
-      label="object_tag"
-      :delete-warning="false"
-      @deleteIndex="removePerson"/>
+        v-model="params.determiner_name_regex"
+        class="full_width"
+        type="text"
+      >
+    </div>
   </div>
 </template>
 
 <script>
 
+import SwitchButtom from 'tasks/observation_matrices/new/components/newMatrix/switch.vue'
 import SmartSelector from 'components/ui/SmartSelector'
 import DisplayList from 'components/displayList'
 import { People } from 'routes/endpoints'
@@ -33,7 +55,8 @@ import { URLParamsToJSON } from 'helpers/url/parse.js'
 export default {
   components: {
     SmartSelector,
-    DisplayList
+    DisplayList,
+    SwitchButtom
   },
 
   props: {
@@ -65,14 +88,21 @@ export default {
     klass: {
       type: String,
       required: true
+    },
+
+    toggle: {
+      type: Boolean,
+      default: false
     }
   },
 
   emits: ['update:modelValue'],
 
   data () {
     return {
-      list: []
+      list: [],
+      switchOptions: ['People', 'Name'],
+      isPeopleView: true
     }
   },
 
@@ -88,7 +118,7 @@ export default {
   },
 
   watch: {
-    value (newVal) {
+    modelValue (newVal) {
       if (!newVal[this.paramPeople].length && this.list.length) {
         this.list = []
       }
@@ -99,6 +129,11 @@ export default {
         this.params[this.paramPeople] = this.list.map(item => item.id)
       },
       deep: true
+    },
+
+    isPeopleView () {
+      this.list = []
+      this.params.determiner_name_regex = undefined
     }
   },