cafe-grader-web Commit - r840:b948bb241476

cafe-grader-web

Commit `r840:b948bb241476` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r840:b948bb241476 - Mon, 25 Jan 2021 14:24:47 - 9 files changed: 66 inserted, 2 deleted

app/views/announcements/_form.html.haml created 644 ¶ +25

@@ -0,0 +1,25
	1	+ = simple_form_for(@announcement) do \|f\|
	2	+ - if @announcement.errors.any?
	3	+ .form-row
	4	+ .col-sm-12
	5	+ #error_explanation.alert.alert-dismissable.alert-danger
	6	+ %button.close{type: "button", data: { dismiss: "alert"}, aria: {hidden: "true"}} ×
	7	+ %h3= "เกิดปัญหาในการบันทึกข้อมูลเนื่องจาก"
	8	+ %ul
	9	+ - @announcement.errors.full_messages.each do \|message\|
	10	+ %li= message
	11	+ .form-row
	12	+ .col-md-6.col-12
	13	+ -# = f.input :lock_version, as: :hidden
	14	+ = f.input :title
	15	+ = f.input :notes, label: 'Notes (shown internally, used to organize announcements)'
	16	+ = f.input :body
	17	+ = f.input :author
	18	+ = f.input :published
	19	+ = f.input :frontpage, label: 'Display in the front page only?'
	20	+ = f.input :on_nav_bar, label: 'Show on menu bar?', wrapper: :custom_boolean
	21	+ = f.input :contest_only, label: 'Display in contest only?'
	22	+ = f.submit "Create", class: 'btn btn-primary'
	23	+ -if content_for?(:form_buttons)
	24	+ = yield(:form_buttons)
	25	+ / = link_to 'Back', announcements_path, class: 'btn btn-default'

db/migrate/20210124101028_add_on_nav_bar_to_announcement.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class AddOnNavBarToAnnouncement < ActiveRecord::Migration[5.2]
	2	+ def change
	3	+ add_column :announcements, :on_nav_bar, :boolean, default: false
	4	+ end
	5	+ end

