ui-soxo-bootstrap-core 2.4.25-dev.9 → 2.4.25

package/core/models/roles/roles.js

@@ -9,188 +9,180 @@ import { DateUtils } from './../../lib/';
 import { ApiUtils } from './../../lib/';
 
 class RolesAPI extends BaseAPI {
-  constructor() {
-    super();
-
-    this.fields = [
-      {
-        field: 'name',
-        caption: 'Name',
-      },
-
-      {
-        field: 'description',
-        caption: 'Description',
-      },
-
-      {
-        field: 'path',
-        caption: 'Path',
-      },
-    ];
-  }
-
-  relativeAdd() {
-    return true;
-  }
-
-  get getEndpoint() {
-    return 'core-roles';
-  }
-
-  get path() {
-    return `roles`;
-  }
-
-  get getName() {
-    return this.modelName + `s`;
-  }
-
-  get modelName() {
-    return `core-role`;
-  }
-
-  get columns() {
-    return [
-      //     {
-      //     caption: 'Type',
-      //     field: 'type',
-      //     key: 'type',
-      // },
-
-      {
-        caption: 'Role',
-        field: 'name',
-        key: 'name',
-      },
-      {
-        field: 'description',
-        caption: 'Description',
-        key: 'description',
-      },
-
-      // {
-      //     caption: 'Identifier',
-      //     field: 'identifier',
-      //     key: 'identifier',
-      // },
-
-      // {
-      //     caption: 'Mode',
-      //     field: 'mode',
-      //     key: 'mode',
-      // },
-
-      // {
-      //     caption: 'Created By',
-      //     field: 'created_by',
-      //     key: 'created_by',
-      // },
-
-      {
-        caption: 'Created at',
-        field: 'created_at',
-        key: 'created_at',
-        render: (ele) => {
-          return ele.created_at ? DateUtils.formatDate(ele.created_at) : null;
-        },
-      },
-
-      // {
-      //     // field: '',
-      //     title: 'Eye',
-      //     render: record => {
-      //         return (
-      //             <ExtraInfoDetail icon={true} modeValue='RD' title='Role Details' {...record} />
-
-      //         );
-      //     },
-      // }
-    ];
-  }
-
-  ListComponent = RoleList;
-
-  ModalAddComponent = (props) => <RoleAdd model={this} {...props} />;
-
-  /**
-   * load the detail of role
-   *
-   * @param {*} menu
-   * @returns
-   */
-  getDetail = (id) => {
-    return this.getRecord(id).then((result) => {
-      return result;
-    });
-  };
-
-  /**
-   * load the list of role
-   *
-   * @param {*} menu
-   * @returns
-   */
-  getRoles = (config) => {
-    // return this.getData({ path: `menus/get-menus`, queries: queries}).then((result) => {
-    //     return result;
-    // });
-
-    return this.get({ url: `admin/role`, config: config }).then((result) => {
-      return result;
-    });
-  };
-
-  deleteRole = (id) => {
-    return ApiUtils.delete({
-      url: `core-roles/delete/${id}`,
-    });
-  };
-
-  getRole = () => {
-    return ApiUtils.get({
-      url: `core-roles/get-core-roles?active=Y`,
-    });
-  };
-
-  /**
-   * Cutsom Api for creating user
-   *
-   * @param {*} values
-   * @returns
-   */
-  createRole = (formBody) => {
-    return ApiUtils.post({
-      url: `core-roles/save-core-role`,
-      formBody,
-    });
-  };
-
-  /**
-   * Cutsom Api for updating user
-   *
-   * @param {*} values
-   * @returns
-   */
-  updateRole = ({ id, formBody }) => {
-    return ApiUtils.put({ url: `core-roles/update/${id}`, formBody });
-  };
-
-  // /**
-  //  * Function to load the roles
-  //  *
-  //  * @param {*} item
-  //  * @returns
-  //  */
-  // loadMenus = (item) => {
-  //     return this.get().then((result) => {
-  //         return Promise.all(result.menus.map(this.loadDetail)).then((result) => {
-  //             return { menus: result };
-  //         });
-  //     });
-  // };
-
-  // ModalAddComponent =
+
+    constructor() {
+
+        super();
+
+        this.fields = [
+            {
+                field: 'name',
+                caption: 'Name',
+            },
+
+            {
+                field: 'description',
+                caption: 'Description',
+            },
+
+            {
+                field: 'path',
+                caption: 'Path',
+            },
+        ];
+
+    }
+
+    relativeAdd() {
+        return true;
+    }
+
+
+    get getEndpoint() {
+        return 'core-roles';
+    }
+
+    get path() {
+        return `roles`;
+    }
+
+    get getName() {
+        return this.modelName + `s`;
+    }
+
+    get modelName() {
+        return `core-role`;
+    }
+
+    get columns() {
+        return [
+
+            //     {
+            //     caption: 'Type',
+            //     field: 'type',
+            //     key: 'type',
+            // },
+
+            {
+                caption: 'Name',
+                field: 'name',
+                key: 'name',
+            },
+
+            {
+                caption: 'Identifier',
+                field: 'identifier',
+                key: 'identifier',
+            },
+
+            // {
+            //     caption: 'Mode',
+            //     field: 'mode',
+            //     key: 'mode',
+            // },
+
+            // {
+            //     caption: 'Created By',
+            //     field: 'created_by',
+            //     key: 'created_by',
+            // },
+
+            {
+                caption: 'Created at',
+                field: 'created_at',
+                key: 'created_at',
+                render: (ele) => {
+                    return ele.created_at ? DateUtils.formatDate(ele.created_at) : null
+                },
+            },
+
+            // {
+            //     // field: '',
+            //     title: 'Eye',
+            //     render: record => {
+            //         return (
+            //             <ExtraInfoDetail icon={true} modeValue='RD' title='Role Details' {...record} />
+
+            //         );
+            //     },
+            // }
+        ];
+    }
+
+    ListComponent = RoleList;
+
+    ModalAddComponent = (props) => <RoleAdd model={this} {...props} />;
+
+
+    /**
+     * load the detail of role
+     *
+     * @param {*} menu
+     * @returns
+     */
+    getDetail = (id) => {
+        return this.getRecord(id).then((result) => {
+            return result;
+        });
+    };
+
+    /**
+     * load the list of role
+     *
+     * @param {*} menu
+     * @returns
+     */
+    getRoles = (config) => {
+
+        // return this.getData({ path: `menus/get-menus`, queries: queries}).then((result) => {
+        //     return result;
+        // });
+
+        return this.get({ url: `admin/role`, config: config }).then((result) => {
+            return result;
+        });
+
+    };
+
+     /**
+    * Cutsom Api for creating user 
+    * 
+    * @param {*} values 
+    * @returns 
+    */
+     createRole = (formBody) => {
+        return ApiUtils.post({ url: `core-roles/create`, formBody });
+    }
+
+
+    /**
+    * Cutsom Api for updating user 
+    * 
+    * @param {*} values 
+    * @returns 
+    */
+    updateRole = ({ id, formBody }) => {
+        return ApiUtils.put({ url: `core-roles/update/${id}`, formBody });
+    }
+
+
+    // /**
+    //  * Function to load the roles
+    //  *
+    //  * @param {*} item
+    //  * @returns
+    //  */
+    // loadMenus = (item) => {
+    //     return this.get().then((result) => {
+    //         return Promise.all(result.menus.map(this.loadDetail)).then((result) => {
+    //             return { menus: result };
+    //         });
+    //     });
+    // };
+
+    // ModalAddComponent = 
+
+
 }
 
 export default RolesAPI;

