cafe-grader-web Commit - r416:3378c5a77746

cafe-grader-web

Commit `r416:3378c5a77746` public

parent | child

Description:

merge with java

Commit status:

[Not Reviewed]

References:

merge algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r416:3378c5a77746 - Sun, 31 Aug 2014 09:35:41 - 24 files changed: 294 inserted, 86 deleted

app/assets/javascripts/new.js created 644 ¶ +6

@@ -0,0 +1,6
	1	+ //= require jquery
	2	+ //= require jquery_ujs
	3	+ //= require jquery.ui.all
	4	+ //= require jquery.ui.datepicker
	5	+ //= require jquery.ui.slider
	6	+ //= require jquery-ui-timepicker-addon

app/assets/javascripts/report.js.coffee created 644 ¶ +3

@@ -0,0 +1,3
	1	+ # Place all the behaviors and hooks related to the matching controller here.
	2	+ # All this logic will automatically be available in application.js.
	3	+ # You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/report.css.scss created 644 ¶ +3

@@ -0,0 +1,3
	1	+ // Place all the styles related to the report controller here.
	2	+ // They will automatically be included in application.css.
	3	+ // You can use Sass (SCSS) here: http://sass-lang.com/

app/helpers/report_helper.rb created 644 ¶ +2

@@ -0,0 +1,2
	1	+ module ReportHelper
	2	+ end

app/models/login.rb created 644 ¶ +3

@@ -0,0 +1,3
	1	+ class Login < ActiveRecord::Base
	2	+ attr_accessible :ip_address, :logged_in_at, :user_id
	3	+ end

app/views/report/_date_range.html.haml created 644 ¶ +23

@@ -0,0 +1,23
	1	+
	2	+ = form_tag({session: :url }) do
	3	+ .submitbox
	4	+ %table
	5	+ %tr
	6	+ %td{colspan: 6, style: 'font-weight: bold'}= title
	7	+ %tr
	8	+ %td{style: 'width: 120px; font-weight: bold'}= param_text
	9	+ %td{align: 'right'} since:
	10	+ %td= text_field_tag 'since_datetime'
	11	+ %tr
	12	+ %td
	13	+ %td{align: 'right'} until:
	14	+ %td= text_field_tag 'until_datetime'
	15	+ %tr
	16	+ %td
	17	+ %td
	18	+ %td Blank mean no condition
	19	+ %tr
	20	+ %td
	21	+ %td
	22	+ %td= submit_tag 'query'
	23	+

app/views/report/login_stat.html.haml created 644 ¶ +33

@@ -0,0 +1,33
	1	+ - content_for :header do
	2	+ = javascript_include_tag 'new'
	3	+
	4	+ %script{:type=>"text/javascript"}
	5	+ $(function () {
	6	+ $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
	7	+ $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
	8	+ });
	9	+
	10	+
	11	+ %h1 Login status
	12	+
	13	+
	14	+ =render partial: 'report_menu'
	15	+ =render partial: 'date_range', locals: {param_text: 'Login date range:', title: 'Query login stat in the range' }
	16	+
	17	+ %table.info
	18	+ %thead
	19	+ %tr.info-head
	20	+ %th login
	21	+ %th full name
	22	+ %th login count
	23	+ %th earliest
	24	+ %th latest
	25	+ %tbody
	26	+ - @logins.each do \|l\|
	27	+ %tr{class: cycle('info-even','info-odd')}
	28	+ %td= l[:login]
	29	+ %td= l[:full_name]
	30	+ %td= l[:count]
	31	+ %td= l[:min] ? l[:min].in_time_zone.strftime('%Y-%m-%d %H:%M') : ''
	32	+ %td= l[:max] ? l[:max].in_time_zone.strftime('%Y-%m-%d %H:%M') : ''
	33	+

app/views/report/submission_stat.html.haml created 644 ¶ +41

