Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.36.2.19 -r1.36.2.20
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java 18 Nov 2016 07:49:46 -0000 1.36.2.19
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java 18 Nov 2016 12:49:07 -0000 1.36.2.20
@@ -1410,9 +1410,9 @@
String originalStatus = userRow.getStatus();
String status;
- if (originalStatus.contains("tick.png")) {
+ if (originalStatus.contains("check")) {
status = getMessage("gradebook.exportcourse.ok");
- } else if (originalStatus.contains("cog.png")) {
+ } else if (originalStatus.contains("cog")) {
status = getMessage("gradebook.exportcourse.current.activity",
new String[] { userRow.getCurrentActivity() });
} else {
@@ -1570,14 +1570,14 @@
final String IMAGES_DIR = Configuration.get(ConfigurationKeys.SERVER_URL) + "images";
if (learnerProgress != null) {
if (learnerProgress.isComplete()) {
- status = "
";
+ status = "";
} else if ((learnerProgress.getAttemptedActivities() != null)
&& (learnerProgress.getAttemptedActivities().size() > 0)) {
String currentActivityTitle = learnerProgress.getCurrentActivity() == null ? ""
: StringEscapeUtils.escapeHtml(learnerProgress.getCurrentActivity().getTitle());
- status = "
";
+ status = "";
}
}
return status;
@@ -1596,10 +1596,10 @@
if (learnerProgress != null) {
byte statusByte = learnerProgress.getProgressState(activity);
if (statusByte == LearnerProgress.ACTIVITY_ATTEMPTED && learnerProgress.getCurrentActivity() != null) {
- return "
";
+ return "";
} else if (statusByte == LearnerProgress.ACTIVITY_COMPLETED) {
- return "
";
+ return "";
}
}
return "-";