Skip to content

Develop #71

Merged
merged 165 commits into from
May 27, 2026
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
165 commits
Select commit Hold shift + click to select a range
d929575
Updated Exchange
roaraf Apr 15, 2026
082a39e
Updated ExchangeTest
roaraf Apr 15, 2026
1a98d8a
Merge pull request #30 from IDATT2003-Gruppe-53/hotfix/22-fix-getgain…
roaraf Apr 15, 2026
6f7e3d4
Updated FileHandler
roaraf Apr 15, 2026
127dd2f
Updated FileHandlerTest
roaraf Apr 15, 2026
01aa629
Updated FileHandler
roaraf Apr 15, 2026
b572be6
Updated FileHandlerTest
roaraf Apr 15, 2026
0ae9629
Merge pull request #31 from IDATT2003-Gruppe-53/bugfix/21-make-fileha…
roaraf Apr 15, 2026
4f181a3
Updated pom.xml
roaraf Apr 15, 2026
9a94064
Added ViewController
roaraf Apr 15, 2026
7169f15
Updated ViewController
roaraf Apr 15, 2026
15b7d86
Added StartView
roaraf Apr 15, 2026
3b4cec7
Updated App
roaraf Apr 15, 2026
e30d761
Merge pull request #33 from IDATT2003-Gruppe-53/32-view-manager
roaraf Apr 15, 2026
80688f9
Updated StartView
roaraf Apr 16, 2026
4544ad3
Added StartViewController
roaraf Apr 16, 2026
3126d0c
Updated App
roaraf Apr 16, 2026
9067253
Merge pull request #34 from IDATT2003-Gruppe-53/25-start-page
arelod Apr 24, 2026
5911e9b
Added a Sale View and Portfolio view with gamecontroller
arelod Apr 24, 2026
4de2b5d
Added navigation bar to Purchase View
arelod Apr 24, 2026
cb0c503
Added navigation bar to Portfolio View
arelod Apr 24, 2026
25a9f6f
Added logic to gamecontroller for navigation bar
arelod Apr 24, 2026
0a34f3c
Regression fix for portfolio and purchase view
arelod Apr 24, 2026
7d0fca1
Same regression fix for GameController
arelod Apr 24, 2026
027d42b
I don't remember all that I changed
arelod Apr 24, 2026
d314523
Merge pull request #35 from IDATT2003-Gruppe-53/26-sale-page
arelod May 11, 2026
fbbd7ac
Refactored the navigation bar in Portfolio view
arelod May 11, 2026
f7a132f
Further work on implementing the views to use BorderPane
arelod May 11, 2026
29c8951
Further implementation of Borderpane into purchase and portfolioview
May 11, 2026
019d2ce
Gaaaaah
May 12, 2026
458e6ea
Further testing
May 13, 2026
4785082
Fixed a regression that displayed blank when switching scenes in the …
May 14, 2026
e7a3c5f
Began implementing a smoother button implementation, with a cleaner s…
May 14, 2026
c81074e
Reworked Purchase design and controller
May 14, 2026
9f9a2fd
Expanded on the Market, purchase information
May 14, 2026
1c112b2
added logo
May 22, 2026
3250a7b
Added initial separation of NavigationBar
May 22, 2026
f313472
Refined the NavigationView with networth in the corner
May 22, 2026
c44492b
Added Bottombar and refined navigationview
May 22, 2026
22101f2
Added logo to startView
May 22, 2026
bd6efec
Refined StartView
May 22, 2026
6abc3aa
Removed old navigationbar from Market and portfolioview
May 22, 2026
242e01f
Added money label to navigationview
May 22, 2026
a73b92f
Rewritten the portfolioview to list grouped shares and not transactions
May 22, 2026
9116b23
Further refinement of the css
May 22, 2026
8790612
Updated package structure
roaraf May 23, 2026
18ec4e7
Updated Exchange
roaraf May 23, 2026
03b867d
Updated Stock
roaraf May 23, 2026
112a19d
Updated Portfolio
roaraf May 23, 2026
ae9a6b0
Updated Player
roaraf May 23, 2026
b4304f2
Updated PurchaseCalculator
roaraf May 23, 2026
fd03be4
Updated Sale
roaraf May 23, 2026
8bc07e8
Updated Sale
roaraf May 23, 2026
0180fdf
Updates SaleCalculator
roaraf May 23, 2026
d772585
Updated TransactionArchive
roaraf May 23, 2026
13a105e
Updated TransactionCalculator
roaraf May 23, 2026
3e8be93
Refactor of test classes
roaraf May 23, 2026
12d837b
Updated ExchangeTest
roaraf May 23, 2026
2b4146e
Updated PlayerTest
roaraf May 23, 2026
a34ddf7
Updated PortfolioTest
roaraf May 23, 2026
a7a3dc2
Updated SaleCalculatorUnitTest.java
roaraf May 23, 2026
ff8774c
Updated SaleTest
roaraf May 23, 2026
4687be8
Updated StockTest
roaraf May 23, 2026
73a7c6e
Updated TransactionArchiveTest
roaraf May 23, 2026
0158fc3
Added FormatBigDecimal
roaraf May 23, 2026
3957248
Updated FormatBigDecimal
roaraf May 23, 2026
c425ba0
Added back FileHandler
roaraf May 23, 2026
281a20e
Added FormatBigDecimalTest
roaraf May 23, 2026
fdadcaf
Moved the refreshMarketList function to gamecontroller
May 23, 2026
d9f247c
Deleted extra FileHandler in view.
roaraf May 23, 2026
8c540b0
Added StockLineChartService
roaraf May 23, 2026
8e6a304
Added StockLineChartServiceTest
roaraf May 23, 2026
bfab398
Added StockLineChartView
roaraf May 23, 2026
02e4b1f
Added CSVChooserView
roaraf May 23, 2026
f3dcc57
Added FooterBar
roaraf May 23, 2026
790e77b
Added NavigationBar
roaraf May 23, 2026
98fa033
Added PlayerNameChooserView
roaraf May 23, 2026
9b668a7
Added PlayerStartingMoneyChooserView
roaraf May 23, 2026
0a2df65
Redefined how formating money worked
May 23, 2026
47311b3
Updated MarketView
roaraf May 23, 2026
7066d27
Updated PortfolioView
roaraf May 23, 2026
e954cbc
Merge pull request #39 from IDATT2003-Gruppe-53/36-comment-and-rebase…
arelod May 23, 2026
24638da
Added TransactionArchiveView
roaraf May 23, 2026
62594d5
Added GameSetupController
roaraf May 23, 2026
a4318a5
Updated ViewController
roaraf May 23, 2026
9dbd38f
Updated GameController
roaraf May 23, 2026
b51e7e4
Updated StartViewController
roaraf May 23, 2026
0e78072
Updated App
roaraf May 23, 2026
54bc1dd
renamed file names and packages to fit with issue 38
May 23, 2026
7cd45ef
Merge pull request #42 from IDATT2003-Gruppe-53/41-40-refactor-develo…
arelod May 23, 2026
28dbed2
Merge remote-tracking branch 'origin/develop' into 38-suggestion-mvc-…
May 23, 2026
45943e4
Merge pull request #43 from IDATT2003-Gruppe-53/38-suggestion-mvc-obs…
arelod May 23, 2026
f8d48fc
Fixed bugs, it now builds
May 23, 2026
1259f09
Merge pull request #45 from IDATT2003-Gruppe-53/44-bug-fix-after-merg…
arelod May 23, 2026
7bbe4b7
Added Subscription for PlayerName, Money and Net Worth for Navbar
May 23, 2026
83a42bd
Fixed portfolioview
May 23, 2026
d389a93
Added styling to History
May 23, 2026
1f781c8
added share selection label in portfolioview
May 23, 2026
7513bad
Added a week counter to footer
May 23, 2026
8b16010
Added test to exchange for the currentweekproperty
May 23, 2026
c1dd278
Set up proper display of purchasecalculator values in the marketView
May 23, 2026
b7cc682
Added tests for the Objectproperties added to Purchase Calculators
May 23, 2026
fec9774
Added the same to PortfolioView
May 23, 2026
c2cdc27
idk
May 23, 2026
b5a6dd1
Merge pull request #48 from IDATT2003-Gruppe-53/46-mmpa-make-the-merg…
arelod May 23, 2026
860eee1
Updated FileHandlerTest
roaraf May 24, 2026
357fd60
Added TransactionFactory
roaraf May 24, 2026
b27f419
Added PurchaseFactory
roaraf May 24, 2026
c033ef1
Added SaleFactory
roaraf May 24, 2026
a66d146
Added PurchaseFactoryTest
roaraf May 24, 2026
48f8a56
Added SaleFactoryTest
roaraf May 24, 2026
6eb274f
Updated Exchange
roaraf May 24, 2026
91e0b42
Merge pull request #50 from IDATT2003-Gruppe-53/49-create-transaction…
roaraf May 24, 2026
17c04d9
Added LanguageManager
roaraf May 24, 2026
d987e02
Added LanguageManagerTest
roaraf May 24, 2026
4c8fd88
Added lang_en.properties
roaraf May 24, 2026
83de347
Added lang_no.properties
roaraf May 24, 2026
61b0244
Added lang.properties
roaraf May 24, 2026
e5927c9
Added lang_en.properties
roaraf May 24, 2026
bc20399
Added lang_en.properties
roaraf May 24, 2026
6618ef3
Added LanguageOption
roaraf May 24, 2026
77a243b
Added LanguageRegistry
roaraf May 24, 2026
52ccd01
Added LanguageRegistryTest
roaraf May 24, 2026
492f7cf
Updated StartView
roaraf May 24, 2026
0423e58
Updated StartViewController
roaraf May 24, 2026
afea12c
Updated PlayerNameChooserView
roaraf May 24, 2026
00d63a8
Updated CSVChooserView
roaraf May 24, 2026
00f6e80
Updated PlayerStartingMoneyChooserView
roaraf May 24, 2026
3126b40
Updated NavigationBar
roaraf May 24, 2026
41ad7cb
Updated FooterBar
roaraf May 24, 2026
6868f1e
Updated LanguageManager
roaraf May 24, 2026
b3e2593
Updated MarketView
roaraf May 24, 2026
331b8b1
Updated GameController
roaraf May 24, 2026
7fc4129
Updated PortfolioView
roaraf May 24, 2026
547c9f5
Updated TransactionArchiveView
roaraf May 24, 2026
31b0c3f
Merge pull request #52 from IDATT2003-Gruppe-53/24-feature-add-multi-…
roaraf May 24, 2026
a25a996
Updated GameController
roaraf May 24, 2026
9fdb62d
Merge pull request #54 from IDATT2003-Gruppe-53/53-hotfix-make-gross-…
roaraf May 24, 2026
d94df4e
Updated pom.xml
roaraf May 25, 2026
1744810
Merge pull request #56 from IDATT2003-Gruppe-53/55-javafx-controls-sh…
roaraf May 25, 2026
37d0061
Added biggest loser and winner to the footer
May 25, 2026
8cd9ef0
Added PlayerStatus update in navbar
May 25, 2026
84ba81c
Some comments
May 25, 2026
f463ac2
Merge remote-tracking branch 'origin/develop' into 51-integrate-topga…
May 25, 2026
bcd3b79
Merge pull request #57 from IDATT2003-Gruppe-53/51-integrate-topgaine…
arelod May 25, 2026
0c1b7b2
Quick fix after error with merge
May 25, 2026
19c4ccb
Added neccessary translations
May 25, 2026
7bd3d8d
Merge pull request #59 from IDATT2003-Gruppe-53/58-add-translations-t…
arelod May 25, 2026
49ca49f
Updated Player
roaraf May 25, 2026
01f29b1
Updated Portfolio
roaraf May 25, 2026
ec56ff6
Updated SaleCalculator
roaraf May 25, 2026
02799c7
Updated PortfolioView
roaraf May 25, 2026
7524fe8
Updated TransactionArchiveView
roaraf May 25, 2026
2a1b6c7
Updated lang_en.properties
roaraf May 25, 2026
0b51d20
Updated lang_no.properties
roaraf May 25, 2026
b92223c
Updated lang.properties
roaraf May 25, 2026
4435ab5
Merge pull request #62 from IDATT2003-Gruppe-53/61-add-more-info-to-t…
roaraf May 25, 2026
9315f87
Added initial game end view and functionality
May 26, 2026
b50ac32
Added localization
May 26, 2026
dbcbdcd
Merge remote-tracking branch 'origin/develop' into 60-game-ending
May 26, 2026
4be2922
Merge pull request #63 from IDATT2003-Gruppe-53/60-game-ending
arelod May 26, 2026
ac1c1fd
added search functionality to market, portfolio, and history
May 26, 2026
27bb541
Merge pull request #65 from IDATT2003-Gruppe-53/64-searchfilter
arelod May 26, 2026
517518d
Updated all main java files
roaraf May 27, 2026
0d6db74
Merge pull request #69 from IDATT2003-Gruppe-53/68-checkstyle-and-fin…
roaraf May 27, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions millions/millions.iml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,4 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
</component>
<component name="CheckStyle-IDEA-Module" serialisationVersion="2">
<option name="activeLocationsIds" />
</component>
</module>
5 changes: 4 additions & 1 deletion millions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>25.0.2</version>
<version>25.0.1</version>
</dependency>
</dependencies>

