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

app/controllers/ec_course_evaluations_controller.rb

@@ -169,7 +169,8 @@ class EcCourseEvaluationsController < ApplicationController
             else
               score_count = @ce.evluation_count * length
               EcStudentAchievement.where(:ec_course_evaluation_subitem_id => subitems.pluck(:id)).destroy_all
-              score_type = worksheet.cell(2, score_count+1) && worksheet.cell(2, score_count+2) ? 1 : 2
+              score_type = worksheet.cell(1, 1) && worksheet.cell(1, 1).try(:strip) == "学号" ? 1 : 2
+
               if score_type == 2 && rows > 3
                 render :json => {status: 0, message: "平均成绩只能有一行数据"}
               else

app/controllers/ec_courses_controller.rb

@@ -361,8 +361,8 @@ class EcCoursesController < ApplicationController
     respond_to do |format|
       format.json{
         courses_data = []
-        courses.each do |c|
+        courses.includes(:teacher).each do |c|
-          courses_data << {id: c.id, name: c.name, created_at: (c.created_at).strftime('%Y-%m-%d'), end_time: c.end_date.present? ? c.end_date.strftime('%Y-%m-%d') : ''}
+          courses_data << {id: c.id, name: c.name, creator_name: c.teacher.show_real_name, created_at: (c.created_at).strftime('%Y-%m-%d'), end_time: c.end_date.present? ? c.end_date.strftime('%Y-%m-%d') : ''}
         end
         render :json => {courses: courses_data}
       }

app/views/competitions/_gq_second_code_competition.html.erb

@@ -109,7 +109,7 @@
         </li>
       </ul>
       <p class="break_word font-18 challenge_describe">
-        标注说明：每个小组选择一种编程语言的题目，针对标注任务中指定的标注模块，要求对代码模块、模块中的代码文件， 以及文件中的函数必须进行标注，关键代码块、代码行及关键变量等由参赛者自由选择进行标注。 正式赛第一阶段的比赛在标注阶段就开放查看所有人的标注，请大家根据个人理解，写出自己的风格。我们将综合考虑标注的原创性、准确性、 完整性和多样性等不同的维度对标注质量进行评分。<%= challenge_description_extra[i] %>
+        标注说明：每个小组选择一个项目，针对标注任务中指定的标注模块，要求对代码模块、模块中的代码文件， 以及文件中的函数必须进行标注，关键代码块、代码行及关键变量等由参赛者自由选择进行标注。请大家根据个人理解，写出自己的风格。我们将综合考虑标注的原创性、准确性、 完整性和多样性等不同的维度对标注质量进行评分。<%= challenge_description_extra[i] %>
       </p>
 
       <ul class="mt30 clearfix">

public/react/public/css/css_min_all.css

@@ -4,7 +4,9 @@ html{height:100%;}
 .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
 .newMain{ margin: 0 auto; padding-bottom: 155px; min-width:1200px }
 .newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;}
-.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:99998}
+.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;
+    /*position: fixed;*/
+    top: 0px;left: 0px;z-index:99998}
 /* 重置样式 */
 body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;}
 table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5; color:#333;}

public/react/public/css/edu-common.css

@@ -4,7 +4,9 @@ html{height:100%;}
 .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
 .newMain{ margin: 0 auto; padding-bottom: 155px; min-width:1200px }
 .newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;}
-.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:99998}
+.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;
+    /*position: fixed;*/
+    top: 0px;left: 0px;z-index:99998}
 /* 重置样式 */
 body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;}
 table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5; color:#333;}

public/react/src/modules/ec/css/ecCourseEvaluations.css

@@ -554,4 +554,8 @@ a.TrainingLecturer:hover{
 
  .ant-input{
   border-color: #d9d9d9 !important;
- }
+ }
+
+.mt60{
+  margin-top:60px;
+}

public/react/src/modules/ec/css/ecCourseSupports.css

@@ -345,4 +345,8 @@ input{
  .ant-select-selection{
   -webkit-box-shadow: 0 0 0 2px transparent !important;
   box-shadow: 0 0 0 2px transparent !important;
- }
+ }
+
+.mt60{
+  margin-top:60px;
+}

public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js

@@ -827,8 +827,9 @@ class ecCourseEvaluations extends Component {
                     <div className="clearfix mt20">
                         <ul style={{width:'100%'}}>
                             <li className="column-1 fl ml60">课堂名称</li>
-                            <li className="column-1 fl ml120">创建时间</li>
+                            <li className="column-1 fl ml120">创建者</li>
-                            <li className="column-1 fl ml120">结束时间</li>
+                            <li className="column-1 fl ml60">创建时间</li>
+                            <li className="column-1 fl ml60">结束时间</li>
                         </ul>
                     </div>
 
@@ -840,8 +841,9 @@ class ecCourseEvaluations extends Component {
                                     <Radio className="fl" id={item.id}  checked={checkevalue===item.id?true:false} onChange={this.onChangechecked}></Radio>
                                       <li className="column-1 fl ml5 assclasslistmidname">{item.name}</li>
                                     </li>
-                                    <li className="column-1 fl ml18">{item.created_at}</li>
+                                    <li className="column-1 fl ml18 assclasslistmidname" style={{width: '60px'}} >{item.creator_name}</li>
-                                    <li className="column-1 fl ml90">{item.end_time}</li>
+                                    <li className="column-1 fl ml30">{item.created_at}</li>
+                                    <li className="column-1 fl ml40">{item.end_time}</li>
                                 </ul>
                                 )
                         })}
@@ -856,7 +858,7 @@ class ecCourseEvaluations extends Component {
                         >确定</a>
                     </div>
                 </Modal>
-                <div className="educontent mb40">
+                <div className="educontent mb40 mt60">
 
                     <EcTitleCourseEvaluations
                         {...this.props}

public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js

@@ -663,7 +663,7 @@ class EcCourseEvaluationsbottom extends Component {
       } = this.state;
 	    return (
         <div className="newMain clearfix">
-          <div className="educontent mb50">
+          <div className="educontent mb50 mt60">
               <Modal
                   title={titlemessages}
                   // visible={modeldelet===true&&listid===list.id?true:false}

public/react/src/modules/ec/ecCourseSupportSetting/index.js

@@ -243,7 +243,7 @@ class EcCourseSupportSetting extends Component {
 
     return (
       <div className="newMain clearfix courseSupport">
-        <div className="educontent mb50">
+        <div className="educontent mb50 mt60">
             <EcTitleCourseEvaluations
                 {...this.props}
                 schooldata={schooldata}

public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js

@@ -470,7 +470,7 @@ class ecCourseSupports extends Component {
                 </Modal>
 
 
-                <div className="educontent mb290">
+                <div className="educontent mb290 mt60">
 
                     <EcTitleCourseEvaluations
                         {...this.props}

public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.css

@@ -19,4 +19,8 @@
 .additecGrade{
     margin-top: 2px;
     display: inline-block;
+}
+
+.mt60{
+    margin-top:60px;
 }

public/react/src/modules/ec/ecStudentList/ecStudentList.css

@@ -37,4 +37,8 @@
     color:#afafaf;
     background:#fff;
     line-height:24px;
+}
+
+.mt60{
+    margin-top:60px;
 }

public/react/src/modules/ec/graduatesRequirement/style.css

@@ -67,4 +67,8 @@
 .graduatesRequirement .ant-table-thead > tr:hover:not(.ant-table-expanded-row) > td, 
 .graduatesRequirement .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td {
   background: transparent !important;
+}
+
+.mt60{
+    margin-top:60px;
 }

public/stylesheets/educoder/edu-all.css

@@ -1,6 +1,8 @@
 /*--------------------------首页*/
 /*头部导航条样式---2018-03-19--by-cs*/
-.newHeader{background: #24292D;width:100%; height: 60px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);}
+.newHeader{background: #24292D;width:100%; height: 60px; min-width: 1200px;
+    /*position: fixed;*/
+    top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);}
 .newHeader .logoimg{
     margin-top: 16px;
     float: left;
@@ -610,7 +612,9 @@ p .activity-item:first-child{border-top: 1px solid #eee;}
 #competition-content img,#competition-db-content img,#ccfPage img{vertical-align: bottom;}
 #hnpage1{background: url('/images/educoder/competition/logo_1.jpg') no-repeat top center;min-height: 820px;}
 
-#competition-header{background:#24292D;height: 60px;width: 100%;padding-right: 40px;box-sizing: border-box;position: fixed;top: 0px;left: 0px;width: 100%;z-index: 1000;}
+#competition-header{background:#24292D;height: 60px;width: 100%;padding-right: 40px;box-sizing: border-box;
+    /*position: fixed;*/
+    top: 0px;left: 0px;width: 100%;z-index: 1000;}
 #competition-header .logoimg{
     margin-top: 5px;
     float: left;

public/stylesheets/educoder/edu-main.css

@@ -192,7 +192,9 @@ input::-ms-clear{display:none;}
 .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
 .educontent{width: 1200px;margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/
 .educontents{margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/
-.newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;padding-top: 60px}/*padding-bottom根据底部的高度而定*/
+.newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;
+    /*padding-top: 60px*/
+}/*padding-bottom根据底部的高度而定*/
 .newMain{ padding-bottom: 110px !important; }
 
 /*高度*/
@@ -925,7 +927,7 @@ html>body #ajax-indicator { position: fixed; }
     margin: 0 auto;
     padding-bottom: 235px;
     min-width: 1200px;
-    padding-top: 60px;
+    /*padding-top: 60px;*/
 }
 
 /* css3 radio */