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

Fix/small bugs

Author: wilmveel

src/main/kotlin/controllers/AggregationController.kt

@@ -15,23 +15,7 @@ import org.springframework.web.bind.annotation.RestController
 class AggregationController(
     val aggregationService: AggregationService
 ) {
-
-    @GetMapping("/revenue-per-month", params = ["year"])
-    @PreAuthorize("hasAuthority('AggregationAuthority.READ')")
-    fun revenuePerMonthByYear(@RequestParam year: Int): Map<YearMonth, BigDecimal> {
-        val from = LocalDate.of(year, 1, 1)
-        val to = LocalDate.of(year, 12, 31)
-        return aggregationService.revenuePerMonth(from, to)
-    }
-
-    @GetMapping("/cost-per-month", params = ["year"])
-    @PreAuthorize("hasAuthority('AggregationAuthority.READ')")
-    fun costPerMonthByYear(@RequestParam year: Int): Map<YearMonth, BigDecimal> {
-        val from = LocalDate.of(year, 1, 1)
-        val to = LocalDate.of(year, 12, 31)
-        return aggregationService.costPerMonth(from, to)
-    }
-
+    
     @GetMapping("/total-per-client", params = ["year"])
     @PreAuthorize("hasAuthority('AggregationAuthority.READ')")
     fun revenuePerClientByYear(@RequestParam year: Int): List<Map<String, Any>> {

src/main/kotlin/services/AggregationService.kt

@@ -39,22 +39,6 @@ class AggregationService(
     private val applicationConstants: ApplicationConstants
 ) {
 
-    fun revenuePerMonth(from: LocalDate, to: LocalDate): Map<YearMonth, BigDecimal> {
-        return assignmentService.findAllActive(from, to)
-            .toMapWorkingDay(from, to)
-            .entries
-            .groupingBy { YearMonth.of(it.key.year, it.key.month) }
-            .fold(BigDecimal.ZERO) { acc, cur -> acc + cur.value.fold(BigDecimal.ZERO) { a, c -> a + c.revenuePerDay() } }
-    }
-
-    fun costPerMonth(from: LocalDate, to: LocalDate): Map<YearMonth, BigDecimal> {
-        return contractService.findAllActive(from, to)
-            .toMapWorkingDay(from, to)
-            .entries
-            .groupingBy { YearMonth.of(it.key.year, it.key.month) }
-            .fold(BigDecimal.ZERO) { acc, cur -> acc + (cur.value.sumAmount(YearMonth.of(cur.key.year, cur.key.month))) }
-    }
-
     fun totalPerClient(from: LocalDate, to: LocalDate): List<Map<String, Any>> {
         val allAssignments = assignmentService.findAllActive(from, to)
         return clientService.findAll()

src/main/react/clients/AggregationClient.js

@@ -1,53 +1,5 @@
 const path = "/api/aggregations"
 
-export const revenuePerMonthByYear = year => {
-  const opts = {
-    method: "GET",
-  }
-  return fetch(`${path}/revenue-per-month?year=${year}`, opts).then(res => {
-    if (res.status === 200) {
-      return res.json()
-    }
-    throw res.json()
-  })
-}
-
-export const costPerMonthByYear = year => {
-  const opts = {
-    method: "GET",
-  }
-  return fetch(`${path}/cost-per-month?year=${year}`, opts).then(res => {
-    if (res.status === 200) {
-      return res.json()
-    }
-    throw res.json()
-  })
-}
-
-export const holidayPerPersonByYear = year => {
-  const opts = {
-    method: "GET",
-  }
-  return fetch(`${path}/holiday-per-person?year=${year}`, opts).then(res => {
-    if (res.status === 200) {
-      return res.json()
-    }
-    throw res.json()
-  })
-}
-
-export const sickdayPerPersonByYear = year => {
-  const opts = {
-    method: "GET",
-  }
-  return fetch(`${path}/sickday-per-person?year=${year}`, opts).then(res => {
-    if (res.status === 200) {
-      return res.json()
-    }
-    throw res.json()
-  })
-}
-
 export const totalPerClientByYear = year => {
   const opts = {
     method: "GET",
@@ -97,8 +49,6 @@ export const totalPerMonthByYear = year => {
 }
 
 export const AggregationClient = {
-  revenuePerMonthByYear,
-  costPerMonthByYear,
   totalPerClientByYear,
   totalPerPersonByYear,
   totalPerPersonByYearMonth,

src/main/react/clients/WorkDayClient.js

@@ -5,6 +5,7 @@ const internalize = it => ({
   ...it,
   from: moment(it.from),
   to: moment(it.to),
+  days: it.days && it.days.length === 0 ? null : it.days,
 })
 
 const path = "/api/workdays"

src/main/react/components/charts/CostPerMonthChart.js

@@ -8,6 +8,7 @@ import Tooltip from "recharts/es6/component/Tooltip"
 import Bar from "recharts/es6/cartesian/Bar"
 import ResponsiveContainer from "recharts/es6/component/ResponsiveContainer"
 import PropTypes from "prop-types"
+import {AlignedLoader} from "@flock-community/flock-eco-core/src/main/react/components/AlignedLoader"
 import {AggregationClient} from "../../clients/AggregationClient"
 
 export function HolidaysPerPersonChart({year}) {
@@ -34,7 +35,7 @@ export function HolidaysPerPersonChart({year}) {
     )
   }, [])
 
-  if (!state) return null
+  if (!state) return <AlignedLoader />
 
   const height = 50 + state.length * 50
 

src/main/react/components/charts/HolidaysPerPersonChart.js

@@ -1,6 +1,7 @@
 import React, {useEffect, useState} from "react"
 import {Pie, PieChart, ResponsiveContainer, Tooltip} from "recharts"
 import PropTypes from "prop-types"
+import {AlignedLoader} from "@flock-community/flock-eco-core/src/main/react/components/AlignedLoader"
 import {AggregationClient} from "../../clients/AggregationClient"
 
 export function RevenuePerClientChart({year}) {
@@ -13,6 +14,8 @@ export function RevenuePerClientChart({year}) {
     )
   }, [])
 
+  if (!state) return <AlignedLoader />
+
   return (
     <ResponsiveContainer>
       <PieChart width={400} height={400}>

src/main/react/components/charts/RevenueCostPerMonthChart.js

@@ -8,6 +8,7 @@ import Tooltip from "recharts/es6/component/Tooltip"
 import Bar from "recharts/es6/cartesian/Bar"
 import ResponsiveContainer from "recharts/es6/component/ResponsiveContainer"
 import PropTypes from "prop-types"
+import {AlignedLoader} from "@flock-community/flock-eco-core/src/main/react/components/AlignedLoader"
 import {AggregationClient} from "../../clients/AggregationClient"
 
 export function SickdayPerPersonChart({year}) {
@@ -20,7 +21,7 @@ export function SickdayPerPersonChart({year}) {
     )
   }, [])
 
-  if (!state) return null
+  if (!state) return <AlignedLoader />
 
   const height = 50 + state.length * 50