=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeComparator.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeComparator.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeComparator.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.comparator; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupComparator.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupComparator.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupComparator.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.comparator; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupSortOrderComparator.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupSortOrderComparator.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupSortOrderComparator.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.comparator; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/package-info.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/package-info.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/package-info.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/package-info.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/package-info.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/package-info.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientchart/package-info.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientchart/package-info.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientchart/package-info.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/package-info.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/package-info.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/package-info.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValue.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValue.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValue.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueService.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueService.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueStore.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueStore.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/package-info.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/package-info.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/package-info.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/package-info.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/package-info.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/package-info.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml' --- dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml 2012-01-11 05:31:53 +0000 @@ -2519,7 +2519,7 @@ Beneficiary registration Beneficiary registration section provides a mechanism for managing facilities which allow to registry new beneficiaries or not. To access the beneficiary registration maintenance module, choose Maintenance->Beneficiaries and Programs->Beneficiary Registration. - There are two processes for registering facilities. The first one is where the administrator will say which patients can register here. The second is where provides services ( Child Health program, Mother Care program, ...) for registered patients. + There are two process for registering facilities. The first one is where the administrator will say which facility can register. The second is when end user logs in and then select a facility, system will display a waring message if the selected facility cannot register beneficiaries; else, the system will display the functions to register beneficiaries.
Program === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/activityplan/DefaultActivityPlanService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/activityplan/DefaultActivityPlanService.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/activityplan/DefaultActivityPlanService.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.activityplan; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -204,7 +204,7 @@ Period period ) { String sql = convertCondition( aggregationCondition, orgunit, period ); - + Collection patientIds = aggregationConditionStore.executeSQL( sql ); if ( patientIds == null ) @@ -798,11 +798,11 @@ sql = "SELECT pi.patientid "; } - return sql + "FROM programstageinstance as psi " - + "INNER JOIN programinstance as pgi ON psi.programinstanceid = pgi.programinstanceid " - + "INNER JOIN patient as pi ON pi.patientid = pgi.patientid " + "WHERE pgi.programid=" + programId + " " - + "AND pi.organisationunitid = " + orgunitId + " " + "AND pgi.enrollmentdate >= '" + startDate - + "' AND pgi.enrollmentdate <= '" + endDate + "' "; + return sql + "FROM programinstance as pgi " + + "INNER JOIN patient as pi ON pi.patientid = pgi.patientid " + + "WHERE pgi.programid=" + programId + " " + + "AND pi.organisationunitid = " + orgunitId + " " + "AND pgi.enrollmentdate >= '" + startDate + + "' AND pgi.enrollmentdate <= '" + endDate + "' "; } private String getSQL( List conditions, List operators ) === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionStore.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionStore.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionStore.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientDeletionHandler.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientDeletionHandler.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientIdentifierDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientIdentifierDeletionHandler.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientIdentifierDeletionHandler.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientIdentifierTypeStore.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientIdentifierTypeStore.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientIdentifierTypeStore.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.hibernate; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/ProgramAttributePopulator.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/ProgramAttributePopulator.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/ProgramAttributePopulator.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueDeletionHandler.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueDeletionHandler.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patientdatavalue.aggregation; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/PatientDataValueAggregationEngine.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/PatientDataValueAggregationEngine.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/PatientDataValueAggregationEngine.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patientdatavalue.aggregation; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeOptionService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeOptionService.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeOptionService.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeService.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeService.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java 2012-01-11 05:01:23 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java 2012-01-11 05:31:53 +0000 @@ -539,7 +539,7 @@ // Add ProvidedByOtherFacility checkbox // ----------------------------------------------------------- - appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue, programStage ); + appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue ); } else { @@ -770,7 +770,7 @@ // Add ProvidedByOtherFacility checkbox // ----------------------------------------------------------- - appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue, programStage ); + appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue ); } // ----------------------------------------------------------- @@ -994,7 +994,7 @@ // Add ProvidedByOtherFacility checkbox // ----------------------------------------------------------- - appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue, programStage ); + appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue ); } // ----------------------------------------------------------- @@ -1223,7 +1223,7 @@ // Add ProvidedByOtherFacility checkbox // --------------------------------------------------------- - appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue, programStage ); + appendCode = addProvidedByOtherFacilityCheckbox( appendCode, patientDataValue ); } // ------------------------------------------------------------- @@ -1336,20 +1336,16 @@ * @param patientDataValue: currrent PatientDataValue * @return full html code after append the check box */ - private String addProvidedByOtherFacilityCheckbox( String appendCode, PatientDataValue patientDataValue, ProgramStage programStage ) + private String addProvidedByOtherFacilityCheckbox( String appendCode, PatientDataValue patientDataValue ) { - appendCode += ""; - - String display = ( programStage.getProgram().getAnonymous() ) ? "none" : "block"; - - appendCode = appendCode.replace( "$DISPLAY", display ); - + return appendCode; } === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2012-01-11 05:31:53 +0000 @@ -169,13 +169,13 @@ { return programStageInstanceStore.getProgramStageInstances( patient, completed ); } - + public List getProgramStageInstances( ProgramInstance programInstance, Date executionDate, int min, int max ) { return programStageInstanceStore.getProgramStageInstances( programInstance, executionDate, min, max ); } - public int countProgramStageInstances( ProgramInstance programInstance, Date executionDate) + public int countProgramStageInstances( ProgramInstance programInstance, Date executionDate ) { return programStageInstanceStore.countProgramStageInstances( programInstance, executionDate ); } === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.program; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeOptionStore.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeOptionStore.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeOptionStore.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeStore.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeStore.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeStore.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2012-01-11 05:01:23 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2012-01-11 05:31:53 +0000 @@ -32,7 +32,6 @@ import java.util.List; import org.hibernate.Query; -import org.hibernate.criterion.Order; import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; import org.hisp.dhis.hibernate.HibernateGenericStore; @@ -56,7 +55,7 @@ { List list = new ArrayList( getCriteria( Restrictions.eq( "programInstance", programInstance ), Restrictions.eq( "programStage", programStage ) ) - .addOrder( Order.asc( "id" ) ).list() ); + .list() ); return (list == null) ? null : list.get( list.size() - 1 ); } === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/DefaultProgramAttributeValueService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/DefaultProgramAttributeValueService.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/DefaultProgramAttributeValueService.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueDeletionHandler.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueDeletionHandler.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/hibernate/HibernateProgramAttributeValueStore.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/hibernate/HibernateProgramAttributeValueStore.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/hibernate/HibernateProgramAttributeValueStore.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2012-01-11 05:31:53 +0000 @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd -http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd +http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CreateAnonymousEncounterAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CreateAnonymousEncounterAction.java 2012-01-11 05:01:23 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CreateAnonymousEncounterAction.java 2012-01-11 05:31:53 +0000 @@ -129,7 +129,6 @@ programStageInstance.setStageInProgram( programInstance.getProgramStageInstances().size() + 1 ); programStageInstance.setDueDate( date ); programStageInstance.setExecutionDate( date ); - programStageInstance.setCompleted( false ); programStageInstanceService.addProgramStageInstance( programStageInstance ); === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetEventsByProgramAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetEventsByProgramAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetEventsByProgramAction.java 2012-01-11 05:31:53 +0000 @@ -113,13 +113,13 @@ ProgramInstance programInstance = programInstanceService.getProgramInstance( programInstanceId ); Date dateValue = format.parseDate( executionDate ); - + total = programStageInstanceService.countProgramStageInstances( programInstance, dateValue ); this.paging = createPaging( total ); - programStageInstances = programStageInstanceService.getProgramStageInstances( programInstance, dateValue, paging - .getStartPos(), paging.getPageSize() ); + programStageInstances = programStageInstanceService.getProgramStageInstances( programInstance, dateValue, + paging.getStartPos(), paging.getPageSize() ); return SUCCESS; } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java 2012-01-11 05:31:53 +0000 @@ -259,7 +259,7 @@ { patientIdentifier = patientIdentifierService.getPatientIdentifier( patient ); } - + selectedStateManager.setSelectedProgramStageInstance( programStageInstance ); selectedStateManager.setSelectedProgramStageInstance( programStageInstance ); === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientProgramEnrollmentAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientProgramEnrollmentAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientProgramEnrollmentAction.java 2012-01-11 05:31:53 +0000 @@ -132,46 +132,84 @@ if ( criteria != null ) { - message = i18n.getString("violate_validation_criteria") + ": " + i18n.getString( criteria.getProperty() ); - - switch ( criteria.getOperator() ) - { - - case ValidationCriteria.OPERATOR_EQUAL_TO: - message += " = "; - break; - case ValidationCriteria.OPERATOR_GREATER_THAN: - message += " > "; - break; - default: - message += " < "; - break; - } - - if ( criteria.getProperty() == "birthDate" ) - { - message += " " + format.formatValue( criteria.getValue() ); - } - else - { - message += " " + criteria.getValue().toString(); - } - - return INPUT; - } - - Date DateOfEnrollment = format.parseDate( enrollmentDate ); - - Date DateOfIncident = format.parseDate( dateOfIncident ); - - if ( DateOfEnrollment.before( DateOfIncident ) ) - { - message = program.getDateOfEnrollmentDescription() + " " - + i18n.getString( "have_to_be_greater_or_equals_to" ) + " " + program.getDateOfIncidentDescription(); - - return INPUT; - - } + message = i18n.getString( "can_not_enroll_into_the_program_because" ) + " " + criteria.getName(); + return INPUT; + } + + if ( enrollmentDate == null ) + { + message = i18n.getString( "can_not_enrol_into_the_program_because" ); + + return INPUT; + } + + else + { + enrollmentDate = enrollmentDate.trim(); + + if ( enrollmentDate.length() == 0 ) + { + message = i18n.getString( "please_specify_enrollment_date" ); + + return INPUT; + } + + if ( enrollmentDate.length() != 0 ) + { + Date DateOfEnrollment = format.parseDate( enrollmentDate ); + + if ( DateOfEnrollment == null ) + { + message = i18n.getString( "please_specify_a_valid_enrollment_date" ); + + return INPUT; + } + } + } + + if ( dateOfIncident == null ) + { + message = i18n.getString( "please_specify_date_of_incident" ); + + return INPUT; + } + + else + { + dateOfIncident = dateOfIncident.trim(); + + if ( dateOfIncident.length() == 0 ) + { + message = i18n.getString( "please_specify_date_of_incident" ); + + return INPUT; + } + + if ( dateOfIncident.length() != 0 ) + { + Date DateOfIncident = format.parseDate( dateOfIncident ); + + if ( DateOfIncident == null ) + { + message = i18n.getString( "please_specify_a_valid_date_of_incident" ); + + return INPUT; + } + + Date DateOfEnrollment = format.parseDate( enrollmentDate ); + + if ( DateOfEnrollment.before( DateOfIncident ) ) + { + message = i18n.getString( "date_of_incident_invalid" ); + + return INPUT; + } + } + } + + // --------------------------------------------------------------------- + // Validation success + // --------------------------------------------------------------------- message = i18n.getString( "everything_is_ok" ); === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2012-01-11 05:31:53 +0000 @@ -2,7 +2,7 @@ +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> @@ -397,15 +397,15 @@ - + - - + class="org.hisp.dhis.caseentry.action.caseentry.GetEventsByProgramAction" scope="prototype"> + + - + /content.vm /dhis-web-caseentry/dataentryRecords.vm - - style/patient.css + javascript/customcheckbox/prettyCheckboxes.js + style/patient.css,javascript/customcheckbox/prettyCheckboxes.css ,../dhis-web-commons/paging/paging.css @@ -156,9 +156,7 @@ class="org.hisp.dhis.caseentry.action.caseentry.ProgramStageCustomDataEntryAction"> /content.vm /dhis-web-caseentry/programStageDataEntryForm.vm - javascript/form.js,javascript/entry.js - ,javascript/customcheckbox/prettyCheckboxes.js,../dhis-web-commons/javascripts/date.js - javascript/customcheckbox/prettyCheckboxes.css + javascript/form.js,javascript/entry.js,../dhis-web-commons/javascripts/date.js - /content.vm /dhis-web-caseentry/historyAnonymousEvents.vm javascript/anonymousRegistration.js - ../dhis-web-caseentry/style/patient.css, - ../dhis-web-commons/paging/paging.css - - - - /content.vm - /dhis-web-caseentry/dataEntryForm.vm - - + ../dhis-web-caseentry/style/patient.css, + ../dhis-web-commons/paging/paging.css + + + + /content.vm + /dhis-web-caseentry/dataEntryForm.vm + + - #if( $!programStageInstance.programStage.program.anonymous == 'false' ) - initCustomCheckboxes(); - #end + initCustomCheckboxes(); #else @@ -60,7 +58,7 @@ $i18n.getString( "data_element" ) $i18n.getString( "entry" ) #if( $programStageInstance.programInstance.program.anonymous == 'false' ) - $i18n.getString( "provided_elsewhere" ) + $i18n.getString( "provided_elsewhere" ) #end #set( $dataElementRowCount = 0 ) @@ -119,12 +117,13 @@ #end #end - - - #set( $id = $programStageDataElement.programStage.id + '_' + $programStageDataElement.dataElement.id + '_facility' ) - ##providedByAnotherFacility - #if( $programStageInstance.programInstance.program.anonymous == 'false' ) + + + #if($programStageInstance.programInstance.program.anonymous == 'false') + + ##providedByAnotherFacility + #set( $id = $programStageDataElement.programStage.id + '_' + $programStageDataElement.dataElement.id + '_facility' ) #if ( $patientDataValue.value ) #if( !$patientDataValue.providedByAnotherFacility ) $patientDataValue.organisationUnit.name @@ -136,11 +135,10 @@ #else #end - + + + #end - #else - - #end #set( $tabIndex = $tabIndex + 1 ) #end === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2012-01-11 05:31:53 +0000 @@ -1,35 +1,31 @@ -
- + - - - - - +
- - - - - - - - - - - - - - - -
$i18n.getString( "full_name" ):$encoder.htmlEncode( $patient.getFullName() ) -
$i18n.getString( "gender" ):$i18n.getString( $patient.gender )
$i18n.getString( "date_of_birth" ):$format.formatDate( $patient.birthDate ) -
$i18n.getString( "age" ):$encoder.htmlEncode( $patient.getAge() )
- 		+ + + + + + + + + + + + + + + + +
$i18n.getString( "full_name" ):$encoder.htmlEncode( $patient.getFullName() ) +
$i18n.getString( "gender" ):$i18n.getString( $patient.gender )
$i18n.getString( "date_of_birth" ):$format.formatDate( $patient.birthDate ) +
$i18n.getString( "age" ):$encoder.htmlEncode( $patient.getAge() )
+
@@ -99,16 +95,3 @@ - -
- - === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2012-01-11 05:31:53 +0000 @@ -35,17 +35,13 @@ setInnerHTML( 'currentSelection', '' ); var history = '

