Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -630,7 +630,7 @@ export default class FixedAssetsMovement extends Component {
                 display: false
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[1] : "Account",
+            name: "Account",
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 102, backgroundColor: '#1c71b8', width: 300 }}>
@@ -668,7 +668,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[2] : `31 Dec ${Number(this.props.periode) - 1} Actual`,
+            name: `31 Dec ${Number(this.props.periode) - 1} Actual`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>
@@ -704,7 +704,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[3] : `Jan ${this.props.periode}`,
+            name: `Jan ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -792,7 +792,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[4] : `Feb ${this.props.periode}`,
+            name: `Feb ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -881,7 +881,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[5] : `Mar ${this.props.periode}`,
+            name: `Mar ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -970,7 +970,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[6] : `Apr ${this.props.periode}`,
+            name: `Apr ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1059,7 +1059,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[7] : `May ${this.props.periode}`,
+            name: `May ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1148,7 +1148,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[8] : `Jun ${this.props.periode}`,
+            name: `Jun ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1237,7 +1237,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[9] : `Jul ${this.props.periode}`,
+            name: `Jul ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1326,7 +1326,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[10] : `Aug ${this.props.periode}`,
+            name: `Aug ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1415,7 +1415,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[11] : `Sep ${this.props.periode}`,
+            name: `Sep ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1504,7 +1504,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[12] : `Oct ${this.props.periode}`,
+            name: `Oct ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1593,7 +1593,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[13] : `Nov ${this.props.periode}`,
+            name: `Nov ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1682,7 +1682,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[14] : `Dec ${this.props.periode}`,
+            name: `Dec ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1771,7 +1771,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[15] : "Current Total",
+            name: "Current Total",
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>
@@ -1809,7 +1809,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[16] : `31 Dec ${Number(this.props.periode) + 1} Total`,
+            name: `31 Dec ${Number(this.props.periode) + 1} Total`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>
@@ -1898,7 +1898,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[17] : `31 Dec ${Number(this.props.periode) + 2} Total`,
+            name: `31 Dec ${Number(this.props.periode) + 2} Total`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>

src/container/MasterData/Perusahaan/Perusahaan.js

@@ -811,6 +811,7 @@ export default class Perusahaan extends Component {
                             onClickClose={() => this.setState({ visibleVisual: false, visiblePerusahaan: true })}
                             height={this.props.height}
                             updateHierarchy={this.updateHierarchy.bind(this)}
+                            handleLoading={() => this.setState({loading: true})}
                         />
                         :
                         <div>

src/container/MasterData/Perusahaan/VisualPerusahaan.js

@@ -185,7 +185,10 @@ export default class VisualPerusahaan extends Component {
                                     <div onClick={() => this.props.onClickClose()} style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor: "pointer" }}>
                                         <span style={{ color: '#354960', fontSize: 11 }} >Cancel</span>
                                     </div>
-                                    <div onClick={() => this.handleSave()} style={{ width: 102, height: 30, marginLeft: 25, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor: "pointer" }}>
+                                    <div onClick={() => {
+                                        this.props.handleLoading()
+                                        this.handleSave()
+                                        }} style={{ width: 102, height: 30, marginLeft: 25, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor: "pointer" }}>
                                         <span style={{ color: '#fff', fontSize: 11 }}>Save</span>
                                     </div>
                                 </div>

src/container/MasterData/ReportItems.js

@@ -1170,6 +1170,7 @@ export default class ReportItems extends Component {
                             buttonEdit={this.state.buttonEdit}
                             onClickClose={() => this.setState({ visualisasi: false, itemReport: true }, () => this.getData())}
                             height={this.props.height}
+                            handleLoading={() => this.setState({ loading: true })}
                         />
                         :
                         <div>

src/container/MasterData/formReportItems/VisualReportItems.js

@@ -334,7 +334,9 @@ export default class VisualReportItems extends Component {
                                     <div onClick={() => this.props.onClickClose()} style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor: "pointer" }}>
                                         <span style={{ color: '#354960', fontSize: 11 }}>Cancel</span>
                                     </div>
-                                    <button onClick={() => this.handleSave()}>
+                                    <button onClick={() => {
+                                        this.props.handleLoading() 
+                                        this.handleSave()}}>
                                         <div style={{ width: 102, height: 30, marginLeft: 25, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor: "pointer" }}>
                                             <span style={{ color: '#fff', fontSize: 11 }}>Save</span>
                                         </div>

src/container/OprIndicator/OperatingIndicator.js

@@ -315,10 +315,20 @@ export default class OperatingIndicator extends Component {
                         return (
                             <div style={{ display: 'flex' }}>
                                 {val === "submitted" || val === "approved" ?
-                                    <img src={Images.ceklis} style={{ width: 31, height: 24 }} /> :
-                                    val === "revision" ? 
-                                    <span>Revisi</span> :
-                                    null
+                                    <span>COMPLETED</span> :
+                                    val === "draft" ?
+                                        <span>DRAFT</span> :
+                                        val === "revision" ?
+                                            <span>REVISION</span> :
+                                            val === "approval_proccess" ?
+                                                <span>APPROVAL PROCCESS</span> :
+                                                val === "approval_review" ?
+                                                    <span>APPROVAL REVIEW</span> :
+                                                    val === "not-yet" ?
+                                                        <span>OPEN</span> :
+                                                        val === "CLOSED" ?
+                                                            <span>CLOSED</span> :
+                                                            <img src={Images.cross} style={{ width: 31, height: 24 }} />
                                 }
                             </div >
                         );