Index: lams_bb_integration/RELEASE_NOTES.TXT =================================================================== diff -u -rab84d3e55ecda248b59bb7ab156e3f368add877e -r42c75fdfde0cd4b5ee838e90cee42b6e59027625 --- lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision ab84d3e55ecda248b59bb7ab156e3f368add877e) +++ lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision 42c75fdfde0cd4b5ee838e90cee42b6e59027625) @@ -73,5 +73,8 @@ =================== * LDEV-3423: Fixed Exception on getting mark from LAMS server after lesson is completed * LDEV-3424: Add new feature to integrations to be able to sync all marks in the lesson + +1.2.9 Release Fixes +=================== * LDEV-3446: Join users to the lesson after it was created on a BB side Index: lams_bb_integration/WEB-INF/bb-manifest.xml =================================================================== diff -u -r4265110d294b2209f343733d3770a28e9ec7d7b1 -r42c75fdfde0cd4b5ee838e90cee42b6e59027625 --- lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision 4265110d294b2209f343733d3770a28e9ec7d7b1) +++ lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision 42c75fdfde0cd4b5ee838e90cee42b6e59027625) @@ -5,7 +5,7 @@ - + Index: lams_bb_integration/build.xml =================================================================== diff -u -r4265110d294b2209f343733d3770a28e9ec7d7b1 -r42c75fdfde0cd4b5ee838e90cee42b6e59027625 --- lams_bb_integration/build.xml (.../build.xml) (revision 4265110d294b2209f343733d3770a28e9ec7d7b1) +++ lams_bb_integration/build.xml (.../build.xml) (revision 42c75fdfde0cd4b5ee838e90cee42b6e59027625) @@ -2,7 +2,7 @@ - + Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java =================================================================== diff -u -rab84d3e55ecda248b59bb7ab156e3f368add877e -r42c75fdfde0cd4b5ee838e90cee42b6e59027625 --- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision ab84d3e55ecda248b59bb7ab156e3f368add877e) +++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision 42c75fdfde0cd4b5ee838e90cee42b6e59027625) @@ -383,7 +383,7 @@ String lastNames = ""; String emails = ""; String monitorIds = ""; - final String DUMMY_NAME = "unknown"; + final String DUMMY_VALUE = "-"; BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager(); Id courseId = ctx.getCourse().getId(); @@ -395,15 +395,15 @@ for (CourseMembership courseMembership : studentCourseMemberships) { learnerIds += URLEncoder.encode(courseMembership.getUser().getUserName(), "utf8") + ","; - String firstName = courseMembership.getUser().getGivenName().isEmpty() ? DUMMY_NAME : courseMembership + String firstName = courseMembership.getUser().getGivenName().isEmpty() ? DUMMY_VALUE : courseMembership .getUser().getGivenName(); firstNames += URLEncoder.encode(firstName, "utf8") + ","; - String lastName = courseMembership.getUser().getFamilyName().isEmpty() ? DUMMY_NAME : courseMembership + String lastName = courseMembership.getUser().getFamilyName().isEmpty() ? DUMMY_VALUE : courseMembership .getUser().getFamilyName(); lastNames += URLEncoder.encode(lastName, "utf8") + ","; - String email = courseMembership.getUser().getEmailAddress().isEmpty() ? DUMMY_NAME : courseMembership + String email = courseMembership.getUser().getEmailAddress().isEmpty() ? DUMMY_VALUE : courseMembership .getUser().getEmailAddress(); emails += URLEncoder.encode(email, "utf8") + ","; } @@ -416,15 +416,15 @@ for (CourseMembership courseMembership : monitorCourseMemberships) { monitorIds += URLEncoder.encode(courseMembership.getUser().getUserName(), "utf8") + ","; - String firstName = courseMembership.getUser().getGivenName().isEmpty() ? DUMMY_NAME : courseMembership + String firstName = courseMembership.getUser().getGivenName().isEmpty() ? DUMMY_VALUE : courseMembership .getUser().getGivenName(); firstNames += URLEncoder.encode(firstName, "utf8") + ","; - String lastName = courseMembership.getUser().getFamilyName().isEmpty() ? DUMMY_NAME : courseMembership + String lastName = courseMembership.getUser().getFamilyName().isEmpty() ? DUMMY_VALUE : courseMembership .getUser().getFamilyName(); lastNames += URLEncoder.encode(lastName, "utf8") + ","; - String email = courseMembership.getUser().getEmailAddress().isEmpty() ? DUMMY_NAME : courseMembership + String email = courseMembership.getUser().getEmailAddress().isEmpty() ? DUMMY_VALUE : courseMembership .getUser().getEmailAddress(); emails += URLEncoder.encode(email, "utf8") + ","; } Index: lams_bb_integration/web/modules/learnermonitor.jsp =================================================================== diff -u -r9b648d812789c78f5788148f8a009b139a78eddb -r42c75fdfde0cd4b5ee838e90cee42b6e59027625 --- lams_bb_integration/web/modules/learnermonitor.jsp (.../learnermonitor.jsp) (revision 9b648d812789c78f5788148f8a009b139a78eddb) +++ lams_bb_integration/web/modules/learnermonitor.jsp (.../learnermonitor.jsp) (revision 42c75fdfde0cd4b5ee838e90cee42b6e59027625) @@ -171,11 +171,6 @@ LearnerProgressDTO learnerProgressDto = LamsSecurityUtil.getLearnerProgress(ctx, lessonId); %> - <%-- Breadcrumbs --%> - - - - <%-- Page Header --%>