Added units to the user time input on the log

app/components/bikes/javascripts/init_component.js

@@ -3,6 +3,7 @@
     // calling superclass's initComponent
     this.callParent();
 
+    // something...
     //due to Netzke bug, :min_chars attribute doesn't work
     var min_char_columns = [
       "bike_brand__brand",

app/components/user_logs.rb

@@ -1,5 +1,4 @@
 class UserLogs < Netzke::Basepack::Grid
-
   def configure(c)
     super
 
@@ -52,23 +51,10 @@ class UserLogs < Netzke::Basepack::Grid
     ]
   end
 
-  def default_fields_for_forms
+  # Overriding the defautl add in form
-    #figure out a better way to do this
+  def preconfigure_record_window(c)
-    bike_store = Bike.all.map { |b| [b.id, b.shop_id] }
+    super
-    current_user ||= User.find_by_id(session[:selected_user_id]) || controller.current_user
+    c.form_config.klass = UserLogsAddItem
-    bike_id = current_user.bike.nil?  ? nil : current_user.bike.id
-    [
-      { :no_binding => true, :xtype => 'displayfield', :fieldLabel => "Log for:", :value => "#{current_user.to_s}"},
-      { :name => :start_date},
-      { :name => :end_date},
-      { :name => :description},
-      #had to hack acts_as_loggable/log.rb to get this to work
-      { :name => :user_action__action, :field_label => 'Action'},
-      { :name => :for_bike, :checkboxName => :copy_log, :inputValue => true, :title => "Copy description to a Bike's History?", :xtype => 'fieldset', :checkboxToggle => true, :collapsed => true, :items => [
-          {:xtype => 'combo', :no_binding => true, :name => :copy_id, :title => 'Bike', :fieldLabel => 'Bike', :store => bike_store, :value => bike_id}
-        ]
-      }
-    ]
   end
 
   #override with nil to remove actions
@@ -76,4 +62,8 @@ class UserLogs < Netzke::Basepack::Grid
     [ :apply, :add_in_form, :search ]
   end
 
-end
+  js_configure do |c|
+    c.mixin :init_component
+  end
+
+end

app/components/user_logs/javascripts/init_component.js

@@ -2,12 +2,48 @@
   initComponent: function(){
     // calling superclass's initComponent
     this.callParent();
-
+    // TESTTING
     //due to Netzke bug, :min_chars attribute doesn't work
     var min_char_columns = [
-      "user_action__purpose"]
+      "user_action__purpose"
-    Ext.each(min_char_columns, function(column, index) {
+    ];
-      Ext.ComponentManager.get(column).editor.minChars = 1;
+
-    });
+    // Ext.each(min_char_columns, function(column, index) {
+    //   Ext.ComponentManager.get(column).editor.minChars = 1;
+    // });
+
+    var view = this.getView();
+
+    view.on('itemclick', function(view, record){
+      console.log('clicking ');
+      // The beauty of using Ext.Direct: calling 3 endpoints in a row, which results in a single call to the server!
+      // console.log('Old record', record);
+    }, this);
+
+    view.on('itemupdate', function(record, index, node){
+      console.log('Updating item');
+      // if('end_date' in record.data.modified){
+      //   console.log('start', record.data.start_date);
+      //   console.log('end', record.data.end_date);
+      // }else if('start_date' in record.data.modified){
+
+      // }
+    }, this);
+
+    // var hoursInput = Ext.getCmp('user_logs_add_form_hours-inputEl');
+
+    // console.log(hoursInput);
+
+    // hoursInput.on('change', function(field, newValue, oldValue){
+    //   console.log('Hours changing...', newValue);
+    // });
+
+  },
+
+  addNewItem: function(e){
+    e.fireEvent('click', {});
+    console.log(e);
+    console.log('Adding new item');
   }
+
 }

app/components/user_logs_add_item.rb

