cafe-grader-web Commit - r599:14a14eb28fed

cafe-grader-web

Commit `r599:14a14eb28fed` public

parent | child

Description:

- fix syntax error

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r599:14a14eb28fed - Wed, 05 Oct 2016 08:33:43 - 1 file changed: 1 inserted, 0 deleted

app/controllers/report_controller.rb ¶ +1

                   (SELECT u.id,COUNT(DISTINCT ip_address) as count,u.login,u.full_name
                     FROM logins l
                     INNER JOIN users u ON l.user_id =  u.id
                     WHERE l.created_at >= ? and l.created_at <= ?
                     GROUP BY u.id
                     HAVING count > 1
                   ) ml ON s.user_id = ml.id
                   WHERE s.submitted_at >= ? and s.submitted_at <= ?
               UNION
                 SELECT s.id,s.user_id,s.ip_address,s.submitted_at,s.problem_id
                   FROM submissions s INNER JOIN
                   (SELECT l.ip_address,COUNT(DISTINCT u.id) as count
                     FROM logins l
                     INNER JOIN users u ON l.user_id =  u.id
                     WHERE l.created_at >= ? and l.created_at <= ?
                     GROUP BY l.ip_address
                     HAVING count > 1
                   ) ml on ml.ip_address = s.ip_address
                   WHERE s.submitted_at >= ? and s.submitted_at <= ?
               ORDER BY ip_address,submitted_at
                           SQL
                   @subs = Submission.joins(:problem).find_by_sql([st,@since_time,@until_time,
                                                      @since_time,@until_time,
                                                      @since_time,@until_time,
                                                      @since_time,@until_time])
                 end
                 def cheat_scruntinize
                   #convert date & time
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
                     @since_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
                     @since_time = Time.zone.now.ago( 90.minutes)
                   end
                   begin
                     md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
                     @until_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
                     @until_time = Time.zone.now
                   end
                   #convert sid
                   @sid = params[:SID].split(/[,\s]/) if params[:SID]
                   unless @sid and @sid.size > 0
                     return
                     redirect_to actoin: :cheat_scruntinize
                     flash[:notice] = 'Please enter at least 1 student id'
                   end
                   mark = Array.new(@sid.size,'?')
                   condition = "(u.login = " + mark.join(' OR u.login = ') + ')'
                   @st = <<-SQL
                 SELECT l.created_at as submitted_at ,-1 as id,u.login,u.full_name,l.ip_address,"" as problem_id,"" as points,l.user_id
                 FROM logins l INNER JOIN users u on l.user_id  = u.id
                 WHERE l.created_at >= ? AND l.created_at <= ? AND #{condition}
               UNION
                 SELECT s.submitted_at,s.id,u.login,u.full_name,s.ip_address,s.problem_id,s.points,s.user_id
                 FROM submissions s INNER JOIN users u ON s.user_id = u.id
                 WHERE s.submitted_at >= ? AND s.submitted_at <= ? AND #{condition}
               ORDER BY submitted_at
                 SQL
                   p = [@st,@since_time,@until_time] + @sid + [@since_time,@until_time] + @sid
                   @logs = Submission.joins(:problem).find_by_sql(p)
                 end
                 protected
                 def calculate_max_score(problems, users,since_id,until_id, get_last_score = false)
                   scorearray = Array.new
                   users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     problems.each do |p|
                       unless get_last_score
                         #get max score
                         max_points = 0
                         Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
                           max_points = sub.points if sub and sub.points and (sub.points > max_points)
                         end
                         ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
                       else
                         #get latest score
                         sub = Submission.find_last_by_user_and_problem(u.id,p.id)
                         if (sub!=nil) and (sub.points!=nil) and p and p.full_score
                           ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
                         else
                           ustat << [0,false]
+            +           end
                       end
                     end
                     scorearray << ustat
                   end
                   return scorearray
                 end
               end

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r599:14a14eb28fed - Wed, 05 Oct 2016 08:33:43 - 1 file changed: 1 inserted, 0 deleted

Sign in to your account

Commit r599:14a14eb28fed public

Author

r599:14a14eb28fed - Wed, 05 Oct 2016 08:33:43 - 1 file changed: 1 inserted, 0 deleted

Commit `r599:14a14eb28fed` public