concerto_template_scheduling 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dbea6fcdda26efbf1615878235a429154a3ef29
-  data.tar.gz: 12130a5497e4e03d32e6a914dbc5f0644283263e
+  metadata.gz: c1671432ba95646459fd39f3cd5560d32997e33c
+  data.tar.gz: 73973e1c52d452cd42afd07be0c61ed11987188d
 SHA512:
-  metadata.gz: 024db2bf0d6fa0de6c8b828f63dc27adb5b64cec3e499f8c706acbcc366376034da188d7bba4fb5e5a50260ba1164397a7cbbb5f4917ad3fd59391fc747067ce
-  data.tar.gz: 31740b8f0cc9732b7b70d1d37246a7aa0e0c400410dfe9ce82252402065ae66ade1afc437057d15ec9f92bdf9afed45267eb8ed3de8539cce24fd7223c56a34c
+  metadata.gz: 0f149b6f566baa2caa01da99013f38137d69e7a23325e46b3a2b9a95a14ef22e3a124ef7ffe87375a91f5108980807f91126593979c913251198ae015f276d61
+  data.tar.gz: 2be7e85debbf625d1c7ab4206574d06e704ab0659d662ec7df270c09b16cfbf800d122148ff4df4536e1fb2841acc2942590f344a673702532579c7619045c9e

data/app/assets/javascripts/concerto_template_scheduling/application.js

@@ -10,4 +10,5 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require recurring_select
 //= require_tree .

data/app/assets/stylesheets/concerto_template_scheduling/application.css

@@ -9,5 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
+ *= require recurring_select
  *= require_tree .
  */

data/app/controllers/concerto_template_scheduling/schedules_controller.rb

@@ -60,6 +60,10 @@ module ConcertoTemplateScheduling
       auth! :action => :update, :object => @schedule.screen
       respond_to do |format|
         if @schedule.save
+          process_notification(@schedule, {:screen_id => @schedule.screen_id, :screen_name => @schedule.screen.name,
+            :template_id => @schedule.template.id, :template_name => @schedule.template.name }, 
+            :key => 'concerto_template_scheduling.schedule.create', :owner => current_user, :action => 'create')
+
           format.html { redirect_to @schedule, notice: 'Schedule was successfully created.' }
           format.json { render json: @schedule, status: :created, location: @schedule }
         else
@@ -77,6 +81,10 @@ module ConcertoTemplateScheduling
 
       respond_to do |format|
         if @schedule.update_attributes(schedule_params)
+          process_notification(@schedule, {:screen_id => @schedule.screen_id, :screen_name => @schedule.screen.name,
+            :template_id => @schedule.template.id, :template_name => @schedule.template.name }, 
+            :key => 'concerto_template_scheduling.schedule.update', :owner => current_user, :action => 'update')
+
           format.html { redirect_to @schedule, notice: 'Schedule was successfully updated.' }
           format.json { head :no_content }
         else
@@ -91,6 +99,9 @@ module ConcertoTemplateScheduling
     def destroy
       @schedule = Schedule.find(params[:id])
       auth! :action => :update, :object => @schedule.screen
+      process_notification(@schedule, {:screen_id => @schedule.screen_id, :screen_name => @schedule.screen.name,
+        :template_id => @schedule.template.id, :template_name => @schedule.template.name }, 
+        :key => 'concerto_template_scheduling.schedule.destroy', :owner => current_user, :action => 'destroy')
       @schedule.destroy
   
       respond_to do |format|

data/app/models/concerto_template_scheduling/schedule.rb

@@ -1,15 +1,14 @@
 module ConcertoTemplateScheduling
   class Schedule < ActiveRecord::Base
     include ActiveModel::ForbiddenAttributesProtection
+    include PublicActivity::Common if defined? PublicActivity::Common
 
     DISPLAY_NEVER=0
-    DISPLAY_ALWAYS=1
     DISPLAY_AS_SCHEDULED=2
     DISPLAY_CONTENT_EXISTS=3
 
     DISPLAY_WHEN = {
       I18n.t('concerto_template_scheduling.never') => DISPLAY_NEVER, 
-      I18n.t('concerto_template_scheduling.always') => DISPLAY_ALWAYS, 
       I18n.t('concerto_template_scheduling.as_scheduled') => DISPLAY_AS_SCHEDULED,
       I18n.t('concerto_template_scheduling.content_exists') => DISPLAY_CONTENT_EXISTS
     }
