wco_models 3.1.0.315 → 3.1.0.316

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64bf475b76498b926be13e9fc16d4652735e9e8063ab34eeb3787faf925279fc
-  data.tar.gz: d2d65679c166a25b62209175ff199de6d54f607bf28f498d145467cac848b15b
+  metadata.gz: ef74c55ae94534c3dafd7ba9354becda76ca6ca4f7e22e588e21302a98013555
+  data.tar.gz: 33fd534065e448419f01d686c5abc00dc64fe2977681f87dae1943e46bb1c836
 SHA512:
-  metadata.gz: e9539d3f4f809d774890e6de3e4eba6c6b4054a3004fc932b5b006c944071f33f110b940d0af273e2f49e13bcb7880d7d3af46f7de045f99543ee5adfe86c810
-  data.tar.gz: d82d7cdff6a46da8a216360fc98759767193484df84e47a3d26428c49580af827ef66bac135d66e50b40eeabcfeb915385b9df6bf19039ec5a12ee7f1a7751ca
+  metadata.gz: 6d3b94363aecd6b681874d855ea62d9d5e9dc171594cb2de015cdeee2d67eca2906bc81e0d4e61a88984d1c40c6279cc96c787bd90b9c4bd7a17d048dfbcc9bc
+  data.tar.gz: 3195590a90fc0c6fb0d49449e84c0217a7699423657c2783c525693df08f0907c236de0a3055a0c501f605bb742f23e4d2a5c63fb4c66e89bd95da971d26db05

data/app/assets/javascripts/wco/application_studio.js

@@ -0,0 +1,8 @@
+//
+//= require ../vendor/jquery-3.3.1.min
+//= require ../vendor/popper-1.14.0.min
+//= require ../vendor/bootstrap-4.6.2.min
+//= require ../vendor/select2-4.0.0
+//= require ../vendor/jquery.dataTables-1.10.16
+//= require ../vendor/jquery-ui@1.13.2.js
+//

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

@@ -3,9 +3,6 @@
  *= require ../vendor/select2-4.0.0
  *= require ../vendor/jquery.dataTables-1.10.16
  *
- * Skip for now b/c I need to move fonts, too:
- * require ../vendor/summernote-0.8.18
- *
  *= require ../light_theme
  *= require_tree .
  *= require ../production_theme

data/app/assets/stylesheets/wco/newsvideos.scss

@@ -1,4 +1,11 @@
 
+.newsvideos-show {
+  .generated-video {
+    display: flex;
+    justify-content: center;
+  }
+}
+
 .zero-height {
   position: absolute;
 }
@@ -26,6 +33,21 @@
 
 
 
+.NewsvideoEventTimeline {
+  border: 1px solid orange;
+  background: white;
+  position: absolute;
+  left: 230px;
+
+  &:hover {
+    z-index: 5;
+  }
+
+  &.disabled {
+    background: gray;
+  }
+}
+
 
 
 .NewsoverlayTimeline {
@@ -37,6 +59,10 @@
   &:hover {
     z-index: 5;
   }
+
+  &.disabled {
+    background: gray;
+  }
 }
 
 .NewspartialTimelineW {
@@ -70,13 +96,19 @@
       min-width: 300px;
     }
 
-    .full-textC {
+    .header.collapse-expand {
+      position: relative;
       z-index: 4;
+    }
+
+    .full-textC {
       position: relative;
       background: white;
       padding: 10px;
       border: 1px solid black;
       border-radius: 10px;
+
+      z-index: 4;
     }
 
   }

data/app/assets/stylesheets/wco/studio.scss

@@ -0,0 +1,33 @@
+
+body {
+  background: #ccc;
+}
+
+
+.ctrl-row {
+  label {
+    margin-right: 2em;
+  }
+}
+
+
+.StudioW1 {
+  border: 1px solid red;
+
+  height: 100%;
+
+  display: flex;
+  justify-content: center;
+
+  .StudioW0 {
+    border: 1px solid blue;
+    background: #bbb;
+
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+
+    z-index: 5;
+  }
+}
+

data/app/controllers/wco/api/newspartials_controller.rb

@@ -54,6 +54,14 @@ class Wco::Api::NewspartialsController < Wco::ApiController
   def show_config
     @newspartial = Wco::Newspartial.find params[:id]
     config = JSON.parse @newspartial.speech_json