@@ -0,0 +1,41
	1	+ - content_for :header do
	2	+ = javascript_include_tag 'new'
	3	+
	4	+ %script{:type=>"text/javascript"}
	5	+ $(function () {
	6	+ $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
	7	+ $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
	8	+ });
	9	+
	10	+
	11	+ %h1 Login status
	12	+
	13	+
	14	+
	15	+
	16	+ =render partial: 'report_menu'
	17	+ =render partial: 'date_range', locals: {param_text: 'Submission date range:', title: 'Query submission stat in the range' }
	18	+
	19	+ %table.info
	20	+ %thead
	21	+ %tr.info-head
	22	+ %th login
	23	+ %th full name
	24	+ %th total submissions
	25	+ %th submissions
	26	+ %tbody
	27	+ - @submissions.each do \|user_id,data\|
	28	+ %tr{class: cycle('info-even','info-odd')}
	29	+ %td= data[:login]
	30	+ %td= data[:full_name]
	31	+ %td= data[:count]
	32	+ %td
	33	+ - data[:sub].each do \|prob_id,sub_data\|
	34	+ = "#{sub_data[:prob_name]}: ["
	35	+ - st = []
	36	+ - sub_data[:sub_ids].each do \|id\|
	37	+ - st << link_to(id, controller: 'graders' , action: 'submission', id: id)
	38	+ = raw st.join ', '
	39	+ = ']'
	40	+ %br/
	41	+

db/migrate/20140826095949_create_logins.rb created 644 ¶ +10

@@ -0,0 +1,10
	1	+ class CreateLogins < ActiveRecord::Migration
	2	+ def change
	3	+ create_table :logins do \|t\|
	4	+ t.string :user_id
	5	+ t.string :ip_address
	6	+
	7	+ t.timestamps
	8	+ end
	9	+ end
	10	+ end

spec/models/login_spec.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ require 'spec_helper'
	2	+
	3	+ describe Login do
	4	+ pending "add some examples to (or delete) #{__FILE__}"
	5	+ end

Gemfile ¶ +7 -1

               source 'https://rubygems.org'
-            - gem 'rails', '3.2.8'
+            + gem 'rails', '3.2.19'
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
               gem 'mysql2'
               # Gems used only for assets and not required
               # in production environments by default.
               group :assets do
                 gem 'sass-rails',   '~> 3.2.3'
                 gem 'coffee-rails', '~> 3.2.1'
                 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
                 # gem 'therubyracer', :platforms => :ruby
                 gem 'uglifier', '>= 1.0.3'
               end
               gem 'prototype-rails'
               # To use ActiveModel has_secure_password
               # gem 'bcrypt-ruby', '~> 3.0.0'
               # To use Jbuilder templates for JSON
               # gem 'jbuilder'
               # Use unicorn as the app server
               # gem 'unicorn'
               # Deploy with Capistrano
               # gem 'capistrano'
               # To use debugger
               # gem 'debugger'
+            + #
+            +
+            + gem 'jquery-rails'
+            + gem 'jquery-ui-sass-rails'
+            + gem 'jquery-timepicker-addon-rails'
+            +
               gem "haml"
               gem "mail"
               gem "rdiscount"
               gem "test-unit"
               gem 'will_paginate', '~> 3.0.0'
               gem 'dynamic_form'
               gem 'in_place_editing'
               gem 'verification', :git => 'git://github.com/sikachu/verification.git'
               group :test, :development do
                 gem "rspec-rails", "~> 2.0"
               end

Gemfile.lock ¶ +94 -75

               GIT
                 remote: git://github.com/sikachu/verification.git
-            -   revision: 344ad2535da3dc9671872628ff9c79d6f59af9da
+            +   revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d
                 specs:
                   verification (1.0.3)
-            -       actionpack (>= 3.0.0, < 3.3.0)
+            +       actionpack (>= 3.0.0, < 5.0)
-            -       activesupport (>= 3.0.0, < 3.3.0)
+            +       activesupport (>= 3.0.0, < 5.0)
               GEM
                 remote: https://rubygems.org/
                 specs:
-            -     actionmailer (3.2.8)
+            +     actionmailer (3.2.19)
-            -       actionpack (= 3.2.8)
+            +       actionpack (= 3.2.19)
-            -       mail (~> 2.4.4)
+            +       mail (~> 2.5.4)
-            -     actionpack (3.2.8)
+            +     actionpack (3.2.19)
-            -       activemodel (= 3.2.8)
+            +       activemodel (= 3.2.19)
-            -       activesupport (= 3.2.8)
+            +       activesupport (= 3.2.19)
                     builder (~> 3.0.0)
                     erubis (~> 2.7.0)
                     journey (~> 1.0.4)
-            -       rack (~> 1.4.0)
+            +       rack (~> 1.4.5)
                     rack-cache (~> 1.2)
                     rack-test (~> 0.6.1)
