Skip to content
Snippets Groups Projects
Commit d43f5345 authored by Harry Linrui XU's avatar Harry Linrui XU
Browse files

Continuing rebasing

parent ca218283
No related branches found
No related tags found
10 merge requests!43Merging frontend-testing into master,!38"Made progressbar dynamic in accordance to spending. Added balance field....,!37Made the sub progress bars respond to changes in expense,!32Added input validation to add dialog boxes.,!30Redesigned scenes,!29Redesigned scenes,!28Redesigned scenes,!26Redesigned Main menu and expense/income windows,!24Merging frontend-testing with master,!23Merging frontend-testing and master
Hide whitespace changes
Inline Side-by-side
.gitignore 0 → 100644
+ 39
− 0
View file @ d43f5345
##############################
## Java
##############################
.mtj.tmp/
*.class
*.jar
*.war
*.ear
*.nar
##############################
## Maven
##############################
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
pom.xml.bak
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
.mvn/wrapper/maven-wrapper.jar
##############################
## IntelliJ
##############################
out/
.idea/*
*.iml
*.ipr
*.iws
##############################
## Database
##############################
*.db
*.DS_Store
src/main/resources/Budget/Budget.budget 0 → 100644
+ 3
− 0
View file @ d43f5345
budgetPeriod=31
maxAmount=1000.0
src/main/resources/Economics/expenseRegisterTest.register 0 → 100644
+ 6
− 0
View file @ d43f5345
date=2023-03-03
description=description
amount=59.900001525878906
isRecurring=Not recurring
category=CLOTHES
src/main/resources/view/AddBudget.fxml
+ 5
− 4
View file @ d43f5345
......@@ -12,7 +12,8 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Text?>
<AnchorPane prefHeight="150.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddBudgetController">
<AnchorPane prefHeight="150.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.BudgetController">
<children>
<GridPane prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<columnConstraints>
......@@ -29,7 +30,7 @@
<children>
<VBox alignment="CENTER" GridPane.columnIndex="1" GridPane.valignment="CENTER">
<children>
<Label text="Category/Title" />
<Label text="Label" />
<ComboBox fx:id="categoryVariable" maxWidth="150.0" prefWidth="150.0" />
</children>
</VBox>
......@@ -47,8 +48,8 @@
</VBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="15.0" GridPane.columnIndex="3" GridPane.rowIndex="1">
<children>
<Button fx:id="cancelButton" mnemonicParsing="false" onAction="#closeButton" text="Cancel" />
<Button fx:id="addButton" mnemonicParsing="false" onAction="#addBudget" text="Add New Budget" />
<Button mnemonicParsing="false" onAction="#closeButton" text="Button" />
<Button mnemonicParsing="false" onAction="#addBudget" text="Button" />
</children>
</HBox>
</children>
......
src/main/resources/view/addBudget.fxml deleted 100644 → 0
+ 0
− 58
View file @ ca218283
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Text?>
<AnchorPane prefHeight="150.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.BudgetController">
<children>
<GridPane prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="10.0" minWidth="0.0" prefWidth="0.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="180.0" minWidth="10.0" prefWidth="150.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="180.0" minWidth="10.0" prefWidth="150.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="10.0" minWidth="10.0" prefWidth="0.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<VBox alignment="CENTER" GridPane.columnIndex="1" GridPane.valignment="CENTER">
<children>
<Label text="Label" />
<ComboBox fx:id="categoryVariable" maxWidth="150.0" prefWidth="150.0" />
</children>
</VBox>
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" GridPane.columnIndex="2">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Amount" />
<TextField fx:id="amountVariable" maxWidth="150.0" />
</children>
</VBox>
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" GridPane.columnIndex="3">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Description" />
<TextField fx:id="descriptionVariable" />
</children>
</VBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="15.0" GridPane.columnIndex="3" GridPane.rowIndex="1">
<children>
<Button mnemonicParsing="false" onAction="#closeButton" text="Button" />
<Button mnemonicParsing="false" onAction="#addBudget" text="Button" />
</children>
</HBox>
</children>
</GridPane>
</children>
</AnchorPane>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment