Skip to content
Snippets Groups Projects
Commit 31ed6138 authored by HSoreide's avatar HSoreide
Browse files

Make main progress bar follow same color coding

parent 000be7b0
No related branches found
No related tags found
1 merge request!44HS - add budget bars dynamically with scroller
Pipeline #218214 passed with stages
in 1 minute and 43 seconds
...@@ -22,7 +22,8 @@ public class BudgetBarController implements Initializable { ...@@ -22,7 +22,8 @@ public class BudgetBarController implements Initializable {
public void setData(BudgetItem budgetItem, double leftovers) { 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)); leftoverTag.setText(String.format("Left: %.0f", leftovers));
double progress = 1+(leftovers-budgetItem.getBudgetAmount())/ budgetItem.getBudgetAmount(); double progress = 1+(leftovers-budgetItem.getBudgetAmount())/ budgetItem.getBudgetAmount();
......
...@@ -165,9 +165,17 @@ public class MainMenu { ...@@ -165,9 +165,17 @@ public class MainMenu {
* Sets the progress of the progress bars to their most updated data. * Sets the progress of the progress bars to their most updated data.
*/ */
private void refreshProgressBars() { private void refreshProgressBars() {
mainBar.setProgress(expenseRegister.getTotalSum()/generalBudget.getMaxAmount()); //mainBar.setProgress(expenseRegister.getTotalSum()/generalBudget.getMaxAmount());
if (mainBar.getProgress() >= 1) { 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.setStyle("-fx-accent: #fa5959;");
mainBar.setProgress(1);
} else if(mainBar.getProgress() <= 0.25f) {
mainBar.setStyle("-fx-accent: #ffb000;");
} }
ArrayList<BudgetItem> budgets = generalBudget.getBudgetItems().stream() ArrayList<BudgetItem> budgets = generalBudget.getBudgetItems().stream()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment