cafe-grader-web

Commit r112:e81565ddb47a public

parent | child
Description:
[web] test_request accepting additional file git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@232 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r112:e81565ddb47a - - 2 files changed: 42 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -68,24 +68,28
68 test_request.submission = nil
68 test_request.submission = nil
69 end
69 end
70
70
71 # checks if the user submits any input file
71 # checks if the user submits any input file
72 if params[:input_file]==nil or params[:input_file]==""
72 if params[:input_file]==nil or params[:input_file]==""
73 test_request.errors.add_to_base("No input submitted.")
73 test_request.errors.add_to_base("No input submitted.")
74 test_request.input_file_name = nil
74 test_request.input_file_name = nil
75 else
75 else
76 test_request.input_file_name = save_input_file(params[:input_file], user, problem)
76 test_request.input_file_name = save_input_file(params[:input_file], user, problem)
77 if test_request.input_file_name == nil
77 if test_request.input_file_name == nil
78 test_request.errors.add_to_base("No input submitted.")
78 test_request.errors.add_to_base("No input submitted.")
79 end
79 end
80 + if params[:additional_file]!=nil and params[:additional_file]!=""
81 + save_additional_file(params[:additional_file],
82 + "#{test_request.input_file_name}.files")
83 + end
80 end
84 end
81 test_request.submitted_at = Time.new
85 test_request.submitted_at = Time.new
82 test_request.status_inqueue
86 test_request.status_inqueue
83 test_request
87 test_request
84 end
88 end
85
89
86 protected
90 protected
87
91
88 def self.name_of(problem)
92 def self.name_of(problem)
89 if problem!=nil
93 if problem!=nil
90 problem.name
94 problem.name
91 else
95 else
@@ -111,24 +115,43
111
115
112 if tempfile.instance_of?(Tempfile)
116 if tempfile.instance_of?(Tempfile)
113 tempfile.close
117 tempfile.close
114 FileUtils.move(tempfile.path,new_file_name)
118 FileUtils.move(tempfile.path,new_file_name)
115 else
119 else
116 File.open(new_file_name, "wb") do |f|
120 File.open(new_file_name, "wb") do |f|
117 f.write(tempfile.read)
121 f.write(tempfile.read)
118 end
122 end
119 end
123 end
120 new_file_name
124 new_file_name
121 end
125 end
122
126
127 + def self.save_additional_file(tempfile,dir)
128 + new_file_name = "#{dir}/#{tempfile.original_filename}"
129 + dirname = File.dirname(new_file_name)
130 + FileUtils.mkdir_p(File.dirname(new_file_name)) if !File.exists?(dirname)
131 +
132 + # when the user did not submit any file
133 + return nil if tempfile==""
134 +
135 + if tempfile.instance_of?(Tempfile)
136 + tempfile.close
137 + FileUtils.move(tempfile.path,new_file_name)
138 + else
139 + File.open(new_file_name, "wb") do |f|
140 + f.write(tempfile.read)
141 + end
142 + end
143 + new_file_name
144 + end
145 +
123 #
146 #
124 # validations
147 # validations
125 #
148 #
126 def must_have_valid_problem
149 def must_have_valid_problem
127 if problem==nil
150 if problem==nil
128 errors.add('problem',"must be specified.")
151 errors.add('problem',"must be specified.")
129 elsif (!problem.available) and (self.new_record?)
152 elsif (!problem.available) and (self.new_record?)
130 errors.add('problem',"must be valid.")
153 errors.add('problem',"must be valid.")
131 end
154 end
132 end
155 end
133
156
134 end
157 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -48,26 +48,44
48 <tr>
48 <tr>
49 <td>Submission:</td>
49 <td>Submission:</td>
50 <td>
50 <td>
51 <%= select(:test_request,
51 <%= select(:test_request,
52 :submission_number,
52 :submission_number,
53 ((1..@submissions[0].number).collect {|n| [n,n]}).reverse) %>
53 ((1..@submissions[0].number).collect {|n| [n,n]}).reverse) %>
54 </td>
54 </td>
55 </tr>
55 </tr>
56 <tr>
56 <tr>
57 <td>Input data:</td>
57 <td>Input data:</td>
58 <td>
58 <td>
59 <%= f.file_field :input_file %>
59 <%= f.file_field :input_file %>
60 - (should be smaller than 2MB)
60 + </td>
61 + <td>
62 + (combined size should not exceed 2MB)
63 + </td>
64 + </tr>
65 + <tr>
66 + <td>
67 + Additional file<sup><span style="color:red">*</span></sup>:
61 </td>
68 </td>
69 + <td>
70 + <%= f.file_field :additional_file %>
71 + </td>
72 + <td>
73 + <small>
74 + * This option works <u>only</u> for task max.
75 + You can use this to submit <tt>questions.txt</tt>.<br/>
76 + The file shall be copied to the execution directory before your program runs.
77 + </small>
78 + </td>
79 + </tr>
62 <tr>
80 <tr>
63 <td colspan="2">
81 <td colspan="2">
64 <%= submit_tag 'submit' %>
82 <%= submit_tag 'submit' %>
65 </td>
83 </td>
66 </tr>
84 </tr>
67 </table>
85 </table>
68 <% end %>
86 <% end %>
69 </div>
87 </div>
70
88
71 <h3>Previous requests</h3>
89 <h3>Previous requests</h3>
72
90
73 <table class="info">
91 <table class="info">
You need to be logged in to leave comments. Login now