cafe-grader-web Commit - r433:a8fd17f1561a

cafe-grader-web

Commit `r433:a8fd17f1561a` public

parent | child

Description:

merge feature from java, including * user profile page * combine user_stat with user_stat_max * add jquery plugin tablesorter that sorts table

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

r433:a8fd17f1561a - Sat, 13 Sep 2014 05:43:10 - 16 files changed: 378 inserted, 74 deleted

app/assets/stylesheets/tablesorter-theme.cafe.css created 644 ¶ +197

@@ -0,0 +1,197
	1	+ /*************
	2	+ Metro Dark Theme
	3	+ *************/
	4	+ /* overall */
	5	+ .tablesorter-cafe {
	6	+ // font: 12px/18px 'Segoe UI Semilight', 'Open Sans', Verdana, Arial, Helvetica, sans-serif;
	7	+ color: #000;
	8	+ background-color: #777;
	9	+ margin: 10px 0 15px;
	10	+ text-align: left;
	11	+ border-collapse: collapse;
	12	+ border: #555 1px solid;
	13	+ }
	14	+
	15	+ .tablesorter-cafe tr.dark-row th, .tablesorter-cafe tr.dark-row td {
	16	+ background-color: #222;
	17	+ color: #fff;
	18	+ text-align: left;
	19	+ font-size: 14px;
	20	+ }
	21	+
	22	+ /* header/footer */
	23	+ .tablesorter-cafe caption,
	24	+ .tablesorter-cafe th,
	25	+ .tablesorter-cafe thead td,
	26	+ .tablesorter-cafe tfoot th,
	27	+ .tablesorter-cafe tfoot td {
	28	+ //font-weight: 300;
	29	+ //font-size: 15px;
	30	+ color: #fff;
	31	+ background-color: #777;
	32	+ padding: 2px;
	33	+ border: #555 1px solid;
	34	+ }
	35	+
	36	+ .tablesorter-cafe .header,
	37	+ .tablesorter-cafe .tablesorter-header {
	38	+ background-image: url(data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAQBAMAAADQT4M0AAAAGFBMVEUAAADu7u7u7u7u7u7u7u7u7u7u7u7u7u5jNePWAAAACHRSTlMAMxIHKwEgMWD59H4AAABSSURBVAjXY2BgYFJgAAHzYhDJ6igSAKTYBAUTgJSioKAQAwNzoaCguAFDiCAQuDIkgigxBgiA8cJAVCpQt6AgSL+JoKAzA0gjUBsQqBcBCYhFAAE/CV4zeSzxAAAAAElFTkSuQmCC);
	39	+ background-position: center right;
	40	+ background-repeat: no-repeat;
	41	+ cursor: pointer;
	42	+ white-space: normal;
	43	+ }
	44	+ .tablesorter-cafe .tablesorter-header-inner {
	45	+ padding: 0 18px 0 4px;
	46	+ }
	47	+ .tablesorter-cafe thead .headerSortUp,
	48	+ .tablesorter-cafe thead .tablesorter-headerSortUp,
	49	+ .tablesorter-cafe thead .tablesorter-headerAsc {
	50	+ background-image: url(data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAQBAMAAADQT4M0AAAAIVBMVEUAAADu7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u5meJAOAAAACnRSTlMAMwsqXt+gIBUGxGoDMAAAAFlJREFUCNctzC0SQAAUReEzGNQ3AlHRiSRZFCVZYgeswRL8hLdK7834wj3tAlGP6y7fYHpKS6w6WwbVG0I1NZVnZPG8/DYxOYlnhUYkA06R1s9ESsxR4NIdPhkPFDFYuEnMAAAAAElFTkSuQmCC);
	51	+ }
	52	+ .tablesorter-cafe thead .headerSortDown,
	53	+ .tablesorter-cafe thead .tablesorter-headerSortDown,
	54	+ .tablesorter-cafe thead .tablesorter-headerDesc {
	55	+ background-image: url(data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAQBAMAAADQT4M0AAAALVBMVEUAAADu7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7i0NViAAAADnRSTlMAMiweCQITTvDctZZqaTlM310AAABcSURBVAjXY2BgYEtgAAFHERDJqigUAKSYBQUNgFSioKAYAwOLIBA4MASBKFUGQxAlzAAF+94BwWuGKBC1lIFl3rt3Lx0YGCzevWsGSjK9e6cAUlT3HKyW9wADAwDRrBiDy6bKzwAAAABJRU5ErkJggg==);
	56	+ }
	57	+ .tablesorter-cafe thead .sorter-false {
	58	+ background-image: none;
	59	+ cursor: default;
	60	+ padding: 4px;
	61	+ }
	62	+
	63	+ /* tbody */
	64	+ .tablesorter-cafe td {
	65	+ background-color: #fff;
	66	+ padding: 1px 4px;
	67	+ vertical-align: top;
	68	+ border-style: solid;
	69	+ border-color: #666;
	70	+ border-collapse: collapse;
	71	+ border-width: 0px 1px;
	72	+
	73	+ }
	74	+
	75	+ /* hovered row colors */
	76	+ .tablesorter-cafe tbody > tr:hover > td,
	77	+ .tablesorter-cafe tbody > tr.even:hover > td,
	78	+ .tablesorter-cafe tbody > tr.odd:hover > td {
	79	+ background: #bbb;
	80	+ color: #000;
	81	+ }
	82	+
	83	+ /* table processing indicator */
	84	+ .tablesorter-cafe .tablesorter-processing {
	85	+ background-position: center center !important;
	86	+ background-repeat: no-repeat !important;
	87	+ /* background-image: url(../addons/pager/icons/loading.gif) !important; */
	88	+ background-image: url(data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=) !important;
	89	+ }
	90	+
	91	+ /* pager */
	92	+ .tablesorter-cafe .tablesorter-pager button {
	93	+ background-color: #444;
	94	+ color: #eee;
	95	+ border: #555 1px solid;
	96	+ cursor: pointer;
	97	+ }
	98	+ .tablesorter-cafe .tablesorter-pager button:hover {
	99	+ background-color: #555;
	100	+ }
	101	+
	102	+ /* Zebra Widget - row alternating colors */
	103	+ .tablesorter-cafe tr.odd td {
	104	+ background-color: #eee;
	105	+ }
	106	+ .tablesorter-cafe tr.even td {
	107	+ background-color: #fff;
	108	+ }
	109	+
	110	+ /* Column Widget - column sort colors */
	111	+ .tablesorter-cafe tr.odd td.primary {
	112	+ background-color: #bfbfbf;
	113	+ }
	114	+ .tablesorter-cafe td.primary,
	115	+ .tablesorter-cafe tr.even td.primary {
	116	+ background-color: #d9d9d9;
	117	+ }
	118	+ .tablesorter-cafe tr.odd td.secondary {
	119	+ background-color: #d9d9d9;
	120	+ }
	121	+ .tablesorter-cafe td.secondary,
	122	+ .tablesorter-cafe tr.even td.secondary {
	123	+ background-color: #e6e6e6;
	124	+ }
	125	+ .tablesorter-cafe tr.odd td.tertiary {
	126	+ background-color: #e6e6e6;
	127	+ }
	128	+ .tablesorter-cafe td.tertiary,
	129	+ .tablesorter-cafe tr.even td.tertiary {
	130	+ background-color: #f2f2f2;
	131	+ }
	132	+
	133	+ /* filter widget */
	134	+ .tablesorter-cafe .tablesorter-filter-row td {
	135	+ background: #eee;
	136	+ line-height: normal;
	137	+ text-align: center; /* center the input */
	138	+ -webkit-transition: line-height 0.1s ease;
	139	+ -moz-transition: line-height 0.1s ease;
	140	+ -o-transition: line-height 0.1s ease;
	141	+ transition: line-height 0.1s ease;
	142	+ }
	143	+ /* optional disabled input styling */
	144	+ .tablesorter-cafe .tablesorter-filter-row .disabled {
	145	+ opacity: 0.5;
	146	+ filter: alpha(opacity=50);
	147	+ cursor: not-allowed;
	148	+ }
	149	+ /* hidden filter row */
	150	+ .tablesorter-cafe .tablesorter-filter-row.hideme td {
	151	+ /* ******************************************* */
	152	+ /* change this padding to modify the thickness */
	153	+ /* of the closed filter row (height = padding x 2) */
	154	+ padding: 2px;
	155	+ /* ******************************************* */
	156	+ margin: 0;
	157	+ line-height: 0;
	158	+ cursor: pointer;
	159	+ }
	160	+ .tablesorter-cafe .tablesorter-filter-row.hideme .tablesorter-filter {
	161	+ height: 1px;
	162	+ min-height: 0;
	163	+ border: 0;
	164	+ padding: 0;
	165	+ margin: 0;
	166	+ /* don't use visibility: hidden because it disables tabbing */
	167	+ opacity: 0;
	168	+ filter: alpha(opacity=0);
	169	+ }
	170	+ /* filters */
	171	+ .tablesorter-cafe .tablesorter-filter {
	172	+ width: 95%;
	173	+ height: auto;
	174	+ margin: 4px;
	175	+ padding: 4px;
	176	+ background-color: #fff;
	177	+ border: 1px solid #bbb;
	178	+ color: #333;
	179	+ -webkit-box-sizing: border-box;
	180	+ -moz-box-sizing: border-box;
	181	+ box-sizing: border-box;
	182	+ -webkit-transition: height 0.1s ease;
	183	+ -moz-transition: height 0.1s ease;
	184	+ -o-transition: height 0.1s ease;
	185	+ transition: height 0.1s ease;
	186	+ }
	187	+ /* rows hidden by filtering (needed for child rows) */
	188	+ .tablesorter .filtered {
	189	+ display: none;
	190	+ }
	191	+
	192	+ /* ajax error row */
	193	+ .tablesorter .tablesorter-errorRow td {
	194	+ text-align: center;
	195	+ cursor: pointer;
	196	+ background-color: #e6bf99;
	197	+ }

