cafe-grader-web Commit - r296:3e5af2413b70

cafe-grader-web

Commit `r296:3e5af2413b70` public

parent | child

Description:

sends notification emails to users after contest upgrade.

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

r296:3e5af2413b70 - Sun, 28 Mar 2010 18:55:40 - 8 files changed: 163 inserted, 82 deleted

lib/mail_helper_methods.rb created 644 ¶ +36

@@ -0,0 +1,36
	1	+ module MailHelperMethods
	2	+
	3	+ def send_mail(to, subject, body)
	4	+ mail = TMail::Mail.new
	5	+ mail.to = to
	6	+ mail.from = Configuration['system.online_registration.from']
	7	+ mail.subject = subject
	8	+ mail.body = body
	9	+
	10	+ smtp_server = Configuration['system.online_registration.smtp']
	11	+
	12	+ if ['fake', 'debug'].include? smtp_server
	13	+ puts "-------------------------
	14	+ To: #{mail.to}
	15	+ From: #{mail.from}
	16	+ Subject: #{mail.subject}
	17	+ #{mail.body}
	18	+ --------------------------
	19	+ "
	20	+ return true
	21	+ end
	22	+
	23	+ begin
	24	+ Net::SMTP.start(smtp_server) do \|smtp\|
	25	+ smtp.send_message(mail.to_s, mail.from, mail.to)
	26	+ end
	27	+ result = true
	28	+ rescue
	29	+ result = false
	30	+ end
	31	+
	32	+ result
	33	+ end
	34	+
	35	+ end
	36	+

app/controllers/application_controller.rb ¶ +1

                   # check if run in single user mode
                   if Configuration[SINGLE_USER_MODE_CONF_KEY]
                     user = User.find(session[:user_id])
                     if user==nil or (not user.admin?)
                       redirect_to :controller => 'main', :action => 'login'
                       return false
                     end
                     return true
                   end
                   if Configuration.multicontests?
                     user = User.find(session[:user_id])
+            +       return true if user.admin?
                     begin
                       if user.contest_stat(true).forced_logout
                         flash[:notice] = 'You have been automatically logged out.'
                         redirect_to :controller => 'main', :action => 'index'
                       end
                     rescue
                     end
                   end
                   return true
                 end
                 def authorization

app/controllers/user_admin_controller.rb ¶ +21

               class UserAdminController < ApplicationController
+            +   include MailHelperMethods
+            +
                 before_filter :admin_authorization
                 def index
                   list
                   render :action => 'list'
                 end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy,
                                                     :create, :create_from_list,
                                                     :update ],
                        :redirect_to => { :action => :list }
                         end
                       elsif operation=='remove'
                         user.contests.delete(contest)
                       else
                         user.contests = [contest]
                       end
                       if params[:reset_timer]
                         user.contest_stat.forced_logout = true
                         user.contest_stat.reset_timer_and_save
                       end
+            +         if params[:notification_emails]
+            +           send_contest_update_notification_email(user, contest)
+            +         end
+            +
                       note << user.login
                       users << user
                     end
                   end
                   if params[:reset_timer]
                     logout_users(users)
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'contest_management'
                 end
                 def logout_users(users)
                   users.each do |user|
                     contest_stat = user.contest_stat(true)
                     if contest_stat and !contest_stat.forced_logout
                       contest_stat.forced_logout = true
                       contest_stat.save
                     end
                   end
                 end
+            +   def send_contest_update_notification_email(user, contest)
+            +     contest_title_name = Configuration['contest.name']
+            +     contest_name = contest.name
+            +     subject = t('contest.notification.email_subject', {
+            +                   :contest_title_name => contest_title_name,
+            +                   :contest_name => contest_name })
+            +     body = t('contest.notification.email_body', {
+            +                :full_name => user.full_name,
+            +                :contest_title_name => contest_title_name,
+            +                :contest_name => contest.name,
+            +              })
+            +
+            +     logger.info body
+            +     send_mail(user.email, subject, body)
+            +   end
               end

