Skip to content

Commit

Permalink
SAK-44383 samigo > provide return link on DD UI for URL delivered qui…
Browse files Browse the repository at this point in the history
  • Loading branch information
bjones86 authored Sep 30, 2020
1 parent 6b79e98 commit 3ba3846
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -411,18 +411,8 @@ public void setAssessment(PublishedAssessmentFacade assessment) {
setIpAddresses(assessment);

// publishedUrl
FacesContext context = FacesContext.getCurrentInstance();
ExternalContext extContext = context.getExternalContext();
// get the alias to the pub assessment
this.alias = assessment.getAssessmentMetaDataByLabel(
AssessmentMetaDataIfc.ALIAS);
String server = ( (javax.servlet.http.HttpServletRequest) extContext.
getRequest()).getRequestURL().toString();
int index = server.indexOf(extContext.getRequestContextPath() + "/"); // "/samigo-app/"
server = server.substring(0, index);
String url = server + extContext.getRequestContextPath();
this.publishedUrl = url + "/servlet/Login?id=" + this.alias;

this.publishedUrl = generatePublishedURL(assessment);

// secure delivery
SecureDeliveryServiceAPI secureDeliveryService = SamigoApiFactory.getInstance().getSecureDeliveryServiceAPI();
this.secureDeliveryAvailable = secureDeliveryService.isSecureDeliveryAvaliable();
Expand Down Expand Up @@ -1889,4 +1879,17 @@ public String getCategorySelected() {
public void setCategorySelected(String categorySelected) {
this.categorySelected = categorySelected;
}

public String generatePublishedURL(PublishedAssessmentFacade paf) {
FacesContext context = FacesContext.getCurrentInstance();
ExternalContext extContext = context.getExternalContext();

// get the alias to the pub assessment
this.alias = paf.getAssessmentMetaDataByLabel(AssessmentMetaDataIfc.ALIAS);
String server = ((javax.servlet.http.HttpServletRequest) extContext.getRequest()).getRequestURL().toString();
int index = server.indexOf(extContext.getRequestContextPath() + "/"); // "/samigo-app/"
server = server.substring(0, index);
String url = server + extContext.getRequestContextPath();
return url + "/servlet/Login?id=" + this.alias;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2552,4 +2552,9 @@ public void calculateMinutesAndSecondsLeft() {
public String getCDNQuery() {
return PortalUtils.getCDNQuery();
}

public String getPublishedURL() {
PublishedAssessmentSettingsBean pasBean = (PublishedAssessmentSettingsBean) ContextUtil.lookupBean("publishedSettings");
return pasBean.generatePublishedURL(publishedAssessment);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@

<h:form id="discrepancyInData">
<p class="act">
<h:commandButton value="#{deliveryMessages.button_return}" type="submit"
styleClass="active" action="select" rendered="#{delivery.actionString=='takeAssessment'}">
<f:actionListener
type="org.sakaiproject.tool.assessment.ui.listener.select.SelectActionListener" />
<h:commandButton value="#{deliveryMessages.button_return}" type="submit" styleClass="active" action="select" rendered="#{delivery.actionString=='takeAssessment'}">
<f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.select.SelectActionListener" />
</h:commandButton>
<h:outputLink rendered="#{delivery.actionString == 'takeAssessmentViaUrl'}" value="#{delivery.getPublishedURL()}">
<h:outputText value="#{deliveryMessages.button_return}" />
</h:outputLink>
</p>
</h:form>
<!-- end content -->
Expand Down

0 comments on commit 3ba3846

Please sign in to comment.