Skip to content

Commit

Permalink
Renamed GP for next order number seed and set voided by for voided or…
Browse files Browse the repository at this point in the history 
…der in test data
  • Loading branch information
@wluyima
wluyima committed Mar 12, 2014
1 parent 71026b9 commit 5ad6a65
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
View file
Expand Up @@ -172,19 +172,19 @@ public Order getOrderByOrderNumber(String orderNumber) {
@Override
public Long getNextOrderNumberSeedSequenceValue() {
Criteria searchCriteria = sessionFactory.getCurrentSession().createCriteria(GlobalProperty.class);
searchCriteria.add(Restrictions.eq("property", OpenmrsConstants.GLOBAL_PROPERTY_NEXT_ORDER_NUMBER_SEED));
searchCriteria.add(Restrictions.eq("property", OpenmrsConstants.GP_NEXT_ORDER_NUMBER_SEED));
GlobalProperty globalProperty = (GlobalProperty) sessionFactory.getCurrentSession().get(GlobalProperty.class,
OpenmrsConstants.GLOBAL_PROPERTY_NEXT_ORDER_NUMBER_SEED, LockOptions.UPGRADE);
OpenmrsConstants.GP_NEXT_ORDER_NUMBER_SEED, LockOptions.UPGRADE);

if (globalProperty == null) {
throw new APIException("Missing global property named: "
+ OpenmrsConstants.GLOBAL_PROPERTY_NEXT_ORDER_NUMBER_SEED);
+ OpenmrsConstants.GP_NEXT_ORDER_NUMBER_SEED);
}

String gpTextValue = globalProperty.getPropertyValue();
if (StringUtils.isBlank(gpTextValue)) {
throw new APIException("Invalid value for global property named: "
+ OpenmrsConstants.GLOBAL_PROPERTY_NEXT_ORDER_NUMBER_SEED);
+ OpenmrsConstants.GP_NEXT_ORDER_NUMBER_SEED);
}

Long gpNumericValue = null;
Expand All @@ -193,7 +193,7 @@ public Long getNextOrderNumberSeedSequenceValue() {
}
catch (NumberFormatException ex) {
throw new APIException("Invalid value for global property named: "
+ OpenmrsConstants.GLOBAL_PROPERTY_NEXT_ORDER_NUMBER_SEED);
+ OpenmrsConstants.GP_NEXT_ORDER_NUMBER_SEED);
}

