cafe-grader-web Commit - r565:d9febe97b3f0

cafe-grader-web

Commit `r565:d9febe97b3f0` public

parent | child

Description:

- bootstrapize submission list - add live edit from submission

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

r565:d9febe97b3f0 - Sat, 02 Jul 2016 15:42:00 - 12 files changed: 89 inserted, 59 deleted

app/views/main/_problem.html.haml created 644 ¶ +11

@@ -0,0 +1,11
	1	+ %tr
	2	+ %td
	3	+ = "#{problem.name}"
	4	+ %td
	5	+ = "#{problem.full_name}"
	6	+ = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem
	7	+ %td{:align => "center"}
	8	+ = @prob_submissions[problem.id][:count]
	9	+ %td
	10	+ = render :partial => 'submission_short',
	11	+ :locals => {:submission => @prob_submissions[problem.id][:submission], :problem_name => problem.name }

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

               // This is a manifest file that'll be compiled into application.js, which will include all the files
               // listed below.
               //
               // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
               // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
               //
               // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
               // the compiled file.
               //
               // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
               // GO AFTER THE REQUIRES BELOW.
               //
               //= require jquery
               //= require jquery_ujs
               //= require jquery.ui.all
               //= require bootstrap-sprockets
               //x= require bootstrap-switch
               //= require bootstrap-toggle
               //= require select2
               //= require custom
               //= require ace-rails-ap
+            + //= require ace/mode-c_cpp
+            + //= require ace/mode-ruby
+            + //= require ace/mode-pascal
+            + //= require ace/mode-javascript
+            + //= require ace/mode-java
+            + //= require ace/theme-merbivore
               // since this is after blank line, it is not downloaded
               //x= require prototype
               //x= require prototype_ujs
               //x= require effects
               //x= require dragdrop
               //x= require controls

app/assets/javascripts/custom.js.coffee ¶ +1 -1

                 $('.btn-file :file').on 'fileselect', (event, numFiles, label) ->
                   input = $(this).parents('.input-group').find(':text')
                   log = if numFiles > 1 then numFiles + ' files selected' else label
                   if input.length
                     input.val log
                   else
                     if log
                       alert log
                   return
                 $(".go-button").on 'click', (event) ->
                   link = $(this).attr("data-source")
                   url = $(link).val()
                   if url
                     window.location.href = url
                   return
                 $('.ajax-toggle').on 'click', (event) ->
                   target = $(event.target)
                   target.removeClass 'btn-default'
                   target.removeClass 'btn-success'
                   target.addClass 'btn-warning'
                   target.text '...'
                   return
                 editor = ace.edit("editor")
-            -   editor.setTheme("ace/theme/monokai")
+            +   editor.setTheme("ace/theme/merbivore")
                 editor.getSession().setMode("ace/mode/javascript")
                 return

app/assets/javascripts/sources.js.coffee ¶ +22

@@ -1,10 +1,32
1	# Place all the behaviors and hooks related to the matching controller here.	1	# Place all the behaviors and hooks related to the matching controller here.
2	# All this logic will automatically be available in application.js.	2	# All this logic will automatically be available in application.js.
3	# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/	3	# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
4		4
5		5
6	$ ->	6	$ ->
7	$("#live_submit").on "click", (event) ->	7	$("#live_submit").on "click", (event) ->
8	h = $("#editor_text")	8	h = $("#editor_text")
9	e = ace.edit("editor")	9	e = ace.edit("editor")
10	h.val(e.getValue())	10	h.val(e.getValue())
		11	+
		12	+ $("#language_id").on "change", (event) ->
		13	+ text = $("#language_id option:selected").text()
		14	+ mode = 'ace/mode/c_cpp'
		15	+ switch text
		16	+ when 'Pascal' then mode = 'ace/mode/pascal'
		17	+ when 'C++','C' then mode = 'ace/mode/c_cpp'
		18	+ when 'Ruby' then mode = 'ace/mode/ruby'
		19	+ when 'Python' then mode = 'ace/mode/python'
		20	+ when 'Java' then mode = 'ace/mode/java'
		21	+ editor = ace.edit('editor')
		22	+ editor.getSession().setMode(mode)
		23	+
		24	+ e = ace.edit("editor")
		25	+ e.setValue($("#text_haha").val())
		26	+ e.gotoLine(1)
		27	+ $("#language_id").trigger('change')
		28	+
		29	+
		30	+
		31	+
		32	+ return

