caboose-cms 0.4.110 → 0.4.111

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTBjODNmMjE5YzM2OTc1YzdlNzQwNGUzYmFmN2RkYzdjNTk1MTRhMA==
+    ZDllZmVlZTkzZTkxYTM2ZGFiN2UxYjkwMGQwZTZhNTEwOTVjNDhiMA==
   data.tar.gz: !binary |-
-    NDc1ZGI2MmNlZTA1NTkxYWExYTEyYzEzMmE1M2Y5NjZiMDk2ZDBhNA==
+    MTE3Yzk2MTM0MDhhMGFiY2NlMDI5MDM0ZmY0YjJlZDUwYzc5NDhkMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWM4YzA4ZmE0ZmI4NzczMWI1NWEzY2NlODVlMjQ5ZmYxMjA4MWEwMzE3MDE2
-    YTU5ODgyNzk3NTc5YjU2NTdjNzNhZDkyOGVmODBmZmZjYWNiYzM1N2Q4MGVj
-    NGM5ZWUyMzRhNjM3NTFiMTg2YmFiYzI3MTk2YmY2MDk4ZmMwMjA=
+    MTdlNmZiYzU3MWU5N2I5ZGI5YjE3NDVkNTBlOGFhNjU4MmE0NjBiOGNiMmEy
+    MzQ5ZDg0MzBjNmI5ZWI0NmI3ZGZhY2VhM2RjZDJiYWI2M2YwOGEwY2JlOGU1
+    Zjk3ZWQyYWUxYTk4MDZmMjVkMzcwNGM4MTA3NDIwZTE5NzQyMDM=
   data.tar.gz: !binary |-
-    NDMzMzQ4OTk1ZTViYzYxZDQ4ZmVhNGNlZmFkZmViYjE3NjczZWVhOWZlNzEx
-    OTM3ZjAxNDc2ZWFlYzAyY2MyZWRiMzRhMjI0OTY2ZmZhYWI0MTljZDk5MTAy
-    NWM2ZGNlNTVjYTljNmQ1ZjBkNjhkODAyOTExYWJhZTU1Zjc4NzA=
+    NTU4NzcxOTZkZGEyY2RmMGI1OGY2NGIxMjNlOGFjMGM3YzYyZGYyNzNjNTgz
+    N2U0OGM2NWY5YjM1ZDQyMzBlMjc3MTlhYTJkYjZkOGZlNDQ3NTE3Nzk3MDZh
+    ZTNkZTRiMjIxNDY1ZWE1OGFkODAwYjlkNGVhMmNiZDllZTdhZWM=

data/app/controllers/caboose/event_groups_controller.rb

@@ -4,69 +4,38 @@ module Caboose
     
     helper :application
     
-    # GET /admin/calendars/:calendar_id/events/:id
-    def admin_edit
-      return unless user_is_allowed('calendars', 'edit')
-      @event = CalendarEvent.find(params[:id])      
-      render :layout => 'caboose/modal'
-    end
-    
-    # GET /admin/calendars/:calendar_id/events/new
-    def admin_new
-      return unless user_is_allowed('calendars', 'edit')
-      @calendar = Calendar.find(params[:calendar_id])
-      @begin_date = DateTime.iso8601(params[:begin_date])
-      render :layout => 'caboose/modal'
-    end
-    
-    # PUT /admin/calendars/:calendar_id/events/:id
+    # PUT /admin/calendars/:calendar_id/event-groups/:id
     def admin_update
       return unless user_is_allowed('calendars', 'edit')
       
       resp = StdClass.new
-      event = CalendarEvent.find(params[:id])
+      g = CalendarEventGroup.find(params[:id])
       
       save = true      
       params.each do |name, value|
         case name
-          when 'name'         then event.name         = value
-          when 'description'  then event.description  = value          
+          when 'frequency'    then g.frequency    = value
+          when 'period'       then g.period       = value        
+          when 'repeat_by'    then g.repeat_by    = value
+          when 'sun'          then g.sun          = value
+          when 'mon'          then g.mon          = value
+          when 'tue'          then g.tue          = value
+          when 'wed'          then g.wed          = value
+          when 'thu'          then g.thu          = value
+          when 'fri'          then g.fri          = value
+          when 'sat'          then g.sat          = value
+          when 'date_start'   then g.date_start   = DateTime.strptime(value, '%m/%d/%Y').to_date
+          when 'repeat_count' then g.repeat_count = value
+          when 'date_end'     then g.date_end     = DateTime.strptime(value, '%m/%d/%Y').to_date                                      
         end
       end
