From 13eeff108b34ebfcc3dde44da031cf061c056380 Mon Sep 17 00:00:00 2001 From: Charlotte Sacre Date: Tue, 6 Jun 2023 15:13:09 -0400 Subject: [PATCH 1/3] Participant status - mandatory comments if not active or complete --- .../candidate_parameters/jsx/ParticipantStatus.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/candidate_parameters/jsx/ParticipantStatus.js b/modules/candidate_parameters/jsx/ParticipantStatus.js index 84cd5d30b6f..890686e3ade 100644 --- a/modules/candidate_parameters/jsx/ParticipantStatus.js +++ b/modules/candidate_parameters/jsx/ParticipantStatus.js @@ -147,6 +147,16 @@ class ParticipantStatus extends Component { suboptionsRequired = true; } + let commentsRequired = false; + let statusOpts = this.state.Data.statusOptions; + if ( + statusOpts && + statusOpts[participantStatus] !== 'Active' && + statusOpts[participantStatus] !== 'Complete' + ) { + commentsRequired = true; + } + let formattedHistory = []; for (let statusKey in this.state.Data.history) { if (this.state.Data.history.hasOwnProperty(statusKey)) { @@ -246,7 +256,7 @@ class ParticipantStatus extends Component { onUserInput={this.setFormData} ref="reasonSpecify" disabled={disabled} - required={false} + required={commentsRequired} /> {updateButton} {formattedHistory} From 3cf793c4f9cba4e92edb347b1fa7d0ca18d8e127 Mon Sep 17 00:00:00 2001 From: Charlotte Sacre Date: Tue, 6 Jun 2023 15:26:49 -0400 Subject: [PATCH 2/3] Change tabs to spaces --- modules/candidate_parameters/jsx/ParticipantStatus.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/candidate_parameters/jsx/ParticipantStatus.js b/modules/candidate_parameters/jsx/ParticipantStatus.js index 890686e3ade..a7fc83f201f 100644 --- a/modules/candidate_parameters/jsx/ParticipantStatus.js +++ b/modules/candidate_parameters/jsx/ParticipantStatus.js @@ -148,8 +148,8 @@ class ParticipantStatus extends Component { } let commentsRequired = false; - let statusOpts = this.state.Data.statusOptions; - if ( + let statusOpts = this.state.Data.statusOptions; + if ( statusOpts && statusOpts[participantStatus] !== 'Active' && statusOpts[participantStatus] !== 'Complete' From c18257d1150537f020763e84d23a7d0582e55a73 Mon Sep 17 00:00:00 2001 From: charlottesce <75381352+charlottesce@users.noreply.github.com> Date: Tue, 6 Jun 2023 16:00:53 -0400 Subject: [PATCH 3/3] Update ParticipantStatus.js --- modules/candidate_parameters/jsx/ParticipantStatus.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/candidate_parameters/jsx/ParticipantStatus.js b/modules/candidate_parameters/jsx/ParticipantStatus.js index a7fc83f201f..97fa3db749a 100644 --- a/modules/candidate_parameters/jsx/ParticipantStatus.js +++ b/modules/candidate_parameters/jsx/ParticipantStatus.js @@ -147,7 +147,7 @@ class ParticipantStatus extends Component { suboptionsRequired = true; } - let commentsRequired = false; + let commentsRequired = false; let statusOpts = this.state.Data.statusOptions; if ( statusOpts &&