Merge pull request #103 from spacemunkay/denney-fix-user-add-bike

Fix User being able to add bikes

README.md

@@ -12,7 +12,7 @@ To add a user, a user must sign themselves up from the initial login screen.  An
 How to add a bike to the database: https://www.youtube.com/watch?v=1IchWUdMQ90.
 
 ## Views
-The app has two different views.  One for "core" volunteers which I consider admins, and another for "customer" volunteers which I consider users.  Because of the Netzke/ExtJS framework I used, the current UI is non-intuitive and I feel like is only adequate for admins who can take the time to learn the system.  I'm in the process of designing a simpler mobile friendly UI with the essential functionality that's intended for users.
+The app has two different views.  One for "core" volunteers which I consider admins, and another for "customer" volunteers which I consider users.  Because of the Netzke/ExtJS framework I used, the current UI is non-intuitive and I feel like is only adequate for admins who can take the time to learn the system.  I'm in the process of designing a simpler mobile friendly UI with the essential functionality that's intended for users.  You can see those changes on this [branch]( https://github.com/spacemunkay/BikeShed/tree/mobile-ui)
 
 ## Deployment
 Currently, at the Velocipede collective we have it running on a computer in the shop on the local network.  The reason for this, is so that it's only accessible from within the shop.  I'm weighing out different methods for ensuring that users can only log in from within the shop (and not from home), such as a shop password that only admins can see and would make visible from within the physical bike shop.  I also don't have to worry about security issues while the app is in development.  In the future, I'd like to see the app hosted much like http://freehub.bikekitchen.org/.
@@ -43,6 +43,7 @@ At Velocipede, with a mobile friendly UI for users, I'm hoping we can get donati
 1. Start Postgres `pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start`
 1. Create your PG user `createuser -d -P velocipede`
 1. Create your database `createdb -U velocipede --owner=velocipede velocipede`
+1. Create your test database `createdb -U velocipede --owner=velocipede velocipede_test`
 
 # Testing
 

app/assets/javascripts/application.js

@@ -17,3 +17,4 @@
 //= require utils
 //= require bootstrap-datepicker
 //= require bootstrap-timepicker
+//= require jquery-date-format

app/assets/javascripts/jquery-date-format.js

@@ -0,0 +1,445 @@
+var DateFormat = {};
+
+(function($) {
+  var daysInWeek          = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+  var shortMonthsInYear   = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+                              'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+  var longMonthsInYear    = ['January', 'February', 'March', 'April', 'May', 'June',
+                              'July', 'August', 'September', 'October', 'November', 'December'];
+  var shortMonthsToNumber = { 'Jan': '01', 'Feb': '02', 'Mar': '03', 'Apr': '04', 'May': '05', 'Jun': '06',
+                              'Jul': '07', 'Aug': '08', 'Sep': '09', 'Oct': '10', 'Nov': '11', 'Dec': '12' };
+
+  var YYYYMMDD_MATCHER = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.?\d{0,3}[Z\-+]?(\d{2}:?\d{2})?/;
+
+  $.format = (function() {
+    function numberToLongDay(value) {
+      // 0 to Sunday
+      // 1 to Monday
+      return daysInWeek[parseInt(value, 10)] || value;
+    }
+
+    function numberToShortMonth(value) {
+      // 1 to Jan
+      // 2 to Feb
+      var monthArrayIndex = parseInt(value, 10) - 1;
+      return shortMonthsInYear[monthArrayIndex] || value;
+    }
+
+    function numberToLongMonth(value) {
+      // 1 to January
+      // 2 to February
+      var monthArrayIndex = parseInt(value, 10) - 1;
+      return longMonthsInYear[monthArrayIndex] || value;
+    }
+
+    function shortMonthToNumber(value) {
+      // Jan to 01
+      // Feb to 02
+      return shortMonthsToNumber[value] || value;
+    }
+
+    function parseTime(value) {
+      // 10:54:50.546
+      // => hour: 10, minute: 54, second: 50, millis: 546
+      // 10:54:50
+      // => hour: 10, minute: 54, second: 50, millis: ''
+      var time = value,
+          values,
+          subValues,
+          hour,
+          minute,
+          second,
+          millis = '',
+          delimited,
+          timeArray;
+
+      if(time.indexOf('.') !== -1) {
+        delimited = time.split('.');
+        // split time and milliseconds
+        time   = delimited[0];
+        millis = delimited[1];
+      }
+
+      timeArray = time.split(':');
+
+      if(timeArray.length === 3) {
+        hour   = timeArray[0];
+        minute = timeArray[1];
+        // '20 GMT-0200 (BRST)'.replace(/\s.+/, '').replace(/[a-z]/gi, '');
+        // => 20
+        // '20Z'.replace(/\s.+/, '').replace(/[a-z]/gi, '');
+        // => 20
+        second = timeArray[2].replace(/\s.+/, '').replace(/[a-z]/gi, '');
+        // '01:10:20 GMT-0200 (BRST)'.replace(/\s.+/, '').replace(/[a-z]/gi, '');
+        // => 01:10:20
+        // '01:10:20Z'.replace(/\s.+/, '').replace(/[a-z]/gi, '');
+        // => 01:10:20
+        time = time.replace(/\s.+/, '').replace(/[a-z]/gi, '');
+        return {
+          time:    time,
+          hour:    hour,
+          minute:  minute,
+          second:  second,
+          millis:  millis
+        };
+      }
+
+      return { time : '', hour : '', minute : '', second : '', millis : '' };
+    }
+
+
+    function padding(value, length) {
+      var paddingCount = length - String(value).length;
+      for(var i = 0; i < paddingCount; i++) {
+        value = '0' + value;
+      }
+      return value;
+    }
+
+    return {
+
+      parseDate: function(value) {
+        var parsedDate = {
+          date:       null,
+          year:       null,
+          month:      null,
+          dayOfMonth: null,
+          dayOfWeek:  null,
+          time:       null
+        };
+
+        if(typeof value == 'number') {
+          return this.parseDate(new Date(value));
+        } else if(typeof value.getFullYear == 'function') {
+          parsedDate.year       = String(value.getFullYear());
+          // d = new Date(1900, 1, 1) // 1 for Feb instead of Jan.
+          // => Thu Feb 01 1900 00:00:00
+          parsedDate.month      = String(value.getMonth() + 1);
+          parsedDate.dayOfMonth = String(value.getDate());
+          parsedDate.time       = parseTime(value.toTimeString());
+        } else if(value.search(YYYYMMDD_MATCHER) != -1) {
+          /* 2009-04-19T16:11:05+02:00 || 2009-04-19T16:11:05Z */
+          values = value.split(/[T\+-]/);
+          parsedDate.year       = values[0];
+          parsedDate.month      = values[1];
+          parsedDate.dayOfMonth = values[2];
+          parsedDate.time       = parseTime(values[3].split('.')[0]);
+        } else {
+          values = value.split(' ');
+          switch (values.length) {
+            case 6:
+              /* Wed Jan 13 10:43:41 CET 2010 */
+              parsedDate.year       = values[5];
+              parsedDate.month      = shortMonthToNumber(values[1]);
+              parsedDate.dayOfMonth = values[2];
+              parsedDate.time       = parseTime(values[3]);
+              break;
+            case 2:
+              /* 2009-12-18 10:54:50.546 */
+              subValues = values[0].split('-');
+              parsedDate.year       = subValues[0];
+              parsedDate.month      = subValues[1];
+              parsedDate.dayOfMonth = subValues[2];
+              parsedDate.time       = parseTime(values[1]);
+              break;
+            case 7:
+              /* Tue Mar 01 2011 12:01:42 GMT-0800 (PST) */
+            case 9:
+              /* added by Larry, for Fri Apr 08 2011 00:00:00 GMT+0800 (China Standard Time) */
+            case 10:
+              /* added by Larry, for Fri Apr 08 2011 00:00:00 GMT+0200 (W. Europe Daylight Time) */
+              parsedDate.year       = values[3];
+              parsedDate.month      = shortMonthToNumber(values[1]);
+              parsedDate.dayOfMonth = values[2];
+              parsedDate.time       = parseTime(values[4]);
+              break;
+            case 1:
+              /* added by Jonny, for 2012-02-07CET00:00:00 (Doctrine Entity -> Json Serializer) */
+              subValues = values[0].split('');
+              parsedDate.year       = subValues[0] + subValues[1] + subValues[2] + subValues[3];
+              parsedDate.month      = subValues[5] + subValues[6];
+              parsedDate.dayOfMonth = subValues[8] + subValues[9];
+              parsedDate.time       = parseTime(subValues[13] + subValues[14] + subValues[15] + subValues[16] + subValues[17] + subValues[18] + subValues[19] + subValues[20]);
+              break;
+            default:
+              return null;
+          }
+        }
+        parsedDate.date       = new Date(parsedDate.year, parsedDate.month - 1, parsedDate.dayOfMonth);
+        parsedDate.dayOfWeek  = String(parsedDate.date.getDay());
+
+        return parsedDate;
+      },
+
+      date : function(value, format) {
+        try {
+          var parsedDate = this.parseDate(value);
+
+          if(parsedDate === null) {
+            return value;
+          }
+
+          var date       = parsedDate.date,
+              year       = parsedDate.year,
+              month      = parsedDate.month,
+              dayOfMonth = parsedDate.dayOfMonth,
+              dayOfWeek  = parsedDate.dayOfWeek,
+              time       = parsedDate.time;
+
+          var pattern      = '',
+              retValue     = '',
+              unparsedRest = '',
+              inQuote      = false;
+
+          /* Issue 1 - variable scope issue in format.date (Thanks jakemonO) */
+          for(var i = 0; i < format.length; i++) {
+            var currentPattern = format.charAt(i);
+            // Look-Ahead Right (LALR)
+            var nextRight      = format.charAt(i + 1);
+
+            if (inQuote) {
+              if (currentPattern == "'") {
+                retValue += (pattern === '') ? "'" : pattern;
+                pattern = '';
+                inQuote = false;
+              } else {
+                pattern += currentPattern;
+              }
+              continue;
+            }
+            pattern += currentPattern;
+            unparsedRest = '';
+            switch (pattern) {
+              case 'ddd':
+                retValue += numberToLongDay(dayOfWeek);
+                pattern = '';
+                break;
+              case 'dd':
+                if(nextRight === 'd') {
+                  break;
+                }
+                retValue += padding(dayOfMonth, 2);
+                pattern = '';
+                break;
+              case 'd':
+                if(nextRight === 'd') {
+                  break;
+                }
+                retValue += parseInt(dayOfMonth, 10);
+                pattern = '';
+                break;
+              case 'D':
+                if(dayOfMonth == 1 || dayOfMonth == 21 || dayOfMonth == 31) {
+                  dayOfMonth = parseInt(dayOfMonth, 10) + 'st';
+                } else if(dayOfMonth == 2 || dayOfMonth == 22) {
+                  dayOfMonth = parseInt(dayOfMonth, 10) + 'nd';
+                } else if(dayOfMonth == 3 || dayOfMonth == 23) {
+                  dayOfMonth = parseInt(dayOfMonth, 10) + 'rd';
+                } else {
+                  dayOfMonth = parseInt(dayOfMonth, 10) + 'th';
+                }
+                retValue += dayOfMonth;
+                pattern = '';
+                break;
+              case 'MMMM':
+                retValue += numberToLongMonth(month);
+                pattern = '';
+                break;
+              case 'MMM':
+                if(nextRight === 'M') {
+                  break;
+                }
+                retValue += numberToShortMonth(month);
+                pattern = '';
+                break;
+              case 'MM':
+                if(nextRight === 'M') {
+                  break;
+                }
+                retValue += padding(month, 2);
+                pattern = '';
+                break;
+              case 'M':
+                if(nextRight === 'M') {
+                  break;
+                }
+                retValue += parseInt(month, 10);
+                pattern = '';
+                break;
+              case 'y':
+              case 'yyy':
+                if(nextRight === 'y') {
+                  break;
+                }
+                retValue += pattern;
+                pattern = '';
+                break;
+              case 'yy':
+                if(nextRight === 'y') {
+                  break;
+                }
+                retValue += String(year).slice(-2);
+                pattern = '';
+                break;
+              case 'yyyy':
+                retValue += year;
+                pattern = '';
+                break;
+              case 'HH':
+                retValue += padding(time.hour, 2);
+                pattern = '';
+                break;
+              case 'H':
+                if(nextRight === 'H') {
+                  break;
+                }
+                retValue += parseInt(time.hour, 10);
+                pattern = '';
+                break;
+              case 'hh':
+                /* time.hour is '00' as string == is used instead of === */
+                hour = (parseInt(time.hour, 10) === 0 ? 12 : time.hour < 13 ? time.hour
+                    : time.hour - 12);
+                retValue += padding(hour, 2);
+                pattern = '';
+                break;
+              case 'h':
+                if(nextRight === 'h') {
+                  break;
+                }
+                hour = (parseInt(time.hour, 10) === 0 ? 12 : time.hour < 13 ? time.hour
+                    : time.hour - 12);
+                retValue += parseInt(hour, 10);
+                // Fixing issue https://github.com/phstc/jquery-dateFormat/issues/21
+                // retValue = parseInt(retValue, 10);
+                pattern = '';
+                break;
+              case 'mm':
+                retValue += padding(time.minute, 2);
+                pattern = '';
+                break;
+              case 'm':
+                if(nextRight === 'm') {
+                  break;
+                }
+                retValue += time.minute;
+                pattern = '';
+                break;
+              case 'ss':
+                /* ensure only seconds are added to the return string */
+                retValue += padding(time.second.substring(0, 2), 2);
+                pattern = '';
+                break;
+              case 's':
+                if(nextRight === 's') {
+                  break;
+                }
+                retValue += time.second;
+                pattern = '';
+                break;
+              case 'S':
+              case 'SS':
+                if(nextRight === 'S') {
+                  break;
+                }
+                retValue += pattern;
+                pattern = '';
+                break;
+              case 'SSS':
+                retValue += time.millis.substring(0, 3);
+                pattern = '';
+                break;
+              case 'a':
+                retValue += time.hour >= 12 ? 'PM' : 'AM';
+                pattern = '';
+                break;
+              case 'p':
+                retValue += time.hour >= 12 ? 'p.m.' : 'a.m.';
+                pattern = '';
+                break;
+              case "'":
+                pattern = '';
+                inQuote = true;
+                break;
+              default:
+                retValue += currentPattern;
+                pattern = '';
+                break;
+            }
+          }
+          retValue += unparsedRest;
+          return retValue;
+        } catch (e) {
+          if(console && console.log) {
+            console.log(e);
+          }
+          return value;
+        }
+      },
+      /*
+       * JavaScript Pretty Date
+       * Copyright (c) 2011 John Resig (ejohn.org)
+       * Licensed under the MIT and GPL licenses.
+       *
+       * Takes an ISO time and returns a string representing how long ago the date
+       * represents
+       *
+       * ('2008-01-28T20:24:17Z') // => '2 hours ago'
+       * ('2008-01-27T22:24:17Z') // => 'Yesterday'
+       * ('2008-01-26T22:24:17Z') // => '2 days ago'
+       * ('2008-01-14T22:24:17Z') // => '2 weeks ago'
+       * ('2007-12-15T22:24:17Z') // => 'more than 5 weeks ago'
+       *
+       */
+      prettyDate : function(time) {
+        var date;
+        var diff;
+        var day_diff;
+
+        if(typeof time === 'string' || typeof time === 'number') {
+          date = new Date(time);
+        }
+
+        if(typeof time === 'object') {
+          date = new Date(time.toString());
+        }
+
+        diff = (((new Date()).getTime() - date.getTime()) / 1000);
+
+        day_diff = Math.floor(diff / 86400);
+
+        if(isNaN(day_diff) || day_diff < 0) {
+          return;
+        }
+
+        if(diff < 60) {
+          return 'just now';
+        } else if(diff < 120) {
+          return '1 minute ago';
+        } else if(diff < 3600) {
+          return Math.floor(diff / 60) + ' minutes ago';
+        } else if(diff < 7200) {
+          return '1 hour ago';
+        } else if(diff < 86400) {
+          return Math.floor(diff / 3600) + ' hours ago';
+        } else if(day_diff === 1) {
+          return 'Yesterday';
+        } else if(day_diff < 7) {
+          return day_diff + ' days ago';
+        } else if(day_diff < 31) {
+          return Math.ceil(day_diff / 7) + ' weeks ago';
+        } else if(day_diff >= 31) {
+          return 'more than 5 weeks ago';
+        }
+      },
+      toBrowserTimeZone : function(value, format) {
+        return this.date(new Date(value), format || 'MM/dd/yyyy HH:mm:ss');
+      }
+    };
+  }());
+}(DateFormat));
+;// require dateFormat.js
+// please check `dist/jquery.dateFormat.js` for a complete version
+(function($) {
+  $.format = DateFormat.format;
+}(jQuery));

