diff --git a/app/src/main/java/com/example/myapplication/database/entities/composeui/ReportPage.kt b/app/src/main/java/com/example/myapplication/database/entities/composeui/ReportPage.kt index d141136..35a87ea 100644 --- a/app/src/main/java/com/example/myapplication/database/entities/composeui/ReportPage.kt +++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/ReportPage.kt @@ -273,17 +273,6 @@ fun ReportPage (navController: NavController?, viewModel: ReportViewModel = view } } -private fun parseDate(dateString: String): Date? { - return try { - // Use SimpleDateFormat or any other method to parse the string into a Date object - // For example: - SimpleDateFormat("yyyy", Locale.getDefault()).parse(dateString) - } catch (e: ParseException) { - // Handle parsing error - null - } -} - @Composable fun TableScreen(reportData: List) { diff --git a/server/data.json b/server/data.json index f7dd29f..81eb251 100644 --- a/server/data.json +++ b/server/data.json @@ -16,13 +16,22 @@ "rents": [], "items": [ { - "dateTime": 2009, + "dateTime": 2015, "weight": 36.6, "radius": 14.5, "colorbike": "Красный", "maxCount": 10, "bikeId": 3, "id": 1 + }, + { + "dateTime": 2009, + "weight": 29.6, + "radius": 13.5, + "colorbike": "Зеленый", + "maxCount": 5, + "bikeId": 3, + "id": 2 } ], "bikes": [ diff --git a/server/router.js b/server/router.js index cbdfe23..ba6f8f5 100644 --- a/server/router.js +++ b/server/router.js @@ -20,8 +20,8 @@ module.exports = (req, res, next) => { const toDate = req.query.toDate; const filteredData = filterByDateTime(data.items, fromDate, toDate); - // Возвращаем отфильтрованные элементы - const reportData = generateReport(filteredData); + // Возвращаем отфильтрованные и отсортированные элементы + const reportData = generateReport(filteredData, data.bikes).sort((a, b) => a.dateTime - b.dateTime); res.json(reportData); } catch (error) { console.error('Error loading data:', error); @@ -33,7 +33,7 @@ module.exports = (req, res, next) => { }; // Функция generateReport для примера -function generateReport(items) { +function generateReport(items, bikes) { // Ваш код для генерации отчета return items.map((item) => ({ id: item.id, @@ -42,7 +42,7 @@ function generateReport(items) { radius: item.radius, colorbike: item.colorbike, maxCount: item.maxCount, - bikeId: item.bikeId + bikeName: bikes.find((bike) => bike.id === item.bikeId)?.name, // Другие поля отчета, которые вам нужны }));