Commit graph

401 commits

Author SHA1 Message Date
45a110db23
Add price range on location view 2020-02-29 21:56:04 +01:00
f2112ec26d
Restore form field location
Ugh, how did that happen
2020-02-29 20:04:14 +01:00
13097b8156
Remove GitHub buttons script include
It has no purpose and is bad for privacy.
2020-02-29 17:39:28 +01:00
04a1f0acb1
Rename from .min.css to .css
This file is not minified, so the .min.css is wrong.
Also remove the executable flag from some non-executable files.
2020-02-29 17:38:25 +01:00
b44d34003d
Make whitespace match convention
Convention according to our EditorConfig.
2020-02-29 17:37:33 +01:00
172d5d1e08
Fix dish change detection once and for all 2020-02-29 15:40:14 +01:00
aa331b6843
Fix error when anonymous name has accidentally been allowed to be None 2020-02-28 13:43:39 +01:00
bba3a0cd3a
Fix bug in ordering 2020-02-27 11:21:16 +01:00
d9685b00d9
Fix stats view
Toss unused FatDish model.
2020-02-26 21:33:41 +01:00
729dab2ba4
Fix anonymous ordering and dish change 2020-02-26 21:25:51 +01:00
e15b085006
Add message about options appearing on submit 2020-02-26 20:16:50 +01:00
ccb034ef7f
Fix bug on anonymous order view
Change to temporary message
2020-02-26 18:10:09 +01:00
2892a7dc25
Add no_text options 2020-02-25 19:09:28 +01:00
646858aac3
Populate HLDS data version field 2020-02-25 17:51:53 +01:00
a62e2bd9f7
Remove admin view 2020-02-25 17:51:14 +01:00
38e10257d2
Drop product ID migration
Actually really really a lot of work and almost no benefit.
2020-02-25 16:29:43 +01:00
e54a89e12c
Change telephone to phone 2020-02-24 21:04:57 +01:00
0bfcf658db
Allow multiple spaces after attribute in location header 2020-02-24 18:33:59 +01:00
2b962e99d4
Eliminate excessive whitespace in options
These would show when editing the option by pressing backspace
2020-02-24 14:33:43 +01:00
6495184af2
Fix appearance of multiselect 2020-02-24 14:32:11 +01:00
b8ac141310
Fix mistake in dish change detection
When the form is submitted, the URL has no dish parameter any more.
To fix this, add a hidden form field to say which dish the form was for.
2020-02-24 14:20:36 +01:00
94d4a403cb
Fix price of common choices being inflated 2020-02-24 00:58:35 +01:00
13560b04cd
Take into account price of options 2020-02-24 00:42:24 +01:00
1025ade758
Fix validation and saving for multi_choice, add price range 2020-02-24 00:31:14 +01:00
513e495665
Add own logic and form elements
Bypass WTForms and use manually written <select> and all that.
2020-02-23 23:31:11 +01:00
f900c85931
Add form for choices, submitting fails 2020-02-21 18:38:30 +01:00
91e76c2b45
Improve location view 2020-02-18 19:33:52 +01:00
04fb06d187
Use order.location_name instead of order.location.name 2020-01-27 22:59:07 +01:00
85f36a8fe4
Remove crippling downgrade code 2020-01-27 22:03:15 +01:00
5049382bf1
Add proxy script: python modules are annoying 2020-01-27 19:36:27 +01:00
2db02b9326
Parse incorrect attributes but semantic error 2020-01-27 19:15:24 +01:00
6768a35808
Improve spacing on "ordered items" page 2020-01-27 05:32:59 +01:00
0e779e59b9
Use order.is_closed() 2020-01-27 03:52:29 +01:00
aa63023383
Improve order items page and other stuff 2020-01-27 03:46:05 +01:00
8ed38f178c
Fix and improve "ordered items" page 2020-01-27 03:01:49 +01:00
6f24b52855
Make creating order and adding items work 2020-01-27 02:33:55 +01:00
161a5031e5
Update location views 2020-01-27 00:57:51 +01:00
3380d790bc
Store attributes directly on model instead of in map 2020-01-27 00:48:26 +01:00
b7cc2048d6
Forbid tags and price on choice blocks 2020-01-27 00:26:51 +01:00
fb9b0d7960
Rename "base" to "dish" 2020-01-26 23:51:29 +01:00
b1d0c3e004
Finish working migration! 2020-01-26 23:40:43 +01:00
40170046c5
Make order_item.price nullable
There are some order items in the DB where product = NULL so price
cannot be defined for them.
2020-01-26 21:03:14 +01:00
7e476c39dc
Drop migration of "paid" to non-nullable
The DB contains NULLs here, and I'll just leave them be.
2020-01-26 19:48:31 +01:00
285d4223e2
Update migration README 2020-01-26 19:39:35 +01:00
4b99eff7c8
Put migration table in migration to avoid import troubles 2020-01-26 19:39:21 +01:00
2313f0bcb5
Write migration -- don't run, not tested 2020-01-26 18:53:14 +01:00
ecaff42ba4
Generate migration -- do not run in production
This is the migration that was automatically generated. If you run this
version, historical data WILL be corrupted beyond repair.
2020-01-26 16:32:37 +01:00
6d7baa31ea
Final fixes before generating migration 2020-01-26 16:25:59 +01:00
d5bb14d3a5
Update views with HLDS models
Not expected to work yet, but if I don't do this generating migrations
gives errors.
2020-01-26 16:14:23 +01:00
238c841239
Add location's attributes in Location.str 2020-01-26 15:40:04 +01:00
9494886965
Fix error in grammar that made some comments illegal
The comment in this location header should be supported, but wasn't:

