mozcode
/
stoptime
1
0
Fork 0
Code Issues 25 Pull Requests Releases Wiki Activity

Merge branch 'release/1.17.1'

This commit is contained in:
Paul van Tilburg 2018-10-15 19:58:48 +02:00
parent f04956cdcb c5f6808e6b
commit 9d48c1ac6b
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CHANGELOG.rdoc
View File

@ -1,5 +1,24 @@
= Stop… Camping Time! release news
== 1.17.1
Bugfixes:
* Fix the number/currency input to allow for all values ≥ 0.00
== 1.17.0
Features:
* Add support for choosing what date/time is used for new entries
* Some textual and style tweaks
Bugfixes:
* Fix crash when showing all entries in the timeline [#89c2a1]
Other bugfixes:
* Fix check that determines if last company info is used
== 1.16.1
Features:

14
stoptime.rb
View File

@ -55,7 +55,7 @@ end
module StopTime
# The version of the application
VERSION = '1.17.0'
VERSION = '1.17.1'
puts "Starting Stop… Camping Time! version #{VERSION}"
# @return [Hash{String=>Object}] The parsed configuration.
@ -1097,7 +1097,7 @@ module StopTime::Controllers
return render :customer_form
end
end
redirect R(Customers)
redirect R(CustomersN, customer_id)
end
end # class StopTime::Controllers::CustomersN
@ -2161,9 +2161,11 @@ module StopTime::Views
control_class: "col-sm-3 col-xs-4")
_form_input_with_label("Financial contact", "financial_contact", :text,
control_class: "col-sm-6 col-xs-8")
_form_input_with_label("Default hourly rate", "hourly_rate", :text,
_form_input_with_label("Default hourly rate", "hourly_rate", :number,
control_class: "col-sm-4 col-xs-5",
input_addon: "€ / h")
input_addon: "€ / h",
min: "0.00",
step: "0.01")
div.form_group do
label.control_label.col_sm_3.col_xs_4 "Time specifications?"
div.col_sm_6.col_xs_8 do
@ -2339,7 +2341,7 @@ module StopTime::Views
_form_input_radio("type", "hourly_rate", true)
text!("Hourly rate: ")
div.input_group do
_form_input("hourly_rate", :number, "Hourly rate")
_form_input("hourly_rate", :number, "Hourly rate", min: "0.00", step: "0.01")
span.input_group_addon "€ / h"
end
end
@ -2349,7 +2351,7 @@ module StopTime::Views
_form_input_radio("type", "fixed_cost")
text!("Fixed cost: ")
div.input_group do
_form_input("fixed_cost", :number, "Fixed cost")
_form_input("fixed_cost", :number, "Fixed cost", min: "0.00", step: "0.01")
span.input_group_addon "€"
end
end