ish_manager 0.1.8.413 → 0.1.8.414

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac60f7cd88786021285d1497b25f91540c45f639d1912ef070eb3329f2e1f15e
-  data.tar.gz: 21a8968131ae5f0075c774f3ad27cfdc0fe9d2927c0150f8c3d28f3366e03ef1
+  metadata.gz: 5ad6332705588cd6755bfb1bc2523291c5fa58240f548f7b7d0596123b280918
+  data.tar.gz: 4fdb537240ff5f95220dc2337f8e2dd49bf3d2cdc05b8ffee7eada2e660d53d6
 SHA512:
-  metadata.gz: 7b4ea92b7f2208a3c80a2a4d478e29582ea2fd5aa37b99afdae807b6b8003f6fc21e0afef66d4ffb72195e25e4993e5ad2a7311b5be1ac2f6e5fa540235aadb6
-  data.tar.gz: 5195f3b41ac7dd1568878ef9ec5de62dbfde500ca3844ffe75e0f211b3f5433c724d1a9ead3578fd7508e4e3f71037513d9bea3945085539dd6d246b7a4ed0ad
+  metadata.gz: feadba78e9e42914933a39332d4f8bdb377c1b75e1d5b61e72511c03f99617b4f8e9b0c396c0e181edf5e3ed4e4a8c72d95bb7034e206a3d8714cb8677ea5102
+  data.tar.gz: 2b6cbd12bfbdd15717f0400a4ed97e58960ae10668a376a95b95a598f39a64a532296e84a4ce44db4719f3627e2296e0771a9a55985de35165da12ecd0c9b33f

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

@@ -359,7 +359,7 @@ textarea.large {
     flex-wrap: wrap;
 
     li {
-      margin: 0 0 10px 0;
+      margin: 0 10px 10px 0;
       display: inline-block;
       min-width: 220px;
 

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

@@ -53,3 +53,14 @@
   }
 }
 
+.scheduled-emails-index {
+  .items {
+    display: flex;
+    flex-wrap: wrap;
+
+    .Card {
+      margin: 0 10px 10px 0;
+      padding: 10px;
+    }
+  }
+}

data/app/controllers/ish_manager/application_controller.rb

@@ -81,6 +81,7 @@ class IshManager::ApplicationController < ActionController::Base
     @leadsets_list        = Leadset.list
     @locations_list       = ::Gameui::Map.list
     @maps_list            = ::Gameui::Map.list # @TODO: missing nonpublic!
+    @office_actions_list  = [[nil,nil]] + Office::Action.all.map { |a| [ a.slug, a.id ] }
     @profiles_list        = Ish::UserProfile.list
     @reports_list         = Report.all.list
     @user_profiles_list   = Ish::UserProfile.list

data/app/controllers/ish_manager/email_actions_controller.rb

@@ -42,7 +42,7 @@ class ::IshManager::EmailActionsController < IshManager::ApplicationController
           params[:email_action][:ties_attributes].delete( k )
         end
         if v[:to_delete] == "1"
-          Actie.find( v[:id] ).delete
+          EActie.find( v[:id] ).delete
           params[:email_action][:ties_attributes].delete( k )
         end
       end

data/app/controllers/ish_manager/email_campaigns_controller.rb

@@ -27,18 +27,7 @@ class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
   def do_send
     @campaign = Ish::EmailCampaign.find params[:id]
     authorize! :send, @campaign
-    @campaign.leads.each do |lead|
-      tmpl = @campaign.email_template
-
-      ctx = Ctx.create!({
-        email_template: tmpl,
-        send_at: Time.now,
-        lead_id: lead.id,
-        from_email: tmpl.from_email,
-        subject: tmpl.subject,
-      })
-    end
-
+    @campaign.do_send
   end
 
   def show

data/app/controllers/ish_manager/office_actions_controller.rb

