bossanyit/workouttest_backoffice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BO 1.33 training program

Browse Source
This commit is contained in:
Tibor Bossanyi (Freelancer)
2021-11-11 21:16:12 +01:00
parent 60927674ee
commit 3a429e714b
13 changed files with 133 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aitrainer_backoffice/aitrainer_backoffice/admin/__init__.py
+2 -1
View File
@@ -15,4 +15,5 @@ from .training_plan_day import TrainingPlanDayAdmin
from .controlling import ControllingAdmin
from .sport import SportAdmin
from .app_text import AppTextAdmin
from .notification import NotificationAdmin
from .notification import NotificationAdmin
from .training_program import TrainingProgramAdmin
aitrainer_backoffice/aitrainer_backoffice/admin/training_plan.py
+1 -1
View File
@@ -100,7 +100,7 @@ class TranslationTrainingPlanInline(admin.TabularInline):
class TrainingPlanAdmin( admin.ModelAdmin):
list_display = ('training_plan_id', 'name', 'internal_name', 'free', 'active')
fields = ('tree', 'name', 'description', 'internal_name', 'free', 'active')
fields = ('tree','training_program', 'name', 'description', 'internal_name', 'free', 'active', 'weeks')
list_editable = ('name', 'internal_name', 'free', 'active')
def save_model(self, request, obj, form, change):
aitrainer_backoffice/aitrainer_backoffice/admin/training_program.py
+13
View File
@@ -0,0 +1,13 @@
from django.contrib import admin
from ..models.training_program import TrainingProgram
class TrainingProgramAdmin(admin.ModelAdmin):
list_display = ('training_program_id', 'name',)
fields = ('name',)
list_editable = ('name',)
admin.site.register(TrainingProgram, TrainingProgramAdmin)
admin.autodiscover()
aitrainer_backoffice/aitrainer_backoffice/locale/hu/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
aitrainer_backoffice/aitrainer_backoffice/locale/hu/LC_MESSAGES/django.po
+31 -22
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-17 10:52+0200\n"
"POT-Creation-Date: 2021-11-11 20:59+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,10 +26,16 @@ msgstr ""
msgid "Image Preview"
msgstr "Kép előnézet"
#: .\aitrainer_backoffice\admin\evaluation.py:29
#: .\aitrainer_backoffice\admin\evaluation.py:27
msgid "Clone the selected evaluation"
msgstr "Kiértékelés klónozása"
#: .\aitrainer_backoffice\admin\exercise_type.py:56
#, fuzzy
#| msgid "exercise_type"
msgid "Clone exercise type"
msgstr "Aktuális gyakorlat"
#: .\aitrainer_backoffice\admin\inline_select_action.py:116
msgid "Actions"
msgstr "Akciók"
@@ -89,7 +95,7 @@ msgstr "App Fordítások"
#: .\aitrainer_backoffice\models\faq.py:34
#: .\aitrainer_backoffice\models\property.py:29
#: .\aitrainer_backoffice\models\sports.py:29
#: .\aitrainer_backoffice\models\training_plan.py:58
#: .\aitrainer_backoffice\models\training_plan.py:61
#: .\aitrainer_backoffice\models\training_plan_day.py:31
#: .\aitrainer_backoffice\models\tutorial.py:45
msgid "Translation"
@@ -105,7 +111,7 @@ msgstr "Fordítás"
#: .\aitrainer_backoffice\models\faq.py:35
#: .\aitrainer_backoffice\models\property.py:30
#: .\aitrainer_backoffice\models\sports.py:30
#: .\aitrainer_backoffice\models\training_plan.py:59
#: .\aitrainer_backoffice\models\training_plan.py:62
#: .\aitrainer_backoffice\models\training_plan_day.py:32
#: .\aitrainer_backoffice\models\tutorial.py:46
msgid "Translations"
@@ -119,25 +125,23 @@ msgstr "Fordítások"
#: .\aitrainer_backoffice\models\split_tests.py:7
#: .\aitrainer_backoffice\models\sports.py:9
#: .\aitrainer_backoffice\models\sports.py:25
#: .\aitrainer_backoffice\models\training_plan.py:14
#: .\aitrainer_backoffice\models\training_plan.py:16
#: .\aitrainer_backoffice\models\training_plan_day.py:11
#: .\aitrainer_backoffice\models\training_plan_day.py:27
#: .\aitrainer_backoffice\models\training_program.py:11
#: .\aitrainer_backoffice\models\tutorial.py:11
msgid "name"
msgstr "Név"
#: .\aitrainer_backoffice\models\customer.py:10
#| msgid "name"
msgid "firstname"
msgstr "Keresztnév"
#: .\aitrainer_backoffice\models\customer.py:28
#| msgid "Customer Property"
msgid "Customer"
msgstr "Ügyfél"
#: .\aitrainer_backoffice\models\customer.py:29
#| msgid "Customer Properties"
msgid "Customers"
msgstr "Ügyfelek"
@@ -288,7 +292,7 @@ msgid "Exercise Parents"
msgstr "Gyakorlat szülők"
#: .\aitrainer_backoffice\models\exercisetree.py:15
#: .\aitrainer_backoffice\models\training_plan.py:17
#: .\aitrainer_backoffice\models\training_plan.py:19
msgid "internal_name"
msgstr ""
@@ -317,12 +321,11 @@ msgstr "GYÍK"
msgid "FAQs"
msgstr "GYÍK"
#: .\aitrainer_backoffice\models\notification.py:20
#: .\aitrainer_backoffice\models\notification.py:21
msgid "Notification"
msgstr ""
#: .\aitrainer_backoffice\models\notification.py:21
#| msgid "Descriptions"
#: .\aitrainer_backoffice\models\notification.py:22
msgid "Notifications"
msgstr ""
@@ -366,32 +369,38 @@ msgstr ""
msgid "Sports"
msgstr ""
#: .\aitrainer_backoffice\models\training_plan.py:23
#: .\aitrainer_backoffice\models\training_plan.py:26
msgid "Training Plan"
msgstr "Edzésprogram"
msgstr "Edzésterv"
#: .\aitrainer_backoffice\models\training_plan.py:24
#: .\aitrainer_backoffice\models\training_plan.py:27
msgid "Training Plans"
msgstr "Edzésprogramok"
msgstr "Edzéstervek"
#: .\aitrainer_backoffice\models\training_plan.py:44
#: .\aitrainer_backoffice\models\training_plan.py:47
msgid "Training Plan Detail"
msgstr "Edzésprogram részlet"
msgstr "Edzésterv részlet"
#: .\aitrainer_backoffice\models\training_plan.py:45
#: .\aitrainer_backoffice\models\training_plan.py:48
msgid "Training Plan Details"
msgstr "Edzésprogram részletek"
msgstr "Edzésterv részletek"
#: .\aitrainer_backoffice\models\training_plan_day.py:15
#| msgid "Training Plan"
msgid "Training Day"
msgstr "Edzésnap"
#: .\aitrainer_backoffice\models\training_plan_day.py:16
#| msgid "Training Plans"
msgid "Training Days"
msgstr "Edzésnapok"
#: .\aitrainer_backoffice\models\training_program.py:15
msgid "Training Program"
msgstr "Edzésprogram"
#: .\aitrainer_backoffice\models\training_program.py:16
msgid "Training Programs"
msgstr "Edzésprogramok"
#: .\aitrainer_backoffice\models\tutorial.py:15
msgid "Tutorial"
msgstr "Tutorial"
aitrainer_backoffice/aitrainer_backoffice/models/training_plan.py
+3
View File
@@ -5,11 +5,13 @@ from django.utils.translation import ugettext_lazy as _
from .enums import LanguageTypes
from ..models import ExerciseType, ExerciseTree
from ..models.training_plan_day import TrainingPlanDay
from ..models.training_program import TrainingProgram
class TrainingPlan(models.Model):
training_plan_id = models.AutoField(primary_key=True)
tree = models.ForeignKey(ExerciseTree,on_delete=models.CASCADE, limit_choices_to={'active':True})
training_program = models.ForeignKey(TrainingProgram, on_delete=models.CASCADE)
name = models.CharField(max_length=100, help_text='The name of the training plan',
verbose_name=_("name"))
description = RichTextField(blank=True, null=True)
@@ -17,6 +19,7 @@ class TrainingPlan(models.Model):
verbose_name=_("internal_name"))
free = models.BooleanField(blank=True)
active = models.BooleanField()
weeks = models.IntegerField(blank=True, null=True )
class Meta:
db_table = 'training_plan'
aitrainer_backoffice/aitrainer_backoffice/models/training_program.py
+19
View File
@@ -0,0 +1,19 @@
from django.db import models
from django.utils.translation import ugettext_lazy as _
from ckeditor.fields import RichTextField
from .enums import LanguageTypes
class TrainingProgram(models.Model):
training_program_id = models.AutoField(primary_key=True)
name = models.CharField(max_length=200, help_text='Unique description name',
verbose_name=_("name"))
class Meta:
db_table = 'training_program'
verbose_name = _("Training Program")
verbose_name_plural = _("Training Programs")
def __str__(self):
return self.name
aitrainer_backoffice/aitrainer_backoffice/settings/deploy.py
+2 -2
View File
@@ -1,7 +1,7 @@
import os
from firebase_admin import initialize_app
BACKOFFICE_VERSION = "1.32"
BACKOFFICE_VERSION = "1.33"
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -51,7 +51,7 @@ INSTALLED_APPS = [
'adminsortable2',
'inline_actions',
'django_cron',
'firebase_admin'
'firebase_admin',
]
MIDDLEWARE = [
aitrainer_backoffice/aitrainer_backoffice/settings/dev.py
+2 -2
View File
@@ -1,7 +1,7 @@
import os
from firebase_admin import initialize_app
BACKOFFICE_VERSION = "1.32"
BACKOFFICE_VERSION = "1.33"
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -35,7 +35,7 @@ INSTALLED_APPS = [
'adminsortable2',
'inline_actions',
'django_cron',
'firebase_admin'
'firebase_admin',
]
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
aitrainer_backoffice/aitrainer_backoffice/settings/prod.py
+1 -1
View File
@@ -1,7 +1,7 @@
import os
from firebase_admin import initialize_app
BACKOFFICE_VERSION = "1.32"
BACKOFFICE_VERSION = "1.33"
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
aitrainer_backoffice/controlling/automation/fcm.py
+3 -1
View File
@@ -55,10 +55,12 @@ class FCM:
return "Registration token is null"
try:
if image_url == None or self.image_base == None:
notification_image_url = self.logo_url
''' if image_url == None or self.image_base == None:
notification_image_url = self.logo_url
else:
notification_image_url = self.image_base + '/' + image_url
'''
print(f'image: {notification_image_url}' )
aitrainer_backoffice/locale/hu/LC_MESSAGES/django.po
+1 -1
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-17 10:52+0200\n"
"POT-Creation-Date: 2021-11-11 20:59+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"