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

Move ReceiptDate Filter Error Messages #19474

Merged
merged 4 commits into from
Sep 15, 2023
Merged

Move ReceiptDate Filter Error Messages #19474

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e280a40
Move ReceiptDate Filter Error Messages
tradesmanhelix Sep 14, 2023
187d652
Merge branch 'feature/APPEALS-15566' into asmith/APPEALS-29958
tradesmanhelix Sep 15, 2023
27bcaa5
Refactor ReceiptDate Error Messages
tradesmanhelix Sep 15, 2023
582339d
Merge branch 'feature/APPEALS-15566' into asmith/APPEALS-29958
HunJerBAH Sep 15, 2023
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
112 changes: 67 additions & 45 deletions client/app/reader/DocumentsTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ class DocumentsTable extends React.Component {
this.setState({ fromDateErrors: foundErrors });

return foundErrors;

};

setDateFrom = (pickedDate) => {
Expand Down Expand Up @@ -175,6 +174,20 @@ class DocumentsTable extends React.Component {
this.setState({ onDate: pickedDate });
}

errorMessagesNode = (errors, errType) => {
if (errors.length) {
return (
<div>
{
errors.map((error, index) =>
<p id={`${errType}Err${index}`} key={index} style={{ color: 'red' }}>{error}</p>
)
}
</div>
);
}
}

constructor() {
super();
this.state = {
Expand Down Expand Up @@ -471,57 +484,66 @@ class DocumentsTable extends React.Component {
{isRecipetDateFilterOpen && (
<div style={{
position: 'relative',
right: '7vw' }}>
right: '7vw'
}}>
<DropdownFilter
clearFilters={this.resetRecieptPicker}
name="Receipt Date"
isClearEnabled
handleClose={this.toggleRecieptDataDropdownFilterVisibility}
addClearFiltersRow
>
<div style={{
paddingLeft: '10px',
paddingRight: '10px' }}>
<Dropdown
name="dateDropdownText"
options={dateDropdownMap}
label="Date filter parameters"
value="dateDropdownVal"
onChange={(newKey) => this.updateRecieptFilter(newKey)}
defaultText={this.state.recieptFilter === recieptDateFilterStates.UNINITIALIZED ? 'Select...' :
dateDropdownMap[this.state.recieptFilter].displayText}
defaultValue="On this date"
/>
{(this.state.recieptFilter === recieptDateFilterStates.BETWEEN || this.state.recieptFilter === recieptDateFilterStates.FROM) &&
this.state.fromDateErrors.map((error, index) =>
<p id={index} key={index} style={{ color: 'red' }}>{error}</p>)}
{(this.state.recieptFilter === recieptDateFilterStates.BETWEEN || this.state.recieptFilter === recieptDateFilterStates.FROM) &&
<DateSelector value={this.state.fromDate} type="date"
name={this.state.recieptFilter === recieptDateFilterStates.BETWEEN ? 'From' : ''}
onChange={this.setDateFrom} />}

{(this.state.recieptFilter === recieptDateFilterStates.BETWEEN || this.state.recieptFilter === recieptDateFilterStates.TO) &&
this.state.toDateErrors.map((error) =>
<p style={{ color: 'red' }}>{error}</p>)}
{(this.state.recieptFilter === recieptDateFilterStates.BETWEEN || this.state.recieptFilter === recieptDateFilterStates.TO) &&
<DateSelector value={this.state.toDate} type="date"
name={this.state.recieptFilter === recieptDateFilterStates.BETWEEN ? 'To' : ''}
onChange={this.setDateTo} />}

{this.state.recieptFilter === recieptDateFilterStates.UNINITIALIZED && <DateSelector readOnly type="date" name="Receipt date"
onChange={this.validateDateIsAfter} comment="This is a read only component used as a dummy" />}

{(this.state.recieptFilter === recieptDateFilterStates.ON) && this.state.onDateErrors.map((error) =>
<p style={{ color: 'red' }}>{error}</p>)}
{this.state.recieptFilter === recieptDateFilterStates.ON && <DateSelector value={this.state.onDate} type="date"
name="" onChange={this.setOnDate} />}

<div style={{ width: '100%', display: 'flex' }}>
<span style={{ height: '1px', position: 'absolute', width: '100%', backgroundColor: 'gray' }}></span>
<div style={{ display: 'flex', marginTop: '10px', marginRight: '10px', marginBottom: '10px', justifyContent: 'end', width: '100%' }}>
<Button disabled={this.isRecieptFilterButtonEnabled()} onClick={() => this.executeRecieptFilter()} title="apply filter">
<span>Apply filter</span>
</Button>
<div>
<div style={{ padding: '0px 30px' }}>
<Dropdown
name="dateDropdownText"
options={dateDropdownMap}
label="Date filter parameters"
value="dateDropdownVal"
onChange={(newKey) => this.updateRecieptFilter(newKey)}
defaultText={this.state.recieptFilter === recieptDateFilterStates.UNINITIALIZED ? 'Select...' :
dateDropdownMap[this.state.recieptFilter].displayText}
defaultValue="On this date"
/>
{
(this.state.recieptFilter === recieptDateFilterStates.BETWEEN || this.state.recieptFilter === recieptDateFilterStates.FROM) &&
<DateSelector
value={this.state.fromDate}
type="date"
name={this.state.recieptFilter === recieptDateFilterStates.BETWEEN ? 'From' : ''}
onChange={this.setDateFrom}
errorMessage={this.errorMessagesNode(this.state.fromDateErrors, 'fromDate')}
/>
}

{
(this.state.recieptFilter === recieptDateFilterStates.BETWEEN || this.state.recieptFilter === recieptDateFilterStates.TO) &&
<DateSelector
value={this.state.toDate}
type="date"
name={this.state.recieptFilter === recieptDateFilterStates.BETWEEN ? 'To' : ''}
onChange={this.setDateTo}
errorMessage={this.errorMessagesNode(this.state.toDateErrors, 'toDate')}
/>
}

{this.state.recieptFilter === recieptDateFilterStates.UNINITIALIZED && <DateSelector readOnly type="date" name="Receipt date"
onChange={this.validateDateIsAfter} comment="This is a read only component used as a dummy" />}

{(this.state.recieptFilter === recieptDateFilterStates.ON) && this.state.onDateErrors.map((error) =>
<p style={{ color: 'red' }}>{error}</p>)}
{this.state.recieptFilter === recieptDateFilterStates.ON && <DateSelector value={this.state.onDate} type="date"
name="" onChange={this.setOnDate} />}
</div>

<div>
<div style={{ width: '100%', display: 'flex' }}>
<span style={{ height: '1px', position: 'absolute', width: '100%', backgroundColor: 'gray' }}></span>
<div style={{ display: 'flex', margin: '10px 0px', justifyContent: 'center', width: '100%' }}>
<Button disabled={this.isRecieptFilterButtonEnabled()} onClick={() => this.executeRecieptFilter()} title="apply filter">
<span>Apply filter</span>
</Button>
</div>
</div>
</div>
</div>
Expand Down
Loading