RecentRunner/group-2-threaded-project-petshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix FXML errors and make Analytics accessible to all users

Browse Source
This commit is contained in:
Harkamal Randhawa
2026-02-28 14:34:11 -07:00
parent f503a7e2b6
commit 2f653acac6
5 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/example/petshopdesktop/controllers/AnalyticsController.java
View File

@@ -55,13 +55,6 @@ public class AnalyticsController {
@FXML
public void initialize() {
if (!UserSession.getInstance().isAdmin()) {
lblError.setText("Access restricted to administrators only.");
lblError.setVisible(true);
disableAllCharts();
return;
}
configureCharts();
loadAnalyticsData();
}

9
src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java
View File

@@ -174,8 +174,8 @@ public class MainLayoutController {
public void initialize() {
applyRBAC();
loadView("pet-view.fxml");
updateButtons(btnPets);
loadView("analytics-view.fxml");
updateButtons(btnAnalytics);
}
private void applyRBAC() {
@@ -204,11 +204,6 @@ public class MainLayoutController {
btnStaffAccounts.setManaged(isAdmin);
}
if (btnAnalytics != null) {
btnAnalytics.setVisible(isAdmin);
btnAnalytics.setManaged(isAdmin);
}
btnSalesHistory.setText(isAdmin ? "Sales History" : "Sales");

20
src/main/resources/org/example/petshopdesktop/main-layout-view.fxml
View File

@@ -32,6 +32,17 @@
</Label>
<Separator prefWidth="200.0" style="-fx-background-color: #444444; -fx-opacity: 0.35;" />
<Button fx:id="btnAnalytics" alignment="CENTER_LEFT" mnemonicParsing="false" onAction="#btnAnalyticsClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Analytics" textFill="#cbd5e1">
<font>
<Font name="System" size="13.0" />
</font>
<padding>
<Insets bottom="10.0" left="14.0" right="14.0" top="10.0" />
</padding>
</Button>
<Separator prefWidth="200.0" style="-fx-background-color: #444444; -fx-opacity: 0.35;" />
<Label text="PETS" textFill="#94a3b8">
<font>
<Font name="System Bold" size="12.0" />
@@ -143,15 +154,6 @@
</padding>
</Button>
<Button fx:id="btnAnalytics" alignment="CENTER_LEFT" mnemonicParsing="false" onAction="#btnAnalyticsClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Analytics" textFill="#cbd5e1">
<font>
<Font name="System" size="13.0" />
</font>
<padding>
<Insets bottom="10.0" left="14.0" right="14.0" top="10.0" />
</padding>
</Button>
<Region VBox.vgrow="ALWAYS" />
<Button fx:id="btnLogout" alignment="CENTER_LEFT" mnemonicParsing="false" onAction="#btnLogoutClicked" prefWidth="250.0" style="-fx-background-color: rgba(255,255,255,0.08); -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Logout" textFill="#e2e8f0">

6
src/main/resources/org/example/petshopdesktop/modelviews/analytics-view.fxml
View File

@@ -121,7 +121,7 @@
<CategoryAxis label="Date" side="BOTTOM" />
</xAxis>
<yAxis>
<NumberAxis label="Revenue ($)" side="LEFT" />
<NumberAxis label="Revenue" side="LEFT" />
</yAxis>
</LineChart>
</VBox>
@@ -138,7 +138,7 @@
</Label>
<BarChart fx:id="chartTopRevenue" animated="true" legendSide="BOTTOM" prefHeight="300.0">
<xAxis>
<NumberAxis label="Revenue ($)" side="BOTTOM" />
<NumberAxis label="Revenue" side="BOTTOM" />
</xAxis>
<yAxis>
<CategoryAxis label="Product" side="LEFT" />
@@ -193,7 +193,7 @@
<CategoryAxis label="Employee" side="BOTTOM" />
</xAxis>
<yAxis>
<NumberAxis label="Revenue ($)" side="LEFT" />
<NumberAxis label="Revenue" side="LEFT" />
</yAxis>
</BarChart>
</VBox>