diff --git a/src/main/resources/Budget/Budget.budget b/src/main/resources/Budget/Budget.budget index f8b78881d4dbd024d085098e54750a590d23948b..78b9f48b0b7ef60c96033b2573dfddcd296b6de6 100644 --- a/src/main/resources/Budget/Budget.budget +++ b/src/main/resources/Budget/Budget.budget @@ -3,9 +3,5 @@ maxAmount=1000.0 budgetAmount=500.0 budgetCategory=FOOD -budgetDescription= - -budgetAmount=67.0 -budgetCategory=CLOTHES -budgetDescription= +budgetDescription=dd diff --git a/src/main/resources/Economics/Expense.register b/src/main/resources/Economics/Expense.register index 680b65f4e274704e9d6af201433e29dc2ff7b183..ec17f6ed2d4603e74ca8e338c12178108b19d29a 100644 --- a/src/main/resources/Economics/Expense.register +++ b/src/main/resources/Economics/Expense.register @@ -1,5 +1,17 @@ -date=2023-03-27 -amount=100.0 +date=2023-03-01 +description=twelve +amount=12.0 +isRecurring=Not recurring +category=CLOTHES + +date=2023-03-11 +description=1111 +amount=121.0 +isRecurring=Not recurring +category=OTHER + +date=2023-03-26 +amount=10.0 isRecurring=Not recurring category=FOOD diff --git a/src/main/resources/Economics/Income.register b/src/main/resources/Economics/Income.register index da16fff25774f98bc979a37541e9c58899f9db22..bc73c7799d89fc774ba0303cc1f4d105377d2b98 100644 --- a/src/main/resources/Economics/Income.register +++ b/src/main/resources/Economics/Income.register @@ -1,10 +1,17 @@ -date=2023-03-27 -amount=110.0 +date=2023-03-24 +description=studie +amount=1000.0 isRecurring=Recurring -category=SALARY +category=STUDENT_LOAN -date=2023-03-31 +date=2023-03-25 amount=100.0 isRecurring=Not recurring category=GIFT +date=2023-03-25 +description=airbnb +amount=1000.0 +isRecurring=Not recurring +category=GIFT + diff --git a/src/main/resources/Economics/incomeRegisterTest.register b/src/main/resources/Economics/incomeRegisterTest.register deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/main/resources/view/Expenses.fxml b/src/main/resources/view/Expenses.fxml index 59e22ba3fd63eb3744a69b98499874889be03c56..cf71e837d92d1a52ae01e1f3332141df90252485 100644 --- a/src/main/resources/view/Expenses.fxml +++ b/src/main/resources/view/Expenses.fxml @@ -33,28 +33,9 @@ </ImageView> <BorderPane prefHeight="400.0" prefWidth="600.0"> <top> - <BorderPane BorderPane.alignment="CENTER"> - <center> - <HBox> - <children> - <Button fx:id="returnBtn" mnemonicParsing="false" onAction="#switchScene" text="Return "> - <opaqueInsets> - <Insets left="100.0" /> - </opaqueInsets> - <HBox.margin> - <Insets left="10.0" top="10.0" /> - </HBox.margin> - </Button> - <Region prefHeight="70.0" prefWidth="141.0" /> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Expenses" textAlignment="CENTER"> - <HBox.margin> - <Insets /> - </HBox.margin> - <font> - <Font size="48.0" /> - </font> - </Text> - </children> + <HBox BorderPane.alignment="CENTER"> + <children> + <Button fx:id="returnBtn" mnemonicParsing="false" onAction="#switchScene" text="Return "> <opaqueInsets> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> </opaqueInsets> @@ -124,6 +105,23 @@ </ComboBox> </children> </VBox> + <HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2" GridPane.rowIndex="3"> + <children> + <Button fx:id="incomeBtn" mnemonicParsing="false" onAction="#switchScene" text="Income" /> + <Button fx:id="budgetBtn" mnemonicParsing="false" onAction="#switchScene" text="Budget" /> + <Button disable="true" mnemonicParsing="false" text="Expenses" /> + <Button mnemonicParsing="false" onAction="#switchScene" text="Next"> + <HBox.margin> + <Insets left="170.0" /> + </HBox.margin></Button> + </children> + <padding> + <Insets top="10.0" /> + </padding> + <GridPane.margin> + <Insets top="5.0" /> + </GridPane.margin> + </HBox> <TableView fx:id="expenseTableView" prefHeight="260.0" prefWidth="485.0" GridPane.columnSpan="2" GridPane.rowIndex="1"> <columns> <TableColumn fx:id="dateColumn" prefWidth="75.0" text="Date" />