add catagory

app/controllers/articles_controller.rb

@@ -2,7 +2,10 @@ class ArticlesController < ApplicationController
   before_action :set_article, only: [:show, :edit, :update, :destroy]
 
   def index
-    @articles = Article.where("era = ?", get_era).order("id DESC").page(params[:page])
+    @articles = Article.where("catagory = 0 AND pinned = true AND era = ?", get_era).order("id DESC")
+    @articles += Article.where("catagory = 0 AND pinned != true AND era = ?", get_era).order("id DESC")
+    @courses = Article.where("catagory = 1 AND pinned = true AND era = ?", get_era).order("id DESC")
+    @courses += Article.where("catagory = 1 AND pinned != true AND era = ?", get_era).order("id DESC")
   end
 
   def create
@@ -81,6 +84,8 @@ def article_params
       :title,
       :content,
       :page,
+      :pinned,
+      :catagory,
       attachments_attributes:
       [
         :id,

app/models/attachment.rb

@@ -1,4 +1,6 @@
 class Attachment < ActiveRecord::Base
+  default_scope order('id ASC')
+
   belongs_to :article
 
   mount_uploader :path, AttachmentUploader

app/models/contest_problem_joint.rb

@@ -1,4 +1,6 @@
 class ContestProblemJoint < ActiveRecord::Base
+  default_scope order('id ASC')
+
   belongs_to :contest
   belongs_to :problem
 end

app/models/post.rb

@@ -1,4 +1,6 @@
 class Post < ActiveRecord::Base
+  default_scope order('id ASC')
+
   belongs_to :problem
   has_many :comments, dependent: :destroy
 

app/models/problem.rb

@@ -1,4 +1,6 @@
 class Problem < ActiveRecord::Base
+  default_scope order('id ASC')
+
   has_many :submissions, dependent: :destroy
   has_many :testdata, dependent: :destroy
   has_many :posts, dependent: :destroy

app/models/testdata_set.rb

@@ -1,3 +1,4 @@
 class TestdataSet < ActiveRecord::Base
+  default_scope order('id ASC')
   belongs_to :problem
 end

app/models/testdatum.rb

@@ -1,4 +1,6 @@
 class Testdatum < ActiveRecord::Base
+  default_scope order('id ASC')
+
   belongs_to :problem
   has_one :limit, dependent: :destroy
   accepts_nested_attributes_for :limit, :allow_destroy => true

app/models/user.rb

@@ -1,4 +1,5 @@
 class User < ActiveRecord::Base
+  default_scope order('id ASC')
   has_many :submissions#, :dependent => :destroy
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable

app/views/articles/_form.html.erb

@@ -10,6 +10,18 @@
     </div>
   <% end %>
 
+  <div class="field">
+    <%= f.check_box :pinned %><%= f.label :pinned, "Pin to top" %>
+  </div>
+
+  <div>
+  <%= f.label :catagory %><br>
+  <%= f.select :catagory, options_for_select([
+  ["Announcements", 0], 
+  ["Course Materials", 1]
+  ], params[:catagory]) %>
+  </div>
+
   <div class="field">
     <%= f.label :title %><br>
     <%= f.text_field :title %>

app/views/articles/index.html.erb

@@ -1,21 +1,24 @@
-<h4 class="page-header">Announcements</h4>
+<h4 class="page-header">Bulletin</h4>
+
+<%= select_tag :era_select, options_for_select([[2014,2014],[2013,2013],[2012,2012]], params[:era]) %>
+<br>
 
 <% if user_signed_in? && current_user.admin == true %>
-  <br><%= link_to 'New Article', new_article_path(:era => params[:era]) %>
+  <%= link_to 'New Announcement', new_article_path(:era => params[:era], :catagory => 0) %><br>
 <% end %>
 
-<%= select_tag :era_select, options_for_select([[2014,2014],[2013,2013]], params[:era]) %>
-
 <script>
   $('#era_select').bind('change', function() { window.location.href = '<%= articles_path.to_s + "?era=" %>' + $(this).val() });
 </script>
 
+<strong>Announcements</strong>
 <table class="table">
   <thead>
     <tr>
+      <th></th>
       <th>Title</th>
-      <th>Arthur</th>
       <th>Time</th>
+      <th>Arthur</th>
       <% if user_signed_in? && current_user.admin == true %>
         <th></th>
         <th></th>
@@ -25,9 +28,44 @@
   <tbody>
     <% @articles.each do |a| %>
       <tr>
+        <td><%= image_tag("DrawingPin1_Blue.png", size: "20x20") if a.pinned and a.pinned == true %></td>
         <td><%= link_to a.title, article_path(a) %></td>
+        <td><%= a.created_at.to_s(:clean) %></td>
         <td><%= link_to a.arthur_id, user_path(a.arthur_id) %></td>
+        <% if user_signed_in? && current_user.admin == true %>
+          <td><%= link_to 'Edit', edit_article_path(a), :class => 'btn btn-info btn-xs' %></td>
+          <td><%= link_to 'Destroy', a, method: :delete, data: { confirm: 'Are you sure?' }, :class=>'btn btn-xs btn-danger' %></td>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<% if user_signed_in? && current_user.admin == true %>
+  <%= link_to 'New Course Material', new_article_path(:era => params[:era], :catagory => 1) %><br>
+<% end %>
+
+<strong>Course Materials</strong>
+<table class="table">
+  <thead>
+    <tr>
+      <th></th>
+      <th>Title</th>
+      <th>Time</th>
+      <th>Arthur</th>
+      <% if user_signed_in? && current_user.admin == true %>
+        <th></th>
+        <th></th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <% @courses.each do |a| %>
+      <tr>
+        <td><%= image_tag("DrawingPin1_Blue.png", size: "20x20") if a.pinned and a.pinned == true %></td>
+        <td><%= link_to a.title, article_path(a) %></td>
         <td><%= a.created_at.to_s(:clean) %></td>
+        <td><%= link_to a.arthur_id, user_path(a.arthur_id) %></td>
         <% if user_signed_in? && current_user.admin == true %>
           <td><%= link_to 'Edit', edit_article_path(a), :class => 'btn btn-info btn-xs' %></td>
           <td><%= link_to 'Destroy', a, method: :delete, data: { confirm: 'Are you sure?' }, :class=>'btn btn-xs btn-danger' %></td>

app/views/contests/dashboard.html.erb

@@ -1,6 +1,6 @@
-<h1 class='page-header'>
+<h4 class="page-header">
   Dashboard : <%= @contest.title %>
-</h1>
+</h4>
 <div class="well well-lg">
 <table class="table">
   <thead>

app/views/contests/edit.html.erb

@@ -1,4 +1,4 @@
-<h1>Editing contest</h1>
+<h4 class="page-header">Editing contest</h4>
 
 <%= render 'form' %>
 

db/migrate/20140622065458_add_pinned_to_articles.rb

@@ -0,0 +1,5 @@
+class AddPinnedToArticles < ActiveRecord::Migration
+  def change
+    add_column :articles, :pinned, :bool
+  end
+end

db/migrate/20140622073308_add_catagory_to_articles.rb

@@ -0,0 +1,5 @@
+class AddCatagoryToArticles < ActiveRecord::Migration
+  def change
+    add_column :articles, :catagory, :integer
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140622041407) do
+ActiveRecord::Schema.define(version: 20140622073308) do
 
   create_table "articles", force: true do |t|
     t.string   "title"
@@ -20,6 +20,8 @@
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "era"
+    t.boolean  "pinned"
+    t.integer  "catagory"
   end
 
   create_table "attachments", force: true do |t|