jlusiardi/rollerverbrauch
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 12 Wiki Activity
115 Commits 9 Branches 13 Tags
aa9fda93c0eb8f506167cfc6307282366013ad04
Commit Graph
91 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jlusiardi aa9fda93c0 statistics 3rd 2016-07-11 22:15:23 +02:00
jlusiardi ca5bd9bb02 statistics 2nd step 2016-07-11 06:59:34 +02:00
jlusiardi 4ea42a7efd first step for statistics 2016-07-10 13:40:49 +02:00
jlusiardi 43e3f9c98b . 2016-07-04 20:19:59 +02:00
jlusiardi af5d4ae6b3 cann add pitstops for selected vehicles / consumables 2016-06-29 22:50:01 +02:00
jlusiardi 907d0435d1 consumables for vehicles can be edited 2016-06-28 23:33:24 +02:00
jlusiardi fe4236eead renamed template for create a pitstop 2016-06-28 21:35:04 +02:00
jlusiardi a0be122186 reworked the crud funtions for vehicles 2016-06-27 22:09:42 +02:00
jlusiardi fa4126be66 adds update & delete for consumables 
adds functionality to
* update
* delete
for consumables
 2016-06-27 21:35:00 +02:00
jlusiardi 60f2e9f4e4 adds form to create a consumable 2016-06-27 20:08:49 +02:00
jlusiardi 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
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 7696fb870c Merge branch 'docker_compose' into 'development' 
Docker compose



See merge request !12
 2016-05-28 17:13:22 +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
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 0d8ae0cd18 introduces modules 2016-04-23 23:08:39 +02:00
jlusiardi 3ec2e4648d Merge branch 'user_handling' into 'master' 
User handling



See merge request !4
 2016-04-23 17:35:10 +02:00
jlusiardi 267c59cbb3 adds create and delete vehicle 2016-04-23 17:11:43 +02:00
jlusiardi d19b0a5858 adds edit vehicle name 2016-04-23 11:20:39 +02:00
jlusiardi 729fee51e9 Merge branch 'user_handling' into add_vehicles 
Conflicts:
	app/main.py
 2016-04-21 21:52:58 +02:00
jlusiardi 4261a9bb0b reworked git ignore file 2016-04-21 08:12:12 +02:00
jlusiardi 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
jlusiardi 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
jlusiardi 9eb7ec7c8a switched to environment variable for config file lookup 2016-04-19 21:09:15 +02:00
jlusiardi 344db8d998 add example config file 2016-04-19 08:19:31 +02:00
jlusiardi 1240a3c64b Users are allowed to register now 
This includes sending a welcome email.
 2016-04-19 07:39:17 +02:00
jlusiardi baca41619d first iteration of vehicles 2016-04-19 06:47:10 +02:00
jlusiardi 2e0fc3b772 Merge branch 'master' into user_handling 
Conflicts:
	app/main.py
	app/requirements.txt
 2016-04-18 21:43:01 +02:00
jlusiardi 1d449cb0ab Merge branch 'master' of code.nerd2nerd.org:n0ob/rollerverbrauch 2016-04-18 21:01:31 +02:00
jlusiardi 4c97bd86db Fixed date vs datetime 2016-04-18 20:58:20 +02:00
jlusiardi 8057c59329 Merge branch 'wtforms' into 'master' 
Wtforms



See merge request !3
 2016-04-18 20:35:58 +02:00
jlusiardi 1998fcb7d8 Merge branch 'master' into wtforms 
Conflicts:
	app/main.py
 2016-04-18 20:34:39 +02:00
jlusiardi 01019c22d9 add switch for debugger 2016-04-18 08:13:27 +02:00
jlusiardi 864b7822ac Changed to WTForms including validation 2016-04-18 07:25:40 +02:00
jlusiardi 6f218e591f add render_field macro to layout.html 2016-04-17 15:06:54 +02:00
jlusiardi 8c8803874e First step for WTForms 2016-04-17 12:50:31 +02:00
jlusiardi 6ed4110ce9 logout only if logged in 2016-04-17 09:59:34 +02:00
jlusiardi a9b2781ae3 custom login form added 2016-04-17 09:34:11 +02:00
jlusiardi f6f1d960b7 Add logout button to menu 2016-04-17 09:05:59 +02:00
jlusiardi bbfa7b9341 First step towards flask security user handling 2016-04-17 08:59:11 +02:00
jlusiardi 808e0d80d3 Merge branch 'introduce_sqlalchemy' into 'master' 
switched to Flask-SQLAlchemy for db handling



See merge request !2
 2016-04-16 15:57:56 +02:00
jlusiardi fc421558b0 switched to Flask-SQLAlchemy for db handling 2016-04-16 15:48:24 +02:00
jlusiardi c1adf69ca0 Merge branch 'reduce_features' into 'master' 
Reduce features



See merge request !1
 2016-04-14 19:54:40 +02:00
jlusiardi 059c86b449 add .gitignore file 2016-04-14 19:53:49 +02:00
jlusiardi fb521194f7 Reduce services feature and reformatting 2016-04-14 07:32:06 +02:00
jlusiardi ef02cc8ab3 Add basic build and run information 2016-04-14 07:02:28 +02:00
jlusiardi 8f99b798bb reworked docker file for faster build times 2016-04-13 08:30:13 +02:00
jlusiardi a12d5f541b Add authentication for pre-existing users. 2015-08-03 22:24:55 +02:00
jlusiardi eb77d03ea3 App now runs on empty DB. 2015-08-02 22:45:03 +02:00
jlusiardi 6f194deac5 Add EXPOSE information 2015-08-02 22:43:58 +02:00