Self hosted FLOSS fitness/workout, nutrition and weight tracker
Clean up whitespace in fixture data
Scott Peshakcc9169327a65
diff --git a/wger/config/fixtures/gym_config.json b/wger/config/fixtures/gym_config.jsonindex d24002e11..1db921206 100644--- a/wger/config/fixtures/gym_config.json+++ b/wger/config/fixtures/gym_config.json@@ -1,9 +1,9 @@[{- "pk": 1,- "model": "config.gymconfig",+ "pk": 1,+ "model": "config.gymconfig","fields": {"default_gym": null}}-]\ No newline at end of file+]diff --git a/wger/config/fixtures/language_config.json b/wger/config/fixtures/language_config.jsonindex 52378c546..06f36d001 100644--- a/wger/config/fixtures/language_config.json+++ b/wger/config/fixtures/language_config.json@@ -2879,4 +2879,4 @@"language_target": 12}}-]\ No newline at end of file+]diff --git a/wger/core/fixtures/days_of_week.json b/wger/core/fixtures/days_of_week.jsonindex 2b48aadcf..cf032ad61 100644--- a/wger/core/fixtures/days_of_week.json+++ b/wger/core/fixtures/days_of_week.json@@ -1,51 +1,51 @@[{- "pk": 1,- "model": "core.daysofweek",+ "pk": 1,+ "model": "core.daysofweek","fields": {"day_of_week": "Monday"}- },+ },{- "pk": 2,- "model": "core.daysofweek",+ "pk": 2,+ "model": "core.daysofweek","fields": {"day_of_week": "Tuesday"}- },+ },{- "pk": 3,- "model": "core.daysofweek",+ "pk": 3,+ "model": "core.daysofweek","fields": {"day_of_week": "Wednesday"}- },+ },{- "pk": 4,- "model": "core.daysofweek",+ "pk": 4,+ "model": "core.daysofweek","fields": {"day_of_week": "Thursday"}- },+ },{- "pk": 5,- "model": "core.daysofweek",+ "pk": 5,+ "model": "core.daysofweek","fields": {"day_of_week": "Friday"}- },+ },{- "pk": 6,- "model": "core.daysofweek",+ "pk": 6,+ "model": "core.daysofweek","fields": {"day_of_week": "Saturday"}- },+ },{- "pk": 7,- "model": "core.daysofweek",+ "pk": 7,+ "model": "core.daysofweek","fields": {"day_of_week": "Sunday"}}-]\ No newline at end of file+]diff --git a/wger/core/fixtures/groups.json b/wger/core/fixtures/groups.jsonindex 3e5f119f4..179517e04 100644--- a/wger/core/fixtures/groups.json+++ b/wger/core/fixtures/groups.json@@ -562,4 +562,4 @@"model": "auth.group","pk": 6}-]\ No newline at end of file+]diff --git a/wger/core/fixtures/languages.json b/wger/core/fixtures/languages.jsonindex 8a39d8ce5..1f0d2c1ac 100644--- a/wger/core/fixtures/languages.json+++ b/wger/core/fixtures/languages.json@@ -95,4 +95,4 @@"full_name": "Fran\u00e7ais"}}-]\ No newline at end of file+]diff --git a/wger/core/fixtures/licenses.json b/wger/core/fixtures/licenses.jsonindex 46cf1f44c..8ee26d657 100644--- a/wger/core/fixtures/licenses.json+++ b/wger/core/fixtures/licenses.json@@ -1,37 +1,37 @@[{- "pk": 1,- "model": "core.license",+ "pk": 1,+ "model": "core.license","fields": {- "url": "https://creativecommons.org/licenses/by-sa/3.0/deed.en",- "full_name": " Creative Commons Attribution Share Alike 3",+ "url": "https://creativecommons.org/licenses/by-sa/3.0/deed.en",+ "full_name": " Creative Commons Attribution Share Alike 3","short_name": "CC-BY-SA 3"}- },+ },{- "pk": 2,- "model": "core.license",+ "pk": 2,+ "model": "core.license","fields": {- "url": "https://creativecommons.org/licenses/by-sa/4.0/deed.en",- "full_name": "Creative Commons Attribution Share Alike 4",+ "url": "https://creativecommons.org/licenses/by-sa/4.0/deed.en",+ "full_name": "Creative Commons Attribution Share Alike 4","short_name": "CC-BY-SA 4"}- },+ },{- "pk": 3,- "model": "core.license",+ "pk": 3,+ "model": "core.license","fields": {- "url": "http://creativecommons.org/publicdomain/zero/1.0/",- "full_name": "Creative Commons Public Domain 1.0",+ "url": "http://creativecommons.org/publicdomain/zero/1.0/",+ "full_name": "Creative Commons Public Domain 1.0","short_name": "CC0"}},{- "pk": 4,- "model": "core.license",+ "pk": 4,+ "model": "core.license","fields": {- "url": "http://creativecommons.org/licenses/by/4.0/",- "full_name": "Creative Commons Attribution 4",+ "url": "http://creativecommons.org/licenses/by/4.0/",+ "full_name": "Creative Commons Attribution 4","short_name": "CC-BY 4"}}diff --git a/wger/core/fixtures/test-licenses.json b/wger/core/fixtures/test-licenses.jsonindex 829b29456..64585042d 100644--- a/wger/core/fixtures/test-licenses.json+++ b/wger/core/fixtures/test-licenses.json@@ -1,19 +1,19 @@[{- "pk": 1,- "model": "core.license",+ "pk": 1,+ "model": "core.license","fields": {- "url": "",- "full_name": "A cool and free license - Germany",+ "url": "",+ "full_name": "A cool and free license - Germany","short_name": "ACAFL - DE"}- },+ },{- "pk": 2,- "model": "core.license",+ "pk": 2,+ "model": "core.license","fields": {- "url": "https://another-cool-license.org/acl-2.1",- "full_name": "Another cool license 2.1",+ "url": "https://another-cool-license.org/acl-2.1",+ "full_name": "Another cool license 2.1","short_name": "ACL 2.1"}}diff --git a/wger/core/fixtures/test-user-data.json b/wger/core/fixtures/test-user-data.jsonindex b0015289c..3992a7134 100644--- a/wger/core/fixtures/test-user-data.json+++ b/wger/core/fixtures/test-user-data.json@@ -1,59 +1,59 @@[{- "pk": 1,- "model": "auth.user",- "fields": {- "username": "admin",- "first_name": "",- "last_name": "",- "is_active": true,- "is_superuser": false,- "is_staff": true,- "last_login": "2012-09-25T21:18:00.042Z",+ "pk": 1,+ "model": "auth.user",+ "fields": {+ "username": "admin",+ "first_name": "",+ "last_name": "",+ "is_active": true,+ "is_superuser": false,+ "is_staff": true,+ "last_login": "2012-09-25T21:18:00.042Z","groups": [["admin"]],- "user_permissions": [],- "password": "pbkdf2_sha256$10000$dAmN8USC9lXU$G/N0SFsSO17Kjkc/f9p8t9cy2INDyGMPCYrsmvjjd4s=",- "email": "[email protected]",+ "user_permissions": [],+ "password": "pbkdf2_sha256$10000$dAmN8USC9lXU$G/N0SFsSO17Kjkc/f9p8t9cy2INDyGMPCYrsmvjjd4s=",+ "email": "[email protected]","date_joined": "2012-07-30T14:28:16.672Z"}- },- {- "pk": 2,- "model": "auth.user",- "fields": {- "username": "test",- "first_name": "",- "last_name": "",- "is_active": true,- "is_superuser": false,- "is_staff": false,- "last_login": "2012-09-26T19:11:44.246Z",- "groups": [],- "user_permissions": [],- "password": "pbkdf2_sha256$10000$o9VK8DZG89YU$p5ZodV5143uKZ+TxLPSpjmklCmF7UvXVwYiitoW+6VM=",- "email": "[email protected]",+ },+ {+ "pk": 2,+ "model": "auth.user",+ "fields": {+ "username": "test",+ "first_name": "",+ "last_name": "",+ "is_active": true,+ "is_superuser": false,+ "is_staff": false,+ "last_login": "2012-09-26T19:11:44.246Z",+ "groups": [],+ "user_permissions": [],+ "password": "pbkdf2_sha256$10000$o9VK8DZG89YU$p5ZodV5143uKZ+TxLPSpjmklCmF7UvXVwYiitoW+6VM=",+ "email": "[email protected]","date_joined": "2012-09-26T19:11:43.114Z"}},{- "pk": 3,- "model": "auth.user",+ "pk": 3,+ "model": "auth.user","fields": {- "username": "demo",- "first_name": "",- "last_name": "",- "is_active": true,- "is_superuser": false,- "is_staff": false,- "last_login": "2013-03-30T00:23:21.592Z",- "groups": [],- "user_permissions": [],+ "username": "demo",+ "first_name": "",+ "last_name": "",+ "is_active": true,+ "is_superuser": false,+ "is_staff": false,+ "last_login": "2013-03-30T00:23:21.592Z",+ "groups": [],+ "user_permissions": [],"password": "pbkdf2_sha256$10000$ncxgfFxHcKK3$oiXpDkxJ1ox765pRuMQh/s50yq7GUPayinBFb6ReeX4=",- "email": "",+ "email": "","date_joined": "2013-03-30T00:23:21.592Z"}},@@ -278,210 +278,210 @@}},{- "pk": 14,- "model": "auth.user",+ "pk": 14,+ "model": "auth.user","fields": {- "username": "member1",- "last_name": "",- "is_active": true,- "is_staff": false,- "groups": [],- "user_permissions": [],- "password": "pbkdf2_sha256$12000$tvRb4UoTTrNA$02ZacbgPTU9n3erervJjNJ6pPnYcT5WCdK8A7vKNsWQ=",- "date_joined": "2013-03-30T00:23:21.592Z",- "first_name": "",- "is_superuser": false,- "last_login": "2013-03-30T00:23:21.592Z",+ "username": "member1",+ "last_name": "",+ "is_active": true,+ "is_staff": false,+ "groups": [],+ "user_permissions": [],+ "password": "pbkdf2_sha256$12000$tvRb4UoTTrNA$02ZacbgPTU9n3erervJjNJ6pPnYcT5WCdK8A7vKNsWQ=",+ "date_joined": "2013-03-30T00:23:21.592Z",+ "first_name": "",+ "is_superuser": false,+ "last_login": "2013-03-30T00:23:21.592Z","email": "[email protected]"}- },- {- "pk": 15,- "model": "auth.user",- "fields": {- "username": "member2",- "last_name": "",- "is_active": true,- "is_staff": false,- "groups": [],- "user_permissions": [],- "password": "pbkdf2_sha256$12000$EmUrOsFPNqad$pVs/qtc6HTNBElh3JTML1t0pu0HrVCgInTRjH1kGR70=",- "date_joined": "2013-03-30T00:23:21.592Z",- "first_name": "",- "is_superuser": false,- "last_login": "2013-03-30T00:23:21.592Z",+ },+ {+ "pk": 15,+ "model": "auth.user",+ "fields": {+ "username": "member2",+ "last_name": "",+ "is_active": true,+ "is_staff": false,+ "groups": [],+ "user_permissions": [],+ "password": "pbkdf2_sha256$12000$EmUrOsFPNqad$pVs/qtc6HTNBElh3JTML1t0pu0HrVCgInTRjH1kGR70=",+ "date_joined": "2013-03-30T00:23:21.592Z",+ "first_name": "",+ "is_superuser": false,+ "last_login": "2013-03-30T00:23:21.592Z","email": "[email protected]"}- },- {- "pk": 16,- "model": "auth.user",- "fields": {- "username": "member3",- "last_name": "",- "is_active": true,- "is_staff": false,- "groups": [],- "user_permissions": [],- "password": "pbkdf2_sha256$12000$u2LgFL6ZAoRj$Ta4N0lDL0ITirzY+1X43Ovu0La/aRuIgbsB6/V3M2Cc=",- "date_joined": "2013-03-30T00:23:21.592Z",- "first_name": "",- "is_superuser": false,- "last_login": "2013-03-30T00:23:21.592Z",+ },+ {+ "pk": 16,+ "model": "auth.user",+ "fields": {+ "username": "member3",+ "last_name": "",+ "is_active": true,+ "is_staff": false,+ "groups": [],+ "user_permissions": [],+ "password": "pbkdf2_sha256$12000$u2LgFL6ZAoRj$Ta4N0lDL0ITirzY+1X43Ovu0La/aRuIgbsB6/V3M2Cc=",+ "date_joined": "2013-03-30T00:23:21.592Z",+ "first_name": "",+ "is_superuser": false,+ "last_login": "2013-03-30T00:23:21.592Z","email": "[email protected]"}- },- {- "pk": 17,- "model": "auth.user",- "fields": {- "username": "member4",- "last_name": "",- "is_active": true,- "is_staff": false,- "groups": [],- "user_permissions": [],- "password": "pbkdf2_sha256$12000$8UWUtO9ISbvS$03anO5xZwW5/9bfKnHvd59jXN7zjZ0feg3ZigNgql2c=",- "date_joined": "2013-03-30T00:23:21.592Z",- "first_name": "",- "is_superuser": false,- "last_login": "2013-03-30T00:23:21.592Z",+ },+ {+ "pk": 17,+ "model": "auth.user",+ "fields": {+ "username": "member4",+ "last_name": "",+ "is_active": true,+ "is_staff": false,+ "groups": [],+ "user_permissions": [],+ "password": "pbkdf2_sha256$12000$8UWUtO9ISbvS$03anO5xZwW5/9bfKnHvd59jXN7zjZ0feg3ZigNgql2c=",+ "date_joined": "2013-03-30T00:23:21.592Z",+ "first_name": "",+ "is_superuser": false,+ "last_login": "2013-03-30T00:23:21.592Z","email": "[email protected]"}- },- {- "pk": 18,- "model": "auth.user",- "fields": {- "username": "member5",- "last_name": "",- "is_active": true,- "is_staff": false,- "groups": [],- "user_permissions": [],- "password": "pbkdf2_sha256$12000$icmsz2q1iPt9$Hye1b2lb5aSfAh8qSJ0As3eQ859X+gPWRLMrg+RgBr8=",- "date_joined": "2013-03-30T00:23:21.592Z",- "first_name": "",- "is_superuser": false,- "last_login": "2013-03-30T00:23:21.592Z",+ },+ {+ "pk": 18,+ "model": "auth.user",+ "fields": {+ "username": "member5",+ "last_name": "",+ "is_active": true,+ "is_staff": false,+ "groups": [],+ "user_permissions": [],+ "password": "pbkdf2_sha256$12000$icmsz2q1iPt9$Hye1b2lb5aSfAh8qSJ0As3eQ859X+gPWRLMrg+RgBr8=",+ "date_joined": "2013-03-30T00:23:21.592Z",+ "first_name": "",+ "is_superuser": false,+ "last_login": "2013-03-30T00:23:21.592Z","email": "[email protected]"}- },- {- "pk": 19,- "model": "auth.user",- "fields": {- "username": "member6",- "last_name": "",- "is_active": true,- "is_staff": false,- "groups": [],- "user_permissions": [],- "password": "pbkdf2_sha256$12000$DrZmCJLgdwmB$EHjhx5Q0TGfQuEIONQ16ZS7y+68ZzRkfrT8+jO9PqtA=",- "date_joined": "2013-03-30T00:23:21.592Z",- "first_name": "",- "is_superuser": false,- "last_login": "2013-03-30T00:23:21.592Z",+ },+ {+ "pk": 19,+ "model": "auth.user",+ "fields": {+ "username": "member6",+ "last_name": "",+ "is_active": true,+ "is_staff": false,+ "groups": [],+ "user_permissions": [],+ "password": "pbkdf2_sha256$12000$DrZmCJLgdwmB$EHjhx5Q0TGfQuEIONQ16ZS7y+68ZzRkfrT8+jO9PqtA=",+ "date_joined": "2013-03-30T00:23:21.592Z",+ "first_name": "",+ "is_superuser": false,+ "last_login": "2013-03-30T00:23:21.592Z","email": "[email protected]"}- },- {- "pk": 20,- "model": "auth.user",- "fields": {- "username": "member7",- "last_name": "",- "is_active": true,- "is_staff": false,- "groups": [],- "user_permissions": [],- "password": "pbkdf2_sha256$12000$TmyjzRJywZvs$CixnTYFGK8/dcAARAQOJE6gIPDmDiI/r3MCE81WZRU4=",- "date_joined": "2013-03-30T00:23:21.592Z",- "first_name": "",- "is_superuser": false,- "last_login": "2013-03-30T00:23:21.592Z",+ },+ {+ "pk": 20,+ "model": "auth.user",+ "fields": {+ "username": "member7",+ "last_name": "",+ "is_active": true,+ "is_staff": false,+ "groups": [],+ "user_permissions": [],+ "password": "pbkdf2_sha256$12000$TmyjzRJywZvs$CixnTYFGK8/dcAARAQOJE6gIPDmDiI/r3MCE81WZRU4=",+ "date_joined": "2013-03-30T00:23:21.592Z",+ "first_name": "",+ "is_superuser": false,+ "last_login": "2013-03-30T00:23:21.592Z","email": "[email protected]"}- },- {- "pk": 21,- "model": "auth.user",- "fields": {- "username": "member8",- "last_name": "",- "is_active": true,- "is_staff": false,- "groups": [],- "user_permissions": [],- "password": "pbkdf2_sha256$12000$GSsralc7hddi$R0CFaVao8DDukttGl3rAgge/kcxFdOKGdl4c7koGIdU=",- "date_joined": "2013-03-30T00:23:21.592Z",- "first_name": "",- "is_superuser": false,- "last_login": "2013-03-30T00:23:21.592Z",+ },+ {+ "pk": 21,+ "model": "auth.user",+ "fields": {+ "username": "member8",+ "last_name": "",+ "is_active": true,+ "is_staff": false,+ "groups": [],+ "user_permissions": [],+ "password": "pbkdf2_sha256$12000$GSsralc7hddi$R0CFaVao8DDukttGl3rAgge/kcxFdOKGdl4c7koGIdU=",+ "date_joined": "2013-03-30T00:23:21.592Z",+ "first_name": "",+ "is_superuser": false,+ "last_login": "2013-03-30T00:23:21.592Z","email": "[email protected]"}- },- {- "pk": 22,- "model": "auth.user",- "fields": {- "username": "member9",- "last_name": "",- "is_active": true,- "is_staff": false,- "groups": [],- "user_permissions": [],- "password": "pbkdf2_sha256$12000$sJ5O9GgTuABf$PocdJ38fKz7F7MaP/mB5ruDbZs1FHPl6ANW8qmuvPtY=",- "date_joined": "2013-03-30T00:23:21.592Z",- "first_name": "",- "is_superuser": false,- "last_login": "2013-03-30T00:23:21.592Z",+ },+ {+ "pk": 22,+ "model": "auth.user",+ "fields": {+ "username": "member9",+ "last_name": "",+ "is_active": true,+ "is_staff": false,+ "groups": [],+ "user_permissions": [],+ "password": "pbkdf2_sha256$12000$sJ5O9GgTuABf$PocdJ38fKz7F7MaP/mB5ruDbZs1FHPl6ANW8qmuvPtY=",+ "date_joined": "2013-03-30T00:23:21.592Z",+ "first_name": "",+ "is_superuser": false,+ "last_login": "2013-03-30T00:23:21.592Z","email": "[email protected]"}- },- {- "pk": 23,- "model": "auth.user",- "fields": {- "username": "member10",- "last_name": "",- "is_active": true,- "is_staff": false,- "groups": [],- "user_permissions": [],- "password": "pbkdf2_sha256$12000$Tq889HV1Bfl6$NsSvfLamynFbcsvPth7TUNam7SMvUteDp4+T0fCJqDU=",- "date_joined": "2013-03-30T00:23:21.592Z",- "first_name": "",- "is_superuser": false,- "last_login": "2013-03-30T00:23:21.592Z",+ },+ {+ "pk": 23,+ "model": "auth.user",+ "fields": {+ "username": "member10",+ "last_name": "",+ "is_active": true,+ "is_staff": false,+ "groups": [],+ "user_permissions": [],+ "password": "pbkdf2_sha256$12000$Tq889HV1Bfl6$NsSvfLamynFbcsvPth7TUNam7SMvUteDp4+T0fCJqDU=",+ "date_joined": "2013-03-30T00:23:21.592Z",+ "first_name": "",+ "is_superuser": false,+ "last_login": "2013-03-30T00:23:21.592Z","email": "[email protected]"}- },- {- "pk": 24,- "model": "auth.user",- "fields": {- "username": "member11",- "last_name": "",- "is_active": true,- "is_staff": false,- "groups": [],- "user_permissions": [],- "password": "pbkdf2_sha256$12000$o3tY1figj6zP$Z/qOvtvxnGTj3QSxTQBskLNH4rNBKJqBdOQ/5/JKkdk=",- "date_joined": "2013-03-30T00:23:21.592Z",- "first_name": "",- "is_superuser": false,- "last_login": "2013-03-30T00:23:21.592Z",+ },+ {+ "pk": 24,+ "model": "auth.user",+ "fields": {+ "username": "member11",+ "last_name": "",+ "is_active": true,+ "is_staff": false,+ "groups": [],+ "user_permissions": [],+ "password": "pbkdf2_sha256$12000$o3tY1figj6zP$Z/qOvtvxnGTj3QSxTQBskLNH4rNBKJqBdOQ/5/JKkdk=",+ "date_joined": "2013-03-30T00:23:21.592Z",+ "first_name": "",+ "is_superuser": false,+ "last_login": "2013-03-30T00:23:21.592Z","email": "[email protected]"}},{- "pk": 1,+ "pk": 1,"model": "core.userprofile","fields": {- "is_temporary": false,- "show_comments": false,- "show_english_ingredients": false,+ "is_temporary": false,+ "show_comments": false,+ "show_english_ingredients": false,"user": 1,"gender": "1","age": 30,@@ -505,14 +505,14 @@"ro_access": true,"num_days_weight_reminder":0}- },+ },{- "pk": 2,+ "pk": 2,"model": "core.userprofile","fields": {- "is_temporary": false,- "show_comments": false,- "show_english_ingredients": false,+ "is_temporary": false,+ "show_comments": false,+ "show_english_ingredients": false,"user": 2,"gender": "1","age": 20,@@ -536,14 +536,14 @@"ro_access": false,"num_days_weight_reminder":3}- },+ },{- "pk": 3,+ "pk": 3,"model": "core.userprofile","fields": {- "is_temporary": true,- "show_comments": false,- "show_english_ingredients": false,+ "is_temporary": true,+ "show_comments": false,+ "show_english_ingredients": false,"user": 3,"gender": "2","age": 50,@@ -877,340 +877,340 @@}},{- "pk": 14,- "model": "core.userprofile",- "fields": {- "workout_reminder": 20,- "height": 180,- "show_english_ingredients": false,- "show_comments": false,- "workout_duration": 8,- "sleep_hours": 7,- "freetime_hours": 8,- "gym": 1,- "sport_intensity": "3",- "workout_reminder_active": false,- "work_intensity": "1",- "user": 14,- "timer_active": true,- "timer_pause": 90,- "work_hours": 8,- "freetime_intensity": "1",- "gender": "1",- "age": 30,- "notification_language": 1,- "calories": 3500,- "sport_hours": 6,+ "pk": 14,+ "model": "core.userprofile",+ "fields": {+ "workout_reminder": 20,+ "height": 180,+ "show_english_ingredients": false,+ "show_comments": false,+ "workout_duration": 8,+ "sleep_hours": 7,+ "freetime_hours": 8,+ "gym": 1,+ "sport_intensity": "3",+ "workout_reminder_active": false,+ "work_intensity": "1",+ "user": 14,+ "timer_active": true,+ "timer_pause": 90,+ "work_hours": 8,+ "freetime_intensity": "1",+ "gender": "1",+ "age": 30,+ "notification_language": 1,+ "calories": 3500,+ "sport_hours": 6,"is_temporary": false,"weight_unit": "kg","ro_access": false,"num_days_weight_reminder":0}- },- {- "pk": 15,- "model": "core.userprofile",- "fields": {- "workout_reminder": 20,- "height": 180,- "show_english_ingredients": false,- "show_comments": false,- "workout_duration": 8,- "sleep_hours": 7,- "freetime_hours": 8,- "gym": 1,- "sport_intensity": "3",- "workout_reminder_active": false,- "work_intensity": "1",- "user": 15,- "timer_active": true,- "timer_pause": 90,- "work_hours": 8,- "freetime_intensity": "1",- "gender": "1",- "age": 30,- "notification_language": 1,- "calories": 3500,- "sport_hours": 6,+ },+ {+ "pk": 15,+ "model": "core.userprofile",+ "fields": {+ "workout_reminder": 20,+ "height": 180,+ "show_english_ingredients": false,+ "show_comments": false,+ "workout_duration": 8,+ "sleep_hours": 7,+ "freetime_hours": 8,+ "gym": 1,+ "sport_intensity": "3",+ "workout_reminder_active": false,+ "work_intensity": "1",+ "user": 15,+ "timer_active": true,+ "timer_pause": 90,+ "work_hours": 8,+ "freetime_intensity": "1",+ "gender": "1",+ "age": 30,+ "notification_language": 1,+ "calories": 3500,+ "sport_hours": 6,"is_temporary": false,"weight_unit": "kg","ro_access": false,"num_days_weight_reminder":0}- },- {- "pk": 16,- "model": "core.userprofile",- "fields": {- "workout_reminder": 20,- "height": 180,- "show_english_ingredients": false,- "show_comments": false,- "workout_duration": 8,- "sleep_hours": 7,- "freetime_hours": 8,- "gym": 1,- "sport_intensity": "3",- "workout_reminder_active": false,- "work_intensity": "1",- "user": 16,- "timer_active": true,- "timer_pause": 90,- "work_hours": 8,- "freetime_intensity": "1",- "gender": "1",- "age": 30,- "notification_language": 1,- "calories": 3500,- "sport_hours": 6,+ },+ {+ "pk": 16,+ "model": "core.userprofile",+ "fields": {+ "workout_reminder": 20,+ "height": 180,+ "show_english_ingredients": false,+ "show_comments": false,+ "workout_duration": 8,+ "sleep_hours": 7,+ "freetime_hours": 8,+ "gym": 1,+ "sport_intensity": "3",+ "workout_reminder_active": false,+ "work_intensity": "1",+ "user": 16,+ "timer_active": true,+ "timer_pause": 90,+ "work_hours": 8,+ "freetime_intensity": "1",+ "gender": "1",+ "age": 30,+ "notification_language": 1,+ "calories": 3500,+ "sport_hours": 6,"is_temporary": false,"weight_unit": "kg","ro_access": false,"num_days_weight_reminder":0}- },- {- "pk": 17,- "model": "core.userprofile",- "fields": {- "workout_reminder": 20,- "height": 180,- "show_english_ingredients": false,- "show_comments": false,- "workout_duration": 8,- "sleep_hours": 7,- "freetime_hours": 8,- "gym": 1,- "sport_intensity": "3",- "workout_reminder_active": false,- "work_intensity": "1",- "user": 17,- "timer_active": true,- "timer_pause": 90,- "work_hours": 8,- "freetime_intensity": "1",- "gender": "1",- "age": 30,- "notification_language": 1,- "calories": 3500,- "sport_hours": 6,+ },+ {+ "pk": 17,+ "model": "core.userprofile",+ "fields": {+ "workout_reminder": 20,+ "height": 180,+ "show_english_ingredients": false,+ "show_comments": false,+ "workout_duration": 8,+ "sleep_hours": 7,+ "freetime_hours": 8,+ "gym": 1,+ "sport_intensity": "3",+ "workout_reminder_active": false,+ "work_intensity": "1",+ "user": 17,+ "timer_active": true,+ "timer_pause": 90,+ "work_hours": 8,+ "freetime_intensity": "1",+ "gender": "1",+ "age": 30,+ "notification_language": 1,+ "calories": 3500,+ "sport_hours": 6,"is_temporary": false,"weight_unit": "kg","ro_access": false,"num_days_weight_reminder":0}- },- {- "pk": 18,- "model": "core.userprofile",- "fields": {- "workout_reminder": 20,- "height": 180,- "show_english_ingredients": false,- "show_comments": false,- "workout_duration": 8,- "sleep_hours": 7,- "freetime_hours": 8,- "gym": 1,- "sport_intensity": "3",- "workout_reminder_active": false,- "work_intensity": "1",- "user": 18,- "timer_active": true,- "timer_pause": 90,- "work_hours": 8,- "freetime_intensity": "1",- "gender": "1",- "age": 30,- "notification_language": 1,- "calories": 3500,- "sport_hours": 6,+ },+ {+ "pk": 18,+ "model": "core.userprofile",+ "fields": {+ "workout_reminder": 20,+ "height": 180,+ "show_english_ingredients": false,+ "show_comments": false,+ "workout_duration": 8,+ "sleep_hours": 7,+ "freetime_hours": 8,+ "gym": 1,+ "sport_intensity": "3",+ "workout_reminder_active": false,+ "work_intensity": "1",+ "user": 18,+ "timer_active": true,+ "timer_pause": 90,+ "work_hours": 8,+ "freetime_intensity": "1",+ "gender": "1",+ "age": 30,+ "notification_language": 1,+ "calories": 3500,+ "sport_hours": 6,"is_temporary": false,"weight_unit": "kg","ro_access": false,"num_days_weight_reminder":0}- },- {- "pk": 19,- "model": "core.userprofile",- "fields": {- "workout_reminder": 20,- "height": 180,- "show_english_ingredients": false,- "show_comments": false,- "workout_duration": 8,- "sleep_hours": 7,- "freetime_hours": 8,- "gym": 2,- "sport_intensity": "3",- "workout_reminder_active": false,- "work_intensity": "1",- "user": 19,- "timer_active": true,- "timer_pause": 90,- "work_hours": 8,- "freetime_intensity": "1",- "gender": "1",- "age": 30,- "notification_language": 1,- "calories": 3500,- "sport_hours": 6,+ },+ {+ "pk": 19,+ "model": "core.userprofile",+ "fields": {+ "workout_reminder": 20,+ "height": 180,+ "show_english_ingredients": false,+ "show_comments": false,+ "workout_duration": 8,+ "sleep_hours": 7,+ "freetime_hours": 8,+ "gym": 2,+ "sport_intensity": "3",+ "workout_reminder_active": false,+ "work_intensity": "1",+ "user": 19,+ "timer_active": true,+ "timer_pause": 90,+ "work_hours": 8,+ "freetime_intensity": "1",+ "gender": "1",+ "age": 30,+ "notification_language": 1,+ "calories": 3500,+ "sport_hours": 6,"is_temporary": false,"weight_unit": "lb","ro_access": false,"num_days_weight_reminder":0}- },- {- "pk": 20,- "model": "core.userprofile",- "fields": {- "workout_reminder": 20,- "height": 180,- "show_english_ingredients": false,- "show_comments": false,- "workout_duration": 8,- "sleep_hours": 7,- "freetime_hours": 8,- "gym": 2,- "sport_intensity": "3",- "workout_reminder_active": false,- "work_intensity": "1",- "user": 20,- "timer_active": true,- "timer_pause": 90,- "work_hours": 8,- "freetime_intensity": "1",- "gender": "1",- "age": 30,- "notification_language": 1,- "calories": 3500,- "sport_hours": 6,+ },+ {+ "pk": 20,+ "model": "core.userprofile",+ "fields": {+ "workout_reminder": 20,+ "height": 180,+ "show_english_ingredients": false,+ "show_comments": false,+ "workout_duration": 8,+ "sleep_hours": 7,+ "freetime_hours": 8,+ "gym": 2,+ "sport_intensity": "3",+ "workout_reminder_active": false,+ "work_intensity": "1",+ "user": 20,+ "timer_active": true,+ "timer_pause": 90,+ "work_hours": 8,+ "freetime_intensity": "1",+ "gender": "1",+ "age": 30,+ "notification_language": 1,+ "calories": 3500,+ "sport_hours": 6,"is_temporary": false,"weight_unit": "lb","ro_access": false,"num_days_weight_reminder":0}- },- {- "pk": 21,- "model": "core.userprofile",- "fields": {- "workout_reminder": 20,- "height": 180,- "show_english_ingredients": false,- "show_comments": false,- "workout_duration": 8,- "sleep_hours": 7,- "freetime_hours": 8,- "gym": 1,- "sport_intensity": "3",- "workout_reminder_active": false,- "work_intensity": "1",- "user": 21,- "timer_active": true,- "timer_pause": 90,- "work_hours": 8,- "freetime_intensity": "1",- "gender": "1",- "age": 30,- "notification_language": 1,- "calories": 3500,- "sport_hours": 6,+ },+ {+ "pk": 21,+ "model": "core.userprofile",+ "fields": {+ "workout_reminder": 20,+ "height": 180,+ "show_english_ingredients": false,+ "show_comments": false,+ "workout_duration": 8,+ "sleep_hours": 7,+ "freetime_hours": 8,+ "gym": 1,+ "sport_intensity": "3",+ "workout_reminder_active": false,+ "work_intensity": "1",+ "user": 21,+ "timer_active": true,+ "timer_pause": 90,+ "work_hours": 8,+ "freetime_intensity": "1",+ "gender": "1",+ "age": 30,+ "notification_language": 1,+ "calories": 3500,+ "sport_hours": 6,"is_temporary": false,"weight_unit": "kg","ro_access": false,"num_days_weight_reminder":0}- },- {- "pk": 22,- "model": "core.userprofile",- "fields": {- "workout_reminder": 20,- "height": 180,- "show_english_ingredients": false,- "show_comments": false,- "workout_duration": 8,- "sleep_hours": 7,- "freetime_hours": 8,- "gym": 1,- "sport_intensity": "3",- "workout_reminder_active": false,- "work_intensity": "1",- "user": 22,- "timer_active": true,- "timer_pause": 90,- "work_hours": 8,- "freetime_intensity": "1",- "gender": "1",- "age": 30,- "notification_language": 1,- "calories": 3500,- "sport_hours": 6,+ },+ {+ "pk": 22,+ "model": "core.userprofile",+ "fields": {+ "workout_reminder": 20,+ "height": 180,+ "show_english_ingredients": false,+ "show_comments": false,+ "workout_duration": 8,+ "sleep_hours": 7,+ "freetime_hours": 8,+ "gym": 1,+ "sport_intensity": "3",+ "workout_reminder_active": false,+ "work_intensity": "1",+ "user": 22,+ "timer_active": true,+ "timer_pause": 90,+ "work_hours": 8,+ "freetime_intensity": "1",+ "gender": "1",+ "age": 30,+ "notification_language": 1,+ "calories": 3500,+ "sport_hours": 6,"is_temporary": false,"weight_unit": "kg","ro_access": false,"num_days_weight_reminder":0}- },- {- "pk": 23,- "model": "core.userprofile",- "fields": {- "workout_reminder": 20,- "height": 180,- "show_english_ingredients": false,- "show_comments": false,- "workout_duration": 8,- "sleep_hours": 7,- "freetime_hours": 8,- "gym": 1,- "sport_intensity": "3",- "workout_reminder_active": false,- "work_intensity": "1",- "user": 23,- "timer_active": true,- "timer_pause": 90,- "work_hours": 8,- "freetime_intensity": "1",- "gender": "1",- "age": 30,- "notification_language": 1,- "calories": 3500,- "sport_hours": 6,+ },+ {+ "pk": 23,+ "model": "core.userprofile",+ "fields": {+ "workout_reminder": 20,+ "height": 180,+ "show_english_ingredients": false,+ "show_comments": false,+ "workout_duration": 8,+ "sleep_hours": 7,+ "freetime_hours": 8,+ "gym": 1,+ "sport_intensity": "3",+ "workout_reminder_active": false,+ "work_intensity": "1",+ "user": 23,+ "timer_active": true,+ "timer_pause": 90,+ "work_hours": 8,+ "freetime_intensity": "1",+ "gender": "1",+ "age": 30,+ "notification_language": 1,+ "calories": 3500,+ "sport_hours": 6,"is_temporary": false,"weight_unit": "kg","ro_access": false,"num_days_weight_reminder":0}- },- {- "pk": 24,- "model": "core.userprofile",- "fields": {- "workout_reminder": 20,- "height": 180,- "show_english_ingredients": false,- "show_comments": false,- "workout_duration": 8,- "sleep_hours": 7,- "freetime_hours": 8,- "gym": 1,- "sport_intensity": "3",- "workout_reminder_active": false,- "work_intensity": "1",- "user": 24,- "timer_active": true,- "timer_pause": 90,- "work_hours": 8,- "freetime_intensity": "1",- "gender": "1",- "age": 30,- "notification_language": 1,- "calories": 3500,- "sport_hours": 6,+ },+ {+ "pk": 24,+ "model": "core.userprofile",+ "fields": {+ "workout_reminder": 20,+ "height": 180,+ "show_english_ingredients": false,+ "show_comments": false,+ "workout_duration": 8,+ "sleep_hours": 7,+ "freetime_hours": 8,+ "gym": 1,+ "sport_intensity": "3",+ "workout_reminder_active": false,+ "work_intensity": "1",+ "user": 24,+ "timer_active": true,+ "timer_pause": 90,+ "work_hours": 8,+ "freetime_intensity": "1",+ "gender": "1",+ "age": 30,+ "notification_language": 1,+ "calories": 3500,+ "sport_hours": 6,"is_temporary": false,"weight_unit": "kg","ro_access": false,diff --git a/wger/core/fixtures/users.json b/wger/core/fixtures/users.jsonindex db67c5c6f..025eb534b 100644--- a/wger/core/fixtures/users.json+++ b/wger/core/fixtures/users.json@@ -1,6 +1,6 @@[{- "pk": 1,+ "pk": 1,"model": "auth.user","fields": {"username": "admin",@@ -34,12 +34,12 @@}},{- "pk": 1,- "model": "core.userprofile",+ "pk": 1,+ "model": "core.userprofile","fields": {- "is_temporary": false,- "show_comments": false,- "show_english_ingredients": false,+ "is_temporary": false,+ "show_comments": false,+ "show_english_ingredients": false,"user": 1,"gym": 1}diff --git a/wger/exercises/fixtures/categories.json b/wger/exercises/fixtures/categories.jsonindex a77d99fd1..00aa76967 100644--- a/wger/exercises/fixtures/categories.json+++ b/wger/exercises/fixtures/categories.json@@ -48,4 +48,4 @@},"model": "exercises.exercisecategory"}-]\ No newline at end of file+]diff --git a/wger/exercises/fixtures/muscles.json b/wger/exercises/fixtures/muscles.jsonindex 90b8cde42..0b09929a0 100644--- a/wger/exercises/fixtures/muscles.json+++ b/wger/exercises/fixtures/muscles.json@@ -1,129 +1,129 @@[{- "pk": 2,- "model": "exercises.muscle",+ "pk": 2,+ "model": "exercises.muscle","fields": {- "is_front": true,+ "is_front": true,"name": "Anterior deltoid"}- },+ },{- "pk": 1,- "model": "exercises.muscle",+ "pk": 1,+ "model": "exercises.muscle","fields": {- "is_front": true,+ "is_front": true,"name": "Biceps brachii"}- },+ },{- "pk": 11,- "model": "exercises.muscle",+ "pk": 11,+ "model": "exercises.muscle","fields": {- "is_front": false,+ "is_front": false,"name": "Biceps femoris"}- },+ },{- "pk": 13,- "model": "exercises.muscle",+ "pk": 13,+ "model": "exercises.muscle","fields": {- "is_front": true,+ "is_front": true,"name": "Brachialis"}- },+ },{- "pk": 16,- "model": "exercises.muscle",+ "pk": 16,+ "model": "exercises.muscle","fields": {- "is_front": false,+ "is_front": false,"name": "Erector spinae"}- },+ },{- "pk": 7,- "model": "exercises.muscle",+ "pk": 7,+ "model": "exercises.muscle","fields": {- "is_front": false,+ "is_front": false,"name": "Gastrocnemius"}- },+ },{- "pk": 8,- "model": "exercises.muscle",+ "pk": 8,+ "model": "exercises.muscle","fields": {- "is_front": false,+ "is_front": false,"name": "Gluteus maximus"}- },+ },{- "pk": 12,- "model": "exercises.muscle",+ "pk": 12,+ "model": "exercises.muscle","fields": {- "is_front": false,+ "is_front": false,"name": "Latissimus dorsi"}- },+ },{- "pk": 14,- "model": "exercises.muscle",+ "pk": 14,+ "model": "exercises.muscle","fields": {- "is_front": true,+ "is_front": true,"name": "Obliquus externus abdominis"}- },+ },{- "pk": 4,- "model": "exercises.muscle",+ "pk": 4,+ "model": "exercises.muscle","fields": {- "is_front": true,+ "is_front": true,"name": "Pectoralis major"}- },+ },{- "pk": 10,- "model": "exercises.muscle",+ "pk": 10,+ "model": "exercises.muscle","fields": {- "is_front": true,+ "is_front": true,"name": "Quadriceps femoris"}- },+ },{- "pk": 6,- "model": "exercises.muscle",+ "pk": 6,+ "model": "exercises.muscle","fields": {- "is_front": true,+ "is_front": true,"name": "Rectus abdominis"}- },+ },{- "pk": 3,- "model": "exercises.muscle",+ "pk": 3,+ "model": "exercises.muscle","fields": {- "is_front": true,+ "is_front": true,"name": "Serratus anterior"}- },+ },{- "pk": 15,- "model": "exercises.muscle",+ "pk": 15,+ "model": "exercises.muscle","fields": {- "is_front": false,+ "is_front": false,"name": "Soleus"}- },+ },{- "pk": 9,- "model": "exercises.muscle",+ "pk": 9,+ "model": "exercises.muscle","fields": {- "is_front": false,+ "is_front": false,"name": "Trapezius"}- },+ },{- "pk": 5,- "model": "exercises.muscle",+ "pk": 5,+ "model": "exercises.muscle","fields": {- "is_front": false,+ "is_front": false,"name": "Triceps brachii"}}diff --git a/wger/exercises/fixtures/test-equipment.json b/wger/exercises/fixtures/test-equipment.jsonindex 6b5a8f2b7..932919fd6 100644--- a/wger/exercises/fixtures/test-equipment.json+++ b/wger/exercises/fixtures/test-equipment.json@@ -1,21 +1,21 @@[{- "pk": 1,- "model": "exercises.equipment",+ "pk": 1,+ "model": "exercises.equipment","fields": {"name": "Dumbbells"}- },+ },{- "pk": 2,- "model": "exercises.equipment",+ "pk": 2,+ "model": "exercises.equipment","fields": {"name": "Kettlebell"}- },+ },{- "pk": 3,- "model": "exercises.equipment",+ "pk": 3,+ "model": "exercises.equipment","fields": {"name": "Something else"}diff --git a/wger/gym/fixtures/gym-adminconfig.json b/wger/gym/fixtures/gym-adminconfig.jsonindex 603675abc..3d7d6c31d 100644--- a/wger/gym/fixtures/gym-adminconfig.json+++ b/wger/gym/fixtures/gym-adminconfig.json@@ -1,10 +1,10 @@[{- "pk": 1,- "model": "gym.gymadminconfig",+ "pk": 1,+ "model": "gym.gymadminconfig","fields": {- "gym": 1,- "user": 1,+ "gym": 1,+ "user": 1,"overview_inactive": true}}diff --git a/wger/gym/fixtures/test-admin-user-notes.json b/wger/gym/fixtures/test-admin-user-notes.jsonindex eacbc65d8..570c909f4 100644--- a/wger/gym/fixtures/test-admin-user-notes.json+++ b/wger/gym/fixtures/test-admin-user-notes.json@@ -1,24 +1,24 @@[{- "pk": 1,- "model": "gym.adminusernote",+ "pk": 1,+ "model": "gym.adminusernote","fields": {"member": 14,- "timestamp_created": "2014-10-27T18:50:28.870Z",- "note": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",+ "timestamp_created": "2014-10-27T18:50:28.870Z",+ "note": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.","user": 1,"timestamp_edited": "2014-10-27T18:55:02.369Z"}- },+ },{- "pk": 2,- "model": "gym.adminusernote",+ "pk": 2,+ "model": "gym.adminusernote","fields": {"member": 14,- "timestamp_created": "2014-10-27T18:50:39.413Z",- "note": "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.\r\n\r\nadsa ad aadad sasadsaa",+ "timestamp_created": "2014-10-27T18:50:39.413Z",+ "note": "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.\r\n\r\nadsa ad aadad sasadsaa","user": 1,"timestamp_edited": "2014-10-27T18:59:39.927Z"}}-]\ No newline at end of file+]diff --git a/wger/gym/fixtures/test-contracts.json b/wger/gym/fixtures/test-contracts.jsonindex b03997780..387d6f80a 100644--- a/wger/gym/fixtures/test-contracts.json+++ b/wger/gym/fixtures/test-contracts.json@@ -116,4 +116,4 @@"pk": 3,"model": "gym.contractoption"}-]\ No newline at end of file+]diff --git a/wger/gym/fixtures/test-gym-adminconfig.json b/wger/gym/fixtures/test-gym-adminconfig.jsonindex 59f2e5786..fdacaff2d 100644--- a/wger/gym/fixtures/test-gym-adminconfig.json+++ b/wger/gym/fixtures/test-gym-adminconfig.json@@ -1,100 +1,100 @@[{- "pk": 1,- "model": "gym.gymadminconfig",+ "pk": 1,+ "model": "gym.gymadminconfig","fields": {- "gym": 1,- "user": 1,+ "gym": 1,+ "user": 1,"overview_inactive": true}},{- "pk": 4,- "model": "gym.gymadminconfig",+ "pk": 4,+ "model": "gym.gymadminconfig","fields": {- "gym": 1,- "user": 4,+ "gym": 1,+ "user": 4,"overview_inactive": true}- },+ },{- "pk": 5,- "model": "gym.gymadminconfig",+ "pk": 5,+ "model": "gym.gymadminconfig","fields": {- "gym": 1,- "user": 5,+ "gym": 1,+ "user": 5,"overview_inactive": true}- },+ },{- "pk": 6,- "model": "gym.gymadminconfig",+ "pk": 6,+ "model": "gym.gymadminconfig","fields": {- "gym": 1,- "user": 6,+ "gym": 1,+ "user": 6,"overview_inactive": true}- },+ },{- "pk": 7,- "model": "gym.gymadminconfig",+ "pk": 7,+ "model": "gym.gymadminconfig","fields": {- "gym": 2,- "user": 7,+ "gym": 2,+ "user": 7,"overview_inactive": true}- },+ },{- "pk": 8,- "model": "gym.gymadminconfig",+ "pk": 8,+ "model": "gym.gymadminconfig","fields": {- "gym": 2,- "user": 8,+ "gym": 2,+ "user": 8,"overview_inactive": true}- },+ },{- "pk": 9,- "model": "gym.gymadminconfig",+ "pk": 9,+ "model": "gym.gymadminconfig","fields": {- "gym": 1,- "user": 9,+ "gym": 1,+ "user": 9,"overview_inactive": true}- },+ },{- "pk": 10,- "model": "gym.gymadminconfig",+ "pk": 10,+ "model": "gym.gymadminconfig","fields": {- "gym": 1,- "user": 10,+ "gym": 1,+ "user": 10,"overview_inactive": true}- },+ },{- "pk": 11,- "model": "gym.gymadminconfig",+ "pk": 11,+ "model": "gym.gymadminconfig","fields": {- "gym": 2,- "user": 11,+ "gym": 2,+ "user": 11,"overview_inactive": true}- },+ },{- "pk": 12,- "model": "gym.gymadminconfig",+ "pk": 12,+ "model": "gym.gymadminconfig","fields": {- "gym": 1,- "user": 12,+ "gym": 1,+ "user": 12,"overview_inactive": true}},{- "pk": 13,- "model": "gym.gymadminconfig",+ "pk": 13,+ "model": "gym.gymadminconfig","fields": {- "gym": 2,- "user": 13,+ "gym": 2,+ "user": 13,"overview_inactive": true}}diff --git a/wger/gym/fixtures/test-gym-user-documents.json b/wger/gym/fixtures/test-gym-user-documents.jsonindex d31c608d8..d96380438 100644--- a/wger/gym/fixtures/test-gym-user-documents.json+++ b/wger/gym/fixtures/test-gym-user-documents.json@@ -1,24 +1,24 @@[{- "pk": 1,- "model": "gym.userdocument",+ "pk": 1,+ "model": "gym.userdocument","fields": {- "timestamp_created": "2014-11-01T19:31:03.184Z",- "timestamp_edited": "2014-11-01T19:31:03.184Z",+ "timestamp_created": "2014-11-01T19:31:03.184Z",+ "timestamp_edited": "2014-11-01T19:31:03.184Z","name": "A description","original_name": "something_else.pdf","member": 14,"user": 4,"document": "gym/documents/1/14/4828abd8-e77b-4f79-a4cf-edd69bbd5df8"}- },+ },{- "pk": 2,- "model": "gym.userdocument",+ "pk": 2,+ "model": "gym.userdocument","fields": {- "timestamp_created": "2014-11-06T20:07:31.261Z",- "timestamp_edited": "2014-11-06T20:07:31.261Z",- "name": "Test 123",+ "timestamp_created": "2014-11-06T20:07:31.261Z",+ "timestamp_edited": "2014-11-06T20:07:31.261Z",+ "name": "Test 123","original_name": "1234567890_abcdefghijk.jpg","member": 14,"user": 5,@@ -38,4 +38,4 @@"document": "gym/documents/1/6/34c507d8-b8e3-4f7b-823c-693c1d80c0c3"}}-]\ No newline at end of file+]diff --git a/wger/gym/fixtures/test-gym-userconfig.json b/wger/gym/fixtures/test-gym-userconfig.jsonindex d11d6c8f3..5412f2f28 100644--- a/wger/gym/fixtures/test-gym-userconfig.json+++ b/wger/gym/fixtures/test-gym-userconfig.json@@ -1,10 +1,10 @@[{- "pk": 1,- "model": "gym.gymuserconfig",+ "pk": 1,+ "model": "gym.gymuserconfig","fields": {- "gym": 1,- "include_inactive": true,+ "gym": 1,+ "include_inactive": true,"user": 2}},@@ -28,46 +28,46 @@},{"pk": 4,- "model": "gym.gymuserconfig",+ "model": "gym.gymuserconfig","fields": {- "gym": 1,- "include_inactive": true,+ "gym": 1,+ "include_inactive": true,"user": 15}- },+ },{"pk": 5,- "model": "gym.gymuserconfig",+ "model": "gym.gymuserconfig","fields": {- "gym": 1,- "include_inactive": true,+ "gym": 1,+ "include_inactive": true,"user": 16}- },+ },{"pk": 6,- "model": "gym.gymuserconfig",+ "model": "gym.gymuserconfig","fields": {- "gym": 1,- "include_inactive": true,+ "gym": 1,+ "include_inactive": true,"user": 17}- },+ },{"pk": 7,- "model": "gym.gymuserconfig",+ "model": "gym.gymuserconfig","fields": {- "gym": 1,- "include_inactive": true,+ "gym": 1,+ "include_inactive": true,"user": 18}- },+ },{"pk": 8,- "model": "gym.gymuserconfig",+ "model": "gym.gymuserconfig","fields": {"gym": 2,- "include_inactive": true,+ "include_inactive": true,"user": 19}},@@ -116,4 +116,4 @@"user": 24}}-]\ No newline at end of file+]diff --git a/wger/gym/fixtures/test-gyms.json b/wger/gym/fixtures/test-gyms.jsonindex c9a0a5f3a..255177e0f 100644--- a/wger/gym/fixtures/test-gyms.json+++ b/wger/gym/fixtures/test-gyms.json@@ -1,23 +1,23 @@[{- "pk": 1,+ "pk": 1,"model": "gym.gym","fields": {"name": "Test 123"}- },+ },{- "pk": 2,+ "pk": 2,"model": "gym.gym","fields": {"name": "A cool gym"}- },+ },{- "pk": 3,+ "pk": 3,"model": "gym.gym","fields": {"name": "Muscle Gym"}}-]\ No newline at end of file+]diff --git a/wger/gym/fixtures/test-gymsconfig.json b/wger/gym/fixtures/test-gymsconfig.jsonindex a0266f502..8de71090b 100644--- a/wger/gym/fixtures/test-gymsconfig.json+++ b/wger/gym/fixtures/test-gymsconfig.json@@ -1,29 +1,29 @@[{- "pk": 1,- "model": "gym.gymconfig",+ "pk": 1,+ "model": "gym.gymconfig","fields": {- "gym": 1,+ "gym": 1,"weeks_inactive": 7,"show_name": true}- },+ },{- "pk": 2,- "model": "gym.gymconfig",+ "pk": 2,+ "model": "gym.gymconfig","fields": {- "gym": 3,+ "gym": 3,"weeks_inactive": 4,"show_name": true}- },+ },{- "pk": 3,- "model": "gym.gymconfig",+ "pk": 3,+ "model": "gym.gymconfig","fields": {- "gym": 2,+ "gym": 2,"weeks_inactive": 2,"show_name": false}}-]\ No newline at end of file+]diff --git a/wger/manager/fixtures/test-apikeys.json b/wger/manager/fixtures/test-apikeys.jsonindex a9d51b841..e969d9259 100644--- a/wger/manager/fixtures/test-apikeys.json+++ b/wger/manager/fixtures/test-apikeys.json@@ -1,28 +1,28 @@[{- "pk": 1,+ "pk": 1,"model": "authtoken.token","fields": {- "user": 1,- "key": "apikey-admin",+ "user": 1,+ "key": "apikey-admin","created": "2013-08-28 19:47:06+01:00"}- },+ },{- "pk": 2,+ "pk": 2,"model": "authtoken.token","fields": {- "user": 2,- "key": "apikey-test",+ "user": 2,+ "key": "apikey-test","created": "2013-08-28 19:47:06+01:00"}- },+ },{- "pk": 3,+ "pk": 3,"model": "authtoken.token","fields": {- "user": 3,- "key": "apikey-demo",+ "user": 3,+ "key": "apikey-demo","created": "2013-08-28 19:47:06+01:00"}}diff --git a/wger/manager/fixtures/test-schedules.json b/wger/manager/fixtures/test-schedules.jsonindex 460c20253..bc6349ecc 100644--- a/wger/manager/fixtures/test-schedules.json+++ b/wger/manager/fixtures/test-schedules.json@@ -1,86 +1,86 @@[{- "pk": 1,- "model": "manager.schedule",+ "pk": 1,+ "model": "manager.schedule","fields": {- "name": "my cool schedule that i found on the internet",- "is_active": true,- "user": 2,- "start_date": "2013-04-21",+ "name": "my cool schedule that i found on the internet",+ "is_active": true,+ "user": 2,+ "start_date": "2013-04-21","is_loop": false}- },+ },{- "pk": 2,- "model": "manager.schedule",+ "pk": 2,+ "model": "manager.schedule","fields": {- "name": "my cool schedule that i found on the internet",- "is_active": false,- "user": 1,- "start_date": "2013-04-21",+ "name": "my cool schedule that i found on the internet",+ "is_active": false,+ "user": 1,+ "start_date": "2013-04-21","is_loop": true}- },+ },{- "pk": 3,- "model": "manager.schedule",+ "pk": 3,+ "model": "manager.schedule","fields": {- "name": "another schedule of mine",- "is_active": false,- "user": 1,- "start_date": "2013-02-01",+ "name": "another schedule of mine",+ "is_active": false,+ "user": 1,+ "start_date": "2013-02-01","is_loop": false}- },+ },{- "pk": 4,- "model": "manager.schedule",+ "pk": 4,+ "model": "manager.schedule","fields": {- "name": "Yet another cool schedule",- "is_active": true,- "user": 1,- "start_date": "2012-10-20",+ "name": "Yet another cool schedule",+ "is_active": true,+ "user": 1,+ "start_date": "2012-10-20","is_loop": false}- },+ },{- "pk": 1,- "model": "manager.schedulestep",+ "pk": 1,+ "model": "manager.schedulestep","fields": {- "duration": 3,- "workout": 1,- "order": 1,+ "duration": 3,+ "workout": 1,+ "order": 1,"schedule": 2}- },+ },{- "pk": 2,- "model": "manager.schedulestep",+ "pk": 2,+ "model": "manager.schedulestep","fields": {- "duration": 5,- "workout": 2,- "order": 2,+ "duration": 5,+ "workout": 2,+ "order": 2,"schedule": 2}- },+ },{- "pk": 3,- "model": "manager.schedulestep",+ "pk": 3,+ "model": "manager.schedulestep","fields": {- "duration": 2,- "workout": 1,- "order": 3,+ "duration": 2,+ "workout": 1,+ "order": 3,"schedule": 2}- },+ },{- "pk": 4,- "model": "manager.schedulestep",+ "pk": 4,+ "model": "manager.schedulestep","fields": {- "duration": 3,- "workout": 3,- "order": 4,+ "duration": 3,+ "workout": 3,+ "order": 4,"schedule": 1}- }+ }]diff --git a/wger/manager/fixtures/test-workout-data.json b/wger/manager/fixtures/test-workout-data.jsonindex 2d3fbe01e..b53221a64 100644--- a/wger/manager/fixtures/test-workout-data.json+++ b/wger/manager/fixtures/test-workout-data.json@@ -1,83 +1,83 @@[{- "pk": 1,- "model": "manager.workout",+ "pk": 1,+ "model": "manager.workout","fields": {- "comment": "A test workout",- "user": 1,+ "comment": "A test workout",+ "user": 1,"creation_date": "2012-11-01"}- },+ },{- "pk": 2,- "model": "manager.workout",+ "pk": 2,+ "model": "manager.workout","fields": {- "comment": "Another test workout",- "user": 1,+ "comment": "Another test workout",+ "user": 1,"creation_date": "2012-11-10"}},{- "pk": 3,- "model": "manager.workout",+ "pk": 3,+ "model": "manager.workout","fields": {- "comment": "My test workout",- "user": 2,+ "comment": "My test workout",+ "user": 2,"creation_date": "2012-11-20"}},--++{- "pk": 1,- "model": "manager.day",+ "pk": 1,+ "model": "manager.day","fields": {- "training": 1,- "description": "A day",+ "training": 1,+ "description": "A day","day": [2]}- },+ },{- "pk": 2,- "model": "manager.day",+ "pk": 2,+ "model": "manager.day","fields": {- "training": 1,- "description": "Another day",+ "training": 1,+ "description": "Another day","day": [4]}},{- "pk": 3,- "model": "manager.day",+ "pk": 3,+ "model": "manager.day","fields": {- "training": 2,- "description": "Test day 1",+ "training": 2,+ "description": "Test day 1","day": [1]}- },+ },{- "pk": 4,- "model": "manager.day",+ "pk": 4,+ "model": "manager.day","fields": {- "training": 1,- "description": "Test day 2",+ "training": 1,+ "description": "Test day 2","day": [5]}},{- "pk": 5,- "model": "manager.day",+ "pk": 5,+ "model": "manager.day","fields": {- "training": 3,- "description": "A cool day",+ "training": 3,+ "description": "A cool day","day": [5,3@@ -87,142 +87,142 @@{- "pk": 1,- "model": "manager.set",+ "pk": 1,+ "model": "manager.set","fields": {"exercises": [1- ],- "exerciseday": 1,- "order": 1,+ ],+ "exerciseday": 1,+ "order": 1,"sets": "2"}},{"pk": 2,- "model": "manager.set",+ "model": "manager.set","fields": {"exercises": [2- ],- "exerciseday": 2,- "order": 1,+ ],+ "exerciseday": 2,+ "order": 1,"sets": "4"}},{"pk": 3,- "model": "manager.set",+ "model": "manager.set","fields": {"exercises": [2- ],- "exerciseday": 5,- "order": 1,+ ],+ "exerciseday": 5,+ "order": 1,"sets": "4"}},{- "pk": 1,- "model": "manager.setting",+ "pk": 1,+ "model": "manager.setting","fields": {- "comment": "",+ "comment": "","set": 1,"reps": 8,"repetition_unit_id": 1,"weight_unit_id": 1,"weight": null,- "order": 1,+ "order": 1,"exercise": 1}},{- "pk": 2,- "model": "manager.setting",+ "pk": 2,+ "model": "manager.setting","fields": {- "comment": "",- "set": 2,+ "comment": "",+ "set": 2,"reps": 10,"repetition_unit_id": 1,"weight_unit_id": 1,"weight": 15,- "order": 1,+ "order": 1,"exercise": 2}},{- "pk": 3,- "model": "manager.setting",+ "pk": 3,+ "model": "manager.setting","fields": {- "comment": "",- "set": 3,+ "comment": "",+ "set": 3,"reps": 10,"repetition_unit_id": 1,"weight_unit_id": 1,"weight": null,- "order": 1,+ "order": 1,"exercise": 2}},{- "pk": 1,- "model": "manager.workoutlog",+ "pk": 1,+ "model": "manager.workoutlog","fields": {- "weight": 30,- "workout": 1,- "reps": 8,- "user": 1,- "date": "2012-10-01",+ "weight": 30,+ "workout": 1,+ "reps": 8,+ "user": 1,+ "date": "2012-10-01","exercise": 1}},{- "pk": 2,- "model": "manager.workoutlog",+ "pk": 2,+ "model": "manager.workoutlog","fields": {"weight": 32,- "workout": 1,- "reps": 8,- "user": 1,- "date": "2012-10-10",+ "workout": 1,+ "reps": 8,+ "user": 1,+ "date": "2012-10-10","exercise": 1}},{- "pk": 3,- "model": "manager.workoutlog",+ "pk": 3,+ "model": "manager.workoutlog","fields": {- "weight": 38,- "workout": 1,- "reps": 8,- "user": 1,+ "weight": 38,+ "workout": 1,+ "reps": 8,+ "user": 1,"date": "2013-10-30","exercise": 1}},{- "pk": 4,- "model": "manager.workoutlog",+ "pk": 4,+ "model": "manager.workoutlog","fields": {- "weight": 30,- "workout": 1,- "reps": 8,- "user": 1,- "date": "2012-11-01",+ "weight": 30,+ "workout": 1,+ "reps": 8,+ "user": 1,+ "date": "2012-11-01","exercise": 1}},{- "pk": 5,- "model": "manager.workoutlog",+ "pk": 5,+ "model": "manager.workoutlog","fields": {- "weight": 30,- "workout": 3,- "reps": 8,- "user": 2,- "date": "2012-11-01",+ "weight": 30,+ "workout": 3,+ "reps": 8,+ "user": 2,+ "date": "2012-11-01","exercise": 2}}diff --git a/wger/manager/fixtures/test-workout-session.json b/wger/manager/fixtures/test-workout-session.jsonindex 78665f04f..f026c5ffe 100644--- a/wger/manager/fixtures/test-workout-session.json+++ b/wger/manager/fixtures/test-workout-session.json@@ -1,13 +1,13 @@[{- "pk": 1,- "model": "manager.workoutsession",+ "pk": 1,+ "model": "manager.workoutsession","fields": {- "impression": "2",- "time_start": "17:00:00",+ "impression": "2",+ "time_start": "17:00:00","workout": 1,- "time_end": "18:30:00",- "user": 1,+ "time_end": "18:30:00",+ "user": 1,"date": "2012-10-01","notes": "Notes come here"}@@ -51,4 +51,4 @@"notes": "Something, something else"}}-]\ No newline at end of file+]diff --git a/wger/nutrition/fixtures/test-nutrition-data.json b/wger/nutrition/fixtures/test-nutrition-data.jsonindex 39c0446ce..dba62c373 100644--- a/wger/nutrition/fixtures/test-nutrition-data.json+++ b/wger/nutrition/fixtures/test-nutrition-data.json@@ -1,360 +1,360 @@[{- "pk": 5,- "model": "nutrition.nutritionplan",+ "pk": 5,+ "model": "nutrition.nutritionplan","fields": {- "description": "Description 1",- "user": 1,- "language": 2,+ "description": "Description 1",+ "user": 1,+ "language": 2,"creation_date": "2012-11-19"}- },+ },{- "pk": 4,- "model": "nutrition.nutritionplan",+ "pk": 4,+ "model": "nutrition.nutritionplan","fields": {- "description": "My plan to do xyz",- "user": 2,- "language": 2,+ "description": "My plan to do xyz",+ "user": 2,+ "language": 2,"creation_date": "2012-11-12"}- },+ },{- "pk": 3,- "model": "nutrition.nutritionplan",+ "pk": 3,+ "model": "nutrition.nutritionplan","fields": {- "description": "",- "user": 1,- "language": 2,+ "description": "",+ "user": 1,+ "language": 2,"creation_date": "2012-11-09"}- },+ },{- "pk": 2,- "model": "nutrition.nutritionplan",+ "pk": 2,+ "model": "nutrition.nutritionplan","fields": {- "description": "",- "user": 1,- "language": 2,+ "description": "",+ "user": 1,+ "language": 2,"creation_date": "2012-10-29"}- },+ },{- "pk": 1,- "model": "nutrition.nutritionplan",+ "pk": 1,+ "model": "nutrition.nutritionplan","fields": {- "description": "",- "user": 2,- "language": 2,+ "description": "",+ "user": 2,+ "language": 2,"creation_date": "2012-09-22"}- },+ },{- "pk": 1,- "model": "nutrition.meal",+ "pk": 1,+ "model": "nutrition.meal","fields": {- "time": null,- "plan": 1,+ "time": null,+ "plan": 1,"order": 1}- },+ },{- "pk": 2,- "model": "nutrition.meal",+ "pk": 2,+ "model": "nutrition.meal","fields": {- "time": "07:00:00",- "plan": 4,+ "time": "07:00:00",+ "plan": 4,"order": 1}- },+ },{- "pk": 3,- "model": "nutrition.meal",+ "pk": 3,+ "model": "nutrition.meal","fields": {- "time": "08:00:00",- "plan": 2,+ "time": "08:00:00",+ "plan": 2,"order": 1}- },+ },{- "pk": 4,- "model": "nutrition.meal",+ "pk": 4,+ "model": "nutrition.meal","fields": {- "time": "08:00:00",- "plan": 3,+ "time": "08:00:00",+ "plan": 3,"order": 1}- },+ },{- "pk": 5,- "model": "nutrition.meal",+ "pk": 5,+ "model": "nutrition.meal","fields": {- "time": "08:00:00",- "plan": 2,+ "time": "08:00:00",+ "plan": 2,"order": 1}- },+ },{- "pk": 6,- "model": "nutrition.meal",+ "pk": 6,+ "model": "nutrition.meal","fields": {- "time": "08:00:00",- "plan": 5,+ "time": "08:00:00",+ "plan": 5,"order": 1}- },+ },{- "pk": 7,- "model": "nutrition.meal",+ "pk": 7,+ "model": "nutrition.meal","fields": {- "time": "08:02:00",- "plan": 4,+ "time": "08:02:00",+ "plan": 4,"order": 1}- },+ },{- "pk": 8,- "model": "nutrition.meal",+ "pk": 8,+ "model": "nutrition.meal","fields": {- "time": "10:00:00",- "plan": 2,+ "time": "10:00:00",+ "plan": 2,"order": 1}- },+ },{- "pk": 9,- "model": "nutrition.meal",+ "pk": 9,+ "model": "nutrition.meal","fields": {- "time": "10:00:00",- "plan": 4,+ "time": "10:00:00",+ "plan": 4,"order": 1}- },+ },{- "pk": 10,- "model": "nutrition.meal",+ "pk": 10,+ "model": "nutrition.meal","fields": {- "time": "19:02:00",- "plan": 4,+ "time": "19:02:00",+ "plan": 4,"order": 1}- },+ },{- "pk": 11,- "model": "nutrition.meal",+ "pk": 11,+ "model": "nutrition.meal","fields": {- "time": "22:00:00",- "plan": 4,+ "time": "22:00:00",+ "plan": 4,"order": 1}- },+ },{- "pk": 1,- "model": "nutrition.mealitem",+ "pk": 1,+ "model": "nutrition.mealitem","fields": {- "ingredient": 1,- "amount": 200,- "meal": 1,+ "ingredient": 1,+ "amount": 200,+ "meal": 1,"order": 1}- },+ },{- "pk": 2,- "model": "nutrition.mealitem",+ "pk": 2,+ "model": "nutrition.mealitem","fields": {- "ingredient": 1,- "amount": 200,- "meal": 1,+ "ingredient": 1,+ "amount": 200,+ "meal": 1,"order": 1}- },+ },{- "pk": 3,- "model": "nutrition.mealitem",+ "pk": 3,+ "model": "nutrition.mealitem","fields": {- "ingredient": 1,- "amount": 200,- "meal": 1,+ "ingredient": 1,+ "amount": 200,+ "meal": 1,"order": 1}- },+ },{- "pk": 4,- "model": "nutrition.mealitem",+ "pk": 4,+ "model": "nutrition.mealitem","fields": {- "ingredient": 4,- "amount": 300,- "meal": 3,+ "ingredient": 4,+ "amount": 300,+ "meal": 3,"order": 1}- },+ },{- "pk": 5,- "model": "nutrition.mealitem",+ "pk": 5,+ "model": "nutrition.mealitem","fields": {- "ingredient": 2,- "amount": 100,- "meal": 8,+ "ingredient": 2,+ "amount": 100,+ "meal": 8,"order": 1}- },+ },{- "pk": 6,- "model": "nutrition.mealitem",+ "pk": 6,+ "model": "nutrition.mealitem","fields": {- "ingredient": 5,- "amount": 100,- "meal": 8,+ "ingredient": 5,+ "amount": 100,+ "meal": 8,"order": 1}- },+ },{- "pk": 7,- "model": "nutrition.mealitem",+ "pk": 7,+ "model": "nutrition.mealitem","fields": {- "ingredient": 3,- "amount": 300,- "meal": 7,+ "ingredient": 3,+ "amount": 300,+ "meal": 7,"order": 1}- },+ },{- "pk": 8,- "model": "nutrition.mealitem",+ "pk": 8,+ "model": "nutrition.mealitem","fields": {- "ingredient": 1,- "amount": 101,- "meal": 9,+ "ingredient": 1,+ "amount": 101,+ "meal": 9,"order": 1}- },+ },{- "pk": 9,- "model": "nutrition.mealitem",+ "pk": 9,+ "model": "nutrition.mealitem","fields": {- "ingredient": 2,- "amount": 100,- "meal": 9,+ "ingredient": 2,+ "amount": 100,+ "meal": 9,"order": 1}- },+ },{- "pk": 10,- "model": "nutrition.mealitem",+ "pk": 10,+ "model": "nutrition.mealitem","fields": {- "ingredient": 3,- "amount": 100,- "meal": 2,+ "ingredient": 3,+ "amount": 100,+ "meal": 2,"order": 1}- },+ },{- "pk": 11,- "model": "nutrition.mealitem",+ "pk": 11,+ "model": "nutrition.mealitem","fields": {- "ingredient": 4,- "amount": 200,- "meal": 10,+ "ingredient": 4,+ "amount": 200,+ "meal": 10,"order": 1}- },+ },{- "pk": 12,- "model": "nutrition.mealitem",+ "pk": 12,+ "model": "nutrition.mealitem","fields": {- "ingredient": 4,- "amount": 200,- "meal": 10,+ "ingredient": 4,+ "amount": 200,+ "meal": 10,"order": 1}- },+ },{- "pk": 13,- "model": "nutrition.mealitem",+ "pk": 13,+ "model": "nutrition.mealitem","fields": {- "ingredient": 3,- "amount": 100,- "meal": 7,+ "ingredient": 3,+ "amount": 100,+ "meal": 7,"order": 1}- },+ },{- "pk": 14,- "model": "nutrition.mealitem",+ "pk": 14,+ "model": "nutrition.mealitem","fields": {- "ingredient": 6,- "amount": 30,- "meal": 7,+ "ingredient": 6,+ "amount": 30,+ "meal": 7,"order": 1}- },+ },{- "pk": 15,- "model": "nutrition.mealitem",+ "pk": 15,+ "model": "nutrition.mealitem","fields": {- "ingredient": 3,- "amount": 150,- "meal": 10,+ "ingredient": 3,+ "amount": 150,+ "meal": 10,"order": 1}- },+ },{- "pk": 16,- "model": "nutrition.mealitem",+ "pk": 16,+ "model": "nutrition.mealitem","fields": {- "ingredient": 1,- "amount": 500,- "meal": 11,+ "ingredient": 1,+ "amount": 500,+ "meal": 11,"order": 1}- },+ },{- "pk": 17,- "model": "nutrition.mealitem",+ "pk": 17,+ "model": "nutrition.mealitem","fields": {- "ingredient": 6,- "amount": 100,- "meal": 6,+ "ingredient": 6,+ "amount": 100,+ "meal": 6,"order": 1}- },+ },{- "pk": 18,- "model": "nutrition.mealitem",+ "pk": 18,+ "model": "nutrition.mealitem","fields": {- "ingredient": 4,- "amount": 100,- "meal": 6,+ "ingredient": 4,+ "amount": 100,+ "meal": 6,"order": 1}- },+ },{- "pk": 19,- "model": "nutrition.mealitem",+ "pk": 19,+ "model": "nutrition.mealitem","fields": {- "ingredient": 3,- "amount": 100,- "meal": 6,+ "ingredient": 3,+ "amount": 100,+ "meal": 6,"order": 1}- },+ },{- "pk": 20,- "model": "nutrition.mealitem",+ "pk": 20,+ "model": "nutrition.mealitem","fields": {- "ingredient": 2,- "amount": 100,- "meal": 6,+ "ingredient": 2,+ "amount": 100,+ "meal": 6,"order": 1}- },+ },{- "pk": 21,- "model": "nutrition.mealitem",+ "pk": 21,+ "model": "nutrition.mealitem","fields": {- "ingredient": 1,- "amount": 100,- "meal": 6,+ "ingredient": 1,+ "amount": 100,+ "meal": 6,"order": 1}}