10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-11 18:56:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

- fixed timepicker filter;

Browse Source
This commit is contained in:
nikitasinelnikov
2019-11-21 01:24:10 +02:00
parent 1c1921e602
commit 9888806798
4 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/pickadate/default.css
+4
View File
@@ -17,6 +17,10 @@
user-select: none;
}
.um .picker__box ul li[role="presentation"] {
margin: 10px 0 0 0;
}
/**
* The picker input element.
*/
assets/css/pickadate/default.time.css
+5
View File
@@ -101,6 +101,11 @@
padding: 0;
border-radius: 2px !important;
}
.um .picker__box ul li[role="presentation"] {
margin: 10px 0 0 0;
}
@media (min-height: 40.125em) {
.um .picker--time .picker__frame {
margin-bottom: 10% !important;
assets/js/um-members.js
+49 -30
View File
@@ -166,9 +166,6 @@ function um_get_current_page( directory ) {
function um_time_convert( time, range ) {
var hours = Math.floor( time / 60 );
var minutes = time % 60;
if ( range === 'to' ) {
minutes = minutes + 1;
}
if ( minutes >= 60 ) {
minutes = 0;
@@ -240,7 +237,47 @@ function um_ajax_get_members( directory, args ) {
var filter_name = filter.find( '.um-timepicker-filter' ).data('filter_name');
var value_from = um_get_data_for_directory( directory, 'filter_' + filter_name + '_from' );
var value_to = um_get_data_for_directory( directory, 'filter_' + filter_name + '_to' );
if ( typeof value_from != 'undefined' || typeof value_to != 'undefined' ) {
if ( typeof value_from != 'undefined' ) {
var value_from = value_from.split(':');
var hours = value_from[0]*1;
if ( hours < 10 ) {
hours = '0' + hours;
}
var minutes = value_from[1]*1;
if ( minutes < 10 ) {
minutes = '0' + minutes;
}
value_from = hours + ':' + minutes + ':00';
}
if ( typeof value_to != 'undefined' ) {
var val_to = value_to.split(':');
var minutes = val_to[1]*1;
// var minutes = Math.ceil( val_to[1] ) + 1;
// if ( minutes >= 60 ) {
// minutes = 0;
// val_to[0] = val_to[0]*1 + 1;
//
// if ( val_to[0] >= 24 ) {
// val_to[0] = 0;
// }
// }
var hours = val_to[0]*1;
if ( hours < 10 ) {
hours = '0' + hours;
}
if ( minutes < 10 ) {
minutes = '0' + minutes;
}
value_to = hours + ':' + minutes + ':59';
}
if ( typeof value_from != 'undefined' || typeof value_to != 'undefined' ) {
request[ filter_name ] = [ value_from, value_to ];
}
} else if ( filter.find( 'select' ).length ) {
@@ -915,7 +952,7 @@ jQuery(document.body).ready( function() {
});
jQuery( document.body ).on( 'blur', '.um-directory .um-search-filter input[type="text"]', function() {
jQuery( document.body ).on( 'blur', '.um-directory .um-search-filter.um-text-filter-type input[type="text"]', function() {
var directory = jQuery(this).parents('.um-directory');
if ( um_is_directory_busy( directory ) ) {
@@ -952,7 +989,7 @@ jQuery(document.body).ready( function() {
//make search on Enter click
jQuery( document.body ).on( 'keypress', '.um-directory .um-search-filter input[type="text"]', function(e) {
jQuery( document.body ).on( 'keypress', '.um-directory .um-search-filter.um-text-filter-type input[type="text"]', function(e) {
if ( e.which === 13 ) {
var directory = jQuery(this).parents('.um-directory');
@@ -1394,22 +1431,14 @@ jQuery(document.body).ready( function() {
current_value_from = min;
}
if ( typeof current_value_to === "undefined" ) {
max = max.split(':');
var minutes = Math.ceil( max[1] ) + 1;
if ( minutes >= 60 ) {
minutes = '00';
max[0] = max[0]*1 + 1;
if ( max[0] >= 24 ) {
max[0] = '00';
}
}
current_value_to = max[0] + ':' + minutes;
current_value_to = max;
}
if ( typeof context.select !== 'undefined' ) {
var select_val = um_time_convert( context.select, range );
//var select_val = context.select / 60;
if ( range === 'from' ) {
current_value_from = select_val;
} else if ( range === 'to' ) {
@@ -1419,17 +1448,7 @@ jQuery(document.body).ready( function() {
if ( range === 'from' ) {
current_value_from = min;
} else if ( range === 'to' ) {
max = max.split(':');
var minutes = Math.ceil( max[1] ) + 1;
if ( minutes >= 60 ) {
minutes = '00';
max[0] = max[0]*1 + 1;
if ( max[0] >= 24 ) {
max[0] = '00';
}
}
current_value_to = max[0] + ':' + minutes;
current_value_to = max;
}
}
@@ -1459,7 +1478,7 @@ jQuery(document.body).ready( function() {
}
});
// first loading timepicker select
var $picker = $input.pickatime('picker');
var $fname = elem.data('filter_name');
var $frange = elem.data('range');
@@ -1468,7 +1487,7 @@ jQuery(document.body).ready( function() {
var query_value = um_get_data_for_directory( $directory, 'filter_' + $fname + '_' + $frange );
if ( typeof query_value !== 'undefined' ) {
var arr = query_value.split(':');
$picker.set( 'select', arr[0]*60 );
$picker.set( 'select', arr[0]*60 + arr[1]*1 );
}
});
assets/js/um-members.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long