+      g.save
+      g.create_events
     
-      resp.success = save && event.save
-      render :json => resp
-    end
-    
-    # POST /admin/calendars/:calendar_id/events
-    def admin_add
-      return unless user_is_allowed('calendars', 'edit')
-      
-      resp = StdClass.new      
-      event = CalendarEvent.new
-      event.calendar_id = params[:calendar_id]
-      event.name = params[:name]
-      event.begin_date = DateTime.iso8601("#{params[:begin_date]}T10:00:00-05:00") 
-      event.end_date   = DateTime.iso8601("#{params[:begin_date]}T10:00:00-05:00")      
-      event.all_day = true
-            
-      if event.name.nil? || event.name.strip.length == 0
-        resp.error = "Please enter an event name."
-      else
-        event.save
-        resp.redirect = "/admin/calendars/#{event.calendar_id}/events/#{event.id}"
-      end
-      render :json => resp
-    end
-    
-    # DELETE /admin/calendars/:id
-    def admin_delete
-      return unless user_is_allowed('calendars', 'delete')
-      Calendar.find(params[:id]).destroy      
-      resp = StdClass.new({ 'redirect' => "/admin/calendars" })                  
+      resp.success = true
       render :json => resp
     end
-    
+     
     # GET /admin/event-groups/period-options
     def admin_period_options
       render :json => [

data/app/controllers/caboose/events_controller.rb

@@ -64,13 +64,13 @@ module Caboose
             event.begin_date = DateTime.strptime("#{value} #{t}", '%m/%d/%Y %H:%M %z')                        
           when 'begin_time'
             d = event.begin_date ? event.begin_date.strftime('%Y-%m-%d') : DateTime.now.strftime('%Y-%m-%d')
-            event.begin_date = DateTime.strptime("#{d} #{value}", '%Y-%m-%d %H:%M %z')
+            event.begin_date = DateTime.strptime("#{d} #{value}", '%Y-%m-%d %I:%M %P')
           when 'end_date'
             t = event.end_date ? event.end_date.strftime('%H:%M %z') : '10:00 -0500'
             event.end_date = DateTime.strptime("#{value} #{t}", '%m/%d/%Y %H:%M %z')
           when 'end_time'
             d = event.end_date ? event.end_date.strftime('%Y-%m-%d') : DateTime.now.strftime('%Y-%m-%d')
-            event.end_date = DateTime.strptime("#{d} #{value}", '%Y-%m-%d %H:%M %z')
+            event.end_date = DateTime.strptime("#{d} #{value}", '%Y-%m-%d %I:%M %P')
           when 'repeats'
             g = event.calendar_event_group
             if value == true || value.to_i == 1

data/app/models/caboose/calendar_event.rb

@@ -12,15 +12,31 @@ module Caboose
       :location                ,
       :begin_date              ,
       :end_date                ,
-      :all_day        
+      :all_day                 ,
+      :repeats
 
     def self.events_for_day(calendar_id, d)
       q = ["calendar_id = ? 
-        and concat(date_part('year', begin_date),date_part('month', begin_date),date_part('day', begin_date)) <= ?
-        and concat(date_part('year', end_date  ),date_part('month', end_date  ),date_part('day', end_date  )) >= ?",
-        calendar_id, d.strftime('%Y%m%d'), d.strftime('%Y%m%d')]
+        and cast(begin_date as date) <= ?
+        and cast(end_date   as date) >= ?",
+        calendar_id, d.to_date, d.to_date]
       self.where(q).reorder(:begin_date).all
     end
+    
+    def duplicate(d)
+      e = CalendarEvent.create(        
+        :calendar_id             => self.calendar_id,
+        :calendar_event_group_id => self.calendar_event_group_id,
+        :name                    => self.name,
+        :description             => self.description,
+        :location                => self.location,
+        :begin_date              => d,
+        :end_date                => d + (self.end_date - self.begin_date).seconds,
+        :all_day                 => self.all_day,
+        :repeats                 => self.repeats
+      )
+      return e
+    end
 
   end
 end

data/app/models/caboose/calendar_event_group.rb

