diff --git a/hypha/apply/api/v1/determination/utils.py b/hypha/apply/api/v1/determination/utils.py index 390fbbd8e0905fe701c983769d3fd6ebbe098b60..a3cd8035fe1ff4a5ce6b71e630bebc38561cd305 100644 --- a/hypha/apply/api/v1/determination/utils.py +++ b/hypha/apply/api/v1/determination/utils.py @@ -1,9 +1,3 @@ -from hypha.apply.determinations.forms import ( - BatchConceptDeterminationForm, - BatchProposalDeterminationForm, - ConceptDeterminationForm, - ProposalDeterminationForm, -) from hypha.apply.determinations.options import ( DETERMINATION_CHOICES, TRANSITION_DETERMINATION, @@ -20,15 +14,6 @@ def get_fields_for_stage(submission): return forms[0].form.form_fields -def get_form_for_stage(submission, batch=False, edit=False): - if batch: - forms = [BatchConceptDeterminationForm, BatchProposalDeterminationForm] - else: - forms = [ConceptDeterminationForm, ProposalDeterminationForm] - index = submission.workflow.stages.index(submission.stage) - return forms[index] - - def outcome_choices_for_phase(submission, user): """ Outcome choices correspond to Phase transitions. diff --git a/hypha/static_src/src/app/src/common/components/PageDownWidget/index.scss b/hypha/static_src/src/app/src/common/components/PageDownWidget/index.scss index 8e3bf6cbdb206e5972abfd9e119d96cedf9af223..acafb37090b945cc9249ef714e716625fb38e10c 100644 --- a/hypha/static_src/src/app/src/common/components/PageDownWidget/index.scss +++ b/hypha/static_src/src/app/src/common/components/PageDownWidget/index.scss @@ -2,4 +2,4 @@ width : '100%'; background-color : #e7f2f6; padding-left: 3px; -} \ No newline at end of file +} diff --git a/hypha/static_src/src/app/src/containers/Determination.js b/hypha/static_src/src/app/src/containers/Determination.js index f4ec2cd3deaaf643e4315104361190613bb401d1..8df05322c34881e9f01bbd8c0d965f8bb28c54ee 100644 --- a/hypha/static_src/src/app/src/containers/Determination.js +++ b/hypha/static_src/src/app/src/containers/Determination.js @@ -69,7 +69,6 @@ const mapStateToProps = (state) => ({ const mapDispatchToProps = (dispatch) => ({ toggleDeterminationForm: (status) => dispatch(toggleDeterminationFormAction(status)), setCurrentDetermination: (reviewId) => dispatch(setCurrentDeterminationAction(reviewId)), - // deleteReview: (reviewId, submissionID) => dispatch(deleteReviewAction(reviewId, submissionID)), }) -export default connect(mapStateToProps, mapDispatchToProps)(DeterminationContainer) \ No newline at end of file +export default connect(mapStateToProps, mapDispatchToProps)(DeterminationContainer) diff --git a/hypha/static_src/src/app/src/containers/Determination.scss b/hypha/static_src/src/app/src/containers/Determination.scss index db2262ccacdd2062291af5053cfb919d72e51f42..c1f75cc38c6a7b2e69526487eb49c3803ac9704f 100644 --- a/hypha/static_src/src/app/src/containers/Determination.scss +++ b/hypha/static_src/src/app/src/containers/Determination.scss @@ -1,3 +1,3 @@ .determination-container{ padding-right: 15px -} \ No newline at end of file +} diff --git a/hypha/static_src/src/app/src/containers/DeterminationForm/actions.js b/hypha/static_src/src/app/src/containers/DeterminationForm/actions.js index db7e40648272b4346385e29e00de9b087569656d..507001f8fbb5bc0c47a18866273c04de57163672 100644 --- a/hypha/static_src/src/app/src/containers/DeterminationForm/actions.js +++ b/hypha/static_src/src/app/src/containers/DeterminationForm/actions.js @@ -51,4 +51,4 @@ export const clearInitialValues = () => ({ export const toggleSaveDraftAction = (status) => ({ type: ActionTypes.TOGGLE_SAVE_DRAFT, status -}) \ No newline at end of file +}) diff --git a/hypha/static_src/src/app/src/containers/DeterminationForm/index.js b/hypha/static_src/src/app/src/containers/DeterminationForm/index.js index 6149fb89e1019a8a23bda92b66e6c934e62362b7..b9aff91aa4bb1a8fc59bd8be6bad7360c861880e 100644 --- a/hypha/static_src/src/app/src/containers/DeterminationForm/index.js +++ b/hypha/static_src/src/app/src/containers/DeterminationForm/index.js @@ -1,5 +1,4 @@ import React from 'react'; -// import {createStore} from 'redux'; import injectReducer from '@utils/injectReducer' import injectSaga from '@utils/injectSaga' import { withRouter } from 'react-router-dom'; @@ -9,7 +8,6 @@ import PropTypes from 'prop-types'; import * as Actions from './actions'; import reducer from './reducer'; import saga from './sagas'; -// import App from "./app" import { getCurrentDetermination } from '@selectors/submissions' import * as Selectors from './selectors'; import "./styles.scss"; @@ -57,11 +55,6 @@ class DeterminationFormContainer extends React.PureComponent { type: "primary", callback: values => this.props.updateDetermination(values,this.props.submissionID, this.props.determinationId) }) - // metaFieldsActions.push({ - // text: "Delete", - // type: "warning", - // callback: () => this.props.deleteDetermination(this.props.determinationId, this.props.submissionID) - // }) } else{ metaFieldsActions.push({ diff --git a/hypha/static_src/src/app/src/containers/DeterminationForm/reducer.js b/hypha/static_src/src/app/src/containers/DeterminationForm/reducer.js index 3d3e6ca7389d4c9ed58e65fae370ef6c101c6b8f..56dfa70fa5499e9be49b3f780f74184061af0814 100644 --- a/hypha/static_src/src/app/src/containers/DeterminationForm/reducer.js +++ b/hypha/static_src/src/app/src/containers/DeterminationForm/reducer.js @@ -21,4 +21,4 @@ const determinationFormReducer = (state = initialState, action) => { } }; -export default determinationFormReducer; \ No newline at end of file +export default determinationFormReducer; diff --git a/hypha/static_src/src/app/src/containers/DeterminationForm/styles.scss b/hypha/static_src/src/app/src/containers/DeterminationForm/styles.scss index 9a4ca0eee1f8d3f206dfcc31b44dde05a43dac81..92c6d81510c209707eb70b06dfcef3e5eed48f10 100644 --- a/hypha/static_src/src/app/src/containers/DeterminationForm/styles.scss +++ b/hypha/static_src/src/app/src/containers/DeterminationForm/styles.scss @@ -3,4 +3,4 @@ background-color: white; margin: 30px ; padding: 20px; width: 80% -} \ No newline at end of file +} diff --git a/hypha/static_src/src/app/src/redux/store.js b/hypha/static_src/src/app/src/redux/store.js index 5b39223633aca1e62a31e6249445c8efa8b54d23..4a454c2292f6532120eaa2635b1bd94934a6b200 100644 --- a/hypha/static_src/src/app/src/redux/store.js +++ b/hypha/static_src/src/app/src/redux/store.js @@ -1,7 +1,6 @@ import { createStore, applyMiddleware } from 'redux' import ReduxThunk from 'redux-thunk' import { composeWithDevTools } from 'redux-devtools-extension/developmentOnly' -// import logger from 'redux-logger' import { routerMiddleware } from 'connected-react-router'; import { createBrowserHistory } from 'history'; import createSagaMiddleware from 'redux-saga'; @@ -18,10 +17,6 @@ const MIDDLEWARE = [ sagaMiddleware ]; -// if (process.env.NODE_ENV === 'development') { -// MIDDLEWARE.push(logger); -// } - export default initialState => { const store = createStore(