cafe-grader-web Commit - r88:61ad7e926318

cafe-grader-web

Commit `r88:61ad7e926318` public

parent | child

Description:

[web] added body to problems, added task view page git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@174 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

r88:61ad7e926318 - Wed, 16 Apr 2008 07:20:47 - 10 files changed: 66 inserted, 2 deleted

app/controllers/tasks_controller.rb created 644 ¶ +15

@@ -0,0 +1,15
	1	+ class TasksController < ApplicationController
	2	+
	3	+ before_filter :authenticate
	4	+
	5	+
	6	+ def index
	7	+ redirect_to :action => 'list'
	8	+ end
	9	+
	10	+ def list
	11	+ @problems = Problem.find_available_problems
	12	+ @user = User.find(session[:user_id])
	13	+ end
	14	+
	15	+ end

app/helpers/tasks_helper.rb created 644 ¶ +2

@@ -0,0 +1,2
	1	+ module TasksHelper
	2	+ end

app/views/tasks/_problem.html.haml created 644 ¶ +5

@@ -0,0 +1,5
	1	+ %a{:name => problem.name}
	2	+ %h3= "#{problem.full_name} (#{problem.name})"
	3	+ %pre
	4	+ %div{:style => "border: 1px solid grey; background: #eeeeee"}
	5	+ = problem.body \|\| "(not available)"

app/views/tasks/list.html.haml created 644 ¶ +13

@@ -0,0 +1,13
	1	+ = user_title_bar(@user)
	2	+
	3	+ %h2 Task Listing
	4	+
	5	+ %b Task:
	6	+
	7	+ - @problems.each do \|problem\|
	8	+ - if problem.body!=nil
	9	+ %a{:href => "\##{problem.name}"}
	10	+ = problem.full_name
	11	+ &nbsp
	12	+
	13	+ = render :partial => 'problem', :collection => @problems

db/migrate/026_add_body_to_problems.rb created 644 ¶ +9

@@ -0,0 +1,9
	1	+ class AddBodyToProblems < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :problems, :body, :text
	4	+ end
	5	+
	6	+ def self.down
	7	+ remove_column :problems, :body
	8	+ end
	9	+ end

test/functional/tasks_controller_test.rb created 644 ¶ +8

@@ -0,0 +1,8
	1	+ require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+ class TasksControllerTest < ActionController::TestCase
	4	+ # Replace this with your real tests.
	5	+ def test_truth
	6	+ assert true
	7	+ end
	8	+ end

app/helpers/application_helper.rb ¶ +1

               # Methods added to this helper will be available to all templates in the application.
               module ApplicationHelper
                 def user_header
                   menu_items = ''
                   user = User.find(session[:user_id])
                   if (user!=nil) and (user.admin?)
                     # admin menu
                     menu_items << "<b>Administrative task:</b> "
                     append_to menu_items, '[Problem admin]', 'problems', 'index'
                     append_to menu_items, '[User admin]', 'user_admin', 'index'
                     append_to menu_items, '[User stat]', 'user_admin', 'user_stat'
                     #append_to menu_items, '[Graders]', 'graders', 'list'
                     append_to menu_items, '[Site config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
                   # main page
                   append_to menu_items, '[Main]', 'main', 'list'
+            +     append_to menu_items, '[Tasks]', 'tasks', 'list'
                   append_to menu_items, '[Submissions]', 'main', 'submission'
                   append_to menu_items, '[Test]', 'test', 'index'
                   append_to menu_items, '[Settings]', 'users', 'index'
                   append_to menu_items, '[Log out]', 'main', 'login'
                   menu_items
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
                 def format_short_time(time)
                   now = Time.now
                   st = ''
                   if (time.yday != now.yday) or
               	(time.year != now.year)
                     st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                 def user_title_bar(user)
                   if user.site!=nil and user.site.finished?
                     contest_over_string = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
                   end
                   <<TITLEBAR
               <div class="title">
               <table>
               #{contest_over_string}
               <tr>
               <td class="left-col">
               #{user.full_name}<br/>
               Current time is #{format_short_time(Time.new)}<br/>
               </td>
               <td class="right-col">APIO'08</td>
               </tr>
               </table>
               </div>
               TITLEBAR
                 end
               end

app/views/problems/_form.rhtml ¶ +3

               <%= error_messages_for 'problem' %>
               <!--[form:problem]-->
               <p><label for="problem_name">Name</label><br/>
               <%= text_field 'problem', 'name'  %></p>
               <p><label for="problem_full_name">Full name</label><br/>
               <%= text_field 'problem', 'full_name'  %></p>
               <p><label for="problem_full_score">Full score</label><br/>
               <%= text_field 'problem', 'full_score'  %></p>
               <p><label for="problem_date_added">Date added</label><br/>
               <%= date_select 'problem', 'date_added'  %></p>
+            + <p><label for="problem_body">Body</label><br/>
+            + <%= text_area 'problem', 'body', :rows => 10  %></p>
+            +
               <p><label for="problem_url">URL</label><br/>
               <%= text_field 'problem', 'url'  %></p>
               <p><label for="problem_available">Available</label><br/>
               <%= select("problem","available",[['True',true],['False',false]]) %></p>
               <!--[eoform:problem]-->

app/views/problems/show.rhtml ¶ +8 -1

               <% for column in Problem.content_columns %>
               <p>
-            -   <b><%= column.human_name %>:</b> <%=h @problem.send(column.name) %>
+            +   <b><%= column.human_name %>:</b>
+            +   <% if column.name != 'body' %>
+            +     <%=h @problem.send(column.name) %>
+            +   <% else %>
+            +     <pre>
+            +     <%= @problem.body %>
+            +     </pre>
+            +   <% end %>
               </p>
               <% end %>
               <%= link_to 'Edit', :action => 'edit', :id => @problem %> |
               <%= link_to 'Back', :action => 'list' %>

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 ActiveRecord 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 => 25) do
+            + ActiveRecord::Schema.define(:version => 26) do
                 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 "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"
                 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 "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.text    "body"
                 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"
                 create_table "sites", :force => true do |t|
                   t.string   "name"
                   t.boolean  "started"
                   t.datetime "start_time"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "submissions", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
                   t.text     "source"
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.integer  "points"
                   t.text     "grader_comment"
                   t.integer  "number"
                 end
                 add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true
                 add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id"
                 create_table "tasks", :force => true do |t|
                   t.integer  "submission_id"
                   t.datetime "created_at"
                   t.integer  "status"
                   t.datetime "updated_at"
                 end
                 create_table "test_requests", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "submission_id"
                   t.string   "input_file_name"
                   t.string   "output_file_name"
                   t.string   "running_stat"
                   t.integer  "status"
                   t.datetime "updated_at"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.string   "grader_comment"
                   t.datetime "created_at"
                   t.float    "running_time"
                   t.string   "exit_status"
                   t.integer  "memory_usage"
                 end
                 add_index "test_requests", ["user_id", "problem_id"], :name => "index_test_requests_on_user_id_and_problem_id"
                 create_table "users", :force => true do |t|
                   t.string  "login",           :limit => 10
                   t.string  "full_name"
                   t.string  "hashed_password"
                   t.string  "salt",            :limit => 5
                   t.string  "alias"

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

r88:61ad7e926318 - Wed, 16 Apr 2008 07:20:47 - 10 files changed: 66 inserted, 2 deleted

Sign in to your account

Commit r88:61ad7e926318 public

Author

r88:61ad7e926318 - Wed, 16 Apr 2008 07:20:47 - 10 files changed: 66 inserted, 2 deleted

Commit `r88:61ad7e926318` public