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 5b921d839915f014f4c529241fea95176f3040e4..64f584401b07b7dec702da968658cc555b812428 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 e2ba087f96801be106ec93d1ad338664989bc87c..06439131ed6f66c4f5083fe64e0d7e99e0051cff 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 b810feb7fb9c717907e315fbe3243d5b3ecaeeda..e7e2fac9584e169675068d40b25c2cb4bc1fe189 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 451dd13e713534fd0f85dd3245faa37a0fcd9d82..cbf48dd282664d440b815a2a8b8a99a76812369d 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 9385a2123998e134364b3a8f2f5dd7e28dcf233d..5093e2d83672e711f441b684a672f81a95bcea22 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" />