cafe-grader-web Commit - r869:abb95edf0526

cafe-grader-web

Commit `r869:abb95edf0526` public

parent | child

Description:

wip

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r869:abb95edf0526 - Sun, 18 Sep 2022 15:53:21 - 5 files changed: 30 inserted, 31 deleted

app/controllers/problems_controller.rb ¶ +5 -5

                 def update
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                   if @description.nil? and params[:description][:body]!=''
                     @description = Description.new(description_params)
                     if !@description.save
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                     @problem.description = @description
                   elsif @description
-            -       if !@description.update_attributes(description_params)
+            +       if !@description.update(description_params)
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                   end
                   if params[:file] and params[:file].content_type != 'application/pdf'
                       flash[:notice] = 'Error: Uploaded file is not PDF'
                       render :action => 'edit' and return
                   end
-            -     if @problem.update_attributes(problem_params)
+            +     if @problem.update(problem_params)
                     flash[:notice] = 'Problem was successfully updated.'
                     unless params[:file] == nil or params[:file] == ''
                       flash[:notice] = 'Problem was successfully updated and a new PDF file is uploaded.'
                       out_dirname = "#{Problem.download_file_basedir}/#{@problem.id}"
                       if not FileTest.exists? out_dirname
                         Dir.mkdir out_dirname
                       end
                       out_filename = "#{out_dirname}/#{@problem.name}.pdf"
                       if FileTest.exists? out_filename
                         File.delete out_filename
                       end
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   p = Problem.find(params[:id]).destroy
                   redirect_to action: :index
                 end
                 def toggle
                   @problem = Problem.find(params[:id])
-            -     @problem.update_attributes(available: !(@problem.available) )
+            +     @problem.update(available: !(@problem.available) )
                   respond_to do |format|
                     format.js { }
                   end
                 end
                 def toggle_test
                   @problem = Problem.find(params[:id])
-            -     @problem.update_attributes(test_allowed: !(@problem.test_allowed?) )
+            +     @problem.update(test_allowed: !(@problem.test_allowed?) )
                   respond_to do |format|
                     format.js { }
                   end
                 end
                 def toggle_view_testcase
                   @problem = Problem.find(params[:id])
-            -     @problem.update_attributes(view_testcase: !(@problem.view_testcase?) )
+            +     @problem.update(view_testcase: !(@problem.view_testcase?) )
                   respond_to do |format|
                     format.js { }
                   end
                 end
                 def turn_all_off
                   Problem.available.all.each do |problem|
                     problem.available = false
                     problem.save
                   end
                   redirect_to action: :index
                 end

app/views/layouts/_header.html.haml ¶ +8 -8

               %header
                 %nav.navbar.fixed-top.navbar-dark.bg-primary.navbar-expand-lg
                   .container-fluid
                     %a.navbar-brand{href: list_main_path}
                       %span.glyphicon.glyphicon-home
                       MAIN
                     %button.navbar-toggler.collapsed{ type: :button, 'data-bs': {toggle: 'collapse', target: '#navbar-collapse'} }
                       %span.navbar-toggler-icon
                     .collapse.navbar-collapse#navbar-collapse
                       %ul.navbar-nav.me-auto.mb-2.mb-lg-0
                         / submission
                         - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user))
-            -             %li.nav-item.dropdown
+            +             %li.nav-item.dropdown.mx-2
                             %a.nav-link.dropdown-toggle{href: '#', 'data-bs': {toggle:'dropdown'},  aria: {expanded:"false"}, role: "button"}
                               = "#{I18n.t 'menu.submissions'}"
                             %ul.dropdown-menu
                               %li= link_to 'View', submissions_path, class:'dropdown-item'
                               %li= link_to 'Self Test', test_index_path, class:'dropdown-item'
                         / hall of fame
                         - if GraderConfiguration['right.user_hall_of_fame']
-            -             = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof', class: 'nav-item')
+            +             %li= link_to "#{I18n.t 'menu.hall_of_fame'}", problem_hof_report_path, class: 'nav-link mx-2'
                         / display MODE button (with countdown in contest mode)
                         - if GraderConfiguration.analysis_mode?
-            -             %div.navbar-btn.btn.btn-success#countdown= "ANALYSIS MODE"
+            +             %div.btn.btn-success#countdown= "ANALYSIS MODE"
                         - elsif GraderConfiguration.time_limit_mode?
                           - if @current_user.contest_finished?
-            -               %div.navbar-btn.btn.btn-danger#countdown= "Contest is over"
+            +               %div.btn.btn-danger#countdown= "Contest is over"
                           - elsif !@current_user.contest_started?
-            -               %div.navbar-btn.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
+            +               %div.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
                           - else
