Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RAD-375 Order report templates by title #496

Merged
merged 1 commit into from
Oct 17, 2016
Merged

Conversation

achabill
Copy link
Contributor

Description

  • Order report templates by dcTermsTitle
  • Edit template titles in MrrtReportTemplateServiceComponentTestDataset.xml to more meaningful names; CT Cardiac Bypass Graft and CT Chest Pulmonary Embolism

Related Issue

see https://issues.openmrs.org/browse/RAD-375

Checklist:

  • My pull request only contains one single commit.
  • My pull request is based on the latest master branch
    git pull --rebase upstream master.
  • I ran mvn clean package right before creating this pull request and
    added all formatting changes to my commit.
  • My code follows the code style of this project.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@mention-bot
Copy link

@achabill, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ivange94, @teleivo and @bgeVam to be potential reviewers.

Copy link
Contributor

@ivange94 ivange94 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@achabill I am pretty sure you did run 'mvn clean package' after you finished with you pull request. But I also think you ran it after you had already committed your changes hence you did not notice that though the build passed. mvn clean package had properly formatted your code for you but you did not commit again. I just pulled your branch and ran 'mvn clean package' and you code was properly formatted. Please if after committing your code you run 'mvn clean package' and 'git status' shows you modified files, please commit them before pushing as these might be formatting changes that mvn has done for you.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.004%) to 94.143% when pulling 53d23d1 on achabill:RAD-375 into 147f96a on openmrs:master.

achabill pushed a commit to achabill/openmrs-module-radiology that referenced this pull request Oct 14, 2016
RAD-375: Source formatting on PR openmrs#496
@coveralls
Copy link

Coverage Status

Coverage increased (+0.004%) to 94.143% when pulling ba184f7 on achabill:RAD-375 into 147f96a on openmrs:master.

@@ -20,12 +20,15 @@
/**
* {@code GlobalProperty} property for the DICOM UID component used to describe the org root.
*
* <p>Refer to DICOM Standard DICOM PS3.5 Chapter 9 Unique Identifiers.</p>
* <p>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@achabill why are these in your diff?
you should not have 21 files in your diff. only 3 MrrtReportTemplateServiceComponentTestDataset.xml, HibernateMrrtReportTemplateDAO.java, MrrtReportTemplateServiceComponentTest.java

* @see MrrtReportTemplateService#getMrrtReportTemplate(Integer)
* @verifies get template with given id
*/
* @see MrrtReportTemplateService#getMrrtReportTemplate(Integer)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these javadocs modifications should also not be in the diff.

@teleivo
Copy link
Member

teleivo commented Oct 15, 2016

@achabill the changes of the xml dataset, the hibernateDAO and the service test are now as wanted but you still have these formatting changes that you need to get rid of. formatting is done by the maven formatter plugin for java files. so if you run "mvn clean install" it will format them accordingly.

@achabill
Copy link
Contributor Author

@teleivo I do a mvn clean install but there is no git diff. Means formatting is applied correctly.

@teleivo
Copy link
Member

teleivo commented Oct 17, 2016

@achabill please make your diff only contain the files you worked onnas already said. Read up in git and how to edit your commit and its changes. It night be that you made these formatting changes in your IDE and that they are not xaught by the maven formatter Plugin.

RAD-375: Source formatting on PR openmrs#496

formatting changes
@coveralls
Copy link

Coverage Status

Coverage increased (+0.004%) to 94.143% when pulling ca5200c on achabill:RAD-375 into 889b5b5 on openmrs:master.

@teleivo teleivo merged commit bb941ce into openmrs:master Oct 17, 2016
@achabill achabill deleted the RAD-375 branch October 17, 2016 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants