Merging the frontend baseline to get up to date with the progress (!6) · Merge requests · Andreas Kluge Svendsrud / idatt1002_2023_9

Merged Anders Emil Bergan requested to merge fx-test-branch into master 2 years ago

Mar 15, 2023
- Created new window for monthly budget overview. Added new images · 24f12098
  Harry Linrui XU authored 2 years ago
  
  24f12098
Mar 14, 2023
- Merge branch 'fx-test-branch' of... · 7e97c641
  Harry Linrui XU authored 2 years ago
  
  Merge branch 'fx-test-branch' of gitlab.stud.idi.ntnu.no:andreksv/idatt-1002-2023-9 into fx-test-branch
  7e97c641
- Added a 'under construction' popup to help in underdeveloped sections in the app · 0da0a55a
  Anders Emil Bergan authored 2 years ago
  
  0da0a55a
- finished popup windows with close function for income and expenses 'add' button. · 73204966
  Anders Emil Bergan authored 2 years ago
  
  73204966
Mar 13, 2023
- small adjustments to expenses and overview · e4838833
  Anders Emil Bergan authored 2 years ago
  
  e4838833
- Merge branch 'fx-test-branch' of... · a29351e9
  Harry Linrui XU authored 2 years ago
  
  Merge branch 'fx-test-branch' of gitlab.stud.idi.ntnu.no:andreksv/idatt-1002-2023-9 into fx-test-branch
  a29351e9
- Added new imports · 7c824d13
  Harry Linrui XU authored 2 years ago
  
  7c824d13
- Made an income fxml that corresponds with expenses · 1dc2f5ce
  Anders Emil Bergan authored 2 years ago
  
  1dc2f5ce
Mar 12, 2023
- Commented out sections of code relating to expense overview. Connected all... · dfdeac8d
  Harry Linrui XU authored 2 years ago
  
  Commented out sections of code relating to expense overview. Connected all fxml files to the same controller
  dfdeac8d
- Created dialog box for expense and added unfinished constructors and enum in ExpenseDialog · e754ca68
  Harry Linrui XU authored 2 years ago
  
  e754ca68
- Created new class for adding, editing and deleting expenses · be0fee38
  Harry Linrui XU authored 2 years ago
  
  be0fee38
- Created controller package and moved SceneController to this package · cfc33804
  Harry Linrui XU authored 2 years ago
  
  cfc33804
- Implement initializable in controller. Added methods that switch to expenses... · b0edb778
  Harry Linrui XU authored 2 years ago
  
  Implement initializable in controller. Added methods that switch to expenses window and adds expenses
  b0edb778
Mar 11, 2023
- Created tableview and table columns · e8e8a5c6
  Harry Linrui XU authored 2 years ago
  
  e8e8a5c6
- Created tableview and columns for expense overview · 120ee303
  Harry Linrui XU authored 2 years ago
  
  120ee303
- Created new app class to run the application from · cf6d388f
  Harry Linrui XU authored 2 years ago
  
  cf6d388f
- Create method that switches to the expenses window · 9c34942a
  Harry Linrui XU authored 2 years ago
  
  9c34942a
- Linked the window to the SceneController · 234c1a9d
  Harry Linrui XU authored 2 years ago
  
  234c1a9d
- Merge branch 'fx-test-branch' of... · d22e3b32
  Harry Linrui XU authored 2 years ago
  
  Merge branch 'fx-test-branch' of gitlab.stud.idi.ntnu.no:andreksv/idatt-1002-2023-9 into fx-test-branch
  d22e3b32
Mar 10, 2023
- Created the baseline view for expenses · 30e4d4a7
  Harry Linrui XU authored 2 years ago
  
  30e4d4a7
- Created expenses window · bf011bf1
  Harry Linrui XU authored 2 years ago
  
  bf011bf1
- Renamed controller class by making the first letter uppercase · 2d4a0563
  Harry Linrui XU authored 2 years ago
  
  2d4a0563
Mar 08, 2023

Merge branch 'fx-test-branch' of... · 3e322efc

Harry Linrui XU authored 2 years ago

Merge branch 'fx-test-branch' of gitlab.stud.idi.ntnu.no:andreksv/idatt-1002-2023-9 into fx-test-branch

# Conflicts:
#	pom.xml
#	src/main/java/no/ntnu/idatt1002/demo/view/MyApp.java
#	src/main/java/no/ntnu/idatt1002/demo/view/sceneController.java

3e322efc

Copied over code from Emil from older commit · 6dfc26f0
Harry Linrui XU authored 2 years ago

6dfc26f0

Mar 07, 2023
- finished starting point for javafx scenes · 6f8678a6
  Anders Emil Bergan authored 2 years ago
  
  6f8678a6
- Here is a version where the program finds the fxml file and runs correctly.... · 8e979ce8
  Anders Emil Bergan authored 2 years ago
  
  Here is a version where the program finds the fxml file and runs correctly. Nothing after first window popup
  8e979ce8
Mar 02, 2023
- switched to SceneBuilder setup for further development. · d82555d2
  Anders Emil Bergan authored 2 years ago
  
  d82555d2
Feb 28, 2023
- Finished the start meny layout and also made it a class that runs from main class 'MyApp'. · 70d9a1f4
  Anders Emil Bergan authored 2 years ago
  
  70d9a1f4
Feb 23, 2023
- small test for a UI window · 3690d23f
  Anders Emil Bergan authored 2 years ago
  
  3690d23f

Merging the frontend baseline to get up to date with the progress

Merge request reports

Activity