Skip to content

Commit

Permalink
RAD-280 Add RESTful API for RadiologyOrders
Browse files Browse the repository at this point in the history
add first REST API for the module handling queries for a single RadiologyOrder
and RadiologyOrder's by Patient. Consume the new REST API via ajax in the
datatables

* add dependency for rest
* add REST resource for RadiologyOrder
* add main controller for REST
* add SearchHandler handling queries for RadiologyOrder by patient
* add test-hibernate.cfg.xml and TestingApplicationContext.xml to omod for component tests
* add dataset xmls for component tests
* use the REST API via ajax in the datatables
* clean the radiology order list pages from all filters except patient
* disable datatables order, search in tables (needs to come from our API)
* reuse radiologyOrdersTab portlet in the manage section. reduces duplication
* restructure js/css files in webapp/resources/scripts like core/reporting does
* use mouseup and keyup events in datatables to reduce stress on backend
* add includeDatatables/WithDefaults.jsp so it can be reused
* add own tag PatientField which is used for the patient filter returning its
UUID. taken as parameter for the REST API.
* externalize translation of datatables into jsp
* remove orderSearch.jsp and its code in PortletsController+PortletsControllerTest
* use momentjs-with-locales.js library for date/time/datetime formatting in
datatables
* remove radiologyOrderList.js
* create own message.properties for datatables
* use pageContext.request.contextPath in jsps instead of constructing paths
myself
* remove paging buttons in datatables since paging not yet fully supported
* remove sortNumbers since unused
* remove patientOverview portlet and its moreInfo.js since allergie part is not found in legacyui
* rearrange jsps into orders/reports folders, remove jsps from /portlets which
are no real portlets
* update NOTICE file
  • Loading branch information
teleivo committed Jun 15, 2016
1 parent 8888932 commit bfe38a9
Show file tree
Hide file tree
Showing 86 changed files with 1,547 additions and 1,304 deletions.
26 changes: 20 additions & 6 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,23 @@ is in the process of migration to Mozilla Public License v2 with Health disclaim

In addition, this product includes software developed by:

========================================================================
New BSD License
========================================================================
This software includes software developed by
Allan Jardine (www.sprymedia.co.uk)
* dataTables - path: omod/src/main/webapp/resources/js/jquery.dataTables.min.js
============================
datatables.net
============================
Author : Allan Jardine (www.sprymedia.co.uk)
License : New BSD License
Version : 1.10.11

============================
moment.js
============================
Authors : Tim Wood, Iskren Chernev, Moment.js contributors
License : MIT
Version : 2.13.0

============================
tinymce.com
============================
Authors : see https://github.com/tinymce/tinymce
License : GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999
Version : 4.3.8
22 changes: 22 additions & 0 deletions omod/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,28 @@
<artifactId>openmrs-test</artifactId>
<type>pom</type>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>webservices.rest-omod-common</artifactId>
<version>${openmrs-webservicesrest-version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>webservices.rest-omod-common</artifactId>
<version>${openmrs-webservicesrest-version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>webservices.rest-omod-2.0</artifactId>
<version>${openmrs-webservicesrest-version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class RadiologyOrderFormController {

public static final String RADIOLOGY_ORDER_FORM_REQUEST_MAPPING = "/module/radiology/radiologyOrder.form";

static final String RADIOLOGY_ORDER_FORM_VIEW = "/module/radiology/radiologyOrderForm";
static final String RADIOLOGY_ORDER_FORM_VIEW = "/module/radiology/orders/radiologyOrderForm";

@Autowired
private RadiologyOrderService radiologyOrderService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class RadiologyOrderListController {

public static final String RADIOLOGY_ORDER_LIST_REQUEST_MAPPING = "/module/radiology/radiologyOrder.list";

private static final String RADIOLOGY_ORDER_LIST_VIEW = "/module/radiology/radiologyOrderList";
private static final String RADIOLOGY_ORDER_LIST_VIEW = "/module/radiology/orders/radiologyOrderList";

@RequestMapping(method = RequestMethod.GET)
public ModelAndView handleRequest() {
Expand Down
Loading

0 comments on commit bfe38a9

Please sign in to comment.