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

Refactor datepicker limits [SCI-9338]

Browse source
This commit is contained in:
Martin Artnik 2023-09-28 13:33:17 +02:00
parent a499a0f0ea
commit 6e405d40a6
5 changed files with 39 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/projects/show.js
View file

@ -192,13 +192,13 @@
// Clear filters // Clear filters
$filterDropdown.on('filter:clear', function() { $filterDropdown.on('filter:clear', function() {
$(this).find('input').val('');
if ($startedOnFromFilter.data('DateTimePicker')) $startedOnFromFilter.data('DateTimePicker').clear(); if ($startedOnFromFilter.data('DateTimePicker')) $startedOnFromFilter.data('DateTimePicker').clear();
if ($startedOnToFilter.data('DateTimePicker')) $startedOnToFilter.data('DateTimePicker').clear(); if ($startedOnToFilter.data('DateTimePicker')) $startedOnToFilter.data('DateTimePicker').clear();
if ($modifiedOnFromFilter.data('DateTimePicker')) $modifiedOnFromFilter.data('DateTimePicker').clear(); if ($modifiedOnFromFilter.data('DateTimePicker')) $modifiedOnFromFilter.data('DateTimePicker').clear();
if ($modifiedOnToFilter.data('DateTimePicker')) $modifiedOnToFilter.data('DateTimePicker').clear(); if ($modifiedOnToFilter.data('DateTimePicker')) $modifiedOnToFilter.data('DateTimePicker').clear();
if ($archivedOnFromFilter.data('DateTimePicker')) $archivedOnFromFilter.data('DateTimePicker').clear(); if ($archivedOnFromFilter.data('DateTimePicker')) $archivedOnFromFilter.data('DateTimePicker').clear();
if ($archivedOnToFilter.data('DateTimePicker')) $archivedOnToFilter.data('DateTimePicker').clear(); if ($archivedOnToFilter.data('DateTimePicker')) $archivedOnToFilter.data('DateTimePicker').clear();
$textFilter.val('');
}); });
} }

2
app/assets/javascripts/protocols/index.js
View file

@ -127,6 +127,8 @@ var ProtocolsIndex = (function() {
$filterDropdown.on('filter:clear', function() { $filterDropdown.on('filter:clear', function() {
dropdownSelector.clearData($publishedByFilter); dropdownSelector.clearData($publishedByFilter);
dropdownSelector.clearData($accessByFilter); dropdownSelector.clearData($accessByFilter);
$(this).find('input').val('');
if ($publishedOnFromFilter.data('DateTimePicker')) $publishedOnFromFilter.data('DateTimePicker').clear(); if ($publishedOnFromFilter.data('DateTimePicker')) $publishedOnFromFilter.data('DateTimePicker').clear();
if ($publishedOnToFilter.data('DateTimePicker')) $publishedOnToFilter.data('DateTimePicker').clear(); if ($publishedOnToFilter.data('DateTimePicker')) $publishedOnToFilter.data('DateTimePicker').clear();
if ($modifiedOnFromFilter.data('DateTimePicker')) $modifiedOnFromFilter.data('DateTimePicker').clear(); if ($modifiedOnFromFilter.data('DateTimePicker')) $modifiedOnFromFilter.data('DateTimePicker').clear();

43
app/assets/javascripts/sitewide/date_time_picker.js
View file

@ -5,26 +5,39 @@
ev.preventDefault(); ev.preventDefault();
ev.stopPropagation(); ev.stopPropagation();
let dt = $(this); const dt = $(this);
let selectedDate = {};
$('.calendar-input').slice(0, 2).each(function(index, element) { if (dt.data('DateTimePicker')) {
if ($(element).val().length > 0 ) { dt.data('DateTimePicker').show();
selectedDate.index = index; return;
selectedDate.date = moment($(element).val(), element.dataset.dateFormat).toDate(); }
}
}); const linkedMin = dt.data('linked-min');
const linkedMax = dt.data('linked-max');
let options = { let options = {
ignoreReadonly: true ignoreReadonly: true,
}; useCurrent: false
}
if (selectedDate.date) { if (linkedMin) {
if (selectedDate.index == 0) { if ($(linkedMin).val()) {
options.minDate = selectedDate.date; options.minDate = moment($(linkedMin).val(), $(linkedMin).data('dateFormat')).toDate();
} else if (selectedDate.index == 1) {
options.maxDate = selectedDate.date;
} }
$(linkedMin).on("dp.change", function (e) {
dt.data("DateTimePicker").minDate(e.date);
});
}
if (linkedMax) {
if ($(linkedMax).val()) {
options.maxDate = moment($(linkedMax).val(), $(linkedMax).data('dateFormat')).toDate();
}
$(linkedMax).on("dp.change", function (e) {
dt.data("DateTimePicker").maxDate(e.date);
});
} }
if (dt.data('DateTimePicker')) { if (dt.data('DateTimePicker')) {

4
app/assets/javascripts/sitewide/filter_dropdown.js
View file

@ -26,6 +26,10 @@ var filterDropdown = (function() {
var $textFilter = $('#textSearchFilterInput', $filterContainer); var $textFilter = $('#textSearchFilterInput', $filterContainer);
$filterContainer.on('show.bs.dropdown', function() { $filterContainer.on('show.bs.dropdown', function() {
if (!$(this).hasClass('filters-applied')) {
$(this).find('input').val('');
}
let $filterDropdown = $filterContainer.find('.dropdown-menu'); let $filterDropdown = $filterContainer.find('.dropdown-menu');
let teamId = $filterDropdown.data('team-id'); let teamId = $filterDropdown.data('team-id');
$('#textSearchFilterHistory').find('li').remove(); $('#textSearchFilterHistory').find('li').remove();

4
app/views/shared/filter_dropdown/_datetime_search.html.erb
View file

@ -6,6 +6,8 @@
<div class="datetime-picker-container flex"> <div class="datetime-picker-container flex">
<span class="sn-icon sn-icon-calendar"></span> <span class="sn-icon sn-icon-calendar"></span>
<input type="datetime" <input type="datetime"
id="<%= "#{container_class}_from" %>"
data-linked-max="#<%= "#{container_class}_to" %>"
data-toggle='date-time-picker' data-toggle='date-time-picker'
class="form-control calendar-input from-date" class="form-control calendar-input from-date"
readonly readonly
@ -19,6 +21,8 @@
<span class="sn-icon sn-icon-calendar"></span> <span class="sn-icon sn-icon-calendar"></span>
<input type="datetime" <input type="datetime"
data-toggle='date-time-picker' data-toggle='date-time-picker'
id="<%= "#{container_class}_to" %>"
data-linked-min="#<%= "#{container_class}_from" %>"
class="form-control calendar-input to-date" class="form-control calendar-input to-date"
readonly readonly
placeholder="<%= t('filters_modal.to_placeholder') %>" placeholder="<%= t('filters_modal.to_placeholder') %>"