app/controllers/sources_controller.rb ¶ +12 -2

@@ -1,7 +1,17
1	class SourcesController < ApplicationController	1	class SourcesController < ApplicationController
2	- before_filter :authenticate, ~~:except~~ => [~~:index~~, ~~:login~~]	2	+ before_filter :authenticate
3		3
4	def direct_edit	4	def direct_edit
5	- @problem = Problem.find~~_by_id~~(params[:pid])	5	+ @problem = Problem.find(params[:pid])
		6	+ @source = ''
6	end	7	end
		8	+
		9	+ def direct_edit_submission
		10	+ @submission = Submission.find(params[:sid])
		11	+ @source = @submission.source.to_s
		12	+ @problem = @submission.problem
		13	+ @lang_id = @submission.language.id
		14	+ render 'direct_edit'
7	end	15	end
		16	+
		17	+ end

app/views/main/_submission.html.haml ¶ +9 -7

-            - %tr{:class => ((submission_counter%2==0) ? "info-even" : "info-odd")}
+            + %tr
-            -   %td.info{:align => "center"}
+            +   %td{:align => "center"}
                   = submission_counter+1
-            -   %td.info{:align => "center"}
+            +   %td{:align => "center"}
                   = link_to "##{submission.id}", controller: :graders, action: :submission, id: submission.id
-            -   %td.info
+            +   %td
                   = l submission.submitted_at, format: :long
                   = "( #{time_ago_in_words(submission.submitted_at)} ago)"
-            -   %td.info{:align => "center"}
+            +   %td
                   = submission.source_filename
                   = " (#{submission.language.pretty_name}) "
                   = link_to('[load]',{:action => 'source', :id => submission.id})
-            -   %td.info
+            +   %td
                   - if submission.graded_at!=nil
                     = "Graded at #{format_short_time(submission.graded_at)}."
                     %br/
                     = "Score: #{(submission.points*100/submission.problem.full_score).to_i} " if GraderConfiguration['ui.show_score']
                     = " ["
                     %tt
                       = submission.grader_comment
                     = "]"
-            -   %td.info
+            +   %td
                   = render :partial => 'compiler_message', :locals => {:compiler_message => submission.compiler_message }
+            +   %td
+            +     = link_to 'Edit', direct_edit_submission_path(submission.id), class: 'btn btn-success'

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

               - if submission==nil
                 = "-"
               - else
                 - if submission.graded_at==nil
                   =t 'main.submitted_at'
                   = format_short_time(submission.submitted_at.localtime)
                 - else
                   = t 'main.graded_at'
                   = "#{format_short_time(submission.graded_at.localtime)}, "
                   - if GraderConfiguration['ui.show_score']
                     = t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   - if GraderConfiguration.show_grading_result
                     = " | "
                     = link_to '[detailed result]', :action => 'result', :id => submission.id
                   = " | "
                   = link_to("[#{t 'main.cmp_msg'}]", {:action => 'compiler_msg', :id => submission.id}, {:popup => true})
                 = " | "
                 = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id})
                 = " | "
-            -   = link_to "[#{t 'main.submissions_link'}]", :action => 'submission', :id => submission.problem.id
+            +   = link_to "[#{t 'main.submissions_link'}]", main_submission_path(submission.problem.id)