-            -       sprockets (~> 2.1.3)
+            +       sprockets (~> 2.2.1)
-            -     activemodel (3.2.8)
+            +     activemodel (3.2.19)
-            -       activesupport (= 3.2.8)
+            +       activesupport (= 3.2.19)
                     builder (~> 3.0.0)
-            -     activerecord (3.2.8)
+            +     activerecord (3.2.19)
-            -       activemodel (= 3.2.8)
+            +       activemodel (= 3.2.19)
-            -       activesupport (= 3.2.8)
+            +       activesupport (= 3.2.19)
                     arel (~> 3.0.2)
                     tzinfo (~> 0.3.29)
-            -     activeresource (3.2.8)
+            +     activeresource (3.2.19)
-            -       activemodel (= 3.2.8)
+            +       activemodel (= 3.2.19)
-            -       activesupport (= 3.2.8)
+            +       activesupport (= 3.2.19)
-            -     activesupport (3.2.8)
+            +     activesupport (3.2.19)
-            -       i18n (~> 0.6)
+            +       i18n (~> 0.6, >= 0.6.4)
                     multi_json (~> 1.0)
-            -     arel (3.0.2)
+            +     arel (3.0.3)
-            -     builder (3.0.3)
+            +     builder (3.0.4)
                   coffee-rails (3.2.2)
                     coffee-script (>= 2.2.0)
                     railties (~> 3.2.0)
-            -     coffee-script (2.2.0)
+            +     coffee-script (2.3.0)
                     coffee-script-source
                     execjs
-            -     coffee-script-source (1.3.3)
+            +     coffee-script-source (1.7.1)
-            -     diff-lcs (1.1.3)
+            +     diff-lcs (1.2.5)
                   dynamic_form (1.1.4)
                   erubis (2.7.0)
-            -     execjs (1.4.0)
+            +     execjs (2.2.1)
-            -       multi_json (~> 1.0)
+            +     haml (4.0.5)
-            -     haml (3.1.7)
+            +       tilt
-            -     hike (1.2.1)
+            +     hike (1.2.3)
-            -     i18n (0.6.1)
+            +     i18n (0.6.11)
                   in_place_editing (1.2.0)
                   journey (1.0.4)
-            -     json (1.7.5)
+            +     jquery-rails (3.1.1)
-            -     mail (2.4.4)
+            +       railties (>= 3.0, < 5.0)
-            -       i18n (>= 0.4.0)
+            +       thor (>= 0.14, < 2.0)
+            +     jquery-timepicker-addon-rails (1.4.1)
+            +       railties (>= 3.1)
+            +     jquery-ui-rails (4.0.3)
+            +       jquery-rails
+            +       railties (>= 3.1.0)
+            +     jquery-ui-sass-rails (4.0.3.0)
+            +       jquery-rails
+            +       jquery-ui-rails (= 4.0.3)
+            +       railties (>= 3.1.0)
+            +     json (1.8.1)
+            +     mail (2.5.4)
                     mime-types (~> 1.16)
                     treetop (~> 1.4.8)
-            -     mime-types (1.19)
+            +     mime-types (1.25.1)
-            -     multi_json (1.3.6)
+            +     multi_json (1.10.1)
-            -     mysql2 (0.3.11)
+            +     mysql2 (0.3.16)
-            -     polyglot (0.3.3)
+            +     polyglot (0.3.5)
+            +     power_assert (0.1.3)
                   prototype-rails (3.2.1)
                     rails (~> 3.2)
-            -     rack (1.4.1)
+            +     rack (1.4.5)
                   rack-cache (1.2)
                     rack (>= 0.4)
-            -     rack-ssl (1.3.2)
+            +     rack-ssl (1.3.4)
                     rack
                   rack-test (0.6.2)
                     rack (>= 1.0)
-            -     rails (3.2.8)
+            +     rails (3.2.19)
-            -       actionmailer (= 3.2.8)
+            +       actionmailer (= 3.2.19)
-            -       actionpack (= 3.2.8)
+            +       actionpack (= 3.2.19)
-            -       activerecord (= 3.2.8)
+            +       activerecord (= 3.2.19)
-            -       activeresource (= 3.2.8)
+            +       activeresource (= 3.2.19)
-            -       activesupport (= 3.2.8)
+            +       activesupport (= 3.2.19)
                     bundler (~> 1.0)
