show threads (but not send messages to them yet)

Author: VorontsovIE

ennead/app.py

@@ -8,6 +8,7 @@
 
 from ennead.views.auth import register, register_page, login, login_page, logout
 from ennead.views.tasks import index
+from ennead.views.dialogue import student_thread_page
 
 from ennead.models.base import database
 from ennead.models.user import User
@@ -49,6 +50,8 @@ def create_app(config_path: Optional[str] = None) -> Flask:
     app.add_url_rule('/login', 'login_page', login_page)
     app.add_url_rule('/login', 'login', login, methods=['POST'])
     app.add_url_rule('/logout', 'logout', logout)
+    
+    app.add_url_rule('/student_thread_page/<int:task_id>', 'student_thread_page', student_thread_page)
 
     return app
 

ennead/models/task.py

@@ -26,6 +26,10 @@ class TaskSet(BaseModel):
     tasks: List['Task']
     threads: List['Thread']
 
+    @property
+    def ordered_tasks(self) -> List["Task"]:
+        return sorted(self.tasks, key=lambda task: task.order_num)
+
 
 class Task(BaseModel):
     """One task for student
@@ -35,12 +39,14 @@ class Task(BaseModel):
         description: `Task` description in Markdown
         base_score: basic maximal score for `Task`
         task_set: set this `Task` belongs to
+        order_num: order of this `Task` in a `TaskSet`
         threads: list of `Thread`s about this `Task`
     """
 
     name: str = CharField()
     description: str = TextField()
     base_score: int = IntegerField()
+    order_num: int = IntegerField()
     task_set: TaskSet = ForeignKeyField(TaskSet, backref='tasks')
 
     threads: List['Thread']

ennead/models/thread.py

@@ -3,7 +3,7 @@
 import datetime
 from typing import List
 
-from peewee import DateTimeField, IntegerField, TextField, ForeignKeyField
+from peewee import DateTimeField, IntegerField, DecimalField, TextField, ForeignKeyField
 
 from ennead.models.user import User
 from ennead.models.task import Task
@@ -21,11 +21,19 @@ class Thread(BaseModel):
     """
 
     task: Task = ForeignKeyField(Task, backref='threads')
-    score: int = IntegerField()
+    score: float = DecimalField(default=0)
     student: User = ForeignKeyField(User, backref='threads')
 
     posts: List['Post']
 
+    def ordered_posts(self, show_hidden=False):
+        posts = self.posts
+        if show_hidden:
+            posts = filter(lambda post: not post.hidden, posts)
+        posts = sorted(posts, key=lambda post: post.date)
+        return posts
+    
+
 
 class Post(BaseModel):
     """One post in `Thread` with `User` about `Task`

ennead/models/user.py

@@ -79,7 +79,7 @@ def is_teacher(self) -> bool:
         return self.group == UserGroup.teacher
 
     @property
-    def score(self) -> int:
+    def score(self) -> float:
         """Get `User`s score in current task set"""
 
         return sum(

ennead/static/style.css

@@ -14,3 +14,24 @@
 	position: relative;
 	top: 0.05em;
 }
+
+.post {
+	border: 1px solid black;
+	margin: 10px 0;
+	padding: 10px;
+}
+.post-teacher {
+	text-align: right;
+	background-color: lightblue;
+}
+.post-student {
+	text-align: left;
+	background-color: white;
+}
+
+.message-form {
+
+}
+.message-form textarea {
+	width: 100%;
+}

ennead/templates/dialogue.html

@@ -0,0 +1,31 @@
+{% extends 'base.html' %}
+
+{% block title %}{{task.order}}. {{ task.name }}{% endblock %}
+
+{% block body %}
+	<div class="row">
+		<div class="col-4 offset-4">
+			<h3>{{ task.order }}{{ task.name }}</h3>
+			<p class="score">Максимальный балл: {{ task.base_score }}</p>
+			<p class="task-description">{{ task.description }}</p>
+			<!-- <p>Отладочная инфа: {{sorted_posts}}</p> -->
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-8 offset-2">
+			{% for post in thread.ordered_posts(show_hidden=False): %}
+				<div class="post {{ 'post-teacher' if post.author.is_teacher else 'post-student' }}">
+					<div class="post-body">{{ post.text }}</div>
+				</div>
+			{% endfor %}
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-8 offset-2">
+			<form class="message-form">
+				<textarea name="text" placeholder="Решение задачи"></textarea>
+				<button class="btn btn-primary float-right" type="submit">Отправить</button>
+			</form>
+		</div>
+	</div>
+{% endblock %}

