Merge branch 'master' of github.com:openplans/wiseguide

Gemfile.lock

@@ -48,41 +48,45 @@ GEM
     activesupport (3.0.7)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
-    bcrypt-ruby (2.1.4)
+    bcrypt-ruby (3.0.1)
     builder (2.1.2)
     cancan (1.6.5)
-    columnize (0.3.2)
-    devise (1.3.4)
-      bcrypt-ruby (~> 2.1.2)
+    cocaine (0.2.0)
+    columnize (0.3.4)
+    devise (1.4.5)
+      bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     fastercsv (1.5.4)
-    formtastic (1.2.3)
+    formtastic (1.2.4)
       actionpack (>= 2.3.7)
       activesupport (>= 2.3.7)
       i18n (~> 0.4)
-    haml (3.1.1)
+    haml (3.1.3)
     i18n (0.5.0)
-    jquery-rails (1.0.9)
+    jquery-rails (1.0.14)
       railties (~> 3.0)
       thor (~> 0.14)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    macaddr (1.0.0)
+    macaddr (1.4.0)
+      systemu (~> 2.2.0)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
     orm_adapter (0.0.5)
-    paperclip (2.3.11)
+    paperclip (2.4.1)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
+      cocaine (>= 0.0.2)
+      mime-types
     pg (0.11.0)
-    polyglot (0.3.1)
+    polyglot (0.3.2)
     rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -112,17 +116,19 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    sqlite3 (1.3.3)
+    sqlite3 (1.3.4)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
+    systemu (2.2.0)
     thor (0.14.6)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+    tzinfo (0.3.29)
     userstamp (2.0.1)
-    uuid (2.3.2)
+    uuid (2.3.4)
       macaddr (~> 1.0)
-    warden (1.0.4)
+    warden (1.0.5)
       rack (>= 1.0)
     will_paginate (3.0.pre2)
 

app/controllers/contacts_controller.rb

@@ -39,7 +39,8 @@ def update
 
   def destroy
     @contact.destroy
-    redirect_to(contacts_url)
+
+    redirect_to kase_path(@contact.kase)
   end
 
   private

app/controllers/events_controller.rb

@@ -9,7 +9,7 @@ def edit
   end
 
   def new
-    @event = Event.new(:user=>current_user, :kase_id=>params[:kase_id], :date_time=>DateTime.now)
+    @event = Event.new(:user=>current_user, :kase_id=>params[:kase_id], :date=>Date.today, :start_time => "08:00 AM", :end_time => "09:00AM")
     prep_edit
   end
 
@@ -39,7 +39,7 @@ def update
 
   def destroy
     @event.destroy
-    redirect_to(events_url)
+    redirect_to kase_url( @event.kase )
   end
 
   private

app/controllers/reports_controller.rb

@@ -78,7 +78,7 @@ def trainer
     start_date = Date.parse(params[:start_date])
     end_date = Date.parse(params[:end_date])
 
-    events = Event.accessible_by(current_ability).where(["date_time between ? and ?", start_date, end_date]).order('date_time')
+    events = Event.accessible_by(current_ability).where(["date between ? and ?", start_date, end_date]).order('date')
     events_by_trainer = {}
     hours_by_trainer = {'{total}' => 0}
     customers_by_trainer = {'{total}' => Set.new}
@@ -112,7 +112,7 @@ def trainee
     start_date = Date.parse(params[:start_date])
     end_date = Date.parse(params[:end_date])
 
-    events = Event.accessible_by(current_ability).where(["date_time between ? and ?", start_date, end_date]).order('date_time')
+    events = Event.accessible_by(current_ability).where(["date between ? and ?", start_date, end_date]).order('date')
     events_by_customer = {}
     hours_by_customer = {}
     dispositions = {}
@@ -189,7 +189,8 @@ def outcomes
       end 
     end
 
-    render :text=>csv
+
+    send_data csv, :type => "text/plain", :filename => "outcomes.csv", :disposition => 'attachment'    
   end
 
   #because this is user-visible in the url, it does not match the
@@ -199,13 +200,13 @@ def cases
     start_date = Date.parse(params[:start_date])
     end_date = Date.parse(params[:end_date])
 
