From de296acc387d4302c0b0ba1eaa27c695bf939da1 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Tue, 5 Mar 2019 19:45:49 +0000
Subject: [PATCH] GH-1077: Add screening to status tab
---
opentech/apply/funds/serializers.py | 3 ++-
.../src/components/ReviewBlock/styles.scss | 3 ---
.../app/src/components/SidebarBlock/index.js | 20 ++++++++++++++++
.../src/components/SidebarBlock/styles.scss | 3 +++
.../app/src/containers/DisplayPanel/index.js | 10 ++++----
.../app/src/containers/ReviewInformation.js | 15 ++++++------
.../app/src/containers/ScreeningOutcome.js | 24 +++++++++++++++++++
.../src/app/src/containers/StatusActions.js | 5 ++--
8 files changed, 66 insertions(+), 17 deletions(-)
create mode 100644 opentech/static_src/src/app/src/components/SidebarBlock/index.js
create mode 100644 opentech/static_src/src/app/src/components/SidebarBlock/styles.scss
create mode 100644 opentech/static_src/src/app/src/containers/ScreeningOutcome.js
diff --git a/opentech/apply/funds/serializers.py b/opentech/apply/funds/serializers.py
index ce4e4da52..8d7bd8aa6 100644
--- a/opentech/apply/funds/serializers.py
+++ b/opentech/apply/funds/serializers.py
@@ -142,10 +142,11 @@ class SubmissionDetailSerializer(serializers.ModelSerializer):
actions = ActionSerializer(source='*')
review = ReviewSummarySerializer(source='*')
phase = serializers.CharField()
+ screening = serializers.ReadOnlyField(source='screening_status')
class Meta:
model = ApplicationSubmission
- fields = ('id', 'title', 'stage', 'status', 'phase', 'meta_questions', 'questions', 'actions', 'review')
+ fields = ('id', 'title', 'stage', 'status', 'phase', 'meta_questions', 'questions', 'actions', 'review', 'screening')
def serialize_questions(self, obj, fields):
for field_id in fields:
diff --git a/opentech/static_src/src/app/src/components/ReviewBlock/styles.scss b/opentech/static_src/src/app/src/components/ReviewBlock/styles.scss
index 103cf8572..1243f9b4b 100644
--- a/opentech/static_src/src/app/src/components/ReviewBlock/styles.scss
+++ b/opentech/static_src/src/app/src/components/ReviewBlock/styles.scss
@@ -1,4 +1 @@
// .reviews-sidebar styles are in apply/components/_reviews-sidebar.scss and are shared with the site
-.review-block {
- padding: 20px;
-}
diff --git a/opentech/static_src/src/app/src/components/SidebarBlock/index.js b/opentech/static_src/src/app/src/components/SidebarBlock/index.js
new file mode 100644
index 000000000..1bdd1b021
--- /dev/null
+++ b/opentech/static_src/src/app/src/components/SidebarBlock/index.js
@@ -0,0 +1,20 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+
+import './styles.scss';
+
+export const SidebarBlock = ({ title, children }) => {
+ return (
+ <div className="sidebar-block">
+ {title && <h5>{title}</h5>}
+ { children }
+ </div>
+ )
+}
+
+SidebarBlock.propTypes = {
+ title: PropTypes.string,
+ children: PropTypes.node,
+}
+
+export default SidebarBlock
diff --git a/opentech/static_src/src/app/src/components/SidebarBlock/styles.scss b/opentech/static_src/src/app/src/components/SidebarBlock/styles.scss
new file mode 100644
index 000000000..04fcde87c
--- /dev/null
+++ b/opentech/static_src/src/app/src/components/SidebarBlock/styles.scss
@@ -0,0 +1,3 @@
+.sidebar-block {
+ padding: 20px;
+}
diff --git a/opentech/static_src/src/app/src/containers/DisplayPanel/index.js b/opentech/static_src/src/app/src/containers/DisplayPanel/index.js
index 186941b60..cbf976b73 100644
--- a/opentech/static_src/src/app/src/containers/DisplayPanel/index.js
+++ b/opentech/static_src/src/app/src/containers/DisplayPanel/index.js
@@ -12,6 +12,7 @@ import {
import CurrentSubmissionDisplay from '@containers/CurrentSubmissionDisplay'
import ReviewInformation from '@containers/ReviewInformation'
+import ScreeningOutcome from '@containers/ScreeningOutcome'
import AddNoteForm from '@containers/AddNoteForm'
import NoteListing from '@containers/NoteListing'
import StatusActions from '@containers/StatusActions'
@@ -59,14 +60,15 @@ const DisplayPanel = props => {
const isMobile = width < 1024;
let tabs = [
- <Tab button="Notes" key="note">
- <NoteListing submissionID={submissionID} />
- <AddNoteForm submissionID={submissionID} />
- </Tab>,
<Tab button="Status" key="status">
+ <ScreeningOutcome submissionID={submissionID} />
<StatusActions submissionID={submissionID} />
<ReviewInformation submissionID={submissionID} />
<SubmissionLink submissionID={submissionID} />
+ </Tab>,
+ <Tab button="Notes" key="note">
+ <NoteListing submissionID={submissionID} />
+ <AddNoteForm submissionID={submissionID} />
</Tab>
]
diff --git a/opentech/static_src/src/app/src/containers/ReviewInformation.js b/opentech/static_src/src/app/src/containers/ReviewInformation.js
index 40097bce4..8e6a1f0d6 100644
--- a/opentech/static_src/src/app/src/containers/ReviewInformation.js
+++ b/opentech/static_src/src/app/src/containers/ReviewInformation.js
@@ -3,17 +3,19 @@ import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import LoadingPanel from '@components/LoadingPanel'
+import SidebarBlock from '@components/SidebarBlock'
import ReviewBlock, { Review, AssignedToReview, Opinion } from '@components/ReviewBlock'
import { getSubmissionOfID } from '@selectors/submissions'
-const ReviewInformation = ({ data }) => {
+const ReviewInformation = ({ submission }) => {
const [showExternal, setShowExternal] = useState(false)
- if (data === undefined) {
+ if (submission === undefined || !submission.review) {
return <LoadingPanel />
}
+ const data = submission.review
const staff = [];
const nonStaff = [];
@@ -79,8 +81,7 @@ const ReviewInformation = ({ data }) => {
const [nonStaffReviewed, nonStaffNotReviewed] = orderPeople(nonStaff);
return (
- <div className="review-block">
- <h5>Reviews & assignees</h5>
+ <SidebarBlock title="Reviews & assignees">
<ReviewBlock score={data.score} recommendation={data.recommendation.display}>
{renderReviewBlock(staffReviewed)}
{renderReviewBlock(staffNotReviewed)}
@@ -93,17 +94,17 @@ const ReviewInformation = ({ data }) => {
renderReviewBlock(nonStaffNotReviewed)
}
</ReviewBlock>
- </div>
+ </SidebarBlock>
)
}
ReviewInformation.propTypes = {
- data: PropTypes.object,
+ submission: PropTypes.object,
submissionID: PropTypes.number.isRequired,
}
const mapStateToProps = (state, ownProps) => ({
- data: getSubmissionOfID(ownProps.submissionID)(state).review,
+ submission: getSubmissionOfID(ownProps.submissionID)(state),
})
export default connect(mapStateToProps)(ReviewInformation)
diff --git a/opentech/static_src/src/app/src/containers/ScreeningOutcome.js b/opentech/static_src/src/app/src/containers/ScreeningOutcome.js
new file mode 100644
index 000000000..16344e730
--- /dev/null
+++ b/opentech/static_src/src/app/src/containers/ScreeningOutcome.js
@@ -0,0 +1,24 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { connect } from 'react-redux'
+
+import SidebarBlock from '@components/SidebarBlock'
+import { getSubmissionOfID } from '@selectors/submissions'
+
+
+const ScreeningOutcome = ({ submission }) => {
+ const outcome = submission && submission.screening;
+ return <SidebarBlock title="Screening Outcome">
+ { outcome ? outcome : "Not yet screened"}
+ </SidebarBlock>
+}
+
+ScreeningOutcome.propTypes = {
+ submission: PropTypes.object,
+}
+
+const mapStateToProps = (state, ownProps) => ({
+ submission: getSubmissionOfID(ownProps.submissionID)(state),
+})
+
+export default connect(mapStateToProps)(ScreeningOutcome)
diff --git a/opentech/static_src/src/app/src/containers/StatusActions.js b/opentech/static_src/src/app/src/containers/StatusActions.js
index ed965288c..61d19f6cd 100644
--- a/opentech/static_src/src/app/src/containers/StatusActions.js
+++ b/opentech/static_src/src/app/src/containers/StatusActions.js
@@ -6,6 +6,7 @@ import PropTypes from 'prop-types';
import { MESSAGE_TYPES, addMessage } from '@actions/messages';
import { executeSubmissionAction } from '@actions/submissions';
import Select from '@components/Select'
+import SidebarBlock from '@components/SidebarBlock'
import { getSubmissionOfID } from '@selectors/submissions';
import { redirect } from '@utils';
@@ -136,7 +137,7 @@ class StatusActions extends React.Component {
}
return (
- <>
+ <SidebarBlock>
<Modal isOpen={this.state.modalVisible}
onRequestClose={this.closeStatusModal}
contentLabel="Update status"
@@ -148,7 +149,7 @@ class StatusActions extends React.Component {
<div className="status-actions">
<button className="button button--primary button--full-width" onClick={this.openStatusModal}>Update status</button>
</div>
- </>
+ </SidebarBlock>
);
}
}
--
GitLab