From 1e148f96ee84da8e73483a8889ffc433888a8c97 Mon Sep 17 00:00:00 2001 From: Harry Linrui XU <xulr0820@hotmail.com> Date: Tue, 25 Apr 2023 17:29:37 +0200 Subject: [PATCH] Made days left dynamic in MainMenu. Removed it from Transactions and Budget --- .../idatt1002/demo/controller/IncomeExpenseController.java | 7 ------- .../ntnu/idatt1002/demo/controller/MainMenuController.java | 2 +- src/main/resources/view/BudgetNewest.fxml | 5 ----- src/main/resources/view/IncomeAndExpenses.fxml | 5 ----- src/main/resources/view/MainMenuNew.fxml | 4 ++-- 5 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java index 5b921d83..64f58440 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java @@ -99,13 +99,6 @@ public class IncomeExpenseController extends FinanceController { @FXML private DatePicker date; - - @FXML - private Label daysLeftLbl; - - @FXML - private ComboBox<?> filter; - @FXML private Button returnToMainMenuBtn; diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java index e2ba087f..06439131 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java @@ -126,7 +126,7 @@ public class MainMenuController { //Make calendar uneditable formatDatePicker(); - daysLeftLbl.setText("Days left: 31"); //TODO + daysLeftLbl.setText("Days left of budget: " + generalBudget.getDaysLeftOfBudgetPeriod()); } /** diff --git a/src/main/resources/view/BudgetNewest.fxml b/src/main/resources/view/BudgetNewest.fxml index b810feb7..e7e2fac9 100644 --- a/src/main/resources/view/BudgetNewest.fxml +++ b/src/main/resources/view/BudgetNewest.fxml @@ -39,11 +39,6 @@ <right> <Pane BorderPane.alignment="CENTER"> <children> - <Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" styleClass="font" stylesheets="@../style.css" text="Days left: 31"> - <font> - <Font name="Lucida Console" size="18.0" /> - </font> - </Label> <DatePicker fx:id="date" layoutX="-4.0" layoutY="55.0" prefWidth="175.0" /> </children> </Pane> diff --git a/src/main/resources/view/IncomeAndExpenses.fxml b/src/main/resources/view/IncomeAndExpenses.fxml index 451dd13e..cbf48dd2 100644 --- a/src/main/resources/view/IncomeAndExpenses.fxml +++ b/src/main/resources/view/IncomeAndExpenses.fxml @@ -41,11 +41,6 @@ <right> <Pane BorderPane.alignment="CENTER"> <children> - <Label fx:id="daysLeftLbl" alignment="CENTER" layoutX="27.0" layoutY="83.0" styleClass="font" stylesheets="@../style.css" text="Days left: 31" textAlignment="CENTER"> - <font> - <Font name="Lucida Console" size="18.0" /> - </font> - </Label> <DatePicker fx:id="date" layoutX="-4.0" layoutY="55.0" prefWidth="175.0" /> </children> </Pane> diff --git a/src/main/resources/view/MainMenuNew.fxml b/src/main/resources/view/MainMenuNew.fxml index 9385a212..5093e2d8 100644 --- a/src/main/resources/view/MainMenuNew.fxml +++ b/src/main/resources/view/MainMenuNew.fxml @@ -48,9 +48,9 @@ <right> <Pane BorderPane.alignment="CENTER"> <children> - <Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" styleClass="font" stylesheets="@../style.css" text="Days left: 31"> + <Label fx:id="daysLeftLbl" layoutX="7.0" layoutY="83.0" styleClass="font" stylesheets="@../style.css" text="Days left of budget: 31"> <font> - <Font name="Lucida Console" size="18.0" /> + <Font name="Lucida Console" size="16.0" /> </font> </Label> <DatePicker fx:id="date" layoutX="-4.0" layoutY="55.0" prefWidth="175.0" /> -- GitLab