diff --git a/app/Http/Controllers/AutograderController.php b/app/Http/Controllers/AutograderController.php
index b349bd6d9d349ce709e036a4aa4a78270bf6cff4..4f85b0f2b6cd7e29c75ff5a1e499fe349f3dde23 100644
--- a/app/Http/Controllers/AutograderController.php
+++ b/app/Http/Controllers/AutograderController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 use Google_Client;
 
 class AutograderController extends Controller
@@ -40,18 +41,21 @@ class AutograderController extends Controller
         $results = AutograderController::grade($keys, $answers);
 
         echo '
-        <table class="table">
+        <table class="table table-hover">
             <thead>
                 <tr>
-                <th scope="col">Cell</th>
-                <th scope="col">Kunci</th>
-                <th scope="col">Jawaban</th>
-                <th scope="col">Skor</th>
+                    <th scope="col">Cell</th>
+                    <th scope="col">Kunci</th>
+                    <th scope="col">Jawaban</th>
+                    <th scope="col">Skor</th>
                 </tr>
             </thead>
             <tbody>             
         ';
+
+        $score = 0;
         for ($i=0; $i<count($results); $i++) {
+            $score = $score + $results[$i]*100;
             echo '<tr>';
             echo '<th>' . $cells_temp[$i] . '</th>';
             echo '<td>' . $keys[$i] . '</td>';
@@ -60,10 +64,28 @@ class AutograderController extends Controller
             echo '</tr>';
         }
         echo '
+                    <tr>
+                        <td></td>
+                        <td></td>
+                        <th class="table-primary">Skor Akhir</th>
+                        <th class="table-primary">' . $score/count($results) . '</th>
+                    </tr>
                 </tbody>
             </table>
-            <a href="/course/ ' . $id_course . '" style="float: right;" class="btn btn-primary" role="button">Kembali ke Kelas</a>
+            <a href="/course/' . $id_course . '" style="float: right;" class="btn btn-primary" role="button">Kembali ke Kelas</a>
         ';
+
+        DB::table('grades')->where([
+            ['id_topic', '=' ,$id_topic], 
+            ['id_user', '=', Auth::id()]            
+        ])->delete();
+
+        DB::table('grades')->insert([
+            'id_course' => $id_course,
+            'id_user' => Auth::id(),
+            'id_topic' => $id_topic,
+            'grade' => $score/count($results)
+        ]);
     }
 
     /**
diff --git a/app/Http/Controllers/CourseController.php b/app/Http/Controllers/CourseController.php
index f6c71e7a14788de1284f9a004bc649108394e621..adb1e8ff4da5fdeb04ab1b39aab9b21dacb5ee2a 100644
--- a/app/Http/Controllers/CourseController.php
+++ b/app/Http/Controllers/CourseController.php
@@ -38,8 +38,22 @@ class CourseController extends Controller
                 $students[] = $temp->name;
             }
         }
-        
-        return view('course', ['topics' => $topics, 'students' => $students, 'teacher' => $teacher]);
+
+        $scores = [];
+        foreach($topics as $topic) {
+            $grades = DB::table('grades')->where([
+                ['id_topic', '=' ,$topic->id], 
+                ['id_user', '=', Auth::id()]            
+            ])->first();
+            
+            if (empty($grades)) {
+                $scores[] = '-';
+            } else {
+                $scores[] = $grades->grade;
+            }
+        }
+
+        return view('course', ['scores' => $scores, 'topics' => $topics, 'students' => $students, 'teacher' => $teacher]);
     }
 
     /**
diff --git a/public/js/learn.js b/public/js/learn.js
index e42ad59958790cdcc963a83ce4fe3d530d14e911..3fb867d8821e8eb8b61a6308dd9c9781c720eea6 100644
--- a/public/js/learn.js
+++ b/public/js/learn.js
@@ -1,5 +1,6 @@
 function submit(id_spreadsheet, url) {
     document.getElementById("submit").disabled = true;
+    document.getElementById("back").disabled = true;
     var xmlhttp = new XMLHttpRequest();
     xmlhttp.onreadystatechange = function() {
         if (this.readyState == 4 && this.status == 200) {
diff --git a/resources/views/course.blade.php b/resources/views/course.blade.php
index 8626eac9a8c93775682fbe5a2d0c0c2ec13dfbf3..cb0ea185485ab73921bcfa6f43512c9e2ce147e4 100644
--- a/resources/views/course.blade.php
+++ b/resources/views/course.blade.php
@@ -96,9 +96,22 @@
                 <div class="card">
                     <div class="card-header">Progress</div>
                     <div class="card-body">
-                        @foreach($topics as $index => $topic)
-                            Topik {{ $index + 1 }}: 100/100 <br/>
-                        @endforeach
+                        <table class="table table-hover">
+                            <thead>
+                                <tr>
+                                <th scope="col">Materi</th>
+                                <th scope="col">Skor</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            @foreach($scores as $index => $score)
+                                <tr>
+                                <td>Materi {{ $index + 1 }}</td>
+                                <td>{{ $score }}</td>
+                                </tr>    
+                            @endforeach
+                            </tbody>
+                        </table>
                     </div>
                 </div>
                 <br/>
diff --git a/resources/views/learn.blade.php b/resources/views/learn.blade.php
index 3f1d5df94996f560bbced8bbd4ba0a7151f9da70..40b0435bda34ef03ee8e995f3eb654eda22ec48f 100644
--- a/resources/views/learn.blade.php
+++ b/resources/views/learn.blade.php
@@ -17,7 +17,7 @@
                 frameBorder="0"
                 src="https://docs.google.com/spreadsheets/d/<?php echo $id_spreadsheet; ?>/edit?usp=drivesdk&rm=embedded">
             </iframe>
-            <a href="/course/<?php echo $id_course; ?>" class="btn btn-primary" role="button">Kembali ke Kelas</a>
+            <a href="/course/<?php echo $id_course; ?>" class="btn btn-primary" id="back" role="button">Kembali ke Kelas</a>
             <button id="submit" style="float: right;" type="text" onclick="submit('<?php echo $id_spreadsheet; ?>', '<?php echo Request::url(); ?>/submit')" class="btn btn-success"><b>Submit</b></button>
         </div>
         <div  id="result" class="col-lg-10" style="margin-top: 1rem; display:none">