WIP

rucio · Mar 2, 2021 · baef800 · baef800
1 parent 824d995
commit baef800
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 39 deletions.
diff --git a/lib/rucio/web/ui/static/bad_replicas_summary.js b/lib/rucio/web/ui/static/bad_replicas_summary.js
@@ -51,57 +51,36 @@ 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;
+    const now = new Date();
+    const default_from_date = new Date(now.getTime() - ms_per_day * 6);
+    const default_to_date = new Date(now.getTime() + ms_per_day);
     var show_suspicious = false;
     $("#datepicker1").datepicker({
-                                      defaultDate: from_date,
+                                      defaultDate: default_from_date,
                                       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_from_date);
                                       }
                                  });
     $("#datepicker2").datepicker({
-                                      defaultDate: to_date,
-                                      minDate: from_date,
-                                      onSelect: function(){
-                                          to_date = $("#datepicker2").val();
-                                      }
+                                      defaultDate: default_to_date,
+                                      minDate: new Date(default_from_date.getTime() + ms_per_day),
+                                      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>';

diff --git a/lib/rucio/web/ui/static/suspicious_replicas.js b/lib/rucio/web/ui/static/suspicious_replicas.js
@@ -65,8 +65,8 @@ $(document).ready(function(){
        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 day = split_from_date[1];
+              var month = split_from_date[0];
               var year = split_from_date[2];
               from_date = year + '-' + month + '-' + day + 'T00:00:00';
           }