Certificate added

.byebug_history

@@ -1,4 +1,17 @@
 c
+dc.user_id
+current_user.id
+c
+u_id
+dc.user_id
+c_id
+dc.course_id
+c
+c_id
+c
+current_user.id
+tmpCourse.id
+c
 params[:course_id]
 c
 changeVideo()

Gemfile

@@ -50,3 +50,5 @@ end
 gem 'devise'
 gem 'omniauth-facebook'
 gem 'yt', '~> 0.28.0'
+gem 'bootstrap-sass', '~> 3.2.0'
+gem 'autoprefixer-rails'

Gemfile.lock

@@ -37,9 +37,13 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.4)
+    autoprefixer-rails (6.7.7.1)
+      execjs
     bcrypt (3.1.11)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    bootstrap-sass (3.2.0.2)
+      sass (~> 3.2)
     builder (3.2.3)
     byebug (9.0.6)
     coffee-rails (4.1.1)
@@ -178,6 +182,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  autoprefixer-rails
+  bootstrap-sass (~> 3.2.0)
   byebug
   coffee-rails (~> 4.1.0)
   devise

app/assets/javascripts/application.js

@@ -21,7 +21,7 @@
 
 
 
-$(document).ready(function(){
+
     function subSignInFunc(){
         alert("Please Sign in first!!");
     }
@@ -40,7 +40,7 @@ $(document).ready(function(){
         }
     }
 
-});
+
 
 
 

app/controllers/student_controller.rb

@@ -39,15 +39,29 @@ def unsubscribeCourse
   def doneVideo
     dv = DoneVideo.new
     dv.user_id = current_user.id
-    dv.link = params[:link]
+    dv.link_key = params[:link]
     dv.save
 
     return redirect_to '/doingCourse/'+params[:course_id]
 
   end
 
+  def accomplishment
 
+  end
+
+  def addingDoneCourse
+    if current_user.done_courses.where(course_id: params[:course_id])
+      return redirect_to '/accomplishment'
+    else
+      dc = DoneCourse.new
+      dc.user_id = current_user.id
+      dc.course_id = params[:course_id]
+      dc.save
+      return redirect_to '/accomplishment'
+    end
 
+  end
 
 
 end

app/helpers/student_helper.rb

@@ -1,2 +1,26 @@
 module StudentHelper
+
+    def courseIsDone(c_id,u_id)
+
+      # DoneCourse.all.each do |dc|
+      #
+      #   if(dc.user_id === u_id)
+      #     if (dc.course_id === c_id)
+      #
+      #       return true
+      #     else
+      #       return false
+      #     end
+      #   else
+      #     return false
+      #   end
+      # end
+      user = User.find(u_id)
+      if user.done_courses.find_by(course_id: c_id)
+        return true
+      else
+        return false
+      end
+    end
+
 end

app/models/done_course.rb

@@ -0,0 +1,3 @@
+class DoneCourse < ActiveRecord::Base
+  has_many :users
+end

app/models/user.rb

@@ -8,7 +8,7 @@ class User < ActiveRecord::Base
 
   has_many :subscribes
   has_many :courses , through: :subscribes
-
+  has_many :done_courses
 
 
 end

app/views/layouts/application.html.erb

@@ -61,7 +61,7 @@
             <button class="dropbtn"><i class="fa fa-user-circle-o fa-lg" aria-hidden="true"></i>&nbsp;<%= value%></button>
             <div class="dropdown-content" style="left:0;">
               <a href="/myCourses">My Courses</a>
-              <a href="/accomplishment/<%= current_user.id.to_s %>">Accomplishment</a>
+              <a href="/accomplishment">Accomplishment</a>
               <a href="/profile">Profile</a>
               <a href="/settings">Settings</a>
               <a href="/users/sign_out" data-method="DELETE">Log Out</a>

app/views/student/accomplishment.html.erb

@@ -0,0 +1,5 @@
+<%current_user.done_courses.each do |dc|%>
+    <% course = Course.find(dc.course_id) %>
+    <h1><%= course.title %></h1>
+    <img src=<%= course.image %> alt="photo" width="400px">
+<%end%>

app/views/student/doingCourse.html.erb

@@ -12,6 +12,7 @@
              frame.setAttribute('src', '<%= course.teaser_video %>');"><p>Intro</p></div>
     <% numOfVideos = 0
        numOfDone = 0 %>
