scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-06 14:36:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8575 from aignatov-bio/ai-sci-12011-fix-datetime-picker

Browse source 
Fix fitlers and canvas create task modal [SCI-12014][SCI-12011]
This commit is contained in:
aignatov-bio 2025-06-12 11:09:07 +02:00 • committed by GitHub
commit 0610f19b35
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/javascript/vue/shared/filters/inputs/date_range_filter.vue
View file

@ -4,7 +4,7 @@
<label class="sci-label">{{ filter.label }}</label> <label class="sci-label">{{ filter.label }}</label>
<div class="w-full mb-2"> <div class="w-full mb-2">
<DateTimePicker <DateTimePicker
:defaultValue="dateFrom" :defaultValue="dateFromObject"
class="w-full" class="w-full"
@change="updateDateFrom" @change="updateDateFrom"
@cleared="updateDateFrom" @cleared="updateDateFrom"
@ -18,7 +18,7 @@
</div> </div>
<div class="w-full"> <div class="w-full">
<DateTimePicker <DateTimePicker
:defaultValue="dateTo" :defaultValue="dateToObject"
class="w-full" class="w-full"
@change="updateDateTo" @change="updateDateTo"
@cleared="updateDateTo" @cleared="updateDateTo"
@ -46,16 +46,16 @@ export default {
components: { DateTimePicker }, components: { DateTimePicker },
data() { data() {
return { return {
dateFrom: null, dateFrom: this.values[`${this.filter.key}_from`],
dateTo: null dateTo: this.values[`${this.filter.key}_to`]
}; };
}, },
created() { computed: {
if (this.values[`${this.filter.key}_from`]) { dateFromObject() {
this.dateFrom = new Date(this.values[`${this.filter.key}_from`]) return this.dateFrom ? new Date(this.dateFrom) : null;
} },
if (this.values[`${this.filter.key}_to`]) { dateToObject() {
this.dateTo = new Date(this.values[`${this.filter.key}_to`]); return this.dateTo ? new Date(this.dateTo) : null;
} }
}, },
methods: { methods: {

2
app/views/my_modules/modals/_new_modal.html.erb
View file

@ -37,7 +37,7 @@
<label class="sci-label" for="my_module_due_date"><%= t('experiments.canvas.new_my_module_modal.due_date') %></label> <label class="sci-label" for="my_module_due_date"><%= t('experiments.canvas.new_my_module_modal.due_date') %></label>
<div id="date-time-picker-my-module" class="vue-date-time-picker w-full" data-e2e="e2e-DP-canvas-newTaskModal-dueDate"> <div id="date-time-picker-my-module" class="vue-date-time-picker w-full" data-e2e="e2e-DP-canvas-newTaskModal-dueDate">
<input ref="input" type="hidden" data-simple-format="true" class="calendar-input" id="date-time-picker-input" v-model="date" name="my_module[due_date]" /> <input ref="input" type="hidden" data-simple-format="true" class="calendar-input" id="date-time-picker-input" v-model="date" name="my_module[due_date]" />
<date-time-picker class="w-full" @cleared="clearDate" ref="vueDateTime" placeholder="<%= t('experiments.canvas.new_my_module_modal.due_date_placeholder') %>" @change="updateDate" mode="datetime"></date-time-picker> <date-time-picker class="w-full" @cleared="clearDate" ref="vueDateTime" value-type="stringWithoutTimezone" placeholder="<%= t('experiments.canvas.new_my_module_modal.due_date_placeholder') %>" @change="updateDate" mode="datetime"></date-time-picker>
</div> </div>
</div> </div>
</div> </div>