From 8c628f1c4fdbc596fce7f84dbb8ac500e1cdedae Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 25 Mar 2019 22:28:37 +0100 Subject: updating that interface --- scraper/client/paper/paper.css | 26 +++++++- scraper/client/paper/paper.random.js | 2 +- scraper/client/paper/paper.verify.js | 115 +++++++++++++++++++++++------------ 3 files changed, 100 insertions(+), 43 deletions(-) (limited to 'scraper/client/paper') diff --git a/scraper/client/paper/paper.css b/scraper/client/paper/paper.css index 1e6d4c30..fc558ca1 100644 --- a/scraper/client/paper/paper.css +++ b/scraper/client/paper/paper.css @@ -1,3 +1,12 @@ +.row { + display: flex; + flex-direction: row; + padding: 4px; +} +.rowHeading { + display: block; + width: 194px; +} .form, .paperInfo { padding: 10px; width: 100%; @@ -74,9 +83,16 @@ input.notes { .param .btn { margin-top: 5px; } -.vetting { - width: 250px; - margin-right: 10px; +.row.disabled { opacity: 0.5; } + +.vettingRow label { + display: flex; + justify-content: center; + align-items: center; + padding: 0 10px 0 0; +} +.vettingRow input { + margin-right: 6px; } .param label { display: block; @@ -86,7 +102,11 @@ input.notes { .param input[type=checkbox] { margin: 6px 0; } +input[type=text] { + margin-bottom: 2px; +} textarea { + margin-bottom: 2px; padding: 4px; font-size: 14px; } diff --git a/scraper/client/paper/paper.random.js b/scraper/client/paper/paper.random.js index aab22172..c7476332 100644 --- a/scraper/client/paper/paper.random.js +++ b/scraper/client/paper/paper.random.js @@ -15,7 +15,7 @@ class PaperRandom extends Component { const citation = choice(citations) console.log(citation) if (citation.id) { - history.push('/paper/' + this.props.match.params.key + '/address/' + citation.id) + history.push('/paper/' + this.props.match.params.key + '/verify/' + citation.id) } } diff --git a/scraper/client/paper/paper.verify.js b/scraper/client/paper/paper.verify.js index 9e1a2ad4..6b2bde07 100644 --- a/scraper/client/paper/paper.verify.js +++ b/scraper/client/paper/paper.verify.js @@ -3,15 +3,14 @@ import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import * as actions from '../actions' - import { history } from '../store' - -import { Loader, Autocomplete } from '../common' +import { Loader } from '../common' +import { USES_DATASET } from '../types' const initialState = { citation: null, verifiable: false, - uses_dataset: false, + uses_dataset: USES_DATASET.UNKNOWN, images_in_paper: false, verified_by: localStorage.getItem('verify.username') || '', reference: '', @@ -169,6 +168,7 @@ class PaperVerify extends Component { return ( this.setState({ pdf_index: i })} className={i === this.state.pdf_index ? 'selected pdfLink' : 'pdfLink'} > @@ -199,43 +199,80 @@ class PaperVerify extends Component { /> -
- - this.setState({ - uses_dataset: e.target.checked, - })} - /> -
+
+
+ {'Uses dataset'} +
+ -
- - this.setState({ - uses_dataset: !e.target.checked, - })} - /> + + +
-
- - this.setState({ - images_in_paper: e.target.checked, - })} - /> +
+
+ {'Paper shows images'} +
+ + + +
@@ -285,7 +322,7 @@ class PaperVerify extends Component { + >{'< Prev'}
-
+
{'Paper shows images'}
@@ -255,7 +258,7 @@ class PaperVerify extends Component { name='images_in_paper' checked={this.state.images_in_paper === "TRUE"} onChange={e => this.setState({ - uses_dataset: "TRUE", + images_in_paper: "TRUE", })} />
{"Yes"}
@@ -268,7 +271,7 @@ class PaperVerify extends Component { name='images_in_paper' checked={this.state.images_in_paper === "FALSE"} onChange={e => this.setState({ - uses_dataset: "FALSE", + images_in_paper: "FALSE", })} />
{"No"}
-- cgit v1.2.3-70-g09d2 From e2738e0685b15f5304b69f5d0635169ccf1fdc00 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 25 Mar 2019 23:03:17 +0100 Subject: updating that interface --- scraper/client/paper/paper.verify.js | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'scraper/client/paper') diff --git a/scraper/client/paper/paper.verify.js b/scraper/client/paper/paper.verify.js index adb2d1ce..c2c530af 100644 --- a/scraper/client/paper/paper.verify.js +++ b/scraper/client/paper/paper.verify.js @@ -9,7 +9,6 @@ import { USES_DATASET } from '../types' const initialState = { citation: null, - verifiable: false, uses_dataset: USES_DATASET.UNKNOWN, images_in_paper: "FALSE", verified_by: localStorage.getItem('verify.username') || '', @@ -62,7 +61,6 @@ class PaperVerify extends Component { const citationState = this.getCitationState(sha256) this.setState({ ...citationState, - verifiable: paper.verifiable === "TRUE", uses_dataset: paper.uses_dataset === "TRUE", images_in_paper: paper.images_in_paper === "TRUE", verified_by: paper.verified_by, @@ -101,7 +99,6 @@ class PaperVerify extends Component { paper_id: this.state.citation.id, title: this.state.citation.title, dataset: this.props.api.paperInfo.dataset.key, - verifiable: this.state.verifiable, uses_dataset: this.state.uses_dataset, images_in_paper: this.state.images_in_paper, verified_by: this.state.verified_by, @@ -186,19 +183,6 @@ class PaperVerify extends Component {
-
- - this.setState({ - verifiable: e.target.checked, - })} - /> -
-
{'Uses dataset'} @@ -339,6 +323,21 @@ class PaperVerify extends Component { } } +/* +
+ + this.setState({ + verifiable: e.target.checked, + })} + /> +
+*/ + const mapStateToProps = state => ({ api: state.api, }) -- cgit v1.2.3-70-g09d2 From b727bc49f985cf157d1dd6e17bede88a0cd636b9 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 26 Mar 2019 01:13:16 +0100 Subject: types --- scraper/client/paper/paper.citations.js | 18 ++++++++++++------ scraper/client/types.js | 6 +++--- 2 files changed, 15 insertions(+), 9 deletions(-) (limited to 'scraper/client/paper') diff --git a/scraper/client/paper/paper.citations.js b/scraper/client/paper/paper.citations.js index 53923c6e..3df9ea0c 100644 --- a/scraper/client/paper/paper.citations.js +++ b/scraper/client/paper/paper.citations.js @@ -6,6 +6,7 @@ import { Link } from 'react-router-dom' import * as actions from '../actions' import { TableObject } from '../common' +import { USES_DATASET } from '../types' class PaperCitations extends Component { componentDidMount() { @@ -36,10 +37,11 @@ class PaperCitations extends Component { cite.s2 = { _raw: true, value: {'[semantic scholar]'} + href={'https://www.semanticscholar.org/paper/' + citation.id} + target="_blank" + rel="noopener noreferrer" + className={'pdfLink'} + >{'[semantic scholar]'} } cite.addresses = { _raw: true, @@ -47,11 +49,15 @@ class PaperCitations extends Component {
{address.name}{', '}{address.type}
)) } - if (citation.id in verifications) { + if (citation.id in verifications && verifications[citation.id].dataset === dataset.key) { const verification = verifications[citation.id] cite.verified = { _raw: true, - value: verification['uses_dataset'] === 'TRUE' ? uses dataset : doesn't use dataset + value: verification.uses_dataset === USES_DATASET.YES + ? uses dataset + : verification.uses_dataset === USES_DATASET.NO + ? doesn\'t use dataset + : not enough information } } else { diff --git a/scraper/client/types.js b/scraper/client/types.js index 6d19984d..95b7a4e3 100644 --- a/scraper/client/types.js +++ b/scraper/client/types.js @@ -13,7 +13,7 @@ export const api = tagAsType('api', [ export const init = '@@INIT' export const USES_DATASET = { - YES: 1, - NO: -1, - UNKNOWN: 0, + YES: "1", + NO: "-1", + UNKNOWN: "0", } -- cgit v1.2.3-70-g09d2 From e79de36d08ebadd2a42a0297b752e9979309ca07 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 26 Mar 2019 01:17:19 +0100 Subject: types --- scraper/client/paper/paper.citations.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'scraper/client/paper') diff --git a/scraper/client/paper/paper.citations.js b/scraper/client/paper/paper.citations.js index 3df9ea0c..5c8e0e0c 100644 --- a/scraper/client/paper/paper.citations.js +++ b/scraper/client/paper/paper.citations.js @@ -56,8 +56,12 @@ class PaperCitations extends Component { value: verification.uses_dataset === USES_DATASET.YES ? uses dataset : verification.uses_dataset === USES_DATASET.NO - ? doesn\'t use dataset - : not enough information + ? {"doesn't use dataset"} + : verification.uses_dataset === 'TRUE' + ? uses dataset + : verification.uses_dataset === 'FALSE' + ? {"doesn't use dataset"} + : {"not enough information"} } } else { -- cgit v1.2.3-70-g09d2 From 65cc702d8324ba8001e747973b43d2fd2b321de7 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 26 Mar 2019 13:34:33 +0100 Subject: used_as_model --- scraper/client/paper/paper.verify.js | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'scraper/client/paper') diff --git a/scraper/client/paper/paper.verify.js b/scraper/client/paper/paper.verify.js index c2c530af..45f8583e 100644 --- a/scraper/client/paper/paper.verify.js +++ b/scraper/client/paper/paper.verify.js @@ -11,6 +11,7 @@ const initialState = { citation: null, uses_dataset: USES_DATASET.UNKNOWN, images_in_paper: "FALSE", + used_as_model: "FALSE", verified_by: localStorage.getItem('verify.username') || '', reference: '', notes: '', @@ -101,6 +102,7 @@ class PaperVerify extends Component { dataset: this.props.api.paperInfo.dataset.key, uses_dataset: this.state.uses_dataset, images_in_paper: this.state.images_in_paper, + used_as_model: this.state.used_as_model, verified_by: this.state.verified_by, reference: this.state.reference, notes: this.state.notes, @@ -262,6 +264,38 @@ class PaperVerify extends Component {
+
+
+ {'Used as model'} +
+ + + + +
+
Date: Tue, 26 Mar 2019 13:37:02 +0100 Subject: used_as_model --- scraper/client/paper/paper.verify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scraper/client/paper') diff --git a/scraper/client/paper/paper.verify.js b/scraper/client/paper/paper.verify.js index 45f8583e..65342adf 100644 --- a/scraper/client/paper/paper.verify.js +++ b/scraper/client/paper/paper.verify.js @@ -264,7 +264,7 @@ class PaperVerify extends Component {
-
+
{'Used as model'}
-- cgit v1.2.3-70-g09d2