Skip to content
Snippets Groups Projects
Commit 000be7b0 authored by HSoreide's avatar HSoreide
Browse files

Make progress bars of budgets color-coded green-yellow-red

parent 35655a91
No related branches found
No related tags found
1 merge request!44HS - add budget bars dynamically with scroller
Pipeline #218212 passed with stages
in 1 minute and 45 seconds
......@@ -24,7 +24,23 @@ public class BudgetBarController implements Initializable {
public void setData(BudgetItem budgetItem, double leftovers) {
nameTag.setText(budgetItem.getBudgetCategory().label);
leftoverTag.setText(String.format("Left: %.0f", leftovers));
miniBar.setProgress(budgetItem.getBudgetAmount()-( leftovers/budgetItem.getBudgetAmount()));
double progress = 1+(leftovers-budgetItem.getBudgetAmount())/ budgetItem.getBudgetAmount();
if(progress < 0.25) {
miniBar.setStyle("-fx-accent: #ffb000;");
if(progress < -0.00) {
miniBar.setProgress(1.0);
miniBar.setStyle("-fx-accent: #fa5959;");
} else {
miniBar.setProgress(progress);
}
} else {
miniBar.setStyle("-fx-accent: rgba(48,222,109,0.8);");
miniBar.setProgress(progress);
}
}
@Override
......
......@@ -131,7 +131,7 @@ public class MainMenu {
}
overview = new Overview(incomeRegister, expenseRegister, generalBudget);
mainBar.setStyle("-fx-accent: #338333;");
mainBar.setStyle("-fx-accent: rgb(48,215,106);");
refreshProgressBars();
refreshLabels();
......
APRIL10
APRILnew
APRILsecond
APRILreasonable
APRIL10
\ No newline at end of file
APRILreasonable
\ No newline at end of file
MILK
YELLOW_CHEESE
MINCED_MEAT
ONION
HAM
TOMATO
WHEAT_FLOUR
ORANGE
OIL
POTATO
OLIVE_OIL
......@@ -83,8 +83,18 @@
/*.main-bar {
-fx-accent: green;
}*/
/*
.mini-bars {
-fx-accent: #1e5b5b;
}*/
}
\ No newline at end of file
.scroll-pane > .viewport {
-fx-background-color: transparent;
}
.scroll-pane {
-fx-background-color: rgba(255, 255, 255, 0.25);
-fx-border-width: 5;
-fx-border-radius: 5;
-fx-border-color: rgba(255, 255, 255, 0.75);
}
......@@ -23,7 +23,7 @@
<children>
<Label fx:id="leftoverTag" layoutY="-1.0" prefHeight="87.0" prefWidth="200.0" text="LeftOver" textAlignment="CENTER" wrapText="true">
<font>
<Font size="24.0" />
<Font size="20.0" />
</font>
<padding>
<Insets left="15.0" />
......
......@@ -78,7 +78,7 @@
</StackPane>
</top>
<center>
<ScrollPane prefHeight="317.0" prefWidth="750.0" BorderPane.alignment="CENTER">
<ScrollPane prefHeight="317.0" prefWidth="750.0" stylesheets="@../style.css" BorderPane.alignment="CENTER">
<content>
<AnchorPane prefHeight="331.0" prefWidth="744.0">
<children>
......
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