app/controllers/users_controller.rb ¶ +23 -50

               require 'tmail'
               require 'net/smtp'
               class UsersController < ApplicationController
+            +   include MailHelperMethods
+            +
                 before_filter :authenticate, :except => [:new,
                                                          :register,
                                                          :confirm,
                                                          :forget,
                                                          :retrieve_password]
                 before_filter :verify_online_registration, :only => [:new,
                                                                      :register,
                                                                      :forget,
                                                                      :retrieve_password]
                 verify :method => :post, :only => [:chg_passwd],
                   if !Configuration['system.online_registration']
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end
                 def send_confirmation_email(user)
                   contest_name = Configuration['contest.name']
                   admin_email = Configuration['system.admin_email']
                   activation_url = url_for(:action => 'confirm',
                                            :login => user.login,
                                            :activation => user.activation_key)
                   home_url = url_for(:controller => 'main', :action => 'index')
-            -     mail = TMail::Mail.new
+            +     subject = "[#{contest_name}] Confirmation"
-            -     mail.to = user.email
+            +     body = t('registration.email_body', {
-            -     mail.from = Configuration['system.online_registration.from']
+            +                :full_name => user.full_name,
-            -     mail.subject = "[#{contest_name}] Confirmation"
+            +                :contest_name => contest_name,
-            -     mail.body = t('registration.email_body', {
+            +                :login => user.login,
-            -                     :full_name => user.full_name,
+            +                :password => user.password,
-            -                     :contest_name => contest_name,
+            +                :activation_url => activation_url,
-            -                     :login => user.login,
+            +                :admin_email => admin_email
-            -                     :password => user.password,
+            +              })
-            -                     :activation_url => activation_url,
-            -                     :admin_email => admin_email
-            -                   })
-            -     logger.info mail.body
+            +     logger.info body
-            -     smtp_server = Configuration['system.online_registration.smtp']
-            -     begin
+            +     send_mail(user.email, subject, body)
-            -       Net::SMTP.start(smtp_server) do |smtp|
-            -         smtp.send_message(mail.to_s, mail.from, mail.to)
-            -       end
-            -       result = true
-            -     rescue
-            -       result = false
-            -     end
-            -     return result
                 end
                 def send_new_password_email(user)
                   contest_name = Configuration['contest.name']
                   admin_email = Configuration['system.admin_email']
-            -     mail = TMail::Mail.new
+            +     subject = "[#{contest_name}] Password recovery"
-            -     mail.to = user.email
+            +     body = t('registration.password_retrieval.email_body', {
-            -     mail.from = Configuration['system.online_registration.from']
+            +                :full_name => user.full_name,
-            -     mail.subject = "[#{contest_name}] Password recovery"
+            +                :contest_name => contest_name,
-            -     mail.body = t('registration.password_retrieval.email_body', {
+            +                :login => user.login,
-            -                     :full_name => user.full_name,
+            +                :password => user.password,
-            -                     :contest_name => contest_name,
+            +                :admin_email => admin_email
-            -                     :login => user.login,
+            +              })
-            -                     :password => user.password,
-            -                     :admin_email => admin_email
-            -                   })
-            -     logger.info mail.body
+            +     logger.info body
+            +     send_mail(user.email, subject, body)
-            -     smtp_server = Configuration['system.online_registration.smtp']
-            -     begin
-            -       Net::SMTP.start(smtp_server) do |smtp|
-            -         smtp.send_message(mail.to_s, mail.from, mail.to)
-            -       end
-            -       result = true
-            -     rescue
-            -       result = false
-            -     end
-            -     return result
                 end
               end

app/views/user_admin/contest_management.html.haml ¶ +14 -7

               %h1 Bulk edit users in contests
               - form_tag :action => 'manage_contest' do
                 List users' login below; one per line.
                 %br/
                 = text_area_tag 'login_list', nil, :rows => 23, :cols => 80
                 %br/
