=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/DefineCriteriaAssociationsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/DefineCriteriaAssociationsAction.java 2010-05-17 02:59:28 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/DefineCriteriaAssociationsAction.java 1970-01-01 00:00:00 +0000 @@ -1,107 +0,0 @@ -/* - * Copyright (c) 2004-2010, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package org.hisp.dhis.patient.action.program; - -import java.util.HashSet; -import java.util.Set; - -import org.hisp.dhis.program.Program; -import org.hisp.dhis.program.ProgramService; -import org.hisp.dhis.validation.ValidationCriteria; -import org.hisp.dhis.validation.ValidationCriteriaService; - -import com.opensymphony.xwork2.Action; - -/** - * @author Chau Thu Tran - * @version DefineCriteriaAssociationsAction.java May 4, 2010 11:25:46 AM - */ -public class DefineCriteriaAssociationsAction implements Action { - // ------------------------------------------------------------------------- - // Dependencies - // ------------------------------------------------------------------------- - - private ProgramService programService; - - private ValidationCriteriaService validationCriteriaService; - - // ------------------------------------------------------------------------- - // Input - // ------------------------------------------------------------------------- - - private Integer programId; - - private Integer[] criteriaIds; - - // ------------------------------------------------------------------------- - // Setters - // ------------------------------------------------------------------------- - - public void setProgramService(ProgramService programService) { - this.programService = programService; - } - - public void setValidationCriteriaService( - ValidationCriteriaService validationCriteriaService) { - this.validationCriteriaService = validationCriteriaService; - } - - public void setProgramId(Integer programId) { - this.programId = programId; - } - - public void setCriteriaIds(Integer[] criteriaIds) { - this.criteriaIds = criteriaIds; - } - - // ------------------------------------------------------------------------- - // Action implementation - // ------------------------------------------------------------------------- - - @Override - public String execute() throws Exception { - - Program program = programService.getProgram(programId); - - Set criteria = new HashSet(); - - if (criteriaIds != null) { - - for (Integer id : criteriaIds) { - - criteria.add(validationCriteriaService.getValidationCriteria(id)); - } - } - - program.setPatientValidationCriteria(criteria); - - programService.updateProgram(program); - - return SUCCESS; - } -} === removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowValidationCriteriaAssociationsFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowValidationCriteriaAssociationsFormAction.java 2010-05-14 02:25:11 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowValidationCriteriaAssociationsFormAction.java 1970-01-01 00:00:00 +0000 @@ -1,131 +0,0 @@ -/* - * Copyright (c) 2004-2010, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package org.hisp.dhis.patient.action.program; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import org.hisp.dhis.program.Program; -import org.hisp.dhis.program.ProgramService; -import org.hisp.dhis.program.ProgramStage; -import org.hisp.dhis.validation.ValidationCriteria; -import org.hisp.dhis.validation.ValidationCriteriaService; -import org.hisp.dhis.validation.comparator.ValidationCriteriaComparator; - -import com.opensymphony.xwork2.Action; - -/** - * @author Chau Thu Tran - * @version ShowValidationAssociationFormAction.java May 5, 2010 9:35:09 AM - */ -public class ShowValidationCriteriaAssociationsFormAction - implements Action -{ - - // ------------------------------------------------------------------------- - // Dependencies - // ------------------------------------------------------------------------- - - private ProgramService programService; - - private ValidationCriteriaService validationCriteriaService; - - // ------------------------------------------------------------------------- - // Input - // ------------------------------------------------------------------------- - - private Integer id; - - // ------------------------------------------------------------------------- - // Output - // ------------------------------------------------------------------------- - - private Program program; - - private Collection stages; - - private List criteria; - - // ------------------------------------------------------------------------- - // Getters && Setters - // ------------------------------------------------------------------------- - - public void setValidationCriteriaService( ValidationCriteriaService validationCriteriaService ) - { - this.validationCriteriaService = validationCriteriaService; - } - - public Program getProgram() - { - return program; - } - - public List getCriteria() - { - return criteria; - } - - public void setProgramService( ProgramService programService ) - { - this.programService = programService; - } - - public Collection getStages() - { - return stages; - } - - public void setId( Integer id ) - { - this.id = id; - } - - // ------------------------------------------------------------------------- - // Action implementation - // ------------------------------------------------------------------------- - - @Override - public String execute() - throws Exception - { - program = programService.getProgram( id ); - - // Get validation-criteria - - criteria = new ArrayList( validationCriteriaService.getAllValidationCriterias() ); - - criteria.removeAll( program.getPatientValidationCriteria() ); - - Collections.sort( criteria, new ValidationCriteriaComparator() ); - - return SUCCESS; - } - -} === 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 2010-10-20 07:16:54 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2010-10-20 12:11:27 +0000 @@ -621,24 +621,6 @@ - - - - - - - - - - - - program.action F_PROGRAM_UPDATE - - - - - /main.vm - /dhis-web-maintenance-patient/validationCriteriaAssociations.vm - - ,javascript/program.js - - F_PROGRAM_UPDATE - - - - - /dhis-web-maintenance-patient/responseSuccess.vm - F_PROGRAM_UPDATE - - + - $i18n.getString( - - - $i18n.getString( === removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteriaAssociations.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteriaAssociations.vm 2010-05-14 04:13:36 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteriaAssociations.vm 1970-01-01 00:00:00 +0000 @@ -1,50 +0,0 @@ - -

$i18n.getString( "define_validation_associations" )

- -
- - - - - - - - - - - - - - - - - - - - - -
$i18n.getString('criteria')
 
- - - -
-
- - 		- -
- - -
- -