cafe-grader-web Commit - r722:83f5b778c08b

cafe-grader-web

Commit `r722:83f5b778c08b` public

parent | child

Description:

update master

Commit status:

[Not Reviewed]

References:

merge default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r722:83f5b778c08b - Tue, 01 May 2018 10:42:34 - 2 files changed: 30 inserted, 2 deleted

app/controllers/users_controller.rb ¶ +3

               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]
+            +   before_filter :admin_authorization, only: [:stat, :toggle_activate, :toggle_enable]
+            +
+            +
                 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
                   redirect_to :action => 'index'
                 end
                 def new
                   @user = User.new
                   render :action => 'new', :layout => 'empty'
                 end
                 def register
                   if(params[:cancel])
                     redirect_to :controller => 'main', :action => 'login'
                     return
                   end
                   @user = User.new(user_params)
                   @user.password_confirmation = @user.password = User.random_password
                   @user.activated = false
                   if (@user.valid?) and (@user.save)
                     if send_confirmation_email(@user)
                       render :action => 'new_splash', :layout => 'empty'
                     else
                       @admin_email = GraderConfiguration['system.admin_email']
                       render :action => 'email_error', :layout => 'empty'
                     end
                   else
                     @user.errors.add(:base,"Email cannot be blank") if @user.email==''
                     render :action => 'new', :layout => 'empty'
                   end
                 end
                 def confirm
                   login = params[:login]
                   key = params[:activation]
                   @user = User.find_by_login(login)
                   if (@user) and (@user.verify_activation_key(key))
                     if @user.valid?  # check uniquenss of email
                       @user.activated = true
                       @user.save
                       @result = :successful
                     else
                       @result = :email_used
                     end
                   else
                     @result = :failed
                   end
                   render :action => 'confirm', :layout => 'empty'
                 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 stat
                   @user = User.find(params[:id])
                   @submission = Submission.joins(:problem).where(user_id: params[:id])

app/views/submissions/edit.html.haml ¶ +27 -2

               %h2 Live submit
               %br
               %textarea#text_sourcecode{style: "display:none"}~ @source
               .container
                 .row
                   .col-md-12
                     .alert.alert-info
                       Write your code in the following box, choose language, and click submit button when finished
                 .row
                   .col-md-8
                     %div#editor{style: 'height: 500px; border-radius: 7px; font-size: 14px;'}
                   .col-md-4
                     - # submission form
                     = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form') do
                       = hidden_field_tag 'editor_text', @source
                       = hidden_field_tag 'submission[problem_id]', @problem.id
                       .form-group
                         = label_tag "Task:"
                         = text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true
+            +         .form-group
+            +           = label_tag "Description:"
+            +           = link_to_description_if_any "[download] <span class='glyphicon glyphicon-file'></span>".html_safe, @problem
                       .form-group
-            -           = label_tag 'Language'
+            +           = label_tag 'Language:'
                         = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name', @lang_id || Language.find_by_pretty_name("Python").id || Language.first.id), class: 'form-control select', style: "width: 100px"
                       .form-group
+            +           .input-group
+            +             %span.input-group-btn
+            +               %span.btn.btn-default.btn-file
+            +                 Browse
+            +                 = file_field_tag 'load_file'
+            +             = text_field_tag '' , nil, {readonly: true, class: 'form-control'}
+            +         .form-group
                         = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit',
                           data: {confirm: "Submitting this source code for task #{@problem.long_name}?"}
                     - # latest submission status
                     .panel{class: (@submission && @submission.graded_at) ? "panel-info" : "panel-warning"}
                       .panel-heading
                         Latest Submission Status
                         = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true if @submission
                       .panel-body
                         %div#latest_status
                           - if @submission
                             = render :partial => 'submission_short',
                               :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id }
                 .row
                   .col-md-12
                     %h2 Console
                     %textarea#console{style: 'height: 100%; width: 100%;background-color:#000;color:#fff;font-family: consolas, monaco, "Droid Sans Mono";',rows: 20}
               :javascript
                 $(document).ready(function() {
                   e = ace.edit("editor")
                   e.setValue($("#text_sourcecode").val());
                   e.gotoLine(1);
                   $("#language_id").trigger('change');
-            -     brython();
+            +     $("#load_file").on('change',function(evt) {
+            +       var file = evt.target.files[0];
+            +       var reader = new FileReader();
+            +       reader.onload =  function(theFile) {
+            +         var e = ace.edit("editor")
+            +         e.setValue(theFile.target.result);
+            +         e.gotoLine(1);
+            +       };
+            +       reader.readAsText(file)
                   });
+            +     //brython();
+            +   });
+            +
+            +
+            +
+            +
               %script#__main__{type:'text/python3'}
                 :plain
                   import sys
                   import traceback
                   from browser import document as doc
                   from browser import window, alert, console
                   _credits = """    Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
                       for supporting Python development.  See www.python.org for more information."""
                   _copyright = """Copyright (c) 2012, Pierre Quentel pierre.quentel@gmail.com
                   All Rights Reserved.
                   Copyright (c) 2001-2013 Python Software Foundation.
                   All Rights Reserved.
                   Copyright (c) 2000 BeOpen.com.
                   All Rights Reserved.
                   Copyright (c) 1995-2001 Corporation for National Research Initiatives.
                   All Rights Reserved.
                   Copyright (c) 1991-1995 Stichting Mathematisch Centrum, Amsterdam.
                   All Rights Reserved."""
                   _license = """Copyright (c) 2012, Pierre Quentel pierre.quentel@gmail.com
                   All rights reserved.
                   Redistribution and use in source and binary forms, with or without
                   modification, are permitted provided that the following conditions are met:
                   Redistributions of source code must retain the above copyright notice, this
                   list of conditions and the following disclaimer. Redistributions in binary
                   form must reproduce the above copyright notice, this list of conditions and
                   the following disclaimer in the documentation and/or other materials provided
                   with the distribution.
                   Neither the name of the <ORGANIZATION> nor the names of its contributors may
                   be used to endorse or promote products derived from this software without
                   specific prior written permission.
                   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
                   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
                   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
                   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
                   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
                   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
                   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
                   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
                   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
                   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
                   POSSIBILITY OF SUCH DAMAGE.
                   """
                   def credits():
                       print(_credits)
                   credits.__repr__ = lambda:_credits
                   def copyright():
                       print(_copyright)
                   copyright.__repr__ = lambda:_copyright
                   def license():
                       print(_license)
                   license.__repr__ = lambda:_license
                   def write(data):
                       doc['console'].value += str(data)
                   sys.stdout.write = sys.stderr.write = write
                   history = []
                   current = 0
                   _status = "main"  # or "block" if typing inside a block
                   # execution namespace
                   editor_ns = {'credits':credits,
                       'copyright':copyright,
                       'license':license,
                       '__name__':'__main__'}
                   def cursorToEnd(*args):
                       pos = len(doc['console'].value)
                       doc['console'].setSelectionRange(pos, pos)
                       doc['console'].scrollTop = doc['console'].scrollHeight
                   def get_col(area):
                       # returns the column num of cursor
                       sel = doc['console'].selectionStart
                       lines = doc['console'].value.split('\n')
                       for line in lines[:-1]:
                           sel -= len(line) + 1
                       return sel

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

r722:83f5b778c08b - Tue, 01 May 2018 10:42:34 - 2 files changed: 30 inserted, 2 deleted

Sign in to your account

Commit r722:83f5b778c08b public

Author

r722:83f5b778c08b - Tue, 01 May 2018 10:42:34 - 2 files changed: 30 inserted, 2 deleted

Commit `r722:83f5b778c08b` public