From 2697aadb39521fea659942273c5ce4cfe2513fad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A8=D0=B0=D0=BB=D0=B8?=
=?UTF-8?q?=D0=BC=D0=BE=D0=B2?= <solidovic@gmail.com>
Date: Sun, 7 Sep 2014 19:25:09 +0400
Subject: [PATCH] =?UTF-8?q?fix=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7?=
=?UTF-8?q?=D0=BA=D0=B0=20=D1=81=D1=82=D1=83=D0=B4=D0=B5=D0=BD=D1=82=D0=BE?=
=?UTF-8?q?=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
~dev_rating/application/classes/FileParser.php | 14 +++++++++-----
.../account/classes/Model/Kohana/Account.php | 7 +++++++
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/~dev_rating/application/classes/FileParser.php b/~dev_rating/application/classes/FileParser.php
index af1a2ea33..26b7122ab 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 60a6b8a9c..a7a991152 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)
--
GitLab