bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2025-10-31 17:05:36 -04:00
Code Issues Projects Releases Wiki Activity

Added units to the user time input on the log

Browse Source
This commit is contained in:
Edwin Perez 2013-10-19 15:43:53 -04:00
parent b7ad63a2e5
commit 4b9f0169bc
2 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/components/user_logs_add_item.rb
View File

@ -11,12 +11,14 @@ class UserLogsAddItem < Netzke::Basepack::Form
c.items = [ c.items = [
{ :no_binding => true, :xtype => 'displayfield', :fieldLabel => "Log for:", :value => "#{current_user.to_s}"}, { :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_start, :name => :start_date},
{ :id => :user_logs_add_form_hours, :no_binding => true, :name => :hours, :xtype => 'field', :fieldLabel => "Hours:", :value => 0 }, { :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 }, { :id => :user_logs_add_form_end, :name => :end_date, :hidden => true },
{ :name => :description}, { :name => :description},
#had to hack acts_as_loggable/log.rb to get this to work #had to hack acts_as_loggable/log.rb to get this to work
{ :name => :user_action__action, :field_label => 'Action'}, { :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 => [ { :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} {:xtype => 'combo', :no_binding => true, :name => :copy_id, :title => 'Bike', :fieldLabel => 'Bike', :store => bike_store, :value => bike_id}
] ]
} }

47
app/components/user_logs_add_item/javascripts/init_component.js
View File

@ -6,7 +6,8 @@
var panel = this; var panel = this;
var theForm = this.getForm(); var theForm = this.getForm();
var startInput = Ext.getCmp('user_logs_add_form_start'); var startInput = Ext.getCmp('user_logs_add_form_start');
var hoursInput = Ext.getCmp('user_logs_add_form_hours'); 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 endInput = Ext.getCmp('user_logs_add_form_end');
var startdate = startInput.items.items[0]; var startdate = startInput.items.items[0];
var starttime = startInput.items.items[1]; var starttime = startInput.items.items[1];
@ -14,27 +15,57 @@
var endtime = endInput.items.items[1]; var endtime = endInput.items.items[1];
startdate.on('change', function(e){ startdate.on('change', function(e){
var hours = hoursInput.getValue(); var hours = timeInput.getValue();
var startTime = starttime.getValue(); var startTime = starttime.getValue();
var calculatedEndTime = Ext.Date.add(new Date(startTime), Ext.Date.HOUR, parseInt(hours));
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); endtime.setValue(calculatedEndTime);
enddate.setValue(calculatedEndTime); enddate.setValue(calculatedEndTime);
}); });
starttime.on('change', function(e){ starttime.on('change', function(e){
var hours = hoursInput.getValue(); var hours = timeInput.getValue();
var startTime = starttime.getValue(); var startTime = starttime.getValue();
var calculatedEndTime = Ext.Date.add(new Date(startTime), Ext.Date.HOUR, parseInt(hours));
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); endtime.setValue(calculatedEndTime);
enddate.setValue(calculatedEndTime); enddate.setValue(calculatedEndTime);
}); });
hoursInput.on('change', function(e){ timeInput.on('change', function(e){
var hours = hoursInput.getValue(); var hours = timeInput.getValue();
var startTime = starttime.getValue(); var startTime = starttime.getValue();
var calculatedEndTime = Ext.Date.add(new Date(startTime), Ext.Date.HOUR, parseInt(hours));
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); endtime.setValue(calculatedEndTime);
enddate.setValue(calculatedEndTime); enddate.setValue(calculatedEndTime);