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: 113 inserted, 49 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

                   @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

app/views/announcements/edit.html.haml ¶ +45 -34

@@ -1,34 +1,45
1	- .container-fluid	1	+ %h1 Edit Announcement
2	- %h1 Editing announcement	2	+
3	- = error_messages_for :announcement	3	+ -content_for(:form_buttons) do
4	- .row	4	+ = link_to t(:back), announcements_path, class: 'card-link btn btn-secondary'
5	- .col-md-6	5	+
6	- = form_for(@announcement) do \|f\|	6	+ = render 'form'
7	- .form-group	7	+ -# old style
8	- %label Title	8	+ .container-fluid
9	- = f.text_field :title, class: 'form-control'	9	+ %h1 Editing announcement
10	- .form-group	10	+ = error_messages_for :announcement
11	- %label Notes	11	+ .row
12	- (shown internally, used to organize announcements)	12	+ .col-md-6
13	- = f.text_field :notes, class: 'form-control'	13	+ = form_for(@announcement) do \|f\|
14	- .form-group	14	+ .form-group
15	- %label ~~Body~~	15	+ %label Title
16	- = f.text_~~area~~ ~~:body~~, class: 'form-control', ~~style~~: ~~'height: 200px;'~~	16	+ = f.text_field :title, class: 'form-control'
17	- .form-group	17	+ .form-group
18	- %label ~~Author~~	18	+ %label Notes
19	- = f.text_field :author, class: 'form-control'	19	+ (shown internally, used to organize announcements)
20	- .checkbox	20	+ = f.text_field :notes, class: 'form-control'
21	- %label	21	+ .form-group
22	- = f.check_box :published	22	+ %label Body
23	- Published	23	+ = f.text_area :body, class: 'form-control', style: 'height: 200px;'
24	- .checkbox	24	+ .form-group
25	- %label	25	+ %label Author
26	- = f.check_box :frontpage	26	+ = f.text_field :author, class: 'form-control'
27	- Show on front page?	27	+ .checkbox
28	- .checkbox	28	+ %label
29	- %label	29	+ = f.check_box :published
30	- = f.check_box :contest_only	30	+ Published
31	- Show only in contest?	31	+ .checkbox
32	- = f.submit "Update", class: 'btn btn-primary'	32	+ %label
33	- = link_to 'Show', @announcement, class: 'btn btn-default'	33	+ = f.check_box :frontpage
34	- = link_to 'Back', announcements_path, class: 'btn btn-default'	34	+ Show on front page?
		35	+ .checkbox
		36	+ %label
		37	+ = f.check_box :on_nav_bar
		38	+ Show on top menu bar?
		39	+ .checkbox
		40	+ %label
		41	+ = f.check_box :contest_only
		42	+ Show only in contest?
		43	+ = f.submit "Update", class: 'btn btn-primary'
		44	+ = link_to 'Show', @announcement, class: 'btn btn-default'
		45	+ = link_to 'Back', announcements_path, class: 'btn btn-default'

app/views/announcements/new.html.haml ¶ +21 -13

@@ -1,14 +1,22
1	%h1 New announcement	1	%h1 New announcement
2	- = error_messages_for :announcement	2	+
3	- = simple_form_for(@announcement) do \|f\|	3	+ -content_for(:form_buttons) do
4	- .row	4	+ = link_to t(:back), announcements_path, class: 'card-link btn btn-secondary'
5	- .col-md-6	5	+
6	- = f.input :title	6	+ = render 'form'
7	- = f.input :notes, label: 'Notes (shown internally, used to organize announcements)'	7	+
8	- = f.input :body	8	+ -# old style
9	- = f.input :author	9	+ = error_messages_for :announcement
10	- = f.input :published	10	+ = simple_form_for(@announcement) do \|f\|
11	- = f.input :frontpage, label: 'Display in the front page only?'	11	+ .row
12	- = f.input :contest_only, label: 'Display in contest only?'	12	+ .col-md-6
13	- = f.button :submit, "Create", class: 'btn btn-primary'	13	+ = f.input :title
14	- = link_to 'Back', announcements_path, class: 'btn btn-default'	14	+ = f.input :notes, label: 'Notes (shown internally, used to organize announcements)'
		15	+ = f.input :body
		16	+ = f.input :author
		17	+ = f.input :published
		18	+ = f.input :frontpage, label: 'Display in the front page only?'
		19	+ = f.input :contest_only, label: 'Display in contest only?'
		20	+ = f.button :submit, "Create", class: 'btn btn-primary'
		21	+ = link_to 'Back', announcements_path, class: 'btn btn-default'
		22	+

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

                 %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

                             %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

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"

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: 113 inserted, 49 deleted

Commit `r840:b948bb241476` public