cafe-grader-web Commit - r103:c7b351b3b685

cafe-grader-web

Commit `r103:c7b351b3b685` public

parent | child

Description:

[web] better ui for announcement and prob stat git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@195 6386c4cd-e34a-4fa8-8920-d93eb39b512e

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

r103:c7b351b3b685 - Sat, 26 Apr 2008 08:15:19 - 3 files changed: 6 inserted, 2 deleted

app/controllers/announcements_controller.rb ¶ +2 -1

               class AnnouncementsController < ApplicationController
                 before_filter :authenticate
                 before_filter { |controller| controller.authorization_by_roles(['admin'])}
                 in_place_edit_for :announcement, :published
                 # GET /announcements
                 # GET /announcements.xml
                 def index
-            -     @announcements = Announcement.find(:all)
+            +     @announcements = Announcement.find(:all,
+            +                                        :order => "created_at DESC")
                   respond_to do |format|
                     format.html # index.html.erb
                     format.xml  { render :xml => @announcements }
                   end
                 end
                 # GET /announcements/1
                 # GET /announcements/1.xml
                 def show
                   @announcement = Announcement.find(params[:id])
                   respond_to do |format|
                     format.html # show.html.erb
                     format.xml  { render :xml => @announcement }
                   end
                 end
                 # GET /announcements/new
                 # GET /announcements/new.xml
                 def new
                   @announcement = Announcement.new
                   respond_to do |format|
                     format.html # new.html.erb
                     format.xml  { render :xml => @announcement }
                   end
                 end
                 # GET /announcements/1/edit
                 def edit
                   @announcement = Announcement.find(params[:id])
                 end
                 # POST /announcements
                 # POST /announcements.xml
                 def create
                   @announcement = Announcement.new(params[:announcement])
                   respond_to do |format|
                     if @announcement.save
                       flash[:notice] = 'Announcement was successfully created.'
                       format.html { redirect_to(@announcement) }
                       format.xml  { render :xml => @announcement, :status => :created, :location => @announcement }
                     else
                       format.html { render :action => "new" }
                       format.xml  { render :xml => @announcement.errors, :status => :unprocessable_entity }
                     end

app/models/submission.rb ¶ +2 -1

               class Submission < ActiveRecord::Base
                 belongs_to :language
                 belongs_to :problem
                 belongs_to :user
                 before_validation :assign_problem
                 before_validation :assign_language
                 validates_presence_of :source
                 validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
                 validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
                 validate :must_have_valid_problem
                 validate :must_specify_language
                 before_save :assign_latest_number_if_new_recond
                 def self.find_last_by_user_and_problem(user_id, problem_id)
                   last_sub = find(:first,
                                   :conditions => {:user_id => user_id,
                                     :problem_id => problem_id},
                                   :order => 'number DESC')
                   return last_sub
                 end
                 def self.find_all_last_by_problem(problem_id)
                   # need to put in SQL command, maybe there's a better way
                   Submission.find_by_sql("SELECT * FROM submissions " +
               			   "WHERE id = " +
               			   "(SELECT MAX(id) FROM submissions AS subs " +
               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
-            - 			   "GROUP BY user_id)")
+            + 			   "GROUP BY user_id) " +
+            +                            "ORDER BY user_id")
                 end
                 def self.find_last_for_all_available_problems(user_id)
                   submissions = Array.new
                   problems = Problem.find_available_problems
                   problems.each do |problem|
                     sub = Submission.find_last_by_user_and_problem(user_id, problem.id)
                     submissions << sub if sub!=nil
                   end
                   submissions
                 end
                 def self.find_by_user_problem_number(user_id, problem_id, number)
                   Submission.find(:first,
                                   :conditions => {
                                     :user_id => user_id,
                                     :problem_id => problem_id,
                                     :number => number
                                   })
                 end
                 def self.find_all_by_user_problem(user_id, problem_id)
                   Submission.find(:all,
                                   :conditions => {
                                     :user_id => user_id,
                                     :problem_id => problem_id,
                                   })
                 end
                 protected
                 def self.find_option_in_source(option, source)
                   if source==nil
                     return nil
                   end
                   i = 0
                   source.each_line do |s|
                     if s =~ option
               	words = s.split
               	return words[1]
                     end
                     i = i + 1
                     if i==10
               	return nil
                     end
                   end
                   return nil
                 end

app/views/announcements/index.html.erb ¶ +2

               <% content_for :head do %>
                 <%= stylesheet_link_tag 'scaffold' %>
                 <%= javascript_include_tag :defaults %>
               <% end %>
               <h1>Listing announcements</h1>
+            + <%= link_to 'New announcement', new_announcement_path %>
+            +
               <table>
                 <tr>
                   <th>Body</th>
                   <th>Author</th>
                   <th>Published</th>
                 </tr>
               <% for announcement in @announcements %>
                 <tr>
                   <% @announcement = announcement %>
                   <td><%=h announcement.body %></td>
                   <td><%=h announcement.author %></td>
                   <td><%= in_place_editor_field :announcement, :published, {}, :rows => 1 %></td>
                   <td><%= link_to 'Show', announcement %></td>
                   <td><%= link_to 'Edit', edit_announcement_path(announcement) %></td>
                   <td><%= link_to 'Destroy', announcement, :confirm => 'Are you sure?', :method => :delete %></td>
                 </tr>
               <% end %>
               </table>
               <br />
               <%= link_to 'New announcement', new_announcement_path %>

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

Commit r103:c7b351b3b685 public

Author

r103:c7b351b3b685 - Sat, 26 Apr 2008 08:15:19 - 3 files changed: 6 inserted, 2 deleted

Commit `r103:c7b351b3b685` public