Merge branch 'main' into 'feat/tutorial-4-belajarbelajar'

# Conflicts:
#   README.md
#   belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/controller/CourseController.java
#   belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/controller/PengajarController.java
#   belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/model/CourseModel.java
#   belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/model/PengajarModel.java
#   belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/repository/PenyelenggaraDb.java
#   belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/service/CourseService.java
#   belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/service/CourseServiceImpl.java
#   belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/service/PenyelenggaraService.java
#   belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/service/PenyelenggaraServiceImpl.java
#   belajarbelajar/src/main/resources/templates/delete-pengajar.html
#   belajarbelajar/src/main/resources/templates/form-add-course.html
#   belajarbelajar/src/main/resources/templates/form-add-pengajar.html
#   belajarbelajar/src/main/resources/templates/home.html
#   belajarbelajar/src/main/resources/templates/view-course.html
#   belajarbelajar/src/main/resources/templates/viewall-course.html

belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/controller/CourseController.java

@@ -173,6 +173,13 @@ public class CourseController {
 //    }
 
 
+    @RequestMapping("/course/viewAllSort")
+    public String listCourseSort(Model model){
+        //mendapatkan semua course
+        List<CourseModel> listCourse = courseService.getListSortName();
+        //add variabel semua course model ke "listCourse" untuk dirender ke thymeleaf
+        model.addAttribute("listCourse",listCourse);
+        return "viewall-course";
 
 
 

belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/service/CourseServiceImpl.java

@@ -52,12 +52,13 @@ public class CourseServiceImpl implements CourseService{
     public List<CourseModel> getListSortName() {
         return courseDb.findAllByOrderByNameCourse();
     }
-
     @Override
     public void deleteCourse(CourseModel course) {
         courseDb.delete(course);
     }
 
+        return courseDb.findAll();
+    }
     @Override
     public boolean isClosed(LocalDateTime tanggalDimulai, LocalDateTime tanggalBerakhir) {
         LocalDateTime now = LocalDateTime.now();