From 85a561b0f751be2ca7786ac50e0721321d23dd31 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Thu, 15 Aug 2019 08:50:17 +0800
Subject: [PATCH] add creator name to ec link course modal

---
 app/controllers/ec_courses_controller.rb               |  4 ++--
 .../ec/ecCourseEvaluations/ecCourseEvaluations.js      | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/ec_courses_controller.rb b/app/controllers/ec_courses_controller.rb
index 8ad9f4e4..cec0f862 100644
--- a/app/controllers/ec_courses_controller.rb
+++ b/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_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.includes(:teacher).each do |c|
+          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}
       }
diff --git a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js b/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js
index 0d2ec519..2e0f60ec 100644
--- a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js
+++ b/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 ml90">{item.end_time}</li>
+                                    <li className="column-1 fl ml18 assclasslistmidname" style={{width: '60px'}} >{item.creator_name}</li>
+                                    <li className="column-1 fl ml30">{item.created_at}</li>
+                                    <li className="column-1 fl ml40">{item.end_time}</li>
                                 </ul>
                                 )
                         })}