From d6cde6a7de343d0a6448183ec95a363db4559b95 Mon Sep 17 00:00:00 2001
From: wahyuun <wahyumind01@gmail.com>
Date: Wed, 6 Mar 2024 16:57:59 +0700
Subject: [PATCH 1/2] parse integer

---
 src/views/Master/RoleProject/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Master/RoleProject/index.js b/src/views/Master/RoleProject/index.js
index d5b095b..b95ab29 100644
--- a/src/views/Master/RoleProject/index.js
+++ b/src/views/Master/RoleProject/index.js
@@ -124,7 +124,7 @@ class index extends Component {
     }
     if (this.state.role_name !== "Super Admin") {
       formData.columns.push(
-        { "name": "company_id", "logic_operator": "=", "value": this.state.company_id, "operator": "AND" },
+        { "name": "company_id", "logic_operator": "=", "value": parseInt(this.state.company_id), "operator": "AND" },
       )
     } else {
       formData.columns.push(

From dbbf774d5f8d9ab98429adee8465a9781631f859 Mon Sep 17 00:00:00 2001
From: wahyuun <wahyumind01@gmail.com>
Date: Wed, 6 Mar 2024 16:58:24 +0700
Subject: [PATCH 2/2] update column FE

---
 src/views/SimproV2/Settings/DialogForm.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/views/SimproV2/Settings/DialogForm.js b/src/views/SimproV2/Settings/DialogForm.js
index d968fc7..14ca80f 100644
--- a/src/views/SimproV2/Settings/DialogForm.js
+++ b/src/views/SimproV2/Settings/DialogForm.js
@@ -185,9 +185,9 @@ const DialogForm = ({
         return (
             <Form>
                 <Row>
-                    <Col md={12}>
+                    <Col md={4}>
                         <FormGroup>
-                          <Label className="capitalize" style={{ fontWeight: "bold" }}>Image Profile</Label>
+                          <Label className="capitalize">Image Profile</Label>
                           <Input
                             type="file"
                             accept="image/*"
@@ -205,25 +205,33 @@ const DialogForm = ({
                             </p>
                           </small>
                         </FormGroup>
+                    </Col>
+                    <Col md={4}>
                         <FormGroup>
                             <Label className="capitalize">Username</Label>
                             <Input type="text" value={userName || userNameProp} onChange={(e) => setUserName(e.target.value)} />
                         </FormGroup>
+                    </Col>
+                    <Col md={4}>
                         <FormGroup>
                             <Label className="capitalize">Email</Label>
 
                             <Input type="text" value={email || emailProp} onChange={(e) => setEmail(e.target.value)} />
                         </FormGroup>
                     </Col>
-                    <Col md={12}>
+                    <Col md={4}>
                         <FormGroup>
                             <Label className="capitalize">Old Password</Label>
                             <Input type="text" value={oldPassword} onChange={(e) => setOldPassword(e.target.value)} />
                         </FormGroup>
+                    </Col>
+                    <Col md={4}>
                         <FormGroup>
                             <Label className="capitalize">New Password</Label>
                             <Input type="text" value={newPassword} onChange={(e) => setNewPassword(e.target.value)} />
                         </FormGroup>
+                    </Col>
+                    <Col md={4}>
                         <FormGroup>
                             <Label className="capitalize">Confirm New Password</Label>
                             <Input type="text" value={newPasswordConfirm} onChange={(e) => setNewPasswordConfirm(e.target.value)} />