event_calendar_engine 0.1.11 → 0.2.0

data/app/models/event_instance_methods.rb

@@ -2,25 +2,25 @@ module EventInstanceMethods
   attr_accessor :start_time, :end_time, :start_date, :end_date
   
   def start_time
-    @start_time ||= start_on.present? ? start_on.in_time_zone(timezone) : start_on
+    @start_time ||= start_on
   end
   
   def end_time
-    @end_time ||= end_on.present? ? end_on.in_time_zone(timezone) : end_on
+    @end_time ||= end_on
   end
   
   def start_date
-    @start_date ||= start_on.present? ? start_on.in_time_zone(timezone).to_date : start_on
+    @start_date ||= start_on.present? ? start_on.to_date : start_on
   end
   
   def end_date
-    @end_date ||= end_on.present? ? end_on.in_time_zone(timezone).to_date : end_on
+    @end_date ||= end_on.present? ? end_on.to_date : end_on
   end
 
   def start_year
     start_on.present? ? start_on.in_time_zone(timezone).year : start_on
   end
-
+  
   def start_month
     start_on.present? ? start_on.in_time_zone(timezone).strftime("%B") : start_on
   end
@@ -29,21 +29,52 @@ module EventInstanceMethods
     start_on.present? ? start_on.in_time_zone(timezone).day : start_on
   end
   
+  def start_hour
+    start_on.present? ? start_on.hour : start_on
+  end
+  
+  def start_min
+    start_on.present? ? start_on.min : start_on
+  end
+  
   def end_year
-    end_on.present? ? end_on.in_time_zone(timezone).year : end_on
+    end_on.present? ? end_on.year : end_on
   end
   
   def end_month
     end_on.present? ? end_on.in_time_zone(timezone).strftime("%B") : end_on
   end
   
+  def end_hour
+    end_on.present? ? end_on.hour : end_on
+  end
+  
+  def end_min
+    end_on.present? ? end_on.min : end_on
+  end
+  
   def end_day
     end_on.present? ? end_on.in_time_zone(timezone).day : end_on
   end
   
   def one_day?
-    start_day == end_day &&
-    start_month == end_month &&
-    start_year == end_year
+    return true if start_on.blank? || end_on.blank?
+    start_on.day == end_on.day &&
+    start_on.month== end_on.month &&
+    start_on.year == end_on.year
+  end
+  
+  def date
+    one_day? ? one_day_date : multi_day_date
+  end
+  
+  def one_day_date
+    start_on.in_time_zone(timezone).strftime('%A, %B %d %Y')
+  end
+  
+  def multi_day_date
+    return one_day_date if end_on.blank?
+    "#{start_on.in_time_zone(timezone).strftime('%A, %B %d')} - "+
+    "#{end_on.in_time_zone(timezone).strftime('%A, %B %d %Y')}"
   end
 end

data/app/models/link.rb

@@ -0,0 +1,19 @@
+class Link < ActiveRecord::Base
+  set_table_name 'event_calendar_links'
+  
+  has_and_belongs_to_many :events, :join_table => 'event_calendar_events_links'
+  
+  before_validation :detect_or_prepend_default_protocol
+  
+  validates_presence_of :name, :url
+  
+  private
+    def detect_or_prepend_default_protocol
+      self.url = 'http://'+url if scheme.blank? and url.present?
+    end
+  protected
+  public
+    def scheme
+      url.present? ? URI.parse(url).scheme : ''
+    end
+end

data/app/views/event_revisions/_list_group.html.erb

@@ -6,7 +6,7 @@
       <li><%= month %>
         <ul>
           <% months_events.each do |event| %>
-          <li>
+          <li class="zoom">
             <p>
               <%= link_to event.name, event_revision_path(event) %>
               <%= link_to 'restore', restore_event_revision_path(event),

data/app/views/events/_details.html.erb

@@ -1,4 +1,5 @@
 <%- unless details.one_day? %>
+<%= render :partial => 'events/multi_day_list_event', :object => details %>
 <%= textilize(details.location) %>
 <%= textilize(details.description) %>
 <%- else -%>
