Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/models/homework_common.rb

@@ -35,7 +35,7 @@ class HomeworkCommon < ApplicationRecord
   has_many :homework_review_results, :dependent => :destroy
 
   validates :name, length: { maximum: 60 }
-  validates :description, length: { maximum: 5000 }
+  validates :description, length: { maximum: 15000 }
   validates :reference_answer, length: { maximum: 5000 }
 
   # after_update :update_activity

db/migrate/20190726082937_add_is_md_for_homeworks.rb

@@ -0,0 +1,12 @@
+class AddIsMdForHomeworks < ActiveRecord::Migration[5.2]
+  def change
+    # add_column :homework_commons, :is_md, :boolean, :default => true
+    # add_column :homework_banks, :is_md, :boolean, :default => true
+    #
+    #
+    # add_column :exercise_questions,:is_md, :boolean, :default => true
+    # add_column :poll_questions,:is_md, :boolean, :default => true
+    #
+    # add_column :exercise_bank_questions, :is_md, :boolean, :default => true
+  end
+end

db/migrate/20190726083814_migrate_course_is_md.rb

@@ -0,0 +1,14 @@
+class MigrateCourseIsMd < ActiveRecord::Migration[5.2]
+  def change
+    # HomeworkCommon.where(homework_type: [1, 3]).where("created_at < '2019-07-21 00:00:00'").update_all(is_md: false)
+    # HomeworkBank.where(homework_type: [1, 3]).where("created_at < '2019-07-21 00:00:00'").update_all(is_md: false)
+    #
+    # HomeworkCommon.where(homework_type: [1, 3]).where("created_at >= '2019-07-21 00:00:00' and homework_bank_id is not null").each do |homework|
+    #
+    # end
+    #
+    # ExerciseQuestion.where("created_at < '2019-07-21 00:00:00'").update_all(is_md: false)
+    # PollQuestion.where("created_at < '2019-07-21 00:00:00'").update_all(is_md: false)
+    # ExerciseBankQuestion.where("created_at < '2019-07-21 00:00:00'").update_all(is_md: false)
+  end
+end

public/react/src/common/TextUtil.js

