Merge pull request #17 from openimis/develop

MERGING RELEASE branches
openimis · May 16, 2023 · 047c337 · 047c337
2 parents 3db3427 + 0a3d49c
commit 047c337
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/src/components/AddFundingDialog.js b/src/components/AddFundingDialog.js
@@ -67,6 +67,7 @@ const AddFundingDialog = (props) => {
                 label="receipt"
                 name="receipt"
                 value={form.receipt}
+                required
                 onChange={(receipt) => setForm({ ...form, receipt })}
               />
             </Grid>
@@ -75,6 +76,7 @@ const AddFundingDialog = (props) => {
                 pubRef="core.DatePicker"
                 value={form.payDate}
                 module="payer"
+                required
                 label="payDate"
                 onChange={(payDate) => setForm({ ...form, payDate })}
               />

diff --git a/src/components/PayerSearcher.js b/src/components/PayerSearcher.js
@@ -1,15 +1,22 @@
 import React, { useState, useCallback } from "react";
-import { usePayersQuery } from "../hooks";
-import { Searcher, useTranslations, useModulesManager, ConfirmDialog } from "@openimis/fe-core";
-import PayerFilters from "./PayerFilters";
+
 import { Tooltip, IconButton } from "@material-ui/core";
 import { Tab as TabIcon, Delete as DeleteIcon } from "@material-ui/icons";
+import { withTheme, withStyles } from "@material-ui/core/styles";
+
+import { Searcher, useTranslations, useModulesManager, combine, ConfirmDialog } from "@openimis/fe-core";
+import { usePayersQuery } from "../hooks";
+import PayerFilters from "./PayerFilters";
 
 const isRowDisabled = (_, row) => Boolean(row.validityTo);
 const formatLocation = (location) => (location ? `${location.code} - ${location.name}` : null);
 
+const styles = (theme) => ({
+  horizontalButtonContainer: theme.buttonContainer.horizontal,
+});
+
 const PayerSearcher = (props) => {
-  const { cacheFiltersKey, onDelete, canDelete, onDoubleClick } = props;
+  const { cacheFiltersKey, classes, onDelete, canDelete, onDoubleClick } = props;
   const modulesManager = useModulesManager();
   const { formatMessage, formatDateFromISO, formatMessageWithValues } = useTranslations("payer", modulesManager);
   const [filters, setFilters] = useState({});
@@ -76,7 +83,7 @@ const PayerSearcher = (props) => {
       (p) => formatDateFromISO(p.validityTo),
       (p) =>
         !filters.showHistory?.value ? (
-          <>
+          <div className={classes.horizontalButtonContainer}>
             <Tooltip title={formatMessage("PayerSearcher.openNewTab")}>
               <IconButton onClick={() => onDoubleClick(p, true)}>
                 <TabIcon />
@@ -89,7 +96,7 @@ const PayerSearcher = (props) => {
                 </IconButton>
               </Tooltip>
             )}
-          </>
+          </div>
         ) : null,
     ];
   }, []);
@@ -128,4 +135,6 @@ const PayerSearcher = (props) => {
   );
 };
 
-export default PayerSearcher;
+const enhance = combine(withTheme, withStyles(styles));
+
+export default enhance(PayerSearcher);