globalProperty.setPropertyValue(String.valueOf(gpNumericValue + 1));
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/org/openmrs/util/OpenmrsConstants.java
View file
Expand Up @@ -1013,7 +1013,7 @@ public static final Collection<String> AUTO_ROLES() {

public static final String GP_CASE_SENSITIVE_NAMES_IN_CONCEPT_NAME_TABLE = "concept.caseSensitiveNamesInConceptNameTable";

public static final String GLOBAL_PROPERTY_NEXT_ORDER_NUMBER_SEED = "order.nextOrderNumberSeed";
public static final String GP_NEXT_ORDER_NUMBER_SEED = "order.nextOrderNumberSeed";

public static final String GP_ORDER_NUMBER_GENERATOR_BEAN_ID = "order.orderNumberGeneratorBeanId";

Expand Down Expand Up @@ -1442,7 +1442,7 @@ public static final List<GlobalProperty> CORE_GLOBAL_PROPERTIES() {
props.add(new GlobalProperty(GLOBAL_PROPERTY_USER_REQUIRE_EMAIL_AS_USERNAME, "false",
"Indicates whether a username must be a valid e-mail or not.", BooleanDatatype.class, null));

props.add(new GlobalProperty(GLOBAL_PROPERTY_NEXT_ORDER_NUMBER_SEED, "1",
props.add(new GlobalProperty(GP_NEXT_ORDER_NUMBER_SEED, "1",
"The next order number available for assignment"));

props.add(new GlobalProperty(GP_ORDER_NUMBER_GENERATOR_BEAN_ID, "",
Expand Down
4 changes: 2 additions & 2 deletions api/src/test/resources/org/openmrs/include/standardTestDataset.xml
View file
Expand Up @@ -236,10 +236,10 @@
<orders order_id="5" order_number="5" urgency="ROUTINE" order_action="NEW" concept_id="88" orderer="1" instructions="1x minutely" start_date="2008-08-19 10:24:10.0" creator="1" date_created="2008-08-19 10:24:10.0" voided="false" patient_id="2" uuid="0c96f25c-4949-4f72-9931-d808fbc226db" care_setting="1"/>
<orders order_id="6" order_number="ORD-6" urgency="ROUTINE" order_action="NEW" concept_id="5497" orderer="1" start_date="2008-09-19 09:24:10.0" auto_expire_date="2008-09-26 09:24:10.0" creator="1" date_created="2008-09-19 09:24:10.0" voided="false" patient_id="2" uuid="1c96f25c-4949-4f72-9931-d808fbc226de" care_setting="1"/>
<orders order_id="7" order_number="ORD-7" urgency="ROUTINE" order_action="NEW" concept_id="5497" orderer="1" start_date="2008-10-19 09:24:10.0" creator="1" date_created="2008-10-19 09:24:10.0" voided="false" patient_id="2" uuid="2c96f25c-4949-4f72-9931-d808fbc226df" care_setting="1"/>
<orders order_id="8" order_number="ORD-8" urgency="ROUTINE" order_action="NEW" concept_id="5497" orderer="1" start_date="2008-11-19 09:24:10.0" creator="1" date_created="2008-11-19 09:24:10.0" voided="true" patient_id="2" date_voided="2008-11-20 09:24:10.0" void_reason="Testing 1" uuid="3c96f25c-4949-4f72-9931-d808fbc226dg" care_setting="1"/>
<orders order_id="8" order_number="ORD-8" urgency="ROUTINE" order_action="NEW" concept_id="5497" orderer="1" start_date="2008-11-19 09:24:10.0" creator="1" date_created="2008-11-19 09:24:10.0" patient_id="2" voided="true" voided_by="1" date_voided="2008-11-20 09:24:10.0" void_reason="Testing 1" uuid="3c96f25c-4949-4f72-9931-d808fbc226dg" care_setting="1"/>
<orders order_id="9" order_number="ORD-9" urgency="ROUTINE" order_action="NEW" concept_id="5497" orderer="1" start_date="2008-12-01 09:24:10.0" date_stopped="2008-12-03 09:24:10.0" auto_expire_date="2008-12-05 09:24:10.0" creator="1" date_created="2008-12-01 09:24:10.0" voided="false" patient_id="2" uuid="4c96f25c-4949-4f72-9931-d808fbc226dh" care_setting="1"/>
<patient patient_id="2" creator="1" date_created="2005-09-22 00:00:00.0" changed_by="1" date_changed="2008-08-18 12:29:59.0" voided="false" void_reason=""/>
<patient patient_id="6" creator="1" date_created="2006-01-18 00:00:00.0" changed_by="1" date_changed="2008-08-18 12:25:31.0" voided="false" void_reason=",,,,"/>
<patient patient_id="6" creator="1" date_created="2006-01-18 00:00:00.0" changed_by="1" date_changed="2008-08-18 12:25:31.0" voided="false" void_reason=",,,,"/> m
<patient patient_id="7" creator="1" date_created="2006-01-18 00:00:00.0" changed_by="1" date_changed="2008-08-18 12:25:57.0" voided="false" void_reason=""/>
<patient patient_id="8" creator="1" date_created="2006-01-18 00:00:00.0" changed_by="1" date_changed="2008-08-18 12:24:34.0" voided="false" void_reason=""/>
<patient patient_id="999" creator="1" date_created="2006-01-18 00:00:00.0" changed_by="1" date_changed="2008-08-18 12:24:34.0" voided="true" void_reason="For test purposes"/>
Expand Down

0 comments on commit 5ad6a65

Please sign in to comment.