456
/
seminar2_old
forked from spen/seminar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug.

This commit is contained in:
BoHung Chiu 2021-04-04 20:43:24 +08:00
parent d22ab9288c
commit ec023fb048
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/seminar_review.rb
View File

@ -74,13 +74,16 @@ class SeminarReview
def get_all_seminar_signup_ids(mode = nil) def get_all_seminar_signup_ids(mode = nil)
if (self.default_topics.include?("seminar_signup_contributes.description") && self.seminar_main.assign_mode == 1) || mode == 1 if (self.default_topics.include?("seminar_signup_contributes.description") && self.seminar_main.assign_mode == 1) || mode == 1
final_assign_signup_ids = SeminarSession.where(:id.in=>self.seminar_session_ids).pluck(:seminar_signup_ids).flatten.map{|id| id.to_s} rescue [] final_assign_signup_ids = SeminarSession.where(:id.in=>self.seminar_session_ids).pluck(:seminar_signup_ids).flatten.map{|id| id.to_s} rescue []
final_assign_signup_ids + self.seminar_signup_ids - self.remove_seminar_signup_ids result = final_assign_signup_ids + self.seminar_signup_ids - self.remove_seminar_signup_ids
result = result.uniq
else else
all_seminar_signup_ids result = all_seminar_signup_ids
end end
result
end end
def all_seminar_signup_ids def all_seminar_signup_ids
self.seminar_signup_ids - self.remove_seminar_signup_ids + self.default_seminar_signup_ids result = self.seminar_signup_ids - self.remove_seminar_signup_ids + self.default_seminar_signup_ids
result.uniq
end end
def append_default_signup_id(signup_id) def append_default_signup_id(signup_id)
sid = signup_id.to_s sid = signup_id.to_s

10
app/views/admin/seminars/_seminar_signup_dashboard.html.erb
View File

@ -120,6 +120,11 @@
} }
function init_func(){ function init_func(){
adjust_height(); adjust_height();
$("tbody").each(function(i,v){
if($(v).find("tr[data-id]").length != 0){
$(v).find("tr.blank_tr").css("display","none");
}
})
$(".zoom_out_btn").off("click").on("click",function(){ $(".zoom_out_btn").off("click").on("click",function(){
var parent = $(this).parent(); var parent = $(this).parent();
var id = parent.data("id"); var id = parent.data("id");
@ -246,11 +251,6 @@
}); });
} }
$(document).ready(function(){ $(document).ready(function(){
$("tbody").each(function(i,v){
if($(v).find("tr[data-id]").length != 0){
$(v).find("tr.blank_tr").css("display","none");
}
})
init_func(); init_func();
}) })
$(window).resize(function(){ $(window).resize(function(){

10
app/views/admin/seminars/_seminar_signup_session_dashboard.html.erb
View File

@ -129,6 +129,11 @@
} }
function init_func(){ function init_func(){
adjust_height(); adjust_height();
$("tbody").each(function(i,v){
if($(v).find("tr[data-id]").length != 0){
$(v).find("tr.blank_tr").css("display","none");
}
})
$(".zoom_out_btn").off("click").on("click",function(){ $(".zoom_out_btn").off("click").on("click",function(){
var parent = $(this).parent(); var parent = $(this).parent();
var session_id = parent.data("id"); var session_id = parent.data("id");
@ -233,11 +238,6 @@
}); });
} }
$(document).ready(function(){ $(document).ready(function(){
$("tbody").each(function(i,v){
if($(v).find("tr[data-id]").length != 0){
$(v).find("tr.blank_tr").css("display","none");
}
})
init_func(); init_func();
}) })
$(window).resize(function(){ $(window).resize(function(){