🏆 Add achievements dialog

TobseF · TobseF · commit 8bfc1995d8a7 · 2019-12-24T00:19:15.000+01:00
diff --git a/src/main/java/org/cleancode/journal/component/AddSpeedDial.java b/src/main/java/org/cleancode/journal/component/AddSpeedDial.java
@@ -2,7 +2,9 @@
 
 import org.cleancode.journal.domain.LogEntry;
 import org.cleancode.journal.domain.Profile;
+import org.cleancode.journal.service.IAchievementService;
 import org.cleancode.journal.service.IGradeService;
+import org.cleancode.journal.view.AchievementDialog;
 import org.cleancode.journal.view.LogDialog;
 
 import java.io.Serializable;
@@ -14,11 +16,13 @@ public class AddSpeedDial extends SpeedDial {
 
     private final Profile profile;
     private final IGradeService gradeService;
+    private final IAchievementService achievementService;
     private NewLogEntryListener entryListener;
 
-    public AddSpeedDial(Profile profile, IGradeService gradeService) {
+    public AddSpeedDial(Profile profile, IGradeService gradeService, IAchievementService achievementService) {
         this.profile = profile;
         this.gradeService = gradeService;
+        this.achievementService = achievementService;
         setBackdrop(false);
         addMenuItem(getTranslation("app.action.add.log-achievement"), TROPHY.create(), e -> activateAchievement());
         addMenuItem(getTranslation("app.action.add.log-block"), NOTEBOOK.create(), e -> createNote());
@@ -30,8 +34,8 @@ public void createNote() {
     }
 
     public void activateAchievement() {
-        LogDialog logDialog = new LogDialog(gradeService, profile, entryListener);
-        logDialog.open();
+        AchievementDialog achievementDialog = new AchievementDialog(achievementService, profile, null);
+        achievementDialog.open();
     }
 
     public void add(NewLogEntryListener entryListener) {
diff --git a/src/main/java/org/cleancode/journal/domain/Achievement.java b/src/main/java/org/cleancode/journal/domain/Achievement.java
@@ -1,8 +1,9 @@
 package org.cleancode.journal.domain;
 
+import java.io.Serializable;
 import java.util.Objects;
 
-public class Achievement {
+public class Achievement implements Serializable {
 
 
     private Group group;
@@ -112,6 +113,6 @@ public int hashCode() {
     }
 
     public enum Group {
-        Grade, Log, CleanCode, Social, Dev, Health, Knowledge;
+        Grade, Log, CleanCode, Social, Dev, Health, Knowledge
     }
 }
diff --git a/src/main/java/org/cleancode/journal/service/AchievementService.java b/src/main/java/org/cleancode/journal/service/AchievementService.java
@@ -4,6 +4,7 @@
 import org.cleancode.journal.domain.Achievement;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import java.io.InputStreamReader;
 import java.util.List;
 import java.util.Map;
@@ -12,16 +13,27 @@
 @Service
 public class AchievementService implements IAchievementService {
 
-    @Override
-    public List<Achievement> loadAllAchievements() {
+    private List<Achievement> achievements;
+
+    @PostConstruct
+    private void loadAchievementsFromFile() {
         Gson gson = new Gson();
         String gradeFilePath = "/achievements.json";
-        Achievement[] achievements = gson.fromJson(new InputStreamReader(getClass().getResourceAsStream(gradeFilePath)), Achievement[].class);
-        return List.of(achievements);
+        achievements = List.of(gson.fromJson(new InputStreamReader(getClass().getResourceAsStream(gradeFilePath)), Achievement[].class));
+    }
+
+    @Override
+    public List<Achievement> loadAllAchievements() {
+        return achievements;
     }
 
     @Override
     public Map<Achievement.Group, List<Achievement>> loadAllAchievementsInGroups() {
         return loadAllAchievements().stream().collect(Collectors.groupingBy(Achievement::getGroup));
     }
+
+    @Override
+    public List<Achievement> loadAllAchievementsByGroup(Achievement.Group group) {
+        return loadAllAchievementsInGroups().get(group);
+    }
 }
diff --git a/src/main/java/org/cleancode/journal/service/IAchievementService.java b/src/main/java/org/cleancode/journal/service/IAchievementService.java
@@ -3,12 +3,15 @@
 import org.cleancode.journal.domain.Achievement;
 import org.springframework.stereotype.Service;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
 @Service
-public interface IAchievementService {
+public interface IAchievementService extends Serializable {
     List<Achievement> loadAllAchievements();
 
     Map<Achievement.Group, List<Achievement>> loadAllAchievementsInGroups();
+
+    List<Achievement> loadAllAchievementsByGroup(Achievement.Group group);
 }
diff --git a/src/main/java/org/cleancode/journal/view/AboutView.java b/src/main/java/org/cleancode/journal/view/AboutView.java
@@ -5,13 +5,14 @@
 import com.vaadin.flow.router.Route;
 import org.cleancode.journal.component.AddSpeedDial;
 import org.cleancode.journal.domain.Profile;
+import org.cleancode.journal.service.IAchievementService;
 import org.cleancode.journal.service.IGradeService;
 
 @Route(layout = MainView.class)
 public class AboutView extends VerticalLayout {
 
-    public AboutView(Profile profile, IGradeService gradeService) {
+    public AboutView(Profile profile, IGradeService gradeService, IAchievementService achievementService) {
         add(new Label("Lorem ipsum"));
-        add(new AddSpeedDial(profile, gradeService));
+        add(new AddSpeedDial(profile, gradeService, achievementService));
     }
 }
diff --git a/src/main/java/org/cleancode/journal/view/AchievementDialog.java b/src/main/java/org/cleancode/journal/view/AchievementDialog.java
@@ -0,0 +1,125 @@
+package org.cleancode.journal.view;
+
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.dialog.Dialog;
+import com.vaadin.flow.component.html.H2;
+import com.vaadin.flow.component.icon.Icon;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.orderedlayout.FlexComponent;
+import com.vaadin.flow.component.orderedlayout.FlexComponent.JustifyContentMode;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.select.Select;
+import com.vaadin.flow.component.textfield.TextArea;
+import org.cleancode.journal.domain.Achievement;
+import org.cleancode.journal.domain.Profile;
+import org.cleancode.journal.service.IAchievementService;
+
+import java.io.Serializable;
+
+
+public class AchievementDialog extends Dialog {
+
+
+    private final IAchievementService achievementService;
+    private final Profile profile;
+    private final NewAchievementListener entryListener;
+    private final TextArea comment;
+    private final Select<Achievement.Group> groupSelect;
+    private final Select<Achievement> achievementSelect;
+
+    public AchievementDialog(IAchievementService achievementService, Profile profile, NewAchievementListener entryListener) {
+        this.achievementService = achievementService;
+        this.profile = profile;
+        this.entryListener = entryListener;
+
+        VerticalLayout content = new VerticalLayout();
+        content.setJustifyContentMode(JustifyContentMode.BETWEEN);
+        content.setSizeFull();
+        add(content);
+
+        HorizontalLayout title = new HorizontalLayout();
+        title.setAlignItems(FlexComponent.Alignment.BASELINE);
+        title.setJustifyContentMode(JustifyContentMode.CENTER);
+        title.setWidthFull();
+        title.add(new Icon(VaadinIcon.TROPHY));
+        title.add(new H2(getTranslation("dialog.achievement.achievement")));
+        title.setMargin(false);
+        title.setPadding(false);
+        content.add(title);
+
+        setWidth("360px");
+        setHeight("600px");
+
+        groupSelect = new Select<>();
+        groupSelect.setLabel(getTranslation("dialog.achievement.category"));
+        groupSelect.setItems(Achievement.Group.values());
+        groupSelect.setItemLabelGenerator(this::getTranslation);
+        groupSelect.setWidthFull();
+        groupSelect.addValueChangeListener(e -> selectedGroup(e.getValue()));
+        content.add(groupSelect);
+
+
+        achievementSelect = new Select<>();
+        achievementSelect.setLabel(getTranslation("dialog.achievement.achievement"));
+        achievementSelect.setEnabled(false);
+        achievementSelect.setItemLabelGenerator(this::getTranslation);
+        achievementSelect.setWidthFull();
+        content.add(achievementSelect);
+
+
+        comment = new TextArea();
+        comment.setWidthFull();
+        comment.setHeightFull();
+        comment.setLabel(getTranslation("dialog.log.comment"));
+        comment.setPlaceholder(getTranslation("dialog.log.comment.placeholder"));
+        content.setFlexGrow(1, comment);
+        content.add(comment);
+
+        setCloseOnOutsideClick(false);
+        setCloseOnOutsideClick(false);
+
+        Button ok = new Button(getTranslation("dialog.achievement.commit"));
+        ok.addClickListener(e -> submit());
+        Button cancel = new Button(getTranslation("dialog.achievement.cancel"));
+        cancel.addClickListener(e -> cancel());
+
+        HorizontalLayout actions = new HorizontalLayout(cancel, ok);
+        actions.setWidthFull();
+        actions.setJustifyContentMode(JustifyContentMode.END);
+
+        content.add(actions);
+    }
+
+    private void selectedGroup(Achievement.Group group) {
+        achievementSelect.setEnabled(true);
+        achievementSelect.setItems(achievementService.loadAllAchievementsByGroup(group));
+    }
+
+
+    private String getTranslation(Achievement.Group group) {
+        return getTranslation("achievement.group." + group.name().toLowerCase());
+    }
+
+    private String getTranslation(Achievement achievement) {
+        return getTranslation(achievement.getId());
+    }
+
+
+    public void cancel() {
+        close();
+    }
+
+    public void submit() {
+        if (!achievementSelect.isInvalid() && !groupSelect.isInvalid()) {
+            Notification.show(getTranslation("dialog.achievement.committed", getTranslation(achievementSelect.getValue())));
+        }
+        close();
+    }
+
+    public interface NewAchievementListener extends Serializable {
+        void newAchievement(Achievement newLogEntry);
+    }
+
+}
diff --git a/src/main/java/org/cleancode/journal/view/AchievementsView.java b/src/main/java/org/cleancode/journal/view/AchievementsView.java
@@ -22,7 +22,7 @@ public AchievementsView(Profile profile, IGradeService gradeService, IAchievemen
 
         achievements.keySet().stream().sorted().map(achievements::get).forEach(this::addAchievements);
 
-        add(new AddSpeedDial(profile, gradeService));
+        add(new AddSpeedDial(profile, gradeService, achievementService));
     }
 
     public void addAchievements(List<Achievement> achievements) {
diff --git a/src/main/java/org/cleancode/journal/view/CompendiumView.java b/src/main/java/org/cleancode/journal/view/CompendiumView.java
@@ -17,9 +17,8 @@
 import org.cleancode.journal.domain.grade.GradeTopic;
 import org.cleancode.journal.domain.grade.Practice;
 import org.cleancode.journal.domain.grade.Principle;
-import org.cleancode.journal.service.GradeService;
+import org.cleancode.journal.service.IAchievementService;
 import org.cleancode.journal.service.IGradeService;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,7 +36,7 @@ public class CompendiumView extends VerticalLayout {
     private final Grid<GradeTopic> table;
     private Accordion tree;
 
-    public CompendiumView(Profile profile, IGradeService gradeService) {
+    public CompendiumView(Profile profile, IGradeService gradeService, IAchievementService achievementService) {
         setHeightFull();
 
         HorizontalLayout controls = new HorizontalLayout();
@@ -54,7 +53,7 @@ public CompendiumView(Profile profile, IGradeService gradeService) {
 
         setViewMode(defaultViewMode);
 
-        add(new AddSpeedDial(profile, gradeService));
+        add(new AddSpeedDial(profile, gradeService, achievementService));
     }
 
     private TextField createFilter(IGradeService gradeService) {
diff --git a/src/main/java/org/cleancode/journal/view/GradeView.java b/src/main/java/org/cleancode/journal/view/GradeView.java
@@ -15,6 +15,7 @@
 import org.cleancode.journal.domain.grade.GradeRating;
 import org.cleancode.journal.domain.grade.GradeRating.Rating;
 import org.cleancode.journal.domain.grade.GradeTopic;
+import org.cleancode.journal.service.IAchievementService;
 import org.cleancode.journal.service.IGradeService;
 
 import java.util.Locale;
@@ -30,7 +31,7 @@ public class GradeView extends VerticalLayout implements HasUrlParameter<String>
     private final IGradeService gradeService;
     private final VerticalLayout ratings;
 
-    public GradeView(Profile profile, IGradeService gradeService) {
+    public GradeView(Profile profile, IGradeService gradeService, IAchievementService achievementService) {
         this.gradeService = gradeService;
 
         name = new H2(EMPTY);
@@ -47,7 +48,7 @@ public GradeView(Profile profile, IGradeService gradeService) {
         description = new Label();
         add(description);
 
-        add(new AddSpeedDial(profile, gradeService));
+        add(new AddSpeedDial(profile, gradeService, achievementService));
     }
 
     @Override
diff --git a/src/main/java/org/cleancode/journal/view/JournalView.java b/src/main/java/org/cleancode/journal/view/JournalView.java
@@ -22,6 +22,7 @@
 import org.cleancode.journal.domain.grade.GradeColor;
 import org.cleancode.journal.domain.grade.GradeTopic;
 import org.cleancode.journal.service.GradeService;
+import org.cleancode.journal.service.IAchievementService;
 import org.cleancode.journal.service.IProgressService;
 
 import javax.annotation.PostConstruct;
@@ -41,7 +42,7 @@ public class JournalView extends VerticalLayout {
     private final VerticalLayout log;
     private VerticalLayout favorites;
 
-    public JournalView(IProgressService progressService, GradeService gradeService, Profile profile) {
+    public JournalView(IProgressService progressService, GradeService gradeService, Profile profile, IAchievementService achievementService) {
         this.progressService = progressService;
         this.gradeService = gradeService;
         this.profile = profile;
@@ -61,7 +62,7 @@ public JournalView(IProgressService progressService, GradeService gradeService,
         bindLogEntries();
 
 
-        AddSpeedDial addSpeedDial = new AddSpeedDial(profile, gradeService);
+        AddSpeedDial addSpeedDial = new AddSpeedDial(profile, gradeService, achievementService);
         //noinspection Convert2Lambda - Using a lamda would break the serialisation
         addSpeedDial.add(new AddSpeedDial.NewLogEntryListener() {
             @Override
diff --git a/src/main/java/org/cleancode/journal/view/LogDialog.java b/src/main/java/org/cleancode/journal/view/LogDialog.java
@@ -5,6 +5,7 @@
 import com.vaadin.flow.component.html.H2;
 import com.vaadin.flow.component.icon.Icon;
 import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.FlexComponent;
 import com.vaadin.flow.component.orderedlayout.FlexComponent.JustifyContentMode;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
@@ -112,14 +113,16 @@ public void cancel() {
     public void submit() {
         if (!voting.isInvalid() && !topicSelect.isInvalid()) {
             LogEntry logEntry = new LogEntry(voting.getValue());
-            logEntry.setTopicId(topicSelect.getValue().getId());
+            GradeTopic gradeTopic = topicSelect.getValue();
+            logEntry.setTopicId(gradeTopic.getId());
             logEntry.setDateTime(LocalDateTime.now());
             logEntry.setComment(comment.getValue());
             profile.addLogEntry(logEntry);
             if (entryListener != null) {
                 entryListener.newLogEntry(logEntry);
             }
             close();
+            Notification.show(getTranslation("dialog.log.committed", gradeTopic.getName()));
         }
     }
 }
diff --git a/src/main/java/org/cleancode/journal/view/ProfileView.java b/src/main/java/org/cleancode/journal/view/ProfileView.java
@@ -13,14 +13,15 @@
 import org.cleancode.journal.component.AddSpeedDial;
 import org.cleancode.journal.domain.Profile;
 import org.cleancode.journal.domain.grade.GradeColor;
+import org.cleancode.journal.service.IAchievementService;
 import org.cleancode.journal.service.IGradeService;
 import org.cleancode.journal.service.INameService;
 
 @Route(layout = MainView.class)
 public class ProfileView extends VerticalLayout {
     private final INameService nameService;
 
-    public ProfileView(INameService nameService, Profile profile, IGradeService gradeService) {
+    public ProfileView(INameService nameService, Profile profile, IGradeService gradeService, IAchievementService achievementService) {
         this.nameService = nameService;
 
         add(createNameField(profile));
@@ -29,7 +30,7 @@ public ProfileView(INameService nameService, Profile profile, IGradeService grad
 
         add(createGradeSelect(profile));
 
-        add(new AddSpeedDial(profile, gradeService));
+        add(new AddSpeedDial(profile, gradeService, achievementService));
     }
 
     private HorizontalLayout createNameField(Profile profile) {
diff --git a/src/main/resources/translation_de.properties b/src/main/resources/translation_de.properties
diff --git a/src/main/resources/translation_en.properties b/src/main/resources/translation_en.properties

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`package org.cleancode.journal.domain;`
`2`	`2`
	`3`	`+import java.io.Serializable;`
`3`	`4`	`import java.util.Objects;`
`4`	`5`
`5`		`-public class Achievement {`
	`6`	`+public class Achievement implements Serializable {`
`6`	`7`
`7`	`8`
`8`	`9`	`private Group group;`
`@@ -112,6 +113,6 @@ public int hashCode() {`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`public enum Group {`
`115`		`- Grade, Log, CleanCode, Social, Dev, Health, Knowledge;`
	`116`	`+ Grade, Log, CleanCode, Social, Dev, Health, Knowledge`
`116`	`117`	`}`
`117`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public AchievementsView(Profile profile, IGradeService gradeService, IAchievemen`
`22`	`22`
`23`	`23`	`achievements.keySet().stream().sorted().map(achievements::get).forEach(this::addAchievements);`
`24`	`24`
`25`		`- add(new AddSpeedDial(profile, gradeService));`
	`25`	`+ add(new AddSpeedDial(profile, gradeService, achievementService));`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public void addAchievements(List<Achievement> achievements) {`