+
+    # @newsvideo_events = Wco::NewsvideoEvent.where( newsvideo: @newspartial.newsvideo )
+    @newsvideo_events = @newspartial.newsvideo_events
+    config[:fns] = @newsvideo_events.map { |ev| ev.exec_js }
+    config[:ftimes] = @newsvideo_events.map { |ev| ev.start_at_ms }
+    config[:fdurations] = @newsvideo_events.map { |ev| ev.duration_ms }
+
+
     config[:w_px] = @newspartial.newsvideo.w_px
     config[:h_px] = @newspartial.newsvideo.h_px
     config[:slug] = "#{@newspartial.newsvideo.slug}::#{@newspartial.slug}"

data/app/controllers/wco/api/newsproducer_controller.rb

@@ -4,16 +4,16 @@ class Wco::Api::NewsproducerController < Wco::ApiController
   before_action :decode_simple_api_key
 
   ## trash
-  def canvas
-    authorize! :home, Wco
-    # render 'canvas_minimal'
-  end
+  # def canvas
+  #   authorize! :home, Wco
+  #   # render 'canvas_minimal'
+  # end
 
   ## trash
-  def canvas_minimal
-    authorize! :home, Wco
-    render 'canvas_minimal'
-  end
+  # def canvas_minimal
+  #   authorize! :home, Wco
+  #   render 'canvas_minimal'
+  # end
 
   ##
   ## current
@@ -22,5 +22,14 @@ class Wco::Api::NewsproducerController < Wco::ApiController
     authorize! :home, Wco
   end
 
+  def studio_blue
+    authorize! :home, Wco
+    @newspartial = Wco::Newspartial.find params[:newspartial_id] rescue nil
+  end
+
+  def studio_green
+    authorize! :home, Wco
+  end
+
 end
 

data/app/controllers/wco/newsvideo_events_controller.rb

@@ -0,0 +1,66 @@
+
+class Wco::NewsvideoEventsController < Wco::ApplicationController
+
+  before_action :set_lists, only: [ :edit, :new ]
+
+  def create
+    @newsvideo_event = Wco::NewsvideoEvent.new params[:newsvideo_event].permit!
+    authorize! :create, @newsvideo_event
+    if @newsvideo_event.save
+      flash_notice 'Success'
+    else
+      flash_alert "No luck: #{@newsvideo_event.errors.full_messages.join(',')}."
+    end
+    redirect_to controller: :newsvideos, method: :index
+  end
+
+  def destroy
+    @newsvideo_event = Wco::NewsvideoEvent.find params[:id]
+    authorize! :destroy, @newsvideo_event
+    if @newsvideo_event.delete
+      flash[:notice] = "deleted newsvideo_event"
+    else
+      flash[:alert] = "Cannot delete newsvideo_event: #{@newsvideo_event.errors.messages}"
+    end
+    redirect_to request.referrer
+  end
+
+  def edit
+    @newsvideo_event = Wco::NewsvideoEvent.find params[:id]
+    authorize! :edit, @newsvideo_event
+  end
+
+  def new
+    authorize! :create, Wco::NewsvideoEvent
+    @newsvideo_event = Wco::NewsvideoEvent.new newsvideo_id: params[:newsvideo_id]
+  end
+
+  def update
+    @newsvideo_event = Wco::NewsvideoEvent.find params[:id]
+    authorize! :update, @newsvideo_event
+
+    if @newsvideo_event.update_attributes params[:newsvideo_event].permit!
+      flash_notice 'Success'
+    else
+      flash_alert "No luck: #{@newsvideo_event.errors.full_messages.join(',')}."
+    end
+    redirect_to controller: 'newsvideos', action: 'show', id: params[:newsvideo_event][:newsvideo_id]
+  end
+
+  ##
+  ## private
+  ##
+  private
+
+  def set_lists
+    if params[:newspartial_id]
+      partial = Wco::Newspartial.find params[:newspartial_id]
+      @newspartials_list = partial.newsvideo.newspartials.list
+      @newsvideos_list = []
+    else
+      @newspartials_list = []
+      @newsvideos_list = Wco::Newsvideo.list
+    end
+  end
+
+end

data/app/controllers/wco/newsvideos_controller.rb

