ish_manager 0.1.8.416 → 0.1.8.418

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc54a836a0fb0b1a3c99d313011c26d16e22ba75b6c631b82eec0dcd2854ac7c
-  data.tar.gz: aa7e5a284ebb5646eb2288e4e1e9009b4409ed22b08e09895a3a8b1aaec5f78a
+  metadata.gz: 10e50889c4080362ba2acde217e981c548ee3d2a8883fb091dc55a544b5b19a0
+  data.tar.gz: 1c707ff1cbdc29a75f492be0616c5939084e351eb91bd9d86801c56ad6b7c2ad
 SHA512:
-  metadata.gz: 75e169cb64cb20dec6c015c9c8e9c9057cecb7a62549ae25ca6144a90259fcc0c98c99391350b85d25973403eb61ca679305e2fd4195dd905fda28a5e4a5fee9
-  data.tar.gz: 15badb0af441666f1b14c3d874e4c9b7dd6e31a7d8a540f8a5f2915fea7f6c041fee9c47f74c0384458a362b04f96c46bee2f67311d5dbb26b8561da34361d28
+  metadata.gz: 504b46e66bd8a8cfed80ac43439e4e356b2c50713ec7608a06a33ae2c7ff3062223c41f1710f203534a74b01b4628d9ee1ba68cc3d808034313ede798cb65077
+  data.tar.gz: a6b7eaed2bf22b43184ec6b77a8db9348f0405a7966ba336622461a8ad8e557e0d74f730d4d2ff700c498c838218fd90bc09304fdd20c2e0929e4a1df319dac0

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

@@ -155,41 +155,54 @@ table.bordered {
   text-align: center;
 }
 
-.chip,
-// .main-header a.chip,
-._ {
-  margin-right: 20px;
+.chip {
   // border: 1px solid black;
-
   border-radius: 1em 0 0 1em;
-  padding-left: .6em;
+
+  margin-right: 32px;
+
+  padding: 0.2em 0.2em 0.2em 0.6em;
+
+  height: 32px;
 
   background: white;
+
   position: relative;
 
+  &::before {
+    // border: 1px solid red;
+    // background: yellow;
 
+    content: "";
+    display: block;
 
+    position: absolute;
+    right: -16px;
+    top: 0;
+
+    width: 16px;
+    height: 32px;
+
+    // border-left: 12px solid white;
+    border-top: 17px solid white;
+    border-right: 12px solid transparent;
+    // border-bottom: 12px solid transparent;
+  }
   &::after {
     // border: 1px solid red;
 
     content: "";
+    display: block;
 
     position: absolute;
-    right: -30px;
-    width: 10px;
-    display: block;
-    // background: inherit;
-    // background: red;
-    margin: 0 20px;
-    top: -1px;
+    right: -16px;
     bottom: 0;
 
-    border-top: 16px solid white;
-    border-bottom: 16px solid white;
+    width: 16px;
+    height: 32px;
 
-    border-right: 10px solid transparent;
-
-    // border: 1px solid red;
+    border-bottom: 17px solid white;
+    border-right: 12px solid transparent;
   }
 }
 
@@ -342,7 +355,7 @@ textarea.large {
   border-bottom: 2px solid red;
   margin-bottom: 1em;
 
-  a,
+  a:not(.chip),
   span.label {
     background: white;
     padding: .2em;

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

@@ -1,5 +1,5 @@
 
-
+.center-headers,
 .email-actions-edit,
 .email-actions-index,
 .email-actions-new,

data/app/controllers/ish_manager/email_campaign_leads_controller.rb

@@ -33,10 +33,17 @@ class ::IshManager::EmailCampaignLeadsController < IshManager::ApplicationContro
   #   redirect_to :action => 'index'
   # end
 
-  # def edit
-  #   @lead = ::Lead.find params[:id]
-  #   authorize! :edit, @lead
-  # end
+  def destroy
+    @clead = EmailCampaignLead.find params[:id]
+    authorize! :destroy, @clead
+    flag = @clead.delete
+    if flag
+      flash[:notice] = 'ok'
+    else
+      flash[:alert] = 'no luck'
+    end
+    redirect_to controller: 'email_campaigns', action: :show, id: @clead.email_campaign_id
+  end
 
   # def index
   #   authorize! :index, ::Lead

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -101,12 +101,9 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
   def summary
     authorize! :summary, Ish::EmailContext
     @results = Ish::EmailContext.summary
-    puts! @results, 'r'
-
-    # headers["Content-Type"] ||= 'text/csv'
 
     respond_to do |format|
-      format.html # show.html.erb
+      format.html
       format.csv do
         render layout: false
       end

data/app/controllers/ish_manager/leads_controller.rb

@@ -110,11 +110,11 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
       }
     }
     @email_contexts = {}
-    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 }
+    # 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'
 
   end

data/app/views/ish_manager/application/_main_header_admin.haml

@@ -52,8 +52,8 @@
     .a
       %ul
         %li
-          .chip
-            = link_to "#{WpTag::INBOX} (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})", email_conversations_in_path(WpTag::INBOX)
+
+          = link_to "#{WpTag::INBOX} (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})", email_conversations_in_path(WpTag::INBOX), class: 'chip'
           = link_to '[+]', new_email_context_path
         %li
           = link_to "Tmpls (#{Ish::EmailTemplate.all.count})", email_templates_path
@@ -73,6 +73,8 @@
         %li
           = link_to "Ctxs (#{Ctx.notsent.length})", notsent_email_contexts_path
           = link_to '[+]', new_email_context_path
+          %br
+          = link_to 'summary', email_contexts_summary_path( format: :html )
           = link_to '[csv]', email_contexts_summary_path( format: :csv )
 
         %li

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

@@ -15,9 +15,9 @@
 
   .collapse-expand#campaignLeads Email Campaign leads (#{@campaign.campaign_leads.length})
   %ul.email-campaign-leads.items.browser-default
-    - @campaign.leads.each do |lead|
+    - @campaign.campaign_leads.each do |clead|
       %li.item
-        = lead.email
-        Ctxs:
-        = render 'ish_manager/email_contexts/index', ctxs: lead.email_contexts
+        .inline-block= button_to '[x]', email_campaign_lead_path(clead), method: :delete, :data => { :confirm => 'Are you sure?' }
+        = link_to clead.lead.email, lead_path(clead.lead.id)
+        (#{clead.lead.email_contexts.length} ctxs)
 

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

@@ -0,0 +1,16 @@
+
+.email-contexts-summary.max-width.center-headers
+  .header
+    %h2.title Email Contexts - Summary
+
+  %table.bordered
+    %thead
+      %tr
+        %th Date
+        %th Count
+    %tbody
+      - @results.each do |r|
+        %tr
+          %td= r['_id']
+          %td= r['total']
+

data/config/routes.rb

@@ -61,7 +61,7 @@ IshManager::Engine.routes.draw do
   post 'email_campaigns/:id/send', to: 'email_campaigns#do_send', as: :send_email_campaign
   resources :email_campaigns
 
-  resources :email_campaign_leads, as: :campaign_leads
+  resources :email_campaign_leads # , as: :campaign_leads
 
   resources :email_filters
 

metadata

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