Changeset 4988
- Timestamp:
- 07/20/08 00:40:39 (4 months ago)
- Files:
-
- openmrs-modules/personportrait/.classpath (modified) (1 diff)
- openmrs-modules/personportrait/lib-common/commons-fileupload-1.1.1.jar (added)
- openmrs-modules/personportrait/lib-common/openmrs-api-1.3.0.12.4984.jar (added)
- openmrs-modules/personportrait/lib-common/web-openmrs-api-1.3.0.12.4984.jar (added)
- openmrs-modules/personportrait/metadata/messages.properties (modified) (1 diff)
- openmrs-modules/personportrait/src/org/openmrs/module/personportrait/impl/ImageManager.java (modified) (3 diffs)
- openmrs-modules/personportrait/web/module/displayPersonPortraitForm.jsp (moved) (moved from openmrs-modules/personportrait/web/module/portraitUploadedForm.jsp) (1 diff, 1 prop)
- openmrs-modules/personportrait/web/module/personPortraitForm.jsp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
openmrs-modules/personportrait/.classpath
r4945 r4988 2 2 <classpath> 3 3 <classpathentry kind="src" path="src"/> 4 <classpathentry kind="src" path="web/src"/> 4 5 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 5 <classpathentry kind="lib" path="lib-common/commons-fileupload-1.2.1.jar"/>6 6 <classpathentry kind="lib" path="lib-common/commons-logging-1.0.4.jar"/> 7 7 <classpathentry kind="lib" path="lib-common/hibernate3.jar"/> 8 8 <classpathentry kind="lib" path="lib-common/junit-3.8.1.jar"/> 9 <classpathentry kind="lib" path="lib-common/openmrs-api-1.2.0.3409.jar"/>10 9 <classpathentry kind="lib" path="lib-common/servlet-api.jar"/> 11 10 <classpathentry kind="lib" path="lib-common/spring-2.0.jar"/> 12 <classpathentry kind="lib" path="lib-common/web-openmrs-api-1.2.0.3530.jar"/> 11 <classpathentry kind="lib" path="lib-common/commons-fileupload-1.1.1.jar"/> 12 <classpathentry kind="lib" path="lib-common/web-openmrs-api-1.3.0.12.4984.jar"/> 13 <classpathentry kind="lib" path="lib-common/openmrs-api-1.3.0.12.4984.jar"/> 13 14 <classpathentry kind="output" path="build"/> 14 15 </classpath> openmrs-modules/personportrait/metadata/messages.properties
r4945 r4988 5 5 @MODULE_ID@.portrait.file=File 6 6 @MODULE_ID@.portrait.form=Form 7 @MODULE_ID@.portrait.displayportrait=Person Information 7 8 @MODULE_ID@.portrait.imageuploaded=Image Uploaded 8 9 @MODULE_ID@.portrait.saved=Image saved openmrs-modules/personportrait/src/org/openmrs/module/personportrait/impl/ImageManager.java
r4945 r4988 3 3 import java.awt.Image; 4 4 import java.util.List; 5 import java.util.Set; 5 6 6 import org.openmrs.ComplexObs;7 7 import org.openmrs.Concept; 8 8 import org.openmrs.Obs; 9 9 import org.openmrs.Patient; 10 import org.openmrs.Person; 10 11 import org.openmrs.api.ObsService; 11 12 import org.openmrs.api.context.Context; … … 13 14 public class ImageManager { 14 15 15 public ComplexObs complexObsImage;16 16 public ObsService obsServiceImage; 17 17 … … 20 20 } 21 21 22 public void getImage() { 23 24 } 25 26 public void saveImage(Concept concept) { 27 complexObsImage.setConcept(concept); 28 obsServiceImage = Context.getObsService(); 22 public void saveImage(Concept conceptPortrait) { 29 23 30 obsServiceImage.createObs(complexObsImage);31 24 } 32 25 33 26 public void replaceImage() { 34 27 28 } 29 30 public void getImage(Person person) { 31 35 32 } 36 33 openmrs-modules/personportrait/web/module/displayPersonPortraitForm.jsp
- Property svn:mergeinfo set
r4945 r4988 1 1 <%@ include file="/WEB-INF/template/include.jsp"%> 2 2 3 <openmrs:require privilege="Upload Portrait" otherwise="/login.htm" redirect="/module/personportrait/ portraitUploaded.form" />3 <openmrs:require privilege="Upload Portrait" otherwise="/login.htm" redirect="/module/personportrait/displayPersonPortrait.form" /> 4 4 5 5 <%@ include file="/WEB-INF/template/header.jsp"%> 6 6 7 <h2><spring:message code="personportrait.portrait. imageuploaded" /></h2>7 <h2><spring:message code="personportrait.portrait.displayportrait" /></h2> 8 8 9 9 openmrs-modules/personportrait/web/module/personPortraitForm.jsp
r4945 r4988 22 22 </form> 23 23 24 <img src="${pageContext.request.contextPath}/moduleServlet/personportrait/generateImage?obsId=113"> 25 24 26 </BODY> 25 27 </HTML>