Update UI (and bug fix for CCAs) (#119)

Author: gremmyz

src/main/java/seedu/connectus/model/tag/CcaPosition.java

@@ -6,7 +6,7 @@
  */
 public class CcaPosition extends Tag {
 
-    public static final String MESSAGE_CONSTRAINTS = "CCA Position should be alphanumeric";
+    public static final String MESSAGE_CONSTRAINTS = "CCA Position names should be alphanumeric";
     public final String ccaPositionName;
 
     /**

src/main/java/seedu/connectus/model/tag/Tag.java

@@ -10,7 +10,7 @@
 public class Tag implements Comparable<Tag> {
 
     public static final String MESSAGE_CONSTRAINTS = "Tags names should be alphanumeric";
-    public static final String VALIDATION_REGEX = "\\p{Alnum}+";
+    public static final String VALIDATION_REGEX = "[\\p{Alnum} ]+";
 
     public final String tagName;
 

src/main/java/seedu/connectus/model/util/SampleDataUtil.java

@@ -37,10 +37,9 @@ public static Person[] getSamplePersons() {
         p1.setBirthday(new Birthday("01/01/1990"));
         p1.setRemarks(getRemarkSet("friends"));
         p1.setModules(getModuleSet("CS2107"));
-        p1.setCcas(getCcaSet("NES"));
+        p1.setCcas(getCcaSet("NUS Hackers"));
         p1.setCcaPositions(getCcaPositionSet("Director"));
 
-
         // Sample person 2
         Person p2 = new Person(new Name("Bernice Yu"));
         p2.setPhone(new Phone("99272758"));
@@ -52,8 +51,8 @@ public static Person[] getSamplePersons() {
         p2.setBirthday(new Birthday("31/05/2000"));
         p2.setRemarks(getRemarkSet("colleagues", "friends"));
         p2.setModules(getModuleSet("CS2105"));
-        p2.setCcas(getCcaSet("ICS"));
-        p2.setCcaPositions(getCcaPositionSet("President"));
+        p2.setCcas(getCcaSet("NUS Chess Club"));
+        p2.setCcaPositions(getCcaPositionSet("Secretary"));
 
         // Sample person 3
         Person p3 = new Person(new Name("Charlotte Oliveiro"));
@@ -65,9 +64,7 @@ public static Person[] getSamplePersons() {
         p3.setBirthday(new Birthday("07/07/1993"));
         p3.setRemarks(getRemarkSet("neighbours"));
         p3.setModules(getModuleSet("CS2105", "ES2660"));
-        p3.setCcas(getCcaSet("NUS Computing Club"));
-        p3.setCcaPositions(getCcaPositionSet("Treasurer"));
-
+        p3.setCcas(getCcaSet("NUS Chess Club", "NUS Computing Club"));
 
         // Sample person 4
         Person p4 = new Person(new Name("David Li"));
@@ -80,8 +77,8 @@ public static Person[] getSamplePersons() {
         p4.setBirthday(new Birthday("18/06/1999"));
         p4.setRemarks(getRemarkSet("family"));
         p4.setModules(getModuleSet("CS2109S"));
-        p4.setCcas(getCcaSet("NUS Chess Club"));
-        p4.setCcaPositions(getCcaPositionSet("Secretary"));
+        p4.setCcas(getCcaSet("ICS"));
+        p4.setCcaPositions(getCcaPositionSet("President"));
 
         // Sample person 5
         Person p5 = new Person(new Name("Irfan Ibrahim"));
@@ -94,8 +91,7 @@ public static Person[] getSamplePersons() {
         p5.setBirthday(new Birthday("29/02/2004"));
         p5.setRemarks(getRemarkSet("classmates"));
         p5.setModules(getModuleSet("CS1101S"));
-        p5.setCcas(getCcaSet("ICS"));
-        p5.setCcaPositions(getCcaPositionSet("Vice-President"));
+        p5.setCcas(getCcaSet("Art Club"));
 
         // Sample person 6
         Person p6 = new Person(new Name("Roy Balakrishnan"));
@@ -108,8 +104,7 @@ public static Person[] getSamplePersons() {
         p6.setBirthday(new Birthday("24/09/2004"));
         p6.setRemarks(getRemarkSet("colleagues"));
         p6.setModules(getModuleSet("CS1101S"));
-        p6.setCcas(getCcaSet("NUS Hackers"));
-        p6.setCcaPositions(getCcaPositionSet("Executive"));
+        p6.setCcas(getCcaSet("NUS Chess Club"));
 
         return new Person[] {
             p1, p2, p3, p4, p5, p6

src/main/java/seedu/connectus/ui/PersonCard.java

@@ -94,27 +94,46 @@ public PersonCard(Person person, int displayedIndex) {
             socialMediaContainer.setVisible(false);
             socialMediaContainer.managedProperty().bind(socialMediaContainer.visibleProperty());
         }
+        if (person.getBirthday().isPresent()) {
+            birthday.setText(person.getBirthday().get().toString());
+        } else {
+            birthday.setText("");
+            birthdayContainer.setVisible(false);
+            birthdayContainer.managedProperty().bind(birthdayContainer.visibleProperty());
+        }
 
         person.getRemarks().stream()
                 .sorted(Comparator.comparing(remark -> remark.tagName))
-                .forEach(remark -> tags.getChildren().add(new Label(remark.tagName)));
+                .forEach(remark -> {
+                    Label remarkLabel = new Label(remark.tagName);
+                    remarkLabel.getStyleClass().add("label");
+                    remarkLabel.getStyleClass().add("remark");
+                    tags.getChildren().add(remarkLabel);
+                });
         person.getModules().stream()
                 .sorted(Comparator.comparing(module -> module.tagName))
-                .forEach(module -> tags.getChildren().add(new Label(module.tagName)));
+                .forEach(module -> {
+                    Label moduleLabel = new Label(module.tagName);
+                    moduleLabel.getStyleClass().add("label");
+                    moduleLabel.getStyleClass().add("module");
+                    tags.getChildren().add(moduleLabel);
+                });
         person.getCcas().stream()
                 .sorted(Comparator.comparing(cca -> cca.tagName))
-                .forEach(cca -> tags.getChildren().add(new Label(cca.tagName)));
+                .forEach(cca -> {
+                    Label ccaLabel = new Label(cca.tagName);
+                    ccaLabel.getStyleClass().add("label");
+                    ccaLabel.getStyleClass().add("cca");
+                    tags.getChildren().add(ccaLabel);
+                });
         person.getCcaPositions().stream()
                 .sorted(Comparator.comparing(ccaPosition -> ccaPosition.tagName))
-                .forEach(ccaPosition -> tags.getChildren().add(new Label(ccaPosition.tagName)));
-
-        if (person.getBirthday().isPresent()) {
-            birthday.setText(person.getBirthday().get().toString());
-        } else {
-            birthday.setText("");
-            birthdayContainer.setVisible(false);
-            birthdayContainer.managedProperty().bind(birthdayContainer.visibleProperty());
-        }
+                .forEach(ccaPosition -> {
+                    Label ccaPositionLabel = new Label(ccaPosition.tagName);
+                    ccaPositionLabel.getStyleClass().add("label");
+                    ccaPositionLabel.getStyleClass().add("ccaPosition");
+                    tags.getChildren().add(ccaPositionLabel);
+                });
     }
 
     @Override

src/main/resources/view/DarkTheme.css

@@ -351,11 +351,39 @@
     -fx-vgap: 3;
 }
 
-#tags .label {
+#tags .label.remark {
     -fx-text-fill: white;
     -fx-background-color: #3e7b91;
     -fx-padding: 1 3 1 3;
     -fx-border-radius: 2;
     -fx-background-radius: 2;
     -fx-font-size: 11;
 }
+
+#tags .label.module {
+    -fx-text-fill: white;
+    -fx-background-color: #ff7f50;
+    -fx-padding: 1 3 1 3;
+    -fx-border-radius: 2;
+    -fx-background-radius: 2;
+    -fx-font-size: 11;
+}
+
+#tags .label.cca {
+    -fx-text-fill: white;
+    -fx-background-color: #773E4A;
+    -fx-padding: 1 3 1 3;
+    -fx-border-radius: 2;
+    -fx-background-radius: 2;
+    -fx-font-size: 11;
+}
+
+#tags .label.ccaPosition {
+    -fx-text-fill: white;
+    -fx-background-color: #67773E;
+    -fx-padding: 1 3 1 3;
+    -fx-border-radius: 2;
+    -fx-background-radius: 2;
+    -fx-font-size: 11;
+}
+