Skip to content

Commit 785b7b3

Browse files
committed
fix: presentation review status
false rejected status Signed-off-by: smarcet@gmail.com <smarcet@gmail.com>
1 parent cd08193 commit 785b7b3

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

app/Models/Foundation/Summit/Events/Presentations/Presentation.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2432,11 +2432,13 @@ public function getReviewStatus(): string
24322432
return self::ReviewStatusNoSubmitted;
24332433

24342434
$selection_plan = $this->selection_plan;
2435-
2435+
// submission period data
24362436
$submission_begin_date = $selection_plan->getSubmissionBeginDate();
24372437
$submission_end_date = $selection_plan->getSubmissionEndDate();
2438+
// selection period data
24382439
$selection_begin_date = $selection_plan->getSelectionBeginDate();
24392440
$selection_end_date = $selection_plan->getSelectionEndDate();
2441+
$selectionPeriodIsDefined = !is_null($selection_begin_date) & !is_null($selection_end_date);
24402442
$submission_lock_down_presentation_status_date = $selection_plan->getSubmissionLockDownPresentationStatusDate();
24412443

24422444
$now = new \DateTime('now', new \DateTimeZone('UTC'));
@@ -2483,11 +2485,11 @@ public function getReviewStatus(): string
24832485
$submission_lock_down_presentation_status_date > $now;
24842486

24852487
// if lock down period is enabled then short-circuit everything
2486-
if ($is_lock_down_period || ($submission_closed && $selection_open)) {
2488+
if ($is_lock_down_period || ($selectionPeriodIsDefined && $submission_closed && $selection_open)) {
24872489
return self::ReviewStatusInReview;
24882490
} else if ($this->isPublished()) {
24892491
return self::ReviewStatusPublished;
2490-
} else if ($selection_closed) {
2492+
} else if ($selectionPeriodIsDefined && $selection_closed) {
24912493
return $submission_accepted ? self::ReviewStatusAccepted : self::ReviewStatusRejected;
24922494
}
24932495

database/migrations/model/Version20240531145157.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ public function up(Schema $schema): void
8181
THEN 'Accepted'
8282
WHEN (P.status = 'Received' OR P.status = 'Accepted') AND
8383
(
84-
SP.SelectionBeginDate IS NULL OR SP.SelectionBeginDate > UTC_TIMESTAMP() OR SP.SelectionEndDate < UTC_TIMESTAMP() OR SP.SelectionEndDate IS NULL
84+
SP.SelectionBeginDate IS NOT NULL AND SP.SelectionEndDate IS NOT NULL AND
85+
SP.SelectionBeginDate < UTC_TIMESTAMP() AND SP.SelectionEndDate < UTC_TIMESTAMP()
8586
)
8687
AND NOT EXISTS (
8788
SELECT 1 FROM SummitSelectedPresentation SSP

0 commit comments

Comments
 (0)