Description:
Merge pull request #6 from nattee/master update mail functionality. Update syntax for mail gem (we might need mor...
Commit status:
[Not Reviewed]
References:
merge default
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment

r361:fae81d234a8a - - 8 files changed: 116 inserted, 10 deleted

@@ -0,0 +1,18
1 +
2 +
3 + = form_tag({action: :user_stat_max }) do
4 + .submitbox
5 + %table
6 + %tr
7 + %td{colspan: 6, style: 'font-weight: bold'} Query maximum score in submission range
8 + %tr
9 + %td{style: 'width: 120px; font-weight: bold'} Submission ID:
10 + %td{align: 'right'} From:
11 + %td= text_field_tag 'since_id', params[:since_id], style: 'width:40px'
12 + %td To:
13 + %td= text_field_tag 'until_id', params[:until_id], style: 'width:40px'
14 + %td= submit_tag 'query'
15 + %tr
16 + %td
17 + %td{colspan: 5} Leave blank for uncondition
18 +
@@ -0,0 +1,44
1 + %h1 User grading results
2 + %h2 Show max scores in submission range
3 +
4 + - if @problem and @problem.errors
5 + =error_messages_for 'problem'
6 +
7 + = render partial: 'submission_range'
8 +
9 + - if @log
10 + %h3 Import log
11 + %pre.import-log
12 + = @log
13 +
14 + %p= link_to '[Show only latest submissions]', controller: :user_admin, action: :user_stat
15 +
16 + %table.info
17 + %thead
18 + %tr.info-head
19 + %th User
20 + %th Name
21 + %th Activated?
22 + %th Logged in
23 + %th Contest(s)
24 + - @problems.each do |p|
25 + %th= p.name
26 + %th Total
27 + %th Passed
28 + %tbody
29 + - @scorearray.each do |sc|
30 + %tr{class: cycle('info-even','info-odd')}
31 + - total,num_passed = 0,0
32 + - sc.each_index do |i|
33 + - if i == 0
34 + %td= sc[i].login
35 + %td= sc[i].full_name
36 + %td= sc[i].activated
37 + %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no'
38 + %td= sc[i].contests.collect {|c| c.name}.join(', ')
39 + - else
40 + %td= sc[i][0]
41 + - total += sc[i][0]
42 + - num_passed += 1 if sc[i][1]
43 + %td= total
44 + %td= num_passed
@@ -84,102 +84,123
84 user = User.new({:login => login,
84 user = User.new({:login => login,
85 :full_name => full_name,
85 :full_name => full_name,
86 :password => password,
86 :password => password,
87 :password_confirmation => password,
87 :password_confirmation => password,
88 :alias => user_alias})
88 :alias => user_alias})
89 user.activated = true
89 user.activated = true
90 user.save
90 user.save
91
91
92 if added_random_password
92 if added_random_password
93 note << "'#{login}' (+)"
93 note << "'#{login}' (+)"
94 else
94 else
95 note << login
95 note << login
96 end
96 end
97 end
97 end
98 end
98 end
99 flash[:notice] = 'User(s) ' + note.join(', ') +
99 flash[:notice] = 'User(s) ' + note.join(', ') +
100 ' were successfully created. ' +
100 ' were successfully created. ' +
101 '( (+) - created with random passwords.)'
101 '( (+) - created with random passwords.)'
102 redirect_to :action => 'list'
102 redirect_to :action => 'list'
103 end
103 end
104
104
105 def edit
105 def edit
106 @user = User.find(params[:id])
106 @user = User.find(params[:id])
107 end
107 end
108
108
109 def update
109 def update
110 @user = User.find(params[:id])
110 @user = User.find(params[:id])
111 if @user.update_attributes(params[:user])
111 if @user.update_attributes(params[:user])
112 flash[:notice] = 'User was successfully updated.'
112 flash[:notice] = 'User was successfully updated.'
113 redirect_to :action => 'show', :id => @user
113 redirect_to :action => 'show', :id => @user
114 else
114 else
115 render :action => 'edit'
115 render :action => 'edit'
116 end
116 end
117 end
117 end
118
118
119 def destroy
119 def destroy
120 User.find(params[:id]).destroy
120 User.find(params[:id]).destroy
121 redirect_to :action => 'list'
121 redirect_to :action => 'list'
122 end
122 end
123
123
124 def user_stat
124 def user_stat
125 @problems = Problem.find_available_problems
125 @problems = Problem.find_available_problems
126 @users = User.find(:all, :include => [:contests, :contest_stat])
126 @users = User.find(:all, :include => [:contests, :contest_stat])
127 @scorearray = Array.new
127 @scorearray = Array.new
128 @users.each do |u|
128 @users.each do |u|
129 ustat = Array.new
129 ustat = Array.new
130 ustat[0] = u
130 ustat[0] = u
131 @problems.each do |p|
131 @problems.each do |p|
132 - sub = Submission.find_last_by_user_and_problem(u.id,p.id)
132 + sub = Submission.find_last_by_user_and_problem(u.id,p.id)
133 - if (sub!=nil) and (sub.points!=nil)
133 + if (sub!=nil) and (sub.points!=nil)
134 - ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
134 + ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
135 - else
135 + else
136 - ustat << [0,false]
136 + ustat << [0,false]
137 - end
137 + end
138 + end
139 + @scorearray << ustat
140 + end
141 + end
142 +
143 + def user_stat_max
144 + @problems = Problem.find_available_problems
145 + @users = User.find(:all, :include => [:contests, :contest_stat])
146 + @scorearray = Array.new
147 + #set up range from param
148 + since_id = params.fetch(:since_id, 0).to_i
149 + until_id = params.fetch(:until_id, 0).to_i
150 + @users.each do |u|
151 + ustat = Array.new
152 + ustat[0] = u
153 + @problems.each do |p|
154 + max_points = 0
155 + Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
156 + max_points = sub.points if sub and sub.points and (sub.points > max_points)
157 + end
158 + ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
138 end
159 end
139 @scorearray << ustat
160 @scorearray << ustat
140 end
161 end
141 end
162 end
142
163
143 def import
164 def import
144 if params[:file]==''
165 if params[:file]==''
145 flash[:notice] = 'Error importing no file'
166 flash[:notice] = 'Error importing no file'
146 redirect_to :action => 'list' and return
167 redirect_to :action => 'list' and return
147 end
168 end
148 import_from_file(params[:file])
169 import_from_file(params[:file])
149 end
170 end
150
171
151 def random_all_passwords
172 def random_all_passwords
152 users = User.find(:all)
173 users = User.find(:all)
153 @prefix = params[:prefix] || ''
174 @prefix = params[:prefix] || ''
154 @non_admin_users = User.find_non_admin_with_prefix(@prefix)
175 @non_admin_users = User.find_non_admin_with_prefix(@prefix)
155 @changed = false
176 @changed = false
156 if request.request_method == 'POST'
177 if request.request_method == 'POST'
157 @non_admin_users.each do |user|
178 @non_admin_users.each do |user|
158 password = random_password
179 password = random_password
159 user.password = password
180 user.password = password
160 user.password_confirmation = password
181 user.password_confirmation = password
161 user.save
182 user.save
162 end
183 end
163 @changed = true
184 @changed = true
164 end
185 end
165 end
186 end
166
187
167 # contest management
188 # contest management
168
189
169 def contests
190 def contests
170 @contest, @users = find_contest_and_user_from_contest_id(params[:id])
191 @contest, @users = find_contest_and_user_from_contest_id(params[:id])
171 @contests = Contest.enabled
192 @contests = Contest.enabled
172 end
193 end
173
194
174 def assign_from_list
195 def assign_from_list
175 contest_id = params[:users_contest_id]
196 contest_id = params[:users_contest_id]
176 org_contest, users = find_contest_and_user_from_contest_id(contest_id)
197 org_contest, users = find_contest_and_user_from_contest_id(contest_id)
177 contest = Contest.find(params[:new_contest][:id])
198 contest = Contest.find(params[:new_contest][:id])
178 if !contest
199 if !contest
179 flash[:notice] = 'Error: no contest'
200 flash[:notice] = 'Error: no contest'
180 redirect_to :action => 'contests', :id =>contest_id
201 redirect_to :action => 'contests', :id =>contest_id
181 end
202 end
182
203
183 note = []
204 note = []
184 users.each do |u|
205 users.each do |u|
185 u.contests = [contest]
206 u.contests = [contest]
@@ -84,73 +84,73
84 end
84 end
85 render :action => 'confirm', :layout => 'empty'
85 render :action => 'confirm', :layout => 'empty'
86 end
86 end
87
87
88 def forget
88 def forget
89 render :action => 'forget', :layout => 'empty'
89 render :action => 'forget', :layout => 'empty'
90 end
90 end
91
91
92 def retrieve_password
92 def retrieve_password
93 email = params[:email]
93 email = params[:email]
94 user = User.find_by_email(email)
94 user = User.find_by_email(email)
95 if user
95 if user
96 last_updated_time = user.updated_at || user.created_at || (Time.now.gmtime - 1.hour)
96 last_updated_time = user.updated_at || user.created_at || (Time.now.gmtime - 1.hour)
97 if last_updated_time > Time.now.gmtime - 5.minutes
97 if last_updated_time > Time.now.gmtime - 5.minutes
98 flash[:notice] = 'The account has recently created or new password has recently been requested. Please wait for 5 minutes'
98 flash[:notice] = 'The account has recently created or new password has recently been requested. Please wait for 5 minutes'
99 else
99 else
100 user.password = user.password_confirmation = User.random_password
100 user.password = user.password_confirmation = User.random_password
101 user.save
101 user.save
102 send_new_password_email(user)
102 send_new_password_email(user)
103 flash[:notice] = 'New password has been mailed to you.'
103 flash[:notice] = 'New password has been mailed to you.'
104 end
104 end
105 else
105 else
106 flash[:notice] = I18n.t 'registration.password_retrieval.no_email'
106 flash[:notice] = I18n.t 'registration.password_retrieval.no_email'
107 end
107 end
108 redirect_to :action => 'forget'
108 redirect_to :action => 'forget'
109 end
109 end
110
110
111 protected
111 protected
112
112
113 def verify_online_registration
113 def verify_online_registration
114 if !GraderConfiguration['system.online_registration']
114 if !GraderConfiguration['system.online_registration']
115 redirect_to :controller => 'main', :action => 'login'
115 redirect_to :controller => 'main', :action => 'login'
116 end
116 end
117 end
117 end
118
118
119 def send_confirmation_email(user)
119 def send_confirmation_email(user)
120 contest_name = GraderConfiguration['contest.name']
120 contest_name = GraderConfiguration['contest.name']
121 activation_url = url_for(:action => 'confirm',
121 activation_url = url_for(:action => 'confirm',
122 :login => user.login,
122 :login => user.login,
123 :activation => user.activation_key)
123 :activation => user.activation_key)
124 home_url = url_for(:controller => 'main', :action => 'index')
124 home_url = url_for(:controller => 'main', :action => 'index')
125 mail_subject = "[#{contest_name}] Confirmation"
125 mail_subject = "[#{contest_name}] Confirmation"
126 mail_body = t('registration.email_body', {
126 mail_body = t('registration.email_body', {
127 :full_name => user.full_name,
127 :full_name => user.full_name,
128 :contest_name => contest_name,
128 :contest_name => contest_name,
129 :login => user.login,
129 :login => user.login,
130 :password => user.password,
130 :password => user.password,
131 :activation_url => activation_url,
131 :activation_url => activation_url,
132 - :admin_email => admin_email
132 + :admin_email => GraderConfiguration['system.admin_email']
133 })
133 })
134
134
135 logger.info mail_body
135 logger.info mail_body
136
136
137 send_mail(user.email, mail_subject, mail_body)
137 send_mail(user.email, mail_subject, mail_body)
138 end
138 end
139
139
140 def send_new_password_email(user)
140 def send_new_password_email(user)
141 contest_name = GraderConfiguration['contest.name']
141 contest_name = GraderConfiguration['contest.name']
142 mail_subject = "[#{contest_name}] Password recovery"
142 mail_subject = "[#{contest_name}] Password recovery"
143 mail_body = t('registration.password_retrieval.email_body', {
143 mail_body = t('registration.password_retrieval.email_body', {
144 :full_name => user.full_name,
144 :full_name => user.full_name,
145 :contest_name => contest_name,
145 :contest_name => contest_name,
146 :login => user.login,
146 :login => user.login,
147 :password => user.password,
147 :password => user.password,
148 - :admin_email => admin_email
148 + :admin_email => GraderConfiguration['system.admin_email']
149 })
149 })
150
150
151 logger.info mail_body
151 logger.info mail_body
152
152
153 send_mail(user.email, mail_subject, mail_body)
153 send_mail(user.email, mail_subject, mail_body)
154 end
154 end
155
155
156 end
156 end
@@ -68,66 +68,66
68 rescue
68 rescue
69 nil
69 nil
70 end
70 end
71 end
71 end
72
72
73 def user_title_bar(user)
73 def user_title_bar(user)
74 header = ''
74 header = ''
75 time_left = ''
75 time_left = ''
76
76
77 #
77 #
78 # if the contest is over
78 # if the contest is over
79 if GraderConfiguration.time_limit_mode?
79 if GraderConfiguration.time_limit_mode?
80 if user.contest_finished?
80 if user.contest_finished?
81 header = <<CONTEST_OVER
81 header = <<CONTEST_OVER
82 <tr><td colspan="2" align="center">
82 <tr><td colspan="2" align="center">
83 <span class="contest-over-msg">THE CONTEST IS OVER</span>
83 <span class="contest-over-msg">THE CONTEST IS OVER</span>
84 </td></tr>
84 </td></tr>
85 CONTEST_OVER
85 CONTEST_OVER
86 end
86 end
87 if !user.contest_started?
87 if !user.contest_started?
88 time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
88 time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
89 else
89 else
90 time_left = "&nbsp;&nbsp;" + (t 'title_bar.remaining_time') +
90 time_left = "&nbsp;&nbsp;" + (t 'title_bar.remaining_time') +
91 " #{format_short_duration(user.contest_time_left)}"
91 " #{format_short_duration(user.contest_time_left)}"
92 end
92 end
93 end
93 end
94
94
95 #
95 #
96 # if the contest is in the anaysis mode
96 # if the contest is in the anaysis mode
97 if GraderConfiguration.analysis_mode?
97 if GraderConfiguration.analysis_mode?
98 header = <<ANALYSISMODE
98 header = <<ANALYSISMODE
99 <tr><td colspan="2" align="center">
99 <tr><td colspan="2" align="center">
100 <span class="contest-over-msg">ANALYSIS MODE</span>
100 <span class="contest-over-msg">ANALYSIS MODE</span>
101 </td></tr>
101 </td></tr>
102 ANALYSISMODE
102 ANALYSISMODE
103 end
103 end
104
104
105 contest_name = GraderConfiguration['contest.name']
105 contest_name = GraderConfiguration['contest.name']
106
106
107 #
107 #
108 # build real title bar
108 # build real title bar
109 result = <<TITLEBAR
109 result = <<TITLEBAR
110 <div class="title">
110 <div class="title">
111 <table>
111 <table>
112 #{header}
112 #{header}
113 <tr>
113 <tr>
114 <td class="left-col">
114 <td class="left-col">
115 #{user.full_name}<br/>
115 #{user.full_name}<br/>
116 - #{t 'title_bar.current_time'} #{format_short_time(Time.new)}
116 + #{t 'title_bar.current_time'} #{format_short_time(Time.zone.now)}
117 #{time_left}
117 #{time_left}
118 <br/>
118 <br/>
119 </td>
119 </td>
120 <td class="right-col">#{contest_name}</td>
120 <td class="right-col">#{contest_name}</td>
121 </tr>
121 </tr>
122 </table>
122 </table>
123 </div>
123 </div>
124 TITLEBAR
124 TITLEBAR
125 result.html_safe
125 result.html_safe
126 end
126 end
127
127
128 def markdown(text)
128 def markdown(text)
129 markdown = RDiscount.new(text)
129 markdown = RDiscount.new(text)
130 markdown.to_html.html_safe
130 markdown.to_html.html_safe
131 end
131 end
132
132
133 end
133 end
@@ -1,84 +1,91
1 class Submission < ActiveRecord::Base
1 class Submission < ActiveRecord::Base
2
2
3 belongs_to :language
3 belongs_to :language
4 belongs_to :problem
4 belongs_to :problem
5 belongs_to :user
5 belongs_to :user
6
6
7 before_validation :assign_problem
7 before_validation :assign_problem
8 before_validation :assign_language
8 before_validation :assign_language
9
9
10 validates_presence_of :source
10 validates_presence_of :source
11 validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
11 validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
12 validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
12 validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
13 validate :must_have_valid_problem
13 validate :must_have_valid_problem
14 validate :must_specify_language
14 validate :must_specify_language
15
15
16 before_save :assign_latest_number_if_new_recond
16 before_save :assign_latest_number_if_new_recond
17
17
18 def self.find_last_by_user_and_problem(user_id, problem_id)
18 def self.find_last_by_user_and_problem(user_id, problem_id)
19 last_sub = find(:first,
19 last_sub = find(:first,
20 :conditions => {:user_id => user_id,
20 :conditions => {:user_id => user_id,
21 :problem_id => problem_id},
21 :problem_id => problem_id},
22 :order => 'number DESC')
22 :order => 'number DESC')
23 return last_sub
23 return last_sub
24 end
24 end
25
25
26 def self.find_all_last_by_problem(problem_id)
26 def self.find_all_last_by_problem(problem_id)
27 # need to put in SQL command, maybe there's a better way
27 # need to put in SQL command, maybe there's a better way
28 Submission.find_by_sql("SELECT * FROM submissions " +
28 Submission.find_by_sql("SELECT * FROM submissions " +
29 "WHERE id = " +
29 "WHERE id = " +
30 "(SELECT MAX(id) FROM submissions AS subs " +
30 "(SELECT MAX(id) FROM submissions AS subs " +
31 "WHERE subs.user_id = submissions.user_id AND " +
31 "WHERE subs.user_id = submissions.user_id AND " +
32 "problem_id = " + problem_id.to_s + " " +
32 "problem_id = " + problem_id.to_s + " " +
33 "GROUP BY user_id) " +
33 "GROUP BY user_id) " +
34 "ORDER BY user_id")
34 "ORDER BY user_id")
35 end
35 end
36
36
37 + def self.find_in_range_by_user_and_problem(user_id, problem_id,since_id,until_id)
38 + records = Submission.where(problem_id: problem_id,user_id: user_id)
39 + records = records.where('id >= ?',since_id) if since_id > 0
40 + records = records.where('id <= ?',until_id) if until_id > 0
41 + records.all
42 + end
43 +
37 def self.find_last_for_all_available_problems(user_id)
44 def self.find_last_for_all_available_problems(user_id)
38 submissions = Array.new
45 submissions = Array.new
39 problems = Problem.find_available_problems
46 problems = Problem.find_available_problems
40 problems.each do |problem|
47 problems.each do |problem|
41 sub = Submission.find_last_by_user_and_problem(user_id, problem.id)
48 sub = Submission.find_last_by_user_and_problem(user_id, problem.id)
42 submissions << sub if sub!=nil
49 submissions << sub if sub!=nil
43 end
50 end
44 submissions
51 submissions
45 end
52 end
46
53
47 def self.find_by_user_problem_number(user_id, problem_id, number)
54 def self.find_by_user_problem_number(user_id, problem_id, number)
48 Submission.find(:first,
55 Submission.find(:first,
49 :conditions => {
56 :conditions => {
50 :user_id => user_id,
57 :user_id => user_id,
51 :problem_id => problem_id,
58 :problem_id => problem_id,
52 :number => number
59 :number => number
53 })
60 })
54 end
61 end
55
62
56 def self.find_all_by_user_problem(user_id, problem_id)
63 def self.find_all_by_user_problem(user_id, problem_id)
57 Submission.find(:all,
64 Submission.find(:all,
58 :conditions => {
65 :conditions => {
59 :user_id => user_id,
66 :user_id => user_id,
60 :problem_id => problem_id,
67 :problem_id => problem_id,
61 })
68 })
62 end
69 end
63
70
64 def download_filename
71 def download_filename
65 if self.problem.output_only
72 if self.problem.output_only
66 return self.source_filename
73 return self.source_filename
67 else
74 else
68 timestamp = self.submitted_at.localtime.strftime("%H%M%S")
75 timestamp = self.submitted_at.localtime.strftime("%H%M%S")
69 return "#{self.problem.name}-#{timestamp}.#{self.language.ext}"
76 return "#{self.problem.name}-#{timestamp}.#{self.language.ext}"
70 end
77 end
71 end
78 end
72
79
73 protected
80 protected
74
81
75 def self.find_option_in_source(option, source)
82 def self.find_option_in_source(option, source)
76 if source==nil
83 if source==nil
77 return nil
84 return nil
78 end
85 end
79 i = 0
86 i = 0
80 source.each_line do |s|
87 source.each_line do |s|
81 if s =~ option
88 if s =~ option
82 words = s.split
89 words = s.split
83 return words[1]
90 return words[1]
84 end
91 end
@@ -1,43 +1,48
1 <h1>User grading results</h1>
1 <h1>User grading results</h1>
2 + <h2>Show scores from latest submission</h2>
3 +
4 + <%= render 'submission_range' %>
5 +
6 + <p>Latest scores</p>
2
7
3 <table class="info">
8 <table class="info">
4 <tr class="info-head">
9 <tr class="info-head">
5 <th>User</th>
10 <th>User</th>
6 <th>Name</th>
11 <th>Name</th>
7 <th>Activated?</th>
12 <th>Activated?</th>
8 <th>Logged in</th>
13 <th>Logged in</th>
9 <th>Contest(s)</th>
14 <th>Contest(s)</th>
10 <% @problems.each do |p| %>
15 <% @problems.each do |p| %>
11 <th><%= p.name %></th>
16 <th><%= p.name %></th>
12 <% end %>
17 <% end %>
13 <th>Total</th>
18 <th>Total</th>
14 <th>Passed</th>
19 <th>Passed</th>
15 </tr>
20 </tr>
16 <% counter = 0 %>
21 <% counter = 0 %>
17 <% @scorearray.each do |sc| %>
22 <% @scorearray.each do |sc| %>
18 <tr class="<%= (counter %2 ==0) ? "info-even" : "info-odd" %>">
23 <tr class="<%= (counter %2 ==0) ? "info-even" : "info-odd" %>">
19 <% total = 0 %>
24 <% total = 0 %>
20 <% num_passed = 0 %>
25 <% num_passed = 0 %>
21 <% sc.each_index do |i| %>
26 <% sc.each_index do |i| %>
22 <% if i==0 %>
27 <% if i==0 %>
23 <td><%= sc[i].login %></td>
28 <td><%= sc[i].login %></td>
24 <td><%= sc[i].full_name %></td>
29 <td><%= sc[i].full_name %></td>
25 <td><%= sc[i].activated %></td>
30 <td><%= sc[i].activated %></td>
26 <td>
31 <td>
27 <%= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no' %>
32 <%= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no' %>
28 </td>
33 </td>
29 <td>
34 <td>
30 <%= sc[i].contests.collect {|c| c.name}.join(', ') %>
35 <%= sc[i].contests.collect {|c| c.name}.join(', ') %>
31 </td>
36 </td>
32 <% else %>
37 <% else %>
33 <td><%= sc[i][0] %></td>
38 <td><%= sc[i][0] %></td>
34 <% total += sc[i][0] %>
39 <% total += sc[i][0] %>
35 <% num_passed += 1 if sc[i][1] %>
40 <% num_passed += 1 if sc[i][1] %>
36 <% end %>
41 <% end %>
37 <% end %>
42 <% end %>
38 <td><%= total %></td>
43 <td><%= total %></td>
39 <td><%= num_passed %></td>
44 <td><%= num_passed %></td>
40 </tr>
45 </tr>
41 <% counter += 1 %>
46 <% counter += 1 %>
42 <% end %>
47 <% end %>
43 </table>
48 </table>
@@ -1,30 +1,41
1 module MailHelperMethods
1 module MailHelperMethods
2
2
3 def send_mail(mail_to, mail_subject, mail_body)
3 def send_mail(mail_to, mail_subject, mail_body)
4 mail_from = GraderConfiguration['system.online_registration.from']
4 mail_from = GraderConfiguration['system.online_registration.from']
5 smtp_server = GraderConfiguration['system.online_registration.smtp']
5 smtp_server = GraderConfiguration['system.online_registration.smtp']
6
6
7 if ['fake', 'debug'].include? smtp_server
7 if ['fake', 'debug'].include? smtp_server
8 puts "-------------------------
8 puts "-------------------------
9 To: #{mail_to}
9 To: #{mail_to}
10 From: #{mail_from}
10 From: #{mail_from}
11 Subject: #{mail_subject}
11 Subject: #{mail_subject}
12 #{mail_body}
12 #{mail_body}
13 --------------------------
13 --------------------------
14 "
14 "
15 return true
15 return true
16 end
16 end
17
17
18 mail = Mail.new do
18 mail = Mail.new do
19 from mail_from
19 from mail_from
20 to mail_to
20 to mail_to
21 subject mail_subject
21 subject mail_subject
22 body mail_body
22 body mail_body
23 end
23 end
24
24
25 - mail.delivery_settings = { :address => smtp_server }
25 + mail_option = {
26 + :address => smtp_server,
27 + # :domain => nil,
28 + # :port => 25,
29 + # :user_name => nil,
30 + # :password => nil,
31 + # :authentication=>'plain',
32 + # :enable_starttls_auto => true
33 + }
34 +
35 + mail.delivery_method :smtp, mail_option
36 +
26 mail.deliver
37 mail.deliver
27 end
38 end
28
39
29 end
40 end
30
41
You need to be logged in to leave comments. Login now