bebccf0a36
Merge branch 'issue_7_really_delete_pitstop_page_does_not_show_all_information' into 'development'
...
Fix issue with missing information on pitstop delete page
See merge request !21
2016-07-21 19:14:45 +02:00
89ebab29c4
Merge branch 'issue_6_pitstop_is_not_editable' into 'development'
...
Fixed the edit function
See merge request !20
2016-07-21 19:14:21 +02:00
a4ecae4700
Fix issue with missing information on pitstop delete page
2016-07-21 19:11:32 +02:00
88f88591a9
Fixed the edit function
2016-07-21 19:03:04 +02:00
fd685c316d
Update README.md
2016-07-17 10:06:19 +02:00
112ed38dbd
fixed SQL Error with MySQL 5.7.12
2016-07-17 10:03:56 +02:00
2f737c1715
fixed DB URL
2016-07-17 10:02:41 +02:00
5a447763d0
Merge branch 'development' into 'master'
...
Merge branch 'development' into 'master'
Merge preparation for Danielle
This adds the following features:
* Add accounting for additional consumable materials (#5 )
* Add cost field to pit stop (#4 )
* Make last pit stop editable / deletable (#3 )
See merge request !19
2016-07-17 09:40:54 +02:00
cfb9dfabc0
Merge branch 'issue_5_more_consumable_material' into development
...
Conflicts:
app/__init__.py
2016-07-17 09:22:38 +02:00
c0f6ef7b4f
Merge branch 'pycharm' into 'development'
...
Fixed project structure for pycharm
See merge request !16
2016-07-17 08:10:04 +02:00
fdb8993ac3
Merge branch 'issue_5_more_consumable_material' into pycharm
...
Conflicts:
app/__init__.py
app/rollerverbrauch/templates/createPitStopForm.html
app/rollerverbrauch/templates/newPitStopForm.html
app/rollerverbrauch/templates/selectVehice.html
app/rollerverbrauch/templates/selectVehicle.html
app/templates/newPitStopForm.html
app/templates/selectVehice.html
2016-07-16 19:29:25 +02:00
1f5cb6b1fa
Fixed issue with status on non-logged in index page
2016-07-16 13:29:32 +02:00
2a524ffdbf
Merge branch 'issue_5_more_consumable_material' into 'development'
...
Issue 5 more consumable material
See merge request !17
2016-07-16 12:12:43 +02:00
1516ac2c51
db update script and some fixes
2016-07-16 12:07:01 +02:00
aa9fda93c0
statistics 3rd
2016-07-11 22:15:23 +02:00
ca5bd9bb02
statistics 2nd step
2016-07-11 06:59:34 +02:00
4ea42a7efd
first step for statistics
2016-07-10 13:40:49 +02:00
43e3f9c98b
.
2016-07-04 20:19:59 +02:00
738bcb9f89
Fixed project structure for pycharm
2016-07-03 19:29:30 +02:00
af5d4ae6b3
cann add pitstops for selected vehicles / consumables
2016-06-29 22:50:01 +02:00
907d0435d1
consumables for vehicles can be edited
2016-06-28 23:33:24 +02:00
fe4236eead
renamed template for create a pitstop
2016-06-28 21:35:04 +02:00
a0be122186
reworked the crud funtions for vehicles
2016-06-27 22:09:42 +02:00
fa4126be66
adds update & delete for consumables
...
adds functionality to
* update
* delete
for consumables
2016-06-27 21:35:00 +02:00
60f2e9f4e4
adds form to create a consumable
2016-06-27 20:08:49 +02:00
5e24b9779e
makes the name of a consumable unique
...
makes the column unique and extends the create form to respect the
uniqueness.
2016-06-27 19:48:04 +02:00
90639a757d
Merge branch 'development' into issue_5_more_consumable_material
2016-06-26 08:27:14 +02:00
820063837d
Merge branch 'issue_4_add_cost_field' into development
2016-06-26 08:26:33 +02:00
f2623cf6e9
bugfix for creating first pitstop of a vehicle
2016-06-26 08:25:53 +02:00
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
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
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
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
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
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
f82cf425fd
Merge branch 'development' into 'master'
...
Merge preparation for Cathrine
See merge request !13
2016-05-28 20:47:26 +02:00
7696fb870c
Merge branch 'docker_compose' into 'development'
...
Docker compose
See merge request !12
2016-05-28 17:13:22 +02:00
63ff5845e2
added demo config
2016-05-26 13:54:51 +02:00
10494a03a9
first version for docker-compose
2016-05-26 12:08:24 +02:00
2176579baa
Merge branch 'implement_delete_account' into 'development'
...
Implement delete account
See merge request !11
2016-05-25 09:41:15 +02:00
da7c40c78b
Merge branch 'index_page' into implement_delete_account
2016-05-25 09:40:20 +02:00
00579eb542
Merge branch 'index_page' into implement_delete_account
2016-05-24 23:56:12 +02:00
ef55b4e479
First step
2016-05-24 23:55:58 +02:00
a6c5abfd88
Merge branch 'index_page' into 'development'
...
Index page
See merge request !10
2016-05-24 07:02:33 +02:00
293ff50809
Some more UI changes
2016-05-24 06:49:39 +02:00
873a28aa28
ui redesign
2016-05-22 11:47:46 +02:00
1c4d73da43
Adds start page for unauthed visitors
2016-05-18 08:19:11 +02:00
7eef2b6cee
Adds start page for unauthed visitors
2016-05-18 08:17:53 +02:00
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
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
