Skip to content
Snippets Groups Projects
Commit de03932a authored by Andrew Rudenets's avatar Andrew Rudenets
Browse files

Merge branch 'master' of http://itlab.mmcs.sfedu.ru/git/grade-rating 

Conflicts:
	application/classes/Controller/Admin/Departaments.php
	application/classes/Controller/Teacher/Admin/Index.php
	web/application/classes/Controller/Teacher/Admin/Index.php
	web/application/classes/Model/Account.php
parents ad959dc3 88ceb036
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 172 additions and 54 deletions
application/classes/Controller/Teacher/Map.php → web/application/classes/Controller/Teacher/Map.php
+ 57
− 51
View file @ de03932a
......@@ -2,6 +2,37 @@
class Controller_Teacher_Map extends Controller_UserEnvi {
private $GradesList = array(
1 => array(
'ID' => '1',
'Title' =>'Курс 1'
),
2 => array(
'ID' => '2',
'Title' =>'Курс 2'
),
3 => array(
'ID' => '3',
'Title' =>'Курс 3'
),
4 => array(
'ID' => '4',
'Title' =>'Курс 4'
),
5 => array(
'ID' => '5',
'Title' =>'Курс 6'
),
6 => array(
'ID' => '6',
'Title' =>'Магистратура 1'
),
7=> array(
'ID' => '7',
'Title' =>'Магистратура 2'
)
);
public function action_show()
{
$twig = Twig::factory('teacher/map/show');
......@@ -11,7 +42,7 @@ class Controller_Teacher_Map extends Controller_UserEnvi {
if($map->count() == 0)
throw HTTP_Exception::factory(404, "Учебная карта дисциплины с ID $id не найдена!");
$twig->User = $this->UserInfo;
$twig->Map = $this->getMapInfo($map);
$twig->Subject = $this->getSubjectInfo($db, $id);
......@@ -20,9 +51,14 @@ class Controller_Teacher_Map extends Controller_UserEnvi {
public function action_create()
{
$twig = Twig::factory('teacher/map/add');
$twig = Twig::factory('teacher/map/create');
$db = new Model_Teacher_Map;
$twig->User = $this->UserInfo;
$twig->SubjectsList = $this->GetSubjectsList($db);
$twig->GradesList = $this->GradesList;
echo Debug::vars($this->UserInfo);
$this->response->body($twig);
}
......@@ -36,54 +72,8 @@ class Controller_Teacher_Map extends Controller_UserEnvi {
$twig->User = $this->UserInfo;
$twig->Map = $this->getMapInfo($map);
$twig->Discipline = $this->getSubjectInfo($db, $id);
$twig->SubjectsList = array(
1 => array(
'ID' => '1',
'Title' =>'Математический анализ'
),
2 => array(
'ID' => '2',
'Title' =>'Дифференциальные уравнения'
),
3 => array(
'ID' => '3',
'Title' =>'Операционные системы'
),
4 => array(
'ID' => '4',
'Title' =>'Топология'
)
);
$twig->GradesList = array(
1 => array(
'ID' => '1',
'Title' =>'Курс 1'
),
2 => array(
'ID' => '2',
'Title' =>'Курс 2'
),
3 => array(
'ID' => '3',
'Title' =>'Курс 3'
),
4 => array(
'ID' => '4',
'Title' =>'Курс 4'
),
5 => array(
'ID' => '5',
'Title' =>'Курс 6'
),
6 => array(
'ID' => '6',
'Title' =>'Магистратура 1'
),
7=> array(
'ID' => '7',
'Title' =>'Магистратура 2'
)
);
$twig->SubjectsList = $this->GetSubjectsList($db);
$twig->GradesList = $this->GradesList;
$this->response->body($twig);
}
......@@ -168,5 +158,21 @@ class Controller_Teacher_Map extends Controller_UserEnvi {
return $subject;
}
private function GetSubjectsList($db)
{
$list = $db->GetSubjectList();
$SubjectsList = array(); $i = 0;
foreach ($list as $row) {
$i++;
$SubjectsList[$i]['ID'] = $row['ID'];
$SubjectsList[$i]['Title'] = $row['Name'];
$SubjectsList[$i]['Abbr'] = $row['Abbr'];
}
return $SubjectsList;
}
}
\ No newline at end of file
web/application/classes/Model/Account.php 0 → 100644
+ 93
− 0
View file @ de03932a
<?php defined('SYSPATH') or die('No direct script access.');
class Model_Account extends Model
{
public function setHashKey($key)
{
$sql = "SELECT SetHashKey('$key') AS `Key`;";
$key = DB::query(Database::SELECT, $sql)->execute();
return $key->get('Key');
}
public function getHashKey()
{
$sql = "SELECT GetHashKey() AS `Key`;";
$key = DB::query(Database::SELECT, $sql)->execute();
return $key->get('Key');
}
public function checkAuth($login, $password) {
$sql = "SELECT SignIn('$login', '$password') AS `ID`;";
$login = DB::query(Database::SELECT, $sql)->execute();
return $login->get('ID');
}
public function getPersonalInfoByID($id)
{
$sql = "CALL GetPersonalInfoByID('$id');";
$query = DB::query(Database::SELECT, $sql)->execute();
return $query;
}
public function getAccountInfoByID($id)
{
$sql = "CALL GetAccInfoByID('$id');";
$query = DB::query(Database::SELECT, $sql)->execute();
return $query;
}
public function changeMail($id, $mail)
{
$sql = "SELECT ChangeMail('$id', '$mail') AS Num;";
$query = DB::query(Database::SELECT, $sql)->execute();
return $query;
}
public function changeLogin($id, $login)
{
$sql = "SELECT ChangeLogin('$id', '$login') AS Num;";
$query = DB::query(Database::SELECT, $sql)->execute();
return $query;
}
public function changePassword($id, $password)
{
$sql = "SELECT `ChangePassword`('$id', '$password') AS Num;";
$query = DB::query(Database::SELECT, $sql)->execute();
return $query;
}
public function getAccNumByLogin($login)
{
$sql = "SELECT GetAccNumByLogin('$login') AS Num;";
$login = DB::query(Database::SELECT, $sql)->execute();
return $login->get('Num');
}
public function getAccNumByMail($email)
{
$sql = "SELECT GetAccNumByMail('$email') AS Num;";
$email = DB::query(Database::SELECT, $sql)->execute();
return $email->get('Num');
}
public function isActivationCodeValid($code)
{
$sql = "SELECT GetAccNumByCode('$code') AS Num;";
$res = DB::query(Database::SELECT, $sql)->execute();
foreach ($res as $value) {
$count = $value['Num'];
}
return $count == 1;
}
public function activateAccount($login, $password, $email, $code)
{
$sql = "SELECT `ActivateAccount` ('$code', '$login', '$email', '$password') AS `Num`; ";
$res = DB::query(Database::SELECT, $sql)->execute();
foreach ($res as $value) {
$id = $value['Num'];
}
return $id;
}
}
\ No newline at end of file
application/classes/Model/Teacher/Map.php → web/application/classes/Model/Teacher/Map.php
+ 20
− 2
View file @ de03932a
......@@ -92,9 +92,9 @@ class Model_Teacher_Map extends Model
return DB::query(Database::SELECT, $sql)->execute();
}
public function AddDiscipline($teacherID, $Grade, $SubjectID, $ExamType, $LectionCount, $PracticeCount)
public function AddDiscipline($teacherID, $Grade, $SubjectID, $ExamType, $LectionCount, $PracticeCount, $DepartmentID)
{
$sql = "SELECT `AddDiscipline`('$teacherID', '$Grade', '$SubjectID', '$ExamType', '$LectionCount', '$PracticeCount') AS `Num`;";
$sql = "SELECT `AddDiscipline`('$teacherID', '$Grade', '$SubjectID', '$ExamType', '$LectionCount', '$PracticeCount', '$DepartmentID') AS `Num`;";
return DB::query(Database::SELECT, $sql)->execute();
}
......@@ -103,4 +103,22 @@ class Model_Teacher_Map extends Model
$sql = "SELECT `ChangeDiscipline`('$teacherID', '$DisciplineID', '$ExamType', '$LectionCount', '$PracticeCount', '$Grade', '$SubjectID') AS `Num`;";
return DB::query(Database::SELECT, $sql)->execute();
}
public function GetSubjectList()
{
$sql = "CALL `GetSubjectList`(); ";
return DB::query(Database::SELECT, $sql)->execute();
}
public function ChangeModuleOrder($teacherID, $moduleID, $OrderNum)
{
$sql = "SELECT `ChangeModuleOrder`('$teacherID', '$moduleID', '$OrderNum') AS `Num`;";
return DB::query(Database::SELECT, $sql)->execute();
}
public function ChangeSubmoduleOrder($teacherID, $SubmoduleID, $OrderNum)
{
$sql = "SELECT `ChangeSubmoduleOrder`('$teacherID', '$SubmoduleID', '$OrderNum') AS `Num`;";
return DB::query(Database::SELECT, $sql)->execute();
}
}
application/classes/Twig.php → web/application/classes/Twig.php
+ 0
− 0
View file @ de03932a
File moved
application/i18n/ru/ru.php → web/application/i18n/ru/ru.php
+ 0
− 0
View file @ de03932a
File moved
application/views/base.twig → web/application/views/base.twig
+ 2
− 1
View file @ de03932a
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
......@@ -7,7 +8,7 @@
{% block media %}{% endblock %}
</head>
<body>
<div id="wrap">
<div id="wrap" class="page">
<div class="header_wrapper">
<div class="header">
......
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