@@ -26,5 +26,96 @@ module Caboose
     REPEAT_BY_DAY_OF_MONTH = 'Day of month'
     REPEAT_BY_DAY_OF_WEEK  = 'Day of week'
     
+    def create_events      
+      return if self.date_start.nil?      
+      return if self.date_end.nil?      
+      return if self.date_end < self.date_start      
+      
+      e = self.calendar_events.reorder(:begin_date).first      
+      return if e.nil?
+      
+      dates = [e.begin_date.to_date]
+      if self.period == 'Day'
+        d = self.date_start
+        while d <= self.date_end
+          if !CalendarEvent.where("calendar_event_group_id = ? and cast(begin_date as date) = ?", self.id, d).exists?
+            e.duplicate(d)
+            dates << d.to_date
+          end
+          d = d + 1.day
+        end
+        
+      elsif self.period == 'Week'
+                
+        d = self.date_start - self.date_start.strftime('%w').to_i.days
+        while d <= self.date_end          
+          (0..6).each do |i|            
+            d = d + 1
+            Caboose.log("d = #{d}")
+            next if d < self.date_start
+            break if d > self.date_end
+            w = d.strftime('%w').to_i
+            if (w == 0 && self.sun) || (w == 1 && self.mon) || (w == 2 && self.tue) || (w == 3 && self.wed) || (w == 4 && self.thu) || (w == 5 && self.fri) || (w == 6 && self.sat)
+              Caboose.log("Found a day")
+              if !CalendarEvent.where("calendar_event_group_id = ? and cast(begin_date as date) = ?", self.id, d).exists?
+                e.duplicate(d)
+                dates << d.to_date
+              end
+            end
+          end
+          d = d + (self.frequency-1).weeks
+        end
+        
+      elsif self.period == 'Month'
+        d = self.date_start
+        if self.repeat_by == self::REPEAT_BY_DAY_OF_MONTH          
+          while d <= self.date_end           
+            if !CalendarEvent.where("calendar_event_group_id = ? and cast(begin_date as date) = ?", self.id, d).exists?
+              e.duplicate(d)
+              dates << d.to_date
+            end
+            d = d + self.frequency.months  
+          end
+        elsif self.repeat_by == self::REPEAT_BY_DAY_OF_WEEK
+          
+          #d0 = DateTime.new(d.strftime('%Y'), d.strftime('%m'), 1)
+          #w = d0.strftime('%w').to_i
+          #i = 0
+          #while d0 <= d
+          #  i = i + 1 if d0.strftime('%w').to_i == w
+          #  d0 = d0 + 1.day
+          #end
+          #
+          ## Now set the i'th occurance of the w day of the week           
+          #d = DateTime.new(d.strftime('%Y'), d.strftime('%m'), 1)
+          #while d <= self.date_end
+          #  d0 = d
+          #  while d
+          #    
+          #    
+          #  if !CalendarEvent.where("calendar_event_group_id = ? and cast(begin_date as date) = ?", self.id, d).exists?
+          #    CalendarEvent.duplicate(d)
+          #  end
+          #  d = d + self.frequency.months  
+          #end
+          
+        end
+        
+      elsif self.period == 'Year'
+        d = self.date_start
+        while d <= self.date_end
+          if !CalendarEvent.where("calendar_event_group_id = ? and cast(begin_date as date) = ?", self.id, d).exists?
+            e.duplicate(d)
+            dates << d.to_date
+          end
+          d = d + 1.year
+        end
+        
+      end
+      
+      # Get rid of events that shouldn't be in the group            
+      CalendarEvent.where("calendar_event_group_id = ? and cast(begin_date as date) not in (?)", self.id, dates).destroy_all
+                  
+    end    
   end
 end

data/app/models/caboose/schema.rb

@@ -31,7 +31,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::User => [:timezone],
       #Caboose::Field => [:child_block_id],
       Caboose::BlockType => [:layout_function],
-      Caboose::CalendarEventGroup => [
+      Caboose::CalendarEvent => [
         :repeat_period , 
         :repeat_sun    , 
         :repeat_mon    , 
@@ -42,6 +42,18 @@ class Caboose::Schema < Caboose::Utilities::Schema
         :repeat_sat    , 
         :repeat_start  , 
         :repeat_end    
+      ],
+      Caboose::CalendarEventGroup => [
+        :repeat_period , 
+        :repeat_sun    , 
+        :repeat_mon    , 
+        :repeat_tue    , 
+        :repeat_wed    , 
+        :repeat_thu    , 
+        :repeat_fri    , 
+        :repeat_sat    , 
+        :repeat_start  , 
+        :repeat_end        
       ] 
     }
   end

