44b92e58b5
use config variable to identify admin account while it is created
2016-08-03 08:13:39 +02:00
48d7c108f1
Merge branch '9-creation-of-new-vehicle-fails' into 'development'
...
Resolve "Creation of new vehicle fails"
Closes #9
See merge request !25
2016-07-29 21:12:30 +02:00
7129e676e2
Fixed issue 9
2016-07-29 21:10:58 +02:00
92fb25c1c1
fix issue 8
2016-07-25 18:54:27 +02:00
c815c2b09a
Merge branch 'style_consumable_selection' into 'development'
...
Style consumable selection
See merge request !22
2016-07-23 13:14:05 +02:00
529f9a6c64
Fixed problem with preselected values
2016-07-23 13:09:38 +02:00
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
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
473c2a4f5b
Slight style improvement
2016-07-18 21:30:06 +02:00
cfb9dfabc0
Merge branch 'issue_5_more_consumable_material' into development
...
Conflicts:
app/__init__.py
2016-07-17 09:22:38 +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
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
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
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
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
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
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
c5305caf36
switched to configurable db
2016-05-05 15:06:29 +02:00
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
471f1415d9
Removed print
2016-05-02 08:03:24 +02:00
6b861903af
add consumption chart
2016-05-02 07:59:31 +02:00
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
161cc16498
continued work ok charts
2016-04-30 06:41:59 +02:00
ef976299dc
Fix PEP8 error
2016-04-28 22:33:14 +02:00
60293d6a27
Demo Chart
2016-04-28 07:53:53 +02:00
13a5b07df2
fixed variable name
2016-04-28 07:10:44 +02:00
fd206de263
add logging for performed db operations
2016-04-28 06:32:51 +02:00
3e2d62b28f
improved design of the form elements
2016-04-27 07:23:28 +02:00
ca7166f731
fixed stats
2016-04-25 22:28:35 +02:00
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
038e255b56
can add pitstops to vehicles nows
2016-04-24 14:09:41 +02:00
3709eddabb
prevents the deletion of vehicles of other users
2016-04-24 12:42:07 +02:00
c941e1bccf
finished modules merge
2016-04-23 23:24:25 +02:00
7bc5422687
Merge branch 'create_modules' into add_vehicles
...
Conflicts:
app/main.py
2016-04-23 23:22:44 +02:00
0d8ae0cd18
introduces modules
2016-04-23 23:08:39 +02:00
267c59cbb3
adds create and delete vehicle
2016-04-23 17:11:43 +02:00
d19b0a5858
adds edit vehicle name
2016-04-23 11:20:39 +02:00
729fee51e9
Merge branch 'user_handling' into add_vehicles
...
Conflicts:
app/main.py
2016-04-21 21:52:58 +02:00
0303be7945
more user handling features of flask-security activated
...
Now users can recover their passwords and change them while
logged in.
2016-04-21 08:11:57 +02:00
01798e9548
adds admin page
...
admin users must have role admin (which must currently be set
manually via database)
2016-04-19 22:41:40 +02:00
9eb7ec7c8a
switched to environment variable for config file lookup
2016-04-19 21:09:15 +02:00
344db8d998
add example config file
2016-04-19 08:19:31 +02:00
1240a3c64b
Users are allowed to register now
...
This includes sending a welcome email.
2016-04-19 07:39:17 +02:00
baca41619d
first iteration of vehicles
2016-04-19 06:47:10 +02:00
2e0fc3b772
Merge branch 'master' into user_handling
...
Conflicts:
app/main.py
app/requirements.txt
2016-04-18 21:43:01 +02:00
4c97bd86db
Fixed date vs datetime
2016-04-18 20:58:20 +02:00
1998fcb7d8
Merge branch 'master' into wtforms
...
Conflicts:
app/main.py
2016-04-18 20:34:39 +02:00
01019c22d9
add switch for debugger
2016-04-18 08:13:27 +02:00
864b7822ac
Changed to WTForms including validation
2016-04-18 07:25:40 +02:00
6f218e591f
add render_field macro to layout.html
2016-04-17 15:06:54 +02:00
8c8803874e
First step for WTForms
2016-04-17 12:50:31 +02:00
6ed4110ce9
logout only if logged in
2016-04-17 09:59:34 +02:00
a9b2781ae3
custom login form added
2016-04-17 09:34:11 +02:00
f6f1d960b7
Add logout button to menu
2016-04-17 09:05:59 +02:00
bbfa7b9341
First step towards flask security user handling
2016-04-17 08:59:11 +02:00
fc421558b0
switched to Flask-SQLAlchemy for db handling
2016-04-16 15:48:24 +02:00
fb521194f7
Reduce services feature and reformatting
2016-04-14 07:32:06 +02:00
a12d5f541b
Add authentication for pre-existing users.
2015-08-03 22:24:55 +02:00
eb77d03ea3
App now runs on empty DB.
2015-08-02 22:45:03 +02:00
joachim lusiardi
56bf707e3b
next try with icons
2015-03-22 13:31:03 +01:00
joachim lusiardi
6b4a3ab48a
added active class to show which tab is active in services overview
2015-03-22 13:02:55 +01:00
joachim lusiardi
6daae927f9
tuned apple icon
2015-03-22 11:02:59 +01:00
joachim lusiardi
915dc01fc3
second try for apple icons
2015-03-22 10:54:33 +01:00
root
5b03dd6ad0
added icon for apple
...
added tabbing for services
2015-03-22 10:07:15 +01:00
joachim lusiardi
895736eaf1
splitted services
2015-03-20 21:18:49 +01:00
joachim lusiardi
d6807857cb
fixed typo
2015-03-18 21:33:56 +01:00
joachim lusiardi
5edfbb9e9b
added manual
2015-03-17 20:57:38 +01:00
joachim lusiardi
0418476d67
added initial values for service
2015-03-16 22:47:28 +01:00
joachim lusiardi
73b2ccc195
started working on services
2015-03-16 22:06:59 +01:00
joachim lusiardi
e479bc24ac
added services tab
...
fixed input field to accept tenth of litres
2015-03-15 07:28:34 +01:00
joachim lusiardi
9b767ec1ea
little design work
2015-03-13 22:40:27 +01:00
joachim lusiardi
2f6f6fd7c8
minor changes
2015-03-12 08:02:17 +01:00
joachim lusiardi
e933473d07
changed inputs to number
2015-03-09 20:57:02 +01:00
joachim lusiardi
140bb3a3d6
added checks for new pit stop form
2015-03-09 20:11:03 +01:00
joachim lusiardi
47921e1941
added checks for new pit stop form
2015-03-09 20:06:17 +01:00