=============================================
fitchen: Fitchen
	osm https://www.openstreetmap.org/node/3394542496
	# Menu: https://www.fitchen.be/wp-content/uploads/2019/12/FITCHEN_gids_02122019_3web.pdf
=============================================
2020-01-26 15:30:32 +01:00
a346220896
Adjust str() of HLDS models to deal with int price 2020-01-26 15:13:48 +01:00
fe593fece6
Add typing in HLDS code, change price to int 2020-01-26 15:09:22 +01:00
798e08d74b
Remove removed concepts in admin, add choice item 2020-01-26 14:37:39 +01:00
9588116ba7
Fix data model before generating migration 2020-01-26 03:04:37 +01:00
e46d5e622e
Fix references to removed concepts
This will probably not work but it's a start and it was needed to get
the DB migrations running
2020-01-26 02:52:45 +01:00
ecb0550fdd
Update models 2020-01-26 02:39:58 +01:00
d564808417
Correct misspelled "courrier" to "courier" 2020-01-26 02:28:20 +01:00
f2c6ad9c89
Remove old, database-based models 2020-01-26 02:13:02 +01:00
996444e1b0
Make choice type available in dish, make tostring idempotent 2020-01-26 02:09:53 +01:00
22aa5a0fb0
Fix issues reported by pylint
And silence the self-use warning: Tatsu requires it this way
2020-01-26 01:50:30 +01:00
5fcac5f937
Add choices to dishes in semantic actions 2020-01-26 01:41:18 +01:00
1d9e7cc170
Refactor loader to parser, remove hlds from app.py 2020-01-26 01:33:08 +01:00
37e3799985
Add semantic actions to create models, add str for models 2020-01-26 01:31:04 +01:00
edb1677523
Refactor HLDS to avoid loading files always 2020-01-26 00:04:29 +01:00
1bfbbfde6d
Update database schema description 2020-01-25 22:16:08 +01:00
b459dbc9b7
Start models 2020-01-25 01:33:23 +01:00
303349e376
Load HLDS locations in app 2020-01-24 15:47:29 +01:00
e6b707e3d7
Make main file executable 2020-01-24 15:38:03 +01:00
ca264b90e1
Force parsed result to be list 2020-01-24 15:16:01 +01:00
f62b105abd
HLDS: simplify data structure slightly 2020-01-24 14:47:53 +01:00
a3af7476c7
Fix strange parsing error 2020-01-24 00:26:53 +01:00
894f9f0016
Merge branch 'master' into hlds 2020-01-22 20:40:28 +01:00
Jan-Pieter Baert
3f3a6a3212
Add documentation to css related functions 2019-12-22 19:46:35 +01:00
Jan-Pieter Baert
d6f0019232
Small fixes
Remove print statements and use format strings instead of "+"
2019-12-17 23:44:15 +01:00
Pieter-Jan Cassiman
98c57b161e Added css_list to render_template for profile page 2019-12-17 22:28:36 +01:00
Pieter-Jan Cassiman
285c36f0cf Updated css_list function to return a list instead of a json 2019-12-17 22:26:48 +01:00
Pieter-Jan Cassiman
7ac0d6291e Fixed css function to deal with default [customTheme] cookie 2019-12-17 22:25:59 +01:00
Pieter-Jan Cassiman
4ad70992f5 Added select for choosing custom themes 2019-12-17 22:24:29 +01:00
Pieter-Jan Cassiman
1657cec1d1 Added JS for dealing with setting the custom theme 2019-12-17 22:23:48 +01:00
Jan-Pieter Baert
b8c15e5cf3
Add css misc functions
A function to list all possible themes and a list to load the css from
the cookie
2019-12-17 19:53:34 +01:00
redfast00
7d6b9a2755
Merge pull request #166 from ZeusWPI/fix-about
Update the about page to the about text from github
2019-12-07 11:46:04 +01:00
redfast00
2d0e405fb2
Fix typo 2019-12-07 09:49:02 +01:00
Jan-Pieter Baert
3cfa56609f
Update the about page to the about text from github 2019-12-06 16:26:23 +01:00
Jan-Pieter Baert
528da7d777
Remove todo which is done 2019-12-06 16:22:57 +01:00
Jan-Pieter Baert
ababb85402
Make custom theme code a bit cleaner 2019-12-06 16:12:05 +01:00
Jan-Pieter Baert
a81055b574
Remove useless 'str(...)' usage 2019-12-06 15:34:39 +01:00
kindtanton
9a44ca3df0 Used correct width for order 2019-12-06 15:10:35 +01:00
kindtanton
40e4bf4fba Changed the way of concatinating strings in app.py 2019-12-06 12:48:37 +01:00
kindtanton
ee627b7dfa Plausible fix for internal server error when requesting the css 2019-12-06 12:32:51 +01:00
kindtanton
79c6195d42 merged 2019-12-05 21:10:45 +01:00
kindtanton
d34369df11 merged + added scss cache to gitignore 2019-12-05 20:38:07 +01:00
kindtanton
c5f82afc6a Created css for 'kerstmis' 2019-12-05 19:39:35 +01:00
Pieter-Jan Cassiman
a71f7434d1 Updated code to deal with dates that wrap around the new year 2019-12-05 19:19:36 +01:00
Pieter-Jan Cassiman
15f8f6c5d9 Updated theme dates 2019-12-05 19:19:03 +01:00
0d7b43705b
Remove seeds for legacy tables 2019-12-01 21:05:19 +01:00
ca199f4a3b
Add first version of the HLDS parser 2019-12-01 02:35:03 +01:00
kindtanton
c0936d5a45 Fix font-family variable
There was 1 quotation mark to much at the end of the font-family variable
which was causing some browsers to fall back to the default font face
-which was not the default font face of haldis.
2019-11-22 17:47:15 +01:00
Pieter-Jan Cassiman
204e1945da Added functionality to automatically choose the relevant seasonal theme 2019-11-22 12:22:25 +01:00
Pieter-Jan Cassiman
0b88c9b660 Added file for storing and parsing all themes 2019-11-22 12:21:46 +01:00