cafe-grader-web Commit - r768:f22301d0d070

cafe-grader-web

Commit `r768:f22301d0d070` public

parent | child

Description:

Merge pull request #23 from nattee/master some bug fix

Commit status:

[Not Reviewed]

References:

merge default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r768:f22301d0d070 - Sun, 08 Jul 2018 08:15:42 - 7 files changed: 12 inserted, 5 deleted

db/migrate/20180612102327_change_submission_source_size.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class ChangeSubmissionSourceSize < ActiveRecord::Migration
	2	+ def change
	3	+ change_column :submissions, :source, :text, :limit => 1.megabyte
	4	+ end
	5	+ end

app/controllers/problems_controller.rb ¶ +1 -1

                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary = { attempt: user.count, solve: 0 }
                   user.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 def manage
                   @problems = Problem.order(date_added: :desc)
                 end
                 def do_manage
-            -     if params.has_key? 'change_date_added'
+            +     if params.has_key? 'change_date_added' and params[:date_added].strip.empty? == false
                     change_date_added
                   elsif params.has_key? 'add_to_contest'
                     add_to_contest
                   elsif params.has_key? 'enable_problem'
                     set_available(true)
                   elsif params.has_key? 'disable_problem'
                     set_available(false)
                   elsif params.has_key? 'add_group'
                     group = Group.find(params[:group_id])
                     ok = []
                     failed = []
                     get_problems_from_params.each do |p|

app/controllers/report_controller.rb ¶ +1 -1

                   #process parameters
                   #problems
                   @problems = []
                   if params[:problem_id]
                     params[:problem_id].each do |id|
                       next unless id.strip != ""
                       pid = Problem.find_by_id(id.to_i)
                       @problems << pid if pid
                     end
                   end
                   #users
-            -     @users = if params[:user] == "all" then
+            +     @users = if params[:users] == "all" then
                              User.includes(:contests).includes(:contest_stat)
                            else
                              User.includes(:contests).includes(:contest_stat).where(enabled: true)
                            end
                   #set up range from param
                   @since_id = params.fetch(:from_id, 0).to_i
                   @until_id = params.fetch(:to_id, 0).to_i
                   @since_id = nil if @since_id == 0
                   @until_id = nil if @until_id == 0
                   #calculate the routine

app/models/submission.rb ¶ +1 -1

               class Submission < ActiveRecord::Base
                 belongs_to :language
                 belongs_to :problem
                 belongs_to :user
                 before_validation :assign_problem
                 before_validation :assign_language
                 validates_presence_of :source
-            -   validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
+            +   validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'code too long, the limit is 100,000 bytes'
                 validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
                 validate :must_have_valid_problem
                 validate :must_specify_language
                 has_one :task
                 before_save :assign_latest_number_if_new_recond
                 def self.find_last_by_user_and_problem(user_id, problem_id)
                   where("user_id = ? AND problem_id = ?",user_id,problem_id).last
                 end

app/views/problems/manage.html.haml ¶ +1

                             %span.label.label-default= t.name
                         %td= problem.available
                         %td= problem.date_added
                         - if GraderConfiguration.multicontests?
                           %td
                             - problem.contests.each do |contest|
                               = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])"
               :javascript
                 $('.input-group.date').datetimepicker({
                   format: 'DD/MMM/YYYY',
                   showTodayButton: true,
+            +     locale: 'en',
                   widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},
                 });
                 $('.datatable').DataTable({
                   paging: false
                 });

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

                     .actions
                       = f.submit "Update", class: 'btn btn-primary'
                   .col-md-8
               = link_to 'Show', @site
               |
               = link_to 'Back', sites_path
               :javascript
                 $('.input-group.date').datetimepicker({
                   format: 'DD/MMM/YYYY HH:mm',
+            +     locale: 'en',
                   showTodayButton: true,
                 });

db/schema.rb ¶ +2 -2

               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record to
               # incrementally modify your database, and then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your
               # database schema. If you need to create the application database on another
               # system, you should be using db:schema:load, not running all the migrations
               # from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended that you check this file into your version control system.
-            - ActiveRecord::Schema.define(version: 20170914150742) do
+            + ActiveRecord::Schema.define(version: 20180612102327) do
                 create_table "announcements", force: :cascade do |t|
                   t.string   "author",       limit: 255
                   t.text     "body",         limit: 65535
                   t.boolean  "published"
                   t.datetime "created_at",                                 null: false
                   t.datetime "updated_at",                                 null: false
                   t.boolean  "frontpage",                  default: false
                   t.boolean  "contest_only",               default: false
                   t.string   "title",        limit: 255
                   t.string   "notes",        limit: 255
                 end
                 create_table "submission_view_logs", force: :cascade do |t|
                   t.integer  "user_id",       limit: 4
                   t.integer  "submission_id", limit: 4
                   t.datetime "created_at",              null: false
                   t.datetime "updated_at",              null: false
                 end
                 create_table "submissions", force: :cascade do |t|
                   t.integer  "user_id",               limit: 4
                   t.integer  "problem_id",            limit: 4
                   t.integer  "language_id",           limit: 4
-            -     t.text     "source",                limit: 65535
+            +     t.text     "source",                limit: 16777215
                   t.binary   "binary",                limit: 65535
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message",      limit: 65535
                   t.datetime "graded_at"
                   t.integer  "points",                limit: 4
                   t.text     "grader_comment",        limit: 65535
                   t.integer  "number",                limit: 4
                   t.string   "source_filename",       limit: 255
                   t.float    "max_runtime",           limit: 24
                   t.integer  "peak_memory",           limit: 4
                   t.integer  "effective_code_length", limit: 4

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

r768:f22301d0d070 - Sun, 08 Jul 2018 08:15:42 - 7 files changed: 12 inserted, 5 deleted

Sign in to your account

Commit r768:f22301d0d070 public

Author

r768:f22301d0d070 - Sun, 08 Jul 2018 08:15:42 - 7 files changed: 12 inserted, 5 deleted

Commit `r768:f22301d0d070` public