RT-PCR Test result
diff --git a/src/components/Results.js b/src/components/Results.js
index 9b17ca2..135e18a 100755
--- a/src/components/Results.js
+++ b/src/components/Results.js
@@ -1,116 +1,210 @@
-import React, { Component } from 'react';
-import { Link } from 'react-router-dom';
-import PropTypes from 'prop-types';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-import { clearResults, logout} from '../actions';
+import React, {Component} from 'react';
+import {Link} from 'react-router-dom';
import Preview from './Preview';
-import LungConditions from './LungConditions';
import '../styles/App.css';
-import { setCookie } from '../util/cookies';
+import {setCookie} from '../util/cookies';
+import downloadIcon from '../assets/img/downo.png';
+import LungConditions from "./LungConditions";
+import {clearResults, logout} from "../actions";
+import PropTypes from 'prop-types';
+import {bindActionCreators} from "redux";
+import {connect} from "react-redux";
class Results extends Component {
backToPatientInfo = e => {
- e.preventDefault();
- this.props.clearResults();
- this.props.history.push('patientInfoForm');
+ e.preventDefault();
+ this.props.clearResults();
+ this.props.history.push('patientInfoForm');
}
- logout = e => {
- e.preventDefault();
- this.props.logout();
- setCookie('token', '');
- this.props.history.push('login');
- }
-
- render() {
- return (
-
-
-
-
-
-
-
- );
- }
+ );
+ }
}
+
Results.propTypes = {
xray_image: PropTypes.object,
ct_scan_image: PropTypes.object,
lung_conditions: PropTypes.object,
+ patientInfo: PropTypes.object,
aws_s3_image_url: PropTypes.string,
msg: PropTypes.string,
type: PropTypes.string,
- covid_diagnosis : PropTypes.string,
+ covid_diagnosis: PropTypes.string,
annotated_img_url: PropTypes.string,
loading: PropTypes.bool
}
-const mapStateToProps = ({xray_image, aws_s3_image_url,msg,type, covid_diagnosis, annotated_img_url, loading, lung_conditions, ct_scan_image, model_type}) => ({xray_image, aws_s3_image_url,msg,type, covid_diagnosis, annotated_img_url, loading, lung_conditions, ct_scan_image, model_type});
-const mapDispatchToProps = dispatch => bindActionCreators( {clearResults, logout}, dispatch);
-export default connect(mapStateToProps, mapDispatchToProps)(Results)
\ No newline at end of file
+const mapStateToProps = ({xray_image, aws_s3_image_url, msg, type, covid_diagnosis, patientInfo,annotated_img_url, loading, lung_conditions, ct_scan_image, model_type}) => ({
+ xray_image,
+ aws_s3_image_url,
+ msg,
+ type,
+ covid_diagnosis,
+ annotated_img_url,
+ loading,
+ lung_conditions,
+ ct_scan_image,
+ model_type,
+ patientInfo
+});
+const mapDispatchToProps = dispatch => {
+ console.log(dispatch);
+ return bindActionCreators({clearResults, logout}, dispatch);
+};
+export default connect(mapStateToProps, mapDispatchToProps)(Results)
diff --git a/src/container/App.js b/src/container/App.js
index 519e38d..55d601e 100755
--- a/src/container/App.js
+++ b/src/container/App.js
@@ -1,28 +1,24 @@
-import React, { Component } from 'react';
+import React, {Component} from 'react';
import ReactGA from 'react-ga';
-import {
- BrowserRouter,
- Route,
- Switch
-} from 'react-router-dom';
+import {BrowserRouter, Route, Switch} from 'react-router-dom';
import PrivateRoute from './PrivateRoute';
import LoginPage from '../components/LoginPage';
import RegisterPage from '../components/RegisterPage';
import PatientInfoForm from '../components/PatientInfoForm';
import Results from '../components/Results';
-import Header from "../components/Header";
import createBrowserHistory from "history/createBrowserHistory";
+
const history = createBrowserHistory();
class App extends Component {
render() {
return (
-
+
- { (this.props.covid_diagnosis && !this.props.loading)?
-
-
-
: null }
-
- { this.props.model_type == 'xray' ?
-
-
- {this.props.covid_diagnosis}
-
-
: null }
+ logout = e => {
+ e.preventDefault();
+ this.props.logout();
+ setCookie('token', '');
+ this.props.history.push('login');
+ }
- { this.props.model_type == 'ct' ?
-
-
- { this.props.annotated_img_url ?
- Input XRay image
-
- 
-
- : null }
- { this.props.lung_conditions ?
-
-
- : null }
- Disease predictions
-
-
-
-
- { this.props.annotated_img_url ?
- Input CT scan
-
-
-
- : null }
- { this.props.lung_conditions ?
- Annotated CT scan
-
-
: null }
-
- Disease predictions
-
+
+
- : null }
-
+
+
+
+ {(this.props.covid_diagnosis && !this.props.loading) ?
+
+
+
: null}
+ Test #420
+System Generated Results not to be consumed without the supervision of Registered + Physician
+
+ :
+ this.props.model_type === 'ct' ? : null}
+
+ {this.props.annotated_img_url !== '' ?
+ Input Image
+ {this.props.model_type === 'xray' ?
+
+ : null}
+ Annotated Image
+
+ 
+
+
+
+
+
+
+
+
+ {this.props.patientInfo ?
+
+ Patient #69
+ {this.props.patientInfo.first_name + ' ' + this.props.patientInfo.last_name}
+ {this.props.patientInfo.age} M
+ {this.props.patientInfo.temperature} deg Celsius
+ Sneezing {this.props.patientInfo.isSneezing}
+ Breathing issues {this.props.patientInfo.isDifficultyInBreathing}
+ Dry Cough {this.props.patientInfo.isDryCough}
+
: null }
+
+ Diagnosis
+
+ COVID-19
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sent for PCR
+
+
+
+
+ Quarantime
+
+
+
+
+ Contact Tracing
+
+
+
+
+
+
+
-
+