@@ -8,6 +9,6 @@
 </div>
 
 <div class="span-6 last">
-  <%= render :partial => 'events/times', :object => times_with_zones(details) %>
+  <%= event_times(details) %>
 </div>
 <%- end -%>

data/app/views/events/_event.html.erb

@@ -2,4 +2,6 @@
   <h1><%= link_to event.name, event_path(event) %> (<em><%= event.event_type %></em>)</h1>
   
   <%= render :partial => 'events/event_details', :object => event %>
+  
+  <%= render :partial => 'links/links' if event.current_revision? %>
 <% end %>

data/app/views/events/_event_details.html.erb

@@ -1,27 +1,32 @@
-<p>
-  <strong>Starts</strong><br />
-  <%= event_details.start_on.in_time_zone(event_details.timezone).strftime('%A, %B %d %Y') %>
+<p class="zoom">
+  <strong>Date:</strong> <%= event_details.date %>
+  <%- if event_details.one_day? -%>
+  <br />
+  <strong>Time:</strong> <%= event_times(event_details) %>
+  <%- end -%>
 </p>
-<%- unless event_details.one_day? %>
-  <% if event_details.end_on %>
-  <p>
-    <strong>Ends</strong><br />
-    <%=  event_details.end_on.in_time_zone(event_details.timezone).strftime('%A, %B %d %Y') %>
-  </p>
-  <% end %>
-<%- else -%>
-  <%= render :partial => 'events/times', :object => times_with_zones(event_details) %>
-<%- end -%>
+<% unless event_details.presenters.blank? %>
+<p class="zoom">
+  <strong>Presenters</strong><br>
+  <%= textilize_without_paragraph event_details.presenters %>
+</p>
+<% end %>
+<% unless event_details.facilitators.blank? %>
+<p class="zoom">
+  <strong>Facilitators</strong><br>
+  <%= textilize_without_paragraph event_details.facilitators %>
+</p>
+<% end %>
 <% unless event_details.location.blank? %>
-<p>
-  <strong>Location</strong><br/>
+<p class="zoom">
+  <strong>Location</strong><br>
   <%= textilize_without_paragraph event_details.location %>
 </p>
 <% end %>
 
 <% unless event_details.description.blank? %>
-<p>
-  <strong>Description/Other Details</strong><br />
+<p class="zoom">
+  <strong>Description/Other Details</strong><br>
   <%= textilize_without_paragraph event_details.description %>
 </p>
 <% end %>

data/app/views/events/_form.html.erb

@@ -4,14 +4,58 @@
   <%= form.inputs do %>
     <%= form.input :name, :hint => "the name of the event" %>
     <%= form.input :event_type, :hint => "conference, meeting, training, etc" %>
-    <%= form.input :start_time, :as => :time, :minute_step => 15 %>
+    <li id="event_start_time_input" class="time optional">
+      <input id="event_start_time_1i" type="hidden" value="<%= Date.current.year %>" name="event[start_time(1i)]">
+      <fieldset>
+        <legend class="label">
+          <label for="event_start_time_1i">Start time</label>
+        </legend>
+        <ol>
+          <li>
+            <label for="event_start_time_4i">Hour</label>
+            <select id="event_start_time_4i" name="event[start_time(4i)]">
+              <%= options_for_select(hour_options, @event.start_hour) %>
+            </select>
+          </li>
+          <li>
+            <label for="event_end_time_5i">Minute</label>
+            <select id="event_end_time_5i" name="event[start_time(5i)]">
+              <%= options_for_select(minute_options, @event.start_min) %>
+            </select>
+          </li>
+        </ol>
+      </fieldset>
+    </li>
     <%= form.input :start_date, :required => false, :as => :string,
           :input_html => { :value => @event.start_date.to_s } %>