app/controllers/announcements_controller.rb ¶ +1 -1

                   respond_to do |format|
                     if @announcement.update_attributes(announcement_params)
                       flash[:notice] = 'Announcement was successfully updated.'
                       format.html { redirect_to(@announcement) }
                       format.js   {}
                       format.xml  { head :ok }
                     else
                       format.html { render :action => "edit" }
                       format.js   {}
                       format.xml  { render :xml => @announcement.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 def toggle
                   @announcement = Announcement.find(params[:id])
                   @announcement.update_attributes( published:  !@announcement.published? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#announcement_toggle_#{@announcement.id}",button_on: @announcement.published? } }
                   end
                 end
                 def toggle_front
                   @announcement = Announcement.find(params[:id])
                   @announcement.update_attributes( frontpage:  !@announcement.frontpage? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#announcement_toggle_front_#{@announcement.id}",button_on: @announcement.frontpage? } }
                   end
                 end
                 # DELETE /announcements/1
                 # DELETE /announcements/1.xml
                 def destroy
                   @announcement = Announcement.find(params[:id])
                   @announcement.destroy
                   respond_to do |format|
                     format.html { redirect_to(announcements_url) }
                     format.xml  { head :ok }
                   end
                 end
                 private
                   def announcement_params
-            -       params.require(:announcement).permit(:author, :body, :published, :frontpage, :contest_only, :title)
+            +       params.require(:announcement).permit(:author, :body, :published, :frontpage, :contest_only, :title, :on_nav_bar)
                   end
               end

app/controllers/application_controller.rb ¶ +5

               require 'ipaddr'
               class ApplicationController < ActionController::Base
                 protect_from_forgery
                 before_action :current_user
+            +   before_action :nav_announcement
                 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
                 MULTIPLE_IP_LOGIN_CONF_KEY = 'right.multiple_ip_login'
                 WHITELIST_IGNORE_CONF_KEY = 'right.whitelist_ignore'
                 WHITELIST_IP_CONF_KEY = 'right.whitelist_ip'
                 #report and redirect for unauthorized activities
                 def unauthorized_redirect(notice = 'You are not authorized to view the page you requested')
                   flash[:notice] = notice
                   redirect_to login_main_path
                 end
                 # Returns the current logged-in user (if any).
                 def current_user
                   return nil unless session[:user_id]
                   @current_user ||= User.find(session[:user_id])
                 end
+            +   def nav_announcement
+            +     @nav_announcement = Announcement.where(on_nav_bar: true)
+            +   end
+            +
                 def admin_authorization
                   return false unless check_valid_login
                   user = User.includes(:roles).find(session[:user_id])
                   unless user.admin?
                     unauthorized_redirect
                     return false
                   end
                   return true
                 end
                 def authorization_by_roles(allowed_roles)
                   return false unless check_valid_login
                   unless @current_user.roles.detect { |role| allowed_roles.member?(role.name) }
                     unauthorized_redirect
                     return false
                   end
                 end
                 def testcase_authorization
                   #admin always has privileged
                   if @current_user.admin?
                     return true
                   end
                   unauthorized_redirect unless GraderConfiguration["right.view_testcase"]
                 end
                 protected
                 #redirect to root (and also force logout)
                 #if the user is not logged_in or the system is in "ADMIN ONLY" mode
                 def check_valid_login
                   #check if logged in
                   unless session[:user_id]
                     if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                       unauthorized_redirect('You need to login but you cannot log in at this time')
                     else
                       unauthorized_redirect('You need to login')
                     end
                     return false
                   end
                   # check if run in single user mode
                   if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                     if @current_user==nil || (!@current_user.admin?)
                       unauthorized_redirect('You cannot log in at this time')
                       return false

app/views/announcements/edit.html.haml ¶ +11

+            + %h1 Edit Announcement
+            +
+            + -content_for(:form_buttons) do
+            +   = link_to t(:back), announcements_path, class: 'card-link btn btn-secondary'
+            +
+            + = render 'form'
+            + -# old style
                 .container-fluid
                   %h1 Editing announcement
                   = error_messages_for :announcement
                   .row
                     .col-md-6
                       = form_for(@announcement) do |f|
                         .form-group
                           %label Title
                           = f.text_field :title, class: 'form-control'
                         .form-group
                           %label Notes
                           (shown internally, used to organize announcements)
                           = f.text_field :notes, class: 'form-control'
                         .form-group
                           %label Body
                           = f.text_area  :body, class: 'form-control', style: 'height: 200px;'
                         .form-group
                           %label Author
                           = f.text_field :author, class: 'form-control'
                         .checkbox
                           %label
                             = f.check_box :published
                             Published
                         .checkbox
                           %label
                             = f.check_box :frontpage
                             Show on front page?
                         .checkbox
                           %label
+            +               = f.check_box :on_nav_bar
+            +               Show on top menu bar?
+            +           .checkbox
+            +             %label
                             = f.check_box :contest_only
                             Show only in contest?
                         = f.submit "Update", class: 'btn btn-primary'
                         = link_to 'Show', @announcement, class: 'btn btn-default'
                         = link_to 'Back', announcements_path, class: 'btn btn-default'

app/views/announcements/new.html.haml ¶ +8

               %h1 New announcement
+            +
+            + -content_for(:form_buttons) do
+            +   = link_to t(:back), announcements_path, class: 'card-link btn btn-secondary'
+            +
+            + = render 'form'
+            +
+            + -# old style
                 = error_messages_for :announcement
                 = simple_form_for(@announcement) do |f|
                   .row
                     .col-md-6
                       = f.input :title
                       = f.input :notes, label: 'Notes (shown internally, used to organize announcements)'
                       = f.input :body
                       = f.input :author
                       = f.input :published
                       = f.input :frontpage, label: 'Display in the front page only?'
                       = f.input :contest_only, label: 'Display in contest only?'
                       = f.button :submit, "Create", class: 'btn btn-primary'
                       = link_to 'Back', announcements_path, class: 'btn btn-default'
+            +

app/views/announcements/show.html.haml ¶ +3

               %p
                 %b Author:
                 = h @announcement.author
               %p
                 %b Title:
                 = h @announcement.title
               %p
                 %b Notes:
                 = h @announcement.notes
               %p
                 %b Body:
                 = h markdown(@announcement.body)
               %p
                 %b Published:
                 = h @announcement.published
               %p
                 %b Show on front page:
                 = h @announcement.frontpage
               %p
+            +   %b Show on top menu bar:
+            +   = h @announcement.on_nav_bar
+            + %p
                 %b Show only in contest:
                 = h @announcement.contest_only
               = link_to 'Edit', edit_announcement_path(@announcement)
               |
               = link_to 'Back', announcements_path

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

                         - if GraderConfiguration['right.user_hall_of_fame']
                           = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
                         / display MODE button (with countdown in contest mode)
                         - if GraderConfiguration.analysis_mode?
                           %div.navbar-btn.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"
                           - elsif !@current_user.contest_started?
                             %div.navbar-btn.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
                           - else
                             %div.navbar-btn.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.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Manage
                               %span.caret
                             %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')
                               = add_menu( 'Message ', 'messages', 'console')
                               %li.divider{role: 'separator'}
                               = add_menu( 'System config', 'configurations', 'index')
                               %li.divider{role: 'separator'}
                               = add_menu( 'Sites', 'sites', 'index')
                               = add_menu( 'Contests', 'contest_management', 'index')
                           / report
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Current Score', 'report', 'current_score')
                               = add_menu( 'Score Report', 'report', 'max_score')
                               = add_menu( 'Submission Report', 'report', 'submission')
                               = add_menu( 'Login Report', 'report', 'login')
                           - 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
+            +           - @nav_announcement.each do |ann|
+            +             %p.navbar-text
+            +               = ann.body.html_safe
+            +
+            +
                       %ul.nav.navbar-nav.navbar-right
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'index', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                         - if GraderConfiguration['system.user_setting_enabled']
                           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog', id: 'user_profile')}".html_safe, 'users', 'profile', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{@current_user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
               /
                 - if (@current_user!=nil) and (session[:admin])
                   %nav.navbar.navbar-fixed-top.navbar-inverse.secondnavbar
                     .container-fluid
                       .collapse.navbar-collapse
                         %ul.nav.navbar-nav
                           = add_menu( '[Announcements]', 'announcements', 'index')
                           = add_menu( '[Msg console]', 'messages', 'console')
                           = add_menu( '[Problems]', 'problems', 'index')
                           = add_menu( '[Users]', 'user_admin', 'index')
                           = add_menu( '[Results]', 'user_admin', 'user_stat')
                           = add_menu( '[Report]', 'report', 'multiple_login')
                           = add_menu( '[Graders]', 'graders', 'list')
                           = add_menu( '[Contests]', 'contest_management', 'index')
                           = add_menu( '[Sites]', 'sites', 'index')
                           = add_menu( '[System config]', 'configurations', 'index')

db/schema.rb ¶ +2 -1

               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record to
               # incrementally modify your database, and then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your
               # database schema. If you need to create the application database on another
               # system, you should be using db:schema:load, not running all the migrations
               # from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended that you check this file into your version control system.
-            - ActiveRecord::Schema.define(version: 2020_08_13_083020) do
+            + ActiveRecord::Schema.define(version: 2021_01_24_101028) do
                 create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
                   t.string "author"
                   t.text "body"
                   t.boolean "published"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                   t.boolean "frontpage", default: false
                   t.boolean "contest_only", default: false
                   t.string "title"
                   t.string "notes"
+            +     t.boolean "on_nav_bar", default: false
                 end
                 create_table "contests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
                   t.string "title"
                   t.boolean "enabled"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                   t.string "name"
                 end
                 create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
                   t.integer "contest_id"
                   t.integer "problem_id"
                 end
                 create_table "contests_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
                   t.integer "contest_id"
                   t.integer "user_id"
                 end
                 create_table "countries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
                   t.string "name"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                 end
                 create_table "descriptions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
                   t.text "body"
                   t.boolean "markdowned"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                 end
                 create_table "grader_configurations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
                   t.string "key"
                   t.string "value_type"
                   t.string "value"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                   t.text "description"
                 end
                 create_table "grader_processes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
                   t.string "host"
                   t.integer "pid"
                   t.string "mode"
                   t.boolean "active"
                   t.datetime "created_at", null: false

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

Commit r840:b948bb241476 public

Author

r840:b948bb241476 - Mon, 25 Jan 2021 14:24:47 - 9 files changed: 66 inserted, 2 deleted

Commit `r840:b948bb241476` public