app/views/user_admin/user_stat.html.haml created 644 ¶ +54

@@ -0,0 +1,54
	1	+ - content_for :header do
	2	+ = javascript_include_tag 'new'
	3	+ = stylesheet_link_tag 'tablesorter-theme.cafe'
	4	+
	5	+ %script{:type=>"text/javascript"}
	6	+ $(function () {
	7	+ $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
	8	+ $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
	9	+ $('#my_table').tablesorter({widgets: ['zebra']});
	10	+ });
	11	+
	12	+ %h1 User grading results
	13	+ %h2= params[:action] == 'user_stat' ? "Show scores from latest submission" : "Show max scores in submission range"
	14	+
	15	+
	16	+ - if @problem and @problem.errors
	17	+ =error_messages_for 'problem'
	18	+
	19	+ = render partial: 'submission_range'
	20	+
	21	+ - if params[:action] == 'user_stat'
	22	+ = "latest score"
	23	+ - else
	24	+ = link_to '[Show only latest submissions]', controller: :user_admin, action: :user_stat
	25	+
	26	+ %table.tablesorter-cafe#my_table
	27	+ %thead
	28	+ %tr
	29	+ %th User
	30	+ %th Name
	31	+ %th Activated?
	32	+ %th Logged in
	33	+ %th Contest(s)
	34	+ - @problems.each do \|p\|
	35	+ %th= p.name
	36	+ %th Total
	37	+ %th Passed
	38	+ %tbody
	39	+ - @scorearray.each do \|sc\|
	40	+ %tr{class: cycle('info-even','info-odd')}
	41	+ - total,num_passed = 0,0
	42	+ - sc.each_index do \|i\|
	43	+ - if i == 0
	44	+ %td= link_to sc[i].login, controller: 'users', action: 'profile', id: sc[i]
	45	+ %td= sc[i].full_name
	46	+ %td= sc[i].activated
	47	+ %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no'
	48	+ %td= sc[i].contests.collect {\|c\| c.name}.join(', ')
	49	+ - else
	50	+ %td= sc[i][0]
	51	+ - total += sc[i][0]
	52	+ - num_passed += 1 if sc[i][1]
	53	+ %td= total
	54	+ %td= num_passed