Expand All @@ -46,6 +46,9 @@
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<configuration>
<mainClass>no.ntnu.gruppe53.App</mainClass>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
41 changes: 36 additions & 5 deletions millions/src/main/java/no/ntnu/gruppe53/App.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,41 @@
package no.ntnu.gruppe53;

import javafx.application.Application;
import javafx.stage.Stage;
import no.ntnu.gruppe53.controller.StartViewController;
import no.ntnu.gruppe53.controller.ViewController;
import no.ntnu.gruppe53.view.StartView;

/**
* Hello world!
* Represents the main app of the application.
*
* <p>Sets up necessary components and shows the first view
* of the application: {@link StartView}.</p>
*/
public class App {
public static void main(String[] args) {
System.out.println("Hello World!");
}
public class App extends Application {
@Override
public void start(Stage stage) {
ViewController vm = new ViewController(stage);

StartView startView = new StartView(vm);

new StartViewController(startView, vm);


vm.addView("start", startView);

vm.switchView("start");

stage.setTitle("Millions - the Stock Game");
stage.show();
}

/**
* Launches the program.
*
* @param args arguments
*/
static void main(String[] args) {
launch();
}
}
190 changes: 0 additions & 190 deletions millions/src/main/java/no/ntnu/gruppe53/Exchange.java

This file was deleted.

128 changes: 0 additions & 128 deletions millions/src/main/java/no/ntnu/gruppe53/FileHandler.java

This file was deleted.

Loading