fixed bugs

Author: rinriko

package-lock.json

@@ -1,7 +1,7 @@
 import React from 'react';
 import './App.css';
 import { makeStyles } from '@material-ui/core/styles';
-import {AppBar,IconButton,Typography,Button,Toolbar,Grid,Slide} from '@material-ui/core';
+import {AppBar,Typography,Button,Toolbar,Grid,Slide} from '@material-ui/core';
 import coverPic from './image/cover.jpg';
 import CRCP from './component/CRCP'
 import TransferFunc from './component/TransferFunc'
@@ -56,7 +56,6 @@ const useStyles = makeStyles((theme) => ({
 
 function App() {
   const [page, setPage] = React.useState('home');
-  const [reportData, setReportData] = React.useState({});
   const [AnalysisPunchouts, setAnalysisPunchouts] = React.useState(0);
   const [AnalysisSlabThickness, setAnalysisSlabThickness] = React.useState(0);
   const classes = useStyles();
@@ -67,9 +66,8 @@ function App() {
     <div >
       <div className={classes.cover}></div>
       <AppBar position="static" style={{backgroundImage: `url(${headerPic})`, backgroundSize:'cover'}}>
-      {/*<AppBar position="static">*/}
         <Toolbar>
-          <img src={logo} style={{width:50}}/>
+          <img src={logo} alt="description" style={{width:50}}/>
           <Typography variant="h6" className={classes.titleNav}>
             TxCRCP-ME Analysis
           </Typography>
@@ -103,24 +101,15 @@ function App() {
         <Slide direction="up" in={page==='CRCP'} mountOnEnter unmountOnExit>
           <CRCP
               toMenu={()=>setPage('home')}
-              // print={(d)=>{setReportData(d);setPage('Print')}}
               AnalysisPunchouts={AnalysisPunchoutsFunc}
               AnalysisSlabThickness={AnalysisSlabThicknessFunc}
           />
         </Slide>
         <Slide direction="up" in={page === 'TransferFunc'} mountOnEnter unmountOnExit>
-        <div> {/* Wrap TransferFunc in Box */}
+        <div>
           <TransferFunc />
         </div>
       </Slide>
-        {/*<Slide direction="up" in={page==='Print'} mountOnEnter unmountOnExit>*/}
-        {/*  <Report*/}
-        {/*      data={reportData}*/}
-        {/*      toMenu={()=>setPage('home')}*/}
-        {/*      toCRCP={()=>setPage('CRCP')}*/}
-        {/*      AnalysisPunchouts={AnalysisPunchoutsFunc()}*/}
-        {/*  />*/}
-        {/*</Slide>*/}
       </div>
     </div>
       </ThemeProvider>

src/App.js

@@ -115,7 +115,7 @@ const DialogTitle = withStyles(styles)((props) => {
       <MuiDialogTitle disableTypography className={classes.root} {...other}>
         {children}
         {onClose ? (
-            <IconButton aria-label="close" size="small" className={classes.closeButton} onClick={onClose} size="small">
+            <IconButton aria-label="close" size="small" className={classes.closeButton} onClick={onClose}>
               <CloseIcon fontSize="small" />
             </IconButton>
         ) : null}
@@ -191,6 +191,7 @@ const Total_design_trafic = <>
     <TransformComponent>
       <img
           src={TrafficOneDirectionPic}
+          alt="description"
           style={{ maxWidth: 500, height: "auto" }}
       /></TransformComponent></TransformWrapper>
 </>;
@@ -514,7 +515,7 @@ class CRCP extends Component {
       if (i !== 1)
         rowIndexStress = 7;
       for (var j = 0; j < 12; j++) {
-        if (i == 1 && j == 0)
+        if (i === 1 && j === 0)
           ;
             //If counterYear = 1 And counterMonth = 1 Then
         //      'If First Year than Omit Calculation of First Month, Already Done
@@ -547,7 +548,7 @@ class CRCP extends Component {
           // Cells(rowIndex, 12) = Cells(rowIndex - 1, 12).Value + Cells(rowIndex, 11).Value
           row2.push(18.985 / (1 + 5 * Math.pow(row2[11], -1.1)));
           // Cells(rowIndex, 13) = 18.985 / (1 + 5 * Cells(rowIndex, 12).Value ^ -1.1)
-          if (rowIndexStress == 13)
+          if (rowIndexStress === 13)
             rowIndexStress = 1;
           rows.push(row2);
           row1 = row2;
@@ -786,7 +787,7 @@ class CRCP extends Component {
       if (this.state.helperEl.el === event.currentTarget && freeze && this.state.helperEl.freeze) // same target
         this.handleCloseHelper(event);
       else {
-        if (freeze || this.state.helperEl.el !== event.currentTarget && freeze)
+        if ((freeze || this.state.helperEl.el) !== (event.currentTarget && freeze))
           this.setState({ helperEl: { el: event.currentTarget, content, freeze } });
       }
     } else {
@@ -934,6 +935,7 @@ class CRCP extends Component {
         case "MH":
         case "CL":
           return 25;
+        default:
       }
     }
 
@@ -1927,7 +1929,7 @@ class CRCP extends Component {
                 <CloseIcon fontSize="small" />
               </IconButton> : ""}
               {this.state.helperEl.content.src ?
-                  <a href={this.state.helperEl.content.href} target={"_blank"}>
+                  <a href={this.state.helperEl.content.href} target={"_blank"} rel="noopener noreferrer">
                     <TransformWrapper
                         defaultScale={1}
                         defaultPositionX={1}
@@ -1936,6 +1938,7 @@ class CRCP extends Component {
                       <TransformComponent>
                         <img
                             src={this.state.helperEl.content.src}
+                            alt="description"
                             style={{ maxWidth: 600, height: "auto" }}
                         /></TransformComponent></TransformWrapper> </a> :
                   this.state.helperEl.content.text

src/component/CRCP.js

@@ -93,7 +93,7 @@ function CustomTable ({data,editFields,onChange,formular}){
         getVal: (formular?formular[k]:undefined)??(d=>d[k])
       })))
     }
-  },[data])
+  },[data, editFields, formular])
   return <TableContainer  style={{height:'70vh'}}>
     <Table stickyHeader aria-label="sticky table" size="small">
       <TableHead>

src/component/EditableTable.js

@@ -29,15 +29,15 @@ class Tabledata  extends Component {
             maxArray.push(0);
         }
         for (var i = 0; i < rows.length; i++) {
-            for (var j = 0; j < rows[i].length; j++) {
+            for (j = 0; j < rows[i].length; j++) {
                 if (rows[i][j] > maxArray[j])
                     maxArray[j] = rows[i][j];
                 if (rows[i][j] < minArray[j])
                     minArray[j] = rows[i][j];
             }
         }
         this.colorRedBlues = [];
-        for (var j = 0; j < rows[0].length; j++) {
+        for (j = 0; j < rows[0].length; j++) {
             var colorScale = d3.scaleLinear()
                 .domain([minArray[j], (minArray[j] + maxArray[j]) / 2, maxArray[j]])
                 .range(["#55f", "white", "#f55"]);