bookyt_projects 0.19.12 → 0.19.13

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,6 +1,7 @@
1
- %table.list#activities_list
2
- %tr
3
- - [:person, :date, :duration].each do |attr|
4
- %th= t_attr(attr, Activity)
5
-
6
- = render collection
1
+ %table.zebra-striped.activities.collection
2
+ %thead
3
+ %tr
4
+ - [:person, :date, :duration].each do |attr|
5
+ %th= t_attr(attr, Activity)
6
+ %tbody
7
+ = render collection
@@ -3,7 +3,7 @@
3
3
  = f.input :date, :as => :date_field, :label => t('attributes.date'), :input_html => {:value => @date}
4
4
 
5
5
  = f.inputs do
6
- %table{:style => 'width: 100%'}
6
+ %table.zebra-striped{:style => 'width: 100%'}
7
7
  %thead
8
8
  %th= t_attr :person, Activity
9
9
  %th= t_attr :project, Activity
@@ -1,4 +1,4 @@
1
- %table.list{:class => "#{collection.first.class.to_s.downcase.pluralize} collection"}
1
+ %table.zebra-striped{:class => "#{collection.first.class.to_s.downcase.pluralize} collection"}
2
2
  %thead
3
3
  %tr
4
4
  %th= t_attr :name
@@ -1,21 +1,22 @@
1
- %table.condensed-table.span8
2
- %tr
3
- %th= t_attr :date, Activity
4
- %th.right= t_attr :working_hours, Activity
5
- %th.right= t_attr :overtime, Activity
6
- %th.right= t_attr :overall_overtime, Activity
7
-
8
- - work_days.each do |day|
9
- - tr_params = {:class => work_day_classes(day)}
10
- - tr_params.merge!(:rel => 'popover', 'data-content' => h(render 'timesheets/activities_popover', :activities => day.activities), 'data-original-title' => 'Aktivitäten', 'data-html' => 'true') unless day.activities.empty?
11
- %tr{tr_params}
12
- %td
13
- - if day.activities.empty?
14
- = link_to l(day.date, :format => '%a, %d.%m.%Y'), new_activity_path(:activity => {:person_id => day.person_id, :date => day.date.to_s(:db)}), 'data-href-container' => 'tr'
15
- - else
16
- = link_to l(day.date, :format => '%a, %d.%m.%Y'), person_activities_path(day.person, :by_date => day.date.to_s(:db)), 'data-href-container' => 'tr'
17
- %td.right
18
- %span.strong= "%0.2f" % day.hours_worked
19
- = "(%0.2f)" % day.hours_due
20
- %td.right.overtime.strong= "%0.2f" % day.overtime
21
- %td.right.overall-overtime.strong= "%0.2f" % day.overall_overtime
1
+ %table.zebra-striped.condensed-table.span8
2
+ %thead
3
+ %tr
4
+ %th= t_attr :date, Activity
5
+ %th.right= t_attr :working_hours, Activity
6
+ %th.right= t_attr :overtime, Activity
7
+ %th.right= t_attr :overall_overtime, Activity
8
+ %tbody
9
+ - work_days.each do |day|
10
+ - tr_params = {:class => work_day_classes(day)}
11
+ - tr_params.merge!(:rel => 'popover', 'data-content' => h(render 'timesheets/activities_popover', :activities => day.activities), 'data-original-title' => 'Aktivitäten', 'data-html' => 'true') unless day.activities.empty?
12
+ %tr{tr_params}
13
+ %td
14
+ - if day.activities.empty?
15
+ = link_to l(day.date, :format => '%a, %d.%m.%Y'), new_activity_path(:activity => {:person_id => day.person_id, :date => day.date.to_s(:db)}), 'data-href-container' => 'tr'
16
+ - else
17
+ = link_to l(day.date, :format => '%a, %d.%m.%Y'), person_activities_path(day.person, :by_date => day.date.to_s(:db)), 'data-href-container' => 'tr'
18
+ %td.right
19
+ %span.strong= "%0.2f" % day.hours_worked
20
+ = "(%0.2f)" % day.hours_due
21
+ %td.right.overtime.strong= "%0.2f" % day.overtime
22
+ %td.right.overall-overtime.strong= "%0.2f" % day.overall_overtime
@@ -1,3 +1,3 @@
1
1
  module BookytPos
2
- VERSION = '0.19.12'
2
+ VERSION = '0.19.13'
3
3
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bookyt_projects
3
3
  version: !ruby/object:Gem::Version
4
- hash: 75
4
+ hash: 73
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 19
9
- - 12
10
- version: 0.19.12
9
+ - 13
10
+ version: 0.19.13
11
11
  platform: ruby
12
12
  authors:
13
13
  - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2012-03-06 00:00:00 Z
19
+ date: 2012-03-08 00:00:00 Z
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
22
  name: rails