Wip

src/order-view/messages_en.json

@@ -1,3 +1,4 @@
 {
-    "orderView.view": "View details"
+    "orderView.view": "View details",
+    "orderView.isRequisitionless": "Requisitionless"
 }

src/order-view/order-view.controller.js

@@ -408,6 +408,7 @@
                     {
                         header: 'orderView.lastUpdated',
                         propertyPath: 'lastUpdatedDate',
+                        sortable: false,
                         template: function(item) {
                             return item.lastUpdatedDate ?
                                 $filter('openlmisDate')(item.lastUpdatedDate) : '';

src/order-view/order-view.html

@@ -1,32 +1,29 @@
 <h2>{{'orderView.viewOrders' | message}}</h2>
 <form class="sidebar" ng-submit="vm.loadOrders()">
-    <label for="supplyingFacility">{{'orderView.supplyingFacility' | message}}</label>
-    <select id="supplyingFacility"
-            ng-model="vm.supplyingFacility"
-            ng-options="facility.name for facility in vm.supplyingFacilities"
-            required></select>
-    <input type="submit" value="{{'orderView.search' | message}}" />
+        <label for="supplyingFacility">{{'orderView.supplyingFacility' | message}}</label>
+        <select id="supplyingFacility" ng-model="vm.supplyingFacility"
+                ng-options="facility.name for facility in vm.supplyingFacilities" required></select>
+        <input type="submit" value="{{'orderView.search' | message}}" />
 </form>
 <section class="openlmis-table-container order-view">
-        <form ng-submit="vm.loadOrders()" >
-        <label for="requestingFacility">{{'orderView.requestingFacility' | message}}</label>
-        <select id="requestingFacility"
-                ng-model="vm.requestingFacility"
-                ng-options="facility.name for facility in vm.requestingFacilities"></select>
-        <label>{{'orderView.program' | message}}</label>
-        <select id="program"
-                ng-model="vm.program"
-                ng-options="program.name for program in vm.programs"></select>
-        <label>{{'orderView.status' | message}}</label>
-        <select id="status"
-                ng-model="vm.status"
-                ng-options="status as status.name for status in vm.orderStatuses track by status.value"></select>
-        <label for=periodStartDate>{{'orderView.periodStart' | message}}</label>
-        <input id="periodStartDate" type="date" ng-model="vm.periodStartDate" max-date="vm.periodEndDate"/>
-        <label for=periodEndDate>{{'orderView.periodEnd' | message}}</label>
-        <input id="periodEndDate" type="date" ng-model="vm.periodEndDate" min-date="vm.periodStartDate"/>
-        <input type="submit" class="btn btn-primary" value="{{'orderView.search' | message}}"/>
-    </form>
-    <openlmis-table table-config="vm.tableConfig"></openlmis-table>
-    <openlmis-pagination/>
+        <form ng-submit="vm.loadOrders()">
+                <label for="requestingFacility">{{'orderView.requestingFacility' | message}}</label>
+                <select id="requestingFacility" ng-model="vm.requestingFacility"
+                        ng-options="facility.name for facility in vm.requestingFacilities"></select>
+                <label>{{'orderView.program' | message}}</label>
+                <select id="program" ng-model="vm.program"
+                        ng-options="program.name for program in vm.programs"></select>
+                <label>{{'orderView.status' | message}}</label>
+                <select id="status" ng-model="vm.status"
+                        ng-options="status as status.name for status in vm.orderStatuses track by status.value"></select>
+                <label for=periodStartDate>{{'orderView.periodStart' | message}}</label>
+                <input id="periodStartDate" type="date" ng-model="vm.periodStartDate" max-date="vm.periodEndDate" />
+                <label for=periodEndDate>{{'orderView.periodEnd' | message}}</label>
+                <input id="periodEndDate" type="date" ng-model="vm.periodEndDate" min-date="vm.periodStartDate" />
+                <label for="">{{:: 'orderView.isRequisitionless' | message}}</label>
+                <input type="checkbox" id="isRequisitionless">
+                <input type="submit" class="btn btn-primary" value="{{'orderView.search' | message}}" />
+        </form>
+        <openlmis-table table-config="vm.tableConfig"></openlmis-table>
+        <openlmis-pagination />
 </section>