cafe-grader-web Commit - r151:2e9ddcc1b233

cafe-grader-web

Commit `r151:2e9ddcc1b233` public

parent | child

Description:

added announcement to frontpage git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@290 6386c4cd-e34a-4fa8-8920-d93eb39b512e

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

r151:2e9ddcc1b233 - Fri, 07 Nov 2008 15:24:13 - 7 files changed: 38 inserted, 5 deleted

app/controllers/main_controller.rb ¶ +2 -4

               class MainController < ApplicationController
                 SYSTEM_MODE_CONF_KEY = 'system.mode'
                 before_filter :authenticate, :except => [:index, :login]
                 before_filter :check_viewability, :except => [:index, :login]
               #
               #  COMMENT OUT: filter in each action instead
               #
               #  before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
               #  COMMENT OUT, only need when having high load
               #  caches_action :index, :login
                 def index
                   redirect_to :action => 'login'
                 end
                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   flash[:notice] = saved_notice
                   #
                   # These are for site administrator login
                   #
                   @countries = Country.find(:all, :include => :sites)
                   @country_select = @countries.collect { |c| [c.name, c.id] }
                   @country_select_with_all = [['Any',0]]
                   @countries.each do |country|
                     @country_select_with_all << [country.name, country.id]
                   end
                   @site_select = []
                   @countries.each do |country|
                     country.sites.each do |site|
                       @site_select << ["#{site.name}, #{country.name}", site.id]
                     end
                   end
