cafe-grader-web Commit - r566:46de378c3b60

cafe-grader-web

Commit `r566:46de378c3b60` public

parent | child

Description:

use ace editor for submission viewing

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

r566:46de378c3b60 - Sun, 03 Jul 2016 02:28:41 - 3 files changed: 97 inserted, 53 deleted

app/assets/javascripts/custom.js.coffee ¶ +5 -3

               $(document).on 'change', '.btn-file :file', ->
                 input = $(this)
                 numFiles = if input.get(0).files then input.get(0).files.length else 1
                 label = input.val().replace(/\\/g, '/').replace(/.*\//, '')
                 input.trigger 'fileselect', [
                   numFiles
                   label
                 ]
                 return
               # document ready
               $ ->
                 $(".select2").select2()
                 #$(".bootstrap-switch").bootstrapSwitch()
                 $(".bootstrap-toggle").bootstrapToggle()
                 $('.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")
+            +   #ace editor
-            -   editor.setTheme("ace/theme/merbivore")
+            +   e = ace.edit("editor")
-            -   editor.getSession().setMode("ace/mode/javascript")
+            +   e.setTheme('ace/theme/merbivore')
+            +   e.getSession().setTabSize(2)
+            +   e.getSession().setUseSoftTabs(true)
                 return

app/helpers/application_helper.rb ¶ +19

                   if GraderConfiguration['system.user_setting_enabled']
                     append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login'
                   menu_items.html_safe
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
                 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 toggle_button(on,toggle_url,id, option={})
                   btn_size = option[:size] || 'btn-xs'
                   link_to (on ? "Yes" : "No"), toggle_url,
                     {class: "btn btn-block #{btn_size} btn-#{on ? 'success' : 'default'} ajax-toggle",
                       id: id,
                       data: {remote: true, method: 'get'}}
                 end
+            +   def get_ace_mode(language)
+            +     # return ace mode string from Language
+            +
+            +     case language.pretty_name
+            +       when 'Pascal'
+            +         'ace/mode/pascal'
+            +       when 'C++','C'
+            +         'ace/mode/c_cpp'
+            +       when 'Ruby'
+            +         'ace/mode/ruby'
+            +       when 'Python'
+            +         'ace/mode/python'
+            +       when 'Java'
+            +         'ace/mode/java'
+            +       else
+            +         'ace/mode/c_cpp'
+            +     end
+            +   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
                   if GraderConfiguration.analysis_mode?
                     header = <<ANALYSISMODE
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">ANALYSIS MODE</span>
               </td></tr>
               ANALYSISMODE
                   end
                   contest_name = GraderConfiguration['contest.name']
                   #
                   # build real title bar
                   result = <<TITLEBAR
               <div class="title">
               <table>
               #{header}
               <tr>
               <td class="left-col">
               #{user.full_name}<br/>
               #{t 'title_bar.current_time'} #{format_short_time(Time.zone.now)}
               #{time_left}
               <br/>
               </td>
               <td class="right-col">#{contest_name}</td>

app/views/graders/submission.html.haml ¶ +73 -50

@@ -1,67 +1,90
1	- %style{type: "text/css"}	1	+ //%style{type: "text/css"}
2	- = ~~@css_style~~	2	+ // = @css_style
3	- :css
4	- .field {
5	- font-weight: bold;
6	- text-align: right;
7	- padding: 3px;
8	- }
9	-
10		3
11	%h1= "Submission: #{@submission.id}"	4	%h1= "Submission: #{@submission.id}"
12		5
13	-	6	+ %textarea#data{style: "display:none;"}
14	- %h2 Stat	7	+ :preserve
		8	+ #{@submission.source}
15		9
16	- %table.info	10	+ //%div.highlight{:style => "border: 1px solid black;"}
17	- %thead	11	+ //=@formatted_code.html_safe
18	- %tr.info-head	12	+ .containter
19	- %th Field	13	+ .row
20	- %th Value	14	+ .col-md-7
21	- %tbody	15	+ %h2 Source Code
22	- %tr{class: cycle('info-even','info-odd')}	16	+ .col-md-5
23	- %td.field User:	17	+ %h2 Stat
24	- %td.value	18	+ .row
		19	+ .col-md-7
		20	+ %div#editor{ style: "font-size: 14px; height: 400px; border-radius:5px;" }
		21	+ :javascript
		22	+ e = ace.edit("editor")
		23	+ e.setOptions({ maxLines: Infinity })
		24	+ e.setValue($("#data").text())
		25	+ e.gotoLine(1)
		26	+ e.getSession().setMode("#{get_ace_mode(@submission.language)}")
		27	+ e.setReadOnly(true)
		28	+ .col-md-5
		29	+ %table.table.table-striped
		30	+ %tr
		31	+ %td.text-right
		32	+ %strong User
		33	+ %td
25	- if @submission.user	34	- if @submission.user
26	= link_to "(#{@submission.user.login})", controller: "users", action: "profile", id: @submission.user	35	= link_to "(#{@submission.user.login})", controller: "users", action: "profile", id: @submission.user
27	= @submission.user.full_name	36	= @submission.user.full_name
28	- else	37	- else
29	= "(n/a)"	38	= "(n/a)"
30	- %tr{class: cycle('info-even','info-odd')}	39	+ %tr
31	- %td.field Problem:	40	+ %td.text-right
32	- %td.value	41	+ %strong Task
		42	+ %td
33	- if @submission.problem!=nil	43	- if @submission.problem!=nil
34	= link_to "(#{@submission.problem.name})", controller: "problems", action: "stat", id: @submission.problem	44	= link_to "(#{@submission.problem.name})", controller: "problems", action: "stat", id: @submission.problem
35	= @submission.problem.full_name	45	= @submission.problem.full_name
36	- else	46	- else
37	= "(n/a)"	47	= "(n/a)"
38	- %tr{class: cycle('info-even','info-odd')}	48	+ %tr
39	- %td.field Tries:	49	+ %td.text-right
40	- %td.value= @submission.number	50	+ %strong Tries
41	- %tr{class: cycle('info-even','info-odd')}	51	+ %td= @submission.number
42	- %td.field Submitted:	52	+ %tr
43	- %td.value #{time_ago_in_words(@submission.submitted_at)} ago (at #{@submission.submitted_at.to_formatted_s(:long)})	53	+ %td.text-right
44	- %tr{class: cycle('info-even','info-odd')}	54	+ %strong Language
45	- %td.field Graded:	55	+ %td= @submission.language.pretty_name
46	- %td.value #{time_ago_in_words(@submission.graded_at)} ago (at #{@submission.graded_at.to_formatted_s(:long)})	56	+ %tr
47	- %tr{class: cycle('info-even','info-odd')}	57	+ %td.text-right
48	- %td.field Points:	58	+ %strong Submitted
49	- %td.value #{@submission.points}/#{@submission.problem.full_score}	59	+ %td #{time_ago_in_words(@submission.submitted_at)} ago (at #{@submission.submitted_at.to_formatted_s(:long)})
50	- %tr{class: cycle('info-even','info-odd')}	60	+ %tr
51	- %td.field Comment:	61	+ %td.text-right
52	- %td.value #{@submission.grader_comment}	62	+ %strong Graded
53	- %tr{class: cycle('info-even','info-odd')}	63	+ - if @submission.graded_at
54	- %td.field Runtime (s):	64	+ %td #{time_ago_in_words(@submission.graded_at)} ago (at #{@submission.graded_at.to_formatted_s(:long)})
55	- %td.value #{@submission.max_runtime}	65	+ - else
56	- %tr{class: cycle('info-even','info-odd')}	66	+ %td -
57	- %td.field Memory (kb):	67	+ %tr
58	- %td.value #{@submission.peak_memory}	68	+ %td.text-right
		69	+ %strong Points
		70	+ %td #{@submission.points}/#{@submission.problem.full_score}
		71	+ %tr
		72	+ %td.text-right
		73	+ %strong Comment
		74	+ %td #{@submission.grader_comment}
		75	+ %tr
		76	+ %td.text-right
		77	+ %strong Runtime (s)
		78	+ %td #{@submission.max_runtime}
		79	+ %tr
		80	+ %td.text-right
		81	+ %strong Memory (kb)
		82	+ %td #{@submission.peak_memory}
59	- if session[:admin]	83	- if session[:admin]
60	- %tr{class: cycle('info-even','info-odd')}	84	+ %tr
61	- %td.field IP:	85	+ %td.text-right
62	- %td.value #{@submission.ip_address}	86	+ %strong IP
		87	+ %td #{@submission.ip_address}
63		88
64	- %h2 Source code
65	- //%div.highlight{:style => "border: 1px solid black;"}
66	- =@formatted_code.html_safe
67		89
		90	+

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

r566:46de378c3b60 - Sun, 03 Jul 2016 02:28:41 - 3 files changed: 97 inserted, 53 deleted

Sign in to your account

Commit r566:46de378c3b60 public

Author

r566:46de378c3b60 - Sun, 03 Jul 2016 02:28:41 - 3 files changed: 97 inserted, 53 deleted

Commit `r566:46de378c3b60` public