cafe-grader-web Commit - r753:9918c6e0c313

cafe-grader-web

Commit `r753:9918c6e0c313` public

parent | child

Description:

still upgrading

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r753:9918c6e0c313 - Fri, 05 Jul 2019 11:10:19 - 6 files changed: 15 inserted, 6 deleted

app/controllers/problems_controller.rb ¶ +6 -2

                   @problem.full_name = @problem.name if @problem.full_name == ''
                   @problem.full_score = 100
                   @problem.available = false
                   @problem.test_allowed = true
                   @problem.output_only = false
                   @problem.date_added = Time.new
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to action: :index
                   else
                     flash[:notice] = 'Error saving problem'
                   redirect_to action: :index
                   end
                 end
                 def edit
                   @problem = Problem.find(params[:id])
                   @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])
+            +       @description = Description.new(description_params)
                     if !@description.save
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                     @problem.description = @description
                   elsif @description
-            -       if !@description.update_attributes(params[:description])
+            +       if !@description.update_attributes(description_params)
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                   end
                   if params[:file] and params[:file].content_type != 'application/pdf'
                       flash[:notice] = 'Error: Uploaded file is not PDF'
                       render :action => 'edit' and return
                   end
                   if @problem.update_attributes(problem_params)
                     flash[:notice] = 'Problem was successfully updated.'
                     unless params[:file] == nil or params[:file] == ''
                       flash[:notice] = 'Problem was successfully updated and a new PDF file is uploaded.'
                       out_dirname = "#{Problem.download_file_basedir}/#{@problem.id}"
                       if not FileTest.exists? out_dirname
                         Dir.mkdir out_dirname
                       end
                       out_filename = "#{out_dirname}/#{@problem.name}.pdf"
                       if FileTest.exists? out_filename
                         File.delete out_filename
                       end
                       File.open(out_filename,"wb") do |file|
                         file.write(params[:file].read)
                     p.save
                   end
                 end
                 def get_problems_from_params
                   problems = []
                   params.keys.each do |k|
                     if k.index('prob-')==0
                       name, id, order = k.split('-')
                       problems << Problem.find(id)
                     end
                   end
                   problems
                 end
                 def get_problems_stat
                 end
                 private
                   def problem_params
                     params.require(:problem).permit(:name, :full_name, :full_score, :change_date_added, :date_added, :available, :test_allowed,:output_only, :url, :description, tag_ids:[])
                   end
+            +     def description_params
+            +       params.require(:description).permit(:body, :markdown)
                   end
+            +
+            + end

app/models/user.rb ¶ +2 -2

               class User < ActiveRecord::Base
                 has_and_belongs_to_many :roles
                 #has_and_belongs_to_many :groups
                 has_many :groups_users, class_name: 'GroupUser'
                 has_many :groups, :through => :groups_users
                 has_many :test_requests, -> {order(submitted_at: :desc)}
                 has_many :messages, -> { order(created_at: :desc) },
                          :class_name => "Message",
                          :foreign_key => "sender_id"
                 has_many :replied_messages, -> { order(created_at: :desc) },
                          :class_name => "Message",
                          :foreign_key => "receiver_id"
                 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
                 belongs_to :site
                 belongs_to :country
-            -   has_and_belongs_to_many :contests, -> { order(:name); uniq}
+            +   has_and_belongs_to_many :contests, -> { order(:name)}
                 scope :activated_users, -> {where activated: true}
                 validates_presence_of :login
                 validates_uniqueness_of :login
                 validates_format_of :login, :with => /\A[\_A-Za-z0-9]+\z/
                 validates_length_of :login, :within => 3..30
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..20, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
                 validates_format_of :email,
                                     :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
                                     :if => :email_validation?
                 validate :uniqueness_of_email_from_activated_users,
                          :if => :email_validation?
                 validate :enough_time_interval_between_same_email_registrations,
                          :if => :email_validation?
                 # these are for ytopc
                     if time_limit == nil
                       return nil
                     end
                     if contest_stat==nil or contest_stat.started_at==nil
                       return (Time.now.gmtime + time_limit) - Time.now.gmtime
                     else
                       finish_time = contest_stat.started_at + time_limit
                       current_time = Time.now.gmtime
                       if current_time > finish_time
                         return 0
                       else
                         return finish_time - current_time
                       end
                     end
                   else
                     return nil
                   end
                 end
                 def contest_finished?
                   if GraderConfiguration.contest_mode?
                     return false if site==nil
                     return site.finished?
                   elsif GraderConfiguration.indv_contest_mode?
-            -       return false if self.contest_stat(true)==nil
+            +       return false if self.contest_stat==nil
                     return contest_time_left == 0
                   else
                     return false
                   end
                 end
                 def contest_started?
                   if GraderConfiguration.indv_contest_mode?
                     stat = self.contest_stat
                     return ((stat != nil) and (stat.started_at != nil))
                   elsif GraderConfiguration.contest_mode?
                     return true if site==nil
                     return site.started
                   else
                     return true
                   end
                 end
                 def update_start_time
                   stat = self.contest_stat
                   if stat.nil? or stat.started_at.nil?
                     stat ||= UserContestStat.new(:user => self)
                     stat.started_at = Time.now.gmtime
                     stat.save

app/views/problems/import.html.haml ¶ +2 -1

               - content_for :head do
                 = stylesheet_link_tag 'problems'
               %h1 Import problems
               %p= link_to '[Back to problem list]', problems_path
               - if @problem and @problem.errors
                 =error_messages_for 'problem'
-            - = form_tag({:action => 'do_import'}, :multipart => true)  do
+            + = simple_form_for :problem, url: do_import_problems_path, :multipart => true  do |f|
+            +
                 .submitbox
                   %table
                     %tr
                       %td Name:
                       %td= text_field_tag 'name'
                     %tr
                       %td Full name:
                       %td
                         = text_field_tag 'full_name'
                         %span{:class => 'help'} Leave blank to use the same value as the name above.
                     %tr
                       %td Testdata file:
                       %td= file_field_tag 'file'
                     %tr
                       %td
                       %td
                         %span{:class => 'help'}
                           In .zip, .tgz, tar.gz, .tar format.
                           It should includes inputs (e.g., 1.in, 2a.in, 2b.in)
                           and solutions (e.g., 1.sol, 2a.sol, 2b.sol).
                           %br/
                           You may put task description in *.html for raw html
                           and *.md or *.markdown for markdown.
                           %br/

app/views/report/max_score.html.haml ¶ +1 -1

               %h1 Maximum score
-            - = form_tag report_show_max_score_path
+            + = form_tag show_max_score_report_path
               .row
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Problems
                     .panel-body
                       %p
                         Select problem(s) that we wish to know the score.
                       = label_tag :problem_id, "Problems"
                       = select_tag 'problem_id[]',
                           options_for_select(Problem.all.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]},params[:problem_id]),
                           { class: 'select2 form-control', multiple: "true" }
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Submission range
                     .panel-body
                       %p
                         Input minimum and maximum range of submission ID that should be included. A blank value for min and max means -1 and infinity, respectively.
                       .form-group
                         = label_tag :from, "Min"
                         = text_field_tag 'from_id', @since_id, class: "form-control"
                       .form-group
                         = label_tag :from, "Max"

app/views/submissions/edit.html.haml ¶ +1

                         .input-group
                           %span.input-group-btn
                             %span.btn.btn-default.btn-file
                               Browse
                               = file_field_tag 'load_file'
                           = text_field_tag '' , nil, {readonly: true, class: 'form-control'}
                       .form-group
                         = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit',
                           data: {confirm: "Submitting this source code for task #{@problem.long_name}?"}
                     - # latest submission status
                     .panel{class: (@submission && @submission.graded_at) ? "panel-info" : "panel-warning"}
                       .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
                         %div#latest_status
                           - 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}
