cafe-grader-web Commit - r361:fae81d234a8a

cafe-grader-web

parent | child

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

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r361:fae81d234a8a - Sun, 24 Aug 2014 02:28:56 - 8 files changed: 110 inserted, 4 deleted

app/views/user_admin/_submission_range.html.haml created 644 ¶ +18

			@@ -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	+

app/views/user_admin/user_stat_max.html.haml created 644 ¶ +44

			@@ -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

app/controllers/user_admin_controller.rb ¶ +21

                   end
                 end
+            +   def user_stat_max
+            +     @problems = Problem.find_available_problems
+            +     @users = User.find(:all, :include => [:contests, :contest_stat])
+            +     @scorearray = Array.new
+            +     #set up range from param
+            +     since_id = params.fetch(:since_id, 0).to_i
+            +     until_id = params.fetch(:until_id, 0).to_i
+            +     @users.each do |u|
+            +       ustat = Array.new
+            +       ustat[0] = u
+            +       @problems.each do |p|
+            +         max_points = 0
+            +         Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
+            +           max_points = sub.points if sub and sub.points and (sub.points > max_points)
+            +         end
+            +         ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
+            +       end
+            +       @scorearray << ustat
+            +     end
+            +   end
+            +
                 def import
                   if params[:file]==''
                     flash[:notice] = 'Error importing no file'

app/controllers/users_controller.rb ¶ +2 -2

                                   :login => user.login,
                                   :password => user.password,
                                   :activation_url => activation_url,
-            -                     :admin_email => admin_email
+            +                     :admin_email => GraderConfiguration['system.admin_email']
                                 })
                   logger.info mail_body
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
-            -                     :admin_email => admin_email
+            +                     :admin_email => GraderConfiguration['system.admin_email']
                                 })
                   logger.info mail_body

app/helpers/application_helper.rb ¶ +1 -1

               <tr>
               <td class="left-col">
               #{user.full_name}<br/>
-            - #{t 'title_bar.current_time'} #{format_short_time(Time.new)}
+            + #{t 'title_bar.current_time'} #{format_short_time(Time.zone.now)}
               #{time_left}
               <br/>
               </td>

app/models/submission.rb ¶ +7

                                          "ORDER BY user_id")
                 end
+            +   def self.find_in_range_by_user_and_problem(user_id, problem_id,since_id,until_id)
+            +     records = Submission.where(problem_id: problem_id,user_id: user_id)
+            +     records = records.where('id >= ?',since_id) if since_id > 0
+            +     records = records.where('id <= ?',until_id) if until_id > 0
+            +     records.all
+            +   end
+            +
                 def self.find_last_for_all_available_problems(user_id)
                   submissions = Array.new
                   problems = Problem.find_available_problems

app/views/user_admin/user_stat.html.erb ¶ +5

               <h1>User grading results</h1>
+            + <h2>Show scores from latest submission</h2>
+            +
+            + <%= render 'submission_range' %>
+            +
+            + <p>Latest scores</p>
               <table class="info">
               <tr class="info-head">

lib/mail_helper_methods.rb ¶ +12 -1

                     body mail_body
                   end
-            -     mail.delivery_settings = { :address => smtp_server }
+            +     mail_option = {
+            +       :address => smtp_server,
+            + #      :domain => nil,
+            + #      :port => 25,
+            + #      :user_name => nil,
+            + #      :password => nil,
+            + #      :authentication=>'plain',
+            + #      :enable_starttls_auto => true
+            +     }
+            +
+            +     mail.delivery_method :smtp, mail_option
+            +
                   mail.deliver
                 end

You need to be logged in to leave comments. Login now

	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