-            -   You want to
+            +   %table
-            -   = select(nil,"operation",[['assign users to','assign'],['add users to','add'],['remove users from','remove']])
+            +     %tr
-            -   contest
+            +       %td{:valign => 'top'}
-            -   = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
+            +         You want to
-            -   = check_box_tag 'reset_timer'
+            +         = select(nil,"operation",[['assign users to','assign'],['add users to','add'],['remove users from','remove']])
-            -   Auto-reset current contest timer.
+            +         contest
-            -   %br/
+            +         = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
+            +         and also
+            +       %td
+            +         = check_box_tag 'reset_timer'
+            +         Auto-reset current contest timer.
+            +         %br/
+            +         = check_box_tag 'notification_emails'
+            +         Send notification email(s).
                 = submit_tag "Perform action!", :confirm => 'Are you sure?'
               %hr/
               = link_to '[go back to index]', :action => 'index'

config/locales/en.yml ¶ +12

                     email_body: "Hello {{full_name}},
               You have requested for new password for {{contest_name}}.  We have generated it for you:
               user name: {{login}}
               password: {{password}}
               If you didn't ask for new password or you're not the person who registered,
               please ignore this e-mail and inform {{admin_email}} of this mistake.
               Thanks!"
+            +   contest:
+            +     notification:
+            +       email_subject: "[{{contest_title_name}}] You have been upgraded to {{contest_name}}"
+            +       email_body: "Congratulations {{full_name}},
+            +
+            + You have advanced to contest {{contest_name}} in {{contest_title_name}}.
+            +
+            + You can now log-in and start participating in that contest.
+            +
+            + Cheers!
+            + -{{contest_title_name}} Admin"
+            +
                 help:
                   how_to_submit: "How to submit"
                   must_specify_language: "You <b>must</b> specify the language you are using in your program header.  You can optionally specify the task you are submitting to."
                   list_available_language: "The possible language options are <tt>C</tt>, <tt>C++</tt>, and <tt>Pascal</tt>. The follow are examples."
                   accept_only_language_specified: "The server <b>will not</b> accept your submission, if you do not specify the language."
                   specifying_task: "Optionally, you can also specify the task with <tt>TASK:</tt> <i>taskname</i>.  On the first page, the taskname for each task is shown in parentheses."
                   example_cpp: "For example, suppose you are using <tt>C++</tt> to write task <b>mobiles</b>, you put the following on top of your source code."
                   example_pas: "If you are using <tt>Pascal</tt> to write the same task, you'll use"
                   ask_questions_at_messages: "If you have any problems, you can ask at [<a href=\"{{url}}\">{{message_link_name}}</a>]."
                 activerecord:
                   attributes:

config/locales/th.yml ¶ +15 -3

               คุณได้ลงทะเบียนเข้าร่วมการแข่งขัน {{contest_name}}
               บัญชีเข้าใช้ของคุณคือ: {{login}}
               รหัสผ่านคือ: {{password}}
               กรุณาเข้าลิงก์ต่อไปนี้:
               {{activation_url}}
               เพื่อเปิดใช้งานบัญชีของคุณ
-            - ถ้าคุณไม่ใช้คนที่ลงทะเบียน กรุณาละทิ้ง e-mail ฉบับนี้
+            + ถ้าคุณไม่ใช่คนที่ลงทะเบียน กรุณาละทิ้ง e-mail ฉบับนี้
-            - และแจ้งความผิดพลาดนี้กับ {{admin_email}}
+            + และแจ้งความผิดพลาดนี้กับ {{admin_email}} ด้วย
               ขอบคุณมาก!"
                   email_sent: "เราได้ส่งข้อมูลสำหรับยืนยันไปให้คุณแล้ว (โปรดอย่าลืมตรวจดูในส่วน Junk mail ด้วย)"
                   email_verify_at: "กรุณาตรวจสอบที่ {{email}} พร้อมทั้งยืนยัน"
                   activation_sucessful_title: "บัณชีผู้ใช้ได้รับการยืนยันแล้ว"
                   account_activated: "บัญชีผู้ใช้ของคุณพร้อมใช้งานแล้ว"
                   activation_failed_title: "การยืนยันล้มเหลว"
                   errors:
                     header: "การขอรหัสผ่านใหม่"
                     instructions: "กรุณากรอก e-mail ที่ลงทะเบียน"
                     button_label: "ขอรหัสผ่านใหม่"
                     no_email: "ไม่มีบัญชีผู้ใช้ที่ใช้ e-mail ดังกล่าว"
                     email_body: "สวัสดีครับ {{full_name}},
               คุณได้ร้องขอรหัสผ่านใหม่ สำหรับการแข่งขัน {{contest_name}} ซึ่งเราได้สร้างให้คุณแล้ว ดังนี้
               บัญชีเข้าใช้ของคุณคือ: {{login}}
               รหัสผ่านคือ: {{password}}
               ถ้าคุณไม่ได้ขอรหัสผ่านใหม่ หรือไม่ใช่คนที่ลงทะเบียน กรุณาละทิ้ง e-mail ฉบับนี้
