metric_admin 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4982211e79dec58fd53319bead5c4b3a57ff8de1
-  data.tar.gz: 9eb11534752d346fbe36dbb7ddaa4dbd120f74b8
+  metadata.gz: c64f678a4f0726af48712b238739e9e94db0f6b0
+  data.tar.gz: 9ec79601a6d4ab724ad8ac407bf3be20df6dac42
 SHA512:
-  metadata.gz: f40e1b7caa515c6d43d08a78b2edf94f27837fcfe897f955af0f005d1e7f4ee9b22e145d3a225554009a867c26d878b0e8a6105d1b810a82e89284a3f271613c
-  data.tar.gz: 66dc5601000c00ff3b87f5be84c7667d06330d6c3817dc4ecd883f6adc2c064d4ed8896c428fd859620e7b094ed60ea97b3f47bc23d5e1e54da251d92eb07340
+  metadata.gz: 477064597e3eb91b095f61434032bc06b2a0ca734e3320b331db5a3413843aaa25e30b6a59d677347f11e7037f382d0034bcec9cdf6f01a2fc6cc6e22d7fd241
+  data.tar.gz: 048ecbe00d5b95c594d5512515348162b6f320fc919948c190390f8efe409ecd8b8b1a6f98c8d3d2b41715eeee93bc329071d0752c745529c26871bb5a946e53

data/app/controllers/admin/metrics_controller.rb

@@ -48,6 +48,14 @@ module MetricAdmin
       end
     end
 
+    def sort
+      params[:metric].each_with_index do |metric_id, i|
+        @metric = Metric.find(metric_id)
+        @metric.update_attribute(:public_sort, i)
+      end
+      render :text => "sorted"
+    end
+
     def clone
       @metric_to_clone = Metric.find(params[:id])
       @metric = @metric_to_clone.clone

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

@@ -18,7 +18,7 @@
     .metric-content
       .row-fluid
         .span12
-          %h3{:style=>"margin:0;"}= "Editing: #{params[:category]} - #{@metric.title}"
+          %h3{:style=>"margin:0;"}= "Editing: #{@metric.resource_type.name} - #{@metric.title}"
           %hr
           - form_for :metric, @metric, :url => admin_metric_path(@metric.id), :html => { :method => :put } do |f|
             = f.error_messages
@@ -82,7 +82,7 @@
                       %br
                   .controls
                     %label.control-label{:for => "logic_staff"} Staff: (for purposes of metric evaluation)
-                    = grouped_collection_select :metric, :resource_type_id, @metric_categories, :resources, :name, :name, :code
+                    = collection_select :metric, :resource_type_id, @metric.resource, :code, :name
                     %br
                   %button.btn.run_logic{"aria-hidden" => "true", "data-dismiss" => "modal"}
                     Run
@@ -141,7 +141,7 @@
           url: "/admin/metrics/"+metric_id+"/evaluate.js",
           beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
           contentType: "application/json; charset=utf-8",
-          data: JSON.stringify({logic: editor_contents , logic_staff: $("#logic_staff").val() }),
+          data: JSON.stringify({logic: editor_contents , logic_staff: $("#metric_resource_type_id").val() }),
           success: function(data){
             $('.loaderImage').hide();
           },

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

@@ -27,26 +27,27 @@
                     = category.present? ? category : 'No Category'
 
                   - _metrics.each do |metric|
-                    %div.item.list-group-item{:class => cycle('odd', 'even'), :id => "metric-#{metric.id}"}
-                      = link_to metric.title, edit_admin_metric_path(metric.id,:category => c.name)
+                    %div.item.list-group-item-wrapper{:class => cycle('odd', 'even'), :id => "metric-#{metric.id}"}
+                      %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 metric.status != 'active'
-                        %p.label{:style=>"margin-left:5px;"} Not Active
+                        - 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
 
-                      .pull-right
-                        .btn-toolbar.actions{:style => "margin: 0;"}
-                          .btn-group
-                            %button.btn Action
-                            %button.btn.dropdown-toggle{"data-toggle" => "dropdown"}
-                              %span.caret
-                            %ul.dropdown-menu
-                              %li
-                                = link_to "Edit".html_safe, edit_admin_metric_path(metric.id)
-                              %li
-                                = link_to "Calculate", "/admin/metrics/#{metric.id}/calculate"
-                              %li
-                                = link_to "Clone", "/admin/metrics/#{metric.id}/clone"
-                              %li
-                                = link_to "Delete", admin_metric_path(metric.id), :confirm => "Are you sure?", :method => :delete
+                        .pull-right
+                          .btn-toolbar.actions
+                            .btn-group
+                              %button.btn Action
+                              %button.btn.dropdown-toggle{"data-toggle" => "dropdown"}
+                                %span.caret
+                              %ul.dropdown-menu
+                                %li
+                                  = link_to "Edit".html_safe, edit_admin_metric_path(metric.id)
+                                %li
+                                  = link_to "Calculate", "/admin/metrics/#{metric.id}/calculate"
+                                %li
+                                  = link_to "Clone", "/admin/metrics/#{metric.id}/clone"
+                                %li
+                                  = link_to "Delete", admin_metric_path(metric.id), :confirm => "Are you sure?", :method => :delete

data/lib/metric_admin/version.rb

@@ -1,3 +1,3 @@
 module MetricAdmin
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metric_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Analytics For Lawyers