From 8c628f1c4fdbc596fce7f84dbb8ac500e1cdedae Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 25 Mar 2019 22:28:37 +0100
Subject: updating that interface

---
 scraper/client/paper/paper.verify.js | 115 +++++++++++++++++++++++------------
 1 file changed, 76 insertions(+), 39 deletions(-)

(limited to 'scraper/client/paper/paper.verify.js')

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 (
               <a
                 key={i}
+                href={pdf}
                 onClick={() => this.setState({ pdf_index: i })}
                 className={i === this.state.pdf_index ? 'selected pdfLink' : 'pdfLink'}
               >
@@ -199,43 +199,80 @@ class PaperVerify extends Component {
           />
         </div>
 
-        <div className='param'>
-          <label>Uses the dataset?</label>
-          <input
-            className='vetting'
-            type='radio'
-            name='uses_dataset'
-            checked={!!this.state.uses_dataset}
-            onChange={e => this.setState({
-              uses_dataset: e.target.checked,
-            })}
-          />
-        </div>
+        <div className='row vettingRow'>
+          <div className='rowHeading'>
+            {'Uses dataset'}
+          </div>
+          <label>
+            <input
+              className='vetting'
+              type='radio'
+              name='uses_dataset'
+              checked={this.state.uses_dataset === USES_DATASET.YES || this.state.uses_dataset === "FALSE"}
+              onChange={e => this.setState({
+                uses_dataset: USES_DATASET.YES,
+              })}
+            />
+            <div>{"Yes"}</div>
+          </label>
 
-        <div className='param'>
-          <label>{"Doesn't use dataset"}</label>
-          <input
-            className='vetting'
-            type='radio'
-            name='uses_dataset'
-            checked={!this.state.uses_dataset}
-            onChange={e => this.setState({
-              uses_dataset: !e.target.checked,
-            })}
-          />
+          <label>
+            <input
+              className='vetting'
+              type='radio'
+              name='uses_dataset'
+              checked={this.state.uses_dataset === USES_DATASET.NO || this.state.uses_dataset === "FALSE"}
+              onChange={e => this.setState({
+                uses_dataset: USES_DATASET.NO,
+              })}
+            />
+            <div>{"No"}</div>
+          </label>
+
+          <label>
+            <input
+              className='vetting'
+              type='radio'
+              name='uses_dataset'
+              checked={this.state.uses_dataset === USES_DATASET.UNKNOWN || this.state.uses_dataset === "FALSE"}
+              onChange={e => this.setState({
+                uses_dataset: USES_DATASET.UNKNOWN,
+              })}
+            />
+            <div>{"Not enough information"}</div>
+          </label>
         </div>
 
-        <div className='param'>
-          <label>{"Uses images from dataset"}</label>
-          <input
-            className='vetting'
-            type='checkbox'
-            name='images_in_paper'
-            checked={!!this.state.images_in_paper}
-            onChange={e => this.setState({
-              images_in_paper: e.target.checked,
-            })}
-          />
+        <div className={this.state.uses_dataset === USES_DATASET.YES ? 'row vettingRow' : 'row vettingRow disabled'}>
+          <div className='rowHeading'>
+            {'Paper shows images'}
+          </div>
+
+          <label>
+            <input
+              className='vetting'
+              type='radio'
+              name='images_in_paper'
+              checked={this.state.images_in_paper === "TRUE"}
+              onChange={e => this.setState({
+                uses_dataset: "TRUE",
+              })}
+            />
+            <div>{"Yes"}</div>
+          </label>
+
+          <label>
+            <input
+              className='vetting'
+              type='radio'
+              name='images_in_paper'
+              checked={this.state.images_in_paper === "FALSE"}
+              onChange={e => this.setState({
+                uses_dataset: "FALSE",
+              })}
+            />
+            <div>{"No"}</div>
+          </label>
         </div>
 
         <div className='param'>
@@ -285,7 +322,7 @@ class PaperVerify extends Component {
           <button
             className='btn'
             onClick={this.prev.bind(this)}
-          >{'Prev >'}</button>
+          >{'< Prev'}</button>
 
           <button
             className='btn'
-- 
cgit v1.2.3-70-g09d2


From d8e4561f3b1102489e366fd0e452f84d1d3f24e7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 25 Mar 2019 22:48:22 +0100
Subject: updating that interface

---
 scraper/client/paper/paper.css       |  2 +-
 scraper/client/paper/paper.verify.js | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'scraper/client/paper/paper.verify.js')

diff --git a/scraper/client/paper/paper.css b/scraper/client/paper/paper.css
index fc558ca1..025d6b8a 100644
--- a/scraper/client/paper/paper.css
+++ b/scraper/client/paper/paper.css
@@ -83,7 +83,7 @@ input.notes {
 .param .btn {
   margin-top: 5px;
 }
-.row.disabled { opacity: 0.5; }
+.row.disabled { opacity: 0.5; pointer-events: none;}
 
 .vettingRow label {
   display: flex;
diff --git a/scraper/client/paper/paper.verify.js b/scraper/client/paper/paper.verify.js
index 6b2bde07..adb2d1ce 100644
--- a/scraper/client/paper/paper.verify.js
+++ b/scraper/client/paper/paper.verify.js
@@ -11,7 +11,7 @@ const initialState = {
   citation: null,
   verifiable: false,
   uses_dataset: USES_DATASET.UNKNOWN,
-  images_in_paper: false,
+  images_in_paper: "FALSE",
   verified_by: localStorage.getItem('verify.username') || '',
   reference: '',
   notes: '',
@@ -243,7 +243,10 @@ class PaperVerify extends Component {
           </label>
         </div>
 
-        <div className={this.state.uses_dataset === USES_DATASET.YES ? 'row vettingRow' : 'row vettingRow disabled'}>
+        <div
+          className={this.state.uses_dataset === USES_DATASET.YES ? 'row vettingRow' : 'row vettingRow disabled'}
+          disabled={this.state.uses_dataset === USES_DATASET.YES ? false : true}
+        >
           <div className='rowHeading'>
             {'Paper shows images'}
           </div>
@@ -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",
               })}
             />
             <div>{"Yes"}</div>
@@ -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",
               })}
             />
             <div>{"No"}</div>