-    kases = Kase.accessible_by(current_ability).includes(:events, :customer).where(["events.date_time between ? and ?", start_date, end_date])
+    kases = Kase.accessible_by(current_ability).includes(:events, :customer).where(["events.date between ? and ?", start_date, end_date])
 
     csv = ""
     CSV.generate(csv) do |csv|
       for kase in kases
         total_duration = 0
-        for event in kase.events.where(["events.date_time between ? and ?", start_date, end_date])
+        for event in kase.events.where(["events.date between ? and ?", start_date, end_date])
           total_duration += event.duration_in_hours
         end
         customer = kase.customer
@@ -231,14 +232,14 @@ def cases
       end
     end 
 
-    render :text=>csv
+    send_data csv, :type => "text/plain", :filename => "cases.csv", :disposition => 'attachment'    
   end
 
   def events
     start_date = Date.parse(params[:start_date])
     end_date = Date.parse(params[:end_date])
 
-    events = Event.accessible_by(current_ability).includes(:kase=>:customer, :user=>nil).where(["date_time between ? and ?", start_date, end_date])
+    events = Event.accessible_by(current_ability).includes(:kase=>:customer, :user=>nil).where(["date between ? and ?", start_date, end_date])
 
     csv = ""
     CSV.generate(csv) do |csv|
@@ -261,13 +262,13 @@ def events
                 kase.close_date,
                 kase.disposition.name,
                 event.event_type.name,
-                event.date_time, 
+                event.date,
                 event.user.email,
                 event.funding_source.name,
                 event.duration_in_hours]
       end
     end
-    render :text=>csv
+    send_data csv, :type => "text/plain", :filename => "events.csv", :disposition => 'attachment'    
   end
 
   private

app/models/event.rb

@@ -17,4 +17,12 @@ def customer
     return kase.customer
   end
 
+  def start_time
+    read_attribute(:start_time).try :to_s, :just_time
+  end
+
+  def end_time
+    read_attribute(:end_time).try :to_s, :just_time
+  end
+
 end

app/views/contacts/_form.html.erb

@@ -1,7 +1,3 @@
-<div id="page-header">
-  <h1>Contact for <%= @contact.customer.name %></h1>
-</div>
-
 <%= form_for @contact do |f| %>
 <fieldset>
   <%= f.hidden_field :kase_id %>

app/views/contacts/edit.html.erb

@@ -1,3 +1,9 @@
+<div id="page-header">
+  <h1>Contact for <%= @contact.customer.name %></h1>
+</div>
+
+<%= link_to "Delete", contact_path(@contact), :method => "delete", :confirm => "Are you sure you want to delete this contact?", :class => "delete" if can?(:delete, @contact) %>
+
 <%= render "form" %>
-<%= last_updated @contact %>
 
+<%= last_updated @contact %>

app/views/events/_form.html.erb

@@ -1,7 +1,3 @@
-<div id="page-header">
-  <h1>Training Event for <%= @event.customer.name %></h1>
-</div>
-
 <%= form_for @event do |f| %>
 <fieldset>
   <%= f.hidden_field :user_id %>
@@ -14,10 +10,20 @@
     </li>
 
     <li>
-      <%= f.label :date_time, "Date & Time" %>
-      <%= f.text_field :date_time %>
+      <%= f.label :date, "Date" %>
+      <%= f.text_field :date, :class => "datepicker" %>
     </li>
 
+    <li>
+      <%= f.label :start_time %>
+      <%= f.text_field :start_time, :value => @event.start_time, :class => "timepicker" %>
+    </li>
+
+    <li>
+      <%= f.label :end_time %>
+      <%= f.text_field :end_time, :value => @event.end_time, :class => "timepicker" %>
+    </li>
+
     <li>
       <%= f.label :event_type_id, "Type" %>
       <%= f.collection_select :event_type_id, @event_types, :id, :name %>

app/views/events/edit.html.erb

@@ -1,3 +1,9 @@
+<div id="page-header">
+  <h1>Training Event for <%= @event.customer.name %></h1>
+</div>
+
+<%= link_to "Delete", event_path(@event), :method => "delete", :confirm => "Are you sure you want to delete this event?", :class => "delete" if can?(:delete, @event) %>
+
 <%= render "form" %>
 
 <%= last_updated @event %><br/>

