Split the css for pie chart and fix style

iamdiluxedbutcooler · Nov 2, 2024 · 179e31e · 179e31e
1 parent c2cfc5a
commit 179e31e
Show file tree

Hide file tree

Showing 6 changed files with 132 additions and 213 deletions.
diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/seedu/address/ui/MainWindow.java
@@ -32,6 +32,14 @@ public class MainWindow extends UiPart<Stage> {
 
     private final Logger logger = LogsCenter.getLogger(getClass());
 
+    private final ListChangeListener<Person> personListListener = change -> {
+        while (change.next()) {
+            if (change.wasAdded() || change.wasRemoved() || change.wasUpdated()) {
+                updateStatusChart();
+            }
+        }
+    };
+
     private Stage primaryStage;
     private Logic logic;
 
@@ -163,6 +171,9 @@ private void updateStatusChart() {
             case NONE -> counts[0]++;
             case NON_URGENT -> counts[1]++;
             case URGENT -> counts[2]++;
+            default -> {
+                logger.warning("Unexpected status value: " + person.getStatus().status);
+            }
             }
         }
 
@@ -240,7 +251,6 @@ private void handleViewCommand(String commandText) {
                 Person personToView = logic.getFilteredPersonList().get(index);
                 personDetailPanel.setPersonDetails(personToView);
             } catch (NumberFormatException | IndexOutOfBoundsException e) {
-                // Handle invalid index
                 resultDisplay.setFeedbackToUser("Invalid person index.");
             }
         } else {
@@ -285,27 +295,16 @@ private CommandResult executeCommand(String commandText) throws CommandException
         }
     }
 
-    private final ListChangeListener<Person> personListListener = change -> {
-        while (change.next()) {
-            if (change.wasAdded() || change.wasRemoved() || change.wasUpdated()) {
-                updateStatusChart();
-            }
-        }
-    };
-
     /**
      * Sets up the split panes and their divider positions
      */
     private void setupSplitPanes() {
-        topSplitPane.setDividerPositions(0.8);  // 80:20 ratio
+        topSplitPane.setDividerPositions(0.8);
 
         topSplitPane.getDividers().get(0).positionProperty().addListener((observable, oldValue, newValue) -> {
             if (Math.abs(newValue.doubleValue() - 0.8) > 0.05) {
                 Platform.runLater(() -> topSplitPane.setDividerPositions(0.8));
             }
         });
     }
-
-
-
 }
diff --git a/src/main/java/seedu/address/ui/StatusPieChart.java b/src/main/java/seedu/address/ui/StatusPieChart.java
@@ -7,23 +7,16 @@
 import javafx.geometry.Insets;
 import javafx.geometry.Side;
 import javafx.scene.chart.PieChart;
+import javafx.scene.control.Label;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
-import javafx.scene.control.Label;
-import javafx.scene.Node;
-import javafx.scene.paint.Color;
 
 /**
  * Panel containing the status distribution pie chart.
  */
 public class StatusPieChart extends UiPart<Region> {
 
     private static final String FXML = "StatusPieChart.fxml";
-
-    private static final String NONE_COLOR = "#009E60";
-    private static final String NON_URGENT_COLOR = "#c46210";
-    private static final String URGENT_COLOR = "#FF2400";
-
     @FXML
     private VBox chartContainer;
 
@@ -33,11 +26,23 @@ public class StatusPieChart extends UiPart<Region> {
     @FXML
     private PieChart statusChart;
 
+    /**
+     * Creates a new StatusPieChart.
+     * Initializes the chart with default settings by calling setupChart().
+     */
     public StatusPieChart() {
         super(FXML);
         setupChart();
     }
 
+    /**
+     * Sets up the initial configuration of the pie chart.
+     * This includes:
+     * - Setting the chart title
+     * - Configuring chart display properties (labels, legend, size)
+     * - Setting up the chart container
+     * - Applying custom styling
+     */
     private void setupChart() {
         chartTitle.setText("CLIENT STATUS");
         statusChart.setTitle("");
@@ -51,7 +56,6 @@ private void setupChart() {
 
         chartContainer.setPadding(new Insets(2));
 
-        // Add default style classes to ensure proper initialization
         statusChart.getStyleClass().add("status-chart");
     }
 
@@ -66,7 +70,6 @@ public void updateChartData(int noneCount, int nonUrgentCount, int urgentCount)
         Platform.runLater(() -> {
             statusChart.getData().clear();
 
-            // Create data pieces
             PieChart.Data noneData = new PieChart.Data("None (" + noneCount + ")", noneCount);
             PieChart.Data nonUrgentData = new PieChart.Data("Non-Urgent (" + nonUrgentCount + ")", nonUrgentCount);
             PieChart.Data urgentData = new PieChart.Data("Urgent (" + urgentCount + ")", urgentCount);
@@ -77,18 +80,11 @@ public void updateChartData(int noneCount, int nonUrgentCount, int urgentCount)
 
             statusChart.setData(pieChartData);
 
-            // Apply styles to pie slices first
-            noneData.getNode().setStyle("-fx-pie-color: " + NONE_COLOR + ";");
-            nonUrgentData.getNode().setStyle("-fx-pie-color: " + NON_URGENT_COLOR + ";");
-            urgentData.getNode().setStyle("-fx-pie-color: " + URGENT_COLOR + ";");
-
-            // Add style classes for CSS styling
             noneData.getNode().getStyleClass().add("data0");
             nonUrgentData.getNode().getStyleClass().add("data1");
             urgentData.getNode().getStyleClass().add("data2");
 
-            // Force a style refresh
             statusChart.applyCss();
         });
     }
-}
+}
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -34,9 +34,7 @@
           </Menu>
         </MenuBar>
 
-        <!-- Top section with command/result and chart -->
         <SplitPane fx:id="topSplitPane" VBox.vgrow="NEVER" styleClass="top-split-pane">
-          <!-- Left side: Command and Result -->
           <VBox minWidth="400">
             <StackPane VBox.vgrow="NEVER" fx:id="commandBoxPlaceholder" styleClass="pane-with-border" minHeight="50">
               <padding>
@@ -51,15 +49,13 @@
             </StackPane>
           </VBox>
 
-          <!-- Right side: Status Chart -->
           <StackPane fx:id="statusChartPlaceholder" styleClass="chart-container" minWidth="150">
             <padding>
               <Insets top="2" right="2" bottom="2" left="2" />
             </padding>
           </StackPane>
         </SplitPane>
 
-        <!-- Bottom section for person list -->
         <SplitPane fx:id="splitPane" VBox.vgrow="ALWAYS" dividerPositions="0.5">
           <VBox fx:id="personList" styleClass="pane-with-border" minWidth="340" prefWidth="340">
             <padding>
@@ -81,4 +77,4 @@
       </VBox>
     </Scene>
   </scene>
-</fx:root>
+</fx:root>
diff --git a/src/main/resources/view/StatusPieChart.fxml b/src/main/resources/view/StatusPieChart.fxml
@@ -10,8 +10,9 @@
       xmlns:fx="http://javafx.com/fxml/1">
     <stylesheets>
         <URL value="@css/DarkTheme.css" />
+        <URL value="@css/StatusPieChart.css" />
     </stylesheets>
 
     <Label fx:id="chartTitle" styleClass="chart-title"/>
     <PieChart fx:id="statusChart" VBox.vgrow="ALWAYS" legendSide="BOTTOM"/>
-</VBox>
+</VBox>