cafe-grader-web Commit - r559:2e5e11be6cae

cafe-grader-web

Commit `r559:2e5e11be6cae` public

parent | child

Description:

* add forgotten toggle file * main/submission changed to bootstrap

Commit status:

[Not Reviewed]

References:

bootstrap

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r559:2e5e11be6cae - Tue, 28 Jun 2016 02:55:05 - 9 files changed: 91 inserted, 9 deleted

app/assets/javascripts/main.js.coffee created 644 ¶ +6

@@ -0,0 +1,6
	1	+ $ ->
	2	+ $("#submission_problem_go").on 'click', (event) ->
	3	+ url = $("#submission_problem_id").val()
	4	+ if (url)
	5	+ window.location = url
	6	+

app/views/problems/index.html.haml created 644 ¶ +46

@@ -0,0 +1,46
	1	+ - content_for :head do
	2	+ = stylesheet_link_tag 'problems'
	3	+ %h1 Listing problems
	4	+ %p
	5	+ = link_to 'New problem', new_problem_path, class: 'btn btn-default btn-sm'
	6	+ = link_to 'Manage problems', { action: 'manage'}, class: 'btn btn-default btn-sm'
	7	+ = link_to 'Import problems', {:action => 'import'}, class: 'btn btn-default btn-sm'
	8	+ = link_to 'Turn off all problems', {:action => 'turn_all_off'}, class: 'btn btn-default btn-sm'
	9	+ = link_to 'Turn on all problems', {:action => 'turn_all_on'}, class: 'btn btn-default btn-sm'
	10	+ .submitbox
	11	+ = form_tag :action => 'quick_create' do
	12	+ %b Quick New:
	13	+ %label{:for => "problem_name"} Name
	14	+ = text_field 'problem', 'name'
	15	+ \|
	16	+ %label{:for => "problem_full_name"} Full name
	17	+ = text_field 'problem', 'full_name'
	18	+ = submit_tag "Create"
	19	+ %table.table.table-condensed.table-hover
	20	+ %thead
	21	+ %th Name
	22	+ %th Full name
	23	+ %th Full score
	24	+ %th Date added
	25	+ %th Avail?
	26	+ %th Test?
	27	+ - if GraderConfiguration.multicontests?
	28	+ %th Contests
	29	+ - for problem in @problems
	30	+ %tr{:class => "#{(problem.available) ? "success" : "danger"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"}
	31	+ - @problem=problem
	32	+ %td= in_place_editor_field :problem, :name, {}, :rows=>1
	33	+ %td= in_place_editor_field :problem, :full_name, {}, :rows=>1
	34	+ %td= in_place_editor_field :problem, :full_score, {}, :rows=>1
	35	+ %td= problem.date_added
	36	+ %td{}= link_to (@problem.available? ? "Yes" : "No"), url_for(controller: :problems, action: :toggle, id: @problem), { class: "btn btn-block btn-sm btn-#{(@problem.available? ? 'success' : 'default')} ajax-toggle", id: "prob-#{@problem.id}-avail", data: {remote: true, method: 'post' } }
	37	+ %td= problem.test_allowed
	38	+ - if GraderConfiguration.multicontests?
	39	+ %td
	40	+ = problem.contests.collect { \|c\| c.name }.join(', ')
	41	+ %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-primary btn-sm'
	42	+ %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-primary btn-sm'
	43	+ %td= link_to 'Edit', {:action => 'edit', :id => problem}, class: 'btn btn-primary btn-sm'
	44	+ %td= link_to 'Destroy', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :post, class: 'btn btn-danger btn-sm'
	45	+ %br/
	46	+ = link_to '[New problem]', :action => 'new'

app/views/problems/toggle.js.haml created 644 ¶ +12

@@ -0,0 +1,12
	1	+ :plain
	2	+ b = $("#prob-#{@problem.id}-avail");
	3	+ b.removeClass('btn-default');
	4	+ b.removeClass('btn-success');
	5	+ b.removeClass('btn-warning');
	6	+ b.addClass("btn-#{@problem.available? ? 'success' : 'default'}");
	7	+ b.text("#{@problem.available? ? 'Yes' : 'No'}");
	8	+ r = $("#prob-#{@problem.id}");
	9	+ r.removeClass('success');
	10	+ r.removeClass('danger');
	11	+ r.addClass("#{@problem.available? ? 'success' : 'danger'}");
	12	+

app/assets/javascripts/announcements.js.coffee ¶ -1

               #js for announcement
               $ ->
                 $('.ajax-toggle').on 'click', (event) ->
-            -     console.log event.target.id
                   target = $(event.target)
                   target.removeClass 'btn-default'
                   target.removeClass 'btn-success'
                   target.addClass 'btn-warning'
                   target.text '...'
                   return
                 $(document).ajaxError (event, jqxhr, settings, exception) ->
                   if jqxhr.status
                     alert 'We\'re sorry, but something went wrong (' + jqxhr.status + ')'
                   return

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

                                 :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 submission
                   @user = User.find(session[:user_id])
                   @problems = @user.available_problems
                   if params[:id]==nil
                     @problem = nil
                     @submissions = nil
                   else
-            -       @problem = Problem.find_by_name(params[:id])
+            +       @problem = Problem.find_by_id(params[:id])
-            -       if not @problem.available
+            +       if (@problem == nil) or (not @problem.available)
                       redirect_to :action => 'list'
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
                     @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
                   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

