Skip to content

Added ReviewPeriodStepper to be displayed with each ReviewPeriodCard #2587

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

Merged
mkimberlin merged 2 commits into from
Sep 17, 2024
Merged

Added ReviewPeriodStepper to be displayed with each ReviewPeriodCard #2587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d988692
Added the ReviewPeriodStepper to be displayed with each ReviewPeriodC…
ocielliottc Sep 10, 2024
28b0625
Merge branch 'develop' into feature-2226/display-review-period-status
mkimberlin Sep 17, 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
12 changes: 12 additions & 0 deletions server/src/main/resources/db/dev/R__Load_testing_data.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1715,3 +1715,15 @@ INSERT INTO role_documentation
(role_id, document_id, display_order)
VALUES
('d03f5f0b-e29c-4cf4-9ea4-6baa09405c56', 'b553d4c0-9b7a-4691-8fe0-e3bdda4f67ae', 3);

-- CAE - Review Periods
INSERT INTO review_periods
(id, name, review_status, review_template_id, self_review_template_id, launch_date, self_review_close_date, close_date, period_start_date, period_end_date)
VALUES
('12345678-e29c-4cf4-9ea4-6baa09405c57', 'Review Period 1', 'CLOSED', 'd1e94b60-47c4-4945-87d1-4dc88f088e57', '926a37a4-4ded-4633-8900-715b0383aecc', '2024-09-01', '2024-09-02', '2024-09-03', '2024-01-01', '2024-12-31');

INSERT INTO review_periods
(id, name, review_status, review_template_id, self_review_template_id, launch_date, self_review_close_date, close_date, period_start_date, period_end_date)
VALUES
('12345678-e29c-4cf4-9ea4-6baa09405c58', 'Review Period 2', 'PLANNING', 'd1e94b60-47c4-4945-87d1-4dc88f088e57', '926a37a4-4ded-4633-8900-715b0383aecc', '2024-09-10', '2024-09-11', '2024-09-12', '2024-01-01', '2024-12-31');

22 changes: 14 additions & 8 deletions web-ui/src/components/reviews/periods/ReviewPeriods.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import {
} from '../../../context/selectors';

import ReviewPeriodCard from './ReviewPeriodCard.jsx';
import ReviewPeriodStepper from './ReviewPeriodStepper.jsx';

const propTypes = {
message: PropTypes.string,
Expand Down Expand Up @@ -377,14 +378,19 @@ const ReviewPeriods = ({ onPeriodSelected, mode }) => {
? -1
: 1;
})
.map(({ name, reviewStatus, id }, i) => (
<ReviewPeriodCard
key={`review-period-card-${id}`}
mode={mode}
onSelect={onPeriodClick}
periodId={id}
selfReviews={selfReviews}
/>
.map((period) => (
<div>
<ReviewPeriodStepper
reviewPeriod={period}
/>
<ReviewPeriodCard
key={`review-period-card-${period.id}`}
mode={mode}
onSelect={onPeriodClick}
periodId={period.id}
selfReviews={selfReviews}
/>
</div>
))
) : (
<Typography variant="body1">
Expand Down