activity first try

krishnagupta21 · krishnagupta21 · commit e1ed5bb3705b · 2014-08-03T16:37:04.000+05:30
diff --git a/Gemfile b/Gemfile
@@ -65,4 +65,6 @@ gem 'will_paginate', '~> 3.0'
 
 gem 'sendgrid'
 
-gem 'acts_as_votable','~> 0.10.0'
+gem 'acts_as_votable','~> 0.10.0'
+
+gem 'public_activity'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -74,6 +74,11 @@ GEM
       mime-types
     pg (0.17.1-x86-mingw32)
     polyglot (0.3.5)
+    public_activity (1.4.1)
+      actionpack (>= 3.0.0)
+      activerecord (>= 3.0)
+      i18n (>= 0.5.0)
+      railties (>= 3.0.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -149,6 +154,7 @@ DEPENDENCIES
   jquery-rails
   paperclip (~> 3.0)
   pg
+  public_activity
   rails (= 4.0.2)
   rails_12factor
   sass-rails (~> 4.0.0)
diff --git a/app/assets/javascripts/activities.js.coffee b/app/assets/javascripts/activities.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/courselist.js b/app/assets/javascripts/courselist.js
diff --git a/app/assets/stylesheets/activities.css.scss b/app/assets/stylesheets/activities.css.scss
@@ -0,0 +1,12 @@
+// Place all the styles related to the activities controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+.activity {
+  border-bottom: solid 1px #ccc;
+  padding: 16px 0;
+  em {
+    color: #777;
+    font-size: 12px;
+    padding-left: 5px;
+  }
+}
diff --git a/app/assets/stylesheets/searchhome.css.scss b/app/assets/stylesheets/searchhome.css.scss
@@ -16,7 +16,7 @@
    margin-left:10px;
 }
 #course {
-  margin-left:8%;
+  margin-left:2%;
 }
 #year,#testname {
   margin-left:15px;
@@ -27,3 +27,4 @@
 #searchbox {
   margin-left:40%;
 }
+
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
@@ -0,0 +1,13 @@
+class ActivitiesController < ApplicationController
+  def index
+    @activities = PublicActivity::Activity.order("created_at desc").where(recipient_id: current_user, owner_type: "User")
+    @myacts = PublicActivity::Activity.order("created_at desc").where(owner_id: current_user, owner_type: "User")
+  end
+
+  #def destroy
+   # @activity = PublicActivity::Activity.find(params[:id])
+   # if @activity.destroy
+    #  redirect_to activities_url
+    #end
+  #end 
+end
diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
@@ -4,9 +4,11 @@ class AnswersController < ApplicationController
   def create
     @question = Question.find(params[:question_id])
     @answer = @question.answers.create(answer_params)
-     @answer.user = current_user 
-      @answer.save
+    @answer.user = current_user 
+    if @answer.save
+    @answer.create_activity :create, owner: current_user, recipient: @question.user
     redirect_to question_path(@question)  
+    end
   
   end
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,4 +1,5 @@
 class ApplicationController < ActionController::Base
+  include PublicActivity::StoreController
 
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
diff --git a/app/helpers/activities_helper.rb b/app/helpers/activities_helper.rb
@@ -0,0 +1,2 @@
+module ActivitiesHelper
+end
diff --git a/app/models/answer.rb b/app/models/answer.rb
@@ -1,8 +1,12 @@
 class Answer < ActiveRecord::Base
+  include PublicActivity::Common
+  #tracked owner: ->(controller, model) {controller && controller.current_user}
+
   belongs_to :question
   belongs_to :user
   validates_presence_of :body
   #has_reputation :votes, source: :user, aggregated_by: :sum
 
+
   acts_as_votable
 end
diff --git a/app/models/question.rb b/app/models/question.rb
@@ -1,4 +1,6 @@
 class Question < ActiveRecord::Base
+ # include PublicActivity::Model
+  #tracked owner: ->(controller, model) {controller && controller.current_user}
 
   has_attached_file :qstnimg, :styles => { :medium => "300x300>", :thumb => "100x100>" }, :default_url => "/images/:style/missing.png"
   validates_attachment_content_type :qstnimg, :content_type => /\Aimage/
diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
@@ -0,0 +1,38 @@
+<div class="center">
+<h1>Notifications</h1>
+<% if @activities.present? %>
+<% @activities.each do |activity| %>
+  <div class="activity">
+    <%= link_to activity.owner.first_name, activity.owner if activity.owner %>
+    added an answer to
+    <% if activity.trackable %>
+    <%#= activity.inspect %>
+    <%= link_to activity.trackable.question.name, activity.trackable.question %>
+    <br/><br/>
+       <%#= link_to 'Delete', activity_path(activity),
+                    method: :delete, data: { confirm: 'Are you sure?' } %>
+    <% end %>
+  </div>
+<% end %>
+
+<% end %>
+<!--
+<h1>Questions I have answered</h1>
+<% if @myacts.present? %>
+<% @myacts.each do |myact| %>
+  <div class="activity">
+    <%= link_to myact.owner.first_name, myact.owner if myact.owner %>
+    added an answer to
+    <% if myact.trackable %>
+    <%#= activity.inspect %>
+    <%= link_to myact.trackable.question.name, myact.trackable.question %>
+    <br/><br/>
+       <%#= link_to 'Delete', activity_path(activity),
+                    method: :delete, data: { confirm: 'Are you sure?' } %>
+    <% end %>
+  </div>
+<% end %>
+
+<% end %>
+</div>
+-->
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -42,7 +42,7 @@
             <li><%= link_to 'Logout', destroy_user_session_path, method: :delete %></li>
           </ul>
         </li>
-       <!-- <li><a href="#">Notifications</a></li>-->
+       <li><%= link_to 'Notifications', activities_path %></li>
         <% else %>
         <li> <%= link_to('Sign up/Sign in', new_user_session_path)  %>  </li>
         <%end%>
diff --git a/app/views/questions/_form.html.erb b/app/views/questions/_form.html.erb
@@ -26,36 +26,11 @@ $(document).ready(function() {
       }
 
   })
-   var availableTags = [
-      "ActionScript",
-      "AppleScript",
-      "Asp",
-      "BASIC",
-      "C",
-      "C++",
-      "Clojure",
-      "COBOL",
-      "ColdFusion",
-      "Erlang",
-      "Fortran",
-      "Groovy",
-      "Haskell",
-      "Java",
-      "JavaScript",
-      "Lisp",
-      "Perl",
-      "PHP",
-      "Python",
-      "Ruby",
-      "Scala",
-      "Scheme"
-    ];
-    $( "#tags" ).autocomplete({
-      source: availableTags
-    });
+  
    
 });
 </script>
+<%= javascript_include_tag "courselist" %>
     <%= stylesheet_link_tag "jquery-ui" %>
 <style type="text/css">
 #coursed,#yeard,#testnamed,#qnod, #checkbox, #subpart {
