Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sivakesh/appeals 60060 #23360

Open
wants to merge 9 commits into
base: feature/APPEALS-60433
Choose a base branch
from
Open

Sivakesh/appeals 60060 #23360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a3d2429
#APPEALS-61393 - add response letter updates
psivakeshva Oct 22, 2024
593d3a2
#APPEALS-61394 - correspondence and appeal task tab updates
psivakeshva Oct 23, 2024
24715df
#APPEALS-61395 - update response letter table headers
psivakeshva Oct 23, 2024
11baa65
#APPEALS-61396 - appeal external link styling
psivakeshva Oct 24, 2024
860d73d
#APPEALS-61397 - update package document type links
psivakeshva Oct 24, 2024
50b2bb0
#APPEALS-61398 - update appeal stream type
psivakeshva Oct 24, 2024
dbe0045
#APPEALS-61400, #APPEALS-61401 - update cancel styling
psivakeshva Oct 24, 2024
85aeaeb
#APPEALS-62627 - update linked appeal gray table
psivakeshva Oct 25, 2024
5eb7029
Merge branch 'feature/APPEALS-60433' into sivakesh/APPEALS-60060
psivakeshva Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions client/app/queue/correspondence/CorrespondenceAppealTasks.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
setWaiveEvidenceAlertBanner
} from '../correspondence/correspondenceDetailsReducer/correspondenceDetailsActions';
import Button from '../../components/Button';
import { renderLegacyAppealType } from 'app/queue/utils';

