cafe-grader-web Commit - r197:7e5cbcab36dd

cafe-grader-web

Commit `r197:7e5cbcab36dd` public

parent | child

Description:

MERGED changeset 404:406 from ytopc branch git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@425 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

r197:7e5cbcab36dd - Sat, 10 Oct 2009 00:20:16 - 3 files changed: 19 inserted, 3 deleted

public/images/topbg.jpg created 644 ¶ binary

new file 100644
binary diff hidden

app/controllers/main_controller.rb ¶ +9

                 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
                   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
                 def prepare_grading_result(submission)
+            +     if Configuration.task_grading_info.has_key? submission.problem.name
                     grading_info = Configuration.task_grading_info[submission.problem.name]
+            +     else
+            +       # guess task info from problem.full_score
+            +       cases = submission.problem.full_score / 10
+            +       grading_info = {
+            +         'testruns' => cases,
+            +         'testcases' => cases
+            +       }
+            +     end
                   @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

public/stylesheets/application.css ¶ +10 -3

               /* Main Default */
               body {
                   background: white url(../images/topbg.jpg) repeat-x top center;
                   font-size: 13px;
                   font-family: Tahoma, "sans-serif";
                   margin: 10px;
                   padding: 10px;
               }
               /* Form Font */
               input {
                   font-family: Tahoma, "sans-serif";
               }
-            - /* Heading 1/2 */
+            + /* Heading 1&2 */
               h1 {
                   font-size: 24px;
                   color: #334488;
                   line-height: 2em;
               }
               h2 {
                   font-size: 18px;
                   color: #5566bb;
                   line-height: 1.5em;
               }
               /* Bar Line Color and Thickness */
               hr {
                   border-top: 1px solid #dddddd;
                   border-bottom: 1px solid #eeeeee;
               }
               /* Link + Anchor Color */
               a, a:link, a:visited {
                   color: #6666cc;
                   text-decoration: none;
               }
               /* This is the main menu bad*/
               div.userbar {
                   line-height: 1.5em;
                   text-align: right;
                   font-size: 12px;
               }
               /* This is the top bar, displaying user's full name */
               div.title {
                   // background: #ddddff;
                   // border: 1px dashed blue;
                   padding: 10px 0px;
                   line-height: 1.5em;
                   font-size: 13px;
               }
               div.title span.contest-over-msg {
                   font-size: 15px;
                   color: red;
               }
               div.title table {
                   width: 100%;
+            +     font-weight: bold;
               }
               div.title td.left-col {
                   text-align: left;
                   vertical-align: top;
                   color: #444444;
               }
               div.title td.right-col {
                   text-align: right;
                   vertical-align: top;
-            -     font-size: 14px;
+            +     font-size: 18px;
-            -     font-weight: bold;
                   color: #116699;
               }
               /* Standard table with header and rows with alternating background */
               table.info {
                   margin: 10px 0;
                   border: 1px solid #666666;
                   border-collapse: collapse;
                   font-size: 12px;
               }
               table.info th {
                   border: 1px solid #666666;
                   line-height: 1.5em;
                   padding: 0 0.5em;
               }
               table.info td {
                   border-left: 1px solid #666666;
                   border-right: 1px solid #666666;
                   line-height: 1.5em;
                   padding: 0 0.5em;
               }
               tr.info-even {
                   background: #f9f9f9;
               }
               /*******************************
                [Main]
               ********************************/
               div.submitbox {
                   background: #eeeeff;
                   border: 1px dotted #99aaee;
                   padding: 5px;
                   margin: 10px 0px;
                   color: black;
                   font-weight: bold;
                   font-size: 13px;
               }
               div.errorExplanation {
                   border: 1px dotted gray;
                   color: #bb2222;
                   padding: 5px 15px 5px 15px;
                   margin-bottom: 5px;
                   background-color: white;
+            +     font-weight: normal;
+            + }
+            +
+            +
+            + div.errorExplanation h2 {
+            +     color: #cc1111;
+            +     font-weight: bold;
               }
               /*******************************
                [Settings]
               ********************************/
               table.uinfo {
                   border-collapse: collapse;
                   border: 1px solid black;
                   font-size: 13px;
               }
               td.uinfo {
                   vertical-align: top;
                   border: 1px solid black;
                   padding: 5px;
               }
               th.uinfo {
                   background: lightgreen;
                   vertical-align: top;
                   text-align: right;
                   border: 1px solid black;
                   padding: 5px;
               }

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

r197:7e5cbcab36dd - Sat, 10 Oct 2009 00:20:16 - 3 files changed: 19 inserted, 3 deleted

Sign in to your account

Commit r197:7e5cbcab36dd public

Author

r197:7e5cbcab36dd - Sat, 10 Oct 2009 00:20:16 - 3 files changed: 19 inserted, 3 deleted

Commit `r197:7e5cbcab36dd` public