From e4322257619f85f0ee52a91b3b3ac4b4b967778b Mon Sep 17 00:00:00 2001
From: Bossanyi Tibor <sw@andio.biz>
Date: Thu, 29 Apr 2021 08:06:33 +0200
Subject: [PATCH] BO 1.12 tutorials direction, branch
---
aitrainer_backoffice/aitrainer_backoffice/admin/tutorial.py | 4 ++--
aitrainer_backoffice/aitrainer_backoffice/models/tutorial.py | 3 ++-
aitrainer_backoffice/aitrainer_backoffice/settings/dev.py | 2 +-
aitrainer_backoffice/aitrainer_backoffice/settings/prod.py | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/aitrainer_backoffice/aitrainer_backoffice/admin/tutorial.py b/aitrainer_backoffice/aitrainer_backoffice/admin/tutorial.py
index f069b54..7638c76 100644
--- a/aitrainer_backoffice/aitrainer_backoffice/admin/tutorial.py
+++ b/aitrainer_backoffice/aitrainer_backoffice/admin/tutorial.py
@@ -10,9 +10,9 @@ class TranslationTutorialInline(admin.TabularInline):
class TutorialStepsAdmin(admin.ModelAdmin):
- list_display = ('tutorial_step_id', 'tutorial', 'check_text', 'step', 'parent')
+ list_display = ('tutorial_step_id', 'tutorial', 'check_text', 'step', 'parent', 'branch')
list_filter = ('tutorial__name',)
- fields = ('tutorial', 'step', "tutorial_text", "error_text", "check_text", "condition", 'get_parent_step', "action")
+ fields = ('tutorial', 'step', "tutorial_text", "check_text", "direction", "condition", 'get_parent_step', 'branch', "action")
list_editable = ('parent',)
readonly_fields = ('get_parent_step',)
diff --git a/aitrainer_backoffice/aitrainer_backoffice/models/tutorial.py b/aitrainer_backoffice/aitrainer_backoffice/models/tutorial.py
index 3517803..d0f2b6c 100644
--- a/aitrainer_backoffice/aitrainer_backoffice/models/tutorial.py
+++ b/aitrainer_backoffice/aitrainer_backoffice/models/tutorial.py
@@ -24,9 +24,10 @@ class TutorialSteps(models.Model):
tutorial = models.ForeignKey(Tutorial, on_delete=models.CASCADE)
step = models.IntegerField(help_text="Tutorial Step")
tutorial_text = RichTextField()
- error_text = RichTextField(blank=True, null=True)
+ direction = models.TextField(max_length=100, blank=True, null=True, help_text="Only for programmers!")
check_text = models.TextField(max_length=50, blank=True, null=True, help_text="Only for programmers!")
condition = models.TextField(max_length=50, blank=True, null=True, help_text="Only for programmers!")
+ branch = models.TextField(max_length=100, blank=True, null=True, help_text="Only for programmers!")
##parent = models.IntegerField(help_text="Tutorial Step Parent. If not defined, then the parent is step-1")
parent = models.ForeignKey('self', blank=True, null=True, related_name='parents', on_delete=models.CASCADE)
action = models.BooleanField(default=0, blank=True, null=True, help_text="Tap, select menu, etc")
diff --git a/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py b/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py
index e10c1c4..f9d173a 100644
--- a/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py
+++ b/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py
@@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/3.0/ref/settings/
import os
-BACKOFFICE_VERSION = 1.10
+BACKOFFICE_VERSION = 1.12
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
diff --git a/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py b/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py
index 229b41a..5a5e68e 100644
--- a/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py
+++ b/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py
@@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/3.0/ref/settings/
import os
-BACKOFFICE_VERSION = 1.10
+BACKOFFICE_VERSION = 1.12
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))