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

app/controllers/courses_controller.rb

@@ -1318,7 +1318,7 @@ class CoursesController < ApplicationController
           @c_tasks = @course.graduation_tasks.task_published.order("graduation_tasks.publish_time asc, graduation_tasks.created_at asc")
 
           set_export_cookies
-          member_to_xlsx(@course, @all_members, @c_homeworks, @c_exercises, @c_tasks)
+          member_to_xlsx(@course, @all_members.includes(user: :user_extension), @c_homeworks, @c_exercises, @c_tasks)
           filename_ = "#{current_user.real_name}_#{@course.name}_总成绩_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
           render xlsx: "#{format_sheet_name filename_.strip}",template: "courses/export_member_scores_excel.xlsx.axlsx",
                  locals: {course_scores:@course_user_scores,shixun_works:@shixun_work_arrays,

app/controllers/shixuns_controller.rb

@@ -716,7 +716,7 @@ class ShixunsController < ApplicationController
 					project_fork(@myshixun, @repo_path, current_user.login)
 					rep_url = Base64.urlsafe_encode64(repo_ip_url @repo_path)
 					uri = "#{cloud_bridge}/bridge/game/openGameInstance"
-					params = {tpiID: "#{myshixun.id}", tpmGitURL: rep_url, tpiRepoName: myshixun.repo_name.split("/").last}
+					params = {tpiID: "#{myshixun.id}", tpmGitURL: rep_url, tpiRepoName: @myshixun.repo_name.split("/").last}
 					interface_post uri, params, 83, "实训云平台繁忙（繁忙等级：83）"
 				end
 			end

app/controllers/student_works_controller.rb

@@ -529,8 +529,8 @@ class StudentWorksController < ApplicationController
     @echart_data = student_efficiency(@homework, @work)
     @myself_eff = @echart_data[:efficiency_list].find { |item| item.last == @user.id }
     @myself_consume = @echart_data[:consume_list].find { |item| item.last == @user.id }
-    filename_ = "#{@use&.student_id}_#{@use&.real_name}_#{@shixun&.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
-    filename = Base64.urlsafe_encode64(filename_.strip)
+    filename_ = "#{@use&.student_id}_#{@use&.real_name}_#{@shixun&.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.pdf"
+    filename = filename_.strip.tr("+/", "-_")
     stylesheets = %w(shixun_work/shixun_work.css shared/codemirror.css)
     if params[:export].present? && params[:export]
       normal_status(0,"正在下载中")

app/helpers/export_helper.rb

@@ -22,21 +22,21 @@ module ExportHelper
       end
     end
 
-    shixun_homeworks = shixun_homeworks&.includes(score_student_works: :user)
+    shixun_homeworks = shixun_homeworks&.includes(:score_student_works)
 
     common_homeworks = homeworks.search_homework_type(1) #全部普通作业
     common_titles = common_homeworks.pluck(:name)+ ["总得分"]
-    common_homeworks = common_homeworks&.includes(score_student_works: :user)
+    common_homeworks = common_homeworks&.includes(:score_student_works)
 
     group_homeworks = homeworks.search_homework_type(3)  #全部分组作业
     group_titles = group_homeworks.pluck(:name)+ ["总得分"]
-    group_homeworks = group_homeworks&.includes(score_student_works: :user)
+    group_homeworks = group_homeworks&.includes(:score_student_works)
 
     task_titles = tasks.pluck(:name) + ["总得分"]
-    tasks = tasks&.includes(user: :user_extension, score_graduation_works: :user)
+    tasks = tasks&.includes(:score_graduation_works)
 
     exercise_titles = exercises.pluck(:exercise_name) + ["总得分"]
-    exercises = exercises&.includes(user: :user_extension, score_exercise_users: :user)
+    exercises = exercises&.includes(:score_exercise_users)
 
     total_user_score_array = []   #学生总成绩集合
 
@@ -168,7 +168,7 @@ module ExportHelper
 
     #实训作业
     shixun_homeworks.each_with_index do |s,index|
-      all_student_works = s.score_student_works.select{|work| all_user_ids.include?(work.user_id)}   #该实训题的全部用户回答
+      all_student_works = s.score_student_works.where(user_id: all_user_ids)   #该实训题的全部用户回答
       title_no = index.to_i + 1
       student_work_to_xlsx(all_student_works,s)
       shixun_work_display_name = format_sheet_name (title_no.to_s + "." + s.name).strip.first(30)
@@ -178,7 +178,7 @@ module ExportHelper
 
     #普通作业
     common_homeworks.each_with_index do |c,index|
-      all_student_works = c.score_student_works.select{|work| all_user_ids.include?(work.user_id)}   #当前用户的对该作业的回答
+      all_student_works = c.score_student_works.where(user_id: all_user_ids)    #当前用户的对该作业的回答
       title_no = count_1 + index.to_i + 1
       student_work_to_xlsx(all_student_works,c)
 
@@ -190,7 +190,7 @@ module ExportHelper
 
     #分组作业
     group_homeworks.each_with_index do |c,index|
-      all_student_works = c.score_student_works.select{|work| all_user_ids.include?(work.user_id)}   #当前用户的对该作业的回答
+      all_student_works = c.score_student_works.where(user_id: all_user_ids)   #当前用户的对该作业的回答
       title_no = count_1 + count_2 + index.to_i + 1
       student_work_to_xlsx(all_student_works,c)
       work_name = format_sheet_name (title_no.to_s + "." + c.name).strip.first(30)
@@ -200,7 +200,7 @@ module ExportHelper
 
     #毕设任务
     tasks.each_with_index do |c,index|
-      all_student_works = c.score_graduation_works.select{|work| all_user_ids.include?(work.user_id)}   #当前用户的对该作业的回答
+      all_student_works = c.score_graduation_works.where(user_id: all_user_ids)   #当前用户的对该作业的回答
       title_no = count_1 + count_2 + count_3 + index.to_i + 1
       graduation_work_to_xlsx(all_student_works,c,current_user)
       work_name = format_sheet_name (title_no.to_s + "." + c.name).strip.first(30)
@@ -210,7 +210,7 @@ module ExportHelper
 
     #试卷的导出
     exercises.each_with_index do |c,index|
-      all_student_works = c.score_exercise_users.select{|work| all_user_ids.include?(work.user_id)}   #当前用户的对该作业的回答
+      all_student_works = c.score_exercise_users.where(user_id: all_user_ids)   #当前用户的对该作业的回答
       title_no = count_1 + count_2 + count_3 + count_4 + index.to_i + 1
       get_export_users(c,course,all_student_works)
       work_name = format_sheet_name (title_no.to_s + "." + c.exercise_name).strip.first(30)

public/react/src/App.js

@@ -615,6 +615,11 @@ class App extends Component {
 								<Route path="/shixuns/new" component={Newshixuns}>
 								</Route>
 
+								{/* jupyter */}
+								<Route path="/tasks/:identifier/jupyter/"
+									component={JupyterTPI}
+								/>
+
 								<Route path="/tasks/:stageId" component={IndexWrapperComponent}/>
 
 								<Route path="/shixuns/:shixunId" component={TPMIndexComponent}>
@@ -702,10 +707,6 @@ class App extends Component {
 										(props) => (<Developer  {...this.props} {...props} {...this.state} />)
 									}/>
 
-								<Route path="/jupytertpi"
-									component={JupyterTPI}
-								/>
-
 								<Route exact path="/"
 											// component={ShixunsHome}
 											render={

public/react/src/AppConfig.js

@@ -51,8 +51,8 @@ export function initAxiosInterceptors(props) {
 			// proxy = "https://testeduplus2.educoder.net"
 			//proxy="http://47.96.87.25:48080"
 			proxy="https://pre-newweb.educoder.net"
-			proxy="https://test-newweb.educoder.net"
-	    proxy="https://test-jupyterweb.educoder.net"
+            proxy="https://test-newweb.educoder.net"
+            proxy="https://test-jupyterweb.educoder.net/"
 	     //proxy="http://192.168.2.63:3001"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；

public/react/src/modules/developer/index.scss

@@ -1,11 +1,14 @@
 .banner-wrap{
   width: 100%;
   height: 300px;
-  background-image: url(/static/media/path.e39ba7de.png);
-  background-color: #000a4f;
-  /* background-size: cover; */
-  background-position: center;
-  background-repeat: no-repeat;
+  // background-image: url(/static/media/path.e39ba7de.png);
+  // background: #000a4f url(../../images/oj//oj_banner.jpg) none center;
+  // background-color: #000a4f;
+  // /* background-size: cover; */
+  // background-position: center;
+  // background-repeat: no-repeat;
+  background: rgb(0, 1, 35) url(../../images/oj/oj_banner.jpg) no-repeat center;
+  background-size: cover;
 }
 
 .developer-list{

public/react/src/modules/tpm/jupyter/index.js

@@ -4,17 +4,25 @@
  * @Github: 
  * @Date: 2019-12-11 08:35:23
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-11 09:13:09
+ * @LastEditTime: 2019-12-12 09:26:17
  */
 import './index.scss';
-import React from 'react';
+import React, { useEffect } from 'react';
 import SplitPane from 'react-split-pane';
 import { Button } from 'antd';
-
+import {
+  connect
+} from 'react-redux';
 import UserInfo from '../../developer/components/userInfo';
+import actions from '../../../redux/actions';
 
 function JupyterTPI (props) {
 
+  useEffect(() => {
+    // 获取数据集
+
+    // 获取jupyter地址
+  }, []);
   return (
     <div className="jupyter_area">
       <div className="jupyter_header">
@@ -44,4 +52,21 @@ function JupyterTPI (props) {
   );
 }
 
-export default JupyterTPI;
+const mapStateToProps = (state) => {
+  const {jupyter_tpi_url, jupyter_data_set, jupyter_identifier} = state.jupyterReducer;
+  return {
+    url: jupyter_tpi_url,
+    dataSets: jupyter_data_set,
+    identifier: jupyter_identifier
+  };
+}
+
+const mapDispatchToProps = (dispatch) => ({
+  getJupyterTpiDataSet: (identifier) => dispatch(actions.getJupyterTpiDataSet(identifier)),
+  getJupyterTpiUrl: (identifier) => dispatch(actions.getJupyterTpiUrl(identifier))
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JupyterTPI);

public/react/src/redux/actions/actionTypes.js

@@ -50,6 +50,10 @@ const types = {
   SAVE_USER_INFO: 'SAVE_USER_INFO', // 只在用户信息
   SAVE_HACK_IDENTIFIER: 'SAVE_HACK_IDENTIFIER', // 用户界面跑到编辑界面需要用的id值
   SAVE_EDITOR_CODE: 'SAVE_EDITOR_CODE', // 保存详情页面中编辑时的代码
+  /*** jupyter  */
+  GET_JUPYTER_DATA_SETS: 'GET_JUPYTER_DATA_SETS', // jupyter 数据集
+  GET_JUPYTER_TPI_URL: 'GET_JUPYTER_TPI_URL', // 获取 jupyter url
+  SAVE_JUPYTER_IDENTIFIER: 'SAVE_JUPYTER_IDENTIFIER', // 保存jupyter identifier
 }
 
 export default types;

public/react/src/redux/actions/index.js

@@ -62,6 +62,11 @@ import {
   getUserInfoForNew
 } from './user';
 
+import {
+  getJupyterTpiDataSet,
+  getJupyterTpiUrl
+} from './jupyter';
+
 export default {
   toggleTodo,
   getOJList,
@@ -103,6 +108,9 @@ export default {
   restoreInitialCode,
   getUserInfoForNew,
   saveUserCodeForInterval,
-  saveEditorCodeForDetail
+  saveEditorCodeForDetail,
+  // jupyter
+  getJupyterTpiDataSet,
+  getJupyterTpiUrl
   // isUpdateCodeCtx
 }

public/react/src/redux/actions/jupyter.js

@@ -0,0 +1,38 @@
+/*
+ * @Description: jupyter tpi 相关内容
+ * @Author: tangjiang
+ * @Github: 
+ * @Date: 2019-12-12 09:01:30
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-12 09:30:53
+ */
+import types from "./actionTypes";
+import { fetchJupyterTpiDataSet, fetchJupyterTpiUrl } from "../../services/jupyterServer";
+
+// 获取 jupyter tpi 数据集
+export const getJupyterTpiDataSet = (identifier) => {
+  return (dispatch) => {
+    fetchJupyterTpiDataSet(identifier).then(res => {
+      if (res.data.status === 401) return; // 用户未登录
+      console.log('数据集:', res);
+    });
+  }
+}
+
+// 获取 jupyter tpi 地址
+export const getJupyterTpiUrl = (identifier) => {
+  return (dispatch) => {
+    fetchJupyterTpiUrl(identifier).then(res => {
+      if (res.data.status === 401) return; // 用户未登录
+      console.log('获取url', res);
+    })
+  }
+}
+
+// 保存 jupyter identifer
+export const saveJupyterIdentifier = (identifier) => {
+  return {
+    type: types.SAVE_JUPYTER_IDENTIFIER,
+    payload: identifier
+  }
+}

public/react/src/redux/reducers/index.js

@@ -13,6 +13,7 @@ import ojListReducer from './ojListReducer';
 import ojForUserReducer from './ojForUserReducer';
 import commonReducer from './commonReducer';
 import userReducer from './userReducer';
+import jupyterReducer from './jupyterReducer';
 
 export default combineReducers({
   testReducer,
@@ -20,5 +21,6 @@ export default combineReducers({
   ojListReducer,
   ojForUserReducer,
   commonReducer,
-  userReducer
+  userReducer,
+  jupyterReducer
 });

public/react/src/redux/reducers/jupyterReducer.js

@@ -0,0 +1,41 @@
+/*
+ * @Description: 
+ * @Author: tangjiang
+ * @Github: 
+ * @Date: 2019-12-12 09:01:39
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-12 09:29:49
+ */
+import types from "../actions/actionTypes";
+
+const initState = {
+  jupyter_tpi_url: '',
+  jupyter_data_set: [],
+  jupyter_identifier: ''
+};
+
+const JupyterReducer = (state = initState, action) => {
+  switch (action.type) {
+    case types.GET_JUPYTER_DATA_SETS:
+      return {
+        ...state,
+        jupyter_data_set: action.payload
+      }
+    case types.GET_JUPYTER_TPI_URL:
+      return {
+        ...state,
+        jupyter_tpi_url: action.payload
+      }
+    case types.SAVE_JUPYTER_IDENTIFIER:
+      return {
+        ...state,
+        jupyter_identifier: action.payload
+      }
+    default:
+      return {
+        ...state
+      }
+  }
+}
+
+export default JupyterReducer;

public/react/src/services/jupyterServer.js

@@ -0,0 +1,20 @@
+/*
+ * @Description: jupyter相关接口
+ * @Author: tangjiang
+ * @Github: 
+ * @Date: 2019-12-12 09:07:07
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-12 09:10:58
+ */
+import axios from 'axios';
+
+// 获取数据集
+export async function fetchJupyterTpiDataSet (identifier) {
+  const url = `/shixuns/${identifier}/jupyter_data_sets.json`;
+  return axios.get(url);
+}
+// 获取 tpi url
+export async function fetchJupyterTpiUrl (params) {
+  const url = `/jupyters/get_info_with_tpi.json`;
+  return axios.get(url, { params });
+}