diff --git a/~dev_rating/application/classes/FileParser.php b/~dev_rating/application/classes/FileParser.php index af1a2ea33e53796906aa470499a3917688304614..26b7122abc20251f4e008422d044667eb31193bc 100644 --- a/~dev_rating/application/classes/FileParser.php +++ b/~dev_rating/application/classes/FileParser.php @@ -17,7 +17,8 @@ class FileParser list($lastName, $firstName, $secondName) = self::parsePeopleName($line[0]); // Курс, степень подготовки $studentGradeNum = $line[1]; - switch($line[2]) + $studentGroupNum = $line[2]; + switch($line[3]) { case 'Бакалавр': $studentDegree = 'bachelor'; @@ -29,10 +30,13 @@ class FileParser $studentDegree = 'master'; break; } - $studentGroupNum = $line[3]; - $studentGradeID = $model->getGradeID($studentGradeNum, $studentDegree); - Account::instance()->createStudent($lastName, $firstName, $secondName, - $studentGradeID, $studentGroupNum, $facultyID); + $studentSpec = $line[4]; + $activationCode = Text::random('hexdec', 10); + //$studentGradeID = $model->getGradeID($studentGradeNum, $studentDegree); + //Account::instance()->createStudent($lastName, $firstName, $secondName, + // $studentGradeID, $studentGroupNum, $facultyID); + Account::instance()->createStudentEx($lastName, $firstName, $secondName, + $studentGradeNum, $studentGroupNum, $studentDegree, $studentSpec, $facultyID, $activationCode); } $i++; } diff --git a/~dev_rating/modules/account/classes/Model/Kohana/Account.php b/~dev_rating/modules/account/classes/Model/Kohana/Account.php index 60a6b8a9c5f8ad9cfcc9c4c9517e190be50fd546..a7a991152c3b953ce851b6c7eb12b8e13727e1c6 100644 --- a/~dev_rating/modules/account/classes/Model/Kohana/Account.php +++ b/~dev_rating/modules/account/classes/Model/Kohana/Account.php @@ -48,6 +48,13 @@ class Model_Kohana_Account extends Model $sql = "SELECT `CreateStudent`('$lastName', '$firstName', '$secondName', '$grade', '$groupNum', '$facultyID', '$activationCode') AS `UserID`;"; $key = DB::query(Database::SELECT, $sql)->execute(); return $key->get('UserID'); + } + + public function createStudentEx($lastName, $firstName, $secondName, $gradeNum, $groupNum, $degree, $specialization, $facultyID, $activationCode) + { + $sql = "SELECT `CreateStudentEx`('$lastName', '$firstName', '$secondName', '$grade', '$groupNum', '$degree', '$specialization', '$facultyID', '$activationCode') AS `UserID`;"; + $key = DB::query(Database::SELECT, $sql)->execute(); + return $key->get('UserID'); } public function getPersonalInfoByID($id)