From 2f84965cc58b1349096f51d69c0fb3bb13fb0a09 Mon Sep 17 00:00:00 2001
From: Albin Henriksson <albhe428@student.liu.se>
Date: Thu, 20 May 2021 19:02:32 +0200
Subject: [PATCH] Slides start out as information slides
---
server/app/apis/slides.py | 2 +-
server/app/database/controller/add.py | 37 +++++++--------------------
2 files changed, 10 insertions(+), 29 deletions(-)
diff --git a/server/app/apis/slides.py b/server/app/apis/slides.py
index 654ee49f..b1052c8d 100644
--- a/server/app/apis/slides.py
+++ b/server/app/apis/slides.py
@@ -38,7 +38,7 @@ class SlidesList(Resource):
def post(self, competition_id):
""" Posts a new slide to the specified competition. """
- item_slide = dbc.add.slide(competition_id)
+ item_slide = dbc.add.slide_without_question(competition_id)
return item_response(schema.dump(item_slide))
diff --git a/server/app/database/controller/add.py b/server/app/database/controller/add.py
index 70c2a8c6..9d37c8f8 100644
--- a/server/app/database/controller/add.py
+++ b/server/app/database/controller/add.py
@@ -7,30 +7,15 @@ import os
import app.core.http_codes as codes
import app.database.controller as dbc
from app.core import db
-from app.database.models import (
- Blacklist,
- City,
- Code,
- Competition,
- ComponentType,
- ImageComponent,
- Media,
- MediaType,
- Question,
- QuestionAlternative,
- QuestionAlternativeAnswer,
- QuestionComponent,
- QuestionScore,
- QuestionType,
- Role,
- Slide,
- Team,
- TextComponent,
- User,
- ViewType,
- Whitelist,
-)
-from app.database.types import IMAGE_COMPONENT_ID, QUESTION_COMPONENT_ID, TEXT_COMPONENT_ID
+from app.database.models import (Blacklist, City, Code, Competition,
+ ComponentType, ImageComponent, Media,
+ MediaType, Question, QuestionAlternative,
+ QuestionAlternativeAnswer, QuestionComponent,
+ QuestionScore, QuestionType, Role, Slide,
+ Team, TextComponent, User, ViewType,
+ Whitelist)
+from app.database.types import (IMAGE_COMPONENT_ID, QUESTION_COMPONENT_ID,
+ TEXT_COMPONENT_ID)
from flask import current_app
from flask.globals import current_app
from flask_restx import abort
@@ -140,10 +125,6 @@ def slide(competition_id):
# Add slide
item_slide = db_add(Slide(order, competition_id))
- # Add default question
- question(f"Fråga {item_slide.order + 1}", 10, 1, item_slide.id)
-
- item_slide = dbc.utils.refresh(item_slide)
return item_slide
--
GitLab