-
-
Notifications
You must be signed in to change notification settings - Fork 547
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Change manager_settings table to include a "moved" column - Calculate the tonnage moved in set.py - Work in progress
- Loading branch information
Showing
24 changed files
with
262 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,16 @@ | ||
# Proposed Changes | ||
|
||
- | ||
- | ||
- | ||
- Change manager_settings table to include a "moved" column | ||
- Calculate the tonnage moved in set.py | ||
- Work in progress | ||
|
||
## Please check that the PR fulfills these requirements | ||
|
||
- [ ] Tests for the changes have been added (for bug fixes / features) | ||
- [ ] Added yourself to AUTHORS.rst | ||
- [x] Tests for the changes have been added (for bug fixes / features) | ||
- [x] Added yourself to AUTHORS.rst | ||
|
||
### Other questions | ||
|
||
* Do users need to run some commmands in their local instances due to this PR | ||
(e.g. database migration)? | ||
yes. Run make migrations, there are database contributions. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
WGER NOTES | ||
|
||
Dynamic Measurements: | ||
|
||
When you call the front page, these are the APIs you hit | ||
"GET /api/v2/meal/?plan=1 HTTP/1.1" 200 52 | ||
"GET /api/v2/nutritiondiary/?plan=1&limit=999 HTTP/1.1" 200 311 | ||
"GET /api/v2/setting-repetitionunit/ HTTP/1.1" 200 245 | ||
"GET /api/v2/setting-weightunit/ HTTP/1.1" 200 219 | ||
|
||
When you enter the bmi calculator screen: | ||
Therefore, no APIS get called (super interesting, maybe we should add height to the database?) | ||
If height is added to the database, then we can access it later to make it part of the measurement | ||
"GET /en/nutrition/calculator/bmi/ HTTP/1.1" 200 31265 | ||
"GET /nutrition/calculator/bmi/chart-data HTTP/1.1" 302 0 | ||
"GET /en/nutrition/calculator/bmi/chart-data HTTP/1.1" 200 1031 | ||
"POST /en/nutrition/calculator/bmi/calculate HTTP/1.1" 200 53 | ||
|
||
Line 192 in urls.py has the weight-entry | ||
we should run a "heightentry" as well to get height | ||
|
||
We should also maybe look at adding height as a one time thing | ||
|
||
|
||
|
||
Encrypting Inputs: |
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -145,6 +145,7 @@ class Meta: | |
'rir', | ||
'order', | ||
'comment', | ||
'moved', | ||
] | ||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# Generated by Django 4.2.6 on 2024-04-19 18:47 | ||
|
||
import django.core.validators | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0017_alter_workoutlog_exercise_base'), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name='setting', | ||
name='moved', | ||
field=models.DecimalField(blank=True, decimal_places=2, max_digits=6, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1500)], verbose_name='Weight-Moved'), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# Generated by Django 4.2.6 on 2024-04-20 04:42 | ||
|
||
import django.core.validators | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0018_setting_moved'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='setting', | ||
name='moved', | ||
field=models.DecimalField(decimal_places=2, default=0.0, max_digits=6, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1500)], verbose_name='Weight-Moved'), | ||
preserve_default=False, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# Generated by Django 4.2.6 on 2024-04-20 05:12 | ||
|
||
import django.core.validators | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0019_alter_setting_moved'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='setting', | ||
name='moved', | ||
field=models.DecimalField(blank=True, decimal_places=2, max_digits=6, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1500)], verbose_name='Weight-Moved'), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# Generated by Django 4.2.6 on 2024-04-20 05:14 | ||
|
||
import django.core.validators | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0020_alter_setting_moved'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='setting', | ||
name='moved', | ||
field=models.DecimalField(decimal_places=2, max_digits=6, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1500)], verbose_name='Weight-Moved'), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# Generated by Django 4.2.6 on 2024-04-20 16:23 | ||
|
||
import django.core.validators | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0021_alter_setting_moved'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='setting', | ||
name='moved', | ||
field=models.DecimalField(blank=True, decimal_places=2, max_digits=6, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1500)], verbose_name='Weight-Moved'), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# Generated by Django 4.2.6 on 2024-04-20 16:25 | ||
|
||
import django.core.validators | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0022_alter_setting_moved'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='setting', | ||
name='moved', | ||
field=models.DecimalField(decimal_places=2, default=1, max_digits=6, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1500)], verbose_name='Weight-Moved'), | ||
preserve_default=False, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# Generated by Django 4.2.6 on 2024-04-20 16:26 | ||
|
||
import django.core.validators | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0023_alter_setting_moved'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='setting', | ||
name='moved', | ||
field=models.DecimalField(blank=True, decimal_places=2, max_digits=6, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1500)], verbose_name='Weight-Moved'), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# Generated by Django 4.2.6 on 2024-04-20 16:45 | ||
|
||
import django.core.validators | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('manager', '0024_alter_setting_moved'), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name='workoutlog', | ||
name='moved', | ||
field=models.DecimalField(blank=True, decimal_places=2, max_digits=6, null=True, validators=[django.core.validators.MinValueValidator(0)], verbose_name='Weight-Moved'), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Oops, something went wrong.