cafe-grader-web Commit - r650:72b80e42fb9b

cafe-grader-web

Commit `r650:72b80e42fb9b` public

parent | child

Description:

- bootstrapize problem/edit - bootstrapize announcement/edit

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r650:72b80e42fb9b - Tue, 16 May 2017 06:40:14 - 5 files changed: 5 inserted, 116 deleted

app/controllers/main_controller.rb ¶ +3 -3

               class MainController < ApplicationController
                 before_filter :authenticate, :except => [:index, :login]
                 before_filter :check_viewability, :except => [:index, :login]
                 append_before_filter :confirm_and_update_start_time,
                                      :except => [:index,
                                                  :login,
                                                  :confirm_contest_start]
                 # to prevent log in box to be shown when user logged out of the
                 # system only in some tab
                 prepend_before_filter :reject_announcement_refresh_when_logged_out,
                                       :only => [:announcements]
                 before_filter :authenticate_by_ip_address, :only => [:list]
                 # COMMENTED OUT: filter in each action instead
                 # before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 # COMMENT OUT: only need when having high load
                 # caches_action :index, :login
                 # NOTE: This method is not actually needed, 'config/routes.rb' has
                 # assigned action login as a default action.
                 def index
                   redirect_to :action => 'login'
                 end
                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   flash.now[:notice] = saved_notice
                   # EXPERIMENT:
                   # Hide login if in single user mode and the url does not
                   # explicitly specify /login
                   #
                   # logger.info "PATH: #{request.path}"
                   # if GraderConfiguration['system.single_user_mode'] and
                   #     request.path!='/main/login'
                   #   @hidelogin = true
                   # end
                   @announcements = Announcement.frontpage
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
                   prepare_list_information
                 end
                 def help
                   @user = User.find(session[:user_id])
                 end
                 def submit
                   user = User.find(session[:user_id])
                   @submission = Submission.new
                   @submission.problem_id = params[:submission][:problem_id]
                   @submission.user = user
                   @submission.language_id = 0
                   if (params['file']) and (params['file']!='')
                     @submission.source = File.open(params['file'].path,'r:UTF-8',&:read)
                     @submission.source.encode!('UTF-8','UTF-8',invalid: :replace, replace: '')
                     @submission.source_filename = params['file'].original_filename
                   end
                   if (params[:editor_text])
                     language = Language.find_by_id(params[:language_id])
                     @submission.source = params[:editor_text]
                     @submission.source_filename = "live_edit.#{language.ext}"
                     @submission.language = language
                   end
                   @submission.submitted_at = Time.new.gmtime
                   @submission.ip_address = request.remote_ip
                   if GraderConfiguration.time_limit_mode? and user.contest_finished?
                     @submission.errors.add(:base,"The contest is over.")
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?
                     if @submission.save == false
-            - 	flash[:notice] = 'Error saving your submission'
+            +         flash[:notice] = 'Error saving your submission'
                     elsif Task.create(:submission_id => @submission.id,
                                       :status => Task::STATUS_INQUEUE) == false