' + i18n_program_stages_history_plan + '

'; history += ''; - history += ''; - history += ''; - history += ''; - history += ''; for ( i in json.programStageInstances ) { - history += ''; + history += ''; history += ''; - history += ''; history += ''; @@ -837,4 +833,4 @@ { loadDataEntry(); }); -} +} \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2012-01-11 05:31:53 +0000 @@ -480,7 +480,6 @@ hideById('programEnrollmentDiv'); - hideEnrolmentField(); return; } @@ -492,7 +491,6 @@ }, function() { showById('programEnrollmentDiv'); - showEnrolmentField(); var singleEvent = jQuery('#programId option:selected').attr('singleevent'); if(singleEvent=='true') @@ -523,9 +521,6 @@ url: 'validatePatientProgramEnrollment.action', data: getParamsForDiv('programEnrollmentSelectDiv'), success: function(json) { - - hideById('message'); - var type = json.response; if ( type == 'success' ) { @@ -533,11 +528,11 @@ } else if ( type == 'error' ) { - setMessage( i18n_program_enrollment_failed + ':' + '\n' + message ); + showErrorMessage( i18n_program_enrollment_failed + ':' + '\n' + message ); } else if ( type == 'input' ) { - setMessage( json.message ); + showWarningMessage( json.message ); } } }); @@ -899,17 +894,3 @@ height: 300 }); } - -function hideEnrolmentField( ) -{ - hideById('enrollmentDateTR'); - hideById('dateOfIncidentTR'); - hideById('enrollBtn'); -} - -function showEnrolmentField( ) -{ - showById('enrollmentDateTR'); - showById('dateOfIncidentTR'); - showById('enrollBtn'); -} === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2012-01-11 05:31:53 +0000 @@ -1,6 +1,6 @@ -#if( $programStageInstances.size() > 0 ) +#if( $programStageInstances )
' + i18n_program_stage + '' + i18n_scheduled_for + '
'; - history += '' + json.programStageInstances[i].name + ''; + history += '' + json.programStageInstances[i].name + ''; history += ''; + history += ''; history += json.programStageInstances[i].infor; history += '
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm 2012-01-11 05:31:53 +0000 @@ -1,6 +1,6 @@

$i18n.getString( "patient_registered" )

- +
@@ -55,28 +55,26 @@
- - - + + + - - - + + + + - - -
- +
@@ -88,17 +86,13 @@ - + \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css 2012-01-11 05:31:53 +0000 @@ -64,7 +64,3 @@ text-align: right; } -td.row -{ -border-bottom-style:dotted; -} \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/AddCaseAggregationConditionAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/AddCaseAggregationConditionAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/AddCaseAggregationConditionAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggConditionDescriptionAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggConditionDescriptionAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggConditionDescriptionAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggDataElementsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggDataElementsAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggDataElementsAction.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.action.caseaggregation; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggPSDataElementsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggPSDataElementsAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggPSDataElementsAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAllCaseAggregationConditionAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAllCaseAggregationConditionAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAllCaseAggregationConditionAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetCaseAggregationConditionAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetCaseAggregationConditionAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetCaseAggregationConditionAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetPSDataElementsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetPSDataElementsAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetPSDataElementsAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -119,17 +119,6 @@ { DataElement de = deIterator.next(); - if ( de.getType().equals( DataElement.VALUE_TYPE_STRING ) && de.isMultiDimensional() ) - { - optionComboIds.add( "[DE:" + psId + "." + de.getId() + ".0]" ); - - optionComboNames.add( de.getName() ); - - optionComboType.add( "1:" + de.getType() ); - - continue; - } - DataElementCategoryCombo dataElementCategoryCombo = de.getCategoryCombo(); List optionCombos = new ArrayList( === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetProgramStagesAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetProgramStagesAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetProgramStagesAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/RemoveCaseAggregationConditionAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/RemoveCaseAggregationConditionAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/RemoveCaseAggregationConditionAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/TestCaseAggregationConditionAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/TestCaseAggregationConditionAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/TestCaseAggregationConditionAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/UpdateCaseAggregationConditionAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/UpdateCaseAggregationConditionAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/UpdateCaseAggregationConditionAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/GetPatientExcelItemplateFileAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/GetPatientExcelItemplateFileAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/GetPatientExcelItemplateFileAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/SetPatientExcelItemplateFileAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/SetPatientExcelItemplateFileAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/SetPatientExcelItemplateFileAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/DelDataEntryFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/DelDataEntryFormAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/DelDataEntryFormAction.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.action.dataentryform; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/GetSelectedDataElementsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/GetSelectedDataElementsAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/GetSelectedDataElementsAction.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.action.dataentryform; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SaveDataEntryFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SaveDataEntryFormAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SaveDataEntryFormAction.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.action.dataentryform; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectDataElementAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectDataElementAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectDataElementAction.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.action.dataentryform; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectProgramStageDataElementAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectProgramStageDataElementAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectProgramStageDataElementAction.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.action.dataentryform; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ValidateDataEntryFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ValidateDataEntryFormAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ValidateDataEntryFormAction.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.action.dataentryform; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === 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 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.action.dataentryform; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/DefinePatientOrgnunitRegistrationAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/DefinePatientOrgnunitRegistrationAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/DefinePatientOrgnunitRegistrationAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/GetPatientOrgnunitRegistrationAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/GetPatientOrgnunitRegistrationAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/GetPatientOrgnunitRegistrationAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/GetPatientAttributesWithoutGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/GetPatientAttributesWithoutGroupAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/GetPatientAttributesWithoutGroupAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientchart/ValidatePatientChartAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientchart/ValidatePatientChartAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientchart/ValidatePatientChartAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified 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-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ImportPatientAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified 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 03:37:02 +0000 +++ 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified 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 03:37:02 +0000 +++ 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAttributeAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAttributeAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAttributeAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/DefineProgramAssociationsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/DefineProgramAssociationsAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/DefineProgramAssociationsAction.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.action.program; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeListAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeListAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/RemoveProgramAttributeAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/RemoveProgramAttributeAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/RemoveProgramAttributeAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAttributeAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAttributeAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAttributeAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/AddProgramValidationAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/AddProgramValidationAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/AddProgramValidationAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/DefineProgramListForValidationCriteriaAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/DefineProgramListForValidationCriteriaAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/DefineProgramListForValidationCriteriaAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramListForValidationCriteriaAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramListForValidationCriteriaAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramListForValidationCriteriaAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationListAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationListAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/RemoveProgramValidationAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/RemoveProgramValidationAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/RemoveProgramValidationAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/UpdateProgramValidationAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/UpdateProgramValidationAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/UpdateProgramValidationAction.java 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/ValidateValidationCriteriaAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/ValidateValidationCriteriaAction.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/ValidateValidationCriteriaAction.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.action.validation; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/DefaultSelectedStateManager.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/DefaultSelectedStateManager.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/DefaultSelectedStateManager.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.state; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/SelectedStateManager.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/SelectedStateManager.java 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/SelectedStateManager.java 2012-01-11 05:31:53 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.patient.state; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2012, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === 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-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2012-01-11 05:31:53 +0000 @@ -2,7 +2,7 @@ +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> === 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-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2012-01-11 05:31:53 +0000 @@ -33,7 +33,6 @@ please_select=Please Select patients_and_programs=Beneficiaries and Programs is=is -'s='s please_select_relationship_type=Please select relationship type confirm_delete_relationship_type=Are you sure you want to delete relationship type? relationship_type=Relationship Type @@ -84,8 +83,8 @@ unselect_all_in_group=Unselect all in group unselect_all_at_level=Unselect all at level select_all_at_level=Select all at level -assign_program_to_orgunits=Assign program to organisation units -assign_program_to_orgunits_for_registering=Assign program to organisation units for registering +define_associations=Define Association +define_program_associations=Define Program Associations programs=Programs selected_programs=Selected Programs available_programs=Available Programs @@ -386,8 +385,4 @@ irregular_encounter=Irregular encounter date_of_birth=Date of Birth anonymous=Anonymous -edit_program_validation = Edit program validation -age = Age -birthDate = Birthdate -violate_validation_criteria = Violate validation criteria -assign_validation_for_programs = Assign validation for programs \ No newline at end of file +edit_program_validation = Edit program validation \ 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/addCaseAggregation.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm 2012-01-11 05:31:53 +0000 @@ -29,7 +29,7 @@ - #foreach( $dataElementGroup in $dataElementGroups) @@ -42,7 +42,7 @@ - === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm 2012-01-11 05:31:53 +0000 @@ -68,7 +68,10 @@ $i18n.getString( "available_data_elements" ) - $i18n.getString( "selected_data_elements" ) + $i18n.getString( "selected_data_elements" ) + + + @@ -96,12 +99,9 @@



- - + - -

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm 2012-01-11 05:31:53 +0000 @@ -51,6 +51,7 @@

$i18n.getString(
+





=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2012-01-11 05:31:53 +0000 @@ -148,6 +148,7 @@ { jQuery.post( 'getCaseAggregation.action', { id:caseAggregationId }, function ( json ) { + setInnerHTML( 'idField', json.caseAggregation.id ); setInnerHTML( 'descriptionField', json.caseAggregation.description ); setInnerHTML( 'operatorField', json.caseAggregation.operator ); setInnerHTML( 'aggregationDataElementField', json.caseAggregation.aggregationDataElement ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2012-01-11 05:31:53 +0000 @@ -6,6 +6,7 @@ { jQuery.post( 'getPatientAttribute.action', { id: patientAttributeId }, function ( json ) { + setInnerHTML( 'idField', json.patientAttribute.id ); setInnerHTML( 'nameField', json.patientAttribute.name ); setInnerHTML( 'descriptionField', json.patientAttribute.description ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js 2012-01-11 05:31:53 +0000 @@ -7,6 +7,7 @@ jQuery.post( 'getPatientAttributeGroup.action', { id: patientAttributeGroupId }, function ( json ) { + setInnerHTML( 'idField', json.patientAttributeGroup.id ); setInnerHTML( 'nameField', json.patientAttributeGroup.name ); setInnerHTML( 'descriptionField', json.patientAttributeGroup.description ); setInnerHTML( 'noAttributeField', json.patientAttributeGroup.noAttribute ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientChart.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientChart.js 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientChart.js 2012-01-11 05:31:53 +0000 @@ -4,6 +4,7 @@ jQuery.postJSON( "getPatientChart.action", { id:patientChartId }, function(json){ + setInnerHTML( 'idField', json.id ); setInnerHTML( 'titleField', json.title ); var typeMap = { === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js 2012-01-11 05:31:53 +0000 @@ -6,6 +6,7 @@ { jQuery.post( 'getPatientIdentifierType.action', { id: patientIdentifierTypeId }, function ( json ) { + setInnerHTML( 'idField', json.patientIdentifierType.id ); setInnerHTML( 'nameField', json.patientIdentifierType.name ); setInnerHTML( 'descriptionField', json.patientIdentifierType.description ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2012-01-11 05:31:53 +0000 @@ -7,6 +7,7 @@ jQuery.post( "getProgram.action", { id:programId }, function(json){ + setInnerHTML( 'idField', json.program.id ); setInnerHTML( 'nameField', json.program.name ); setInnerHTML( 'descriptionField', json.program.description ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js 2012-01-11 05:31:53 +0000 @@ -5,6 +5,7 @@ function showProgramAttributeDetails( programAttributeId ) { jQuery.post( 'getProgramAttribute.action', { id: programAttributeId }, function ( json ) { + setInnerHTML( 'idField', json.programAttribute.id ); setInnerHTML( 'nameField', json.programAttribute.name ); setInnerHTML( 'descriptionField', json.programAttribute.description ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js 2012-01-11 05:31:53 +0000 @@ -39,6 +39,7 @@ function showProgramStageDetails( programStageId ) { jQuery.post( 'getProgramStage.action', { id: programStageId }, function ( json ) { + setInnerHTML( 'idField', json.programStage.id ); setInnerHTML( 'nameField', json.programStage.name ); setInnerHTML( 'descriptionField', json.programStage.description ); setInnerHTML( 'stageInProgramField', json.programStage.stageInProgram ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programValidation.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programValidation.js 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programValidation.js 2012-01-11 05:31:53 +0000 @@ -12,6 +12,7 @@ function showProgramValidationDetails ( programValidationId ) { jQuery.post( 'getProgramValidation.action', { validationId: programValidationId }, function ( json ) { + setInnerHTML( 'idField', json.validation.id ); setInnerHTML( 'descriptionField', json.validation.description ); setInnerHTML( 'leftSideField', json.validation.leftSide ); if( json.validation.rightSide != '1==1') === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js 2012-01-11 05:31:53 +0000 @@ -5,6 +5,7 @@ function showRelationshipTypeDetails( relationshipTypeId ) { jQuery.post( 'getRelationshipType.action', { id: relationshipTypeId }, function ( json ) { + setInnerHTML( 'idField', json.relationshipType.id ); setInnerHTML( 'aIsToBField', json.relationshipType.aIsToB ); setInnerHTML( 'bIsToAField', json.relationshipType.bIsToA ); setInnerHTML( 'descriptionField', json.relationshipType.description ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js 2012-01-11 05:31:53 +0000 @@ -14,6 +14,7 @@ function showValidationCriteriaDetails( criteriaId ) { jQuery.post( 'getValidationCriteria.action', { id: criteriaId }, function ( json ) { + setInnerHTML( 'idField', json.validationCriteria.id ); setInnerHTML( 'nameField', json.validationCriteria.name ); setInnerHTML( 'descriptionField', json.validationCriteria.description ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2012-01-11 05:31:53 +0000 @@ -49,6 +49,7 @@
$i18n.getString( 'hide_details' )
+





=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2012-01-11 05:31:53 +0000 @@ -55,6 +55,7 @@
$i18n.getString( 'hide_details' )
+





=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm 2012-01-11 05:31:53 +0000 @@ -53,6 +53,7 @@
$i18n.getString( 'hide_details' )
+





=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientChartList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientChartList.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientChartList.vm 2012-01-11 05:31:53 +0000 @@ -43,6 +43,7 @@
$i18n.getString( 'hide_details' )
+





=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ -

$i18n.getString( "assign_program_to_orgunits_for_registering" )

+

$i18n.getString( "define_program_associations" )

$encoder.htmlEncode( $program.name )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm 2012-01-11 05:31:53 +0000 @@ -52,6 +52,7 @@
$i18n.getString( 'hide_details' )
+





=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2012-01-11 05:31:53 +0000 @@ -23,9 +23,9 @@ $encoder.htmlEncode( $program.name ) - $i18n.getString( 'assign_program_to_orgunits' ) + $i18n.getString( 'define_associations' ) #if( $program.anonymous=='false') - $i18n.getString( 'program_validation_management' ) + $i18n.getString( 'define_program_validation' ) #else        #end @@ -48,6 +48,7 @@
$i18n.getString(
+





=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm 2012-01-11 05:31:53 +0000 @@ -59,6 +59,7 @@
$i18n.getString(
+





=== 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-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2012-01-11 05:31:53 +0000 @@ -47,6 +47,7 @@
$i18n.getString(
+





=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm 2012-01-11 05:31:53 +0000 @@ -1,5 +1,5 @@ -

$i18n.getString( "assign_validation_for_programs" )

+

$i18n.getString( "define_program_associations" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm 2012-01-11 05:31:53 +0000 @@ -54,6 +54,7 @@
$i18n.getString( 'hide_details' )
+





=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2012-01-11 05:31:53 +0000 @@ -31,7 +31,7 @@ === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2012-01-11 05:31:53 +0000 @@ -83,7 +83,10 @@ - + @@ -105,7 +108,7 @@ #foreach ( $programStageDataElement in $programStageDataElements ) - + @@ -123,8 +126,6 @@
- #foreach( $dataElementGroup in $dataElementGroups) @@ -44,7 +44,7 @@
-
$i18n.getString( "available_data_elements" ) $i18n.getString( "selected_data_elements" )$i18n.getString( "selected_data_elements" ) + + +
$encoder.htmlEncode( $programStageDataElement.dataElement.name )
- -

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm 2012-01-11 03:37:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm 2012-01-11 05:31:53 +0000 @@ -26,7 +26,7 @@ $criteria.name - $i18n.getString( 'assign_validation_for_programs' ) + $i18n.getString( 'assign_program' ) $i18n.getString( 'edit' ) $i18n.getString( 'remove' ) $i18n.getString( 'show_details' ) @@ -41,6 +41,7 @@

$i18n.getString( 'hide_details' )
+