cafe-grader-web Commit - r700:757ebc0ccd63

cafe-grader-web

Commit `r700:757ebc0ccd63` public

parent | child

Description:

add tags

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r700:757ebc0ccd63 - Sat, 10 Mar 2018 07:07:14 - 7 files changed: 56 inserted, 29 deleted

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

                     end
                     flash[:success] = "The following problems are added to the group #{group.name}: " + ok.join(', ') if ok.count > 0
                     flash[:alert] = "The following problems are already in the group #{group.name}: " + failed.join(', ') if failed.count > 0
+            +     elsif params.has_key? 'add_tags'
+            +       get_problems_from_params.each do |p|
+            +         p.tag_ids += params[:tag_ids]
+            +       end
                   end
                   redirect_to :action => 'manage'
                 private
                   def problem_params
-            -       params.require(:problem).permit(:name, :full_name, :full_score, :date_added, :available, :test_allowed,:output_only, :url, :description)
+            +       params.require(:problem).permit(:name, :full_name, :full_score, :date_added, :available, :test_allowed,:output_only, :url, :description, tag_ids:[])
                   end
               end

app/controllers/tags_controller.rb ¶ +2

                 # DELETE /tags/1
                 def destroy
+            +     #remove any association
+            +     ProblemTag.where(tag_id: @tag.id).destroy_all
                   @tag.destroy
                   redirect_to tags_url, notice: 'Tag was successfully destroyed.'
                 end

app/views/layouts/_header.html.haml ¶ +1

                             %ul.dropdown-menu
                               = add_menu( 'Announcements', 'announcements', 'index')
                               = add_menu( 'Problems', 'problems', 'index')
+            +                 = add_menu( 'Tags', 'tags', 'index')
                               = add_menu( 'Users', 'user_admin', 'index')
                               = add_menu( 'User Groups', 'groups', 'index')
                               = add_menu( 'Graders', 'graders', 'list')

app/views/problems/_form.html.haml ¶ +3

                 %label{:for => "problem_full_score"} Full score
                 = text_field 'problem', 'full_score', class: 'form-control'
               .form-group
+            +   %label{:for => "problem_full_score"} Tags
+            +   = collection_select(:problem, :tag_ids, Tag.all, :id, :name,  {}, {multiple: true, class: 'form-control select2'})
+            + .form-group
                 %label{:for => "problem_date_added"} Date added
                 = date_select 'problem', 'date_added', class: 'form-control'
               - # TODO: these should be put in model Problem, but I can't think of

app/views/problems/index.html.haml ¶ +5

                   %th Name
                   %th Full name
                   %th.text-right Full score
+            +     %th Tags
                   %th
                     Submit
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Admin can always submit to any problem' } [?]
                       = problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1
                       = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem
                     %td.text-right= problem.full_score #in_place_editor_field :problem, :full_score, {}, :rows=>1
+            +       %td
+            +         - problem.tags.each do |t|
+            +           - #%button.btn.btn-default.btn-xs= t.name
+            +           %span.label.label-default= t.name
                     %td= link_to "Submit", direct_edit_problem_submissions_path(problem,@current_user.id), class: 'btn btn-xs btn-primary'
                     %td= problem.date_added
                     %td= toggle_button(@problem.available?, toggle_problem_path(@problem), "problem-avail-#{@problem.id}")

app/views/problems/manage.html.haml ¶ +39 -28

                       (You can shift-click to select a range of problems)
                       %ul.form-inline
                         %li
-            -             Change date added to
+            +             Change "Date added" to
                           .input-group.date
                             = text_field_tag :date_added, class: 'form-control'
                             %span.input-group-addon
                           &nbsp;&nbsp;&nbsp;
                           = submit_tag 'Change', :name => 'change_date_added', class: 'btn btn-primary btn-sm'
                         %li
-            -             Set available to
+            +             Set "Available" to
                           = submit_tag 'True', :name => 'enable_problem', class: 'btn btn-primary btn-sm'
                           = submit_tag 'False', :name => 'disable_problem', class: 'btn btn-primary btn-sm'
                         - if GraderConfiguration.multicontests?
                           %li
-            -               Add to
+            +               Add selected problems to contest
                             = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
                             = submit_tag 'Add', :name => 'add_to_contest', class: 'btn btn-primary btn-sm'
                         %li
-            -             Add problems to group
+            +             Add selected problems to user group
                           = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
-            -             = submit_tag 'Add', name: 'add_group', class: 'btn btn-default'
+            -
+            +             = submit_tag 'Add', name: 'add_group', class: 'btn btn-primary'
+            +           %li
+            +             Add the following tags to the selected problems
+            +             = select_tag "tag_ids", options_from_collection_for_select( Tag.all, 'id','name'), id: 'tags_name',class: 'select2', multiple: true, data: {placeholder: 'Select tags by clicking', width: "200px"}
+            +             = submit_tag 'Add', name: 'add_tags', class: 'btn btn-primary'
-            -   %table.table.table-hover
-            -     %tr{style: "text-align: left;"}
-            -       %th= check_box_tag 'select_all'
-            -       %th Name
-            -       %th Full name
-            -       %th Available
-            -       %th Date added
-            -       - if GraderConfiguration.multicontests?
-            -         %th Contests
+            +   %table.table.table-hover.datatable
+            +     %thead
+            +       %tr{style: "text-align: left;"}
+            +         %th= check_box_tag 'select_all'
+            +         %th Name
+            +         %th Full name
+            +         %th Tags
+            +         %th Available
+            +         %th Date added
+            +         - if GraderConfiguration.multicontests?
+            +           %th Contests
-            -     - num = 0
-            -     - for problem in @problems
-            -       - num += 1
-            -       %tr{:id => "row-prob-#{problem.id}", :name=> "prob-#{problem.id}"}
-            -         %td= check_box_tag "prob-#{problem.id}-#{num}"
-            -         %td= problem.name
-            -         %td= problem.full_name
-            -         %td= problem.available
-            -         %td= problem.date_added
-            -         - if GraderConfiguration.multicontests?
+            +     %tbody
+            +       - num = 0
+            +       - for problem in @problems
+            +         - num += 1
+            +         %tr{:id => "row-prob-#{problem.id}", :name=> "prob-#{problem.id}"}
+            +           %td= check_box_tag "prob-#{problem.id}-#{num}"
+            +           %td= problem.name
+            +           %td= problem.full_name
                         %td
-            -             - problem.contests.each do |contest|
-            -               = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])"
+            +             - problem.tags.each do |t|
+            +               %span.label.label-default= t.name
+            +           %td= problem.available
+            +           %td= problem.date_added
+            +           - if GraderConfiguration.multicontests?
+            +             %td
+            +               - problem.contests.each do |contest|
+            +                 = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])"
               :javascript
                 $('.input-group.date').datetimepicker({
                   widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},
                 });
+            -
+            +   $('.datatable').DataTable({
+            +     paging: false
+            +   });

app/views/sites/edit.html.haml ¶ +1

               :javascript
                 $('.input-group.date').datetimepicker({
                   format: 'DD/MMM/YYYY HH:mm',
+            +     showTodayButton: true,
                 });

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

r700:757ebc0ccd63 - Sat, 10 Mar 2018 07:07:14 - 7 files changed: 56 inserted, 29 deleted

Sign in to your account

Commit r700:757ebc0ccd63 public

Author

r700:757ebc0ccd63 - Sat, 10 Mar 2018 07:07:14 - 7 files changed: 56 inserted, 29 deleted

Commit `r700:757ebc0ccd63` public