Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use License model to set licenses for exercise images

Roland Geidercdf89b9cf7ef
diff --git a/wger/exercises/api/resources.py b/wger/exercises/api/resources.py
index f3875f945..e9ca56956 100644
--- a/wger/exercises/api/resources.py
+++ b/wger/exercises/api/resources.py
@@ -79,6 +79,7 @@ class ExerciseCategoryResource(ModelResource):
class ExerciseImageResource(ModelResource):
exercise = fields.ToOneField('wger.exercises.api.resources.ExerciseResource', 'exercise')
+ license = fields.ToOneField(LicenseResource, 'license')
class Meta:
queryset = ExerciseImage.objects.all()
diff --git a/wger/exercises/forms.py b/wger/exercises/forms.py
new file mode 100644
index 000000000..ed916e4a6
--- /dev/null
+++ b/wger/exercises/forms.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+# This file is part of Workout Manager.
+#
+# Workout Manager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Workout Manager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+
+from django import forms
+
+from wger.exercises.models import ExerciseImage
+
+
+class ExerciseImageForm(forms.ModelForm):
+ class Meta:
+ model = ExerciseImage
+ fields = ('image',
+ 'is_main',
+ 'license',
+ 'license_author')
diff --git a/wger/exercises/migrations/0017_auto__del_field_exerciseimage_license.py b/wger/exercises/migrations/0017_auto__del_field_exerciseimage_license.py
new file mode 100644
index 000000000..e0f459b38
--- /dev/null
+++ b/wger/exercises/migrations/0017_auto__del_field_exerciseimage_license.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Deleting field 'ExerciseImage.license'
+ db.delete_column(u'exercises_exerciseimage', 'license')
+
+
+ def backwards(self, orm):
+ # Adding field 'ExerciseImage.license'
+ db.add_column(u'exercises_exerciseimage', 'license',
+ self.gf('django.db.models.fields.CharField')(default='1', max_length=2),
+ keep_default=False)
+
+
+ models = {
+ u'core.language': {
+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})
+ },
+ u'core.license': {
+ 'Meta': {'ordering': "['full_name']", 'object_name': 'License'},
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '60'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+ },
+ u'exercises.equipment': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Equipment'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'exercises.exercise': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Exercise'},
+ 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.ExerciseCategory']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),
+ 'equipment': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Equipment']", 'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.Language']"}),
+ 'license': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': u"orm['core.License']"}),
+ 'license_author': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+ 'muscles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Muscle']", 'null': 'True', 'blank': 'True'}),
+ 'muscles_secondary': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'secondary_muscles'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['exercises.Muscle']"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'}),
+ 'user': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'})
+ },
+ u'exercises.exercisecategory': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'ExerciseCategory'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ u'exercises.exercisecomment': {
+ 'Meta': {'object_name': 'ExerciseComment'},
+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ u'exercises.exerciseimage': {
+ 'Meta': {'ordering': "['-is_main', 'id']", 'object_name': 'ExerciseImage'},
+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+ 'is_main': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'license_author': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
+ },
+ u'exercises.muscle': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Muscle'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_front': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ }
+ }
+
+ complete_apps = ['exercises']
\ No newline at end of file
diff --git a/wger/exercises/migrations/0018_auto__add_field_exerciseimage_license.py b/wger/exercises/migrations/0018_auto__add_field_exerciseimage_license.py
new file mode 100644
index 000000000..94d48d0af
--- /dev/null
+++ b/wger/exercises/migrations/0018_auto__add_field_exerciseimage_license.py
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding field 'ExerciseImage.license'
+ db.add_column(u'exercises_exerciseimage', 'license',
+ self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['core.License']),
+ keep_default=False)
+
+
+ def backwards(self, orm):
+ # Deleting field 'ExerciseImage.license'
+ db.delete_column(u'exercises_exerciseimage', 'license_id')
+
+
+ models = {
+ u'core.language': {
+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})
+ },
+ u'core.license': {
+ 'Meta': {'ordering': "['full_name']", 'object_name': 'License'},
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '60'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+ },
+ u'exercises.equipment': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Equipment'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'exercises.exercise': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Exercise'},
+ 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.ExerciseCategory']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),
+ 'equipment': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Equipment']", 'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.Language']"}),
+ 'license': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': u"orm['core.License']"}),
+ 'license_author': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+ 'muscles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Muscle']", 'null': 'True', 'blank': 'True'}),
+ 'muscles_secondary': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'secondary_muscles'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['exercises.Muscle']"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'}),
+ 'user': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'})
+ },
+ u'exercises.exercisecategory': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'ExerciseCategory'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ u'exercises.exercisecomment': {
+ 'Meta': {'object_name': 'ExerciseComment'},
+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ u'exercises.exerciseimage': {
+ 'Meta': {'ordering': "['-is_main', 'id']", 'object_name': 'ExerciseImage'},
+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+ 'is_main': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'license': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': u"orm['core.License']"}),
+ 'license_author': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
+ },
+ u'exercises.muscle': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Muscle'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_front': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ }
+ }
+
+ complete_apps = ['exercises']
\ No newline at end of file
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index ddfa5cd9d..df1ca886c 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -317,21 +317,11 @@ def exercise_image_upload_dir(instance, filename):
return "exercise-images/{0}/{1}".format(instance.exercise.id, filename)
-class ExerciseImage(models.Model):
+class ExerciseImage(AbstractLicenseModel, models.Model):
'''
Model for an exercise image
'''
- IMAGE_LICENSE_CC_BY_SA_3 = '1'
- IMAGE_LICENSE_CC_BY_SA_4 = '3'
- IMAGE_LICENSE_PUBLIC_DOMAIN = '2'
-
- IMAGE_LICENSE = (
- (IMAGE_LICENSE_CC_BY_SA_3, 'CC-BY-SA 3.0'),
- (IMAGE_LICENSE_CC_BY_SA_4, 'CC-BY-SA 4.0'),
- (IMAGE_LICENSE_PUBLIC_DOMAIN, _('Public domain')),
- )
-
exercise = models.ForeignKey(Exercise,
verbose_name=_('Exercise'),
editable=False)
@@ -342,21 +332,6 @@ class ExerciseImage(models.Model):
upload_to=exercise_image_upload_dir)
'''Uploaded image'''
- license = models.CharField(verbose_name=_('License'),
- max_length=2,
- choices=IMAGE_LICENSE,
- default=IMAGE_LICENSE_CC_BY_SA_3)
- '''The license the image is released under'''
-
- license_author = models.CharField(verbose_name=_('Author'),
- max_length=50,
- blank=True,
- null=True,
- help_text=_('If you are not the author of the image, enter '
- 'the name here. This is needed for some licenses '
- 'e.g. the CC-BY-SA.'))
- '''The author of the image if it is not the uploader'''
-
is_main = models.BooleanField(verbose_name=_('Is main picture'),
default=False,
help_text=_("Tick the box if you want to set this image as the "
diff --git a/wger/exercises/views/images.py b/wger/exercises/views/images.py
index 73092f645..18d5ed395 100644
--- a/wger/exercises/views/images.py
+++ b/wger/exercises/views/images.py
@@ -25,6 +25,7 @@ from django.views.generic import DeleteView
from wger.exercises.models import Exercise
from wger.exercises.models import ExerciseImage
+from wger.exercises.forms import ExerciseImageForm
from wger.utils.generic_views import WgerFormMixin
from wger.utils.generic_views import WgerDeleteMixin
@@ -46,6 +47,7 @@ class ExerciseImageEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):
model = ExerciseImage
title = ugettext_lazy('Edit exercise image')
permission_required = 'exercises.change_exerciseimage'
+ form_class = ExerciseImageForm
def get_success_url(self):
return reverse('exercise-view', kwargs={'id': self.object.exercise.id})
@@ -68,6 +70,7 @@ class ExerciseImageAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
model = ExerciseImage
title = ugettext_lazy('Add exercise image')
permission_required = 'exercises.add_exerciseimage'
+ form_class = ExerciseImageForm
def form_valid(self, form):
form.instance.exercise = Exercise.objects.get(pk=self.kwargs['exercise_pk'])
diff --git a/wger/nutrition/migrations/0011_auto__add_field_ingredient_license__add_field_ingredient_license_autho.py b/wger/nutrition/migrations/0011_auto__add_field_ingredient_license__add_field_ingredient_license_autho.py
new file mode 100644
index 000000000..875c26f7a
--- /dev/null
+++ b/wger/nutrition/migrations/0011_auto__add_field_ingredient_license__add_field_ingredient_license_autho.py
@@ -0,0 +1,141 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding field 'Ingredient.license'
+ db.add_column(u'nutrition_ingredient', 'license',
+ self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['core.License']),
+ keep_default=False)
+
+ # Adding field 'Ingredient.license_author'
+ db.add_column(u'nutrition_ingredient', 'license_author',
+ self.gf('django.db.models.fields.CharField')(max_length=50, null=True, blank=True),
+ keep_default=False)
+
+
+ def backwards(self, orm):
+ # Deleting field 'Ingredient.license'
+ db.delete_column(u'nutrition_ingredient', 'license_id')
+
+ # Deleting field 'Ingredient.license_author'
+ db.delete_column(u'nutrition_ingredient', 'license_author')
+
+
+ models = {
+ u'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ u'auth.permission': {
+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ u'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ u'core.language': {
+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})
+ },
+ u'core.license': {
+ 'Meta': {'ordering': "['full_name']", 'object_name': 'License'},
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '60'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+ },
+ u'nutrition.ingredient': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Ingredient'},
+ 'carbohydrates': ('wger.utils.fields.Html5DecimalField', [], {'max_digits': '6', 'decimal_places': '3'}),
+ 'carbohydrates_sugar': ('wger.utils.fields.Html5DecimalField', [], {'null': 'True', 'max_digits': '6', 'decimal_places': '3', 'blank': 'True'}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'energy': ('wger.utils.fields.Html5IntegerField', [], {}),
+ 'fat': ('wger.utils.fields.Html5DecimalField', [], {'max_digits': '6', 'decimal_places': '3'}),
+ 'fat_saturated': ('wger.utils.fields.Html5DecimalField', [], {'null': 'True', 'max_digits': '6', 'decimal_places': '3', 'blank': 'True'}),
+ 'fibres': ('wger.utils.fields.Html5DecimalField', [], {'null': 'True', 'max_digits': '6', 'decimal_places': '3', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.Language']"}),
+ 'license': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': u"orm['core.License']"}),
+ 'license_author': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+ 'protein': ('wger.utils.fields.Html5DecimalField', [], {'max_digits': '6', 'decimal_places': '3'}),
+ 'sodium': ('wger.utils.fields.Html5DecimalField', [], {'null': 'True', 'max_digits': '6', 'decimal_places': '3', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'}),
+ 'update_date': ('django.db.models.fields.DateField', [], {'auto_now': 'True', 'blank': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+ },
+ u'nutrition.ingredientweightunit': {
+ 'Meta': {'object_name': 'IngredientWeightUnit'},
+ 'amount': ('django.db.models.fields.DecimalField', [], {'default': '1', 'max_digits': '5', 'decimal_places': '2'}),
+ 'gramm': ('django.db.models.fields.IntegerField', [], {}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'ingredient': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['nutrition.Ingredient']"}),
+ 'unit': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['nutrition.WeightUnit']"})
+ },
+ u'nutrition.meal': {
+ 'Meta': {'ordering': "['time']", 'object_name': 'Meal'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'max_length': '1', 'blank': 'True'}),
+ 'plan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['nutrition.NutritionPlan']"}),
+ 'time': ('wger.utils.fields.Html5TimeField', [], {'null': 'True', 'blank': 'True'})
+ },
+ u'nutrition.mealitem': {
+ 'Meta': {'object_name': 'MealItem'},
+ 'amount': ('wger.utils.fields.Html5DecimalField', [], {'max_digits': '6', 'decimal_places': '2'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'ingredient': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['nutrition.Ingredient']"}),
+ 'meal': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['nutrition.Meal']"}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'max_length': '1', 'blank': 'True'}),
+ 'weight_unit': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['nutrition.IngredientWeightUnit']", 'null': 'True', 'blank': 'True'})
+ },
+ u'nutrition.nutritionplan': {
+ 'Meta': {'ordering': "['-creation_date']", 'object_name': 'NutritionPlan'},
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2000', 'blank': 'True'}),
+ 'has_goal_calories': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.Language']"}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
+ },
+ u'nutrition.weightunit': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'WeightUnit'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.Language']"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ }
+ }
+
+ complete_apps = ['nutrition']
\ No newline at end of file