-            -       railties (= 3.2.8)
+            +       railties (= 3.2.19)
-            -     railties (3.2.8)
+            +     railties (3.2.19)
-            -       actionpack (= 3.2.8)
+            +       actionpack (= 3.2.19)
-            -       activesupport (= 3.2.8)
+            +       activesupport (= 3.2.19)
                     rack-ssl (~> 1.3.2)
                     rake (>= 0.8.7)
                     rdoc (~> 3.4)
                     thor (>= 0.14.6, < 2.0)
-            -     rake (0.9.2.2)
+            +     rake (10.3.2)
-            -     rdiscount (1.6.8)
+            +     rdiscount (2.1.7.1)
-            -     rdoc (3.12)
+            +     rdoc (3.12.2)
                     json (~> 1.4)
-            -     rspec (2.11.0)
+            +     rspec-collection_matchers (1.0.0)
-            -       rspec-core (~> 2.11.0)
+            +       rspec-expectations (>= 2.99.0.beta1)
-            -       rspec-expectations (~> 2.11.0)
+            +     rspec-core (2.99.2)
-            -       rspec-mocks (~> 2.11.0)
+            +     rspec-expectations (2.99.2)
-            -     rspec-core (2.11.1)
+            +       diff-lcs (>= 1.1.3, < 2.0)
-            -     rspec-expectations (2.11.3)
+            +     rspec-mocks (2.99.2)
-            -       diff-lcs (~> 1.1.3)
+            +     rspec-rails (2.99.0)
-            -     rspec-mocks (2.11.3)
-            -     rspec-rails (2.11.0)
                     actionpack (>= 3.0)
+            +       activemodel (>= 3.0)
                     activesupport (>= 3.0)
                     railties (>= 3.0)
-            -       rspec (~> 2.11.0)
+            +       rspec-collection_matchers
-            -     sass (3.2.1)
+            +       rspec-core (~> 2.99.0)
-            -     sass-rails (3.2.5)
+            +       rspec-expectations (~> 2.99.0)
+            +       rspec-mocks (~> 2.99.0)
+            +     sass (3.4.1)
+            +     sass-rails (3.2.6)
                     railties (~> 3.2.0)
                     sass (>= 3.1.10)
                     tilt (~> 1.3)
-            -     sprockets (2.1.3)
+            +     sprockets (2.2.2)
                     hike (~> 1.2)
+            +       multi_json (~> 1.0)
                     rack (~> 1.0)
                     tilt (~> 1.1, != 1.3.0)
-            -     test-unit (2.5.2)
+            +     test-unit (3.0.1)
-            -     thor (0.16.0)
+            +       power_assert
-            -     tilt (1.3.3)
+            +     thor (0.19.1)
-            -     treetop (1.4.10)
+            +     tilt (1.4.1)
+            +     treetop (1.4.15)
                     polyglot
                     polyglot (>= 0.3.1)
-            -     tzinfo (0.3.33)
+            +     tzinfo (0.3.41)
-            -     uglifier (1.3.0)
+            +     uglifier (2.5.3)
                     execjs (>= 0.3.0)
