metric_admin 0.0.12 → 0.0.13

data/app/controllers/admin/metric_summaries_controller.rb

@@ -0,0 +1,14 @@
+module MetricAdmin
+  class Admin::MetricSummariesController < ApplicationController
+    layout 'admin'
+
+    def destroy
+      @metric_summary = MetricSummary.find(params[:id])
+      if @metric_summary && @metric_summary.destroy
+        redirect_to edit_admin_metric_path(@metric_summary.metric), :notice => "Metric Summary was deleted."
+      else
+        redirect_to edit_admin_metric_path(@metric_summary.metric), :alert => "Metric Summary was not deleted."
+      end
+    end
+  end
+end

data/app/controllers/admin/metrics_controller.rb

@@ -17,6 +17,7 @@ module MetricAdmin
       @metric = Metric.find(params[:id])
       @resources = Resource.all
       @resource_type = ResourceType.find_by_id(@metric.resource_type_id)
+      1.times { @metric.metric_summaries.build }
     end
 
     def new
@@ -39,6 +40,8 @@ module MetricAdmin
 
     def create
       @metric = Metric.new(params[:metric])
+      @metric.has_detail = 1
+      @metric.data_type = "integer"
       if @metric.save
         flash[:success] = "#{@metric.title} has been created"
         redirect_to admin_metrics_url
@@ -119,6 +122,5 @@ module MetricAdmin
         render :action => :index, :status => :unprocessable_entity
       end
     end
-
   end
 end

data/app/views/admin/metrics/_metric_summaries.html.haml

@@ -0,0 +1,19 @@
+- f.fields_for :metric_summaries do |ms|
+  %div.summary
+    = ms.label "Metric summary title"
+    = ms.text_field :title
+    = ms.label "Group by"
+    = ms.select :group_by_key, eval(@metric.logic.match(/\['(.*?)'\]/)[0])
+    and
+    = ms.label "Action"
+    = ms.select :action, %w(count sum average median), {}, :class => "action-to-take"
+    on
+    %div.acton
+      = ms.label "Act on"
+      = ms.select :action_on, eval(@metric.logic.match(/\['(.*?)'\]/)[0])
+    = link_to "Add summary", "#", :class => "add_fields", :'data-id' => @metric.id
+    - if ms.object.new_record?
+      = link_to "Remove", "#", :class => "remove_fields"
+    - else
+      = link_to "Remove", admin_metric_metric_summary_path(@metric, ms.object), :method => :delete, :remote => true, :class => "remove_fields"
+      = ms.hidden_field :id

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

@@ -84,6 +84,10 @@
                     %label.control-label{:for => "staff_evaluation"} Staff: (for purposes of metric evaluation)
                     = collection_select :metric, :staff_evaluation, @metric.resource_type.resources, :code, :name
                     %br
+                  %label.control-label{:for => "description"} Configure Summaries:
+                  .controls       
+                    = render :partial => "metric_summaries", :locals => { :f => f } if @metric.logic.match(/\['(.*?)'\]/).present?  
+                    %br
                   %button.btn.run_logic{"aria-hidden" => "true", "data-dismiss" => "modal"}
                     Run
                     %i.icon-play
@@ -143,9 +147,11 @@
           contentType: "application/json; charset=utf-8",
           data: JSON.stringify({logic: editor_contents , logic_staff: $("#metric_staff_evaluation").val() }),
           success: function(data){
+            console.log("SUCCESS......", data)
             $('.loaderImage').hide();
           },
           error: function (response) {
+            console.log("FAILURE", response)
             $('.loaderImage').hide();
             $('.errors').html(response.responseText);
             $('.error-wrapper').show();

data/app/views/admin/metrics/new.html.haml

@@ -37,6 +37,11 @@
             = f.text_area :logic, :class=>"my-code-area input-block-level", :placeholder => "Technical Explanation", :value => @metric.logic, :rows => 20
 
             %br
+          .error-wrapper
+            %label.control-label{:for => "description"} Errors:
+            .controls
+              = f.text_area :logic_errors, :class=>"input-block-level errors", :placeholder => "Error Container", :value => "", :rows => 20
+              %br
           .controls
             %label.control-label{:for => "logic_staff"} Staff: (for purposes of metric evaluation)
             = text_field_tag :logic_staff, Resource.first(:conditions=>["resource_type_id = ?", params[:resource_type_id]]).code
@@ -89,7 +94,7 @@
 - content_for :footer do
   :javascript
     $(document).ready(function() {
-
+      $(".error-wrapper").hide();
       $("#metric_title").on("blur", function(){
         $("#metric_name").val( $("#metric_name").data('type') + "_" + this.value.replace(/[^A-Z0-9]/ig, "_").toLowerCase());
       });
@@ -105,7 +110,8 @@
 
       $('.quantified_result').html('');
       $('.detailed_results').html('');
-
+      $('.errors').html('');
+      $(".error-wrapper").hide()
       $.ajax(
         {
           type: "POST",
@@ -119,6 +125,8 @@
           },
           error: function (response) {
             $('.loaderImage').hide();
+            $('.errors').html(response.responseText);
+            $('.error-wrapper').show();
           }
         }
       );

data/lib/metric_admin/version.rb

@@ -1,3 +1,3 @@
 module MetricAdmin
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Analytics For Lawyers
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-09-23 00:00:00 -04:00
+date: 2016-09-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/controllers/admin/metric_summaries_controller.rb
 - app/controllers/admin/metrics_controller.rb
+- app/views/admin/metrics/_metric_summaries.html.haml
 - app/views/admin/metrics/edit.haml
 - app/views/admin/metrics/evaluate.js.erb
 - app/views/admin/metrics/index.haml