package/core/models/users/components/user-add/user-add.js

@@ -12,7 +12,6 @@ import { ModelsAPI, PagesAPI } from '../../..';
 
 import { UsersAPI } from '../../..';
 import DoctorAdd from '../../../doctor/components/doctor-add/doctor-add';
-import StaffAdd from '../../../staff/components/staff-add/staff-add';
 
 const { Title } = Typography;
 
@@ -38,9 +37,6 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
   const [users, setUsers] = useState([]);
   const [doctorID, setDoctorID] = useState(false);
   const [selectedDoctor, setSelectedDoctor] = useState(null);
-  const [staffID, setStaffID] = useState(false);
-  const [selectedStaff, setSelectedStaff] = useState(null);
-  const [staffList, setStaffList] = useState([]);
   /**Converting to JSON */
   let firmDetails = JSON.parse(user.firm.f_otherdetails1);
 
@@ -164,7 +160,6 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
     { label: 'General', value: 'GEN' },
     { label: 'Doctor', value: 'RAD' },
     { label: 'Radiographer', value: 'TECH' },
-    { label: 'Staff', value: 'STAFF' },
   ];
 
   /**
@@ -242,25 +237,6 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
       })
       .catch((err) => console.error('Doctor API Error:', err));
   };
-  /** Get staff List */
-  const getStaff = () => {
-    UsersAPI.getAllStaff()
-      .then((res) => {
-        console.log('Staff List Response:', res);
-
-        if (Array.isArray(res)) {
-          const list = res.map((staff) => ({
-            label: `${staff.shortName || 'No Name'} (${staff.id})`,
-            value: staff.id,
-          }));
-
-          setStaffList(list);
-        } else {
-          console.error('API did not return an array!');
-        }
-      })
-      .catch((err) => console.error('staff API Error:', err));
-  };
 
   // Function to handle user type change
   const handleUserTypeChange = (value) => {
@@ -271,11 +247,6 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
     } else {
       form.setFieldsValue({ default_code: undefined });
     }
