tb_events 1.1.0 → 1.3.1

data/app/models/spud_calendar.rb

@@ -1,4 +1,32 @@
 class SpudCalendar < ActiveRecord::Base
-  has_many :spud_calendar_events, :dependent => :destroy
-  validates_presence_of :title, :color
+  has_many :spud_calendar_events, dependent: :destroy
+  validates_presence_of :title
+  validates :identifier, presence: true, uniqueness: true
+
+  before_validation :set_identifier
+
+  def self.with_identifier(identifier)
+    where(identifier: identifier).first
+  end
+
+  def color
+    modulo = (id - 1) % COLORS.length
+    COLORS[modulo]
+  end
+
+  COLORS = %w(
+    4D854B
+    f89406
+    b94a48
+    3a87ad
+    999999
+    333333)
+
+  private
+
+  def set_identifier
+    if identifier.nil? && title.present?
+      self.identifier = title.parameterize.underscore
+    end
+  end
 end

data/app/models/spud_calendar_event.rb

@@ -1,19 +1,2 @@
-class SpudCalendarEvent < ActiveRecord::Base
-  belongs_to :spud_calendar
-  validates_presence_of :title, :start_at, :end_at, :spud_calendar_id
-
-  def self.in_month_of(month)
-    where(["spud_calendar_events.start_at <= ? AND spud_calendar_events.start_at >= ?", month.end_of_month, month.beginning_of_month])
-  end
-
-  def days_span
-    return (end_at.to_date - start_at.to_date).to_i + 1
-  end
-
-  def falls_on?(day)
-    start_date = start_at.beginning_of_day.to_date
-    end_date = end_at.end_of_day.to_date
-    return day >= start_date && day <= end_date
-  end
-
+class SpudCalendarEvent < SpudEvents::CalendarEventModel
 end

data/app/models/spud_events/calendar_event_model.rb

@@ -0,0 +1,31 @@
+class SpudEvents::CalendarEventModel < ActiveRecord::Base
+  self.table_name = 'spud_calendar_events'
+
+  belongs_to :spud_calendar
+  validates_presence_of :title, :start_at, :end_at, :spud_calendar_id
+
+  scope :ordered, -> { order('start_at desc') }
+  scope :in_month_of, lambda { |date|
+    where('start_at BETWEEN ? AND ? OR end_at BETWEEN ? AND ?', date.beginning_of_month, date.end_of_month, date.beginning_of_month, date.end_of_month).order('start_at asc')
+    # where(:start_at => date.beginning_of_month...date.end_of_month)
+  }
+  scope :upcoming, ->(limit = false) { where('start_at >= ?', Date.today).order('start_at asc').limit(limit) }
+
+  def start_date
+    start_at.to_date
+  end
+
+  def end_date
+    end_at.to_date
+  end
+
+  def days_span
+    (end_at.to_date - start_at.to_date).to_i + 1
+  end
+
+  def falls_on?(day)
+    start_date = start_at.beginning_of_day.to_date
+    end_date = end_at.end_of_day.to_date
+    day >= start_date && day <= end_date
+  end
+end

data/app/views/admin/calendar_events/_calendar.html.erb

@@ -1,14 +1,19 @@
-<p><%= link_to_next_admin_calendar_month(@calendar_date, :class => "btn") %></p>
-<p><%= link_to_previous_admin_calendar_month(@calendar_date, :class => "btn") %></p>
+<%= link_to_next_admin_calendar_month @calendar_date %>
+<%= link_to_previous_admin_calendar_month @calendar_date %>
 
-<%= build_calendar_for @calendar_events, :year => @calendar_date.year, :month => @calendar_date.month do |t| %>
-  <%= raw t.head('S', 'M', 'T', 'W', 'T', 'F', 'S') %>
-  <%= t.day do |day, tasks| %>
-    <div class="spud_events_admin_calendar_date_container">
-        <%= content_tag :span, day.day, :class => (tasks.count > 0 ? "spud_events_admin_calendar_date spud_events_admin_calendar_date_active" : "spud_events_admin_calendar_date") %>
-    <% tasks.each do |task| %>
-      <%= link_to truncate(task.title, :length => 25), edit_admin_calendar_event_path(task.id), :class => "spud_events_admin_calendar_event_marker spud_events_calendar_event_#{task.spud_calendar_id}", :style => "background-color: \##{task.spud_calendar.color}; color:\##{calendar_fore_color(task.spud_calendar.color)}" %>
+<%= spud_calendar_for_events(@calendar_events, @calendar_date, :headers => ['S', 'M', 'T', 'W', 'T', 'F', 'S']) do |day, events| %>
+  <span class="calendar-day">
+    <%= day.day %>
+  </span>
+  <ul class="calendar-events-list">
+    <% events.each do |event| %>
+      <li>
+        <%= link_to edit_admin_calendar_event_path(event.id) do %>
+          <span class="label" style="background-color: #<%= event.spud_calendar.color %>">
+            <%= truncate(event.title, :length => 25) %>
+          </span>
+        <% end %>
+      </li>
     <% end %>
