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

app/assets/javascripts/admins/subject_settings/index.js

@@ -30,22 +30,6 @@ $(document).on('turbolinks:load', function () {
 		});
 
 
-        $(".action-container").on("change", '.subject-mobile-form', function () {
-            var s_id = $(this).attr("data-id");
-            var s_value = $(this).val();
-            var s_name = $(this).attr("name");
-            var json = {};
-            var s_index = $(this).parent("td").siblings(".shixun-line-no").text();
-            json[s_name] = s_value;
-            json["page_no"] = s_index;
-            $.ajax({
-                url: "/admins/subject_settings/update_mobile_show?subject_id=" + s_id,
-                type: "POST",
-                dataType:'script',
-                data: json
-            });
-        });
-
         $(".subject-setting-list-container").on("change", '.subject-setting-form', function () {
             var s_id = $(this).attr("data-id");
             var s_value = $(this).val();

app/queries/admins/subject_query.rb

@@ -18,9 +18,9 @@ class Admins::SubjectQuery < ApplicationQuery
     status =
         case params[:status].to_s.strip
         when "editing" then {status: 0}
-        when "processed" then {status: 2, public: 0}
+        when "applying" then {status: 2, public: [0, 1]}
         when "pending" then {public: 1}
-        when "publiced" then {public: 2}
+        when "published" then {public: 2}
         end
 
     subjects = subjects.where(status) if status

app/views/admins/subject_settings/index.html.erb

@@ -6,7 +6,7 @@
   <%= form_tag(admins_subject_settings_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
     <div class="form-group mr-1">
       <label for="status">状态：</label>
-      <% status_options = [['全部', ''], ['编辑中', 'pending'], ['审核中', 'applying'], ['已发布', 'published']] %>
+      <% status_options = [['全部', ''], ['编辑中', 'pending'], ['审核中', 'applying'], ['已公开', 'published']] %>
       <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
     </div>
 

app/views/admins/subject_settings/shared/_td.html.erb

@@ -5,7 +5,7 @@
   <span class="badge badge-pill badge-info excellent-badge" style="<%= subject.excellent? ? '' : 'display:none' %>">金课</span>
 </td>
 <td><%= display_text subject.repertoire&.name %></td>
-<td><%= display_text subject.status == 2 ? "已发布" : "未发布" %></td>
+<td><%= display_text subject.public == 2 ? "已公开" : ((subject.public == 1 && subject.status == 2) ? "审核中" : "未发布") %></td>
 <td>
   <%= select_tag(:sub_disciplines, options_for_select(@sub_disciplines, subject.sub_disciplines.pluck(:id)),multiple:true,class:"form-control subject-setting-form",data:{id:subject.id},id:"tags-chosen-#{subject.id}") %>
 </td>
@@ -26,4 +26,22 @@
       multiple: true,
       maximumSelectionLength: 3,
       placeholder: '请选择课程体系'});
+
+
+  $(".action-container").on("change", '.subject-mobile-form', function () {
+      var s_id = $(this).attr("data-id");
+      var s_value = $(this).val();
+      var s_name = $(this).attr("name");
+      var json = {};
+      var s_index = $(this).parent("td").siblings(".shixun-line-no").text();
+      json[s_name] = s_value;
+      json["page_no"] = s_index;
+      $.ajax({
+          url: "/admins/subject_settings/update_mobile_show?subject_id=" + s_id,
+          type: "POST",
+          dataType:'script',
+          data: json
+      });
+  });
+
 </script>

public/react/src/modules/courses/poll/PollDetailTabForthRules.js

@@ -263,8 +263,13 @@ class PollDetailTabForthRules extends Component{
           flag1=false;
         }
         else if(!arr.e_timeflag && moment(arr.end_time,dataformat) <= moment()){
-          arr.end_flag="截止时间不能早于当前时间"
-          flag1=false;
+          if(this.props.type==="Shixun"){
+
+          }else{
+            arr.end_flag="截止时间不能早于当前时间"
+            flag1=false;
+          }
+
         }else if(!arr.e_timeflag && moment(arr.end_time,dataformat) <= moment(arr.publish_time,dataformat)){
           arr.end_flag="截止时间不能早于发布时间"
           flag1=false;
@@ -314,8 +319,13 @@ class PollDetailTabForthRules extends Component{
 								flag2=false;
 						}
 						else if(moment(arr.end_time,dataformat) <= moment()){
-								arr.end_flag="截止时间不能早于当前时间"
-								flag2=false;
+              if(this.props.type==="Shixun"){
+
+              }else{
+                arr.end_flag="截止时间不能早于当前时间"
+                flag2=false;
+              }
+
 						}else if(moment(arr.end_time,dataformat) <= moment(arr.publish_time,dataformat)){
 								arr.end_flag="截止时间不能早于发布时间"
 								flag2=false;

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -468,13 +468,13 @@ class Trainingjobsetting extends Component {
 
 						if (moment(this.state.end_time, "YYYY-MM-DD HH:mm") <= moment()) {
 							//截止时间小于当前时间
-							this.scrollToAnchor("publishtimeid");
-							this.setState({
-								unit_e_tip: "截止时间不能早于当前时间",
-								p_flag: true,
-								borredss: "bor-reds",
-							})
-							return;
+							// this.scrollToAnchor("publishtimeid");
+							// this.setState({
+							// 	unit_e_tip: "截止时间不能早于当前时间",
+							// 	p_flag: true,
+							// 	borredss: "bor-reds",
+							// })
+							// return;
 						}
 						if (moment(this.state.end_time, "YYYY-MM-DD HH:mm") <= moment(this.state.publish_time, "YYYY-MM-DD HH:mm")) {
 							//截止时间小于发布时间
@@ -787,6 +787,7 @@ class Trainingjobsetting extends Component {
 			.then((result) => {
 				if (result.data.status == 0) {
 					// console.log(JSON.stringify(result));
+					this.getTrainingjobsetting(true);
 					this.props.showNotification(`更新成功`);
 					this.setState({
 						flagPageEditsbox: false,