diff --git a/api/src/main/java/org/openmrs/module/jsslab/LabCatalogService.java b/api/src/main/java/org/openmrs/module/jsslab/LabCatalogService.java index d29ce76..2a087e5 100644 --- a/api/src/main/java/org/openmrs/module/jsslab/LabCatalogService.java +++ b/api/src/main/java/org/openmrs/module/jsslab/LabCatalogService.java @@ -13,6 +13,7 @@ import org.openmrs.api.OpenmrsService; import org.springframework.transaction.annotation.Transactional; +@Transactional public interface LabCatalogService extends OpenmrsService { //----------------------------------------------------------------------- diff --git a/api/src/main/java/org/openmrs/module/jsslab/LabManagementService.java b/api/src/main/java/org/openmrs/module/jsslab/LabManagementService.java index 7d27124..28f25fa 100644 --- a/api/src/main/java/org/openmrs/module/jsslab/LabManagementService.java +++ b/api/src/main/java/org/openmrs/module/jsslab/LabManagementService.java @@ -9,6 +9,7 @@ import org.openmrs.module.jsslab.db.LabSupplyItem; import org.springframework.transaction.annotation.Transactional; +@Transactional public interface LabManagementService extends OpenmrsService { /** @@ -125,11 +126,11 @@ public interface LabManagementService extends OpenmrsService { /** * Get the LabInstrument with the given propertyTag or serialNumber * - * @param propertyTag or serialNumber to find + * @param name propertyTag, serialNumber or model to find * @return the LabInstrument that was found or null */ @Authorized( PrivilegeConstants.VIEW_LAB_MGMT ) - public LabInstrument getLabInstrument(Integer idNumber); + public LabInstrument getLabInstrument(String name); /** * Save or update the given LabSupplyItem in the database diff --git a/api/src/main/java/org/openmrs/module/jsslab/LabOrderService.java b/api/src/main/java/org/openmrs/module/jsslab/LabOrderService.java index 3c92a10..958255b 100644 --- a/api/src/main/java/org/openmrs/module/jsslab/LabOrderService.java +++ b/api/src/main/java/org/openmrs/module/jsslab/LabOrderService.java @@ -14,6 +14,7 @@ import org.openmrs.api.OpenmrsService; import org.springframework.transaction.annotation.Transactional; +@Transactional public interface LabOrderService extends OpenmrsService { /** diff --git a/api/src/main/java/org/openmrs/module/jsslab/LabTestingService.java b/api/src/main/java/org/openmrs/module/jsslab/LabTestingService.java index de3a0e8..5628f53 100644 --- a/api/src/main/java/org/openmrs/module/jsslab/LabTestingService.java +++ b/api/src/main/java/org/openmrs/module/jsslab/LabTestingService.java @@ -12,6 +12,7 @@ import org.openmrs.module.jsslab.db.LabTestRange; import org.springframework.transaction.annotation.Transactional; +@Transactional public interface LabTestingService extends OpenmrsService { @Authorized( PrivilegeConstants.VIEW_LAB_TEST ) diff --git a/api/src/main/java/org/openmrs/module/jsslab/db/LabInstrument.java b/api/src/main/java/org/openmrs/module/jsslab/db/LabInstrument.java index 7df7d72..fd8479f 100644 --- a/api/src/main/java/org/openmrs/module/jsslab/db/LabInstrument.java +++ b/api/src/main/java/org/openmrs/module/jsslab/db/LabInstrument.java @@ -58,7 +58,8 @@ public class LabInstrument extends BaseOpenmrsMetadata { protected Set testRuns = new HashSet(); - private String name; +// TODO decide if needed - currently unused +// private String name; public LabInstrument() { super(); @@ -219,7 +220,7 @@ public String getReceivedFrom() { * @param receivedFrom The receivedFrom to set. */ @Attribute(required = false) - public void setreceivedFrom(String ReceivedFrom) { + public void setReceivedFrom(String receivedFrom) { this.receivedFrom = receivedFrom; } diff --git a/api/src/main/java/org/openmrs/module/jsslab/db/LabInstrumentDAO.java b/api/src/main/java/org/openmrs/module/jsslab/db/LabInstrumentDAO.java index e1ee750..5d46605 100644 --- a/api/src/main/java/org/openmrs/module/jsslab/db/LabInstrumentDAO.java +++ b/api/src/main/java/org/openmrs/module/jsslab/db/LabInstrumentDAO.java @@ -58,7 +58,7 @@ public interface LabInstrumentDAO { /** * Get a labInstrument by name * - * @param name String name of the LabInstrument to get + * @param name String value of the propertyTag, serialNumber or model properties of LabInstrument to match * @return the requested LabInstrument */ public LabInstrument getLabInstrument(String name); diff --git a/api/src/main/java/org/openmrs/module/jsslab/db/LabReport.java b/api/src/main/java/org/openmrs/module/jsslab/db/LabReport.java index ca2b921..98c2560 100644 --- a/api/src/main/java/org/openmrs/module/jsslab/db/LabReport.java +++ b/api/src/main/java/org/openmrs/module/jsslab/db/LabReport.java @@ -15,25 +15,17 @@ import java.io.Serializable; import java.util.Date; -import java.util.HashMap; import java.util.HashSet; -import java.util.List; -import java.util.Map; import java.util.Set; import java.util.UUID; -import org.openmrs.BaseOpenmrsMetadata; -import org.openmrs.Patient; -import org.openmrs.Person; -import org.openmrs.User; -import org.openmrs.Location; -import org.openmrs.Concept; -import org.openmrs.Order; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.openmrs.BaseOpenmrsMetadata; +import org.openmrs.Concept; +import org.openmrs.User; import org.simpleframework.xml.Attribute; import org.simpleframework.xml.Element; -import org.simpleframework.xml.ElementList; import org.simpleframework.xml.Root; /** @@ -66,14 +58,12 @@ public class LabReport extends BaseOpenmrsMetadata implements Serializable { protected Set specimens = new HashSet(); - public void LabReport() { - + public LabReport() { this.setUuid(UUID.randomUUID().toString()); } @Override public int hashCode() { - return this.getUuid().hashCode(); } @@ -87,28 +77,25 @@ public boolean equals(Object other) { } } - /* (non-Javadoc) - * @see org.openmrs.OpenmrsObject#getId() - */ + @Override public Integer getId() { return reportId; } - public void setReportId(Integer reportId) { - this.reportId = reportId; + @Override + public void setId(Integer id) { + this.reportId = id; + } public Integer getReportId() { return reportId; } - /* (non-Javadoc) - * @see org.openmrs.OpenmrsObject#setId(java.lang.Integer) - */ - public void setId(Integer reportId) { + public void setReportId(Integer reportId) { this.reportId = reportId; } - + /** * @return Returns the labReportId. */ @@ -238,6 +225,5 @@ public Set getSpecimens(){ public void setSpecimens(Set specimens) { this.specimens = specimens; } - } diff --git a/api/src/main/java/org/openmrs/module/jsslab/db/LabSpecimen.java b/api/src/main/java/org/openmrs/module/jsslab/db/LabSpecimen.java index 6dfedd2..51552d7 100644 --- a/api/src/main/java/org/openmrs/module/jsslab/db/LabSpecimen.java +++ b/api/src/main/java/org/openmrs/module/jsslab/db/LabSpecimen.java @@ -371,7 +371,7 @@ public void setHidden(Boolean hidden) { * @return Returns the testspecimens set. */ @Attribute(required = false) - public Set getTestSpecimens(){ + public Set getTestSpecimens() { return testSpecimens; } @@ -379,7 +379,7 @@ public Set getTestSpecimens(){ * @param testspecimens The set of testspecimens to set. */ @Attribute(required = false) - public void setTestSpecimens(Set TestSpecimens) { + public void setTestSpecimens(Set testSpecimens) { this.testSpecimens = testSpecimens; } diff --git a/api/src/main/java/org/openmrs/module/jsslab/db/LabSpecimenTemplate.java b/api/src/main/java/org/openmrs/module/jsslab/db/LabSpecimenTemplate.java index db5adff..66b3edb 100644 --- a/api/src/main/java/org/openmrs/module/jsslab/db/LabSpecimenTemplate.java +++ b/api/src/main/java/org/openmrs/module/jsslab/db/LabSpecimenTemplate.java @@ -14,19 +14,14 @@ package org.openmrs.module.jsslab.db; import java.io.Serializable; -import java.util.Date; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import java.util.Locale; -import java.lang.Comparable; +import java.util.UUID; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.openmrs.BaseOpenmrsMetadata; import org.openmrs.Concept; -import org.openmrs.User; import org.openmrs.api.context.Context; import org.simpleframework.xml.Attribute; import org.simpleframework.xml.Root; @@ -42,10 +37,10 @@ public class LabSpecimenTemplate extends BaseOpenmrsMetadata implements Serializ private static final Log log = LogFactory.getLog(LabSpecimenTemplate.class); - private Locale textLocale; - private Integer specimenTemplateId; + private Locale textLocale; + private Concept parentRoleConcept; private String parentRoleName; @@ -108,14 +103,6 @@ public void setSpecimenTemplateId(Integer specimenTemplateId) { this.specimenTemplateId = specimenTemplateId; } - public Integer getTestSpecimenId() { - return specimenTemplateId; - } - - public void setTestSpecimenId(Integer specimenTemplateId) { - this.specimenTemplateId = specimenTemplateId; - } - /** * @return Returns the parentRole concept. */ diff --git a/api/src/main/java/org/openmrs/module/jsslab/db/LabSupplyItem.java b/api/src/main/java/org/openmrs/module/jsslab/db/LabSupplyItem.java index 362a12b..ae831ed 100644 --- a/api/src/main/java/org/openmrs/module/jsslab/db/LabSupplyItem.java +++ b/api/src/main/java/org/openmrs/module/jsslab/db/LabSupplyItem.java @@ -49,7 +49,6 @@ public LabSupplyItem() { @Override public int hashCode() { - return this.getUuid().hashCode(); } diff --git a/api/src/main/java/org/openmrs/module/jsslab/db/LabTest.java b/api/src/main/java/org/openmrs/module/jsslab/db/LabTest.java index 785871a..777d892 100644 --- a/api/src/main/java/org/openmrs/module/jsslab/db/LabTest.java +++ b/api/src/main/java/org/openmrs/module/jsslab/db/LabTest.java @@ -58,13 +58,11 @@ public class LabTest extends BaseOpenmrsMetadata implements Serializable { private Set testRanges = new HashSet(); public LabTest() { - this.setUuid(UUID.randomUUID().toString()); } @Override public int hashCode() { - return this.getUuid().hashCode(); } diff --git a/api/src/main/java/org/openmrs/module/jsslab/db/LabTestPanel.java b/api/src/main/java/org/openmrs/module/jsslab/db/LabTestPanel.java index d7654d8..2ca5ca8 100644 --- a/api/src/main/java/org/openmrs/module/jsslab/db/LabTestPanel.java +++ b/api/src/main/java/org/openmrs/module/jsslab/db/LabTestPanel.java @@ -14,21 +14,17 @@ package org.openmrs.module.jsslab.db; import java.io.Serializable; -import java.util.Date; -import java.util.HashMap; +import java.math.BigDecimal; import java.util.HashSet; -import java.util.List; -import java.util.Map; import java.util.Set; import java.util.UUID; -import java.math.BigDecimal; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.openmrs.BaseOpenmrsMetadata; -import org.openmrs.Location; import org.openmrs.Concept; +import org.openmrs.Location; import org.openmrs.api.context.Context; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.simpleframework.xml.Attribute; import org.simpleframework.xml.Root; @@ -75,14 +71,12 @@ public class LabTestPanel extends BaseOpenmrsMetadata implements Serializable { private Set specimenTemplates = new HashSet(); - public void LabTestPanel() { - + public LabTestPanel() { this.setUuid(UUID.randomUUID().toString()); } @Override public int hashCode() { - return this.getUuid().hashCode(); } diff --git a/api/src/main/java/org/openmrs/module/jsslab/db/hibernate/HibernateLabInstrumentDAO.java b/api/src/main/java/org/openmrs/module/jsslab/db/hibernate/HibernateLabInstrumentDAO.java index d12a938..5c693fa 100644 --- a/api/src/main/java/org/openmrs/module/jsslab/db/hibernate/HibernateLabInstrumentDAO.java +++ b/api/src/main/java/org/openmrs/module/jsslab/db/hibernate/HibernateLabInstrumentDAO.java @@ -22,7 +22,6 @@ import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; import org.openmrs.api.APIException; -import org.openmrs.api.context.Context; import org.openmrs.module.jsslab.db.LabInstrument; import org.openmrs.module.jsslab.db.LabInstrumentDAO; import org.openmrs.module.jsslab.db.LabTestRun; @@ -45,10 +44,10 @@ public void setSessionFactory(SessionFactory sessionFactory) { * @see org.openmrs.api.db.LabInstrumentDAO#saveLabInstrument(org.openmrs.LabInstrument) */ public LabInstrument saveLabInstrument(LabInstrument instrument) { - if (instrument.getInstrumentId() == null) { - throw new APIException(Context.getMessageSourceService().getMessage("JSSLab.HibernateLabInstrumentDAO.saveLabInstrument.instrumentIdRequired", null, - "Attribute 'instrumentId' is required", Context.getLocale())); - } +// if (instrument.getInstrumentId() == null) { +// throw new APIException(Context.getMessageSourceService().getMessage("JSSLab.HibernateLabInstrumentDAO.saveLabInstrument.instrumentIdRequired", null, +// "Attribute 'instrumentId' is required", Context.getLocale())); +// } /** * TODO: implement TestRuns if (instrument.getTestRuns() != null && instrument.getId() != * null) { // Hibernate has a problem updating child collections // if the parent object was