app/assets/javascripts/panel.js

@@ -22,7 +22,6 @@ Ext.define('Ext.ux.form.field.DateTime', {
     dateSubmitFormat: 'Y-m-d',
     timeFormat: 'H:i:s',
     timeSubmitFormat: 'H:i:s',
-    submitFormat: 'c',
     dateConfig:{},
     timeConfig:{},
 
@@ -185,10 +184,8 @@ Ext.define('Ext.ux.form.field.DateTime', {
         var me = this
             ,format = me.getFormat()
             ,value = me.getValue();
-        console.log(value);
+
-        console.log(format);
+        return value ? Ext.Date.format(value, format) : null;
-        console.log("formatted: " + Ext.Date.format(value, this.submitFormat));
-        return value ? Ext.Date.format(value, this.submitFormat) : null;
     },
 
     setValue: function(value){

app/assets/javascripts/time_entries.js

@@ -23,9 +23,13 @@ $(document).ready(function(){
       forward = "/task_lists/" + bike_id + "/edit";
     }
 
+    //FIXME: Ideally, we'd submit the dates as ISO, but I can't figure out
+    // how to get Netzke to render UTC dates correctly (it calls to_json
+    // somewhere and drops off the timezone).  For the time being, save dates
+    // in locale like Netzke.
     json_data = { time_entries: [{
-        start_date:    start_date.toISOString(),
+        start_date:    $.format.date(start_date, "dd-MM-yyyy hh:mm a"),
-        end_date:      end_date.toISOString(),
+        end_date:      $.format.date(end_date, "dd-MM-yyyy hh:mm a"),
         log_action_id: parseInt($('input[name=action_id]:checked').val()),
         bike_id:       bike_id,
         description:   $("#description_id").val(),
@@ -44,6 +48,7 @@ $(document).ready(function(){
         displayFormErrors(data.responseJSON);
       }
     });
+
   });
 
   $(".work_entry-delete-btn").click(function(){

app/components/app_tab_panel/javascripts/sign_out.js

@@ -19,6 +19,6 @@
     });
   },
   onChangeAccountInfo: function(){
-    window.location.href="users/edit";
+    window.location.href="/users/edit";
   }
 }

app/models/ability.rb

@@ -23,7 +23,7 @@ class Ability
 
   def user
     can :read, :all
-    can :manage, Bike, :id => @current_user.bike_id unless @current_user.bike.nil?
+    can :manage, @current_user.bike unless @current_user.bike.nil?
     can :manage, ::ActsAsLoggable::Log, :loggable_type => "Bike", :loggable_id => @current_user.bike_id
     can :manage, ::ActsAsLoggable::Log, :loggable_type => "User", :loggable_id => @current_user.id
   end

app/views/site/index.html.haml

@@ -6,6 +6,7 @@
     %a{class: "btn btn-lg btn-block btn-primary", href: new_time_entry_path} Add Time Entry
   %p
     %a{class: "btn btn-lg btn-block btn-primary", href: time_entries_path} View Timesheet
+- if can? :manage, Bike
   %p
     %a{class: "btn btn-lg btn-block btn-primary", href: new_bike_path} Add Bike
 
@@ -13,9 +14,8 @@
   %p
     %a{class: "btn btn-lg btn-block btn-primary", href: bike_path(@bike)} View Your Bike
 
-
 %p
   %p
-    %a{class: "btn btn-lg btn-block btn-primary hidden-xs", href: admin_index_path} Admin View
+    %a{class: "btn btn-lg btn-block btn-primary hidden-xs", href: admin_index_path} Desktop View
   %p
     %input{id: "index_logout", value: "Logout", type: "button", class: "btn btn-lg btn-block btn-danger", "data-url" => destroy_user_session_path }

db/migrate/20140504154355_add_timezones_to_logs.rb

@@ -1,15 +0,0 @@
-class AddTimezonesToLogs < ActiveRecord::Migration
-  def up
-    change_table :logs do |t|
-      t.change :start_date, :timestamptz
-      t.change :end_date, :timestamptz
-    end
-  end
-
-  def down
-    change_table :logs do |t|
-      t.change :start_date, :timestamp
-      t.change :end_date, :timestamp
-    end
-  end
-end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140504154355) do
+ActiveRecord::Schema.define(:version => 20131019170248) do
 
   create_table "bike_actions", :force => true do |t|
     t.string   "action",     :limit => 128, :null => false