Skip to content

Commit

Permalink
Merge pull request #142 from I-GUIDE/develop
Browse files Browse the repository at this point in the history
[HOTFIX] Use text fields in range input
  • Loading branch information
Maurier authored May 13, 2024
2 parents 5504682 + b74565c commit da92867
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 39 deletions.
4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cznet-discovery",
"version": "0.2.0",
"name": "i-guide-catalog",
"version": "1.1.0",
"private": true,
"scripts": {
"serve": "vite --open",
Expand Down
71 changes: 39 additions & 32 deletions frontend/src/components/search-results/cd.range-input.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,39 +22,46 @@
thumb-size="15"
hide-details
/>
<div :class="{ 'grayed-out': !isActive }">
<v-number-input
:model-value="modelValue[0]"
@update:model-value="modelValue[0] = $event"
@blur="
$emit('update:model-value', [modelValue[0], modelValue[1]]);
$emit('end');
"
@keyup.enter="
$emit('update:model-value', [modelValue[0], modelValue[1]]);
$emit('end');
"
label="Start"
variant="outlined"
density="compact"
/>
<v-row :class="{ 'grayed-out': !isActive }">
<v-col>
<v-text-field
:model-value="modelValue[0]"
@update:model-value="modelValue[0] = $event"
type="number"
@blur="
$emit('update:model-value', [modelValue[0], modelValue[1]]);
$emit('end');
"
@keyup.enter="
$emit('update:model-value', [modelValue[0], modelValue[1]]);
$emit('end');
"
label="Start"
variant="outlined"
density="compact"
focusable
/>
</v-col>

<v-number-input
:model-value="modelValue[1]"
@update:model-value="modelValue[1] = $event"
@blur="
$emit('update:model-value', [modelValue[0], modelValue[1]]);
$emit('end');
"
@keyup.enter="
$emit('update:model-value', [modelValue[0], modelValue[1]]);
$emit('end');
"
label="End"
variant="outlined"
density="compact"
/>
</div>
<v-col>
<v-text-field
:model-value="modelValue[1]"
@update:model-value="modelValue[1] = $event"
type="number"
@blur="
$emit('update:model-value', [modelValue[0], modelValue[1]]);
$emit('end');
"
@keyup.enter="
$emit('update:model-value', [modelValue[0], modelValue[1]]);
$emit('end');
"
label="End"
variant="outlined"
density="compact"
/>
</v-col>
</v-row>
</div>
</template>

Expand Down
7 changes: 2 additions & 5 deletions frontend/src/components/search-results/cd.search-results.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@end="onSliderControlChange(filter.dataCoverage)"
:min="filter.dataCoverage.min"
:max="filter.dataCoverage.max"
label="Publication Year"
label="Data Coverage"
/>

<!-- CREATOR NAME -->
Expand Down Expand Up @@ -558,6 +558,7 @@ class CdSearchResults extends Vue {
max: number;
isActive: boolean;
}) {
console.log("onSliderControlChange");
filter.isActive = true;
this.pushSearchRoute();
}
Expand Down Expand Up @@ -799,10 +800,6 @@ export default toNative(CdSearchResults);
}
}
.grayed-out {
opacity: 0.55;
}
:deep(.v-select--chips .v-select__selections .v-chip--select:first-child) {
margin-top: 1rem;
}
Expand Down

0 comments on commit da92867

Please sign in to comment.