From fc4a56e3694c78225d5e5d292a16b547bd89a595 Mon Sep 17 00:00:00 2001 From: Bossanyi Tibor Date: Sun, 19 Jul 2020 14:44:46 +0200 Subject: [PATCH] exercise_type menu_id --- .../aitrainer_backoffice/models.py | 33 ++++++++++--------- .../aitrainer_backoffice/settings/prod.py | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/aitrainer_backoffice/aitrainer_backoffice/models.py b/aitrainer_backoffice/aitrainer_backoffice/models.py index 39f7c39..ed344bc 100644 --- a/aitrainer_backoffice/aitrainer_backoffice/models.py +++ b/aitrainer_backoffice/aitrainer_backoffice/models.py @@ -2,6 +2,22 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ +class ExerciseTree(models.Model): + item_id = models.AutoField(primary_key=True) + parent_id = models.IntegerField(help_text='This is the parent menu ID. 0 if it is on the top of the tree') + name = models.CharField(max_length=100, help_text='The name should be in English here') + image_url = models.ImageField(upload_to='images/', help_text='The menu image size is 1366x768') + active = models.BooleanField(default=0, blank=True, null=True) + + class Meta: + db_table = 'exercise_tree' + verbose_name = _("Exercise Tree") + verbose_name_plural = _("Exercise Tree Items") + + def __str__(self): + return self.name + + class ExerciseType(models.Model): class UnitTypes(models.TextChoices): REPEAT = 'repeat' @@ -14,6 +30,7 @@ class ExerciseType(models.Model): KG = 'kilogram' exercise_type_id = models.AutoField(primary_key=True) + tree = models.ForeignKey(ExerciseTree, on_delete=models.CASCADE) name = models.CharField(max_length=100, help_text='The name should be in English here') description = models.TextField(max_length=1000, blank=True, null=True, help_text='The description should be in ' 'English here') @@ -74,22 +91,6 @@ class ExerciseTypeTranslation(models.Model): return self.name -class ExerciseTree(models.Model): - item_id = models.AutoField(primary_key=True) - parent_id = models.IntegerField(help_text='This is the parent menu ID. 0 if it is on the top of the tree') - name = models.CharField(max_length=100, help_text='The name should be in English here') - image_url = models.ImageField(upload_to='images/', help_text='The menu image size is 1366x768') - active = models.BooleanField(default=0, blank=True, null=True) - - class Meta: - db_table = 'exercise_tree' - verbose_name = _("Exercise Tree") - verbose_name_plural = _("Exercise Tree Items") - - def __str__(self): - return self.name - - class ExerciseTreeTranslation(models.Model): translation_id = models.AutoField(primary_key=True) tree = models.ForeignKey(ExerciseTree, on_delete=models.CASCADE) diff --git a/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py b/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py index ee40c82..dc35358 100644 --- a/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py +++ b/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py @@ -74,7 +74,7 @@ WSGI_APPLICATION = 'aitrainer_backoffice.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME': 'aitrainer2', + 'NAME': 'aitrainer', 'USER': 'aitrainer', 'PASSWORD': 'andio2009', 'HOST': '127.0.0.1',