solved issue with lesson table wrong values..

pstlab · Jun 25, 2018 · d5f368e · d5f368e
1 parent 22bc2a9
commit d5f368e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/LECTurE-DesktopApp/src/main/java/it/cnr/istc/lecture/desktopapp/LessonController.java b/LECTurE-DesktopApp/src/main/java/it/cnr/istc/lecture/desktopapp/LessonController.java
@@ -318,11 +318,11 @@ protected void updateItem(String item, boolean empty) {
                     styleProperty().unbind();
                     setStyle("");
                 } else {
-                    EventTemplate et = l_ctx.get().getModel().events.get(getIndex());
+                    TokenRow row = getTableView().getItems().get(getIndex());
+                    EventTemplate et = l_ctx.get().getModel().events.stream().filter(evt -> evt.name.equals(row.getName())).findAny().get();
                     StudentContext student_ctx = Context.getContext().getStudentContext(l_ctx.get().getLesson().roles.get(et.role));
                     setText(student_ctx.getStudent().first_name + " " + student_ctx.getStudent().last_name);
 
-                    TokenRow row = getTableView().getItems().get(getIndex());
                     styleProperty().bind(Bindings.createStringBinding(() -> {
                         if (row.getExecuted()) {
                             return "-fx-font-weight: bold;";
@@ -343,7 +343,8 @@ protected void updateItem(String item, boolean empty) {
                     styleProperty().unbind();
                     setStyle("");
                 } else {
-                    EventTemplate et = l_ctx.get().getModel().events.get(getIndex());
+                    TokenRow row = getTableView().getItems().get(getIndex());
+                    EventTemplate et = l_ctx.get().getModel().events.stream().filter(evt -> evt.name.equals(row.getName())).findAny().get();
                     if (et instanceof TextEventTemplate) {
                         setText(((TextEventTemplate) et).content);
                     } else if (et instanceof URLEventTemplate) {
@@ -352,7 +353,6 @@ protected void updateItem(String item, boolean empty) {
                         setText(((QuestionEventTemplate) et).question);
                     }
 
-                    TokenRow row = getTableView().getItems().get(getIndex());
                     styleProperty().bind(Bindings.createStringBinding(() -> {
                         if (row.getExecuted()) {
                             return "-fx-font-weight: bold;";