Sorted Nekku orders by delivery date and added excel report export possibility (#7663)

Author: tahtee

frontend/src/employee-frontend/components/reports/NekkuOrders.tsx

@@ -26,6 +26,7 @@ import { renderResult } from '../async-rendering'
 import { FlexRow } from '../common/styled/containers'
 import { daycaresQuery, unitGroupsQuery } from '../unit/queries'
 
+import ReportDownload from './ReportDownload'
 import { FilterLabel, FilterRow, TableScrollable } from './common'
 
 const getNekkuOrderReportByUnitResult = wrapResult(getNekkuOrderReportByUnit)
@@ -175,6 +176,54 @@ export default React.memo(function NekkuOrders() {
         {tooLongRange && <div>{i18n.reports.nekkuOrders.tooLongRange}</div>}
         {renderResult(report, (report) => (
           <>
+            <ReportDownload
+              data={report}
+              columns={[
+                {
+                  label: i18n.reports.common.date,
+                  value: (row) => row.date.toString()
+                },
+                {
+                  label: i18n.reports.common.groupName,
+                  value: (row) => row.groupName
+                },
+                {
+                  label: i18n.reports.nekkuOrders.sku,
+                  value: (row) => row.sku
+                },
+                {
+                  label: i18n.reports.nekkuOrders.quantity,
+                  value: (row) => row.quantity
+                },
+                {
+                  label: i18n.reports.nekkuOrders.mealTime,
+                  value: (row) =>
+                    row.mealTime
+                      .map((mealTimeValue) => {
+                        return i18n.reports.nekkuOrders.mealTimeValues[
+                          mealTimeValue as mealTimeOptions
+                        ]
+                      })
+                      .join(', ')
+                },
+                {
+                  label: i18n.reports.nekkuOrders.mealType,
+                  value: (row) =>
+                    i18n.reports.nekkuOrders.mealTypeValues[
+                      (row.mealType ?? 'DEFAULT') as mealTypeOptions
+                    ]
+                },
+                {
+                  label: i18n.reports.nekkuOrders.specialDiets,
+                  value: (row) => row.specialDiets
+                },
+                {
+                  label: i18n.reports.nekkuOrders.nekkuOrderInfo,
+                  value: (row) => row.nekkuOrderInfo
+                }
+              ]}
+              filename={`${i18n.reports.nekkuOrders.title}.csv`}
+            />
             <TableScrollable data-qa="report-nekkuorders">
               <Thead>
                 <Tr>

service/src/main/kotlin/fi/espoo/evaka/nekku/NekkuQueries.kt

@@ -736,7 +736,7 @@ fun Database.Read.getNekkuOrderReport(
 ): List<NekkuOrdersReport> =
     createQuery {
             sql(
-                "SELECT delivery_date, daycare_id, group_id, meal_sku, total_quantity, meal_time, meal_type, meals_by_special_diet, nekku_order_info FROM nekku_orders_report WHERE daycare_id = ${bind(daycareId)} AND group_id = (${bind(groupId)}) AND delivery_date = ${bind(date)} "
+                "SELECT delivery_date, daycare_id, group_id, meal_sku, total_quantity, meal_time, meal_type, meals_by_special_diet, nekku_order_info FROM nekku_orders_report WHERE daycare_id = ${bind(daycareId)} AND group_id = (${bind(groupId)}) AND delivery_date = ${bind(date)} ORDER BY delivery_date"
             )
         }
         .toList<NekkuOrdersReport>()

service/src/main/kotlin/fi/espoo/evaka/reports/NekkuOrderReport.kt

@@ -91,21 +91,23 @@ fun Database.Read.getNekkuReportRows(
     return createQuery {
             sql(
                 """
-SELECT nor.delivery_date as date, 
-        nor.meal_sku as sku,
-        nor.total_quantity as quantity, 
-        dg.name as groupname,
-        coalesce(nor.meal_time, '{}') as mealtime,
-        nor.meal_type as mealtype,
-        nor.meals_by_special_diet as specialdiets,
-        nor.nekku_order_info as nekkuOrderInfo
-FROM nekku_orders_report nor
-    JOIN daycare_group dg
-    ON nor.group_id = dg.id
-    WHERE nor.daycare_id = ${bind(daycareId)}
-    AND nor.group_id =ANY(${bind ( groupIds)})
-    AND nor.delivery_date =ANY(${bind ( dates)})
-"""
+            SELECT 
+                nor.delivery_date as date, 
+                nor.meal_sku as sku,
+                nor.total_quantity as quantity, 
+                dg.name as groupname,
+                coalesce(nor.meal_time, '{}') as mealtime,
+                nor.meal_type as mealtype,
+                nor.meals_by_special_diet as specialdiets,
+                nor.nekku_order_info as nekkuOrderInfo
+            FROM nekku_orders_report nor
+                JOIN daycare_group dg
+                ON nor.group_id = dg.id
+                WHERE nor.daycare_id = ${bind(daycareId)}
+                AND nor.group_id =ANY(${bind ( groupIds)})
+                AND nor.delivery_date =ANY(${bind ( dates)})
+                ORDER BY nor.delivery_date
+            """
             )
         }
         .toList<NekkuOrderRow>()