dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16025
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5962: (patient) Remove import patient function.
------------------------------------------------------------
revno: 5962
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-02-15 13:47:14 +0700
message:
(patient) Remove import patient function.
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ImportPatientAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ValidateUploadExcelFileAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/XMLItem.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/configurationParams.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importMenu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importPatientParams.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importPatientResult.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/import.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm
modified:
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/org/hisp/dhis/patient/i18n_module.properties
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/webapp/dhis-web-maintenance-patient/menu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm
--
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
=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport'
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ImportPatientAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ImportPatientAction.java 2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ImportPatientAction.java 1970-01-01 00:00:00 +0000
@@ -1,970 +0,0 @@
-/*
- * Copyright (c) 2004-2012, 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.action.patientimport;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.i18n.I18nFormat;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.patient.Patient;
-import org.hisp.dhis.patient.PatientAttribute;
-import org.hisp.dhis.patient.PatientAttributeOption;
-import org.hisp.dhis.patient.PatientAttributeOptionService;
-import org.hisp.dhis.patient.PatientAttributeService;
-import org.hisp.dhis.patient.PatientIdentifier;
-import org.hisp.dhis.patient.PatientIdentifierType;
-import org.hisp.dhis.patient.PatientIdentifierTypeService;
-import org.hisp.dhis.patient.PatientService;
-import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
-import org.hisp.dhis.patientattributevalue.PatientAttributeValueService;
-import org.hisp.dhis.patientdatavalue.PatientDataValue;
-import org.hisp.dhis.patientdatavalue.PatientDataValueService;
-import org.hisp.dhis.program.Program;
-import org.hisp.dhis.program.ProgramInstance;
-import org.hisp.dhis.program.ProgramInstanceService;
-import org.hisp.dhis.program.ProgramService;
-import org.hisp.dhis.program.ProgramStage;
-import org.hisp.dhis.program.ProgramStageInstance;
-import org.hisp.dhis.program.ProgramStageInstanceService;
-import org.hisp.dhis.program.ProgramStageService;
-import org.hisp.dhis.setting.SystemSettingManager;
-import org.hisp.dhis.system.util.DateUtils;
-import org.hisp.dhis.system.util.StreamUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version ImportPatientAction.java Nov 12, 2010 12:45:57 PM
- */
-public class ImportPatientAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private PatientService patientService;
-
- private PatientIdentifierTypeService patientIdentifierTypeService;
-
- private PatientAttributeService patientAttributeService;
-
- private PatientAttributeOptionService patientAttributeOptionService;
-
- private PatientAttributeValueService patientAttributeValueService;
-
- private ProgramService programService;
-
- private ProgramStageService programStageService;
-
- private ProgramInstanceService programInstanceService;
-
- private ProgramStageInstanceService programStageInstanceService;
-
- private DataElementService dataElementService;
-
- private PatientDataValueService patientDataValueService;
-
- private SystemSettingManager systemSettingManager;
-
- private OrganisationUnitService organisationUnitService;
-
- private I18nFormat format;
-
- private I18n i18n;
-
- // -------------------------------------------------------------------------
- // Input/Output
- // -------------------------------------------------------------------------
-
- private HashMap<Integer, Patient> errPatients = new HashMap<Integer, Patient>();
-
- private HashMap<Integer, String> errMessage = new HashMap<Integer, String>();
-
- private String fileName;
-
- public void setUploadFileName( String fileName )
- {
- this.fileName = fileName;
- }
-
- private File upload;
-
- public void setUpload( File upload )
- {
- this.upload = upload;
- }
-
- private File output;
-
- private String message;
-
- public String getMessage()
- {
- return message;
- }
-
- // -------------------------------------------------------------------------
- // Private Parameters
- // -------------------------------------------------------------------------
-
- private XMLItem xmlStartRow;
-
- private XMLItem xmlEndRow;
-
- private XMLItem xmlOrgunit;
-
- private XMLItem xmlProgram;
-
- private char ageType;
-
- Collection<XMLItem> itemProperty = new HashSet<XMLItem>();
-
- Collection<XMLItem> itemAttribute = new HashSet<XMLItem>();
-
- Collection<XMLItem> itemEnrollProgram = new HashSet<XMLItem>();
-
- Collection<XMLItem> itemProgramStage = new HashSet<XMLItem>();
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- public void setProgramInstanceService( ProgramInstanceService programInstanceService )
- {
- this.programInstanceService = programInstanceService;
- }
-
- public void setPatientService( PatientService patientService )
- {
- this.patientService = patientService;
- }
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- public void setPatientAttributeValueService( PatientAttributeValueService patientAttributeValueService )
- {
- this.patientAttributeValueService = patientAttributeValueService;
- }
-
- public void setPatientDataValueService( PatientDataValueService patientDataValueService )
- {
- this.patientDataValueService = patientDataValueService;
- }
-
- public void setI18n( I18n i18n )
- {
- this.i18n = i18n;
- }
-
- public void setProgramService( ProgramService programService )
- {
- this.programService = programService;
- }
-
- public void setProgramStageService( ProgramStageService programStageService )
- {
- this.programStageService = programStageService;
- }
-
- public void setPatientIdentifierTypeService( PatientIdentifierTypeService patientIdentifierTypeService )
- {
- this.patientIdentifierTypeService = patientIdentifierTypeService;
- }
-
- public void setProgramStageInstanceService( ProgramStageInstanceService programStageInstanceService )
- {
- this.programStageInstanceService = programStageInstanceService;
- }
-
- public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
- {
- this.organisationUnitService = organisationUnitService;
- }
-
- public void setPatientAttributeService( PatientAttributeService patientAttributeService )
- {
- this.patientAttributeService = patientAttributeService;
- }
-
- public void setPatientAttributeOptionService( PatientAttributeOptionService patientAttributeOptionService )
- {
- this.patientAttributeOptionService = patientAttributeOptionService;
- }
-
- public void setSystemSettingManager( SystemSettingManager systemSettingManager )
- {
- this.systemSettingManager = systemSettingManager;
- }
-
- public HashMap<Integer, Patient> getErrPatients()
- {
- return errPatients;
- }
-
- public HashMap<Integer, String> getErrMessage()
- {
- return errMessage;
- }
-
- public void setFormat( I18nFormat format )
- {
- this.format = format;
- }
-
- public File getOutput()
- {
- return output;
- }
-
- public void setOutput( File output )
- {
- this.output = output;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- if ( upload == null )
- {
- message = i18n.getString( "upload_file_null" );
-
- return ERROR;
- }
-
- // ---------------------------------------------------------------------
- // Get template-file
- // ---------------------------------------------------------------------
-
- String path = System.getenv( "DHIS2_HOME" );
- fileName += (Math.random() * 1000) + ".xls";
-
- if ( path != null )
- {
- path += File.separator + "patienttemp" + File.separator + fileName;
- }
- else
- {
- path = System.getenv( "user.home" ) + File.separator + "patienttemp" + File.separator + fileName;
- }
-
- output = new File( path );
- StreamUtils.write( upload, output );
-
- // ---------------------------------------------------------------------
- // Do import
- // ---------------------------------------------------------------------
-
- if ( output == null )
- {
- message = i18n.getString( "upload_file_null" );
-
- return ERROR;
- }
-
- try
- {
- // -----------------------------------------------------------------
- // Get excel-items from XML-template-file
- // -----------------------------------------------------------------
-
- readXMLTemplateFile();
-
- if ( message != null && message.length() > 0 )
- {
- return ERROR;
- }
-
- // -----------------------------------------------------------------
- // Get file which need to import information
- // -----------------------------------------------------------------
-
- FileInputStream inputStream = new FileInputStream( output );
-
- HSSFWorkbook wb = new HSSFWorkbook( inputStream );
-
- // -----------------------------------------------------------------
- // Get common-information from XML-template-file
- // -----------------------------------------------------------------
-
- // Get Mandatory attributes
- Collection<PatientAttribute> attributes = patientAttributeService.getPatientAttributesByMandatory( true );
-
- // Get Mandatory identifiers
- Collection<PatientIdentifierType> identifiers = patientIdentifierTypeService
- .getPatientIdentifierTypes( true );
-
- // Get organisation-unit
- HSSFSheet sheet = wb.getSheetAt( xmlOrgunit.getSheet() );
- String value = readValue( xmlOrgunit.getRow(), xmlOrgunit.getColumn(), sheet );
- OrganisationUnit orgunit = organisationUnitService.getOrganisationUnit( Integer.parseInt( value ) );
-
- // Get program
- sheet = wb.getSheetAt( xmlProgram.getSheet() );
- value = readValue( xmlProgram.getRow(), xmlProgram.getColumn(), sheet );
- Program program = programService.getProgram( Integer.parseInt( value ) );
-
- // Get startRow
- sheet = wb.getSheetAt( xmlStartRow.getSheet() );
- value = readValue( xmlStartRow.getRow(), xmlStartRow.getColumn(), sheet );
- int startRow = Integer.parseInt( value ) - 1;
-
- // get endRow
- sheet = wb.getSheetAt( xmlEndRow.getSheet() );
- value = readValue( xmlEndRow.getRow(), xmlEndRow.getColumn(), sheet );
- int endRow = Integer.parseInt( value ) - 1;
-
- // -----------------------------------------------------------------
- // Import information
- // -----------------------------------------------------------------
-
- for ( int row = startRow; row <= endRow; row++ )
- {
- // -------------------------------------------------------------
- // Get patient and patient-attribute-values from Excel file
- // -------------------------------------------------------------
-
- Patient patient = getPatient( row, orgunit, wb );
-
- Collection<PatientAttributeValue> attributeValues = getAttributes( patient, row, wb );
-
- // -------------------------------------------------------------
- // Validate data of patient is right, continue to get
- // information into excel file
- // -------------------------------------------------------------
-
- ProgramInstance programInstance = null;
- List<ProgramStageInstance> programStageInstances = null;
- Collection<PatientDataValue> patientDataValues = null;
-
- if ( validatePatient( patient, identifiers, row )
- && validatePatientAttribute( patient, attributes, attributeValues, row ) )
- {
- try
- {
- // -------------------------------------------------------------
- // Get Information of EnrollProgram
- // -------------------------------------------------------------
-
- // Get programInstance for patient
- programInstance = getProgramInstance( patient, program, row, wb );
-
- // Get programStageInstance for patient
- programStageInstances = getProgramStageInstances( programInstance, row, wb );
-
- }
- catch ( Exception ex )
- {
- errPatients.put( row, patient );
- errMessage.put( row, i18n.getString( "get_data_error" ) );
- ex.printStackTrace();
- continue;
- }
-
- // save new Patient
- patientService.savePatient( patient );
- // save patient-attribute-values
- for ( PatientAttributeValue attributeValue : attributeValues )
- {
- patientAttributeValueService.savePatientAttributeValue( attributeValue );
- }
-
- programInstanceService.addProgramInstance( programInstance );
-
- patientService.updatePatient( patient );
-
- for ( ProgramStageInstance programStageInstance : programStageInstances )
- {
- programStageInstanceService.addProgramStageInstance( programStageInstance );
- }
-
- // -------------------------------------------------------------
- // Get PatientDataValue
- // -------------------------------------------------------------
-
- patientDataValues = getPatientDataValue( orgunit, programInstance, programStageInstances, row, wb );
-
- for ( PatientDataValue patientDataValue : patientDataValues )
- {
- patientDataValueService.savePatientDataValue( patientDataValue );
- }
- }
- }
-
- }
- catch ( Exception ex )
- {
- ex.printStackTrace();
- }
-
- return SUCCESS;
- }
-
- // -------------------------------------------------------------------------
- // Supporting methods
- // -------------------------------------------------------------------------
-
- private Patient getPatient( int row, OrganisationUnit orgunit, HSSFWorkbook wb )
- throws Exception
- {
- Patient patient = new Patient();
- patient.setFirstName( "" );
- patient.setMiddleName( "" );
- patient.setLastName( "" );
- patient.setOrganisationUnit( orgunit );
- patient.setRegistrationDate( new Date() );
- patient.setUnderAge( false );
-
- // ---------------------------------------------------------------------
- // Create Patient
- // ---------------------------------------------------------------------
-
- for ( XMLItem xmlItem : itemProperty )
- {
- HSSFSheet sheet = wb.getSheetAt( xmlItem.getSheet() );
-
- String value = readValue( row, xmlItem.getColumn(), sheet );
-
- // -----------------------------------------------------------------
- // Import identifier values
- // -----------------------------------------------------------------
-
- if ( xmlItem.isType( XMLItem.IDENTIFIER_TYPE ) )
- {
- int objectId = Integer.parseInt( xmlItem.getValue() );
- PatientIdentifierType identifierType = patientIdentifierTypeService.getPatientIdentifierType( objectId );
-
- PatientIdentifier identifier = new PatientIdentifier();
- identifier.setIdentifierType( identifierType );
- identifier.setPatient( patient );
- identifier.setIdentifier( value.trim() );
- patient.getIdentifiers().add( identifier );
- }
-
- // -----------------------------------------------------------------
- // Import property values
- // -----------------------------------------------------------------
-
- else if ( xmlItem.isType( XMLItem.PROPERTY_TYPE ) )
- {
- if ( !value.isEmpty() )
- {
- if ( xmlItem.getValue().equalsIgnoreCase( XMLItem.BIRTH_DATE_FROM_VALUE ) )
- {
- patient.setBirthDateFromAge( Integer.parseInt( value ), ageType );
- }
- else
- {
- setObject( patient, xmlItem.getValue(), value );
- }
- }
- }
- }
-
-// // -------------------------------------------------------------
-// // Generate system id with this format :
-// // (BirthDate)(Gender)(XXXXXX)(checkdigit)
-// // PatientIdentifierType will be null
-// // -------------------------------------------------------------
-//
-// String systemIdentifier = PatientIdentifierGenerator.getNewIdentifier( patient.getBirthDate(), patient
-// .getGender() );
-//
-// PatientIdentifier systemGenerateIdentifier = patientIdentifierService.get( null, systemIdentifier );
-// while ( systemGenerateIdentifier != null )
-// {
-// systemIdentifier = PatientIdentifierGenerator
-// .getNewIdentifier( patient.getBirthDate(), patient.getGender() );
-// systemGenerateIdentifier = patientIdentifierService.get( null, systemIdentifier );
-// }
-//
-// systemGenerateIdentifier = new PatientIdentifier();
-// systemGenerateIdentifier.setIdentifier( systemIdentifier );
-// systemGenerateIdentifier.setPatient( patient );
-//
-// patient.getIdentifiers().add( systemGenerateIdentifier );
-
- return patient;
- }
-
- private Collection<PatientAttributeValue> getAttributes( Patient patient, int row, HSSFWorkbook wb )
- {
- // ---------------------------------------------------------------------
- // Import Information of attributes of patient
- // ---------------------------------------------------------------------
-
- Collection<PatientAttributeValue> attributeValues = new HashSet<PatientAttributeValue>();
-
- Set<PatientAttribute> attributes = new HashSet<PatientAttribute>();
-
- for ( XMLItem xmlItem : itemAttribute )
- {
- HSSFSheet sheet = wb.getSheetAt( xmlItem.getSheet() );
-
- // -----------------------------------------------------------------
- // Get value into Excel-file
- // -----------------------------------------------------------------
-
- String value = readValue( row, xmlItem.getColumn(), sheet );
-
- // -----------------------------------------------------------------
- // Import attribute value
- // -----------------------------------------------------------------
-
- int objectId = Integer.parseInt( xmlItem.getValue() );
- PatientAttribute attribute = patientAttributeService.getPatientAttribute( objectId );
-
- attributes.add( attribute );
- PatientAttributeValue attributeValue = new PatientAttributeValue();
- attributeValue.setPatient( patient );
- attributeValue.setPatientAttribute( attribute );
-
- // Attribute is combo-type
- if ( PatientAttribute.TYPE_COMBO.equalsIgnoreCase( attribute.getValueType() ) )
- {
- // value is the id of the option
- PatientAttributeOption option = patientAttributeOptionService.get( Integer
- .parseInt( value.split( ":" )[1] ) );
-
- if ( option != null )
- {
- attributeValue.setPatientAttributeOption( option );
- attributeValue.setValue( option.getName() );
- }
- }
- else
- {
- attributeValue.setValue( value.trim() );
- }
-
- attributeValues.add( attributeValue );
- }
-
- patient.setAttributes( attributes );
-
- return attributeValues;
- }
-
- private ProgramInstance getProgramInstance( Patient patient, Program program, int row, HSSFWorkbook wb )
- throws IllegalArgumentException, SecurityException, IllegalAccessException, InvocationTargetException,
- NoSuchMethodException
- {
- ProgramInstance programInstance = new ProgramInstance();
-
- for ( XMLItem xmlItem : itemEnrollProgram )
- {
- HSSFSheet sheet = wb.getSheetAt( xmlItem.getSheet() );
- String value = readValue( row, xmlItem.getColumn(), sheet );
-
- Date date = format.parseDate( value );
-
- ProgramInstance.class.getMethod( "set" + StringUtils.capitalize( xmlItem.getValue() ), Date.class ).invoke(
- programInstance, date );
-
- }
-
- // -------------------------------------------------------------
- // Enroll program
- // -------------------------------------------------------------
-
- programInstance.setProgram( program );
- programInstance.setPatient( patient );
- programInstance.setCompleted( false );
-
- patient.getPrograms().add( program );
-
- return programInstance;
- }
-
- private List<ProgramStageInstance> getProgramStageInstances( ProgramInstance programInstance, int row,
- HSSFWorkbook wb )
- {
-
- List<ProgramStageInstance> programStageInstances = new ArrayList<ProgramStageInstance>();
-
- Program program = programInstance.getProgram();
-
- for ( ProgramStage programStage : program.getProgramStages() )
- {
- ProgramStageInstance programStageInstance = new ProgramStageInstance();
- programStageInstance.setProgramInstance( programInstance );
- programStageInstance.setProgramStage( programStage );
- programStageInstance.setStageInProgram( programStage.getStageInProgram() );
-
- Date dueDate = DateUtils.getDateAfterAddition( programInstance.getDateOfIncident(), programStage
- .getMinDaysFromStart() );
-
- programStageInstance.setDueDate( dueDate );
-
- programStageInstances.add( programStageInstance );
- }
-
- return programStageInstances;
- }
-
- private Collection<PatientDataValue> getPatientDataValue( OrganisationUnit orgunit,
- ProgramInstance programInstance, List<ProgramStageInstance> stageInstances, int row, HSSFWorkbook wb )
- {
- Collection<PatientDataValue> dataValues = new HashSet<PatientDataValue>();
-
- for ( XMLItem xmlItem : itemProgramStage )
- {
- HSSFSheet sheet = wb.getSheetAt( xmlItem.getSheet() );
- String value = readValue( row, xmlItem.getColumn(), sheet );
-
- // -----------------------------------------------------------------
- // Create PatientDataValue
- // -----------------------------------------------------------------
-
- String[] infor = xmlItem.getValue().split( "\\." );
-
- ProgramStage stage = programStageService.getProgramStage( Integer.parseInt( infor[0] ) );
-
- DataElement dataElement = dataElementService.getDataElement( Integer.parseInt( infor[1] ) );
-
- if ( stage != null && dataElement != null )
- {
- ProgramStageInstance stageInstance = programStageInstanceService.getProgramStageInstance(
- programInstance, stage );
-
- PatientDataValue dataValue = new PatientDataValue();
-
- dataValue.setDataElement( dataElement );
- dataValue.setProgramStageInstance( stageInstance );
- dataValue.setOrganisationUnit( orgunit );
- dataValue.setTimestamp( new Date() );
- dataValue.setValue( value );
-
- dataValues.add( dataValue );
- }
- }
-
- return dataValues;
- }
-
- // -------------------------------------------------------------------------
- // Validate data from Excel file
- // -------------------------------------------------------------------------
-
- private boolean validatePatient( Patient patient, Collection<PatientIdentifierType> identifiers, int row )
- {
- // ---------------------------------------------------------------------
- // Validation information of the patient
- // ---------------------------------------------------------------------
-
- if ( patient.getFirstName() == null && patient.getMiddleName() == null && patient.getLastName() == null )
- {
- errPatients.put( row, patient );
- errMessage.put( row, i18n.getString( "patient_name_is_null" ) );
- return false;
- }
-
- if ( patient.getBirthDate() == null )
- {
- errPatients.put( row, patient );
- errMessage.put( row, i18n.getString( "birthday_is_null" ) );
- return false;
- }
-
- // ---------------------------------------------------------------------
- // Check duplicated patient
- // ---------------------------------------------------------------------
-
- Collection<Patient> patients = patientService.getPatient( patient.getFirstName(), patient.getMiddleName(),
- patient.getLastName(), patient.getBirthDate(), patient.getGender() );
-
- if ( patients != null && patients.size() > 0 )
- {
- errPatients.put( row, patient );
- errMessage.put( row, i18n.getString( "duplicate" ) );
- return false;
- }
-
- // ---------------------------------------------------------------------
- // Validation identifiers of the patient
- // ---------------------------------------------------------------------
-
- Collection<PatientIdentifierType> patientIdentifierTypes = new HashSet<PatientIdentifierType>();
-
- for ( PatientIdentifier patientIdentifier : patient.getIdentifiers() )
- {
- patientIdentifierTypes.add( patientIdentifier.getIdentifierType() );
- }
-
- if ( !patientIdentifierTypes.containsAll( identifiers ) )
- {
- errPatients.put( row, patient );
- errMessage.put( row, i18n.getString( "not_enough_mandatory_identifier" ) );
- return false;
- }
-
- return true;
- }
-
- private boolean validatePatientAttribute( Patient patient, Collection<PatientAttribute> attributes,
- Collection<PatientAttributeValue> attributeValues, int row )
- {
- Collection<PatientAttribute> patientAttributes = new HashSet<PatientAttribute>();
-
- for ( PatientAttributeValue attributeValue : attributeValues )
- {
- patientAttributes.add( attributeValue.getPatientAttribute() );
- }
-
- if ( !patientAttributes.containsAll( attributes ) )
- {
- errPatients.put( row, patient );
- errMessage.put( row, i18n.getString( "not_enough_madatory_attribute" ) );
- return false;
- }
-
- return true;
- }
-
- // -------------------------------------------------------------------------
- // Read template file
- // -------------------------------------------------------------------------
-
- private void readXMLTemplateFile()
- {
- // ---------------------------------------------------------------------
- // Get template-file
- // ---------------------------------------------------------------------
-
- String fileName = (String) systemSettingManager
- .getSystemSetting( SystemSettingManager.KEY_PATIENT_EXCEL_TEMPLATE_FILE_NAME );
-
- if ( fileName == null )
- {
- message = i18n.getString( "configuration_xml_file_null" );
-
- return;
- }
-
- String path = System.getenv( "DHIS2_HOME" );
-
- if ( path != null )
- {
- path += File.separator + fileName;
- }
- else
- {
- path = System.getenv( "user.home" ) + File.separator + "patienttemp" + File.separator + fileName;
- }
-
- // ---------------------------------------------------------------------
- // Get contents into template-file
- // ---------------------------------------------------------------------
-
- try
- {
- DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
- Document doc = docBuilder.parse( new File( path ) );
-
- if ( doc == null )
- {
- message = i18n.getString( "there_is_no_defination_xml_file_in_user_home" );
-
- return;
- }
-
- NodeList cellNode = doc.getElementsByTagName( "cell" );
-
- for ( int i = 0; i < cellNode.getLength(); i++ )
- {
- Element cellElement = (Element) cellNode.item( i );
-
- XMLItem item = new XMLItem();
-
- item.setValue( cellElement.getAttribute( "value" ) );
-
- item.setType( cellElement.getAttribute( "type" ) );
-
- item.setColumn( Integer.parseInt( cellElement.getAttribute( "colno" ) ) - 1 );
-
- item.setRow( Integer.parseInt( cellElement.getAttribute( "rowno" ) ) - 1 );
-
- item.setSheet( Integer.parseInt( cellElement.getAttribute( "sheetno" ) ) - 1 );
-
- if ( item.isType( XMLItem.ORGUNIT_TYPE ) )
- {
- xmlOrgunit = item;
- }
- else if ( item.isType( XMLItem.START_ROW_TYPE ) )
- {
- xmlStartRow = item;
- }
- else if ( item.isType( XMLItem.END_ROW_TYPE ) )
- {
- xmlEndRow = item;
- }
- else if ( item.isType( XMLItem.PROGRAM_TYPE ) )
- {
- xmlProgram = item;
- }
- else if ( item.isType( XMLItem.AGE_TYPE ) )
- {
- ageType = cellElement.getAttribute( "value" ).charAt( 0 );
- }
- else if ( item.isType( XMLItem.PROGRAM_ATTRIBUTE_TYPE ) )
- {
- itemEnrollProgram.add( item );
- }
- else if ( item.isType( XMLItem.PROGRAM_STAGE_TYPE ) )
- {
- itemProgramStage.add( item );
- }
- else if ( item.isType( XMLItem.ATTRIBUTE_TYPE ) )
- {
- itemAttribute.add( item );
- }
- else
- {
- itemProperty.add( item );
- }
- }
- }
- catch ( Exception t )
- {
- t.printStackTrace();
- }
- }
-
- private String readValue( int row, int column, Sheet sheet )
- {
- Cell cell = sheet.getRow( row ).getCell( column );
-
- String value = "";
-
- if ( cell != null )
- {
- switch ( cell.getCellType() )
- {
- case Cell.CELL_TYPE_NUMERIC:
-
- if ( HSSFDateUtil.isCellDateFormatted( cell ) )
- {
- value = format.formatDate( cell.getDateCellValue() );
- }
- else
- {
- value = String.valueOf( Math.round( cell.getNumericCellValue() ) );
- }
- break;
-
- case Cell.CELL_TYPE_BOOLEAN:
- value = String.valueOf( cell.getBooleanCellValue() );
- break;
-
- case Cell.CELL_TYPE_FORMULA:
- value = cell.getCellFormula();
- break;
-
- case Cell.CELL_TYPE_STRING:
- value = cell.getRichStringCellValue().toString();
- break;
- }
- }
-
- return value;
-
- }
-
- private void setObject( Patient patient, String property, String value )
- throws Exception
- {
- Type type = Patient.class.getMethod( "get" + StringUtils.capitalize( property ) ).getReturnType();
-
- // Get value
- if ( type == Integer.class || type == Integer.TYPE )
- {
- Integer object = Integer.valueOf( value );
- Patient.class.getMethod( "set" + StringUtils.capitalize( property ), Integer.class ).invoke( patient,
- object );
- }
- else if ( type.equals( Boolean.class ) || type == Boolean.TYPE )
- {
- Boolean object = Boolean.valueOf( value );
- Patient.class.getMethod( "set" + StringUtils.capitalize( property ), Boolean.class ).invoke( patient,
- object );
- }
- else if ( type.equals( Date.class ) )
- {
- Date object = format.parseDate( value.trim() );
- Patient.class.getMethod( "set" + StringUtils.capitalize( property ), Date.class ).invoke( patient, object );
- }
- else if ( type.equals( Character.class ) || type == Character.TYPE )
- {
- Character object = Character.valueOf( value.charAt( 0 ) );
- Patient.class.getMethod( "set" + StringUtils.capitalize( property ), Character.class ).invoke( patient,
- object );
- }
- else
- {
- Patient.class.getMethod( "set" + StringUtils.capitalize( property ), String.class ).invoke( patient, value );
- }
-
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ValidateUploadExcelFileAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ValidateUploadExcelFileAction.java 2012-01-11 05:31:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ValidateUploadExcelFileAction.java 1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2004-2012, 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.action.patientimport;
-
-import java.io.File;
-
-import org.hisp.dhis.i18n.I18n;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version ValidateUploadExcelFileAction.java Nov 16, 2010 1:19:57 PM
- */
-public class ValidateUploadExcelFileAction
- implements Action
-{
- private static final String CONTENT_TYPE_DEFAULT = "application/vnd.ms-excel";
-
- private static final String CONTENT_TYPE_OCTET_STREAM = "application/octet-stream";
-
- // -------------------------------------------------------------------------
- // Input & Output
- // -------------------------------------------------------------------------
-
- private String uploadContentType;
-
- public void setUploadContentType( String uploadContentType )
- {
- this.uploadContentType = uploadContentType;
- }
-
- private String message;
-
- public String getMessage()
- {
- return message;
- }
-
- private I18n i18n;
-
- public void setI18n( I18n i18n )
- {
- this.i18n = i18n;
- }
-
- private File upload;
-
- public File getUpload()
- {
- return upload;
- }
-
- public void setUpload( File upload )
- {
- this.upload = upload;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- if ( upload == null || !upload.exists() )
- {
- message = i18n.getString( "upload_file_null" );
-
- return ERROR;
- }
-
- if ( !CONTENT_TYPE_DEFAULT.equals( uploadContentType ) && !CONTENT_TYPE_OCTET_STREAM.equals( uploadContentType ) )
- {
- message = i18n.getString( "file_type_not_supported" );
-
- return ERROR;
- }
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/XMLItem.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/XMLItem.java 2012-01-11 05:31:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/XMLItem.java 1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2004-2012, 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.action.patientimport;
-
-/**
- * @author Chau Thu Tran
- *
- * @version ExcelItem.java Nov 12, 2010 1:07:17 PM
- */
-public class XMLItem
-{
- public static String ORGUNIT_TYPE = "orgunit";
-
- public static String START_ROW_TYPE = "startRow";
-
- public static String END_ROW_TYPE = "endRow";
-
- public static String PROPERTY_TYPE = "property";
-
- public static String ATTRIBUTE_TYPE = "attribute";
-
- public static String IDENTIFIER_TYPE = "identifier";
-
- public static String AGE_TYPE = "age-type";
-
- public static String BIRTH_DATE_FROM_VALUE = "birthDateFromAge";
-
- public static String PROGRAM_TYPE = "program";
-
- public static String PROGRAM_ATTRIBUTE_TYPE = "programAttr";
-
- public static String PROGRAM_STAGE_TYPE = "programStage";
-
- // -------------------------------------------------------------------------
- // Fields
- // -------------------------------------------------------------------------
-
- private int row;
-
- private int column;
-
- private int sheet;
-
- private String type;
-
- private String value;
-
- // -------------------------------------------------------------------------
- // Constructors
- // -------------------------------------------------------------------------
-
- public XMLItem()
- {
-
- }
-
- public XMLItem( int row, int column, int sheet, String type, String value )
- {
- this.row = row;
- this.column = column;
- this.type = type;
- this.value = value;
- this.sheet = sheet;
- }
-
- // -------------------------------------------------------------------------
- // Logic
- // -------------------------------------------------------------------------
-
- public boolean isType( String type )
- {
- return this.type.equalsIgnoreCase( type );
- }
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- public int getRow()
- {
- return row;
- }
-
- public void setRow( int row )
- {
- this.row = row;
- }
-
- public int getColumn()
- {
- return column;
- }
-
- public String getType()
- {
- return type;
- }
-
- public void setType( String type )
- {
- this.type = type;
- }
-
- public void setColumn( int column )
- {
- this.column = column;
- }
-
- public String getValue()
- {
- return value;
- }
-
- public void setValue( String value )
- {
- this.value = value;
- }
-
- public int getSheet()
- {
- return sheet;
- }
-
- public void setSheet( int sheet )
- {
- this.sheet = sheet;
- }
-}
=== 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 2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2012-02-15 06:47:14 +0000
@@ -875,78 +875,6 @@
ref="org.hisp.dhis.program.ProgramValidationService" />
</bean>
- <!-- Configuration -->
-
- <bean
- id="org.hisp.dhis.patient.action.configuration.GetPatientExcelItemplateFileAction"
- class="org.hisp.dhis.patient.action.configuration.GetPatientExcelItemplateFileAction"
- scope="prototype">
- <property name="systemSettingManager">
- <ref bean="org.hisp.dhis.setting.SystemSettingManager" />
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.patient.action.configuration.SetPatientExcelItemplateFileAction"
- class="org.hisp.dhis.patient.action.configuration.SetPatientExcelItemplateFileAction"
- scope="prototype">
- <property name="systemSettingManager">
- <ref bean="org.hisp.dhis.setting.SystemSettingManager" />
- </property>
- </bean>
-
- <!-- Import patient -->
-
- <bean
- id="org.hisp.dhis.patient.action.patientimport.ValidateUploadExcelFileAction"
- class="org.hisp.dhis.patient.action.patientimport.ValidateUploadExcelFileAction"
- scope="prototype">
- </bean>
-
- <bean id="org.hisp.dhis.patient.action.patientimport.ImportPatientAction"
- class="org.hisp.dhis.patient.action.patientimport.ImportPatientAction"
- scope="prototype">
- <property name="patientService">
- <ref bean="org.hisp.dhis.patient.PatientService" />
- </property>
- <property name="programInstanceService">
- <ref bean="org.hisp.dhis.program.ProgramInstanceService" />
- </property>
- <property name="programStageInstanceService">
- <ref bean="org.hisp.dhis.program.ProgramStageInstanceService" />
- </property>
- <property name="patientIdentifierTypeService">
- <ref bean="org.hisp.dhis.patient.PatientIdentifierTypeService" />
- </property>
- <property name="patientAttributeService">
- <ref bean="org.hisp.dhis.patient.PatientAttributeService" />
- </property>
- <property name="patientAttributeOptionService">
- <ref bean="org.hisp.dhis.patient.PatientAttributeOptionService" />
- </property>
- <property name="systemSettingManager">
- <ref bean="org.hisp.dhis.setting.SystemSettingManager" />
- </property>
- <property name="organisationUnitService">
- <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- </property>
- <property name="programService">
- <ref bean="org.hisp.dhis.program.ProgramService" />
- </property>
- <property name="programStageService">
- <ref bean="org.hisp.dhis.program.ProgramStageService" />
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService" />
- </property>
- <property name="patientDataValueService">
- <ref bean="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
- </property>
- <property name="patientAttributeValueService">
- <ref bean="org.hisp.dhis.patientattributevalue.PatientAttributeValueService" />
- </property>
- </bean>
-
<!-- Patient chart -->
<bean id="org.hisp.dhis.patient.action.patientchart.AddPatientChartAction"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2012-03-01 07:44:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2012-02-15 06:47:14 +0000
@@ -324,7 +324,7 @@
edit_single_program_validation=Edit single program validation
edit_multi_program_validation=Edit multi program validation
program_validation_details=Program Validation Details
-program_validation_management=Define program validation managenent
+program_validation_management=Program validation managenent
create_new_single_validation=Create new single validation
create_new_multi_validation=Create new multi validation
save_success=Save successfully
=== 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 2012-03-01 08:09:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2012-02-15 06:47:14 +0000
@@ -20,7 +20,7 @@
class="org.hisp.dhis.patient.action.relationship.GetRelationshipTypeListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/relationshipType.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
<param name="javascripts">javascript/relationship.js</param>
</action>
@@ -48,7 +48,6 @@
<action name="showAddRelationshipTypeForm" class="org.hisp.dhis.patient.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addRelationshipTypeForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/relationship.js</param>
<param name="requiredAuthorities">F_RELATIONSHIPTYPE_ADD</param>
</action>
@@ -57,7 +56,6 @@
class="org.hisp.dhis.patient.action.relationship.GetRelationshipTypeAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/relationship.js</param>
<param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param>
</action>
@@ -87,7 +85,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">
/dhis-web-maintenance-patient/patientAttribute.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
<param name="javascripts">javascript/patientAttribute.js</param>
</action>
@@ -132,7 +130,6 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">
/dhis-web-maintenance-patient/addPatientAttributeForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/patientAttribute.js</param>
<param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
</action>
@@ -142,7 +139,6 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">
/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/patientAttribute.js
,../dhis-web-commons/javascripts/jQuery/ui/jquery.cluetip.min.js</param>
<param name="stylesheets">../dhis-web-commons/javascripts/jQuery/ui/css/jquery.cluetip.css</param>
@@ -182,7 +178,7 @@
class="org.hisp.dhis.patient.action.orgunitregistration.GetPatientOrgnunitRegistrationAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/orgunitRegistration.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
</action>
@@ -198,7 +194,7 @@
class="org.hisp.dhis.patient.action.program.GetProgramListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/programList.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
<param name="javascripts">javascript/program.js</param>
</action>
@@ -225,11 +221,11 @@
<param name="requiredAuthorities">F_PROGRAM_ADD</param>
</action>
+
<action name="showAddProgramForm"
class="org.hisp.dhis.patient.action.program.ShowAddProgramFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addProgramForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/program.js</param>
<param name="requiredAuthorities">F_PROGRAM_ADD</param>
</action>
@@ -238,7 +234,6 @@
class="org.hisp.dhis.patient.action.program.GetProgramAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updateProgramForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/program.js</param>
<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
</action>
@@ -267,7 +262,7 @@
class="org.hisp.dhis.patient.action.program.GetProgramAttributeListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/programAttributeList.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
<param name="javascripts">javascript/programAttribute.js</param>
</action>
@@ -313,7 +308,6 @@
<action name="showAddProgramAttributeForm" class="org.hisp.dhis.patient.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addProgramAttributeForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/programAttribute.js</param>
<param name="requiredAuthorities">F_PROGRAM_ATTRIBUTE_ADD</param>
</action>
@@ -322,7 +316,6 @@
class="org.hisp.dhis.patient.action.program.GetProgramAttributeAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updateProgramAttributeForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/programAttribute.js</param>
<param name="requiredAuthorities">F_PROGRAM_ATTRIBUTE_UPDATE</param>
</action>
@@ -371,7 +364,6 @@
class="org.hisp.dhis.patient.action.programstage.GetProgramStageListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/programStageList.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/programStage.js</param>
</action>
@@ -389,7 +381,6 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">
/dhis-web-maintenance-patient/addProgramStageForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programStage.js</param>
<param name="stylesheets">/dhis-web-maintenance-patient/style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAMSTAGE_ADD</param>
@@ -423,7 +414,6 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">
/dhis-web-maintenance-patient/updateProgramStageForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programStage.js</param>
<param name="stylesheets">/dhis-web-maintenance-patient/style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAMSTAGE_UPDATE</param>
@@ -443,7 +433,6 @@
class="org.hisp.dhis.patient.action.programstage.ShowSortProgramStageFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/sortProgramStageForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="requiredAuthorities">F_PROGRAMSTAGE_ADD</param>
</action>
@@ -506,7 +495,7 @@
class="org.hisp.dhis.patient.action.patientattributegroup.GetPatientAttributeGroupListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/patientAttributeGroup.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
<param name="javascripts">javascript/patientAttributeGroup.js</param>
</action>
@@ -536,7 +525,6 @@
class="org.hisp.dhis.patient.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/patientAttributeGroup.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
@@ -546,7 +534,6 @@
class="org.hisp.dhis.patient.action.patientattributegroup.GetPatientAttributeGroupAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/patientAttributeGroup.js</param>
<param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param>
</action>
@@ -573,7 +560,6 @@
class="org.hisp.dhis.patient.action.patientattributegroup.GetPatientAttributeGroupListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/sortPatientAttributeGroupForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/patientAttributeGroup.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
@@ -591,7 +577,6 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">
/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/patientIdentifierType.js</param>
<param name="requiredAuthorities">F_PATIENTIDENTIFIERTYPE_ADD</param>
</action>
@@ -612,7 +597,6 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">
/dhis-web-maintenance-patient/updatePatientIdentifierType.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/patientIdentifierType.js</param>
<param name="requiredAuthorities">F_PATIENTIDENTIFIERTYPE_UPDATE</param>
</action>
@@ -622,7 +606,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">
/dhis-web-maintenance-patient/listPatientIdentifierType.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
<param name="javascripts">javascript/patientIdentifierType.js</param>
</action>
@@ -663,7 +647,7 @@
class="org.hisp.dhis.patient.action.caseaggregation.GetAllCaseAggregationConditionAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/caseAggregation.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
<param name="javascripts">javascript/caseaggregation.js</param>
</action>
@@ -671,7 +655,6 @@
class="org.hisp.dhis.patient.action.caseaggregation.ShowAddCaseAggregationConditionFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addCaseAggregation.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/commons.js,javascript/caseaggregation.js</param>
</action>
@@ -679,7 +662,6 @@
class="org.hisp.dhis.patient.action.caseaggregation.ShowUpdateCaseAggregationConditionFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updateCaseAggregation.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/commons.js,javascript/caseaggregation.js</param>
</action>
@@ -767,14 +749,13 @@
class="org.hisp.dhis.patient.action.validation.GetValidationCriteriaListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/validationCriteria.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
<param name="javascripts">javascript/validationcriteria.js</param>
</action>
<action name="showAddValidationCriteriaForm" class="org.hisp.dhis.patient.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addValidationCriteria.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/validationcriteria.js</param>
<param name="requiredAuthorities">F_VALIDATIONCRITERIA_ADD</param>
</action>
@@ -790,7 +771,6 @@
class="org.hisp.dhis.patient.action.validation.GetValidationCriteriaAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updateValidationCriteria.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/validationcriteria.js</param>
<param name="requiredAuthorities">F_VALIDATIONCRITERIA_UPDATE</param>
</action>
@@ -844,7 +824,6 @@
class="org.hisp.dhis.patient.action.validation.GetProgramValidationListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/programValidationList.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
</action>
@@ -853,7 +832,6 @@
class="org.hisp.dhis.patient.action.program.GetProgramAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addMultiProgramValidationForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
</action>
@@ -862,7 +840,6 @@
class="org.hisp.dhis.patient.action.program.GetProgramAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
</action>
@@ -871,7 +848,6 @@
class="org.hisp.dhis.patient.action.program.GetProgramAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addDateProgramValidationForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
</action>
@@ -887,7 +863,6 @@
class="org.hisp.dhis.patient.action.validation.GetProgramValidationAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
</action>
@@ -896,7 +871,6 @@
class="org.hisp.dhis.patient.action.validation.GetProgramValidationAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
</action>
@@ -942,58 +916,12 @@
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
</action>
- <!-- Configuration -->
-
- <action name="configuration"
- class="org.hisp.dhis.patient.action.configuration.GetPatientExcelItemplateFileAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/configurationParams.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/importMenu.vm</param>
- <param name="javascripts">javascript/import.js</param>
- </action>
-
- <action name="saveConfiguration"
- class="org.hisp.dhis.patient.action.configuration.SetPatientExcelItemplateFileAction">
- <result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- </action>
-
- <!-- Import Action -->
-
- <action name="importPatientForm" class="org.hisp.dhis.patient.action.NoAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/importPatientParams.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/importMenu.vm</param>
- <param name="javascripts">javascript/import.js</param>
- </action>
-
- <action name="validateUploadExcelFile"
- class="org.hisp.dhis.patient.action.patientimport.ValidateUploadExcelFileAction">
- <result name="success" type="velocity-xml">
- /dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
- <result name="error" type="velocity-xml">
- /dhis-web-commons/ajax/xmlResponseError.vm</result>
- <interceptor-ref name="fileUploadStack" />
- </action>
-
- <action name="importPatient"
- class="org.hisp.dhis.patient.action.patientimport.ImportPatientAction">
- <result name="success" type="velocity">/main.vm</result>
- <result name="error" type="velocity-xml">
- /dhis-web-commons/ajax/xmlResponseError.vm</result>
- <param name="page">/dhis-web-maintenance-patient/importPatientResult.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/importMenu.vm</param>
- <param name="javascripts">javascript/import.js</param>
- <interceptor-ref name="fileUploadStack" />
- </action>
-
<!-- Patient chart -->
<action name="patientChartList"
class="org.hisp.dhis.patient.action.patientchart.GetPatientChartListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/patientChartList.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
<param name="javascripts">javascript/patientChart.js</param>
</action>
@@ -1001,7 +929,6 @@
class="org.hisp.dhis.patient.action.patientchart.ShowAddPatientChartFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addPatientChartForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
</action>
<action name="addPatientChart"
@@ -1015,7 +942,6 @@
class="org.hisp.dhis.patient.action.patientchart.GetPatientChartAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updatePatientChartForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param>
</action>
<action name="updatePatientChart"
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/configurationParams.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/configurationParams.vm 2011-07-28 03:33:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/configurationParams.vm 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<h3>$i18n.getString('configuration') #openHelp( "import_beneficiary_configuration" )</h3>
-
-<form id="configurationParamsForm" action="saveConfiguration.action" method="post">
-<table>
- <tr>
- <td>$i18n.getString('patient_xml_template_file')</td>
- </tr>
- <tr>
- <td><input type="text" id="fileName" name="fileName" style="width:400px" value="$!fileName" class="{validate:{required:true}}"/></td>
- </tr>
- <tr>
- <td><input type="button" value="$i18n.getString('ok')" style="width:150px" onclick="saveConfiguration();"/>
- <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location='index.action'" style="width:150px">
- </td>
- </tr>
-</table>
-</form>
-
-<script>
- jQuery(document).ready(
- function()
- {
- validation( 'configurationParamsForm', function(form){ form.submit() })
- }
- );
-
- var i18n_save_successfull = '$encoder.jsEscape( $i18n.getString( "save_successfull" ) , "'" )';
-</script>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importMenu.vm 2010-12-09 08:20:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importMenu.vm 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<a href="index.action"><h2>$i18n.getString( "import" )</h2></a>
-<ul>
- <li><a href="configuration.action">$i18n.getString( "configuration" )</a></li>
- <li><a href="importPatientForm.action">$i18n.getString( "import_data" )</a></li>
-</ul>
-
-
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importPatientParams.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importPatientParams.vm 2011-07-28 03:33:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importPatientParams.vm 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<h3>$i18n.getString('import_data') #openHelp( "import_beneficiary_data" )</h3>
-
-<form name="importingParam" id="importingParam" action="importPatient.action" method="post" enctype="multipart/form-data">
-
-<table width="62%">
- <tr>
- <td width="18%" style=" width:25% ">$i18n.getString( 'excel_file' )</td>
- <td width="82%">
- <input type="file" id="upload" name="upload" onChange="enable('uploadButton');"/>
- <input name="uploadButton" id="uploadButton" type="button" value="$i18n.getString( 'upload' )" onclick='validateUploadExcelFile();' />
- </td>
- </tr>
-</table>
-</form>
-<hr/>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importPatientResult.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importPatientResult.vm 2011-06-01 09:12:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importPatientResult.vm 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-#parse( "/dhis-web-maintenance-patient/importPatientParams.vm" )
-
-#if( $errPatients.keySet() && $errPatients.keySet().size() > 0 )
-<h4>$i18n.getString( 'not_save_patient' )</h4>
-<table width=100%>
- <tr>
- <th>$i18n.getString('patient')</th>
- <th>$i18n.getString('row')</th>
- <th>$i18n.getString('reason')</th>
- </tr>
- #foreach($row in $errPatients.keySet())
- #set ($mark = false)
- <tr #alternate( $mark )>
- <td>$errPatients.get($row).getFullName()</td>
- <td>
- #set($index =$row + 1 )
- $index
- </td>
- <td>$errMessage.get($row)</td>
- </tr>
- #set ($mark = !$mark)
- #end
-</table>
-#end
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/import.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/import.js 2011-06-01 09:12:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/import.js 1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-//------------------------------------------------------------------------------
-// Save Configuration
-//------------------------------------------------------------------------------
-
-function saveConfiguration()
-{
- var url = 'saveConfiguration.action?' +
- 'fileName=' + getFieldValue( 'fileName' );
-
- var request = new Request();
- request.setResponseTypeXML( 'message' );
- request.setCallbackSuccess( saveConfigurationCompleted );
- request.send( url );
-
- return false;
-}
-
-function saveConfigurationCompleted( messageElement )
-{
- showSuccessMessage( i18n_save_successfull );
-}
-
-function validateUploadExcelFile()
-{
- jQuery( "#upload" ).upload( 'validateUploadExcelFile.action',
- function( data )
- {
- data = data.getElementsByTagName('message')[0];
- var type = data.getAttribute("type");
-
- if ( type=='error' ) showErrorMessage(data.firstChild.nodeValue);
- else uploadExcelImportPatient();
- }, 'xml'
- );
-}
-
-function uploadExcelImportPatient()
-{
- jQuery( "#upload" ).upload( 'importPatient.action',
- function(data)
- {
- data = data.getElementsByTagName('message')[0];
- if ( data != undefined )
- {
- var type = data.getAttribute("type");
- if ( type=='error' ) alert(data.firstChild.nodeValue);
- }
- else window.location.reload();
- }, 'xml'
- );
-}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm 2012-01-13 07:32:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm 2012-02-15 06:47:14 +0000
@@ -11,10 +11,4 @@
<li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li>
</ul>
-<h2>$i18n.getString( "import" )</h2>
-<ul>
- <li><a href="configuration.action">$i18n.getString( "configuration" )</a></li>
- <li><a href="importPatientForm.action">$i18n.getString( "import_data" )</a></li>
-</ul>
-
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm 2010-12-09 08:20:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-
-#parse( "/dhis-web-maintenance-patient/patientAndProgramMenu.vm" )
-
-#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2012-01-13 02:14:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2012-02-15 06:47:14 +0000
@@ -1,5 +1,5 @@
<h3>$i18n.getString( "program_validation_management" )</h3>
-
+<h4>$i18n.getString( "program_validation_management" )</h4>
<table class="mainPageTable">
<tr>
<td style="vertical-align:top">
