Merge branch 'faisal' into 'master'

faisal!

See merge request !1513

src/container/Progress/TableProgressReport.js

@@ -25,8 +25,8 @@ export default class TableProgressReport extends Component {
 
 
     render() {
-        let dataTable2 = this.props.dataTable2
-        console.log(this.props);
+        let dataTable2 = this.props.dataTable
+        // console.log(this.props);
 
         const columnMB = [
             {
@@ -58,7 +58,7 @@ export default class TableProgressReport extends Component {
                 name: "Revision",
                 options: {
                     customHeadRender: (columnMeta) => (
-                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', borderRight: '1px solid #fff', borderLeft: '1px solid #fff' }}>
+                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', borderRight: '1px solid #fff', borderLeft: '1px solid #fff', width: 100 }}>
                             <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                         </TableCell>
                     ),
@@ -84,7 +84,7 @@ export default class TableProgressReport extends Component {
                     setCellProps: () => ({ style2 }),
                     customBodyRender: (value, tableMeta, updateValue) => {
                         return (
-                            <div style={{ width: 90, textAlign: 'center' }}>
+                            <div style={{ width: 300, textAlign: 'center' }}>
                                 {
                                     value
                                 }
@@ -102,7 +102,7 @@ export default class TableProgressReport extends Component {
                     ),
                     customBodyRender: (val, tableMeta) => {
                         return (
-                            <div style={{ textAlign: 'center', width: 60 }}>
+                            <div style={{ textAlign: 'center', width: 100 }}>
                                 {
                                     val
                                 }