Skip to content
Snippets Groups Projects
Commit 3d812484 authored by Vladislav Yakovlev's avatar Vladislav Yakovlev
Browse files

FIX: update subjects.ExternalID

parent 7cf475ca
Branches
No related merge requests found
......@@ -248,7 +248,10 @@ BEGIN
# create/get subject (subject name is unique key)
INSERT INTO subjects (Name, Abbr, ExternalID) VALUES (pSubjectName, pSubjectAbbr, pExternalID)
ON DUPLICATE KEY UPDATE
subjects.ID = LAST_INSERT_ID(subjects.ID);
subjects.ID = LAST_INSERT_ID(subjects.ID),
subjects.Name = pSubjectName,
subjects.Abbr = COALESCE(pSubjectAbbr, subjects.Abbr),
subjects.ExternalID = COALESCE(pExternalID, subjects.ExternalID);
SET vSubjectID = LAST_INSERT_ID();
BEGIN # handler block
......
......@@ -3,7 +3,7 @@
class Controller_Api_V0_StudyPlan extends Controller_Handler_Api {
private function normalizeDisciplinesData($disciplineData, $facultyID) {
if (!isset($disciplineData->subjectID) && isset($disciplineData->externalID)) {
$disciplineData->subjectID = Model_Subject::withExternalID($disciplineData->externalID, $disciplineData->name, '', $facultyID);
$disciplineData->subjectID = Model_Subject::withExternalID($disciplineData->externalID, $disciplineData->name, NULL, $facultyID);
}
foreach ($disciplineData->teachers as $teacherData) {
......
......@@ -48,7 +48,7 @@ class Model_Subject
return (int) $res->get('Num');
}
public static function withExternalID($extID, $name='', $abbr='', $facultyID=null) {
public static function withExternalID($extID, $name, $abbr, $facultyID) {
$sql = 'SELECT `Subject_GetByExternalID`(:extID) AS `ID`';
$id = DB::query(Database::SELECT, $sql)
->param(':extID', $extID)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment