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

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

@@ -1,6 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-identity-authentications-index-page').length > 0) {
     var $searchFrom = $('.identity-authentication-list-form');
+    $searchFrom.find('select[name="status"]').val('pending');
 
     $searchFrom.on('click', '.search-form-tab', function(){
       var $link = $(this);
@@ -12,6 +13,7 @@ $(document).on('turbolinks:load', function() {
         $searchFrom.find('.status-filter').show();
       } else {
         $searchFrom.find('.status-filter').hide();
+        $searchFrom.find('select[name="status"]').val('pending');
       }
     });
   }

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

@@ -1,6 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-professional-authentications-index-page').length > 0) {
     var $searchFrom = $('.professional-authentication-list-form');
+    $searchFrom.find('select[name="status"]').val('pending');
 
     $searchFrom.on('click', '.search-form-tab', function(){
       var $link = $(this);
@@ -12,6 +13,7 @@ $(document).on('turbolinks:load', function() {
         $searchFrom.find('.status-filter').show();
       } else {
         $searchFrom.find('.status-filter').hide();
+        $searchFrom.find('select[name="status"]').val('pending');
       }
     });
   }

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

@@ -1,6 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-shixun-authorizations-index-page').length > 0) {
     var $searchFrom = $('.shixun-authorization-list-form');
+    $searchFrom.find('select[name="status"]').val('pending');
 
     $searchFrom.on('click', '.search-form-tab', function(){
       var $link = $(this);
@@ -12,6 +13,7 @@ $(document).on('turbolinks:load', function() {
         $searchFrom.find('.status-filter').show();
       } else {
         $searchFrom.find('.status-filter').hide();
+        $searchFrom.find('select[name="status"]').val('pending');
       }
     });
   }

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

@@ -1,6 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-subject-authorizations-index-page').length > 0) {
     var $searchFrom = $('.subject-authorization-list-form');
+    $searchFrom.find('select[name="status"]').val('pending');
 
     $searchFrom.on('click', '.search-form-tab', function(){
       var $link = $(this);
@@ -12,6 +13,7 @@ $(document).on('turbolinks:load', function() {
         $searchFrom.find('.status-filter').show();
       } else {
         $searchFrom.find('.status-filter').hide();
+        $searchFrom.find('select[name="status"]').val('pending');
       }
     });
   }

app/controllers/games_controller.rb

@@ -970,7 +970,7 @@ class GamesController < ApplicationController
     game.update_attribute(:status, 0) if game.status == 1
     game.update_attributes(status: 0, open_time: Time.now) if game.status == 3
     # 开启实训更新myshixuns的时间，方便跟踪用于的学习进度。
-    game.myshixun.update_column(:update_at, Time.now)
+    game.myshixun.update_column(:updated_at, Time.now)
   end
 
 end

app/helpers/subjects_helper.rb

@@ -13,8 +13,13 @@ module SubjectsHelper
 
   # 实训路径的所有用户获得的标签
   def user_shixun_tags challenge_ids, user_id
+    logger.info("#####################")
     ChallengeTag.joins("join games on challenge_tags.challenge_id = games.challenge_id").
       where(challenge_id: challenge_ids, games: {status: 2, user_id: user_id}).pluck("challenge_tags.name").uniq
+    logger.info("#####################")
+    pass_challenge_ids = Game.where(status: 2, user_id: user_id, challenge_ids: challenge_ids).pluck(:challenge_id)
+    ChallengeTag.where(challenge_id: pass_challenge_ids).pluck(:name).uniq
+    logger.info("#####################")
   end
 
   # 金课的课堂状态 0：未开课，1：进行中，2：已结束

app/models/subject.rb

@@ -82,9 +82,16 @@ class Subject < ApplicationRecord
   end
 
   def my_subject_progress
+    logger.info("#-----------")
     my_challenge_count = Game.joins(:challenge).where(user_id: User.current.id, status: 2, challenges: {shixun_id: shixuns.published_closed}).
       pluck(:challenge_id).uniq.size
-    count = self.subject_challenge_count == 0 ? 0 : ((my_challenge_count.to_f / self.subject_challenge_count).round(2) * 100).to_i
+    logger.info("#-----------")
+    new_challenge_count = Challenge.left_joins(:games)
+                              .where(games: {user_id: current_user.id, status: 2}, shixun_id: shixuns.published_closed)
+                              .uniq.count
+    logger.info("#-----------")
+    subject_challenge_count = shixuns.challenges_count
+    subject_challenge_count == 0 ? 0 : ((my_challenge_count.to_f / subject_challenge_count).round(2) * 100).to_i
   end
 
   def my_consume_time

config/environments/development.rb

