diff --git a/app/Http/Controllers/AutograderController.php b/app/Http/Controllers/AutograderController.php
index 4f85b0f2b6cd7e29c75ff5a1e499fe349f3dde23..531929c41eca9e57a53867a40c5f2dbb0d5e5e0e 100644
--- a/app/Http/Controllers/AutograderController.php
+++ b/app/Http/Controllers/AutograderController.php
@@ -165,9 +165,4 @@ class AutograderController extends Controller
return $answers;
}
-
- public function test()
- {
- echo strtoupper("=sum(A1,A2)");
- }
}
diff --git a/app/Http/Controllers/CourseController.php b/app/Http/Controllers/CourseController.php
index adb1e8ff4da5fdeb04ab1b39aab9b21dacb5ee2a..8fb97754bda9debce48439e3a1f56b11f6fa7621 100644
--- a/app/Http/Controllers/CourseController.php
+++ b/app/Http/Controllers/CourseController.php
@@ -70,8 +70,7 @@ class CourseController extends Controller
DB::table('user_course')->insert([
'id_user' => Auth::id(),
- 'id_course' => $id,
- 'role' => 1
+ 'id_course' => $id
]);
return redirect()->route('home', ['msg' => 2]);
}
@@ -85,8 +84,7 @@ class CourseController extends Controller
{
DB::table('user_course')->insert([
'id_user' => Auth::id(),
- 'id_course' => $request->enroll_id,
- 'role' => 0
+ 'id_course' => $request->enroll_id
]);
return redirect()->route('home', ['msg' => 3]);
}
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 0102f4c1a9a97d424e1024b1a99f4ac9dac9c760..78f0be5778bc8631a1cd1ea22927aa94ab3a4d57 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -40,16 +40,7 @@ class HomeController extends Controller
$enrolled[] = DB::table('courses')->where('id', $id)->first();
}
- foreach($courses as $course) {
- $temp = DB::table('user_course')->where([
- ['id_course', '=', $course->id],
- ['role', '=', 1]
- ])->first();
- $teacher = DB::table('users')->where('id', $temp->id_user)->first();
- $teachers[] = $teacher->name;
- }
-
- return view('home', ['profile' => $profile, 'role' => $role, 'courses' => $courses, 'teachers' => $teachers, 'enrolled' => $enrolled]);
+ return view('home', ['profile' => $profile, 'role' => $role, 'courses' => $courses, 'enrolled' => $enrolled]);
}
public function profile(Request $request)
diff --git a/app/Http/Controllers/LearnController.php b/app/Http/Controllers/LearnController.php
index aad3b989c45080a95ea246d7fe6691e3a8c3ab19..aa40adee9b81982be543d9c169cecdc82dd3167a 100644
--- a/app/Http/Controllers/LearnController.php
+++ b/app/Http/Controllers/LearnController.php
@@ -67,6 +67,7 @@ class LearnController extends Controller
DB::table('topics')->insert([
'id_course' => $id_course,
'name' => $request->topic_name,
+ 'description' => $request->topic_description,
'content' => 'Konten',
'id_spreadsheet' => $response->spreadsheetId
]);
diff --git a/database/migrations/2020_03_11_190629_create_topics_table.php b/database/migrations/2020_03_11_190629_create_topics_table.php
index c98e5dd14523c472891cf60c81b4a6c492feb8b3..ced5d3df5740c2b5e2df55bb5b9654e57f9e4543 100644
--- a/database/migrations/2020_03_11_190629_create_topics_table.php
+++ b/database/migrations/2020_03_11_190629_create_topics_table.php
@@ -17,6 +17,7 @@ class CreateTopicsTable extends Migration
$table->bigIncrements('id');
$table->bigInteger('id_course')->unsigned();
$table->string('name');
+ $table->longText('description');
$table->longText('content');
$table->string('id_spreadsheet');
diff --git a/database/migrations/2020_03_11_190641_create_spreadsheets_table.php b/database/migrations/2020_03_11_190641_create_spreadsheets_table.php
index 1c0313903ac25ef62a137e8ef88760a216f820e2..c7be28e11034f2f63d6e518e4cd3bb9c27a7ea3e 100644
--- a/database/migrations/2020_03_11_190641_create_spreadsheets_table.php
+++ b/database/migrations/2020_03_11_190641_create_spreadsheets_table.php
@@ -17,7 +17,6 @@ class CreateSpreadsheetsTable extends Migration
$table->bigInteger('id')->unsigned();
$table->string('cell');
$table->string('value');
- $table->integer('type');
$table->primary(['id', 'cell']);
$table->foreign('id')->references('id')->on('topics');
diff --git a/database/migrations/2020_03_11_190651_create_grades_table.php b/database/migrations/2020_03_11_190651_create_grades_table.php
index 5fba8613a9a9f3b40c138c1d5ad6676b1d1f88f2..048825747cb7ce489c4dd98c2f5dee832ba1faa7 100644
--- a/database/migrations/2020_03_11_190651_create_grades_table.php
+++ b/database/migrations/2020_03_11_190651_create_grades_table.php
@@ -17,7 +17,7 @@ class CreateGradesTable extends Migration
$table->bigInteger('id_course')->unsigned();
$table->bigInteger('id_user')->unsigned();
$table->bigInteger('id_topic')->unsigned();
- $table->integer('grade');
+ $table->double('grade', 8, 2);
$table->primary(['id_course', 'id_user', 'id_topic']);
diff --git a/database/migrations/2020_03_11_190702_create_user_course_table.php b/database/migrations/2020_03_11_190702_create_user_course_table.php
index bd4047751782e1b429b0912bcd991c38720f88a5..62195545fb4eab3c80b902b2880f450d40a4b7f2 100644
--- a/database/migrations/2020_03_11_190702_create_user_course_table.php
+++ b/database/migrations/2020_03_11_190702_create_user_course_table.php
@@ -16,7 +16,6 @@ class CreateUserCourseTable extends Migration
Schema::create('user_course', function (Blueprint $table) {
$table->bigInteger('id_user')->unsigned();
$table->bigInteger('id_course')->unsigned();
- $table->integer('role');
$table->primary(['id_user', 'id_course']);
diff --git a/resources/views/course.blade.php b/resources/views/course.blade.php
index cb0ea185485ab73921bcfa6f43512c9e2ce147e4..0a69515af9b1bdd5b81b5edbf2e3a418fd4e2cb9 100644
--- a/resources/views/course.blade.php
+++ b/resources/views/course.blade.php
@@ -46,7 +46,7 @@
</div>
<div id="collapse<?php echo $topic->id; ?>" class="collapse show" aria-labelledby="heading<?php echo $topic->id; ?>" data-parent="#accordionTopics">
<div class="card-body">
- {{ $topic->content }} <br/><br/>
+ {{ $topic->description }} <br/><br/>
@if(Auth::user()->role == 1)
<a href="<?php echo $topic->id_course; ?>/learn/<?php echo $topic->id; ?>/edit" class="btn btn-primary" role="button">Edit Materi</a>
@else
@@ -80,10 +80,14 @@
<label for="topic-name" class="col-form-label">Masukkan Judul Materi</label>
<input type="text" class="form-control" name="topic_name" id="topic-name" required="required" placeholder="Judul Topik">
</div>
+ <div class="form-group">
+ <label for="topic-description">Deskripsi</label>
+ <textarea class="form-control" name="topic_description" id="topic_description" rows="2"></textarea>
+ </div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Batal</button>
- <button type="submit" class="btn btn-primary">Buat Topik</button>
+ <button type="submit" class="btn btn-primary">Tambah Materi</button>
</div>
</form>
</div>
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index afe835634edc35f1894780d07cb19f59eae47c44..b9e3bb1215b0d8d7db0bd19e186820ab82536e26 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -134,8 +134,7 @@
<div id="collapse<?php echo $course->id; ?>" class="collapse" aria-labelledby="heading<?php echo $course->id; ?>" data-parent="#accordionCourses">
<div class="card-body">
- {{ $course->description }} <br/>
- Pengajar : {{ $teachers[$index] }} <br/> <br/>
+ {{ $course->description }} <br/><br/>
<form action="course/enroll" method="post">
{{ csrf_field() }}
<input style="display: none;" type="number" class="form-control" name="enroll_id" id="enroll_id" required="required" value="<?php echo $course->id ?>">
diff --git a/resources/views/test.blade.php b/resources/views/test.blade.php
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/routes/web.php b/routes/web.php
index ccf1f585b5281698ef3bad81c9eb162af3b107fb..2d450f6d71b1938cf030c9b16af3c86e20378c04 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -12,6 +12,7 @@
*/
Auth::routes();
Route::get('/', 'HomeController@index')->name('home');
+Route::redirect('/home', '/');
Route::get('/test', 'AutograderController@test')->name('test');
Route::post('/profile', 'HomeController@profile')->name('profile');
Route::get('/course/{id_course}', 'CourseController@index')->name('course');