ennead/views/dialogue.py

@@ -0,0 +1,20 @@
+"""Views for dialogues"""
+
+import datetime
+from flask import g
+
+from flask import session, current_app, render_template, request, redirect, url_for
+from werkzeug.wrappers import Response
+
+from ennead.utils import require_logged_in
+from ennead.models.user import User, UserGroup
+from ennead.models.task import Task
+from ennead.models.thread import Thread, Post
+
+
+@require_logged_in
+def student_thread_page(task_id: int) -> Response:
+    """GET /thread/{task}: show student's thread for a specified task"""
+    task = Task.get_by_id(task_id)
+    thread, _ = Thread.get_or_create(task=task_id, student=g.user)
+    return render_template('dialogue.html', task=task, thread=thread)

populate_db.py

@@ -0,0 +1,58 @@
+import datetime
+from ennead.config import Config
+
+from ennead.models.base import database
+from ennead.models.user import User, UserGroup
+from ennead.models.task import TaskSet, Task
+from ennead.models.thread import Thread, Post
+
+config_path = 'ennead.json'
+if config_path:
+    config = Config.from_filename(config_path)
+else:
+    config = Config()
+
+database.initialize(config.DB_CLASS(config.DB_NAME, **config.DB_PARAMS))
+database.create_tables([User, Task, TaskSet, Thread, Post])
+
+student = User(
+    username = 'test',
+    email = 'test@test.com',
+    registered_at = datetime.datetime.now(),
+    first_name = 'Иван',
+    surname = 'Петров',
+    patronym = 'Иванович',
+    group = UserGroup.student)
+student.set_password('password')
+student.save()
+
+teacher = User(
+    username = 'prep',
+    email = 'prep@test.com',
+    registered_at = datetime.datetime.now(),
+    first_name = 'Препод',
+    surname = 'Злой',
+    patronym = '',
+    group = UserGroup.teacher)
+teacher.set_password('password')
+teacher.save()
+
+
+prev_task_set = TaskSet.create(name='Старая заочка', active=True)
+task_set = TaskSet.create(name='Текущая заочка', active=True)
+
+task_1_1 = Task.create(order_num=1, name='Очень старая задача #1', description='Когда трава была зеленее', base_score=1, task_set=prev_task_set)
+task_1_2 = Task.create(order_num=2, name='Очень старая задача #2', description='И задачи были забористей', base_score=1, task_set=prev_task_set)
+
+task_2_1 = Task.create(order_num=1, name='Задача первая', description='Самая первая', base_score=1, task_set=task_set)
+task_2_2 = Task.create(order_num=3, name='Задача последняя', description='Хардкор', base_score=42, task_set=task_set)
+task_2_3 = Task.create(order_num=2, name='Задача два', description='Посложнее', base_score=5, task_set=task_set)
+
+thread_1 = Thread.create(student=student, task=task_2_1)
+thread_2 = Thread.create(student=student, task=task_2_2)
+
+post_1_1 = Post.create(thread=thread_1, text='Первый нах', date = datetime.datetime.now(), author=student)
+post_1_2 = Post.create(thread=thread_1, text='Так себе решение. Пока 0 баллов', date = datetime.datetime.now(), author=teacher)
+post_1_3 = Post.create(thread=thread_1, text='Ну ладно, 2+2=3', date = datetime.datetime.now(), author=student)
+post_1_3 = Post.create(thread=thread_1, text='Ой, 2+2=4', date = datetime.datetime.now(), author=student)
+post_1_4 = Post.create(thread=thread_1, text='Ок, угадал. 1 балл', date = datetime.datetime.now(), author=teacher)