Skip to content

Commit

Permalink
Merge branch 'release-5.7.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
@hirokiterashima
hirokiterashima committed May 25, 2018
2 parents 6c23da0 + ef7c48e commit 0554457
Show file tree
Hide file tree
Showing 143 changed files with 4,301 additions and 7,255 deletions.
1 change: 0 additions & 1 deletion .idea/compiler.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wise",
"version": "5.7.5",
"version": "5.7.6",
"description": "Web-based Inquiry Science Environment",
"main": "app.js",
"dependencies": {
Expand Down
4 changes: 1 addition & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<artifactId>wise</artifactId>
<packaging>war</packaging>
<name>Web-based Inquiry Science Environment</name>
<version>5.7.5</version>
<version>5.7.6</version>
<url>http://wise5.org</url>

<licenses>
Expand Down Expand Up @@ -124,7 +124,6 @@
<testExcludes>
<exclude>**/org/wise/portal/service/**/*.java</exclude>
<exclude>**/org/wise/portal/domain/**/*.java</exclude>
<exclude>**/org/wise/portal/presentation/web/controllers/admin/*.java</exclude>
<exclude>**/org/wise/portal/presentation/web/controllers/general/contactwise/*.java</exclude>
<exclude>**/org/wise/portal/presentation/web/controllers/teacher/**/*.java</exclude>
<exclude>**/org/wise/portal/presentation/web/controllers/*.java</exclude>
Expand All @@ -148,7 +147,6 @@
<excludes>
<exclude>**/org/wise/portal/service/**/*.java</exclude>
<exclude>**/org/wise/portal/domain/**/*.java</exclude>
<exclude>**/org/wise/portal/presentation/web/controllers/admin/*.java</exclude>
<exclude>**/org/wise/portal/presentation/web/controllers/general/contactwise/*.java</exclude>
<exclude>**/org/wise/portal/presentation/web/controllers/teacher/**/*.java</exclude>
<exclude>**/org/wise/portal/presentation/web/controllers/*.java</exclude>
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/wise/portal/domain/admin/DailyAdminJob.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ public void doJob() {
try {
JSONObject wiseStatisticsJSONObject = new JSONObject();
wiseStatisticsJSONObject.put("wiseName", wiseProperties.getProperty("wise.name"));
wiseStatisticsJSONObject.put("wiseBaseURL", wiseProperties.getProperty("wiseBaseURL"));

PortalStatistics latestPortalStatistics = portalStatisticsService.getLatestPortalStatistics();
wiseStatisticsJSONObject.put("portal", latestPortalStatistics.getJSONObject());
Expand Down Expand Up @@ -680,7 +679,6 @@ public void postStatistics(String wiseStatisticsString) {

List<NameValuePair> urlParameters = new ArrayList<NameValuePair>();
urlParameters.add(new BasicNameValuePair("name", wiseProperties.getProperty("wise.name")));
urlParameters.add(new BasicNameValuePair("wiseBaseURL", wiseProperties.getProperty("wiseBaseURL")));
urlParameters.add(new BasicNameValuePair("stats", wiseStatisticsString));

try {
Expand Down
115 changes: 56 additions & 59 deletions src/main/java/org/wise/portal/presentation/web/controllers/InformationController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,13 @@ public void handleGetConfigWISE4(HttpServletRequest request, HttpServletResponse
throws ObjectNotFoundException, IOException {
User signedInUser = ControllerUtil.getSignedInUser();
String mode = request.getParameter("mode");

String wiseBaseURL = wiseProperties.getProperty("wiseBaseURL");
String contextPath = request.getContextPath();
JSONObject config = new JSONObject();
String projectIdString = request.getParameter("projectId");
// if projectId provided, this is a request for preview
if (projectIdString != null) {
Project project = projectService.getById(Long.parseLong(projectIdString));
addPreviewConfigParametersWISE4(request, signedInUser, mode, wiseBaseURL, config, project);
addPreviewConfigParametersWISE4(request, signedInUser, mode, contextPath, config, project);
printConfigToResponse(response, config);
return;
}
Expand All @@ -155,7 +154,7 @@ public void handleGetConfigWISE4(HttpServletRequest request, HttpServletResponse
if (workgroup == null && signedInUser == null && !signedInUser.isAdmin()) {
return;
}
addRunConfigParametersWISE4(request, signedInUser, mode, wiseBaseURL, config, runId, run, workgroup);
addRunConfigParametersWISE4(request, signedInUser, mode, contextPath, config, runId, run, workgroup);
printConfigToResponse(response, config);
return;
}
Expand Down Expand Up @@ -219,18 +218,19 @@ public void handleGetConfigWISE5ClassroomMonitor(HttpServletRequest request,
getRunConfigParameters(request, config, run);

User signedInUser = ControllerUtil.getSignedInUser();
String wiseBaseURL = wiseProperties.getProperty("wiseBaseURL");
String contextPath = request.getContextPath();

if (hasRunReadAccess(signedInUser, run)) {
config.put("runCode", run.getRuncode());
config.put("teacherDataURL", wiseBaseURL + "/teacher/data");
config.put("runDataExportURL", wiseBaseURL + "/teacher/export");
config.put("studentNotebookURL", wiseBaseURL + "/teacher/notebook/" + runId);
config.put("teacherDataURL", contextPath + "/teacher/data");
config.put("runDataExportURL", contextPath + "/teacher/export");
config.put("studentNotebookURL", contextPath + "/teacher/notebook/" + runId);
}

Project project = run.getProject();
if (hasRunWriteAccess(signedInUser, run)) {
String projectId = project.getId().toString();
String saveProjectURL = wiseBaseURL + "/project/save/" + projectId;
String saveProjectURL = contextPath + "/project/save/" + projectId;
config.put("saveProjectURL", saveProjectURL);
}

Expand Down Expand Up @@ -444,7 +444,7 @@ private JSONArray getPeriodsJSONArray(Run run) {

private void addPreviewConfigParametersWISE4(
HttpServletRequest request, User signedInUser, String mode,
String wiseBaseURL, JSONObject config, Project project) {
String contextPath, JSONObject config, Project project) {
try {
config.put("runId", "");
config.put("runName", "");
Expand All @@ -462,11 +462,11 @@ private void addPreviewConfigParametersWISE4(
} catch (JSONException e) {
e.printStackTrace();
}
addCommonConfigParametersWISE4(request, signedInUser, mode, wiseBaseURL, config, project);
addCommonConfigParametersWISE4(request, signedInUser, mode, contextPath, config, project);
}

private void addRunConfigParametersWISE4(HttpServletRequest request, User signedInUser,
String mode, String wiseBaseURL, JSONObject config, String runId, Run run, Workgroup workgroup) {
String mode, String contextPath, JSONObject config, String runId, Run run, Workgroup workgroup) {
Long workgroupId = null;
Long periodId = null;
if (workgroup != null && workgroup.isStudentWorkgroup()) {
Expand All @@ -482,47 +482,46 @@ private void addRunConfigParametersWISE4(HttpServletRequest request, User signed
config.put("runId", Long.parseLong(runId));
config.put("runName", run.getName());
config.put("isRunActive", !run.isEnded());
config.put("flagsURL", wiseBaseURL + "/annotation?type=flag&runId=" + runId);
config.put("inappropriateFlagsURL", wiseBaseURL + "/annotation?type=inappropriateFlag&runId=" + runId);
config.put("annotationsURL", wiseBaseURL + "/annotation?type=annotation&runId=" + runId);
config.put("studentDataURL", wiseBaseURL + "/studentData.html");
config.put("flagsURL", contextPath + "/annotation?type=flag&runId=" + runId);
config.put("inappropriateFlagsURL", contextPath + "/annotation?type=inappropriateFlag&runId=" + runId);
config.put("annotationsURL", contextPath + "/annotation?type=annotation&runId=" + runId);
config.put("studentDataURL", contextPath + "/studentData.html");
config.put("gradingType", request.getParameter("gradingType"));
config.put("getRevisions", request.getParameter("getRevisions"));
config.put("peerReviewURL", wiseBaseURL + "/peerReview.html?type=peerreview");
config.put("ideaBasketURL", getIdeaBasketURL(runId, wiseBaseURL, run, periodId, workgroupId));
config.put("portfolioURL", getPortfolioURL(runId, wiseBaseURL, periodId, workgroupId));
config.put("studentAssetManagerURL", wiseBaseURL + "/assetManager?type=studentAssetManager&runId=" + runId);
config.put("peerReviewURL", contextPath + "/peerReview.html?type=peerreview");
config.put("ideaBasketURL", getIdeaBasketURL(runId, contextPath, run, periodId, workgroupId));
config.put("portfolioURL", getPortfolioURL(runId, contextPath, periodId, workgroupId));
config.put("studentAssetManagerURL", contextPath + "/assetManager?type=studentAssetManager&runId=" + runId);
config.put("runInfo", run.getInfo());
config.put("isRealTimeEnabled", true); // TODO: make this run-specific setting
config.put("webSocketURL", getWebSocketURL(request, wiseBaseURL));
config.put("studentStatusURL", wiseBaseURL + "/studentStatus");
config.put("runStatusURL", wiseBaseURL + "/runStatus");
config.put("webSocketURL", getWebSocketURL(request, contextPath));
config.put("studentStatusURL", contextPath + "/studentStatus");
config.put("runStatusURL", contextPath + "/runStatus");
config.put("postLevel", run.getPostLevel());
config.put("userInfoURL", wiseBaseURL + "/userInfo?runId=" + runId);
config.put("userInfoURL", contextPath + "/userInfo?runId=" + runId);

if ("grading".equals(mode)) {
config.put("premadeCommentsURL", wiseBaseURL + "/teacher/grading/premadeComments.html");
config.put("getXLSExportURL", wiseBaseURL + "/export?type=xlsexport&runId=" + runId);
config.put("getSpecialExportURL", wiseBaseURL + "/specialExport?type=specialExport&runId=" + runId);
config.put("getStudentListURL", wiseBaseURL + "/teacher/management/studentListExport?runId=" + runId);
config.put("premadeCommentsURL", contextPath + "/teacher/grading/premadeComments.html");
config.put("getXLSExportURL", contextPath + "/export?type=xlsexport&runId=" + runId);
config.put("getSpecialExportURL", contextPath + "/specialExport?type=specialExport&runId=" + runId);
config.put("getStudentListURL", contextPath + "/teacher/management/studentListExport?runId=" + runId);
}
} catch (JSONException e) {
e.printStackTrace();
}
Project project = run.getProject();
addCommonConfigParametersWISE4(request, signedInUser, mode, wiseBaseURL, config, project);
addCommonConfigParametersWISE4(request, signedInUser, mode, contextPath, config, project);
}

private void addCommonConfigParametersWISE4(
HttpServletRequest request, User signedInUser, String mode,
String wiseBaseURL, JSONObject config, Project project) {
String contextPath, JSONObject config, Project project) {
assert project != null;
try {
config.put("wiseBaseURL", wiseBaseURL);
String contextPath = request.getContextPath();
config.put("wiseBaseURL", contextPath);
config.put("contextPath", contextPath);
config.put("mode", mode);
config.put("projectMetadataURL", wiseBaseURL + "/metadata.html");
config.put("projectMetadataURL", contextPath + "/metadata.html");
String curriculumBaseWWW = wiseProperties.getProperty("curriculum_base_www");
String rawProjectUrl = project.getModulePath();
String projectURL = curriculumBaseWWW + rawProjectUrl;
Expand All @@ -532,9 +531,9 @@ private void addCommonConfigParametersWISE4(
addProjectBaseURL(config, projectURL);
config.put("studentUploadsBaseURL", wiseProperties.getProperty("studentuploads_base_www"));
config.put("theme", "WISE");
config.put("cRaterRequestURL", wiseBaseURL + "/cRater");
config.put("cRaterRequestURL", contextPath + "/cRater");
config.put("mainHomePageURL", contextPath);
config.put("renewSessionURL", wiseBaseURL + "/session/renew");
config.put("renewSessionURL", contextPath + "/session/renew");
config.put("sessionLogOutURL", contextPath + "/logout");
addStep(request, config);
setUserLocale(request, signedInUser, config);
Expand All @@ -555,8 +554,8 @@ private void addStep(HttpServletRequest request, JSONObject config) throws JSONE
}
}

private String getPortfolioURL(String runId, String wiseBaseURL, Long periodId, Long workgroupId) {
String portfolioURL = wiseBaseURL + "/portfolio?runId=" + runId;
private String getPortfolioURL(String runId, String contextPath, Long periodId, Long workgroupId) {
String portfolioURL = contextPath + "/portfolio?runId=" + runId;
if (periodId != null) {
portfolioURL += "&periodId=" + periodId;
}
Expand All @@ -566,8 +565,8 @@ private String getPortfolioURL(String runId, String wiseBaseURL, Long periodId,
return portfolioURL;
}

private String getIdeaBasketURL(String runId, String wiseBaseURL, Run run, Long periodId, Long workgroupId) {
String ideaBasketURL = wiseBaseURL + "/ideaBasket?runId=" + runId + "&projectId=" + run.getProject().getId().toString();
private String getIdeaBasketURL(String runId, String contextPath, Run run, Long periodId, Long workgroupId) {
String ideaBasketURL = contextPath + "/ideaBasket?runId=" + runId + "&projectId=" + run.getProject().getId().toString();
if (periodId != null) {
ideaBasketURL += "&periodId=" + periodId;
}
Expand All @@ -585,11 +584,11 @@ private String getIdeaBasketURL(String runId, String wiseBaseURL, Run run, Long
* e.g.
* ws://localhost:8080/wise
*/
private String getWebSocketURL(HttpServletRequest request, String wiseBaseURL) {
private String getWebSocketURL(HttpServletRequest request, String contextPath) {
String webSocketBaseURL = wiseProperties.getProperty("webSocketBaseUrl");
if (webSocketBaseURL == null) {
if (wiseBaseURL.contains("http")) {
webSocketBaseURL = wiseBaseURL.replace("http", "ws");
if (contextPath.contains("http")) {
webSocketBaseURL = contextPath.replace("http", "ws");
} else {
String portalContextPath = ControllerUtil.getPortalUrlString(request);
webSocketBaseURL = portalContextPath.replace("http", "ws");
Expand Down Expand Up @@ -664,26 +663,26 @@ private void setUserLocale(HttpServletRequest request, User signedInUser, JSONOb

private void getRunConfigParameters(HttpServletRequest request, JSONObject config, Run run)
throws JSONException, ObjectNotFoundException {
String wiseBaseURL = wiseProperties.getProperty("wiseBaseURL");
String contextPath = request.getContextPath();
Long runId = run.getId();
String annotationsURL = wiseBaseURL + "/annotation?type=annotation&runId=" + runId;
String studentStatusURL = wiseBaseURL + "/studentStatus";
String runStatusURL = wiseBaseURL + "/runStatus";
String annotationsURL = contextPath + "/annotation?type=annotation&runId=" + runId;
String studentStatusURL = contextPath + "/studentStatus";
String runStatusURL = contextPath + "/runStatus";

config.put("runName", run.getName());
config.put("runId", runId);
config.put("annotationsURL", annotationsURL);
config.put("runInfo", run.getInfo());
config.put("isRealTimeEnabled", run.isRealTimeEnabled());
config.put("webSocketURL", getWebSocketURL(request, wiseBaseURL));
config.put("webSocketURL", getWebSocketURL(request, contextPath));
config.put("studentStatusURL", studentStatusURL);
config.put("runStatusURL", runStatusURL);
config.put("userInfo", getUserInfo(run));
config.put("studentDataURL", wiseBaseURL + "/student/data"); // the url to get/post student data
config.put("studentAssetsURL", wiseBaseURL + "/student/asset/" + runId);
config.put("studentNotebookURL", wiseBaseURL + "/student/notebook/" + runId);
config.put("achievementURL", wiseBaseURL + "/achievement/" + runId);
config.put("notificationURL", wiseBaseURL + "/notification/" + runId);
config.put("studentDataURL", contextPath + "/student/data"); // the url to get/post student data
config.put("studentAssetsURL", contextPath + "/student/asset/" + runId);
config.put("studentNotebookURL", contextPath + "/student/notebook/" + runId);
config.put("achievementURL", contextPath + "/achievement/" + runId);
config.put("notificationURL", contextPath + "/notification/" + runId);
String openCPUURL = wiseProperties.getProperty("openCPUURL");
if (openCPUURL != null) {
config.put("openCPUURL", openCPUURL);
Expand Down Expand Up @@ -729,21 +728,19 @@ private void addCommonConfigParameters(
String curriculumBaseWWW = wiseProperties.getProperty("curriculum_base_www");
String projectURL = curriculumBaseWWW + rawProjectUrl;

String wiseBaseURL = wiseProperties.getProperty("wiseBaseURL");
config.put("wiseBaseURL", wiseBaseURL);
String contextPath = request.getContextPath();
config.put("wiseBaseURL", contextPath);
config.put("projectId", project.getId());
config.put("parentProjectId", project.getParentProjectId());
config.put("previewProjectURL", wiseBaseURL + "/project/" + project.getId());
config.put("previewProjectURL", contextPath + "/project/" + project.getId());
config.put("theme", "WISE");
config.put("projectURL", projectURL);
addProjectBaseURL(config, projectURL);
config.put("studentUploadsBaseURL", wiseProperties.getProperty("studentuploads_base_www"));
config.put("cRaterRequestURL", wiseBaseURL + "/cRater");

String contextPath = request.getContextPath(); //get the context path e.g. /wise
config.put("cRaterRequestURL", contextPath + "/cRater");
config.put("contextPath", contextPath);
config.put("mainHomePageURL", contextPath);
config.put("renewSessionURL", wiseBaseURL + "/session/renew");
config.put("renewSessionURL", contextPath + "/session/renew");
config.put("sessionLogOutURL", contextPath + "/logout");

User signedInUser = ControllerUtil.getSignedInUser();
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/org/wise/portal/presentation/web/controllers/StatisticsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,6 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
return null;
} else {
ModelAndView modelAndView = new ModelAndView();

//add the wise base url to the model so the jsp can access it
modelAndView.addObject("wiseBaseURL", wiseProperties.getProperty("wiseBaseURL"));

return modelAndView;
}
}
Expand Down
Loading

0 comments on commit 0554457

Please sign in to comment.