diff --git a/app/assets/javascripts/admins/common-refuse-modal.js b/app/assets/javascripts/admins/common-refuse-modal.js
index 4e1af891e..886c00570 100644
--- a/app/assets/javascripts/admins/common-refuse-modal.js
+++ b/app/assets/javascripts/admins/common-refuse-modal.js
@@ -3,6 +3,7 @@ $(document).on('turbolinks:load', function() {
if ($refuseModal.length > 0) {
var $form = $refuseModal.find('form.admin-common-refuse-form');
var $applyIdInput = $refuseModal.find('.modal-body input[name="apply_id"]');
+ var $applyTitle = $refuseModal.find('.modal-title');
$form.validate({
errorElement: 'span',
@@ -21,9 +22,19 @@ $(document).on('turbolinks:load', function() {
var applyId = $link.data('id');
var url = $link.data('url');
+ var title = $link.data('title');
+ var type = $link.data('type');
+ var form_method = "POST";
+ if(typeof title !== 'undefined'){
+ $applyTitle.html(title)
+ }
+ if(typeof type !== 'undefined'){
+ form_method = type;
+ }
$applyIdInput.val(applyId);
$form.data('url', url);
+ $form.data('type', form_method);
});
// modal visited fire
$refuseModal.on('shown.bs.modal', function(){
@@ -40,9 +51,10 @@ $(document).on('turbolinks:load', function() {
if ($form.valid()) {
var url = $form.data('url');
+ var form_method = $form.data('type');
$.ajax({
- method: 'POST',
+ method: form_method,
dataType: 'script',
url: url,
data: $form.serialize(),
diff --git a/app/assets/javascripts/admins/message-modal.js b/app/assets/javascripts/admins/message-modal.js
index 227d75776..2c9ce27a7 100644
--- a/app/assets/javascripts/admins/message-modal.js
+++ b/app/assets/javascripts/admins/message-modal.js
@@ -1,14 +1,22 @@
$(document).on('turbolinks:load', function() {
var $modal = $('.modal.admin-message-modal');
+ var $submitBtn = $modal.find('.submit-btn');
if ($modal.length > 0) {
$modal.on('hide.bs.modal', function(){
$modal.find('.modal-body').html('');
+ $submitBtn.unbind();
});
}
});
-function showMessageModal(html) {
+function showMessageModal(html, callback) {
var $modal = $('.modal.admin-message-modal');
+ var $submitBtn = $modal.find('.submit-btn');
+ $submitBtn.unbind();
+ if(callback !== undefined && typeof callback === 'function'){
+ $submitBtn.on('click', callback);
+ }
+
$modal.find('.modal-body').html(html);
$modal.modal('show');
}
\ No newline at end of file
diff --git a/app/assets/javascripts/admins/modals/admin-import-customer-member-modal.js b/app/assets/javascripts/admins/modals/admin-import-customer-member-modal.js
new file mode 100644
index 000000000..01038c7de
--- /dev/null
+++ b/app/assets/javascripts/admins/modals/admin-import-customer-member-modal.js
@@ -0,0 +1,78 @@
+$(document).on('turbolinks:load', function() {
+ var $modal = $('.modal.admin-import-course-member-modal');
+ if ($modal.length > 0) {
+ var $form = $modal.find('form.admin-import-course-member-form');
+
+ var resetFileInputFunc = function(file){
+ file.after(file.clone().val(""));
+ file.remove();
+ }
+
+ $modal.on('show.bs.modal', function(){
+ $modal.find('.file-names').html('选择文件');
+ $modal.find('.upload-file-input').trigger('click');
+ });
+ $modal.on('hide.bs.modal', function(){
+ resetFileInputFunc($modal.find('.upload-file-input'));
+ });
+ $modal.on('change', '.upload-file-input', function(e){
+ var file = $(this)[0].files[0];
+ $modal.find('.file-names').html(file ? file.name : '请选择文件');
+ })
+
+ var importFormValid = function(){
+ if($form.find('input[name="file"]').val() == undefined || $form.find('input[name="file"]').val().length == 0){
+ $form.find('.error').html('请选择文件');
+ return false;
+ }
+
+ return true;
+ };
+
+ var buildResultMessage = function(data){
+ var messageHtml = "导入结果：成功" + data.success + "条，失败"+ data.fail.length + "条
";
+
+ if(data.fail.length > 0){
+ messageHtml += '数据 失败原因 ';
+
+ data.fail.forEach(function(item){
+ messageHtml += '' + item.data + ' ' + item.message + '
'
+ }
+
+ return messageHtml;
+ }
+
+ $modal.on('click', '.submit-btn', function(){
+ $form.find('.error').html('');
+
+ if (importFormValid()) {
+ $('body').mLoading({ text: '正在导入...' });
+
+ $.ajax({
+ method: 'POST',
+ dataType: 'json',
+ url: '/admins/import_course_members',
+ data: new FormData($form[0]),
+ processData: false,
+ contentType: false,
+ success: function(data){
+ $('body').mLoading('destroy');
+ $modal.modal('hide');
+
+ showMessageModal(buildResultMessage(data), function(){
+ window.location.reload();
+ });
+ },
+ error: function(res){
+ $('body').mLoading('destroy');
+ var data = res.responseJSON;
+ $form.find('.error').html(data.message);
+ }
+ });
+ }
+ });
+ }
+});
\ No newline at end of file
diff --git a/app/assets/javascripts/admins/modals/admin-merge-department-modal.js b/app/assets/javascripts/admins/modals/admin-merge-department-modal.js
index aead3f485..f5f2dceeb 100644
--- a/app/assets/javascripts/admins/modals/admin-merge-department-modal.js
+++ b/app/assets/javascripts/admins/modals/admin-merge-department-modal.js
@@ -66,10 +66,11 @@ $(document).on('turbolinks:load', function() {
var $link = $(event.relatedTarget);
var schoolId = $link.data('schoolId');
+ var url = $link.data('url');
$schoolIdInput.val(schoolId);
$originDepartmentIdInput.val($link.data('departmentId'));
-
+ $form.data('url', url);
$.ajax({
url: '/api/schools/' + schoolId + '/departments/for_option.json',
dataType: 'json',
diff --git a/app/assets/javascripts/admins/users/index.js b/app/assets/javascripts/admins/users/index.js
index 4d4f0f945..1ac936df5 100644
--- a/app/assets/javascripts/admins/users/index.js
+++ b/app/assets/javascripts/admins/users/index.js
@@ -122,14 +122,18 @@ $(document).on('turbolinks:load', function(){
// 导入学生
var $importUserModal = $('.modal.admin-import-user-modal');
var $importUserForm = $importUserModal.find('form.admin-import-user-form')
+ var resetFileInputFunc = function(file){
+ file.after(file.clone().val(""));
+ file.remove();
+ }
$importUserModal.on('show.bs.modal', function(){
+ resetFileInputFunc($importUserModal.find('.upload-file-input'));
$importUserModal.find('.file-names').html('选择文件');
$importUserModal.find('.upload-file-input').trigger('click');
});
- $importUserModal.find('.upload-file-input').on('change', function(e){
+ $importUserModal.on('change', '.upload-file-input', function(e){
var file = $(this)[0].files[0];
-
$importUserModal.find('.file-names').html(file ? file.name : '请选择文件');
})
@@ -175,7 +179,9 @@ $(document).on('turbolinks:load', function(){
$('body').mLoading('destroy');
$importUserModal.modal('hide');
- showMessageModal(buildResultMessage(data));
+ showMessageModal(buildResultMessage(data), function(){
+ window.location.reload();
+ });
},
error: function(res){
$('body').mLoading('destroy');
diff --git a/app/controllers/admins/department_applies_controller.rb b/app/controllers/admins/department_applies_controller.rb
new file mode 100644
index 000000000..b6dece1de
--- /dev/null
+++ b/app/controllers/admins/department_applies_controller.rb
@@ -0,0 +1,103 @@
+class Admins::DepartmentAppliesController < Admins::BaseController
+
+ before_action :get_apply,only:[:agree,:destroy]
+
+ def index
+ params[:status] ||= 0
+ params[:sort_by] = params[:sort_by].presence || 'created_at'
+ params[:sort_direction] = params[:sort_direction].presence || 'desc'
+ applies = Admins::DepartmentApplyQuery.call(params)
+ @depart_applies = paginate applies.preload(:school,user: :user_extension)
+ end
+
+ def agree
+ ActiveRecord::Base.transaction do
+ @depart_apply.update_attribute("status",1)
+ @depart_apply&.applied_messages&.update_all(status:1)
+ @depart_apply&.department&.update_attribute("is_auth",1)
+ @depart_apply&.user&.user_extension&.update_attribute("department_id",@depart_apply.department_id)
+ render_success_js
+ end
+ end
+
+ def merge
+ apply_id = params[:origin_department_id]
+ apply_add =ApplyAddDepartment.find(apply_id)
+ origin_id = apply_add&.department_id
+ new_id = params[:department_id]
+
+ return render_error('请选择其它部门') if origin_id.to_s == new_id.to_s
+
+ origin_department = apply_add&.department
+ to_department = Department.find(new_id)
+
+ return render_error('部门所属单位不相同') if origin_department&.school_id != to_department&.school_id
+
+ ActiveRecord::Base.transaction do
+ applied_message = AppliedMessage.where(applied_id: origin_id, applied_type: "ApplyAddDepartment")
+
+ applied_message.update_all(:status => 4)
+ apply_add.update_attribute(:status, 2)
+ apply_add.tidings.update_all(:status => 1)
+
+ extra = to_department&.name + "(#{apply_add&.department&.school&.try(:name)})"
+ tiding_params = {
+ user_id: apply_add.user_id,
+ trigger_user_id: 0,
+ container_id: apply_add.id,
+ container_type: 'ApplyAddDepartment',
+ belong_container_id: apply_add&.department&.school_id,
+ belong_container_type: "School",
+ tiding_type: "System",
+ status: 3,
+ extra: extra
+ }
+ Tiding.create(tiding_params)
+
+ origin_department.apply_add_departments.delete_all
+
+ origin_department.user_extensions.update_all(department_id: new_id)
+
+ if to_department.identifier.blank? && origin_department.identifier.present?
+ to_department.update!(identifier: origin_department.identifier)
+ end
+
+ origin_department.destroy!
+ apply_add.destroy!
+ end
+ render_ok
+ end
+
+ def destroy
+ ActiveRecord::Base.transaction do
+ @depart_apply.update_attribute("status",3)
+ @depart_apply&.applied_messages&.update_all(status:3)
+
+ if params[:tip] == 'unapplied' #未审批时候删除
+ UserExtension.where(department_id: @depart_apply.department_id).update_all(department_id:nil)
+ tiding_params = {
+ user_id: @depart_apply.user_id,
+ trigger_user_id: 0,
+ container_id: @depart_apply.id,
+ container_type: 'ApplyAddDepartment',
+ belong_container_id: @depart_apply&.department&.school_id,
+ belong_container_type: "School",
+ tiding_type: "System",
+ status: 2,
+ extra: params[:reason]
+ }
+ Tiding.create(tiding_params)
+ end
+
+ @depart_apply&.department&.destroy
+ @depart_apply.destroy
+ render_success_js
+ end
+ end
+
+ private
+
+ def get_apply
+ @depart_apply = ApplyAddDepartment.find_by(id:params[:id])
+ end
+end
diff --git a/app/controllers/admins/unit_applies_controller.rb b/app/controllers/admins/unit_applies_controller.rb
new file mode 100644
index 000000000..deb231f16
--- /dev/null
+++ b/app/controllers/admins/unit_applies_controller.rb
@@ -0,0 +1,122 @@
+class Admins::UnitAppliesController < Admins::BaseController
+ before_action :get_apply,only: [:agree,:destroy,:edit,:update]
+
+ def index
+ params[:sort_by] ||= 'created_at'
+ params[:sort_direction] ||= 'desc'
+ unit_applies = Admins::UnitApplyQuery.call(params)
+ @unit_applies = paginate unit_applies.preload(:school, :user)
+ end
+
+ def agree
+ ActiveRecord::Base.transaction do
+ begin
+ @unit_apply.update_attribute("status",1)
+ @unit_apply&.applied_messages&.update_all(status:1)
+ @unit_apply&.school&.update_attribute("province",@unit_apply.province)
+
+ # #申请信息的创建
+ apply_message_params = {
+ user_id: @unit_apply&.user_id,
+ status: 1,
+ viewed: 0,
+ applied_id: @unit_apply.school_id,
+ applied_type: "ApplyAddSchools",
+ name: @unit_apply.name,
+ }
+ AppliedMessage.new(apply_message_params).save(validate: false)
+
+ Tiding.where(user_id: 1, trigger_user_id: @unit_apply.user_id, container_id: @unit_apply.id,
+ container_type: 'ApplyAddSchools', status: 0, tiding_type: "Apply").update_all(status: 1)
+ #消息的创建
+ tiding_params = {
+ user_id: @unit_apply.user_id,
+ trigger_user_id: 0,
+ container_id: @unit_apply.id,
+ container_type: 'ApplyAddSchools',
+ belong_container_id: @unit_apply.school_id,
+ belong_container_type: "School",
+ tiding_type: "System",
+ status: 1
+ }
+ Tiding.create(tiding_params)
+ render_success_js
+ rescue Exception => e
+ Rails.logger.info("############_________________#########{e}")
+ end
+ end
+ end
+
+ def destroy
+ Admins::DeleteUnitApplyService.call(@unit_apply, params)
+ render_success_js
+ end
+
+ def edit
+ @all_schools = School.where.not(id: @unit_apply.school_id).pluck("name","id")
+
+ end
+
+ def update
+ school = School.find_by(id: params[:school_id])
+ ActiveRecord::Base.transaction do
+ @unit_apply&.applied_messages&.update_all(status:4)
+ Tiding.where(user_id: 1, trigger_user_id: @unit_apply.user_id, container_id: @unit_apply.id,
+ container_type: 'ApplyAddSchools', status: 0, tiding_type: "Apply").update_all(status: 1)
+
+ #消息的创建
+ tiding_params = {
+ user_id: @unit_apply.user_id,
+ trigger_user_id: 0,
+ container_id: @unit_apply.id,
+ container_type: 'ApplyAddSchools',
+ belong_container_id: params[:school_id],
+ belong_container_type: "School",
+ tiding_type: "System",
+ status: 3,
+ extra: school.try(:name).to_s
+ }
+ Tiding.create(tiding_params)
+
+ UserExtension.where(school_id: @unit_apply.school_id).update_all(school_id: params[:school_id].to_i)
+ ApplyAddDepartment.where(:school_id => @unit_apply.school_id).update_all(school_id: params[:school_id].to_i)
+
+ # 判断重复
+ before_apply_departments = Department.where(school_id: @unit_apply.school_id)
+ before_apply_departments.each do |department|
+ after_dep = Department.where(school_id: params[:school_id].to_i, name: department.name)&.first
+ if after_dep.present?
+ UserExtension.where(school_id: @unit_apply.school_id, department_id: department.id).update_all(department_id: after_dep.id)
+ department.destroy
+ department.apply_add_departments.destroy_all
+ else
+ department.apply_add_departments.update_all(school_id: school.id)
+ department.update_attribute(:school_id, school.id)
+ end
+ end
+
+ @unit_apply&.school&.destroy
+ apply_params = {
+ status: 2,
+ name: school&.name.to_s,
+ school_id: params[:school_id],
+ province: params[:province],
+ city: params[:city],
+ address: params[:address]
+ }
+ @unit_apply.update_attributes(apply_params)
+ # render_success_js
+ end
+ end
+
+ private
+
+ def get_apply
+ @unit_apply = ApplyAddSchool.find_by(id:params[:id])
+ end
+
+ def disk_auth_filename(source_type, source_id, type)
+ File.join(storage_path, "#{source_type}", "#{source_id}#{type}")
+ end
+end
+
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index b10147462..10d733a94 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -27,7 +27,7 @@ class CoursesController < ApplicationController
:attahcment_category_list,:export_member_scores_excel, :duplicate_course,
:switch_to_teacher, :switch_to_assistant, :switch_to_student, :exit_course,
:informs, :update_informs, :online_learning, :update_task_position, :tasks_list,
- :join_excellent_course, :export_couser_info, :export_member_act_score, :new_informs]
+ :join_excellent_course, :export_couser_info, :export_member_act_score, :new_informs, :delete_informs]
before_action :user_course_identity, except: [:join_excellent_course, :index, :create, :new, :apply_to_join_course,
:search_course_list, :get_historical_course_students, :mine, :search_slim, :board_list]
before_action :teacher_allowed, only: [:update, :destroy, :settings, :search_teacher_candidate,
@@ -36,7 +36,7 @@ class CoursesController < ApplicationController
:add_teacher, :export_couser_info, :export_member_act_score]
before_action :admin_allowed, only: [:set_invite_code_halt, :set_public_or_private, :change_course_admin,
:set_course_group, :create_group_by_importing_file, :update_informs, :new_informs,
- :update_task_position, :tasks_list]
+ :update_task_position, :tasks_list, :delete_informs]
before_action :teacher_or_admin_allowed, only: [:graduation_group_list, :create_graduation_group, :join_graduation_group,
:change_course_teacher, :course_group_list,
:teacher_application_review, :apply_teachers, :delete_course_teacher]
@@ -212,7 +212,7 @@ class CoursesController < ApplicationController
@course.update_attributes!(course_params.merge(extra_params))
@course.update_course_modules(params[:course_module_types])
-
+ Rails.logger.info("###############course_update_end")
normal_status(0, "成功")
rescue => e
uid_logger_error(e.message)
@@ -257,6 +257,12 @@ class CoursesController < ApplicationController
normal_status("更新成功")
end
+ def delete_informs
+ inform = @course.informs.find_by(id: params[:inform_id])
+ inform.destroy!
+ normal_status("删除成功")
+ end
+
def online_learning
@subject = @course.subject
@stages = @subject&.stages
@@ -1478,8 +1484,10 @@ class CoursesController < ApplicationController
shixun_titles = shixun_homeworks.pluck(:name) + ["总得分"]
# 更新实训作业成绩
- shixun_homeworks.includes(:homework_challenge_settings, :published_settings, :homework_commons_shixun).each do |homework|
- homework.update_homework_work_score
+ unless course.is_end
+ shixun_homeworks.includes(:homework_challenge_settings, :published_settings, :homework_commons_shixun).each do |homework|
+ homework.update_homework_work_score
+ end
end
shixun_homeworks = shixun_homeworks&.includes(score_student_works: :user)
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 89b6dca27..2807a0215 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -916,7 +916,8 @@ class GamesController < ApplicationController
# 更新关卡状态和一些学习进度
def update_game_parameter game
game.update_attribute(:status, 0) if game.status == 1
- game.update_attributes(status: 0, open_time: Time.now) if game.status == 3
+ # 第一次进入关卡更新时间
+ game.update_attributes(status: 0, open_time: Time.now) if game.open_time.blank? || game.status == 3
# 开启实训更新myshixuns的时间，方便跟踪用于的学习进度。
game.myshixun.update_column(:updated_at, Time.now)
end
diff --git a/app/controllers/graduation_topics_controller.rb b/app/controllers/graduation_topics_controller.rb
index bd93401f3..0242bff21 100644
--- a/app/controllers/graduation_topics_controller.rb
+++ b/app/controllers/graduation_topics_controller.rb
@@ -230,6 +230,7 @@ class GraduationTopicsController < ApplicationController
topic_repeat: topic.topic_repeat,
province: topic.province,
city: topic.city,
+ topic_type: topic.topic_type,
course_list_id: @course.course_list_id)
topic_bank.attachments.destroy_all
else
@@ -241,6 +242,7 @@ class GraduationTopicsController < ApplicationController
topic_repeat: topic.topic_repeat,
province: topic.province,
city: topic.city,
+ topic_type: topic.topic_type,
course_list_id: @course.course_list_id,
user_id: current_user.id,
graduation_topic_id: topic.id)
diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 8268382bd..b62840200 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -82,8 +82,7 @@ class HomeworkCommonsController < ApplicationController
end
@task_count = @homework_commons.size
- @homework_commons = @homework_commons.order("IF(ISNULL(homework_commons.publish_time),0,1), homework_commons.publish_time DESC,
- homework_commons.created_at DESC").page(page).per(15)
+ @homework_commons = @homework_commons.order("position DESC").page(page).per(15)
if @homework_type == 4
@homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :shixuns)
@@ -931,6 +930,7 @@ class HomeworkCommonsController < ApplicationController
shixuns.each do |shixun|
homework = HomeworksService.new.create_homework shixun, @course, @category, current_user
@homework_ids << homework.id
+ CreateStudentWorkJob.perform_later(homework.id)
end
rescue Exception => e
uid_logger(e.message)
@@ -1032,6 +1032,7 @@ class HomeworkCommonsController < ApplicationController
stage.shixuns.where.not(shixuns: {id: none_shixun_ids}).unhidden.each do |shixun|
homework = HomeworksService.new.create_homework shixun, @course, category, current_user
@homework_ids << homework.id
+ CreateStudentWorkJob.perform_later(homework.id)
end
end
end
diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 8591f9821..221197f4e 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -8,11 +8,11 @@ class ShixunsController < ApplicationController
before_action :find_shixun, except: [:index, :new, :create, :menus, :get_recommend_shixuns,
:propaedeutics, :departments, :apply_shixun_mirror,
- :get_mirror_script, :download_file]
+ :get_mirror_script, :download_file, :shixun_list]
before_action :shixun_access_allowed, except: [:index, :new, :create, :menus, :get_recommend_shixuns,
:propaedeutics, :departments, :apply_shixun_mirror,
- :get_mirror_script, :download_file]
+ :get_mirror_script, :download_file, :shixun_list]
before_action :find_repo_name, only: [:repository, :commits, :file_content, :update_file, :shixun_exec, :copy, :add_file]
before_action :allowed, only: [:update, :close, :update_propaedeutics, :settings, :publish,
@@ -98,6 +98,45 @@ class ShixunsController < ApplicationController
.each_with_object({}) { |r, obj| obj[r.shixun_id] = r.name }
end
+ def shixun_list
+ # 全部实训/我的实训
+ type = params[:type] || "all"
+ # 状态：已发布/未发布
+ status = params[:status] || "all"
+
+ # 超级管理员用户显示所有未隐藏的实训、非管理员显示所有已发布的实训（对本单位公开且未隐藏未关闭）
+ if type == "mine"
+ @shixuns = current_user.shixuns.none_closed
+ else
+ if current_user.admin?
+ @shixuns = Shixun.none_closed.where(hidden: 0)
+ else
+ none_shixun_ids = ShixunSchool.where("school_id != #{current_user.school_id}").pluck(:shixun_id)
+
+ @shixuns = Shixun.where.not(id: none_shixun_ids).none_closed.where(hidden: 0)
+ end
+ end
+
+ unless status == "all"
+ @shixuns = status == "published" ? @shixuns.where(status: 2) : @shixuns.where(status: [0, 1])
+ end
+
+ ## 筛选 难度
+ if params[:diff].present? && params[:diff].to_i != 0
+ @shixuns = @shixuns.where(trainee: params[:diff])
+ end
+
+ page = params[:page] || 1
+ limit = params[:limit] || 10
+ offset = (page.to_i - 1) * limit
+ order = params[:order] || "desc"
+ ## 搜索关键字创建者、实训名称、院校名称
+ keyword = params[:search]
+ @shixuns = Shixun.search keyword, where: {id: @shixuns.pluck(:id)}, order: {"myshixuns_count" => order}, limit: limit, offset: offset
+
+ @total_count = @shixuns.total_count
+ end
+
## 获取顶部菜单
def menus
@repertoires = Repertoire.includes(sub_repertoires: [:tag_repertoires]).order("updated_at asc")
@@ -601,7 +640,7 @@ class ShixunsController < ApplicationController
challenges.each_with_index do |challenge, index|
status = (index == 0 ? 0 : 3)
game_identifier = generate_identifier(Game, 12)
- worker.add(base_attr.merge(challenge_id: challenge.id, status: status, open_time: Time.now,
+ worker.add(base_attr.merge(challenge_id: challenge.id, status: status,
identifier: game_identifier, modify_time: challenge.modify_time))
end
end
@@ -865,6 +904,7 @@ class ShixunsController < ApplicationController
def send_to_course
@course = Course.find(params[:course_id])
homework = HomeworksService.new.create_homework @shixun, @course, nil, current_user
+ CreateStudentWorkJob.perform_later(homework.id)
end
# 二维码扫描下载
diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index d97b7172c..7c76748b1 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -214,6 +214,7 @@ class SubjectsController < ApplicationController
stage.shixuns.where(id: params[:shixun_ids], status: 2).each do |shixun|
homework = HomeworksService.new.create_homework shixun, @course, category, current_user
+ CreateStudentWorkJob.perform_later(homework.id)
end
end
rescue Exception => e
diff --git a/app/controllers/users/question_banks_controller.rb b/app/controllers/users/question_banks_controller.rb
index d2f111973..d6a2fcc88 100644
--- a/app/controllers/users/question_banks_controller.rb
+++ b/app/controllers/users/question_banks_controller.rb
@@ -1,5 +1,6 @@
class Users::QuestionBanksController < Users::BaseController
before_action :require_login
+ before_action :private_user_resources!
before_action :check_query_params!
before_action :check_user_permission!
diff --git a/app/controllers/wechats/js_sdk_signatures_controller.rb b/app/controllers/wechats/js_sdk_signatures_controller.rb
index e4ee0da27..6d7b3d87d 100644
--- a/app/controllers/wechats/js_sdk_signatures_controller.rb
+++ b/app/controllers/wechats/js_sdk_signatures_controller.rb
@@ -1,7 +1,10 @@
class Wechats::JsSdkSignaturesController < ApplicationController
def create
- signature = Util::Wechat.js_sdk_signature(params[:url], params[:noncestr], params[:timestamp])
- render_ok(signature: signature)
+ timestamp = (Time.now.to_f * 1000).to_i
+ noncestr = ('A'..'z').to_a.sample(8).join
+ signature = Util::Wechat.js_sdk_signature(params[:url], noncestr, timestamp)
+
+ render_ok(appid: Util::Wechat.appid, timestamp: timestamp, noncestr: noncestr, signature: signature)
rescue Util::Wechat::Error => ex
render_error(ex.message)
end
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index c5d376baf..83c4ded65 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -108,6 +108,8 @@ module CoursesHelper
course_board.present? ? course_board.messages.size : 0
when "course_group"
course.course_groups_count
+ when "announcement"
+ course.informs.count
end
end
diff --git a/app/models/apply_add_school.rb b/app/models/apply_add_school.rb
index c303283ca..ac7c880cd 100644
--- a/app/models/apply_add_school.rb
+++ b/app/models/apply_add_school.rb
@@ -1,10 +1,12 @@
class ApplyAddSchool < ApplicationRecord
belongs_to :school
+ belongs_to :user
has_many :applied_messages, as: :applied
has_many :tidings, as: :container, dependent: :destroy
after_create :send_notify
+ # after_destroy :after_delete_apply
private
@@ -12,4 +14,9 @@ class ApplyAddSchool < ApplicationRecord
Tiding.create!(user_id: 1, status: 0, container_id: id, container_type: 'ApplyAddSchools',
trigger_user_id: user_id, belong_container: school, tiding_type: 'Apply')
end
+
+ # def after_delete_apply
+ #
+ # end
+
end
\ No newline at end of file
diff --git a/app/models/school.rb b/app/models/school.rb
index 1034fd997..24de02496 100644
--- a/app/models/school.rb
+++ b/app/models/school.rb
@@ -16,6 +16,8 @@ class School < ApplicationRecord
has_many :customers, dependent: :destroy
has_many :partners, dependent: :destroy
+ has_many :apply_add_departments, dependent: :destroy
+
# 学校管理员
def manager?(user)
ec_school_users.exists?(user_id: user.id)
diff --git a/app/models/searchable/shixun.rb b/app/models/searchable/shixun.rb
index 49e066eac..0b53e9df3 100644
--- a/app/models/searchable/shixun.rb
+++ b/app/models/searchable/shixun.rb
@@ -14,7 +14,9 @@ module Searchable::Shixun
def search_data
{
name: name,
- description: Util.extract_content(description)[0..Searchable::MAXIMUM_LENGTH]
+ description: Util.extract_content(description)[0..Searchable::MAXIMUM_LENGTH],
+ status: status,
+ myshixuns_count: myshixuns_count
}.merge!(searchable_user_data)
.merge!(searchable_challenge_data)
end
@@ -37,7 +39,7 @@ module Searchable::Shixun
end
def should_index?
- status == 2 # published
+ [0, 1, 2].include?(status) # published
end
def to_searchable_json
diff --git a/app/models/shixun.rb b/app/models/shixun.rb
index db6bca43e..33d36d026 100644
--- a/app/models/shixun.rb
+++ b/app/models/shixun.rb
@@ -59,6 +59,7 @@ class Shixun < ApplicationRecord
scope :visible, -> { where.not(status: -1) }
scope :published, lambda{ where(status: 2) }
scope :published_closed, lambda{ where(status: [2, 3]) }
+ scope :none_closed, lambda{ where(status: [0, 1, 2]) }
scope :unhidden, lambda{ where(hidden: 0, status: 2) }
scope :field_for_recommend, lambda{ select([:id, :name, :identifier, :myshixuns_count]) }
scope :find_by_ids,lambda{|k| where(id:k)}
diff --git a/app/queries/admins/department_apply_query.rb b/app/queries/admins/department_apply_query.rb
new file mode 100644
index 000000000..500536ddb
--- /dev/null
+++ b/app/queries/admins/department_apply_query.rb
@@ -0,0 +1,25 @@
+class Admins::DepartmentApplyQuery < ApplicationQuery
+ include CustomSortable
+
+ attr_reader :params
+
+ sort_columns :created_at, default_by: :created_at, default_direction: :desc
+
+ def initialize(params)
+ @params = params
+ end
+
+ def call
+ status = params[:status]
+
+ applies = ApplyAddDepartment.where(status: status) if status.present?
+
+ # 关键字模糊查询
+ keyword = params[:keyword].to_s.strip
+ if keyword.present?
+ applies = applies.where('name LIKE :keyword', keyword: "%#{keyword}%")
+ end
+
+ custom_sort(applies, params[:sort_by], params[:sort_direction])
+ end
+end
\ No newline at end of file
diff --git a/app/queries/admins/unit_apply_query.rb b/app/queries/admins/unit_apply_query.rb
new file mode 100644
index 000000000..5df9c8ebb
--- /dev/null
+++ b/app/queries/admins/unit_apply_query.rb
@@ -0,0 +1,24 @@
+class Admins::UnitApplyQuery < ApplicationQuery
+ include CustomSortable
+
+ attr_reader :params
+
+ sort_columns :created_at, default_by: :created_at, default_direction: :desc
+
+ def initialize(params)
+ @params = params
+ end
+
+ def call
+ unit_applies = ApplyAddSchool.where(status:0)
+
+ # 关键字模糊查询
+ keyword = params[:keyword].to_s.strip
+ if keyword.present?
+ unit_applies = unit_applies.where("name like ?","%#{keyword}%")
+ end
+
+ custom_sort(unit_applies, params[:sort_by], params[:sort_direction])
+ end
+end
+
diff --git a/app/services/admins/delete_unit_apply_service.rb b/app/services/admins/delete_unit_apply_service.rb
new file mode 100644
index 000000000..a64c8d64d
--- /dev/null
+++ b/app/services/admins/delete_unit_apply_service.rb
@@ -0,0 +1,56 @@
+class Admins::DeleteUnitApplyService < ApplicationService
+
+ attr_reader :department, :params
+
+ def initialize(unit_apply, params)
+ @unit_apply = unit_apply
+ @params = params
+ end
+
+ def call
+ ActiveRecord::Base.transaction do
+ @unit_apply.update_attribute("status",3)
+ @unit_apply&.applied_messages&.update_all(status:3)
+ @unit_apply&.school&.apply_add_departments&.update_all(status:3)
+
+ applied_departments = ApplyAddDepartment.where(school_id: @unit_apply.school_id)
+ applied_departments.update_all(status: 3)
+
+ use_extensions = UserExtension&.where(school_id: @unit_apply.school_id)
+ user_ids = UserExtension&.where(school_id: @unit_apply.school_id)&.pluck(:user_id)
+ User.where(id: user_ids).update_all(profile_completed: false)
+ use_extensions.update_all(school_id: nil,department_id: nil)
+
+ @unit_apply&.user&.user_extension&.update_attribute("department_id", nil)
+
+ # 申请了职业认证的用户撤销申请
+ apply_user_auth = ApplyUserAuthentication.where(user_id: user_ids, auth_type: 2, status: 0)
+ apply_user_auth.each do |apply|
+ apply.tidings.destroy_all
+ apply.update_attribute('status', 3)
+ diskfile2 = disk_auth_filename('UserAuthentication', apply.user_id, 'PRO')
+ diskfilePRO = diskfile2 + 'temp'
+ File.delete(diskfilePRO) if File.exist?(diskfilePRO)
+ File.delete(diskfile2) if File.exist?(diskfile2)
+ end
+
+ # 未审批删除
+ if params[:tip] == "unapplied"
+ Tiding.where(:user_id => 1, :trigger_user_id => @unit_apply.user_id, :container_id => @unit_apply.id, :container_type => 'ApplyAddSchools', :status => 0, :tiding_type => "Apply").update_all(status: 1)
+ Tiding.create(:user_id => @unit_apply.user_id, :trigger_user_id => 0, :container_id => @unit_apply.id, :container_type =>'ApplyAddSchools', :belong_container_id => @unit_apply.school_id, :belong_container_type=> 'School', :tiding_type => "System", :status => 2, :extra => params[:reason])
+
+ Tiding.where(:user_id => 1, :container_id => applied_departments.pluck(:id), :container_type => 'ApplyAddDepartment', :status => 0, :tiding_type => "Apply").update_all(status: 1)
+ if applied_departments&.first.present?
+ Tiding.create(:user_id => applied_departments.first.user_id, :trigger_user_id => 0, :container_id => applied_departments.first.id, :container_type =>'ApplyAddDepartment', :belong_container_id => @unit_apply.school_id, :belong_container_type=> 'School', :tiding_type => "System", :status => 2)
+ AppliedMessage.create(:user_id => applied_departments.first.user_id, :status => 3, :viewed => 0, :applied_id => applied_departments.first.id, :applied_type => "ApplyAddDepartment", :name => applied_departments.first.name )
+ end
+ @unit_apply&.school&.destroy
+ @unit_apply&.school&.departments&.destroy_all
+ elsif params[:tip] == "applied"
+ applied_departments.destroy_all
+ @unit_apply.destroy
+ end
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/app/services/admins/import_user_service.rb b/app/services/admins/import_user_service.rb
index e5e7abfe6..f3408051b 100644
--- a/app/services/admins/import_user_service.rb
+++ b/app/services/admins/import_user_service.rb
@@ -46,6 +46,7 @@ class Admins::ImportUserService < ApplicationService
department = school.departments.find_by(name: data.department_name)
attr = {
+ type: 'User',
status: User::STATUS_ACTIVE,
login: "#{prefix}#{data.student_id}",
firstname: '',
@@ -54,7 +55,9 @@ class Admins::ImportUserService < ApplicationService
professional_certification: 1,
certification: 1,
password: '12345678',
- phone: data.phone
+ phone: data.phone,
+ mail: "#{prefix}#{data.student_id}@qq.com",
+ profile_completed: true
}
ActiveRecord::Base.transaction do
user = User.create!(attr)
@@ -66,8 +69,8 @@ class Admins::ImportUserService < ApplicationService
extension_attr[:technical_title] =
case data.identity.to_i
- when 0 then %w(教授 副教授 讲师 助教).include?(data.technical_title) || '讲师'
- when 2 then %w(企业管理者 部门管理者 高级工程师 工程师 助理工程师).include?(data.technical_title) || '助理工程师'
+ when 0 then %w(教授 副教授 讲师 助教).include?(data.technical_title) ? data.technical_title : '讲师'
+ when 2 then %w(企业管理者 部门管理者 高级工程师 工程师 助理工程师).include?(data.technical_title) ? data.technical_title : '助理工程师'
else nil
end
diff --git a/app/services/homeworks_service.rb b/app/services/homeworks_service.rb
index f6868afba..0dc814c89 100644
--- a/app/services/homeworks_service.rb
+++ b/app/services/homeworks_service.rb
@@ -15,7 +15,6 @@ class HomeworksService
homework_detail_manual.save! if homework_detail_manual
HomeworkCommonsShixun.create!(homework_common_id: homework.id, shixun_id: shixun.id)
HomeworksService.new.create_shixun_homework_cha_setting(homework, shixun)
- CreateStudentWorkJob.perform_later(homework.id)
# HomeworksService.new.create_works_list(homework, course)
end
homework
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index 7cd1857bd..418021cc0 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -14,10 +14,12 @@ class SearchService < ApplicationService
private
def search_options
- {
+ model_options = {
index_name: index_names,
model_includes: model_includes
- }.merge(default_options)
+ }
+ model_options.merge(where: { status: 2 }) if index_names == [Shixun]
+ model_options.merge(default_options)
end
def index_names
diff --git a/app/views/admins/courses/shared/_import_course_member_modal.html.erb b/app/views/admins/courses/shared/_import_course_member_modal.html.erb
new file mode 100644
index 000000000..d52a60b09
--- /dev/null
+++ b/app/views/admins/courses/shared/_import_course_member_modal.html.erb
@@ -0,0 +1,30 @@
+
\ No newline at end of file
diff --git a/app/views/admins/department_applies/index.html.erb b/app/views/admins/department_applies/index.html.erb
new file mode 100644
index 000000000..49b38e31a
--- /dev/null
+++ b/app/views/admins/department_applies/index.html.erb
@@ -0,0 +1,18 @@
+<% define_admin_breadcrumbs do %>
+ <% add_admin_breadcrumb('部门审批') %>
+<% end %>
+
+
+ <%= form_tag(admins_department_applies_path(unsafe_params), method: :get, class: 'form-inline search-form mt-3', remote: true) do %>
+ <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '部门名称检索') %>
+ <%= submit_tag('搜索', class: 'btn btn-primary ml-3','data-disable-with':"搜索中...") %>
+ <%= link_to "清除",admins_department_applies_path(keyword:nil),class:"btn btn-default",remote:true %>
+ <% end %>
+
+
+
+ <%= render(partial: 'admins/department_applies/shared/list', locals: { applies: @depart_applies }) %>
+
+
+<%= render(partial: 'admins/shared/admin_common_refuse_modal') %>
+<%= render 'admins/departments/shared/merge_department_modal' %>
\ No newline at end of file
diff --git a/app/views/admins/department_applies/index.js.erb b/app/views/admins/department_applies/index.js.erb
new file mode 100644
index 000000000..8e11b834c
--- /dev/null
+++ b/app/views/admins/department_applies/index.js.erb
@@ -0,0 +1 @@
+$(".department-applies-list-container").html("<%= j render partial: "admins/department_applies/shared/list",locals: {applies:@depart_applies} %>")
\ No newline at end of file
diff --git a/app/views/admins/department_applies/shared/_list.html.erb b/app/views/admins/department_applies/shared/_list.html.erb
new file mode 100644
index 000000000..bdd518a8f
--- /dev/null
+++ b/app/views/admins/department_applies/shared/_list.html.erb
@@ -0,0 +1,39 @@
+
+
+
+ ID
+ 部门名称
+ 单位名称
+ 创建者
+ <%= sort_tag('创建于', name: 'created_at', path: admins_department_applies_path) %>
+ 操作
+
+
+
+ <% if applies.present? %>
+ <% applies.each do |apply| %>
+
+ <%= apply.id %>
+ <%= apply.name %>
+ <%= apply.school.try(:name) %>
+ <%= apply.user.show_real_name %>
+ <%= format_time apply.created_at %>
+
+ <%= agree_link '批准', agree_admins_department_apply_path(apply, element: ".department-apply-#{apply.id}"), 'data-confirm': '确认批准通过？' %>
+ <%= javascript_void_link('删除', class: 'action refuse-action',
+ data: {
+ toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id, title: "删除原因", type: "delete",
+ url: admins_department_apply_path(apply,tip:"unapplied", element: ".department-apply-#{apply.id}")
+ }) %>
+ <%= javascript_void_link '更改', class: 'action', data: { school_id: apply.school_id, department_id: apply.id,
+ toggle: 'modal', target: '.admin-merge-department-modal', url: merge_admins_department_applies_path } %>
+
+
+ <% end %>
+ <% else %>
+ <%= render 'admins/shared/no_data_for_table' %>
+ <% end %>
+
+
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: applies } %>
\ No newline at end of file
diff --git a/app/views/admins/departments/shared/_department_item.html.erb b/app/views/admins/departments/shared/_department_item.html.erb
index 11584909d..64b4ee70b 100644
--- a/app/views/admins/departments/shared/_department_item.html.erb
+++ b/app/views/admins/departments/shared/_department_item.html.erb
@@ -28,7 +28,8 @@
<%= javascript_void_link '添加管理员', class: 'action', data: { department_id: department.id, toggle: 'modal', target: '.admin-add-department-member-modal' } %>
- <%= javascript_void_link '更改', class: 'action', data: { school_id: department.school_id, department_id: department.id, toggle: 'modal', target: '.admin-merge-department-modal' } %>
+ <%= javascript_void_link '更改', class: 'action', data: { school_id: department.school_id, department_id: department.id,
+ toggle: 'modal', target: '.admin-merge-department-modal', url: merge_admins_departments_path } %>
<%= delete_link '删除', admins_department_path(department, element: ".department-item-#{department.id}"), class: 'delete-department-action' %>
\ No newline at end of file
diff --git a/app/views/admins/departments/shared/_merge_department_modal.html.erb b/app/views/admins/departments/shared/_merge_department_modal.html.erb
index 200e75ccd..5c1ca6892 100644
--- a/app/views/admins/departments/shared/_merge_department_modal.html.erb
+++ b/app/views/admins/departments/shared/_merge_department_modal.html.erb
@@ -18,7 +18,6 @@
diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb
index a0e26d84e..9a7c696b8 100644
--- a/app/views/admins/shared/_sidebar.html.erb
+++ b/app/views/admins/shared/_sidebar.html.erb
@@ -56,15 +56,15 @@
<%= sidebar_item_group('#apply-review-submenu', '审核', icon: 'gavel') do %>
<%= sidebar_item(admins_identity_authentications_path, '实名认证', icon: 'id-card-o', controller: 'admins-identity_authentications') %>
<%= sidebar_item(admins_professional_authentications_path, '职业认证', icon: 'drivers-license', controller: 'admins-professional_authentications') %>
+ <%= sidebar_item(admins_department_applies_path, '部门审批', icon: 'newspaper-o', controller: 'admins-department_applies') %>
+ <%= sidebar_item(admins_unit_applies_path, '单位审批', icon: 'building-o', controller: 'admins-unit_applies') %>
<%= sidebar_item(admins_shixun_authorizations_path, '实训发布', icon: 'object-ungroup', controller: 'admins-shixun_authorizations') %>
- <%= sidebar_item(admins_subject_authorizations_path, '实践课程发布', icon: 'object-group', controller: 'admins-subject_authorizations') %>
- <%= sidebar_item(admins_library_applies_path, '教学案例发布', icon: 'language', controller: 'admins-library_applies') %>
- <%= sidebar_item(admins_project_package_applies_path, '众包需求发布', icon: 'joomla', controller: 'admins-project_package_applies') %>
- <%= sidebar_item(admins_video_applies_path, '视频发布', icon: 'film', controller: 'admins-video_applies') %>
-
- <% end %>
+ <%= sidebar_item(admins_subject_authorizations_path, '实践课程发布', icon: 'object-group', controller: 'admins-subject_authorizations') %>
+ <%= sidebar_item(admins_library_applies_path, '教学案例发布', icon: 'language', controller: 'admins-library_applies') %>
+ <%= sidebar_item(admins_project_package_applies_path, '众包需求发布', icon: 'joomla', controller: 'admins-project_package_applies') %>
+ <%= sidebar_item(admins_video_applies_path, '视频发布', icon: 'film', controller: 'admins-video_applies') %>
+ <% end %>
-
<%= sidebar_item('/', '返回主站', icon: 'sign-out', controller: 'root') %>
\ No newline at end of file
diff --git a/app/views/admins/shared/modal/_message_modal.html.erb b/app/views/admins/shared/modal/_message_modal.html.erb
index 94454ca2d..17c02ea14 100644
--- a/app/views/admins/shared/modal/_message_modal.html.erb
+++ b/app/views/admins/shared/modal/_message_modal.html.erb
@@ -11,7 +11,7 @@
保存成功
diff --git a/app/views/admins/unit_applies/edit.js.erb b/app/views/admins/unit_applies/edit.js.erb
new file mode 100644
index 000000000..15fc1f4c2
--- /dev/null
+++ b/app/views/admins/unit_applies/edit.js.erb
@@ -0,0 +1,56 @@
+$("body").append("<%= j render partial: "admins/unit_applies/shared/edit_modal",locals: {apply: @unit_apply, schools: @all_schools} %>")
+var uni_edit_modal = $(".admin-unit-edit-modal")
+uni_edit_modal.modal("show")
+
+uni_edit_modal.on("hidden.bs.modal",function () {
+ $(".admin-unit-edit-modal").remove()
+ $("body").removeClass("modal-open")
+})
+
+// 初始化学校选择器
+var matcherFunc = function(params, data){
+ if ($.trim(params.term) === '') {
+ return data;
+ }
+ if (typeof data.text === 'undefined') {
+ return null;
+ }
+ if (data.name && data.name.indexOf(params.term) > -1) {
+ var modifiedData = $.extend({}, data, true);
+ return modifiedData;
+ }
+
+ // Return `null` if the term should not be displayed
+ return null;
+}
+$.ajax({
+ url: '/api/schools/for_option.json',
+ dataType: 'json',
+ type: 'GET',
+ success: function(data) {
+ $("#all-schools").select2({
+ theme: 'bootstrap4',
+ placeholder: '查询学校/单位',
+ minimumInputLength: 1,
+ data: data.schools,
+ templateResult: function (item) {
+ if(!item.id || item.id === '') return item.text;
+ return item.name;
+ },
+ templateSelection: function(item){
+ return item.name || item.text;
+ },
+ matcher: matcherFunc
+ })
+ }
+});
+
+$("#all-schools").select2({})
+$("#show-province-<%= @unit_apply.id %>").select2()
+$("#schoolCity_<%= @unit_apply.id %>").select2()
+
+// **************** 地区选择 ****************
+$('.province-city-select').cxSelect({
+ url: '/javascripts/educoder/province-data.json',
+ selects: ['province-select', 'city-select']
+});
\ No newline at end of file
diff --git a/app/views/admins/unit_applies/index.html.erb b/app/views/admins/unit_applies/index.html.erb
new file mode 100644
index 000000000..2b715b87c
--- /dev/null
+++ b/app/views/admins/unit_applies/index.html.erb
@@ -0,0 +1,17 @@
+<% define_admin_breadcrumbs do %>
+ <% add_admin_breadcrumb('单位审批') %>
+<% end %>
+
+
+ <%= form_tag(admins_unit_applies_path(unsafe_params), method: :get, class: 'form-inline search-form mt-3', remote: true) do %>
+ <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '单位名称检索') %>
+ <%= submit_tag('搜索', class: 'btn btn-primary ml-3','data-disable-with':"搜索中...") %>
+ <%= link_to "清除",admins_unit_applies_path(keyword:nil),class:"btn btn-default",remote:true %>
+ <% end %>
+
+
+
+ <%= render(partial: 'admins/unit_applies/shared/list', locals: { applies: @unit_applies }) %>
+
+
+<%= render(partial: 'admins/shared/admin_common_refuse_modal') %>
diff --git a/app/views/admins/unit_applies/index.js.erb b/app/views/admins/unit_applies/index.js.erb
new file mode 100644
index 000000000..d9297d51a
--- /dev/null
+++ b/app/views/admins/unit_applies/index.js.erb
@@ -0,0 +1 @@
+$(".unit-applies-list-container").html("<%= j render partial: "admins/unit_applies/shared/list", locals: {applies: @unit_applies} %>")
diff --git a/app/views/admins/unit_applies/shared/_apply_item.html.erb b/app/views/admins/unit_applies/shared/_apply_item.html.erb
new file mode 100644
index 000000000..d8a2bdcc4
--- /dev/null
+++ b/app/views/admins/unit_applies/shared/_apply_item.html.erb
@@ -0,0 +1,17 @@
+<%= apply.id %>
+<%= overflow_hidden_span apply.name %>
+
+ <%= "#{apply&.province.to_s}"+"#{apply&.city.to_s}" %>
+
+<%= overflow_hidden_span apply.address %>
+<%= apply.user.try(:show_real_name) %>
+<%= format_time apply.created_at %>
+
+ <%= agree_link '批准', agree_admins_unit_apply_path(apply, element: ".unit-apply-#{apply.id}"), 'data-confirm': '确认批准通过？' %>
+ <%= javascript_void_link('删除', class: 'action refuse-action',
+ data: {
+ toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id, title: "删除原因", type: "delete",
+ url: admins_unit_apply_path(apply, tip: "unapplied", element: ".unit-apply-#{apply.id}")
+ }) %>
+ <%= link_to "更改",edit_admins_unit_apply_path(apply), remote: true, class:"action",'data-disable-with': '打开中...' %>
+
\ No newline at end of file
diff --git a/app/views/admins/unit_applies/shared/_edit_modal.html.erb b/app/views/admins/unit_applies/shared/_edit_modal.html.erb
new file mode 100644
index 000000000..6f8995ae0
--- /dev/null
+++ b/app/views/admins/unit_applies/shared/_edit_modal.html.erb
@@ -0,0 +1,43 @@
+
+
+
+
+ <%= form_tag(admins_unit_apply_path, method: :put, remote: true) do %>
+
+
+ <% end %>
+
+
+
+
+
+ ID
+ 单位名称
+ 地区
+ 详细地址
+ 申请者
+ <%= sort_tag('创建于', name: 'created_at', path: admins_unit_applies_path) %>
+ 操作
+
+
+
+ <% if applies.present? %>
+ <% applies.each do |apply| %>
+
+ <%= render partial: "admins/unit_applies/shared/apply_item", locals: {apply: apply} %>
+
+ <% end %>
+ <% else %>
+ <%= render 'admins/shared/no_data_for_table' %>
+ <% end %>
+
+
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: applies } %>
\ No newline at end of file
diff --git a/app/views/admins/unit_applies/update.js.erb b/app/views/admins/unit_applies/update.js.erb
new file mode 100644
index 000000000..c710f46b5
--- /dev/null
+++ b/app/views/admins/unit_applies/update.js.erb
@@ -0,0 +1,3 @@
+$('.modal.admin-unit-edit-modal').modal('hide');
+$('.unit-applies-list-table .unit-apply-<%= @unit_apply.id %>').remove()
+$.notify({ message: '操作成功' });
\ No newline at end of file
diff --git a/app/views/admins/users/index.html.erb b/app/views/admins/users/index.html.erb
index fa6d67a64..0892b5641 100644
--- a/app/views/admins/users/index.html.erb
+++ b/app/views/admins/users/index.html.erb
@@ -28,6 +28,7 @@
<% end %>
<%= javascript_void_link '导入用户', class: 'btn btn-secondary btn-sm', data: { toggle: 'modal', target: '.admin-import-user-modal'} %>
+ <%= javascript_void_link '导入课堂成员', class: 'btn btn-secondary btn-sm ml-2', data: { toggle: 'modal', target: '.admin-import-course-member-modal'} %>
@@ -35,4 +36,7 @@
<%= render partial: 'admins/users/shared/reward_grade_modal' %>
-<%= render partial: 'admins/users/shared/import_user_modal' %>
\ No newline at end of file
+<%= render partial: 'admins/users/shared/import_user_modal' %>
+
+
+<%= render partial: 'admins/courses/shared/import_course_member_modal' %>
\ No newline at end of file
diff --git a/app/views/admins/users/shared/_import_user_modal.html.erb b/app/views/admins/users/shared/_import_user_modal.html.erb
index ff3c725b9..b0d3c9a77 100644
--- a/app/views/admins/users/shared/_import_user_modal.html.erb
+++ b/app/views/admins/users/shared/_import_user_modal.html.erb
@@ -14,8 +14,8 @@
文件
- 选择文件
+ 选择文件
diff --git a/app/views/shixuns/shixun_list.json.jbuilder b/app/views/shixuns/shixun_list.json.jbuilder
new file mode 100644
index 000000000..54ac65a0a
--- /dev/null
+++ b/app/views/shixuns/shixun_list.json.jbuilder
@@ -0,0 +1,17 @@
+json.shixuns_count @total_count
+
+json.shixun_list do
+ json.array! @shixuns.with_highlights(multiple: true) do |obj, highlights|
+ puts obj
+ json.merge! obj.to_searchable_json
+ json.challenge_names obj.challenges.pluck(:subject)
+
+ json.title highlights.delete(:name)&.join('...') || obj.searchable_title
+ # json.description highlights.values[0,5].each { |arr| arr.is_a?(Array) ? arr.join('...') : arr }.join('])*?>/)(/tag/g,block._tag)();block.paragraph=replace(block.paragraph)("hr",block.hr)("heading",block.heading)("lheading",block.lheading)("blockquote",block.blockquote)("tag","<"+block._tag)("def",block.def)();block.normal=merge({},block);block.gfm=merge({},block.normal,{fences:/^ *(`{3,}|~{3,}) *(\S+)? *\n([\s\S]+?)\s*\1 *(?:\n+|$)/,paragraph:/^/});block.gfm.paragraph=replace(block.paragraph)("(?!","(?!"+block.gfm.fences.source.replace("\\1","\\2")+"|"+block.list.source.replace("\\1","\\3")+"|")();block.tables=merge({},block.gfm,{nptable:/^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,table:/^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/});function Lexer(options){this.tokens=[];this.tokens.links={};this.options=options||marked.defaults;this.rules=block.normal;if(this.options.gfm){if(this.options.tables){this.rules=block.tables}else{this.rules=block.gfm}}}Lexer.rules=block;Lexer.lex=function(src,options){var lexer=new Lexer(options);return lexer.lex(src)};Lexer.prototype.lex=function(src){src=src.replace(/\r\n|\r/g,"\n").replace(/\t/g," ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n");return this.token(src,true)};Lexer.prototype.token=function(src,top,bq){var src=src.replace(/^ +$/gm,""),next,loose,cap,bull,b,item,space,i,l;while(src){if(cap=this.rules.newline.exec(src)){src=src.substring(cap[0].length);if(cap[0].length>1){this.tokens.push({type:"space"})}}if(cap=this.rules.code.exec(src)){src=src.substring(cap[0].length);cap=cap[0].replace(/^ {4}/gm,"");this.tokens.push({type:"code",text:!this.options.pedantic?cap.replace(/\n+$/,""):cap});continue}if(cap=this.rules.fences.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"code",lang:cap[2],text:cap[3]});continue}if(cap=this.rules.heading.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"heading",depth:cap[1].length,text:cap[2]});continue}if(top&&(cap=this.rules.nptable.exec(src))){src=src.substring(cap[0].length);item={type:"table",header:cap[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:cap[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:cap[3].replace(/\n$/,"").split("\n")};for(i=0;i ?/gm,"");this.token(cap,top,true);this.tokens.push({type:"blockquote_end"});continue}if(cap=this.rules.list.exec(src)){src=src.substring(cap[0].length);bull=cap[2];this.tokens.push({type:"list_start",ordered:bull.length>1});cap=cap[0].match(this.rules.item);next=false;l=cap.length;i=0;for(;i1&&b.length>1)){src=cap.slice(i+1).join("\n")+src;i=l-1}}loose=next||/\n\n(?!\s*$)/.test(item);if(i!==l-1){next=item.charAt(item.length-1)==="\n";if(!loose){loose=next}}this.tokens.push({type:loose?"loose_item_start":"list_item_start"});this.token(item,false,bq);
-this.tokens.push({type:"list_item_end"})}this.tokens.push({type:"list_end"});continue}if(cap=this.rules.html.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:cap[1]==="pre"||cap[1]==="script"||cap[1]==="style",text:cap[0]});continue}if((!bq&&top)&&(cap=this.rules.def.exec(src))){src=src.substring(cap[0].length);this.tokens.links[cap[1].toLowerCase()]={href:cap[2],title:cap[3]};continue}if(top&&(cap=this.rules.table.exec(src))){src=src.substring(cap[0].length);item={type:"table",header:cap[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:cap[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:cap[3].replace(/(?: *\| *)?\n$/,"").split("\n")};for(i=0;i])/,autolink:/^<([^ >]+(@|:\/)[^ >]+)>/,url:noop,tag:/^|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,link:/^!?\[(inside)\]\(href\)/,reflink:/^!?\[(inside)\]\s*\[([^\]]*)\]/,nolink:/^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,strong:/^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,em:/^\b_((?:__|[\s\S])+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:noop,text:/^[\s\S]+?(?=[\\?(?:\s+['"]([\s\S]*?)['"])?\s*/;inline.link=replace(inline.link)("inside",inline._inside)("href",inline._href)();inline.reflink=replace(inline.reflink)("inside",inline._inside)();inline.normal=merge({},inline);inline.pedantic=merge({},inline.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/});inline.gfm=merge({},inline.normal,{escape:replace(inline.escape)("])","~|])")(),url:/^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:replace(inline.text)("]|","~]|")("|","|https?://|")()});inline.breaks=merge({},inline.gfm,{br:replace(inline.br)("{2,}","*")(),text:replace(inline.gfm.text)("{2,}","*")()});function InlineLexer(links,options){this.options=options||marked.defaults;this.links=links;this.rules=inline.normal;this.renderer=this.options.renderer||new Renderer;this.renderer.options=this.options;if(!this.links){throw new Error("Tokens array requires a `links` property.")}if(this.options.gfm){if(this.options.breaks){this.rules=inline.breaks}else{this.rules=inline.gfm}}else{if(this.options.pedantic){this.rules=inline.pedantic}}}InlineLexer.rules=inline;InlineLexer.output=function(src,links,options){var inline=new InlineLexer(links,options);return inline.output(src)};InlineLexer.prototype.output=function(src){var out="",link,text,href,cap;while(src){if(cap=this.rules.escape.exec(src)){src=src.substring(cap[0].length);out+=cap[1];continue}if(cap=this.rules.autolink.exec(src)){src=src.substring(cap[0].length);if(cap[2]==="@"){text=cap[1].charAt(6)===":"?this.mangle(cap[1].substring(7)):this.mangle(cap[1]);href=this.mangle("mailto:")+text}else{text=escape(cap[1]);href=text}out+=this.renderer.link(href,null,text);continue}if(!this.inLink&&(cap=this.rules.url.exec(src))){src=src.substring(cap[0].length);text=escape(cap[1]);href=text;out+=this.renderer.link(href,null,text);continue}if(cap=this.rules.tag.exec(src)){if(!this.inLink&&/^/i.test(cap[0])){this.inLink=false}}src=src.substring(cap[0].length);out+=this.options.sanitize?escape(cap[0]):cap[0];continue}if(cap=this.rules.link.exec(src)){src=src.substring(cap[0].length);this.inLink=true;out+=this.outputLink(cap,{href:cap[2],title:cap[3]});this.inLink=false;continue}if((cap=this.rules.reflink.exec(src))||(cap=this.rules.nolink.exec(src))){src=src.substring(cap[0].length);link=(cap[2]||cap[1]).replace(/\s+/g," ");link=this.links[link.toLowerCase()];if(!link||!link.href){out+=cap[0].charAt(0);src=cap[0].substring(1)+src;continue}this.inLink=true;out+=this.outputLink(cap,link);this.inLink=false;continue}if(cap=this.rules.strong.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.strong(this.output(cap[2]||cap[1]));continue}if(cap=this.rules.em.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.em(this.output(cap[2]||cap[1]));continue
+this.tokens.push({type:"list_item_end"})}this.tokens.push({type:"list_end"});continue}if(cap=this.rules.html.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:cap[1]==="pre"||cap[1]==="script"||cap[1]==="style",text:cap[0]});continue}if((!bq&&top)&&(cap=this.rules.def.exec(src))){src=src.substring(cap[0].length);this.tokens.links[cap[1].toLowerCase()]={href:cap[2],title:cap[3]};continue}if(top&&(cap=this.rules.table.exec(src))){src=src.substring(cap[0].length);item={type:"table",header:cap[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:cap[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:cap[3].replace(/(?: *\| *)?\n$/,"").split("\n")};for(i=0;i])/,autolink:/^<([^ >]+(@|:\/)[^ >]+)>/,url:noop,tag:/^|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,link:/^!?\[(inside)\]\(href\)/,reflink:/^!?\[(inside)\]\s*\[([^\]]*)\]/,nolink:/^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,strong:/^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,em:/^\b_((?:__|[\s\S])+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:noop,text:/^[\s\S]+?(?=[\\?(?:\s+['"]([\s\S]*?)['"])?\s*/;inline.link=replace(inline.link)("inside",inline._inside)("href",inline._href)();inline.reflink=replace(inline.reflink)("inside",inline._inside)();inline.normal=merge({},inline);inline.pedantic=merge({},inline.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/});inline.gfm=merge({},inline.normal,{escape:replace(inline.escape)("])","~|])")(),url:/^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:replace(inline.text)("]|","~]|")("|","|https?://|")()});inline.breaks=merge({},inline.gfm,{br:replace(inline.br)("{2,}","*")(),text:replace(inline.gfm.text)("{2,}","*")()});function InlineLexer(links,options){this.options=options||marked.defaults;this.links=links;this.rules=inline.normal;this.renderer=this.options.renderer||new Renderer;this.renderer.options=this.options;if(!this.links){throw new Error("Tokens array requires a `links` property.")}if(this.options.gfm){if(this.options.breaks){this.rules=inline.breaks}else{this.rules=inline.gfm}}else{if(this.options.pedantic){this.rules=inline.pedantic}}}InlineLexer.rules=inline;InlineLexer.output=function(src,links,options){var inline=new InlineLexer(links,options);return inline.output(src)};InlineLexer.prototype.output=function(src){var out="",link,text,href,cap;while(src){if(cap=this.rules.escape.exec(src)){src=src.substring(cap[0].length);out+=cap[1];continue}if(cap=this.rules.autolink.exec(src)){src=src.substring(cap[0].length);if(cap[2]==="@"){text=cap[1].charAt(6)===":"?this.mangle(cap[1].substring(7)):this.mangle(cap[1]);href=this.mangle("mailto:")+text}else{text=escape(cap[1]);href=text}out+=this.renderer.link(href,null,text);continue}if(!this.inLink&&(cap=this.rules.url.exec(src))){src=src.substring(cap[0].length);text=escape(cap[1]);href=text;out+=this.renderer.link(href,null,text);continue}if(cap=this.rules.tag.exec(src)){if(!this.inLink&&/^/i.test(cap[0])){this.inLink=false}}src=src.substring(cap[0].length);out+=this.options.sanitize?escape(cap[0]):cap[0];continue}if(cap=this.rules.link.exec(src)){src=src.substring(cap[0].length);this.inLink=true;out+=this.outputLink(cap,{href:cap[2],title:cap[3]});this.inLink=false;continue}if((cap=this.rules.reflink.exec(src))||(cap=this.rules.nolink.exec(src))){src=src.substring(cap[0].length);link=(cap[2]||cap[1]).replace(/\s+/g," ");link=this.links[link.toLowerCase()];if(!link||!link.href){out+=cap[0].charAt(0);src=cap[0].substring(1)+src;continue}this.inLink=true;out+=this.outputLink(cap,link);this.inLink=false;continue}if(cap=this.rules.strong.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.strong(this.output(cap[2]||cap[1]));continue}if(cap=this.rules.em.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.em(this.output(cap[2]||cap[1]), cap.input);continue
}if(cap=this.rules.code.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.codespan(escape(cap[2],true));continue}if(cap=this.rules.br.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.br();continue}if(cap=this.rules.del.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.del(this.output(cap[1]));continue}if(cap=this.rules.text.exec(src)){src=src.substring(cap[0].length);out+=escape(this.smartypants(cap[0]));continue}if(src){throw new Error("Infinite loop on byte: "+src.charCodeAt(0))}}return out};InlineLexer.prototype.outputLink=function(cap,link){var href=escape(link.href),title=link.title?escape(link.title):null;return cap[0].charAt(0)!=="!"?this.renderer.link(href,title,this.output(cap[1])):this.renderer.image(href,title,escape(cap[1]))};InlineLexer.prototype.smartypants=function(text){if(!this.options.smartypants){return text}return text.replace(/--/g,"\u2014").replace(/(^|[-\u2014/(\[{"\s])'/g,"$1\u2018").replace(/'/g,"\u2019").replace(/(^|[-\u2014/(\[{\u2018\s])"/g,"$1\u201c").replace(/"/g,"\u201d").replace(/\.{3}/g,"\u2026")};InlineLexer.prototype.mangle=function(text){var out="",l=text.length,i=0,ch;for(;i0.5){ch="x"+ch.toString(16)}out+="&#"+ch+";"}return out};function Renderer(options){this.options=options||{}}Renderer.prototype.code=function(code,lang,escaped){if(this.options.highlight){var out=this.options.highlight(code,lang);if(out!=null&&out!==code){escaped=true;code=out}}if(!lang){return""+(escaped?code:escape(code,true))+"\n'+(escaped?code:escape(code,true))+"\n\n"+quote+" \n"};Renderer.prototype.html=function(html){return html};Renderer.prototype.heading=function(text,level,raw){return" ',ucwords:'Aa
','
'].join("\n");return s.append(h).addClass(a+"vertical"),""!==n.theme&&s.addClass(a+"theme-"+n.theme),this.mask=s.children("."+a+"mask"),this.containerMask=s.children("."+a+"container-mask"),""!==n.markdown&&c.val(n.markdown),""!==n.appendMarkdown&&c.val(c.val()+n.appendMarkdown),this.htmlTextarea=s.children("."+l.textarea.html),this.preview=s.children("."+a+"preview"),this.previewContainer=this.preview.children("."+a+"preview-container"),""!==n.previewTheme&&this.preview.addClass(a+"preview-theme-"+n.previewTheme),"function"==typeof define&&define.amd&&("undefined"!=typeof katex&&(r.$katex=katex),n.searchReplace&&!n.readOnly&&(r.loadCSS(n.path+"codemirror/addon/dialog/dialog"),r.loadCSS(n.path+"codemirror/addon/search/matchesonscrollbar"))),"function"==typeof define&&define.amd||!n.autoLoadModules?("undefined"!=typeof CodeMirror&&(r.$CodeMirror=CodeMirror),"undefined"!=typeof marked&&(r.$marked=marked),this.setCodeMirror().setToolbar().loadedDisplay()):this.loadQueues(),this},loadQueues:function(){var e=this,t=o,i=t.path,a=function(){r.isIE8?e.loadedDisplay():t.flowChart||t.sequenceDiagram?r.loadScript(i+"raphael.min",function(){r.loadScript(i+"underscore.min",function(){!t.flowChart&&t.sequenceDiagram?r.loadScript(i+"sequence-diagram.min",function(){e.loadedDisplay()}):t.flowChart&&!t.sequenceDiagram?r.loadScript(i+"flowchart.min",function(){r.loadScript(i+"jquery.flowchart.min",function(){e.loadedDisplay()})}):t.flowChart&&t.sequenceDiagram&&r.loadScript(i+"flowchart.min",function(){r.loadScript(i+"jquery.flowchart.min",function(){r.loadScript(i+"sequence-diagram.min",function(){e.loadedDisplay()})})})})}):e.loadedDisplay()};return t.searchReplace&&!t.readOnly&&(r.loadCSS(i+"codemirror/addon/dialog/dialog"),r.loadCSS(i+"codemirror/addon/search/matchesonscrollbar")),t.codeFold&&r.loadCSS(i+"codemirror/addon/fold/foldgutter"),r.$CodeMirror=CodeMirror,r.loadScript(i+"codemirror/modes.min",function(){r.loadScript(i+"codemirror/addons.min",function(){if(e.setCodeMirror(),"gfm"!==t.mode&&"markdown"!==t.mode)return e.loadedDisplay(),!1;e.setToolbar(),r.loadScript(i+"marked.min",function(){r.$marked=marked,t.previewCodeHighlight?r.loadScript(i+"prettify.min",function(){a()}):a()})})}),this},setTheme:function(e){var t=this.editor,i=o.theme,r=this.classPrefix+"theme-";return t.removeClass(r+i).addClass(r+e),o.theme=e,this},setEditorTheme:function(e){var t=o;return t.editorTheme=e,"default"!==e&&r.loadCSS(t.path+"codemirror/theme/"+t.editorTheme),this.cm.setOption("theme",e),this},setCodeMirrorTheme:function(e){return this.setEditorTheme(e),this},setPreviewTheme:function(e){var t=this.preview,i=o.previewTheme,r=this.classPrefix+"preview-theme-";return t.removeClass(r+i).addClass(r+e),o.previewTheme=e,this},setCodeMirror:function(){var e=o,t=this.editor;"default"!==e.editorTheme&&r.loadCSS(e.path+"codemirror/theme/"+e.editorTheme);var i={mode:e.mode,theme:e.editorTheme,tabSize:e.tabSize,dragDrop:!1,autofocus:e.autoFocus,autoCloseTags:e.autoCloseTags,readOnly:!!e.readOnly&&"nocursor",indentUnit:e.indentUnit,lineNumbers:e.lineNumbers,lineWrapping:e.lineWrapping,extraKeys:{"Ctrl-Q":function(e){e.foldCode(e.getCursor())}},foldGutter:e.codeFold,gutters:["CodeMirror-linenumbers","CodeMirror-foldgutter"],matchBrackets:e.matchBrackets,indentWithTabs:e.indentWithTabs,styleActiveLine:e.styleActiveLine,styleSelectedText:e.styleSelectedText,autoCloseBrackets:e.autoCloseBrackets,showTrailingSpace:e.showTrailingSpace,highlightSelectionMatches:!!e.matchWordHighlight&&{showToken:"onselected"!==e.matchWordHighlight&&/\w/}};return this.codeEditor=this.cm=r.$CodeMirror.fromTextArea(this.markdownTextarea[0],i),this.codeMirror=this.cmElement=t.children(".CodeMirror"),""!==e.value&&this.cm.setValue(e.value),this.codeMirror.css({fontSize:e.fontSize,width:e.watch?"50%":"100%"}),e.autoHeight&&(this.codeMirror.css("height","auto"),this.cm.setOption("viewportMargin",1/0)),e.lineNumbers||this.codeMirror.find(".CodeMirror-gutters").css("border-right","none"),this},getCodeMirrorOption:function(e){return this.cm.getOption(e)},setCodeMirrorOption:function(e,t){return this.cm.setOption(e,t),this},addKeyMap:function(e,t){return this.cm.addKeyMap(e,t),this},removeKeyMap:function(e){return this.cm.removeKeyMap(e),this},gotoLine:function(t){var i=o;if(!i.gotoLine)return this;var r=this.cm,a=(this.editor,r.lineCount()),n=this.preview;if("string"==typeof t&&("last"===t&&(t=a),"first"===t&&(t=1)),"number"!=typeof t)return alert("Error: The line number must be an integer."),this;if((t=parseInt(t)-1)>a)return alert("Error: The line number range 1-"+a),this;r.setCursor({line:t,ch:0});var s=r.getScrollInfo().clientHeight,l=r.charCoords({line:t,ch:0},"local");if(r.scrollTo(null,(l.top+l.bottom-s)/2),i.watch){var c=this.codeMirror.find(".CodeMirror-scroll")[0],h=e(c).height(),d=c.scrollTop,u=d/c.scrollHeight;0===d?n.scrollTop(0):d+h>=c.scrollHeight-16?n.scrollTop(n[0].scrollHeight):n.scrollTop(n[0].scrollHeight*u)}return r.focus(),this},extend:function(){return void 0!==arguments[1]&&("function"==typeof arguments[1]&&(arguments[1]=e.proxy(arguments[1],this)),this[arguments[0]]=arguments[1]),"object"==typeof arguments[0]&&void 0===arguments[0].length&&e.extend(!0,this,arguments[0]),this},set:function(t,i){return void 0!==i&&"function"==typeof i&&(i=e.proxy(i,this)),this[t]=i,this},config:function(t,i){var r=o;return"object"==typeof t&&(r=e.extend(!0,r,t)),"string"==typeof t&&(r[t]=i),o=r,this.recreate(),this},on:function(t,i){var r=o;return void 0!==r["on"+t]&&(r["on"+t]=e.proxy(i,this)),this},off:function(e){var t=o;return void 0!==t["on"+e]&&(t["on"+e]=function(){}),this},showToolbar:function(t){var i=o;return i.readOnly?this:(i.toolbar&&(this.toolbar.length<1||""===this.toolbar.find("."+this.classPrefix+"menu").html())&&this.setToolbar(),i.toolbar=!0,this.toolbar.show(),this.resize(),e.proxy(t||function(){},this)(),this)},hideToolbar:function(t){return o.toolbar=!1,this.toolbar.hide(),this.resize(),e.proxy(t||function(){},this)(),this},setToolbarAutoFixed:function(t){var i=this.state,r=this.editor,a=this.toolbar,n=o;void 0!==t&&(n.toolbarAutoFixed=t);return!i.fullscreen&&!i.preview&&n.toolbar&&n.toolbarAutoFixed&&e(window).bind("scroll",function(){var t=e(window),i=t.scrollTop();if(!n.toolbarAutoFixed)return!1;i-r.offset().top>10&&i
';t.append(n),a=this.toolbar=t.children("."+i+"toolbar")}if(!e.toolbar)return a.hide(),this;a.show();for(var s="function"==typeof e.toolbarIcons?e.toolbarIcons(this):"string"==typeof e.toolbarIcons?r.toolbarModes[e.toolbarIcons]:e.toolbarIcons,l=a.find("."+this.classPrefix+"menu"),c="",h=!1,d=0,u=s.length;d|';else{var p=/h(\d)/.test(f),m=f;"watch"!==f||e.watch||(m="unwatch");var g=e.lang.toolbar[m],w=e.toolbarIconTexts[m],v=e.toolbarIconsClass[m];g=void 0===g?"":g,w=void 0===w?"":w,v=void 0===v?"":v;var k=h?'':" ";void 0!==e.toolbarCustomIcons[f]&&"function"!=typeof e.toolbarCustomIcons[f]?k+=e.toolbarCustomIcons[f]:(k+='',k+=''+(p?f.toUpperCase():""===v?w:"")+" ",k+=" "),k+=" ",c=h?k+c:c+k}}return l.html(c),l.find('[title="Lowercase"]').attr("title",e.lang.toolbar.lowercase),l.find('[title="ucwords"]').attr("title",e.lang.toolbar.ucwords),this.setToolbarHandler(),this.setToolbarAutoFixed(),this},dialogLockScreen:function(){return e.proxy(r.dialogLockScreen,this)(),this},dialogShowMask:function(t){return e.proxy(r.dialogShowMask,this)(t),this},getToolbarHandles:function(e){var t=this.toolbarHandlers=r.toolbarHandlers;return e&&void 0!==toolbarIconHandlers[e]?t[e]:t},setToolbarHandler:function(){var t=this,i=o;if(!i.toolbar||i.readOnly)return this;var a=this.toolbar,n=this.cm,s=this.classPrefix,l=this.toolbarIcons=a.find("."+s+"menu > li > a"),c=this.getToolbarHandles();return l.bind(r.mouseOrTouch("click","touchend"),function(o){var r=e(this).children(".fa"),a=r.attr("name"),s=n.getCursor(),l=n.getSelection();if(""!==a)return t.activeIcon=r,void 0!==c[a]?e.proxy(c[a],t)(n):void 0!==i.toolbarHandlers[a]&&e.proxy(i.toolbarHandlers[a],t)(n,r,s,l),"link"!==a&&"reference-link"!==a&&"image"!==a&&"code-block"!==a&&"preformatted-text"!==a&&"watch"!==a&&"preview"!==a&&"search"!==a&&"fullscreen"!==a&&"info"!==a&&n.focus(),!1}),this},createDialog:function(t){return e.proxy(r.createDialog,this)(t)},createInfoDialog:function(){var e=this,t=this.editor,i=this.classPrefix,o=['','
','
v"+r.version+" ","
"+this.lang.description+"
",'
'+r.homePage+'
','
Copyright © 2015 Pandao , The MIT License.
',"
",'
',"
'}else{var l=e.match(m),c=e.match(f);if(l)for(var h=0,d=l.length;h'}else{if(!c){var g="+1"===o?"plus1":o;return g="moon"===(g="black_large_square"===g?"black_square":g)?"waxing_gibbous_moon":g,''+e+" "}).replace(/_#_@_#_/g,"@")),o.emailLink&&(t=t.replace(u,function(t,i,o,r,a){return!i&&e.inArray(a,"jpg|jpeg|png|gif|webp|ico|icon|pdf".split("|"))<0?''+t+" ":t})),t):t},s.link=function(e,t,i){if(this.options.sanitize){try{var o=decodeURIComponent(unescape(e)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return""}if(0===o.indexOf("javascript:"))return""}var r=''+i.replace(/@/g,"@")+" "):(t&&(r+=' title="'+t+'"'),r+=">"+i+" ")},s.heading=function(e,i,o){var r=e,n=/\s*\]*)\>(.*)\<\/a\>\s*/;if(n.test(e)){for(var s=[],l=0,c=(e=e.split(/\]+)\>([^\>]*)\<\/a\>/)).length;l';return u+='"+e+" "},s.paragraph=function(e){var t=/\$\$(.*)\$\$/g.test(e),i=/^\$\$(.*)\$\$$/.test(e),a=i?' class="'+r.classNames.tex+'"':"",n=o.tocm?/^(\[TOC\]|\[TOCM\])$/.test(e):/^\[TOC\]$/.test(e),s=/^\[TOCM\]$/.test(e),l=''+(e=!i&&t?e.replace(/(\$\$([^\$]*)\$\$)+/g,function(e,t){return''+t.replace(/\$/g,"")+" "}):i?e.replace(/\$/g,""):e)+"
";return n?s?'"+this.atLink(this.emoji(e))+"\n"},s.code=function(e,t,i){return"seq"===t||"sequence"===t?''+e+"
":"flow"===t?''+e+"
":"math"===t||"latex"===t||"katex"===t?''+e+"
":n.Renderer.prototype.code.apply(this,arguments)},s.tablecell=function(e,t){var i=t.header?"th":"td";return(t.align?"<"+i+' style="text-align:'+t.align+'">':"<"+i+">")+this.atLink(this.emoji(e))+"\n"},s.listitem=function(e){return o.taskList&&/^\s*\[[x\s]\]\s*/.test(e)?(e=e.replace(/^\s*\[\s\]\s*/,''+this.atLink(this.emoji(e))+" "):""+this.atLink(this.emoji(e))+" "},s},r.markdownToCRenderer=function(e,t,i,o){var r="",a=0,n=this.classPrefix;o=o||1;for(var s=0,l=e.length;sa?"":h"):"",r+=''+c+" ",a=h)}var d=t.find(".markdown-toc");if(d.length<1&&"false"===t.attr("previewContainer")){var u='
';u=i?'":u,t.html(u),d=t.find(".markdown-toc")}return i&&d.wrap('\<\/ul\>/g,"")),d},r.tocDropdownMenu=function(t,i){i=i||"Table of Contents";var o=400,r=t.find("."+this.classPrefix+"toc-menu");return r.each(function(){var t=e(this),r=t.children(".markdown-toc"),a='"+i+" "+a+" ]*)>([^>]*)","igm"),"")}if(void 0!==a){var c=/\<(\w+)\s*([^\>]*)\>([^\>]*)\<\/(\w+)\>/gi;t="*"===a?t.replace(c,function(e,t,i,o,r){return"<"+t+">"+o+""}):"on*"===a?t.replace(c,function(t,i,o,r,a){var n=e("<"+i+">"+r+""),s=e(t)[0].attributes,l={};e.each(s,function(e,t){'"'!==t.nodeName&&(l[t.nodeName]=t.nodeValue)}),e.each(l,function(e){0===e.indexOf("on")&&delete l[e]}),n.attr(l);var c=void 0!==n[1]?e(n[1]).text():"";return n[0].outerHTML+c}):t.replace(c,function(t,i,o,r){var n=a.split(","),s=e(t);return s.html(r),e.each(n,function(e){s.attr(n[e],null)}),s[0].outerHTML})}return t},r.markdownToHTML=function(t,i){r.$marked=marked;var o=e("#"+t),a=o.settings=e.extend(!0,{gfm:!0,toc:!0,tocm:!1,tocStartLevel:1,tocTitle:"目录",tocDropdown:!1,tocContainer:"",markdown:"",markdownSourceCode:!1,htmlDecode:!1,autoLoadKaTeX:!0,pageBreak:!0,atLink:!0,emailLink:!0,tex:!1,taskList:!1,emoji:!1,flowChart:!1,sequenceDiagram:!1,previewCodeHighlight:!0},i||{}),n=o.find("textarea");n.length<1&&(o.append(""),n=o.find("textarea"));var s=""===a.markdown?n.val():a.markdown,l=[],c={toc:a.toc,tocm:a.tocm,tocStartLevel:a.tocStartLevel,taskList:a.taskList,emoji:a.emoji,tex:a.tex,pageBreak:a.pageBreak,atLink:a.atLink,emailLink:a.emailLink,flowChart:a.flowChart,sequenceDiagram:a.sequenceDiagram,previewCodeHighlight:a.previewCodeHighlight},h={renderer:r.markedRenderer(l,c),gfm:a.gfm,tables:!0,breaks:!0,pedantic:!1,sanitize:!a.htmlDecode,smartLists:!0,smartypants:!0};s=new String(s);var d=marked(s,h);d=r.filterHTMLTags(d,a.htmlDecode),a.markdownSourceCode?n.text(s):n.remove(),o.addClass("markdown-body "+this.classPrefix+"html-preview").append(d);var u=""!==a.tocContainer?e(a.tocContainer):o;if(""!==a.tocContainer&&u.attr("previewContainer",!1),a.toc&&(o.tocContainer=this.markdownToCRenderer(l,u,a.tocDropdown,a.tocStartLevel),(a.tocDropdown||o.find("."+this.classPrefix+"toc-menu").length>0)&&this.tocDropdownMenu(o,a.tocTitle),""!==a.tocContainer&&o.find(".editormd-toc-menu, .editormd-markdown-toc").remove()),a.previewCodeHighlight&&(o.find("pre").addClass("prettyprint linenums"),prettyPrint()),r.isIE8||(a.flowChart&&o.find(".flowchart").flowChart(),a.sequenceDiagram&&o.find(".sequence-diagram").sequenceDiagram({theme:"simple"})),a.tex){var f=function(){o.find("."+r.classNames.tex).each(function(){var t=e(this);katex.render(t.text(),t[0]),t.find(".katex").css("font-size","1.0em")})};!a.autoLoadKaTeX||r.$katex||r.kaTeXLoaded?f():this.loadKaTeX(function(){r.$katex=katex,r.kaTeXLoaded=!0,f()})}return o.getMarkdown=function(){return n.val()},o},r.themes=["default","dark"],r.previewThemes=["default","dark"],r.editorThemes=["default","3024-day","3024-night","ambiance","ambiance-mobile","base16-dark","base16-light","blackboard","cobalt","eclipse","elegant","erlang-dark","lesser-dark","mbo","mdn-like","midnight","monokai","neat","neo","night","paraiso-dark","paraiso-light","pastel-on-dark","rubyblue","solarized","the-matrix","tomorrow-night-eighties","twilight","vibrant-ink","xq-dark","xq-light"],r.loadPlugins={},r.loadFiles={js:[],css:[],plugin:[]},r.loadPlugin=function(e,t,i){t=t||function(){},this.loadScript(e,function(){r.loadFiles.plugin.push(e),t()},i)},r.loadCSS=function(e,t,i){i=i||"head",t=t||function(){};var o=document.createElement("link");o.type="text/css",o.rel="stylesheet",o.onload=o.onreadystatechange=function(){r.loadFiles.css.push(e),t()},o.href=e+".css","head"===i?document.getElementsByTagName("head")[0].appendChild(o):document.body.appendChild(o)},r.isIE="Microsoft Internet Explorer"==navigator.appName,r.isIE8=r.isIE&&"8."==navigator.appVersion.match(/8./i),r.loadScript=function(e,t,i){i=i||"head",t=t||function(){};var o=null;(o=document.createElement("script")).id=e.replace(/[\./]+/g,"-"),o.type="text/javascript",o.src=e+".js",r.isIE8?o.onreadystatechange=function(){o.readyState&&("loaded"!==o.readyState&&"complete"!==o.readyState||(o.onreadystatechange=null,r.loadFiles.js.push(e),t()))}:o.onload=function(){r.loadFiles.js.push(e),t()},"head"===i?document.getElementsByTagName("head")[0].appendChild(o):document.body.appendChild(o)},r.katexURL={css:"/katex/katex.min",js:"/katex/katex.min"},r.kaTeXLoaded=!1,r.loadKaTeX=function(e){r.loadCSS(r.katexURL.css,function(){r.loadScript(r.katexURL.js,e||function(){})})},r.lockScreen=function(t){e("html,body").css("overflow",t?"hidden":"")},r.createDialog=function(t){t=e.extend(!0,{name:"",width:420,height:240,title:"",drag:!0,closed:!0,content:"",mask:!0,maskStyle:{backgroundColor:"#fff",opacity:.1},lockScreen:!0,footer:!0,buttons:!1},t);var i=this,o=this.editor,a=r.classPrefix,n=(new Date).getTime(),s=""===t.name?a+"dialog-"+n:t.name,l=r.mouseOrTouch,c='';""!==t.title&&(c+='"),t.closed&&(c+='
'),c+='
'+t.content,(t.footer||"string"==typeof t.footer)&&(c+='"),c+="
",c+='
',c+='
',c+="
'+p[0]+" "),p[1]=e.proxy(p[1],h),u.children("."+m).bind(l("click","touchend"),p[1])}}if(""!==t.title&&t.drag){var g,w,v=h.children("."+a+"dialog-header");t.mask||v.bind(l("click","touchend"),function(){r.dialogZindex+=2,h.css("z-index",r.dialogZindex)}),v.mousedown(function(e){e=e||window.event,g=e.clientX-parseInt(h[0].style.left),w=e.clientY-parseInt(h[0].style.top),document.onmousemove=x});var k=function(e){e.removeClass(a+"user-unselect").off("selectstart")},b=function(e){e.addClass(a+"user-unselect").on("selectstart",function(e){return!1})},x=function(t){t=t||window.event;var i,o,r=parseInt(h[0].style.left),a=parseInt(h[0].style.top);r>=0?r+h.width()<=e(window).width()?i=t.clientX-g:(i=e(window).width()-h.width(),document.onmousemove=null):(i=0,document.onmousemove=null),a>=0?o=t.clientY-w:(o=0,document.onmousemove=null),document.onselectstart=function(){return!1},b(e("body")),b(h),h[0].style.left=i+"px",h[0].style.top=o+"px"};document.onmouseup=function(){k(e("body")),k(h),document.onselectstart=null,document.onmousemove=null},v.touchDraggable=function(){var t=null;this.bind("touchstart",function(i){var o=i.originalEvent,r=e(this).parent().position();t={x:o.changedTouches[0].pageX-r.left,y:o.changedTouches[0].pageY-r.top}}).bind("touchmove",function(i){i.preventDefault();var o=i.originalEvent;e(this).parent().css({top:o.changedTouches[0].pageY-t.y,left:o.changedTouches[0].pageX-t.x})})},v.touchDraggable()}return r.dialogZindex+=2,e("body").removeAttr("style"),h},r.mouseOrTouch=function(e,t){t=t||"touchend";var i=e=e||"click";try{document.createEvent("TouchEvent"),i=t}catch(e){}return i},r.dateFormat=function(e){e=e||"";var t=function(e){return e<10?"0"+e:e},i=new Date,o=i.getFullYear(),r=o.toString().slice(2,4),a=t(i.getMonth()+1),n=t(i.getDate()),s=i.getDay(),l=t(i.getHours()),c=t(i.getMinutes()),h=t(i.getSeconds()),d=t(i.getMilliseconds()),u="",f=r+"-"+a+"-"+n,p=o+"-"+a+"-"+n,m=l+":"+c+":"+h;switch(e){case"UNIX Time":u=i.getTime();break;case"UTC":u=i.toUTCString();break;case"yy":u=r;break;case"year":case"yyyy":u=o;break;case"month":case"mm":u=a;break;case"cn-week-day":case"cn-wd":u="星期"+["日","一","二","三","四","五","六"][s];break;case"week-day":case"wd":u=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"][s];break;case"day":case"dd":u=n;break;case"hour":case"hh":u=l;break;case"min":case"ii":u=c;break;case"second":case"ss":u=h;break;case"ms":u=d;break;case"yy-mm-dd":u=f;break;case"yyyy-mm-dd":u=p;break;case"yyyy-mm-dd h:i:s ms":case"full + ms":u=p+" "+m+" "+d;break;case"full":case"yyyy-mm-dd h:i:s":default:u=p+" "+m}return u},r}}),window._whenPasterDoUpload=function(e,t,i){var o,r,a,n=e.clipboardData,s=0;if(n){if(!(o=n.items))return;for(r=o[0],a=n.types||[];s {
+ if (window.wx) {
+ const wx = window.wx
+ const url = '/wechats/js_sdk_signature.json'
+ axios.post(url, {
+ url: 'http://pre-newweb.educoder.net',
+ }).then((response) => {
+ console.log('got res')
+ const data = response.data;
+ wx.config({
+ debug: false,
+ appId: data.appid,
+ timestamp: data.timestamp,
+ nonceStr: data.nonceStr,
+ signature: data.signature,
+ jsApiList: [
+ 'onMenuShareTimeline',//
+ 'onMenuShareAppMessage',
+ 'onMenuShareQQ',
+ 'onMenuShareWeibo',
+ 'onMenuShareQZone'
+
+ ]
+ });
+ wx.ready(function () {
+ console.log('wx is ready')
+ var shareData = {
+ title: '这是是分享标题',
+ desc: '这是是摘要',
+ link: 'http://pre-newweb.educoder.net',
+ imgUrl: 'http://pre-newweb.educoder.net/images/educoder/index/subject/subject15.jpg'
+ };
+
+ wx.onMenuShareAppMessage(shareData);//分享给好友
+ wx.onMenuShareTimeline(shareData);//分享到朋友圈
+ wx.onMenuShareQQ(shareData);//分享给手机QQ
+ wx.onMenuShareWeibo(shareData);//分享腾讯微博
+ wx.onMenuShareQZone(shareData);//分享到QQ空间
+
+
+
+ });
+ wx.error(function (res) {
+ console.log('wx is error')
+ console.log(res)
+ //alert(res.errMsg);//错误提示
+
+ });
+ }).catch((error) => {
+ console.log(error)
+ })
+ }
+ }
componentDidMount() {
+
+
// force an update if the URL changes
history.listen(() => {
this.forceUpdate()
@@ -302,7 +357,7 @@ class App extends Component {
});
initAxiosInterceptors(this.props)
-
+ this.initWXShare()
//
// axios.interceptors.response.use((response) => {
// // console.log("response"+response);
diff --git a/public/react/src/common/Env.js b/public/react/src/common/Env.js
index bdd4584f4..283e82c48 100644
--- a/public/react/src/common/Env.js
+++ b/public/react/src/common/Env.js
@@ -1,3 +1,6 @@
export function isDev() {
return window.location.port === "3007";
-}
\ No newline at end of file
+}
+
+// const isMobile
+export const isMobile = (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase()));
\ No newline at end of file
diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js
index 1d7c66dbb..5b1d7ac28 100644
--- a/public/react/src/common/educoder.js
+++ b/public/react/src/common/educoder.js
@@ -20,8 +20,7 @@ export { markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, ap
downloadFile, sortDirections } from './TextUtil'
export { handleDateString, getNextHalfHourOfMoment,formatDuring } from './DateUtil'
-
-export { isDev as isDev } from './Env'
+export { isDev as isDev, isMobile } from './Env'
export { toStore as toStore, fromStore as fromStore } from './Store'
diff --git a/public/react/src/context/TPIContextProvider.js b/public/react/src/context/TPIContextProvider.js
index 0e0d7be1b..3fbdb6ed1 100644
--- a/public/react/src/context/TPIContextProvider.js
+++ b/public/react/src/context/TPIContextProvider.js
@@ -525,7 +525,10 @@ pop_box_new(htmlvalue, 480, 182);
})
// test
- // var data = {"st":0,"discusses_count":12,"game_count":6,"record_onsume_time":5.303,"prev_game":"q67plhfjaogy","next_game":"lfrwm2ohiate","praise_count":0,"user_praise":false,"time_limit":180,"tomcat_url":"http://47.98.226.234","is_teacher":true,"myshixun_manager":false,"game":{"id":1964918,"myshixun_id":510423,"user_id":73892,"created_at":"2019-06-24T11:22:58.000+08:00","updated_at":"2019-06-25T11:15:48.000+08:00","status":0,"final_score":0,"challenge_id":573,"open_time":"2019-06-24T11:22:58.000+08:00","identifier":"yrsxolqk6zcp","answer_open":0,"end_time":null,"retry_status":0,"resubmit_identifier":null,"test_sets_view":false,"picture_path":null,"accuracy":null,"modify_time":null,"star":0,"cost_time":3966,"evaluate_count":1,"answer_deduction":0},"challenge":{"id":573,"shixun_id":186,"subject":"应用模型做预测","position":4,"task_pass":"####本关任务\r\n本关卡学习如何应用机器学习模型来做预测。\r\n\r\n####相关知识\r\n在前一关卡中，我们一起探讨了机器学习的一般原理，并建立了一个非常简单的电影评分模型Model 0：\r\n\r\n评分 = **大众对电影的平均评分** + **用户个人的给分偏好** + **电影的评分偏好**\r\n\r\n针对这个模型，我们设计了一个非常朴素的预测模型Baseline，直接从数据集中统计得到上述三个参数的值。\r\n\r\n在本关卡中，我们将应用这个模型对用户和电影的评分做出预测。\r\n\r\n####编程要求\r\n回顾Model 0的预测评分公式：\r\n```latex\r\nf(u,m)=g+\\alpha(u)+\\beta(m)\r\n```\r\n\r\n我们的Baseline模型得到了$$g$$、$$\\alpha$$和$$\\beta$$三种参数，下面我们实现predict函数，来对测试数据集中未知的用户电影评分进行预测，需要填充的代码块如下：\r\n```python\r\n# -*- coding:utf-8 -*-\r\n\r\ndef predict(g, alpha, beta, test_data):\r\n\t\"\"\"预测用户对电影的评分\r\n\t参数:\r\n\t\tg - 浮点数，模型参数平均电影评分\r\n\t\talpha - 浮点数组，用户评分偏差参数数组\r\n\t\tbeta - 浮点数组，电影评分偏差参数数组\r\n\t\ttest_data - Pandas的DataFrame对象，有两列'user','movie'，是测试数据集\r\n\t返回值：\r\n\t\tret - 浮点数数组，预测的评分数组，举例ret[10]，表示第10组用户和电影对的评分值\r\n\t\"\"\"\t\r\n\tret = []\r\n\tN = len(alpha)\r\n\tM = len(beta)\r\n\t\r\n\t# 请在此添加实现代码\r\n\t#********** Begin *********#\r\n\t\r\n\t#********** End *********#\r\n\t\r\n\treturn ret\r\n```\r\n\r\n####本关任务\r\n本关卡的测试数据来自内置测试文件，平台将比对您所编写函数的预测评分与正确评分，只有所有数据全部计算正确才能进入下一关。","score":500,"path":"src/step4/doprediction.py","st":0,"web_route":null,"modify_time":null},"shixun":{"id":186,"name":"理解机器学习基本概念：从电影评分预测讲起","user_id":24758,"gpid":3676,"visits":622,"created_at":"2017-08-25T18:07:41.000+08:00","updated_at":"2019-06-02T11:05:20.000+08:00","status":2,"language":"MachineLearning","authentication":false,"identifier":"58DRWG63","trainee":3,"major_id":635,"webssh":0,"homepage_show":false,"hidden":false,"fork_from":null,"can_copy":true,"modify_time":"2017-09-29T21:42:16.000+08:00","reset_time":"2017-09-29T21:42:16.000+08:00","publish_time":"2017-09-29T10:58:13.000+08:00","closer_id":null,"end_time":null,"git_url":"educoder/58drwg63","vnc":false,"myshixuns_count":318,"challenges_count":6,"use_scope":0,"mirror_script_id":0,"image_text":null,"code_hidden":false,"task_pass":false,"exec_time":180,"test_set_permission":true,"sigle_training":false,"hide_code":false,"multi_webssh":false,"excute_time":null,"repo_name":"educoder/58drwg63","averge_star":4.9,"opening_time":null,"users_count":10,"forbid_copy":false,"pod_life":0},"myshixun":{"id":510423,"shixun_id":186,"is_public":true,"user_id":73892,"gpid":null,"created_at":"2019-06-24T11:22:55.000+08:00","updated_at":"2019-06-24T13:56:40.000+08:00","status":0,"identifier":"7pkwxim9eh","commit_id":"ff7c6652fdfdf62eaa1316d39400ebdbd6cb81fb","modify_time":"2017-09-29T21:42:16.000+08:00","reset_time":"2017-09-29T21:42:16.000+08:00","system_tip":false,"git_url":null,"onclick_time":"2019-06-24T11:22:55.000+08:00","repo_name":"p35840769/7pkwxim9eh20190624112255"},"user":{"user_id":73892,"login":"p35840769","name":"韩半安","grade":6895,"image_url":"avatars/User/b","school":"国防科技大学","identity":6},"tpm_modified":false,"tpm_cases_modified":false,"mirror_name":["MachineLearning"],"has_answer":true,"test_sets":[{"is_public":true,"result":false,"input":"771 253 360 99 8 759 976 387 873 829 437 53 854 148 447 179 246 810 158 653 583 929 691 892 263 230 637 221 7 652 127 965 767","output":"3.577 -0.329 2.648 4.727 4.351 2.616 3.496 3.059 3.470 3.166 3.064 2.716 3.712 4.003 3.064 3.462 4.004 2.067 3.860 0.121 3.807 3.735 4.230 3.137 4.431 2.468 4.018 5.218 4.351 4.121 4.050 4.587 3.777","actual_output":"Traceback (most recent call last):\r\n File \"src/step4/main.py\", line 3, in \u003cmodule\u003e\r\n from doprediction import predict\r\nImportError: cannot import name 'predict'\r\n","compile_success":1},{"is_public":false,"result":false,"compile_success":1}],"allowed_unlock":true,"last_compile_output":"共有2组测试集，其中有2组测试结果不匹配。详情如下：","test_sets_count":2,"sets_error_count":2}
+ // var data = {"st":0,"discusses_count":0,"game_count":3,"record_onsume_time":0.36,"prev_game":null,"next_game":"7p9xwo2hklqv","praise_count":0,"user_praise":false,"time_limit":20,"tomcat_url":"http://47.96.157.89","is_teacher":false,"myshixun_manager":true,"game":{"id":2192828,"myshixun_id":580911,"user_id":57844,"created_at":"2019-09-03T15:50:49.000+08:00","updated_at":"2019-09-03T15:51:05.000+08:00","status":2,"final_score":0,"challenge_id":10010,"open_time":"2019-09-03T15:50:49.000+08:00","identifier":"hknvz4oaw825","answer_open":0,"end_time":"2019-09-03T15:51:04.000+08:00","retry_status":0,"resubmit_identifier":null,"test_sets_view":false,"picture_path":null,"accuracy":1.0,"modify_time":"2019-09-03T15:23:33.000+08:00","star":0,"cost_time":14,"evaluate_count":1,"answer_deduction":0},"challenge":{"id":10010,"shixun_id":3516,"subject":"1.1 列表操作","position":1,"task_pass":"[TOC]\n\n---\n\n####任务描述\n\n\n数据集a包含1-10共10个整数，请以a为输入数据，编写python程序，实现如下功能：\n①\t用2种方法输出a中所有奇数\n②\t输出大于3，小于7的偶数\n③\t用2种方法输出[1,2,3,…10,11,…20]\n④\t输出a的最大值、最小值。\n⑤\t用2种方法输出[10,9,…2,1]\n⑥\t输出[1,2,3,1,2,3,1,2,3,1,2,3]\n\n\n####相关知识\n\n\n请自行学习相关知识\n\n\n---\n开始你的任务吧，祝你成功！","score":100,"path":"1-1-stu.py","st":0,"web_route":null,"modify_time":"2019-09-03T15:23:33.000+08:00","exec_time":20,"praises_count":0},"shixun":{"id":3516,"name":"作业1——Python程序设计","user_id":77620,"gpid":null,"visits":23,"created_at":"2019-09-03T14:18:17.000+08:00","updated_at":"2019-09-03T15:58:16.000+08:00","status":0,"language":null,"authentication":false,"identifier":"6lzjig58","trainee":1,"major_id":null,"webssh":2,"homepage_show":false,"hidden":false,"fork_from":null,"can_copy":true,"modify_time":"2019-09-03T14:18:17.000+08:00","reset_time":"2019-09-03T14:18:17.000+08:00","publish_time":null,"closer_id":null,"end_time":null,"git_url":null,"vnc":null,"myshixuns_count":3,"challenges_count":3,"use_scope":0,"mirror_script_id":20,"image_text":null,"code_hidden":false,"task_pass":true,"exec_time":20,"test_set_permission":true,"sigle_training":false,"hide_code":false,"multi_webssh":false,"excute_time":null,"repo_name":"p09218567/6lzjig58","averge_star":5.0,"opening_time":null,"users_count":1,"forbid_copy":false,"pod_life":0},"myshixun":{"id":580911,"shixun_id":3516,"is_public":true,"user_id":57844,"gpid":null,"created_at":"2019-09-03T15:50:49.000+08:00","updated_at":"2019-09-03T15:59:04.000+08:00","status":0,"identifier":"k36hm4rwav","commit_id":"f25e1713882156480fc45ce0af57eff395a5037f","modify_time":"2019-09-03T14:18:17.000+08:00","reset_time":"2019-09-03T14:18:17.000+08:00","system_tip":false,"git_url":null,"onclick_time":"2019-09-03T15:50:49.000+08:00","repo_name":"p53276410/k36hm4rwav20190903155049"},"user":{"user_id":57844,"login":"p53276410","name":"文振乾","grade":24624,"identity":1,"image_url":"avatars/User/57844","school":"EduCoder团队"},"tpm_modified":true,"tpm_cases_modified":false,"mirror_name":["Python3.6"],"has_answer":false,"test_sets":[{"is_public":true,"result":true,"input":"","output":"result of a:\n[1, 3, 5, 7, 9]\n[1, 3, 5, 7, 9]\nresult of b:\n[2, 4, 6, 8, 10]\nresult of c:\n[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]\n[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]\nresult of d:\nThe minimum is:1\nThe maxium is:10\nresult of e:\n[10, 9, 8, 7, 6, 5, 4, 3, 2, 1]\n[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]\nresult of f:\n[10, 9, 8, 10, 9, 8, 10, 9, 8, 10, 9, 8]\n","actual_output":"result of a:\r\n[1, 3, 5, 7, 9]\r\n[1, 3, 5, 7, 9]\r\nresult of b:\r\n[2, 4, 6, 8, 10]\r\nresult of c:\r\n[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]\r\n[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]\r\nresult of d:\r\nThe minimum is:1\r\nThe maxium is:10\r\nresult of e:\r\n[10, 9, 8, 7, 6, 5, 4, 3, 2, 1]\r\n[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]\r\nresult of f:\r\n[10, 9, 8, 10, 9, 8, 10, 9, 8, 10, 9, 8]\r\n","compile_success":1,"ts_time":0.05,"ts_mem":8.77}],"allowed_unlock":true,"last_compile_output":"compile successfully","test_sets_count":1,"sets_error_count":0}
+ // data.test_sets[0].actual_output = data.test_sets[0].actual_output.replace(/\r\n/g, '\n')
+ // data.test_sets[0].output = data.test_sets[0].output.replace(/\r\n/g, '\n')
+ // console.log(JSON.stringify(data))
// data.shixun.vnc = true
// data.vnc_url= "http://47.96.157.89:41158/vnc_lite.html?password=headless"
diff --git a/public/react/src/images/path/path.png b/public/react/src/images/path/path.png
new file mode 100644
index 000000000..594358959
Binary files /dev/null and b/public/react/src/images/path/path.png differ
diff --git a/public/react/src/modules/comment/Comments.js b/public/react/src/modules/comment/Comments.js
index ae246197c..836b520cc 100644
--- a/public/react/src/modules/comment/Comments.js
+++ b/public/react/src/modules/comment/Comments.js
@@ -383,12 +383,12 @@ class Comments extends Component {
{/* | */}
- this.initReply(item) } >
-
+ }
{/* | */}
diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index b06ab3dc1..4e8e89567 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -30,7 +30,8 @@ class Fileslistitem extends Component{
showfiles=(list)=>{
if(list.is_history_file===false){
// this.props.DownloadFileA(list.title,list.url)
- window.location.href=list.url;
+ //window.location.href=list.url;
+ window.open(list.url, '_blank');
}else{
let {discussMessage,coursesId}=this.props
let file_id=discussMessage.id
@@ -49,7 +50,7 @@ class Fileslistitem extends Component{
//
// }
// this.props.DownloadFileA(result.data.title,result.data.url)
- window.location.href=list.url;
+ window.open(list.url, '_blank');
}else{
this.setState({
Showoldfiles:true,
diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js
index a08225c1f..0222907d3 100644
--- a/public/react/src/modules/courses/boards/BoardsNew.js
+++ b/public/react/src/modules/courses/boards/BoardsNew.js
@@ -287,7 +287,7 @@ class BoardsNew extends Component{
const isAdmin = this.props.isAdmin()
const courseId=this.props.match.params.coursesId;
const boardId = this.props.match.params.boardId
-
+ const isCourseEnd = this.props.isCourseEnd()
return(
{menu}
{
- isAdmin &&
+ isAdmin && !isCourseEnd &&
this.refs['addDirModal'].open()}>
diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js
index 542157bfb..8ecc85565 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.js
+++ b/public/react/src/modules/courses/boards/TopicDetail.js
@@ -527,6 +527,7 @@ class TopicDetail extends Component {
// TODO 图片上传地址
const courseId=this.props.match.params.coursesId;
const boardId = this.props.match.params.boardId
+ const isCourseEnd = this.props.isCourseEnd()
return (
{/* fl with100 */}
diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index 82e8a5d76..bff4422ec 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -376,7 +376,7 @@ class AccountBasic extends Component {
this.getSchoolList(this.props.basicInfo, name);
this.props.form.setFieldsValue({
- name: name
+ org: name
})
}
diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js
index c2f2c7ff4..99afce1d0 100644
--- a/public/react/src/modules/user/usersInfo/InfosBanner.js
+++ b/public/react/src/modules/user/usersInfo/InfosBanner.js
@@ -30,6 +30,11 @@ class InfosBanner extends Component{
let user_id=this.props.current_user&&this.props.current_user.user_id;
let user_type=this.props.current_user&&this.props.current_user.user_identity;
let targetuserid=this.props.data&&this.props.data.id;
+
+ // console.log(is_current)
+ // console.log(current_user)
+ // console.log(current_user.is_teacher)
+ // console.log(current_user.admin)
return(
diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js
index c25f4e823..2bf71a51b 100644
--- a/public/react/src/modules/user/usersInfo/InfosTopics.js
+++ b/public/react/src/modules/user/usersInfo/InfosTopics.js
@@ -271,6 +271,10 @@ class InfosTopics extends Component{
visible,
isshowprofes
} = this.state;
+ let {
+ is_current,
+ current_user,
+ }=this.props;
let categorylist=[
{val:"普通作业",type:"normal"},
@@ -291,6 +295,12 @@ class InfosTopics extends Component{
let user_type=this.props.current_user&&this.props.current_user.user_identity;
let targetuserid=this.props.data&&this.props.data.id;
+
+
+ // console.log(is_current)
+ // console.log(current_user)
+ // console.log(current_user.is_teacher)
+ // console.log(current_user.admin)
const menu = (
this.updatedlist("updated_at")}>
@@ -353,20 +363,16 @@ class InfosTopics extends Component{
}
.shaiContent li.shaiItem {
- padding: 0px 15px;
+ padding: 0px 9px;
float: left;
border-radius: 4px;
cursor: pointer;
- margin-right: 20px;
+ margin-right: 10px;
display: block;
margin-bottom: 0px;
color: #666;
}
- .mr38{
- margin-right:38px;
- }
-
.maxwidth900{
max-width: 900px;
overflow:hidden;
@@ -381,7 +387,9 @@ class InfosTopics extends Component{
.homepagePostSettingbox{
width:139px !important;
}
-
+ .marright0{
+ margin-right: 0px !important;
+ }
`
}
@@ -407,7 +415,7 @@ class InfosTopics extends Component{
{categorylist.map((item,key)=>{
return(
-
this.searchCategory(item.type)}>{item.val}
+
this.searchCategory(item.type)}>{item.val}
)
})}
@@ -418,7 +426,7 @@ class InfosTopics extends Component{
{data===undefined?"":data.course_list===undefined||data.course_list.length===0?"":data.course_list.map((item,key)=>{
return(
-
this.searchCourselistid(item.id)}>{item.name}
+ this.searchCourselistid(item.id)}>{item.name}
)
})}
@@ -442,15 +450,15 @@ class InfosTopics extends Component{
-
- 共 {data&&data.count===undefined?0:data&&data.count} 个
+
+ 共 {data&&data.count===undefined?0:data&&data.count} 个
已选择 {checkBoxValues.length} 个 (不支持跨页勾选)
- {sort_by==="updated_at"?'最近更新':sort_by==="name"?'题目更新':sort_by==="contributor"?"贡献者":""}
-
+ {sort_by==="updated_at"?'最近更新':sort_by==="name"?'题目更新':sort_by==="contributor"?"贡献者":""}
+ this.updatedlist(sort_by)}>
- {user_id===targetuserid&&user_type!="学生"?this.sendTopics()}>发送 :""}
- {types==="personal"?user_id===targetuserid&&user_type!="学生"?this.deletecheckBoxValues()}>删除 :"":""}
+ {user_type!="学生"?this.sendTopics()}>发送 :""}
+ {types==="personal"?((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
+ &&this.deletecheckBoxValues()}>删除 :""}
diff --git a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
index 6a303f62b..496c21459 100644
--- a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
+++ b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
@@ -93,7 +93,7 @@ class BanksIndex extends Component{
{
crumbData &&
- { crumbData && crumbData.is_public == true ? '公共' : '我的' }题库
+ { crumbData && crumbData.is_public == true ? '公共' : '我的' }题库
{
crumbData.crumbArray && crumbData.crumbArray.map((item,key)=>{
return(
@@ -117,14 +117,14 @@ class BanksIndex extends Component{
{/*毕设任务编辑*/}
- {
return (
- {
return (
- {
return (
- {
return (
- {
- return (
- {
return ( (
- {
return (
-
- {/*毕设任务题库详情*/}
- {
+ return (
+ {/*毕设任务题库详情*/}
+ (
{/*毕设内容题库详情*/}
- (
{/*分组作业题库详情*/}
- (
{/* 普通作业题库详情*/}
- (
{
@@ -58,7 +61,7 @@ class BanksTabIndex extends Component{
>
}
- {
return (
- {
return (
- {
return (
+ 完成
+ }
>
)
diff --git a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js
index b3145f00f..4c3bc4e24 100644
--- a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js
+++ b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js
@@ -25,7 +25,7 @@ class GtaskBanksEdit extends Component {
title:'编辑',
is_public:result && result.data && result.data.is_public,
crumbArray:[
- {to:`/banks/gtask/${workId}/edit`,content:'详情'},
+ {to:`/banks/gtask/${workId}/${this.props.match.params.type}`,content:'详情'},
{content:'编辑'}
]
}
@@ -59,7 +59,7 @@ class GtaskBanksEdit extends Component {
});
}
toWorkDetail = () => {
- this.props.history.push(`/banks/gtask/${this.props.match.params.workId}`);
+ this.props.history.push(`/banks/gtask/${this.props.match.params.workId}/${this.props.match.params.type}`);
this.props.initPublic(undefined);
}
onCancel = () => {
diff --git a/public/react/src/modules/user/usersInfo/banks/GtopicBanks.js b/public/react/src/modules/user/usersInfo/banks/GtopicBanks.js
index 4d7aceb8b..be7922d90 100644
--- a/public/react/src/modules/user/usersInfo/banks/GtopicBanks.js
+++ b/public/react/src/modules/user/usersInfo/banks/GtopicBanks.js
@@ -21,7 +21,8 @@ class GtopicBanks extends Component{
// {to:'/banks/gtopic/1/answer',content:'参考答案'},
],
category:'topic',//毕设选题
- id:bankId
+ id:bankId,
+ is_public:true,
}
this.props.initPublic(crumbData,menuData);
}
diff --git a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js
index ade1b3361..87be40195 100644
--- a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js
+++ b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js
@@ -24,7 +24,7 @@ class GtopicBanksEdit extends Component{
title:'编辑',
is_public:result && result.data.selected_data && result.data.selected_data.is_public,
crumbArray:[
- {to:`/banks/gtopic/${bankId}/edit`,content:'详情'},
+ {to:`/banks/gtopic/${bankId}/${this.props.match.params.type}`,content:'详情'},
{content:'编辑'}
]
}
@@ -47,7 +47,7 @@ class GtopicBanksEdit extends Component{
axios.put(url,params).then((result)=>{
if(result){
this.props.showNotification('保存成功！');
- this.props.history.push(`/banks/gtopic/${bankId}`);
+ this.props.history.push(`/banks/gtopic/${bankId}/${this.props.match.params.type}`);
}
}).catch((error)=>{
console.log(error);
@@ -56,7 +56,7 @@ class GtopicBanksEdit extends Component{
// 取消
editCancel = () =>{
- this.props.history.push(`/banks/gtopic/${this.props.match.params.bankId}`);
+ this.props.history.push(`/banks/gtopic/${this.props.match.params.bankId}/${this.props.match.params.type}`);
this.props.initPublic(undefined);
}
diff --git a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js
index b672239b5..25133f547 100644
--- a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js
+++ b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js
@@ -26,7 +26,7 @@ class HomeworkBanksEdit extends Component {
title:'编辑',
is_public:result && result.data && result.data.is_public,
crumbArray:[
- {to:`/banks/${this.getModuleName()}/${workId}`,content:'详情'},
+ {to:`/banks/${this.getModuleName()}/${workId}/${this.props.match.params.type}`,content:'详情'},
{content:'编辑'}
]
}
@@ -64,7 +64,7 @@ class HomeworkBanksEdit extends Component {
return this.props.isGroup ? 'group' : 'normal'
}
toWorkDetail = () => {
- this.props.history.push(`/banks/${this.getModuleName()}/${this.props.match.params.workId}?tab=0`)
+ this.props.history.push(`/banks/${this.getModuleName()}/${this.props.match.params.workId}/${this.props.match.params.type}`)
this.props.initPublic(undefined);
}
onCancel = () => {
diff --git a/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js b/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
index db18c696d..6d8bfb13a 100644
--- a/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
+++ b/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
@@ -12,6 +12,8 @@ class PollBanksContent extends Component{
}
componentDidMount = () =>{
+ console.log("PollBanksContent");
+ console.log(this.props)
let bankId=this.props.match.params.bankId;
let url = `/exercise_banks/${bankId}.json`
axios.get(url).then((result)=>{
@@ -36,12 +38,13 @@ class PollBanksContent extends Component{
const menuData={
tab:'0',//tab选中的index
menuArray:[//tab以及tab路由
- {to:`/banks/poll/${bankId}`,content:'内容详情'}
+ {to:`/banks/poll/${bankId}/${this.props.match.params.type}`,content:'内容详情'}
],
category:'poll',//毕设选题
- tos:`/banks/poll/${bankId}/edit`,
+ tos:`/banks/poll/${bankId}/edit/${this.props.match.params.type}`,
id:bankId,
-
+ is_public:result.data.poll && result.data.poll.is_public,
+ type:this.props.match.params.type,
}
this.props.initPublic(crumbData,menuData);
this.setState({
@@ -55,7 +58,6 @@ class PollBanksContent extends Component{
render(){
let { pollDetail } = this.state
-
return(
diff --git a/public/react/src/modules/user/usersInfo/banks/banksMenu.js b/public/react/src/modules/user/usersInfo/banks/banksMenu.js
index 7680dc748..82cbf2ef3 100644
--- a/public/react/src/modules/user/usersInfo/banks/banksMenu.js
+++ b/public/react/src/modules/user/usersInfo/banks/banksMenu.js
@@ -13,7 +13,8 @@ class BanksMenu extends Component{
constructor(props){
super(props);
this.state={
- visible:false
+ visible:false,
+ tab:['0'],
}
}
@@ -23,6 +24,12 @@ class BanksMenu extends Component{
visible:true
})
}
+ componentDidMount() {
+ let { banksMenu} = this.props;
+ this.setState({
+ tab:banksMenu && banksMenu.tab?[String(banksMenu.tab)]:['0'],
+ })
+ }
topicscancelmodel=()=>{
this.setState({
@@ -78,15 +85,29 @@ class BanksMenu extends Component{
});
this.topicscancelmodel()
}
-
+ changeTab=(e)=>{
+ this.setState({
+ tab:e.key
+ })
+ console.log(e.key);
+ // if(e.key === 0){
+ //
+ // }else{
+ //
+ //
+ // }
+ }
render(){
let { banksMenu} = this.props;
- let {visible}=this.state;
+ let {visible,tab}=this.state;
// console.log("问卷预览");
// console.log(visible);
let user_id=this.props.current_user&&this.props.current_user.user_id;
let user_type=this.props.current_user&&this.props.current_user.user_identity;
let targetuserid=this.props.data&&this.props.data.id;
+ console.log("_____________________________");
+ console.log(this.props);
+ console.log("++++++++++++++++=");
return(
{this.state.Modalstype&&this.state.Modalstype===true?
-
+
{
banksMenu.menuArray && banksMenu.menuArray.map((item,key)=>{
+ console.log("BanksMenu");
+ console.log(item);
return(
}
-
-
+ {this.props.isClassManagement() === true?
+
this.deletecheckBoxValues(banksMenu&&banksMenu.id,banksMenu&&banksMenu.category)}style="blue" className="ml20 font-16">删除
编辑
this.sendTopics()} style="blue" className="ml20 font-16">发送
+ :
+ (banksMenu&&banksMenu.type==="publicly"?
+ (
+ banksMenu===undefined?
+
+ this.deletecheckBoxValues(banksMenu&&banksMenu.id,banksMenu&&banksMenu.category)}style="blue" className="ml20 font-16">删除
+ 编辑
+ this.sendTopics()} style="blue" className="ml20 font-16">发送
+
+ :banksMenu.is_public===true?
+
+ this.sendTopics()} style="blue" className="ml20 font-16">发送
+
+ :
+
+ this.deletecheckBoxValues(banksMenu&&banksMenu.id,banksMenu&&banksMenu.category)}style="blue" className="ml20 font-16">删除
+ 编辑
+
+ )
+ :
+
+ this.deletecheckBoxValues(banksMenu&&banksMenu.id,banksMenu&&banksMenu.category)}style="blue" className="ml20 font-16">删除
+ 编辑
+ this.sendTopics()} style="blue" className="ml20 font-16">发送
+
+ )
+ }
+
)
}
diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css
index 259981f2f..0801e46e2 100644
--- a/public/react/src/modules/user/usersInfo/usersInfo.css
+++ b/public/react/src/modules/user/usersInfo/usersInfo.css
@@ -341,7 +341,7 @@
.pd1323{
padding: 10px 6px 25px 40px;
- cursor: pointer;
+ /*cursor: pointer;*/
}
.pd1323:hover {
box-shadow: 0px 2px 6px rgba(51,51,51,0.09);
@@ -398,7 +398,7 @@
}
.topicsItem{
- max-width: 1050px;
+ max-width: 1073px;
max-height: 115px;
overflow-y: auto;
}