fixed display groups bug

Author: cppavel

src/main/java/ie/tcd/pavel/ExerciseChartsPage.java

@@ -31,6 +31,8 @@
 import ie.tcd.pavel.security.SecurityUtils;
 import ie.tcd.pavel.utility.ExerciseTypes;
 
+import javax.management.Notification;
+
 @Route("charts")
 public class ExerciseChartsPage extends VerticalLayout {
 
@@ -42,7 +44,7 @@ public class ExerciseChartsPage extends VerticalLayout {
     public ExerciseChartsPage() {
     	database = BeanUtil.getBean(MongoDBOperations.class);
         exerciseTypes = BeanUtil.getBean(ExerciseTypes.class);
-        
+
         String[] exercises = exerciseTypes.getExerciseTypes();  
     	List<Group> groups= database.getGroupsByUser(SecurityUtils.getUsername());
     	User currentUser= database.getUserByLogin(SecurityUtils.getUsername());
@@ -63,9 +65,12 @@ public ExerciseChartsPage() {
         	comboBoxExercise.setLabel("Exercise");
         	comboBoxExercise.setItems(exercises);
         	comboBoxExercise.addValueChangeListener(exerciseEvent ->{
-				HashMap<User, Double> data= database.inGroupGetCumulativeValuesByUserAndType(comboBoxGroup.getValue(), comboBoxExercise.getValue());	
+				HashMap<User, Double> data= database.inGroupGetCumulativeValuesByUserAndType(comboBoxGroup.getValue(),
+						comboBoxExercise.getValue());
+
 
         		Chart pieChart= new Chart(ChartType.PIE);
+        		horizontalLayout.remove(pieChart);
         		Configuration pieChartConfig= pieChart.getConfiguration();
         		pieChartConfig.setTitle("Member Contribution");
         		pieChartConfig.setSubTitle(comboBoxExercise.getValue());
@@ -81,13 +86,8 @@ public ExerciseChartsPage() {
                 pieChartConfig.setPlotOptions(plotOptions);
 
                 DataSeries dataSeries= new DataSeries();
-                dataSeries.clear();
-                DataSeriesItem currentUserSeries= new DataSeriesItem(currentUser.getLogin(), data.get(currentUser));
-                currentUserSeries.setSliced(true);
-                currentUserSeries.setSelected(true);
-                dataSeries.add(currentUserSeries);
                 for(int i= 0; i<database.getUsersByGroup(comboBoxGroup.getValue()).size(); i++)
-                {
+				{
                 	User user= database.getUsersByGroup(comboBoxGroup.getValue()).get(i);
                 	dataSeries.add(new DataSeriesItem(user.getLogin(), data.get(user)));
                 }

src/main/java/ie/tcd/pavel/MainPage.java

@@ -35,7 +35,7 @@
 public class MainPage extends AppLayout implements BeforeEnterObserver {
 
     private HashMap<Tab, Component> tabMap = new HashMap<>();
-    private Image background = new Image("https://i.imgur.com/2ikSvg1.jpg", "Background");
+    private Image background = new Image("https://i.imgur.com/4AhkxVz.jpg", "Background");
 
     public MainPage() {
         this.setContent(background);

src/main/java/ie/tcd/pavel/MongoDBOperations.java

@@ -220,7 +220,7 @@ public List<User> getUsersByGroup(String group)
         List<Group> resultGroup = mongoTemplate.query(Group.class).matching(searchGroup).all();
         List<User> users = new ArrayList<>();
         for (Group gr: resultGroup) {
-            users.add(getUserByLogin(gr.getName()));
+            users.add(getUserByLogin(gr.getUser()));
         }
         return users;
     }
@@ -250,6 +250,7 @@ public HashMap<User,Double> inGroupGetCumulativeValuesByUserAndType(String group
                 List<Exercise> exercises = allUsersExercises.get(user);
                 for(Exercise exercise: exercises)
                 {
+                    System.out.println(ExerciseAdaptor.getDistanceValue(exercise.getInformation()));
                     currentValue+= ExerciseAdaptor.getDistanceValue(exercise.getInformation());
                 }
                 cumulativeData.put(user,currentValue);

src/main/java/ie/tcd/pavel/MyGroupsPage.java

@@ -35,7 +35,6 @@ public MyGroupsPage()
                 ArrayList<User> users = (ArrayList<User>) database.getUsersByGroup(g.getName());
                 if(!users.isEmpty()) {
                     for (User u : users) {
-                        System.out.printf(u.getLogin() + "%n");
                         group.addContent(new H3(u.getLogin()));
                     }
                 }