cafe-grader-web Commit - r259:fd4ff20f8070

cafe-grader-web

Commit `r259:fd4ff20f8070` public

parent | child

Description:

fixed problem description refresh bug

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r259:fd4ff20f8070 - Wed, 10 Feb 2010 06:48:17 - 3 files changed: 22 inserted, 8 deleted

app/views/main/_problem_title.html.erb created 644 ¶ +17

			@@ -0,0 +1,17
		1	+ <div class="problem-bar" id="problem-bar-<%= problem.id %>">
		2	+ <% if @page_reload_when_view_problem %>
		3	+ <a href="<%= url_for :action => 'list', :id => problem.id %>">
		4	+ <% else %>
		5	+ <a href="#"
		6	+ onclick="$$('.problem-panel').each(function(elt) {elt.hide();}); $('problem-panel-<%= problem.id %>').show(); $('problem-panel-filler').hide(); return false;">
		7	+ <% end %>
		8	+ <span class="problem-title">
		9	+ <%= problem.full_name %>
		10	+ <% if @prob_submissions[problem_title_counter][:count] > 0 %>
		11	+ [<%= @prob_submissions[problem_title_counter][:count] %> trials(s)]
		12	+ <% else %>
		13	+ [No trials]
		14	+ <% end %>
		15	+ </span>
		16	+ </a>
		17	+ </div>

app/controllers/main_controller.rb ¶ +5

                   recent_assignment.submitted = true
                   recent_assignment.save
                   status = user.get_submission_status_for(problem)
                   if status == nil
                     status = SubmissionStatus.new :user => user, :problem => problem, :submission_count => 0
                   end
                   status.submission_count += 1
                   status.passed = passed
                   status.save
                   if passed
                     flash[:notice] = 'Correct solution.'
                     user.update_codejom_status
                   else
                     session[:current_problem_id] = problem.id
                     flash[:notice] = 'Incorrect solution.'
                   end
                   redirect_to :action => 'list'
                 end
                 def problems
                   prepare_list_information
+            +     @page_reload_when_view_problem = true
                   render :partial => 'problem_title', :collection => @problems, :as => :problem
                 end
                 def splash
                   render :text => '<div class="notice">Most recent task:</span>'
                 end
                 protected
                 def prepare_announcements(recent=nil)
                   if Configuration.show_tasks_to?(@user)
                     @announcements = Announcement.find_published(true)
                   else
                     @announcements = Announcement.find_published
                   end
                   if recent!=nil
                     recent_id = recent.to_i
                     @announcements = @announcements.find_all { |a| a.id > recent_id }
                   end
                 end
                 def prepare_timeout_information(problems)
                   @submission_timeouts = {}
                   problems.each do |problem|
                     end
                     @submission_timeouts[problem.id] = timeout
                   end
                   @submission_timeouts.each_pair {|k,v| puts "#{k} => #{v}"}
                 end
                 def prepare_list_information
                   @user = User.find(session[:user_id])
                   all_problems = Problem.find_available_problems
                   passed = {}
                   sub_count = {}
                   @user.submission_statuses.each do |status|
                     if status.passed
                       passed[status.problem_id] = true
                     end
                     sub_count[status.problem_id] = status.submission_count
                   end
                   if session.has_key? :current_problem_id
                     @current_problem_id = session[:current_problem_id]
                     session.delete(:current_problem_id)
                   else
+            +       if params.has_key? :id
+            +         @current_problem_id = params[:id].to_i
+            +       else
                     @current_problem_id = nil
                   end
+            +     end
                   @problems = all_problems.reject { |problem| passed.has_key? problem.id }
                   prepare_timeout_information(@problems)
                   @prob_submissions = Array.new
                   @problems.each do |p|
                     if sub_count.has_key? p.id
                       @prob_submissions << { :count => sub_count[p.id] }
                     else
                       @prob_submissions << { :count => 0 }
                     end
                   end
                   prepare_announcements
                 end
                 def check_viewability
                   @user = User.find(session[:user_id])
                   if (!Configuration.show_tasks_to?(@user)) and
                       ((action_name=='submission') or (action_name=='submit'))
                     redirect_to :action => 'list' and return
                   end
                 end

app/views/main/_problem_title.html.haml removed ¶ -8

deleted file

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

r259:fd4ff20f8070 - Wed, 10 Feb 2010 06:48:17 - 3 files changed: 22 inserted, 8 deleted

Sign in to your account

Commit r259:fd4ff20f8070 public

Author

r259:fd4ff20f8070 - Wed, 10 Feb 2010 06:48:17 - 3 files changed: 22 inserted, 8 deleted

Commit `r259:fd4ff20f8070` public