Merge pull request #106 from flock-community/fix/small_bugs

Fix/small bugs

Author: wilmveel

src/main/kotlin/controllers/ExpenseController.kt

@@ -47,7 +47,7 @@ class ExpenseController(
         pageable: Pageable
     ) = when {
         authentication.isAdmin() -> expenseService.findAllByPersonCode(personCode, pageable)
-        else -> expenseService.findAllByPersonCode(authentication.name, pageable)
+        else -> expenseService.findAllByPersonUserCode(authentication.name, pageable)
     }
         .toResponse()
 

src/main/kotlin/repository/ExpenseRepository.kt

@@ -17,6 +17,7 @@ import java.util.UUID
 @Repository
 interface ExpenseRepository : PagingAndSortingRepository<Expense, UUID>{
     fun findAllByPersonCode(personCode: String, pageable: Pageable): Page<Expense>
+    fun findAllByPersonUserCode(personCode: String, pageable: Pageable): Page<Expense>
     fun findAllByStatus(status: Status):Iterable<Expense>
 }
 

src/main/kotlin/services/ExpenseService.kt

@@ -35,6 +35,9 @@ class ExpenseService(
     fun findAllByPersonCode(personCode: String, pageable: Pageable): Page<Expense> = expenseRepository
         .findAllByPersonCode(personCode, pageable)
 
+    fun findAllByPersonUserCode(personCode: String, pageable: Pageable): Page<Expense> = expenseRepository
+        .findAllByPersonUserCode(personCode, pageable)
+
     fun findAllByStatus(status: Status) = expenseRepository.findAllByStatus(status)
 
     @Transactional

src/main/react/features/month/MonthFeature.js

@@ -55,7 +55,7 @@ export function MonthFeature() {
     .map(it => ({
       ...it,
       missing: Math.max(
-        it.total - (it.workDays + it.holiDays + it.sickDays + it.event),
+        it.total - (it.workDays + it.holiDayUsed + it.sickDays + it.event),
         0
       ),
     }))
@@ -74,7 +74,12 @@ export function MonthFeature() {
           <Tooltip formatter={value => new Intl.NumberFormat().format(value)} />
           <Legend />
           <Bar stackId="days" dataKey="workDays" name="worked hours" fill="#1de8b5" />
-          <Bar stackId="days" dataKey="holiDays" name="holiday hours" fill="#42a5f5" />
+          <Bar
+            stackId="days"
+            dataKey="holiDayUsed"
+            name="holiday hours"
+            fill="#42a5f5"
+          />
           <Bar stackId="days" dataKey="sickDays" name="sick hours" fill="#ef5350" />
           <Bar stackId="days" dataKey="event" name="event hours" fill="#fed766" />
           <Bar stackId="days" dataKey="missing" name="missing hours" fill="#9e9e9e" />