@@ -50,11 +50,14 @@ Rails.application.configure do
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
-  config.assets.debug = true
+  config.assets.debug = false
 
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
+  config.assets.compile = true
+  # config.assets.prefix = '/dev-assets'
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 

config/initializers/assets.rb

@@ -11,4 +11,4 @@ Rails.application.config.assets.paths << Rails.root.join('node_modules')
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
-Rails.application.config.assets.precompile += %w( admin.js admin.scss )
+Rails.application.config.assets.precompile += %w( admin.js admin.css )

public/assets/.sprockets-manifest-1c370772f16743f825981ab0e5c94237.json

@@ -0,0 +1 @@
+{"files":{"admin-6575f1399953fb1935c037a7b8bd28c4aff07b70bed9b41faf6899a89af4b57d.js":{"logical_path":"admin.js","mtime":"2019-08-26T15:21:11+08:00","size":907839,"digest":"6575f1399953fb1935c037a7b8bd28c4aff07b70bed9b41faf6899a89af4b57d","integrity":"sha256-ZXXxOZlT+xk1wDenuL0oxK/we3C+2bQfr2iZqJr0tX0="},"admin-8a2b03cb8a055dc63f45443b304cae77382331beba55b1570b3d3c8aa42442d5.css":{"logical_path":"admin.css","mtime":"2019-08-26T15:21:47+08:00","size":655571,"digest":"8a2b03cb8a055dc63f45443b304cae77382331beba55b1570b3d3c8aa42442d5","integrity":"sha256-iisDy4oFXcY/RUQ7MEyudzgjMb66VbFXCz08iqQkQtU="},"font-awesome/fontawesome-webfont-7bfcab6db99d5cfbf1705ca0536ddc78585432cc5fa41bbd7ad0f009033b2979.eot":{"logical_path":"font-awesome/fontawesome-webfont.eot","mtime":"2019-08-14T17:22:43+08:00","size":165742,"digest":"7bfcab6db99d5cfbf1705ca0536ddc78585432cc5fa41bbd7ad0f009033b2979","integrity":"sha256-e/yrbbmdXPvxcFygU23ceFhUMsxfpBu9etDwCQM7KXk="},"font-awesome/fontawesome-webfont-2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe.woff2":{"logical_path":"font-awesome/fontawesome-webfont.woff2","mtime":"2019-08-14T17:22:43+08:00","size":77160,"digest":"2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe","integrity":"sha256-Kt78vAQefRj88tQXh53FoJmXqmTWdbejxLbOM9oT8/4="},"font-awesome/fontawesome-webfont-ba0c59deb5450f5cb41b3f93609ee2d0d995415877ddfa223e8a8a7533474f07.woff":{"logical_path":"font-awesome/fontawesome-webfont.woff","mtime":"2019-08-14T17:22:43+08:00","size":98024,"digest":"ba0c59deb5450f5cb41b3f93609ee2d0d995415877ddfa223e8a8a7533474f07","integrity":"sha256-ugxZ3rVFD1y0Gz+TYJ7i0NmVQVh33foiPoqKdTNHTwc="},"font-awesome/fontawesome-webfont-aa58f33f239a0fb02f5c7a6c45c043d7a9ac9a093335806694ecd6d4edc0d6a8.ttf":{"logical_path":"font-awesome/fontawesome-webfont.ttf","mtime":"2019-08-14T17:22:43+08:00","size":165548,"digest":"aa58f33f239a0fb02f5c7a6c45c043d7a9ac9a093335806694ecd6d4edc0d6a8","integrity":"sha256-qljzPyOaD7AvXHpsRcBD16msmgkzNYBmlOzW1O3A1qg="},"font-awesome/fontawesome-webfont-ad6157926c1622ba4e1d03d478f1541368524bfc46f51e42fe0d945f7ef323e4.svg":{"logical_path":"font-awesome/fontawesome-webfont.svg","mtime":"2019-08-14T17:22:43+08:00","size":444379,"digest":"ad6157926c1622ba4e1d03d478f1541368524bfc46f51e42fe0d945f7ef323e4","integrity":"sha256-rWFXkmwWIrpOHQPUePFUE2hSS/xG9R5C/g2UX37zI+Q="},"logo-7ff112568709bf97f9898fe87249b7a8f200ff1f48d537d85af87215f1870423.png":{"logical_path":"logo.png","mtime":"2019-08-21T15:10:12+08:00","size":2816,"digest":"7ff112568709bf97f9898fe87249b7a8f200ff1f48d537d85af87215f1870423","integrity":"sha256-f/ESVocJv5f5iY/ockm3qPIA/x9I1TfYWvhyFfGHBCM="},"application-a3a4f3549d68670572bb07700c85a9ac11e536edc73fef6e7489723bf535e533.js":{"logical_path":"application.js","mtime":"2019-08-26T15:21:11+08:00","size":1042232,"digest":"a3a4f3549d68670572bb07700c85a9ac11e536edc73fef6e7489723bf535e533","integrity":"sha256-o6TzVJ1oZwVyuwdwDIWprBHlNu3HP+9udIlyO/U15TM="},"application-a7508b88eb6a69a5b301602bddc14745cec09853ea7d91c6fae856b96e788f46.css":{"logical_path":"application.css","mtime":"2019-08-26T15:21:47+08:00","size":1182859,"digest":"a7508b88eb6a69a5b301602bddc14745cec09853ea7d91c6fae856b96e788f46","integrity":"sha256-p1CLiOtqaaWzAWAr3cFHRc7AmFPqfZHG+uhWuW54j0Y="}},"assets":{"admin.js":"admin-6575f1399953fb1935c037a7b8bd28c4aff07b70bed9b41faf6899a89af4b57d.js","admin.css":"admin-8a2b03cb8a055dc63f45443b304cae77382331beba55b1570b3d3c8aa42442d5.css","font-awesome/fontawesome-webfont.eot":"font-awesome/fontawesome-webfont-7bfcab6db99d5cfbf1705ca0536ddc78585432cc5fa41bbd7ad0f009033b2979.eot","font-awesome/fontawesome-webfont.woff2":"font-awesome/fontawesome-webfont-2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe.woff2","font-awesome/fontawesome-webfont.woff":"font-awesome/fontawesome-webfont-ba0c59deb5450f5cb41b3f93609ee2d0d995415877ddfa223e8a8a7533474f07.woff","font-awesome/fontawesome-webfont.ttf":"font-awesome/fontawesome-webfont-aa58f33f239a0fb02f5c7a6c45c043d7a9ac9a093335806694ecd6d4edc0d6a8.ttf","font-awesome/fontawesome-webfont.svg":"font-awesome/fontawesome-webfont-ad6157926c1622ba4e1d03d478f1541368524bfc46f51e42fe0d945f7ef323e4.svg","logo.png":"logo-7ff112568709bf97f9898fe87249b7a8f200ff1f48d537d85af87215f1870423.png","application.js":"application-a3a4f3549d68670572bb07700c85a9ac11e536edc73fef6e7489723bf535e533.js","application.css":"application-a7508b88eb6a69a5b301602bddc14745cec09853ea7d91c6fae856b96e788f46.css"}}