-    if (value === 'STAFF') {
-      getStaff(); // load staff list
-    } else {
-      form.setFieldsValue({ staff_code: undefined });
-    }
   };
 
   useEffect(() => {
@@ -283,7 +254,6 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
     getDesignations();
     getDepartments();
     getDoctors(); // load doctor list
-    getStaff();
   }, []);
 
   useEffect(() => {
@@ -294,9 +264,6 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
       if (formContent.user_type === 'RAD' && formContent.doctor_code) {
         form.setFieldsValue({ default_code: formContent.doctor_code });
       }
-      if (formContent.user_type === 'STAFF' && formContent.staff_code) {
-        form.setFieldsValue({ staff_code: formContent.staff_code });
-      }
     }
     if (formContent?.id && formContent?.organization_details) {
       try {
@@ -327,6 +294,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
    * Submit values
    */
   const onSubmit = (values) => {
+    console.log('values____________', values);
     /**If PanelOpen is open and edit mode then password will be existing password else new password*/
     if (!isPasswordVisible && mode === 'Edit') {
       values.password = body.password;
@@ -338,11 +306,6 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
     } else {
       values.doctor_code = null;
     }
-    if (values.user_type === 'STAFF') {
-      values.staff_code = values.staff_code;
-    } else {
-      values.staff_code = null;
-    }
     values = {
       ...values,
       auth_type: 'LDAP',
@@ -518,37 +481,6 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
                   />
                 </Form.Item>
               )}
-              {userType === 'STAFF' && (
-                <Form.Item name="staff_code" label="Staff Code" rules={[{ required: true, message: 'Please select a staff code' }]}>
-                  <Select
-                    placeholder="Select Code"
-                    options={staffList}
-                    showSearch
-                    optionFilterProp="label"
-                    dropdownRender={(menu) => (
-                      <>
-                        {menu}
-                        <div
-                          style={{
-                            padding: '8px',
-                            cursor: 'pointer',
-                            borderTop: '1px solid #f0f0f0',
-                            color: '#1890ff',
-                          }}
-                          onClick={() => setVisible(true)}
-                        >
-                          + Add New Staff
-                        </div>
-                      </>
-                    )}
-                  />
-                  {/* Render DoctorAdd OUTSIDE the Select */}
-
-                  <StaffAdd visible={visible} onCancel={() => setVisible(false)} staffData={selectedStaff} staffId={staffID} onSuccess={getStaff} />
-
-                  <></>
-                </Form.Item>
-              )}
             </Col>
           </Row>
           <Row gutter={16}>

package/core/models/users/users.js

@@ -276,63 +276,6 @@ class Users extends Base {
   getUser = ({ id }) => {
     return ApiUtils.get({ url: `users/${id}` });
   };
-
-  /**
-   *Cutsom Api for creating staff
-   * @returns
-   */
-
-  createStaff = (formBody) => {
-    return ApiUtils.post({
-      url: `staff/create-staff`,
-      formBody,
-    });
-  };
-
-  /**
-   * Update a staff by ID
-   * @param {Object} formBody - Data to update
-   * @param {string|number} id - Staff ID
-   * @returns {Promise} API response
-   */
-  updateStaff = (formBody, id) => {
-    return ApiUtils.put({
-      url: `staff/update-staff/${id}`,
-      formBody,
-    });
-  };
-
-  /**
-   * edit staff with id
-   * @returns
-   */
-
-  getStaff = (id) => {
-    return ApiUtils.get({
-      url: `staff/get-staff/${id}`,
-    });
-  };
-
-  /**
-   * staff code validation
-   *
-   */
-  getStaffCode = (code) => {
-    return ApiUtils.get({
-      url: `staff/check-staff-exists/${code}`,
-    });
-  };
-
-  /**
-   * get all staff
-   * @returns
-   */
-
-  getAllStaff = () => {
-    return ApiUtils.get({
-      url: 'staff/get-all-staff',
-    });
-  };
 }
 
 export default Users;

package/core/modules/index.js

@@ -22,30 +22,20 @@ import ReportingDashboard from '../modules/reporting/components/reporting-dashbo
 
 import ChangeInfo from './Informations/change-info/change-info';
 // All Dashboard Components Ends
-import ProcessStepsPage from './steps/steps';
-
 
 export {
-    ProcessStepsPage,
-    GenericList,
-    GenericAdd,
-
-    GenericEdit,
-
-    GenericDetail,
-
-    ModuleRoutes,
-
-
-    DashboardCard,
-
-    PopQueryDashboard,
-    HomePageAPI,
-    Profile,
-    ReportingDashboard,
-    ChangePassword,
-    ChangeInfo
-}
-
+  GenericList,
+  GenericAdd,
+  GenericEdit,
+  GenericDetail,
+  ModuleRoutes,
+  DashboardCard,
+  PopQueryDashboard,
+  HomePageAPI,
+  Profile,
+  ReportingDashboard,
+  ChangePassword,
+  ChangeInfo,
+};
 
 // export { Generic } from './generic/generic-detail/generic-detail';

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

@@ -565,7 +565,7 @@ function GuestList({
   attributes,
   fetchReportData,
 }) {
-  
+  console.log(attributes, '_____________________________________');
   /**
    * @param {*} propValues
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-soxo-bootstrap-core",
-  "version": "2.4.25-dev.9",
+  "version": "2.4.25",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"
@@ -19,7 +19,7 @@
     "build": "webpack --mode production",
     "deploy": "gh-pages -d examples/build",
     "quick-deploy": "git status && git add . && git commit -m \"Theme Updates\" && git push",
-    "release": "git tag -a v2023-v2.0.92 -m \"Theme Updates\" && npm run quick-deploy && npm publish",
+    "release": "git tag -a v2023-v2.0.91 -m \"Theme Updates\" && npm run quick-deploy && npm publish",
     "quick-commit": "git status && git add . && git commit -m 'Saving changes after deploying' && git push ",
     "publish-demo": "npm run build && npm run deploy",
     "lint": "eslint core",