-- 
cgit v1.2.3-70-g09d2


From e2738e0685b15f5304b69f5d0635169ccf1fdc00 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
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/paper.verify.js')

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 {
           </a>
         </div>
 
-        <div className='param'>
-          <label>{"Verifiable"}</label>
-          <input
-            className='vetting'
-            type='checkbox'
-            name='verifiable'
-            checked={!!this.state.verifiable}
-            onChange={e => this.setState({
-              verifiable: e.target.checked,
-            })}
-          />
-        </div>
-
         <div className='row vettingRow'>
           <div className='rowHeading'>
             {'Uses dataset'}
@@ -339,6 +323,21 @@ class PaperVerify extends Component {
   }
 }
 
+/*
+        <div className='param'>
+          <label>{"Verifiable"}</label>
+          <input
+            className='vetting'
+            type='checkbox'
+            name='verifiable'
+            checked={!!this.state.verifiable}
+            onChange={e => this.setState({
+              verifiable: e.target.checked,
+            })}
+          />
+        </div>
+*/
+
 const mapStateToProps = state => ({
   api: state.api,
 })
-- 
cgit v1.2.3-70-g09d2


From 65cc702d8324ba8001e747973b43d2fd2b321de7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
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/paper.verify.js')

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 {
           </label>
         </div>
 
+        <div>
+          <div className='rowHeading'>
+            {'Used as model'}
+          </div>
+
+          <label>
+            <input
+              className='vetting'
+              type='radio'
+              name='used_as_model'
+              checked={this.state.used_as_model === "TRUE"}
+              onChange={e => this.setState({
+                used_as_model: "TRUE",
+              })}
+            />
+            <div>{"Yes"}</div>
+          </label>
+
+          <label>
+            <input
+              className='vetting'
+              type='radio'
+              name='used_as_model'
+              checked={this.state.used_as_model === "FALSE"}
+              onChange={e => this.setState({
+                used_as_model: "FALSE",
+              })}
+            />
+            <div>{"No"}</div>
+          </label>
+        </div>
+
         <div className='param'>
           <label>Verified by:</label>
           <input
-- 
cgit v1.2.3-70-g09d2


From fb5ce71f3d4c8c02421f2758e63d2b2d41226a7f Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
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/paper.verify.js')

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 {
           </label>
         </div>
 
-        <div>
+        <div className='row vettingRow'>
           <div className='rowHeading'>
             {'Used as model'}
           </div>
-- 
cgit v1.2.3-70-g09d2