diff --git a/app/views/test/_test_request.html.haml b/app/views/test/_test_request.html.haml --- a/app/views/test/_test_request.html.haml +++ b/app/views/test/_test_request.html.haml @@ -6,10 +6,13 @@ = test_request.submission.number %td{:align => "center"} = test_request.status_str - %td= simple_format((test_request.running_stat or '')) %td{:align => "center"} - if test_request.output_file_name!=nil - = link_to '[output]', :action => 'read', :id => test_request.id - %td= test_request.grader_comment or '' - %td= simple_format((test_request.compiler_message or '')) - %td= link_to '[view]', :action => 'result', :id => test_request.id + = link_to '[download]', :action => 'read', :id => test_request.id + %td{:align => "center"} + - if test_request.compiler_message!=nil and test_request.compiler_message!='' + = "yes" + - else + = "no" + %td{:align => "center"} + = link_to '[view]', :action => 'result', :id => test_request.id diff --git a/app/views/test/index.html.erb b/app/views/test/index.html.erb --- a/app/views/test/index.html.erb +++ b/app/views/test/index.html.erb @@ -70,11 +70,9 @@ problem sub # status - running stat output (first 2kb) - grading comment compiler message - Detail + detail <%= render :partial => 'test_request', :collection => @test_requests %> diff --git a/app/views/test/result.html.haml b/app/views/test/result.html.haml --- a/app/views/test/result.html.haml +++ b/app/views/test/result.html.haml @@ -9,7 +9,7 @@ %br/ = "Execution time: #{@test_request.running_time} s." %br/ - = "Memory usage: #{@test_request.memory_usage}" + = "Memory usage: #{@test_request.memory_usage}kb" %br/ %b= @test_request.exit_status %br/ @@ -19,12 +19,12 @@ %div{:style => "border: 1px solid black; background: lightgrey"} = simple_format((@test_request.compiler_message or '')) -%b Input +%b Input (first 2kb) %div{:style => "border: 1px solid black; background: lightgrey"} - if @test_request.input_file_name!=nil = simple_format(read_textfile(@test_request.input_file_name,2048)) -%b Output +%b Output (first 2kb) %div{:style => "border: 1px solid black; background: lightgrey"} - if @test_request.output_file_name!=nil = simple_format(read_textfile(@test_request.output_file_name,2048))