-            -       multi_json (~> 1.0, >= 1.0.2)
+            +       json (>= 1.8.0)
-            -     will_paginate (3.0.3)
+            +     will_paginate (3.0.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 coffee-rails (~> 3.2.1)
                 dynamic_form
                 haml
                 in_place_editing
+            +   jquery-rails
+            +   jquery-timepicker-addon-rails
+            +   jquery-ui-sass-rails
                 mail
                 mysql2
                 prototype-rails
-            -   rails (= 3.2.8)
+            +   rails (= 3.2.19)
                 rdiscount
                 rspec-rails (~> 2.0)
                 sass-rails (~> 3.2.3)
                 test-unit
                 uglifier (>= 1.0.3)
                 verification!
                 will_paginate (~> 3.0.0)

app/assets/stylesheets/application.css.sass ¶ +9 -1

+            +
+            + @import jquery.ui.core
+            + @import jquery.ui.theme
+            + @import jquery.ui.datepicker
+            + @import jquery.ui.slider
+            + @import jquery-ui-timepicker-addon
+            +
+            +
               body
                 background: white image-url("topbg.jpg") repeat-x top center
                 font-size: 13px
                 font-family: Tahoma, "sans-serif"
                 margin: 10px
                 padding: 10px
               input
                 font-family: Tahoma, "sans-serif"
               h1
                 font-size: 24px
                 color: #334488
                 line-height: 2em
               h2
                 font-size: 18px
                 color: #5566bb
                 line-height: 1.5em
                     &.message div.stat
                       font-size: 10px
                       line-height: 1.75em
                       padding: 0 5px
                       color: #444444
                       background: #bbbbbb
                       font-weight: bold
                 &.contest-title
                   color: white
                   text-align: center
                   line-height: 2em
                 &.registration-desc, &.test-desc
                   border: 1px dotted gray
                   background: #f5f5f5
                   padding: 5px
                   margin: 10px 0
                   font-size: 12px
                   line-height: 1.5em
               h2.contest-title
                 margin-top: 5px
-            -   margin-bottom: 5px
  No newline at end of file
+            +   margin-bottom: 5px

app/controllers/login_controller.rb ¶ +3

               class LoginController < ApplicationController
                 def index
                   # show login screen
                   reset_session
                   redirect_to :controller => 'main', :action => 'login'
                 end
                 def login
                   if user = User.authenticate(params[:login], params[:password])
                     session[:user_id] = user.id
                     session[:admin] = user.admin?
                     # clear forced logout flag for multicontests contest change
                     if GraderConfiguration.multicontests?
                       contest_stat = user.contest_stat
                       if contest_stat.respond_to? :forced_logout
                         if contest_stat.forced_logout
                           contest_stat.forced_logout = false
                           contest_stat.save
                         end
                       end
                     end
+            +       #save login information
+            +       Login.create(user_id: user.id, ip_address: request.remote_ip)
+            +
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     flash[:notice] = 'Wrong password'
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end
                 def site_login
                   begin
                     site = Site.find(params[:login][:site_id])
                   rescue ActiveRecord::RecordNotFound
                     site = nil
                   end
                   if site==nil
                     flash[:notice] = 'Wrong site'
                     redirect_to :controller => 'main', :action => 'login'  and return
                   end
                   if (site.password) and (site.password == params[:login][:password])
                     session[:site_id] = site.id
                     redirect_to :controller => 'site', :action => 'index'
                   else
                     flash[:notice] = 'Wrong site password'
                     redirect_to :controller => 'site', :action => 'login'
                   end

app/helpers/application_helper.rb ¶ +1

               # Methods added to this helper will be available to all templates in the application.
               module ApplicationHelper
                 def user_header
                   menu_items = ''
                   user = User.find(session[:user_id])
                   if (user!=nil) and (session[:admin])
                     # admin menu
                     menu_items << "<b>Administrative task:</b> "
                     append_to menu_items, '[Announcements]', 'announcements', 'index'
                     append_to menu_items, '[Msg console]', 'messages', 'console'
                     append_to menu_items, '[Problems]', 'problems', 'index'
                     append_to menu_items, '[Users]', 'user_admin', 'index'
                     append_to menu_items, '[Results]', 'user_admin', 'user_stat'
+            +       append_to menu_items, '[Report]', 'report', 'login_stat'
                     append_to menu_items, '[Graders]', 'graders', 'list'
                     append_to menu_items, '[Contests]', 'contest_management', 'index'
                     append_to menu_items, '[Sites]', 'sites', 'index'
                     append_to menu_items, '[System config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
                   # main page
                   append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list'
                   append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list'
                   if (user!=nil) and (GraderConfiguration.show_tasks_to?(user))
                     append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list'
                     append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission'
                     append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help'
                   if GraderConfiguration['system.user_setting_enabled']
                     append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login'
                   menu_items.html_safe

app/models/problem.rb ¶ +9 -2

               class Problem < ActiveRecord::Base
                 belongs_to :description
                 has_and_belongs_to_many :contests, :uniq => true
                 has_many :test_pairs, :dependent => :delete_all
                 validates_presence_of :name
                 validates_format_of :name, :with => /^\w+$/
                 validates_presence_of :full_name
                 scope :available, :conditions => {:available => true}
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
                 def self.find_available_problems
-            -     Problem.available.all(:order => "date_added DESC")
+            +     Problem.available.all(:order => "date_added DESC, name ASC")
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   org_problem = old_problem || Problem.new
                   import_params, problem = Problem.extract_params_and_check(params,
                                                                             org_problem)
                   if !problem.errors.empty?
                     return problem, 'Error importing'
                   end
                   problem.full_score = 100
                   problem.date_added = Time.new
                   problem.test_allowed = true
                   problem.output_only = false
                   problem.available = false
                   if not problem.save
                     return problem, 'Error importing'
                   end
                   import_to_db = params.has_key? :import_to_db
                   importer = TestdataImporter.new(problem)
                   if not importer.import_from_file(import_params[:file],
                                                    import_params[:time_limit],
                                                    import_params[:memory_limit],
+            +                                      import_params[:checker_name],
                                                    import_to_db)
                     problem.errors.add_to_base('Import error.')
                   end
                   return problem, importer.log_msg
                 end
                 def self.download_file_basedir
                   return "#{Rails.root}/data/tasks"
                 end
                 protected
                 def self.to_i_or_default(st, default)
                   if st!=''
                     result = st.to_i
                   end
                   result ||= default
                 end
                 def self.to_f_or_default(st, default)
                   if st!=''
                     result = st.to_f
                   end
                   result ||= default
                 end
                 def self.extract_params_and_check(params, problem)
                   time_limit = Problem.to_f_or_default(params[:time_limit],
                                                        DEFAULT_TIME_LIMIT)
                   memory_limit = Problem.to_i_or_default(params[:memory_limit],
                                                          DEFAULT_MEMORY_LIMIT)
                   if time_limit<=0 or time_limit >60
                     problem.errors.add_to_base('Time limit out of range.')
                   end
                   if memory_limit==0 and params[:memory_limit]!='0'
                     problem.errors.add_to_base('Memory limit format errors.')
                   elsif memory_limit<=0 or memory_limit >512
                     problem.errors.add_to_base('Memory limit out of range.')
                   end
                   if params[:file]==nil or params[:file]==''
                     problem.errors.add_to_base('No testdata file.')
                   end
+            +     checker_name = 'text'
+            +     if ['text','float'].include? params[:checker]
+            +       checker_name = params[:checker]
+            +     end
+            +
                   file = params[:file]
                   if !problem.errors.empty?
                     return nil, problem
                   end
                   problem.name = params[:name]
                   if params[:full_name]!=''
                     problem.full_name = params[:full_name]
                   else
                     problem.full_name = params[:name]
                   end
                   return [{
                             :time_limit => time_limit,
                             :memory_limit => memory_limit,
-            -               :file => file
+            +               :file => file,
+            +               :checker_name => checker_name
                           },
                           problem]
                 end
               end

app/models/user.rb ¶ +12 -3

               require 'digest/sha1'
               require 'net/pop'
+            + require 'net/https'
+            + require 'net/http'
               require 'json'
               class User < ActiveRecord::Base
                 has_and_belongs_to_many :roles
                 has_many :test_requests, :order => "submitted_at DESC"
                 has_many :messages,
                          :class_name => "Message",
                          :foreign_key => "sender_id",
                          :order => 'created_at DESC'
                 has_many :replied_messages,
                          :class_name => "Message",
                          :foreign_key => "receiver_id",
                          :order => 'created_at DESC'
                 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
                 belongs_to :site
                 belongs_to :country
                 has_and_belongs_to_many :contests, :uniq => true, :order => 'name'
                 # this is for will_paginate
                 cattr_reader :per_page
                 @@per_page = 50
                 def self.authenticate(login, password)
                   user = find_by_login(login)
                   if user
                     return user if user.authenticated?(password)
                     if user.authenticated_by_cucas?(password) or user.authenticated_by_pop3?(password)
                       user.password = password
                       user.save
                       return user
                     end
                   end
                 end
                 def authenticated?(password)
                   if self.activated
                     hashed_password == User.encrypt(password,self.salt)
                   else
                     false
                   end
                 end
-            -   def authenticated_by_pop3?(password)
+            +   def authenticated_by_pop3?(password)
                   Net::POP3.enable_ssl
                   pop = Net::POP3.new('pops.it.chula.ac.th')
                   authen = true
                   begin
                     pop.start(login, password)
                     pop.finish
                     return true
                   rescue
                     return false
                   end
                 end
                 def authenticated_by_cucas?(password)
                   url = URI.parse('https://www.cas.chula.ac.th/cas/api/?q=studentAuthenticate')
                   appid = '41508763e340d5858c00f8c1a0f5a2bb'
                   appsecret ='d9cbb5863091dbe186fded85722a1e31'
                   post_args = {
                     'appid' => appid,
                     'appsecret' => appsecret,
                     'username' => login,
                     'password' => password
                   }
                   #simple call
                   begin
-            -       resp = Net::HTTP.post_form(url, post_args)
+            +       http = Net::HTTP.new('www.cas.chula.ac.th', 443)
-            -       result = JSON.parse resp.body
+            +       http.use_ssl = true
+            +       result = [ ]
+            +       http.start do |http|
+            +         req = Net::HTTP::Post.new('/cas/api/?q=studentAuthenticate')
+            +         param = "appid=#{appid}&appsecret=#{appsecret}&username=#{login}&password=#{password}"
+            +         resp = http.request(req,param)
+            +         result = JSON.parse resp.body
+            +       end
                     return true if result["type"] == "beanStudent"
                   rescue
                     return false
                   end
                   return false
                 end
                 def admin?
                   self.roles.detect {|r| r.name == 'admin' }
                 end
                 def email_for_editing
                   if self.email==nil
                     "(unknown)"
                   elsif self.email==''
                     "(blank)"
                   else
                     self.email
                   end
                 end
                 def email_for_editing=(e)
                   self.email=e
                 end

app/views/layouts/application.html.erb ¶ +2

               <!DOCTYPE html>
               <html>
               <head>
                 <title><%= GraderConfiguration['contest.name'] %></title>
                 <%= stylesheet_link_tag "application", :media => "all" %>
                 <%= javascript_include_tag "application" %>
                 <%= csrf_meta_tags %>
+            +   <%= content_for :header %>
                 <%= yield :head %>
+            +
               </head>
               <body>
               <div class="userbar">
               <%= user_header %>
               </div>
               <%= content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil %>
               <%= yield %>
               </body>
               </html>

app/views/main/_problem.html.erb ¶ +1 -1

               <tr class="info-<%= (problem_counter%2==0) ? "even" : "odd" %>">
                 <td>
                   <%= "#{problem_counter+1}" %>
                 </td>
                 <td>
-            -     <%= "#{problem.full_name} (#{problem.name})" %>
+            +     <%= "(#{problem.name}) #{problem.full_name}" %>
                   <%= link_to_description_if_any "[#{t 'main.problem_desc'}]", problem %>
                 </td>
                 <td align="center">
                   <%= @prob_submissions[problem.id][:count] %>
                 </td>
                 <td>
                   <%= render :partial => 'submission_short',
                              :locals => {
                                :submission => @prob_submissions[problem.id][:submission],
                                :problem_name => problem.name }%>
                 </td>
               </tr>

app/views/problems/import.html.haml ¶ +13

               = form_tag({:action => 'do_import'}, :multipart => true)  do
                 .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/
+            +             You may also put a pdf file for the task description
+            +       %tr
+            +         %td Checker:
+            +         %td= select_tag 'checker', options_for_select([['Text checker','text'],['Float checker','float']], 'text')
+            +       %tr
+            +         %td
+            +         %td
+            +           %span{:class => 'help'}
+            +             "Text" checker checks if the text (including numbers) is the same, ignoring any whitespace
+            +             %br/
+            +             "Float" checker checks if all numbers is within EPSILON error using formula |a-b| < EPSILON * max(|a|,|b|)
+            +
                     - if @allow_test_pair_import
                       %tr
                         %td
                         %td
                           = check_box_tag 'import_to_db'
                           Import test data to database (for a test-pair task)
                     %tr
                       %td Time limit:
                       %td
                         = text_field_tag 'time_limit'
                         %span{:class => 'help'} In seconds. Leave blank to use 1 sec.
                     %tr
                       %td Memory limit:
                       %td
                         = text_field_tag 'memory_limit'
                         %span{:class => 'help'} In MB. Leave blank to use 32MB.
                     %tr
                       %td
                       %td= submit_tag 'Import problem'
               - if @log
                 %h3 Import log
                 %pre.import-log
                   = @log

config/routes.rb ¶ +2

               CafeGrader::Application.routes.draw do
+            +   get "report/login"
+            +
                 resources :contests
                 resources :announcements
                 resources :sites
                 # The priority is based upon order of creation:
                 # first created -> highest priority.
                 # Sample of regular route:
                 #   match 'products/:id' => 'catalog#view'
                 # Keep in mind you can assign values other than :controller and :action
                 # Sample of named route:
                 #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
                 # This route can be invoked with purchase_url(:id => product.id)
                 # Sample resource route (maps HTTP verbs to controller actions automatically):
                 #   resources :products
                 # Sample resource route with options:
                 #   resources :products do
                 #     member do
                 #       get 'short'
                 #       post 'toggle'

db/schema.rb ¶ +8 -1

               # encoding: UTF-8
               # 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 to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20140823031747) do
+            + ActiveRecord::Schema.define(:version => 20140826095949) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   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"
                   t.string   "notes"
                 end
                 create_table "contests", :force => true do |t|
                   t.string   "title"
                   t.boolean  "enabled"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                   t.string   "name"
                 end
                 create_table "contests_problems", :id => false, :force => true do |t|
                   t.integer "contest_id"
                   t.integer "problem_id"
                   t.text     "description"
                 end
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at",               :null => false
                   t.datetime "updated_at",               :null => false
                   t.integer  "task_id"
                   t.string   "task_type"
                   t.boolean  "terminated"
                 end
                 add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
                 create_table "languages", :force => true do |t|
                   t.string "name",        :limit => 10
                   t.string "pretty_name"
                   t.string "ext",         :limit => 10
                   t.string "common_ext"
                 end
+            +   create_table "logins", :force => true do |t|
+            +     t.string   "user_id"
+            +     t.string   "ip_address"
+            +     t.datetime "created_at", :null => false
+            +     t.datetime "updated_at", :null => false
+            +   end
+            +
                 create_table "messages", :force => true do |t|
                   t.integer  "sender_id"
                   t.integer  "receiver_id"
                   t.integer  "replying_message_id"
                   t.text     "body"
                   t.boolean  "replied"
                   t.datetime "created_at",          :null => false
                   t.datetime "updated_at",          :null => false
                 end
                 create_table "problems", :force => true do |t|
                   t.string  "name",                 :limit => 30
                   t.string  "full_name"
                   t.integer "full_score"
                   t.date    "date_added"
                   t.boolean "available"
                   t.string  "url"
                   t.integer "description_id"
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                   t.string  "description_filename"
                 end
                 create_table "rights", :force => true do |t|

lib/grader_script.rb ¶ +1 -1

                 end
                 def self.start_grader(env)
                   GraderScript.call_grader "#{env} queue &"
                   GraderScript.call_grader "#{env} test_request &"
                 end
                 def self.call_import_problem(problem_name,
                                              problem_dir,
                                              time_limit=1,
                                              memory_limit=32,
                                              checker_name='text')
                   if GraderScript.grader_control_enabled?
                     cur_dir = `pwd`.chomp
                     Dir.chdir(GRADER_ROOT_DIR)
                     script_name = File.join(GRADER_ROOT_DIR, "scripts/import_problem")
                     cmd = "#{script_name} #{problem_name} #{problem_dir} #{checker_name}" +
                       " -t #{time_limit} -m #{memory_limit}"
                     output = `#{cmd}`
                     Dir.chdir(cur_dir)
-            -       return output
+            +       return "import CMD: #{cmd}\n" + output
                   end
                   return ''
                 end
               end

lib/testdata_importer.rb ¶ +3 -1

               require 'tmpdir'
               class TestdataImporter
                 attr :log_msg
                 def initialize(problem)
                   @problem = problem
                 end
                 def import_from_file(tempfile,
                                      time_limit,
                                      memory_limit,
+            +                        checker_name='text',
                                      import_to_db=false)
                   dirname = extract(tempfile)
                   return false if not dirname
                   if not import_to_db
                     @log_msg = GraderScript.call_import_problem(@problem.name,
                                                                 dirname,
                                                                 time_limit,
-            -                                                   memory_limit)
+            +                                                   memory_limit,
+            +                                                   checker_name)
                   else
                     # Import test data to test pairs.
                     @problem.test_pairs.clear
                     if import_test_pairs(dirname)
                       test_pair_count = TestPair.count :conditions => "problem_id = #{@problem.id}"
                       @log_msg = "Importing test pair successful. (#{test_pair_count} test pairs imported)"
                     else
                       @log_msg = "Importing test pair failed. (0 test pairs imported)"
                     end
                   end
                   @log_msg << import_problem_description(dirname)
                   @log_msg << import_problem_pdf(dirname)
                   @log_msg << import_full_score(dirname)
                   return true
                 end
                 protected
                 def self.long_ext(filename)
                   i = filename.index('.')
                   len = filename.length

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

r416:3378c5a77746 - Sun, 31 Aug 2014 09:35:41 - 24 files changed: 294 inserted, 86 deleted

Sign in to your account

Commit r416:3378c5a77746 public

Author

r416:3378c5a77746 - Sun, 31 Aug 2014 09:35:41 - 24 files changed: 294 inserted, 86 deleted

Commit `r416:3378c5a77746` public