Description:
fix change date not working in problem bulk manage
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r739:dd100c4f33f7 - - 1 file changed: 1 inserted, 1 deleted
@@ -115,196 +115,196 | |||||
|
115 | end |
|
115 | end |
|
116 |
|
116 | ||
|
117 | def destroy |
|
117 | def destroy |
|
118 | p = Problem.find(params[:id]).destroy |
|
118 | p = Problem.find(params[:id]).destroy |
|
119 | redirect_to action: :index |
|
119 | redirect_to action: :index |
|
120 | end |
|
120 | end |
|
121 |
|
121 | ||
|
122 | def toggle |
|
122 | def toggle |
|
123 | @problem = Problem.find(params[:id]) |
|
123 | @problem = Problem.find(params[:id]) |
|
124 | @problem.update_attributes(available: !(@problem.available) ) |
|
124 | @problem.update_attributes(available: !(@problem.available) ) |
|
125 | respond_to do |format| |
|
125 | respond_to do |format| |
|
126 | format.js { } |
|
126 | format.js { } |
|
127 | end |
|
127 | end |
|
128 | end |
|
128 | end |
|
129 |
|
129 | ||
|
130 | def toggle_test |
|
130 | def toggle_test |
|
131 | @problem = Problem.find(params[:id]) |
|
131 | @problem = Problem.find(params[:id]) |
|
132 | @problem.update_attributes(test_allowed: !(@problem.test_allowed?) ) |
|
132 | @problem.update_attributes(test_allowed: !(@problem.test_allowed?) ) |
|
133 | respond_to do |format| |
|
133 | respond_to do |format| |
|
134 | format.js { } |
|
134 | format.js { } |
|
135 | end |
|
135 | end |
|
136 | end |
|
136 | end |
|
137 |
|
137 | ||
|
138 | def toggle_view_testcase |
|
138 | def toggle_view_testcase |
|
139 | @problem = Problem.find(params[:id]) |
|
139 | @problem = Problem.find(params[:id]) |
|
140 | @problem.update_attributes(view_testcase: !(@problem.view_testcase?) ) |
|
140 | @problem.update_attributes(view_testcase: !(@problem.view_testcase?) ) |
|
141 | respond_to do |format| |
|
141 | respond_to do |format| |
|
142 | format.js { } |
|
142 | format.js { } |
|
143 | end |
|
143 | end |
|
144 | end |
|
144 | end |
|
145 |
|
145 | ||
|
146 | def turn_all_off |
|
146 | def turn_all_off |
|
147 | Problem.available.all.each do |problem| |
|
147 | Problem.available.all.each do |problem| |
|
148 | problem.available = false |
|
148 | problem.available = false |
|
149 | problem.save |
|
149 | problem.save |
|
150 | end |
|
150 | end |
|
151 | redirect_to action: :index |
|
151 | redirect_to action: :index |
|
152 | end |
|
152 | end |
|
153 |
|
153 | ||
|
154 | def turn_all_on |
|
154 | def turn_all_on |
|
155 | Problem.where.not(available: true).each do |problem| |
|
155 | Problem.where.not(available: true).each do |problem| |
|
156 | problem.available = true |
|
156 | problem.available = true |
|
157 | problem.save |
|
157 | problem.save |
|
158 | end |
|
158 | end |
|
159 | redirect_to action: :index |
|
159 | redirect_to action: :index |
|
160 | end |
|
160 | end |
|
161 |
|
161 | ||
|
162 | def stat |
|
162 | def stat |
|
163 | @problem = Problem.find(params[:id]) |
|
163 | @problem = Problem.find(params[:id]) |
|
164 | unless @problem.available or session[:admin] |
|
164 | unless @problem.available or session[:admin] |
|
165 | redirect_to :controller => 'main', :action => 'list' |
|
165 | redirect_to :controller => 'main', :action => 'list' |
|
166 | return |
|
166 | return |
|
167 | end |
|
167 | end |
|
168 | @submissions = Submission.includes(:user).includes(:language).where(problem_id: params[:id]).order(:user_id,:id) |
|
168 | @submissions = Submission.includes(:user).includes(:language).where(problem_id: params[:id]).order(:user_id,:id) |
|
169 |
|
169 | ||
|
170 | #stat summary |
|
170 | #stat summary |
|
171 | range =65 |
|
171 | range =65 |
|
172 | @histogram = { data: Array.new(range,0), summary: {} } |
|
172 | @histogram = { data: Array.new(range,0), summary: {} } |
|
173 | user = Hash.new(0) |
|
173 | user = Hash.new(0) |
|
174 | @submissions.find_each do |sub| |
|
174 | @submissions.find_each do |sub| |
|
175 | d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60 |
|
175 | d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60 |
|
176 | @histogram[:data][d.to_i] += 1 if d < range |
|
176 | @histogram[:data][d.to_i] += 1 if d < range |
|
177 | user[sub.user_id] = [user[sub.user_id], ((sub.try(:points) || 0) >= @problem.full_score) ? 1 : 0].max |
|
177 | user[sub.user_id] = [user[sub.user_id], ((sub.try(:points) || 0) >= @problem.full_score) ? 1 : 0].max |
|
178 | end |
|
178 | end |
|
179 | @histogram[:summary][:max] = [@histogram[:data].max,1].max |
|
179 | @histogram[:summary][:max] = [@histogram[:data].max,1].max |
|
180 |
|
180 | ||
|
181 | @summary = { attempt: user.count, solve: 0 } |
|
181 | @summary = { attempt: user.count, solve: 0 } |
|
182 | user.each_value { |v| @summary[:solve] += 1 if v == 1 } |
|
182 | user.each_value { |v| @summary[:solve] += 1 if v == 1 } |
|
183 | end |
|
183 | end |
|
184 |
|
184 | ||
|
185 | def manage |
|
185 | def manage |
|
186 | @problems = Problem.order(date_added: :desc) |
|
186 | @problems = Problem.order(date_added: :desc) |
|
187 | end |
|
187 | end |
|
188 |
|
188 | ||
|
189 | def do_manage |
|
189 | def do_manage |
|
190 | if params.has_key? 'change_date_added' and params[:date_added].strip.empty? == false |
|
190 | if params.has_key? 'change_date_added' and params[:date_added].strip.empty? == false |
|
191 | change_date_added |
|
191 | change_date_added |
|
192 | elsif params.has_key? 'add_to_contest' |
|
192 | elsif params.has_key? 'add_to_contest' |
|
193 | add_to_contest |
|
193 | add_to_contest |
|
194 | elsif params.has_key? 'enable_problem' |
|
194 | elsif params.has_key? 'enable_problem' |
|
195 | set_available(true) |
|
195 | set_available(true) |
|
196 | elsif params.has_key? 'disable_problem' |
|
196 | elsif params.has_key? 'disable_problem' |
|
197 | set_available(false) |
|
197 | set_available(false) |
|
198 | elsif params.has_key? 'add_group' |
|
198 | elsif params.has_key? 'add_group' |
|
199 | group = Group.find(params[:group_id]) |
|
199 | group = Group.find(params[:group_id]) |
|
200 | ok = [] |
|
200 | ok = [] |
|
201 | failed = [] |
|
201 | failed = [] |
|
202 | get_problems_from_params.each do |p| |
|
202 | get_problems_from_params.each do |p| |
|
203 | begin |
|
203 | begin |
|
204 | group.problems << p |
|
204 | group.problems << p |
|
205 | ok << p.full_name |
|
205 | ok << p.full_name |
|
206 | rescue => e |
|
206 | rescue => e |
|
207 | failed << p.full_name |
|
207 | failed << p.full_name |
|
208 | end |
|
208 | end |
|
209 | end |
|
209 | end |
|
210 | flash[:success] = "The following problems are added to the group #{group.name}: " + ok.join(', ') if ok.count > 0 |
|
210 | flash[:success] = "The following problems are added to the group #{group.name}: " + ok.join(', ') if ok.count > 0 |
|
211 | flash[:alert] = "The following problems are already in the group #{group.name}: " + failed.join(', ') if failed.count > 0 |
|
211 | flash[:alert] = "The following problems are already in the group #{group.name}: " + failed.join(', ') if failed.count > 0 |
|
212 | elsif params.has_key? 'add_tags' |
|
212 | elsif params.has_key? 'add_tags' |
|
213 | get_problems_from_params.each do |p| |
|
213 | get_problems_from_params.each do |p| |
|
214 | p.tag_ids += params[:tag_ids] |
|
214 | p.tag_ids += params[:tag_ids] |
|
215 | end |
|
215 | end |
|
216 | end |
|
216 | end |
|
217 |
|
217 | ||
|
218 | redirect_to :action => 'manage' |
|
218 | redirect_to :action => 'manage' |
|
219 | end |
|
219 | end |
|
220 |
|
220 | ||
|
221 | def import |
|
221 | def import |
|
222 | @allow_test_pair_import = allow_test_pair_import? |
|
222 | @allow_test_pair_import = allow_test_pair_import? |
|
223 | end |
|
223 | end |
|
224 |
|
224 | ||
|
225 | def do_import |
|
225 | def do_import |
|
226 | old_problem = Problem.find_by_name(params[:name]) |
|
226 | old_problem = Problem.find_by_name(params[:name]) |
|
227 | if !allow_test_pair_import? and params.has_key? :import_to_db |
|
227 | if !allow_test_pair_import? and params.has_key? :import_to_db |
|
228 | params.delete :import_to_db |
|
228 | params.delete :import_to_db |
|
229 | end |
|
229 | end |
|
230 | @problem, import_log = Problem.create_from_import_form_params(params, |
|
230 | @problem, import_log = Problem.create_from_import_form_params(params, |
|
231 | old_problem) |
|
231 | old_problem) |
|
232 |
|
232 | ||
|
233 | if !@problem.errors.empty? |
|
233 | if !@problem.errors.empty? |
|
234 | render :action => 'import' and return |
|
234 | render :action => 'import' and return |
|
235 | end |
|
235 | end |
|
236 |
|
236 | ||
|
237 | if old_problem!=nil |
|
237 | if old_problem!=nil |
|
238 | flash[:notice] = "The test data has been replaced for problem #{@problem.name}" |
|
238 | flash[:notice] = "The test data has been replaced for problem #{@problem.name}" |
|
239 | end |
|
239 | end |
|
240 | @log = import_log |
|
240 | @log = import_log |
|
241 | end |
|
241 | end |
|
242 |
|
242 | ||
|
243 | def remove_contest |
|
243 | def remove_contest |
|
244 | problem = Problem.find(params[:id]) |
|
244 | problem = Problem.find(params[:id]) |
|
245 | contest = Contest.find(params[:contest_id]) |
|
245 | contest = Contest.find(params[:contest_id]) |
|
246 | if problem!=nil and contest!=nil |
|
246 | if problem!=nil and contest!=nil |
|
247 | problem.contests.delete(contest) |
|
247 | problem.contests.delete(contest) |
|
248 | end |
|
248 | end |
|
249 | redirect_to :action => 'manage' |
|
249 | redirect_to :action => 'manage' |
|
250 | end |
|
250 | end |
|
251 |
|
251 | ||
|
252 | ################################## |
|
252 | ################################## |
|
253 | protected |
|
253 | protected |
|
254 |
|
254 | ||
|
255 | def allow_test_pair_import? |
|
255 | def allow_test_pair_import? |
|
256 | if defined? ALLOW_TEST_PAIR_IMPORT |
|
256 | if defined? ALLOW_TEST_PAIR_IMPORT |
|
257 | return ALLOW_TEST_PAIR_IMPORT |
|
257 | return ALLOW_TEST_PAIR_IMPORT |
|
258 | else |
|
258 | else |
|
259 | return false |
|
259 | return false |
|
260 | end |
|
260 | end |
|
261 | end |
|
261 | end |
|
262 |
|
262 | ||
|
263 | def change_date_added |
|
263 | def change_date_added |
|
264 | problems = get_problems_from_params |
|
264 | problems = get_problems_from_params |
|
265 | date = Date.parse(params[:date_added]) |
|
265 | date = Date.parse(params[:date_added]) |
|
266 | problems.each do |p| |
|
266 | problems.each do |p| |
|
267 | p.date_added = date |
|
267 | p.date_added = date |
|
268 | p.save |
|
268 | p.save |
|
269 | end |
|
269 | end |
|
270 | end |
|
270 | end |
|
271 |
|
271 | ||
|
272 | def add_to_contest |
|
272 | def add_to_contest |
|
273 | problems = get_problems_from_params |
|
273 | problems = get_problems_from_params |
|
274 | contest = Contest.find(params[:contest][:id]) |
|
274 | contest = Contest.find(params[:contest][:id]) |
|
275 | if contest!=nil and contest.enabled |
|
275 | if contest!=nil and contest.enabled |
|
276 | problems.each do |p| |
|
276 | problems.each do |p| |
|
277 | p.contests << contest |
|
277 | p.contests << contest |
|
278 | end |
|
278 | end |
|
279 | end |
|
279 | end |
|
280 | end |
|
280 | end |
|
281 |
|
281 | ||
|
282 | def set_available(avail) |
|
282 | def set_available(avail) |
|
283 | problems = get_problems_from_params |
|
283 | problems = get_problems_from_params |
|
284 | problems.each do |p| |
|
284 | problems.each do |p| |
|
285 | p.available = avail |
|
285 | p.available = avail |
|
286 | p.save |
|
286 | p.save |
|
287 | end |
|
287 | end |
|
288 | end |
|
288 | end |
|
289 |
|
289 | ||
|
290 | def get_problems_from_params |
|
290 | def get_problems_from_params |
|
291 | problems = [] |
|
291 | problems = [] |
|
292 | params.keys.each do |k| |
|
292 | params.keys.each do |k| |
|
293 | if k.index('prob-')==0 |
|
293 | if k.index('prob-')==0 |
|
294 | name, id, order = k.split('-') |
|
294 | name, id, order = k.split('-') |
|
295 | problems << Problem.find(id) |
|
295 | problems << Problem.find(id) |
|
296 | end |
|
296 | end |
|
297 | end |
|
297 | end |
|
298 | problems |
|
298 | problems |
|
299 | end |
|
299 | end |
|
300 |
|
300 | ||
|
301 | def get_problems_stat |
|
301 | def get_problems_stat |
|
302 | end |
|
302 | end |
|
303 |
|
303 | ||
|
304 | private |
|
304 | private |
|
305 |
|
305 | ||
|
306 | def problem_params |
|
306 | def problem_params |
|
307 | - params.require(:problem).permit(:name, :full_name, :full_score, :date_added, :available, :test_allowed,:output_only, :url, :description, tag_ids:[]) |
|
307 | + params.require(:problem).permit(:name, :full_name, :full_score, :change_date_added, :date_added, :available, :test_allowed,:output_only, :url, :description, tag_ids:[]) |
|
308 | end |
|
308 | end |
|
309 |
|
309 | ||
|
310 | end |
|
310 | end |
You need to be logged in to leave comments.
Login now