From 7f56b2f485ac908fd0aa3b43f208325943ac927e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 26 Mar 2020 19:58:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/exercise/ExerciseNewCommon.js     |  2 +
 .../courses/exercise/new/MainDisplay.js       |  2 +-
 .../courses/exercise/new/NullDisplay.js       |  2 +-
 .../exercise/new/QestionDisplayHeader.js      |  4 +-
 .../courses/exercise/new/ShixunDisplay.js     |  2 +-
 .../courses/exercise/new/ShixunProgramming.js | 38 +++++++++----------
 .../courses/exercise/new/SingleDisplay.js     |  4 +-
 .../modules/courses/exercise/new/common.js    |  2 +
 8 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/ExerciseNewCommon.js b/public/react/src/modules/courses/exercise/ExerciseNewCommon.js
index 9101a4974..677a09f8f 100644
--- a/public/react/src/modules/courses/exercise/ExerciseNewCommon.js
+++ b/public/react/src/modules/courses/exercise/ExerciseNewCommon.js
@@ -398,6 +398,8 @@ class ExerciseNewCommon extends Component {
       getEditQuestionUrl: this.getEditQuestionUrl,
       exercise_url: this.props.exercise_url,
     }
+    console.log(this.props)
+    console.log(this.state)
     return (
       <React.Fragment>
         <ShixunChooseModal
diff --git a/public/react/src/modules/courses/exercise/new/MainDisplay.js b/public/react/src/modules/courses/exercise/new/MainDisplay.js
index d91cfbc24..4613bd500 100644
--- a/public/react/src/modules/courses/exercise/new/MainDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/MainDisplay.js
@@ -44,7 +44,7 @@ class MainDisplay extends Component{
             <React.Fragment>
               <div style={{color: '#05101A'}} className="font-16 mb5 font-bd">参考答案：</div>
 
-              {this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={standard_answer[0]} selector={'answer_' + qNumber}
+              {!this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={standard_answer[0]} selector={'answer_' + qNumber}
                   className=""
               ></MarkdownToHtml>:<QuillForEditor
                 readOnly={true}
diff --git a/public/react/src/modules/courses/exercise/new/NullDisplay.js b/public/react/src/modules/courses/exercise/new/NullDisplay.js
index 8f4d1bd7b..531d974b9 100644
--- a/public/react/src/modules/courses/exercise/new/NullDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/NullDisplay.js
@@ -82,7 +82,7 @@ class NullDisplay extends Component{
                             <div className="answers">
                                 { answers.answer_text.map((item, itemIndex) => {
                                     return(
-                                      this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml
+                                      !this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml
                                         className="answer" key={itemIndex}
                                         content={item} selector={'null_' + (index + 1) + (_index + 1) + (itemIndex + 1)}
                                       ></MarkdownToHtml>:<QuillForEditor
diff --git a/public/react/src/modules/courses/exercise/new/QestionDisplayHeader.js b/public/react/src/modules/courses/exercise/new/QestionDisplayHeader.js
index 4dc8370d3..44a537c71 100644
--- a/public/react/src/modules/courses/exercise/new/QestionDisplayHeader.js
+++ b/public/react/src/modules/courses/exercise/new/QestionDisplayHeader.js
@@ -29,7 +29,7 @@ class QestionDisplayHeader extends Component{
 
     const qName = qNameArray[question_type]
 
-    // console.log(this.props)
+    console.log(this.props)
     return(
         <React.Fragment>
         <div className="new_li">
@@ -77,7 +77,7 @@ class QestionDisplayHeader extends Component{
             </div>
         </div>
         { question_title &&
-        this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={question_title} selector={'qtitle_' + (index + 1)} style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px' }}
+        !this.props.exercise||this.props.exercise&&this.props.exercise.is_md||this.props.question_type===6?<MarkdownToHtml content={question_title} selector={'qtitle_' + (index + 1)} style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px' }}
 
          ></MarkdownToHtml>:<QuillForEditor
           style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px',padding:'0px'}}
diff --git a/public/react/src/modules/courses/exercise/new/ShixunDisplay.js b/public/react/src/modules/courses/exercise/new/ShixunDisplay.js
index f7bccec60..85eb3e12a 100644
--- a/public/react/src/modules/courses/exercise/new/ShixunDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/ShixunDisplay.js
@@ -105,7 +105,7 @@ class ShixunDisplay extends Component{
             ></QestionDisplayHeader>
 
 
-          {this.props.exercise&&this.props.exercise.is_md?<div className="mainQuestionDisplay color-grey-9 markdown-body"
+          {!this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<div className="mainQuestionDisplay color-grey-9 markdown-body"
                 dangerouslySetInnerHTML={{__html: markdownToHTML(question_title)}}
             >
             </div>:<QuillForEditor
diff --git a/public/react/src/modules/courses/exercise/new/ShixunProgramming.js b/public/react/src/modules/courses/exercise/new/ShixunProgramming.js
index 14dec06b8..9be9dd4cc 100644
--- a/public/react/src/modules/courses/exercise/new/ShixunProgramming.js
+++ b/public/react/src/modules/courses/exercise/new/ShixunProgramming.js
@@ -1,5 +1,5 @@
 import React,{ Component } from "react";
-import {QuillForEditor,markdownToHTML} from 'educoder';
+import {MarkdownToHtml,QuillForEditor} from 'educoder';
 import QestionDisplayHeader from './QestionDisplayHeader'
 
 
@@ -14,8 +14,8 @@ class ShixunProgramming extends Component{
   componentDidMount = () => {
   }
   render() {
-    let { question_title,
-      question_id, index, shixun_identifier
+    let { description,question_title,
+      question_id, index, shixun_identifier,hack_identifier
     } = this.props;
     const qNumber = `question_${index}`;
 
@@ -36,24 +36,24 @@ class ShixunProgramming extends Component{
               
             `}</style>
 
-        {/*<QestionDisplayHeader {...this.props} question_title={question_title}*/}
-        {/*                      topRight={*/}
-        {/*                        <a target="_blank" href={`/shixuns/${shixun_identifier}/challenges`} className="mr30"*/}
-        {/*                           style={{color: '#4CACFF'}}*/}
-        {/*                        >实训详情</a>*/}
-        {/*                      }*/}
-        {/*></QestionDisplayHeader>*/}
+        <QestionDisplayHeader {...this.props} question_title={question_title}
+                              topRight={
+                                <a target="_blank" href={`/myproblems/${hack_identifier}`} className="mr30"
+                                   style={{color: '#4CACFF'}}
+                                >实训详情</a>
+                              }
+        ></QestionDisplayHeader>
 
 
-        {/*{this.props.exercise&&this.props.exercise.is_md?<div className="mainQuestionDisplay color-grey-9 markdown-body"*/}
-        {/*                                                     dangerouslySetInnerHTML={{__html: markdownToHTML(question_title)}}*/}
-        {/*>*/}
-        {/*</div>:<QuillForEditor*/}
-        {/*  readOnly={true}*/}
-        {/*  style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}*/}
-        {/*  value={question_title?JSON.parse(question_title):""}*/}
-        {/*  // showUploadImage={this.handleShowUploadImage}*/}
-        {/*/>}*/}
+        {description&&
+        !this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={description} selector={'qtitle_' + (index + 1)} style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px' }}
+
+        ></MarkdownToHtml>:<QuillForEditor
+          style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px',padding:'0px'}}
+          readOnly={true}
+          value={description?JSON.parse(description):""}
+          // showUploadImage={this.handleShowUploadImage}
+        />}
 
         {/*{shixun.map((ch, index) => {*/}
         {/*  return <div>*/}
diff --git a/public/react/src/modules/courses/exercise/new/SingleDisplay.js b/public/react/src/modules/courses/exercise/new/SingleDisplay.js
index 1a56fde96..7c008bb07 100644
--- a/public/react/src/modules/courses/exercise/new/SingleDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/SingleDisplay.js
@@ -78,7 +78,7 @@ class SingleDisplay extends Component{
 													flexDirection:"row",
 												}} key={optionIndex}>
                             <Radio disabled className="fl lineh-25 w50" checked={item.standard_boolean}>{prefix}</Radio>
-                          {this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1) + '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }}
+                          {!this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1) + '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }}
 
                             ></MarkdownToHtml>:<QuillForEditor
                             readOnly={true}
@@ -96,7 +96,7 @@ class SingleDisplay extends Component{
 													flexDirection:"row",
 												}} key={optionIndex}>
                             <Checkbox  disabled className="fl lineh-25  w50" checked={item.standard_boolean}>{prefix}</Checkbox>
-                          {this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1)+ '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }}
+                          {!this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1)+ '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }}
 
                             ></MarkdownToHtml>:<QuillForEditor
                           readOnly={true}
diff --git a/public/react/src/modules/courses/exercise/new/common.js b/public/react/src/modules/courses/exercise/new/common.js
index 7c7431196..6510c8536 100644
--- a/public/react/src/modules/courses/exercise/new/common.js
+++ b/public/react/src/modules/courses/exercise/new/common.js
@@ -4,6 +4,7 @@ export const Q_TYPE_JUDGE = 2  // 判断
 export const Q_TYPE_NULL = 3 // 填空
 export const Q_TYPE_MAIN = 4 // 填空
 export const Q_TYPE_SHIXUN = 5  // 实训
+export const Q_TYPE_SHIXUN_BIANCHENG = 6  // 编程题
 
 export const qNameArray = [
     '单选题',
@@ -12,4 +13,5 @@ export const qNameArray = [
     '填空题',
     '简答题',
     '实训题',
+    '编程题'
 ]
\ No newline at end of file