From 51d063f95cae1cbf0ce06b7926ebb8032b6b847c Mon Sep 17 00:00:00 2001
From: Harkamal Randhawa <harkamalsr@gmail.com>
Date: Thu, 9 Apr 2026 17:29:18 -0600
Subject: [PATCH] Format Appointment Times

---
 .../AppointmentDialogController.java          | 30 +++++++++++++++++++
 .../dialogviews/appointment-dialog-view.fxml  | 11 ++++---
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/desktop/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/AppointmentDialogController.java b/desktop/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/AppointmentDialogController.java
index 1629187a..91490c8f 100644
--- a/desktop/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/AppointmentDialogController.java
+++ b/desktop/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/AppointmentDialogController.java
@@ -83,6 +83,36 @@ public class AppointmentDialogController {
 
         cbMinute.getItems().addAll(0, 15, 30, 45);
 
+        cbHour.setCellFactory(param -> new ListCell<>() {
+            @Override
+            protected void updateItem(Integer option, boolean empty) {
+                super.updateItem(option, empty);
+                setText(empty || option == null ? null : String.valueOf(option));
+            }
+        });
+        cbHour.setButtonCell(new ListCell<>() {
+            @Override
+            protected void updateItem(Integer option, boolean empty) {
+                super.updateItem(option, empty);
+                setText(empty || option == null ? null : String.valueOf(option));
+            }
+        });
+
+        cbMinute.setCellFactory(param -> new ListCell<>() {
+            @Override
+            protected void updateItem(Integer option, boolean empty) {
+                super.updateItem(option, empty);
+                setText(empty || option == null ? null : String.format("%02d", option));
+            }
+        });
+        cbMinute.setButtonCell(new ListCell<>() {
+            @Override
+            protected void updateItem(Integer option, boolean empty) {
+                super.updateItem(option, empty);
+                setText(empty || option == null ? null : String.format("%02d", option));
+            }
+        });
+
         cbService.setCellFactory(param -> new ListCell<>() {
             @Override
             protected void updateItem(DropdownOption option, boolean empty) {
diff --git a/desktop/src/main/resources/org/example/petshopdesktop/dialogviews/appointment-dialog-view.fxml b/desktop/src/main/resources/org/example/petshopdesktop/dialogviews/appointment-dialog-view.fxml
index f3cccdac..df0ccb5a 100644
--- a/desktop/src/main/resources/org/example/petshopdesktop/dialogviews/appointment-dialog-view.fxml
+++ b/desktop/src/main/resources/org/example/petshopdesktop/dialogviews/appointment-dialog-view.fxml
@@ -12,9 +12,6 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.layout.HBox?>
-
 <VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0"
       spacing="20.0" style="-fx-font-size: 14px;"
       xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
@@ -156,7 +153,7 @@
                                     </font>
                                 </Label>
 
-                                <HBox spacing="10">
+                                <HBox spacing="10" alignment="CENTER_LEFT">
 
                                     <!-- Hour -->
                                     <ComboBox fx:id="cbHour"
@@ -172,6 +169,12 @@
                                         </padding>
                                     </ComboBox>
 
+                                    <Label text=":" textFill="#2c3e50">
+                                        <font>
+                                            <Font name="System Bold" size="18.0" />
+                                        </font>
+                                    </Label>
+
                                     <!-- Minute -->
                                     <ComboBox fx:id="cbMinute"
                                               promptText="Minute"