ish_manager 0.1.8.440 → 0.1.8.441

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c76d84dfb6865e2469dcf6c92fa6ba382aaf6121664bc6c2c5030d517e436def
-  data.tar.gz: bb81afa3195283fe7e37347dd126490daa13a3e9ee79e4e7aebcfcb4cc330933
+  metadata.gz: 6ce64aaafb4bd3dbd060130af2561c9fa55c05e2bb40421ec488ed7cadd49949
+  data.tar.gz: 24bf8ebaa112f151a9fe0f5a95629a879aa102061dd6b3b9385501eec0e453a4
 SHA512:
-  metadata.gz: 1b7c4a6015f671f1d7814d4cf0e706e6a0f41a3d88b42267193256c145e1a8c164427433389be0c58384abaed4de6e25c4bc4f77da0fb95fd3e430208f8f2c8a
-  data.tar.gz: dd66635adab427556e6590d3ebfc10eeae6441be0deaeece93eb39804d48fdbc5896da15493f6cab9621faeadfb6f3d203d08c64ffca49d65c0473fa78a07eba
+  metadata.gz: 0f6c63048a0449bf28aabdf076364e421c4c515ecc0ec2061c399bbfd680bfd483c9b0baa1d7e1422443576db7bd741077532cf9bdb115fe78edc1d56a1d8305
+  data.tar.gz: 902decd1516986d31701c458f7236e3dc137f1cda1e067abe2b4f728e7f20e69b95b4a684ffbf6475cbf7e2464058a9b46405832a867a84e53102075ba8f0162

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

@@ -254,6 +254,17 @@ table.dataTable {
   display: none;
   position: absolute;
   min-width: 250px;
+  z-index: 1;
+
+  form {
+    min-width: 300px;
+    border: 1px solid blue;
+    border-radius: 0.5em;
+    padding: 0.5em;
+
+    background: #ccc;
+    display: inline-block;
+  }
 }
 
 /* E */

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

@@ -67,6 +67,7 @@
 
   .leads {
     .item {
+      display: inline;
       border: 1px solid green;
       // background: cyan;
     }

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

@@ -1,8 +1,4 @@
 
-.scheduled-email-actions--form {
-  min-width: 300px;
-}
-
 .scheduled-emails-new {
   border: 1px solid red;
   border-radius: .5em;
@@ -24,16 +20,6 @@
 }
 
 .scheduled-email-actions--form {
-
-  form {
-    border: 1px solid blue;
-    border-radius: 0.5em;
-    padding: 0.5em;
-
-    background: #ccc;
-    display: inline-block;
-  }
-
   .actions {
     display: flex;
     justify-content: flex-end;
@@ -43,5 +29,4 @@
   .flex-row {
     justify-content: space-between;
   }
-
 }

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -69,15 +69,15 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
     authorize! :index, ::Ish::EmailContext
     @ctxs = ::Ish::EmailContext.all.page( params[:ctxs_page] ).per( current_profile.per_page )
 
-    if my_truthy? params[:sent]
-      @ctxs = @ctxs.where( :sent_at.ne => nil )
-    else
-      @ctxs = @ctxs.where( sent_at: nil )
-    end
-
     if params[:lead_id]
       @lead = Lead.find params[:lead_id]
-      @ctxs = @ctxs.where( to_email: @lead.email )
+      @ctxs = @ctxs.where( lead_id: @lead.id )
+    else
+      if my_truthy? params[:sent]
+        @ctxs = @ctxs.where( :sent_at.ne => nil )
+      else
+        @ctxs = @ctxs.where( sent_at: nil )
+      end
     end
   end
 

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

@@ -3,15 +3,17 @@
 
   .header.collapse-expand-trash#emailContextsIndex
     %h2.title
-      - if my_truthy? params[:sent]
-        = link_to '[notsent]', email_contexts_path({ sent: false })
-        <u>sent</u>
-      - else
-        <u>notsent</u>
-        = link_to '[sent]', email_contexts_path({ sent: true })
+
       Email Contexts (#{@ctxs.length})
       - if @lead
-        For lead `#{@lead.name}`
+        For lead #{@lead.email}
+      - else
+        - if my_truthy? params[:sent]
+          = link_to '[notsent]', email_contexts_path({ sent: false })
+          <u>sent</u>
+        - else
+          <u>notsent</u>
+          = link_to '[sent]', email_contexts_path({ sent: true })
       = link_to '[+]', new_email_context_path
 
 

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

@@ -16,8 +16,20 @@
 
   .leads.max-width
     Leads (#{@email_conversation.leads.length}):
-    = @email_conversation.leads.map(&:id)
-    -# .leadsC= render 'ish_manager/leads/index_rows', leads: @email_conversation.leads
+    - @email_conversation.leads.each do |lead|
+      .item
+        = link_to "#{lead.id} #{lead.email}", lead_path(lead)
+        \(ctxs:
+        = link_to email_contexts_for_lead_path( lead ) do
+          = lead.email_contexts.count
+          %i.fa.fa-envelope
+        .relative.inline-block
+          %i.fa.fa-plus.expand-next
+          .expand-hide= render 'ish_manager/email_contexts/form', ctx: Ctx.new({ lead_id: lead.id, email_template: Tmpl.blank })
+        \)
+        .relative.inline-block
+          %i.fa.fa-clock-o.expand-next{ style: "color: red;" }
+          .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
 
   .messages.max-width
     - @email_messages.each do |msg|
@@ -31,14 +43,7 @@
                 = msg.id
                 <b>To:</b> #{msg.to}
                 <b>From:</b> #{lead.email}
-                = link_to email_contexts_for_lead_path( lead ) do
-                  \(
-                  = lead.email_contexts.count
-                  %i.fa.fa-envelope
-                  \)
-                .relative.inline-block
-                  %i.fa.fa-clock-o.expand-next{ style: "color: red;" }
-                  .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
+
 
           .datetime
             .date= msg.date&.strftime('%Y-%m-%d')

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

@@ -22,8 +22,8 @@
       %ul
         - @ctxs.each do |ctx|
           %li
-            = link_to ctx.subject, email_context_path(ctx)
-            = pp_date ctx.sent_at
+            = pp_date( ctx.sent_at ) || 'not sent'
+            = link_to ctx.subject.presence||"No Subj?!", email_context_path(ctx)
     .col-md-6.schs
       %h5
         Scheduled actions (#{@schs.length})

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

@@ -18,7 +18,7 @@
       = f.select :email_action, options_for_select( @email_actions_list, selected: sch_a[:email_action_id] ), {}, class: 'select2'
     .flex-row
       = f.label :perform_at
-      = f.text_field :perform_at
+      = f.text_field :perform_at, value: sch_a.new_record? ? Time.now : sch_a.perform_at
 
     .actions
       = submit_tag 'Schedule'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.440
+  version: 0.1.8.441
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails