Skip to content

Result page #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amritesh09 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Result page #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04fa105
Commit ---console error fixes
govi2010 Apr 22, 2020
4c21a12
Commit --- half result page
govi2010 Apr 23, 2020
17d8d40
Commit --- half result page
govi2010 Apr 23, 2020
00f5aa9
Commit --- info by patientInfo
govi2010 Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/components/LoginPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, { Component } from 'react';
import { Link, Redirect } from 'react-router-dom';
import { connect } from 'react-redux';
import React, {Component} from 'react';
import {Redirect} from 'react-router-dom';
import {connect} from 'react-redux';

import { loginUserAction, registerUserAction} from '../actions/authenticationActions';
import { setCookie } from '../util/cookies';
import {loginUserAction} from '../actions/authenticationActions';
import {setCookie} from '../util/cookies';
import icon1 from '../assets/img/icon-1-li.png';
import icon2 from '../assets/img/icon-2-li.png'
import icon3 from '../assets/img/icon-3-li.png'
Expand All @@ -13,7 +13,7 @@ import Tab from "react-bootstrap/Tab";
import Tabs from "react-bootstrap/Tabs";
import Header from "../components/Header";

import { initializeReactGA } from '../container/App';
import {initializeReactGA} from '../container/App';

class LoginPage extends Component {

Expand Down Expand Up @@ -42,7 +42,7 @@ class LoginPage extends Component {
if (this.props.response && this.props.response.hasOwnProperty('response')) {
isSuccess = this.props.response.response.success;
message = this.props.response.response.message;

if (isSuccess) {
console.log('success');
setCookie('token', this.props.response.response.token, 1);
Expand Down Expand Up @@ -216,7 +216,7 @@ class LoginPage extends Component {

<div className="text-center mt-4">
<strong className="small-line">
<a href="#">Read Our Research</a>
<a href="javascript:void(0)">Read Our Research</a>
</strong>
</div>

Expand Down Expand Up @@ -325,4 +325,4 @@ class LoginPage extends Component {

const mapStateToProps = (response) => ({response});

export default connect(mapStateToProps)(LoginPage);
export default connect(mapStateToProps)(LoginPage);
51 changes: 41 additions & 10 deletions src/components/LungConditions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { Component } from "react";
import ProgressBar from "react-bootstrap/ProgressBar";
import React, {Component} from "react";

class LungConditions extends Component {

Expand All @@ -9,21 +8,53 @@ class LungConditions extends Component {
if (this.props.data) {
Object.keys(this.props.data).forEach(key => {
tifOptions.push(
<div class="row">
<div class="col-md-6">{key}</div>
<div class="col-md-6">
<div>{this.props.data[key].result_boolean? <div><b>Yes</b></div> : <div>No</div>}</div>
/**/ <div className="row mt-3" key={key}>
<div className="col-xl-4 col-lg-4 col-md-4 col-sm-12 col-xs-12">
<strong>{key}</strong>
</div>

<div className="col-xl-8 col-lg-8 col-md-8 col-sm-12 col-xs-12">
<div className="slidecontainer">
<input type="range" min={this.props.data[key].low_val} max={this.props.data[key].high_val} value={this.props.data[key].this_val} className="slider" id={key}/>
</div>
</div>
</div>
);
});
}
return (
<div>
{tifOptions}
</div>
<React.Fragment>
<div className="mt-3 mb-3 text-center">
<h5>Disease Predictions</h5>
</div>
<div className="row mt-3">
<div className="col-xl-4 col-lg-4 col-md-4 col-sm-12 col-xs-12">

</div>

<div className="col-xl-8 col-lg-8 col-md-8 col-sm-12 col-xs-12 ">
<div className="justify-content-between d-flex">
<small>Healthy</small>
<small>Risk</small>
</div>
<div className="justify-content-between d-flex dote">
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</div>
</div>
{tifOptions}
</React.Fragment>
);
}
}

export default LungConditions;
export default LungConditions;
25 changes: 12 additions & 13 deletions src/components/PatientInfoForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import React, { Component } from 'react';
import { Link } from 'react-router-dom';
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 { setXrayImage, setCTScanImage, uploadImage, response , getMLResponse, setLoading, logout} from '../actions';
import {bindActionCreators} from 'redux';
import {connect} from 'react-redux';
import {getMLResponse, logout, response, setCTScanImage, setLoading, setXrayImage, uploadImage} from '../actions';
import Preview from './Preview';
import LungConditions from './LungConditions';
import { setCookie } from '../util/cookies';
import {setCookie} from '../util/cookies';
import '../styles/App.css';

import { initializeReactGA } from '../container/App';
import {initializeReactGA} from '../container/App';

class PatientInfoForm extends Component {

Expand Down Expand Up @@ -46,20 +45,20 @@ class PatientInfoForm extends Component {
: 'not_selected';
patientInfo['isRtPcrConducted'] =
document.querySelector('input[name="isRtPcrConducted"]:checked') ?
document.querySelector('input[name="isRtPcrConducted"]:checked').value == 'yes' ?
document.querySelector('input[name="isRtPcrConducted"]:checked').value === 'yes' ?
document.querySelector('input[name="isRtPcrResultPositive"]:checked') ?
document.querySelector('input[name="isRtPcrResultPositive"]:checked').value == 'yes' ?
document.querySelector('input[name="isRtPcrResultPositive"]:checked').value === 'yes' ?
'positive'
: 'negative'
: 'none' // TODO: Make 'isRtPcrResultPositive' field mandatory
: 'none'
: 'none'; // TODO: Make 'isRtPcrConducted' field mandatory

let formImageData = new FormData();
if(this.props.model_type == 'xray') {
if(this.props.model_type === 'xray') {
formImageData.append("photo", this.props.xray_image);
this.props.uploadImage(formImageData, patientInfo, 'xray');
}else if(this.props.model_type == 'ct') {
}else if(this.props.model_type === 'ct') {
formImageData.append("photo", this.props.ct_scan_image);
this.props.uploadImage(formImageData, patientInfo, 'ct');
}
Expand Down Expand Up @@ -198,7 +197,7 @@ class PatientInfoForm extends Component {
</div>
</div>

{this.state && this.state.isRtPcrConducted && this.state.isRtPcrConducted == 'yes' ?
{this.state && this.state.isRtPcrConducted && this.state.isRtPcrConducted === 'yes' ?
<div className="mt-4">
<div><strong>RT-PCR Test result</strong></div>
<div className="d-flex mt-4">
Expand Down
Loading