Index: lams_bb_integration/RELEASE_NOTES.TXT =================================================================== diff -u -r5b93d9a61b07f22f60187ed378b6cc402dfe0c35 -r9cf8f14597f71f72d4ed68964790b7a9b1e99559 --- lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision 5b93d9a61b07f22f60187ed378b6cc402dfe0c35) +++ lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision 9cf8f14597f71f72d4ed68964790b7a9b1e99559) @@ -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 -r96fdd34b6349ec748fc6080c3c688b63e20d411e -r9cf8f14597f71f72d4ed68964790b7a9b1e99559 --- lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision 96fdd34b6349ec748fc6080c3c688b63e20d411e) +++ lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision 9cf8f14597f71f72d4ed68964790b7a9b1e99559) @@ -5,7 +5,7 @@ - + Index: lams_bb_integration/build.xml =================================================================== diff -u -r96fdd34b6349ec748fc6080c3c688b63e20d411e -r9cf8f14597f71f72d4ed68964790b7a9b1e99559 --- lams_bb_integration/build.xml (.../build.xml) (revision 96fdd34b6349ec748fc6080c3c688b63e20d411e) +++ lams_bb_integration/build.xml (.../build.xml) (revision 9cf8f14597f71f72d4ed68964790b7a9b1e99559) @@ -2,7 +2,7 @@ - + Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java =================================================================== diff -u -r5b93d9a61b07f22f60187ed378b6cc402dfe0c35 -r9cf8f14597f71f72d4ed68964790b7a9b1e99559 --- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision 5b93d9a61b07f22f60187ed378b6cc402dfe0c35) +++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision 9cf8f14597f71f72d4ed68964790b7a9b1e99559) @@ -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 -rbfbcd227c7e4f3c218726ee242bacc48702d9e42 -r9cf8f14597f71f72d4ed68964790b7a9b1e99559 --- lams_bb_integration/web/modules/learnermonitor.jsp (.../learnermonitor.jsp) (revision bfbcd227c7e4f3c218726ee242bacc48702d9e42) +++ lams_bb_integration/web/modules/learnermonitor.jsp (.../learnermonitor.jsp) (revision 9cf8f14597f71f72d4ed68964790b7a9b1e99559) @@ -171,11 +171,6 @@ LearnerProgressDTO learnerProgressDto = LamsSecurityUtil.getLearnerProgress(ctx, lessonId); %> - <%-- Breadcrumbs --%> - - - - <%-- Page Header --%>