Resolve "Add correcting instructions in question"

client/src/interfaces/ApiModels.ts

@@ -56,6 +56,7 @@ export interface Question extends NameID {
   slide_id: number
   total_score: number
   type_id: number
+  correcting_instructions: string
 }
 
 export interface QuestionAlternative {

client/src/interfaces/ApiRichModels.ts

@@ -36,5 +36,6 @@ export interface RichQuestion {
   total_score: number
   question_type: QuestionType
   type_id: number
+  correcting_instructions: string
   alternatives: QuestionAlternative[]
 }

client/src/pages/presentationEditor/components/slideSettingsComponents/Instructions.tsx

@@ -30,7 +30,7 @@ const Instructions = ({ activeSlide, competitionId }: InstructionsProps) => {
             .put(
               `/api/competitions/${competitionId}/slides/${activeSlide.id}/questions/${activeSlide.questions[0].id}`,
               {
-                instructions: event.target.value,
+                correcting_instructions: event.target.value,
               }
             )
             .then(() => {
@@ -56,7 +56,7 @@ const Instructions = ({ activeSlide, competitionId }: InstructionsProps) => {
         <Center>
           <TextField
             id="outlined-basic"
-            defaultValue={''}
+            defaultValue={activeSlide.questions[0].correcting_instructions}
             onChange={updateInstructionsText}
             variant="outlined"
             fullWidth={true}

client/src/pages/views/components/JudgeScoringInstructions.tsx

@@ -20,7 +20,7 @@ const JudgeScoringInstructions = ({ question }: JudgeScoringInstructionsProps) =
   return (
     <JudgeScoringInstructionsContainer elevation={3}>
       <Typography variant="h4">Rättningsinstruktioner</Typography>
-      <Typography variant="body1">Såhär rättar du denhär frågan</Typography>
+      <Typography variant="body1">{question?.correcting_instructions}</Typography>
     </JudgeScoringInstructionsContainer>
   )
 }

server/app/apis/questions.py

@@ -14,11 +14,13 @@ question_parser_add = reqparse.RequestParser()
 question_parser_add.add_argument("name", type=str, default=None, location="json")
 question_parser_add.add_argument("total_score", type=int, default=None, location="json")
 question_parser_add.add_argument("type_id", type=int, required=True, location="json")
+question_parser_add.add_argument("correcting_instructions", type=str, default=None, location="json")
 
 question_parser_edit = reqparse.RequestParser()
 question_parser_edit.add_argument("name", type=str, default=sentinel, location="json")
 question_parser_edit.add_argument("total_score", type=int, default=sentinel, location="json")
 question_parser_edit.add_argument("type_id", type=int, default=sentinel, location="json")
+question_parser_edit.add_argument("correcting_instructions", type=str, default=sentinel, location="json")
 
 
 @api.route("/questions")

server/app/core/rich_schemas.py

@@ -25,6 +25,7 @@ class QuestionSchemaRich(RichSchema):
     total_score = ma.auto_field()
     slide_id = ma.auto_field()
     type_id = ma.auto_field()
+    correcting_instructions = ma.auto_field()
     alternatives = fields.Nested(schemas.QuestionAlternativeSchema, many=True)
 
 

server/app/core/schemas.py

@@ -63,6 +63,7 @@ class QuestionSchema(BaseSchema):
     total_score = ma.auto_field()
     type_id = ma.auto_field()
     slide_id = ma.auto_field()
+    correcting_instructions = ma.auto_field()
 
 
 class QuestionAnswerSchema(BaseSchema):

server/app/database/controller/add.py

@@ -244,12 +244,12 @@ def user(email, password, role_id, city_id, name=None):
     return db_add(User(email, password, role_id, city_id, name))
 
 
-def question(name, total_score, type_id, slide_id):
+def question(name, total_score, type_id, slide_id, correcting_instructions=None):
     """
     Adds a question to the specified slide using the provided arguments.
     """
 
-    return db_add(Question(name, total_score, type_id, slide_id))
+    return db_add(Question(name, total_score, type_id, slide_id, correcting_instructions))
 
 
 def question_alternative(text, value, question_id):

server/app/database/controller/copy.py

@@ -24,6 +24,7 @@ def _question(item_question_old, slide_id):
             item_question_old.total_score,
             item_question_old.type_id,
             slide_id,
+            item_question_old.correcting_instructions,
         )
     )
 

server/app/database/models.py

@@ -154,15 +154,17 @@ class Question(db.Model):
     total_score = db.Column(db.Integer, nullable=False, default=1)
     type_id = db.Column(db.Integer, db.ForeignKey("question_type.id"), nullable=False)
     slide_id = db.Column(db.Integer, db.ForeignKey("slide.id"), nullable=False)
+    correcting_instructions = db.Column(db.Text, nullable=True, default=None)
 
     question_answers = db.relationship("QuestionAnswer", backref="question")
     alternatives = db.relationship("QuestionAlternative", backref="question")
 
-    def __init__(self, name, total_score, type_id, slide_id):
+    def __init__(self, name, total_score, type_id, slide_id, correcting_instructions):
         self.name = name
         self.total_score = total_score
         self.type_id = type_id
         self.slide_id = slide_id
+        self.correcting_instructions = correcting_instructions
 
 
 class QuestionAlternative(db.Model):