-            -               %div.navbar-btn.btn.btn-primary#countdown asdf
+            +               %div.btn.btn-primary#countdown asdf
                             :javascript
                               $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'});
                         / admin section
                         - if (@current_user!=nil) and (session[:admin])
                           / management
-            -             %li.nav-item.dropdown
+            +             %li.nav-item.dropdown.mx-2
                             %a.nav-link.dropdown-toggle{href: '#', 'data-bs': {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Manage
                             %ul.dropdown-menu
                               %li= link_to 'Announcements', announcements_path, class: 'dropdown-item'
                               %li= link_to 'Problems', problems_path, class: 'dropdown-item'
                               %li= link_to 'Tags', tags_path, class: 'dropdown-item'
                               %li= link_to 'Users', user_admin_index_path, class: 'dropdown-item'
                               %li= link_to 'User Groups', groups_path, class: 'dropdown-item'
                               %li= link_to 'Graders', graders_list_path, class: 'dropdown-item'
                               %li= link_to 'Message ', console_messages_path, class: 'dropdown-item'
                               %li
                                 %hr.dropdown-divider
                               %li= link_to 'System config', grader_configuration_index_path, class: 'dropdown-item'
                               %li
                                 %hr.dropdown-divider
                               %li= link_to 'Sites', sites_path, class: 'dropdown-item'
                               %li= link_to 'Contests', contest_management_index_path, class: 'dropdown-item'
                               -#
                           / report
-            -             %li.nav-item.dropdown
+            +             %li.nav-item.dropdown.mx-2
                             %a.nav-link.dropdown-toggle{href: '#', 'data-bs': {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                             %ul.dropdown-menu
                               %li= link_to 'Current Score', current_score_report_path, class: 'dropdown-item'
                               %li= link_to 'Score Report', max_score_report_path, class: 'dropdown-item'
                               %li= link_to 'Submission Report', submission_report_path, class: 'dropdown-item'
                               %li= link_to 'Login Report', login_report_path, class: 'dropdown-item'
                           - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
                             =link_to "#{ungraded} backlogs!",
                               graders_list_path,
                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
                         / announcement

app/views/main/_submission_box.html.haml ¶ +12 -13

-            - = form_tag({:action => 'submit'}, :multipart => true, class: 'form') do
+            + = form_with url: submit_main_path, multipart: true, class: 'form' do |form|
                 - 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.name}] #{p.full_name}", p.id]}, {:selected => '-1'}, { class: 'select2 form-control', style: "width: 100%" }
-            -   .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'
+            +   .row.mb-2
+            +     .col-sm-2
+            +       = form.label :submission, 'Problem:', class: 'form-label'
+            +     .col-sm-10
+            +       = 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', style: "width: 100%" }
+            +   .row.mb-2
+            +     .col-sm-2
+            +       = form.label :file, 'File:', class: 'form-label'
+            +     .col-sm-10
+            +       = form.file_field :file, class: 'form-control'
+            +   = form.submit 'Submit', class: 'btn btn-primary'

app/views/main/list.html.haml ¶ +4 -4

               = user_title_bar(@user)
               - if @user.section
                 passcode for CP Unofficial Logo voting is
                 %strong= @user.section
                 %br
               - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               .row
                 .col-md-7
                   - if GraderConfiguration.show_submitbox_to?(@user)
-            -       .panel.panel-primary
-            -         .panel-heading
+            +       .card.border-primary
+            +         .card-header.text-bg-primary
                         Submission
-            -         .panel-body
-            -           = render :partial => 'submission_box'
+            +         .card-body
+            +           = render 'submission_box'
                   - if GraderConfiguration.show_tasks_to?(@user)
                     - if not GraderConfiguration.multicontests?
                       %table.table.table-striped.table-condensed
                         %thead
                           %tr
                             %th Task name
                             %th Full name
                             %th # of sub(s)
                             %th Results
                             %th
                         %tbody
                           = render :partial => 'problem', :collection => @problems

app/views/report/_score_table.html.haml ¶ +1 -1

-            - %table.table.sortable.table-striped.table-bordered.table-condensed
+            + %table#score-table.table.sortable.table-striped.table-bordered.table-condensed
                 %thead
                   %tr
                     %th Login
                     %th Name
                     / %th Activated?
                     / %th Logged_in
                     / %th Contest(s)
                     %th Remark
                     - @problems.each do |p|
                       %th.text-right= p.name.gsub('_',' ')
                     %th.text-right Total
                     %th.text-right Passed

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

r869:abb95edf0526 - Sun, 18 Sep 2022 15:53:21 - 5 files changed: 30 inserted, 31 deleted

Sign in to your account

Commit r869:abb95edf0526 public

Author

r869:abb95edf0526 - Sun, 18 Sep 2022 15:53:21 - 5 files changed: 30 inserted, 31 deleted

Commit `r869:abb95edf0526` public