@@ -0,0 +1,85 @@
+
+class ::IshManager::OfficeActionsController < IshManager::ApplicationController
+
+  before_action :set_lists
+
+  ## Alphabetized : )
+
+  def create
+    @new_office_action = Office::Action.new params[:office_action].permit!
+    authorize! :create, @new_office_action
+    flag = @new_office_action.save
+    if flag
+      flash[:notice] = "Created OAction."
+      redirect_to action: 'index'
+    else
+      flash[:alert] = "Cannot create OAction: #{@new_office_action.errors.full_messages.join(', ')}."
+      render action: 'new'
+    end
+  end
+
+  def edit
+    @act = @office_action = Office::Action.find( params[:id] )
+    @act.ties.push Office::ActionTie.new( next_office_action_id: nil )
+    authorize! :edit, @act
+  end
+
+  def index
+    @office_actions = Office::Action.all
+
+    authorize! :index, @new_office_action
+  end
+
+  def new
+    authorize! :new, @new_office_action
+  end
+
+  def show
+    @act = @office_action = Office::Action.find( params[:id] )
+    authorize! :show, @act
+  end
+
+  ## def create; update; end
+  ## def upsert; update; end
+  def update
+    if params[:id]
+      @act = @office_action = Office::Action.find( params[:id] )
+    else
+      @act = @office_action = Office::Action.new
+    end
+    authorize! :upsert, @act
+
+    if params[:office_action][:ties_attributes]
+      params[:office_action][:ties_attributes].each do |k, v|
+        if !v[:next_office_action_id].present?
+          params[:office_action][:ties_attributes].delete( k )
+        end
+        if v[:to_delete] == "1"
+          EActie.find( v[:id] ).delete
+          params[:office_action][:ties_attributes].delete( k )
+        end
+      end
+    end
+
+    flag = @act.update_attributes( params[:office_action].permit! )
+    if flag
+      flash[:notice] = 'Success'
+      redirect_to action: 'index'
+    else
+      flash[:alert] = "No luck: #{@act.errors.full_messages.join(', ')}. #{@act.ties.map { |t| t.errors.full_messages.join(', ') }.join(' | ') }"
+      render action: 'edit'
+    end
+
+  end
+
+  ##
+  ## private
+  ##
+  private
+
+  def set_lists
+    @new_office_action = Office::Action.new
+    super
+  end
+
+end

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

@@ -56,24 +56,24 @@
             = link_to "#{WpTag::INBOX} (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})", email_conversations_in_path(WpTag::INBOX)
           = link_to '[+]', new_email_context_path
         %li
-          = link_to "Templates (#{Ish::EmailTemplate.all.count})", email_templates_path
+          = link_to "Tmpls (#{Ish::EmailTemplate.all.count})", email_templates_path
           = link_to '[+]', new_email_template_path
         %li
-          = link_to "Companies (#{Leadset.kept.length})", leadsets_path
+          = link_to "Co's (#{Leadset.kept.length})", leadsets_path
           = link_to '[+]', new_leadset_path
 
 
         %li
-          = link_to "Email Actions (#{Office::EmailAction.all.length})", email_actions_path
+          = link_to "EActions (#{Office::EmailAction.count})", email_actions_path
           = link_to '[+]', new_email_action_path
       %ul
         %li
           = link_to "Filters (#{Office::EmailFilter.active.length})", email_filters_path
           = link_to '[+]', new_email_filter_path
         %li
-          = link_to "Contexts (#{Ctx.notsent.length})", notsent_email_contexts_path
+          = link_to "Ctxs (#{Ctx.notsent.length})", notsent_email_contexts_path
           = link_to '[+]', new_email_context_path
-          = link_to 'summary', email_contexts_summary_path( format: :csv )
+          = link_to '[csv]', email_contexts_summary_path( format: :csv )
 
         %li
           = link_to "Leads (#{Lead.kept.length})", leads_path
@@ -81,13 +81,16 @@
         %li
           = link_to "Schs (#{Sch.active.length})", scheduled_email_actions_path
           = link_to '[+]', new_scheduled_email_action_path
+
       %ul
         %li  
         %li  
         %li
-          = link_to 'Campaigns', email_campaigns_path
+          = link_to "Campaigns (#{Ish::EmailCampaign.count})", email_campaigns_path
           = link_to '[+]', new_email_campaign_path
-        %li  
+        %li
+          = link_to "OActions (#{Office::Action.count})", office_actions_path
+          = link_to '[+]', new_office_action_path
 
     .c
 

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

@@ -1,6 +1,6 @@
 
-- act = email_action
-- url = email_action.new_record? ? email_actions_path : email_action_path( email_action )
+- eact = email_action
+- url  = email_action.new_record? ? email_actions_path : email_action_path( email_action )
 
 .email-actions--form
 
@@ -19,7 +19,7 @@
         -#   = f.text_area :descr
         .field.flex-row
           %label Template
-          = f.select :email_template_id, options_for_select( @email_templates_list, selected: act.email_template_id ), {}, class: 'select2'
+          = f.select :email_template_id, options_for_select( @email_templates_list, selected: eact.email_template_id ), {}, class: 'select2'
 
       .col-md-6
         .field

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

@@ -11,22 +11,22 @@
       %th= check_box_tag 'abba'
       %th
       %th slug
-      %th descr
       %th next actions