+            +     @announcements = Announcement.find_for_frontpage
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
                   prepare_list_information
                 end
                 def help
                   @user = User.find(session[:user_id])
                 end
                 def submit
                   user = User.find(session[:user_id])
                   @submission = Submission.new(params[:submission])
                   @submission.user = user
                   @submission.language_id = 0
                   if params['file']!=''
                     @submission.source = params['file'].read
                     @submission.source_filename = params['file'].original_filename
                   end
                   @submission.submitted_at = Time.new.gmtime
                   if Configuration[SYSTEM_MODE_CONF_KEY]=='contest' and
                       user.site!=nil and user.site.finished?
                     @submission.errors.add_to_base "The contest is over."
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?
                     if @submission.save == false
               	flash[:notice] = 'Error saving your submission'
                     elsif Task.create(:submission_id => @submission.id,
                                       :status => Task::STATUS_INQUEUE) == false
               	flash[:notice] = 'Error adding your submission to task queue'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   redirect_to :action => 'list'
                 end
                 def source
                   submission = Submission.find(params[:id])
                   if submission.user_id == session[:user_id]
                     if submission.problem.output_only
                       fname = submission.source_filename
                     else
                       fname = submission.problem.name + '.' + submission.language.ext
                     end
                     send_data(submission.source,
               		{:filename => fname,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def submission
                   @user = User.find(session[:user_id])
                   @problems = Problem.find_available_problems
                   if params[:id]==nil
                     @problem = nil
                     @submissions = nil
                   else
                     @problem = Problem.find_by_name(params[:id])
                     @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
                   end
                 end
                 def result
                   if !Configuration.show_grading_result
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   prepare_grading_result(@submission)
                 end
                 def load_output
                   if !Configuration.show_grading_result or params[:num]==nil
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   case_num = params[:num].to_i
                   out_filename = output_filename(@user.login,
                                                  @submission.problem.name,
                                                  @submission.id,
                                                  case_num)
                   if !FileTest.exists?(out_filename)
                     flash[:notice] = 'Output not found.'
                     redirect_to :action => 'list' and return
                   end
                   response.headers['Content-Type'] = "application/force-download"
                   response.headers['Content-Disposition'] = "attachment; filename=\"output-#{case_num}.txt\""
                   response.headers["X-Sendfile"] = out_filename
                   response.headers['Content-length'] = File.size(out_filename)
                   render :nothing => true
                 end
                 def error
                   @user = User.find(session[:user_id])
                 end
                 protected
                 def prepare_list_information
                   @problems = Problem.find_available_problems
                   @prob_submissions = Array.new
                   @user = User.find(session[:user_id])
                   @problems.each do |p|
                     sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
                     if sub!=nil
                       @prob_submissions << { :count => sub.number, :submission => sub }
                     else
                       @prob_submissions << { :count => 0, :submission => nil }
                     end
                   end
+            +     @announcements = Announcement.find_published
-            -     @announcements = Announcement.find(:all,
-            -                                        :conditions => "published = 1",
-            -                                        :order => "created_at DESC")
                 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
                 def prepare_grading_result(submission)
                   grading_info = Configuration.task_grading_info[submission.problem.name]
                   @test_runs = []
                   if grading_info['testruns'].is_a? Integer
                     trun_count = grading_info['testruns']
                     trun_count.times do |i|
                       @test_runs << [ read_grading_result(@user.login,
                                                           submission.problem.name,
                                                           submission.id,
                                                           i+1) ]
                     end
                   else
                     grading_info['testruns'].keys.sort.each do |num|
                       run = []
                       testrun = grading_info['testruns'][num]
                       testrun.each do |c|
                         run << read_grading_result(@user.login,
                                                    submission.problem.name,
                                                    submission.id,
                                                    c)
                       end
                       @test_runs << run
                     end
                   end
                 end
                 def grading_result_dir(user_name, problem_name, submission_id, case_num)
                   return "#{GRADING_RESULT_DIR}/#{user_name}/#{problem_name}/#{submission_id}/test-result/#{case_num}"
                 end
                 def output_filename(user_name, problem_name, submission_id, case_num)
                   dir = grading_result_dir(user_name,problem_name, submission_id, case_num)
                   return "#{dir}/output.txt"
                 end
                 def read_grading_result(user_name, problem_name, submission_id, case_num)
                   dir = grading_result_dir(user_name,problem_name, submission_id, case_num)
                   result_file_name = "#{dir}/result"
                   if !FileTest.exists?(result_file_name)
                     return {:num => case_num, :msg => 'program did not run'}
                   else
                     results = File.open(result_file_name).readlines
                     run_stat = extract_running_stat(results)
                     output_filename = "#{dir}/output.txt"
                     if FileTest.exists?(output_filename)
                       output_file = true
                       output_size = File.size(output_filename)
                     else
                       output_file = false
                       output_size = 0
                     end
                     return {
                       :num => case_num,
                       :msg => results[0],
                       :run_stat => run_stat,
                       :output => output_file,
                       :output_size => output_size
                     }
                   end
                 end
                 # copied from grader/script/lib/test_request_helper.rb
                 def extract_running_stat(results)
                   running_stat_line = results[-1]
                   # extract exit status line
                   run_stat = ""
                   if !(/[Cc]orrect/.match(results[0]))
                     run_stat = results[0].chomp
                   else
                     run_stat = 'Program exited normally'
                   end
                   logger.info "Stat line: #{running_stat_line}"
                   # extract running time
                   if res = /r(.*)u(.*)s/.match(running_stat_line)
                     seconds = (res[1].to_f + res[2].to_f)
                     time_stat = "Time used: #{seconds} sec."
                   else
                     seconds = nil
                     time_stat = "Time used: n/a sec."
                   end
                   # extract memory usage

app/models/announcement.rb ¶ +13

@@ -1,2 +1,15
1	class Announcement < ActiveRecord::Base	1	class Announcement < ActiveRecord::Base
		2	+
		3	+ def self.find_published
		4	+ Announcement.find(:all,
		5	+ :conditions => "(published = 1) AND (frontpage = 0)",
		6	+ :order => "created_at DESC")
		7	+ end
		8	+
		9	+ def self.find_for_frontpage
		10	+ Announcement.find(:all,
		11	+ :conditions => "(published = 1) AND (frontpage = 1)",
		12	+ :order => "created_at DESC")
		13	+ end
		14	+
2	end	15	end

app/views/announcements/edit.html.erb ¶ +5

               <h1>Editing announcement</h1>
               <%= error_messages_for :announcement %>
               <% form_for(@announcement) do |f| %>
                 <p>
                   <b>Body</b><br />
                   <%= f.text_area :body %>
                 </p>
                 <p>
                   <b>Author</b><br />
                   <%= f.text_field :author %>
                 </p>
                 <p>
                   <b>Published</b><br />
                   <%= f.check_box :published %>
                 </p>
                 <p>
+            +     <b>Show on front page?</b><br />
+            +     <%= f.check_box :frontpage %>
+            +   </p>
+            +
+            +   <p>
                   <%= f.submit "Update" %>
                 </p>
               <% end %>
               <%= link_to 'Show', @announcement %> |
               <%= link_to 'Back', announcements_path %>

app/views/announcements/new.html.erb ¶ +5

               <h1>New announcement</h1>
               <%= error_messages_for :announcement %>
               <% form_for(@announcement) do |f| %>
                 <p>
                   <b>Body</b><br />
                   <%= f.text_area :body %>
                 </p>
                 <p>
                   <b>Author</b><br />
                   <%= f.text_field :author %>
                 </p>
                 <p>
                   <b>Published</b><br />
                   <%= f.check_box :published %>
                 </p>
                 <p>
+            +     <b>Show on front page?</b><br />
+            +     <%= f.check_box :frontpage %>
+            +   </p>
+            +
+            +   <p>
                   <%= f.submit "Create" %>
                 </p>
               <% end %>
               <%= link_to 'Back', announcements_path %>

app/views/announcements/show.html.erb ¶ +5

               <p>
                 <b>Author:</b>
                 <%=h @announcement.author %>
               </p>
               <p>
                 <b>Body:</b>
                 <%=h @announcement.body %>
               </p>
               <p>
                 <b>Published:</b>
                 <%=h @announcement.published %>
               </p>
+            + <p>
+            +   <b>Show on front page:</b>
+            +   <%=h @announcement.frontpage %>
+            + </p>
+            +
               <%= link_to 'Edit', edit_announcement_path(@announcement) %> |
               <%= link_to 'Back', announcements_path %>

app/views/main/login.html.haml ¶ +6

               %h1= Configuration['ui.front.title']
+            + - if @announcements.length!=0
+            +   .announcementbox
+            +     %span{:class => 'title'}
+            +       Announcements
+            +     = render :partial => 'announcement', :collection => @announcements
+            +
               %b= Configuration['ui.front.welcome_message']
               %br/
               Please login to see the problem list.
               %br/
               %br/
               - if flash[:notice]
                 %hr/
                 %b= flash[:notice]
                 %hr/
               %div{ :style => "border: solid 1px gray; padding: 2px; background: #f0f0f0;"}
                 - form_tag :controller => 'login', :action => 'login' do
                   %table
                     %tr
                       %td{:align => "right"} Login:
                       %td= text_field_tag 'login'
                     %tr
                       %td{:align => "right"} Password:
                       %td= password_field_tag
                   = submit_tag 'Login'
               %br/
               - if Configuration['system.mode']=='contest'
                 %script{:type => 'text/javascript'}
                   var siteList = new Array();
                   - @countries.each do |country|
                     = "siteList[#{country.id}] = new Array();"
                     - country.sites.each do |site|
                       = "siteList[#{country.id}][#{site.id}] = \"#{site.name}\";"
                   var allSiteList = new Array();
                   - @site_select.each do |sel|
                     = "allSiteList[#{sel[1]}]=\"#{sel[0]}\";"
                 %script{:type => 'text/javascript', :src => '/javascripts/site_update.js'}
                 %div{ :style => "border: solid 1px gray; padding: 2px; background: #f0f0f0;"}
                   %b For Site Administrator.
                   %br/
                   Please select your country and site and login.
                   - form_for :login, nil, :url => {:controller => 'login', :action => 'site_login'} do |f|
                     Country:
                     = select :site_country, :id, @country_select_with_all, {}, {:onchange => "updateSiteList();", :onclick => "updateSiteList();" }
                     Site:
                     = select :login, :site_id, @site_select
                     %br/
                     Password:
                     = f.password_field :password
                     = submit_tag "Site Administrator Login"
                 %script{:type => 'text/javascript'}
                   updateSiteList();

db/schema.rb ¶ +2 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of Active Record to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20081012050458) do
+            + ActiveRecord::Schema.define(:version => 20081107145815) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
+            +     t.boolean  "frontpage",  :default => false
                 end
                 create_table "configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "countries", :force => true do |t|
                   t.string   "name"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "descriptions", :force => true do |t|
                   t.text     "body"
                   t.boolean  "markdowned"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer  "task_id"
                   t.string   "task_type"
                 end
                 add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
                 create_table "languages", :force => true do |t|
                   t.string "name",        :limit => 10
                   t.string "pretty_name"
                   t.string "ext",         :limit => 10
                 end
                 create_table "messages", :force => true do |t|
                   t.integer  "sender_id"
                   t.integer  "receiver_id"
                   t.integer  "replying_message_id"
                   t.text     "body"
                   t.boolean  "replied"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "problems", :force => true do |t|
                   t.string  "name",           :limit => 30
                   t.string  "full_name"
                   t.integer "full_score"
                   t.date    "date_added"
                   t.boolean "available"
                   t.string  "url"
                   t.integer "description_id"
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                 end
                 create_table "rights", :force => true do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end
                 create_table "rights_roles", :id => false, :force => true do |t|
                   t.integer "right_id"
                   t.integer "role_id"
                 end
                 add_index "rights_roles", ["role_id"], :name => "index_rights_roles_on_role_id"
                 create_table "roles", :force => true do |t|
                   t.string "name"
                 end
                 create_table "roles_users", :id => false, :force => true do |t|
                   t.integer "role_id"
                   t.integer "user_id"
                 end
                 add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
                 create_table "sessions", :force => true do |t|
                   t.string   "session_id"
                   t.text     "data"
                   t.datetime "updated_at"
                 end
                 add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
                 add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"

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

Commit r151:2e9ddcc1b233 public

Author

r151:2e9ddcc1b233 - Fri, 07 Nov 2008 15:24:13 - 7 files changed: 38 inserted, 5 deleted

Commit `r151:2e9ddcc1b233` public