diff --git a/amp/WEB-INF/fn.tld b/amp/WEB-INF/fn.tld index 12d4ca8e812..c57e31255be 100644 --- a/amp/WEB-INF/fn.tld +++ b/amp/WEB-INF/fn.tld @@ -204,4 +204,13 @@ + + + Returns the correct url for specific report. It can point to legacy or nireports. + + getReportUrl + org.digijava.kernel.ampapi.endpoints.reports.ReportsUtil + java.lang.String getUrl(org.digijava.module.aim.dbentity.AmpReports) + + diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/reports/ReportsUtil.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/reports/ReportsUtil.java index f4f4ae5312a..b7ee48ae851 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/reports/ReportsUtil.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/reports/ReportsUtil.java @@ -848,4 +848,14 @@ public static AmountsUnits getAmountsUnitsOrDefault(ReportSpecification spec) { return spec.getSettings().getUnitsOption(); return AmountsUnits.getDefaultValue(); } + + public static String getUrl(AmpReports report) { + String prefix; + if (report.getType() != null && report.getType().equals((long) ArConstants.REGIONAL_TYPE)){ + prefix = "/aim/viewNewAdvancedReport.do~view=reset&widget=false&resetSettings=true~ampReportId="; + } else { + prefix = "/TEMPLATE/ampTemplate/saikuui_nireports/index_reports.html#report/open/"; + } + return prefix + report.getAmpReportId(); + } } \ No newline at end of file diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/reportwizard/ReportWizardAction.java b/amp/WEB-INF/src/org/digijava/module/aim/action/reportwizard/ReportWizardAction.java index 11bd6961168..f26b65fab89 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/action/reportwizard/ReportWizardAction.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/action/reportwizard/ReportWizardAction.java @@ -664,17 +664,18 @@ protected ActionForward serializeReportAndOpen(AmpReports ampReport, TeamMember MultilingualInputFieldValues.serialize(ampReport, "name", null, null, request); if ((request.getParameter("openReport") != null) && request.getParameter("openReport").equals("true")) { - callSaikuReport (ampReport.getAmpReportId().intValue(), response,"openReportId", ampReport.hasAvailableMeasures()); + boolean saiku = ampReport.hasAvailableMeasures() && ampReport.getType().intValue() != ArConstants.REGIONAL_TYPE; + callSaikuReport (ampReport.getAmpReportId().intValue(), response,"openReportId", saiku); } return null; } - private void callSaikuReport(Integer reportId, HttpServletResponse response, String varName, boolean hasAvailableMeasures ) throws IOException { + private void callSaikuReport(Integer reportId, HttpServletResponse response, String varName, boolean saiku) throws IOException { PrintWriter out = response.getWriter(); StringBuilder responseString = new StringBuilder(); responseString.append(varName + "=" + reportId); responseString.append(","); - responseString.append("saiku=" + hasAvailableMeasures ); + responseString.append("saiku=" + saiku); out.write(responseString.toString()); out.flush(); diff --git a/amp/repository/aim/view/myReports.jsp b/amp/repository/aim/view/myReports.jsp index 57069d10a76..11dc9dca806 100644 --- a/amp/repository/aim/view/myReports.jsp +++ b/amp/repository/aim/view/myReports.jsp @@ -66,7 +66,7 @@ function popup(mylink, windowname)
  • - + ... diff --git a/amp/repository/aim/view/reportWizard/toolbar.jsp b/amp/repository/aim/view/reportWizard/toolbar.jsp index eb0f16d44f2..a4efd5d480a 100644 --- a/amp/repository/aim/view/reportWizard/toolbar.jsp +++ b/amp/repository/aim/view/reportWizard/toolbar.jsp @@ -34,6 +34,9 @@ + @@ -42,6 +45,9 @@ + diff --git a/amp/repository/aim/view/scripts/reportWizard/reportManager.js b/amp/repository/aim/view/scripts/reportWizard/reportManager.js index c7b794d2a09..86dcdbdd283 100644 --- a/amp/repository/aim/view/scripts/reportWizard/reportManager.js +++ b/amp/repository/aim/view/scripts/reportWizard/reportManager.js @@ -361,8 +361,9 @@ NormalReportManager.prototype.callbackRepTypeCall = { NormalReportManager.prototype.checkReportDetails = function () { this.enableTab(1); - return true; - + // regional reports are not supported by nireports yet + // we either have to be logged in or choose a report different from regional + return currentMemberInSession || getReportType() != "regional"; }; NormalReportManager.prototype.checkMeasures = function () { diff --git a/amp/repository/aim/view/showTeamReports.jsp b/amp/repository/aim/view/showTeamReports.jsp index 1b3d7239c09..22141687adb 100644 --- a/amp/repository/aim/view/showTeamReports.jsp +++ b/amp/repository/aim/view/showTeamReports.jsp @@ -17,6 +17,7 @@ <%@ taglib uri="/taglib/category" prefix="category" %> <%@ page language="java" import="org.digijava.module.aim.helper.TeamMember" %> +<%@ page import="org.dgfoundation.amp.ar.ArConstants" %> @@ -465,6 +466,7 @@ $(document).ready(function() { type="org.digijava.module.aim.dbentity.AmpReports"> , '#a5bcf2', '#FFFF00');" onmouseover="setPointer(this, <%=idx.intValue()%>, 'over', <%=(idx.intValue()%2==1?"\'#dbe5f1\'":"\'#ffffff\'")%>, '#a5bcf2', '#FFFF00');" > + <%if(idx.intValue()%2==1) color = "#dbe5f1"; %> <%if(idx.intValue()%2!=1) color = "#ffffff"; %> @@ -477,11 +479,6 @@ $(document).ready(function() { - -

    @@ -646,7 +643,7 @@ $(document).ready(function() { - diff --git a/amp/repository/aim/view/showTeamReportsPublic.jsp b/amp/repository/aim/view/showTeamReportsPublic.jsp index 8d0dcbfaafe..fb632adf54d 100644 --- a/amp/repository/aim/view/showTeamReportsPublic.jsp +++ b/amp/repository/aim/view/showTeamReportsPublic.jsp @@ -340,14 +340,11 @@ function submitForm(action){ Click here to view the Report +

    - <%-- --%> - - - - diff --git a/amp/repository/search/view/search.jsp b/amp/repository/search/view/search.jsp index 014be029c9f..c165331a369 100644 --- a/amp/repository/search/view/search.jsp +++ b/amp/repository/search/view/search.jsp @@ -260,7 +260,7 @@
  • + href="${fn:getReportUrl(report)}"> ${report.objectFilteredName}