ui-soxo-bootstrap-core 2.6.1-dev.15 → 2.6.1-dev.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -82,7 +82,7 @@ export async function ApiCall({ url, formBody, method, settings, ...props }) {
|
|
|
82
82
|
...settings.headers,
|
|
83
83
|
...headers,
|
|
84
84
|
...(props.headers || {}),
|
|
85
|
-
Authorization: `Bearer ${token}
|
|
85
|
+
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
|
86
86
|
'Content-Type': 'application/json',
|
|
87
87
|
},
|
|
88
88
|
body: formBody ? JSON.stringify(formBody) : null,
|
|
@@ -51,7 +51,6 @@ export default function buildDisplayColumns({ columns = [], patients = [], isFix
|
|
|
51
51
|
const isHeaderWrapEnabled = otherDetails?.isHeaderWrapEnabled;
|
|
52
52
|
|
|
53
53
|
const titleStyle = isHeaderWrapEnabled ? { whiteSpace: 'pre-wrap', overflowWrap: 'break-word' } : {};
|
|
54
|
-
|
|
55
54
|
displayColumns.push({
|
|
56
55
|
render: (record) =>
|
|
57
56
|
renderDisplayCell({
|
|
@@ -80,8 +79,8 @@ export default function buildDisplayColumns({ columns = [], patients = [], isFix
|
|
|
80
79
|
? [...new Set(patients.map((item) => item[entry.field]).filter(Boolean))].map((value) => ({ text: value, value }))
|
|
81
80
|
: null,
|
|
82
81
|
onFilter: isFilterEnabled ? (value, record) => record[entry.field] === value : null,
|
|
83
|
-
sorter: isSortingEnabled ? (a, b) => String(a[entry.field]
|
|
84
|
-
filterSearch:
|
|
82
|
+
sorter: isSortingEnabled ? (a, b) => String(a[entry.field]).localeCompare(String(b[entry.field])) : null,
|
|
83
|
+
filterSearch: isFilterEnabled ? isFilterEnabled : false,
|
|
85
84
|
exportDefinition: (record) => getExportDefinition(entry, record),
|
|
86
85
|
align: entry.type === 'number' ? 'right' : 'left',
|
|
87
86
|
});
|
|
@@ -722,8 +722,8 @@ function GuestList({
|
|
|
722
722
|
|
|
723
723
|
const { isMobile, dispatch } = useContext(GlobalContext);
|
|
724
724
|
const [single, setSingle] = useState({});
|
|
725
|
-
|
|
726
725
|
const otherDetails = config.other_details1 ? JSON.parse(config.other_details1) : {};
|
|
726
|
+
|
|
727
727
|
// const [view, setView] = useState(isMobile ? true : false); //Need to check this condition
|
|
728
728
|
const cols = buildDisplayColumns({
|
|
729
729
|
columns,
|
|
@@ -1073,7 +1073,7 @@ function GuestList({
|
|
|
1073
1073
|
const summaryValues = calculateSummaryValues(summaryCols, pageData);
|
|
1074
1074
|
|
|
1075
1075
|
return (
|
|
1076
|
-
<Table.Summary.Row className=
|
|
1076
|
+
<Table.Summary.Row className="report-summary-row">
|
|
1077
1077
|
{cols.map((col, index) => {
|
|
1078
1078
|
if (summaryValues[col.field] !== undefined) {
|
|
1079
1079
|
return (
|