Skip to content

Commit

Permalink
WebUI: Refine use of Datepicker widgets #4184
Browse files Browse the repository at this point in the history
  • Loading branch information
@dchristidis
dchristidis committed Jan 26, 2022
1 parent 80f8c5a commit 3420063
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 75 deletions.
50 changes: 13 additions & 37 deletions lib/rucio/web/ui/static/bad_replicas_summary.js
View file
Expand Up @@ -51,57 +51,33 @@ function draw_pie(data) {
$(document).ready(function(){

dt = $('#badreplicasummary').DataTable();
var today = new Date();
var ms = today.getTime() + 86400000;
var to_date = new Date(ms);
var ms = to_date.getTime() - 86400000 * 7;
var from_date = new Date(ms);
const ms_per_day = 60 * 60 * 24 * 1000;
var show_suspicious = false;
$("#datepicker1").datepicker({
defaultDate: from_date,
defaultDate: '-6d',
minDate: new Date(2015, 0, 1),
onSelect: function(){
from_date = $("#datepicker1").val();
$("#datepicker2").datepicker('setDate', from_date).datepicker('option', 'minDate', from_date);
dateFormat: $.datepicker.ISO_8601,
onSelect: function(new_from_date) {
const new_min_to_date = new Date(new Date(new_from_date).getTime() + ms_per_day);
$('#datepicker2').datepicker('option', 'minDate', new_min_to_date);
}
});
$("#datepicker2").datepicker({
defaultDate: to_date,
minDate: from_date,
onSelect: function(){
to_date = $("#datepicker2").val();
}
defaultDate: '+1d',
minDate: '-5d'),
dateFormat: $.datepicker.ISO_8601,
});
$("#submit_button").click(function(){
$('#show_suspicious').click(function() {
show_suspicious = true;
});
if (typeof from_date == "undefined"){
alert('Please select a start date');
return
}
else if (typeof to_date == "undefined"){
alert('Please select an end date');
return
}
var date_array = from_date.toString().split('/');
if (date_array.length == 3){
from_date = date_array[2] + '-' + date_array[0] + '-' + date_array[1];
}
else if (typeof from_date != 'string'){
from_date = from_date.toISOString().slice(0, 10);
}
date_array = to_date.toString().split('/');
if (date_array.length == 3){
to_date = date_array[2] + '-' + date_array[0] + '-' + date_array[1];
}
else if (typeof to_date != 'string'){
to_date = to_date.toISOString().slice(0, 10);
}

dt.destroy();
$('#loader').html('<div class="row"><div class="large-1 large-centered columns"><img src="/media/spinner.gif"></div></div>');
r.get_bad_replicas_summary({rse_expression: url_param('rse_expression'), from_date: from_date, to_date: to_date, success: function(data) {
r.get_bad_replicas_summary({rse_expression: url_param('rse_expression'),
from_date: $('#datepicker1').val(),
to_date: $('#datepicker2').val(),
success: function(data) {
$('#loader').html('');

var tbl_head = '<thead><tr><th>RSE</th><th>Reason</th><th>Created_at</th><th>Bad (transient)</th><th>Deleted</th><th>Lost</th><th>Recovered</th>';
Expand Down
14 changes: 3 additions & 11 deletions lib/rucio/web/ui/static/lifetime_exception.js
View file
Expand Up @@ -18,10 +18,6 @@ function formatBytes(bytes){
}

$(document).ready(function(){
var today = new Date();
var ms = today.getTime() + 86400000;
var from_date = new Date(ms);
var to_date = new Date(today.getTime() + 86400000 * 366);
var scopes = []
var proj = ['mc', 'data', 'valid'];
var chosen_proj = null;
Expand Down Expand Up @@ -207,13 +203,9 @@ $(document).ready(function(){
});

$("#datepicker").datepicker({
defaultDate: null,
dateFormat: "D, d M yy",
minDate: from_date,
maxDate: to_date,
onSelect: function(){
var lifetime = $("#datepicker").val();
}
dateFormat: $.datepicker.RFC_1123,
minDate: '+1d',
maxDate: '+366d'
});
$("#datepicker").datepicker( "setDate" , null )
$("#submit_request").submit(function( event) {
Expand Down
30 changes: 3 additions & 27 deletions lib/rucio/web/ui/static/suspicious_replicas.js
View file
Expand Up @@ -13,17 +13,10 @@
$(document).ready(function(){

dt = $('#suspiciousreplicas').DataTable();
var today = new Date();
var ms = today.getTime() + 86400000;
var to_date = new Date(ms);
var ms = to_date.getTime() - 86400000 * 7;
var from_date = new Date(ms);
$("#datepicker1").datepicker({
defaultDate: from_date,
defaultDate: '-6d',
minDate: new Date(2015, 0, 1),
onSelect: function(){
from_date = $("#datepicker1").val();
}
dateFormat: $.datepicker.ISO_8601
});

$('#rse_expression_checker').submit(function( event) {
Expand Down Expand Up @@ -55,30 +48,13 @@ $(document).ready(function(){


$("#submit_button").click(function(){
if (typeof from_date == "undefined"){
alert('Please select a start date');
return
}
if (typeof from_date != 'string'){
from_date = from_date.toISOString().slice(0, 19);
}
if (typeof from_date == 'string'){
split_from_date = from_date.split('/');
if (split_from_date.length > 2){
var day = split_from_date[0];
var month = split_from_date[1];
var year = split_from_date[2];
from_date = year + '-' + month + '-' + day + 'T00:00:00';
}
}

dt.destroy();
$('#loader').html('<div class="row"><div class="large-1 large-centered columns"><img src="/media/spinner.gif"></div></div>');

r.get_suspicious_files({
rse_expression: $("#rse_expression").val(),
nattempts: $("#slider-range-min").slider("value"),
younger_than: from_date,
younger_than: $('#datepicker1').val() + 'T00:00:00',
success: function(data) {
$('#loader').html('');
var bad_replicas = Array();
Expand Down

0 comments on commit 3420063

Please sign in to comment.