cafe-grader-web Commit - r456:2cbe975cbc59

r456:2cbe975cbc59 - Tue, 23 Sep 2014 11:31:59 - 11 files changed: 67 inserted, 63 deleted

app/assets/javascripts/local_jquery.js ⬅ ~~app/assets/javascripts/new.js~~ renamed ¶

file renamed from app/assets/javascripts/new.js to app/assets/javascripts/local_jquery.js

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

                   @user = User.find(session[:user_id])
                   @messages = Message.find_all_sent_by_user(@user)
                 end
+            -
+            +
                 def console
                   @user = User.find(session[:user_id])
                   @messages = Message.find_all_system_unreplied_messages

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

                 def do_manage
                   if params.has_key? 'change_date_added'
                     change_date_added
-            -     else params.has_key? 'add_to_contest'
+            +     elsif params.has_key? 'add_to_contest'
                     add_to_contest
+            +     elsif params.has_key? 'enable_problem'
+            +       set_available(true)
+            +     elsif params.has_key? 'disable_problem'
+            +       set_available(false)
                   end
                   redirect_to :action => 'manage'
                 end
                   end
                 end
+            +   def set_available(avail)
+            +     problems = get_problems_from_params
+            +     problems.each do |p|
+            +       p.available = avail
+            +       p.save
+            +     end
+            +   end
+            +
                 def get_problems_from_params
                   problems = []
                   params.keys.each do |k|
                     if k.index('prob-')==0
-            -         name, id = k.split('-')
+            +         name, id, order = k.split('-')
                       problems << Problem.find(id)
                     end
                   end

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

                   Message.build_replying_message_hierarchy messages, replied_messages
                   return messages
                 end
+            -
+            +
                 def self.find_all_system_unreplied_messages
                   self.find(:all,
                             :conditions => 'ISNULL(receiver_id) ' +

app/views/problems/manage.html.haml ¶ +46 -4

               - content_for :head do
                 = stylesheet_link_tag 'problems'
+            +   = javascript_include_tag 'local_jquery'
+            +
+            + :javascript
+            +   $(document).ready( function() {
+            +     function shiftclick(start,stop,value) {
+            +       $('tr input').each( function(id,input) {
+            +         var $input=$(input);
+            +         var iid=parseInt($input.attr('id').split('-')[2]);
+            +         if(iid>=start&&iid<=stop){
+            +         $input.prop('checked',value)
+            +         }
+            +       });
+            +     }
+            +
+            +     $('tr input').click( function(e)  {
+            +       if (e.shiftKey) {
+            +         stop = parseInt($(this).attr('id').split('-')[2]);
+            +         var orig_stop = stop
+            +         if (typeof start !== 'undefined') {
+            +           if (start > stop) {
+            +             var tmp = start;
+            +             start = stop;
+            +             stop = tmp;
+            +           }
+            +           shiftclick(start,stop,$(this).is(':checked') )
+            +         }
+            +         start = orig_stop
+            +       } else {
+            +         start = parseInt($(this).attr('id').split('-')[2]);
+            +       }
+            +     });
+            +   });
+            +
               %h1 Manage problems
               = form_tag :action=>'do_manage' do
                 .submitbox
-            -     What do you want to do?
+            +     What do you want to do to the selected problem?
                   %br/
+            +     (You can shift-click to select a range of problems)
                   %ul
                     %li
                       Change date added to
                       = select_date Date.current, :prefix => 'date_added'
                       &nbsp;&nbsp;&nbsp;
                       = submit_tag 'Change', :name => 'change_date_added'
+            +       %li
+            +         Set available to
+            +         = submit_tag 'True', :name => 'enable_problem'
+            +         = submit_tag 'False', :name => 'disable_problem'
                     - if GraderConfiguration.multicontests?
                       %li
                         = submit_tag 'Add', :name => 'add_to_contest'
                 %table
-            -     %tr
-            -       %th/
+            +     %tr{style: "text-align: left;"}
+            +       %th= check_box_tag 'select_all'
                     %th Name
                     %th Full name
+            +       %th Available
                     %th Date added
                     - if GraderConfiguration.multicontests?
                       %th Contests
+            +     - num = 0
                   - for problem in @problems
+            +       - num += 1
                     %tr{:id => "row-prob-#{problem.id}", :name=> "prob-#{problem.id}"}
-            -         %td= check_box_tag "prob-#{problem.id}"
+            +         %td= check_box_tag "prob-#{problem.id}-#{num}"
                       %td= problem.name
                       %td= problem.full_name
+            +         %td= problem.available
                       %td= problem.date_added
                       - if GraderConfiguration.multicontests?
                         %td

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

               - content_for :header do
                 = stylesheet_link_tag 'tablesorter-theme.cafe'
-            -   = javascript_include_tag 'new'
+            +   = javascript_include_tag 'local_jquery'
               %script{:type=>"text/javascript"}
                 $(function () {

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

               - content_for :header do
-            -   = javascript_include_tag 'new'
+            +   = javascript_include_tag 'local_jquery'
               %script{:type=>"text/javascript"}
                 $(function () {

app/views/user_admin/user_stat.html.haml ¶ +1 -1

               - content_for :header do
-            -   = javascript_include_tag 'new'
+            +   = javascript_include_tag 'local_jquery'
                 = stylesheet_link_tag 'tablesorter-theme.cafe'
               %script{:type=>"text/javascript"}

app/views/users/profile.html.haml ¶ +1 -1

               - content_for :header do
-            -   = javascript_include_tag 'new'
+            +   = javascript_include_tag 'local_jquery'
               %script{:type=>"text/javascript"}
                 $(function () {

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

                   config.assets.version = '1.0'
                   config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js','graders.css','problems.css']
-            -     config.assets.precompile += ['new.js','tablesorter-theme.cafe.css']
+            +     config.assets.precompile += ['local_jquery.js','tablesorter-theme.cafe.css']
                 end
               end

app/views/user_admin/user_stat_max.html.haml removed ¶ -50

deleted file

	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

r456:2cbe975cbc59 - Tue, 23 Sep 2014 11:31:59 - 11 files changed: 67 inserted, 63 deleted

Sign in to your account

Commit r456:2cbe975cbc59 public

Author

r456:2cbe975cbc59 - Tue, 23 Sep 2014 11:31:59 - 11 files changed: 67 inserted, 63 deleted

Commit `r456:2cbe975cbc59` public