cafe-grader-web Commit - r766:4b83dfaa53e2

cafe-grader-web

Commit `r766:4b83dfaa53e2` public

parent | child

Description:

update message console

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r766:4b83dfaa53e2 - Thu, 10 Oct 2019 04:38:18 - 7 files changed: 66 inserted, 62 deleted

app/views/messages/index.html.haml created 644 ¶ +24

@@ -0,0 +1,24
	1	+ .announcementbox
	2	+ %span{:class => 'title'}
	3	+ How to submit clarification requests
	4	+ .announcement
	5	+ %p
	6	+ :markdown
	7	+ The clarification requests should be phrased as yes/no questions.
	8	+ The answers will be one of the following:
	9	+ (1) YES,
	10	+ (2) <b>NO</b>,
	11	+ (3) ANSWERED IN TASK DESCRIPTION (EXPLICITLY OR IMPLICITLY),
	12	+ (4) INVALID QUESTION, and
	13	+ (5) NO COMMENT.
	14	+
	15	+ = form_for 'message', :url => { :action => 'create'} do \|f\|
	16	+ %p
	17	+ %b New clarification request
	18	+ = submit_tag "Post"
	19	+ %br/
	20	+ = f.text_area :body, :rows => 5, :cols => 100
	21	+
	22	+ %hr/
	23	+
	24	+ = render :partial => 'message', :collection => @messages, :locals => {:reply => false}

app/controllers/messages_controller.rb ¶ +34 -30

               class MessagesController < ApplicationController