-    </div>
-  <% end %>
+  </ul>
 <% end %>

data/app/views/admin/calendar_events/_form.html.erb

@@ -1,103 +1,21 @@
-<%= form_for @calendar_event, :url => path, :html=>{:class=>"form-horizontal"} do |f| %>
-  <%= error_messages_for(f.object) %>
-    <fieldset>
-    <legend>Details</legend>
-    <div class="control-group">
-      <%= f.label :spud_calender_id, "Calendar",:class => "control-label" %>
-      <div class="controls">
-        <%= f.select(:spud_calendar_id, options_from_collection_for_select(SpudCalendar.all, :id, :title, @calendar_event.spud_calendar_id)) %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :title,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :title %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :description,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_area :description, :rows => 5 %>
-      </div>
-    </div>
-  </fieldset>
+<%= form_for @calendar_event, :url => path, :builder => TbCore::FormBuilder, :html => {:class => "form-horizontal"} do |f| %>
+  <%= tb_form_error_header(f.object) %>
 
-  <fieldset>
-    <legend>Event Time</legend>
+  <%= f.tb_select :spud_calendar_id, options_from_collection_for_select(SpudCalendar.all, :id, :title, @calendar_event.spud_calendar_id) %>
 
-    <div class="control-group">
-      <%= f.label :start_at, "Starts",:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :start_at,:value => f.object.start_at.blank? ? Time.now.strftime("%Y-%m-%d %H:%M") : f.object.start_at.strftime("%Y-%m-%d %H:%M")  , :class => 'spud_form_date_picker' %>
-        <span class="time_select">
-          <%= f.time_select :start_at, :ignore_date => true,:ampm => true%>
-        </span>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :end_at, "Ends",:class => "control-label" %>
+  <%= f.tb_text_field :title %>
+  <%= f.tb_text_area :description, :style => "width:100%;", :class => 'tinymce full-width' %>
+  
+  <%= f.tb_datetime_select :start_at, :ampm => true, :minute_step => 5 %>
+  <%= f.tb_datetime_select :end_at, :ampm => true, :minute_step => 5 %>
 
-      <div class="controls">
-        <%= f.text_field :end_at,:value => f.object.end_at.blank? ? Time.now.strftime("%Y-%m-%d %H:%M") : f.object.end_at.strftime("%Y-%m-%d %H:%M")  , :class => 'spud_form_date_picker' %>
-        <span class="time_select">
-          <%= f.time_select :end_at, :ignore_date => true,:ampm => true%>
-        </span>
-      </div>
-   </div>
-  </fieldset>
-  <fieldset>
-    <legend>Location</legend>
-    <div class="control-group">
-      <%= f.label :location,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :location %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :address,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :address %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :address_2,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :address_2 %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :city,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :city %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :state,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :state %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :zip,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :zip %>
-      </div>
-    </div>
-  </fieldset>
+  <%= f.tb_text_field :location %>
+  <%= f.tb_text_field :address %>
+  <%= f.tb_text_field :address_2 %>
+  <%= f.tb_text_field :city %>
+  <%= f.tb_text_field :state %>
+  <%= f.tb_text_field :zip %>
 
-   <div class="form-actions">
-      <%= f.submit "Save", :class=>"btn btn-primary"%> 
-      <%=link_to "cancel",admin_list_spud_calendar_events_path,:class => "btn"%>
-      <% if !@calendar_event.new_record? %>
-        or
-        <%= link_to "Delete", admin_calendar_event_path(@calendar_event), :method=>:delete,:class => "btn btn-danger", :data => {:confirm=>"Are you sure you want delete this event?"} %>
-      <% end %>
-  </div>
+  <%= f.tb_save_buttons 'Event', admin_list_spud_calendar_events_path, @calendar_event.id ? admin_calendar_event_path(@calendar_event) : nil %>
 
-<% end %>
-<br class="clear" />
-<script type="text/javascript">
-$(document).ready(function(){
-  spud.admin.date_picker.init();
-});
-</script>
+<% end %>

