Skip to content

Develop #71

Merged
merged 165 commits into from
May 27, 2026
Merged

Develop #71

merged 165 commits into from
May 27, 2026

Conversation

arelod
Copy link
Member

@arelod arelod commented May 27, 2026

Merging Develop branch to main for our final release.

roaraf and others added 30 commits April 15, 2026 19:38
Added private method getTopStocks to avoid duplicate code, and change getGainers and getLosers to use getTopStocks.
Added test methods for getGainers and getLosers that also target getTopStocks.
…ers-and-getlosers-in-exchange-and-add-junit-test

Fix gainers/losers logic in exchange (#22)
Changed logic to hopefully be OS independent.
Added tests for the new FileHandler logic.
Fixed logic for handling exceptions thrown by Stock object for illegal parameters.
Added tests for everything but IOException.
…ndler-universal-across-oses

Fixed logic in FileHandler to make it OS independent and added more tests
Added App as the main class.
Class for switching views.
Fixed javadoc typos.
A currently dummy class to make the app launch with a default view.
Added commands to make javafx work.
Added a class for changing views/stages
Converted the dummy view to the first user view.
Controller class for StartView
Added StartView to the ViewController
roaraf and others added 26 commits May 25, 2026 10:34
…iners-and-toplosers-into-view

# Conflicts:
#	millions/src/main/java/no/ntnu/gruppe53/view/FooterBar.java
#	millions/src/main/java/no/ntnu/gruppe53/view/NavigationBar.java
…rs-and-toplosers-into-view

51 integrate topgainers and toplosers into view
…o-changes-made-in-issue-51

Added neccessary translations
Changed .addListener to .subscribe and made updateNetWorth() private.
Made updateNetWorth() private.
Added getProfitProperty() and a observable of the profit of a sale.
Added a label, textfield and subscriptipn related to the calculated profit of a sale.
Increased the information a string of transaction info gives the player. Now the player is more informed about what the transaction entailed.
Added strings for the new ui elements.
Added strings for the new ui elements.
Mirrored changes in lang_en.
…ransactions

61 add more info to transactions
# Conflicts:
#	millions/src/main/resources/i18n/lang.properties
#	millions/src/main/resources/i18n/lang_en.properties
#	millions/src/main/resources/i18n/lang_no.properties
added search functionality to market, portfolio, and history
Fixed google checkstyle, missing javadoc, and minor warnings.
@arelod arelod self-assigned this May 27, 2026
@arelod arelod requested a review from roaraf May 27, 2026 08:23
@arelod arelod merged commit 21d0600 into main May 27, 2026
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants