From 50a2699798dfb9bacae5600ba3537af8cca8ee63 Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Sat, 13 Nov 2021 16:32:55 +0100 Subject: [PATCH] output field --- TealCode/main/migrations/0007_topic_output.py | 19 +++++++++++++++++++ .../migrations/0008_alter_topic_output.py | 18 ++++++++++++++++++ TealCode/main/models.py | 1 + TealCode/main/templates/main/topic.html | 8 ++++++-- TealCode/main/views.py | 1 + 5 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 TealCode/main/migrations/0007_topic_output.py create mode 100644 TealCode/main/migrations/0008_alter_topic_output.py diff --git a/TealCode/main/migrations/0007_topic_output.py b/TealCode/main/migrations/0007_topic_output.py new file mode 100644 index 0000000..c27b2f9 --- /dev/null +++ b/TealCode/main/migrations/0007_topic_output.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.9 on 2021-11-13 15:29 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0006_auto_20211112_0855'), + ] + + operations = [ + migrations.AddField( + model_name='topic', + name='output', + field=models.TextField(default='test'), + preserve_default=False, + ), + ] diff --git a/TealCode/main/migrations/0008_alter_topic_output.py b/TealCode/main/migrations/0008_alter_topic_output.py new file mode 100644 index 0000000..c2224f2 --- /dev/null +++ b/TealCode/main/migrations/0008_alter_topic_output.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.9 on 2021-11-13 15:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0007_topic_output'), + ] + + operations = [ + migrations.AlterField( + model_name='topic', + name='output', + field=models.TextField(blank=True), + ), + ] diff --git a/TealCode/main/models.py b/TealCode/main/models.py index 9439369..d76a65b 100644 --- a/TealCode/main/models.py +++ b/TealCode/main/models.py @@ -14,6 +14,7 @@ class Category(models.Model): class Topic(models.Model): title = models.CharField(max_length=200) code_text = models.TextField() + output = models.TextField(blank=True) date_created = models.DateTimeField(default=timezone.now) category = models.ForeignKey(Category, on_delete=models.CASCADE) version = models.CharField(max_length=100, blank=True) diff --git a/TealCode/main/templates/main/topic.html b/TealCode/main/templates/main/topic.html index 64b8a43..4033f8d 100644 --- a/TealCode/main/templates/main/topic.html +++ b/TealCode/main/templates/main/topic.html @@ -28,10 +28,14 @@
{{code}}
- + {% if output %} +
+
#Output: {{output}}
+ {% endif %} + {% if version %}
-

{{version}}

+

Tested in version: {{version}}

{% endif %} diff --git a/TealCode/main/views.py b/TealCode/main/views.py index f422dc8..fd81080 100644 --- a/TealCode/main/views.py +++ b/TealCode/main/views.py @@ -21,6 +21,7 @@ def topic(req, category, topic): 'version': topic_obj.version, 'previous': previous_obj, 'next': next_obj, + 'output': topic_obj.output, } return render(req, "main/topic.html", context)