@@ -0,0 +1,31 @@
+# The User Log Add Item Form
+class UserLogsAddItem < Netzke::Basepack::Form
+  def configure(c)
+    super
+    c.model = 'ActsAsLoggable::Log'
+
+    #figure out a better way to do this
+    bike_store = Bike.all.map { |b| [b.id, b.shop_id] }
+    current_user ||= User.find_by_id(session[:selected_user_id]) || controller.current_user
+    bike_id = current_user.bike.nil?  ? nil : current_user.bike.id
+    c.items = [
+      { :no_binding => true, :xtype => 'displayfield', :fieldLabel => "Log for:", :value => "#{current_user.to_s}"},
+      { :id => :user_logs_add_form_start, :name => :start_date},
+      { :id => :user_logs_add_form_time, :no_binding => true, :name => :time, :xtype => 'field', :fieldLabel => "Time:", :value => 0 },
+      { :id => :user_logs_add_form_units, :xtype => 'combo', :no_binding => true, :name => :units, :fieldLabel => 'Units', :store => ['Mins', 'Hrs'], :value => 'Mins' },
+      { :id => :user_logs_add_form_end, :name => :end_date, :hidden => true },
+      { :name => :description},
+      #had to hack acts_as_loggable/log.rb to get this to work
+      { :name => :user_action__action, :field_label => 'Action'},
+      { :name => :for_bike, :checkboxName => :copy_log, :inputValue => true, 
+        :title => "Copy description to a Bike's History?", :xtype => 'fieldset', :checkboxToggle => true, :collapsed => true, :items => [
+          {:xtype => 'combo', :no_binding => true, :name => :copy_id, :title => 'Bike', :fieldLabel => 'Bike', :store => bike_store, :value => bike_id}
+        ]
+      }
+    ]
+  end
+
+  js_configure do |c|
+    c.mixin :init_component
+  end
+end

app/components/user_logs_add_item/javascripts/init_component.js

@@ -0,0 +1,76 @@
+{
+  initComponent: function(){
+    // calling superclass's initComponent
+    this.callParent();
+
+    var panel = this;
+    var theForm = this.getForm();
+    var startInput = Ext.getCmp('user_logs_add_form_start');
+    var timeInput = Ext.getCmp('user_logs_add_form_time');
+    var unitsInput = Ext.getCmp('user_logs_add_form_units');
+    var endInput = Ext.getCmp('user_logs_add_form_end');
+    var startdate = startInput.items.items[0];
+    var starttime = startInput.items.items[1];
+    var enddate = endInput.items.items[0];
+    var endtime = endInput.items.items[1];
+
+    startdate.on('change', function(e){
+      var hours = timeInput.getValue();
+      var startTime = starttime.getValue();
+
+      if('Mins' === unitsInput.getValue()){
+        var calculatedEndTime = Ext.Date.add(new Date(startTime), Ext.Date.MINUTE, parseInt(hours));
+      }else{
+        var calculatedEndTime = Ext.Date.add(new Date(startTime), Ext.Date.HOUR, parseInt(hours));
+      }
+
+      endtime.setValue(calculatedEndTime);
+      enddate.setValue(calculatedEndTime);
+    });
+
+    starttime.on('change', function(e){
+      var hours = timeInput.getValue();
+      var startTime = starttime.getValue();
+
+      if('Mins' === unitsInput.getValue()){
+        var calculatedEndTime = Ext.Date.add(new Date(startTime), Ext.Date.MINUTE, parseInt(hours));
+      }else{
+        var calculatedEndTime = Ext.Date.add(new Date(startTime), Ext.Date.HOUR, parseInt(hours));
+      }
+
+
+      endtime.setValue(calculatedEndTime);
+      enddate.setValue(calculatedEndTime);
+    });
+
+    timeInput.on('change', function(e){
+      var hours = timeInput.getValue();
+      var startTime = starttime.getValue();
+
+      if('Mins' === unitsInput.getValue()){
+        var calculatedEndTime = Ext.Date.add(new Date(startTime), Ext.Date.MINUTE, parseInt(hours));
+      }else{
+        var calculatedEndTime = Ext.Date.add(new Date(startTime), Ext.Date.HOUR, parseInt(hours));
+      }
+
+      endtime.setValue(calculatedEndTime);
+      enddate.setValue(calculatedEndTime);
+    });
+
+    unitsInput.on('change', function(e){
+      var hours = timeInput.getValue();
+      var startTime = starttime.getValue();
+
+      if('Mins' === unitsInput.getValue()){
+        var calculatedEndTime = Ext.Date.add(new Date(startTime), Ext.Date.MINUTE, parseInt(hours));
+      }else{
+        var calculatedEndTime = Ext.Date.add(new Date(startTime), Ext.Date.HOUR, parseInt(hours));
+      }
+
+      endtime.setValue(calculatedEndTime);
+      enddate.setValue(calculatedEndTime);
+    });
+
+  }
+
+}