Merge pull request #133 from AnataAria/vinh

Vinh/fix bug on export csv file and thumbnail
AnataAria · Nov 17, 2023 · 65441b9 · 65441b9
2 parents aa9159b + 9c75b95
commit 65441b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...ouseselling/src/main/java/com/group1/drawingcouseselling/repository/SalaryRepository.java b/...ouseselling/src/main/java/com/group1/drawingcouseselling/repository/SalaryRepository.java
@@ -19,6 +19,8 @@ public interface SalaryRepository extends JpaRepository<Salary, BigDecimal> {
     public Optional<Salary> getSalariesByInstructorID(@Param(value = "instructorID") BigDecimal instructorID);
     @Query(value = "SELECT s FROM salary s WHERE " +
             "YEAR(s.salaryDate) = YEAR(:salaryDate)" +
-            " AND MONTH(s.salaryDate) = MONTH(:salaryDate)")
+            " AND MONTH(s.salaryDate) = MONTH(:salaryDate) " +
+            "AND s.instructor.paypalEmail IS NOT NULL AND " +
+            " s.instructor.paypalEmail <> ''")
     public Collection<Salary> getSalariesByYearsAndMonth(@Param(value = "salaryDate")Date salaryDate);
 }
diff --git a/frontend/my-app/src/routes/instructor/course/edit/+page.svelte b/frontend/my-app/src/routes/instructor/course/edit/+page.svelte
@@ -342,7 +342,11 @@
           >
             <!--Left-->
             <div class="col-span-1 sm:col-span-3 h-56">
-              <img class="items-center w-full" alt="" src="" />
+              <img
+                class="items-center w-full h-11/12 pt-5"
+                alt=""
+                src={courseInfo.courseInfo.thumbnail_path}
+              />
             </div>
             <!--Right-->
             {#if !editCourse}