app/views/kases/_events.html.erb

@@ -3,7 +3,9 @@
 <table>
 <% for event in @kase.events %>
 <tr>
-  <td><%= event.date_time.to_date %></td>
+  <td><%= event.date %></td>
+  <td><%= event.start_time %></td>
+  <td><%= event.end_time %></td>
   <td><%= event.event_type.name %></td>
   <td><%= event.user.email %></td>
   <td><%= link_to "Details", edit_event_path(event) %></td>

app/views/layouts/application.html.erb

@@ -6,7 +6,7 @@
   <%= stylesheet_link_tag "print.css", :media=>"print" %>
   <%= stylesheet_link_tag "jquery-ui-1.8.9.custom.css" %>
 
-  <%= javascript_include_tag %w{jquery.min jquery-ui jquery-ui-timepicker-addon jquery.autoresize.min dateFormat application rails} %>
+  <%= javascript_include_tag %w{jquery.min jquery-ui jquery-ui-timepicker-addon jquery-Gtimepicker jquery.autoresize.min dateFormat application rails} %>
   
   <%= csrf_meta_tag %>
 

app/views/reports/trainee.html.erb

@@ -14,7 +14,7 @@
 <% for event in @events_by_customer[customer] %>
 <tr>
 <td><%= event.event_type.name %></td>
-<td><%= event.date_time.to_date %></td>
+<td><%= event.date %></td>
 <td><%= event.user.email %></td>
 <td><%= event.duration_in_hours %></td>
 </tr>

app/views/reports/trainer.html.erb

@@ -16,7 +16,7 @@ Trained: <i><%= @customers_by_trainer[trainer].size %></i><br/>
 <tr>
 <td><%= event.kase.customer.name %></td>
 <td><%= event.event_type.name %></td>
-<td><%= event.date_time.to_date %></td>
+<td><%= event.date.to_date %></td>
 <td><%= event.duration_in_hours %></td>
 </tr>
 <% end %>

config/initializers/date_time_formats.rb

@@ -0,0 +1 @@
+Time::DATE_FORMATS[:just_time] = '%I:%M %p'

db/migrate/20110914195533_change_events_date_time_to_date.rb

@@ -0,0 +1,11 @@
+class ChangeEventsDateTimeToDate < ActiveRecord::Migration
+  def self.up
+    rename_column :events, :date_time, :date
+    change_column :events, :date, :date
+  end
+
+  def self.down
+    change_column :events, :date, :datetime
+    rename_column :events, :date, :date_time
+  end
+end

db/migrate/20110914201816_change_events_add_start_time_end_time.rb

@@ -0,0 +1,11 @@
+class ChangeEventsAddStartTimeEndTime < ActiveRecord::Migration
+  def self.up
+    add_column :events, :start_time, :time
+    add_column :events, :end_time, :time
+  end
+
+  def self.down
+    remove_column :events, :start_time
+    remove_column :events, :end_time
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110525180000) do
+ActiveRecord::Schema.define(:version => 20110914201816) do
 
   create_table "answers", :force => true do |t|
     t.integer  "question_id"
@@ -150,7 +150,7 @@
   create_table "events", :force => true do |t|
     t.integer  "kase_id"
     t.integer  "user_id"
-    t.datetime "date_time"
+    t.date     "date"
     t.integer  "event_type_id"
     t.integer  "funding_source_id"
     t.decimal  "duration_in_hours", :precision => 5, :scale => 2
@@ -160,6 +160,8 @@
     t.integer  "lock_version",                                    :default => 0
     t.integer  "created_by_id"
     t.integer  "updated_by_id"
+    t.time     "start_time"
+    t.time     "end_time"
   end
 
   create_table "funding_sources", :force => true do |t|

public/javascripts/application.js

@@ -23,6 +23,9 @@ $(function(){
     dateFormat: 'yy-mm-dd' 
   });
 
+  // time picker
+  $('.timepicker').timePkr();
+
   $('.birthdatepicker').datepicker({
     showOn: "button",
     buttonText: "Select",