data/app/views/admin/calendar_events/index.html.erb

@@ -1,20 +1,28 @@
-<%=content_for :data_controls do%>
-  <%= link_to "New Event", new_admin_calendar_event_path, :class => "btn btn-primary right" %>
-<%end%>
-<%=content_for :detail do%>
-<h3>Calendar Events - <%=  @calendar_date.strftime('%B %Y') %></h3>
+<% @page_name = "Events - #{@calendar_date.strftime('%B %Y')}" %>
 
-<div id="spud_events_admin_calendar">
-  <%= render :partial => 'calendar' %>
-</div>
+<%= content_for :data_controls do %>
+  <%= link_to "New Calendar", new_admin_calendar_path, :class => "btn btn-default" %>
+  <%= link_to "New Event", new_admin_calendar_event_path, :class => "btn btn-primary" %>
+<% end %>
 
-<ul id="spud_events_admin_calendar_legend">
-    <%= render :partial => 'admin/calendars/calendar_legend', :collection => @calendars, :as => :calendar %>
-    <li>
-      <%= link_to("New Calendar", new_admin_calendar_path, :class => "btn btn-primary btn-small pull-right") %>
-      <br style="clear:right;"/>
-    </li>
-</ul>
+<%= content_for :detail do %>
 
+  <div class="row">
+    <div id="spud_events_admin_calendar" class="col-md-8">
+      <%= render :partial => 'calendar' %>
+    </div>
 
-<%end%>
+    <div class="col-md-4">
+      <ul id="spud_events_admin_calendar_legend">
+        <%= render :partial => 'admin/calendars/calendar_legend', :collection => @calendars, :as => :calendar %>
+      </ul>
+    </div>
+  </div>
+
+  <script>
+    $(document).ready(function() {
+      spud.admin.events.init();
+    });
+  </script>
+
+<% end %>

data/app/views/admin/calendars/_calendar_legend.html.erb

@@ -1,7 +1,8 @@
 <li id="spud_events_admin_calendar_legend_<%= calendar.id %>" class="spud_events_admin_calendar_legend_item">
-  <%= content_tag :span, calendar.title, :style => "background-color: \##{calendar.color};color:\##{calendar_fore_color(calendar.color)}"%>
-  <div class="spud_events_admin_calendar_actions">
-    <%= link_to 'edit', edit_admin_calendar_path(calendar), :class => "btn btn-mini" %>
-    <%= link_to 'delete', admin_calendar_path(calendar), :remote => true, :data => {:confirm => "This action can't be undone. Would you like to remove the calendar \"#{calendar.title}\"?"}, :method => :delete, :class => 'js-spud-calendar-delete-action btn btn-mini btn-danger' %>
+  <div class="spud_events_admin_calendar_actions pull-right">
+    <%= link_to 'edit', edit_admin_calendar_path(calendar), :class => "btn btn-sm btn-default" %>
+    <%= link_to 'delete', admin_calendar_path(calendar), :remote => true, :data => {:confirm => "This action can't be undone. Would you like to remove the calendar \"#{calendar.title}\"?"}, :method => :delete, :class => 'js-spud-calendar-delete-action btn btn-sm btn-danger' %>
   </div>
+  <%= content_tag :span, calendar.title, :style => "background-color: \##{calendar.color}", :class => 'label' %>
+  <div class="clearfix"></div>
 </li>

data/app/views/admin/calendars/_form.html.erb

@@ -1,20 +1,5 @@
-<%= form_for @calendar, :url => (@calendar.new_record? ? admin_calendars_path : admin_calendar_path(@calendar)),:html=>{:class=>"form-horizontal"}  do |f| %>
-    <%= error_messages_for(f.object) %>
-    <div class="control-group">
-      <%= f.label :title,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :title %>
-      </div>
-    </div>
-        <div class="control-group">
-      <%= f.label :color,:class => "control-label" %>
-      <div class="controls">
-        <%= f.hidden_field :color %>
-        <div class="spud_events_admin_color_picker"></div>
-      </div>
-    </div>
- <div class="form-actions">
-  <%= f.submit "Save", :class=>"btn btn-primary"%> or <%=link_to "cancel", admin_list_spud_calendar_events_path, :class => "btn" %>
-  </div>
-
+<%= form_for @calendar, :url => (@calendar.new_record? ? admin_calendars_path : admin_calendar_path(@calendar)), :builder => TbCore::FormBuilder, :html => {:class => "form-horizontal"} do |f| %>
+  <%= tb_form_errors(f.object) %>
+  <%= f.tb_text_field :title %>
+  <%= f.tb_save_buttons('Calendar', admin_list_spud_calendar_events_path) %>
 <% end %>