-            -   before_action :authenticate
+            +   before_action :check_valid_login
+            +   before_action :set_message, only: ['show', 'reply']
-            -   before_filter :admin_authorization, :only => ['console','show',
+            +   before_action :admin_authorization, :only => ['console','show',
                                                               'reply','hide','list_all']
-            -   def list
+            +   def index
-            -     @user = User.find(session[:user_id])
+            +     @messages = Message.find_all_sent_by_user(@current_user)
-            -     @messages = Message.find_all_sent_by_user(@user)
                 end
                 def console
-            -     @user = User.find(session[:user_id])
                   @messages = Message.find_all_system_unreplied_messages
                 end
                 def show
-            -     @message = Message.find(params[:id])
                 end
                 def list_all
-            -     @user = User.find(session[:user_id])
                   @messages = Message.where(receiver_id: nil).order(:created_at)
                 end
                 def create
-            -     user = User.find(session[:user_id])
+            +     @message = Message.new(message_params)
-            -     @message = Message.new(params[:message])
+            +     @message.sender = @current_user
-            -     @message.sender = user
                   if @message.body == '' or !@message.save
                     flash[:notice] = 'An error occurred'
                   else
                     flash[:notice] = 'New message posted'
                   end
-            -     redirect_to :action => 'list'
+            +     redirect_to action: 'index'
                 end
                 def reply
-            -     user = User.find(session[:user_id])
+            +     @r_message = Message.new(message_params)
-            -     @message = Message.new(params[:r_message])
+            +     @r_message.receiver = @message.sender
-            -     @message.sender = user
+            +     @r_message.sender = @current_user
                   if @message.body == '' or !@message.save
                     flash[:notice] = 'An error occurred'
                     redirect_to :action => 'show', :id => @message.replying_message_id
                   else
                     flash[:notice] = 'Message replied'
-            -       rep_msg = @message.replying_message
+            +       @message.replied = true
-            -       rep_msg.replied = true
+            +       @message.replying_message = @r_message
-            -       rep_msg.save
+            +       @message.save
                     redirect_to :action => 'console'
                   end
                 end
                 def hide
                   message = Message.find(params[:id])
                   message.replied = true
                   message.save
                   flash[:notice] = 'Message hidden (just marked replied)'
                   redirect_to :action => 'console'
                 end
                 protected
-            -   def build_replying_message_hierarchy(user)
+            +     def build_replying_message_hierarchy(user)
-            -     @all_messages = {}
+            +       @all_messages = {}
-            -     # manually build replies hierarchy (to improve efficiency)
+            +       # manually build replies hierarchy (to improve efficiency)
-            -     [@messages, @replied_messages].each do |collection|
+            +       [@messages, @replied_messages].each do |collection|
-            -       collection.each do |m|
+            +         collection.each do |m|
-            -         @all_messages[m.id] = {:msg => m, :replies => []}
+            +           @all_messages[m.id] = {:msg => m, :replies => []}
+            +         end
+            +       end
+            +
+            +       @all_messages.each do |m|
+            +         rep_id = m.replying_message_id
+            +         if @all_messages[rep_id]!=nil
+            +           @all_messages[rep_id][:replies] << m
+            +         end
                     end
                   end
-            -     @all_messages.each do |m|
+            +     def set_message
-            -       rep_id = m.replying_message_id
+            +       @message = Message.find(params[:id])
-            -       if @all_messages[rep_id]!=nil
-            -         @all_messages[rep_id][:replies] << m
-            -       end
                   end
-            -   end
+            +     def message_params
+            +       params.require(:message).permit(:body)
+            +     end
               end

app/views/messages/console.html.haml ¶ -1

-            - = user_title_bar(@user)
               %h1 Console: active messages
               = link_to '[all messages]', :action => 'list_all'
               %table
                 %tr
                   %th From
                   %th When
                   %th Message
                   %th
                 = render :partial => "short_message", :collection => @messages

app/views/messages/list_all.html.haml ¶ -2

-            - = user_title_bar(@user)
               %h1 Console: all messages
               = link_to '[active messages]', :action => 'list_all'
               %table
                 %tr
                   %th From
                   %th When
                   %th Message
                   %th
                 = render :partial => "short_message", :collection => @messages

app/views/messages/show.html.haml ¶ +3 -3

               %h3 Message
               .message
                 .stat
                   = "#{@message.sender.full_name} at #{@message.created_at}"
                 .body= simple_format(@message.body)
               %h3 Your reply:
-            - = form_for 'r_message', :url => { :action => 'reply'} do |f|
+            + = form_for 'message', url: reply_message_path(@message) do |f|
                 = f.text_area :body, :rows => 5, :cols => 100
-            -   = f.hidden_field :receiver_id, {:value => @message.sender_id }
+            +   -#= f.hidden_field :receiver_id, {:value => @message.sender_id }
-            -   = f.hidden_field :replying_message_id, {:value => @message.id }
+            +   -#= f.hidden_field :replying_message_id, {:value => @message.id }
                 = submit_tag "Post"
               %p
                 If you do not want to reply, but want to hide this message from
                 console, you can
                 = link_to "[hide]", :action => 'hide', :id => @message.id
                 this message.  (This message will be marked as replied.)

config/routes.rb ¶ +5

                 get "sources/direct_edit"
                 root :to => 'main#login'
                 #logins
                 match 'login/login',  to: 'login#login', via: [:get,:post]
                 resources :contests
                 resources :sites
                 resources :test
                 resources :messages do
+            +     member do
+            +       get 'hide'
+            +       post 'reply'
+            +     end
                   collection do
                     get 'console'
+            +       get 'list_all'
                   end
                 end
                 resources :announcements do
                   member do
                     get 'toggle','toggle_front'
                   end
                 end
                 resources :problems do
                   member do
                     get 'toggle'

app/views/messages/list.html.haml removed ¶ -26

deleted file

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

r766:4b83dfaa53e2 - Thu, 10 Oct 2019 04:38:18 - 7 files changed: 66 inserted, 62 deleted

Sign in to your account

Commit r766:4b83dfaa53e2 public

Author

r766:4b83dfaa53e2 - Thu, 10 Oct 2019 04:38:18 - 7 files changed: 66 inserted, 62 deleted

Commit `r766:4b83dfaa53e2` public