Merge pull request #124 from Yufannnn/update-user-guide

Update user guide GUI Section
nus-cs2103-AY2223S2 · Mar 30, 2023 · 7f20c71 · 7f20c71
2 parents 12064df + 44eca33
commit 7f20c71
Show file tree

Hide file tree

Showing 10 changed files with 139 additions and 78 deletions.
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
diff --git a/docs/images/Exams.jpg b/docs/images/Exams.jpg
diff --git a/docs/images/GUI.jpg b/docs/images/GUI.jpg
diff --git a/docs/images/Homework.jpg b/docs/images/Homework.jpg
diff --git a/docs/images/Lessons.jpg b/docs/images/Lessons.jpg
diff --git a/docs/images/Profile.jpg b/docs/images/Profile.jpg
diff --git a/src/main/java/seedu/address/logic/commands/exceptions/CommandException.java b/src/main/java/seedu/address/logic/commands/exceptions/CommandException.java
@@ -1,5 +1,7 @@
 package seedu.address.logic.commands.exceptions;
 
+import seedu.address.logic.commands.Command;
+
 /**
  * Represents an error which occurs during execution of a {@link Command}.
  */

diff --git a/src/main/java/seedu/address/ui/exam/FilledExamsContent.java b/src/main/java/seedu/address/ui/exam/FilledExamsContent.java
@@ -44,7 +44,7 @@ public FilledExamsContent(Student student) {
         studentName = student.getName();
 
         name.setText(String.format("First Name: %s", student.getName().getFirstName()));
-        pastExamsListName.setText("All Exams: ");
+        pastExamsListName.setText(PAST_EXAMS_LIST_NAME);
 
         // Set the past exams list panel to display the past exams of the student
         ObservableList<Exam> pastExamsList = student.getPastExamsList();

diff --git a/src/main/resources/view/ProfileContent.fxml b/src/main/resources/view/ProfileContent.fxml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.geometry.Insets?>
@@ -9,12 +10,16 @@
     <padding>
         <Insets top="10" right="10" bottom="10" left="10" />
     </padding>
-    <VBox fx:id="profileContent" spacing="10">
-        <Label fx:id="name" alignment="TOP_LEFT" styleClass="studentNameLabel" text="Name" />
-        <Label fx:id="phone" alignment="TOP_LEFT" text="Phone" />
-        <Label fx:id="address" alignment="TOP_LEFT" text="Address"/>
-        <Label fx:id="email" alignment="TOP_LEFT" text="Email" />
-
-        <VBox fx:id="tagsContainer" spacing="5" />
-    </VBox>
+    <ScrollPane fx:id="detailedContentScroll" hbarPolicy="ALWAYS">
+        <padding>
+            <Insets top="10" right="10" bottom="10" left="10" />
+        </padding>
+        <VBox fx:id="profileContent" spacing="10">
+            <Label fx:id="name" alignment="TOP_LEFT" styleClass="studentNameLabel" text="Name" />
+            <Label fx:id="phone" alignment="TOP_LEFT" text="Phone" />
+            <Label fx:id="address" alignment="TOP_LEFT" text="Address" />
+            <Label fx:id="email" alignment="TOP_LEFT" text="Email" />
+            <VBox fx:id="tagsContainer" spacing="5" />
+        </VBox>
+    </ScrollPane>
 </StackPane>
diff --git a/src/main/resources/view/stylesheet/DetailedInfoRegion.css b/src/main/resources/view/stylesheet/DetailedInfoRegion.css
@@ -18,7 +18,7 @@
 }
 
 #welcomeMessage {
-    -fx-font-size: 12pt;
+    -fx-font-size: 13pt;
     -fx-font-family: "Comic Sans MS";
     -fx-text-fill: #1d1d1d;
 }
@@ -52,3 +52,10 @@
 
 #homeworkPieChart.default-color0.chart-pie { -fx-pie-color: #ffd700; }
 #homeworkPieChart.default-color1.chart-pie { -fx-pie-color: #ffa500; }
+
+#detailedContentScroll {
+    -fx-background-color: #f5f5f5;
+    -fx-border-width: 2;
+    -fx-border-color: black;
+    -fx-border-radius: 5;
+}