cafe-grader-web Commit - r695:55afb135c5f9

cafe-grader-web

Commit `r695:55afb135c5f9` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r695:55afb135c5f9 - Thu, 02 Nov 2017 11:33:31 - 12 files changed: 117 inserted, 54 deleted

Gemfile ¶ +4 -3

               #syntax highlighter
               gem 'rouge'
-            - #add bootstrap
+            + #bootstrap add-ons
               gem 'bootstrap-sass', '~> 3.2.0'
               gem 'bootstrap-switch-rails'
               gem 'bootstrap-toggle-rails'
               gem 'autoprefixer-rails'
-            - #bootstrap sortable
               gem 'momentjs-rails'
               gem 'rails_bootstrap_sortable'
+            + gem 'bootstrap-datepicker-rails'
+            + gem 'bootstrap3-datetimepicker-rails'
+            + gem 'jquery-datatables-rails'
               #----------- user interface -----------------
               #select 2

Gemfile.lock ¶ +13 -1

                   best_in_place (3.0.3)
                     actionpack (>= 3.2)
                     railties (>= 3.2)
+            +     bootstrap-datepicker-rails (1.7.1.1)
+            +       railties (>= 3.0)
                   bootstrap-sass (3.2.0.2)
                     sass (~> 3.2)
                   bootstrap-switch-rails (3.3.3)
                   bootstrap-toggle-rails (2.2.1.0)
+            +     bootstrap3-datetimepicker-rails (4.17.47)
+            +       momentjs-rails (>= 2.8.1)
                   builder (3.2.2)
                   coffee-rails (4.2.1)
                     coffee-script (>= 2.2.0)
                   i18n (0.7.0)
                   in_place_editing (1.2.0)
                   jquery-countdown-rails (2.0.2)
+            +     jquery-datatables-rails (3.4.0)
+            +       actionpack (>= 3.1)
+            +       jquery-rails
+            +       railties (>= 3.1)
+            +       sass-rails
                   jquery-rails (4.2.1)
                     rails-dom-testing (>= 1, < 3)
                     railties (>= 4.2.0)
                 activerecord-session_store
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
+            +   bootstrap-datepicker-rails
                 bootstrap-sass (~> 3.2.0)
                 bootstrap-switch-rails
                 bootstrap-toggle-rails
+            +   bootstrap3-datetimepicker-rails
                 coffee-rails
                 dynamic_form
                 fuzzy-string-match
                 haml-rails
                 in_place_editing
                 jquery-countdown-rails
+            +   jquery-datatables-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 yaml_db
               BUNDLED WITH
-            -    1.13.6
+            +    1.15.4

app/assets/javascripts/application.js ¶ +6

               //
               //= require jquery
               //= require jquery_ujs
+            + //= require dataTables/jquery.dataTables
+            + //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
               //= require jquery-ui
               //= require bootstrap-sprockets
               //= require moment
+            + //= require moment/th
               //= require bootstrap-sortable
+            + //= require bootstrap-datetimepicker
               //= require select2
               //= require ace-rails-ap
               //= require ace/mode-c_cpp
               //= require best_in_place
               //= require best_in_place.jquery-ui
               //= require brython
+            + //= require bootstrap-datepicker
+            + //= require bootstrap-datetimepicker
               // since this is after blank line, it is not downloaded
               //x= require prototype

app/assets/stylesheets/application.css.scss ¶ +3

               //@import bootstrap3-switch
               @import "bootstrap-toggle";
               @import "bootstrap-sortable";
+            + @import "bootstrap-datepicker3";
+            + @import "bootstrap-datetimepicker";
+            + @import "dataTables/bootstrap/3/jquery.dataTables.bootstrap";
               //bootstrap navbar color (from)
               $bgDefault: #19197b;

app/controllers/login_controller.rb ¶ +12 -6

                 end
                 def login
-            -     if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree])
+            +     user = User.authenticate(params[:login], params[:password])
+            +     unless user
+            +       flash[:notice] = 'Wrong password'
+            +       redirect_to :controller => 'main', :action => 'login'
+            +       return
+            +     end
+            +
+            +     if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree]) and !user.admin?
                     flash[:notice] = 'You must accept the agreement before logging in'
                     redirect_to :controller => 'main', :action => 'login'
