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

                   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.'

app/controllers/user_admin_controller.rb ¶ +21

@@ -1,5 +1,7
1	class UserAdminController < ApplicationController	1	class UserAdminController < ApplicationController
2		2
		3	+ include MailHelperMethods
		4	+
3	before_filter :admin_authorization	5	before_filter :admin_authorization
4		6
5	def index	7	def index
@@ -215,6 +217,10
215	user.contest_stat.reset_timer_and_save	217	user.contest_stat.reset_timer_and_save
216	end	218	end
217		219
		220	+ if params[:notification_emails]
		221	+ send_contest_update_notification_email(user, contest)
		222	+ end
		223	+
218	note << user.login	224	note << user.login
219	users << user	225	users << user
220	end	226	end
@@ -344,4 +350,19
344	end	350	end
345	end	351	end
346		352
		353	+ def send_contest_update_notification_email(user, contest)
		354	+ contest_title_name = Configuration['contest.name']
		355	+ contest_name = contest.name
		356	+ subject = t('contest.notification.email_subject', {
		357	+ :contest_title_name => contest_title_name,
		358	+ :contest_name => contest_name })
		359	+ body = t('contest.notification.email_body', {
		360	+ :full_name => user.full_name,
		361	+ :contest_title_name => contest_title_name,
		362	+ :contest_name => contest.name,
		363	+ })
		364	+
		365	+ logger.info body
		366	+ send_mail(user.email, subject, body)
		367	+ end
347	end	368	end

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

@@ -3,6 +3,8
3		3
4	class UsersController < ApplicationController	4	class UsersController < ApplicationController
5		5
		6	+ include MailHelperMethods
		7	+
6	before_filter :authenticate, :except => [:new,	8	before_filter :authenticate, :except => [:new,
7	:register,	9	:register,
8	:confirm,	10	:confirm,
@@ -122,64 +124,35
122	:login => user.login,	124	:login => user.login,
123	:activation => user.activation_key)	125	:activation => user.activation_key)
124	home_url = url_for(:controller => 'main', :action => 'index')	126	home_url = url_for(:controller => 'main', :action => 'index')
125	- mail = TMail::Mail.new	127	+ subject = "[#{contest_name}] Confirmation"
126	- mail.to = user.email	128	+ body = t('registration.email_body', {
127	- mail.from = Configuration['system.online_registration.from']	129	+ :full_name => user.full_name,
128	- mail.subject = "[#{contest_name}] Confirmation"	130	+ :contest_name => contest_name,
129	- mail.body = t('registration.email_body', {	131	+ :login => user.login,
130	- ~~:full_name~~ => user.~~full_name~~,	132	+ :password => user.password,
131	- :contest_name => contest_name,	133	+ :activation_url => activation_url,
132	- :login => user.login,	134	+ :admin_email => admin_email
133	- :password => user.password,	135	+ })
134	- :activation_url => activation_url,
135	- :admin_email => admin_email
136	- })
137		136
138	- logger.info ~~mail~~.body	137	+ logger.info body
139	-
140	- smtp_server = Configuration['system.online_registration.smtp']
141		138
142	- begin	139	+ send_mail(user.email, subject, body)
143	- Net::SMTP.start(smtp_server) do \|smtp\|
144	- smtp.send_message(mail.to_s, mail.from, mail.to)
145	- end
146	- result = true
147	- rescue
148	- result = false
149	- end
150	-
151	- return result
152	end	140	end
153		141
154	def send_new_password_email(user)	142	def send_new_password_email(user)
155	contest_name = Configuration['contest.name']	143	contest_name = Configuration['contest.name']
156	admin_email = Configuration['system.admin_email']	144	admin_email = Configuration['system.admin_email']
157	- mail = TMail::Mail.new	145	+ subject = "[#{contest_name}] Password recovery"
158	- mail.to = user.email	146	+ body = t('registration.password_retrieval.email_body', {
159	- mail.from = Configuration['system.online_registration.from']	147	+ :full_name => user.full_name,
160	- mail.subject = "[#{contest_name}] Password recovery"	148	+ :contest_name => contest_name,
161	- mail.body = t('registration.password_retrieval.email_body', {	149	+ :login => user.login,
162	- ~~:full_name~~ => user.~~full_name~~,	150	+ :password => user.password,
163	- :contest_name => contest_name,	151	+ :admin_email => admin_email
164	- :login => user.login,	152	+ })
165	- :password => user.password,
166	- :admin_email => admin_email
167	- })
168		153
169	- logger.info ~~mail~~.body	154	+ logger.info body
170	-	155	+ send_mail(user.email, subject, body)
171	- smtp_server = Configuration['system.online_registration.smtp']
172	-
173	- begin
174	- Net::SMTP.start(smtp_server) do \|smtp\|
175	- smtp.send_message(mail.to_s, mail.from, mail.to)
176	- end
177	- result = true
178	- rescue
179	- result = false
180	- end
181	-
182	- return result
183	end	156	end
184		157
185	end	158	end

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