app/views/users/profile.html.haml created 644 ¶ +40

@@ -0,0 +1,40
	1	+ - content_for :header do
	2	+ = javascript_include_tag 'new'
	3	+
	4	+ %script{:type=>"text/javascript"}
	5	+ $(function () {
	6	+ $('#submission_table').tablesorter({widgets: ['zebra','filter']});
	7	+ });
	8	+
	9	+ %h1= @user.full_name + ' Profile'
	10	+
	11	+ %h2 Basic info
	12	+ <b>Login:</b> #{@user.login} <br/>
	13	+ <b>Full name:</b> #{@user.full_name} <br />
	14	+
	15	+
	16	+ %h2 Problem Stat
	17	+
	18	+ %h2 Submissions
	19	+
	20	+ %table.tablesorter-cafe#submission_table
	21	+ %thead
	22	+ %tr
	23	+ %th ID
	24	+ %th Problem code
	25	+ %th Problem name
	26	+ %th Language
	27	+ %th Result
	28	+ %th Score
	29	+ %tbody
	30	+ - @submission.each do \|s\|
	31	+ %tr
	32	+ %td= link_to "#{s.id}", controller: "graders", action: "submission", id: s.id
	33	+ %td= s.problem.name
	34	+ %td= s.problem.full_name
	35	+ %td= s.language.pretty_name
	36	+ %td{style: 'font-family: Droid Sans Mono,Consolas, monospace, mono'}= s.grader_comment
	37	+ %td= s.points/s.problem.full_score * 100
	38	+
	39	+
	40	+