-            -     elsif user = User.authenticate(params[:login], params[:password])
+            +       return
+            +     end
+            +
+            +     #process logging in
                   session[:user_id] = user.id
                   session[:admin] = user.admin?
                   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

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

                 def change_date_added
                   problems = get_problems_from_params
-            -     year = params[:date_added][:year].to_i
+            +     date = Date.parse(params[:date_added])
-            -     month = params[:date_added][:month].to_i
-            -     day = params[:date_added][:day].to_i
-            -     date = Date.new(year,month,day)
                   problems.each do |p|
                     p.date_added = date
                     p.save

app/controllers/user_admin_controller.rb ¶ +1

                     @users = User.paginate :page => params[:page]
                     @paginated = true
                   end
+            +     @users = User.all
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                   @contests = Contest.enabled
                 end

app/views/problems/manage.html.haml ¶ +19 -6

                       What do you want to do to the selected problem?
                       %br/
                       (You can shift-click to select a range of problems)
-            -         %ul
+            +         %ul.form-inline
                         %li
                           Change date added to
-            -             = select_date Date.current, :prefix => 'date_added'
+            +             .input-group.date
+            +               = text_field_tag :date_added, class: 'form-control'
+            +               %span.input-group-addon
+            +                 %span.glyphicon.glyphicon-calendar
+            +             -# = select_date Date.current, :prefix => 'date_added'
                           &nbsp;&nbsp;&nbsp;
-            -             = submit_tag 'Change', :name => 'change_date_added', class: 'btn btn-default'
+            +             = submit_tag 'Change', :name => 'change_date_added', class: 'btn btn-primary btn-sm'
                         %li
                           Set available to
-            -             = submit_tag 'True', :name => 'enable_problem', class: 'btn btn-default'
+            +             = submit_tag 'True', :name => 'enable_problem', class: 'btn btn-primary btn-sm'
-            -             = submit_tag 'False', :name => 'disable_problem', class: 'btn btn-default'
+            +             = submit_tag 'False', :name => 'disable_problem', class: 'btn btn-primary btn-sm'
                         - if GraderConfiguration.multicontests?
                           %li
                             Add to
                             = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
-            -               = submit_tag 'Add', :name => 'add_to_contest', class: 'btn btn-default'
+            +               = submit_tag 'Add', :name => 'add_to_contest', class: 'btn btn-primary btn-sm'
                         %li
                           Add problems to group
                           = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
                         %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,
+            +     widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},
+            +
+            +   });
+            +

app/views/problems/stat.html.haml ¶ +8 -4

               %h2 Submissions
               - if @submissions and @submissions.count > 0
-            -   %table.info#main_table
+            +   %table#main_table.table.table-condensed.table-striped
                   %thead
-            -       %tr.info-head
+            +       %tr
                       %th ID
                       %th Login
                       %th Name
                     - @submissions.each do |sub|
                       - next unless sub.user
                       - row_odd,curr = !row_odd, sub.user if curr != sub.user
-            -         %tr{class: row_odd ? "info-odd" : "info-even"}
+            +         %tr
                         %td= link_to sub.id, submission_path(sub)
                         %td= link_to sub.user.login, stat_user_path(sub.user)
                         %td= sub.user.full_name
-            -           %td= time_ago_in_words(sub.submitted_at) + " ago"
+            +           %td{data: {order: sub.submitted_at}}= time_ago_in_words(sub.submitted_at) + " ago"
                         %td= sub.points
                         %td.fix-width= sub.grader_comment
                         %td= sub.ip_address
               - else
                 No submission
+            + :javascript
+            +   $("#main_table").DataTable({
+            +     paging: false
+            +   });

app/views/sites/edit.html.haml ¶ +29 -18

