Merge pull request 'update profile' (#68) from dev-wahyun into staging

Reviewed-on: ibnu/generic-ospro-frontend#68

src/views/Master/RoleProject/index.js

@@ -135,7 +135,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(

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)} />