-    - @email_actions.each do |act|
+    - @email_actions.each do |eact|
       %tr
         %td= check_box_tag 'abba'
-        %td= link_to '[~]', edit_email_action_path( act )
-        %td= link_to act.slug, email_action_path( act )
-        %td= act.descr
-        -# %td= act.lead&.email
+        %td= link_to '[~]', edit_email_action_path( eact )
+        %td
+          -# = link_to eact.slug, email_action_path( eact )
+          = eact.slug
+          .em.small= eact.descr
         %td
           %ul
-            - act.ties.map do |next_a|
+            - eact.ties.map do |next_a|
               %li
                 .a= next_a.next_at_exe
                 .a
-                  - if next_a.next_email_action.slug == act.slug
+                  - if next_a.next_email_action.slug == eact.slug
                     (same)
                   = next_a.next_email_action.slug
-              -# %li= link_to next_a.next_email_action.slug, edit_email_action_path( next_a.next_email_action )
+

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

@@ -21,7 +21,7 @@
 
     .field
       = f.label "From"
-      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: campaign.from_email)
+      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: campaign.from_email), {}, class: 'select2'
 
     .actions
       = f.submit 'Submit'

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

@@ -5,6 +5,9 @@
       Email Campaigns (#{@campaigns.length})
       = link_to '[+]', new_email_campaign_path
 
-  - @campaigns.each do |c|
-    = link_to c.slug, email_campaign_path(c)
+  %ul
+    - @campaigns.each do |c|
+      %li
+        = link_to c.slug, email_campaign_path(c)
+        = link_to '[~]', edit_email_campaign_path(c)
 

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

@@ -0,0 +1,49 @@
+
+- oact = office_action
+- url  = office_action.new_record? ? office_actions_path : office_action_path( office_action )
+
+.office-actions--form
+
+  = form_for office_action, url: url, as: :office_action, :html => { :multipart => true } do |f|
+    .row
+      .col-sm-6
+        = f.submit :submit
+
+    .row
+      .col-md-6
+        .field
+          %label Slug
+          = f.text_field :slug
+
+        .flex-row
+          %label State
+          = f.select :state, options_for_select(::Office::Action::STATES, selected: oact.state )
+        .field
+          = f.label :perform_at
+          = f.text_field :perform_at
+
+        .field
+          %label Action Exe
+          = f.text_area :action_exe, class: 'large'
+
+      .col-md-6
+        .field
+          %label Next Office Actions
+          .eg rand(1..5).business_days.from_now.to_date + rand(8..16).hours + rand(1..59).minutes
+          %br
+
+          = f.fields_for :ties do |next_f|
+            .flex-row.field
+              = next_f.label :next_at_exe
+              = next_f.text_field :next_at_exe, class: 'flex-grow'
+            .flex-row.field
+              = next_f.label :to_delete
+              = next_f.check_box :to_delete
+              = next_f.select :next_office_action_id, options_for_select( @office_actions_list, selected: next_f.object.next_office_action_id ), { }, { class: 'select2' }
+            %br
+
+    .row
+      .col-sm-6
+        = f.submit :submit
+
+

data/app/views/ish_manager/office_actions/edit.haml

@@ -0,0 +1,7 @@
+
+.office-actions-edit.padded
+  .header
+    %h2.title Edit Office Action
+
+  = render 'form', office_action: @act
+

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

@@ -0,0 +1,38 @@
+
+.office-actions-index.padded
+
+  .header
+    %h2.title
+      Office Actions
+      = link_to '[+]', new_office_action_path
+
+  %table.bordered
+    %tr
+      %th= check_box_tag 'abba'
+      %th
+      %th state
+      %th slug
+      %th perform at
+      %th exe
+      %th next actions
+    - @office_actions.each do |oact|
+      %tr
+        %td= check_box_tag 'abba'
+        %td= link_to '[~]', edit_office_action_path( oact )
+        %td= oact.state
+        %td
+          -# = link_to oact.slug, office_action_path( oact )
+          = oact.slug
+          .em.small= oact.descr
+        %td= oact.perform_at
+        %td= oact.action_exe
+        %td
+          %ul
+            - oact.ties.map do |next_a|
+              %li
+                .a= next_a.next_at_exe
+                .a
+                  - if next_a.next_office_action.slug == oact.slug
+                    (same)
+                  = next_a.next_office_action.slug
+

data/app/views/ish_manager/office_actions/new.haml

@@ -0,0 +1,9 @@
+
+-# padded b/c eval(next_time_at) is long
+
+.office-actions-new.padded
+  .header
+    %h2.title
+      New Office Action
+
+  = render 'form', office_action: @new_office_action

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

@@ -0,0 +1,11 @@
+
+.office-actions-show.max-width
+  .header
+    .title Office Action #{@act.id}
+
+  %ul
+    - @act.ties.map do |next_a|
+      %li
+        .a <b>Next act:</b> #{"(same)" if next_a.next_office_action.slug == @act.slug} #{next_a.next_office_action.slug}
+        .a <b>Next at exe:</b> #{next_a.next_at_exe}
+        .a <b>Eval'ed:</b> #{eval( next_a.next_at_exe )}

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

@@ -1,24 +1,23 @@
 
-.scheduled-emails-index.max-width
+.scheduled-emails-index.padded
   .header
     %h2
       Scheduled Email Actions
       -# (#{Sch.kept.count})
       (#{Sch.all.count})
       = link_to '[+]', new_scheduled_email_action_path
-  .header
-    Time now: #{Time.now.strftime('%Y-%m-%d %l:%M%P')}
 
   .items
     - @scheduled_email_actions.each do |sch|
-      .item
+      .item.Card
         .flex-row
           .gray= sch.id
           = link_to '[~]', edit_scheduled_email_action_path(sch)
 
         %ul
-          %li <b>Act:</b> #{link_to sch.email_action.slug, edit_email_action_path(sch.email_action)}
+          %li <b>EAct:</b> #{link_to sch.email_action.slug, edit_email_action_path(sch.email_action)}
           %li <b>Tmpl:</b> #{sch.email_action.email_template.slug}
-          %li <b>Lead:</b> #{link_to sch.lead.email, lead_path(sch.lead) }
+          - if sch.lead_id
+            %li <b>Lead:</b> #{link_to sch.lead.email, lead_path(sch.lead) }
           %li <b>State:</b> #{sch.state}
           %li <b>Perform at:</b> #{sch.perform_at.in_time_zone}

data/config/routes.rb

@@ -108,6 +108,8 @@ IshManager::Engine.routes.draw do
 
   resources :newsitems
 
+  resources :office_actions
+
   resources :photos
   resources :payments
 

data/lib/tasks/office_tasks.rake

@@ -18,6 +18,34 @@ namespace :office do
     end
   end
 
+  desc 'office actions exe, rolling perform'
+  task oacts: :environment do
+    while true do
+
+      ## send and roll
+      Office::Action.active.where({ :perform_at.lte => Time.now }).each do |oact|
+
+        oact.update({
+          perform_at: nil,
+          # state: OAct::STATE_INACTIVE, ## @TODO: remove, they remain active but non-perform.
+        })
+        eval( oact.action_exe )
+        oact.ties.each do |tie|
+          next_oact            = tie.next_office_action
+          next_oact.perform_at = eval(tie.next_at_exe)
+          next_oact.state      = OAct::STATE_ACTIVE
+          next_oact.save!
+        end
+
+        print '+'
+      end
+
+      duration = Rails.env.production? ? 360 : 15 # 6 minutes or 15 seconds
+      sleep duration
+      print '.'
+    end
+  end
+
   ## 2023-04-02 _vp_ Continue.
   desc "send emails"
   task ctxs: :environment do
@@ -30,7 +58,8 @@ namespace :office do
         print '^'
       end
 
-      sleep 60 # seconds
+      duration = Rails.env.production? ? 120 : 15 # 2 minutes or 15 seconds
+      sleep duration
       print '.'
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.413
+  version: 0.1.8.414
 platform: ruby
 authors:
 - piousbox
@@ -307,6 +307,7 @@ files:
 - app/controllers/ish_manager/markers_controller.rb
 - app/controllers/ish_manager/meetings_controller.rb
 - app/controllers/ish_manager/newsitems_controller.rb
+- app/controllers/ish_manager/office_actions_controller.rb
 - app/controllers/ish_manager/payments_controller.rb
 - app/controllers/ish_manager/photos_controller.rb
 - app/controllers/ish_manager/reports_controller.rb
@@ -520,6 +521,11 @@ files:
 - app/views/ish_manager/newsitems/edit.haml
 - app/views/ish_manager/newsitems/index.haml
 - app/views/ish_manager/newsitems/new.haml
+- app/views/ish_manager/office_actions/_form.haml
+- app/views/ish_manager/office_actions/edit.haml
+- app/views/ish_manager/office_actions/index.haml
+- app/views/ish_manager/office_actions/new.haml
+- app/views/ish_manager/office_actions/show.haml
 - app/views/ish_manager/office_mailer/morning_reminder.haml
 - app/views/ish_manager/office_mailer/render
 - app/views/ish_manager/office_mailer/test_email.html.haml