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

app/services/jupyter_service.rb

@@ -8,7 +8,7 @@ module JupyterService
             uri = "#{shixun_tomcat}/bridge/jupyter/get"
             tpiID = "tpm#{shixun.id}"
             mount = shixun.data_sets.present?
-            params = {tpiID: tpiID, identifier: shixun.identifier, needMount: mount,
+            params = {tpiID: tpiID, identifier: shixun.identifier, needMount: mount, gitUrl: '',
                       :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
     
             logger.info "test_juypter: uri->#{uri}, params->#{params}"
@@ -48,8 +48,14 @@ module JupyterService
 
             tpiID = myshixun.id
             mount = myshixun.shixun.data_sets.present?
-            params = {tpiID: tpiID, identifier: shixun.identifier, myshixunIdentifier: myshixun.identifier, needMount: mount,
-                      :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
+
+            gitUrl = "#{edu_setting('git_address_domain')}/#{myshixun.repo_path}"
+            params = { tpiID: tpiID, 
+                       identifier: shixun.identifier,
+                       myshixunIdentifier: myshixun.identifier,
+                       gitUrl: gitUrl,
+                       needMount: mount,
+                       :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
             res = uri_post uri, params
 
             logger.info "test_juypter: #{res}"

db/migrate/20200102030946_modify_course_group_for_courses.rb

@@ -1,10 +1,12 @@
 class ModifyCourseGroupForCourses < ActiveRecord::Migration[5.2]
   def change
-    groups = CourseGroup.where(course_id:3128).order("created_at desc").group(:name)
+    groups = CourseGroup.where(course_id:3429).order("created_at desc").group(:name)
     ActiveRecord::Base.transaction do
       groups.each do |g|
         CourseGroup.where(name: g.name).where.not(id: g.id).each do |cg|
-          cg.course_members.update_all(course_group_id: g.id)
+          cg.course_members.each do |cm|
+            cm.update_attributes!(course_group_id: g.id)
+          end
           cg.exercise_group_settings.update_all(course_group_id: g.id)
           cg.attachment_group_settings.update_all(course_group_id: g.id)
           cg.homework_group_reviews.update_all(course_group_id: g.id)

public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js

@@ -113,16 +113,16 @@ class Challengesjupyter extends Component {
 
 			}else{
 				if(response.data.status===0){
-					if(response.data.useSeconds===null){
+					if(response.data.remainingSeconds===null){
 						this.handleClickResetTpi()
 					}else{
-						let useSeconds=response.data.useSeconds;
-						let summain=3600 * 1000;
-						let sums= useSeconds * 1000;
-						let sum=summain-sums;
+						let remainingSeconds=response.data.remainingSeconds;
+						// let summain=3600 * 1000;
+						let sums= remainingSeconds * 1000;
+						// let sum=summain-sums;
 						setTimeout(()=>{
 							this.setState({
-								jupytertime:Date.now() +sum
+								jupytertime:Date.now() +sums
 							})
 						},500);
 					}
@@ -420,6 +420,7 @@ class Challengesjupyter extends Component {
 
 	onFinish=()=>{
 		let id=this.props.match.params.shixunId;
+		let that=this;
 		Modal.confirm({
 			title: '倒计时截止',
 			content: (
@@ -430,7 +431,7 @@ class Challengesjupyter extends Component {
 			okText: '确定',
 			cancelText: '取消',
 			onOk () {
-				this.handleClickResetTpisync_code(id)
+				that.handleClickResetTpisync_code(id)
 			}
 		})
 	}

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

@@ -259,11 +259,11 @@ export const timeinfo_with_tpi = (identifier, dispatch) => {
               onCancel() {}
             })
           }else{
-            let useSeconds=res.data.useSeconds;
-            let summain=3600 * 1000;
-            let sums= useSeconds * 1000;
-            let sum=summain-sums;
-            setTimeout(()=>{ dispatch(addjypertime(Date.now() +sum))},500);
+            let remainingSeconds=res.data.remainingSeconds;
+            // let summain=3600 * 1000;
+            let sums= remainingSeconds * 1000;
+            // let sum=summain-sums;
+            setTimeout(()=>{ dispatch(addjypertime(Date.now() +sums))},500);
           }
         }
       }