@@ -1,24 +1,35
1	%h1 Editing site	1	%h1 Editing site
2	= error_messages_for :site	2	= error_messages_for :site
3	= form_for(@site) do \|f\|	3	= form_for(@site) do \|f\|
4	- %p	4	+ .row
5	- %b Name	5	+ .col-md-4
6	- %br/	6	+ .form-group.field
7	- = f.text_field :name	7	+ = f.label :name, "Name"
8	- %p	8	+ = f.text_field :name, class: 'form-control'
9	- %b Password	9	+ .form-group.field
10	- %br/	10	+ = f.label :password, "Password"
11	- = f.text_field :password	11	+ = f.text_field :password, class: 'form-control'
12	- %p	12	+ .form-group.field
13	- %b Started	13	+ = f.label :started, "Started"
14	- %br/	14	+ = f.check_box :started, class: 'form-control'
15	- = f.check_box :started	15	+ .form-group.field
16	- %p	16	+ = f.label :start_time, "Start time"
17	- %b Start time	17	+ -# = f.datetime_select :start_time, :include_blank => true
18	- %br/	18	+ .input-group.date
19	- = f.datetime_select :start_time, :include_blank => true	19	+ = f.text_field :start_time, class:'form-control' , value: (@site.start_time ? @site.start_time.strftime('%d/%b/%Y %H:%M') : '')
20	- %p	20	+ %span.input-group-addon
21	- = f.submit "Update"	21	+ %span.glyphicon.glyphicon-calendar
		22	+ .actions
		23	+ = f.submit "Update", class: 'btn btn-primary'
		24	+ .col-md-8
		25	+
22	= link_to 'Show', @site	26	= link_to 'Show', @site
23	\|	27	\|
24	= link_to 'Back', sites_path	28	= link_to 'Back', sites_path
		29	+
		30	+
		31	+ :javascript
		32	+ $('.input-group.date').datetimepicker({
		33	+ format: 'DD/MMM/YYYY HH:mm',
		34	+ });
		35	+

app/views/user_admin/index.html.haml ¶ +16 -11

-            - %h1 Listing users
+            + %h1 Users
               .panel.panel-primary
                 .panel-title.panel-heading
               %p
                 = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
                 = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
+            +   = link_to 'Bulk Manage', bulk_manage_user_admin_path , { class: 'btn btn-default btn-info'}
                 = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default '}
-            -   = link_to 'Bulk Manage', bulk_manage_user_admin_path , { class: 'btn btn-default '}
                 = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default '}
                 = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default '}
                 = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default '}
                   = link_to "[#{contest.name}]", :action => 'contests', :id => contest.id
                 = link_to "[no contest]", :action => 'contests', :id => 'none'
-            - Total #{@user_count} users |
+            + -# Total #{@user_count} users |
-            - - if !@paginated
+            + -# - if !@paginated
-            -   Display all users.
+            + -#   Display all users.
-            -   \#{link_to '[show in pages]', :action => 'index', :page => '1'}
+            + -#   \#{link_to '[show in pages]', :action => 'index', :page => '1'}
-            - - else
+            + -# - else
-            -   Display in pages.
+            + -#   Display in pages.
-            -   \#{link_to '[display all]', :action => 'index', :page => 'all'} |
+            + -#   \#{link_to '[display all]', :action => 'index', :page => 'all'} |
-            -   \#{will_paginate @users, :container => false}
+            + -#   \#{will_paginate @users, :container => false}
-            - %table.table.table-hover.table-condense
+            + %table.table.table-hover.table-condense.datatable
                 %thead
                   %th Login
                   %th Full name
               %br/
               = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
               = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
+            +
+            + :javascript
+            +   $('.datatable').DataTable({
+            +     'pageLength': 50
+            +   });

app/views/users/stat.html.haml ¶ +5 -1

               =render partial: 'application/bar_graph', locals: {histogram: @histogram, param: {bar_width: 7}}
-            - %table.tablesorter-cafe#submission_table
+            + %table#submission_table.table.table-striped
                 %thead
                   %tr
                     %th ID
+            + :javascript
+            +   $("#submission_table").DataTable({
+            +     paging: false
+            +   });

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

r695:55afb135c5f9 - Thu, 02 Nov 2017 11:33:31 - 12 files changed: 117 inserted, 54 deleted

Sign in to your account

Commit r695:55afb135c5f9 public

Author

r695:55afb135c5f9 - Thu, 02 Nov 2017 11:33:31 - 12 files changed: 117 inserted, 54 deleted

Commit `r695:55afb135c5f9` public