Commit Graph

56 Commits

Author SHA1 Message Date
Roland Geider
82255c951e Small improvements to OFF import script 2021-11-25 20:30:52 +01:00
Roland Geider
1326abdc0a Improve instructions on how to use the filter-fixtures.py script 2021-01-09 11:36:47 +01:00
Roland Geider
8ae404de8c Move variations and base data to separate exercise json fixture 2021-01-05 13:32:26 +01:00
Roland Geider
88c214b22b Fix linting error 2020-12-20 15:01:45 +01:00
Roland Geider
621ae62181 Add steps on how to update fixtures 2020-12-20 14:55:45 +01:00
Roland Geider
9eef161842 Cleanup installation 2020-12-20 14:40:09 +01:00
Roland Geider
5f4c31a3cb Cleanup installation 2020-12-20 14:03:02 +01:00
Roland Geider
63caf299e1 Cleanup 2020-12-20 13:54:01 +01:00
Roland Geider
0f14def553 Fix linting errors 2020-12-19 20:01:37 +01:00
Roland Geider
b39b0cfc2d Use a dictionary for the languages, seem cleaner 2020-12-19 19:58:39 +01:00
Roland Geider
79b0472f4c Use bulk inserts when possible 2020-12-19 19:48:16 +01:00
Roland Geider
3898b6b086 Set the license for the ingredients 2020-12-19 18:21:15 +01:00
Roland Geider
35788d0a60 Use authentication when creating the mongo database 2020-12-19 14:58:54 +01:00
Roland Geider
2007a0419c Check name similarity with other ingredients
Also, move the contents of the shell script to a readme. I feel this is safer
for such a process.
2020-12-18 20:07:24 +01:00
Roland Geider
ee0a476846 Extend script to update or create products 2020-12-18 16:18:16 +01:00
Roland Geider
f740f84b6f Skip products with no name 2020-12-16 12:01:31 +01:00
Roland Geider
8aa966f1f5 Change path so that it finds the default settings.py file 2020-12-16 12:00:22 +01:00
nikithamurikinati
6fc7cb0cf1 added error handling and fixed bugs 2020-12-14 15:32:16 -05:00
nikithamurikinati
521da6add8 fixed linter errors 2020-12-14 13:11:56 -05:00
nikithamurikinati
69c60b5363 Added status to ingredient creation 2020-12-14 09:46:42 -05:00
nikithamurikinati
a6073d1990 Completed import open food facts script 2020-12-13 17:18:29 -05:00
nikithamurikinati
4bde5ac210 Exercis 2020-12-12 21:24:42 -05:00
Harlene Samra
35e2d2d738 Starting work on OpenFoodFacts import 2020-12-12 16:38:49 -05:00
Roland Geider
b7b3543653 Filter out submitted entries that are not accepted 2020-11-16 21:21:23 +01:00
Roland Geider
351deb9c35 Move filter to correct group 2020-08-30 18:47:50 +02:00
Roland Geider
cff54bc888 Merge branch 'master' into nutrition-diary
# Conflicts:
#	wger/core/templates/index.html
#	wger/core/templates/misc/fragments/shariff_modal.html
#	wger/nutrition/api/views.py
#	wger/nutrition/models.py
#	wger/nutrition/templates/mobile/plan/view.html
#	wger/nutrition/templates/plan/view.html
#	wger/nutrition/urls.py
2020-08-24 23:47:10 +02:00
Roland Geider
7ebdb0b4f0 noqa all the files to be skipped
Github's super linter seems to call each file individually. So instead of
flake --config foo . it does flake --config foo /path/to/file1.py and this
ignores the exclude values in the config.
2020-08-09 23:17:32 +02:00
Roland Geider
6a8655d77c Replace single triple quotes
This is consistent with PEP8 and wasn't done before due to a duty
to consistency
2020-07-22 23:00:14 +02:00
Roland Geider
405bfd694e Merge branch 'master' into nutrition-diary
Conflicts:
    wger/nutrition/templates/plan/view.html
2016-07-16 14:14:26 +02:00
Roland Geider
b18faf36bd Add Norwegian translation
Fixes #304
2016-07-11 23:14:38 +02:00
Roland Geider
6e8206036a Only write the JSON file if there are any entries 2016-05-16 10:38:30 +02:00
Roland Geider
d3824556df Rename SettingUnit to RepetitionUnit
The unit doesn't refer to the whole setting entry, but only to the "repetition"
(which is itself just one of the units).
2016-03-03 20:31:27 +01:00
Roland Geider
4457edb9db Start working on units for settings
This will allow to specify not only 3 x 10 repetitions but e.g. also
5 minutes or 10 kilometers

See #216 and #134
2016-01-07 22:20:25 +01:00
Roland Geider
eb1f1d984c Add views to add contracts to users 2015-10-04 00:00:58 +02:00
Roland Geider
c80e08a510 Remove unneeded files
All the functionality has been moved to the new invoke based commands
2015-09-14 20:08:12 +02:00
Roland Geider
5aeeff600d Add user document to fixture filter helper 2014-11-06 22:36:31 +01:00
Roland Geider
f26a6be485 Allow trainers to add notes to users 2014-10-27 20:12:36 +01:00
Roland Geider
f7ec157b95 Remove wrongly commited test file 2014-10-22 22:08:31 +02:00
Roland Geider
1735dbcbf4 Create configuration table for gym members
This model works like GymAdminConfig, except that only regular members have
an entry.
2014-10-22 22:06:16 +02:00
Roland Geider
9e5e4ef177 Add edit views for gym admin configurations 2014-10-20 00:37:09 +02:00
Roland Geider
4643e01b38 Add configuration table for individual gyms
This allows to set different configuration options on a per-gym basis.
Additionally there are per-user configuration options. At the moment only
the inactivity of members can be set.
2014-10-08 22:19:07 +02:00
Roland Geider
9df3a89f07 Move gym views and models to own app
While this is not really necessary right now, this makes the app a bit more
future proof, if later on more models and views are added
2014-10-07 21:49:08 +02:00
Roland Geider
7ad796adc4 Fix group permission fixture 2014-10-03 21:19:20 +02:00
Roland Geider
96086de8bb Allow gym administrators to delete users 2014-10-03 09:53:42 +02:00
Roland Geider
c375518df1 Commit missing fixture for global gym configuration 2014-09-27 10:20:03 +02:00
Roland Geider
17fca8e0a5 Add system wide gym configuration options
At the moment this only allows the administrator to set a default
gym for the installation.
2014-08-11 20:24:34 +02:00
Roland Geider
dc3abf1b1d Add support for gym management 2014-07-13 19:48:16 +02:00
Roland Geider
b13711d822 New License model to use for exercises, ingredients, etc.
Also add necessary views to manage the licenses and update or add tests.
2014-02-18 14:50:30 +01:00
Roland Geider
de5af37db8 Add support for equipment needed for exercises 2013-11-02 11:01:31 +01:00
Roland Geider
c47bef41e4 Merge 2013-11-01 19:16:14 +01:00