-    <%= form.input :end_time, :as => :time, :minute_step => 15 %>
+    <li id="event_end_time_input" class="time optional">
+      <input id="event_end_time_1i" type="hidden" value="<%= Date.current.year %>" name="event[end_time(1i)]">
+      <fieldset>
+        <legend class="label">
+          <label for="event_end_time_1i">End time</label>
+        </legend>
+        <ol>
+          <li>
+            <label for="event_end_time_4i">Hour</label>
+            <select id="event_end_time_4i" name="event[end_time(4i)]">
+              <%= options_for_select(hour_options, @event.end_hour) %>
+            </select>
+          </li>
+          <li>
+            <label for="event_end_time_5i">Minute</label>
+            <select id="event_end_time_5i" name="event[end_time(5i)]">
+              <%= options_for_select(minute_options, @event.end_min) %>
+            </select>
+          </li>
+        </ol>
+      </fieldset>
+    </li>
     <%= form.input :end_date, :required => false, :as => :string,
           :input_html => { :value => @event.end_date.to_s } %>
     <%= form.input :timezone, :as => :time_zone, :priority_zones => /^(Eastern|Central|Mountain|Pacific) Time/ %>
-    <%= form.input :location, :required => false, :label => 'Location' %>
+    <%= form.input :facilitators, :hint => 'eg Sally Resonant, DSM WRRC' %>
+    <%= form.input :presenters, :hint => 'eg Jane Doe, DSM WRRC' %>
+    <%= form.input :location, :required => false, :hint => 'eg Portland, Oregon USA or http://some.webinar.org', :label => 'Location' %>
     <%= form.input :description, :required => false, :label => 'Description' %>
     <% unless @event.new_record? %>
       <%= form.input :notes, :required => false, :label => 'Notes' %>

data/app/views/events/_list_group.html.erb

@@ -6,7 +6,7 @@
       <li><span class="collapsible closed"><%= month %></span>
         <ul>
           <% months_events.each do |event| %>
-          <li>
+          <li class="zoom">
             <p class="collapsible closed"><%= link_to event.name, event_path(event) %> (<%= event.start_on.strftime("%a") %> <%= event.start_day.ordinalize %>)</p>
             <%- if event.one_day? -%>
             <%= render :partial => 'events/one_day_list_event', :object => event %>

data/app/views/events/_one_day_list_event.html.erb

@@ -1,2 +1,2 @@
 <p><%= one_day_list_event.start_on.strftime("%A") %> <%= one_day_list_event.start_day.ordinalize %></p>
-<%= render :partial => 'events/times', :object => times_with_zones(one_day_list_event) %>
+<p><%= event_times(one_day_list_event) %></p>

data/app/views/events/edit.html.erb

@@ -1,3 +1,3 @@
-<h1>Editing Event</h1>
+<h1>Editing <%= link_to @event.name, event_path(@event) %> (<em><%= @event.event_type %></em>)</h1>
 
 <%= render :partial => "form" if has_authorization?(:update, @event) %>

data/app/views/links/_form.html.erb

@@ -0,0 +1,18 @@
+<%- 
+if @link.new_record?
+  submission_path = event_links_path(@event)
+  method = 'post'
+else
+  submission_path = event_link_path(@event, @link)
+  method = 'put'
+end
+-%>
+<%= semantic_form_for(@link, :html => {:class => 'dynamic', :id => 'link_dynamic_form'}, :url => submission_path, :method => 'put') do |form| %>
+  <%= form.inputs do %>
+    <input type="hidden" name="_method" value="<%= method %>">
+    <%= form.input :name, :hint => "Your External Resource" %>
+    <%= form.input :url, :label => 'URL', :hint => "some.domain.tld or http://some.dom..." %>
+    <%= form.input :description, :hint => 'Statistics, Analysis and News regarding the sudden and unexpected rise in the population of water molecules.' %>
+    <%= form.submit %> <input type="reset" class="cancel" value="Cancel">
+  <% end %>
+<% end %>

data/app/views/links/_link.html.erb

@@ -0,0 +1,6 @@
+<%= content_tag_for :p, link, :class => 'zoom' do %>
+  <%= link_to link.name, link.url, :class => 'link_name' %> <em class="link_url"><%= link.url %></em>
+  <%= link_to_edit_link(@event, link, {}, {:class => 'edit fake_button magic'}) %>
+  <%= link_to_delete_link(@event, link, {}, {:class => 'fake_button magic'}) %><br>
+  <span class="link_description"><%= link.description %></span>
+<% end %>

