jlusiardi
90639a757d
Merge branch 'development' into issue_5_more_consumable_material
2016-06-26 08:27:14 +02:00
jlusiardi
820063837d
Merge branch 'issue_4_add_cost_field' into development
2016-06-26 08:26:33 +02:00
jlusiardi
f2623cf6e9
bugfix for creating first pitstop of a vehicle
2016-06-26 08:25:53 +02:00
jlusiardi
1072142a1b
adds consumables to database
...
this adds a new consumables entity to the database and
the possibility in the admin page to add these.
2016-06-26 08:19:28 +02:00
jlusiardi
56757f29a1
Merge branch 'issue_3_last_stop_editable' into 'development'
...
Issue 3 last stop editable
See merge request !15
2016-06-24 07:17:00 +02:00
jlusiardi
9d41c39ae7
adds edit feature for last pitstop
...
Adds the possibility to edit the last pitstop in a dedicated
form.
2016-06-24 07:15:24 +02:00
jlusiardi
6f7716abc6
adds delete feature for last pitstop
...
Adds the possibility to delete the latest pitstop after a
confirmation page.
2016-06-22 22:48:27 +02:00
jlusiardi
6d26ceeae8
Merge branch 'issue_4_add_cost_field' into 'development'
...
adds tracking of costs
This commit adds a new field to each pitstop for tracking of
costs.
This includes:
* a new DB column
* a new field in the create pitstop form
* a new column in the pitstop overview
* new stats values related to costs
* 2 new graphs
See merge request !14
2016-06-22 21:01:46 +02:00
jlusiardi
5b69a82e05
adds tracking of costs
...
This commit adds a new field to each pitstop for tracking of
costs.
This includes:
* a new DB column
* a new field in the create pitstop form
* a new column in the pitstop overview
* new stats values related to costs
* 2 new graphs
2016-06-21 21:06:41 +02:00
jlusiardi
f82cf425fd
Merge branch 'development' into 'master'
...
Merge preparation for Cathrine
See merge request !13
2016-05-28 20:47:26 +02:00
jlusiardi
936fbf30f6
worked on tests
2016-05-28 18:59:23 +02:00
jlusiardi
7696fb870c
Merge branch 'docker_compose' into 'development'
...
Docker compose
See merge request !12
2016-05-28 17:13:22 +02:00
jlusiardi
3f8f30f5d1
improved tests
...
test code waits for selenium to be available
screenshots get named more precisely
2016-05-27 11:33:15 +02:00
jlusiardi
cc414092a3
Adds first steps towards auto tests
2016-05-27 03:24:44 +02:00
jlusiardi
63ff5845e2
added demo config
2016-05-26 13:54:51 +02:00
jlusiardi
10494a03a9
first version for docker-compose
2016-05-26 12:08:24 +02:00
jlusiardi
2176579baa
Merge branch 'implement_delete_account' into 'development'
...
Implement delete account
See merge request !11
2016-05-25 09:41:15 +02:00
jlusiardi
da7c40c78b
Merge branch 'index_page' into implement_delete_account
2016-05-25 09:40:20 +02:00
jlusiardi
00579eb542
Merge branch 'index_page' into implement_delete_account
2016-05-24 23:56:12 +02:00
jlusiardi
ef55b4e479
First step
2016-05-24 23:55:58 +02:00
jlusiardi
a6c5abfd88
Merge branch 'index_page' into 'development'
...
Index page
See merge request !10
2016-05-24 07:02:33 +02:00
jlusiardi
293ff50809
Some more UI changes
2016-05-24 06:49:39 +02:00
jlusiardi
873a28aa28
ui redesign
2016-05-22 11:47:46 +02:00
jlusiardi
1c4d73da43
Adds start page for unauthed visitors
2016-05-18 08:19:11 +02:00
jlusiardi
7eef2b6cee
Adds start page for unauthed visitors
2016-05-18 08:17:53 +02:00
jlusiardi
227dc79e6b
Merge branch 'issue_1' into 'development'
...
Handle vehicle name uniqueness
Vehicle names now must be only unique per owner, not globally.
Also errors are displayed to the forms on creation and edit of
vehicles.
See merge request !9
2016-05-16 18:49:39 +02:00
jlusiardi
19b1e3b7ae
Handle vehicle name uniqueness
...
Vehicle names now must be only unique per owner, not globally.
Also errors are displayed to the forms on creation and edit of
vehicles.
2016-05-16 18:46:24 +02:00
jlusiardi
c5305caf36
switched to configurable db
2016-05-05 15:06:29 +02:00
jlusiardi
e1e5fe7725
Little Improvements
...
Help text for create pitstops form
More precise error messages for create pitstops form
Fixed bu in statistics page when only one pitstop was present
2016-05-03 22:21:57 +02:00
jlusiardi
471f1415d9
Removed print
2016-05-02 08:03:24 +02:00
jlusiardi
99df28a015
Merge branch 'add_charts' into 'master'
...
Add charts
See merge request !8
2016-05-02 08:02:33 +02:00
jlusiardi
6b861903af
add consumption chart
2016-05-02 07:59:31 +02:00
jlusiardi
706f30e2e2
switched off drop representation
2016-05-02 07:59:14 +02:00
Joachim Lusiardi
cc7d2620e8
Worked on charts
2016-05-02 06:42:43 +02:00
jlusiardi
161cc16498
continued work ok charts
2016-04-30 06:41:59 +02:00
jlusiardi
ef976299dc
Fix PEP8 error
2016-04-28 22:33:14 +02:00
jlusiardi
60293d6a27
Demo Chart
2016-04-28 07:53:53 +02:00
jlusiardi
1e5b63d068
Merge branch 'add_app_step_log' into 'master'
...
fixed variable name
See merge request !7
2016-04-28 07:11:10 +02:00
jlusiardi
13a5b07df2
fixed variable name
2016-04-28 07:10:44 +02:00
jlusiardi
662e5b5b63
Merge branch 'add_app_step_log' into 'master'
...
Add app step log
See merge request !6
2016-04-28 06:44:46 +02:00
jlusiardi
fd206de263
add logging for performed db operations
2016-04-28 06:32:51 +02:00
jlusiardi
e936f1c60f
fixed typos in readme
2016-04-27 21:41:47 +02:00
jlusiardi
a7df0aebee
Merge branch 'add_vehicles' into 'master'
...
Add vehicles
See merge request !5
2016-04-27 07:24:59 +02:00
jlusiardi
3e2d62b28f
improved design of the form elements
2016-04-27 07:23:28 +02:00
jlusiardi
ca7166f731
fixed stats
2016-04-25 22:28:35 +02:00
jlusiardi
34905921d9
fixes display of last pitstops
...
the display of the last pitstops now is separated by vehicle.
2016-04-25 07:23:01 +02:00
jlusiardi
038e255b56
can add pitstops to vehicles nows
2016-04-24 14:09:41 +02:00
jlusiardi
3709eddabb
prevents the deletion of vehicles of other users
2016-04-24 12:42:07 +02:00
jlusiardi
c941e1bccf
finished modules merge
2016-04-23 23:24:25 +02:00
jlusiardi
7bc5422687
Merge branch 'create_modules' into add_vehicles
...
Conflicts:
app/main.py
2016-04-23 23:22:44 +02:00
jlusiardi
Joachim Lusiardi