Open
Conversation
added 9 commits
August 19, 2013 10:27
…gration Conflicts: api/target/classes/CategoryCombo.hbm.xml
…gration Conflicts: omod/src/main/resources/config.xml omod/target/classes/config.xml pom.xml resolving conflicts
1. Renamed MappingCohortController to MappingCohortPortletController and moved up to controller package, eliminated portlet package 2. Removed Spring mapping for MappingCohortController from ModuleApplicationContext to WebModuleApplicationContext and modelled on HTTPFormFlowsheet module 3. Added <context> to ModuleApplicationContext 4. Modified dhis_orgunit, changing parent_id link from uid to id5. Modified OrgUnit.hbm.xml removing Report fields, adding code, changing representation of parent_id to set 6. Modified OrgUnit.java removing ParentOrg adding ChildOrgs.
1. Restored MasterTemplate.xml, .xsd, Categories-Export.xml, .xsd, CategoryOptionCombo-Detailed.xml, .xsd, OrganisationUnit-Export.xml, .xsd, and metaData.xsd to api/resources 2. Made code required="false" for Option.hbm.xml, OptionSet.hbm.xml, CategoryCombo.hbm.xml, CategoryOption.hbm.xml, ReportTemplate.hbm.xml, DataElement.hbm.xml. Modified dhis_option, dhis_categoryoption, dhis_reporttemplate, dhis_dataelement to allow nulls in code. ALTER TABLE `new19`.`dhis_categoryoption` CHANGE COLUMN `code` `code` VARCHAR(50) NULL ; 3. Made type required="false" for DataElement.hbm.xml. Modified dhis_dataelement to allow nulls in type. 4. Added field uid to CategoryOption.hbm.xml. 5. Removed field ReportTemplateId from dhis_reporttemplate. Removed get/setReportTemplateId, added id property, modified get/set id in ReportTemplate.java. 6. Modified mapping of set dataValueTemplates in ReportTemplate.hbm.xml. 7. Modified dhis_integrationserver, set username, password, url, mastertemplate, emailorurl, transport_type nullable.
|
body{font-size:10pt;font-family:arial,sans-serif;background-color:#ffffff;color:black;}p{margin:0px;}This seems like a very interestin subject. See especially the 7-vote solution near the bottom.http://stackoverflow.com/questions/1079114/spring-transactional-annotation-best-practice |
added 7 commits
September 2, 2013 01:34
1. Modified DAO GetDataElementByCode to fix field name. 2. Modified dhis_datavaluetemplate so that dataelement_id, categoryoption_id and reporttemplate_id can be null. Modified hbm similarly. 3. Changes to DhisXmlUtils:buildObjects to handle unanticipated nulls (to be investigated) 4. Change to DhisXmlUtilsTest to use and save in actual DB, working for allPatients and unidentified cohort definitions
2. api/pom.xml should be returned to its original state after debugging 3. Changed constructors for pojos CategoryCombo, CategoryOption, DataElement,Option,OptionSet, OrgUnit, ReportTemplate 4. Changed how OpenmrsDhisObject handles empty uids to use CodeGeneration class from DHIS2; added a test to DhisServiceTest to check this. 5. Changed HibernateDhisDAO to use new variable names for DataElement, same with DataElement and ReportTemplate hbm.xml 6. Replaced metaData.xsd with a new one I believe this is everything I have been working on except for the ServerMetadata and DhisXmlUtils classes
1. Remove DhisXmlUtils and ...Test, add DhisMetadataUtils and ...Test 2. Add OrgUnitDisplay and ...Test 3. ServerMetadata and ...Test modified to be jaxb output handler 4. Further mods to hbms, pojos and DAO to incorporate OpenmrsDhisObject 5. Additional routines for DhisService, ...Impl and ...Test
DhisService and its impl. 2. Progress on ServerMetadata, OrgUnitDisplay, DhisMetadataUtils, and their tests. 3. id changes in hbms
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.