+
     <%course.videos.each do |c|%>
         <%numOfVideos += 1%>
         <div style="display: flex;">
@@ -26,7 +27,7 @@
                 courseIsDone = false
                 DoneVideo.all.each do |dv|
                   if dv.user_id == current_user.id
-                    if dv.link == c.link.split('/')[-1]
+                    if dv.link_key == c.link.split('/')[-1]
                       courseIsDone = true
                     end
                   end
@@ -50,7 +51,7 @@
   <md-card>
   <%if numOfVideos == numOfDone %>
     <h1 style="margin-bottom: 10px;">Course Complete</h1>
-        <a style="margin-bottom: 30px;" href="/accomplishment/<%= current_user.id.to_s%>">See Certificate</a>
+        <a style="margin-bottom: 30px;" href="/addingDoneCourse/<%= params[:course_id].to_s %>">See Certificate</a>
   <%end%>
 
     <iframe id="videoFrame" src=<%= course.teaser_video %> width="420"  height=300">

app/views/student/myCourses.html.erb

@@ -1,4 +1,6 @@
 <%= current_user.id %>
+<%courseDone = false%>
+
   <md-card>
     <h2>Subscribed Courses</h2>
 
@@ -26,12 +28,25 @@
            <div style="display: flex; align-items: center;">
 
              <img class="controllingWidthOfImage" src=<%= tmpCourse.image%> alt="photo" onclick="location.href=<%=doingCourseURL%>;">
-             <div style="display: flex;flex-direction: column;">
+               <div style="display: flex;flex-direction: column;">
 
-               <p style="margin-left: 20px;"><%= tmpCourse.short_summay%></p>
-               <button style="margin-left: 20px; width: 100px;" onclick="unsubscribeConfirmation(<%= tmpCourse.id %>);">Un-subscribe</button>
+                 <p style="margin-left: 20px;"><%= tmpCourse.short_summay%></p>
 
-             </div>
+
+                <%if courseIsDone(tmpCourse.id,current_user.id) %>
+                     <div style="display: flex; margin-left: 20px;margin-top: 20px;">
+                       <i class="fa fa-check" aria-hidden="true"></i>
+                       <p>You have completed this course</p>
+                     </div>
+
+                <%else%>
+                     <button style="margin-left: 20px; width: 100px;" onclick="unsubscribeConfirmation(<%= tmpCourse.id %>);">Un-subscribe</button>
+                <%end%>
+
+                 <md-progress-linear md-mode="determinate" value="50"></md-progress-linear>
+
+
+               </div>
              </div>
          </md-card>
       <%end%>

config/routes.rb

@@ -31,7 +31,8 @@
   get '/unsubscribeCourse/:id' => 'student#unsubscribeCourse'
   post '/changeSettings' => 'student#changeSettings'
   get '/doneVideo/:link/:course_id' => 'student#doneVideo'
-
+  get '/accomplishment' => 'student#accomplishment'
+  get '/addingDoneCourse/:course_id' => 'student#addingDoneCourse'
 
   #--------------Teacher------------------#
 

db/migrate/20170325154011_change_column_name.rb

@@ -0,0 +1,5 @@
+class ChangeColumnName < ActiveRecord::Migration
+  def change
+    rename_column :done_videos, :link, :link_key
+  end
+end

db/migrate/20170325160613_create_done_courses.rb

@@ -0,0 +1,10 @@
+class CreateDoneCourses < ActiveRecord::Migration
+  def change
+    create_table :done_courses do |t|
+      t.integer :user_id
+      t.integer :course_id
+
+      t.timestamps null: false
+    end
+  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: 20170325142508) do
+ActiveRecord::Schema.define(version: 20170325160613) do
 
   create_table "courses", force: :cascade do |t|
     t.string   "category"
@@ -32,9 +32,16 @@
     t.integer  "teacher_id"
   end
 
+  create_table "done_courses", force: :cascade do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "done_videos", force: :cascade do |t|
     t.integer  "user_id"
-    t.string   "link"
+    t.string   "link_key"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end

test/fixtures/done_courses.yml

@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  user_id: 1
+  course_id: 1
+
+two:
+  user_id: 1
+  course_id: 1

test/models/done_course_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class DoneCourseTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end