data/app/views/calendar_events/index.html.erb

@@ -0,0 +1,22 @@
+<h1>Events</h1>
+
+<table>
+  <tr>
+    <th>Title</th>
+    <th>Date</th>
+    <th>&nbsp;</th>
+  </tr>
+  <tbody>
+    <% cache(@events) do %>
+      <% @events.each do |event| %>
+        <tr>
+          <td><%= event.title %></td>
+          <td><%= event.start_at.strftime('%D') %></td>
+          <td><%= link_to 'Details', calendar_event_path(event) %></td>
+        </tr>
+      <% end %>
+    <% end %>
+  </tbody>
+</table>
+
+<%= will_paginate(@events) %>

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

@@ -2,4 +2,6 @@
 <p><b>Calendar:</b> <%= @event.spud_calendar.title %></p>
 <p><em><%= @event.start_at %> - <%= @event.end_at %></em></p>
 <%= simple_format(@event.description) %>
-<p><%= link_to 'Back', calendar_path %></p>
+
+<p><%= link_to 'Events List', calendar_events_path %> | <%= link_to 'Calendar', calendar_path %></p>
+

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

@@ -1,16 +1,19 @@
-<%= render :partial => 'calendar_options' %>
-<div id="spud_events_calendar">
-  <%= render :partial => 'calendar', :locals => {:date => @calendar_date} %>
-</div>
+<% @page_title = @calendar_date.strftime("Events Calendar %B %Y") %>
 
-<div id="spud_events_list">
-  <% @events.each do |event| %>
-    <div class="spud_event_list_item">
-      <h3><%= event.title %></h3>
-      <p><b>Calendar:</b> <%= event.spud_calendar.title %></p>
-      <p><em><%= event.start_at %> - <%= event.end_at %></em></p>
-      <%= simple_format(event.description) %>
-      <p><%= link_to 'Details', event_path(event) %></p>
-    </div>
-  <% end %>
-</div>
+<h1><%= @page_title %></h1>
+
+<nav id="events-calendar-nav">
+  <%= link_to_previous_calendar_month(@calendar_date) %>
+  <%= link_to_next_calendar_month(@calendar_date) %>
+</nav>
+
+<%= spud_calendar_for_events(@events, @calendar_date) do |day, events| %>
+  <span class="calendar-day">
+    <%= day.day %>
+  </span>
+  <ul class="calendar-events">
+    <% events.each do |event| %>
+      <li><%= link_to truncate(event.title, :length => 25), calendar_event_path(event.id) %></li>
+    <% end %>
+  </ul>
+<% end %>

data/config/locales/en.yml

@@ -0,0 +1,9 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  activerecord:
+    attributes:
+      spud_calendar_event:
+        spud_calendar_id: 'Calendar'
+

data/config/routes.rb

@@ -1,14 +1,11 @@
 Rails.application.routes.draw do
-
   # Calendar
-  get 'calendar/event/:id' => "calendar_events#show", :as => "event"
-  match 'calendar(/:month(/:year(/:calendar)))' => "calendars#show", :as => "calendar", :via => [:get, :post]
-
-	namespace :admin do
-    # Events
-    resources :calendar_events, :except => [:index]
-    resources :calendars, :except => [:index]
-    get 'events(/:month(/:year(/:calendar)))' => "calendar_events#index", :as => "list_spud_calendar_events"
-	end
+  get 'calendar(/:month/:year)' => 'calendars#show', :as => :calendar
+  resources :calendar_events, only: [:index, :show], path: '/events'
 
+  namespace :admin do
+    resources :calendar_events, except: [:index]
+    resources :calendars, except: [:index]
+    get 'events(/:month(/:year(/:calendar)))' => 'calendar_events#index', :as => 'list_spud_calendar_events'
+  end
 end

data/db/migrate/20120216191833_create_spud_calendars.rb

@@ -1,12 +1,12 @@
-class CreateSpudCalendars < ActiveRecord::Migration
+class CreateSpudCalendars < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_calendars do |t|
       t.string :title
       t.column :color, 'binary(6)'
-      
+
       t.timestamps
     end
-    
+
     add_index :spud_calendars, :title
   end
 end

data/db/migrate/20120216192531_create_spud_calendar_events.rb

@@ -1,4 +1,4 @@
-class CreateSpudCalendarEvents < ActiveRecord::Migration
+class CreateSpudCalendarEvents < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_calendar_events do |t|
       t.references :spud_calendar