+            + - if @submission
                 .modal.fade#compiler{tabindex: -1,role: 'dialog'}
                   .modal-dialog.modal-lg{role:'document'}
                     .modal-content
                       .modal-header
                         %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}
                           %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} &times;
                         %h4 Compiler message
                       .modal-body
                         %pre#compiler_msg= @submission.compiler_message
                       .modal-footer
                         %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close
               :javascript
                 $(document).ready(function() {
                   e = ace.edit("editor")
                   e.setValue($("#text_sourcecode").val());
                   e.gotoLine(1);
                   $("#language_id").trigger('change');
                   $("#load_file").on('change',function(evt) {
                     var file = evt.target.files[0];
                     var reader = new FileReader();
                     reader.onload =  function(theFile) {
                       var e = ace.edit("editor")

config/routes.rb ¶ +3

                     get 'console'
                   end
                 end
                 resources :announcements do
                   member do
                     get 'toggle','toggle_front'
                   end
                 end
                 resources :problems do
                   member do
                     get 'toggle'
                     get 'toggle_test'
                     get 'toggle_view_testcase'
                     get 'stat'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                     get 'quick_create'
                     post 'do_manage'
+            +       post 'do_import'
                   end
                 end
                 resources :groups do
                   member do
                     post 'add_user', to: 'groups#add_user', as: 'add_user'
                     delete 'remove_user/:user_id', to: 'groups#remove_user', as: 'remove_user'
                     delete 'remove_all_user', to: 'groups#remove_all_user', as: 'remove_all_user'
                     post 'add_problem', to: 'groups#add_problem', as: 'add_problem'
                     delete 'remove_problem/:problem_id', to: 'groups#remove_problem', as: 'remove_problem'
                     delete 'remove_all_problem', to: 'groups#remove_all_problem', as: 'remove_all_problem'
                   end
                   collection do
                   end
                 end
                 resources :testcases, only: [] do
                   member do
                     get 'download_input'
                     get 'download_sol'
                   end
                   collection do
                     get 'show_problem/:problem_id(/:test_num)' => 'testcases#show_problem', as: 'show_problem'
                   end
                 end
                 resources :grader_configuration, controller: 'configurations'
                 resources :users do
                   member do
                     get 'toggle_activate', 'toggle_enable'
                     get 'stat'
                   end
                 end
                 resources :submissions do
                   member do
                     get 'download'
                     get 'compiler_msg'
                     get 'rejudge'
+            +       get 'source'
                   end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
                     get 'direct_edit_problem/:problem_id(/:user_id)', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
                     get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
                   end
                 end
                 #user admin
                 resources :user_admin do
                   collection do
                     match 'bulk_manage', via: [:get, :post]
                     get 'bulk_mail'
                     get 'user_stat'
                     get 'import'
                     get 'new_list'
                     get 'admin'
                     get 'active'
                     get 'mass_mailing'
                     post 'grant_admin'
                     match 'create_from_list', via: [:get, :post]
                     match 'random_all_passwords', via: [:get, :post]
                   end
                   member do
                     get 'clear_last_ip'
                   end
                 end
                 resources :contest_management, only: [:index] do
                   collection do
                     get 'user_stat'
                     get 'clear_stat'
                     get 'clear_all_stat'
+            +       get 'change_contest_mode'
                   end
                 end
                 #get 'user_admin', to: 'user_admin#index'
                 #get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
                 #post 'user_admin', to: 'user_admin#create'
                 #delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
                 #singular resource
                 #---- BEWARE ---- singular resource maps to plural controller by default, we can override by provide controller name directly
                 #report
                 resource :report, only: [], controller: 'report' do
                   get 'login'
                   get 'multiple_login'
                   get 'problem_hof/:id', action: 'problem_hof'
                   get 'current_score'
                   get 'max_score'
                   post 'show_max_score'
                 end
                 #get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
                 #get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
                 #get "report/login"
                 #get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
                 #post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'

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

r753:9918c6e0c313 - Fri, 05 Jul 2019 11:10:19 - 6 files changed: 15 inserted, 6 deleted

Sign in to your account

Commit r753:9918c6e0c313 public

Author

r753:9918c6e0c313 - Fri, 05 Jul 2019 11:10:19 - 6 files changed: 15 inserted, 6 deleted

Commit `r753:9918c6e0c313` public