metric_admin 0.0.23 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 563e709e3eed279359a2edcb0d5848c723bdd179
-  data.tar.gz: 56906b5c54eef337958e036b568f8f1fcc9e8a2a
+  metadata.gz: 62c0c0b520fbc7ce04d4892a0766b7fb18d773d6
+  data.tar.gz: 6d28e54d4811fcf875c73016a1912fabd395eede
 SHA512:
-  metadata.gz: d2c9fb4fc5944b789fe5f3d5801acc8d78e3221b973dc459d072b99b4e8a5d10c28069de747fc5391b2d272bb81d48702f0276393fdc7dc91b3bafcb9f6ed0ee
-  data.tar.gz: 609e6b26e03fca3924d18c9fb80dd953dec5416466d64bd13c8542cd56b3a17acc12a7ff539a44e467e80f4c1562ffe750df95a94d6242bd9b14ea6b3cd1ae24
+  metadata.gz: 59d137dea8b280b9586bf3ac9e385e5775c54317119d7f66c9ad4a02f7cbd024a98c964a9bb641387f34e751b8c7f2da6f4e39faac6433ba4081b63ac7a00421
+  data.tar.gz: 80b94995ed3759bf55a05cec8ee29716cf6395de0b2c86b2a42c454240e02f16e0f3b8d8b4d7ecc34cb7ff44b142d98994d0db8a5beb2d4ec2f658be1363d816

data/README.md

@@ -133,7 +133,7 @@ Link the metric_admin.js and the metric_admin.css in the admin view in ```layout
 
 Also ensure that you have linked in the admin layout the lastest jquery.ui.min.js file.
 
-Ensure that the metric table has a public_sort column.
+Ensure that the metric table has a sort column.
 
 In the dashboard application modify ```app/models/metric.rb```
 

data/app/controllers/admin/metrics_controller.rb

@@ -54,7 +54,7 @@ module MetricAdmin
     def sort
       params[:metric].each_with_index do |metric_id, i|
         @metric = Metric.find(metric_id)
-        @metric.update_attribute(:public_sort, i)
+        @metric.update_attribute(:sort, i)
       end
       render :text => "sorted"
     end
@@ -63,7 +63,7 @@ module MetricAdmin
       @metric_to_clone = Metric.find(params[:id])
       @metric = @metric_to_clone.clone
       @metric.title = "Copy of #{@metric.title}"
-      @metric.public_sort = Metric.maximum(:public_sort, :conditions=>["resource_type_id = ?", @metric_to_clone.resource_type_id ]).to_i + 1
+      @metric.sort = Metric.maximum(:sort, :conditions=>["resource_type_id = ?", @metric_to_clone.resource_type_id ]).to_i + 1
       if @metric.save
         flash[:notice] = "#{@metric.title} has been cloned"
         redirect_to edit_admin_metric_url(@metric)
@@ -74,7 +74,12 @@ module MetricAdmin
     end
 
     def calculate
-      CalculateMetrics.calculate_metrics_for_id(params[:id])
+      threads = []
+      flash[:notice] = "Started calculating..."
+      threads << Thread.new do 
+        CalculateMetrics.calculate_metrics_for_id(params[:id])
+      end
+      threads.each(&:join)
       flash[:notice] = "Completed calculating"
       redirect_to admin_metrics_url
     end

data/app/helpers/metrics_helper.rb

@@ -18,7 +18,7 @@ module MetricsHelper
       summary_action_on_index = headers.index(summary_action_on)
     end
 
-    summary_results = results.map{|x| x[summary_index]}.uniq.sort - [summary_key]
+    summary_results = results.map{|x| x[summary_index]}.uniq.compact.sort - [summary_key]
 
     case summary.action
     when 'count'

data/app/views/admin/metrics/edit.haml

@@ -39,7 +39,7 @@
                 .control-group
                   %label.control-label{:for => "title"} Sort order
                   .controls
-                    = f.text_field :sort, :value => @metric.public_sort.nil? ? @metric.resource_type.metrics.count : @metric.public_sort, :disabled => true, :class=>"span3"
+                    = f.text_field :sort, :value => @metric.sort.nil? ? @metric.resource_type.metrics.count : @metric.sort, :disabled => true, :class=>"span3"
 
               .span6
                 .row

data/app/views/admin/metrics/index.haml

@@ -18,7 +18,7 @@
               %h2.page-subtitle.pull-left= c.name
               = link_to "<i class='icon-plus icon-white'></i> Create a new #{c.name} metric", new_admin_metric_url(:resource_type_id => c), :class=>"btn btn-primary pull-right"
 
-            - metrics = Metric.all(:conditions=>["resource_type_id=?", c.id], :order => 'category ASC, public_sort ASC')
+            - metrics = Metric.all(:conditions=>["resource_type_id=?", c.id], :order => 'category ASC, sort ASC')
 
             - if metrics
               - metrics.group_by{|x| x.category }.each do |category, _metrics|
@@ -31,8 +31,8 @@
                       %div.list-group-item
                         = link_to metric.title, edit_admin_metric_path(metric.id)
 
-                        - if Result.count(:conditions=>["calculated_at = ? and metric_id = ?", Date.today.to_s, metric.id ]) == 0 && metric.status == 'active'
-                          %p.label.warning Has not run today.
+                        / - if Result.count(:conditions=>["calculated_at = ? and metric_id = ?", Date.today.to_s, metric.id ]) == 0 && metric.status == 'active'
+                        /   %p.label.warning Has not run today.
                         - if metric.status != 'active'
                           %p.label{:style=>"margin-left:5px;"} Not Active
 

data/app/views/metrics/metric_detail.html.haml

@@ -63,14 +63,14 @@
                 - headers[1..-1].each_with_index do |col, i|
                   %td{:class=> (i+2 == headers.count) || ((col.downcase["value"]) || (col.downcase["amount"]) ) ? "tr" : "tl", :style=>"border-top:2px solid #444; background:#fff;"}
                     - if (i+2 == headers.count)
-                      = number_to_currency(@result.result)
+                      = '--'
             - if @metric.data_type == "average"
               %tr
                 %td{:style=>"border-top:2px solid #444;background:#fff;"} Average
                 - headers[1..-1].each_with_index do |col, i|
                   %td{:class=> (i+2 == headers.count) || ((col.downcase["value"]) || (col.downcase["amount"]) ) ? "tr" : "tl", :style=>"border-top:2px solid #444; background:#fff;"}
                     - if (i+2 == headers.count)
-                      = @result.result
+                      = '--'
           - else
             / %tr
             /   %td{:style=>"border-top:2px solid #444;background:#fff;"} Sum

data/lib/metric_admin/version.rb

@@ -1,3 +1,3 @@
 module MetricAdmin
-  VERSION = "0.0.23"
+  VERSION = "0.0.28"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metric_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.28
 platform: ruby
 authors:
 - Analytics For Lawyers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Gem that builds and edits metrics.