Merge pull request #82 from abwilli/master

Bug fix in Tags Json files
CS2103-AY1819S2-W16-4 · Apr 3, 2019 · bbb38c7 · bbb38c7
2 parents 1628969 + f2b75ee
commit bbb38c7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/seedu/address/model/tag/SkillsTag.java b/src/main/java/seedu/address/model/tag/SkillsTag.java
@@ -25,19 +25,21 @@ public class SkillsTag {
     public SkillsTag(String tagName, String type) {
         requireNonNull(tagName);
         checkArgument(isValidTagName(tagName), MESSAGE_CONSTRAINTS);
-        this.tagName = tagName;
         this.tagType = type;
         if (type.equals("skill")) {
             //skill tag
             this.tagColor = "pink";
+            this.tagName = "s:" + tagName;
 
         } else if (type.equals("pos")) {
             //position tag
             this.tagColor = "yellow";
+            this.tagName = "p:" + tagName;
 
         } else {
             //endorsement tag
             this.tagColor = "teal";
+            this.tagName = "e:" + tagName;
         }
     }
 

diff --git a/src/main/java/seedu/address/storage/JsonAdaptedTag.java b/src/main/java/seedu/address/storage/JsonAdaptedTag.java
@@ -20,8 +20,16 @@ class JsonAdaptedTag {
 
     @JsonCreator
     public JsonAdaptedTag(String tagName) {
-        this.tagName = tagName;
-        this.tagType = "pos";
+        String parsed = tagName.substring(2);
+        String prefix = tagName.substring(0,1);
+        this.tagName = parsed;
+        if(prefix.equals("s")){
+            this.tagType = "skill";
+        }else if(prefix.equals("p")){
+            this.tagType = "pos";
+        }else{
+            this.tagType = "endorse";
+        }
 
     }
 
@@ -47,6 +55,7 @@ public SkillsTag toModelType() throws IllegalValueException {
         if (!SkillsTag.isValidTagName(tagName)) {
             throw new IllegalValueException(SkillsTag.MESSAGE_CONSTRAINTS);
         }
+
         return new SkillsTag(tagName, tagType);
     }
 

diff --git a/src/main/java/seedu/address/ui/PersonCard.java b/src/main/java/seedu/address/ui/PersonCard.java
@@ -60,7 +60,7 @@ public PersonCard(Person person, int displayedIndex) {
      */
     private void formatTags(Person person) {
         person.getTags().forEach(tag -> {
-            Label tLabel = new Label(tag.tagName);
+            Label tLabel = new Label(tag.tagName.substring(2));
             tLabel.getStyleClass().add(tag.tagColor);
             tags.getChildren().add(tLabel);