Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8c3fb72d5dc0
Choose a base ref
...
head repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6384c5397b11
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 27, 2014

  1. Follow up to remove dose_strength and units fields from the Drug.hbm.… 

    …xml file - TRUNK-4265
    @wluyima
    wluyima committed Mar 27, 2014
    Copy the full SHA
    449eb02 View commit details

  2. Follow up to remove dose_strength and units fields from the Drug.hbm.… 

    …xml file - TRUNK-4265
    @wluyima
    wluyima committed Mar 27, 2014
    Copy the full SHA
    6384c53 View commit details
3 changes: 0 additions & 3 deletions api/src/main/resources/org/openmrs/api/db/hibernate/Drug.hbm.xml
View file
Original file line number Diff line number Diff line change
@@ -16,13 +16,10 @@
<property name="name" type="java.lang.String" length="255" />
<property name="combination" type="java.lang.Boolean" length="1"
not-null="true" />
<property name="doseStrength" type="java.lang.Double"
column="dose_strength" length="22" />
<property name="maximumDailyDose" type="java.lang.Double"
column="maximum_daily_dose" length="22" />
<property name="minimumDailyDose" type="java.lang.Double"
column="minimum_daily_dose" length="22" />
<property name="units" type="java.lang.String" length="50" />
<property name="strength" type="java.lang.String" length="255" />
<property name="dateCreated" type="java.util.Date"
column="date_created" not-null="true" length="19" />
6 changes: 3 additions & 3 deletions api/src/test/resources/org/openmrs/include/standardTestDataset.xml
View file
Original file line number Diff line number Diff line change
@@ -174,9 +174,9 @@
<concept_set concept_set_id="2" concept_id="19" concept_set="23" sort_weight="2.0" creator="1" date_created="2008-08-18 12:38:58.0" uuid="df26fc1a-6fc0-4867-8982-9e5dfe3f8265"/>
<concept_set concept_set_id="3" concept_id="20" concept_set="23" sort_weight="1.0" creator="1" date_created="2008-08-18 12:38:58.0" uuid="fdefaa94-3f99-464c-8b1f-3e1d1c61335c"/>
<concept_state_conversion concept_state_conversion_id="1" concept_id="16" program_workflow_id="2" program_workflow_state_id="1" uuid="6c72b064-506d-11de-80cb-001e378eb67e"/>
<drug drug_id="2" concept_id="792" name="Triomune-30" combination="true" dose_strength="1.0" units="tab(s)" creator="1" date_created="2005-02-24 00:00:00.0" retired="false" uuid="3cfcf118-931c-46f7-8ff6-7b876f0d4202"/>
<drug drug_id="3" concept_id="88" name="Aspirin" combination="false" dose_strength="325.0" units="mg" creator="1" date_created="2005-02-24 00:00:00.0" retired="false" uuid="05ec820a-d297-44e3-be6e-698531d9dd3f"/>
<drug drug_id="11" concept_id="3" name="NYQUIL" combination="true" units="" creator="1" date_created="2008-08-15 15:34:03.0" retired="true" uuid="7e2323fa-0fa0-461f-9b59-6765997d849e"/>
<drug drug_id="2" concept_id="792" name="Triomune-30" combination="true" strength="1.0tab(s)" creator="1" date_created="2005-02-24 00:00:00.0" retired="false" uuid="3cfcf118-931c-46f7-8ff6-7b876f0d4202"/>
<drug drug_id="3" concept_id="88" name="Aspirin" combination="false" strength="325.0mg" creator="1" date_created="2005-02-24 00:00:00.0" retired="false" uuid="05ec820a-d297-44e3-be6e-698531d9dd3f"/>
<drug drug_id="11" concept_id="3" name="NYQUIL" combination="true" creator="1" date_created="2008-08-15 15:34:03.0" retired="true" uuid="7e2323fa-0fa0-461f-9b59-6765997d849e"/>
<concept concept_id="113" retired="true" datatype_id="1" class_id="19" is_set="false" creator="1" date_created="2004-08-12 00:00:00.0" version="" uuid="7e02d1a0-7869-11e3-981f-0800200c9a66"/>
<concept_name concept_id="113" name="1/day x 7 days/week" concept_name_id="1131" locale="en" creator="1" date_created="2008-08-15 13:52:53.0" concept_name_type="FULLY_SPECIFIED" locale_preferred="1" voided="false" uuid="83f24a00-7869-11e3-981f-0800200c9a66"/>
<order_frequency order_frequency_id="1" concept_id="113" creator="1" date_created="2008-08-15 13:52:53.0" retired="false" uuid="28090760-7c38-11e3-baa7-0800200c9a66" />
2 changes: 1 addition & 1 deletion api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<concept concept_id="1" retired="false" datatype_id="0" class_id="0" is_set="false" creator="1" date_created="2005-01-01 00:00:00.0" uuid="cd7aa206-b9fe-4704-b815-a914a76b0eb5"/>
<concept_description concept_description_id="1" concept_id="1" description="A TB drug" locale="en" creator="1" date_created="2005-01-01 00:00:00.0" uuid="2ce39a36-e93d-4489-9f31-259372244237"/>
<concept_name concept_id="1" name="Isoniazid" locale="en" creator="1" date_created="2005-01-01 00:00:00.0" concept_name_id="1" voided="false" uuid="a354c039-98ba-4351-bac9-f0cc4b2bc903" concept_name_type="FULLY_SPECIFIED" locale_preferred="0"/>
<drug drug_id="1" concept_id="1" name="INH 300mg" combination="false" dose_strength="300.0" units="mg" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" uuid="e40c80cb-0a17-47fe-b64a-076b056f42e0"/>
<drug drug_id="1" concept_id="1" name="INH 300mg" combination="false" strength="300.0mg" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" uuid="e40c80cb-0a17-47fe-b64a-076b056f42e0"/>
<drug_order order_id="1" drug_inventory_id="1" dose="900.0" dose_units="50" as_needed="false" frequency="1" dosing_type="SIMPLE"/>
<location location_id="1" name="Test Location" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" uuid="d033b4e1-2a21-4265-943b-d5a0710a0c2d"/>
<orders order_id="1" urgency="ROUTINE" order_action="NEW" concept_id="1" orderer="1" start_date="2005-01-01 00:00:00.0" auto_expire_date="2005-12-31 00:00:00.0" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" patient_id="2" uuid="f4740b0b-206c-48a4-a5b7-8a9024cb75d9" care_setting="1"/>