Merge pull request #226 from ogomaemmanuel/node-sass

Node sass
ogomaemmanuel · Nov 26, 2023 · eaf9b94 · eaf9b94
2 parents 4535f38 + a4263f8
commit eaf9b94
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/hr_core/package.json b/hr_core/package.json
@@ -110,6 +110,8 @@
     "sinon": "^9.0.3",
     "sockjs-client": "^1.4.0",
     "stompjs": "^2.3.3",
+    "sockjs-client": "^1.6.1",
+    "stompjs": "^2.3.3",
     "sw-precache-webpack-plugin": "^0.11.5",
     "tailwindcss": "^1.8.5",
     "tooltip.js": "^1.3.2",

diff --git a/...src/main/java/com/ogoma/hr_core/boundaries/hr/leave_management/entities/LeaveRequest.java b/...src/main/java/com/ogoma/hr_core/boundaries/hr/leave_management/entities/LeaveRequest.java
@@ -46,7 +46,7 @@ public class LeaveRequest {
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "in_place", insertable = false, updatable = false)
     private Employee inPlace;
-    @OneToOne(fetch = FetchType.LAZY)
+    @OneToOne()
     @JoinColumn(name = "leave_type_id", insertable = false, updatable = false)
     private LeaveType leaveType;
     @OneToMany(mappedBy = "leaveRequest", cascade = CascadeType.ALL, fetch = FetchType.LAZY)

diff --git a/...com/ogoma/hr_core/boundaries/hr/leave_management/repositories/LeaveRequestRepository.java b/...com/ogoma/hr_core/boundaries/hr/leave_management/repositories/LeaveRequestRepository.java
@@ -15,7 +15,7 @@
 
 @Repository
 public interface LeaveRequestRepository extends BaseRepo<LeaveRequest> {
-    @Query("Select le from LeaveRequest le where le.applicantId=?#{ principal?.id }")
+    @Query("Select le from LeaveRequest le  where  le.applicantId=?#{ principal?.id }")
     public Page<LeaveRequest> findCurrentUserLeaveRequest(Pageable pageable);
 
     @Query(value = "select s.id as userId,s.id as staffId,concat_ws(u.first_name,u.last_name) as fullName from employees s left join users u on s.id=u.id where s.id!=?#{principal.id}", nativeQuery = true)

diff --git a/...ore/src/main/resources/static/js/src/components/leave_management/UserLeaveRequestItem.vue b/...ore/src/main/resources/static/js/src/components/leave_management/UserLeaveRequestItem.vue
@@ -1,6 +1,6 @@
 <template>
 	<tr>
-		<td data-label="Name">{{leaveRequestClone.leaveType}}</td>
+		<td data-label="Name">{{leaveRequestClone?.leaveType?.name}}</td>
 		<td data-label="Number of Days">{{leaveRequestClone.numberOfDays}}</td>
 		<td data-label="Start Date">{{leaveRequestClone.startDate|dateFormat}}</td>
 		<td data-label="End Date">{{leaveRequestClone.endDate|dateFormat}}</td>