style calendar selector

publiclab · Dec 26, 2018 · 5fbc450 · 5fbc450
1 parent 1e8e38f
commit 5fbc450
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 23 deletions.
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
@@ -9,8 +9,14 @@ def subscriptions
   end
 
   def range
-    @start = params[:start] ? Time.parse(params[:start]) : Time.now - 1.month
-    @end = params[:end] ? Time.parse(params[:end]) : Time.now
+    if params[:options].present?
+      @start = Time.now - 1.send(params[:options].downcase)
+      params[:start] = @start
+      params[:end] = Time.now
+    end
+    @start = params[:start] ? Time.parse(params[:start].to_s) : Time.now - 1.month
+    @end = params[:end] ? Time.parse(params[:end].to_s) : Time.now
+
     @notes = Node.select(%i(created type status))
       .where(type: 'note', status: 1, created: @start.to_i..@end.to_i)
       .count(:all)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -57,6 +57,17 @@
       I18n.defaultLocale = "<%= I18n.default_locale %>";
       I18n.locale = "<%= I18n.locale %>";
       I18n.fallbacks = true;
+      $(function () {
+      $("[data-toggle=popover]").popover({
+          html: true, 
+          content: function() {
+              return $('#popover-content').html();
+
+          }
+
+      });
+})
+
     </script>
 
     <% cache('feature_header', skip_digest: true) do %>

diff --git a/app/views/stats/range.html.erb b/app/views/stats/range.html.erb
@@ -1,36 +1,45 @@
 <h1>Activity</h1>
 
-<h5>From <%= @start.to_formatted_s(:long) %> to <%= @end.to_formatted_s(:long) %></h5>
-
 <h4><b> Select a range below to view stats within the range </b></h4>
 <%= form_tag request.url, method: 'get' do %>
-<div class="row">
-    <div class="col-md-4">
-        <h4>From</h4>
-    </div>
-    <div class="col-md-4">
-        <h4>To</h4>
+    <div class="row">
+        <div class="col-md-8 well">
+            <span style="font-size: 1.25em; color:#3071a9">
+                <i class="fa fa-calendar" style="font-size: 2em;"></i> From <%= @start.to_formatted_s(:long) %> to <%= @end.to_formatted_s(:long) %>
+        </span>
+        </div>
     </div>
-</div>
-<div class="row">
-    <div class="col-md-3">
-        <div data-toggle="tooltip">
-            <input data-provide="datepicker" data-date="<%= DateTime.now.strftime("%d-%m-%Y") %>" data-date-format="dd-mm-yyyy"  tabindex="1" class="form-control input-lg" type="text" name="start" value="<%= (DateTime.now - 1.weeks).strftime("%d-%m-%Y") %>" />
+    <div class="row">
+        <div class="col-md-8">
+            <h5> Date Range </h5>
+            <%= select_tag :options, options_for_select(["Week", "Month","Year"]), prompt: "View stats in the past", class: " form-control input-lg", onchange: "this.form.submit();" %>
         </div>
     </div>
-    <div class="col-md-1">
+    <div class="row">
+        <div class="col-md-4">
+            <h4>Starting</h4>
+        </div>
+        <div class="col-md-4">
+            <h4>Ending</h4>
+        </div>
     </div>
-    <div class="col-md-3">
-        <div data-toggle="tooltip">
+    <div class="row">
+        <div class="col-md-3">
+            <input data-provide="datepicker" data-date="<%= DateTime.now.strftime("%d-%m-%Y") %>" data-date-format="dd-mm-yyyy"  top="10px" tabindex="1" class="form-control input-lg" type="text" name="start" value="<%= (DateTime.now - 1.weeks).strftime("%d-%m-%Y") %>" />
+        </div>
+        <div class="col-md-1">
+        </div>
+        <div class="col-md-3">
             <input data-provide="datepicker" data-date="<%= DateTime.now.strftime("%d-%m-%Y") %>"   data-date-format="dd-mm-yyyy" tabindex="1" class="form-control input-lg" type="text" name="end" value="<%= DateTime.now.strftime("%d-%m-%Y") %>" />
         </div>
+        <div class="col-md-2">
+            <%= button_tag type: 'submit' , class: 'btn btn-primary' do %>
+                <i class="fa fa-chevron-right fa-2x"></i>
+            <% end %>
+        </div>
     </div>
-    <div class="col-md-2">
-        <%= submit_tag "Apply Filter", class: "btn btn-primary"%>
-    </div>
-</div>
 <% end %>
-
+</div>
 <hr />
 
 <table class="table">