@openmrs/esm-stock-management-app 1.0.1-pre.404 → 1.0.1-pre.411
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/180.js +2 -0
- package/dist/180.js.map +1 -0
- package/dist/39.js +1 -1
- package/dist/39.js.map +1 -1
- package/dist/574.js +1 -1
- package/dist/800.js +1 -1
- package/dist/800.js.map +1 -1
- package/dist/main.js +1 -1
- package/dist/main.js.map +1 -1
- package/dist/openmrs-esm-stock-management-app.js +1 -1
- package/dist/openmrs-esm-stock-management-app.js.buildmanifest.json +39 -39
- package/dist/routes.json +1 -1
- package/package.json +1 -1
- package/src/stock-home/stock-home-inventory-card.component.tsx +10 -7
- package/src/stock-items/add-stock-item/stock-item-category-selector/stock-item-category-selector.component.tsx +5 -2
- package/src/stock-items/add-stock-item/stock-item-details/stock-item-details.resource.tsx +2 -2
- package/src/stock-items/components/filter-stock-items/filter-stock-items.component.tsx +6 -2
- package/src/stock-items/stock-items-table.component.tsx +5 -1
- package/src/stock-items/stock-items-table.resource.ts +1 -1
- package/src/stock-operations/add-stock-operation/base-operation-details.component.tsx +4 -2
- package/translations/en.json +3 -1
- package/dist/835.js +0 -2
- package/dist/835.js.map +0 -1
- /package/dist/{835.js.LICENSE.txt → 180.js.LICENSE.txt} +0 -0
@@ -1 +1 @@
|
|
1
|
-
var _openmrs_esm_stock_management_app;(()=>{"use strict";var e,r,t,n,o,a,i,l,s,u,f,p,c,d,h,m,v,g={1371:(e,r,t)=>{var n={"./start":()=>Promise.all([t.e(935),t.e(
|
1
|
+
var _openmrs_esm_stock_management_app;(()=>{"use strict";var e,r,t,n,o,a,i,l,s,u,f,p,c,d,h,m,v,g={1371:(e,r,t)=>{var n={"./start":()=>Promise.all([t.e(935),t.e(180),t.e(672),t.e(39)]).then((()=>()=>t(3529)))},o=(e,r)=>(t.R=r,r=t.o(n,e)?n[e]():Promise.resolve().then((()=>{throw new Error('Module "'+e+'" does not exist in container.')})),t.R=void 0,r),a=(e,r)=>{if(t.S){var n="default",o=t.S[n];if(o&&o!==e)throw new Error("Container initialization failed as it has already been initialized with a different share scope");return t.S[n]=e,t.I(n,r)}};t.d(r,{get:()=>o,init:()=>a})}},b={};function y(e){var r=b[e];if(void 0!==r)return r.exports;var t=b[e]={id:e,loaded:!1,exports:{}};return g[e].call(t.exports,t,t.exports,y),t.loaded=!0,t.exports}y.m=g,y.c=b,y.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return y.d(r,{a:r}),r},r=Object.getPrototypeOf?e=>Object.getPrototypeOf(e):e=>e.__proto__,y.t=function(t,n){if(1&n&&(t=this(t)),8&n)return t;if("object"==typeof t&&t){if(4&n&&t.__esModule)return t;if(16&n&&"function"==typeof t.then)return t}var o=Object.create(null);y.r(o);var a={};e=e||[null,r({}),r([]),r(r)];for(var i=2&n&&t;"object"==typeof i&&!~e.indexOf(i);i=r(i))Object.getOwnPropertyNames(i).forEach((e=>a[e]=()=>t[e]));return a.default=()=>t,y.d(o,a),o},y.d=(e,r)=>{for(var t in r)y.o(r,t)&&!y.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},y.f={},y.e=e=>Promise.all(Object.keys(y.f).reduce(((r,t)=>(y.f[t](e,r),r)),[])),y.u=e=>e+".js",y.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),y.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),t={},n="@openmrs/esm-stock-management-app:",y.l=(e,r,o,a)=>{if(t[e])t[e].push(r);else{var i,l;if(void 0!==o)for(var s=document.getElementsByTagName("script"),u=0;u<s.length;u++){var f=s[u];if(f.getAttribute("src")==e||f.getAttribute("data-webpack")==n+o){i=f;break}}i||(l=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,y.nc&&i.setAttribute("nonce",y.nc),i.setAttribute("data-webpack",n+o),i.src=e),t[e]=[r];var p=(r,n)=>{i.onerror=i.onload=null,clearTimeout(c);var o=t[e];if(delete t[e],i.parentNode&&i.parentNode.removeChild(i),o&&o.forEach((e=>e(n))),r)return r(n)},c=setTimeout(p.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=p.bind(null,i.onerror),i.onload=p.bind(null,i.onload),l&&document.head.appendChild(i)}},y.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},y.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{y.S={};var e={},r={};y.I=(t,n)=>{n||(n=[]);var o=r[t];if(o||(o=r[t]={}),!(n.indexOf(o)>=0)){if(n.push(o),e[t])return e[t];y.o(y.S,t)||(y.S[t]={});var a=y.S[t],i="@openmrs/esm-stock-management-app",l=(e,r,t,n)=>{var o=a[e]=a[e]||{},l=o[r];(!l||!l.loaded&&(!n!=!l.eager?n:i>l.from))&&(o[r]={get:t,from:i,eager:!!n})},s=[];return"default"===t&&(l("@openmrs/esm-framework","5.6.1-pre.1977",(()=>Promise.all([y.e(800),y.e(672)]).then((()=>()=>y(4800))))),l("dayjs","1.11.10",(()=>y.e(484).then((()=>()=>y(7484))))),l("react-i18next","11.18.6",(()=>Promise.all([y.e(672),y.e(629)]).then((()=>()=>y(707))))),l("react-router-dom","6.21.1",(()=>Promise.all([y.e(26),y.e(935),y.e(672)]).then((()=>()=>y(8026))))),l("react","18.2.0",(()=>y.e(294).then((()=>()=>y(7294))))),l("swr/_internal","2.2.5",(()=>Promise.all([y.e(46),y.e(672)]).then((()=>()=>y(46)))))),e[t]=s.length?Promise.all(s).then((()=>e[t]=1)):1}}})(),(()=>{var e;y.g.importScripts&&(e=y.g.location+"");var r=y.g.document;if(!e&&r&&(r.currentScript&&(e=r.currentScript.src),!e)){var t=r.getElementsByTagName("script");if(t.length)for(var n=t.length-1;n>-1&&!e;)e=t[n--].src}if(!e)throw new Error("Automatic publicPath is not supported in this browser");e=e.replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),y.p=e})(),o=e=>{var r=e=>e.split(".").map((e=>+e==e?+e:e)),t=/^([^-+]+)?(?:-([^+]+))?(?:\+(.+))?$/.exec(e),n=t[1]?r(t[1]):[];return t[2]&&(n.length++,n.push.apply(n,r(t[2]))),t[3]&&(n.push([]),n.push.apply(n,r(t[3]))),n},a=(e,r)=>{e=o(e),r=o(r);for(var t=0;;){if(t>=e.length)return t<r.length&&"u"!=(typeof r[t])[0];var n=e[t],a=(typeof n)[0];if(t>=r.length)return"u"==a;var i=r[t],l=(typeof i)[0];if(a!=l)return"o"==a&&"n"==l||"s"==l||"u"==a;if("o"!=a&&"u"!=a&&n!=i)return n<i;t++}},i=e=>{var r=e[0],t="";if(1===e.length)return"*";if(r+.5){t+=0==r?">=":-1==r?"<":1==r?"^":2==r?"~":r>0?"=":"!=";for(var n=1,o=1;o<e.length;o++)n--,t+="u"==(typeof(l=e[o]))[0]?"-":(n>0?".":"")+(n=2,l);return t}var a=[];for(o=1;o<e.length;o++){var l=e[o];a.push(0===l?"not("+s()+")":1===l?"("+s()+" || "+s()+")":2===l?a.pop()+" "+a.pop():i(l))}return s();function s(){return a.pop().replace(/^\((.+)\)$/,"$1")}},l=(e,r)=>{if(0 in e){r=o(r);var t=e[0],n=t<0;n&&(t=-t-1);for(var a=0,i=1,s=!0;;i++,a++){var u,f,p=i<e.length?(typeof e[i])[0]:"";if(a>=r.length||"o"==(f=(typeof(u=r[a]))[0]))return!s||("u"==p?i>t&&!n:""==p!=n);if("u"==f){if(!s||"u"!=p)return!1}else if(s)if(p==f)if(i<=t){if(u!=e[i])return!1}else{if(n?u>e[i]:u<e[i])return!1;u!=e[i]&&(s=!1)}else if("s"!=p&&"n"!=p){if(n||i<=t)return!1;s=!1,i--}else{if(i<=t||f<p!=n)return!1;s=!1}else"s"!=p&&"n"!=p&&(s=!1,i--)}}var c=[],d=c.pop.bind(c);for(a=1;a<e.length;a++){var h=e[a];c.push(1==h?d()|d():2==h?d()&d():h?l(h,r):!d())}return!!d()},s=(e,r)=>{var t=e[r];return Object.keys(t).reduce(((e,r)=>!e||!t[e].loaded&&a(e,r)?r:e),0)},u=(e,r,t,n)=>"Unsatisfied version "+t+" from "+(t&&e[r][t].from)+" of shared singleton module "+r+" (required "+i(n)+")",f=(e,r,t,n)=>{var o=s(e,t);return l(n,o)||p(u(e,t,o,n)),c(e[t][o])},p=e=>{"undefined"!=typeof console&&console.warn&&console.warn(e)},c=e=>(e.loaded=1,e.get()),d=(e=>function(r,t,n,o){var a=y.I(r);return a&&a.then?a.then(e.bind(e,r,y.S[r],t,n,o)):e(0,y.S[r],t,n,o)})(((e,r,t,n,o)=>r&&y.o(r,t)?f(r,0,t,n):o())),h={},m={1672:()=>d("default","react",[1,18],(()=>y.e(294).then((()=>()=>y(7294))))),1914:()=>d("default","react-router-dom",[1,6],(()=>y.e(26).then((()=>()=>y(8026))))),2653:()=>d("default","dayjs",[1,1],(()=>y.e(484).then((()=>()=>y(7484))))),3397:()=>d("default","react-i18next",[1,11],(()=>y.e(707).then((()=>()=>y(707))))),5512:()=>d("default","swr/_internal",[1,2],(()=>y.e(46).then((()=>()=>y(46))))),7248:()=>d("default","@openmrs/esm-framework",[1,5],(()=>y.e(800).then((()=>()=>y(4800)))))},v={39:[1914,2653,3397,5512,7248],672:[1672]},y.f.consumes=(e,r)=>{y.o(v,e)&&v[e].forEach((e=>{if(y.o(h,e))return r.push(h[e]);var t=r=>{h[e]=0,y.m[e]=t=>{delete y.c[e],t.exports=r()}},n=r=>{delete h[e],y.m[e]=t=>{throw delete y.c[e],r}};try{var o=m[e]();o.then?r.push(h[e]=o.then(t).catch(n)):t(o)}catch(e){n(e)}}))},(()=>{var e={122:0};y.f.j=(r,t)=>{var n=y.o(e,r)?e[r]:void 0;if(0!==n)if(n)t.push(n[2]);else if(672!=r){var o=new Promise(((t,o)=>n=e[r]=[t,o]));t.push(n[2]=o);var a=y.p+y.u(r),i=new Error;y.l(a,(t=>{if(y.o(e,r)&&(0!==(n=e[r])&&(e[r]=void 0),n)){var o=t&&("load"===t.type?"missing":t.type),a=t&&t.target&&t.target.src;i.message="Loading chunk "+r+" failed.\n("+o+": "+a+")",i.name="ChunkLoadError",i.type=o,i.request=a,n[1](i)}}),"chunk-"+r,r)}else e[r]=0};var r=(r,t)=>{var n,o,[a,i,l]=t,s=0;if(a.some((r=>0!==e[r]))){for(n in i)y.o(i,n)&&(y.m[n]=i[n]);l&&l(y)}for(r&&r(t);s<a.length;s++)o=a[s],y.o(e,o)&&e[o]&&e[o][0](),e[o]=0},t=globalThis.webpackChunk_openmrs_esm_stock_management_app=globalThis.webpackChunk_openmrs_esm_stock_management_app||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),y.nc=void 0;var _=y(1371);_openmrs_esm_stock_management_app=_})();
|
@@ -32,9 +32,9 @@
|
|
32
32
|
"initial": false,
|
33
33
|
"entry": false,
|
34
34
|
"recorded": false,
|
35
|
-
"size":
|
35
|
+
"size": 1033865,
|
36
36
|
"sizes": {
|
37
|
-
"javascript":
|
37
|
+
"javascript": 1033655,
|
38
38
|
"consume-shared": 210
|
39
39
|
},
|
40
40
|
"names": [],
|
@@ -48,7 +48,7 @@
|
|
48
48
|
"auxiliaryFiles": [
|
49
49
|
"39.js.map"
|
50
50
|
],
|
51
|
-
"hash": "
|
51
|
+
"hash": "36d7594192fbb296",
|
52
52
|
"childrenByOrder": {}
|
53
53
|
},
|
54
54
|
{
|
@@ -102,7 +102,7 @@
|
|
102
102
|
"auxiliaryFiles": [
|
103
103
|
"openmrs-esm-stock-management-app.js.map"
|
104
104
|
],
|
105
|
-
"hash": "
|
105
|
+
"hash": "e829c254097e3a96",
|
106
106
|
"childrenByOrder": {}
|
107
107
|
},
|
108
108
|
{
|
@@ -110,10 +110,10 @@
|
|
110
110
|
"initial": true,
|
111
111
|
"entry": true,
|
112
112
|
"recorded": false,
|
113
|
-
"size":
|
113
|
+
"size": 4725045,
|
114
114
|
"sizes": {
|
115
115
|
"consume-shared": 252,
|
116
|
-
"javascript":
|
116
|
+
"javascript": 4703097,
|
117
117
|
"share-init": 252,
|
118
118
|
"runtime": 21444
|
119
119
|
},
|
@@ -130,7 +130,33 @@
|
|
130
130
|
"auxiliaryFiles": [
|
131
131
|
"main.js.map"
|
132
132
|
],
|
133
|
-
"hash": "
|
133
|
+
"hash": "ae5edd249b6c153d",
|
134
|
+
"childrenByOrder": {}
|
135
|
+
},
|
136
|
+
{
|
137
|
+
"rendered": true,
|
138
|
+
"initial": false,
|
139
|
+
"entry": false,
|
140
|
+
"recorded": false,
|
141
|
+
"reason": "split chunk (cache group: defaultVendors)",
|
142
|
+
"size": 3531909,
|
143
|
+
"sizes": {
|
144
|
+
"javascript": 3531909
|
145
|
+
},
|
146
|
+
"names": [],
|
147
|
+
"idHints": [
|
148
|
+
"vendors"
|
149
|
+
],
|
150
|
+
"runtime": [
|
151
|
+
"@openmrs/esm-stock-management-app"
|
152
|
+
],
|
153
|
+
"files": [
|
154
|
+
"180.js"
|
155
|
+
],
|
156
|
+
"auxiliaryFiles": [
|
157
|
+
"180.js.map"
|
158
|
+
],
|
159
|
+
"hash": "c8e04103bafa5900",
|
134
160
|
"childrenByOrder": {}
|
135
161
|
},
|
136
162
|
{
|
@@ -186,9 +212,9 @@
|
|
186
212
|
"initial": false,
|
187
213
|
"entry": false,
|
188
214
|
"recorded": false,
|
189
|
-
"size":
|
215
|
+
"size": 1706,
|
190
216
|
"sizes": {
|
191
|
-
"javascript":
|
217
|
+
"javascript": 1706
|
192
218
|
},
|
193
219
|
"names": [],
|
194
220
|
"idHints": [],
|
@@ -200,7 +226,7 @@
|
|
200
226
|
"574.js"
|
201
227
|
],
|
202
228
|
"auxiliaryFiles": [],
|
203
|
-
"hash": "
|
229
|
+
"hash": "79c30f90fd2e5c04",
|
204
230
|
"childrenByOrder": {}
|
205
231
|
},
|
206
232
|
{
|
@@ -278,9 +304,9 @@
|
|
278
304
|
"entry": false,
|
279
305
|
"recorded": false,
|
280
306
|
"reason": "reused as split chunk (cache group: defaultVendors)",
|
281
|
-
"size":
|
307
|
+
"size": 1774162,
|
282
308
|
"sizes": {
|
283
|
-
"javascript":
|
309
|
+
"javascript": 1774162
|
284
310
|
},
|
285
311
|
"names": [],
|
286
312
|
"idHints": [
|
@@ -296,33 +322,7 @@
|
|
296
322
|
"auxiliaryFiles": [
|
297
323
|
"800.js.map"
|
298
324
|
],
|
299
|
-
"hash": "
|
300
|
-
"childrenByOrder": {}
|
301
|
-
},
|
302
|
-
{
|
303
|
-
"rendered": true,
|
304
|
-
"initial": false,
|
305
|
-
"entry": false,
|
306
|
-
"recorded": false,
|
307
|
-
"reason": "split chunk (cache group: defaultVendors)",
|
308
|
-
"size": 3589778,
|
309
|
-
"sizes": {
|
310
|
-
"javascript": 3589778
|
311
|
-
},
|
312
|
-
"names": [],
|
313
|
-
"idHints": [
|
314
|
-
"vendors"
|
315
|
-
],
|
316
|
-
"runtime": [
|
317
|
-
"@openmrs/esm-stock-management-app"
|
318
|
-
],
|
319
|
-
"files": [
|
320
|
-
"835.js"
|
321
|
-
],
|
322
|
-
"auxiliaryFiles": [
|
323
|
-
"835.js.map"
|
324
|
-
],
|
325
|
-
"hash": "b85dc435ca33dcdf",
|
325
|
+
"hash": "6ecc56e4cc7f2866",
|
326
326
|
"childrenByOrder": {}
|
327
327
|
},
|
328
328
|
{
|
package/dist/routes.json
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-management-dashboard","slot":"stock-management-dashboard-slot","component":"stockManagementDashboard"},{"name":"stock-management-admin-card-link","slot":"system-admin-page-card-link-slot","component":"stockManagementAdminCardLink"},{"name":"stock-operation-dialog","component":"stockOperationDialog"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsDialog"},{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"pages":[{"component":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.
|
1
|
+
{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-management-dashboard","slot":"stock-management-dashboard-slot","component":"stockManagementDashboard"},{"name":"stock-management-admin-card-link","slot":"system-admin-page-card-link-slot","component":"stockManagementAdminCardLink"},{"name":"stock-operation-dialog","component":"stockOperationDialog"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsDialog"},{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"pages":[{"component":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.411"}
|
package/package.json
CHANGED
@@ -38,13 +38,16 @@ const StockHomeInventoryCard = () => {
|
|
38
38
|
|
39
39
|
mergedArray = mergedArray.filter((item) => item.hasExpiration);
|
40
40
|
|
41
|
-
const filteredData = mergedArray
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
41
|
+
const filteredData = mergedArray
|
42
|
+
.filter((item) => {
|
43
|
+
const expirationDate = new Date(item.expiration);
|
44
|
+
const differenceInDays = Math.ceil(
|
45
|
+
(expirationDate.getTime() - currentDate.getTime()) /
|
46
|
+
(1000 * 60 * 60 * 24)
|
47
|
+
);
|
48
|
+
return differenceInDays <= 180 && differenceInDays >= 0;
|
49
|
+
})
|
50
|
+
.slice(0, 5);
|
48
51
|
|
49
52
|
return (
|
50
53
|
<>
|
@@ -5,6 +5,7 @@ import { ComboBox, TextInputSkeleton } from "@carbon/react";
|
|
5
5
|
import { useConcept } from "../../../stock-lookups/stock-lookups.resource";
|
6
6
|
import { type ConfigObject } from "../../../config-schema";
|
7
7
|
import { useConfig } from "@openmrs/esm-framework";
|
8
|
+
import { useTranslation } from "react-i18next";
|
8
9
|
|
9
10
|
interface StockItemCategorySelectorProps<T> {
|
10
11
|
categoryUuid?: string;
|
@@ -23,6 +24,8 @@ interface StockItemCategorySelectorProps<T> {
|
|
23
24
|
const StockItemCategorySelector = <T,>(
|
24
25
|
props: StockItemCategorySelectorProps<T>
|
25
26
|
) => {
|
27
|
+
const { t } = useTranslation();
|
28
|
+
|
26
29
|
const { stockItemCategoryUUID } = useConfig<ConfigObject>();
|
27
30
|
const {
|
28
31
|
items: { answers: categories },
|
@@ -52,10 +55,10 @@ const StockItemCategorySelector = <T,>(
|
|
52
55
|
categories?.find((p) => p.uuid === props.categoryUuid) || {}
|
53
56
|
}
|
54
57
|
itemToString={(item?: Concept) =>
|
55
|
-
item && item?.display ? `${item?.display}` : ""
|
58
|
+
item && item?.display ? `${t(item?.display)}` : ""
|
56
59
|
}
|
57
60
|
shouldFilterItem={() => true}
|
58
|
-
value={categories?.find((p) => p.uuid === value)?.display ?? ""}
|
61
|
+
value={t(categories?.find((p) => p.uuid === value)?.display) ?? ""}
|
59
62
|
placeholder={props.placeholder}
|
60
63
|
ref={ref}
|
61
64
|
invalid={props.invalid}
|
@@ -4,8 +4,8 @@ export interface RadioOption {
|
|
4
4
|
}
|
5
5
|
|
6
6
|
export const radioOptions: RadioOption[] = [
|
7
|
-
{ label: "
|
8
|
-
{ label: "
|
7
|
+
{ label: "Pharmaceuticals", value: true },
|
8
|
+
{ label: "Non Pharmaceuticals", value: false },
|
9
9
|
];
|
10
10
|
|
11
11
|
export const expirationOptions: RadioOption[] = [
|
@@ -19,8 +19,12 @@ const FilterStockItems: React.FC<FilterStockItemsProps> = ({
|
|
19
19
|
className={styles.spacing}
|
20
20
|
>
|
21
21
|
<RadioButton labelText="All" value="" id="is-drug-all" />
|
22
|
-
<RadioButton labelText="
|
23
|
-
<RadioButton
|
22
|
+
<RadioButton labelText="Pharmaceuticals" value="true" id="is-drug-drug" />
|
23
|
+
<RadioButton
|
24
|
+
labelText="Non Pharmaceuticals"
|
25
|
+
value="false"
|
26
|
+
id="is-drug-other"
|
27
|
+
/>
|
24
28
|
</RadioButtonGroup>
|
25
29
|
);
|
26
30
|
};
|
@@ -45,6 +45,7 @@ const StockItemsTableComponent: React.FC<StockItemsTableProps> = () => {
|
|
45
45
|
items,
|
46
46
|
totalCount,
|
47
47
|
currentPageSize,
|
48
|
+
setPageSize,
|
48
49
|
pageSizes,
|
49
50
|
currentPage,
|
50
51
|
setCurrentPage,
|
@@ -275,7 +276,10 @@ const StockItemsTableComponent: React.FC<StockItemsTableProps> = () => {
|
|
275
276
|
pageSize={currentPageSize}
|
276
277
|
pageSizes={pageSizes}
|
277
278
|
totalItems={totalCount}
|
278
|
-
onChange={({ page }) =>
|
279
|
+
onChange={({ page, pageSize }) => {
|
280
|
+
setCurrentPage(page);
|
281
|
+
setPageSize(pageSize);
|
282
|
+
}}
|
279
283
|
className={styles.paginationOverride}
|
280
284
|
/>
|
281
285
|
</>
|
@@ -18,7 +18,7 @@ export function useStockItemsPages(v?: ResourceRepresentation) {
|
|
18
18
|
const [stockItemFilter, setStockItemFilter] = useState<StockItemFilter>({
|
19
19
|
startIndex: currentPage - 1,
|
20
20
|
v: v || ResourceRepresentation.Default,
|
21
|
-
limit:
|
21
|
+
limit: currentPageSize,
|
22
22
|
q: null,
|
23
23
|
totalCount: true,
|
24
24
|
});
|
@@ -118,7 +118,9 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
|
|
118
118
|
maxDate={formatForDatePicker(today())}
|
119
119
|
locale="en"
|
120
120
|
dateFormat={DATE_PICKER_CONTROL_FORMAT}
|
121
|
-
onChange={
|
121
|
+
onChange={([newDate]) => {
|
122
|
+
onChange(newDate);
|
123
|
+
}}
|
122
124
|
>
|
123
125
|
<DatePickerInput
|
124
126
|
invalid={!!errors.operationDate}
|
@@ -127,7 +129,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
|
|
127
129
|
name="operationDate"
|
128
130
|
placeholder={DATE_PICKER_FORMAT}
|
129
131
|
labelText={t("operationDate", "Operation Date")}
|
130
|
-
|
132
|
+
defaultValue={formatForDatePicker(model?.operationDate)}
|
131
133
|
/>
|
132
134
|
</DatePicker>
|
133
135
|
)}
|
package/translations/en.json
CHANGED
@@ -20,5 +20,7 @@
|
|
20
20
|
"patientGetterExplainer": "Try clicking the button below to fetch a patient from the backend",
|
21
21
|
"resources": "Resources",
|
22
22
|
"usefulLinks": "Below are some links to useful resources",
|
23
|
-
"welcomeText": "Welcome to the O3 Template app"
|
23
|
+
"welcomeText": "Welcome to the O3 Template app",
|
24
|
+
"Is a Drug": "Pharmaceuticals",
|
25
|
+
"Non Drug": "Non Pharmaceuticals"
|
24
26
|
}
|