app/helpers/application_helper.rb ¶ +12

                 def format_short_time(time)
                   now = Time.now.gmtime
                   st = ''
                   if (time.yday != now.yday) or
               	(time.year != now.year)
                     st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                 def format_short_duration(duration)
                   return '' if duration==nil
                   d = duration.to_f
                   return Time.at(d).gmtime.strftime("%X")
                 end
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
+            +   def problem_select(problems, options = {})
+            +     prefix = options[:with_specific_in_header] ? [[(t 'main.specified_in_header'),'-1']] : []
+            +     selected = options[:selected] || (options[:with_specific_in_header] ? -1 : nil)
+            +     puts "selected =  #{selected} hehe"
+            +     html_options = {class: 'select2 form-control'}
+            +     html_options[:id] = options[:id]if options[:id]
+            +     select 'submission',
+            +            'problem_id',  prefix + problems.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]},
+            +            (selected ? { selected: "#{selected}"} : {} ),
+            +            html_options
+            +   end
+            +
                 def user_title_bar(user)
                   header = ''
                   time_left = ''
                   #
                   # if the contest is over
                   if GraderConfiguration.time_limit_mode?
                     if user.contest_finished?
                       header = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
                     end
                     if !user.contest_started?
                       time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
                     else
                       time_left = "&nbsp;&nbsp;" + (t 'title_bar.remaining_time') +
                         " #{format_short_duration(user.contest_time_left)}"
                     end
                   end
                   #
                   # if the contest is in the anaysis mode

app/views/main/_submission_box.html.haml ¶ +1 -1

               = form_tag({:action => 'submit'}, :multipart => true, class: 'form-inline') do
                 - if @submission and @submission.errors.any?
                   #error_explanation
                     .alert.alert-danger
                       %h3= "#{pluralize(@submission.errors.count, "error")} prohibited this user from being saved:"
                       %ul
                         - @submission.errors.full_messages.each do |msg|
                           %li= msg
                 .form-group
                   = label_tag :submission, 'Problem:'
-            -     = select 'submission', 'problem_id', [[(t 'main.specified_in_header'),'-1']] + @problems.collect {|p| [p.full_name, p.id]}, {:selected => '-1'}, { class: 'select2 form-control' }
+            +     = select 'submission', 'problem_id', [[(t 'main.specified_in_header'),'-1']] + @problems.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]}, {:selected => '-1'}, { class: 'select2 form-control' }
                 .form-group
                   = label_tag :file, 'File:'
                   .input-group
                     %span.input-group-btn
                       %span.btn.btn-default.btn-file
                         Browse
                         = file_field_tag 'file'
                     = text_field_tag '' , nil, {readonly: true, class: 'form-control'}
                 = submit_tag 'Submit', class: 'btn btn-default'

app/views/main/submission.html.haml ¶ +11 -5

               = user_title_bar(@user)
-            - .task-menu
+            + .panel.panel-info
-            -   Task List
+            +   .panel-heading
-            -   %br/
+            +     Select Problems
-            -   - @problems.each do |problem|
+            +   .panel-body
-            -     = link_to problem.name, :action => 'submission', :id => problem.name
+            +     .form-inline
+            +       = select 'submission',
+            +         'problem_id',
+            +         @problems.collect {|p| ["[#{p.name}] #{p.full_name}", main_submission_url(p.id)]},
+            +         {:selected => '-1'},
+            +         { class: 'select2 form-control' }
+            +       %button.btn.btn-primary.btn-sm#submission_problem_go Go
               - if @problem!=nil
                 %h2= "Task: #{@problem.full_name} (#{@problem.name})"
               - if @submissions!=nil
                 - if @submissions.length>0
                   %table.info
                     %tr.info-head
                       %th.info No.
                       %th.info #
                       %th.info At
                       %th.info Source
                       %th.info Result
                       %th.info{:width => "300px"}
                         Compiler message
                     = render :partial => 'submission', :collection => @submissions
                 - else
                   No submission

config/routes.rb ¶ +1

               CafeGrader::Application.routes.draw do
                 root :to => 'main#login'
                 get "report/login"
                 resources :contests
                 resources :announcements
                 match 'announcements/toggle/:id' => 'announcements#toggle'
                 resources :sites
                 resources :problem
                 resources :grader_configuration, controller: 'configurations'
                 match 'tasks/view/:file.:ext' => 'tasks#view'
                 match 'tasks/download/:id/:file.:ext' => 'tasks#download'
                 match 'heartbeat/:id/edit' => 'heartbeat#edit'
                 #main
                 get "main/list"
+            +   get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
                 # See how all your routes lay out with "rake routes"
                 # This is a legacy wild controller route that's not recommended for RESTful applications.
                 # Note: This route will make all actions in every controller accessible via GET requests.
                 match ':controller(/:action(/:id))(.:format)'
               end

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

r559:2e5e11be6cae - Tue, 28 Jun 2016 02:55:05 - 9 files changed: 91 inserted, 9 deleted

Sign in to your account

Commit r559:2e5e11be6cae public

Author

r559:2e5e11be6cae - Tue, 28 Jun 2016 02:55:05 - 9 files changed: 91 inserted, 9 deleted

Commit `r559:2e5e11be6cae` public