@@ -5,13 +5,20
5	%br/	5	%br/
6	= text_area_tag 'login_list', nil, :rows => 23, :cols => 80	6	= text_area_tag 'login_list', nil, :rows => 23, :cols => 80
7	%br/	7	%br/
8	- You want to	8	+ %table
9	- = select(nil,"operation",[['assign users to','assign'],['add users to','add'],['remove users from','remove']])	9	+ %tr
10	- contest	10	+ %td{:valign => 'top'}
11	- = select("contest","id",Contest.all.collect {\|c\| [c.title, c.id]})	11	+ You want to
12	- = check_box_tag 'reset_timer'	12	+ = select(nil,"operation",[['assign users to','assign'],['add users to','add'],['remove users from','remove']])
13	- Auto-reset current contest timer.	13	+ contest
14	- %br/	14	+ = select("contest","id",Contest.all.collect {\|c\| [c.title, c.id]})
		15	+ and also
		16	+ %td
		17	+ = check_box_tag 'reset_timer'
		18	+ Auto-reset current contest timer.
		19	+ %br/
		20	+ = check_box_tag 'notification_emails'
		21	+ Send notification email(s).
15		22
16	= submit_tag "Perform action!", :confirm => 'Are you sure?'	23	= submit_tag "Perform action!", :confirm => 'Are you sure?'
17		24

config/locales/en.yml ¶ +12

@@ -119,6 +119,18
119		119
120	Thanks!"	120	Thanks!"
121		121
		122	+ contest:
		123	+ notification:
		124	+ email_subject: "[{{contest_title_name}}] You have been upgraded to {{contest_name}}"
		125	+ email_body: "Congratulations {{full_name}},
		126	+
		127	+ You have advanced to contest {{contest_name}} in {{contest_title_name}}.
		128	+
		129	+ You can now log-in and start participating in that contest.
		130	+
		131	+ Cheers!
		132	+ -{{contest_title_name}} Admin"
		133	+
122	help:	134	help:
123	how_to_submit: "How to submit"	135	how_to_submit: "How to submit"
124	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."	136	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."

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

               เพื่อเปิดใช้งานบัญชีของคุณ
-            - ถ้าคุณไม่ใช้คนที่ลงทะเบียน กรุณาละทิ้ง e-mail ฉบับนี้
+            + ถ้าคุณไม่ใช่คนที่ลงทะเบียน กรุณาละทิ้ง e-mail ฉบับนี้
-            - และแจ้งความผิดพลาดนี้กับ {{admin_email}}
+            + และแจ้งความผิดพลาดนี้กับ {{admin_email}} ด้วย
               ขอบคุณมาก!"
               รหัสผ่านคือ: {{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: "วิธีการส่งโปรแกรม"

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

                 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

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