@@ -168,7 +168,10 @@ class Wco::NewsvideosController < Wco::ApplicationController
     authorize! :show, @newsvideo
     @newspartials = Wco::Newspartial.where( newsvideo_id: @newsvideo.id.to_s).includes(:video)
     @newsoverlays = @newsvideo.newsoverlays
+    @newsvideo_events = @newsvideo.newsvideo_events
     @skip_footer = true
+
+    puts!  @newsvideo_events.to_a, 'zz'
   end
 
   def split

data/app/models/wco/newsoverlay.rb

@@ -37,6 +37,13 @@ class Wco::Newsoverlay
   field :start_at_ms, type: :integer, default: 0
   field :duration_ms, type: :integer, default: 0
 
+  STATUS_ACTIVE   = 'active'
+  STATUS_DISABLED = 'disabled'
+  field :status, type: :string, default: STATUS_ACTIVE
+  def self.active
+    where( status: STATUS_ACTIVE)
+  end
+
   delegate :duration_ms, to: :video
   delegate :name,        to: :video
 

data/app/models/wco/newspartial.rb

@@ -12,17 +12,19 @@ class Wco::Newspartial
 
   MAX_WORDS = 30
 
-  field :title
-  # validates :title, presence: true, uniqueness: true
-  # index({ title: 1 }, { unique: true })
-
   field :body
   field :config_json, type: :string, default: '{}'
   field :speech_json, type: :string, default: '{}' # the smaller config, excludes audio wav
 
   belongs_to :newsvideo
+
   has_one :video
 
+  has_many :newsvideo_events, class_name: 'Wco::NewsvideoEvent'
+  def newsvideo_events
+    Wco::NewsvideoEvent.where(newspartial_id: self.id)
+  end
+
   field :slug, type: :string
 
   has_mongoid_attached_file :audio,
@@ -127,4 +129,8 @@ class Wco::Newspartial
     Wco::Video.where( newspartial_id: self[:id] ).first
   end
 
+  def to_s
+    "#{newsvideo.slug}::#{slug}"
+  end
+
 end

data/app/models/wco/newsvideo.rb

@@ -47,7 +47,10 @@ class Wco::Newsvideo
   has_and_belongs_to_many :tags
   has_many :videos
 
-
+  has_many :newsvideo_events
+  def newsvideo_events
+    Wco::NewsvideoEvent.where( newsvideo_id: self.id )
+  end
 
   has_many :newsoverlays
   def newsoverlays
@@ -133,10 +136,10 @@ class Wco::Newsvideo
 
 
     ## overlays
-    if @newsvideo.newsoverlays.length > 0
+    if @newsvideo.newsoverlays.active.length > 0
       ## get overlays
       cmd = "cd #{Rails.root.join('tmp', @newsvideo.id)} ; "
-      @newsvideo.newsoverlays.each_with_index do |overlay, idx|
+      @newsvideo.newsoverlays.active.each_with_index do |overlay, idx|
         cmd = "#{cmd} wget -nc -O overlay_#{idx}.mp4 #{overlay.video.video.url} ; "
       end
       puts "+++ overlays cmd:"

data/app/models/wco/newsvideo_event.rb

@@ -0,0 +1,21 @@
+
+class Wco::NewsvideoEvent
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Wco::Utils
+  store_in collection: 'wco_newsvideo_events'
+
+  PAGE_PARAM_NAME = 'newsvideo_events_page'
+
+  belongs_to :newsvideo, class_name: 'Wco::Newsvideo', optional: true
+  belongs_to :newspartial, class_name: 'Wco::Newspartial', optional: true
+
+  field :start_at_ms, type: :integer, default: 0
+  field :duration_ms, type: :integer, default: 0
+
+  field :exec_js, type: :string, default: ''
+
+  field :status, default: 'active'
+  field :name, default: '<event>'
+
+end

data/app/models/wco_email/email_action.rb

@@ -56,12 +56,13 @@ class WcoEmail::EmailAction
       next_sch.save!
     end
   end
-
+  def do_run; send_and_roll; end
 
   def self.list
     [[nil,nil]] + all.map { |p| [ "#{p.lead&.email} :: #{p.tmpl&.slug}", p.id ] }
   end
 end
 
+
 Sch = WcoEmail::EmailAction