From d1c0c6884939b9003cb0a24d15feedbabc3fd777 Mon Sep 17 00:00:00 2001
From: xamgore <xamgore@ya.ru>
Date: Mon, 9 Mar 2015 21:36:47 +0300
Subject: [PATCH] Unified Model_Faculties class added
---
.../classes/Controller/Admin/Accounts.php | 2 +-
.../classes/Controller/Admin/Students.php | 6 ++---
.../classes/Controller/Admin/Subjects.php | 2 +-
.../classes/Controller/Admin/Teachers.php | 6 ++---
.../classes/Controller/Teacher/Discipline.php | 6 ++---
.../application/classes/DataArr/Faculties.php | 6 +++--
.../classes/Model/DataArr/Faculties.php | 4 ++-
.../application/classes/Model/Faculties.php | 25 +++++++++++++++++++
8 files changed, 43 insertions(+), 14 deletions(-)
create mode 100644 ~dev_rating/application/classes/Model/Faculties.php
diff --git a/~dev_rating/application/classes/Controller/Admin/Accounts.php b/~dev_rating/application/classes/Controller/Admin/Accounts.php
index c3db29418..685e5dff0 100644
--- a/~dev_rating/application/classes/Controller/Admin/Accounts.php
+++ b/~dev_rating/application/classes/Controller/Admin/Accounts.php
@@ -15,7 +15,7 @@ class Controller_Admin_Accounts extends Controller_UserEnvi {
$model = new Model_Students();
Cookie::set('fD', 'true');
$twig = Twig::factory('admin/accounts/codes');
- $twig->Faculties = DataArray::factory('Faculties')->common()->asArray();
+ $twig->Faculties = Model_Faculties::factory()->common()->asArray();
$twig->Grades = $this->getGrades();
$twig->User = $this->UserInfo;
$this->response->body($twig);
diff --git a/~dev_rating/application/classes/Controller/Admin/Students.php b/~dev_rating/application/classes/Controller/Admin/Students.php
index 86f80187c..390fe09cb 100644
--- a/~dev_rating/application/classes/Controller/Admin/Students.php
+++ b/~dev_rating/application/classes/Controller/Admin/Students.php
@@ -6,7 +6,7 @@ class Controller_Admin_Students extends Controller_UserEnvi {
{
// VIEW
$twig = Twig::factory('admin/students/index');
- $twig->Faculties = DataArray::factory('Faculties')->common()->asArray();
+ $twig->Faculties = Model_Faculties::factory()->common()->asArray();
$twig->Grades = Model_Grades::factory()->structured()->asArray();
$twig->User = $this->UserInfo;
$this->response->body($twig);
@@ -15,7 +15,7 @@ class Controller_Admin_Students extends Controller_UserEnvi {
public function action_add()
{
$twig = Twig::factory('admin/students/add');
- $twig->Faculties = DataArray::factory('Faculties')->common()->asArray();
+ $twig->Faculties = Model_Faculties::factory()->common()->asArray();
$twig->Grades = Model_Grades::factory()->structured()->asArray();
$twig->User = $this->UserInfo;
$this->response->body($twig);
@@ -29,7 +29,7 @@ class Controller_Admin_Students extends Controller_UserEnvi {
}
// VIEW
$twig = Twig::factory('admin/students/upload');
- $twig->Faculties = DataArray::factory('Faculties')->common()->asArray();
+ $twig->Faculties = Model_Faculties::factory()->common()->asArray();
$twig->UploadingResult = $result;
$twig->User = $this->UserInfo;
$this->response->body($twig);
diff --git a/~dev_rating/application/classes/Controller/Admin/Subjects.php b/~dev_rating/application/classes/Controller/Admin/Subjects.php
index da5499ce8..ee51083fb 100644
--- a/~dev_rating/application/classes/Controller/Admin/Subjects.php
+++ b/~dev_rating/application/classes/Controller/Admin/Subjects.php
@@ -13,7 +13,7 @@ class Controller_Admin_Subjects extends Controller_UserEnvi {
}
// VIEW
$twig = Twig::factory('admin/subjects/upload');
- $twig->Faculties = DataArray::factory('Faculties')->common()->asArray();
+ $twig->Faculties = Model_Faculties::factory()->common()->asArray();
$twig->UploadingResult = $result;
$twig->User = $this->UserInfo;
$this->response->body($twig);
diff --git a/~dev_rating/application/classes/Controller/Admin/Teachers.php b/~dev_rating/application/classes/Controller/Admin/Teachers.php
index d904eab94..9498684ad 100644
--- a/~dev_rating/application/classes/Controller/Admin/Teachers.php
+++ b/~dev_rating/application/classes/Controller/Admin/Teachers.php
@@ -6,7 +6,7 @@ class Controller_Admin_Teachers extends Controller_UserEnvi {
{
// VIEW
$twig = Twig::factory('admin/teachers/index');
- $twig->Faculties = DataArray::factory('Faculties')->common()->asArray();
+ $twig->Faculties = Model_Faculties::factory()->common()->asArray();
$twig->User = $this->UserInfo;
$this->response->body($twig);
}
@@ -15,7 +15,7 @@ class Controller_Admin_Teachers extends Controller_UserEnvi {
{
$twig = Twig::factory('admin/teachers/add');
$twig->JobPositions = $this->getJobPositions();
- $twig->Faculties = DataArray::factory('Faculties')->common()->asArray();
+ $twig->Faculties = Model_Faculties::factory()->common()->asArray();
$twig->User = $this->UserInfo;
$this->response->body($twig);
}
@@ -28,7 +28,7 @@ class Controller_Admin_Teachers extends Controller_UserEnvi {
}
// VIEW
$twig = Twig::factory('admin/teachers/upload');
- $twig->Faculties = DataArray::factory('Faculties')->common()->asArray();
+ $twig->Faculties = Model_Faculties::factory()->common()->asArray();
$twig->UploadingResult = $result;
$twig->User = $this->UserInfo;
$this->response->body($twig);
diff --git a/~dev_rating/application/classes/Controller/Teacher/Discipline.php b/~dev_rating/application/classes/Controller/Teacher/Discipline.php
index c38d3394e..a30cc2c9f 100644
--- a/~dev_rating/application/classes/Controller/Teacher/Discipline.php
+++ b/~dev_rating/application/classes/Controller/Teacher/Discipline.php
@@ -7,7 +7,7 @@ class Controller_Teacher_Discipline extends Controller_UserEnvi {
$twig = Twig::factory('teacher/discipline/CreateDiscipline');
$db = new Model_Teacher_Map;
$twig->User = $this->UserInfo;
- $twig->FacultiesList = DataArray::factory('Faculties')->common()->asArray();
+ $twig->FacultiesList = Model_Faculties::factory()->common()->asArray();
$twig->SubjectsList = Model_Subjects::factory()->byFaculty($this->UserInfo['FacultyID'])->asArray();
$twig->GradesList = Model_Grades::factory()->common()->asArray();
$this->response->body($twig);
@@ -22,7 +22,7 @@ class Controller_Teacher_Discipline extends Controller_UserEnvi {
$twig->User = $this->UserInfo;
- //$twig->FacultiesList = DataArray::factory('Faculties')->common()->asArray();
+ //$twig->FacultiesList = Model_Faculties::factory()->common()->asArray();
$twig->Discipline = $this->GetDisciplineInfo($db, $id);
$twig->SubjectsList = Model_Subjects::factory()->byFaculty($this->UserInfo['FacultyID'])->asArray();
$twig->GradesList = Model_Grades::factory()->common()->asArray();
@@ -145,7 +145,7 @@ class Controller_Teacher_Discipline extends Controller_UserEnvi {
$twig->User = $this->UserInfo;
$twig->Discipline = $this->getDisciplineInfo($db, $id);
$twig->BindTeachersList = Model_Teachers::factory()->forDiscipline($id)->asArray();
- $twig->FacultiesList = DataArray::factory('Faculties')->common()->asArray();
+ $twig->FacultiesList = Model_Faculties::factory()->common()->asArray();
$twig->Departments = DataArray::factory('Departments')->byFaculty($this->UserInfo['FacultyID'])->asArray();
$this->response->body($twig);
diff --git a/~dev_rating/application/classes/DataArr/Faculties.php b/~dev_rating/application/classes/DataArr/Faculties.php
index 9e9c4bb8c..20ff24eb1 100644
--- a/~dev_rating/application/classes/DataArr/Faculties.php
+++ b/~dev_rating/application/classes/DataArr/Faculties.php
@@ -1,12 +1,14 @@
<?php
+/** @deprecated use Model_Faculties instead. */
class DataArr_Faculties {
protected $model;
public function __construct() {
$this->model = new Model_DataArr_Faculties;
}
-
+
+ /** @deprecated */
public function common() {
$list = $this->model->GetFaculties();
@@ -22,5 +24,5 @@ class DataArr_Faculties {
return new DataArray_Result($FacList);
}
- // TODO: Метод для получения факультетов
+ // Метод для получения факультетов
}
\ No newline at end of file
diff --git a/~dev_rating/application/classes/Model/DataArr/Faculties.php b/~dev_rating/application/classes/Model/DataArr/Faculties.php
index fd5ffc872..56bf6d438 100644
--- a/~dev_rating/application/classes/Model/DataArr/Faculties.php
+++ b/~dev_rating/application/classes/Model/DataArr/Faculties.php
@@ -1,7 +1,9 @@
<?php defined('SYSPATH') or die('No direct script access.');
-
+
+/** @deprecated use Model_Faculties instead. */
class Model_DataArr_Faculties extends Model
{
+ /** @deprecated */
public function getFaculties()
{
$sql = "CALL `GetFaculties`(); ";
diff --git a/~dev_rating/application/classes/Model/Faculties.php b/~dev_rating/application/classes/Model/Faculties.php
new file mode 100644
index 000000000..5bebbd362
--- /dev/null
+++ b/~dev_rating/application/classes/Model/Faculties.php
@@ -0,0 +1,25 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Model_Faculties extends Model
+{
+ public static function factory() {
+ return new self();
+ }
+
+ public function getFaculties() {
+ $sql = "CALL `GetFaculties`(); ";
+ return DB::query(Database::SELECT, $sql)->execute();
+ }
+
+ public function common() {
+ $list = $this->GetFaculties();
+
+ $FacList = array();
+ foreach ($list as $row)
+ $FacList = $row;
+
+ return new DataArray_Result($FacList);
+ }
+
+ // TODO Метод для получения факультетов
+}
--
GitLab