ish_manager 0.1.8.431 → 0.1.8.433

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6f1b0f07e5b49a3f1aef9c15acb767d8c02420d20be6875d523b319297cd31b
-  data.tar.gz: 5ed7d17e31bd4873a9d06f8e7375c576059211ad122cc6e48659f6931174f127
+  metadata.gz: 3851f500f04389f2ec81a1a8dd31f47060d9f001be4ddeb4244ea808909c0644
+  data.tar.gz: 7676488b23694c001a8ae1453eba0ce3a6b0ef55ce31336a4c5bc050f2f6c5dc
 SHA512:
-  metadata.gz: 699e248f1b23b586ba81734afc67ce008ac48264c3a0980ad8841f595f771c5edaeeda6409178cc7eab394d695ee51944e551687ff564020faef0d7d8a172fa8
-  data.tar.gz: 0f2521916b15ffe1980fa17d5f46ef307d2fb9fab954f05ee796b669c4e7c2edb041b6375119f085635f9062ef4dcafbc942c67ad7c20c36297939e4703d3dd2
+  metadata.gz: 7c65c1edb906422b3ad548447da0d48811d7083e6d33b89de64d87aa4a5595f0b112f5c34d683da78449b6aa1fdfe9d2c8a6c2a704353399633d0173faf4e34a
+  data.tar.gz: 9facdfad77ef6a9e60058a348f42a00b77591fbcb252e50081ea0bad56eb5f5221a6c943c86a37deef15a81d1ed33edc5992236a4f4502fd0fb71ed17caa2f27

data/app/assets/stylesheets/ish_manager/email.scss

@@ -23,7 +23,9 @@
     justify-content: center;
   }
 }
-.ctxs {
+
+th.ctxs,
+td.ctxs {
   text-align: center;
 }
 .email-actions--form {

data/app/controllers/ish_manager/leads_controller.rb

@@ -70,28 +70,28 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
     end
     @leads = @leads.page( params[:leads_page ] ).per( current_profile.per_page )
 
-    @email_contexts = {}
-    lead_emails = @leads.map( &:email ).compact.reject(&:empty?)
-    map = %Q{
-      function() {
-        emit(this.to_email, {count: 1})
-      }
-    }
-    reduce = %Q{
-      function(key, values) {
-        var result = {count: 0};
-        values.forEach(function(value) {
-          result.count += value.count;
-        });
-        return result;
-      }
-    }
-    tmp_contexts = Ish::EmailContext.all.where( :to_email.in => lead_emails
-      ).map_reduce( map, reduce
-      ).out( inline: 1 ## From: https://www.mongodb.com/docs/mongoid/current/reference/map-reduce/
-      ).to_a
-    tmp_contexts.map { |x| @email_contexts[x[:_id]] = x[:value][:count].to_i }
-    puts! @email_contexts, '@email_contexts'
+    # @email_contexts = {}
+    # # lead_emails = @leads.map( &:email ).compact.reject(&:empty?)
+    # lead_ids = @leads.map( &:id )
+    # map = %Q{
+    #   function() {
+    #     emit(''+this.lead_id, {count: 1})
+    #   }
+    # }
+    # reduce = %Q{
+    #   function(key, values) {
+    #     var result = {count: 0};
+    #     values.forEach(function(value) {
+    #       result.count += value.count;
+    #     });
+    #     return result;
+    #   }
+    # }
+    # tmp_contexts = Ish::EmailContext.all.where( :lead_id.in => lead_ids
+    #   ).map_reduce( map, reduce
+    #   ).out( inline: 1 ## From: https://www.mongodb.com/docs/mongoid/current/reference/map-reduce/
+    #   ).to_a
+    # tmp_contexts.map { |x| @email_contexts[x[:_id]] = x[:value][:count].to_i }
 
   end
 
@@ -116,7 +116,8 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
     else
       flash[:alert] = "Cannot update lead: #{@lead.errors.messages}"
     end
-    redirect_to :action => 'index'
+    ## 2023-05-14 NOT redirecting to index anymore.
+    redirect_to :action => 'show', id: @lead.id
   end
 
 end

data/app/views/ish_manager/email_contexts/_form.haml

@@ -34,7 +34,7 @@
       .label-save-preview= f.submit 'Save & Preview'
     .tabs
       .tab-raw
-        = f.text_area :body, class: 'tinymce'
+        = f.text_area :body
       .tab-preview
         - if ctx.new_record?
           New record...

data/app/views/ish_manager/leads/_form.haml

@@ -23,6 +23,10 @@
     = f.label "Leadset (company)"
     = f.select :m3_leadset_id, options_for_select(@leadsets_list, selected: lead.m3_leadset_id), { include_blank: true }, { class: 'select2' }
 
+  .field
+    = f.label :comment
+    = f.text_area :comment
+
   -# .field
   -#   = f.label "Tags"
   -#   = f.text_field :wp_tags

data/app/views/ish_manager/leads/_index.haml

@@ -1,8 +1,8 @@
 
 -#
--# receives locals: leads , email_contexts , search_path
+-# receives locals: leads , search_path
 -#
-- email_contexts ||= {}
+-# - email_contexts ||= {}
 
 .leads--index.padded
   .header
@@ -40,7 +40,9 @@
         - leads.each do |lead|
           %tr
             %td= check_box_tag 'lead_ids[]', lead.id
-            %td= link_to "#{lead.name} <#{lead.email}>", lead_path( lead )
+            %td
+              = link_to '[~]', edit_lead_path( lead )
+              = link_to "#{lead.name} <#{lead.email}>", lead_path( lead )
             %td.company
               = lead.company.company_url
               - if lead.company.name.present?
@@ -51,7 +53,10 @@
             %td= lead.wp_tags.map(&:name).join(", ")
             %td= lead.created_at.to_s[0..10]
             %td.ctxs
-              = email_contexts[lead.email]&.length || '-'
+              = lead.email_contexts.length
+              -## without the N+1 but unfinished and messy:
+              -# = email_contexts[lead.id] || '-'
+
             %td.sch
               = lead.scheduled_email_actions.length
               = link_to '[+]', new_scheduled_email_action_path( lead_id: lead.id )

data/app/views/ish_manager/leads/index.haml

@@ -1,2 +1,3 @@
 
-= render 'index', leads: @leads, email_contexts: @email_contexts, search_path: leads_path
+= @email_contexts
+= render 'index', leads: @leads, search_path: leads_path

data/app/views/ish_manager/leads/show.haml

@@ -12,6 +12,7 @@
     %li Company: #{ link_to @lead.company.company_url, leadset_path(@lead.company) }
     %li Phone: #{@lead.phone}
     %li Address: #{@lead.address}
+    %li Comment: #{raw @lead.comment}
 
   .row
     .col-md-6.ctxs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.431
+  version: 0.1.8.433
 platform: ruby
 authors:
 - piousbox