app/views/main/list.html.haml ¶ +2 -5

               = user_title_bar(@user)
               .announcementbox{:style => (@announcements.length==0 ? "display:none" : "")}
                 %span{:class => 'title'}
                   Announcements
                 #announcementbox-body
                   = render :partial => 'announcement', :collection => @announcements
               - if GraderConfiguration.show_submitbox_to?(@user)
                 .submitbox
                   = render :partial => 'submission_box'
               %hr/
               - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               - if GraderConfiguration.show_tasks_to?(@user)
                 - if not GraderConfiguration.multicontests?
                   %table.table.table-striped.table-condensed
                     %thead
                       %tr.info-head
-            -           %th #
+            +           %th Task name
-            -           %th Tasks name
                         %th Full name
                         %th # of sub(s)
                         %th Results
                     %tbody
                       = render :partial => 'problem', :collection => @problems
                 - else
                   - @contest_problems.each do |cp|
                     - if cp[:problems].length > 0
                       %h2{:class =>'contest-title'}
                         = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
                       %table.info
                         %tr.info-head
-            -             %th
+            +             %th Task name
-            -             %th Tasks name
                           %th Full name
                           %th # of sub(s)
                           %th Results
                         = render :partial => 'problem', :collection => cp[:problems]
               %hr/
               %script{:type => 'text/javascript'}
                 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
                 Announcement.registerRefreshEventTimer();

app/views/main/submission.html.haml ¶ +9 -9

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

app/views/sources/direct_edit.html.haml ¶ +15 -13

@@ -1,21 +1,23
1	- %h1 Live submit	1	+ %h2 Live submit
2	- = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form-inline') do	2	+ %br
3	- = hidden_field_tag 'editor_text'	3	+
		4	+ %textarea#text_haha{style: "display:none"}~ @source
		5	+ .container
		6	+ .row
		7	+ .col-md-7
		8	+ %div#editor{style: 'height: 500px; border-radius: 7px; font-size: 14px;'}
		9	+ .col-md-5
		10	+ = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form') do
		11	+
		12	+ = hidden_field_tag 'editor_text', @source
4	= hidden_field_tag 'submission[problem_id]', @problem.id	13	= hidden_field_tag 'submission[problem_id]', @problem.id
5	.form-group	14	.form-group
6	= label_tag "Task:"	15	= label_tag "Task:"
7	= text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true	16	= text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true
8		17
9	.form-group	18	.form-group
10	= label_tag 'Language'	19	= label_tag 'Language'
11	- = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name',~~"C++"~~), class: 'form-control', style: "width: 100px"	20	+ = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name', @lang_id \|\| Language.first.id), class: 'form-control select', style: "width: 100px"
12	.form-group	21	.form-group
13	- = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit'	22	+ = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit',
14	-	23	+ data: {confirm: "Submitting this source code for task #{@problem.long_name}?"}
15	- %br
16	-
17	- .container
18	- .row
19	- .col-md-12
20	- %div#editor{style: 'height: 400px'}
21	- Hahaha

config/routes.rb ¶ +1

                   member do
                     get 'toggle'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                   end
                 end
                 resources :grader_configuration, controller: 'configurations'
                 resources :users do
                   member do
                     get 'toggle_activate', 'toggle_enable'
                   end
                 end
                 #resources :sources do
                 #  collection do
                 #  end
                 #end
                 get 'sources/direct_edit/:pid', to: 'sources#direct_edit', as: 'direct_edit'
+            +   get 'sources/direct_edit_submission/:sid', to: 'sources#direct_edit_submission', as: 'direct_edit_submission'
                 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'
                 #report
                 get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
                 get "report/login"
                 # 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

app/views/main/_problem.html.erb removed ¶ -21

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

r565:d9febe97b3f0 - Sat, 02 Jul 2016 15:42:00 - 12 files changed: 89 inserted, 59 deleted

Sign in to your account

Commit r565:d9febe97b3f0 public

Author

r565:d9febe97b3f0 - Sat, 02 Jul 2016 15:42:00 - 12 files changed: 89 inserted, 59 deleted

Commit `r565:d9febe97b3f0` public