data/app/views/links/_links.html.erb

@@ -0,0 +1,6 @@
+<p><strong>Materials/Resources</strong></p>
+<div id="links" class="links">
+  <%= render @event.links.all %>
+  <p class="new"><%= link_to 'New Link', new_event_link_path(@event) %></p>
+  <%= render :partial => 'links/form' %>
+</div>

data/app/views/links/create.js.rjs

@@ -0,0 +1,14 @@
+if @link.valid?
+  page << %Q{
+    $('div.links > p.new').before('#{escape_javascript(render(@link))}');
+    $('#link_dynamic_form').remove();
+    $('#link_#{@link.id}').find('.magic').hide();
+  }
+else
+  page << %Q{
+    $('#link_dynamic_form').replaceWith('#{escape_javascript(render({
+      :partial => 'links/form'
+    }))}');
+    $('#link_dynamic_form').attach(Remote.Form);
+  }
+end

data/app/views/links/edit.html.erb

@@ -0,0 +1,3 @@
+<h1>Editing <%= link_to @event.name, event_path(@event) %> Link <%= link_to @link.name, @link.url %></h1>
+
+<%= render :partial => "form" if has_authorization?(:update, @link) %>

data/app/views/links/new.html.erb

@@ -0,0 +1,3 @@
+<h1>Adding Link to <%= link_to @event.name, event_path(@event) %></h1>
+
+<%= render :partial => "form" if has_authorization?(:update, @link) %>

data/app/views/links/show.html.erb

@@ -0,0 +1,3 @@
+<h1><%= link_to @event.name, event_path(@event) %> Link</h1>
+
+<%= render @link %>

data/app/views/links/update.js.rjs

@@ -0,0 +1,15 @@
+if @link.valid?
+  page << %Q{
+    // $('#link_dynamic_form').insertAfter('div.links > p.new');
+    $('#link_dynamic_form').remove();
+    $('#link_#{@link.id}').replaceWith('#{escape_javascript(render(@link))}');
+    $('#link_#{@link.id}').find('.magic').hide();
+  }
+else
+  page << %Q{
+    $('#link_dynamic_form').replaceWith('#{escape_javascript(render({
+      :partial => 'links/form'
+    }))}');
+    $('#link_dynamic_form').attach(Remote.Form);
+  }
+end

data/config/routes.rb

@@ -2,66 +2,11 @@ Rails.application.routes.draw do
   root :to => "events#index"
   resources :events do
     resources :attendees
+    resources :links
   end
   resources :event_revisions do
     member do
       post :restore
     end
   end
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => "welcome#index"
-
-  # See how all your routes lay out with "rake routes"
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id(.:format)))'
 end

data/db/migrate/20110204223256_add_presenters_facilitators_to_events.rb

@@ -0,0 +1,11 @@
+class AddPresentersFacilitatorsToEvents < ActiveRecord::Migration
+  def self.up
+    add_column :event_calendar_events, :presenters, :text
+    add_column :event_calendar_events, :facilitators, :text
+  end
+
+  def self.down
+    remove_column :event_calendar_events, :facilitators
+    remove_column :event_calendar_events, :presenters
+  end
+end

data/db/migrate/20110206000427_create_event_calendar_links.rb

@@ -0,0 +1,23 @@
+class CreateEventCalendarLinks < ActiveRecord::Migration
+  def self.up
+    create_table :event_calendar_links do |t|
+      t.string :name
+      t.string :url
+      t.text :description
+      
+      t.timestamps
+    end
+    
+    create_table :event_calendar_events_links, :id => false do |t|
+      t.integer :event_id
+      t.integer :link_id
+    end
+    
+    add_index :event_calendar_events_links, [:event_id, :link_id]
+  end
+
+  def self.down
+    drop_table :event_calendar_links
+    drop_table :event_calendar_events_links
+  end
+end