From 91aff4f0933b9d0891a9978d4fba9d660c4b6cc2 Mon Sep 17 00:00:00 2001
From: = <tommyah@stud.ntnu.no>
Date: Fri, 15 May 2026 10:27:07 +0200
Subject: [PATCH 01/12] Feat: Improved trade actions sections

Added quantity buttons and buy / sell button in top section of dashboard view. Functionality not added yet.
---
 .../idatt2003/g40/mappe/engine/Exchange.java  |   2 +-
 .../dashboard/DashBoardController.java        |   4 +-
 .../view/widgets/dashboard/DashBoardView.java | 121 ++++++++++++++----
 src/main/resources/styles.css                 |  59 +++++++--
 4 files changed, 148 insertions(+), 38 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
index 88ca0b0..887fc27 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
@@ -203,7 +203,6 @@ public Transaction sell(final Share share, final Player player)
    * Method for advancing time, increasing the amount of weeks.
    * */
   public void advance() {
-    week.set(week.get() + 1);
     for (Stock stock : stockMap.values()) {
       BigDecimal currentPrice = stock.getSalesPrice();
 
@@ -213,6 +212,7 @@ public void advance() {
       BigDecimal newPrice = currentPrice.multiply(factor);
       stock.addNewSalesPrice(newPrice);
     }
+    week.set(week.get() + 1);
   }
 
   /**
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
index b6fe1bd..b2d94f7 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
@@ -43,9 +43,7 @@ private void populateStockList() {
     for (Stock s : stockList) {
       Button stockBtn = getViewElement().createStockButton(s.getSymbol());
 
-      getViewElement().setOnStockAction(stockBtn, s, selectedStock -> {
-        handleStockSelection(selectedStock);
-      });
+      getViewElement().setOnStockAction(stockBtn, s, this::handleStockSelection);
     }
   }
 
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
index 2710660..45ab0ff 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
@@ -9,6 +9,7 @@
 import java.util.function.Consumer;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.financialsummary.SummaryView;
+import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.chart.LineChart;
@@ -18,26 +19,24 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TextField;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.VBox;
+import javafx.scene.layout.*;
 
 public class DashBoardView extends ViewElement<HBox, DashBoardActions> {
   private LineChart<Number, Number> chart;
   private XYChart.Series<Number, Number> dataSeries;
   private VBox sidebar;
-  private ArrayList<Button> stockButtons;
   private Stock selectedStock;
   private Label selectedStockLabel;
-  private HBox tradeActions;
   private NumberAxis xAxis;
   private NumberAxis yAxis;
   private Label selectedStockPriceLabel;
   private TextField shareQuantityInputField;
+  private Button m5QtyBtn;
+  private Button m1QtyBtn;
+  private Button p1QtyBtn;
+  private Button p5QtyBtn;
 
   public DashBoardView() {
-    stockButtons = new ArrayList<>();
     super(new HBox(), DashBoardActions.class);
   }
 
@@ -71,9 +70,6 @@ protected void initLayout() {
     selectedStockLabel = new Label("");
     selectedStockPriceLabel = new Label("");
 
-    HBox topSection = new HBox();
-    topSection.getChildren().addAll(selectedStockLabel, selectedStockPriceLabel);
-
     xAxis = new NumberAxis(1, 22, 1);
     xAxis.setMinorTickVisible(false);
     xAxis.setTickMarkVisible(true);
@@ -103,12 +99,6 @@ protected void initLayout() {
     chart.minHeightProperty().set(50);
     chart.getData().add(dataSeries);
 
-    tradeActions = new HBox();
-    tradeActions.setAlignment(Pos.CENTER);
-    tradeActions.setMaxWidth(Integer.MAX_VALUE);
-    tradeActions.setPrefWidth(Integer.MAX_VALUE);
-    tradeActions.minWidth(100);
-
     Button buyBtn = new Button("buy");
     buyBtn.getStyleClass().add("buy-button");
     registerButton(DashBoardActions.BUY_SHARES, buyBtn);
@@ -117,31 +107,108 @@ protected void initLayout() {
     sellBtn.getStyleClass().add("sell-button");
     registerButton(DashBoardActions.SELL_SHARES, sellBtn);
 
+    HBox header = new HBox(20);
+    header.setAlignment(Pos.CENTER_LEFT);
+
+    // Stock Identity (The gray pill)
+    VBox stockIdentity = new VBox(5);
+    selectedStockLabel = new Label("APL");
+    selectedStockLabel.getStyleClass().add("stock-symbol-title");
+    Label stockFullNameLabel = new Label("Apple corporation");
+    Label ownedQuantityLabel = new Label("Owned: 0");
+    stockIdentity.getChildren().addAll(selectedStockLabel, stockFullNameLabel, ownedQuantityLabel);
+
+    // Price Stats
+    VBox priceStats = new VBox(5);
+    selectedStockPriceLabel = new Label("0.0 NOK (+0.0%)");
+    selectedStockPriceLabel.getStyleClass().add("price-large");
+
+    HBox lowHighBox = new HBox(10);
+    Label lowPriceLabel = new Label("Low: 0.0 NOK");
+    Label highPriceLabel = new Label("High: 0.0 NOK");
+    lowHighBox.getChildren().addAll(lowPriceLabel, highPriceLabel);
+    priceStats.getChildren().addAll(selectedStockPriceLabel, lowHighBox);
+
+    m5QtyBtn = new Button("-5");
+    m1QtyBtn = new Button("-1");
     shareQuantityInputField = new TextField("1.0");
+    shareQuantityInputField.setAlignment(Pos.CENTER);
+    p1QtyBtn = new Button("+1");
+    p5QtyBtn = new Button("+5");
+
+    buyBtn = new Button("buy");
+    buyBtn.getStyleClass().add("buy-button");
+    sellBtn = new Button("sell");
+    sellBtn.getStyleClass().add("sell-button");
+
+    GridPane grid = new GridPane();
+    grid.setHgap(0);
+    grid.setVgap(0);
+    grid.setAlignment(Pos.CENTER);
+
+    int amountOfCols = 6;
+    float colWidth = 100f/amountOfCols;
+
+    for (int i = 0; i<amountOfCols; i++) {
+      if(i == 0 || i == amountOfCols - 1) {
+        colWidth = 20;
+      } else {
+        colWidth = 15;
+      }
+      ColumnConstraints curCol = makeCol(colWidth);
+      grid.getColumnConstraints().add(curCol);
+    }
 
-    shareQuantityInputField.setPromptText("Quantity amount");
+    HBox leftQty = new HBox(0, m5QtyBtn, m1QtyBtn);
+    leftQty.setAlignment(Pos.CENTER_RIGHT);
 
+    HBox rightQty = new HBox(0, p1QtyBtn, p5QtyBtn);
+    rightQty.setAlignment(Pos.CENTER_LEFT);
+
+    HBox qtySection = new HBox(0, leftQty, shareQuantityInputField, rightQty);
+    qtySection.setAlignment(Pos.CENTER);
+
+    HBox tradeBtns = new HBox(20, buyBtn, sellBtn);
+    HBox.setHgrow(buyBtn, Priority.ALWAYS);
+    HBox.setHgrow(sellBtn, Priority.ALWAYS);
+    tradeBtns.setAlignment(Pos.CENTER);
+
+    grid.add(qtySection, 0, 0, 6,1);
+    grid.add(tradeBtns, 0, 1, 6, 1);
+
+    header.getChildren().addAll(stockIdentity, priceStats, grid);
 
     Region spacer = new Region();
     HBox.setHgrow(spacer, Priority.ALWAYS);
-    tradeActions.getChildren().addAll(buyBtn, spacer, shareQuantityInputField, sellBtn);
 
     VBox.setVgrow(chart, Priority.ALWAYS);
 
-    mainContent.getChildren().addAll(topSection, chart, tradeActions);
+    mainContent.getChildren().addAll(header, chart);
     getRootPane().getChildren().addAll(scrollPane, mainContent);
 
     registerButton(DashBoardActions.BUY_SHARES, buyBtn);
     registerButton(DashBoardActions.SELL_SHARES, sellBtn);
   }
 
+  private ColumnConstraints makeCol(final float w) {
+    ColumnConstraints col = new ColumnConstraints();
+    col.setHalignment(HPos.CENTER);
+    col.setPercentWidth(w);
+    col.setFillWidth(true);
+    return col;
+  }
+
   @Override
   protected void initStyling() {
     sidebar.getStyleClass().add("market-sidebar");
-    tradeActions.getStyleClass().add("trade-actions");
     selectedStockLabel.getStyleClass().add("selected-stock-pill");
     selectedStockPriceLabel.getStyleClass().add("selected-stock-pill");
+    shareQuantityInputField.getStyleClass().add("qtyTextField");
     chart.getStyleClass().add("chart");
+    m5QtyBtn.getStyleClass().add("qtyBtn");
+    m1QtyBtn.getStyleClass().add("qtyBtn");
+    p1QtyBtn.getStyleClass().add("qtyBtn");
+    p5QtyBtn.getStyleClass().add("qtyBtn");
   }
 
   public void setCurrentStock(final Stock stock) {
@@ -151,21 +218,19 @@ public void setCurrentStock(final Stock stock) {
 
   public Button createStockButton(final String label) {
     Button button = new Button(label);
-    stockButtons.add(button);
     sidebar.getChildren().add(button);
     button.getStyleClass().add("stock-button");
     return button;
   }
 
   public void clearStockList() {
-    stockButtons.clear();
     sidebar.getChildren().clear();
   }
 
   public void updateGraph() {
     dataSeries.getData().clear();
     List<BigDecimal> prices = selectedStock.getHistoricalPrices();
-    updateStockPrice(prices.getLast().floatValue());
+    updateStockPrice(prices.getLast().floatValue(), selectedStock.getLatestPriceChange().floatValue());
     xAxis.setLowerBound(Math.max(1, prices.size() - 22));
     xAxis.setUpperBound(Math.max(22, prices.size()));
 
@@ -190,8 +255,14 @@ public void updateGraph() {
     }
   }
 
-  private void updateStockPrice(final float value) {
-    selectedStockPriceLabel.setText(Float.toString(Math.round(value*100f)/100f));
+  private void updateStockPrice(final float value, final float changeSinceLast) {
+    String changeSinceLastString;
+    if (changeSinceLast >= 0) {
+      changeSinceLastString = "+ " + Math.round(changeSinceLast*100f)/100f;
+    } else {
+      changeSinceLastString = "- " + Math.abs(changeSinceLast*100f)/100f;
+    }
+    selectedStockPriceLabel.setText(Float.toString(Math.round(value*100f)/100f) + "NOK (" + changeSinceLastString + ")");
   }
 
   public Stock getCurrentStock() {
diff --git a/src/main/resources/styles.css b/src/main/resources/styles.css
index a55cf3f..d3d5875 100644
--- a/src/main/resources/styles.css
+++ b/src/main/resources/styles.css
@@ -247,7 +247,7 @@
     -fx-font-size: 24;
 }
 
-.stock-button : hover {
+.stock-button:hover {
     -fx-cursor: hand;
     -fx-scale-x: 1.05;
     -fx-scale-y: 1.05;
@@ -271,10 +271,14 @@
     -fx-text-fill: black;
     -fx-font-style: italic;
     -fx-font-weight: bold;
-    -fx-min-height: 60;
-    -fx-pref-height: 80;
-    -fx-min-width: 150;
-    -fx-max-width: 250;
+
+    -fx-min-height: 30;
+    -fx-pref-height: 45;
+    -fx-max-height: 60;
+
+    -fx-min-width: 60;
+    -fx-pref-width: 80;
+    -fx-max-width: 200;
 }
 
 .sell-button {
@@ -284,14 +288,51 @@
     -fx-text-fill: black;
     -fx-font-style: italic;
     -fx-font-weight: bold;
-    -fx-min-height: 60;
-    -fx-pref-height: 80;
-    -fx-min-width: 150;
-    -fx-max-width: 250;
+
+    -fx-min-height: 30;
+    -fx-pref-height: 45;
+    -fx-max-height: 60;
+
+    -fx-min-width: 60;
+    -fx-pref-width: 80;
+    -fx-max-width: 200;
 }
 
 .buy-button:hover, .sell-button:hover {
     -fx-cursor: hand;
     -fx-scale-x: 1.05;
     -fx-scale-y: 1.05;
+}
+.qtyBtn {
+    -fx-background-color: rgba(140, 140, 140, 0.6);
+
+    -fx-background-radius: 50;
+
+    -fx-text-fill: white;
+    -fx-font-weight: bold;
+    -fx-font-size: 14px;
+
+    -fx-min-width: 60;
+    -fx-pref-width: 75;
+    -fx-max-width: 90;
+
+    -fx-min-height: 20;
+    -fx-pref-height: 30;
+    -fx-max-height: 40;
+}
+
+.qtyBtn:hover {
+    -fx-cursor: hand;
+    -fx-scale-x: 1.05;
+    -fx-scale-y: 1.05;
+}
+
+.qtyTextField {
+    -fx-min-width: 50;
+    -fx-pref-width: 75;
+    -fx-max-width: 100;
+
+    -fx-min-height: 30;
+    -fx-pref-height: 45;
+    -fx-max-height: 60;
 }
\ No newline at end of file

From 258fbafd1e374c5df3a063e51438dbe3205ffb68 Mon Sep 17 00:00:00 2001
From: = <tommyah@stud.ntnu.no>
Date: Fri, 15 May 2026 10:41:25 +0200
Subject: [PATCH 02/12] Feat: Updated price section

Updated price section of dashboard view to show percent change since last week as well as highest and lowest price of the selected stock
---
 .../view/widgets/dashboard/DashBoardView.java | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
index 45ab0ff..1564f91 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
@@ -31,6 +31,8 @@ public class DashBoardView extends ViewElement<HBox, DashBoardActions> {
   private NumberAxis yAxis;
   private Label selectedStockPriceLabel;
   private TextField shareQuantityInputField;
+  private Label lowPriceLabel;
+  private Label highPriceLabel;
   private Button m5QtyBtn;
   private Button m1QtyBtn;
   private Button p1QtyBtn;
@@ -124,8 +126,8 @@ protected void initLayout() {
     selectedStockPriceLabel.getStyleClass().add("price-large");
 
     HBox lowHighBox = new HBox(10);
-    Label lowPriceLabel = new Label("Low: 0.0 NOK");
-    Label highPriceLabel = new Label("High: 0.0 NOK");
+    lowPriceLabel = new Label("Low: 0.0 NOK");
+    highPriceLabel = new Label("High: 0.0 NOK");
     lowHighBox.getChildren().addAll(lowPriceLabel, highPriceLabel);
     priceStats.getChildren().addAll(selectedStockPriceLabel, lowHighBox);
 
@@ -231,6 +233,8 @@ public void updateGraph() {
     dataSeries.getData().clear();
     List<BigDecimal> prices = selectedStock.getHistoricalPrices();
     updateStockPrice(prices.getLast().floatValue(), selectedStock.getLatestPriceChange().floatValue());
+    setHighPriceLabel(selectedStock.getHighestPrice().floatValue());
+    setLowPriceLabel(selectedStock.getLowestPrice().floatValue());
     xAxis.setLowerBound(Math.max(1, prices.size() - 22));
     xAxis.setUpperBound(Math.max(22, prices.size()));
 
@@ -255,14 +259,28 @@ public void updateGraph() {
     }
   }
 
-  private void updateStockPrice(final float value, final float changeSinceLast) {
+  private void updateStockPrice(final float value,
+                                final float changeSinceLast) {
     String changeSinceLastString;
-    if (changeSinceLast >= 0) {
-      changeSinceLastString = "+ " + Math.round(changeSinceLast*100f)/100f;
+    float oldVal = value - changeSinceLast;
+    float changePercent = (value/oldVal - 1) * 100;
+    if (changeSinceLast > 0) {
+      changeSinceLastString = "(+ " + Math.round(changePercent*100f)/100f + "%)";
+    } else if (changeSinceLast < 0) {
+      changeSinceLastString = "(- " + Math.round(Math.abs(changePercent)*100f)/100f + "%)";
     } else {
-      changeSinceLastString = "- " + Math.abs(changeSinceLast*100f)/100f;
+      changeSinceLastString = "";
     }
-    selectedStockPriceLabel.setText(Float.toString(Math.round(value*100f)/100f) + "NOK (" + changeSinceLastString + ")");
+    
+    selectedStockPriceLabel.setText(Float.toString(Math.round(value*100f)/100f) + "NOK " + changeSinceLastString);
+  }
+
+  private void setLowPriceLabel(float value) {
+    lowPriceLabel.setText("Low: " + Math.round(value*100f)/100f + " NOK");
+  }
+
+  private void setHighPriceLabel(float value) {
+    highPriceLabel.setText("High: " + Math.round(value*100f)/100f + " NOK");
   }
 
   public Stock getCurrentStock() {

From 9e557d6b3077bbf1d1f61416d123d3bc517e49b0 Mon Sep 17 00:00:00 2001
From: = <tommyah@stud.ntnu.no>
Date: Fri, 15 May 2026 11:10:17 +0200
Subject: [PATCH 03/12] Feat: Name label and amount owned

Stock name now updates when selecting a new stock. In addition, amount of shares owned is updated when buying and changing stocks
---
 .../dashboard/DashBoardController.java        | 24 ++++++++++++------
 .../view/widgets/dashboard/DashBoardView.java | 25 ++++++++++++++-----
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
index b2d94f7..6aa9f86 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
@@ -1,8 +1,7 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.dashboard;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
-import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
-import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.*;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventManager;
 import edu.ntnu.idi.idatt2003.g40.mappe.utils.Validator;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewController;
@@ -33,8 +32,8 @@ public DashBoardController(final DashBoardView viewElement,
     super(viewElement, eventManager);
   }
 
-  private void handleStockSelection(Stock stock) {
-    getViewElement().setCurrentStock(stock);
+  private void handleStockSelection(final Stock stock, final float amountOwned) {
+    getViewElement().setCurrentStock(stock, amountOwned);
     getViewElement().updateGraph();
   }
 
@@ -43,24 +42,33 @@ private void populateStockList() {
     for (Stock s : stockList) {
       Button stockBtn = getViewElement().createStockButton(s.getSymbol());
 
-      getViewElement().setOnStockAction(stockBtn, s, this::handleStockSelection);
+
+      getViewElement().setOnStockAction(stockBtn, s, (stock)-> {
+        BigDecimal amountOfSharesOwnedThisStock = player.getPortfolio().getShares().stream()
+                .filter(share -> share.getStock().equals(s))
+                .map(Share::getQuantity)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        handleStockSelection(stock, amountOfSharesOwnedThisStock.floatValue());
+      });
     }
   }
 
-
   @Override
   protected void initInteractions() {
     populateStockList();
-    getViewElement().setCurrentStock(stockList.getFirst());
+    getViewElement().setCurrentStock(stockList.getFirst(), 0);
     getViewElement().updateGraph();
     getViewElement().setOnAction(DashBoardActions.BUY_SHARES, () -> {
       if (Validator.NOT_EMPTY.isValid(getViewElement().getQuantityInputField().getText())) {
         BigDecimal amountToBuy = new BigDecimal(getViewElement().getQuantityInputField().getText());
-        exchange.buy(
+        Transaction purchase = exchange.buy(
                 getViewElement().getCurrentStock().getSymbol(),
                 amountToBuy,
                 player
         );
+        if (purchase.isCommited()) {
+          getViewElement().addOwnedShares(purchase.getShare().getQuantity().floatValue());
+        }
       }
     });
 
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
index 1564f91..165f44b 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
@@ -26,7 +26,10 @@ public class DashBoardView extends ViewElement<HBox, DashBoardActions> {
   private XYChart.Series<Number, Number> dataSeries;
   private VBox sidebar;
   private Stock selectedStock;
+  private float ownedStocks = 0;
   private Label selectedStockLabel;
+  private Label stockFullNameLabel;
+  private Label ownedQuantityLabel;
   private NumberAxis xAxis;
   private NumberAxis yAxis;
   private Label selectedStockPriceLabel;
@@ -116,8 +119,9 @@ protected void initLayout() {
     VBox stockIdentity = new VBox(5);
     selectedStockLabel = new Label("APL");
     selectedStockLabel.getStyleClass().add("stock-symbol-title");
-    Label stockFullNameLabel = new Label("Apple corporation");
-    Label ownedQuantityLabel = new Label("Owned: 0");
+    stockFullNameLabel = new Label("Apple corporation");
+    ownedQuantityLabel = new Label("Owned: 0");
+
     stockIdentity.getChildren().addAll(selectedStockLabel, stockFullNameLabel, ownedQuantityLabel);
 
     // Price Stats
@@ -213,9 +217,17 @@ protected void initStyling() {
     p5QtyBtn.getStyleClass().add("qtyBtn");
   }
 
-  public void setCurrentStock(final Stock stock) {
+  public void setCurrentStock(final Stock stock, final float amountOwned) {
     selectedStock = stock;
     selectedStockLabel.setText(stock.getSymbol());
+    stockFullNameLabel.setText(stock.getCompany());
+    ownedStocks = amountOwned;
+    ownedQuantityLabel.setText("Owned: " + ownedStocks);
+  }
+
+  public void addOwnedShares(final float val) {
+    ownedStocks += val;
+    ownedQuantityLabel.setText("Owned: " + ownedStocks);
   }
 
   public Button createStockButton(final String label) {
@@ -262,8 +274,7 @@ public void updateGraph() {
   private void updateStockPrice(final float value,
                                 final float changeSinceLast) {
     String changeSinceLastString;
-    float oldVal = value - changeSinceLast;
-    float changePercent = (value/oldVal - 1) * 100;
+    float changePercent = (value / (value - changeSinceLast) - 1) * 100;
     if (changeSinceLast > 0) {
       changeSinceLastString = "(+ " + Math.round(changePercent*100f)/100f + "%)";
     } else if (changeSinceLast < 0) {
@@ -271,7 +282,7 @@ private void updateStockPrice(final float value,
     } else {
       changeSinceLastString = "";
     }
-    
+
     selectedStockPriceLabel.setText(Float.toString(Math.round(value*100f)/100f) + "NOK " + changeSinceLastString);
   }
 
@@ -283,6 +294,8 @@ private void setHighPriceLabel(float value) {
     highPriceLabel.setText("High: " + Math.round(value*100f)/100f + " NOK");
   }
 
+  //public void update
+
   public Stock getCurrentStock() {
     return selectedStock;
   }

From b705e59a4e6f09b7ff3afbd2a7318f87a5b18b91 Mon Sep 17 00:00:00 2001
From: = <tommyah@stud.ntnu.no>
Date: Fri, 15 May 2026 12:05:27 +0200
Subject: [PATCH 04/12] Feat: Added sell functionality

Made it possible to sell shares based on a stock. This works by getting total amount of shares owned on the stock, and splitting shares if the required amount to sell does not divide the total amount owned.
---
 .../idatt2003/g40/mappe/engine/Exchange.java  | 51 +++++++++++++++++--
 .../idi/idatt2003/g40/mappe/model/Player.java | 17 ++++++-
 .../idatt2003/g40/mappe/model/Portfolio.java  | 37 ++++++++++++++
 .../dashboard/DashBoardController.java        | 20 ++++++--
 .../financialsummary/SummaryController.java   |  4 ++
 .../widgets/financialsummary/SummaryView.java |  2 +-
 6 files changed, 121 insertions(+), 10 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
index 887fc27..744bdce 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
@@ -6,9 +6,7 @@
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Transaction;
-import edu.ntnu.idi.idatt2003.g40.mappe.service.PurchaseCalculator;
-import edu.ntnu.idi.idatt2003.g40.mappe.service.SaleCalculator;
-import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionCalculator;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.*;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventData;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventManager;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventPublisher;
@@ -199,6 +197,53 @@ public Transaction sell(final Share share, final Player player)
     return sale;
   }
 
+  /**
+   * Method called when a player sells share.
+   *
+   * @param amount the amount of "shares" to sell.
+   * @param stockSymbol the stock to sell shares in.
+   * @param player the player buying stock.
+   *
+   * @return Transaction representing the transaction.
+   *
+   * @throws IllegalArgumentException if any parameter is null, or if player does not have enough shares.
+   * */
+  public List<Transaction> sell(final BigDecimal amount, final String stockSymbol, final Player player)
+          throws IllegalArgumentException {
+    if (amount == null || player == null || !Validator.NOT_EMPTY.isValid(stockSymbol)) {
+      throw new IllegalArgumentException("Invalid sell!");
+    } else {
+
+      List<Share> sharesOfStock = player.getPortfolio().getShares().stream()
+              .filter(s -> s.getStock().getSymbol().equals(stockSymbol))
+              .toList();
+
+      BigDecimal totalOwned = player.getPortfolio().getTotalSharesBySymbol(stockSymbol);
+
+      if (amount.compareTo(totalOwned) > 0) {
+        throw new IllegalArgumentException("Not enough shares!");
+      }
+      ArrayList<Transaction> transactions = new ArrayList<>();
+      BigDecimal remainingToSell = amount;
+
+      for (Share share : sharesOfStock) {
+        if (remainingToSell.compareTo(BigDecimal.ZERO) <= 0) break;
+
+        BigDecimal shareQty = share.getQuantity();
+
+        if (shareQty.compareTo(remainingToSell) <= 0) {
+          remainingToSell = remainingToSell.subtract(shareQty);
+          transactions.add(sell(share, player));
+        } else {
+          Share newShare = player.getPortfolio().splitShare(share, remainingToSell);
+          remainingToSell = BigDecimal.ZERO;
+          transactions.add(sell(newShare, player));
+        }
+      }
+      return transactions;
+    }
+  }
+
   /**
    * Method for advancing time, increasing the amount of weeks.
    * */
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java
index 27af458..999a316 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java
@@ -41,6 +41,11 @@ public final class Player {
    * */
   private final FloatProperty networthAsFloatProp = new SimpleFloatProperty(0);
 
+  /**
+   * Current money of player as a listenable {@link FloatProperty} object.
+   * */
+  private final FloatProperty moneyAsFloatProp = new SimpleFloatProperty(0);
+
   /**
    * The players' portfolio, holding their shares.
    * */
@@ -68,6 +73,7 @@ public Player(final String name, final BigDecimal startingMoney) throws IllegalA
     this.startingMoney = startingMoney;
     this.money = this.startingMoney;
     this.networthAsFloatProp.setValue(this.startingMoney);
+    this.moneyAsFloatProp.setValue(this.startingMoney);
     this.portfolio = new Portfolio();
     this.transactionArchive = new TransactionArchive();
   }
@@ -115,7 +121,6 @@ public void addMoney(final BigDecimal amount) {
    */
   public void withdrawMoney(final BigDecimal amount) {
     money = money.subtract(amount);
-
   }
 
   /**
@@ -155,6 +160,15 @@ public FloatProperty getNetWorthAsFloatProperty() {
     return networthAsFloatProp;
   }
 
+  /**
+   * Get money as a {@link FloatProperty} object, allowing listening for changes.
+   *
+   * @return FloatProperty.
+   * */
+  public FloatProperty getMoneyAsFloatProperty() {
+    return moneyAsFloatProp;
+  }
+
   /**
    * Getter method for players' current status.
    *
@@ -182,6 +196,7 @@ public void handleTransaction(final Transaction transaction) {
         portfolio.removeShare(sale.getShare());
       }
       networthAsFloatProp.setValue(getNetWorth().floatValue());
+      moneyAsFloatProp.setValue(money);
       transaction.commit(this);
     }
   }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Portfolio.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Portfolio.java
index f83ea00..483adb8 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Portfolio.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Portfolio.java
@@ -123,4 +123,41 @@ public BigDecimal getNetWorth() {
     }
     return netWorth;
   }
+
+  /**
+   * Helper method to get total amount of shares owned in a specific stock.
+   *
+   * @param symbol the symbol of the stock to check for shares.
+   * */
+  public BigDecimal getTotalSharesBySymbol(final String symbol) {
+    return shares.stream()
+            .filter(s -> s.getStock().getSymbol().equals(symbol))
+            .map(Share::getQuantity)
+            .reduce(BigDecimal.ZERO, BigDecimal::add);
+  }
+
+  /**
+   * "Splits" a share in two pieces based on an amount.
+   *
+   * @param share the share to split.
+   * @param splitAmount the amount to split by.
+   *
+   * @return the split share from the original to the split amount.
+   *
+   * @throws IllegalArgumentException if share or split amount is invalid.
+   * */
+  public Share splitShare(final Share share, final BigDecimal splitAmount)
+          throws IllegalArgumentException {
+    if (!contains(share) || splitAmount.compareTo(share.getQuantity()) > 0) {
+      throw new IllegalArgumentException("Cannot split share!");
+    }
+    BigDecimal remainingAmount = share.getQuantity().subtract(splitAmount);
+
+    Share newShare1 = new Share(share.getStock(), splitAmount, share.getPurchasePrice());
+    Share newShare2 = new Share(share.getStock(), remainingAmount, share.getPurchasePrice());
+    removeShare(share);
+    addShare(newShare1);
+    addShare(newShare2);
+    return newShare1;
+  }
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
index 6aa9f86..87801b1 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
@@ -10,6 +10,7 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Optional;
 
 public class DashBoardController extends ViewController<DashBoardView> {
 
@@ -44,11 +45,8 @@ private void populateStockList() {
 
 
       getViewElement().setOnStockAction(stockBtn, s, (stock)-> {
-        BigDecimal amountOfSharesOwnedThisStock = player.getPortfolio().getShares().stream()
-                .filter(share -> share.getStock().equals(s))
-                .map(Share::getQuantity)
-                .reduce(BigDecimal.ZERO, BigDecimal::add);
-        handleStockSelection(stock, amountOfSharesOwnedThisStock.floatValue());
+        BigDecimal amountOfSharesOwned = player.getPortfolio().getTotalSharesBySymbol(s.getSymbol());
+        handleStockSelection(stock, amountOfSharesOwned.floatValue());
       });
     }
   }
@@ -72,6 +70,18 @@ protected void initInteractions() {
       }
     });
 
