ui-soxo-bootstrap-core 2.6.53 → 2.6.55-dev.0

package/core/lib/models/forms/components/form-creator/form-creator.js

@@ -211,7 +211,9 @@ function FormCreator({
         // Keep the same value preparation path for normal submit and search reset.
         fields.forEach((field) => {
 
-            if (field.field && field.field.includes('date')) {
+            // Only actual date inputs are converted , a field can be named with date
+            // and still hold a plain value ( eg : date_filter_type select )
+            if (field.field && field.field.includes('date') && ['date', 'datetime'].indexOf(field.type) !== -1) {
 
                 nextValues[field.field] = moment(nextValues[field.field]).valueOf();
 
@@ -530,7 +532,7 @@ function UserInput({ field, onUpload, selectedInformation, onChange, onSearchRes
                     return (
                         <Select defaultValue={defaultValue}
                             required={field.required}
-                            style={{ width: '120' }}
+                            style={{ minWidth: '160px' }}
                             onChange={(value) => onChange(field, value)}
                         >
                             {field.options.map((option, key) => (

package/core/models/menus/components/menu-lists/menu-lists.js

@@ -348,8 +348,8 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
   );
 
   return (
-    <Card className="generic-list">
-      <div style={{ marginBottom: 16 }}>
+    <Card className="generic-list menu-lists">
+      <div className="menu-lists__header" style={{ marginBottom: 16 }}>
         <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
           <Search placeholder="Search menus & sub-menus…" allowClear style={{ width: 300, marginBottom: '0px' }} onChange={onSearch} />
 
@@ -399,10 +399,10 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
           </div>
         )}
       </div>
-      {loading ? (
-        <Skeleton active />
-      ) : (
-        <>
+      <div className="menu-lists__body">
+        {loading ? (
+          <Skeleton active />
+        ) : (
           <>
             {/* {!view ? ( */}
             <Card>
@@ -468,8 +468,8 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
               <CardList model={model} data={filtered ? filtered : records} />
             )} */}
           </>
-        </>
-      )}
+        )}
+      </div>
 
       <Drawer title={drawerTitle} open={drawerVisible} width="80%" destroyOnClose onClose={() => setDrawerVisible(false)}>
         {model.ModalAddComponent && (

package/core/models/menus/components/menu-lists/menu-lists.scss

@@ -1,3 +1,30 @@
+/* Keep the search / order switch / create button row pinned while only the
+   menu cards below scroll. */
+.menu-lists {
+  height: calc(100vh - 100px);
+  display: flex;
+  flex-direction: column;
+
+  > .ant-card-body {
+    display: flex;
+    flex-direction: column;
+    flex: 1 1 auto;
+    min-height: 0;
+    overflow: hidden;
+  }
+
+  .menu-lists__header {
+    flex: 0 0 auto;
+  }
+
+  .menu-lists__body {
+    flex: 1 1 auto;
+    min-height: 0;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+}
+
 .custom-collapse {
   background: transparent !important;
   border: none !important;

package/core/modules/reporting/components/reporting-dashboard/reporting-dashboard.js

@@ -15,6 +15,9 @@ import MenuDashBoardComponent from '../../../../lib/elements/basic/menu-dashboar
 
 import ReportingTable from './reporting-table';
 
+// Input parameter that decides which date column the report is filtered by
+const DATE_FILTER_FIELD = 'date_filter_type';
+
 /**
  * ReportingDashboard component renders the dashboard and handles patient details,
  * configuration, and form layout for generating reports.
@@ -174,6 +177,9 @@ export default function ReportingDashboard({
       if (urlParams[record.field]) {
         if (record.type === 'date') {
           formContent[record.field] = moment.utc(urlParams[record.field]);
+        } else if (record.type !== 'search') {
+          // Restore plain values ( eg : select filters ) back from the url
+          formContent[record.field] = urlParams[record.field];
         }
 
         // return formContent;
@@ -201,6 +207,10 @@ export default function ReportingDashboard({
             break;
 
           default:
+            // Any other default is taken as the value itself ( eg : select filters )
+            if (record.default !== undefined && record.default !== null && record.type !== 'date') {
+              formContent[record.field] = record.default;
+            }
             break;
         }
       }
@@ -209,6 +219,11 @@ export default function ReportingDashboard({
       if (record.type === 'date' && !formContent[record.field]) {
         formContent[record.field] = moment().tz(process.env.REACT_APP_TIMEZONE);
       }
+
+      // For a static select with no value yet , preselect the first option
+      if (record.type === 'select' && Array.isArray(record.options) && formContent[record.field] === undefined) {
+        formContent[record.field] = record.options[0]?.valueMember;
+      }
       if (record.type === 'search') {
         if (!formContent[record.field]) formContent[record.field] = [];
         return {
@@ -248,8 +263,19 @@ export default function ReportingDashboard({
       // If enabled, clear the details array
       setDetails([]);
     } else {
+      // The date filter input is shown only when the filter is enabled in otherDetails .
+      // Otherwise it stays hidden holding its default value , so the report keeps filtering
+      // on the default date
+      const filterKey = otherDetails ? Object.keys(otherDetails).find((key) => key.toLowerCase().trim() === 'enableuserfilter') : null;
+
+      const isFilterEnabled = filterKey ? otherDetails[filterKey] === true || otherDetails[filterKey] === 'true' : false;
+
       // Keep all parameters with a type (including search) to render in FormCreator
-      setDetails([...parameters.filter((ele) => ele.type)]);
+      setDetails([
+        ...parameters
+          .filter((ele) => ele.type)
+          .map((ele) => (ele.field === DATE_FILTER_FIELD ? { ...ele, visible: isFilterEnabled } : ele)),
+      ]);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-soxo-bootstrap-core",
-  "version": "2.6.53",
+  "version": "2.6.55-dev.0",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"