diff --git a/app/views/employees/_form.html.erb b/app/views/employees/_form.html.erb index c4e3450..5e46e7b 100644 --- a/app/views/employees/_form.html.erb +++ b/app/views/employees/_form.html.erb @@ -1,65 +1,120 @@ <% form_for @employee do |f| %> <%= f.error_messages %> -
- Personal -
<%= f.label :number %>
-
<%= f.text_field :number %>
-
<%= f.label :firstname %>
-
<%= f.text_field :firstname %>
-
<%= f.label :lastname %>
-
<%= f.text_field :lastname %>
-
<%= f.label :dob %>
-
<%= f.date_select :dob, :start_year => Time.now.year - 70, - :end_year => Time.now.year - 17, :default => Time.now - 30.years %> -
-
<%= f.label :phone %>
-
<%= f.text_field :phone %>
+ Personal Info + <%# f.label :number %> + <%# f.text_field :number %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
<%= f.label :firstname, "First Name", :class => "label" %> + <%= f.label :lastname, "Last Name", :class => "label" %>
<%= f.text_field :firstname, :size => "12" %><%= f.text_field :lastname, :size => "12" %>
<%= f.label :street, "Street", :class => "label" %>
<%= f.text_field :street %>
<%= f.label :city, "City", :class => "label" %> <%= f.label :state, "St", :class => "label" %><%= f.label :zip, "Zip", :class => "label" %>
<%= f.text_field :city, :size => "20" %><%= f.text_field :state, :size => "2" %><%= f.text_field :zip, :size => "6" %>
<%= f.label :dob, "Birth Date", :class => "label" %><%= f.label :hired, "Hire Date", :class => "label" %>
<%= f.calendar_date_select :dob, :size => "10", + :year_range => 70.years.ago..0.years.ago, + :buttons => false %><%= f.calendar_date_select :hired, :size => "10", + :year_range => 20.years.ago..1.year.from_now, + :buttons => false %>
<%= f.label :ssn, "Social", :class => "label" %><%= f.label :phone, "Phone", :class => "label" %>
<%= f.text_field :ssn, :size => "10" %><%= f.text_field :phone, :size => "12" %>
 <%= f.label :tax_status, "Status", :class => "label" %><%= f.label :dependents, "Dep", :class => "label" %><%= f.label :payrate, "Rate", :class => "label" %>
 <%= f.text_field :tax_status, :size => "1" %><%= f.text_field :dependents, :size => "1" %><%= f.text_field :payrate, :size => "4" %>
-
- Tax Info - -
<%= f.label :ssn %>
-
<%= f.text_field :ssn %>
-
<%= f.label :payrate %>
-
<%= f.text_field :payrate %>
-
<%= f.label :tax_status %>
-
<%= f.text_field :tax_status %>
-
<%= f.label :dependents %>
-
<%= f.text_field :dependents %>
-
<%= f.label :hired %>
-
<%= f.date_select :hired, :start_year => Time.now.year - 10, - :end_year => Time.now.year + 1, :default => Time.now %> -
+
+ Recent Loads +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- - Address -
<%= f.label :street %>
-
<%= f.text_field :street %>
-
<%= f.label :city %>
-
<%= f.text_field :city %>
-
<%= f.label :state %>
-
<%= f.text_field :state %>
-
<%= f.label :zip %>
-
<%= f.text_field :zip %>
+ Vehicle Info + + + + + + + + + + + + + + + + + + + + +
+ <%= f.label :dl_number, "License No.", :class => "label" %><%= f.label :dl_state, "St", :class => "label" %><%= f.label :dl_expire, "Expiry", :class => "label" %>
<%= f.text_field :dl_number, :size => "14" %><%= f.text_field :dl_state, :size => "2" %><%= f.calendar_date_select :dl_expire, + :size => "10" %>
<%= f.label :truck, "Truck No", :class => "label" %><%= f.label :trailer, "Trailer No", :class => "label" %>
<%= f.text_field :truck, :size => "12" %><%= f.text_field :trailer, :size => "12" %>
-
- Vehicle Info - -
<%= f.label :dl_number %>
-
<%= f.text_field :dl_number %>
-
<%= f.label :dl_state %>
-
<%= f.text_field :dl_state %>
-
<%= f.label :dl_expire %>
-
<%= f.text_field :dl_expire %>
- -
<%= f.label :truck %>
-
<%= f.text_field :truck %>
-
<%= f.label :trailer %>
-
<%= f.text_field :trailer %>
-
-

<%= f.submit "Submit" %>

<% end %> diff --git a/app/views/employees/index.html.erb b/app/views/employees/index.html.erb index f52283c..964589f 100644 --- a/app/views/employees/index.html.erb +++ b/app/views/employees/index.html.erb @@ -4,24 +4,26 @@ No. First Name Last Name - SSN + Street + City + St. + Zip Birth Date Hire Date - S - D - Payrate + Rate <% for employee in @employees %> " onclick="location.href='<%= edit_employee_path(employee) %>'"> <%= employee.number %> - <%= employee.firstname %> - <%= employee.lastname %> - <%= employee.ssn %> - <%= employee.dob %> - <%= employee.hired %> - <%= employee.tax_status %> - <%= employee.dependents %> - <%= employee.payrate %> + <%= employee.firstname %> + <%= employee.lastname %> + <%= employee.street %> + <%= employee.city %> + <%= employee.state %> + <%= employee.zip %> + <%= employee.dob %> + <%= employee.hired %> + <%= number_to_currency employee.payrate %> <% end %>