-            - 	flash[:notice] = 'Error adding your submission to task queue'
+            +         flash[:notice] = 'Error adding your submission to task queue'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   redirect_to :action => 'list'
                 end
                 def source
                   submission = Submission.find(params[:id])
                   if ((submission.user_id == session[:user_id]) and
                       (submission.problem != nil) and
                       (submission.problem.available))
                     send_data(submission.source,
-            - 		{:filename => submission.download_filename,
+            +                 {:filename => submission.download_filename,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def result
                   if !GraderConfiguration.show_grading_result
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   prepare_grading_result(@submission)
                 end
                 def load_output
                   if !GraderConfiguration.show_grading_result or params[:num]==nil
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   case_num = params[:num].to_i
                   out_filename = output_filename(@user.login,
                                                  @submission.problem.name,
                                                  @submission.id,
                                                  case_num)
                   if !FileTest.exists?(out_filename)
                     flash[:notice] = 'Output not found.'
                     redirect_to :action => 'list' and return
                   end
                   if defined?(USE_APACHE_XSENDFILE) and USE_APACHE_XSENDFILE
                     response.headers['Content-Type'] = "application/force-download"
                     response.headers['Content-Disposition'] = "attachment; filename=\"output-#{case_num}.txt\""
                     response.headers["X-Sendfile"] = out_filename
                     response.headers['Content-length'] = File.size(out_filename)
                     render :nothing => true
                   else
                     send_file out_filename, :stream => false, :filename => "output-#{case_num}.txt", :type => "text/plain"
                   end
                 end
                 def error
                   @user = User.find(session[:user_id])
                 end
                 # announcement refreshing and hiding methods
                 def announcements
                   if params.has_key? 'recent'
                     prepare_announcements(params[:recent])
                   else
                     prepare_announcements
                   end
                   render(:partial => 'announcement',
                          :collection => @announcements,
                          :locals => {:announcement_effect => true})
                 end
                 def confirm_contest_start
                   user = User.find(session[:user_id])
                   if request.method == 'POST'
                     user.update_start_time
                     redirect_to :action => 'list'
                   else
                     @contests = user.contests
                     @user = user
                   end
                 end
                 protected
                 def prepare_announcements(recent=nil)
                   if GraderConfiguration.show_tasks_to?(@user)
                     @announcements = Announcement.published(true)
                   else
                     @announcements = Announcement.published
                   end
                   if recent!=nil
                     recent_id = recent.to_i
                     @announcements = @announcements.find_all { |a| a.id > recent_id }
                   end
                 end
                 def prepare_list_information
                   @user = User.find(session[:user_id])
                   if not GraderConfiguration.multicontests?
                     @problems = @user.available_problems
                   else
                     @contest_problems = @user.available_problems_group_by_contests
                     @problems = @user.available_problems
                   end
                   @prob_submissions = {}
                   @problems.each do |p|
                     sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
                     if sub!=nil
                       @prob_submissions[p.id] = { :count => sub.number, :submission => sub }
                     else
                       @prob_submissions[p.id] = { :count => 0, :submission => nil }
                     end
                   end
                   prepare_announcements
                 end
                 def check_viewability
                   @user = User.find(session[:user_id])
                   if (!GraderConfiguration.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 GraderConfiguration.task_grading_info.has_key? submission.problem.name
                     grading_info = GraderConfiguration.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
                 def grading_result_dir(user_name, problem_name, submission_id, case_num)
                   return "#{GRADING_RESULT_DIR}/#{user_name}/#{problem_name}/#{submission_id}/test-result/#{case_num}"
                 end
                 def output_filename(user_name, problem_name, submission_id, case_num)
                   dir = grading_result_dir(user_name,problem_name, submission_id, case_num)
                   return "#{dir}/output.txt"
                 end
                 def read_grading_result(user_name, problem_name, submission_id, case_num)
                   dir = grading_result_dir(user_name,problem_name, submission_id, case_num)
                   result_file_name = "#{dir}/result"
                   if !FileTest.exists?(result_file_name)
                     return {:num => case_num, :msg => 'program did not run'}
                   else
                     results = File.open(result_file_name).readlines
                     run_stat = extract_running_stat(results)
                     output_filename = "#{dir}/output.txt"
                     if FileTest.exists?(output_filename)
                       output_file = true
                       output_size = File.size(output_filename)
                     else
                       output_file = false
                       output_size = 0
                     end
                     return {
                       :num => case_num,
                       :msg => results[0],
                       :run_stat => run_stat,
                       :output => output_file,
                       :output_size => output_size
                     }
                   end
                 end
                 # copied from grader/script/lib/test_request_helper.rb
                 def extract_running_stat(results)
                   running_stat_line = results[-1]
                   # extract exit status line
                   run_stat = ""
                   if !(/[Cc]orrect/.match(results[0]))
                     run_stat = results[0].chomp
                   else
                     run_stat = 'Program exited normally'
                   end
                   logger.info "Stat line: #{running_stat_line}"
                   # extract running time
                   if res = /r(.*)u(.*)s/.match(running_stat_line)
                     seconds = (res[1].to_f + res[2].to_f)
                     time_stat = "Time used: #{seconds} sec."
                   else
                     seconds = nil
                     time_stat = "Time used: n/a sec."
                   end
                   # extract memory usage
                   if res = /s(.*)m/.match(running_stat_line)
                     memory_used = res[1].to_i
                   else
                     memory_used = -1
                   end
                   return {
                     :msg => "#{run_stat}\n#{time_stat}",
                     :running_time => seconds,
                     :exit_status => run_stat,
                     :memory_usage => memory_used
                   }
                 end
                 def confirm_and_update_start_time
                   user = User.find(session[:user_id])
                   if (GraderConfiguration.indv_contest_mode? and
                       GraderConfiguration['contest.confirm_indv_contest_start'] and
                       !user.contest_started?)
                     redirect_to :action => 'confirm_contest_start' and return
                   end
                   if not GraderConfiguration.analysis_mode?
                     user.update_start_time
                   end
                 end
                 def reject_announcement_refresh_when_logged_out
                   if not session[:user_id]
                     render :text => 'Access forbidden', :status => 403
                   end
                   if GraderConfiguration.multicontests?
                     user = User.find(session[:user_id])
                     if user.contest_stat.forced_logout
                       render :text => 'Access forbidden', :status => 403
                     end
                   end
                 end
               end

app/views/submissions/edit.html.haml ¶ +2 -2

               %h2 Live submit
               %br
-            - %textarea#text_haha{style: "display:none"}~ @source
+            + %textarea#text_sourcecode{style: "display:none"}~ @source
               .container
                 .row
                   .col-md-12
                     .alert.alert-info
                       Write your code in the following box, choose language, and click submit button when finished
                 .row
                   .col-md-8
                     %div#editor{style: 'height: 500px; border-radius: 7px; font-size: 14px;'}
                   .col-md-4
                     = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form') do
                       = hidden_field_tag 'editor_text', @source
                       = hidden_field_tag 'submission[problem_id]', @problem.id
                       .form-group
                         = label_tag "Task:"
                         = text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true
                       .form-group
                         = label_tag 'Language'
                         = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name', @lang_id || Language.find_by_pretty_name("Python").id || Language.first.id), class: 'form-control select', style: "width: 100px"
                       .form-group
                         = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit',
                           data: {confirm: "Submitting this source code for task #{@problem.long_name}?"}
                     .panel.panel-info
                       .panel-heading
                         Latest Submission Status
                         = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true if @submission
                       .panel-body
                         - if @submission
                           = render :partial => 'submission_short',
                             :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id }
                 .row
                   .col-md-12
                     %h2 Console
                     %textarea#console{style: 'height: 100%; width: 100%;background-color:#000;color:#fff;font-family: consolas, monaco, "Droid Sans Mono";',rows: 20}
               :javascript
                 $(document).ready(function() {
                   e = ace.edit("editor")
-            -     e.setValue($("#text_haha").val());
+            +     e.setValue($("#text_sourcecode").val());
                   e.gotoLine(1);
                   $("#language_id").trigger('change');
                   brython();
                 });
               %script#__main__{type:'text/python3'}
                 :plain
                   import sys
                   import traceback
                   from browser import document as doc
                   from browser import window, alert, console
                   _credits = """    Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
                       for supporting Python development.  See www.python.org for more information."""
                   _copyright = """Copyright (c) 2012, Pierre Quentel pierre.quentel@gmail.com
                   All Rights Reserved.
                   Copyright (c) 2001-2013 Python Software Foundation.
                   All Rights Reserved.
                   Copyright (c) 2000 BeOpen.com.
                   All Rights Reserved.
                   Copyright (c) 1995-2001 Corporation for National Research Initiatives.
                   All Rights Reserved.
                   Copyright (c) 1991-1995 Stichting Mathematisch Centrum, Amsterdam.
                   All Rights Reserved."""
                   _license = """Copyright (c) 2012, Pierre Quentel pierre.quentel@gmail.com
                   All rights reserved.
                   Redistribution and use in source and binary forms, with or without
                   modification, are permitted provided that the following conditions are met:
                   Redistributions of source code must retain the above copyright notice, this
                   list of conditions and the following disclaimer. Redistributions in binary
                   form must reproduce the above copyright notice, this list of conditions and
                   the following disclaimer in the documentation and/or other materials provided
                   with the distribution.
                   Neither the name of the <ORGANIZATION> nor the names of its contributors may
                   be used to endorse or promote products derived from this software without
                   specific prior written permission.
                   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
                   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
                   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
                   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
                   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
                   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
                   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
                   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
                   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
                   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
                   POSSIBILITY OF SUCH DAMAGE.
                   """
                   def credits():
                       print(_credits)
                   credits.__repr__ = lambda:_credits
                   def copyright():
                       print(_copyright)
                   copyright.__repr__ = lambda:_copyright
                   def license():
                       print(_license)
                   license.__repr__ = lambda:_license
                   def write(data):
                       doc['console'].value += str(data)
                   sys.stdout.write = sys.stderr.write = write
                   history = []
                   current = 0
                   _status = "main"  # or "block" if typing inside a block
                   # execution namespace
                   editor_ns = {'credits':credits,
                       'copyright':copyright,
                       'license':license,
                       '__name__':'__main__'}
                   def cursorToEnd(*args):
                       pos = len(doc['console'].value)
                       doc['console'].setSelectionRange(pos, pos)
                       doc['console'].scrollTop = doc['console'].scrollHeight
                   def get_col(area):
                       # returns the column num of cursor
                       sel = doc['console'].selectionStart
                       lines = doc['console'].value.split('\n')
                       for line in lines[:-1]:
                           sel -= len(line) + 1
                       return sel
                   def myKeyPress(event):
                       global _status, current
                       if event.keyCode == 9:  # tab key
                           event.preventDefault()
                           doc['console'].value += "    "
                       elif event.keyCode == 13:  # return
                           src = doc['console'].value
                           if _status == "main":
                               currentLine = src[src.rfind('>>>') + 4:]
                           elif _status == "3string":
                               currentLine = src[src.rfind('>>>') + 4:]
                               currentLine = currentLine.replace('\n... ', '\n')
                           else:
                               currentLine = src[src.rfind('...') + 4:]
                           if _status == 'main' and not currentLine.strip():
                               doc['console'].value += '\n>>> '
                               event.preventDefault()
                               return
                           doc['console'].value += '\n'
                           history.append(currentLine)
                           current = len(history)
                           if _status == "main" or _status == "3string":
                               try:
                                   _ = editor_ns['_'] = eval(currentLine, editor_ns)
                                   if _ is not None:
                                       write(repr(_)+'\n')
                                   doc['console'].value += '>>> '
                                   _status = "main"
                               except IndentationError:
                                   doc['console'].value += '... '
                                   _status = "block"
                               except SyntaxError as msg:
                                   if str(msg) == 'invalid syntax : triple string end not found' or \
                                       str(msg).startswith('Unbalanced bracket'):
                                       doc['console'].value += '... '
                                       _status = "3string"
                                   elif str(msg) == 'eval() argument must be an expression':
                                       try:
                                           exec(currentLine, editor_ns)
                                       except:
                                           traceback.print_exc()
                                       doc['console'].value += '>>> '
                                       _status = "main"
                                   elif str(msg) == 'decorator expects function':
                                       doc['console'].value += '... '
                                       _status = "block"
                                   else:
                                       traceback.print_exc()
                                       doc['console'].value += '>>> '
                                       _status = "main"
                               except:
                                   traceback.print_exc()
                                   doc['console'].value += '>>> '
                                   _status = "main"
                           elif currentLine == "":  # end of block
                               block = src[src.rfind('>>>') + 4:].splitlines()
                               block = [block[0]] + [b[4:] for b in block[1:]]
                               block_src = '\n'.join(block)
                               # status must be set before executing code in globals()
                               _status = "main"
                               try:
                                   _ = exec(block_src, editor_ns)
                                   if _ is not None:
                                       print(repr(_))
                               except:
                                   traceback.print_exc()
                               doc['console'].value += '>>> '
                           else:
                               doc['console'].value += '... '
                           cursorToEnd()
                           event.preventDefault()
                   def myKeyDown(event):
                       global _status, current
                       if event.keyCode == 37:  # left arrow
                           sel = get_col(doc['console'])
                           if sel < 5:
                               event.preventDefault()
                               event.stopPropagation()
                       elif event.keyCode == 36:  # line start
                           pos = doc['console'].selectionStart
                           col = get_col(doc['console'])
                           doc['console'].setSelectionRange(pos - col + 4, pos - col + 4)
                           event.preventDefault()
                       elif event.keyCode == 38:  # up
                           if current > 0:
                               pos = doc['console'].selectionStart
                               col = get_col(doc['console'])
                               # remove current line
                               doc['console'].value = doc['console'].value[:pos - col + 4]
                               current -= 1
                               doc['console'].value += history[current]
                           event.preventDefault()
                       elif event.keyCode == 40:  # down
                           if current < len(history) - 1:
                               pos = doc['console'].selectionStart
                               col = get_col(doc['console'])
                               # remove current line
                               doc['console'].value = doc['console'].value[:pos - col + 4]
                               current += 1
                               doc['console'].value += history[current]
                           event.preventDefault()
                       elif event.keyCode == 8:  # backspace
                           src = doc['console'].value
                           lstart = src.rfind('\n')
                           if (lstart == -1 and len(src) < 5) or (len(src) - lstart < 6):
                               event.preventDefault()
                               event.stopPropagation()
                   doc['console'].bind('keypress', myKeyPress)
                   doc['console'].bind('keydown', myKeyDown)
                   doc['console'].bind('click', cursorToEnd)
                   v = sys.implementation.version
                   doc['console'].value = "Brython %s.%s.%s on %s %s\n>>> " % (
                       v[0], v[1], v[2], window.navigator.appName, window.navigator.appVersion)
                   #doc['console'].value += 'Type "copyright", "credits" or "license" for more information.'
                   doc['console'].focus()
                   cursorToEnd()

app/views/announcements/edit.html.erb removed ¶ -47

deleted file

app/views/problems/_form.html.erb removed ¶ -55

deleted file

app/views/problems/edit.html.erb removed ¶ -9

deleted 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

r650:72b80e42fb9b - Tue, 16 May 2017 06:40:14 - 5 files changed: 5 inserted, 116 deleted

Sign in to your account

Commit r650:72b80e42fb9b public

Author

r650:72b80e42fb9b - Tue, 16 May 2017 06:40:14 - 5 files changed: 5 inserted, 116 deleted

Commit `r650:72b80e42fb9b` public