@@ -6,26 +6,30 @@ export function isImageExtension(fileName) {
 export function markdownToHTML(oldContent, selector) {
     window.$('#md_div').html('')
     // markdown to html
-    try {    
-    var markdwonParser = window.editormd.markdownToHTML("md_div", {
-        markdown: oldContent, // .replace(/▁/g,"▁▁▁"),
-        emoji: true,
-        htmlDecode: "style,script,iframe",  // you can filter tags decode
-        taskList: true,
-        tex: true,  // 默认不解析
-        flowChart: true,  // 默认不解析
-        sequenceDiagram: true // 默认不解析
-    });
+    if (selector && oldContent && oldContent.startsWith('<p')) {  // 普通html处理
+        window.$(selector).html(oldContent)
+    } else {
+        try {    
+        var markdwonParser = window.editormd.markdownToHTML("md_div", {
+            markdown: oldContent, // .replace(/▁/g,"▁▁▁"),
+            emoji: true,
+            htmlDecode: "style,script,iframe",  // you can filter tags decode
+            taskList: true,
+            tex: true,  // 默认不解析
+            flowChart: true,  // 默认不解析
+            sequenceDiagram: true // 默认不解析
+        });
 
-    } catch(e) {
-        console.error(e)
+        } catch(e) {
+            console.error(e)
+        }
+        
+        const content = window.$('#md_div').html()
+        if (selector) {
+            window.$(selector).html(content)
+        }
+        return content
     }
-    
-    const content = window.$('#md_div').html()
-    if (selector) {
-        window.$(selector).html(content)
-    }
-    return content
 }
 
 export function appendFileSizeToUploadFile(item) {

public/react/src/modules/courses/busyWork/CommonWorkQuestion.js

@@ -87,7 +87,7 @@ class CommonWorkQuestion extends Component{
         
         {/* 内容区 */}
         <div className="padding40 memoContent new_li">
-          <MarkdownToHtml content={description}></MarkdownToHtml>
+          <MarkdownToHtml content={description} selector="work_content"></MarkdownToHtml>
 
           { attachments && attachments.map((item) => {
             return ( <div className="color-grey">

public/react/src/modules/login/LoginDialog.js

@@ -13,6 +13,7 @@ import axios from 'axios';
 
 import './LoginDialog.css';
 import { broadcastChannelPostMessage } from 'educoder'
+import Notcompletedysl from "../user/Notcompletedysl";
 
 const $ = window.$;
 var wait = 60;
@@ -100,6 +101,7 @@ class LoginDialog extends Component {
         authCodeType:true,
         authCodeclass:'log-botton mt5',
         isRender: false,
+        MyEduCoderModals:false,
 
       };
     }
@@ -365,11 +367,12 @@ class LoginDialog extends Component {
 										description:response.data.message,
 									});
 								}else{
-                  if(response.data.identity === null || response.data.identity === undefined){
-                    this.props.history.push("/interesse");
+                  if(response.data.profile_completed !== null || response.data.profile_completed === false){
+                    this.setMyEduCoderModals();
                     return;
                   }
-                    broadcastChannelPostMessage('refreshPage')
+
+                  broadcastChannelPostMessage('refreshPage')
                     this.setState({
                         isRender:false
                     })
@@ -388,17 +391,28 @@ class LoginDialog extends Component {
             console.log(error)
         })
 
-    }
+    };
+  setNotcompleteds=()=>{
+    this.setState({
+      Notcompleteds:true,
+      MyEduCoderModals:false
+    })
+  };
+  setMyEduCoderModals=()=>{
+    this.setState({
+      MyEduCoderModals:true
+    })
+  };
     onKeydowns=(e)=>{
         let {disabled}=this.state;
         if( disabled===false&& e.keyCode === 13){
             this.loginEDU()
             console.log(1)
         }
-    }
+    };
   getloginurl=(url)=>{
     window.location.href = url;
-  }
+  };
     render() {
       let{open,login,speedy,loginValue,regular,isGoing,isGoingValue,disabled,bottonclass,
         dialogBox,shortcutnum,disabledType,gaincode,authCodeType,authCodeclass, isRender}=this.state;
@@ -414,6 +428,10 @@ class LoginDialog extends Component {
 							disableBackdropClick={true}
               onClose={() => this.handleDialogClose()}
             >
+        <Notcompletedysl
+          modalsType={this.state.MyEduCoderModals}
+          setNotcompleteds={()=>{this.setNotcompleteds()}}
+        />
 				{isRender===true?
             <div className={dialogBox}>
                   <div id="closeIcon" onClick={()=>{this.handleDialogClose()}}>

public/react/src/modules/user/FindPasswordComponent.js

@@ -691,7 +691,7 @@ class LoginRegisterComponent extends Component {
 						<Input style={loginInputsyl} type="text" autoComplete="off" onClick={this.changeTypey}
 									 className={Phonenumberisnotco && Phonenumberisnotco !== "" ?" color-grey-9 loginInputzhucheyslass bor-reds":" color-grey-9 loginInputzhuche"}
 									 placeholder="输入注册手机号或邮箱" value={this.state.login}
-									 onBlur={(e) => this.inputOnBlurzhuche(e)}
+									 // onBlur={(e) => this.inputOnBlurzhuche(e)}
 									 onChange={this.loginInputonChange} style={{marginTop: '10px', height: "38px"}}></Input>
 						{
 							Phonenumberisnotco && Phonenumberisnotco !== "" ?

public/react/src/modules/user/LoginRegisterComponent.js

@@ -340,8 +340,8 @@ class LoginRegisterComponent extends Component {
 
             }
 
-            if(response.data.identity === null || response.data.identity === undefined){
-                this.props.history.push("/interesse");
+            if(response.data.profile_completed !== null || response.data.profile_completed === false){
+                this.setMyEduCoderModals();
                 return;
             }
 
@@ -1028,7 +1028,7 @@ class LoginRegisterComponent extends Component {
                                    value={this.state.logins}
                                    type="text" autoComplete="off"
                                    onChange={this.loginInputonChanges}
-                                    onBlur={(e) => this.inputOnBlurzhuche(e, 2)}
+                                    // onBlur={(e) => this.inputOnBlurzhuche(e, 2)}
                                    style={{marginTop: '30px' , height: '38px',color:'#999999',fontSize:"14px"}}></Input>
                             {
                                 Phonenumberisnotcos && Phonenumberisnotcos !== "" ?

public/react/src/modules/user/account/AccountBasicEdit.js

@@ -402,6 +402,7 @@ class AccountBasic extends Component {
       filterDepartments,
       school,
       school_id,
+      departments,
       departmentsName,
       identity
     }=this.state;
@@ -718,7 +719,9 @@ class AccountBasic extends Component {
             </Form.Item>
               
               {
-                (!filterDepartments || (filterDepartments && filterDepartments.length==0 ) || (departmentsName == '' && !this.state.department_id))  && 
+                (!filterDepartments || (filterDepartments && filterDepartments.length==0 ) 
+                    || (departmentsName == '' && !this.state.department_id 
+                        && (!departments || departments.length == 0) ))  && 
                 <div style={{marginLeft: '113px',height:"20px",lineHeight:"20px"}}>
                   <span>
                     <span style={{color: '#CDCDCD'}}>{departmentsName ? `未找到包含“${departmentsName}”的院系/部门` : '未找到院系'}，</span>