|
|
|
@ -177,9 +177,7 @@ class UsersController < ApplicationController
|
|
|
|
|
@memberships_done = []
|
|
|
|
|
now_time = Time.now
|
|
|
|
|
@memberships.map { |e|
|
|
|
|
|
(@memberships_doing.push(e);next) if e.project.course_extra.endup_time.nil?
|
|
|
|
|
end_time_str = e.project.course_extra.endup_time
|
|
|
|
|
end_time = Time.parse(end_time_str)
|
|
|
|
|
end_time = e.project.course_extra.get_endup_time
|
|
|
|
|
if end_time > now_time
|
|
|
|
|
@memberships_doing.push e
|
|
|
|
|
else
|
|
|
|
|