cafe-grader-web Commit - r581:11a43c5a5a46

cafe-grader-web

Commit `r581:11a43c5a5a46` public

parent | child

Description:

add get_latest_submission_status for 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

r581:11a43c5a5a46 - Tue, 09 Aug 2016 11:26:02 - 5 files changed: 49 inserted, 2 deleted

app/views/application/_submission_short.html.haml created 644 ¶ +26

@@ -0,0 +1,26
	1	+
	2	+ - if submission.nil?
	3	+ = "-"
	4	+ - else
	5	+ - if submission.graded_at.nil?
	6	+ =t 'main.submitted_at'
	7	+ = format_short_time(submission.submitted_at.localtime)
	8	+ - else
	9	+ = t 'main.graded_at'
	10	+ = "#{format_short_time(submission.graded_at.localtime)}, "
	11	+ - if GraderConfiguration['ui.show_score']
	12	+ = t 'main.score'
	13	+ = "#{(submission.points*100/submission.problem.full_score).to_i} "
	14	+ = " ["
	15	+ %tt
	16	+ = submission.grader_comment
	17	+ = "]"
	18	+ - if GraderConfiguration.show_grading_result
	19	+ = " \| "
	20	+ = link_to '[detailed result]', :action => 'result', :id => submission.id
	21	+ = " \| "
	22	+ = link_to("[#{t 'main.cmp_msg'}]", {:action => 'compiler_msg', :id => submission.id}, {:popup => true})
	23	+ = " \| "
	24	+ = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id})
	25	+ //= " \| "
	26	+ //= link_to "[#{t 'main.submissions_link'}]", main_submission_path(submission.problem.id)

app/views/sources/get_latest_submission_status.js.haml created 644 ¶ +2

@@ -0,0 +1,2
	1	+ :javascript
	2	+ $("#latest_status").html("#{j render({partial: 'submission_short', locals: {submission: @submission, problem_name: @problem.name}})}")

app/controllers/sources_controller.rb ¶ +10

               class SourcesController < ApplicationController
                 before_filter :authenticate
                 def direct_edit
                   @problem = Problem.find(params[:pid])
                   @source = ''
                 end
                 def direct_edit_submission
                   @submission = Submission.find(params[:sid])
                   @source = @submission.source.to_s
                   @problem = @submission.problem
                   @lang_id = @submission.language.id
                   render 'direct_edit'
                 end
+            +   def get_latest_submission_status
+            +     @problem = Problem.find(params[:pid])
+            +     @submission = Submission.find_last_by_user_and_problem(params[:uid],params[:pid])
+            +     puts User.find(params[:uid]).login
+            +     puts Problem.find(params[:pid]).name
+            +     puts 'nil' unless @submission
+            +     respond_to do |format|
+            +       format.js
+            +     end
+            +   end
               end

app/views/sources/direct_edit.html.haml ¶ +9 -2

               %h2 Live submit
               %br
               %textarea#text_haha{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-7
+            +     .col-md-8
                     %div#editor{style: 'height: 500px; border-radius: 7px; font-size: 14px;'}
-            -     .col-md-5
+            +     .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
+            +         .panel-body
+            +           - if @submission
+            +             = render :partial => 'submission_short',
+            +               :locals => {:submission => @submission, :problem_name => @problem.name }

config/routes.rb ¶ +2

                   end
                 end
                 resources :problems do
                   member do
                     get 'toggle'
                     get 'toggle_test'
                   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
+            +   #source code edit
                 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'
+            +   get 'sources/get_latest_submission_status/:uid/:pid', to: 'sources#get_latest_submission_status', as: 'get_latest_submission_status'
                 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"
                 #grader
                 get 'graders/list', to: 'graders#list', as: 'grader_list'
                 # 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

r581:11a43c5a5a46 - Tue, 09 Aug 2016 11:26:02 - 5 files changed: 49 inserted, 2 deleted

Sign in to your account

Commit r581:11a43c5a5a46 public

Author

r581:11a43c5a5a46 - Tue, 09 Aug 2016 11:26:02 - 5 files changed: 49 inserted, 2 deleted

Commit `r581:11a43c5a5a46` public