diff --git a/app/WebContent/WEB-INF/reports/ActivityReport.jasper b/app/WebContent/WEB-INF/reports/ActivityReport.jasper index 01667cfa..0b0d4bf3 100644 Binary files a/app/WebContent/WEB-INF/reports/ActivityReport.jasper and b/app/WebContent/WEB-INF/reports/ActivityReport.jasper differ diff --git a/app/WebContent/WEB-INF/reports/ActivityReport.jrxml b/app/WebContent/WEB-INF/reports/ActivityReport.jrxml index 38c8e930..4d61c148 100644 --- a/app/WebContent/WEB-INF/reports/ActivityReport.jrxml +++ b/app/WebContent/WEB-INF/reports/ActivityReport.jrxml @@ -18,8 +18,11 @@ - - + + + + + @@ -113,7 +116,7 @@ - + @@ -139,7 +142,7 @@ - + @@ -159,7 +162,7 @@ - + @@ -172,19 +175,19 @@ - + - + - + - + @@ -205,19 +208,21 @@ - + + + - + - + @@ -235,10 +240,10 @@ - + - + @@ -247,14 +252,14 @@ - + - + @@ -273,7 +278,7 @@ - + @@ -283,20 +288,22 @@ - + + + - + - + @@ -309,7 +316,7 @@ - + diff --git a/app/WebContent/WEB-INF/reports/PatientReportHaitiNoAlerts.jasper b/app/WebContent/WEB-INF/reports/PatientReportHaiti.jasper similarity index 66% rename from app/WebContent/WEB-INF/reports/PatientReportHaitiNoAlerts.jasper rename to app/WebContent/WEB-INF/reports/PatientReportHaiti.jasper index 6d1cb5f9..9177a241 100644 Binary files a/app/WebContent/WEB-INF/reports/PatientReportHaitiNoAlerts.jasper and b/app/WebContent/WEB-INF/reports/PatientReportHaiti.jasper differ diff --git a/app/WebContent/WEB-INF/reports/PatientReportHaitiNoAlerts.jrxml b/app/WebContent/WEB-INF/reports/PatientReportHaiti.jrxml similarity index 97% rename from app/WebContent/WEB-INF/reports/PatientReportHaitiNoAlerts.jrxml rename to app/WebContent/WEB-INF/reports/PatientReportHaiti.jrxml index d4fdfc27..cd510e44 100644 --- a/app/WebContent/WEB-INF/reports/PatientReportHaitiNoAlerts.jrxml +++ b/app/WebContent/WEB-INF/reports/PatientReportHaiti.jrxml @@ -68,7 +68,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -105,11 +105,11 @@ - + - + @@ -118,7 +118,7 @@ - + @@ -346,6 +346,11 @@ + + + + + @@ -428,21 +433,21 @@ - - - + + + - - - + + + diff --git a/app/WebContent/WEB-INF/reports/RejectionReport.jasper b/app/WebContent/WEB-INF/reports/RejectionReport.jasper index b294447e..63ba8b80 100644 Binary files a/app/WebContent/WEB-INF/reports/RejectionReport.jasper and b/app/WebContent/WEB-INF/reports/RejectionReport.jasper differ diff --git a/app/WebContent/WEB-INF/reports/RejectionReport.jrxml b/app/WebContent/WEB-INF/reports/RejectionReport.jrxml index af7f2486..30540c73 100644 --- a/app/WebContent/WEB-INF/reports/RejectionReport.jrxml +++ b/app/WebContent/WEB-INF/reports/RejectionReport.jrxml @@ -18,8 +18,8 @@ - - + + @@ -81,7 +81,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -166,9 +166,9 @@ - + - + @@ -176,19 +176,21 @@ - + + + - + - + @@ -207,7 +209,7 @@ - + @@ -244,7 +246,7 @@ - + diff --git a/app/WebContent/WEB-INF/reports/WorkplanResultsByTest.jasper b/app/WebContent/WEB-INF/reports/WorkplanResultsByTest.jasper index 2160b643..b66d93f9 100644 Binary files a/app/WebContent/WEB-INF/reports/WorkplanResultsByTest.jasper and b/app/WebContent/WEB-INF/reports/WorkplanResultsByTest.jasper differ diff --git a/app/WebContent/WEB-INF/reports/WorkplanResultsByTest.jrxml b/app/WebContent/WEB-INF/reports/WorkplanResultsByTest.jrxml index 55581294..110ea499 100644 --- a/app/WebContent/WEB-INF/reports/WorkplanResultsByTest.jrxml +++ b/app/WebContent/WEB-INF/reports/WorkplanResultsByTest.jrxml @@ -149,13 +149,7 @@ - - - - - - - + @@ -175,11 +169,17 @@ - - + + + + + + + + diff --git a/app/WebContent/WEB-INF/reports/WorkplanResultsByTestSection.jasper b/app/WebContent/WEB-INF/reports/WorkplanResultsByTestSection.jasper index c0e761a5..bab33fe5 100644 Binary files a/app/WebContent/WEB-INF/reports/WorkplanResultsByTestSection.jasper and b/app/WebContent/WEB-INF/reports/WorkplanResultsByTestSection.jasper differ diff --git a/app/WebContent/WEB-INF/reports/WorkplanResultsByTestSection.jrxml b/app/WebContent/WEB-INF/reports/WorkplanResultsByTestSection.jrxml index eb6fb4ef..4dbd2acf 100644 --- a/app/WebContent/WEB-INF/reports/WorkplanResultsByTestSection.jrxml +++ b/app/WebContent/WEB-INF/reports/WorkplanResultsByTestSection.jrxml @@ -121,7 +121,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -191,7 +191,7 @@ - + diff --git a/app/WebContent/pages/result/resultListView.jsp b/app/WebContent/pages/result/resultListView.jsp index 96475ff4..38a553ef 100644 --- a/app/WebContent/pages/result/resultListView.jsp +++ b/app/WebContent/pages/result/resultListView.jsp @@ -766,8 +766,6 @@ function updateShadowResult(source, index){ ( noteRequired && !"".equals(testResult.getResultValue()) ? "showNote( " + index + ");" : "" ) + ( testResult.isDisplayResultAsLog() ? " updateLogValue(this, " + index + ");" : "" ) + " updateShadowResult(this, " + index + ");"%>'/> - - '/> - ' /> - <% if( "D".equals(testResult.getResultType()) ){ %> @@ -868,8 +864,8 @@ function updateShadowResult(source, index){ - - + + ' size='6' /> log <% } %> + <% if( ableToRefer ){ %> diff --git a/app/WebContent/pages/resultvalidation/resultValidation.jsp b/app/WebContent/pages/resultvalidation/resultValidation.jsp index ae4e3d3c..4fbc8d6e 100644 --- a/app/WebContent/pages/resultvalidation/resultValidation.jsp +++ b/app/WebContent/pages/resultvalidation/resultValidation.jsp @@ -50,6 +50,7 @@ +