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

Fixed issue #18630: Survey list showing wrong icon for surveys. #2960

Merged
merged 3 commits into from Mar 22, 2023
Merged

Fixed issue #18630: Survey list showing wrong icon for surveys. #2960

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
959b41e
Fixed issue #18630: Survey list showing wrong icon for surveys.
lapiudevgit Mar 2, 2023
21a4700
Fixed issue #18630: Survey list showing wrong icon for surveys.
gabrieljenik Mar 2, 2023
73f7142
Fixed issue #18630: Survey list showing wrong icon for surveys.
gabrieljenik Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions application/models/Survey.php
View file
Open in desktop
Expand Up @@ -1155,31 +1155,31 @@ public function getRunning()
// Time adjust
$sNow = date("Y-m-d H:i:s", strtotime(Yii::app()->getConfig('timeadjust'), strtotime(date("Y-m-d H:i:s"))));
$sStop = ($this->expires != '') ? date("Y-m-d H:i:s", strtotime(Yii::app()->getConfig('timeadjust'), strtotime($this->expires))) : null;
$sStart = ($this->startdate != '') ? date("Y-m-d H:i:s", strtotime(Yii::app()->getConfig('timeadjust'), strtotime($this->startdate))) : $sNow;
$sStart = ($this->startdate != '') ? date("Y-m-d H:i:s", strtotime(Yii::app()->getConfig('timeadjust'), strtotime($this->startdate))) : null;

// Time comparaison
$oNow = new DateTime($sNow);
$oStop = new DateTime($sStop);
$oStart = new DateTime($sStart);

$bExpired = ($oStop < $oNow);
$bWillRun = ($oStart > $oNow);
$bExpired = (!is_null($sStop) && $oStop < $oNow);
Shnoulle marked this conversation as resolved.
Show resolved Hide resolved
$bWillRun = (!is_null($sStart) && $oStart > $oNow);

$sStop = $sStop != null ? convertToGlobalSettingFormat($sStop) : null;
$sStart = convertToGlobalSettingFormat($sStart);

// Icon generaton (for CGridView)
$sIconRunNoEx = '<a href="' . App()->createUrl('/surveyAdministration/view/surveyid/' . $this->sid) . '" class="survey-state" data-toggle="tooltip" title="' . gT('End: Never') . '"><span class="fa fa-play text-success"></span><span class="sr-only">SS' . gT('End: Never') . '</span></a>';
$sIconRunning = '<a href="' . App()->createUrl('/surveyAdministration/view/surveyid/' . $this->sid) . '" class="survey-state" data-toggle="tooltip" title="' . sprintf(gT('End: %s'), $sStop) . '"><span class="fa fa-play text-success"></span><span class="sr-only">' . sprintf(gT('End: %s'), $sStop) . '</span></a>';
$sIconRunNoEx = '<a href="' . App()->createUrl('/surveyAdministration/view/surveyid/' . $this->sid) . '" class="survey-state" data-toggle="tooltip" title="' . gT('End: Never') . '"><span class="fa fa-play text-success"></span><span class="sr-only">SS' . gT('End: Never') . '</span></a>';
$sIconRunning = '<a href="' . App()->createUrl('/surveyAdministration/view/surveyid/' . $this->sid) . '" class="survey-state" data-toggle="tooltip" title="' . sprintf(gT('End: %s'), $sStop) . '"><span class="fa fa-play text-success"></span><span class="sr-only">' . sprintf(gT('End: %s'), $sStop) . '</span></a>';
$sIconExpired = '<a href="' . App()->createUrl('/surveyAdministration/view/surveyid/' . $this->sid) . '" class="survey-state" data-toggle="tooltip" title="' . sprintf(gT('Expired: %s'), $sStop) . '"><span class="fa fa fa-step-forward text-warning"></span><span class="sr-only">' . sprintf(gT('Expired: %s'), $sStop) . '</span></a>';
$sIconFuture = '<a href="' . App()->createUrl('/surveyAdministration/view/surveyid/' . $this->sid) . '" class="survey-state" data-toggle="tooltip" title="' . sprintf(gT('Start: %s'), $sStart) . '"><span class="fa fa-clock-o text-warning"></span><span class="sr-only">' . sprintf(gT('Start: %s'), $sStart) . '</span></a>';
$sIconFuture = '<a href="' . App()->createUrl('/surveyAdministration/view/surveyid/' . $this->sid) . '" class="survey-state" data-toggle="tooltip" title="' . sprintf(gT('Start: %s'), $sStart) . '"><span class="fa fa-clock-o text-warning"></span><span class="sr-only">' . sprintf(gT('Start: %s'), $sStart) . '</span></a>';