.gitignore ¶ +7

               # See http://help.github.com/ignore-files/ for more about ignoring files.
               #
               # If you find yourself ignoring temporary files generated by your text editor
               # or operating system, you probably want to add a global ignore instead:
               #   git config --global core.excludesfile ~/.gitignore_global
               # Ignore bundler config
               /.bundle
               # Ignore the default SQLite database.
               /db/*.sqlite3
               # Ignore all logfiles and tempfiles.
               /log/*.log
               /tmp
               *~
               /vendor/plugins/rails_upgrade
+            +
+            + #ignore public assets???
+            + /public/assets
+            +
+            + #ignore .orig and .swp
+            + *.orig
+            + *.swp

Gemfile ¶ +2

                 # 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'
               #
+            + # jquery addition
               gem 'jquery-rails'
               gem 'jquery-ui-sass-rails'
               gem 'jquery-timepicker-addon-rails'
+            + gem 'jquery-tablesorter'
               #syntax highlighter
               gem 'rouge'
               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 ¶ +3

                     i18n (~> 0.6, >= 0.6.4)
                     multi_json (~> 1.0)
                   arel (3.0.3)
                   builder (3.0.4)
                   coffee-rails (3.2.2)
                     coffee-script (>= 2.2.0)
                     railties (~> 3.2.0)
                   coffee-script (2.3.0)
                     coffee-script-source
                     execjs
                   coffee-script-source (1.7.1)
                   diff-lcs (1.2.5)
                   dynamic_form (1.1.4)
                   erubis (2.7.0)
                   execjs (2.2.1)
                   haml (4.0.5)
                     tilt
                   hike (1.2.3)
                   i18n (0.6.11)
                   in_place_editing (1.2.0)
                   journey (1.0.4)
                   jquery-rails (3.1.1)
                     railties (>= 3.0, < 5.0)
                     thor (>= 0.14, < 2.0)
+            +     jquery-tablesorter (1.12.7)
+            +       railties (>= 3.1, < 5)
                   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.25.1)
                   multi_json (1.10.1)
                   mysql2 (0.3.16)
                   polyglot (0.3.5)
                   power_assert (0.1.3)
                   prototype-rails (3.2.1)
                     rails (~> 3.2)
                   rack (1.4.5)
                   rack-cache (1.2)
                     rack (>= 0.4)
                   rack-ssl (1.3.4)
                     rack (~> 1.0)
                     tilt (~> 1.1, != 1.3.0)
                   test-unit (3.0.1)
                     power_assert
                   thor (0.19.1)
                   tilt (1.4.1)
                   treetop (1.4.15)
                     polyglot
                     polyglot (>= 0.3.1)
                   tzinfo (0.3.41)
                   uglifier (2.5.3)
                     execjs (>= 0.3.0)
                     json (>= 1.8.0)
                   will_paginate (3.0.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 coffee-rails (~> 3.2.1)
                 dynamic_form
                 haml
                 in_place_editing
                 jquery-rails
+            +   jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-sass-rails
                 mail
                 mysql2
                 prototype-rails
                 rails (= 3.2.19)
                 rdiscount
                 rouge
                 rspec-rails (~> 2.0)
                 sass-rails (~> 3.2.3)
                 test-unit
                 uglifier (>= 1.0.3)
                 verification!
                 will_paginate (~> 3.0.0)

app/assets/javascripts/new.js ¶ +1

               //= require jquery
               //= require jquery_ujs
               //= require jquery.ui.all
               //= require jquery.ui.datepicker
               //= require jquery.ui.slider
               //= require jquery-ui-timepicker-addon
+            + //= require jquery-tablesorter

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

               @import jquery.ui.core
               @import jquery.ui.theme
               @import jquery.ui.datepicker
               @import jquery.ui.slider
               @import jquery-ui-timepicker-addon
+            + @import jquery-tablesorter/theme.metro-dark
+            + @import tablesorter-theme.cafe
               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

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

                   if GraderConfiguration["right.user_view_submission"]
                     return true;
                   end
                   admin_authorization
                 }
                 def login_stat
                   @logins = Array.new
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
                   rescue
                     @since_time = DateTime.new(1000,1,1)
                   end
                   begin
                     @until_time = DateTime.strptime(params[:until_datetime],date_and_time)
                   rescue
                     @until_time = DateTime.new(3000,1,1)
                   end
                   User.all.each do |user|
-            -       @logins << { login: user.login,
+            +       @logins << { id: user.id,
+            +                    login: user.login,
                                  full_name: user.full_name,
                                  count: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
                                                     user.id,@since_time,@until_time)
                                         .count(:id),
                                  min: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
                                                     user.id,@since_time,@until_time)
                                         .minimum(:created_at),
                                  max: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
                                                     user.id,@since_time,@until_time)
                                         .maximum(:created_at)
                                }
                   end
                 end
                 def submission_stat
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
                   rescue
                     @since_time = DateTime.new(1000,1,1)
                   end
                   begin
                     @until_time = DateTime.strptime(params[:until_datetime],date_and_time)

app/controllers/user_admin_controller.rb ¶ +2

                     end
                     @scorearray << ustat
                   end
                 end
                 def user_stat_max
                   @problems = Problem.find_available_problems
                   @users = User.find(:all, :include => [:contests, :contest_stat])
                   @scorearray = Array.new
                   #set up range from param
                   since_id = params.fetch(:since_id, 0).to_i
                   until_id = params.fetch(:until_id, 0).to_i
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       max_points = 0
                       Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
                         max_points = sub.points if sub and sub.points and (sub.points > max_points)
                       end
                       ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
                     end
                     @scorearray << ustat
                   end
+            +
+            +     render template: 'user_admin/user_stat'
                 end
                 def import
                   if params[:file]==''
                     flash[:notice] = 'Error importing no file'
                     redirect_to :action => 'list' and return
                   end
                   import_from_file(params[:file])
                 end
                 def random_all_passwords
                   users = User.find(:all)
                   @prefix = params[:prefix] || ''
                   @non_admin_users = User.find_non_admin_with_prefix(@prefix)
                   @changed = false
                   if request.request_method == 'POST'
                     @non_admin_users.each do |user|
                       password = random_password
                       user.password = password
                       user.password_confirmation = password
                       user.save
                     end
                     @changed = true
                   end

app/controllers/users_controller.rb ¶ +20

               require 'net/smtp'
               class UsersController < ApplicationController
                 include MailHelperMethods
                 before_filter :authenticate, :except => [:new,
                                                          :register,
                                                          :confirm,
                                                          :forget,
                                                          :retrieve_password]
                 before_filter :verify_online_registration, :only => [:new,
                                                                      :register,
                                                                      :forget,
                                                                      :retrieve_password]
+            +   before_filter :authenticate, :profile_authorization, only: [:profile]
                 verify :method => :post, :only => [:chg_passwd],
                        :redirect_to => { :action => :index }
                 #in_place_edit_for :user, :alias_for_editing
                 #in_place_edit_for :user, :email_for_editing
                 def index
                   if !GraderConfiguration['system.user_setting_enabled']
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @user = User.find(session[:user_id])
                   end
                 end
                 def chg_passwd
                   user = User.find(session[:user_id])
                   user.password = params[:passwd]
                   user.password_confirmation = params[:passwd_verify]
                   if user.save
                     flash[:notice] = 'password changed'
                   else
                     flash[:notice] = 'Error: password changing failed'
                   end
                 def forget
                   render :action => 'forget', :layout => 'empty'
                 end
                 def retrieve_password
                   email = params[:email]
                   user = User.find_by_email(email)
                   if user
                     last_updated_time = user.updated_at || user.created_at || (Time.now.gmtime - 1.hour)
                     if last_updated_time > Time.now.gmtime - 5.minutes
                       flash[:notice] = 'The account has recently created or new password has recently been requested.  Please wait for 5 minutes'
                     else
                       user.password = user.password_confirmation = User.random_password
                       user.save
                       send_new_password_email(user)
                       flash[:notice] = 'New password has been mailed to you.'
                     end
                   else
                     flash[:notice] = I18n.t 'registration.password_retrieval.no_email'
                   end
                   redirect_to :action => 'forget'
                 end
+            +   def profile
+            +     @user = User.find(params[:id])
+            +     @submission = Submission.where(user_id: params[:id]).all
+            +   end
+            +
                 protected
                 def verify_online_registration
                   if !GraderConfiguration['system.online_registration']
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end
                 def send_confirmation_email(user)
                   contest_name = GraderConfiguration['contest.name']
                   activation_url = url_for(:action => 'confirm',
                                            :login => user.login,
                                            :activation => user.activation_key)
                   home_url = url_for(:controller => 'main', :action => 'index')
                   mail_subject = "[#{contest_name}] Confirmation"
                   mail_body = t('registration.email_body', {
                                   :full_name => user.full_name,
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
                                   :activation_url => activation_url,
                                   :admin_email => admin_email
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
                 def send_new_password_email(user)
                   contest_name = GraderConfiguration['contest.name']
                   mail_subject = "[#{contest_name}] Password recovery"
                   mail_body = t('registration.password_retrieval.email_body', {
                                   :full_name => user.full_name,
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
                                   :admin_email => admin_email
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
+            +
+            +   # allow viewing of regular user profile only when options allow so
+            +   # only admins can view admins profile
+            +   def profile_authorization
+            +     #if view admins' profile, allow only admin
+            +     return false unless(params[:id])
+            +     user = User.find(params[:id])
+            +     return false unless user
+            +     return admin_authorization if user.admin?
+            +     return true if GraderConfiguration["right.user_view_submission"]
+            +
+            +     #finally, we allow only admin
+            +     admin_authorization
+            +   end
               end

app/views/report/_task_hof.html.haml ¶ +28 -11

               :css
                 .hof_user { color: orangered; font-style: italic; }
                 .hof_language { color: green; font-style: italic; }
                 .hof_value { color: deeppink;font-style: italic; }
               %h2 Overall
               - if @best
                 %b Best Runtime:
-            -   by <span class="hof_user">#{@best[:runtime][:user]}</span> using <span class="hof_language">#{@best[:runtime][:lang]}</span> with <span class="hof_value">#{@best[:runtime][:value] * 1000} milliseconds</span> at submission
+            +   by #{link_to @best[:runtime][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
+            +   using <span class="hof_language">#{@best[:runtime][:lang]}</span>
+            +   with <span class="hof_value">#{@best[:runtime][:value] * 1000} milliseconds</span>
+            +   at submission
                 = link_to("#" + @best[:runtime][:sub_id].to_s, controller: 'graders', action: 'submission', id:@best[:runtime][:sub_id])
                 %br/
                 %b Best Memory Usage:
-            -   by <span class="hof_user">#{@best[:memory][:user]}</span> using <span class="hof_language">#{@best[:memory][:lang]}</span> with <span class="hof_value">#{@best[:memory][:value]} kbytes </span> at submission
+            +   by #{link_to @best[:memory][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
+            +   using <span class="hof_language">#{@best[:memory][:lang]}</span>
+            +   with <span class="hof_value">#{@best[:memory][:value]} kbytes </span>
+            +   at submission
                 = link_to("#" + @best[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id:@best[:memory][:sub_id])
                 %br/
-            -   %b Shortest Code:
+            +   %b Shortest Code:
-            -   by <span class="hof_user">#{@best[:length][:user]}</span> using <span class="hof_language">#{@best[:length][:lang]}</span> with  <span class="hof_value">#{@best[:length][:value]} bytes</span> at submission
+            +   by #{link_to @best[:length][:user], controller:'users', action:'profile', id:@best[:length][:user_id]}
+            +   using <span class="hof_language">#{@best[:length][:lang]}</span>
+            +   with  <span class="hof_value">#{@best[:length][:value]} bytes</span>
+            +   at submission
                 = link_to("#" + @best[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:length][:sub_id])
                 %br/
-            -   %b First solver:
+            +   %b First solver:
-            -   <span class="hof_user">#{@best[:first][:user]}</span> is the first solver using <span class="hof_language">#{@best[:first][:lang]}</span> on <span class="hof_value">#{@best[:first][:value]}</span> at submission
+            +   #{link_to @best[:first][:user], controller:'users', action:'profile', id:@best[:first][:user_id]} is the first solver
+            +   using <span class="hof_language">#{@best[:first][:lang]}</span>
+            +   on <span class="hof_value">#{@best[:first][:value]}</span>
+            +   at submission
                 = link_to("#" + @best[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:first][:sub_id])
                 %br/
                 %p
                   This counts only for submission with 100% score <br/>
                   Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)
                 %h2 By language
                 %table.info
                   %thead
                     %tr.info-head
                       %th Language
                       %th Best runtime (ms)
                       %th Best memory (kbytes)
                       %th Shortest Code (bytes)
                       %th First solver
                   %tbody
                     - @by_lang.each do |lang,value|
                       %tr{class: cycle('info-even','info-odd')}
                         %td= lang
                         %td
-            -             = "#{value[:runtime][:user]} (#{(value[:runtime][:value] * 1000).to_i} @"
+            +             = link_to value[:runtime][:user], controller: 'users', action: 'profile', id: value[:runtime][:user_id]
+            +             = "(#{(value[:runtime][:value] * 1000).to_i} @"
                           = "#{link_to("#" + value[:runtime][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:runtime][:sub_id])} )".html_safe
                         %td
-            -             = "#{value[:memory][:user]} (#{value[:memory][:value]} @"
+            +             = link_to value[:memory][:user], controller: 'users', action: 'profile', id: value[:memory][:user_id]
+            +             = "(#{value[:memory][:value]} @"
                           = "#{link_to("#" + value[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:memory][:sub_id])} )".html_safe
                         %td
-            -             = "#{value[:length][:user]} (#{value[:length][:value]} @"
+            +             = link_to value[:length][:user], controller: 'users', action: 'profile', id: value[:length][:user_id]
+            +             = "(#{value[:length][:value]} @"
                           = "#{link_to("#" + value[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:length][:sub_id])} )".html_safe
                         %td
-            -             = "#{value[:first][:user]} (#{value[:first][:value]} @"
+            +             - if value[:first][:user] != '(NULL)' #TODO: i know... this is wrong...
-            -             = "#{link_to("#" + value[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:first][:sub_id])} )".html_safe
+            +               = link_to value[:first][:user], controller: 'users', action: 'profile', id: value[:first][:user_id]
+            +               = "(#{value[:first][:value]} @"
+            +               = "#{link_to("#" + value[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:first][:sub_id])} )".html_safe
               - else
                 %h3 No submissions

app/views/report/login_stat.html.haml ¶ +6 -5

               - content_for :header do
+            +   = stylesheet_link_tag 'tablesorter-theme.cafe'
                 = javascript_include_tag 'new'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
+            +   $('#my_table').tablesorter({widthFixed: true, widgets: ['zebra']});
                 });
               %h1 Login status
               =render partial: 'report_menu'
               =render partial: 'date_range', locals: {param_text: 'Login date range:', title: 'Query login stat in the range'  }
-            - %table.info
+            + %table.tablesorter-cafe#my_table
                 %thead
-            -     %tr.info-head
+            +     %tr
                     %th login
                     %th full name
                     %th login count
                     %th earliest
                     %th latest
                 %tbody
                   - @logins.each do |l|
                     %tr{class: cycle('info-even','info-odd')}
-            -         %td= l[:login]
+            +         %td= link_to l[:login], controller: 'users', action: 'profile', id: l[:id]
                       %td= l[:full_name]
                       %td= l[:count]
                       %td= l[:min] ? l[:min].in_time_zone.strftime('%Y-%m-%d %H:%M') : ''
-            -         %td= l[:max] ? l[:max].in_time_zone.strftime('%Y-%m-%d %H:%M') : ''
+            +         %td= l[:max] ? time_ago_in_words(l[:max].in_time_zone) + ' ago' : ''

app/views/user_admin/user_stat_max.html.haml ¶ +13 -7

+            + - content_for :header do
+            +   = javascript_include_tag 'new'
+            +   = stylesheet_link_tag 'tablesorter-theme.cafe'
+            +
+            + %script{:type=>"text/javascript"}
+            +   $(function () {
+            +   $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
+            +   $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
+            +   $('#my_table').tablesorter({widgets: ['zebra']});
+            +   });
+            +
               %h1 User grading results
               %h2 Show max scores in submission range
               - if @problem and @problem.errors
                 =error_messages_for 'problem'
               = render partial: 'submission_range'
-            - - if @log
-            -   %h3 Import log
-            -   %pre.import-log
-            -     = @log
               %p= link_to '[Show only latest submissions]', controller: :user_admin, action: :user_stat
-            - %table.info
+            + %table.tablesorter-cafe#my_table{style: 'width:auto;'}
                 %thead
-            -     %tr.info-head
+            +     %tr
                     %th User
                     %th Name
                     %th Activated?
                     %th Logged in
                     %th Contest(s)
                     - @problems.each do |p|
                       %th= p.name
                     %th Total
                     %th Passed
                 %tbody
                   - @scorearray.each do |sc|
                     %tr{class: cycle('info-even','info-odd')}
                       - total,num_passed = 0,0
                       - sc.each_index do |i|
                         - if i == 0
                           %td= sc[i].login
                           %td= sc[i].full_name
                           %td= sc[i].activated
                           %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no'
                           %td= sc[i].contests.collect {|c| c.name}.join(', ')
                         - else
                           %td= sc[i][0]
                           - total += sc[i][0]
                           - num_passed += 1 if sc[i][1]

config/application.rb.SAMPLE ¶ +1 -1

                   # Configure sensitive parameters which will be filtered from the log file.
                   config.filter_parameters += [:password]
                   # Enable escaping HTML in JSON.
                   config.active_support.escape_html_entities_in_json = true
                   # Use SQL instead of Active Record's schema dumper when creating the database.
                   # This is necessary if your schema can't be completely dumped by the schema dumper,
                   # like if you have constraints or database-specific column types
                   # config.active_record.schema_format = :sql
                   # Enforce whitelist mode for mass assignment.
                   # This will create an empty whitelist of attributes available for mass-assignment for all models
                   # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
                   # parameters by using an attr_accessible or attr_protected declaration.
                   config.active_record.whitelist_attributes = false
                   # Enable the asset pipeline
                   config.assets.enabled = true
                   # Version of your assets, change this if you want to expire all your assets
                   config.assets.version = '1.0'
-            -     config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js','graders.css','problems.css','new.js']
+            +     config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js','graders.css','problems.css']
                 end
               end

app/views/user_admin/user_stat.html.erb removed ¶ -48

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

r433:a8fd17f1561a - Sat, 13 Sep 2014 05:43:10 - 16 files changed: 378 inserted, 74 deleted

Sign in to your account

Commit r433:a8fd17f1561a public

Author

r433:a8fd17f1561a - Sat, 13 Sep 2014 05:43:10 - 16 files changed: 378 inserted, 74 deleted

Commit `r433:a8fd17f1561a` public