From 31ed61380a74cf5e72b578c94bf6ab453873b42e Mon Sep 17 00:00:00 2001
From: HSoreide <sofie.scisly@gmail.com>
Date: Thu, 20 Apr 2023 22:53:15 +0200
Subject: [PATCH] Make main progress bar follow same color coding
---
.../demo/controller/BudgetBarController.java | 3 ++-
.../no/ntnu/idatt1002/demo/controller/MainMenu.java | 12 ++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetBarController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetBarController.java
index f019119d..1444edbc 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetBarController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetBarController.java
@@ -22,7 +22,8 @@ public class BudgetBarController implements Initializable {
public void setData(BudgetItem budgetItem, double leftovers) {
- nameTag.setText(budgetItem.getBudgetCategory().label);
+ nameTag.setText(budgetItem.getBudgetCategory().label.substring(0,1).toUpperCase()
+ + budgetItem.getBudgetCategory().label.substring(1));
leftoverTag.setText(String.format("Left: %.0f", leftovers));
double progress = 1+(leftovers-budgetItem.getBudgetAmount())/ budgetItem.getBudgetAmount();
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java
index d6a2ef26..eb114829 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java
@@ -165,9 +165,17 @@ public class MainMenu {
* Sets the progress of the progress bars to their most updated data.
*/
private void refreshProgressBars() {
- mainBar.setProgress(expenseRegister.getTotalSum()/generalBudget.getMaxAmount());
- if (mainBar.getProgress() >= 1) {
+ //mainBar.setProgress(expenseRegister.getTotalSum()/generalBudget.getMaxAmount());
+ mainBar.setProgress(1-expenseRegister.getTotalSum()/generalBudget.getMaxAmount());
+
+
+ //double progress = 1+(leftovers-budgetItem.getBudgetAmount())/ budgetItem.getBudgetAmount();
+
+ if (mainBar.getProgress() <= 0.0f) {
mainBar.setStyle("-fx-accent: #fa5959;");
+ mainBar.setProgress(1);
+ } else if(mainBar.getProgress() <= 0.25f) {
+ mainBar.setStyle("-fx-accent: #ffb000;");
}
ArrayList<BudgetItem> budgets = generalBudget.getBudgetItems().stream()
--
GitLab