cafe-grader-web

Commit r151:2e9ddcc1b233 public

parent | child
Description:
added announcement to frontpage git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@290 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r151:2e9ddcc1b233 - - 7 files changed: 38 inserted, 5 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -22,48 +22,49
22 22
23 23 def login
24 24 saved_notice = flash[:notice]
25 25 reset_session
26 26 flash[:notice] = saved_notice
27 27
28 28 #
29 29 # These are for site administrator login
30 30 #
31 31 @countries = Country.find(:all, :include => :sites)
32 32 @country_select = @countries.collect { |c| [c.name, c.id] }
33 33
34 34 @country_select_with_all = [['Any',0]]
35 35 @countries.each do |country|
36 36 @country_select_with_all << [country.name, country.id]
37 37 end
38 38
39 39 @site_select = []
40 40 @countries.each do |country|
41 41 country.sites.each do |site|
42 42 @site_select << ["#{site.name}, #{country.name}", site.id]
43 43 end
44 44 end
45 45
46 + @announcements = Announcement.find_for_frontpage
46 47 render :action => 'login', :layout => 'empty'
47 48 end
48 49
49 50 def list
50 51 prepare_list_information
51 52 end
52 53
53 54 def help
54 55 @user = User.find(session[:user_id])
55 56 end
56 57
57 58 def submit
58 59 user = User.find(session[:user_id])
59 60
60 61 @submission = Submission.new(params[:submission])
61 62 @submission.user = user
62 63 @submission.language_id = 0
63 64 if params['file']!=''
64 65 @submission.source = params['file'].read
65 66 @submission.source_filename = params['file'].original_filename
66 67 end
67 68 @submission.submitted_at = Time.new.gmtime
68 69
69 70 if Configuration[SYSTEM_MODE_CONF_KEY]=='contest' and
@@ -162,52 +163,49
162 163 response.headers['Content-Type'] = "application/force-download"
163 164 response.headers['Content-Disposition'] = "attachment; filename=\"output-#{case_num}.txt\""
164 165 response.headers["X-Sendfile"] = out_filename
165 166 response.headers['Content-length'] = File.size(out_filename)
166 167 render :nothing => true
167 168 end
168 169
169 170 def error
170 171 @user = User.find(session[:user_id])
171 172 end
172 173
173 174 protected
174 175 def prepare_list_information
175 176 @problems = Problem.find_available_problems
176 177 @prob_submissions = Array.new
177 178 @user = User.find(session[:user_id])
178 179 @problems.each do |p|
179 180 sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
180 181 if sub!=nil
181 182 @prob_submissions << { :count => sub.number, :submission => sub }
182 183 else
183 184 @prob_submissions << { :count => 0, :submission => nil }
184 185 end
185 186 end
186 -
187 - @announcements = Announcement.find(:all,
188 - :conditions => "published = 1",
189 - :order => "created_at DESC")
187 + @announcements = Announcement.find_published
190 188 end
191 189
192 190 def check_viewability
193 191 @user = User.find(session[:user_id])
194 192 if (!Configuration.show_tasks_to?(@user)) and
195 193 ((action_name=='submission') or (action_name=='submit'))
196 194 redirect_to :action => 'list' and return
197 195 end
198 196 end
199 197
200 198 def prepare_grading_result(submission)
201 199 grading_info = Configuration.task_grading_info[submission.problem.name]
202 200 @test_runs = []
203 201 if grading_info['testruns'].is_a? Integer
204 202 trun_count = grading_info['testruns']
205 203 trun_count.times do |i|
206 204 @test_runs << [ read_grading_result(@user.login,
207 205 submission.problem.name,
208 206 submission.id,
209 207 i+1) ]
210 208 end
211 209 else
212 210 grading_info['testruns'].keys.sort.each do |num|
213 211 run = []
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,2 +1,15
1 1 class Announcement < ActiveRecord::Base
2 +
3 + def self.find_published
4 + Announcement.find(:all,
5 + :conditions => "(published = 1) AND (frontpage = 0)",
6 + :order => "created_at DESC")
2 7 end
8 +
9 + def self.find_for_frontpage
10 + Announcement.find(:all,
11 + :conditions => "(published = 1) AND (frontpage = 1)",
12 + :order => "created_at DESC")
13 + end
14 +
15 + end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,27 +1,32
1 1 <h1>Editing announcement</h1>
2 2
3 3 <%= error_messages_for :announcement %>
4 4
5 5 <% form_for(@announcement) do |f| %>
6 6 <p>
7 7 <b>Body</b><br />
8 8 <%= f.text_area :body %>
9 9 </p>
10 10
11 11 <p>
12 12 <b>Author</b><br />
13 13 <%= f.text_field :author %>
14 14 </p>
15 15
16 16 <p>
17 17 <b>Published</b><br />
18 18 <%= f.check_box :published %>
19 19 </p>
20 20
21 21 <p>
22 + <b>Show on front page?</b><br />
23 + <%= f.check_box :frontpage %>
24 + </p>
25 +
26 + <p>
22 27 <%= f.submit "Update" %>
23 28 </p>
24 29 <% end %>
25 30
26 31 <%= link_to 'Show', @announcement %> |
27 32 <%= link_to 'Back', announcements_path %>
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,26 +1,31
1 1 <h1>New announcement</h1>
2 2
3 3 <%= error_messages_for :announcement %>
4 4
5 5 <% form_for(@announcement) do |f| %>
6 6 <p>
7 7 <b>Body</b><br />
8 8 <%= f.text_area :body %>
9 9 </p>
10 10
11 11 <p>
12 12 <b>Author</b><br />
13 13 <%= f.text_field :author %>
14 14 </p>
15 15
16 16 <p>
17 17 <b>Published</b><br />
18 18 <%= f.check_box :published %>
19 19 </p>
20 20
21 21 <p>
22 + <b>Show on front page?</b><br />
23 + <%= f.check_box :frontpage %>
24 + </p>
25 +
26 + <p>
22 27 <%= f.submit "Create" %>
23 28 </p>
24 29 <% end %>
25 30
26 31 <%= link_to 'Back', announcements_path %>
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,18 +1,23
1 1 <p>
2 2 <b>Author:</b>
3 3 <%=h @announcement.author %>
4 4 </p>
5 5
6 6 <p>
7 7 <b>Body:</b>
8 8 <%=h @announcement.body %>
9 9 </p>
10 10
11 11 <p>
12 12 <b>Published:</b>
13 13 <%=h @announcement.published %>
14 14 </p>
15 15
16 + <p>
17 + <b>Show on front page:</b>
18 + <%=h @announcement.frontpage %>
19 + </p>
20 +
16 21
17 22 <%= link_to 'Edit', edit_announcement_path(@announcement) %> |
18 23 <%= link_to 'Back', announcements_path %>
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,26 +1,32
1 1 %h1= Configuration['ui.front.title']
2 2
3 + - if @announcements.length!=0
4 + .announcementbox
5 + %span{:class => 'title'}
6 + Announcements
7 + = render :partial => 'announcement', :collection => @announcements
8 +
3 9 %b= Configuration['ui.front.welcome_message']
4 10 %br/
5 11 Please login to see the problem list.
6 12 %br/
7 13 %br/
8 14
9 15 - if flash[:notice]
10 16 %hr/
11 17 %b= flash[:notice]
12 18 %hr/
13 19
14 20 %div{ :style => "border: solid 1px gray; padding: 2px; background: #f0f0f0;"}
15 21 - form_tag :controller => 'login', :action => 'login' do
16 22 %table
17 23 %tr
18 24 %td{:align => "right"} Login:
19 25 %td= text_field_tag 'login'
20 26 %tr
21 27 %td{:align => "right"} Password:
22 28 %td= password_field_tag
23 29 = submit_tag 'Login'
24 30
25 31 %br/
26 32
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,43 +1,44
1 1 # This file is auto-generated from the current state of the database. Instead of editing this file,
2 2 # please use the migrations feature of Active Record to incrementally modify your database, and
3 3 # then regenerate this schema definition.
4 4 #
5 5 # Note that this schema.rb definition is the authoritative source for your database schema. If you need
6 6 # to create the application database on another system, you should be using db:schema:load, not running
7 7 # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
8 8 # you'll amass, the slower it'll run and the greater likelihood for issues).
9 9 #
10 10 # It's strongly recommended to check this file into your version control system.
11 11
12 - ActiveRecord::Schema.define(:version => 20081012050458) do
12 + ActiveRecord::Schema.define(:version => 20081107145815) do
13 13
14 14 create_table "announcements", :force => true do |t|
15 15 t.string "author"
16 16 t.text "body"
17 17 t.boolean "published"
18 18 t.datetime "created_at"
19 19 t.datetime "updated_at"
20 + t.boolean "frontpage", :default => false
20 21 end
21 22
22 23 create_table "configurations", :force => true do |t|
23 24 t.string "key"
24 25 t.string "value_type"
25 26 t.string "value"
26 27 t.datetime "created_at"
27 28 t.datetime "updated_at"
28 29 end
29 30
30 31 create_table "countries", :force => true do |t|
31 32 t.string "name"
32 33 t.datetime "created_at"
33 34 t.datetime "updated_at"
34 35 end
35 36
36 37 create_table "descriptions", :force => true do |t|
37 38 t.text "body"
38 39 t.boolean "markdowned"
39 40 t.datetime "created_at"
40 41 t.datetime "updated_at"
41 42 end
42 43
43 44 create_table "grader_processes", :force => true do |t|
You need to be logged in to leave comments. Login now