bookyt_projects 0.19.19 → 0.19.20

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,14 +1,12 @@
1
- = semantic_form_for @activity do |f|
2
- = f.inputs do
3
- .row-fluid
4
- .span5= f.input :person, :as => :combobox
5
- .span5= f.input :project, :as => :combobox
6
- .row-fluid
7
- .span5= f.input :date, :as => :date_field
8
- .span5= f.input :duration, :as => :string
1
+ = simple_form_for @activity do |f|
2
+ .row-fluid
3
+ .span6= f.input :person, :as => :combobox
4
+ .span6= f.input :project, :as => :combobox
5
+ .row-fluid
6
+ .span6= f.input :date, :as => :date_field
7
+ .span6= f.input :duration, :as => :string
9
8
 
10
- .row-fluid
11
- .span10= f.input :remarks, :input_html => {:rows => 2, :class => 'span10'}
9
+ .row-fluid
10
+ .span12= f.input :remarks, :input_html => {:rows => 2}
12
11
 
13
- = f.buttons do
14
- = f.commit_button
12
+ = f.button :submit
@@ -1,25 +1,22 @@
1
- = semantic_form_for :batch_activities, :url => batch_activities_path do |f|
2
- = f.inputs do
3
- = f.input :date, :as => :date_field, :label => t('attributes.date'), :input_html => {:value => @date}
1
+ = simple_form_for :batch_activities, :url => batch_activities_path do |f|
2
+ = f.input :date, :as => :date_field, :label => t('attributes.date'), :input_html => {:value => @date}
4
3
 
5
- = f.inputs do
6
- %table.table.table-striped.collection
7
- %thead
8
- %th= t_attr :person, Activity
9
- %th= t_attr :project, Activity
10
- %th{:style => 'width: 5em'}= t_attr :duration, Activity
11
- %th= t_attr :remarks, Activity
4
+ %table.table.table-striped.collection
5
+ %thead
6
+ %th= t_attr :person, Activity
7
+ %th= t_attr :project, Activity
8
+ %th{:style => 'width: 5em'}= t_attr :duration, Activity
9
+ %th= t_attr :remarks, Activity
12
10
 
13
- %tbody
14
- - for activity in @activities
15
- %tr
16
- = fields_for 'activities[]', activity do |a|
17
- %td
18
- = link_to activity.person, activity.person
19
- = a.hidden_field :person_id
20
- %td= a.select :project_id, Project.all.map{|project| [project.to_s, project.id]}, {:prompt => t_select_prompt(Project)}
21
- %td= a.text_field :duration
22
- %td= a.text_field :remarks
11
+ %tbody
12
+ - for activity in @activities
13
+ %tr
14
+ = fields_for 'activities[]', activity do |a|
15
+ %td
16
+ = link_to activity.person, activity.person
17
+ = a.hidden_field :person_id
18
+ %td= a.select :project_id, Project.all.map{|project| [project.to_s, project.id]}, {:prompt => t_select_prompt(Project)}
19
+ %td= a.text_field :duration
20
+ %td= a.text_field :remarks
23
21
 
24
- = f.buttons do
25
- = f.commit_button
22
+ = f.button :submit
@@ -1,7 +1,7 @@
1
1
  - WorkDay.create_or_update_upto(@employee, Date.today.end_of_month)
2
2
 
3
3
  .row-fluid
4
- .span10
4
+ .span12
5
5
  = render 'timesheets/show', :work_days => @employee.work_days.where(:date => current_month_period(:time_sheet_period))
6
6
 
7
7
  - content_for :sidebar do
@@ -1,5 +1,3 @@
1
- = semantic_form_for @project_state do |f|
2
- = f.semantic_errors
1
+ = simple_form_for @project_state do |f|
3
2
  = f.inputs :name
4
- = f.buttons do
5
- = f.commit_button
3
+ = f.button :submit
@@ -1,17 +1,14 @@
1
- = semantic_form_for @project do |f|
2
- = f.semantic_errors
3
- = f.inputs do
4
- .row-fluid
5
- .span5
6
- = f.input :name, :input_html => {'data-autofocus' => 'true'}
7
- = f.input :duration_from, :as => :date_field
8
- = f.input :client, :as => :combobox
9
- .span5
10
- = f.input :project_state
11
- = f.input :duration_to, :as => :date_field
12
- .row-fluid
13
- .span10
14
- = f.input :remarks, :input_html => {:rows => 5, :class => 'span10'}
1
+ = simple_form_for @project do |f|
2
+ .row-fluid
3
+ .span6
4
+ = f.input :name, :input_html => {'data-autofocus' => 'true'}
5
+ = f.input :duration_from, :as => :date_field
6
+ = f.input :client, :as => :combobox
7
+ .span6
8
+ = f.input :project_state
9
+ = f.input :duration_to, :as => :date_field
10
+ .row-fluid
11
+ .span12
12
+ = f.input :remarks, :input_html => {:rows => 5}
15
13
 
16
- = f.buttons do
17
- = f.commit_button
14
+ = f.button :submit
@@ -1,3 +1,3 @@
1
1
  module BookytPos
2
- VERSION = '0.19.19'
2
+ VERSION = '0.19.20'
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: 117
4
+ hash: 123
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 19
9
- - 19
10
- version: 0.19.19
9
+ - 20
10
+ version: 0.19.20
11
11
  platform: ruby
12
12
  authors:
13
13
  - Roman Simecek (CyT)