Navigation

← Previous Changeset
Next Changeset →

Changeset 3441

Timestamp:

02/20/08 23:28:37 (9 months ago)

Author:

bmckown

Message:

form2program module: Fixed bug mentioned in #627 PatientProgram creator is now set to Encounter.getCreator(). Changed version since OpenMRS build requirement is now 1.2.0.3440

Files:

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

openmrs-modules/form2program/.classpath

r2394	r3441
4	4	<classpathentry kind="src" path="web/src"/>
5	5	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6		<classpathentry kind="lib" path="lib-common/openmrs-api-1.~~1.10.2390.jar"~~/>
7		<classpathentry kind="lib" path="lib-common/tests-openmrs-api-1.~~1.10.239~~0.jar"/>
8		<classpathentry kind="lib" path="lib-common/web-openmrs-api-1.~~1.10.239~~0.jar"/>
	6	<classpathentry kind="lib" path="lib-common/openmrs-api-1.2.0.3440.jar" />
	7	<classpathentry kind="lib" path="lib-common/tests-openmrs-api-1.2.0.3440.jar"/>
	8	<classpathentry kind="lib" path="lib-common/web-openmrs-api-1.2.0.3440.jar"/>
9	9	<classpathentry kind="lib" path="lib-common/commons-logging-1.0.4.jar"/>
10	10	<classpathentry kind="lib" path="lib-common/spring-2.0.jar"/>

openmrs-modules/form2program/metadata/config.xml

r2888	r3441
7	7	<id>form2program</id>
8	8	<name>Form2Program</name>
9		<version>1.3</version>
	9	<version>1.4</version>
10	10	<package>org.openmrs.module.@MODULE_ID@</package>
11	11	<author>Brian McKown</author>
…	…
18	18	<updateURL>https://dev.openmrs.org/modules/download/@MODULE_ID@/update.rdf</updateURL>
19	19
20		<require_version>1.~~1.10.239~~0</require_version>
	20	<require_version>1.2.0.3340</require_version>
21	21
22	22	<extension>

openmrs-modules/form2program/src/org/openmrs/module/form2program/advice/EncounterCreatedAfterAdvice.java

r3410	r3441
51	51	if (f2pService.existsForm2ProgramMap(fpm.getProgram(), encounterType))
52	52	if (!this.getProgramWorkflowService().isInProgram(patient, fpm.getProgram(), today, null)) {
53		this.getProgramWorkflowService().enrollPatientInProgram(patient, fpm.getProgram(), encounter.getEncounterDatetime(), null);
	53	this.getProgramWorkflowService().enrollPatientInProgram(patient, fpm.getProgram(), encounter.getEncounterDatetime(), null, encounter.getCreator());
54	54	}
55	55	}

openmrs-modules/form2program/src/org/openmrs/module/form2program/db/hibernate/HibernateForm2ProgramDAO.java

r3410	r3441
150	150	* Apply Form2ProgramMap to patients that are already in the database who have not yet been enrolled in the program.
151	151	* This applies to all org.openmrs.EncounterType that are mapped to the @param program.
152		* (non-Javadoc)
153	152	*
154	153	* Enrollment date is the encounter datetime of a patient's first encounter with an encounter type mapped to
…	…
168	167	"( select form2program_map.encounter_type from form2program_map where form2program_map.program = " + program.getProgramId() + " ) ) " +
169	168	"GROUP BY encounter.patient_id ORDER BY encounter.encounter_datetime ASC";
170
	169
171	170	int rows = 0;
172	171	try {
…	…
200	199	"AND encounter.encounter_datetime = (select min(e.encounter_datetime) from encounter e where e.patient_id = encounter.patient_id and e.encounter_type = " +
201	200	encounterType.getEncounterTypeId() + " ) GROUP BY encounter.patient_id ORDER BY encounter.encounter_datetime ASC";
202
	201
203	202	int rows = 0;
204	203	try {

OpenMRS