Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java (working copy) @@ -215,6 +215,7 @@ private String siteId; private boolean beginAssessment; + private boolean beginAssessmentLogged; // this instance tracks if the Agent is taking a test via URL, as well as // current agent string (if assigned). SAK-1927: esmiley @@ -1357,10 +1358,10 @@ returnValue="anonymousThankYou"; PublishedAssessmentService publishedAssessmentService = new PublishedAssessmentService(); String siteId = publishedAssessmentService.getPublishedAssessmentOwner(adata.getPublishedAssessmentId()); - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.submit.via_url", "submissionId=" + adata.getAssessmentGradingId(), siteId, true, NotificationService.NOTI_REQUIRED)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.submit.via_url", "/sam/" + AgentFacade.getCurrentSiteId() + "submissionId=" + adata.getAssessmentGradingId(), siteId, true, NotificationService.NOTI_REQUIRED)); } else { - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.submit", "submissionId=" + adata.getAssessmentGradingId(), true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.submit", "/sam/" + AgentFacade.getCurrentSiteId() + "submissionId=" + adata.getAssessmentGradingId(), true)); } } else { @@ -1369,10 +1370,10 @@ returnValue="anonymousThankYou"; PublishedAssessmentService publishedAssessmentService = new PublishedAssessmentService(); String siteId = publishedAssessmentService.getPublishedAssessmentOwner(adata.getPublishedAssessmentId()); - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.timer_submit.url", "submissionId=" + adata.getAssessmentGradingId(), siteId, true, NotificationService.NOTI_REQUIRED)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.timer_submit.url", "/sam/" + AgentFacade.getCurrentSiteId() +"submissionId=" + adata.getAssessmentGradingId(), siteId, true, NotificationService.NOTI_REQUIRED)); } else { - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.timer_submit", "submissionId=" + adata.getAssessmentGradingId(), true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.timer_submit", "/sam/" + AgentFacade.getCurrentSiteId() +"submissionId=" + adata.getAssessmentGradingId(), true)); } } forGrade = false; @@ -1388,6 +1389,9 @@ public String confirmSubmit() { + // Reset event tracking info + setBeginAssessmentLogged(false); + String nextAction = checkBeforeProceed(); log.debug("***** next Action="+nextAction); if (!("safeToProceed").equals(nextAction)){ @@ -2476,6 +2480,14 @@ public void setBeginAssessment(boolean beginAssessment){ this.beginAssessment = beginAssessment; } + + public boolean getBeginAssessmentLogged(){ + return beginAssessmentLogged; + } + + public void setBeginAssessmentLogged(boolean beginAssessment){ + this.beginAssessmentLogged = beginAssessment; + } public boolean timeExpired(){ boolean timeExpired = false; Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/ItemContentsBean.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/ItemContentsBean.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/ItemContentsBean.java (working copy) @@ -1161,7 +1161,7 @@ "new value " + score); answer.setScore(score); } - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.revise", "itemId=" + itemData.getItemId(), true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.revise", "/sam/" + AgentFacade.getCurrentSiteId() +"/itemId=" + itemData.getItemId(), true)); } itemService.saveItem(item); itemData.setScore(score); Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/util/EmailBean.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/util/EmailBean.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/util/EmailBean.java (working copy) @@ -45,6 +45,7 @@ import org.sakaiproject.tool.api.ToolSession; import org.sakaiproject.tool.assessment.data.dao.assessment.AttachmentData; import org.sakaiproject.tool.assessment.data.ifc.assessment.AttachmentIfc; +import org.sakaiproject.tool.assessment.facade.AgentFacade; import org.sakaiproject.tool.assessment.services.assessment.AssessmentService; import org.sakaiproject.tool.assessment.ui.listener.util.ContextUtil; import org.sakaiproject.tool.assessment.util.SamigoEmailService; @@ -311,13 +312,13 @@ if ("send".equals(result)) { String msgSent = ContextUtil.getLocalizedString("org.sakaiproject.tool.assessment.bundle.EvaluationMessages","sent_email_confirmation"); FacesContext.getCurrentInstance().addMessage(null,new FacesMessage(msgSent)); - EventTrackingService.post(EventTrackingService.newEvent("sam.email", "Email sent ok: toName=" + toName + ", toEmail=" + toEmailAddress, true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.email", "/sam/" +AgentFacade.getCurrentSiteId() + "Email sent ok: toName=" + toName + ", toEmail=" + toEmailAddress, true)); return "confirmEmailSent"; } else { String msgError = ContextUtil.getLocalizedString("org.sakaiproject.tool.assessment.bundle.EvaluationMessages","sent_email_error"); FacesContext.getCurrentInstance().addMessage(null,new FacesMessage(msgError)); - EventTrackingService.post(EventTrackingService.newEvent("sam.email", "Email sent error: toName=" + toName + ", toEmail=" + toEmailAddress, true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.email", "/sam/" +AgentFacade.getCurrentSiteId() + "Email sent error: toName=" + toName + ", toEmail=" + toEmailAddress, true)); return "emailError"; } } Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/AuthorAssessmentListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/AuthorAssessmentListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/AuthorAssessmentListener.java (working copy) @@ -35,6 +35,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.sakaiproject.event.cover.EventTrackingService; +import org.sakaiproject.tool.assessment.facade.AgentFacade; import org.sakaiproject.tool.assessment.facade.AssessmentFacade; import org.sakaiproject.tool.assessment.facade.AssessmentFacadeQueries; import org.sakaiproject.tool.assessment.facade.AssessmentTemplateFacade; @@ -128,7 +129,7 @@ try{ assessment = createAssessment( assessmentTitle.trim(), description, typeId, templateId); - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.create", "assessmentId=" + assessment.getAssessmentId(), true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.create", "/sam/"+ AgentFacade.getCurrentSiteId()+ "/assessmentId=" + assessment.getAssessmentId() +"/"+ AgentFacade.getCurrentSiteId(), true)); } catch(Exception e){ // can't create assesment because gradebookService is not ready Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmEditPublishedAssessmentListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmEditPublishedAssessmentListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmEditPublishedAssessmentListener.java (working copy) @@ -8,6 +8,7 @@ import org.sakaiproject.tool.assessment.ui.bean.author.AssessmentBean; import org.sakaiproject.tool.assessment.ui.bean.author.AuthorBean; import org.sakaiproject.tool.assessment.ui.listener.util.ContextUtil; +import org.sakaiproject.tool.assessment.facade.AgentFacade; public class ConfirmEditPublishedAssessmentListener implements ActionListener { public void processAction(ActionEvent ae) throws AbortProcessingException { @@ -17,6 +18,6 @@ AssessmentBean assessmentBean = (AssessmentBean) ContextUtil.lookupBean( "assessmentBean"); assessmentBean.setAssessmentId(publishedAssessmentId); - EventTrackingService.post(EventTrackingService.newEvent("sam.pubassessment.confirm_edit", "publishedAssessmentId=" + publishedAssessmentId, true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.pubassessment.confirm_edit", "/sam/" + AgentFacade.getCurrentSiteId() + "/publishedAssessmentId=" + publishedAssessmentId, true)); } } Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmPublishAssessmentListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmPublishAssessmentListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmPublishAssessmentListener.java (working copy) @@ -54,6 +54,7 @@ import org.sakaiproject.tool.assessment.ui.listener.util.ContextUtil; import org.sakaiproject.tool.assessment.util.TextFormat; import org.sakaiproject.util.FormattedText; +import org.sakaiproject.event.cover.EventTrackingService; /** *

Title: Samigo

2 @@ -95,6 +96,7 @@ } assessmentBean.setAssessment(assessment); + EventTrackingService.post(EventTrackingService.newEvent("sam.pubassessment.confirm_edit", "/sam/"+AgentFacade.getCurrentSiteId() + "/assessmentId=" + assessmentId, true)); // Only if the assessment already have question, this page will be excuted assessmentSettings.setHasQuestions(true); Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmRepublishAssessmentListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmRepublishAssessmentListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmRepublishAssessmentListener.java (working copy) @@ -19,6 +19,7 @@ import org.sakaiproject.tool.assessment.ui.bean.author.PublishedAssessmentSettingsBean; import org.sakaiproject.tool.assessment.ui.listener.util.ContextUtil; import org.sakaiproject.util.FormattedText; +import org.sakaiproject.tool.assessment.facade.AgentFacade; public class ConfirmRepublishAssessmentListener implements ActionListener { // To Do: I think this can be combined with SavePublishedSettingsListener. @@ -42,7 +43,7 @@ control.setAssessmentBase(assessment.getData()); } */ - EventTrackingService.post(EventTrackingService.newEvent("sam.pubsetting.edit", "publishedAssessmentId=" + assessmentId, true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.pubsetting.edit", "/sam/" + AgentFacade.getCurrentSiteId() + "/publishedAssessmentId=" + assessmentId, true)); FacesContext context = FacesContext.getCurrentInstance(); //boolean error = savePublishedSettingsListener.setPublishedSettings(assessmentService, assessmentSettings, context, control, assessment, false); /* Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/EditPartListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/EditPartListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/EditPartListener.java (working copy) @@ -32,6 +32,7 @@ import org.sakaiproject.tool.assessment.data.dao.assessment.SectionMetaData; import org.sakaiproject.tool.assessment.data.ifc.assessment.SectionDataIfc; import org.sakaiproject.tool.assessment.data.ifc.assessment.SectionMetaDataIfc; +import org.sakaiproject.tool.assessment.facade.AgentFacade; import org.sakaiproject.tool.assessment.facade.SectionFacade; import org.sakaiproject.tool.assessment.services.ItemService; import org.sakaiproject.tool.assessment.services.PublishedItemService; @@ -86,11 +87,11 @@ AssessmentService assessmentService = null; SectionFacade section = null; if (isEditPendingAssessmentFlow) { - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.revise", "sectionId=" + sectionId, true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.revise", "/sam/" + AgentFacade.getCurrentSiteId() + "/sectionId=" + sectionId, true)); assessmentService = new AssessmentService(); } else { - EventTrackingService.post(EventTrackingService.newEvent("sam.pubassessment.revise", "sectionId=" + sectionId, true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.pubassessment.revise", "/sam/" + AgentFacade.getCurrentSiteId() + "/sectionId=" + sectionId, true)); assessmentService = new PublishedAssessmentService(); } section = assessmentService.getSection(sectionId); Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ItemAddListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ItemAddListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ItemAddListener.java (working copy) @@ -476,11 +476,11 @@ isPendingOrPool = isEditPendingAssessmentFlow || isFromQuestionPool; ItemService delegate; if (isPendingOrPool) { - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.revise", "itemId=" + itemauthor.getItemId(), true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.revise", "/sam/" +AgentFacade.getCurrentSiteId() + "/itemId=" + itemauthor.getItemId(), true)); delegate = new ItemService(); } else { - EventTrackingService.post(EventTrackingService.newEvent("sam.pubassessment.revise", "itemId=" + itemauthor.getItemId(), true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.pubassessment.revise", "/sam/"+AgentFacade.getCurrentSiteId() + "/itemId=" + itemauthor.getItemId(), true)); delegate = new PublishedItemService(); } // update not working yet, delete, then add Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/PublishAssessmentListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/PublishAssessmentListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/PublishAssessmentListener.java (working copy) @@ -176,7 +176,7 @@ assessmentSettings.getTimedHours(), assessmentSettings.getTimedMinutes(), assessmentSettings.getUnlimitedSubmissions(), assessmentSettings.getSubmissionsAllowed(), assessmentSettings.getScoringType(), assessmentSettings.getFeedbackDelivery(), assessmentSettings.getFeedbackDateString()); } - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.publish", "assessmentId=" + assessment.getAssessmentId() + ", publishedAssessmentId=" + pub.getPublishedAssessmentId(), true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.publish", "/sam/"+AgentFacade.getCurrentSiteId() + "/assessmentId=" + assessment.getAssessmentId() + ", publishedAssessmentId=" + pub.getPublishedAssessmentId(), true)); } catch (AssignmentHasIllegalPointsException gbe) { // Right now gradebook can only accept assessements with totalPoints > 0 // this might change later Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/RemovePartListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/RemovePartListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/RemovePartListener.java (working copy) @@ -28,6 +28,7 @@ import javax.faces.event.ActionListener; import org.sakaiproject.event.cover.EventTrackingService; +import org.sakaiproject.tool.assessment.facade.AgentFacade; import org.sakaiproject.tool.assessment.facade.AssessmentFacade; import org.sakaiproject.tool.assessment.services.assessment.AssessmentService; import org.sakaiproject.tool.assessment.ui.bean.author.AssessmentBean; @@ -73,7 +74,7 @@ assessmentService.moveAllItems(sectionId,destSectionId); } assessmentService.removeSection(sectionId); - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.revise", "removed sectionId=" + sectionId, true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.revise", "/sam/" +AgentFacade.getCurrentSiteId() + "/removed sectionId=" + sectionId, true)); // #2 - goto editAssessment.jsp, so reset assessmentBean //log.info("** assessmentId in RemovePartListener ="+assessmentBean.getAssessmentId()); Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/RemovePublishedAssessmentListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/RemovePublishedAssessmentListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/RemovePublishedAssessmentListener.java (working copy) @@ -35,6 +35,7 @@ import org.sakaiproject.event.cover.EventTrackingService; import org.sakaiproject.service.gradebook.shared.GradebookService; import org.sakaiproject.spring.SpringBeanLocator; +import org.sakaiproject.tool.assessment.facade.AgentFacade; import org.sakaiproject.tool.assessment.facade.GradebookFacade; import org.sakaiproject.tool.assessment.facade.PublishedAssessmentFacade; import org.sakaiproject.tool.assessment.integration.context.IntegrationContextFactory; @@ -73,7 +74,7 @@ PublishedAssessmentService assessmentService = new PublishedAssessmentService(); assessmentService.removeAssessment(assessmentId, "remove"); removeFromGradebook(assessmentId); - EventTrackingService.post(EventTrackingService.newEvent("sam.pubAssessment.remove", "publisedAssessmentId=" + assessmentId, true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.pubAssessment.remove", "/sam/" + AgentFacade.getCurrentSiteId() + "/publisedAssessmentId=" + assessmentId, true)); AuthorBean author = (AuthorBean) ContextUtil.lookupBean("author"); Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/RepublishAssessmentListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/RepublishAssessmentListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/RepublishAssessmentListener.java (working copy) @@ -20,6 +20,7 @@ import org.sakaiproject.tool.assessment.data.ifc.assessment.AssessmentBaseIfc; import org.sakaiproject.tool.assessment.data.ifc.assessment.EvaluationModelIfc; import org.sakaiproject.tool.assessment.data.ifc.grading.AssessmentGradingIfc; +import org.sakaiproject.tool.assessment.facade.AgentFacade; import org.sakaiproject.tool.assessment.facade.GradebookFacade; import org.sakaiproject.tool.assessment.facade.PublishedAssessmentFacade; import org.sakaiproject.tool.assessment.integration.context.IntegrationContextFactory; @@ -54,7 +55,7 @@ // Go to database to get the newly updated data. The data inside beans might not be up to date. PublishedAssessmentFacade assessment = publishedAssessmentService.getPublishedAssessment(publishedAssessmentId); - EventTrackingService.post(EventTrackingService.newEvent("sam.pubassessment.republish", "publishedAssessmentId=" + publishedAssessmentId, true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.pubassessment.republish", "/sam/" + AgentFacade.getCurrentSiteId() + "/publishedAssessmentId=" + publishedAssessmentId, true)); assessment.setStatus(AssessmentBaseIfc.ACTIVE_STATUS); publishedAssessmentService.saveAssessment(assessment); @@ -65,7 +66,7 @@ regradeRepublishedAssessment(publishedAssessmentService, assessment); } - EventTrackingService.post(EventTrackingService.newEvent("sam.pubassessment.republish", "publishedAssessmentId=" + publishedAssessmentId, true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.pubassessment.republish", "/sam/" + AgentFacade.getCurrentSiteId() + "/publishedAssessmentId=" + publishedAssessmentId, true)); assessment.setStatus(AssessmentBaseIfc.ACTIVE_STATUS); publishedAssessmentService.saveAssessment(assessment); updateGB(assessment); Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java (working copy) @@ -50,6 +50,7 @@ import org.sakaiproject.tool.assessment.data.ifc.assessment.AssessmentIfc; import org.sakaiproject.tool.assessment.data.ifc.assessment.AssessmentAttachmentIfc; import org.sakaiproject.tool.assessment.data.ifc.assessment.AssessmentMetaDataIfc; +import org.sakaiproject.tool.assessment.facade.AgentFacade; import org.sakaiproject.tool.assessment.facade.AssessmentFacade; import org.sakaiproject.tool.assessment.facade.AuthzQueriesFacadeAPI; import org.sakaiproject.tool.assessment.facade.authz.integrated.AuthzQueriesFacade; @@ -297,7 +298,7 @@ // added by daisyf, 10/10/06 updateAttachment(assessment.getAssessmentAttachmentList(), assessmentSettings.getAttachmentList(),(AssessmentIfc)assessment.getData(), true); - EventTrackingService.post(EventTrackingService.newEvent("sam.setting.edit", "assessmentId=" + assessmentSettings.getAssessmentId(), true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.setting.edit", "/sam/"+AgentFacade.getCurrentSiteId()+ "/assessmentId=" + assessmentSettings.getAssessmentId(), true)); //added by gopalrc, 6 Nov 2007 AuthzQueriesFacadeAPI authz = PersistenceService.getInstance().getAuthzQueriesFacade(); Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePartListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePartListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePartListener.java (working copy) @@ -112,11 +112,11 @@ AssessmentService assessmentService = null; SectionFacade section = null; if (isEditPendingAssessmentFlow) { - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.revise", "sectionId=" + sectionId, true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.revise", "/sam/" + AgentFacade.getCurrentSiteId() + "/sectionId=" + sectionId, true)); assessmentService = new AssessmentService(); } else { - EventTrackingService.post(EventTrackingService.newEvent("sam.pubassessment.revise", "sectionId=" + sectionId, true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.pubassessment.revise", "/sam/" + AgentFacade.getCurrentSiteId() + "/sectionId=" + sectionId, true)); assessmentService = new PublishedAssessmentService(); } @@ -310,7 +310,7 @@ assessmentBean.setAssessment(assessment); assessmentService.updateAssessmentLastModifiedInfo(assessment); - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.revise", "sectionId=" + section.getSectionId(), true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.revise", "/sam/"+AgentFacade.getCurrentSiteId() + "/sectionId=" + section.getSectionId() , true)); } public SectionFacade addPart(String assessmentId){ Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java (working copy) @@ -113,7 +113,7 @@ retractNow = true; } - EventTrackingService.post(EventTrackingService.newEvent("sam.pubsetting.edit", "publishedAssessmentId=" + assessmentId, true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.pubsetting.edit", "/sam/"+AgentFacade.getCurrentSiteId() + "/publishedAssessmentId=" + assessmentId, true)); boolean error = checkPublishedSettings(assessmentService, assessmentSettings, context); if (error){ @@ -157,7 +157,7 @@ assessmentService.saveAssessment(assessment); saveAssessmentSettings.updateAttachment(assessment.getAssessmentAttachmentList(), assessmentSettings.getAttachmentList(),(AssessmentIfc)assessment.getData(), false); - EventTrackingService.post(EventTrackingService.newEvent("sam.pubSetting.edit", "pubAssessmentId=" + assessmentSettings.getAssessmentId(), true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.pubSetting.edit", "/sam/" + AgentFacade.getCurrentSiteId() + "/pubAssessmentId=" + assessmentSettings.getAssessmentId(), true)); AuthorBean author = (AuthorBean) ContextUtil.lookupBean("author"); if ("editAssessment".equals(author.getFromPage())) { Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java (working copy) @@ -149,6 +149,13 @@ log.debug("From Begin Assessment button clicks"); delivery.setPartIndex(0); delivery.setQuestionIndex(0); + if (action == 1 || action == 5) { + boolean eventlogged = delivery.getBeginAssessmentLogged(); + if (!eventlogged){ + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.take", "/sam/" +AgentFacade.getCurrentSiteId() + "/publishedAssessmentId=" + delivery.getAssessmentId(), true)); + delivery.setBeginAssessmentLogged(true); + } + } } // If it comes from Begin Assessment button clicks, reset isNoQuestion to false Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/QuestionScoreUpdateListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/QuestionScoreUpdateListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/QuestionScoreUpdateListener.java (working copy) @@ -177,7 +177,7 @@ if (newAutoScore != oldAutoScore || !newComments.equals(oldComments)){ data.setGradedBy(AgentFacade.getAgentString()); data.setGradedDate(new Date()); - EventTrackingService.post(EventTrackingService.newEvent("sam.question.score.update", logString.toString(), true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.question.score.update", "/sam/"+AgentFacade.getCurrentSiteId() +"/" + logString.toString(), true)); delegate.updateItemScore(data, newAutoScore-oldAutoScore, tbean.getPublishedAssessment()); } @@ -222,7 +222,7 @@ if (attachmentList.size() > 0) { gradingService.saveOrUpdateAttachments(attachmentList); EventTrackingService.post(EventTrackingService.newEvent("sam.student.score.update", - "Adding " + attachmentList.size() + " attachments for itemGradingData id = " + itemGradingData.getItemGradingId(), + "/sam/" + AgentFacade.getCurrentSiteId() + "/Adding " + attachmentList.size() + " attachments for itemGradingData id = " + itemGradingData.getItemGradingId(), true)); } @@ -233,7 +233,7 @@ Long attachmentId = (Long)iter.next(); gradingService.removeItemGradingAttachment(attachmentId.toString()); EventTrackingService.post(EventTrackingService.newEvent("sam.student.score.update", - "Removing attachmentId = " + attachmentId, true)); + "/sam/" + AgentFacade.getCurrentSiteId() + "/Removing attachmentId = " + attachmentId, true)); } bean.setIsAnyItemGradingAttachmentListModified(true); } Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/StudentScoreUpdateListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/StudentScoreUpdateListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/StudentScoreUpdateListener.java (working copy) @@ -196,7 +196,7 @@ updateFlag = true; data.setGradedBy(AgentFacade.getAgentString()); data.setGradedDate(new Date()); - EventTrackingService.post(EventTrackingService.newEvent("sam.student.score.update", logString.toString(), true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.student.score.update", "/sam/" +AgentFacade.getCurrentSiteId() + "/" + logString.toString(), true)); log.debug("****4 itemGradingId="+data.getItemGradingId()); log.debug("****5 set points = " + data.getAutoScore() + ", comments to " + data.getComments()); } @@ -309,7 +309,7 @@ if (attachmentList.size() > 0) { gradingService.saveOrUpdateAttachments(attachmentList); EventTrackingService.post(EventTrackingService.newEvent("sam.student.score.update", - "Adding " + attachmentList.size() + " attachments for itemGradingData id = " + itemGradingData.getItemGradingId(), + "/sam/" + AgentFacade.getCurrentSiteId() + "/Adding " + attachmentList.size() + " attachments for itemGradingData id = " + itemGradingData.getItemGradingId(), true)); } @@ -320,7 +320,7 @@ Long attachmentId = (Long)iter4.next(); gradingService.removeItemGradingAttachment(attachmentId.toString()); EventTrackingService.post(EventTrackingService.newEvent("sam.student.score.update", - "Removing attachmentId = " + attachmentId, true)); + "/sam/" + AgentFacade.getCurrentSiteId() + "/Removing attachmentId = " + attachmentId, true)); } } } Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/samlite/AssessmentListener.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/samlite/AssessmentListener.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/samlite/AssessmentListener.java (working copy) @@ -6,6 +6,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.sakaiproject.event.cover.EventTrackingService; +import org.sakaiproject.tool.assessment.facade.AgentFacade; import org.sakaiproject.tool.assessment.facade.AssessmentFacade; import org.sakaiproject.tool.assessment.qti.constants.QTIVersion; import org.sakaiproject.tool.assessment.services.qti.QTIService; @@ -37,7 +38,7 @@ samLiteBean.createAssessment(assessment); samLiteBean.setData(""); - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.create", "assessmentId=" + assessment.getAssessmentId(), true)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.create", "/sam/" + AgentFacade.getCurrentSiteId() + "/assessmentId=" + assessment.getAssessmentId(), true)); } public AssessmentFacade createImportedAssessment(Document document, int qti, String templateId) { Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/queue/delivery/SubmitTimedAssessmentThread.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/queue/delivery/SubmitTimedAssessmentThread.java (revision 91769) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/queue/delivery/SubmitTimedAssessmentThread.java (working copy) @@ -105,7 +105,7 @@ service.saveOrUpdateAssessmentGrading(ag); PublishedAssessmentService publishedAssessmentService = new PublishedAssessmentService(); String siteId = publishedAssessmentService.getPublishedAssessmentOwner(ag.getPublishedAssessmentId()); - EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.thread_submit", "submissionId=" + ag.getAssessmentGradingId(), siteId, true, NotificationService.NOTI_REQUIRED)); + EventTrackingService.post(EventTrackingService.newEvent("sam.assessment.thread_submit", "/sam/" + AgentFacade.getCurrentSiteId() + "/submissionId=" + ag.getAssessmentGradingId(), siteId, true, NotificationService.NOTI_REQUIRED)); notifyGradebookByScoringType(ag, timedAG.getPublishedAssessment()); log.debug("**** 4a. time's up, timeLeft+latency buffer reached, saved to DB"); } Index: samigo-services/src/java/org/sakaiproject/tool/assessment/services/GradingService.java =================================================================== --- samigo-services/src/java/org/sakaiproject/tool/assessment/services/GradingService.java (revision 91769) +++ samigo-services/src/java/org/sakaiproject/tool/assessment/services/GradingService.java (working copy) @@ -212,12 +212,12 @@ AssessmentGradingData ag = (AssessmentGradingData)gdataList.get(i); saveOrUpdateAssessmentGrading(ag); EventTrackingService.post(EventTrackingService.newEvent("sam.total.score.update", - "gradedBy=" + AgentFacade.getAgentString() + + "/sam/" + AgentFacade.getCurrentSiteId() + "gradedBy=" + AgentFacade.getAgentString() + ", assessmentGradingId=" + ag.getAssessmentGradingId() + ", totalAutoScore=" + ag.getTotalAutoScore() + ", totalOverrideScore=" + ag.getTotalOverrideScore() + ", FinalScore=" + ag.getFinalScore() + - ", comments=" + ag.getComments() , true)); + ", comments=" + ag.getComments() + "/" + AgentFacade.getCurrentSiteId(), true)); } // no need to notify gradebook if this submission is not for grade