Compare commits
No commits in common. "development" and "master" have entirely different histories.
developmen
...
master
|
|
@ -1,32 +1,11 @@
|
|||
# Ignore bundler config
|
||||
/.bundle
|
||||
|
||||
# Ignore bundler installation
|
||||
/vendor/bundle
|
||||
|
||||
# Ignore SASS and YARD cache
|
||||
.sass-cache
|
||||
.yardoc
|
||||
|
||||
# Ignore the local configuration
|
||||
config.yaml
|
||||
htpasswd
|
||||
|
||||
# Ignore the SQLite databases
|
||||
db/*
|
||||
|
||||
# Ignore generated documentation
|
||||
doc/*
|
||||
|
||||
# Ignore generated invoice assets
|
||||
public/invoices/*
|
||||
|
||||
# Ignore compiled asssets
|
||||
public/stylesheets/style.css
|
||||
public/stylesheets/style.css.map
|
||||
|
||||
# Ignore custom invoice templates
|
||||
templates/*_invoice.tex.erb
|
||||
|
||||
# Ignore temporary files
|
||||
tmp/*
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
2.5.1
|
||||
18
Gemfile
18
Gemfile
|
|
@ -1,18 +0,0 @@
|
|||
source "http://rubygems.org"
|
||||
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
|
||||
|
||||
|
||||
# This application is build on Camping, use it from our own Git master
|
||||
gem "camping", github: "paulvt/camping", branch: "master"
|
||||
|
||||
# Use ActionView for the templates.
|
||||
gem "actionview", "~> 4.2.10"
|
||||
|
||||
# Use ActiveRecord as the ORM.
|
||||
gem "activerecord", "~> 4.2.10"
|
||||
|
||||
# Use SASS for handling CSS assets/Bootstrap.
|
||||
gem "sass", "~> 3.4.6"
|
||||
|
||||
# Use SQLite as the database.
|
||||
gem "sqlite3", "~> 1.3.9"
|
||||
74
Gemfile.lock
74
Gemfile.lock
|
|
@ -1,74 +0,0 @@
|
|||
GIT
|
||||
remote: https://github.com/paulvt/camping.git
|
||||
revision: e6834563b244e0f24af2034d679cd6e8e9d932c0
|
||||
branch: master
|
||||
specs:
|
||||
camping (2.1.602)
|
||||
mab (>= 0.0.3)
|
||||
rack (>= 1.0)
|
||||
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
actionview (4.2.11.3)
|
||||
activesupport (= 4.2.11.3)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
activemodel (4.2.11.3)
|
||||
activesupport (= 4.2.11.3)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.11.3)
|
||||
activemodel (= 4.2.11.3)
|
||||
activesupport (= 4.2.11.3)
|
||||
arel (~> 6.0)
|
||||
activesupport (4.2.11.3)
|
||||
i18n (~> 0.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
arel (6.0.4)
|
||||
builder (3.2.4)
|
||||
concurrent-ruby (1.1.9)
|
||||
crass (1.0.6)
|
||||
erubis (2.7.0)
|
||||
i18n (0.9.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
loofah (2.12.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mab (0.0.3)
|
||||
mini_portile2 (2.6.1)
|
||||
minitest (5.14.4)
|
||||
nokogiri (1.12.5)
|
||||
mini_portile2 (~> 2.6.1)
|
||||
racc (~> 1.4)
|
||||
racc (1.5.2)
|
||||
rack (2.2.3)
|
||||
rails-deprecated_sanitizer (1.0.4)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
rails-dom-testing (1.0.9)
|
||||
activesupport (>= 4.2.0, < 5.0)
|
||||
nokogiri (~> 1.6)
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-html-sanitizer (1.4.2)
|
||||
loofah (~> 2.3)
|
||||
sass (3.4.25)
|
||||
sqlite3 (1.3.13)
|
||||
thread_safe (0.3.6)
|
||||
tzinfo (1.2.9)
|
||||
thread_safe (~> 0.1)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
actionview (~> 4.2.10)
|
||||
activerecord (~> 4.2.10)
|
||||
camping!
|
||||
sass (~> 3.4.6)
|
||||
sqlite3 (~> 1.3.9)
|
||||
|
||||
BUNDLED WITH
|
||||
1.17.3
|
||||
|
|
@ -39,9 +39,6 @@ and the following LaTeX programs:
|
|||
* isodoc package (>= 1.00)
|
||||
* rubber
|
||||
|
||||
It is also possible to use Bundler (which is the default when using
|
||||
@config.ru@), in this you only need Ruby and Bundler installed.
|
||||
|
||||
== Installation
|
||||
|
||||
For now, Stop… Camping Time! is in a developing state and not ready for
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
#!/usr/bin/env rackup
|
||||
|
||||
require "bundler/setup"
|
||||
require "./stoptime"
|
||||
|
||||
StopTime::Models::Base.establish_connection(adapter: "sqlite3",
|
||||
database: "db/stoptime.db",
|
||||
timeout: 10000)
|
||||
StopTime::Models::Base.establish_connection( :adapter => 'sqlite3',
|
||||
:database => 'db/stoptime.db',
|
||||
:timeout => 10000 )
|
||||
StopTime.create
|
||||
run StopTime
|
||||
|
|
|
|||
14
stoptime.rb
14
stoptime.rb
|
|
@ -2319,16 +2319,14 @@ module StopTime::Views
|
|||
end if @task.billed?
|
||||
div.row do
|
||||
div.col_md_6.col_xs_12 do
|
||||
form.form_horizontal.form_condensed action: R(*@target),
|
||||
method: :post do
|
||||
form.form_horizontal.form_condensed action: R(*@target), method: :post do
|
||||
div.form_group do
|
||||
label.control_label.col_sm_3.col_xs_4 "Customer", for: "customer"
|
||||
div.col_sm_4.col_xs_8 do
|
||||
_form_select("customer", @customer_list)
|
||||
end
|
||||
div.col_sm_offset_2.col_sm_3.hidden_xs do
|
||||
a.btn.btn_default role: "button",
|
||||
href: R(CustomersN, @customer.id) do
|
||||
a.btn.btn_default role: "button", href: R(CustomersN, @customer.id) do
|
||||
_icon("user")
|
||||
span "Show customer"
|
||||
end
|
||||
|
|
@ -2343,8 +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",
|
||||
min: "0.00", step: "0.01")
|
||||
_form_input("hourly_rate", :number, "Hourly rate", min: "0.00", step: "0.01")
|
||||
span.input_group_addon "€ / h"
|
||||
end
|
||||
end
|
||||
|
|
@ -2354,8 +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",
|
||||
min: "0.00", step: "0.01")
|
||||
_form_input("fixed_cost", :number, "Fixed cost", min: "0.00", step: "0.01")
|
||||
span.input_group_addon "€"
|
||||
end
|
||||
end
|
||||
|
|
@ -2759,7 +2755,7 @@ module StopTime::Views
|
|||
button.btn.btn_primary "Create invoice", type: :submit,
|
||||
name: "create", value: "Create invoice",
|
||||
disabled: @none_found
|
||||
button.btn.btn_default "Cancel", type: :submit, name: "cancel",
|
||||
button.btn.btn_default "Cancel", type: :submit, name: "cancel",
|
||||
value: "Cancel"
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* CSS file for Stop... Camping Time! */
|
||||
/* CSS file for Stop… Camping Time! */
|
||||
|
||||
/* Main elements */
|
||||
html
|
||||
|
|
|
|||
Loading…
Reference in New Issue