jlusiardi/rollerverbrauch
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 12 Wiki Activity
163 Commits 9 Branches 13 Tags
bceb9181ee09505805ca1681c8f4c3b23eb55b39
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jlusiardi bceb9181ee sorting for events 2016-11-01 19:48:24 +01:00
jlusiardi 086c643365 fixed shadowing warning 2016-11-01 19:48:08 +01:00
jlusiardi d8c6a0a59b splitted routes into package 2016-11-01 18:01:52 +01:00
jlusiardi 43d9fc412e moved forms to extra package 2016-11-01 16:36:28 +01:00
jlusiardi 71412bf487 integrate services into rollerverbrauch 2016-11-01 11:19:26 +01:00
jlusiardi dd11419305 add the crud forms for services 2016-11-01 11:18:40 +01:00
jlusiardi d132dc72de Add Entitiy for the Service Object 2016-11-01 11:17:54 +01:00
jlusiardi 43fa41aace Add input type TextAreaField 
adds a possibility to add longer texts in the style of
rollerverbrauch
 2016-11-01 11:16:13 +01:00
jlusiardi b8a6f69090 add gitattributes to handle line ending settings and expose ports on docker compose 2016-08-28 15:45:08 +02:00
jlusiardi bb7c2780e8 Merge branch '11_Redirect_to_edit_vehicle_page_if_no_consumable_is_configured' into 'development' 
11 redirect to edit vehicle page if no consumable is configured



See merge request !28
 2016-08-28 14:01:37 +02:00
jlusiardi 088d1f24a0 add redirect if vehicle is not configured and flash messages 2016-08-16 13:21:54 +02:00
jlusiardi 87b3b02f3e add sqlite files to gitignore 2016-08-07 13:19:26 +02:00
jlusiardi c8a9404bf6 fixed use of os.environ 2016-08-07 13:18:39 +02:00
jlusiardi 4acf36112c add ids to pitstop elements 2016-08-07 13:18:04 +02:00
jlusiardi 4b73699750 Added ids to important elements 2016-08-06 10:59:20 +02:00
jlusiardi d393f19b47 Fixed wrong text 2016-08-06 10:59:03 +02:00
jlusiardi 44b92e58b5 use config variable to identify admin account while it is created 2016-08-03 08:13:39 +02:00
jlusiardi 1e7db29de9 add config variable to identify admin account while it is created 2016-08-03 08:12:06 +02:00
jlusiardi 938a7fc140 Removed dependency to mysql for testing 2016-08-03 08:09:58 +02:00
jlusiardi 49a45ba8a4 Merge branch 'development' into 'selenium_tests' 
Sync Development to selenium tests



See merge request !27
 2016-07-30 09:23:14 +02:00
jlusiardi 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
jlusiardi 7129e676e2 Fixed issue 9 2016-07-29 21:10:58 +02:00
jlusiardi aaa94f08fa Merge branch 'issue_8_wrong_date_on_creating_new_pitstop' into 'development' 
fix issue 8



See merge request !24
 2016-07-29 21:02:43 +02:00
jlusiardi 92fb25c1c1 fix issue 8 2016-07-25 18:54:27 +02:00
jlusiardi 5fa710149d Merge branch 'development' into 'master' 
Merge preparation for Esther



See merge request !23
 2016-07-24 11:26:34 +02:00
jlusiardi c815c2b09a Merge branch 'style_consumable_selection' into 'development' 
Style consumable selection



See merge request !22
 2016-07-23 13:14:05 +02:00
jlusiardi 529f9a6c64 Fixed problem with preselected values 2016-07-23 13:09:38 +02:00
jlusiardi 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
jlusiardi 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
jlusiardi a4ecae4700 Fix issue with missing information on pitstop delete page 2016-07-21 19:11:32 +02:00
jlusiardi 88f88591a9 Fixed the edit function 2016-07-21 19:03:04 +02:00
jlusiardi 473c2a4f5b Slight style improvement 2016-07-18 21:30:06 +02:00
jlusiardi bcc0541be3 Merge branch 'development' into selenium_tests 2016-07-17 10:09:01 +02:00
jlusiardi fd685c316d Update README.md 2016-07-17 10:06:19 +02:00
jlusiardi 112ed38dbd fixed SQL Error with MySQL 5.7.12 2016-07-17 10:03:56 +02:00
jlusiardi 2f737c1715 fixed DB URL 2016-07-17 10:02:41 +02:00
jlusiardi 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
jlusiardi cfb9dfabc0 Merge branch 'issue_5_more_consumable_material' into development 
Conflicts:
	app/__init__.py
 2016-07-17 09:22:38 +02:00
jlusiardi c0f6ef7b4f Merge branch 'pycharm' into 'development' 
Fixed project structure for pycharm



See merge request !16
 2016-07-17 08:10:04 +02:00
jlusiardi 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
jlusiardi 1f5cb6b1fa Fixed issue with status on non-logged in index page 2016-07-16 13:29:32 +02:00
jlusiardi 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
jlusiardi 1516ac2c51 db update script and some fixes 2016-07-16 12:07:01 +02:00
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 738bcb9f89 Fixed project structure for pycharm 2016-07-03 19:29:30 +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 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
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