fixed bug

Author: rinriko

src/component/CRCP.js

@@ -57,7 +57,7 @@ import { districts, districtCode, counties, str2date, date2str } from "./ulti";
 import CssBaseline from "@material-ui/core/CssBaseline";
 import EditableTable from "./EditableTable";
 
-const highway = ["IH 45", "US 290", "IH 30", "US 59", "IH 35W", "IH 820", "IH 10", "IH 40", "IH 35", "US 287", "US 81", "IH 27", "SL 289", "SH 226", "SH 36", "US 83B", "VA", "FM 3129", "IH 20", "US 71", "US 79", "US 47", "US 67", "BU90-Y", "CS", "FM 1960", "FM 364", "FM 365", "SH 347", "SH 105", "SH 12", "SH 124", "SH 146", "SH 326", "SH 61", "SH 73", "SH 87", "SS 380", "US 90", "US 69", "US 96", "BS6-R", "SH 21", "BW 8", "US 83", "BS 121H", "FM 1171", "FM 1382", "FM 2499", "FM 709", "FM 740", "IH 35E", "IH4 5", "IH 635", "LP 12", "LP 354", "MH", "SH 289", "SH 31", "SH 66", "SH 78", "SH 114", "SH 121", "SH 161", "SH 180", "SH 183", "SH 310", "SH 34", "SH 342", "SH 356", "SL 12", "SL 288", "SP 244", "SP 348", "SP 366", "SPUR 354", "US 175", "US 380", "US 75", "US 77", "US 377", "US 80", "US 54", "BU 287P", "FM 157", "IH 820 ", "SH 199", "SH 26", "SH 360", "FM 1764", "FM 523", "FM 1092", "FM 1488", "FM 518", "IH 610", "SH 288", "SH 332", "SH 225", "SH 242", "SH 249", "SH 35", "US 90A", "IH27", "SH 7", "FM 1472", "LP 20", "ODA 181-1", "ODA 181-2", "ODA 250-1", "ODA 250-2", "US 82", "SH 6", "FM 85", "LP 281", "LP 323", "SH 19", "SH 198", "SH 334", "US 259", "US 281", "FM 1695", "FM 3476", "FM 933", "IH 36", "LP 363", "SH 195", "US 84", "BU 287J", "IH 44", "SH 240", "SP 1027 ", "US 287 ", "US 55", "US 70", "SH 71"];
+// const highway = ["IH 45", "US 290", "IH 30", "US 59", "IH 35W", "IH 820", "IH 10", "IH 40", "IH 35", "US 287", "US 81", "IH 27", "SL 289", "SH 226", "SH 36", "US 83B", "VA", "FM 3129", "IH 20", "US 71", "US 79", "US 47", "US 67", "BU90-Y", "CS", "FM 1960", "FM 364", "FM 365", "SH 347", "SH 105", "SH 12", "SH 124", "SH 146", "SH 326", "SH 61", "SH 73", "SH 87", "SS 380", "US 90", "US 69", "US 96", "BS6-R", "SH 21", "BW 8", "US 83", "BS 121H", "FM 1171", "FM 1382", "FM 2499", "FM 709", "FM 740", "IH 35E", "IH4 5", "IH 635", "LP 12", "LP 354", "MH", "SH 289", "SH 31", "SH 66", "SH 78", "SH 114", "SH 121", "SH 161", "SH 180", "SH 183", "SH 310", "SH 34", "SH 342", "SH 356", "SL 12", "SL 288", "SP 244", "SP 348", "SP 366", "SPUR 354", "US 175", "US 380", "US 75", "US 77", "US 377", "US 80", "US 54", "BU 287P", "FM 157", "IH 820 ", "SH 199", "SH 26", "SH 360", "FM 1764", "FM 523", "FM 1092", "FM 1488", "FM 518", "IH 610", "SH 288", "SH 332", "SH 225", "SH 242", "SH 249", "SH 35", "US 90A", "IH27", "SH 7", "FM 1472", "LP 20", "ODA 181-1", "ODA 181-2", "ODA 250-1", "ODA 250-2", "US 82", "SH 6", "FM 85", "LP 281", "LP 323", "SH 19", "SH 198", "SH 334", "US 259", "US 281", "FM 1695", "FM 3476", "FM 933", "IH 36", "LP 363", "SH 195", "US 84", "BU 287J", "IH 44", "SH 240", "SP 1027 ", "US 287 ", "US 55", "US 70", "SH 71"];
 // const baseType = ["CTB", "HMA Base"];
 const soilClassSub = ["GW", "GP", "GM", "GC", "SW", "SP", "SM", "SC", "ML", "CL", "OL", "MH", "CH", "OH", "Pt"];
 
