From b1ec6624df68515761a1faf38fc152ca00c806ce Mon Sep 17 00:00:00 2001 From: gnaegi <none@none> Date: Thu, 18 Jun 2015 16:46:56 +0200 Subject: [PATCH] OO-991 update model on back, fix wrong icon --- .../course/nodes/gta/ui/GTACoachSelectionController.java | 7 +++++++ .../course/nodes/gta/ui/GTACoachedGroupListController.java | 2 +- .../nodes/gta/ui/GTACoachedParticipantListController.java | 2 +- .../olat/course/nodes/gta/ui/TaskStatusCellRenderer.java | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachSelectionController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachSelectionController.java index 789e2706478..a2340806216 100644 --- a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachSelectionController.java +++ b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachSelectionController.java @@ -146,6 +146,13 @@ public class GTACoachSelectionController extends BasicController { coachingCtrl = null; } backLink.setVisible(false); + if (participantListCtrl != null) { + participantListCtrl.updateModel(); + } + if (groupListCtrl != null) { + groupListCtrl.updateModel(); + + } } private void doSelectBusinessGroup(UserRequest ureq, BusinessGroup group) { diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedGroupListController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedGroupListController.java index 76f092f9c1e..a0dc1b45666 100644 --- a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedGroupListController.java +++ b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedGroupListController.java @@ -93,7 +93,7 @@ public class GTACoachedGroupListController extends FormBasicController { tableEl = uifactory.addTableElement(getWindowControl(), "entries", tableModel, getTranslator(), formLayout); } - private void updateModel() { + protected void updateModel() { RepositoryEntry entry = courseEnv.getCourseGroupManager().getCourseEntry(); List<TaskLight> tasks = gtaManager.getTasksLight(entry, gtaNode); Map<Long,TaskLight> groupToTasks = new HashMap<>(); diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedParticipantListController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedParticipantListController.java index a54b0b59582..0606b194d45 100644 --- a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedParticipantListController.java +++ b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedParticipantListController.java @@ -180,7 +180,7 @@ public class GTACoachedParticipantListController extends FormBasicController { tableEl = uifactory.addTableElement(getWindowControl(), "entries", tableModel, getTranslator(), formLayout); } - private void updateModel() { + protected void updateModel() { RepositoryEntry entry = courseEnv.getCourseGroupManager().getCourseEntry(); List<TaskLight> tasks = gtaManager.getTasksLight(entry, gtaNode); Map<Long,TaskLight> identityToTasks = new HashMap<>(); diff --git a/src/main/java/org/olat/course/nodes/gta/ui/TaskStatusCellRenderer.java b/src/main/java/org/olat/course/nodes/gta/ui/TaskStatusCellRenderer.java index 675198f3e14..d3b9da6e2a8 100644 --- a/src/main/java/org/olat/course/nodes/gta/ui/TaskStatusCellRenderer.java +++ b/src/main/java/org/olat/course/nodes/gta/ui/TaskStatusCellRenderer.java @@ -53,7 +53,7 @@ public class TaskStatusCellRenderer implements FlexiCellRenderer { case revision: target.append("<i class='o_icon o_icon-fw'> </i>").append(translator.translate("process.revision")); break; case correction: target.append("<i class='o_icon o_icon-fw o_icon_info'> </i>").append(translator.translate("process.correction")); break; case solution: target.append("<i class='o_icon o_icon-fw'> </i>").append(translator.translate("process.solution")); break; - case grading: target.append("<i class='o_icon o_icon-fw o_icon_warn'> </i>").append(translator.translate("process.grading")); break; + case grading: target.append("<i class='o_icon o_icon-fw o_icon_info'> </i>").append(translator.translate("process.grading")); break; case graded: target.append("<i class='o_icon o_icon-fw'> </i>").append(translator.translate("process.graded")); break; } } else if(cellValue == null) { -- GitLab