data/app/views/caboose/calendars/admin_edit.html.erb

@@ -37,7 +37,7 @@
         <% events = Caboose::CalendarEvent.events_for_day(@calendar.id, d) %>
         <% if events.count > 0 %>
           <ul>
-            <% events.each do |ev| %><li><%= ev.name %></li><% end %>
+            <% events.each do |ev| %><li><a href='/admin/calendars/<%= @calendar.id %>/events/<%= ev.id %>' class='event_link'><%= ev.name %></a></li><% end %>
           </ul>
         <% end %>      
       </td>
@@ -76,12 +76,19 @@ $(document).ready(function() {
     .mouseout(function(e) { $(this).removeClass('over'); })
     .click(function(e) {
       e.preventDefault();
+      e.stopPropagation();
       if (!$(this).hasClass('blank'))
       {        
         var d = $(this).attr('id').replace('day_', '');        
         caboose_modal_url('/admin/calendars/<%= @calendar.id %>/events/new?begin_date=' + d);
       }
     });
+  $('#calendar td a.event_link')    
+    .click(function(e) {
+      e.preventDefault();
+      e.stopPropagation();              
+      caboose_modal_url($(this).attr('href'));
+    });
 });
 
 function delete_calendar(calendar_id, confirm)
@@ -114,10 +121,14 @@ function delete_calendar(calendar_id, confirm)
       
 #calendar table { border-collapse: collapse; width: 95%; }
 #calendar th { border: #666 1px solid; background: #666; color: #fff; margin: 0; padding: 4px 8px; }
-#calendar td { border: #666 1px solid; position: relative; margin: 0; padding: 0; height: 100px; vertical-align: top; }
+#calendar td { border: #666 1px solid; position: relative; margin: 0; padding: 0; width: 14%; height: 100px; vertical-align: top; }
 #calendar td.blank { background: #efefef; border: #666 1px solid; }
 #calendar td.over { background: #ffcc99; }
 #calendar td span.day { display: block; float: left; border-right: #666 1px solid; border-bottom: #666 1px solid; width: 20px; text-align: center; }
+#calendar td ul { margin: 0; padding: 0; list-style: none; }
+#calendar td ul li { margin: 0; padding: 0; list-style: none; }
+#calendar td ul li a { display: block; }
+#calendar td ul li a:hover { background: #fff; }
 
 </style>
 <% end %>

data/app/views/caboose/events/admin_edit.html.erb

@@ -25,7 +25,7 @@ g = @event.calendar_event_group
   <div id='repeat_by_container' <% if g.repeat_by != Caboose::CalendarEventGroup::PERIOD_MONTH %>style='display: none;'<% end %>>    
     <div id='calendareventgroup_<%= g.id %>_repeat_by'    ></div>
   </div>
-  <div id='week_container' <% if g.repeat_by != Caboose::CalendarEventGroup::PERIOD_WEEK %>style='display: none;'<% end %>>
+  <div id='week_container' <% if g.period != Caboose::CalendarEventGroup::PERIOD_WEEK %>style='display: none;'<% end %>>
     <table class='data'>
       <tr><th>S</th><th>M</th><th>T</th><th>W</th><th>R</th><th>F</th><th>S</th></tr>
       <tr>
