ui-soxo-bootstrap-core 2.6.1-dev.2 → 2.6.1-dev.20

package/core/models/core-scripts/core-scripts.js

@@ -9,142 +9,150 @@ import React from 'react';
 
 import Base from '../base/base';
 
-import { ApiUtils } from './../../lib/'
-
+import { ApiUtils } from './../../lib/';
 
 class CoreScript extends Base {
+  constructor() {
+    super();
 
-    constructor() {
-        super();
-
-        this.fields = [
-            {
-                field: 'name',
-                caption: 'Name'
-            },
-            {
-                field: 'amount',
-                caption: 'Amount'
-            }
-        ];
-
-        // this.columns = ;
-    }
-
-    get id() {
-        return 'id';
-    }
-
-    get getEndpoint() {
-        return 'core-scripts';
-    }
-
-
-    get modelName() {
-        return `core-scripts`;
-    }
-
-    get columns() {
-        return [
-            {
-                caption: 'Staff',
-                field: 'staff.name',
-                key: 'staff'
-            },
-            {
-                caption: 'Weight',
-                field: 'weight',
-                key: 'weight'
-            },
-            {
-                caption: 'Date',
-                field: 'created_at',
-                key: 'created_at'
-            }
-        ];
-    }
-
-
-    /**
-     *Getting core_script data
-     * @returns
-     */
-    getReportingLisitng = (id, formBody, dbPtr = null) => {
-        
-        // Settings db pointer
-        if (!dbPtr) dbPtr = localStorage.db_ptr;
-        return ApiUtils.post({
-            url: `core-scripts/dashboardquery/${id}`,
-            formBody,
-            headers: {
-        'Content-Type': 'application/json',
-        Authorization: 'Bearer ' + localStorage.access_token,
-        db_ptr: dbPtr
+    this.fields = [
+      {
+        field: 'name',
+        caption: 'Name',
       },
-        });
-    };
-
+      {
+        field: 'amount',
+        caption: 'Amount',
+      },
+    ];
 
-    /**
-     *Updating user details
-     * @returns
-     */
-    getUserDetailsLisitng = (id, formBody) => {
+    // this.columns = ;
+  }
 
-        return ApiUtils.post({
-            url: `core-scripts/update-user-deatils/${id}`,
-            formBody,
-        });
-    };
+  get id() {
+    return 'id';
+  }
 
+  get getEndpoint() {
+    return 'core-scripts';
+  }
 
-    /**
-     * 
-     */
-    getReportMenu = async ({ id }) => {
-
-        const result = await this.getRecord({ id });
-
-        const report = result.result
-
-        return {
-            ...report,
-            caption: report.caption,
-            path: '/reports/' + report.id,
-            is_visible: true
-        }
-    }
-
-    /**
-      * To get extra script data corresponding to mode
-      *
-      * @param {*} mode
-      * @returns
-      */
-    getExtraInfo = (mode) => {
-        return ApiUtils.get({
-            url: `core-scripts/get-script-data?mode=${mode}`,
-        });
-    };
+  get modelName() {
+    return `core-scripts`;
+  }
 
-
-    /**
-      * To get executed data
-      *
-      * @param {*} mode
-      * @returns
-      */
-
-    getSelectedExtraInfo = (formBody) => {
-        return ApiUtils.post({
-            url: `core-scripts/get-selected-script-data`,
-            formBody,
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: 'Bearer ' + localStorage.access_token,
-            },
-        });
+  get columns() {
+    return [
+      {
+        caption: 'Staff',
+        field: 'staff.name',
+        key: 'staff',
+      },
+      {
+        caption: 'Weight',
+        field: 'weight',
+        key: 'weight',
+      },
+      {
+        caption: 'Date',
+        field: 'created_at',
+        key: 'created_at',
+      },
+    ];
+  }
+
+  /**
+   *Getting core_script data
+   * @returns
+   */
+  getReportingLisitng = (id, formBody, dbPtr = null) => {
+    // Settings db pointer
+    if (!dbPtr) dbPtr = localStorage.db_ptr;
+    return ApiUtils.post({
+        // baseUrl: 'http://localhost:8002/dev/',  
+      url: `core-scripts/dashboardquery/${id}`,
+      formBody,
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: 'Bearer ' + localStorage.access_token,
+        db_ptr: dbPtr,
+      },
+    });
+  };
+
+  /**
+   *Updating user details
+   * @returns
+   */
+  getUserDetailsLisitng = (id, formBody) => {
+    return ApiUtils.post({
+      url: `core-scripts/update-user-deatils/${id}`,
+      formBody,
+    });
+  };
+
+  getQuery = (formBody) => {
+    return ApiUtils.post({
+      url: `core-scripts/execute-script-api`,
+      formBody,
+    });
+  };
+/**
+ * 
+ */
+  getQuerySeacch = (formBody) => {
+    return ApiUtils.post({
+    //   baseUrl: 'http://localhost:8002/dev/',
+      url: `core-scripts/execute-script-by-search`,
+      formBody,
+    });
+  };
+
+  /**
+   *
+   */
+  getReportMenu = async ({ id }) => {
+    const result = await this.getRecord({ id });
+
+    const report = result.result;
+
+    return {
+      ...report,
+      caption: report.caption,
+      path: '/reports/' + report.id,
+      is_visible: true,
     };
+  };
+
+  /**
+   * To get extra script data corresponding to mode
+   *
+   * @param {*} mode
+   * @returns
+   */
+  getExtraInfo = (mode) => {
+    return ApiUtils.get({
+      url: `core-scripts/get-script-data?mode=${mode}`,
+    });
+  };
+
+  /**
+   * To get executed data
+   *
+   * @param {*} mode
+   * @returns
+   */
+
+  getSelectedExtraInfo = (formBody) => {
+    return ApiUtils.post({
+      url: `core-scripts/get-selected-script-data`,
+      formBody,
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: 'Bearer ' + localStorage.access_token,
+      },
+    });
+  };
 }
 
 export default CoreScript;

