UPDATE GRAPH VISUAL

Shayokh144 · Sep 11, 2024 · bc218e5 · bc218e5
1 parent 4257644
commit bc218e5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/visualization/app/VisualReport/VisualReport/Graph/LineChart/LineChartScreen.swift b/visualization/app/VisualReport/VisualReport/Graph/LineChart/LineChartScreen.swift
@@ -40,7 +40,8 @@ struct LineChartScreen: View {
                     AxisTick()
                     AxisValueLabel() {
                         if let date = value.as(Date.self) {
-                            if viewModel.selectedChartOption.value == LineChartOption.last2Months.value {
+                            if viewModel.selectedChartOption.value == LineChartOption.last2Months.value ||
+                                viewModel.selectedChartOption.value == LineChartOption.last2Weeks.value {
                                 Text(DateFormatter.dayMonthYearShort.string(from: date))
                                     .rotationEffect(.degrees(-90))
                                     .padding(.bottom, 20.0)

diff --git a/visualization/app/VisualReport/VisualReport/Graph/LineChart/LineChartViewModel.swift b/visualization/app/VisualReport/VisualReport/Graph/LineChart/LineChartViewModel.swift
@@ -18,10 +18,9 @@ final class LineChartViewModel: ObservableObject {
     @Published var chartXAxisValues: [Date] = []
     @Published var chartOptions: [String] = []
     @Published var selectedChartOption: LineChartOption = .allYear
+    @Published var viewModelData: LineChartViewModelData
     private var years: [String] = []
 
-    let viewModelData: LineChartViewModelData
-
     init(lineChartViewModelData: LineChartViewModelData) {
         uiModels = []
         viewModelData = lineChartViewModelData
@@ -131,7 +130,7 @@ final class LineChartViewModel: ObservableObject {
         } else if selectedChartOption.value == LineChartOption.allMonthlyAverage.value {
             dayInterval = 32
         } else if selectedChartOption.value == LineChartOption.last2Weeks.value {
-            dayInterval = 2
+            dayInterval = 1
             dateFormat = ""
         }
         var currentDate = firstDate
@@ -145,6 +144,10 @@ final class LineChartViewModel: ObservableObject {
             }
         }
 
+        // UPDATE TIME FRAME
+
+        viewModelData.timeFrame = "\(DateFormatter.dayMonthYearShort.string(from: firstDate)) to \(DateFormatter.dayMonthYearShort.string(from: lastDate))"
+
         // UPDATE UI DATA
         let uiModel = LineChartDataSeries(
             type: "\(selectedChartOption.value) \(dateFormat)",
@@ -199,7 +202,7 @@ final class LineChartViewModel: ObservableObject {
 struct LineChartViewModelData {
 
     let chartName: String
-    let timeFrame: String
+    var timeFrame: String
     let weightUnitText: String
     let currencyUnitText: String
     let dataSource: String