ui-soxo-bootstrap-core 2.4.24 → 2.4.25-dev.11

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

@@ -0,0 +1,32 @@
+.signature-method {
+  margin-bottom: 10px;
+}
+.signature-image {
+  border: 2px dashed #b4b5b7ff;
+  border-radius: 5px;
+  padding: 2px;
+  margin-bottom: 5px;
+  width: 500px;
+}
+.upload-container {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+  gap: 12px; // optional spacing
+  width: 500px;
+  height: 200px;
+  border: 2px dashed #b4b5b7ff;
+  border-radius: 5px;
+  padding: 2px;
+  margin-bottom: 5px;
+}
+.signature-pad {
+  padding: 0 !important;
+  .sigCanvas {
+    width: 500px !important;
+    border: 2px dashed #b4b5b7ff !important;
+    border-radius: 5px !important;
+  }
+}

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

@@ -16,310 +16,263 @@ const { Option } = Select;
 
 import './menu-add.scss';
 
-
 const MenuAdd = ({ model, callback, edit, history, formContent, match, additional_queries, ...props }) => {
-
-    let mode = 'Add';
-
-    if (formContent.id) {
-        mode = 'Edit'
-    } else if (formContent.copy) {
-        mode = 'copy'
-    }
-
-    if (formContent.attributes) {
-
-        if (typeof formContent.attributes === 'string') {
-
-            if (formContent.attributes !== '') {
-
-                formContent.attributes = JSON.parse(formContent.attributes);
-
-            } else {
-
-                formContent.attributes = {};
-
-            }
-        }
-    } else {
-        formContent.attributes = {}
+  let mode = 'Add';
+
+  if (formContent.id) {
+    mode = 'Edit';
+  } else if (formContent.copy) {
+    mode = 'copy';
+  }
+
+  if (formContent.attributes) {
+    if (typeof formContent.attributes === 'string') {
+      if (formContent.attributes !== '') {
+        formContent.attributes = JSON.parse(formContent.attributes);
+      } else {
+        formContent.attributes = {};
+      }
     }
+  } else {
+    formContent.attributes = {};
+  }
 
+  const [loading, setLoading] = useState(true);
 
-    const [loading, setLoading] = useState(true);
-
-    const [form] = Form.useForm();
-
-    const [pages, setPages] = useState([]);
-
-    const [models, setModels] = useState([]);
-
-    const [menus, setMenus] = useState([])
-
-    const [body, setBody] = useState(formContent);
-
-    const { params } = match;
-
-    let location = useLocation();
-
-    const query = new URLSearchParams(location.search);
-
-    console.log(query.get('step'));
-
-    let step = parseInt(query.get('step')) || 1;
-
-    console.log(step);
-
-    useEffect(() => {
-
-        // loadModelColumns();
-        getPages();
-
-        getModels();
-
-        setLoading(false);
-
-        getMenus();
-
-    }, []);
-
-
-    /**
-     * Load the Staffs
-     */
-    const getPages = () => {
-        PagesAPI.getPages().then((result) => {
-
-            if (Array.isArray(result.result)) {
-                setPages(result.result);
-            }
-        });
-    };
-
-    /**
-     * Load the Models
-     */
-    const getModels = () => {
-        ModelsAPI.get().then((result) => {
-            // console.log(result);
-
-            setModels(result.result);
-        });
-    };
-
+  const [form] = Form.useForm();
 
-    /**
-  * Load the Models
-  */
-    const getMenus = () => {
-        MenusAPI.get().then((result) => {
-            // console.log(result);
+  const [pages, setPages] = useState([]);
 
-            setMenus(result.result);
-        });
-    };
+  const [models, setModels] = useState([]);
 
+  const [menus, setMenus] = useState([]);
 
-    /**
-     * Submit values
-     */
-    const onSubmit = (values) => {
-        // console.log(values);
-        setLoading(true);
+  const [body, setBody] = useState(formContent);
 
-        let id = formContent.id;
+  const { params } = match;
 
-        // Add the step to form content
-        // values.step = step;
+  let location = useLocation();
 
-        if (values.attributes && typeof values === 'object') {
+  const query = new URLSearchParams(location.search);
 
-            values = {
-                ...values,
-                attributes: JSON.stringify(values.attributes)
-            }
-        }
+  let step = parseInt(query.get('step')) || 1;
 
-        if (id) {
-            // Update of model
-            model.update({ id, values }).then(() => {
+  console.log(step);
 
-                // callback();
-                message.success('Menu Updated');
+  useEffect(() => {
+    // loadModelColumns();
+    getPages();
 
-                setLoading(false);
+    getModels();
 
-                callback();
+    setLoading(false);
 
-            });
+    getMenus();
+  }, []);
 
-        } else {
+  /**
+   * Load the Staffs
+   */
+  const getPages = () => {
+    PagesAPI.getPages().then((result) => {
+      if (Array.isArray(result.result)) {
+        setPages(result.result);
+      }
+    });
+  };
 
-            values.step = step;
+  /**
+   * Load the Models
+   */
+  const getModels = () => {
+    ModelsAPI.get().then((result) => {
+      // console.log(result);
 
-            // Append the additional queries to the object
-            additional_queries.forEach(({ field, value }) => {
+      setModels(result.result);
+    });
+  };
 
-                values[field] = value;
+  /**
+   * Load the Models
+   */
+  const getMenus = () => {
+    MenusAPI.get().then((result) => {
+      // console.log(result);
 
-            })
+      setMenus(result.result);
+    });
+  };
 
-            // add new model
-            model.add({ values }).then(() => {
+  /**
+   * Submit values
+   */
+  const onSubmit = (values) => {
+    setLoading(true);
 
-                // callback();
-                message.success('Menu Added');
-
-                setLoading(false);
-
-                callback();
-
-            });
-        }
-    };
-
-    return (
-        <section className="collection-add menu-add">
-            {/* <Title level={4}>{mode} Menu</Title> */}
-
-            {loading ? (
-                <Skeleton />
-            ) : (
-                <Form initialValues={{ ...body }} form={form} layout="vertical" onFinish={onSubmit}>
-
-                    <div className='form-container'>
-                        <div className='left-container'>
+    let id = formContent.id;
 
+    // ✅ ONLY set step if it's NOT already provided
+    if (!values.step) {
+      values.step = formContent.step || step;
+    }
 
-                            {/* Caption */}
-                            <Form.Item name={"caption"} label="Caption" required>
-                                <Input placeholder="Enter caption" />
-                            </Form.Item>
-                            {/* Caption Ends */}
+    if (values.attributes && typeof values === 'object') {
+      values = {
+        ...values,
+        attributes: JSON.stringify(values.attributes),
+      };
+    }
 
-                            {/* Name */}
-                            <Form.Item name={"name"} label="Name" required>
-                                <Input placeholder="Enter name" />
-                            </Form.Item>
-                            {/* Name Ends */}
+    if (id) {
+      model.update({ id, values }).then(() => {
+        message.success('Menu Updated');
+        setLoading(false);
+        callback();
+      });
+    } else {
+      additional_queries.forEach(({ field, value }) => {
+        values[field] = value;
+      });
 
-                            {/* Description */}
-                            <Form.Item name={"description"} label="Description">
+      model.add({ values }).then(() => {
+        message.success('Menu Added');
+        setLoading(false);
+        callback();
+      });
+    }
+  };
+
+  return (
+    <section className="collection-add menu-add">
+      {/* <Title level={4}>{mode} Menu</Title> */}
+
+      {loading ? (
+        <Skeleton />
+      ) : (
+        <Form initialValues={{ ...body }} form={form} layout="vertical" onFinish={onSubmit}>
+          <div className="form-container">
+            <div className="left-container">
+              {/* Caption */}
+              <Form.Item name={'caption'} label="Caption" rules={[{ required: true, message: 'Caption is required' }]}>
+                <Input placeholder="Enter caption" />
+              </Form.Item>
+              {/* Caption Ends */}
+
+              {/* Name */}
+              <Form.Item name={'name'} label="Name" rules={[{ required: true, message: 'Name is required' }]}>
+                <Input placeholder="Enter name" />
+              </Form.Item>
+              {/* Name Ends */}
+
+              {/* Description */}
+              {/* <Form.Item name={"description"} label="Description">
                                 <TextArea placeholder="Enter Description" />
-                            </Form.Item>
-                            {/* Description Ends */}
-
-                            {/* Model */}
-                            <Form.Item label="Models" name={'model_id'}>
-
-                                {/* <ReferenceSelect value={model.id} label={model.name} model={Models} /> */}
-                                <Select showSearch  style={{ width: '100%' }}
-                                 placeholder="Select a Page"
-                                 optionFilterProp="label" 
-                                 >
-                                    {models.map((model, key) => (
-                                        <Option key={key} label={model.name}  value={model.id}>{model.name}</Option>
-                                    ))}
-                                </Select>
-
-                            </Form.Item>
-                            {/* Model Ends
+                            </Form.Item> */}
+              {/* Description Ends */}
+
+              {/* Model */}
+              <Form.Item label="Models" name={'model_id'}>
+                {/* <ReferenceSelect value={model.id} label={model.name} model={Models} /> */}
+                <Select showSearch style={{ width: '100%' }} placeholder="Select a Page" optionFilterProp="label">
+                  {models.map((model, key) => (
+                    <Option key={key} label={model.name} value={model.id}>
+                      {model.name}
+                    </Option>
+                  ))}
+                </Select>
+              </Form.Item>
+              {/* Model Ends
 
 
                     {/* Pages */}
-                            <Form.Item label="Pages" name={'page_id'}>
-
-                                {/* <ReferenceSelect value={pages.id} label={pages.name} model={Pages} /> */}
-
-                                <Select showSearch optionFilterProp="children" style={{ width: '100%' }}>
-                                    {pages.map((model, key) => (
-                                        <Option key={key} value={model.id}>{model.name}</Option>
-                                    ))}
-                                </Select>
-
-                            </Form.Item>
-                            {/* Pages Ends */}
-
-
-
-                            {/* Pages */}
-                            <Form.Item label="Header" name={'header_id'}>
-
-                                {/* <ReferenceSelect value={pages.id} label={pages.name} model={Pages} /> */}
-
-                                <Select showSearch style={{ width: '100%' }}>
-                                    {menus.map((menu, key) => (
-                                        <Option key={key} value={menu.id}>{menu.name}</Option>
-                                    ))}
-                                </Select>
-
-                            </Form.Item>
-                            {/* Pages Ends */}
-
-
-                            {/* Path */}
-                            <Form.Item name="path" label="Path" required>
+              <Form.Item label="Pages" name={'page_id'}>
+                {/* <ReferenceSelect value={pages.id} label={pages.name} model={Pages} /> */}
+
+                <Select showSearch optionFilterProp="children" style={{ width: '100%' }}>
+                  {pages.map((model, key) => (
+                    <Option key={key} value={model.id}>
+                      {model.name}
+                    </Option>
+                  ))}
+                </Select>
+              </Form.Item>
+              {/* Pages Ends */}
+
+              {/* Pages */}
+              <Form.Item label="Header" name={'header_id'}>
+                {/* <ReferenceSelect value={pages.id} label={pages.name} model={Pages} /> */}
+
+                <Select
+                  showSearch
+                  style={{ width: '100%' }}
+                  placeholder="Select header"
+                  optionFilterProp="children"
+                  filterOption={(input, option) => option.children.toLowerCase().includes(input.toLowerCase())}
+                >
+                  {menus.map((menu) => (
+                    <Option key={menu.id} value={menu.id}>
+                      {menu.name}
+                    </Option>
+                  ))}
+                </Select>
+              </Form.Item>
+              {/* Pages Ends */}
+
+              {/* Path */}
+              {/* <Form.Item name="path" label="Path" required>
                                 <Input placeholder="Enter path" />
-                            </Form.Item>
-                            {/* Path Ends */}
-
-                            {/* Route */}
-                            <Form.Item name="route" label="Route" required>
-                                <Input placeholder="Enter route" />
-                            </Form.Item>
-                            {/* Route Ends */}
-
-                            {/* Switch */}
-                            <Form.Item name="is_visible" label="Visible" required>
-                                <Switch defaultChecked={body.is_visible} />
-                            </Form.Item>
-                            {/* Switch Ends */}
-
-                            {/* Step */}
-                            <Form.Item name={"order"} label="Order" required>
-                                <InputNumber placeholder="Enter order" />
-                            </Form.Item>
-                            {/* Step Ends */}
+                            </Form.Item> */}
+              {/* Path Ends */}
 
-                            {/* Icon Name*/}
-                            <Form.Item name="icon_name" label="Icon Name" required>
-                                <Input placeholder="Enter icon name" />
-                            </Form.Item>
-                            {/*  Icon Name Ends */}
+              {/* Route */}
+              <Form.Item name="route" label="Route" rules={[{ required: true, message: 'Route is required' }]}>
+                <Input placeholder="Enter route" />
+              </Form.Item>
+              {/* Route Ends */}
 
-                            {/* Step */}
-                            <Form.Item name={"step"} label="Step" required>
-                                <InputNumber placeholder="Enter step" />
-                            </Form.Item>
-                            {/* Step Ends */}
+              {/* Switch */}
+              <Form.Item name="is_visible" label="Visible" valuePropName="checked" rules={[{ required: true, message: 'Visibility is required' }]}>
+                <Switch />
+              </Form.Item>
 
+              {/* Switch Ends */}
 
-                            <Form.Item>
-                                <Button loading={loading} htmlType={'submit'} type="primary">
-                                    Submit
-                                </Button>
-                            </Form.Item>
-
-                        </div>
-                        <div className='right-container'>
-
-
-                            {/* Description */}
-                            <Form.Item name={"attributes"} label="Attributes">
-
-                                <JSONInput />
-
-                            </Form.Item>
-                            {/* Description Ends */}
-
-                        </div>
-
-                    </div>
-
-                </Form>
-            )}
-        </section>
-    );
+              {/* Step */}
+              {/* <Form.Item name={"order"} label="Order" required>
+                                <InputNumber placeholder="Enter order" />
+                            </Form.Item> */}
+              {/* Step Ends */}
+
+              {/* Icon Name*/}
+              <Form.Item name="icon_name" label="Icon Name" rules={[{ required: true, message: 'Icon name is required' }]}>
+                <Input placeholder="Enter icon name" />
+              </Form.Item>
+              {/*  Icon Name Ends */}
+
+              {/* Step */}
+              <Form.Item name={'step'} label="Step" rules={[{ required: true, message: 'Step is required' }]}>
+                <InputNumber placeholder="Enter step" />
+              </Form.Item>
+              {/* Step Ends */}
+
+              <Form.Item>
+                <Button loading={loading} htmlType={'submit'} type="primary">
+                  Submit
+                </Button>
+              </Form.Item>
+            </div>
+            <div className="right-container">
+              {/* Description */}
+              <Form.Item name={'attributes'} label="Attributes">
+                <JSONInput />
+              </Form.Item>
+              {/* Description Ends */}
+            </div>
+          </div>
+        </Form>
+      )}
+    </section>
+  );
 };
 
 export default MenuAdd;