// Icon parsing
if ($bExpired || $bWillRun) {
// Expire prior to will start
$running = ($bExpired) ? $sIconExpired : $sIconFuture;
} else {
if ($sStop == null) {
if (is_null($sStop)) {
$running = $sIconRunNoEx;
} else {
$running = $sIconRunning;
Expand Down
347 changes: 346 additions & 1 deletion tests/unit/models/SurveyTest.php
View file
Open in desktop
Expand Up @@ -2,8 +2,353 @@

namespace ls\tests;


class SurveyTest extends BaseModelTestCase
{
protected $modelClassName = \Survey::class;
private static $intervals;

public static function setUpBeforeClass(): void
{
parent::setupBeforeClass();

\Yii::import('application.helpers.surveytranslator_helper', true);

\Yii::app()->session['dateformat'] = 6;

//Set time intervals.
self::$intervals = array(
'oneDay' => \DateInterval::createFromDateString('1 days'),
'twoDays' => \DateInterval::createFromDateString('2 days'),
'threeDays' => \DateInterval::createFromDateString('3 days'),
'fourDays' => \DateInterval::createFromDateString('4 days'),
'fiveDays' => \DateInterval::createFromDateString('5 days'),
'sixDays' => \DateInterval::createFromDateString('6 days'),
'sevenDays' => \DateInterval::createFromDateString('7 days'),
);
}

public function setUp(): void
{
\SettingGlobal::setSetting('timeadjust', '+0 minutes');
}

/**
* Survey state: inactive.
*/
public function testInactiveSurveyState(): void
{
$survey = new \Survey();
$survey->active = 'N';

$state = $survey->getState();

$this->assertSame('inactive', $state, 'Survey active property is ' . $survey->active);
}

/**
* Survey state: expired.
*/
public function testExpiredSurveyState(): void
{
$survey = new \Survey();
$survey->active = 'Y';

$twoDaysAgo = date_create()->sub(self::$intervals['twoDays'])->format('Y-m-d H:i:s');
$survey->expires = $twoDaysAgo;

$state = $survey->getState();

$this->assertSame('expired', $state, 'Survey expires property is ' . $survey->expires);

//Test with time adjust.
\SettingGlobal::setSetting('timeadjust', '+420 minutes');

$state = $survey->getState();

$this->assertSame('expired', $state, 'Survey expires property is ' . $survey->expires . ' (time adjust test)');
}

/**
* Survey state: willRun.
*/
public function testWillRunSurveyState(): void
{
$survey = new \Survey();
$survey->active = 'Y';

$inFourDays = date_create()->add(self::$intervals['fourDays'])->format('Y-m-d H:i:s');
$survey->startdate = $inFourDays;

$state = $survey->getState();

$this->assertSame('willRun', $state, 'Survey startdate property is ' . $survey->startdate);
}

/**
* Survey state: willExpire (the survey is active and it has an expiredate).
*/
public function testWillExpireSurveyState(): void
{
$survey = new \Survey();
$survey->active = 'Y';

$inFiveDays = date_create()->add(self::$intervals['fiveDays'])->format('Y-m-d H:i:s');
$survey->expires = $inFiveDays;

$state = $survey->getState();

$this->assertSame('willExpire', $state, 'Survey expires property is ' . $survey->expires);

// Testing for both start and expire date.
$inSevenDays = date_create()->add(self::$intervals['sevenDays'])->format('Y-m-d H:i:s');
$oneDayAgo = date_create()->sub(self::$intervals['oneDay'])->format('Y-m-d H:i:s');

$survey->startdate = $oneDayAgo;
$survey->expires = $inSevenDays;

$state = $survey->getState();

$this->assertSame('willExpire', $state, 'Survey expires property is ' . $survey->expires . '. Survey startdate property is ' . $survey->startdate);
}

/**
* Survey state: running (the survey is active but it does not have an expire date).
*/
public function testRunningSurveyState(): void
{
$survey = new \Survey();
$survey->active = 'Y';

$state = $survey->getState();

$this->assertSame('running', $state, 'Survey active property is ' . $survey->active . ', no dates set.');
}

/**
* The survey is not active.
*/
public function testInactiveSurveyIcon(): void
{
$survey = new \Survey();
$survey->active = 'N';

$icon = $survey->getRunning();

$this->assertStringContainsString(gT('Inactive'), $icon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa-stop text-warning', $icon, 'The icon link does not have the right css classes.');
}

/**
* The survey is active but it has no start or expire dates set.
*/
public function testActiveSurveyIconNoDates(): void
{
$survey = new \Survey();
$survey->active = 'Y';

$icon = $survey->getRunning();

$this->assertStringContainsString(gT('Active'), $icon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa-play text-success', $icon, 'The icon link does not have the right css classes.');
}

/**
* The survey is active, it has a start date in the past but no expire date.
*/
public function testActiveSurveyIconNoExpireDate(): void
{
$survey = new \Survey();
$survey->active = 'Y';

$threeDaysAgo = date_create()->sub(self::$intervals['threeDays'])->format('Y-m-d H:i:s');

$survey->startdate = $threeDaysAgo;

$icon = $survey->getRunning();

$this->assertStringContainsString(gT('End: Never'), $icon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa-play text-success', $icon, 'The icon link does not have the right css classes.');

//Test with time adjust.
\SettingGlobal::setSetting('timeadjust', '+420 minutes');

$newIcon = $survey->getRunning();

$this->assertStringContainsString(gT('End: Never'), $newIcon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa-play text-success', $newIcon, 'The icon link does not have the right css classes.');
}

/**
* The survey is active, it has an expire date in the future but no start date.
*/
public function testActiveSurveyIconNoStartDate(): void
{
$survey = new \Survey();
$survey->active = 'Y';

$inFourDays = date_create()->add(self::$intervals['fourDays'])->format('Y-m-d H:i:s');

$survey->expires = $inFourDays;

$sExpires = convertToGlobalSettingFormat(date("Y-m-d H:i:s", strtotime(\Yii::app()->getConfig('timeadjust'), strtotime($survey->expires))));

$icon = $survey->getRunning();

$this->assertStringContainsString(sprintf(gT('End: %s'), $sExpires), $icon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa-play text-success', $icon, 'The icon link does not have the right css classes.');

//Test with time adjust.
\SettingGlobal::setSetting('timeadjust', '+120 minutes');

$newIcon = $survey->getRunning();

$this->assertStringContainsString(sprintf(gT('End: %s'), $sExpires), $newIcon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa-play text-success', $newIcon, 'The icon link does not have the right css classes.');
}

/**
* The survey is active, it has an expire date in the future and a start date in the past.
*/
public function testActiveSurveyIconExpireDateInTheFutureStartDateInThePast(): void
{

$survey = new \Survey();
$survey->active = 'Y';

$oneDayAgo = date_create()->sub(self::$intervals['oneDay'])->format('Y-m-d H:i:s');
$inFiveDays = date_create()->add(self::$intervals['fiveDays'])->format('Y-m-d H:i:s');

$survey->startdate = $oneDayAgo;
$survey->expires = $inFiveDays;

$sExpires = convertToGlobalSettingFormat(date("Y-m-d H:i:s", strtotime(\Yii::app()->getConfig('timeadjust'), strtotime($survey->expires))));

$icon = $survey->getRunning();

$this->assertStringContainsString(sprintf(gT('End: %s'), $sExpires), $icon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa-play text-success', $icon, 'The icon link does not have the right css classes.');

//Test with time adjust.
\SettingGlobal::setSetting('timeadjust', '+180 minutes');

$newIcon = $survey->getRunning();

$this->assertStringContainsString(sprintf(gT('End: %s'), $sExpires), $newIcon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa-play text-success', $newIcon, 'The icon link does not have the right css classes.');
}

/**
* The survey has a start date in the future and no expire date.
*/
public function testSurveyIconWillStartNoExpireDate(): void
{

$survey = new \Survey();
$survey->active = 'Y';

$inSixDays = date_create()->add(self::$intervals['sixDays'])->format('Y-m-d H:i:s');

$survey->startdate = $inSixDays;

$sStart = convertToGlobalSettingFormat(date("Y-m-d H:i:s", strtotime(\Yii::app()->getConfig('timeadjust'), strtotime($survey->startdate))));
$icon = $survey->getRunning();

$this->assertStringContainsString(sprintf(gT('Start: %s'), $sStart), $icon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa-clock-o text-warning', $icon, 'The icon link does not have the right css classes.');

//Test with time adjust.
\SettingGlobal::setSetting('timeadjust', '+240 minutes');

$newIcon = $survey->getRunning();

$this->assertStringContainsString(sprintf(gT('Start: %s'), $sStart), $newIcon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa-clock-o text-warning', $newIcon, 'The icon link does not have the right css classes.');
}

/**
* The survey has a start date in the future and an expire date in the future.
*/
public function testSurveyIconWillStart(): void
{

$survey = new \Survey();
$survey->active = 'Y';

$inFourDays = date_create()->add(self::$intervals['fourDays'])->format('Y-m-d H:i:s');
$inSevenDays = date_create()->add(self::$intervals['sevenDays'])->format('Y-m-d H:i:s');

$survey->startdate = $inFourDays;
$survey->expires = $inSevenDays;

$sStart = convertToGlobalSettingFormat(date("Y-m-d H:i:s", strtotime(\Yii::app()->getConfig('timeadjust'), strtotime($survey->startdate))));
$icon = $survey->getRunning();

$this->assertStringContainsString(sprintf(gT('Start: %s'), $sStart), $icon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa-clock-o text-warning', $icon, 'The icon link does not have the right css classes.');

//Test with time adjust.
\SettingGlobal::setSetting('timeadjust', '+300 minutes');

$newIcon = $survey->getRunning();

$this->assertStringContainsString(sprintf(gT('Start: %s'), $sStart), $newIcon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa-clock-o text-warning', $newIcon, 'The icon link does not have the right css classes.');
}

/**
* The survey has an expire date in the past and no start date.
*/
public function testSurveyIconExpiredNoStartdate(): void
{

$survey = new \Survey();
$survey->active = 'Y';

$threeDaysAgo = date_create()->sub(self::$intervals['threeDays'])->format('Y-m-d H:i:s');

$survey->expires = $threeDaysAgo;

$sExpires = convertToGlobalSettingFormat(date("Y-m-d H:i:s", strtotime(\Yii::app()->getConfig('timeadjust'), strtotime($survey->expires))));
$icon = $survey->getRunning();

$this->assertStringContainsString(sprintf(gT('Expired: %s'), $sExpires), $icon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa fa-step-forward text-warning', $icon, 'The icon link does not have the right css classes.');

//Test with time adjust.
\SettingGlobal::setSetting('timeadjust', '+360 minutes');

$newIcon = $survey->getRunning();

$this->assertStringContainsString(sprintf(gT('Expired: %s'), $sExpires), $newIcon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa fa-step-forward text-warning', $newIcon, 'The icon link does not have the right css classes.');
}

/**
* The survey has an expire date in the past and a start date in the past.
*/
public function testSurveyIconExpired(): void
{
$survey = new \Survey();
$survey->active = 'Y';

$fiveDaysAgo = date_create()->sub(self::$intervals['fiveDays'])->format('Y-m-d H:i:s');
$sevenDaysAgo = date_create()->sub(self::$intervals['sevenDays'])->format('Y-m-d H:i:s');

$survey->startdate = $sevenDaysAgo;
$survey->expires = $fiveDaysAgo;

$sExpires = convertToGlobalSettingFormat(date("Y-m-d H:i:s", strtotime(\Yii::app()->getConfig('timeadjust'), strtotime($survey->expires))));
$icon = $survey->getRunning();

$this->assertStringContainsString(sprintf(gT('Expired: %s'), $sExpires), $icon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa fa-step-forward text-warning', $icon, 'The icon link does not have the right css classes.');

//Test with time adjust.
\SettingGlobal::setSetting('timeadjust', '+60 minutes');

$newIcon = $survey->getRunning();

$this->assertStringContainsString(sprintf(gT('Expired: %s'), $sExpires), $newIcon, 'The icon link does not have the right text.');
$this->assertStringContainsString('fa fa fa-step-forward text-warning', $newIcon, 'The icon link does not have the right css classes.');
}
}