package/core/models/doctor/components/doctor-add/doctor-add.js

@@ -6,7 +6,8 @@ import { useTranslation, Button } from './../../../../lib/';
 import { UsersAPI } from '../../..';
 import SignatureCanvasComponent from '../../../../lib/components/consent/signature-pad';
 
-const DoctorAdd = ({ visible, onCancel, attributes, doctorId, doctorData, onSuccess }) => {
+const DoctorAdd = ({ visible, onCancel, doctorId, doctorData, onSuccess }) => {
+  // console.log('attributes', attributes);
   const [form] = Form.useForm();
   const { t } = useTranslation();
 
@@ -21,8 +22,8 @@ const DoctorAdd = ({ visible, onCancel, attributes, doctorId, doctorData, onSucc
   const [doctorID, setDoctorID] = useState(false);
   const [selectedDoctor, setSelectedDoctor] = useState(null);
 
-  const propValues = attributes || {};
-  const doctorType = propValues?.type;
+  // const propValues = attributes || {};
+  // const doctorType = propValues?.type;
 
   const editMode = Boolean(doctorId);
 
@@ -37,6 +38,10 @@ const DoctorAdd = ({ visible, onCancel, attributes, doctorId, doctorData, onSucc
     message: '',
   });
 
+  const getDoctorTypeOptions = () => [
+    { label: 'In House', value: 'DRINH' },
+    { label: 'Out Side', value: 'DROTR' },
+  ];
   /** Autofocus on modal open */
   useEffect(() => {
     if (visible) {
@@ -266,7 +271,7 @@ const DoctorAdd = ({ visible, onCancel, attributes, doctorId, doctorData, onSucc
               <Row gutter={16}>
                 <Col span={8}>
                   <Form.Item label="Type" name="type">
-                    <Select placeholder="Select Type" options={doctorType || []} showSearch />
+                    <Select placeholder="Select Type" options={getDoctorTypeOptions() || []} showSearch />
                   </Form.Item>
                 </Col>
 

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

@@ -164,7 +164,7 @@ const MenuAdd = ({ model, callback, edit, history, formContent, match, additiona
             <div className="left-container">
               {/* Caption */}
               <Form.Item name={'caption'} label="Caption" rules={[{ required: true, message: 'Caption is required' }]}>
-                <Input placeholder="Enter caption" />
+                <Input placeholder="Enter caption" autoFocus />
               </Form.Item>
               {/* Caption Ends */}
 

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

@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useEffect } from 'react';
-import { Space, Popconfirm, Input, Drawer, Skeleton, Collapse, message } from 'antd';
+import { Space, Popconfirm, Input, Drawer, Skeleton, Collapse, message, Tag, Empty } from 'antd';
 import { ReloadOutlined, DeleteOutlined, EditOutlined, PlusCircleFilled, CopyOutlined } from '@ant-design/icons';
 import { Button, Card, Switch, DraggableWrapper } from '../../../../lib';
 //  for draggable menu list import { DndProvider } from "react-dnd";
@@ -55,7 +55,6 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
       .catch(() => setLoading(false));
   };
 
-  console.log('record', records);
   /**
    *
    */
@@ -204,9 +203,9 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
     model.delete(rec).then(loadMenus);
   };
 
-  const filtered = records.filter((r) => r.name?.toUpperCase().includes(query.toUpperCase()));
+  const filtered = records.filter((r) => r.caption?.toUpperCase().includes(query.toUpperCase()));
 
-  const visibleItems = dragMode ? records : filtered;
+  const visibleItems = filtered;
 
   const onSearch = (event) => {
     setQuery(event.target.value);
@@ -363,50 +362,53 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
             <Card>
               <DndProvider backend={HTML5Backend}>
                 <Collapse accordion>
-                  {visibleItems.map((item, index) => (
-                    <Panel
-                      key={item.id}
-                      header={
-                        <DraggableWrapper
-                          id={item.id}
-                          index={index}
-                          movePanel={movePanel}
-                          item={item}
-                          dragEnabled={dragMode}
-                          level={1}
-                          parentId={null}
-                          onCrossLevelMove={handleCrossLevelMove}
-                          canAcceptChildren={true}
-                        />
-                      }
-                      //  only show arrow if sub_menus exist
-                      showArrow={item.sub_menus && item.sub_menus.length > 0}
-                      //  disable panel
-                      // collapsible={item.sub_menus && item.sub_menus.length > 0 ? 'header' : 'disabled'}
-                      extra={panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerVisible, deleteRecord)}
-                    >
-                      {item.sub_menus && item.sub_menus.length > 0 && (
-                        <NestedMenu
-                          parentId={item.id}
-                          step={item.step + 1}
-                          items={item.sub_menus || []}
-                          model={model}
-                          dragMode={dragMode}
-                          setSelectedRecord={setSelectedRecord}
-                          setDrawerTitle={setDrawerTitle}
-                          setDrawerVisible={setDrawerVisible}
-                          deleteRecord={deleteRecord}
-                          level={2}
-                          onCrossLevelMove={handleCrossLevelMove}
-                          onChange={(subMenus) => {
-                            const updated = records.map((r) => (r.id === item.id ? { ...r, sub_menus: subMenus } : r));
-                            setRecords(updated);
-                            setOrderChanged(true);
-                          }}
-                        />
-                      )}
-                    </Panel>
-                  ))}
+                  {visibleItems && visibleItems.length > 0 ? (
+                    visibleItems.map((item, index) => (
+                      <Panel
+                        key={item.id}
+                        header={
+                          <DraggableWrapper
+                            id={item.id}
+                            index={index}
+                            movePanel={movePanel}
+                            item={item}
+                            dragEnabled={dragMode}
+                            level={1}
+                            parentId={null}
+                            onCrossLevelMove={handleCrossLevelMove}
+                            canAcceptChildren={true}
+                          />
+                        }
+                        showArrow={item.sub_menus && item.sub_menus.length > 0}
+                        extra={panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerVisible, deleteRecord)}
+                      >
+                        {item.sub_menus && item.sub_menus.length > 0 && (
+                          <NestedMenu
+                            parentId={item.id}
+                            step={item.step + 1}
+                            items={item.sub_menus || []}
+                            model={model}
+                            dragMode={dragMode}
+                            setSelectedRecord={setSelectedRecord}
+                            setDrawerTitle={setDrawerTitle}
+                            setDrawerVisible={setDrawerVisible}
+                            deleteRecord={deleteRecord}
+                            level={2}
+                            onCrossLevelMove={handleCrossLevelMove}
+                            onChange={(subMenus) => {
+                              const updated = records.map((r) => (r.id === item.id ? { ...r, sub_menus: subMenus } : r));
+                              setRecords(updated);
+                              setOrderChanged(true);
+                            }}
+                          />
+                        )}
+                      </Panel>
+                    ))
+                  ) : (
+                    <div style={{ textAlign: 'center', padding: '40px 0' }}>
+                      <Empty description="No Menu Items" />
+                    </div>
+                  )}
                 </Collapse>
               </DndProvider>
             </Card>
@@ -440,7 +442,7 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
 function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerVisible, deleteRecord) {
   return (
     <Space onClick={(e) => e.stopPropagation()}>
-      {/* ⭐ NEW BUTTON — Add Submenu */}
+      <Tag color={item.is_visible === true ? 'green' : 'blue'}>{item.is_visible === true ? 'VISIBLE' : 'HIDDEN'}</Tag>{' '}
       <Button
         size="small"
         type="dashed"
@@ -459,7 +461,6 @@ function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerV
         <PlusCircleFilled />
         Add Sub Menu
       </Button>
-
       {model.ModalAddComponent && (
         <Button
           size="small"
@@ -473,8 +474,7 @@ function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerV
           <EditOutlined />
         </Button>
       )}
-
-      {/* <Button
+      <Button
         size="small"
         type="default"
         onClick={() => {
@@ -484,8 +484,7 @@ function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerV
         }}
       >
         <CopyOutlined />
-      </Button> */}
-
+      </Button>
       <Popconfirm title="Are you sure?" onConfirm={() => deleteRecord(item)}>
         <Button danger size="small" type="default">
           <DeleteOutlined />

package/core/models/menus/menus.js

@@ -177,28 +177,47 @@ class MenusAPI extends Base {
    * @param {*} menu
    * @returns
    */
-  getMenus = (config) => {
+  getMenus = (config, dbPtr = null) => {
     // Use 'core-menus' endpoint if REACT_APP_USE_CORE_MENUS is true (used for Matria)
     const url =
       process.env.REACT_APP_USE_CORE_MENUS === 'true'
         ? 'core-menus/get-menus' // Matria
         : 'menus/get-menus'; // NURA
 
+    if (!dbPtr) dbPtr = localStorage.db_ptr;
+
     return this.get({
       url,
       config,
+      headers: {
+        db_ptr: dbPtr,
+      },
+    }).then((result) => result);
+  };
+
+  getMenubyUser = (user_id) => {
+    const url = `menus/get-menus?userId=${user_id}`;
+    return this.get({
+      url,
     }).then((result) => result);
   };
 
   // get core-menu list with submenu
   getCoreMenuLists = () => {
     const url = 'core-menus/core-menus?step=1&header_id=null';
-
     return this.get({
       url,
     }).then((result) => result);
   };
 
+  getCoreMenuByRoleId = async (role_id) => {
+    const url = `menus/get-menus-by-role/${role_id}`;
+    const result = await this.get({
+      url,
+    });
+    return result;
+  };
+
   getCoreMenus = () => {
     return [
       // {
@@ -286,6 +305,12 @@ class MenusAPI extends Base {
       // }
     ];
   };
+  // license summary api call
+  getSummary = () => {
+    return ApiUtils.get({
+      url: 'license/summary',
+    });
+  };
 }
 
 export default MenusAPI;