Ajaxif'd the dashboard.

Updated .gitignore with more temp files;

.gitignore

@@ -13,6 +13,10 @@
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
+/out
+
+# Ignoring OSX files
+.DS_Store
 
 # Ignore all Intellij Files
 /*.iml

app/assets/javascripts/dashboard.js.coffee

@@ -1,3 +1,12 @@
 # Place all the behaviors and hooks related to the matching controller here.
 # All this logic will automatically be available in application.js.
 # You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
+jQuery ->
+  $('#new_commute').bind 'ajax:success', (event, data, status, xhr) ->
+    console.log data
+    $('#cash_score').text data.cash_score
+    $('#cal_score').text data.cal_score
+    $('#envfp_score').text data.envfp_score
+    $('.score').show()
+  .bind 'ajax:error', ->
+    alert 'No!'

app/controllers/commutes_controller.rb

@@ -44,8 +44,11 @@ def create
 
     respond_to do |format|
       if @commute.save
-        redirect_to dashboard_path(@commute), notice: 'Commute was successfully created.'
-        format.json { render json: @commute, status: :created, location: @commute }
+        format.html { render action: "show" }
+        format.json { render json: @commute.attributes.merge({:cal_score => @commute.cal_score,
+                                                              :cash_score => @commute.cash_score,
+                                                              :envfp_score => @commute.envfp_score
+                                                             }), status: :ok, location: @commute }
       else
         format.html { render action: "new" }
         format.json { render json: @commute.errors, status: :unprocessable_entity }
@@ -60,8 +63,11 @@ def update
 
     respond_to do |format|
       if @commute.update_attributes(params[:commute])
-        redirect_to dashboard_path(@commute), notice: 'Commute was successfully update.'
-        format.json { head :no_content }
+        format.html { render action: "show" }
+        format.json { render json: @commute.attributes.merge({:cal_score => @commute.cal_score,
+                                                              :cash_score => @commute.cash_score,
+                                                              :envfp_score => @commute.envfp_score
+                                                             }), status: :ok, location: @commute }
       else
         format.html { render action: "edit" }
         format.json { render json: @commute.errors, status: :unprocessable_entity }

app/models/commute.rb

@@ -11,28 +11,34 @@ class Commute < ActiveRecord::Base
   def cash_score
     # calculate cash score
     #   car cash value - other cash value
-    if cash_fr
-      (CommuteType.baseline.cash - cash)
-    else
-      (CommuteType.baseline.cash * distance) * (1 + passenger) - (cash * distance)
+    if id?
+      if cash_fr
+        (CommuteType.baseline.cash - cash)
+      else
+        (CommuteType.baseline.cash * distance) * (1 + passenger) - (cash * distance)
+      end
     end
  end
 
   def cal_score
     # calculate calories score
-    if calories_fr
-      calories
-    else
-      calories * distance
+    if id?
+      if calories_fr
+        calories
+      else
+        calories * distance
+      end
     end
   end
 
   def envfp_score
     # calculate envfp score
-    if envfp_fr
-      (CommuteType.baseline.envfp - envfp)
-    else
-      (CommuteType.baseline.envfp * distance) * (1 + passenger) - (envfp * distance)
+    if id?
+      if envfp_fr
+        (CommuteType.baseline.envfp - envfp)
+      else
+        (CommuteType.baseline.envfp * distance) * (1 + passenger) - (envfp * distance)
+      end
     end
   end
 end

app/views/commutes/index.html.erb

@@ -17,8 +17,8 @@
   <tbody>
     <% @commutes.each do |commute| %>
       <tr>
-        <td><%= link_to commute.name, commute_path(commute) %></td>
-        <td><%= commute.commute_type %></td>
+        <td><%= link_to commute.name, dashboard_path(commute) %></td>
+        <td><%= commute.commute_type.name %></td>
         <td><%= commute.start %></td>
         <td><%= commute.end %></td>
         <td><%= commute.distance %></td>

app/views/dashboard/_form.html.erb

@@ -2,15 +2,15 @@
     <h4 style="color:#BDC3C7; text-align:right; font-size:1.1em; margin-right:40px;"><%= Time.now.strftime("%A, %B %d %Y") %></h4>
 </div><!-- end row -->
 <div class="row" style=" margin-bottom:20px;">
-    <%= form_for @commute, :html => { :class => 'form-horizontal' } do |f| %>
+    <%= form_for @commute, :html => { :class => 'form-horizontal', :'data-type' => 'json' }, :remote => true do |f| %>
 
         <h1 class="text-center" style="margin: 25px 0;">Today I am
             <%= f.collection_select :commute_type_id, CommuteType.all, :id, :name, :class => 'collection_select' %>    to
             <%= f.collection_select :distance, Destination.all, :distance, :name, :class => 'collection_select' %>    with
             <%= f.select( "passenger", { "0 people" => "0", "1 person" => "1", "2 people" => "2", "3 people" => "3"}) %>
         </h1>
         <div class="form-actions">
-            <%= f.submit "Save Commute", :class => 'btn btn-primary' %>
+            <%= f.submit 'Save Commute', :class => 'btn btn-primary' %>
         </div>
     <% end %>
 </div><!-- end row -->

app/views/dashboard/_score.html.erb

@@ -1,9 +1,10 @@
+<div class="score" <% unless @commute.id? %>style="display: none"<% end %> >
 <div class="row">
     <div class="span2" style="padding-left:25px;">
         <%= image_tag "icons/icon-env.svg" %>
     </div>
     <div class="span6" style="margin-top:30px;">
-        <h4>You will save $<%= @commute.cash_score %>.</h4>
+        <h4>You will save $<span id='cash_score'><%= @commute.cash_score || 0 %></span>.</h4>
     </div>
     <div class="span4" style="margin-top:30px;">
         <div class="progress">
@@ -20,7 +21,7 @@
         <%= image_tag "icons/icon-health.svg" %>
     </div>
     <div class="span6" style="margin-top:30px;">
-        <h4>You will burn <%= @commute.cal_score %> calories.</h4>
+        <h4>You will burn <span id='cal_score'><%= @commute.cal_score || 0 %></span> calories.</h4>
     </div>
     <div class="span4" style="margin-top:30px;">
         <div class="progress">
@@ -37,7 +38,7 @@
         <%= image_tag "icons/icon-money.svg" %>
     </div>
     <div class="span6" style="margin-top:30px;">
-        <h4>You will reduce your carbon footprint by <%= @commute.envfp_score %> grams.</h4>
+        <h4>You will reduce your carbon footprint by <span id='envfp_score'><%= @commute.envfp_score || 0%></span> grams.</h4>
     </div>
     <div class="span4" style="margin-top:30px;">
         <div class="progress">
@@ -51,3 +52,4 @@
 </div><!-- end row -->
 <div class="row" style="background:#1ABC9C; height:150px; margin-top:25px; margin-bottom:25px; margin-right:0; width: 100%;">
 </div><!-- end row -->
+</div>

app/views/dashboard/main.html.erb

@@ -1,5 +1,6 @@
 <div class="container">
   <%= render :partial => 'form' %>
+  <%= render :partial => 'score' %>
   <%= render :partial => 'rewards' %>
 </div>
 

config/routes.rb

@@ -9,9 +9,9 @@
 
   root :to => 'dashboard#intro'
 
-  match '/dashboard' => 'dashboard#main'
+  match 'dashboard' => 'dashboard#main'
 
-  get 'dashboard/:id', :to => 'dashboard#show'
+  match 'dashboard/:id', :to => 'dashboard#show', :as => 'dashboard'
 
   # The priority is based upon order of creation:
   # first created -> highest priority.