Index: lams_bb_integration/RELEASE_NOTES.TXT =================================================================== diff -u -r62c44056eedc1abc844adcfb505f4565c5c2934e -rf52ac414dcf0258bf1c89c5c910440587221d2d9 --- lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision 62c44056eedc1abc844adcfb505f4565c5c2934e) +++ lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision f52ac414dcf0258bf1c89c5c910440587221d2d9) @@ -4,13 +4,13 @@ All Jira bug references can be found at: https://bugs.lamsfoundation.org/browse/ -1.0.1 Release -============= +1.0.1 Release Fixes +=================== * LDEV-1326 Implement "return to Blackboard" message * LDEV-1331 Monitoring and Learning windows open in the same window -1.0.2 Release -============= +1.0.2 Release Fixes +=================== * LDEV-1342 Live edit wont start when using the Blackboard integration * LDEV-1345 When selecting a sequence, the next button wont work with IE6 * LDEV-1350 Start lesson in Blackboard 7.1 throws NoSuchMethodError Index: lams_bb_integration/WEB-INF/bb-manifest.xml =================================================================== diff -u -r31aa927fd99f462f93471aff8f3a815448ba6f5d -rf52ac414dcf0258bf1c89c5c910440587221d2d9 --- lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision 31aa927fd99f462f93471aff8f3a815448ba6f5d) +++ lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision f52ac414dcf0258bf1c89c5c910440587221d2d9) @@ -60,6 +60,9 @@ - + + + + Fisheye: Tag 3b9ddc508e73ba1d53a30bf7e6a45d400da05096 refers to a dead (removed) revision in file `lams_bb_integration/web/modules/gradeit.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b9ddc508e73ba1d53a30bf7e6a45d400da05096 refers to a dead (removed) revision in file `lams_bb_integration/web/modules/index.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_bb_integration/web/modules/learnermonitor.jsp =================================================================== diff -u -rb29fcc0fc241926bdbf411c89c0e1a6e16c559fe -rf52ac414dcf0258bf1c89c5c910440587221d2d9 --- lams_bb_integration/web/modules/learnermonitor.jsp (.../learnermonitor.jsp) (revision b29fcc0fc241926bdbf411c89c0e1a6e16c559fe) +++ lams_bb_integration/web/modules/learnermonitor.jsp (.../learnermonitor.jsp) (revision f52ac414dcf0258bf1c89c5c910440587221d2d9) @@ -26,7 +26,22 @@ String monitorUrl = LamsSecurityUtil.generateRequestURL(ctx, "monitor") + "&lsid=" + lsid; String liveEditUrl = LamsSecurityUtil.generateRequestURL(ctx, "author"); +// add port to the url if the port is in the blackboard url. + int bbport = request.getServerPort(); + String bbportstr = bbport != 0 ? ":" + bbport : ""; + //String contentUrl = LamsSecurityUtil.generateRequestURL(ctx, "learner") + "&lsid=" + learningSessionId; + String updateGradesUrl = "\"" + request.getScheme() + + "://" + + request.getServerName() + + bbportstr + + request.getContextPath() + + "/modules/updateGrades.jsp?lsid=" + lsid + + "&course_id=" + request.getParameter("course_id") + + "&lineitem_id=" + request.getParameter("lineitem_id") + + "\""; + + String course_idstr = request.getParameter("course_id"); BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager(); @@ -131,6 +146,11 @@ } } + function updateGrades() + { + window.location = <%=updateGradesUrl%> + } + function openAuthorForEditOnFly( learningDesignID ) { liveEditUrl= '<%=liveEditUrl%>' + '&layout=editonfly&learningDesignID=' + learningDesignID; @@ -144,6 +164,8 @@ monitorWin.focus(); } } + + //--> @@ -163,8 +185,9 @@ Please Choose an Option

     - + + Fisheye: Tag 3b9ddc508e73ba1d53a30bf7e6a45d400da05096 refers to a dead (removed) revision in file `lams_bb_integration/web/modules/newlineitem.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_bb_integration/web/modules/start_lesson_proc.jsp =================================================================== diff -u -r0c62e5aa08b76c3810de11b5e1fe583c8393f2bb -rf52ac414dcf0258bf1c89c5c910440587221d2d9 --- lams_bb_integration/web/modules/start_lesson_proc.jsp (.../start_lesson_proc.jsp) (revision 0c62e5aa08b76c3810de11b5e1fe583c8393f2bb) +++ lams_bb_integration/web/modules/start_lesson_proc.jsp (.../start_lesson_proc.jsp) (revision f52ac414dcf0258bf1c89c5c910440587221d2d9) @@ -14,6 +14,8 @@ <%@ page import="blackboard.platform.session.BbSession"%> <%@ page import="blackboard.platform.*"%> <%@ page import="blackboard.platform.plugin.PlugInUtil"%> +<%@ page import="blackboard.data.gradebook.Lineitem" %> +<%@ page import="blackboard.persist.gradebook.LineitemDbPersister" %> <%@ page import="org.lamsfoundation.ld.integration.blackboard.LamsSecurityUtil"%> <%@ page import="org.lamsfoundation.ld.integration.blackboard.LamsPluginUtil"%> @@ -24,10 +26,12 @@ + + <% String title = request.getParameter("title").trim(); String description = request.getParameter("description").trim(); @@ -92,21 +96,38 @@ throw new ServletException(e.getMessage(), e); } - // add port to the url if the port is in the blackboard url. + + // Creating the gradebook row for this lesson + Id lineitemId = bbPm.generateId(Lineitem.LINEITEM_DATA_TYPE,learningSessionId); + + Lineitem lineitem = new Lineitem(); + lineitem.setCourseId(courseId); + lineitem.setName("LAMS Lesson: " + title); + lineitem.setId(lineitemId); + lineitem.setAssessmentId(learningSessionId,Lineitem.AssessmentLocation.EXTERNAL); + lineitem.setAssessmentLocation( Lineitem.AssessmentLocation.EXTERNAL ); + lineitem.setDateAdded(); + lineitem.setIsAvailable(true); + lineitem.setType("LAMS"); + lineitem.setColumnOrder(3000); + lineitem.validate(); + lineitem.setPointsPossible(1); + + + + // add port to the url if the port is in the blackboard url. int bbport = request.getServerPort(); String bbportstr = bbport != 0 ? ":" + bbport : ""; - - - //String contentUrl = LamsSecurityUtil.generateRequestURL(ctx, "learner") + "&lsid=" + learningSessionId; String contentUrl = request.getScheme() + "://" + request.getServerName() + bbportstr + request.getContextPath() + "/modules/learnermonitor.jsp?lsid=" + learningSessionId + - "&course_id=" + request.getParameter("course_id"); + "&course_id=" + request.getParameter("course_id") + + "&lineitem_id=" + lineitemId.getExternalString(); myContent.setUrl(contentUrl); //Parse start/end Date from the @@ -125,6 +146,13 @@ } + + + //LineitemDbLoader liLoader = (LineitemDbLoader) bbPm.getLoader(LineitemDbLoader.TYPE); + LineitemDbPersister lineItempersist = (LineitemDbPersister) bbPm.getPersister(LineitemDbPersister.TYPE); + lineItempersist.persist(lineitem); + + ContentDbPersister persister= (ContentDbPersister) bbPm.getPersister( ContentDbPersister.TYPE ); persister.persist( myContent ); Fisheye: Tag 3b9ddc508e73ba1d53a30bf7e6a45d400da05096 refers to a dead (removed) revision in file `lams_bb_integration/web/modules/updateGrades.jsp'. Fisheye: No comparison available. Pass `N' to diff?