cafe-grader-web Commit - r257:76846842a151

cafe-grader-web

Commit `r257:76846842a151` public

parent | child

Description:

added problem list auto update

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

r257:76846842a151 - Tue, 09 Feb 2010 17:50:22 - 3 files changed: 14 inserted, 2 deleted

app/controllers/main_controller.rb ¶ +9

                   if recent_assignment.submitted
                     flash[:notice] = 'You have already submitted an incorrect solution for this input.  Please download a new input data.'
                     session[:current_problem_id] = problem.id
                     redirect_to :action => 'list' and return
                   end
                   if params[:file] == nil
                     flash[:notice] = 'You have not submitted any output.'
                     session[:current_problem_id] = problem.id
                     redirect_to :action => 'list' and return
                   end
                   submitted_solution = params[:file].read
                   test_pair = recent_assignment.test_pair
                   passed = test_pair.grade(submitted_solution)
                   points = passed ? 100 : 0
                   submission = Submission.new(:user => user,
                                               :problem => problem,
                                               :source => submitted_solution,
                                               :source_filename => params['file'].original_filename,
                                               :language_id => 0,
                                               :submitted_at => Time.new.gmtime,
                                               :graded_at => Time.new.gmtime,
                                               :points => points)
                   submission.save
                   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
+            +     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|
                     assignment = @user.get_recent_test_pair_assignment_for(problem)
                     if assignment == nil
                       timeout = nil
                     else
                       if (assignment.expired?) or (assignment.submitted)
                         timeout = 0
                       else
                         timeout = assignment.created_at + TEST_ASSIGNMENT_EXPIRATION_DURATION - Time.new.gmtime
                       end
                     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]

app/views/main/list.html.haml ¶ +4 -1

               - content_for :head do
                 = javascript_include_tag :defaults
                 = javascript_include_tag 'announcement_refresh.js'
                 = javascript_include_tag 'codejom_timeout.js'
               = user_title_bar(@user)
               .announcementbox{:style => (@announcements.length==0 ? "display:none" : "")}
                 %span{:class => 'title'}
                   Announcements
                 #announcementbox-body
                   = render :partial => 'announcement', :collection => @announcements
               %hr/
               - if (Configuration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               - if Configuration.show_tasks_to?(@user)
-            -   .problem-list
+            +   .problem-list{:id => 'problem-list'}
                   = render :partial => 'problem_title', :collection => @problems, :as => :problem
                 .problem-content
                   %span{:id => "problem-panel-filler", :style => (@current_problem_id!=nil) ? "display:none" : ""}
                     %h2
                       Welcome to Code Jom
                     %br/
                     Choose problems from the list on the right.
                   = render :partial => 'problem', :collection => @problems
               %br{:clear=>'both'}/
               %hr/
               %script{:type => 'text/javascript'}
                 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
                 Announcement.registerRefreshEventTimer();
                 = render :partial => 'submission_timeouts'
                 CodejomTimeout.updateProblemMessages();
                 CodejomTimeout.registerRefreshEvent();
+            + = periodically_call_remote(:url => { :action => 'problems' }, :update => 'problem-list')
+            +
+            +

public/stylesheets/sass/application.sass ¶ +1 -1

                 float: left
               .problem-bar
                 margin-top: 5px
                 padding: 5px
                 background: #e0e0e0
                 span.problem-title
                   font-weight: bold
                   font-size: 110%
               .problem-content
                 float: left
                 margin-left: 10px
                 width: 700px
               .problem-panel
                 border: 1px black solid
                 padding: 5px
                 .problem-form
                   border: 1px dotted #99aaee
                   background: #eeeeff
               .notice-bar
                 margin-top: 3px
                 margin-bottom: 3px
                 text-align: center
                 span.notice
                   color: white
                   font-weight: bold
                   background: #000070
                   padding: 3px 20px 3px 20px
                   -moz-border-radius: 2px
                   -webkit-border-radius: 5px
                   border-radius: 5px
               table.codejom-problems
                 th
                   background: #000070
                   color: white
                 td
                   width: 200px
                   vertical-align: top
                   text-align: center
                   &.random-button
-            -       background: lightgrey
  No newline at end of file
+            +       background: lightgrey

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

r257:76846842a151 - Tue, 09 Feb 2010 17:50:22 - 3 files changed: 14 inserted, 2 deleted

Sign in to your account

Commit r257:76846842a151 public

Author

r257:76846842a151 - Tue, 09 Feb 2010 17:50:22 - 3 files changed: 14 inserted, 2 deleted

Commit `r257:76846842a151` public