Browse Source

Code cleanup

Andrew Kane 8 năm trước cách đây
mục cha
commit
c16e50ac13

+ 2 - 2
app/assets/javascripts/blazer/routes.js

@@ -6,10 +6,10 @@ var Routes = {
     return rootPath + "queries/cancel"
   },
   schema_queries_path: function(params) {
-    return rootPath + "queries/schema?data_source=" + params.data_source
+    return rootPath + "queries/schema?" + $.param(params)
   },
   tables_queries_path: function(params) {
-    return rootPath + "queries/tables?data_source=" + params.data_source
+    return rootPath + "queries/tables?" + $.param(params)
   },
   queries_path: function() {
     return rootPath + "queries"

+ 19 - 19
app/views/blazer/_variables.html.erb

@@ -45,23 +45,23 @@
 
       <script>
         <%= blazer_js_var "timeZone", Blazer.time_zone.tzinfo.name %>
-        var format = "YYYY-MM-DD";
-        var now = moment.tz(timeZone);
+        var format = "YYYY-MM-DD"
+        var now = moment.tz(timeZone)
 
         function dateStr(daysAgo) {
-          return now.clone().subtract(daysAgo || 0, "days").format(format);
+          return now.clone().subtract(daysAgo || 0, "days").format(format)
         }
 
         function toDate(time) {
-          return moment.tz(time.format(format), timeZone);
+          return moment.tz(time.format(format), timeZone)
         }
 
         function setTimeInputs(start, end) {
-          $("#start_time").val(toDate(start).utc().format());
-          $("#end_time").val(toDate(end).endOf("day").utc().format());
+          $("#start_time").val(toDate(start).utc().format())
+          $("#end_time").val(toDate(end).endOf("day").utc().format())
         }
 
-        $('#reportrange').daterangepicker(
+        $("#reportrange").daterangepicker(
           {
             ranges: {
              "Today": [dateStr(), dateStr()],
@@ -76,23 +76,23 @@
             opens: "right"
           },
           function(start, end) {
-            setTimeInputs(start, end);
-            submitIfCompleted($("#start_time").closest("form"));
+            setTimeInputs(start, end)
+            submitIfCompleted($("#start_time").closest("form"))
           }
-        ).on('apply.daterangepicker', function(ev, picker) {
-          setTimeInputs(picker.startDate, picker.endDate);
-          $('#reportrange span').html(toDate(picker.startDate).format('MMMM D, YYYY') + ' - ' + toDate(picker.endDate).format('MMMM D, YYYY'));
+        ).on("apply.daterangepicker", function(ev, picker) {
+          setTimeInputs(picker.startDate, picker.endDate)
+          $("#reportrange span").html(toDate(picker.startDate).format("MMMM D, YYYY") + " - " + toDate(picker.endDate).format("MMMM D, YYYY"))
         })
 
         if ($("#start_time").val().length > 0) {
-          var picker = $("#reportrange").data('daterangepicker');
-          picker.setStartDate(moment.tz($("#start_time").val(), timeZone));
-          picker.setEndDate(moment.tz($("#end_time").val(), timeZone));
-          $("#reportrange").trigger('apply.daterangepicker', picker)
+          var picker = $("#reportrange").data("daterangepicker")
+          picker.setStartDate(moment.tz($("#start_time").val(), timeZone))
+          picker.setEndDate(moment.tz($("#end_time").val(), timeZone))
+          $("#reportrange").trigger("apply.daterangepicker", picker)
         } else {
-          var picker = $("#reportrange").data('daterangepicker');
-          $("#reportrange").trigger('apply.daterangepicker', picker);
-          submitIfCompleted($("#start_time").closest("form"));
+          var picker = $("#reportrange").data("daterangepicker")
+          $("#reportrange").trigger("apply.daterangepicker", picker)
+          submitIfCompleted($("#start_time").closest("form"))
         }
       </script>
     <% end %>

+ 1 - 1
app/views/blazer/queries/_form.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <div id="app" v-cloak>
-  <%= form_for @query, url: (@query.persisted? ? query_path(@query, variable_params) : queries_path(variable_params)), html: {class: "the_form", autocomplete: "off"} do |f| %>
+  <%= form_for @query, url: (@query.persisted? ? query_path(@query, variable_params) : queries_path(variable_params)), html: {autocomplete: "off"} do |f| %>
     <div class="row">
       <div id="statement-box" class="col-xs-8">
         <div class= "form-group">

+ 4 - 4
app/views/blazer/queries/show.html.erb

@@ -48,17 +48,17 @@
 
   <script>
     function showRun(data) {
-      $("#results").html(data);
-      $("#results table").stupidtable().stickyTableHeaders({fixedOffset: 60});
+      $("#results").html(data)
+      $("#results table").stupidtable().stickyTableHeaders({fixedOffset: 60})
     }
 
     function showError(message) {
-      $("#results").addClass("query-error").html(message);
+      $("#results").addClass("query-error").html(message)
     }
 
     <%= blazer_js_var "data", variable_params.merge(statement: @statement, query_id: @query.id) %>
 
-    runQuery(data, showRun, showError);
+    runQuery(data, showRun, showError)
   </script>
 <% end %>