Merge pull request #110 from amrut-prabhu/fix

Fix merge issues
CS2103JAN2018-W15-B4 · Mar 21, 2018 · e600910 · e600910
2 parents b4ff23a + 688e79b
commit e600910
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/clubbook.xml b/clubbook.xml
@@ -19,7 +19,7 @@
         <password>password</password>
         <matricNumber>A1010027G</matricNumber>
         <group>exco</group>
-        <profilePhoto>C:/Users/Amrut Prabhu/IdeaProjects/main/src/main/resources/photos/default.png</profilePhoto>
+        <profilePhoto></profilePhoto>
         <tagged>neighbours</tagged>
     </members>
     <members>
@@ -30,7 +30,7 @@
         <password>password</password>
         <matricNumber>A7251856A</matricNumber>
         <group>marketing</group>
-        <profilePhoto>C:/Users/Amrut Prabhu/IdeaProjects/main/src/main/resources/photos/default.png</profilePhoto>
+        <profilePhoto></profilePhoto>
         <tagged>family</tagged>
     </members>
     <members>
@@ -41,7 +41,7 @@
         <password>password</password>
         <matricNumber>A0123456H</matricNumber>
         <group>logistics</group>
-        <profilePhoto>C:/Users/Amrut Prabhu/IdeaProjects/main/src/main/resources/photos/default.png</profilePhoto>
+        <profilePhoto></profilePhoto>
         <tagged>friends</tagged>
     </members>
     <members>
@@ -52,7 +52,7 @@
         <password>password</password>
         <matricNumber>A0123456H</matricNumber>
         <group>logistics</group>
-        <profilePhoto>C:/Users/Amrut Prabhu/IdeaProjects/main/src/main/resources/photos/default.png</profilePhoto>
+        <profilePhoto></profilePhoto>
         <tagged>owesMoney</tagged>
         <tagged>friends</tagged>
     </members>
@@ -64,7 +64,7 @@
         <password>password</password>
         <matricNumber>A0123456H</matricNumber>
         <group>prod</group>
-        <profilePhoto>C:/Users/Amrut Prabhu/IdeaProjects/main/src/main/resources/photos/default.png</profilePhoto>
+        <profilePhoto></profilePhoto>
         <tagged>owesMoney</tagged>
         <tagged>friends</tagged>
     </members>
@@ -76,7 +76,7 @@
         <password>password</password>
         <matricNumber>A2488865L</matricNumber>
         <group>legal</group>
-        <profilePhoto>C:/Users/Amrut Prabhu/IdeaProjects/main/src/main/resources/photos/default.png</profilePhoto>
+        <profilePhoto></profilePhoto>
         <tagged>colleagues</tagged>
     </members>
     <tags>owesMoney</tags>

diff --git a/src/main/java/seedu/club/ui/CompressedMemberCard.java b/src/main/java/seedu/club/ui/CompressedMemberCard.java
@@ -17,8 +17,8 @@ public class CompressedMemberCard extends MemberCard {
      * @see <a href="https://github.com/se-edu/addressbook-level4/issues/336">The issue on AddressBook level 4</a>
      */
 
-    public CompressedMemberCard(Member member, int displayedIndex) {
-        super(member, displayedIndex, FXML);
+    public CompressedMemberCard(Member member, int displayedIndex, boolean isCompressed) {
+        super(member, displayedIndex, FXML, isCompressed);
     }
 
     @Override

diff --git a/src/main/java/seedu/club/ui/MemberCard.java b/src/main/java/seedu/club/ui/MemberCard.java
@@ -69,15 +69,17 @@ public MemberCard(Member member, int displayedIndex) {
         member.getTags().forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
     }
 
-    public MemberCard(Member member, int displayedIndex, String fxml) {
+    public MemberCard(Member member, int displayedIndex, String fxml, boolean isCompressed) {
         super(fxml);
         this.member = member;
         id.setText(displayedIndex + ". ");
         name.setText(member.getName().fullName);
         phone.setText(member.getPhone().value);
         group.setText(member.getGroup().groupName);
         email.setText(member.getEmail().value);
-        setProfilePhoto(member);
+        if (!isCompressed) {
+            setProfilePhoto(member);
+        }
         //bindListeners(member);
     }
 

diff --git a/src/main/java/seedu/club/ui/MemberListPanel.java b/src/main/java/seedu/club/ui/MemberListPanel.java
@@ -68,7 +68,8 @@ private void setMemberListView(ObservableList<Member> memberList) {
         ObservableList<MemberCard> mappedList = EasyBind.map(
                 memberList, (member) -> {
                 if (isDisplayingCompressedMembers) {
-                    return new CompressedMemberCard(member, memberList.indexOf(member) + 1);
+                    return new CompressedMemberCard(member, memberList.indexOf(member) + 1,
+                            isDisplayingCompressedMembers);
                 } else {
                     return new MemberCard(member, memberList.indexOf(member) + 1);
                 }

diff --git a/src/main/resources/view/MemberListCard.fxml b/src/main/resources/view/MemberListCard.fxml
@@ -12,9 +12,9 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.shape.Circle?>
 
-<!--HBox id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"-->
-<HBox id="cardPane" fx:id="cardPane" prefHeight="105.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/8.0.102"
-      xmlns:fx="http://javafx.com/fxml/1">
+<HBox id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<!--HBox id="cardPane" fx:id="cardPane" prefHeight="105.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/8.0.102"
+      xmlns:fx="http://javafx.com/fxml/1"-->
   <GridPane HBox.hgrow="ALWAYS">
     <columnConstraints>
       <ColumnConstraints hgrow="SOMETIMES" minWidth="10" prefWidth="150" />