public/react/public/css/edu-all.css

@@ -119,7 +119,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
 .tag-green .tag-name{display: block;width: auto;
     /*background-image: url("/images/educoder/tag1.png");*/
     background: rgba(000,000,000,0.56);
-    border: 1px solid #fff;
+    border: 1px solid rgba(255,255,255,0.56);
     border-radius: 3px;
     font-size: 12px;
     /*opacity: 0.56;*/

public/react/src/common/components/attachment/AttachmentList.js

@@ -12,7 +12,7 @@ class AttachmentsList extends Component{
         {
           attachments.map((item,key)=>{
             return(
-              <p key={key}>
+              <p key={key} className="clearfix mb3">
                 <a className="color-grey fl">
                   <i className="font-14 color-green iconfont icon-fujian mr8"></i>
                 </a>

public/react/src/modules/courses/graduation/tasks/index.js

@@ -563,7 +563,7 @@ class GraduationTasks extends Component{
       //debugger
     let {search,page,order,all_count} = this.state;
     this.fetchAll(search,page,order,all_count)
-		debugger
+
 
   }
   getcourse_groupslist=(id)=>{

public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js

@@ -59,7 +59,7 @@ class GraduateTopicDetailTable extends Component{
             </div>
             {
               topicInfo && topicInfo.attachment_list.length>0 &&
-              <p className="mt30">
+              <div className="mt30">
                 {/* {
                   topicInfo.attachment_list.map((item,key)=>{
                     return(
@@ -75,7 +75,7 @@ class GraduateTopicDetailTable extends Component{
                   })
                 } */}
                 <AttachmentList {...this.props} {...this.state} attachments = {topicInfo.attachment_list}></AttachmentList>
-              </p>
+              </div>
             }
           </div>
           <div className="mt30">

public/stylesheets/educoder/edu-all.css

@@ -121,7 +121,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
 .tag-green .tag-name{display: block;width: auto;
     /*background-image: url("/images/educoder/tag1.png");*/
     background: rgba(000,000,000,0.56);
-    border: 1px solid #fff;
+    border: 1px solid rgba(255,255,255,0.56);
     border-radius: 3px;
     font-size: 12px;
     /*opacity: 0.56;*/