@@ -47,4 +63,8 @@ const ExperimentNavigation = ({ match }) => {
)
}
-export default ExperimentNavigation
+const mapStateToProps = state => ({
+ selectedRoutine: selectSelectedRoutine(state),
+})
+
+export default connect(mapStateToProps)(ExperimentNavigation)
diff --git a/src/presentation/experiment/list/index.js b/src/presentation/experiment/list/index.js
index 62eab20..bc9f87b 100644
--- a/src/presentation/experiment/list/index.js
+++ b/src/presentation/experiment/list/index.js
@@ -6,18 +6,21 @@ import ExperimentsPresenter from './presenter'
import {
selectRoutines,
selectSearchInProgress,
- selectRoutineFetchingStatus
+ selectRoutineFetchingStatus,
+ selectRoutinePagination
} from '../../../redux/routine/selector'
import {
fetchRoutinesRequest,
setSelectedRoutine,
- clearSearchTerm,
- setSearchTerm
+ clearSelectedRoutine,
+ clearSearch,
+ searchRequest
} from '../../../redux/routine/actions'
class Experiments extends Component {
componentWillMount () {
this.props.requestRoutines()
+ this.props.clearSelectedRoutine()
}
onSelectRoutine (routine) {
@@ -27,19 +30,22 @@ class Experiments extends Component {
onSearch (event, { value }) {
if (!value) {
- this.props.clearSearchTerm()
+ this.props.clearSearch()
} else {
- this.props.setSearchTerm(value)
+ this.props.searchRequest(value)
}
}
render () {
return (
@@ -51,16 +57,18 @@ const mapStateToProps = state => {
return {
...selectRoutineFetchingStatus(state),
searchInProgress: selectSearchInProgress(state),
+ pagination: selectRoutinePagination(state),
routines: selectRoutines(state)
}
}
const mapDispatchToProps = dispatch => {
return {
- requestRoutines: () => dispatch(fetchRoutinesRequest()),
+ requestRoutines: page => dispatch(fetchRoutinesRequest(page)),
setSelectedRoutine: routine => dispatch(setSelectedRoutine(routine)),
- clearSearchTerm: () => dispatch(clearSearchTerm()),
- setSearchTerm: searchTerm => dispatch(setSearchTerm(searchTerm))
+ clearSelectedRoutine: () => dispatch(clearSelectedRoutine()),
+ clearSearch: () => dispatch(clearSearch()),
+ searchRequest: searchTerm => dispatch(searchRequest(searchTerm))
}
}
diff --git a/src/presentation/experiment/list/presenter.js b/src/presentation/experiment/list/presenter.js
index be02e39..6e0e95f 100644
--- a/src/presentation/experiment/list/presenter.js
+++ b/src/presentation/experiment/list/presenter.js
@@ -1,28 +1,51 @@
-import React from 'react'
-import moment from 'moment'
-import './styles.css'
+import React from "react";
+import moment from "moment";
+import "./styles.css";
+import { Loader } from "semantic-ui-react";
-import Table from '../../common/table'
-import Screen from '../../common/screen'
-import Container from '../../common/container'
-import Search from '../../common/search'
-import Message from '../../common/message'
-import ButtonLink from '../../common/button/link'
+import { FUNCTIONALITY_ACCESS } from "../../router";
-const ExperimentsPresenter = ({ routines, searchInProgress, error, onSelectRoutine, onSearch, onCancel }) => {
- const emptyRoutines = routines.length === 0 && !searchInProgress
+import Table from "../../common/table";
+import Screen from "../../common/screen";
+import Container from "../../common/container";
+import Search from "../../common/search";
+import Message from "../../common/message";
+import ButtonLink from "../../common/button/link";
+import Pagination from "../../common/pagination";
+
+const ExperimentsPresenter = ({
+ fetching,
+ routines,
+ pagination,
+ searchInProgress,
+ error,
+ onSelectRoutine,
+ onNavigateToPage,
+ onSearch,
+ onCancel
+}) => {
+ const emptyRoutines = routines.length === 0 && !searchInProgress;
return (
- )
-}
+ );
+};
-export default ExperimentsPresenter
+export default ExperimentsPresenter;
diff --git a/src/presentation/experiment/report/calculation/chart/index.js b/src/presentation/experiment/report/calculation/chart/index.js
new file mode 100644
index 0000000..d9a5003
--- /dev/null
+++ b/src/presentation/experiment/report/calculation/chart/index.js
@@ -0,0 +1,19 @@
+import React from 'react'
+
+import LineChart from '../../../../common/chart/line'
+
+const ReportChart = ({ calculation, color }) => {
+ return (
+
y),
+ label: calculation.map(({ x, y }) => x),
+ stroke: color
+ }]}
+ height={60}
+ labels={calculation.map(({ x, y }) => x)}
+ />
+ )
+}
+
+export default ReportChart
diff --git a/src/presentation/experiment/report/calculation/index.js b/src/presentation/experiment/report/calculation/index.js
new file mode 100644
index 0000000..2966f50
--- /dev/null
+++ b/src/presentation/experiment/report/calculation/index.js
@@ -0,0 +1,58 @@
+import React from 'react'
+import { isEmpty } from 'lodash'
+import './styles.css'
+
+import Chart from './chart'
+import Container from '../../../common/container'
+
+const MAGNITUDE_COLORS = {
+ temp: '#DB9439',
+ ph: '#8DB5B2',
+ product: '#C6625B',
+ substratum: '#739E53',
+ biomass: '#A37EA0'
+}
+
+const CALCULATION_NAMES = {
+ specificProductVelocity: 'Velocidad EspecÃfica de Producto',
+ productVolumetricPerformance: 'Rendimiento volumétrico de Producto',
+ productPerformance: 'Rendimiento de Producto',
+ maxProductVolumetricPerformance: 'Máximo rendmiento de Producto volumétrico',
+ maxProductVelocity: 'Máxima velocidad de producto',
+
+ productBiomassPerformance: 'Rendimiento de Producto Biomasa',
+
+ specificBiomassVelocity: 'Velocidad EspecÃfica de Biomasa',
+ biomassVolumetricPerformance: 'Rendimiento volumétrico de Biomasa',
+ biomassPerformance: 'Rendimiento de Biomasa',
+ maxBiomassVolumetricPerformance: 'Máxima rendimiento de Biomasa volumétrica',
+ maxBiomassVelocity: 'Máxima velocidad de Biomasa',
+
+ specificPhVelocity: 'Velocidad EspecÃfica de pH',
+ maxPhVelocity: 'Máxima velocidad de pH'
+}
+
+const getMagnitudeName = calculationName =>
+ Object.keys(MAGNITUDE_COLORS).find(m => calculationName.toLowerCase().includes(m))
+
+const Calculation = ({ routine, calculation, max }) => {
+ if (isEmpty(routine.calculations[calculation])) {
+ return null
+ }
+ return (
+
+
+ {CALCULATION_NAMES[calculation]}
+ { routine.calculations[max] &&
+ Máximo {routine.calculations[max].y}
+ }
+
+
+
+ )
+}
+
+export default Calculation
diff --git a/src/presentation/experiment/report/calculation/styles.css b/src/presentation/experiment/report/calculation/styles.css
new file mode 100644
index 0000000..44c0bb4
--- /dev/null
+++ b/src/presentation/experiment/report/calculation/styles.css
@@ -0,0 +1,3 @@
+.maximum {
+ margin-top: 0;
+}
\ No newline at end of file
diff --git a/src/presentation/experiment/analysis/index.js b/src/presentation/experiment/report/index.js
similarity index 66%
rename from src/presentation/experiment/analysis/index.js
rename to src/presentation/experiment/report/index.js
index f8c2311..b71a26e 100644
--- a/src/presentation/experiment/analysis/index.js
+++ b/src/presentation/experiment/report/index.js
@@ -1,29 +1,27 @@
import React, { Component } from 'react'
import { connect } from 'react-redux'
-import ExperimentAnalysisPresenter from './presenter'
+import ExperimentReportPresenter from './presenter'
import {
- selectRoutineFetchingStatus
+ selectRoutineFetchingStatus, selectSelectedRoutine
} from '../../../redux/routine/selector'
-import {
- selectSelectedRoutineTimeline
-} from '../../../redux/reading/selector'
+
import {
fetchRequest
} from '../../../redux/routine/actions'
-class ExperimentAnalysis extends Component {
+class ExperimentReport extends Component {
componentWillMount () {
this.props.requestRoutine(this.props.match.params)
}
render () {
return (
-
)
}
@@ -32,7 +30,7 @@ class ExperimentAnalysis extends Component {
const mapStateToProps = state => {
return {
...selectRoutineFetchingStatus(state),
- timeline: selectSelectedRoutineTimeline(state)
+ routine: selectSelectedRoutine(state)
}
}
@@ -42,4 +40,4 @@ const mapDispatchToProps = dispatch => {
}
}
-export default connect(mapStateToProps, mapDispatchToProps)(ExperimentAnalysis)
+export default connect(mapStateToProps, mapDispatchToProps)(ExperimentReport)
diff --git a/src/presentation/experiment/report/presenter.js b/src/presentation/experiment/report/presenter.js
new file mode 100644
index 0000000..9d5fbae
--- /dev/null
+++ b/src/presentation/experiment/report/presenter.js
@@ -0,0 +1,115 @@
+import React from 'react'
+import './styles.css'
+import { isEmpty } from 'lodash'
+import Network from '../../../networking'
+import Button from '../../common/button'
+
+import Screen from '../../common/screen'
+import Container from '../../common/container'
+import Calculation from './calculation'
+
+const BIOMASS_CALCULATIONS = [
+ 'biomassPerformance',
+ 'biomassVolumetricPerformance',
+ 'specificBiomassVelocity'
+]
+
+const PRODUCT_CALCULATIONS = [
+ 'productPerformance',
+ 'biomassVolumetricPerformance',
+ 'specificBiomassVelocity'
+]
+
+
+const ExperimentReportPresenter = ({ routine = {}, fetching, error }) => {
+ return (
+
+
+
+ {routine.title}
+
+
+
+
+
+
+
+
+ { !isEmpty(routine.calculations) &&
+
+
+
+
+ Biomasa
+
+ { hasCalculations(routine, BIOMASS_CALCULATIONS) ? (
+
+
+
+
+
+ ) : (
+
No hay cálculos de Biomasa disponibles
+ )
+ }
+
+
+
+
+ Producto
+
+ { hasCalculations(routine, PRODUCT_CALCULATIONS) ? (
+
+
+
+
+
+ ) : (
+
No hay cálculos de Producto disponibles
+ )
+ }
+
+
+
+
+ pH
+
+
+
+
+
+
Información básica
+
+