Merge branch 'master' into branch-removeUnusedDevGuide

SwaminathanViswa · Nov 6, 2024 · 9ff7a7e · 9ff7a7e
2 parents 8f2bbec + 70c7db8
commit 9ff7a7e
Show file tree

Hide file tree

Showing 22 changed files with 90 additions and 51 deletions.
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
diff --git a/docs/images/excelKnownIssue.png b/docs/images/excelKnownIssue.png
diff --git a/docs/images/filterFriendsTagByFilter.png b/docs/images/filterFriendsTagByFilter.png
diff --git a/docs/images/findAlexCharlotte.png b/docs/images/findAlexCharlotte.png
diff --git a/docs/images/findFriendsTagByFilter.png b/docs/images/findFriendsTagByFilter.png
diff --git a/docs/images/githubUsage.png b/docs/images/githubUsage.png
diff --git a/docs/images/helpMessage.png b/docs/images/helpMessage.png
diff --git a/docs/images/loadingPageOfUi.png b/docs/images/loadingPageOfUi.png
diff --git a/docs/images/markAlexAbsent.png b/docs/images/markAlexAbsent.png
diff --git a/docs/images/markAlexPresent.png b/docs/images/markAlexPresent.png
diff --git a/docs/images/markPresent.png b/docs/images/markPresent.png
diff --git a/docs/images/sortByNameDesc.png b/docs/images/sortByNameDesc.png
diff --git a/docs/images/sortExample.png b/docs/images/sortExample.png
diff --git a/docs/images/sortReset.png b/docs/images/sortReset.png
diff --git a/docs/images/unmarkStudent.png b/docs/images/unmarkStudent.png
diff --git a/docs/images/validCSV.png b/docs/images/validCSV.png
diff --git a/docs/images/validCSV1.png b/docs/images/validCSV1.png
diff --git a/docs/images/viewWindowScreenshot.png b/docs/images/viewWindowScreenshot.png
diff --git a/src/main/java/seedu/address/ui/PersonCard.java b/src/main/java/seedu/address/ui/PersonCard.java
@@ -7,6 +7,7 @@
 import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Region;
+import seedu.address.logic.parser.ParserUtil;
 import seedu.address.model.person.Person;
 
 /**
@@ -38,6 +39,8 @@ public class PersonCard extends UiPart<Region> {
     private Label telegram;
     @FXML
     private Label github;
+    @FXML
+    private FlowPane weekLabel;
 
     /**
      * Creates a {@code PersonCode} with the given {@code Person} and index to display.
@@ -56,6 +59,27 @@ public PersonCard(Person person, int displayedIndex) {
         } else {
             github.setText("GitHub username unspecified");
         }
+
+        Label labelOfWeek = new Label("Weeks attended: ");
+        if (!person.getWeeksPresent().isEmpty()) {
+            labelOfWeek.getStyleClass().add("information-label");
+            weekLabel.getChildren().add(labelOfWeek);
+
+            for (int week = 0; week <= ParserUtil.MAX_WEEK; week++) {
+                Label weekLabelNode = new Label(String.valueOf(week));
+
+                if (person.getWeeksPresent().contains(week)) {
+                    weekLabelNode.getStyleClass().add("week-number-marked");
+                } else {
+                    weekLabelNode.getStyleClass().add("week-number-unmarked");
+                }
+                weekLabel.getChildren().add(weekLabelNode);
+            }
+        } else {
+            labelOfWeek = new Label("No weeks attended");
+            labelOfWeek.getStyleClass().add("information-label");
+            weekLabel.getChildren().add(labelOfWeek);
+        }
     }
 
 }
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
@@ -132,17 +132,6 @@
     -fx-text-fill: #010504;
 }
 
-.hyperlink {
-    -fx-font-family: "Segoe UI"; /* Inherit font-family */
-    -fx-font-size: 13px;        /* Inherit font-size */
-    -fx-text-fill: #E2F1E7;     /* Change to a lighter color for hyperlinks */
-    -fx-underline: true;        /* Ensure hyperlink is underlined */
-}
-
-.hyperlink:hover {
-    -fx-text-fill: #2b4274;     /* Change color on hover */
-}
-
 .stack-pane {
      -fx-background-color: derive(#1d1d1d, 20%);
 }
@@ -372,6 +361,12 @@
     -fx-font-size: 20;
 }
 
+#weekLabel .information-label {
+    -fx-font-family: "Segoe UI";
+    -fx-text-fill: D6BD98;
+    -fx-font-size: 12;
+}
+
 #weekLabel .week-number-marked {
     -fx-text-fill: white;
     -fx-background-color: green;
@@ -391,6 +386,7 @@
 }
 
 #fieldLabel {
+    -fx-font-family: "Segoe UI";
     -fx-text-fill: D6BD98;
 }
 

diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
@@ -38,7 +38,8 @@
         <Label id="fieldLabel" styleClass="cell_small_label" text="Github: " />
         <Label fx:id="github" styleClass="cell_small_label" text="\$github" />
       </HBox>
-    <!--Align to the right -->
+
+      <FlowPane fx:id="weekLabel" />
     </VBox>
   </GridPane>
 </HBox>
diff --git a/src/main/resources/view/ViewWindow.fxml b/src/main/resources/view/ViewWindow.fxml
@@ -3,7 +3,6 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.FlowPane?>
-<?import javafx.scene.layout.GridPane?>
 
 <?import javafx.scene.layout.VBox?>