@@ -65,7 +64,7 @@ module ConcertoTemplateScheduling
     # @return [Hash{String => String, Number}] configuration hash.
     def default_config
       {
-        'display_when' => DISPLAY_ALWAYS,
+        'display_when' => DISPLAY_AS_SCHEDULED,
         'from_time' => '12:00am',
         'to_time' => '11:59pm'
       }
@@ -139,9 +138,7 @@ module ConcertoTemplateScheduling
         # and it is within the viewing window for the day
         if Clock.time >= Time.parse(self.config['from_time']) && Clock.time <= Time.parse(self.config['to_time'])
           # and it is either marked as always shown
-          if self.config['display_when'].to_i == DISPLAY_ALWAYS
-            effective = true
-          elsif self.config['display_when'].to_i == DISPLAY_CONTENT_EXISTS
+          if self.config['display_when'].to_i == DISPLAY_CONTENT_EXISTS
             # or if we detect actual content on the specified feed
             if !self.feed.nil? && !self.feed.approved_contents.active.where('kind_id != 4').empty?
               effective = true

data/app/views/concerto_template_scheduling/schedules/_form.html.erb

@@ -1,3 +1,4 @@
+<%= stylesheet_link_tag "concerto_template_scheduling/application" %>
 <%= javascript_include_tag "concerto_template_scheduling/application" %>
 
 <%= form_for(@schedule) do |f| %>

data/app/views/concerto_template_scheduling/screens/_screen_link.html.erb

@@ -36,8 +36,7 @@
                       <%= l(schedule.start_time.to_date, :format => :short) %> - <%= l(schedule.end_time.to_date, :format => :short) %>
                     <% end %> <b><%= schedule.is_effective? ? t(:active) : '' %></b>
                   </p>
-                  <p><%= schedule.config['from_time'] %> - <%= schedule.config['to_time'] %></p>
-                  <p><%= t('concerto_template_scheduling.when')%>: <b><%= ConcertoTemplateScheduling::Schedule::DISPLAY_WHEN.key(schedule.config['display_when'].to_i) %></b></p>
+                  <p><b><%= ConcertoTemplateScheduling::Schedule::DISPLAY_WHEN.key(schedule.config['display_when'].to_i) %></b></p>
 
                   <% if schedule.config['display_when'].to_i == ConcertoTemplateScheduling::Schedule::DISPLAY_CONTENT_EXISTS %>
                     <p>
@@ -50,6 +49,9 @@
                   <% elsif schedule.config['display_when'].to_i == ConcertoTemplateScheduling::Schedule::DISPLAY_AS_SCHEDULED %>
                     <p><%= schedule.schedule_in_words %></p>
                   <% end %>
+                  <% if schedule.config['display_when'].to_i != ConcertoTemplateScheduling::Schedule::DISPLAY_NEVER %>
+                    <p><%= schedule.config['from_time'] %> - <%= schedule.config['to_time'] %></p>
+                  <% end %>
                 </div>
               </li>
             <% end %>

data/app/views/public_activity/concerto_template_scheduling/schedule/_create.html.erb

@@ -0,0 +1,17 @@
+<% public_owner = User.find(activity.owner) %>
+<%= link_to public_owner.name, public_owner %> <%=t('.scheduled_template')%>  
+<% if ::Template.exists?(activity.parameters[:template_id]) %>
+  <%= link_to activity.parameters[:template_name], main_app.template_path(activity.parameters[:template_id]) %> 
+<% else %>
+  <%= activity.parameters[:template_name] %> 
+<% end %>
+<% if activity.trackable && defined?(template_scheduling) %>
+  <%= t('concerto_template_scheduling.starting') %> 
+  <%= link_to l(activity.trackable.start_time.to_date, :format => :short), template_scheduling.schedule_path(activity.trackable) %>
+<% end %>
+  <%= t('concerto_template_scheduling.for') %> 
+<% if Screen.exists?(activity.parameters[:screen_id]) %>
+  <%= link_to activity.parameters[:screen_name], main_app.screen_path(activity.parameters[:screen_id]) %> 
+<% else %>
+  <%= activity.parameters[:screen_name] %> 
+<% end %>

data/app/views/public_activity/concerto_template_scheduling/schedule/_destroy.html.erb

@@ -0,0 +1,14 @@
+<% public_owner = User.find(activity.owner) %>
+<%= link_to public_owner.name, public_owner %> <%=t('.deleted_a_schedule')%>  
+ <%= t('concerto_template_scheduling.for') %> 
+<% if ::Template.exists?(activity.parameters[:template_id]) %>
+  <%= link_to activity.parameters[:template_name], main_app.template_path(activity.parameters[:template_id]) %> 
+<% else %>
+  <%= activity.parameters[:template_name] %> 
+<% end %>
+ <%= t('concerto_template_scheduling.for') %> 
+<% if Screen.exists?(activity.parameters[:screen_id]) %>
+  <%= link_to activity.parameters[:screen_name], main_app.screen_path(activity.parameters[:screen_id]) %> 
+<% else %>
+  <%= activity.parameters[:screen_name] %> 
+<% end %>

data/app/views/public_activity/concerto_template_scheduling/schedule/_update.html.erb

@@ -0,0 +1,17 @@
+<% public_owner = User.find(activity.owner) %>
+<%= link_to public_owner.name, public_owner %> <%=t('.updated_template')%>  
+<% if ::Template.exists?(activity.parameters[:template_id]) %>
+  <%= link_to activity.parameters[:template_name], main_app.template_path(activity.parameters[:template_id]) %> 
+<% else %>
+  <%= activity.parameters[:template_name] %> 
+<% end %>
+<% if activity.trackable && defined?(template_scheduling) %>
+  <%= t('concerto_template_scheduling.starting') %> 
+  <%= link_to l(activity.trackable.start_time.to_date, :format => :short), template_scheduling.schedule_path(activity.trackable) %>
+<% end %>
+  <%= t('concerto_template_scheduling.for') %> 
+<% if Screen.exists?(activity.parameters[:screen_id]) %>
+  <%= link_to activity.parameters[:screen_name], main_app.screen_path(activity.parameters[:screen_id]) %> 
+<% else %>
+  <%= activity.parameters[:screen_name] %> 
+<% end %>

data/config/locales/en.yml

@@ -20,12 +20,14 @@ en:
     as_scheduled: 'As Scheduled'
     content_exists: 'Content Exists on Feed'
     effective: 'Currently in Effect? '
+    for: 'for'
     never: 'Never'
     from_time_must_precede_to_time: "'From Time' must precede 'To Time'"
     must_be_selected: 'must be selected'
     valid: 'Active'
     when: 'When'
     schedule_must_be_defined: 'Scheduling Criteria must be defined when "Use Template When" is "As Scheduled"'
+    starting: 'starting'
 
     schedules:
       edit:
@@ -60,3 +62,13 @@ en:
     templates:
       in_use_by:
         scheduled_for_the_following_screens: 'Scheduled for the following screens'
+
+  public_activity:
+    concerto_template_scheduling:
+      schedule:
+        create:
+          scheduled_template: 'scheduled template '
+        destroy:
+          deleted_a_schedule: 'deleted a scheduled template '
+        update:
+          updated_template: 'updated schedule for template '

data/lib/concerto_template_scheduling/engine.rb

@@ -1,3 +1,4 @@
+require 'recurring_select'
 module ConcertoTemplateScheduling
   class Engine < ::Rails::Engine
     isolate_namespace ConcertoTemplateScheduling
@@ -37,13 +38,11 @@ module ConcertoTemplateScheduling
 
         # influence which template is the effective template for a screen
 
-        add_controller_hook "Screen", :effective_template, :before do
-          # self is the screen model instance
-          if @template.nil?
-            schedules = Schedule.active.where(:screen_id => self.id)
-            schedules.reject! {|s| !s.is_effective? }
-            @template = schedules.first.template if !schedules.empty?
-          end
+        add_controller_hook "Screen", :frontend_display, :before do
+          # sets the template to the "effective" template
+          schedules = Schedule.active.where(:screen_id => self.id)
+          schedules.reject! {|s| !s.is_effective? }
+          self.template = schedules.first.template if !schedules.empty?
         end
 
         # delete schedules when a screen is deleted

data/lib/concerto_template_scheduling/version.rb

@@ -1,3 +1,3 @@
 module ConcertoTemplateScheduling
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_template_scheduling
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Marvin Frederickson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -90,6 +90,9 @@ files:
 - app/views/concerto_template_scheduling/schedules/show.html.erb
 - app/views/concerto_template_scheduling/screens/_screen_link.html.erb
 - app/views/concerto_template_scheduling/templates/_in_use_by.html.erb
+- app/views/public_activity/concerto_template_scheduling/schedule/_create.html.erb
+- app/views/public_activity/concerto_template_scheduling/schedule/_destroy.html.erb
+- app/views/public_activity/concerto_template_scheduling/schedule/_update.html.erb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20140118205731_create_concerto_template_scheduling_schedules.rb