Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

[Core: Candidate] Fix getFirstVisit method #4075

Merged
merged 17 commits into from
Jan 28, 2019
Merged

[Core: Candidate] Fix getFirstVisit method #4075

Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4bd8d19
done
davidblader Nov 7, 2018
c6c52fc
trabus
davidblader Nov 7, 2018
d4abdf4
different approach
davidblader Nov 7, 2018
224bbb1
change query
davidblader Nov 7, 2018
3daac81
ugly query in progress
davidblader Nov 12, 2018
d31db98
less ugly query
davidblader Nov 19, 2018
2f99c3e
remove redundnant join
davidblader Nov 19, 2018
109a97e
feedback
davidblader Dec 14, 2018
6640db5
update return type tag
davidblader Dec 17, 2018
f60ba7c
use array shift
davidblader Jan 7, 2019
65ea200
travis
davidblader Jan 14, 2019
c6451a8
return string only
davidblader Jan 17, 2019
bf286eb
Update php/libraries/Candidate.class.inc
johnsaigle Jan 23, 2019
01e207b
fix project return type
davidblader Jan 25, 2019
44caf6c
Merge branch 'fix_candidate_getFirstVisit' of https://github.com/davi…
davidblader Jan 25, 2019
bf0bdf1
use visitno column
davidblader Jan 28, 2019
c40d6f2
remove echo
davidblader Jan 28, 2019
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
14 changes: 6 additions & 8 deletions php/libraries/Candidate.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ class Candidate
function getProjectTitle()
{
$ProjectList = Utility::getProjectList();
return $ProjectList[$this->getProjectID()];
return $ProjectList[$this->getProjectID()] ?? '';
}

/**
Expand Down Expand Up @@ -621,15 +621,13 @@ class Candidate
$db = $factory->database();

$candID = $this->getCandID();

$query = "SELECT Visit_label
FROM session s JOIN candidate c ON (c.CandID = s.CandID)
WHERE c.CandID=:cid AND Date_Visit IS NOT NULL
ORDER BY Date_Visit";
$query = "SELECT Visit_label FROM session
WHERE CandID = :cid AND Date_visit IS NOT NULL
ORDER BY Date_visit, ID ASC LIMIT 1";
$where = array('cid' => $candID);
$vLabel = $db->pselectOne($query, $where);
$result = $db->pselectCol($query, $where);

return $vLabel;
return (is_array($result) && count($result) > 0) ? array_shift($result) : '';
}

/**
Expand Down