cafe-grader-web Commit - r101:4a05c0a30468

cafe-grader-web

Commit `r101:4a05c0a30468` public

parent | child

Description:

[web] fixed test page crashes when problem is deleted git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@193 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

r101:4a05c0a30468 - Thu, 24 Apr 2008 12:20:33 - 5 files changed: 28 inserted, 8 deleted

app/controllers/problems_controller.rb ¶ +9

                   @description = @problem.description
                 end
                 def update
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                   if @description == nil and params[:description][:body]!=''
                     @description = Description.new(params[:description])
                     if !@description.save
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                     @problem.description = @description
                   elsif @description!=nil
                     if !@description.update_attributes(params[:description])
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                   end
                   if @problem.update_attributes(params[:problem])
                     flash[:notice] = 'Problem was successfully updated.'
                     redirect_to :action => 'show', :id => @problem
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   Problem.find(params[:id]).destroy
                   redirect_to :action => 'list'
                 end
                 def toggle_avail
                   problem = Problem.find(params[:id])
                   problem.available = !(problem.available)
                   problem.save
                   redirect_to :action => 'list'
                 end
                 def turn_all_off
                   Problem.find(:all,
                                :conditions => "available = 1").each do |problem|
                     problem.available = false
                     problem.save
                   end
                   redirect_to :action => 'list'
                 end
+            +   def turn_all_on
+            +     Problem.find(:all,
+            +                  :conditions => "available = 0").each do |problem|
+            +       problem.available = true
+            +       problem.save
+            +     end
+            +     redirect_to :action => 'list'
+            +   end
+            +
                 def stat
                   @problem = Problem.find(params[:id])
                   if !@problem.available
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @submissions = Submission.find_all_last_by_problem(params[:id])
                   end
                 end
               end

app/views/problems/list.rhtml ¶ +4 -1

               <% content_for :head do %>
                 <%= stylesheet_link_tag 'scaffold' %>
                 <%= stylesheet_link_tag 'problems' %>
                 <%= javascript_include_tag :defaults %>
               <% end %>
               <h1>Listing problems</h1>
+            + <p>
               <%= link_to 'New problem', :action => 'new' %>
-            - <%= link_to 'Turn off all problems', :action => 'turn_all_off' %><br/>
+            + <%= link_to 'Turn off all problems', :action => 'turn_all_off' %>
+            + <%= link_to 'Turn on all problems', :action => 'turn_all_on' %>
+            + </p>
               <table>
                 <tr>
                   <th>Name</th>
                   <th>Full name</th>
                   <th>Full score</th>
                   <th>Date added</th>
                   <th>Avail?</th>
                   <th>Test?</th>
                 </tr>
               <% for problem in @problems %>
                 <tr class="<%= (problem.available) ? "available" : "not-available" %>">
                   <% @problem=problem %>
                   <td><%= in_place_editor_field :problem, :name, {}, :rows=>1 %></td>
                   <td><%= in_place_editor_field :problem, :full_name, {}, :rows=>1 %></td>
                   <td><%= in_place_editor_field :problem, :full_score, {}, :rows=>1 %></td>
                   <td><%= problem.date_added %></td>
                   <td><%= problem.available %></td>
                   <td><%= problem.test_allowed %></td>
                   <td><%= link_to '[Toggle]', :action => 'toggle_avail', :id => problem.id %></td>
                   <td><%= link_to '[Stat]', :action => 'stat', :id => problem.id %></td>
                   <td><%= link_to '[Show]', :action => 'show', :id => problem %></td>
                   <td><%= link_to '[Edit]', :action => 'edit', :id => problem %></td>
                   <td><%= link_to '[Destroy]', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :post %></td>
                 </tr>
               <% end %>
               </table>
               <br />
               <%= link_to 'New problem', :action => 'new' %>

app/views/test/_test_request.html.haml ¶ +5 -1

               %tr{:class => (test_request_counter%2==0) ? "info-even" : "info-odd"}
                 %td{:align => "center"}
                   = format_short_time(test_request.submitted_at)
-            -   %td= test_request.problem.full_name
+            +   %td
+            +     - if test_request.problem!=nil
+            +       = test_request.problem.full_name
+            +     - else
+            +       (n/a)
                 %td{:align => "center"}
                   = test_request.submission.number
                 %td{:align => "center"}
                   = test_request.status_str
                 %td{:align => "center"}
                   - if test_request.output_file_name!=nil
                     = 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

app/views/test/result.html.haml ¶ +5 -1

               = user_title_bar(@user)
               %div{:style => "text-align: center; font-size: 12px"}
-            -   = "Problem: #{@test_request.problem.full_name}"
+            +   Problem:
+            +   - if @test_request.problem!=nil
+            +     = "#{@test_request.problem.full_name}"
+            +   - else
+            +     = "(n/a)"
                 %br/
                 = "Submission: #{@test_request.submission.number}"
                 %br/
                 = "Test submitted at: #{format_short_time(@test_request.submitted_at)}"
                 %br/
                 = "Execution time: #{@test_request.running_time} s."
                 %br/
                 = "Memory usage: #{@test_request.memory_usage}kb"
                 %br/
                 %b= @test_request.exit_status
                 %br/
               - if @test_request.compiler_message!=nil and @test_request.compiler_message!=''
                 %b Compiler Message
                 %div{:style => "border: 1px solid black; background: lightgrey"}
                   = simple_format((@test_request.compiler_message or ''))
               %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 (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))
                 - else
                   (no output)

public/stylesheets/application.css ¶ +5 -5

                   border-bottom: 1px solid black;
                   margin-top: 2px;
                   margin-bottom: 4px;
               }
               /*******************************
                [Submission]
               ********************************/
               table.taskdesc {
                   border: 1px solid black;
                   border-collapse: collapse;
                   width: 95%;
                   font-size: 13px;
               }
               table.taskdesc p {
                   font-size: 13px;
               }
               table.taskdesc tr.name {
                   border: 1px solid black;
                   background: #aaaaaa;
                   color: white;
                   font-weight: bold;
                   font-size: 14px;
                   text-align: center;
               }
               table.taskdesc td.desc-odd {
                   padding: 5px;
                   padding-left: 20px;
                   background: #fefeee;
               }
               table.taskdesc td.desc-even {
                   padding: 5px;
                   padding-left: 20px;
                   background: #feeefe;
               }
               /**********************
                [Announcement]
               ***********************/
               div.announcementbox {
                   margin-top: 10px;
                   margin-bottom: 10px;
                   background: green;
-            -     padding: 2px;
+            +     padding: 1px;
               }
               div.announcementbox span.title {
                   font-weight: bold;
                   color: white;
                   padding-left: 10px;
               }
               div.announcement {
                   margin: 2px;
                   background: white;
-            -     padding: 2px;
+            +     padding: 1px;
                   padding-left: 10px;
                   padding-right: 10px;
               }
               div.announcement p {
-            -     font-size: 13px;
+            +     font-size: 12px;
               }
               div.pub-info, div.pub-info p {
                   text-align: right;
                   font-style: italic;
-            -     font-size: 10px;
+            +     font-size: 9px;
-            - }
  No newline at end of file
+            + }

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

r101:4a05c0a30468 - Thu, 24 Apr 2008 12:20:33 - 5 files changed: 28 inserted, 8 deleted

Sign in to your account

Commit r101:4a05c0a30468 public

Author

r101:4a05c0a30468 - Thu, 24 Apr 2008 12:20:33 - 5 files changed: 28 inserted, 8 deleted

Commit `r101:4a05c0a30468` public