@@ -59,7 +59,7 @@ g = @event.calendar_event_group
 
 var modal = false;
 $(window).ready(function() {
-  modal = new CabooseModal(600);
+  modal = new CabooseModal(460);
 });
 
 $(document).ready(function() {
@@ -72,9 +72,9 @@ $(document).ready(function() {
       { name: 'name'        , nice_name: 'Name'         , type: 'text'     , value: <%= raw Caboose.json(e.name        ) %>, width: 430 },        
       { name: 'description' , nice_name: 'Description'  , type: 'textarea' , value: <%= raw Caboose.json(e.description ) %>, width: 430, height: 100 },
       { name: 'location'    , nice_name: 'Location'     , type: 'text'     , value: <%= raw Caboose.json(e.location    ) %>, width: 430 },
-      { name: 'begin_date'  , nice_name: 'Begin date'   , type: 'date'     , value: <%= raw Caboose.json(e.begin_date.strftime('%m/%d/%Y') ) %>, width: 200 },
+      { name: 'begin_date'  , nice_name: 'Begin date'   , type: 'date'     , value: <%= raw Caboose.json(e.begin_date.strftime('%m/%d/%Y') ) %>, width: 200 , align: 'right' },
       { name: 'begin_time'  , nice_name: 'Begin time'   , type: 'time'     , value: <%= raw Caboose.json(e.begin_date.strftime('%I:%M %P') ) %>, width: 200 , fixed_placeholder: false },
-      { name: 'end_date'    , nice_name: 'End date'     , type: 'date'     , value: <%= raw Caboose.json(e.end_date.strftime('%m/%d/%Y')   ) %>, width: 200 },
+      { name: 'end_date'    , nice_name: 'End date'     , type: 'date'     , value: <%= raw Caboose.json(e.end_date.strftime('%m/%d/%Y')   ) %>, width: 200 , align: 'right' },
       { name: 'end_time'    , nice_name: 'End time'     , type: 'time'     , value: <%= raw Caboose.json(e.end_date.strftime('%I:%M %P')   ) %>, width: 200 , fixed_placeholder: false },
       { name: 'all_day'     , nice_name: 'All day'      , type: 'checkbox' , value: <%= raw e.all_day ? 1 : 0 %>, width: 100, after_update: after_all_day_update },
       { name: 'repeats'     , nice_name: 'Repeats'      , type: 'checkbox' , value: <%= raw e.repeats ? 1 : 0 %>, width: 100, after_update: after_repeats_update }      
@@ -121,7 +121,7 @@ function delete_event(event_id, confirm)
     type: 'delete',
     success: function(resp) {
       if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
-      if (resp.redirect) window.location = resp.redirect;
+      if (resp.redirect) modal.close();
     }
   });
 }

data/app/views/caboose/events/admin_new.html.erb

@@ -4,7 +4,7 @@
 <form action='/admin/calendars/<%= @calendar.id %>' method='post' id='new_event_form'>
   <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>'>
   <input type='hidden' name='begin_date' value='<%= @begin_date.strftime('%Y-%m-%d') %>'>
-  <p><input type='text' name='name' id='name'       placeholder='Name' style='width: 500px;'></p>    
+  <p><input type='text' name='name' id='name'       placeholder='Name' style='width: 430px;'></p>    
   <div id='message'></div>
   <p>
     <input type='button' value='Cancel' onclick="modal.close();" />
@@ -17,7 +17,7 @@
 <script type="text/javascript">
 
 $(window).load(function() {
-  modal = new CabooseModal(600);
+  modal = new CabooseModal(460);
 });
 
 function add_event()

data/config/routes.rb

@@ -220,11 +220,12 @@ Caboose::Engine.routes.draw do
   get     "admin/calendars/:calendar_id/events/:id" => "events#admin_edit"
   put     "admin/calendars/:calendar_id/events/:id" => "events#admin_update"
   post    "admin/calendars/:calendar_id/events"     => "events#admin_add"
-  delete  "admin/calendars/:calendar_id/events"     => "events#admin_delete"
+  delete  "admin/calendars/:calendar_id/events/:id" => "events#admin_delete"
   
-  get     "admin/event-groups/period-options"     => "event_groups#admin_period_options"
-  get     "admin/event-groups/frequency-options"  => "event_groups#admin_frequency_options"
-  get     "admin/event-groups/repeat-by-options"  => "event_groups#admin_repeat_by_options"
+  put     "admin/calendars/:calendar_id/event-groups/:id" => "event_groups#admin_update"
+  get     "admin/event-groups/period-options"             => "event_groups#admin_period_options"
+  get     "admin/event-groups/frequency-options"          => "event_groups#admin_frequency_options"
+  get     "admin/event-groups/repeat-by-options"          => "event_groups#admin_repeat_by_options"
 
   get     "admin/ab-variants"                     => "ab_variants#admin_index"
   get     "admin/ab-variants/new"                 => "ab_variants#admin_new"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.110'
+  VERSION = '0.4.111'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.110
+  version: 0.4.111
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails