diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 88a625d8b35..e246e7cf7a3 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -51,6 +51,7 @@ def review_package
render "correspondence/review_package"
end
+ # rubocop:disable Metrics/MethodLength
def intake_update
tasks = Task.where("appeal_id = ? and appeal_type = ?", correspondence.id, "Correspondence")
begin
@@ -63,16 +64,18 @@ def intake_update
task.status = "cancelled"
task.save
end
- if correspondence_intake_processor.upload_documents_to_claim_evidence(correspondence, current_user)
+ if upload_documents_to_claim_evidence
render json: { correspondence: correspondence }
else
- render json: {}, status: bad_request
+ render json: {}, status: :bad_request
end
rescue StandardError => error
Rails.logger.error(error.to_s)
- render json: {}, status: bad_request
+ Raven.capture_exception(error)
+ render json: {}, status: :bad_request
end
end
+ # rubocop:enable Metrics/MethodLength
def veteran
render json: { veteran_id: veteran_by_correspondence&.id, file_number: veteran_by_correspondence&.file_number }
diff --git a/app/views/correspondence/intake.html.erb b/app/views/correspondence/intake.html.erb
index f508218d4c0..c43156efc74 100644
--- a/app/views/correspondence/intake.html.erb
+++ b/app/views/correspondence/intake.html.erb
@@ -4,6 +4,9 @@
userId: current_user.id,
userRole: (current_user.vacols_roles.first || "").capitalize,
userCssId: current_user.css_id,
+ dropdownUrls: dropdown_urls,
+ applicationUrls: application_urls,
+ feedbackUrl: feedback_url,
organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
featureToggles: {
correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
index 9305eb95067..caea2256677 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
@@ -8,23 +8,21 @@ import CorrespondenceDetailsTable from './CorrespondenceDetailsTable';
import ConfirmTasksNotRelatedToAnAppeal from './ConfirmTasksNotRelatedToAnAppeal';
import Table from '../../../../../components/Table';
import ConfirmTasksRelatedToAnAppeal from './ConfirmTasksRelatedToAnAppeal';
+import { COLORS } from '../../../../../constants/AppConstants';
const bodyStyling = css({
'& > tr > td': {
- backgroundColor: '#f5f5f5',
+ backgroundColor: COLORS.GREY_BACKGROUND,
borderBottom: 'none',
- borderColor: '#d6d7d9',
+ borderColor: COLORS.GREY_LIGHT,
paddingTop: '0vh',
paddingBottom: '0vh',
},
});
const tableStyling = css({
- marginBottom: '-2vh',
- marginTop: '2vh'
-});
-const bottonStyling = css({
- paddingRight: '0px'
+ marginBottom: '-1vh',
+ marginTop: '1vh'
});
export const ConfirmCorrespondenceView = (props) => {
@@ -124,59 +122,45 @@ export const ConfirmCorrespondenceView = (props) => {
};
return (
-
-
Review and Confirm Correspondence
+
+
Review and Confirm Correspondence
Review the details below to make sure the information is correct before submitting.
If you need to make changes, please go back to the associated section.
-
-
-
-
+
-
-
- Associated Prior Mail
-
-
-
props.goToStep(1)}>
-
+
+
Associated Prior Mail
+
+
props.goToStep(1)}>
+
+ Edit Section
-
-
-
-
+
-
-
Completed Mail Tasks
-
-
props.goToStep(2)}>
-
- Edit Section
+
+
+
+
Completed Mail Tasks
+
+
props.goToStep(2)}>
+
+ Edit Section
-
-
+
-
-
Tasks not related to an Appeal
-
-
props.goToStep(2)}>
-
- Edit Section
+
+
Tasks not related to an Appeal
+
+
props.goToStep(2)}>
+
+ Edit Section
-
-
Linked Appeals & New Tasks
-
-
props.goToStep(2)}>
-
- Edit Section
+
+
Linked Appeals & New Tasks
+
+
props.goToStep(2)}>
+
+ Edit Section
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx
index a869e57c8ac..b8d42525828 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx
@@ -1,7 +1,8 @@
import React from 'react';
import { useSelector } from 'react-redux';
+import { COLORS } from '../../../../../constants/AppConstants';
-const styling = { backgroundColor: '#f5f5f5' };
+const styling = { backgroundColor: COLORS.GREY_BACKGROUND };
const ConfirmTasksNotRelatedToAnAppeal = () => {
const tasks = useSelector((state) => state.intakeCorrespondence.unrelatedTasks);
@@ -10,10 +11,10 @@ const ConfirmTasksNotRelatedToAnAppeal = () => {
return (
+ style={{ backgroundColor: COLORS.GREY_BACKGROUND, borderTop: '1px solid #dee2e6', width: '20%' }}>
{task.label}
-
+
{task.content}
@@ -25,7 +26,7 @@ const ConfirmTasksNotRelatedToAnAppeal = () => {
+ style={{ background: COLORS.GREY_BACKGROUND, padding: '2rem', paddingTop: '0.5rem' }}>
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
index 310ec9467e2..4e65d28a620 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
@@ -9,8 +9,8 @@ export const CorrespondenceDetailsTable = () => {
return (
-
About the Correspondence
-
+ About the Correspondence
+
Portal Entry Date
diff --git a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
index 9741bf946b9..ec30502a4f9 100644
--- a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
+++ b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
@@ -7,7 +7,7 @@ import { AddTasksAppealsView } from './TasksAppeals/AddTasksAppealsView';
import { connect, useSelector } from 'react-redux';
import { bindActionCreators } from 'redux';
import { setUnrelatedTasks } from '../../correspondenceReducer/correspondenceActions';
-import { useHistory, useLocation } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
import { ConfirmCorrespondenceView } from './ConfirmCorrespondence/ConfirmCorrespondenceView';
import { SubmitCorrespondenceModal } from './ConfirmCorrespondence/SubmitCorrespondenceModal';
import Alert from 'app/components/Alert';
@@ -39,10 +39,7 @@ export const CorrespondenceIntake = (props) => {
const [addTasksVisible, setAddTasksVisible] = useState(false);
const [submitCorrespondenceModalVisible, setSubmitCorrespondenceModalVisible] = useState(false);
const [errorBannerVisible, setErrorBannerVisible] = useState(false);
- const { pathname, hash, key } = useLocation();
const history = useHistory();
- // For hash routing - Add element id and which step it lives on here
- const SECTION_MAP = { 'task-not-related-to-an-appeal': 2 };
const handleContinueStatusChange = (isEnabled) => {
setContinueEnabled(isEnabled);
@@ -96,23 +93,6 @@ export const CorrespondenceIntake = (props) => {
);
}, [currentStep]);
- useEffect(() => {
- if (hash === '') {
- window.scrollTo(0, 0);
- } else {
- setTimeout(() => {
- const id = hash.replace('#', '');
-
- setCurrentStep(SECTION_MAP[id]);
- const element = document.getElementById(id);
-
- if (element) {
- element.scrollIntoView();
- }
- }, 0);
- }
- }, [pathname, hash, key]);
-
return
{ errorBannerVisible &&
diff --git a/client/app/styles/_table.scss b/client/app/styles/_table.scss
index 342e26f451f..5c6b9c1b6dc 100644
--- a/client/app/styles/_table.scss
+++ b/client/app/styles/_table.scss
@@ -179,26 +179,3 @@
}
}
}
-
-// ===========================*
-// Alternate Borderless (no bottom border)
-// ===========================*
-.usa-table-alternate-borderless {
- background-color: $color-gray-lightest;
-
- width: 100%;
-
- th,
- td {
- border: 0;
- background-color: $color-gray-lightest;
- padding-top: 2rem;
- padding-bottom: 0;
- }
-
- td {
- margin: 2px;
- padding-top: 0;
- padding-bottom: 25px;
- }
-}
diff --git a/client/app/styles/queue/_correspondence.scss b/client/app/styles/queue/_correspondence.scss
index 28b769aa5bb..736497bc011 100644
--- a/client/app/styles/queue/_correspondence.scss
+++ b/client/app/styles/queue/_correspondence.scss
@@ -95,6 +95,72 @@
}
}
+//Intake Form Styling
+.corr {
+ color: $color-black;
+ padding: 3rem 4rem;
+
+ p {
+ color: $color-black;
+ }
+
+ h1 {
+ text-align: left;
+ margin-bottom: 20px;
+ }
+
+ h2 {
+ margin-top: 30px;
+ margin-bottom: 20px;
+ }
+
+ button {
+ display: inline-block;
+ margin-top: 30px;
+ margin-right: 10px;
+ padding-right: 0;
+ }
+
+ .corr-icon {
+ position: absolute;
+}
+
+ .corr-sectionlink {
+ margin-left: 20px;
+ margin-right: 10px;
+}
+
+ .corr-flex {
+ display: flex;
+ }
+
+ .corr-autoleft {
+ margin-left: auto;
+}
+
+// Alternate Borderless (no bottom border)
+ .corr-table-borderless {
+ background-color: $caseflow-background;
+
+ width: 100%;
+ margin-bottom: 0;
+ margin-top: 0;
+
+ th,
+ td {
+ border: 0;
+ background-color: $caseflow-background;
+ padding-top: 2rem;
+ padding-bottom: 0;
+ }
+
+ td {
+ margin: 2px;
+ padding-top: 0;
+ padding-bottom: 25px;
+ }
+ }
+}
.correspondence-doctype-edit-dropdown .cf-select .cf-select__control {
max-width: 43rem;
}
diff --git a/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json b/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
index 8828134b71c..377d3de90fd 100644
--- a/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
+++ b/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
@@ -11,49 +11,49 @@
"klass": "CongressionalInterestMailTask",
"assigned_to": "LitigationSupport"
},
- "label": "Congressional interest"
+ "label": "Congressional Interest"
}, {
"value": {
"klass": "DeathCertificateMailTask",
"assigned_to": "Colocated"
},
- "label": "Death certificate"
+ "label": "Death Certificate"
}, {
"value": {
"klass": "FoiaRequestMailTask",
"assigned_to": "PrivacyTeam"
},
- "label": "FOIA request"
+ "label": "FOIA Request"
}, {
"value": {
"klass": "OtherMotionMailTask",
"assigned_to": "LitigationSupport"
},
- "label": "Other motion"
+ "label": "Other Motion"
}, {
"value": {
"klass": "PowerOfAttorneyRelatedMailTask",
"assigned_to": "HearingAdmin"
},
- "label": "Power of attorney-related"
+ "label": "Power Of Attorney-Related"
}, {
"value": {
"klass": "PrivacyActRequestMailTask",
"assigned_to": "PrivacyTeam"
},
- "label": "Privacy act request"
+ "label": "Privacy Act Request"
}, {
"value": {
"klass": "PrivacyComplaintMailTask",
"assigned_to": "PrivacyTeam"
},
- "label": "Privacy complaint"
+ "label": "Privacy Complaint"
}, {
"value": {
"klass": "StatusInquiryMailTask",
"assigned_to": "LitigationSupport"
},
- "label": "Status inquiry"
+ "label": "Status Inquiry"
}
],
"relatedToAppeal": [
@@ -68,19 +68,19 @@
"klass": "ClearAndUnmistakeableErrorMailTask",
"assigned_to": "LitigationSupport"
},
- "label": "CUE-related"
+ "label": "CUE-Related"
}, {
"value": {
"klass": "AddressChangeMailTask",
"assigned_to": "HearingAdmin"
},
- "label": "Change of address"
+ "label": "Change Of Address"
}, {
"value": {
"klass": "CongressionalInterestMailTask",
"assigned_to": "LitigationSupport"
},
- "label": "Congressional interest"
+ "label": "Congressional Interest"
}, {
"value": {
"klass": "ControlledCorrespondenceMailTask",
@@ -92,31 +92,31 @@
"klass": "DeathCertificateMailTask",
"assigned_to": "Colocated"
},
- "label": "Death certificate"
+ "label": "Death Certificate"
}, {
"value": {
"klass": "DocketSwitchMailTask",
"assigned_to": "ClerkOfTheBoard"
},
- "label": "Docket switch"
+ "label": "Docket Switch"
}, {
"value": {
"klass": "EvidenceOrArgumentMailTask",
"assigned_to": "Colocated"
},
- "label": "Evidence or argument"
+ "label": "Evidence Or Argument"
}, {
"value": {
"klass": "ExtensionRequestMailTask",
"assigned_to": "Colocated"
},
- "label": "Extension request"
+ "label": "Extension Request"
}, {
"value": {
"klass": "FoiaRequestMailTask",
"assigned_to": "PrivacyTeam"
},
- "label": "FOIA request"
+ "label": "FOIA Request"
}, {
"value": {
"klass": "HearingPostponementRequestMailTask",
@@ -128,7 +128,7 @@
"klass": "HearingRelatedMailTask",
"assigned_to": "HearingAdmin"
},
- "label": "Hearing-related"
+ "label": "Hearing-Related"
}, {
"value": {
"klass": "HearingWithdrawalRequestMailTask",
@@ -140,55 +140,55 @@
"klass": "ReconsiderationMotionMailTask",
"assigned_to": "LitigationSupport"
},
- "label": "Motion for reconsideration"
+ "label": "Motion For Reconsideration"
}, {
"value": {
"klass": "AodMotionMailTask",
"assigned_to": "AodTeam"
},
- "label": "Motion to Advance on Docket"
+ "label": "Motion To Advance On Docket"
}, {
"value": {
"klass": "OtherMotionMailTask",
"assigned_to": "LitigationSupport"
},
- "label": "Other motion"
+ "label": "Other Motion"
}, {
"value": {
"klass": "PowerOfAttorneyRelatedMailTask",
"assigned_to": "HearingAdmin"
},
- "label": "Power of attorney-related"
+ "label": "Power Of Attorney-Related"
}, {
"value": {
"klass": "PrivacyActRequestMailTask",
"assigned_to": "PrivacyTeam"
},
- "label": "Privacy act request"
+ "label": "Privacy Act Request"
}, {
"value": {
"klass": "PrivacyComplaintMailTask",
"assigned_to": "PrivacyTeam"
},
- "label": "Privacy complaint"
+ "label": "Privacy Complaint"
}, {
"value": {
"klass": "ReturnedUndeliverableCorrespondenceMailTask",
"assigned_to": "BvaDispatch"
},
- "label": "Returned or undeliverable mail"
+ "label": "Returned Or Undeliverable Mail"
}, {
"value": {
"klass": "StatusInquiryMailTask",
"assigned_to": "LitigationSupport"
},
- "label": "Status inquiry"
+ "label": "Status Inquiry"
}, {
"value": {
"klass": "AppealWithdrawalMailTask",
"assigned_to": "CaseReview"
},
- "label": "Withdrawal of appeal"
+ "label": "Withdrawal Of Appeal"
}
]
}