@@ -787,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 {
@@ -796,7 +796,7 @@ class CRCP extends Component {
   };
 
   handleCloseHelper = (source) => {
-    if (source.type !== "mouseleave" || source.type === "mouseleave" && this.state.helperEl && (!this.state.helperEl.freeze))
+    if (source.type !== "mouseleave" || (source.type === "mouseleave" && this.state.helperEl && (!this.state.helperEl.freeze)))
       this.setState({ helperEl: undefined });
   };
 

src/component/Graph.js

@@ -4,15 +4,6 @@ import Tabledata from './tableData';
 import {withStyles} from '@material-ui/core/styles';
 import {
     Grid,
-    Typography,
-    Button,
-    Paper,
-    Stepper,
-    Step,
-    StepLabel,
-    StepContent,
-    TextField,
-    Container
 } from '@material-ui/core';
 import * as d3 from 'd3';
 import {tip as d3tip} from "d3-v6-tip";

src/component/report.js

@@ -399,8 +399,8 @@ class Report extends Component {
                             </ul>
                         </Grid>
                         <Grid item xs={12} container style={{bottom:0,position:'absolute'}}>
-                            <Grid item xs={12}><img src={footer} style={{width:'100%',height:15,transform:'scale(-1)'}}/></Grid>
-                            <Grid item><img src={logo} style={{width:60}}/></Grid>
+                            <Grid item xs={12}><img src={footer} alt="description" style={{width:'100%',height:15,transform:'scale(-1)'}}/></Grid>
+                            <Grid item><img src={logo} alt="description" style={{width:60}}/></Grid>
                             <Grid item xs><h3>TxCRCP-ME Analysis</h3></Grid>
                             {/*<Grid item xs={12}><img src={footer} style={{width:'100%',height:20}}/></Grid>*/}
                         </Grid>

src/component/tableData.js

@@ -1,6 +1,5 @@
 import React,{ Component } from 'react';
 import * as d3 from 'd3';
-import {withStyles} from "@material-ui/core/styles";
 
 class Tabledata  extends Component {
     constructor(props) {
@@ -84,7 +83,7 @@ class Tabledata  extends Component {
                         paddingTop: '0px',
                         paddingBottom: '0px'
                     }}>
-                        {([1, 2, 3, 12, 8, 9, 5, 6, 7, 10, 11].indexOf(j) !== -1) ? parseFloat(c).toFixed((j == 1 || j == 12) ? 2 : ((j == 2 || j == 3 || j == 8 || j == 9) ? 0 : ((j == 5 || j == 6) ? 1 : ((j == 7) ? 3 : 4)))) : c}
+                        {([1, 2, 3, 12, 8, 9, 5, 6, 7, 10, 11].indexOf(j) !== -1) ? parseFloat(c).toFixed((j === 1 || j === 12) ? 2 : ((j === 2 || j === 3 || j === 8 || j === 9) ? 0 : ((j === 5 || j === 6) ? 1 : ((j === 7) ? 3 : 4)))) : c}
                     </td>)}</tr>)}
                 </table>
             </div>)