ish_manager 0.1.8.413 → 0.1.8.415

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

@@ -6,8 +6,8 @@
     %h2.title
       = @email_template.slug
       = link_to '[~]', edit_email_template_path( @email_template )
-      = link_to '[src ^]', '#'
-      = link_to '[preview ^]', '#'
-      = link_to '[use]', '#'
+      = link_to 'src', email_template_iframe_path(@email_template.slug), target: :_blank
+      -# = link_to '[preview ^]', '#'
+      -# = link_to '[use]', '#'
 
   %iframe{ src: email_template_iframe_path(@email_template.slug), width: '100%', height: '100%' }

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.415
 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
@@ -417,6 +418,7 @@ files:
 - app/views/ish_manager/email_templates/_m20221201react.html.erb
 - app/views/ish_manager/email_templates/_m20221222merryxmas.html.erb
 - app/views/ish_manager/email_templates/_marketing_react_1.html
+- app/views/ish_manager/email_templates/_marketing_react_2.html.erb
 - app/views/ish_manager/email_templates/_marketing_ror_1.html
 - app/views/ish_manager/email_templates/_marketing_ror_2.html.erb
 - app/views/ish_manager/email_templates/_marketing_wordpress_1.html
@@ -520,6 +522,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