diff --git a/app/views/questions/_search.html.erb b/app/views/questions/_search.html.erb
@@ -1,3 +1,4 @@
+<%= javascript_include_tag "jquery-ui.min" %>
 <%= stylesheet_link_tag "searchhome" %>
   <script type="text/javascript">
 $(document).ready(function() {
@@ -27,7 +28,8 @@ $(document).ready(function() {
    
 });
 </script>
-
+<%= javascript_include_tag "courselist" %>
+<%= stylesheet_link_tag "jquery-ui" %>
 <div id="mainform">
   <br/><br/>
 <%= form_tag(questions_path, :method => "get", id: "search-form", class: "navbar-form navbar-left", role: "search", name: "qform") do %>
@@ -45,13 +47,10 @@ $(document).ready(function() {
     </select>
   </div><br/><br/>
 <div id="show">
-   <div class="form-group" id="course">
-   <select name="question[course]" class="form-control" id="selectsize">
-   <option><strong>Course Name:</strong></option>
-   <option>aps105</option>
-  </select>
+   <div class="ui-widget form-group" id="course">
+  <input id="tags" class="form-control tags" name="question[course]" placeholder="Select Course">
 </div>
-
+ 
 <div id="year" class="form-group">
    <select name="question[year]" class="form-control" id="selectsize">
    <option><strong>Year:</strong></option>
diff --git a/app/views/questions/_searchrest.html.erb b/app/views/questions/_searchrest.html.erb
@@ -1,3 +1,4 @@
+<%= javascript_include_tag "jquery-ui.min" %>
 <%= stylesheet_link_tag "index" %>
   <script type="text/javascript">
 $(document).ready(function() {
@@ -27,7 +28,8 @@ $(document).ready(function() {
    
 });
 </script>
-
+<%= javascript_include_tag "courselist" %>
+<%= stylesheet_link_tag "jquery-ui" %>
 <div id="mainforms">
   <br/><br/>
 <%= form_tag(questions_path, :method => "get", id: "search-form", class: "navbar-form navbar-left", role: "search", name: "qform") do %>
@@ -45,11 +47,8 @@ $(document).ready(function() {
     </select>
   </div><br/><br/>
 <div id="show">
-   <div class="form-group" id="courses">
-   <select name="question[course]" class="form-control" id="selectsizes">
-   <option><strong>Course Name:</strong></option>
-   <option>aps105</option>
-  </select>
+   <div class="ui-widget form-group" id="courses">
+  <input id="tags" class="form-control" name="question[course]" placeholder="Select Course">
 </div><br/>
 <div id="testnames" class="form-group">
    <select name="question[testname]" class="form-control" id="selectsizes">
diff --git a/app/views/questions/show.html.erb b/app/views/questions/show.html.erb
@@ -12,6 +12,7 @@
           <%=@question.year%> <span class="glyphicon glyphicon glyphicon-chevron-right"></span>
           <%=@question.testname%> <span class="glyphicon glyphicon glyphicon-chevron-right"></span>
           <%=@question.qno%>.<%= @question.subpart %><br/>
+
      <% end %> </strong>
    <strong>Question: </strong> <%= @question.name %><br/>
    <strong> Description:</strong> <%= @question.description %><br/>
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,7 +1,10 @@
 Ans::Application.routes.draw do
+ 
   get "questions/search"
   get "users/show"
   devise_for :users, :controllers => { registrations: 'registrations' }
+
+  resources :activities, only: :index
   resources :users
   resources :questions do 
      resources :answers do
diff --git a/db/migrate/20140801071919_create_activities.rb b/db/migrate/20140801071919_create_activities.rb
@@ -0,0 +1,23 @@
+# Migration responsible for creating a table with activities
+class CreateActivities < ActiveRecord::Migration
+  # Create table
+  def self.up
+    create_table :activities do |t|
+      t.belongs_to :trackable, :polymorphic => true
+      t.belongs_to :owner, :polymorphic => true
+      t.string  :key
+      t.text    :parameters
+      t.belongs_to :recipient, :polymorphic => true
+
+      t.timestamps
+    end
+
+    add_index :activities, [:trackable_id, :trackable_type]
+    add_index :activities, [:owner_id, :owner_type]
+    add_index :activities, [:recipient_id, :recipient_type]
+  end
+  # Drop table
+  def self.down
+    drop_table :activities
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,11 +11,28 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140729140424) do
+ActiveRecord::Schema.define(version: 20140801071919) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
+  create_table "activities", force: true do |t|
+    t.integer  "trackable_id"
+    t.string   "trackable_type"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+    t.string   "key"
+    t.text     "parameters"
+    t.integer  "recipient_id"
+    t.string   "recipient_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "activities", ["owner_id", "owner_type"], name: "index_activities_on_owner_id_and_owner_type", using: :btree
+  add_index "activities", ["recipient_id", "recipient_type"], name: "index_activities_on_recipient_id_and_recipient_type", using: :btree
+  add_index "activities", ["trackable_id", "trackable_type"], name: "index_activities_on_trackable_id_and_trackable_type", using: :btree
+
   create_table "answers", force: true do |t|
     t.string   "name"
     t.string   "body"
diff --git a/test/controllers/activities_controller_test.rb b/test/controllers/activities_controller_test.rb
@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class ActivitiesControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index
+    assert_response :success
+  end
+
+end
diff --git a/test/helpers/activities_helper_test.rb b/test/helpers/activities_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class ActivitiesHelperTest < ActionView::TestCase
+end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Place all the behaviors and hooks related to the matching controller here.`
	`2`	`+# All this logic will automatically be available in application.js.`
	`3`	`+# You can use CoffeeScript in this file: http://coffeescript.org/`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`margin-left:10px;`
`17`	`17`	`}`
`18`	`18`	`#course {`
`19`		`- margin-left:8%;`
	`19`	`+ margin-left:2%;`
`20`	`20`	`}`
`21`	`21`	`#year,#testname {`
`22`	`22`	`margin-left:15px;`
`@@ -27,3 +27,4 @@`
`27`	`27`	`#searchbox {`
`28`	`28`	`margin-left:40%;`
`29`	`29`	`}`
	`30`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`class ApplicationController < ActionController::Base`
	`2`	`+ include PublicActivity::StoreController`
`2`	`3`
`3`	`4`	`# Prevent CSRF attacks by raising an exception.`
`4`	`5`	`# For APIs, you may want to use :null_session instead.`