const CorrespondenceAppealTasks = (props) => {
const {
Expand Down Expand Up @@ -51,7 +52,7 @@ const CorrespondenceAppealTasks = (props) => {
<>
<div className="correspondence-existing-appeals">
<div className="left-section">
<h2>Linked appeal:</h2>
<h2>Linked Appeal:</h2>
<div className="case-details-header-badge">
<DocketTypeBadge name={props.task_added.appealType} />
<CaseDetailsLink
Expand Down Expand Up @@ -82,37 +83,42 @@ const CorrespondenceAppealTasks = (props) => {
<div className="correspondence-tasks-added ">
<div className="corr-tasks-added-col first-row">
<p className="task-added-header">DOCKET NUMBER</p>
<span className="case-details-badge">
<DocketTypeBadge name={props.task_added.appealType} />
<CaseDetailsLink
appeal={{ externalId: props.task_added.appealUuid }}
getLinkText={() => props.task_added.docketNumber}
task={props.task_added}
<div className="task-added-value">
<span className="case-details-badge">
<DocketTypeBadge name={props.task_added.appealType} />
<CaseDetailsLink
appeal={{ externalId: props.task_added.appealUuid }}
getLinkText={() => props.task_added.docketNumber}
task={props.task_added}

linkOpensInNewTab
/>
</span>
linkOpensInNewTab
/>
</span>
</div>

</div>
<div className="corr-tasks-added-col">
<p className="task-added-header">APPELLANT NAME</p>
<p>{veteranFullName}</p>
<p className="task-added-value">{veteranFullName}</p>
</div>
<div className="corr-tasks-added-col">
<p className="task-added-header">APPEAL STREAM TYPE</p>
<p>{props.task_added.streamType}</p>
<p className="stream-type task-added-value">{renderLegacyAppealType({
aod: props.task_added.appeal.data.attributes.aod,
type: props.task_added.streamType
})}</p>
</div>
<div className="corr-tasks-added-col">
<p className="task-added-header">NUMBER OF ISSUES</p>
<p>{props.task_added.numberOfIssues}</p>
<p className="task-added-value">{props.task_added.numberOfIssues}</p>
</div>
<div className="corr-tasks-added-col">
<p className="task-added-header">STATUS</p>
<p>{props.task_added.status}</p>
<p className="task-added-value">{props.task_added.status}</p>
</div>
<div className="corr-tasks-added-col">
<p className="task-added-header">ASSIGNED TO</p>
<p>{props.task_added.assignedTo ? props.task_added.assignedTo.name : ''}</p>
<p className="task-added-value">{props.task_added.assignedTo ? props.task_added.assignedTo.name : ''}</p>
</div>

</div>
Expand Down
9 changes: 5 additions & 4 deletions client/app/queue/correspondence/details/CorrespondenceDetails.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ const CorrespondenceDetails = (props) => {
</div>
<div className="correspondence-existing-appeals">
<div className="left-section">
<h2>Existing appeals</h2>
<h2>Existing Appeals</h2>
<div className="correspondence-details-view-documents">
<a
rel="noopener noreferrer"
Expand All @@ -470,7 +470,7 @@ const CorrespondenceDetails = (props) => {
</Button>
</div>
</div>
<div className="collapse-section-container">
<div className="collapse-section-container existing-appeals-table">
{isExpanded && (
<AppSegment filledBackground noMarginTop>
<p className="correspondence-details-p">
Expand All @@ -484,6 +484,7 @@ const CorrespondenceDetails = (props) => {
taskRelatedAppealIds={selectedAppeals}
initialAppealIds={initialSelectedAppeals}
enableTopPagination
linkOpensInNewTab
userAccess={userAccess}
checkboxOnChange={appealCheckboxOnChange}
/>
Expand Down Expand Up @@ -511,7 +512,7 @@ const CorrespondenceDetails = (props) => {

<div className="correspondence-existing-appeals">
<div className="left-section">
<h2>Tasks not related to an appeal</h2>
<h2>Task not related to an Appeal</h2>

{isAdminNotLoggedIn() ?
'' :
Expand Down Expand Up @@ -886,7 +887,7 @@ const CorrespondenceDetails = (props) => {
/>
</div>
}
<AppSegment filledBackground extraClassNames="app-segment-cd-details">
<AppSegment filledBackground extraClassNames="app-segment-cd-details correspondence-details-page">
<div className="correspondence-details-header">
<h1> {correspondence?.veteranFullName} </h1>
<div className="copy-id">
Expand Down
12 changes: 6 additions & 6 deletions client/app/queue/correspondence/details/CorrespondenceResponseLetters.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,27 +79,27 @@ const CorrespondenceResponseLetters = (props) => {
<tbody>
<tr>
<td className="response-letter-table-borderless-first-item">
<strong>Letter response expiration:</strong>
<strong>Letter Response Expiration:</strong>
<span className="response-letter-table-borderless">
{letter.days_left}
</span>
</td>
</tr>
<tr>
<th className="response-letter-table-borderless-second-item">
<strong>Date response letter sent</strong>
<strong>Date Response Letter Sent</strong>
</th>
<th className="response-letter-table-borderless-second-item">
<strong>Letter type</strong>
<strong>Letter Type</strong>
</th>
<th className="response-letter-table-borderless-second-item">
<strong>Letter title</strong>
<strong>Letter Title</strong>
</th>
<th className="response-letter-table-borderless-second-item">
<strong>Letter subcategory</strong>
<strong>Letter Subcategory</strong>
</th>
<th className="response-letter-table-borderless-second-item">
<strong>Letter subcategory reasons</strong>
<strong>Letter Subcategory Reason</strong>
</th>
</tr>
<tr>
Expand Down
8 changes: 6 additions & 2 deletions client/app/queue/correspondence/intake/components/AddCorrespondence/NewLetter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export const NewLetter = (props) => {
const [letterSubReason, setLetterSubReason] = useState('');
const customResponseVal = Boolean(displayLetter && currentLetter?.customValue > 0);
const [customResponseWindowState, setCustomResponseWindowState] = useState(customResponseVal);
const [dateError, setDateError] = useState(false);

const [stateOptions, setStateOptions] = useState(true);

Expand Down Expand Up @@ -281,7 +282,10 @@ export const NewLetter = (props) => {
};

const changeDate = (val) => {
const isFutureDate = moment(val).isAfter(moment(), 'day');
const isFutureDate = new Date(val) > new Date();
const error = isFutureDate ? 'Date cannot be in the future' : false;

setDateError(error);

if (isFutureDate) {
setLetterCard({
Expand Down Expand Up @@ -316,7 +320,7 @@ export const NewLetter = (props) => {
value={letterCard.date}
onChange={(val) => changeDate(val)}
type="date"
noFutureDates
errorMessage={dateError}
/>
</div>
<br />
Expand Down
58 changes: 54 additions & 4 deletions client/app/styles/queue/_correspondence.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ $color-bg-hsl-a: hsl(0, 0%, 80%);

.external-link-icon-a {
color: $color-blue;
font-weight: bold;
}

.external-link-icon-wrapper {
Expand Down Expand Up @@ -1322,6 +1323,18 @@ $color-bg-hsl-a: hsl(0, 0%, 80%);
margin-bottom: 30px;
}

.correspondence-response-letters {
.cf-modal-divider {
padding-bottom: 0;
}

.cf-modal-controls {
.cf-push-left {
padding-left: 0;
}
}
}

.new-letter-container {
display: inline-block;
padding: 2rem;
Expand All @@ -1344,10 +1357,7 @@ $color-bg-hsl-a: hsl(0, 0%, 80%);

.details-page-letter-container {
float: left;
height: 540px;
width: 100%;
overflow: auto;
padding: 18px;
position: relative;
}

Expand Down Expand Up @@ -1611,6 +1621,7 @@ $color-bg-hsl-a: hsl(0, 0%, 80%);

.task-added-header {
font-weight: bold;
font-size: 15px;
}

.number-of-issues-header {
Expand All @@ -1634,10 +1645,18 @@ $color-bg-hsl-a: hsl(0, 0%, 80%);
.corr-tasks-added-col {
flex-direction: column;
width: 15%;

.stream-type {
text-transform: capitalize;
}
}
.corr-tasks-added-col:not(:last-child) .task-added-value{
border-right: 2px solid #ccc;
margin-right: 3%;
}

.first-row {
padding-right: 3%;
//padding-right: 3%;
flex-wrap: nowrap;
min-width: fit-content;
}
Expand All @@ -1660,6 +1679,27 @@ $color-bg-hsl-a: hsl(0, 0%, 80%);
.case-details-header-badge {
flex-grow: unset;
margin: 12px 17px 12px 2px;

a {
display: flex;
flex-direction: row;
align-items: center;

.cf-pdf-external-link-icon {
display: flex;
align-items: center;
}
}
}

.existing-appeals-table {
a {
color: $color-blue;
.cf-pdf-external-link-icon {
display: inline-flex;
align-items: center;
}
}
}

.link-icon-container {
Expand Down Expand Up @@ -1755,6 +1795,16 @@ $color-bg-hsl-a: hsl(0, 0%, 80%);
padding-top: 0;
}

.correspondence-details-page {
.cf-modal-body {
.cf-modal-controls {
.cf-btn-link {
padding-left: 0;
}
}
}
}

.add-task-modal-container {
.task-selection-dropdown-box {
margin-bottom: 1.5rem;
Expand Down
Loading