cafe-grader-web Commit - r650:72b80e42fb9b

cafe-grader-web

Commit `r650:72b80e42fb9b` public

parent | child

Description:

- bootstrapize problem/edit - bootstrapize announcement/edit

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r650:72b80e42fb9b - Tue, 16 May 2017 06:40:14 - 5 files changed: 5 inserted, 116 deleted

app/controllers/main_controller.rb ¶ +3 -3

                   # if GraderConfiguration['system.single_user_mode'] and
                   #     request.path!='/main/login'
                   #   @hidelogin = true
                   # end
                   @announcements = Announcement.frontpage
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
                   prepare_list_information
                 end
                 def help
                   @user = User.find(session[:user_id])
                 end
                 def submit
                   user = User.find(session[:user_id])
                   @submission = Submission.new
                   @submission.problem_id = params[:submission][:problem_id]
                   @submission.user = user
                   @submission.language_id = 0
                   if (params['file']) and (params['file']!='')
                     @submission.source = File.open(params['file'].path,'r:UTF-8',&:read)
                     @submission.source.encode!('UTF-8','UTF-8',invalid: :replace, replace: '')
                     @submission.source_filename = params['file'].original_filename
                   end
                   if (params[:editor_text])
                     language = Language.find_by_id(params[:language_id])
                     @submission.source = params[:editor_text]
                     @submission.source_filename = "live_edit.#{language.ext}"
                     @submission.language = language
                   end
                   @submission.submitted_at = Time.new.gmtime
                   @submission.ip_address = request.remote_ip
                   if GraderConfiguration.time_limit_mode? and user.contest_finished?
                     @submission.errors.add(:base,"The contest is over.")
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?
                     if @submission.save == false
-            - 	flash[:notice] = 'Error saving your submission'
+            +         flash[:notice] = 'Error saving your submission'
                     elsif Task.create(:submission_id => @submission.id,
                                       :status => Task::STATUS_INQUEUE) == false
-            - 	flash[:notice] = 'Error adding your submission to task queue'
+            +         flash[:notice] = 'Error adding your submission to task queue'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   redirect_to :action => 'list'
                 end
                 def source
                   submission = Submission.find(params[:id])
                   if ((submission.user_id == session[:user_id]) and
                       (submission.problem != nil) and
                       (submission.problem.available))
                     send_data(submission.source,
-            - 		{:filename => submission.download_filename,
+            +                 {:filename => submission.download_filename,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def result
                   if !GraderConfiguration.show_grading_result
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   prepare_grading_result(@submission)
                 end
                 def load_output
                   if !GraderConfiguration.show_grading_result or params[:num]==nil
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   case_num = params[:num].to_i
                   out_filename = output_filename(@user.login,
                                                  @submission.problem.name,
                                                  @submission.id,
                                                  case_num)
                   if !FileTest.exists?(out_filename)
                     flash[:notice] = 'Output not found.'
                     redirect_to :action => 'list' and return

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

               %h2 Live submit
               %br
-            - %textarea#text_haha{style: "display:none"}~ @source
+            + %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
                     = 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 '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
                         = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit',
                           data: {confirm: "Submitting this source code for task #{@problem.long_name}?"}
                     .panel.panel-info
                       .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
                         - 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_haha").val());
+            +     e.setValue($("#text_sourcecode").val());
                   e.gotoLine(1);
                   $("#language_id").trigger('change');
                   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"

app/views/announcements/edit.html.erb removed ¶ -47

deleted file

app/views/problems/_form.html.erb removed ¶ -55

deleted file

app/views/problems/edit.html.erb removed ¶ -9

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

r650:72b80e42fb9b - Tue, 16 May 2017 06:40:14 - 5 files changed: 5 inserted, 116 deleted

Sign in to your account

Commit r650:72b80e42fb9b public

Author

r650:72b80e42fb9b - Tue, 16 May 2017 06:40:14 - 5 files changed: 5 inserted, 116 deleted

Commit `r650:72b80e42fb9b` public