dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11374
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3220: Remove DataEntryManager class from dhis-web-maintenance-patient and re-use the services of DataEn...
------------------------------------------------------------
revno: 3220
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-03-31 08:39:19 +0700
message:
Remove DataEntryManager class from dhis-web-maintenance-patient and re-use the services of DataEntryFormService.
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/screen/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/screen/DataEntryManager.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/screen/DefaultDataEntryManager.java
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ShowDataEntryFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.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-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ShowDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ShowDataEntryFormAction.java 2011-03-20 17:57:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ShowDataEntryFormAction.java 2011-03-31 01:39:19 +0000
@@ -29,7 +29,6 @@
import org.hisp.dhis.dataentryform.DataEntryForm;
import org.hisp.dhis.dataentryform.DataEntryFormService;
-import org.hisp.dhis.patient.screen.DataEntryManager;
import com.opensymphony.xwork2.Action;
@@ -42,7 +41,7 @@
implements Action
{
// -------------------------------------------------------------------------
- // Dependencies
+ // Dependency
// -------------------------------------------------------------------------
private DataEntryFormService dataEntryFormService;
@@ -52,13 +51,6 @@
this.dataEntryFormService = dataEntryFormService;
}
- private DataEntryManager dataEntryManager;
-
- public void setDataEntryManager( DataEntryManager dataEntryManager )
- {
- this.dataEntryManager = dataEntryManager;
- }
-
// -------------------------------------------------------------------------
// Getters & Setters
// -------------------------------------------------------------------------
@@ -78,7 +70,7 @@
}
// -------------------------------------------------------------------------
- // Execute
+ // Action implementation
// -------------------------------------------------------------------------
public String execute()
@@ -90,7 +82,7 @@
if ( dataEntryForm != null )
{
- dataEntryFormCode = dataEntryManager.prepareDataEntryFormCode( dataEntryForm.getHtmlCode() );
+ dataEntryFormCode = dataEntryFormService.prepareDataEntryFormCode( dataEntryForm.getHtmlCode() );
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java 2011-03-23 02:10:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java 2011-03-31 01:39:19 +0000
@@ -36,7 +36,6 @@
import org.hisp.dhis.dataentryform.DataEntryForm;
import org.hisp.dhis.dataentryform.DataEntryFormService;
import org.hisp.dhis.editor.EditorManager;
-import org.hisp.dhis.patient.screen.DataEntryManager;
import org.hisp.dhis.program.ProgramStage;
import org.hisp.dhis.program.ProgramStageDataElementService;
import org.hisp.dhis.program.ProgramStageService;
@@ -71,13 +70,6 @@
this.programStageService = programStageService;
}
- private DataEntryManager dataEntryManager;
-
- public void setDataEntryManager( DataEntryManager dataEntryManager )
- {
- this.dataEntryManager = dataEntryManager;
- }
-
private EditorManager editorManager;
public EditorManager getEditorManager()
@@ -144,7 +136,7 @@
}
// -------------------------------------------------------------------------
- // Execute
+ // Action implementation
// -------------------------------------------------------------------------
public String execute()
@@ -158,7 +150,7 @@
dataEntryForm = programStage.getDataEntryForm();
- editorManager.setValue( dataEntryForm == null ? "" : dataEntryManager.prepareDataEntryFormCode( dataEntryForm
+ editorManager.setValue( dataEntryForm == null ? "" : dataEntryFormService.prepareDataEntryFormCode( dataEntryForm
.getHtmlCode() ) );
// ---------------------------------------------------------------------
=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/screen'
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/screen/DataEntryManager.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/screen/DataEntryManager.java 2011-03-20 18:15:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/screen/DataEntryManager.java 1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2004-2009, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.patient.screen;
-
-/**
- * @author Viet Nguyen
- * @version $Id$
- */
-public interface DataEntryManager
-{
- String prepareDataEntryFormCode( String dataEntryFormCode );
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/screen/DefaultDataEntryManager.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/screen/DefaultDataEntryManager.java 2011-03-20 18:15:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/screen/DefaultDataEntryManager.java 1970-01-01 00:00:00 +0000
@@ -1,594 +0,0 @@
-/*
- * Copyright (c) 2004-2009, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.patient.screen;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryOption;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.dataelement.DataElementService;
-
-/**
- * @author Viet Nguyen
- *
- * @version $Id$
- */
-public class DefaultDataEntryManager
- implements DataEntryManager
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private DataElementCategoryService categoryService;
-
- public void setCategoryService( DataElementCategoryService categoryService )
- {
- this.categoryService = categoryService;
- }
-
- // -------------------------------------------------------------------------
- // Implement methods
- // -------------------------------------------------------------------------
-
- /**
- * Prepares the data entry form code by injecting the dataElement name for
- * each entry field
- *
- *
- * @param dataEntryFormCode HTML code of the data entry form (as persisted
- * in the database)
- * @return HTML code for the data entry form injected with dataelement name
- */
- public String prepareDataEntryFormCode( String dataEntryFormCode )
- {
- String preparedCode = dataEntryFormCode;
-
- preparedCode = prepareDataEntryFormInputs( preparedCode );
- preparedCode = prepareDataEntryFormCombos( preparedCode );
-
- return preparedCode;
- }
-
- private String prepareDataEntryFormInputs( String preparedCode )
- {
- // ---------------------------------------------------------------------
- // Buffer to contain the final result.
- // ---------------------------------------------------------------------
-
- StringBuffer sb = new StringBuffer();
-
- // ---------------------------------------------------------------------
- // Pattern to match data elements in the HTML code.
- // ---------------------------------------------------------------------
-
- Pattern patDataElement = Pattern.compile( "(<input.*?)[/]?>" );
- Matcher matDataElement = patDataElement.matcher( preparedCode );
-
- // ---------------------------------------------------------------------
- // Iterate through all matching data element fields.
- // ---------------------------------------------------------------------
-
- boolean result = matDataElement.find();
- while ( result )
- {
- // -----------------------------------------------------------------
- // Get input HTML code (HTML input field code)
- // -----------------------------------------------------------------
-
- String dataElementCode = matDataElement.group( 1 );
-
- // -----------------------------------------------------------------
- // Pattern to extract data element ID from data element field
- // -----------------------------------------------------------------
-
- Pattern patDataElementId = Pattern
- .compile( "value\\[(.*)\\].value:value\\[(.*)\\].value:value\\[(.*)\\].value" );
- Matcher matDataElementId = patDataElementId.matcher( dataElementCode );
-
- Pattern patViewBy = Pattern.compile( "view=\"@@(.*)@@\"" );
- Matcher matViewBy = patViewBy.matcher( dataElementCode );
-
- if ( matDataElementId.find() && matDataElementId.groupCount() > 0 )
- {
- // -------------------------------------------------------------
- // Get data element id,name, optionCombo id,name of data element
- // -------------------------------------------------------------
-
- //int programStageId = Integer.parseInt( matDataElementId.group( 1 ) );
- // do somthing with programStage
-
- int dataElementId = Integer.parseInt( matDataElementId.group( 2 ) );
- DataElement dataElement = dataElementService.getDataElement( dataElementId );
-
- // int optionComboId = Integer.parseInt( matDataElementId.group(
- // 3 ) );
- // DataElementCategoryOptionCombo optionCombo =
- // dataElementCategoryService
- // .getDataElementCategoryOptionCombo( optionComboId );
- String optionComboName = "";
-
- // if ( optionCombo != null )
- // {
- // List<DataElementCategoryOption> categoryOptions = new
- // ArrayList<DataElementCategoryOption>(
- // optionCombo.getCategoryOptions() );
- // Iterator<DataElementCategoryOption> categoryOptionsIterator =
- // categoryOptions.iterator();
- //
- // while ( categoryOptionsIterator.hasNext() )
- // {
- // DataElementCategoryOption categoryOption =
- // categoryOptionsIterator.next();
- //
- // optionComboName += categoryOption.getName() + " ";
- // }
- // }
-
- // -------------------------------------------------------------
- // Insert name of data element in output code.
- // -------------------------------------------------------------
-
- String dispVal = "No Such DataElement Exists";
-
- if ( dataElement != null )
- {
- dispVal = dataElement.getShortName();
-
- if ( matViewBy.find() && matViewBy.groupCount() > 0 )
- {
- String viewByVal = matViewBy.group( 1 );
- if ( viewByVal.equalsIgnoreCase( "deid" ) )
- {
- dispVal = String.valueOf( dataElement.getId() );
- }
- else if ( viewByVal.equalsIgnoreCase( "dename" ) )
- {
- dispVal = dataElement.getName();
- }
- }
-
- dispVal += " - " + optionComboName;
-
- if ( dataElementCode.contains( "value=\"\"" ) )
- {
- dataElementCode = dataElementCode.replace( "value=\"\"", "value=\"[ " + dispVal + " ]\"" );
- }
- else
- {
- dataElementCode += " value=\"[ " + dispVal + " ]\"";
- }
-
- // if ( dataElementCode.contains( "title=\"\"" ) )
- // {
- // dataElementCode = dataElementCode.replace( "title=\"\"",
- // "title=\"-- " + dataElement.getId()
- // + ". " + dataElement.getName() + " " + optionComboId +
- // ". " + optionComboName + " ("
- // + dataElement.getType() + ") --\"" );
- // }
- // else
- // {
- // dataElementCode += " title=\"-- " + dataElement.getId() +
- // ". " + dataElement.getName() + " "
- // + optionComboId + ". " + optionComboName + " (" +
- // dataElement.getType() + ") --\"";
- // }
- }
- else
- {
- if ( dataElementCode.contains( "value=\"\"" ) )
- {
- dataElementCode = dataElementCode.replace( "value=\"\"", "value=\"[ " + dispVal + " ]\"" );
- }
- else
- {
- dataElementCode += " value=\"[ " + dispVal + " ]\"";
- }
-
- if ( dataElementCode.contains( "title=\"\"" ) )
- {
- dataElementCode = dataElementCode.replace( "title=\"\"", "title=\"-- " + dispVal + " --\"" );
- }
- else
- {
- dataElementCode += " title=\"-- " + dispVal + " --\"";
- }
- }
-
- // -------------------------------------------------------------
- // Appends dataElementCode
- // -------------------------------------------------------------
-
- String appendCode = dataElementCode;
- appendCode += "/>";
- matDataElement.appendReplacement( sb, appendCode );
- }
-
- // -----------------------------------------------------------------
- // Go to next data entry field
- // -----------------------------------------------------------------
-
- result = matDataElement.find();
- }
-
- // ---------------------------------------------------------------------
- // Add remaining code (after the last match), and return formatted code
- // ---------------------------------------------------------------------
-
- matDataElement.appendTail( sb );
-
- return sb.toString();
- }
-
- private String prepareDataEntryFormCombos( String preparedCode )
- {
- // ---------------------------------------------------------------------
- // Buffer to contain the final result.
- // ---------------------------------------------------------------------
-
- StringBuffer sb = new StringBuffer();
-
- // ---------------------------------------------------------------------
- // Pattern to match data elements in the HTML code.
- // ---------------------------------------------------------------------
-
- Pattern patDataElement = Pattern.compile( "(<input.*?)[/]?>" );
- Matcher matDataElement = patDataElement.matcher( preparedCode );
-
- // ---------------------------------------------------------------------
- // Iterate through all matching data element fields.
- // ---------------------------------------------------------------------
-
- boolean result = matDataElement.find();
-
- while ( result )
- {
- // -----------------------------------------------------------------
- // Get input HTML code (HTML input field code).
- // -----------------------------------------------------------------
-
- String dataElementCode = matDataElement.group( 1 );
-
- // -----------------------------------------------------------------
- // Pattern to extract data element ID from data element field
- // -----------------------------------------------------------------
-
- Pattern patDataElementId = Pattern.compile( "value\\[(.*)\\].boolean:value\\[(.*)\\].boolean" );
- Matcher matDataElementId = patDataElementId.matcher( dataElementCode );
-
- Pattern patViewBy = Pattern.compile( "view=\"@@(.*)@@\"" );
- Matcher matViewBy = patViewBy.matcher( dataElementCode );
-
- if ( matDataElementId.find() && matDataElementId.groupCount() > 0 )
- {
- // -------------------------------------------------------------
- // Get data element id,name, optionCombo id,name of data element
- // -------------------------------------------------------------
-
- int dataElementId = Integer.parseInt( matDataElementId.group( 1 ) );
- DataElement dataElement = dataElementService.getDataElement( dataElementId );
-
- int optionComboId = Integer.parseInt( matDataElementId.group( 2 ) );
- DataElementCategoryOptionCombo optionCombo = categoryService
- .getDataElementCategoryOptionCombo( optionComboId );
- String optionComboName = "";
-
- if ( optionCombo != null )
- {
- List<DataElementCategoryOption> categoryOptions = new ArrayList<DataElementCategoryOption>(
- optionCombo.getCategoryOptions() );
- Iterator<DataElementCategoryOption> categoryOptionsIterator = categoryOptions.iterator();
-
- while ( categoryOptionsIterator.hasNext() )
- {
- DataElementCategoryOption categoryOption = categoryOptionsIterator.next();
-
- optionComboName += categoryOption.getName() + " ";
- }
- }
- // -------------------------------------------------------------
- // Insert name of data element in output code.
- // -------------------------------------------------------------
-
- String dispVal = "No Such DataElement Exists";
-
- if ( dataElement != null )
- {
- dispVal = dataElement.getShortName();
-
- if ( matViewBy.find() && matViewBy.groupCount() > 0 )
- {
- String viewByVal = matViewBy.group( 1 );
-
- if ( viewByVal.equalsIgnoreCase( "deid" ) )
- {
- dispVal = String.valueOf( dataElement.getId() );
- }
- else if ( viewByVal.equalsIgnoreCase( "dename" ) )
- {
- dispVal = dataElement.getName();
- }
- }
-
- dispVal += " - " + optionComboName;
-
- if ( dataElementCode.contains( "value=\"\"" ) )
- {
- dataElementCode = dataElementCode.replace( "value=\"\"", "value=\"[ " + dispVal + " ]\"" );
- }
- else
- {
- dataElementCode += " value=\"[ " + dispVal + " ]\"";
- }
-
- if ( dataElementCode.contains( "title=\"\"" ) )
- {
- dataElementCode = dataElementCode.replace( "title=\"\"", "title=\"-- " + dataElement.getId()
- + ". " + dataElement.getName() + " " + optionComboId + ". " + optionComboName + " ("
- + dataElement.getType() + ") --\"" );
- }
- else
- {
- dataElementCode += " title=\"-- " + dataElement.getId() + ". " + dataElement.getName() + " "
- + optionComboId + ". " + optionComboName + " (" + dataElement.getType() + ") --\"";
- }
- }
- else
- {
- if ( dataElementCode.contains( "value=\"\"" ) )
- {
- dataElementCode = dataElementCode.replace( "value=\"\"", "value=\"[ " + dispVal + " ]\"" );
- }
- else
- {
- dataElementCode += " value=\"[ " + dispVal + " ]\"";
- }
-
- if ( dataElementCode.contains( "title=\"\"" ) )
- {
- dataElementCode = dataElementCode.replace( "title=\"\"", "title=\"-- " + dispVal + " --\"" );
- }
- else
- {
- dataElementCode += " title=\"-- " + dispVal + " --\"";
- }
- }
-
- // -------------------------------------------------------------
- // Appends dataElementCode
- // -------------------------------------------------------------
-
- String appendCode = dataElementCode;
- appendCode += "/>";
- matDataElement.appendReplacement( sb, appendCode );
- }
-
- // -----------------------------------------------------------------
- // Go to next data entry field
- // -----------------------------------------------------------------
-
- result = matDataElement.find();
- }
-
- // ---------------------------------------------------------------------
- // Add remaining code (after the last match), and return formatted code.
- // ---------------------------------------------------------------------
-
- matDataElement.appendTail( sb );
-
- return sb.toString();
- }
-
- @SuppressWarnings("unused")
- private String prepareDataEntryFormComboString( String preparedCode )
- {
- // ---------------------------------------------------------------------
- // Buffer to contain the final result.
- // ---------------------------------------------------------------------
-
- StringBuffer sb = new StringBuffer();
-
- // ---------------------------------------------------------------------
- // Pattern to match data elements in the HTML code.
- // ---------------------------------------------------------------------
-
- Pattern patDataElement = Pattern.compile( "(<select.*?)[/]?</select>", Pattern.DOTALL );
- Matcher matDataElement = patDataElement.matcher( preparedCode );
-
- // ---------------------------------------------------------------------
- // Iterate through all matching data element fields.
- // ---------------------------------------------------------------------
-
- boolean result = matDataElement.find();
-
- while ( result )
- {
- // -----------------------------------------------------------------
- // Get input HTML code (HTML input field code).
- // -----------------------------------------------------------------
-
- String dataElementCode = matDataElement.group( 1 );
-
- // -----------------------------------------------------------------
- // Pattern to extract data element ID from data element field
- // -----------------------------------------------------------------
-
- Pattern patDataElementId = Pattern.compile( "value\\[(.*)\\].value:value\\[(.*)\\].value" );
- Matcher matDataElementId = patDataElementId.matcher( dataElementCode );
- Pattern patComboId = Pattern.compile( "combo\\[(.*)\\].combo" );
- Matcher matComboId = patComboId.matcher( dataElementCode );
-
- Pattern patViewBy = Pattern.compile( "view=\"@@(.*)@@\"" );
- Matcher matViewBy = patViewBy.matcher( dataElementCode );
-
- if ( matDataElementId.find() && matDataElementId.groupCount() > 0 )
- {
- // -------------------------------------------------------------
- // Get data element id,name, optionCombo id,name of data element
- // -------------------------------------------------------------
-
- int dataElementId = Integer.parseInt( matDataElementId.group( 1 ) );
- DataElement dataElement = dataElementService.getDataElement( dataElementId );
-
- boolean resultCombo = matComboId.find();
- String optionComboName = "";
-
- while ( resultCombo )
- {
- int optionComboId = Integer.parseInt( matDataElementId.group( 1 ) );
- DataElementCategoryOptionCombo optionCombo = categoryService
- .getDataElementCategoryOptionCombo( optionComboId );
-
- if ( optionCombo != null )
- {
- List<DataElementCategoryOption> categoryOptions = new ArrayList<DataElementCategoryOption>(
- optionCombo.getCategoryOptions() );
- Iterator<DataElementCategoryOption> categoryOptionsIterator = categoryOptions.iterator();
-
- while ( categoryOptionsIterator.hasNext() )
- {
- DataElementCategoryOption categoryOption = categoryOptionsIterator.next();
-
- optionComboName = categoryOption.getName() + " ";
- }
- }
-
- }
- // -------------------------------------------------------------
- // Insert name of data element in output code.
- // -------------------------------------------------------------
-
- // String dispVal = "No Such DataElement Exists";
- //
- // if ( dataElement != null )
- // {
- // dispVal = dataElement.getShortName();
- //
- // if ( matViewBy.find() && matViewBy.groupCount() > 0 )
- // {
- // String viewByVal = matViewBy.group( 1 );
- //
- // if ( viewByVal.equalsIgnoreCase( "deid" ) )
- // {
- // dispVal = String.valueOf( dataElement.getId() );
- // }
- // else if ( viewByVal.equalsIgnoreCase( "dename" ) )
- // {
- // dispVal = dataElement.getName();
- // }
- // }
- //
- // dispVal += " - " + optionComboName;
- //
- // if ( dataElementCode.contains( "value=\"\"" ) )
- // {
- // dataElementCode = dataElementCode.replace( "value=\"\"",
- // "value=\"[ " + dispVal + " ]\"" );
- // }
- // else
- // {
- // dataElementCode += " value=\"[ " + dispVal + " ]\"";
- // }
- //
- // if ( dataElementCode.contains( "title=\"\"" ) )
- // {
- // dataElementCode = dataElementCode.replace( "title=\"\"",
- // "title=\"-- " + dataElement.getId()
- // + ". " + dataElement.getName() + " " + optionComboId + ". " +
- // optionComboName + " ("
- // + dataElement.getType() + ") --\"" );
- // }
- // else
- // {
- // dataElementCode += " title=\"-- " + dataElement.getId() +
- // ". " + dataElement.getName() + " "
- // + optionComboId + ". " + optionComboName + " (" +
- // dataElement.getType() + ") --\"";
- // }
- // }
- // else
- // {
- // if ( dataElementCode.contains( "value=\"\"" ) )
- // {
- // dataElementCode = dataElementCode.replace( "value=\"\"",
- // "value=\"[ " + dispVal + " ]\"" );
- // }
- // else
- // {
- // dataElementCode += " value=\"[ " + dispVal + " ]\"";
- // }
- //
- // if ( dataElementCode.contains( "title=\"\"" ) )
- // {
- // dataElementCode = dataElementCode.replace( "title=\"\"",
- // "title=\"-- " + dispVal + " --\"" );
- // }
- // else
- // {
- // dataElementCode += " title=\"-- " + dispVal + " --\"";
- // }
- // }
-
- // -------------------------------------------------------------
- // Appends dataElementCode
- // -------------------------------------------------------------
-
- String appendCode = dataElementCode;
- appendCode += "/>";
- matDataElement.appendReplacement( sb, appendCode );
- }
-
- // -----------------------------------------------------------------
- // Go to next data entry field
- // -----------------------------------------------------------------
-
- result = matDataElement.find();
- }
-
- // ---------------------------------------------------------------------
- // Add remaining code (after the last match), and return formatted code.
- // ---------------------------------------------------------------------
-
- matDataElement.appendTail( sb );
-
- return sb.toString();
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2011-02-24 06:02:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2011-03-31 01:39:19 +0000
@@ -819,9 +819,6 @@
<property name="dataEntryFormService">
<ref bean="org.hisp.dhis.dataentryform.DataEntryFormService" />
</property>
- <property name="dataEntryManager">
- <ref bean="org.hisp.dhis.patient.screen.DataEntryManager" />
- </property>
</bean>
<bean
@@ -834,24 +831,11 @@
<property name="programStageService">
<ref bean="org.hisp.dhis.program.ProgramStageService" />
</property>
- <property name="dataEntryManager">
- <ref bean="org.hisp.dhis.patient.screen.DataEntryManager" />
- </property>
<property name="editorManager" ref="editorManager" />
<property name="programStageDataElementService"
ref="org.hisp.dhis.program.ProgramStageDataElementService" />
</bean>
- <bean id="org.hisp.dhis.patient.screen.DataEntryManager" class="org.hisp.dhis.patient.screen.DefaultDataEntryManager"
- scope="prototype">
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService" />
- </property>
- <property name="categoryService">
- <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService" />
- </property>
- </bean>
-
<bean
id="org.hisp.dhis.patient.action.dataentryform.SaveDataEntryFormAction"
class="org.hisp.dhis.patient.action.dataentryform.SaveDataEntryFormAction"
