diff --git a/docker-compose.yml b/docker-compose.yml index da9099c..382e37d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,7 +50,7 @@ services: volumes: - '/openlmis-report-ui' requisition-ui: - image: elmislesotho/requisition-ui:0.0.1 + image: elmislesotho/requisition-ui:0.0.3 volumes: - '/openlmis-requisition-ui' stockmanagement-ui: diff --git a/src/requisition-redistribution/messages_en.json b/requisition-redistribution/messages_en.json similarity index 100% rename from src/requisition-redistribution/messages_en.json rename to requisition-redistribution/messages_en.json diff --git a/src/requisition-redistribution/redistribution-toolbar.html b/requisition-redistribution/redistribution-toolbar.html similarity index 100% rename from src/requisition-redistribution/redistribution-toolbar.html rename to requisition-redistribution/redistribution-toolbar.html diff --git a/src/requisition-redistribution/requisition-redistribution.controller.js b/requisition-redistribution/requisition-redistribution.controller.js similarity index 100% rename from src/requisition-redistribution/requisition-redistribution.controller.js rename to requisition-redistribution/requisition-redistribution.controller.js diff --git a/src/requisition-redistribution/requisition-redistribution.html b/requisition-redistribution/requisition-redistribution.html similarity index 100% rename from src/requisition-redistribution/requisition-redistribution.html rename to requisition-redistribution/requisition-redistribution.html diff --git a/src/requisition-redistribution/requisition-redistribution.module.js b/requisition-redistribution/requisition-redistribution.module.js similarity index 100% rename from src/requisition-redistribution/requisition-redistribution.module.js rename to requisition-redistribution/requisition-redistribution.module.js diff --git a/src/requisition-redistribution/requisition-redistribution.routes.js b/requisition-redistribution/requisition-redistribution.routes.js similarity index 100% rename from src/requisition-redistribution/requisition-redistribution.routes.js rename to requisition-redistribution/requisition-redistribution.routes.js diff --git a/src/requisition-convert-to-order/convert-to-order.html b/src/requisition-convert-to-order/convert-to-order.html deleted file mode 100755 index 286c2e7..0000000 --- a/src/requisition-convert-to-order/convert-to-order.html +++ /dev/null @@ -1,68 +0,0 @@ -

{{'requisitionConvertToOrder.convertRequisitionsToOrder' | message}}

-
-
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{vm.infoMessage | message}}
- - {{'requisitionConvertToOrder.program' | message}}{{'requisitionConvertToOrder.facility' | message}}{{'requisitionConvertToOrder.districtName' | message}}{{'requisitionConvertToOrder.period' | message}}{{'requisitionConvertToOrder.startDate' | message}}{{'requisitionConvertToOrder.endDate' | message}}{{'requisitionConvertToOrder.dateApproved' | message}}{{'requisitionConvertToOrder.emergency' | message}}{{'requisitionConvertToOrder.supplyingDepot' | message}}
- - {{item.requisition.program.name}}{{item.requisition.facility.code}} - {{item.requisition.facility.name}}{{item.requisition.facility.geographicZone.name}}{{item.requisition.processingPeriod.name}}{{item.requisition.processingPeriod.startDate | openlmisDate}}{{item.requisition.processingPeriod.endDate | openlmisDate}}{{item.requisition.statusChanges.APPROVED.changeDate | openlmisDate}} - - - -
- -
-
- - > - -
diff --git a/src/requisition-convert-to-order/messages_en.json b/src/requisition-convert-to-order/messages_en.json deleted file mode 100755 index 45c2c34..0000000 --- a/src/requisition-convert-to-order/messages_en.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "requisitionConvertToOrder.all": "All", - "requisitionConvertToOrder.convertRequisitionsToOrder": "Acknowledge Requests", - "requisitionConvertToOrder.convertToOrder.confirm": "Are you sure you want to acknowledge this request(s)?", - "requisitionConvertToOrder.convertToOrder.label": "Acknowledge Request", - "requisitionConvertToOrder.convertToOrder.success": "The requisition(s) have been successfully acknowledged", - "requisitionConvertToOrder.releaseWithoutOrder.label": "Release without order", - "requisitionConvertToOrder.releaseWithoutOrder.confirm": "Are you sure you want to release this R&R(s) without order(s)?", - "requisitionConvertToOrder.releaseWithoutOrder.success": "The requisition(s) have been successfully released without order(s)", - "requisitionConvertToOrder.dateApproved": "Date approved", - "requisitionConvertToOrder.districtName": "District name", - "requisitionConvertToOrder.emergency": "Emergency", - "requisitionConvertToOrder.endDate": "End date", - "requisitionConvertToOrder.errorOccurred": "Error occurred", - "requisitionConvertToOrder.facility": "Facility", - "requisitionConvertToOrder.facilityCode": "Facility code", - "requisitionConvertToOrder.facilityName": "Facility name", - "requisitionConvertToOrder.noRequisitionToConvert": "No request(s) to be acknowledged", - "requisitionConvertToOrder.noSearchResults": "No request(s) to be acknowledged found", - "requisitionConvertToOrder.noSupplyingDepotSelected": "Supplying depot not selected", - "requisitionConvertToOrder.period": "Period", - "requisitionConvertToOrder.program": "Program", - "requisitionConvertToOrder.search": "Search", - "requisitionConvertToOrder.selectAtLeastOneRnr": "Please select at least one request to acknowledge.", - "requisitionConvertToOrder.selectAtLeastOneRnrWithoutOrder" : "Please select at least one requisition to release without order.", - "requisitionConvertToOrder.startDate": "Start date", - "requisitionConvertToOrder.supplyingDepot": "Supplying depot", - "requisitionConvertToOrder.searchInfo": "In order to filter Requisitions type in one of the following parameters: Program Name, Facility Name or Facility Code and click \"Search\" button." -} \ No newline at end of file