-            - และแจ้งความผิดพลาดนี้กับ {{admin_email}}
+            + และแจ้งความผิดพลาดนี้กับ {{admin_email}} ด้วย
               ขอบคุณมาก!"
+            +
+            +   contest:
+            +     notification:
+            +       email_subject: "[{{contest_title_name}}] คุณได้รับการเลื่อนขั้นสู่ระดับ {{contest_name}}"
+            +       email_body: "ขอแสดงความยินดีด้วย คุณ{{full_name}}
+            +
+            + คุณได้รับการเลื่อนขั้นให้สามารถแข่งขันในการแข่งขันระดับ {{contest_name}} ของ {{contest_title_name}} แล้ว
+            +
+            + คุณสามารถเข้าสู่ระบบเพื่อทำโจทย์ได้ทันที คุณสามารถแข่งในระดับ {{contest_name}} ได้จนกระทั่งการแข่งขันรอบนี้สิ้นสุดลง
+            +
+            + -ทีมงาน {{contest_title_name}}"
+            +
                 help:
                   how_to_submit: "วิธีการส่งโปรแกรม"
                   must_specify_language: "คุณ<b>ต้อง</b>ระบุภาษาโปรแกรมที่ใช้ที่ตอนต้นของรหัสโปรแกรม (source code) นอกจากนี้คุณอาจจะระบุโจทย์ที่ต้องการส่งได้ด้วย"
                   list_available_language: "ภาษาโปรแกรมที่สามารถระบุได้คือ <tt>C</tt>, <tt>C++</tt>, และ <tt>Pascal</tt>   ด้านล่างแสดงตัวอย่างของการระบุสำหรับภาษาต่าง ๆ"
                   accept_only_language_specified: "ระบบจะ<b>ไม่รับ</b>โปรแกรมที่ส่งถ้าคุณไม่ได้ระบุภาษาที่ใช้"
                   specifying_task: "นอกจากนี้ คุณยังสามารถระบุชื่อของโจทย์ที่ต้องการส่งเพิ่มเติมได้ ในการระบุให้ใส่ <tt>TASK:</tt> <i>taskname</i> คุณสามารถตรวจสอบชื่อของโจทย์ได้ โดยจะแสดงในวงเล็บหลังชื่อภาษาไทยของโจทย์"
                   example_cpp: "ยกตัวอย่างเช่น ถ้าคุณใช้ภาษา <tt>C++</tt> สำหรับเขียนโจทย์ <tt>mobiles</tt> ตอนต้นโปรแกรมคุณจะใส่ดังนี้"
                   example_pas: "ถ้าคุณใช้ภาษา <tt>Pascal</tt> เพื่อเขียนโจทย์ข้อเดียวกัน คุณจะระบุ"
                   ask_questions_at_messages: "ถ้ามีปัญหาในการใช้งานสามารถสอบถามได้ที่หน้า<a href=\"{{url}}\">{{message_link_name}}</a>"
                 activerecord:

spec/integration/contest_managements_spec.rb ¶ +41 -22

                 before(:each) do
                   @admin_user = users(:mary)
                   @contest_b = contests(:contest_b)
                   @james = users(:james)
                   @jack = users(:jack)
                   set_contest_time_limit('3:00')
                   set_indv_contest_mode
                   enable_multicontest
                 end
                 it "should reset users' timer when their contests change" do
-            -     james_session = open_session
+            +     session = open_session
-            -     james_session.extend(MainSessionMethods)
+            +     session.extend(MainSessionMethods)
-            -     james_login_and_get_main_list(james_session)
+            +     james_login_and_get_main_list(session)
-            -     james_session.response.should_not have_text(/OVER/)
+            +     session.response.should_not have_text(/OVER/)
                   Delorean.time_travel_to(190.minutes.since) do
-            -       james_session.get_main_list
+            +       session.get_main_list
-            -       james_session.response.should have_text(/OVER/)
+            +       session.response.should have_text(/OVER/)
-            -       james_session.get '/'                   # logout
+            +       session.get '/'                   # logout
-            -       james_session.get '/main/list'          # clearly log out
+            +       session.get '/main/list'          # clearly log out
-            -       james_session.response.should_not render_template 'main/list'
+            +       session.response.should_not render_template 'main/list'
                     admin_change_users_contest_to("james", @contest_b, true)
-            -       james_login_and_get_main_list(james_session)
+            +       james_login_and_get_main_list(session)
-            -       james_session.response.should_not have_text(/OVER/)
+            +       session.response.should_not have_text(/OVER/)
                   end
                 end
                 it "should force users to log out when their contests change" do
-            -     james_session = open_session
+            +     session = open_session
-            -     james_session.extend(MainSessionMethods)
+            +     session.extend(MainSessionMethods)
-            -     james_login_and_get_main_list(james_session)
+            +     james_login_and_get_main_list(session)
-            -     james_session.response.should_not have_text(/OVER/)
+            +     session.response.should_not have_text(/OVER/)
                   Delorean.time_travel_to(190.minutes.since) do
-            -       james_session.get_main_list
+            +       session.get_main_list
-            -       james_session.response.should have_text(/OVER/)
+            +       session.response.should have_text(/OVER/)
                     admin_change_users_contest_to("james", @contest_b, true)
-            -       james_session.get '/main/list'
+            +       session.get '/main/list'
-            -       james_session.response.should_not render_template 'main/list'
+            +       session.response.should_not render_template 'main/list'
-            -       james_session.should be_redirect
+            +       session.should be_redirect
                     Delorean.time_travel_to(200.minutes.since) do
-            -         james_login_and_get_main_list(james_session)
+            +         james_login_and_get_main_list(session)
-            -         james_session.response.should_not have_text(/OVER/)
+            +         session.response.should_not have_text(/OVER/)
                     end
                   end
                 end
+            +   it "should maintain admin logged-in sessions even when their contests change" do
+            +     session = open_session
+            +     session.extend(MainSessionMethods)
+            +
+            +     session.login('mary', 'goodbye')
+            +     session.get_main_list
+            +     session.response.should_not have_text(/OVER/)
+            +
+            +     Delorean.time_travel_to(190.minutes.since) do
+            +       session.get_main_list
+            +       session.response.should have_text(/OVER/)
+            +
+            +       admin_change_users_contest_to("mary", @contest_b, true)
+            +
+            +       session.get '/main/list'
+            +       session.response.should render_template 'main/list'
+            +     end
+            +   end
+            +
                 private
                 module MainSessionMethods
                   def login(login_name, password)
                     post '/login/login', :login => login_name, :password => password
                     assert_redirected_to '/main/list'
                   end
                   def get_main_list
                     get '/main/list'
                     assert_template 'main/list'
                   end

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

r296:3e5af2413b70 - Sun, 28 Mar 2010 18:55:40 - 8 files changed: 163 inserted, 82 deleted

Sign in to your account

Commit r296:3e5af2413b70 public

Author

r296:3e5af2413b70 - Sun, 28 Mar 2010 18:55:40 - 8 files changed: 163 inserted, 82 deleted

Commit `r296:3e5af2413b70` public