+    getViewElement().setOnAction(DashBoardActions.SELL_SHARES, () -> {
+      if (Validator.NOT_EMPTY.isValid(getViewElement().getQuantityInputField().getText())) {
+        List<Transaction> transactions = exchange.sell(new BigDecimal(getViewElement().getQuantityInputField().getText()), getViewElement().getCurrentStock().getSymbol(), player);
+
+        for (Transaction t : transactions) {
+          if(t.isCommited()) {
+            getViewElement().addOwnedShares(-t.getShare().getQuantity().floatValue());
+          }
+        }
+      }
+    });
+
     exchange.weekProperty().addListener((observable,o,n) -> {
       getViewElement().updateGraph();
     });
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryController.java
index cd6c58a..ee3b88e 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryController.java
@@ -46,5 +46,9 @@ protected void initInteractions() {
     player.getNetWorthAsFloatProperty().addListener((observable, o, n) -> {
       getViewElement().setBalance(player.getMoney().floatValue(), player.getNetWorth().floatValue());
     });
+
+    player.getMoneyAsFloatProperty().addListener((observable, o, n) -> {
+      getViewElement().setBalance(player.getMoney().floatValue(), player.getNetWorth().floatValue());
+    });
   }
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryView.java
index 83a30e7..092e407 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryView.java
@@ -109,7 +109,7 @@ protected void initStyling() {
   }
 
   public void setBalance(final float money, final float netWorth) {
-    balanceLabel.setText(Math.round(money*100f)/100f + "$ / " + Math.round(netWorth*100f)/100f + "$");
+    balanceLabel.setText(Math.round(money*100f)/100f + "NOK / " + Math.round(netWorth*100f)/100f + "NOK");
   }
 
   public void setWeek(int week) {

From cf09d0f8ae317245091593adf11d20b4b04df7ab Mon Sep 17 00:00:00 2001
From: = <tommyah@stud.ntnu.no>
Date: Fri, 15 May 2026 12:29:19 +0200
Subject: [PATCH 05/12] Feat: Quantity Button and fixes

Added functionality for the quantity buttons, and fixed some logic concerning selling/purchasing stocks and synchronizing the view.
---
 .../idatt2003/g40/mappe/engine/Exchange.java  |  4 ++-
 .../idi/idatt2003/g40/mappe/model/Player.java | 18 +++++++------
 .../widgets/dashboard/DashBoardActions.java   |  5 +++-
 .../dashboard/DashBoardController.java        | 26 ++++++++++++++++++-
 .../view/widgets/dashboard/DashBoardView.java |  4 +++
 5 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
index 744bdce..cfa3940 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
@@ -227,7 +227,9 @@ public List<Transaction> sell(final BigDecimal amount, final String stockSymbol,
       BigDecimal remainingToSell = amount;
 
       for (Share share : sharesOfStock) {
-        if (remainingToSell.compareTo(BigDecimal.ZERO) <= 0) break;
+        if (remainingToSell.compareTo(BigDecimal.ZERO) <= 0) {
+          break;
+        }
 
         BigDecimal shareQty = share.getQuantity();
 
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java
index 999a316..9cac71e 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java
@@ -186,18 +186,20 @@ public PlayerStatus getStatus() {
    * @param transaction the transaction to handle.
    * */
   public void handleTransaction(final Transaction transaction) {
-    if (money.floatValue() > transaction.getCalculator().calculateTotal().floatValue()) {
-      transactionArchive.add(transaction);
-      if (transaction instanceof Purchase purchase) {
+    if (transaction instanceof Purchase purchase) {
+      if (money.floatValue() > transaction.getCalculator().calculateTotal().floatValue()) {
         withdrawMoney(purchase.getCalculator().calculateTotal());
         portfolio.addShare(purchase.getShare());
-      } else if (transaction instanceof Sale sale) {
-        addMoney(sale.getCalculator().calculateTotal());
-        portfolio.removeShare(sale.getShare());
+        transactionArchive.add(transaction);
+        transaction.commit(this);
       }
-      networthAsFloatProp.setValue(getNetWorth().floatValue());
-      moneyAsFloatProp.setValue(money);
+    } else if (transaction instanceof Sale sale) {
+      addMoney(sale.getCalculator().calculateTotal());
+      portfolio.removeShare(sale.getShare());
+      transactionArchive.add(transaction);
       transaction.commit(this);
     }
+    networthAsFloatProp.setValue(getNetWorth().floatValue());
+    moneyAsFloatProp.setValue(money);
   }
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardActions.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardActions.java
index e6fa822..f3facb4 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardActions.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardActions.java
@@ -3,5 +3,8 @@
 public enum DashBoardActions {
   BUY_SHARES,
   SELL_SHARES,
-  SELECT_STOCK;
+  DECREASE_5,
+  DECREASE_1,
+  INCREASE_1,
+  INCREASE_5;
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
index 87801b1..ecf8526 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
@@ -72,7 +72,10 @@ protected void initInteractions() {
 
     getViewElement().setOnAction(DashBoardActions.SELL_SHARES, () -> {
       if (Validator.NOT_EMPTY.isValid(getViewElement().getQuantityInputField().getText())) {
-        List<Transaction> transactions = exchange.sell(new BigDecimal(getViewElement().getQuantityInputField().getText()), getViewElement().getCurrentStock().getSymbol(), player);
+        List<Transaction> transactions = exchange.sell(
+                new BigDecimal(getViewElement().getQuantityInputField().getText()),
+                getViewElement().getCurrentStock().getSymbol(),
+                player);
 
         for (Transaction t : transactions) {
           if(t.isCommited()) {
@@ -82,6 +85,27 @@ protected void initInteractions() {
       }
     });
 
+    getViewElement().setOnAction(DashBoardActions.DECREASE_5, () -> {
+      getViewElement().getQuantityInputField().setText(
+              new BigDecimal(getViewElement().getQuantityInputField().getText())
+                      .subtract(new BigDecimal("5")).toString());
+    });
+    getViewElement().setOnAction(DashBoardActions.DECREASE_1, () -> {
+      getViewElement().getQuantityInputField().setText(
+              new BigDecimal(getViewElement().getQuantityInputField().getText())
+                      .subtract(new BigDecimal("1")).toString());
+    });
+    getViewElement().setOnAction(DashBoardActions.INCREASE_1, () -> {
+      getViewElement().getQuantityInputField().setText(
+              new BigDecimal(getViewElement().getQuantityInputField().getText())
+                      .add(new BigDecimal("1")).toString());
+    });
+    getViewElement().setOnAction(DashBoardActions.INCREASE_5, () -> {
+      getViewElement().getQuantityInputField().setText(
+              new BigDecimal(getViewElement().getQuantityInputField().getText())
+                      .add(new BigDecimal("5")).toString());
+    });
+
     exchange.weekProperty().addListener((observable,o,n) -> {
       getViewElement().updateGraph();
     });
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
index 165f44b..2b612a0 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
@@ -194,6 +194,10 @@ protected void initLayout() {
 
     registerButton(DashBoardActions.BUY_SHARES, buyBtn);
     registerButton(DashBoardActions.SELL_SHARES, sellBtn);
+    registerButton(DashBoardActions.DECREASE_5, m5QtyBtn);
+    registerButton(DashBoardActions.DECREASE_1, m1QtyBtn);
+    registerButton(DashBoardActions.INCREASE_1, p1QtyBtn);
+    registerButton(DashBoardActions.INCREASE_5, p5QtyBtn);
   }
 
   private ColumnConstraints makeCol(final float w) {

From f4ed619468a555b46ad7b724775ed9831b1991e1 Mon Sep 17 00:00:00 2001
From: = <tommyah@stud.ntnu.no>
Date: Fri, 15 May 2026 12:35:25 +0200
Subject: [PATCH 06/12] Feat: Made it possible to sell max stocks

If attempting to sell more than currently held, the system simply sells every share
---
 .../edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java    | 4 ++--
 .../g40/mappe/view/widgets/dashboard/DashBoardView.java      | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
index cfa3940..9c5796a 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
@@ -208,7 +208,7 @@ public Transaction sell(final Share share, final Player player)
    *
    * @throws IllegalArgumentException if any parameter is null, or if player does not have enough shares.
    * */
-  public List<Transaction> sell(final BigDecimal amount, final String stockSymbol, final Player player)
+  public List<Transaction> sell(BigDecimal amount, final String stockSymbol, final Player player)
           throws IllegalArgumentException {
     if (amount == null || player == null || !Validator.NOT_EMPTY.isValid(stockSymbol)) {
       throw new IllegalArgumentException("Invalid sell!");
@@ -221,7 +221,7 @@ public List<Transaction> sell(final BigDecimal amount, final String stockSymbol,
       BigDecimal totalOwned = player.getPortfolio().getTotalSharesBySymbol(stockSymbol);
 
       if (amount.compareTo(totalOwned) > 0) {
-        throw new IllegalArgumentException("Not enough shares!");
+        amount = totalOwned;
       }
       ArrayList<Transaction> transactions = new ArrayList<>();
       BigDecimal remainingToSell = amount;
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
index 2b612a0..2b05357 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
@@ -115,6 +115,7 @@ protected void initLayout() {
     HBox header = new HBox(20);
     header.setAlignment(Pos.CENTER_LEFT);
 
+
     // Stock Identity (The gray pill)
     VBox stockIdentity = new VBox(5);
     selectedStockLabel = new Label("APL");
@@ -182,6 +183,10 @@ protected void initLayout() {
     grid.add(qtySection, 0, 0, 6,1);
     grid.add(tradeBtns, 0, 1, 6, 1);
 
+    HBox.setHgrow(stockIdentity, Priority.ALWAYS);
+    HBox.setHgrow(priceStats, Priority.ALWAYS);
+    HBox.setHgrow(grid, Priority.ALWAYS);
+
     header.getChildren().addAll(stockIdentity, priceStats, grid);
 
     Region spacer = new Region();

From 7c421e1966d780a23fe06f48de6017c5d803c31d Mon Sep 17 00:00:00 2001
From: = <tommyah@stud.ntnu.no>
Date: Fri, 15 May 2026 13:04:53 +0200
Subject: [PATCH 07/12] Feat; Added sidebar elements

---
 .../view/widgets/dashboard/DashBoardView.java | 21 +++++++++++++------
 src/main/resources/styles.css                 | 21 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
index 2b05357..948d91a 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
@@ -11,22 +11,22 @@
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.financialsummary.SummaryView;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
 import javafx.scene.chart.LineChart;
 import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.XYChart;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.scene.layout.*;
 
 public class DashBoardView extends ViewElement<HBox, DashBoardActions> {
   private LineChart<Number, Number> chart;
   private XYChart.Series<Number, Number> dataSeries;
   private VBox sidebar;
+  private VBox completeSideBar;
   private Stock selectedStock;
   private float ownedStocks = 0;
+  private TextField sideBarSearchField;
   private Label selectedStockLabel;
   private Label stockFullNameLabel;
   private Label ownedQuantityLabel;
@@ -50,6 +50,12 @@ protected void initLayout() {
     getRootPane().setAlignment(Pos.TOP_LEFT);
     getRootPane().setFillHeight(true);
 
+    completeSideBar = new VBox(10);
+    sideBarSearchField = new TextField();
+    sideBarSearchField.setPromptText("Search...");
+    List<String> timeSelectionOptions;
+    ComboBox<List<String>> timeDropDownMenu = new ComboBox<>();
+
     sidebar = new VBox(10);
     sidebar.setPrefWidth(150);
     sidebar.setMaxHeight(Double.MAX_VALUE);
@@ -57,7 +63,9 @@ protected void initLayout() {
     VBox.setVgrow(sidebar, Priority.ALWAYS);
 
     ScrollPane scrollPane = new ScrollPane(sidebar);
+    Separator separator = new Separator();
 
+    completeSideBar.getChildren().addAll(sideBarSearchField, separator, scrollPane, timeDropDownMenu);
     scrollPane.setFitToWidth(true);
     scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
     scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
@@ -195,7 +203,7 @@ protected void initLayout() {
     VBox.setVgrow(chart, Priority.ALWAYS);
 
     mainContent.getChildren().addAll(header, chart);
-    getRootPane().getChildren().addAll(scrollPane, mainContent);
+    getRootPane().getChildren().addAll(completeSideBar, mainContent);
 
     registerButton(DashBoardActions.BUY_SHARES, buyBtn);
     registerButton(DashBoardActions.SELL_SHARES, sellBtn);
@@ -215,7 +223,8 @@ private ColumnConstraints makeCol(final float w) {
 
   @Override
   protected void initStyling() {
-    sidebar.getStyleClass().add("market-sidebar");
+    completeSideBar.getStyleClass().add("market-sidebar");
+    sidebar.getStyleClass().add("market-sidebar2");
     selectedStockLabel.getStyleClass().add("selected-stock-pill");
     selectedStockPriceLabel.getStyleClass().add("selected-stock-pill");
     shareQuantityInputField.getStyleClass().add("qtyTextField");
diff --git a/src/main/resources/styles.css b/src/main/resources/styles.css
index d3d5875..de4e2d4 100644
--- a/src/main/resources/styles.css
+++ b/src/main/resources/styles.css
@@ -236,6 +236,14 @@
 
 /* --------------- IN GAME VIEW ------------- */
 .market-sidebar {
+    -fx-border-color: #000000;
+    -fx-border-width: 0 2 0 0;
+    -fx-border-style: solid;
+
+    -fx-padding: 20;
+}
+
+.market-sidebar2 {
     -fx-padding: 20;
 }
 
@@ -303,6 +311,7 @@
     -fx-scale-x: 1.05;
     -fx-scale-y: 1.05;
 }
+
 .qtyBtn {
     -fx-background-color: rgba(140, 140, 140, 0.6);
 
@@ -335,4 +344,14 @@
     -fx-min-height: 30;
     -fx-pref-height: 45;
     -fx-max-height: 60;
-}
\ No newline at end of file
+}
+
+.scroll-pane {
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+    -fx-padding: 0;
+}
+
+.scroll-pane > .viewport {
+    -fx-background-color: transparent;
+}

From 3f394dc8dbc060d202351582b875eac42ecf4e10 Mon Sep 17 00:00:00 2001
From: = <tommyah@stud.ntnu.no>
Date: Fri, 15 May 2026 13:14:33 +0200
Subject: [PATCH 08/12] Feat: Implemented search functionality

Implemented functionality for searching for stocks in the dashboard view
---
 .../dashboard/DashBoardController.java        | 26 ++++++++++++++-----
 .../view/widgets/dashboard/DashBoardView.java |  6 +++--
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
index ecf8526..b1d376b 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
@@ -9,6 +9,7 @@
 import javafx.scene.control.TextFormatter;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -38,22 +39,29 @@ private void handleStockSelection(final Stock stock, final float amountOwned) {
     getViewElement().updateGraph();
   }
 
-  private void populateStockList() {
+  private void populateStockList(String filter) {
     getViewElement().clearStockList();
+    String search = filter.toLowerCase();
     for (Stock s : stockList) {
-      Button stockBtn = getViewElement().createStockButton(s.getSymbol());
+      boolean matches = s.getSymbol().toLowerCase().contains(search) ||
+              s.getCompany().toLowerCase().contains(search);
 
 
-      getViewElement().setOnStockAction(stockBtn, s, (stock)-> {
-        BigDecimal amountOfSharesOwned = player.getPortfolio().getTotalSharesBySymbol(s.getSymbol());
-        handleStockSelection(stock, amountOfSharesOwned.floatValue());
-      });
+      if (matches) {
+        Button stockBtn = getViewElement().createStockButton(s.getSymbol());
+
+        getViewElement().setOnStockAction(stockBtn, s, (Stock stock) -> {
+          BigDecimal amountOfSharesOwned = player.getPortfolio()
+                  .getTotalSharesBySymbol(s.getSymbol());
+          handleStockSelection(stock, amountOfSharesOwned.floatValue());
+        });
+      }
     }
   }
 
   @Override
   protected void initInteractions() {
-    populateStockList();
+    populateStockList("");
     getViewElement().setCurrentStock(stockList.getFirst(), 0);
     getViewElement().updateGraph();
     getViewElement().setOnAction(DashBoardActions.BUY_SHARES, () -> {
@@ -116,5 +124,9 @@ protected void initInteractions() {
       }
       return null;
     }));
+
+    getViewElement().getSideBarSearchField().textProperty().addListener((observable, o, n) -> {
+      populateStockList(n);
+    });
   }
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
index 948d91a..9699f5a 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
@@ -93,7 +93,7 @@ protected void initLayout() {
     yAxis.setTickMarkVisible(true);
     yAxis.setMinorTickVisible(false);
     yAxis.setAutoRanging(false);
-    yAxis.setLabel("Price ($)");
+    yAxis.setLabel("Price (NOK)");
 
     chart = new LineChart<>(xAxis, yAxis);
     chart.setCreateSymbols(false);
@@ -312,7 +312,9 @@ private void setHighPriceLabel(float value) {
     highPriceLabel.setText("High: " + Math.round(value*100f)/100f + " NOK");
   }
 
-  //public void update
+  public TextField getSideBarSearchField() {
+    return sideBarSearchField;
+  }
 
   public Stock getCurrentStock() {
     return selectedStock;

From b3fbbeaefa01321efb926c3884bab367b244f152 Mon Sep 17 00:00:00 2001
From: = <tommyah@stud.ntnu.no>
Date: Fri, 15 May 2026 13:34:48 +0200
Subject: [PATCH 09/12] Feat: Graph change time range

Added a time range enum that controls how the graphs' x value range.
---
 .../dashboard/DashBoardController.java        | 13 +++++++---
 .../widgets/dashboard/DashBoardTimeRange.java | 24 +++++++++++++++++++
 .../view/widgets/dashboard/DashBoardView.java | 20 +++++++++++-----
 3 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardTimeRange.java

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
index b1d376b..47d1ff4 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
@@ -18,6 +18,7 @@ public class DashBoardController extends ViewController<DashBoardView> {
   private Player player;
   private Exchange exchange;
   private List<Stock> stockList;
+  private DashBoardTimeRange selectedTimeRange;
 
   /**
    * {@inheritDoc}
@@ -31,12 +32,13 @@ public DashBoardController(final DashBoardView viewElement,
     this.player = player;
     this.stockList = stockList;
     this.exchange = exchange;
+    this.selectedTimeRange = DashBoardTimeRange.DEFAULT;
     super(viewElement, eventManager);
   }
 
   private void handleStockSelection(final Stock stock, final float amountOwned) {
     getViewElement().setCurrentStock(stock, amountOwned);
-    getViewElement().updateGraph();
+    getViewElement().updateGraph(selectedTimeRange);
   }
 
   private void populateStockList(String filter) {
@@ -63,7 +65,7 @@ private void populateStockList(String filter) {
   protected void initInteractions() {
     populateStockList("");
     getViewElement().setCurrentStock(stockList.getFirst(), 0);
-    getViewElement().updateGraph();
+    getViewElement().updateGraph(selectedTimeRange);
     getViewElement().setOnAction(DashBoardActions.BUY_SHARES, () -> {
       if (Validator.NOT_EMPTY.isValid(getViewElement().getQuantityInputField().getText())) {
         BigDecimal amountToBuy = new BigDecimal(getViewElement().getQuantityInputField().getText());
@@ -115,7 +117,7 @@ protected void initInteractions() {
     });
 
     exchange.weekProperty().addListener((observable,o,n) -> {
-      getViewElement().updateGraph();
+      getViewElement().updateGraph(selectedTimeRange);
     });
 
     getViewElement().getQuantityInputField().setTextFormatter(new TextFormatter<>(change -> {
@@ -128,5 +130,10 @@ protected void initInteractions() {
     getViewElement().getSideBarSearchField().textProperty().addListener((observable, o, n) -> {
       populateStockList(n);
     });
+
+    getViewElement().getTimeRangeSelector().setOnAction(e -> {
+      selectedTimeRange = getViewElement().getTimeRangeSelector().getValue();
+      getViewElement().updateGraph(selectedTimeRange);
+    });
   }
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardTimeRange.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardTimeRange.java
new file mode 100644
index 0000000..672211a
--- /dev/null
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardTimeRange.java
@@ -0,0 +1,24 @@
+package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.dashboard;
+
+public enum DashBoardTimeRange {
+  ONE_WEEK("1 Week", 1),
+  DEFAULT("22 Weeks (Default)", 22),
+  ONE_MONTH("1 Month", 4),
+  ONE_YEAR("1 Year", 52);
+
+  private final String label;
+  private final int weeks;
+
+  DashBoardTimeRange(final String label, final int weeks) {
+    this.label = label; this.weeks = weeks;
+  }
+
+  public int getWeeks() {
+    return weeks;
+  }
+
+  @Override
+  public String toString() {
+    return label;
+  }
+}
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
index 9699f5a..a10f987 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
@@ -25,6 +25,7 @@ public class DashBoardView extends ViewElement<HBox, DashBoardActions> {
   private VBox sidebar;
   private VBox completeSideBar;
   private Stock selectedStock;
+  private ComboBox<DashBoardTimeRange> timeRangeSelector;
   private float ownedStocks = 0;
   private TextField sideBarSearchField;
   private Label selectedStockLabel;
@@ -53,8 +54,9 @@ protected void initLayout() {
     completeSideBar = new VBox(10);
     sideBarSearchField = new TextField();
     sideBarSearchField.setPromptText("Search...");
-    List<String> timeSelectionOptions;
-    ComboBox<List<String>> timeDropDownMenu = new ComboBox<>();
+    timeRangeSelector = new ComboBox<>();
+    timeRangeSelector.getItems().addAll(DashBoardTimeRange.values());
+    timeRangeSelector.setValue(DashBoardTimeRange.DEFAULT);
 
     sidebar = new VBox(10);
     sidebar.setPrefWidth(150);
@@ -65,7 +67,7 @@ protected void initLayout() {
     ScrollPane scrollPane = new ScrollPane(sidebar);
     Separator separator = new Separator();
 
-    completeSideBar.getChildren().addAll(sideBarSearchField, separator, scrollPane, timeDropDownMenu);
+    completeSideBar.getChildren().addAll(sideBarSearchField, separator, scrollPane, timeRangeSelector);
     scrollPane.setFitToWidth(true);
     scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
     scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
@@ -259,14 +261,16 @@ public void clearStockList() {
     sidebar.getChildren().clear();
   }
 
-  public void updateGraph() {
+  public void updateGraph(final DashBoardTimeRange timeRange) {
     dataSeries.getData().clear();
     List<BigDecimal> prices = selectedStock.getHistoricalPrices();
+
     updateStockPrice(prices.getLast().floatValue(), selectedStock.getLatestPriceChange().floatValue());
     setHighPriceLabel(selectedStock.getHighestPrice().floatValue());
     setLowPriceLabel(selectedStock.getLowestPrice().floatValue());
-    xAxis.setLowerBound(Math.max(1, prices.size() - 22));
-    xAxis.setUpperBound(Math.max(22, prices.size()));
+
+    xAxis.setLowerBound(Math.max(1, prices.size() - timeRange.getWeeks()));
+    xAxis.setUpperBound(xAxis.getLowerBound() + timeRange.getWeeks());
 
     double min = prices.stream()
             .min(BigDecimal::compareTo)
@@ -330,4 +334,8 @@ public void setOnStockAction(final Button button,
   public TextField getQuantityInputField() {
     return shareQuantityInputField;
   }
+
+  public ComboBox<DashBoardTimeRange> getTimeRangeSelector() {
+    return timeRangeSelector;
+  }
 }

From cffc19bd4a9d92b64a04584c1380e263edaa1c2b Mon Sep 17 00:00:00 2001
From: = <tommyah@stud.ntnu.no>
Date: Fri, 15 May 2026 14:07:18 +0200
Subject: [PATCH 10/12] Feat: Auto change percent values in pricestats section

The percent values shown in the price statistics section of the header of the dashboard view now updates according to the time range set.
---
 .../view/widgets/dashboard/DashBoardView.java | 27 +++++++++++++------
 src/main/resources/styles.css                 | 11 ++++++++
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
index a10f987..c86e504 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
@@ -4,6 +4,7 @@
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewElement;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
@@ -265,7 +266,18 @@ public void updateGraph(final DashBoardTimeRange timeRange) {
     dataSeries.getData().clear();
     List<BigDecimal> prices = selectedStock.getHistoricalPrices();
 
-    updateStockPrice(prices.getLast().floatValue(), selectedStock.getLatestPriceChange().floatValue());
+    BigDecimal currentPrice = prices.getLast();
+    int rangeInWeeks = timeRange.getWeeks();
+    int startIndex = Math.max(0, prices.size() - 1 - rangeInWeeks);
+
+    BigDecimal pastPrice = prices.get(startIndex);
+    float percentChange;
+    percentChange = currentPrice.subtract(pastPrice)
+            .divide(pastPrice, 4, RoundingMode.HALF_UP)
+            .multiply(new BigDecimal(100))
+            .floatValue();
+
+    updateStockPrice(currentPrice.floatValue(), percentChange);
     setHighPriceLabel(selectedStock.getHighestPrice().floatValue());
     setLowPriceLabel(selectedStock.getLowestPrice().floatValue());
 
@@ -294,18 +306,17 @@ public void updateGraph(final DashBoardTimeRange timeRange) {
   }
 
   private void updateStockPrice(final float value,
-                                final float changeSinceLast) {
+                                final float percentChange) {
     String changeSinceLastString;
-    float changePercent = (value / (value - changeSinceLast) - 1) * 100;
-    if (changeSinceLast > 0) {
-      changeSinceLastString = "(+ " + Math.round(changePercent*100f)/100f + "%)";
-    } else if (changeSinceLast < 0) {
-      changeSinceLastString = "(- " + Math.round(Math.abs(changePercent)*100f)/100f + "%)";
+    if (percentChange > 0) {
+      changeSinceLastString = "(+ " + Math.round(percentChange*100f)/100f + "%)";
+    } else if (percentChange < 0) {
+      changeSinceLastString = "(- " + Math.round(Math.abs(percentChange)*100f)/100f + "%)";
     } else {
       changeSinceLastString = "";
     }
 
-    selectedStockPriceLabel.setText(Float.toString(Math.round(value*100f)/100f) + "NOK " + changeSinceLastString);
+    selectedStockPriceLabel.setText((Math.round(value*100f)/100f) + "NOK " + changeSinceLastString);
   }
 
   private void setLowPriceLabel(float value) {
diff --git a/src/main/resources/styles.css b/src/main/resources/styles.css
index de4e2d4..4266a2e 100644
--- a/src/main/resources/styles.css
+++ b/src/main/resources/styles.css
@@ -355,3 +355,14 @@
 .scroll-pane > .viewport {
     -fx-background-color: transparent;
 }
+
+.combo-box {
+    -fx-background-color: #f4f4f4;
+    -fx-border-color: #d1d1d1;
+    -fx-border-radius: 5;
+    -fx-background-radius: 5;
+}
+
+.combo-box .list-cell {
+    -fx-text-fill: #333333;
+}
\ No newline at end of file

From ffeafb0d1f595e5261f7d88ef3eb8d921c63eba5 Mon Sep 17 00:00:00 2001
From: = <tommyah@stud.ntnu.no>
Date: Fri, 15 May 2026 14:28:00 +0200
Subject: [PATCH 11/12] Feat: Stock button percent change

Implemented percent changes since chosen timerange for stock buttons, so they now display the stocks' changes.
---
 .../dashboard/DashBoardController.java        | 39 ++++++++++++++++---
 .../view/widgets/dashboard/DashBoardView.java |  5 ++-
 src/main/resources/styles.css                 | 12 +++---
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
index 47d1ff4..3d21c35 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
@@ -9,6 +9,7 @@
 import javafx.scene.control.TextFormatter;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -19,6 +20,7 @@ public class DashBoardController extends ViewController<DashBoardView> {
   private Exchange exchange;
   private List<Stock> stockList;
   private DashBoardTimeRange selectedTimeRange;
+  private String selectedFilter;
 
   /**
    * {@inheritDoc}
@@ -32,6 +34,7 @@ public DashBoardController(final DashBoardView viewElement,
     this.player = player;
     this.stockList = stockList;
     this.exchange = exchange;
+    this.selectedFilter = "";
     this.selectedTimeRange = DashBoardTimeRange.DEFAULT;
     super(viewElement, eventManager);
   }
@@ -45,12 +48,35 @@ private void populateStockList(String filter) {
     getViewElement().clearStockList();
     String search = filter.toLowerCase();
     for (Stock s : stockList) {
-      boolean matches = s.getSymbol().toLowerCase().contains(search) ||
-              s.getCompany().toLowerCase().contains(search);
+      if (s.getSymbol().toLowerCase().contains(search)
+      || s.getCompany().toLowerCase().contains(search)) {
 
+        float rangePercent = 0;
 
-      if (matches) {
-        Button stockBtn = getViewElement().createStockButton(s.getSymbol());
+        if (s.getHistoricalPrices().size() >= 2) {
+          BigDecimal currentPrice = s.getHistoricalPrices().get(s.getHistoricalPrices().size() - 1);
+
+          int lookbackIndex = Math.max(0, s.getHistoricalPrices().size() - 1 - selectedTimeRange.getWeeks());
+          BigDecimal pastPrice = s.getHistoricalPrices().get(lookbackIndex);
+
+          if (pastPrice.compareTo(BigDecimal.ZERO) != 0) {
+            rangePercent = currentPrice.subtract(pastPrice)
+                    .divide(pastPrice, 4, RoundingMode.HALF_UP)
+                    .multiply(new BigDecimal(100))
+                    .floatValue();
+          }
+        }
+
+        String sign = rangePercent >= 0 ? "+" : "";
+        String buttonText = String.format("%s (%s%.2f%%)",
+                s.getSymbol(), sign, rangePercent);
+        Button stockBtn = getViewElement().createStockButton(buttonText);
+
+        if (rangePercent >= 0) {
+          stockBtn.setStyle("-fx-text-fill: green;");
+        } else {
+          stockBtn.setStyle("-fx-text-fill: red;");
+        }
 
         getViewElement().setOnStockAction(stockBtn, s, (Stock stock) -> {
           BigDecimal amountOfSharesOwned = player.getPortfolio()
@@ -118,6 +144,7 @@ protected void initInteractions() {
 
     exchange.weekProperty().addListener((observable,o,n) -> {
       getViewElement().updateGraph(selectedTimeRange);
+      populateStockList(selectedFilter);
     });
 
     getViewElement().getQuantityInputField().setTextFormatter(new TextFormatter<>(change -> {
@@ -128,12 +155,14 @@ protected void initInteractions() {
     }));
 
     getViewElement().getSideBarSearchField().textProperty().addListener((observable, o, n) -> {
-      populateStockList(n);
+      selectedFilter = n;
+      populateStockList(selectedFilter);
     });
 
     getViewElement().getTimeRangeSelector().setOnAction(e -> {
       selectedTimeRange = getViewElement().getTimeRangeSelector().getValue();
       getViewElement().updateGraph(selectedTimeRange);
+      populateStockList(selectedFilter);
     });
   }
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
index c86e504..f12c700 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
@@ -63,6 +63,7 @@ protected void initLayout() {
     sidebar.setPrefWidth(150);
     sidebar.setMaxHeight(Double.MAX_VALUE);
     sidebar.setMinWidth(150);
+    sidebar.setAlignment(Pos.TOP_CENTER);
     VBox.setVgrow(sidebar, Priority.ALWAYS);
 
     ScrollPane scrollPane = new ScrollPane(sidebar);
@@ -226,8 +227,8 @@ private ColumnConstraints makeCol(final float w) {
 
   @Override
   protected void initStyling() {
-    completeSideBar.getStyleClass().add("market-sidebar");
-    sidebar.getStyleClass().add("market-sidebar2");
+    completeSideBar.getStyleClass().add("complete-market-sidebar");
+    sidebar.getStyleClass().add("market-sidebar");
     selectedStockLabel.getStyleClass().add("selected-stock-pill");
     selectedStockPriceLabel.getStyleClass().add("selected-stock-pill");
     shareQuantityInputField.getStyleClass().add("qtyTextField");
diff --git a/src/main/resources/styles.css b/src/main/resources/styles.css
index 4266a2e..b852181 100644
--- a/src/main/resources/styles.css
+++ b/src/main/resources/styles.css
@@ -235,24 +235,26 @@
 
 
 /* --------------- IN GAME VIEW ------------- */
-.market-sidebar {
+.complete-market-sidebar {
     -fx-border-color: #000000;
     -fx-border-width: 0 2 0 0;
     -fx-border-style: solid;
-
     -fx-padding: 20;
 }
 
-.market-sidebar2 {
-    -fx-padding: 20;
+.market-sidebar {
+    -fx-padding: 10;
 }
 
 .stock-button {
     -fx-background-color: #e0e0e0;
+    -fx-alignment: CENTER_LEFT;
+    -fx-padding: 10 15 10 15;
     -fx-font-weight: bold;
     -fx-font-style: italic;
     -fx-text-fill: black;
-    -fx-font-size: 24;
+    -fx-font-size: 13;
+
 }
 
 .stock-button:hover {

From d5abacff2314f00bdaa64aa8501c8193fbfededd Mon Sep 17 00:00:00 2001
From: = <tommyah@stud.ntnu.no>
Date: Fri, 15 May 2026 19:57:49 +0200
Subject: [PATCH 12/12] Feat: Refactor and restructuring

---
 .../widgets/dashboard/DashBoardActions.java   |  26 ++
 .../dashboard/DashBoardController.java        |  50 +-
 .../widgets/dashboard/DashBoardTimeRange.java |  40 +-
 .../view/widgets/dashboard/DashBoardView.java | 429 +++++++++++++-----
 src/main/resources/styles.css                 |  60 +++
 5 files changed, 484 insertions(+), 121 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardActions.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardActions.java
index f3facb4..75b6639 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardActions.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardActions.java
@@ -1,10 +1,36 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.dashboard;
 
+/**
+ * Enum representing actions done in an instance of {@link DashBoardView}.
+ * */
 public enum DashBoardActions {
+  /**
+   * Buying shares.
+   * */
   BUY_SHARES,
+
+  /**
+   * Selling shares.
+   * */
   SELL_SHARES,
+
+  /**
+   * Decreasing quantity of shares to buy/sell by five.
+   * */
   DECREASE_5,
+
+  /**
+   * Decreasing quantity of shares to buy/sell by one.
+   * */
   DECREASE_1,
+
+  /**
+   * Increasing quantity of shares to buy/sell by one.
+   * */
   INCREASE_1,
+
+  /**
+   * Increasing quantity of shares to buy/sell by five.
+   * */
   INCREASE_5;
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
index 3d21c35..d6334f0 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
@@ -7,19 +7,40 @@
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewController;
 import javafx.scene.control.Button;
 import javafx.scene.control.TextFormatter;
-
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
+/**
+ * Controller for {@link DashBoardView}.
+ * */
 public class DashBoardController extends ViewController<DashBoardView> {
 
-  private Player player;
-  private Exchange exchange;
-  private List<Stock> stockList;
+  /**
+   * This player instance.
+   * */
+  private final Player player;
+
+  /**
+   * This exchange instance.
+   * */
+  private final Exchange exchange;
+
+  /**
+   * List of stocks in the program.
+   * */
+  private final List<Stock> stockList;
+
+  /**
+   * Time range chosen.
+   *
+   * @see DashBoardTimeRange
+   * */
   private DashBoardTimeRange selectedTimeRange;
+
+  /**
+   * Selected search keyword.
+   * */
   private String selectedFilter;
 
   /**
@@ -39,12 +60,24 @@ public DashBoardController(final DashBoardView viewElement,
     super(viewElement, eventManager);
   }
 
+  /**
+   * Sets the current stock of the view.
+   *
+   * @param stock the stock to set.
+   * @param amountOwned the amount of shares owned in this stock.
+   * */
   private void handleStockSelection(final Stock stock, final float amountOwned) {
     getViewElement().setCurrentStock(stock, amountOwned);
     getViewElement().updateGraph(selectedTimeRange);
   }
 
-  private void populateStockList(String filter) {
+  /**
+   * Updates the sidebar including the list of relevant stocks
+   * based on a search filter.
+   *
+   * @param filter the keyword to search for.
+   * */
+  private void populateStockList(final String filter) {
     getViewElement().clearStockList();
     String search = filter.toLowerCase();
     for (Stock s : stockList) {
@@ -87,6 +120,9 @@ private void populateStockList(String filter) {
     }
   }
 
+  /**
+   * {@inheritDoc}.
+   * */
   @Override
   protected void initInteractions() {
     populateStockList("");
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardTimeRange.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardTimeRange.java
index 672211a..42d0680 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardTimeRange.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardTimeRange.java
@@ -1,18 +1,56 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.dashboard;
 
+/**
+ * Controls what time range the player has chosen for the dashboard.
+ * */
 public enum DashBoardTimeRange {
+
+  /**
+   * One week (a single change).
+   * */
   ONE_WEEK("1 Week", 1),
+
+  /**
+   * 22 weeks (default).
+   * */
   DEFAULT("22 Weeks (Default)", 22),
+
+  /**
+   * One month.
+   * */
   ONE_MONTH("1 Month", 4),
+
+  /**
+   * One year.
+   * */
   ONE_YEAR("1 Year", 52);
 
+  /**
+   * The label, used in the dropdown menu.
+   * */
   private final String label;
+
+  /**
+   * Weeks used for calculating and updating graph and percentages.
+   * */
   private final int weeks;
 
+  /**
+   * Constructor.
+   *
+   * @param label the label for this enum.
+   * @param weeks the amount of weeks.
+   * */
   DashBoardTimeRange(final String label, final int weeks) {
-    this.label = label; this.weeks = weeks;
+    this.label = label;
+    this.weeks = weeks;
   }
 
+  /**
+   * Getter method for amount of weeks a constant represent.
+   *
+   * @return weeks.
+   * */
   public int getWeeks() {
     return weeks;
   }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
index f12c700..c1d53a6 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
@@ -2,86 +2,237 @@
 
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewElement;
-
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
-
-import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.financialsummary.SummaryView;
 import javafx.geometry.HPos;
-import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
 import javafx.scene.chart.LineChart;
 import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.XYChart;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.Separator;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.ColumnConstraints;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.VBox;
+
+/**
+ * Dashboard view. Used to give an overview of all stocks in the application.
+ *
+ * <p>Extends {@link ViewElement}</p>
+ *
+ * <p>Acts like a {@link HBox}</p>
+ * */
+public final class DashBoardView extends ViewElement<HBox, DashBoardActions> {
+
+  /**
+   * The currently owned shares for this stock.
+   * */
+  private float ownedStocks = 0;
 
-public class DashBoardView extends ViewElement<HBox, DashBoardActions> {
+  /**
+   * Chart element.
+   * */
   private LineChart<Number, Number> chart;
+
+  /**
+   * Data series for the chart.
+   * */
   private XYChart.Series<Number, Number> dataSeries;
-  private VBox sidebar;
-  private VBox completeSideBar;
-  private Stock selectedStock;
+
+  /**
+   * The time range drop down menu selector.
+   * */
   private ComboBox<DashBoardTimeRange> timeRangeSelector;
-  private float ownedStocks = 0;
+
+  /**
+   * The scroll pane controlling the sidebar content.
+   * */
+  private ScrollPane scrollPane;
+
+  /**
+   * The currently selected stock object to display information about.
+   * */
+  private Stock selectedStock;
+
+  /**
+   * Grid used for quantity and buy/sell section of the header.
+   * */
+  private GridPane grid;
+
+  /**
+   * The search field in the sidebar.
+   * */
   private TextField sideBarSearchField;
-  private Label selectedStockLabel;
-  private Label stockFullNameLabel;
-  private Label ownedQuantityLabel;
+
+  /**
+   * The text field for amount of shares to buy/sell.
+   * */
+  private TextField shareQuantityInputField;
+
+  /**
+   * The x-axis for the chart.
+   * */
   private NumberAxis xAxis;
+
+  /**
+   * The y-axis for the chart.
+   * */
   private NumberAxis yAxis;
-  private Label selectedStockPriceLabel;
-  private TextField shareQuantityInputField;
-  private Label lowPriceLabel;
-  private Label highPriceLabel;
+
+  /**
+   * The container for the elements above the chart.
+   * */
+  private HBox header;
+
+  /**
+   * Container for lowest / highest stock price.
+   * */
+  private HBox lowHigh;
+
+  /**
+   * Left section of the quantity buttons (-5, -1).
+   */
+  private HBox leftQty;
+
+  /**
+   * Left section of the quantity buttons (+1, +5).
+   */
+  private HBox rightQty;
+
+  /**
+   * Entire quantity section including text field.
+   */
+  private HBox qtySection;
+
+  /**
+   * Container for trade buttons (buy/sell).
+   */
+  private HBox tradeBtns;
+
+  /**
+   * Content in the sidebar (Stock list).
+   * */
+  private VBox sidebar;
+
+  /**
+   * The complete sidebar including search bar and time range menu.
+   * */
+  private VBox completeSideBar;
+
+  /**
+   * The main section of the page, including the local header and graph.
+   * */
+  private VBox mainContent;
+
+  /**
+   * The container for stock symbol, name and amount of shares owned.
+   */
+  private VBox stockIdentity;
+
+  /**
+   * Container for price, price change and highest/lowest stock prices.
+   */
+  private VBox priceStats;
+
+  /**
+   * Decrease quantity by 5 button.
+   * */
   private Button m5QtyBtn;
+
+  /**
+   * Decrease quantity by 1 button.
+   * */
   private Button m1QtyBtn;
+
+  /**
+   * Increase quantity by 1 button.
+   * */
   private Button p1QtyBtn;
+
+  /**
+   * Increase quantity by 5 button.
+   * */
   private Button p5QtyBtn;
 
+  /**
+   * Button to buy shares.
+   * */
+  private Button buySharesBtn;
+
+  /**
+   * Button to sell shares.
+   * */
+  private Button sellSharesBtn;
+
+  /**
+   * The selected stock symbol label.
+   * */
+  private Label selectedStockLabel;
+
+  /**
+   * The selected stock full name label.
+   * */
+  private Label stockFullNameLabel;
+
+  /**
+   * The amount of shares owned label.
+   * */
+  private Label ownedQuantityLabel;
+
+  /**
+   * The label showing the selected stocks current price.
+   * */
+  private Label selectedStockPriceLabel;
+
+  /**
+   * The label showing the stocks lowest overall price.
+   * */
+  private Label lowPriceLabel;
+
+  /**
+   * The label showing the stocks highest overall price.
+   * */
+  private Label highPriceLabel;
+
+  /**
+   * Constructor.
+   * */
   public DashBoardView() {
     super(new HBox(), DashBoardActions.class);
   }
 
   @Override
   protected void initLayout() {
-    getRootPane().setAlignment(Pos.TOP_LEFT);
-    getRootPane().setFillHeight(true);
+    completeSideBar = new VBox();
 
-    completeSideBar = new VBox(10);
     sideBarSearchField = new TextField();
     sideBarSearchField.setPromptText("Search...");
+
     timeRangeSelector = new ComboBox<>();
     timeRangeSelector.getItems().addAll(DashBoardTimeRange.values());
     timeRangeSelector.setValue(DashBoardTimeRange.DEFAULT);
 
-    sidebar = new VBox(10);
-    sidebar.setPrefWidth(150);
-    sidebar.setMaxHeight(Double.MAX_VALUE);
-    sidebar.setMinWidth(150);
-    sidebar.setAlignment(Pos.TOP_CENTER);
+    sidebar = new VBox();
     VBox.setVgrow(sidebar, Priority.ALWAYS);
 
-    ScrollPane scrollPane = new ScrollPane(sidebar);
-    Separator separator = new Separator();
-
-    completeSideBar.getChildren().addAll(sideBarSearchField, separator, scrollPane, timeRangeSelector);
-    scrollPane.setFitToWidth(true);
+    scrollPane = new ScrollPane(sidebar);
     scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
     scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-    scrollPane.setMinWidth(150);
-
     VBox.setVgrow(scrollPane, Priority.ALWAYS);
-    scrollPane.setMaxHeight(Double.MAX_VALUE);
 
-    VBox mainContent = new VBox(20);
-    mainContent.setAlignment(Pos.TOP_LEFT);
-    mainContent.setMaxHeight(Double.MAX_VALUE);
-    mainContent.setPadding(new Insets(30));
+    Separator separator = new Separator();
+    completeSideBar.getChildren().addAll(sideBarSearchField, separator, scrollPane, timeRangeSelector);
+
+    mainContent = new VBox();
     HBox.setHgrow(mainContent, Priority.ALWAYS);
     VBox.setVgrow(mainContent, Priority.ALWAYS);
     selectedStockLabel = new Label("");
@@ -106,70 +257,47 @@ protected void initLayout() {
     chart.setVerticalGridLinesVisible(false);
     chart.setAlternativeRowFillVisible(false);
     chart.setAnimated(false);
-    chart.setMinHeight(200);
-    chart.setPrefHeight(650);
-    chart.setMaxHeight(Integer.MAX_VALUE);
-    chart.setMaxWidth(Double.MAX_VALUE);
-    chart.setMinWidth(0);
     dataSeries = new XYChart.Series<>();
-    chart.prefHeightProperty().bind(getRootPane().heightProperty().divide(5));
-    chart.minHeightProperty().set(50);
     chart.getData().add(dataSeries);
 
-    Button buyBtn = new Button("buy");
-    buyBtn.getStyleClass().add("buy-button");
-    registerButton(DashBoardActions.BUY_SHARES, buyBtn);
-
-    Button sellBtn = new Button("sell");
-    sellBtn.getStyleClass().add("sell-button");
-    registerButton(DashBoardActions.SELL_SHARES, sellBtn);
-
-    HBox header = new HBox(20);
+    header = new HBox();
     header.setAlignment(Pos.CENTER_LEFT);
 
-
-    // Stock Identity (The gray pill)
-    VBox stockIdentity = new VBox(5);
-    selectedStockLabel = new Label("APL");
-    selectedStockLabel.getStyleClass().add("stock-symbol-title");
-    stockFullNameLabel = new Label("Apple corporation");
-    ownedQuantityLabel = new Label("Owned: 0");
+    stockIdentity = new VBox();
+    selectedStockLabel = new Label();
+    stockFullNameLabel = new Label();
+    ownedQuantityLabel = new Label();
 
     stockIdentity.getChildren().addAll(selectedStockLabel, stockFullNameLabel, ownedQuantityLabel);
 
-    // Price Stats
-    VBox priceStats = new VBox(5);
-    selectedStockPriceLabel = new Label("0.0 NOK (+0.0%)");
-    selectedStockPriceLabel.getStyleClass().add("price-large");
+    priceStats = new VBox();
+    selectedStockPriceLabel = new Label();
+
+    lowHigh = new HBox();
+    lowPriceLabel = new Label();
+    highPriceLabel = new Label();
 
-    HBox lowHighBox = new HBox(10);
-    lowPriceLabel = new Label("Low: 0.0 NOK");
-    highPriceLabel = new Label("High: 0.0 NOK");
-    lowHighBox.getChildren().addAll(lowPriceLabel, highPriceLabel);
-    priceStats.getChildren().addAll(selectedStockPriceLabel, lowHighBox);
+    lowHigh.getChildren().addAll(lowPriceLabel, highPriceLabel);
+    priceStats.getChildren().addAll(selectedStockPriceLabel, lowHigh);
 
     m5QtyBtn = new Button("-5");
     m1QtyBtn = new Button("-1");
-    shareQuantityInputField = new TextField("1.0");
-    shareQuantityInputField.setAlignment(Pos.CENTER);
+    shareQuantityInputField = new TextField("0.0");
     p1QtyBtn = new Button("+1");
     p5QtyBtn = new Button("+5");
 
-    buyBtn = new Button("buy");
-    buyBtn.getStyleClass().add("buy-button");
-    sellBtn = new Button("sell");
-    sellBtn.getStyleClass().add("sell-button");
+    buySharesBtn = new Button("buy");
+    sellSharesBtn = new Button("sell");
 
-    GridPane grid = new GridPane();
+    grid = new GridPane();
     grid.setHgap(0);
     grid.setVgap(0);
-    grid.setAlignment(Pos.CENTER);
 
     int amountOfCols = 6;
-    float colWidth = 100f/amountOfCols;
+    float colWidth;
 
-    for (int i = 0; i<amountOfCols; i++) {
-      if(i == 0 || i == amountOfCols - 1) {
+    for (int i = 0; i < amountOfCols; i++) {
+      if (i == 0 || i == amountOfCols - 1) {
         colWidth = 20;
       } else {
         colWidth = 15;
@@ -178,19 +306,13 @@ protected void initLayout() {
       grid.getColumnConstraints().add(curCol);
     }
 
-    HBox leftQty = new HBox(0, m5QtyBtn, m1QtyBtn);
-    leftQty.setAlignment(Pos.CENTER_RIGHT);
+    leftQty = new HBox(0, m5QtyBtn, m1QtyBtn);
+    rightQty = new HBox(0, p1QtyBtn, p5QtyBtn);
+    qtySection = new HBox(0, leftQty, shareQuantityInputField, rightQty);
+    tradeBtns = new HBox(20, buySharesBtn, sellSharesBtn);
 
-    HBox rightQty = new HBox(0, p1QtyBtn, p5QtyBtn);
-    rightQty.setAlignment(Pos.CENTER_LEFT);
-
-    HBox qtySection = new HBox(0, leftQty, shareQuantityInputField, rightQty);
-    qtySection.setAlignment(Pos.CENTER);
-
-    HBox tradeBtns = new HBox(20, buyBtn, sellBtn);
-    HBox.setHgrow(buyBtn, Priority.ALWAYS);
-    HBox.setHgrow(sellBtn, Priority.ALWAYS);
-    tradeBtns.setAlignment(Pos.CENTER);
+    HBox.setHgrow(buySharesBtn, Priority.ALWAYS);
+    HBox.setHgrow(sellSharesBtn, Priority.ALWAYS);
 
     grid.add(qtySection, 0, 0, 6,1);
     grid.add(tradeBtns, 0, 1, 6, 1);
@@ -200,17 +322,14 @@ protected void initLayout() {
     HBox.setHgrow(grid, Priority.ALWAYS);
 
     header.getChildren().addAll(stockIdentity, priceStats, grid);
-
-    Region spacer = new Region();
-    HBox.setHgrow(spacer, Priority.ALWAYS);
-
+ 
     VBox.setVgrow(chart, Priority.ALWAYS);
 
     mainContent.getChildren().addAll(header, chart);
     getRootPane().getChildren().addAll(completeSideBar, mainContent);
 
-    registerButton(DashBoardActions.BUY_SHARES, buyBtn);
-    registerButton(DashBoardActions.SELL_SHARES, sellBtn);
+    registerButton(DashBoardActions.BUY_SHARES, buySharesBtn);
+    registerButton(DashBoardActions.SELL_SHARES, sellSharesBtn);
     registerButton(DashBoardActions.DECREASE_5, m5QtyBtn);
     registerButton(DashBoardActions.DECREASE_1, m1QtyBtn);
     registerButton(DashBoardActions.INCREASE_1, p1QtyBtn);
@@ -232,13 +351,32 @@ protected void initStyling() {
     selectedStockLabel.getStyleClass().add("selected-stock-pill");
     selectedStockPriceLabel.getStyleClass().add("selected-stock-pill");
     shareQuantityInputField.getStyleClass().add("qtyTextField");
-    chart.getStyleClass().add("chart");
+    chart.getStyleClass().add("dashboard-chart");
+    scrollPane.getStyleClass().add("dashboard-sidebar-scrollPane");
+    mainContent.getStyleClass().add("dashboard-mainContent-VBox");
     m5QtyBtn.getStyleClass().add("qtyBtn");
     m1QtyBtn.getStyleClass().add("qtyBtn");
     p1QtyBtn.getStyleClass().add("qtyBtn");
     p5QtyBtn.getStyleClass().add("qtyBtn");
+    buySharesBtn.getStyleClass().add("buy-button");
+    sellSharesBtn.getStyleClass().add("sell-button");
+    header.getStyleClass().add("dashboard-header");
+    stockIdentity.getStyleClass().add("dashboard-stockIdentity");
+    priceStats.getStyleClass().add("dashboard-priceStats");
+    lowHigh.getStyleClass().add("dashboard-lowhigh");
+    grid.getStyleClass().add("dashboard-grid");
+    leftQty.getStyleClass().add("dashboard-leftQty");
+    rightQty.getStyleClass().add("dashboard-rightQty");
+    qtySection.getStyleClass().add("dashboard-qtySection");
+    tradeBtns.getStyleClass().add("dashboard-tradeBtns");
   }
 
+  /**
+   * Setter method for the current stock, including the amount owned.
+   *
+   * @param stock the stock to change the view to.
+   * @param amountOwned the amount of shares owned of this stock.
+   * */
   public void setCurrentStock(final Stock stock, final float amountOwned) {
     selectedStock = stock;
     selectedStockLabel.setText(stock.getSymbol());
@@ -247,22 +385,42 @@ public void setCurrentStock(final Stock stock, final float amountOwned) {
     ownedQuantityLabel.setText("Owned: " + ownedStocks);
   }
 
+  /**
+   * Updates amount of owned shares for this stock.
+   *
+   * @param val the value to add.
+   * */
   public void addOwnedShares(final float val) {
     ownedStocks += val;
     ownedQuantityLabel.setText("Owned: " + ownedStocks);
   }
 
-  public Button createStockButton(final String label) {
-    Button button = new Button(label);
+  /**
+   * Creates a stock button.
+   *
+   * @param text the text in the button to show.
+   *
+   * @return stock button created.
+   * */
+  public Button createStockButton(final String text) {
+    Button button = new Button(text);
     sidebar.getChildren().add(button);
     button.getStyleClass().add("stock-button");
     return button;
   }
 
+  /**
+   * Helper method for clearing the stock list.
+   * */
   public void clearStockList() {
     sidebar.getChildren().clear();
   }
 
+  /**
+   * Updates the graph based on the chosen time range.
+   *
+   * @param timeRange the chosen {@link DashBoardTimeRange}
+   * */
   public void updateGraph(final DashBoardTimeRange timeRange) {
     dataSeries.getData().clear();
     List<BigDecimal> prices = selectedStock.getHistoricalPrices();
@@ -306,47 +464,92 @@ public void updateGraph(final DashBoardTimeRange timeRange) {
     }
   }
 
+  /**
+   * Updates the current stock price.
+   *
+   * @param value the new value.
+   * @param percentChange the change since last value in percent.
+   * */
   private void updateStockPrice(final float value,
                                 final float percentChange) {
     String changeSinceLastString;
     if (percentChange > 0) {
-      changeSinceLastString = "(+ " + Math.round(percentChange*100f)/100f + "%)";
+      changeSinceLastString = "(+ " + Math.round(percentChange * 100f) / 100f + "%)";
     } else if (percentChange < 0) {
-      changeSinceLastString = "(- " + Math.round(Math.abs(percentChange)*100f)/100f + "%)";
+      changeSinceLastString = "(- " + Math.round(Math.abs(percentChange) * 100f) / 100f + "%)";
     } else {
       changeSinceLastString = "";
     }
 
-    selectedStockPriceLabel.setText((Math.round(value*100f)/100f) + "NOK " + changeSinceLastString);
+    selectedStockPriceLabel.setText((Math.round(value * 100f) / 100f) + "NOK " + changeSinceLastString);
   }
 
-  private void setLowPriceLabel(float value) {
-    lowPriceLabel.setText("Low: " + Math.round(value*100f)/100f + " NOK");
+  /**
+   * Sets the lowest stock price text to a new value.
+   *
+   * @param value the value to set.
+   * */
+  private void setLowPriceLabel(final float value) {
+    lowPriceLabel.setText("Low: " + Math.round(value * 100f) / 100f + " NOK");
   }
 
-  private void setHighPriceLabel(float value) {
-    highPriceLabel.setText("High: " + Math.round(value*100f)/100f + " NOK");
+  /**
+   * Sets the highest stock price text to a new value.
+   *
+   * @param value the value to set.
+   * */
+  private void setHighPriceLabel(final float value) {
+    highPriceLabel.setText("High: " + Math.round(value * 100f) / 100f + " NOK");
   }
 
+  /**
+   * Getter method for the search text field in the sidebar.
+   *
+   * @return search field.
+   * */
   public TextField getSideBarSearchField() {
     return sideBarSearchField;
   }
 
+  /**
+   * Getter method for the current stock displayed in the view.
+   *
+   * @return stock object.
+   * */
   public Stock getCurrentStock() {
     return selectedStock;
   }
 
+  /**
+   * Method for setting a {@link Consumer} function when pressing
+   * a stock button.
+   *
+   * <p>Set by the associated {@link DashBoardController} object.</p>
+   *
+   * @param button the stock button to set functionality.
+   * @param stock the stock this button represents.
+   * @param logic the consumer logic to run when pressing this button.
+   * */
   public void setOnStockAction(final Button button,
                                final Stock stock,
-                               final Consumer<Stock> logic)
-  {
+                               final Consumer<Stock> logic) {
     button.setOnAction(e -> logic.accept(stock));
   }
 
+  /**
+   * Getter method for the quantity input text field.
+   *
+   * @return text field.
+   * */
   public TextField getQuantityInputField() {
     return shareQuantityInputField;
   }
 
+  /**
+   * Getter method for the time range drop down menu.
+   *
+   * @return Combo box.
+   * */
   public ComboBox<DashBoardTimeRange> getTimeRangeSelector() {
     return timeRangeSelector;
   }
diff --git a/src/main/resources/styles.css b/src/main/resources/styles.css
index b852181..b78aa9b 100644
--- a/src/main/resources/styles.css
+++ b/src/main/resources/styles.css
@@ -240,10 +240,17 @@
     -fx-border-width: 0 2 0 0;
     -fx-border-style: solid;
     -fx-padding: 20;
+    -fx-spacing: 10;
 }
 
 .market-sidebar {
     -fx-padding: 10;
+    -fx-spacing: 10;
+    -fx-alignment: TOP_CENTER;
+
+    -fx-min-width: 150;
+    -fx-pref-width: 150;
+
 }
 
 .stock-button {
@@ -339,6 +346,8 @@
 }
 
 .qtyTextField {
+    -fx-alignment: CENTER;
+
     -fx-min-width: 50;
     -fx-pref-width: 75;
     -fx-max-width: 100;
@@ -367,4 +376,55 @@
 
 .combo-box .list-cell {
     -fx-text-fill: #333333;
+}
+
+.dashboard-sidebar-scrollPane {
+    -fx-min-width: 150;
+}
+
+.dashboard-mainContent-VBox {
+    -fx-padding: 30;
+    -fx-spacing: 20;
+    -fx-alignment: TOP_LEFT;
+}
+
+.dashboard-chart {
+    -fx-min-height: 200;
+    -fx-pref-height: 650;
+}
+
+.dashboard-header {
+    -fx-spacing: 20;
+}
+
+.dashboard-stockIdentity {
+    -fx-spacing: 5;
+}
+
+.dashboard-priceStats {
+    -fx-spacing: 5;
+}
+
+.dashboard-lowhigh {
+    -fx-spacing: 10;
+}
+
+.dashboard-grid {
+    -fx-alignment: CENTER;
+}
+
+.dashboard-leftQty {
+    -fx-alignment: CENTER_RIGHT;
+}
+
+.dashboard-rightQty {
+    -fx-alignment: CENTER_LEFT;
+}
+
+.dashboard-qtySection {
+    -fx-alignment: CENTER;
+}
+
+.dashboard-tradeBtns {
+    -fx-alignment: CENTER;
 }
\ No newline at end of file