dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12023
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3562: Removed unnecessary use of organisationUnitTreeStack in patient module
Merge authors:
Lars Helge Øverland (larshelge)
------------------------------------------------------------
revno: 3562 [merge]
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-05-10 21:28:47 +0200
message:
Removed unnecessary use of organisationUnitTreeStack in patient module
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormService.java 2011-05-10 09:48:46 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormService.java 2011-05-10 11:39:42 +0000
@@ -46,6 +46,7 @@
final Pattern INPUT_PATTERN = Pattern.compile( "(<input.*?/>)", Pattern.DOTALL );
final Pattern IDENTIFIER_PATTERN = Pattern.compile( "value\\[(.*)\\].value:value\\[(.*)\\].value" );
+ final Pattern INDICATOR_PATTERN = Pattern.compile( "indicatorid=\"(.*?)\"" );
final Pattern VALUE_TAG_PATTERN = Pattern.compile( "value=\"(.*?)\"", Pattern.DOTALL );
final Pattern TITLE_TAG_PATTERN = Pattern.compile( "title=\"(.*?)\"", Pattern.DOTALL );
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java 2011-05-10 10:59:59 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java 2011-05-10 11:39:42 +0000
@@ -28,6 +28,7 @@
*/
import static org.hisp.dhis.dataentryform.DataEntryFormService.IDENTIFIER_PATTERN;
+import static org.hisp.dhis.dataentryform.DataEntryFormService.INDICATOR_PATTERN;
import static org.hisp.dhis.dataentryform.DataEntryFormService.INPUT_PATTERN;
import static org.hisp.dhis.options.SystemSettingManager.AGGREGATION_STRATEGY_REAL_TIME;
import static org.hisp.dhis.options.SystemSettingManager.DEFAULT_AGGREGATION_STRATEGY;
@@ -42,7 +43,6 @@
import java.util.Set;
import java.util.TreeMap;
import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import org.hisp.dhis.aggregation.AggregatedDataValueService;
import org.hisp.dhis.aggregation.AggregationService;
@@ -78,9 +78,7 @@
*/
public class DefaultDataSetReportService
implements DataSetReportService
-{
- final Pattern INDICATOR_PATTERN = Pattern.compile( "indicatorid=\"(.*?)\"" );
-
+{
private static final String NULL_REPLACEMENT = "";
private static final String SEPARATOR = ":";
private static final String DEFAULT_HEADER = "Value";
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2011-05-05 21:17:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2011-05-10 19:28:47 +0000
@@ -92,7 +92,6 @@
<action name="showRelationshipList"
class="org.hisp.dhis.patient.action.relationship.ShowRelationshipListAction">
- <interceptor-ref name="organisationUnitTreeStack" />
<result name="relationshiplist" type="chain">getRelationshipList
</result>
<result name="success" type="velocity">/main.vm</result>
@@ -105,7 +104,6 @@
<action name="getRelationshipList"
class="org.hisp.dhis.patient.action.relationship.GetRelationshipListAction">
- <interceptor-ref name="organisationUnitTreeStack" />
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/relationshipList.vm</param>
<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param>
@@ -116,7 +114,6 @@
<action name="showAddRelationshipForm"
class="org.hisp.dhis.patient.action.relationship.ShowAddRelationshipFormAction">
- <interceptor-ref name="organisationUnitTreeStack" />
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addRelationshipForm.vm</param>
<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param>
@@ -178,7 +175,6 @@
<action name="showAddRelationshipPatient"
class="org.hisp.dhis.patient.action.relationship.ShowAddRelationshipPatientAction">
- <interceptor-ref name="organisationUnitTreeStack" />
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addRelationshipPatientForm.vm</param>
<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param>
@@ -302,7 +298,6 @@
<action name="showUpdatePatientAttributeValueForm"
class="org.hisp.dhis.patient.action.patientattribute.ShowUpdatePatientAttributeValueAction">
- <interceptor-ref name="organisationUnitTreeStack" />
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updatePatientAttributeValueForm.vm</param>
<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param>
@@ -374,7 +369,6 @@
<action name="listAllPatients"
class="org.hisp.dhis.patient.action.patient.SearchPatientAction">
- <interceptor-ref name="organisationUnitTreeStack" />
<result name="success" type="velocity">/main.vm</result>
<param name="listAll">true</param>
<param name="page">/dhis-web-maintenance-patient/listPatient.vm</param>
@@ -412,7 +406,6 @@
<action name="showAddPatientForm"
class="org.hisp.dhis.patient.action.patient.ShowAddPatientFormAction">
- <interceptor-ref name="organisationUnitTreeStack" />
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addPatientForm.vm</param>
<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param>
@@ -429,7 +422,6 @@
<action name="showUpdatePatientForm"
class="org.hisp.dhis.patient.action.patient.GetPatientAction">
- <interceptor-ref name="organisationUnitTreeStack" />
<result name="success" type="velocity">/main.vm</result>
<param name="page">
/dhis-web-maintenance-patient/updatePatientForm.vm</param>
@@ -515,7 +507,6 @@
<action name="showProgramEnrollmentForm"
class="org.hisp.dhis.patient.action.patient.ProgramEnrollmentSelectAction">
- <interceptor-ref name="organisationUnitTreeStack" />
<result name="enrollmentform" type="chain">enrollmentform
</result>
<result name="success" type="velocity">/main.vm</result>
@@ -531,7 +522,6 @@
<action name="enrollmentform"
class="org.hisp.dhis.patient.action.patient.ProgramEnrollmentAction">
- <interceptor-ref name="organisationUnitTreeStack" />
<result name="success" type="velocity">/main.vm</result>
<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param>
<param name="menuTreeHeight">321</param>
@@ -556,7 +546,6 @@
<action name="saveProgramEnrollment"
class="org.hisp.dhis.patient.action.patient.SaveProgramEnrollmentAction">
- <interceptor-ref name="organisationUnitTreeStack" />
<result name="success" type="velocity">/main.vm</result>
<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param>
<param name="menuTreeHeight">321</param>
@@ -567,22 +556,8 @@
javascript/patient.js</param>
</action>
- <!--
- <action name="showProgramUnEnrollmentForm"
- class="org.hisp.dhis.patient.action.patient.ProgramEnrollmentSelectAction">
- <result name="enrollmentform" type="chain">enrollChain</result>
- <result name="success" type="chain">unEnrollmentFormChain</result>
- <param name="requiredAuthorities">F_PATIENT_UPDATE</param> </action>
-
- <action name="enrollChain"
- class="org.hisp.dhis.patient.action.patient.ProgramEnrollmentAction">
- <result name="success" type="chain">unEnrollmentFormChain</result>
- </action>
- -->
-
<action name="showProgramUnEnrollmentForm"
class="org.hisp.dhis.patient.action.patient.RemoveEnrollmentSelectAction">
- <interceptor-ref name="organisationUnitTreeStack" />
<result name="success" type="velocity">/main.vm</result>
<param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param>
<param name="menuTreeHeight">321</param>
