Unified Model_Departments class added

~dev_rating/application/classes/Controller/Handler/AdmTeachers.php

@@ -80,6 +80,6 @@ class Controller_Handler_AdmTeachers extends Controller_Handler {
         public function action_getDepartmentsList()
         {
             $facultyID = $this->post->offsetGet('facultyID');
-            $this->response->body(DataArray::factory('Departments')->byFaculty($facultyID)->asJSON());
+            $this->response->body(Model_Departments::factory()->byFaculty($facultyID)->asJSON());
         }
 }
\ No newline at end of file

~dev_rating/application/classes/Controller/Handler/Map.php

@@ -516,7 +516,7 @@ class Controller_Handler_Map extends Controller_Handler {
             $this->post -> rule('FacultyID', 'not_empty')
                         -> rule('FacultyID', 'digit');
             if($this->post->check()) {
-				$DepList = DataArray::factory('Departments')->byFaculty($this->post->offsetGet('FacultyID'))->asJSON();
+				$DepList = Model_Departments::factory()->byFaculty($this->post->offsetGet('FacultyID'))->asJSON();
             }
 			$this->response->body($DepList);
 		}

~dev_rating/application/classes/Controller/Handler/Settings.php

@@ -80,7 +80,7 @@ class Controller_Handler_Settings extends Controller_Handler {
         public function action_getDepartmentsList()
         {
             $facultyID = $this->post->offsetGet('facultyID');
-            $deps = DataArray::factory('Departments')->byFaculty($facultyID)->asArray();
+            $deps = Model_Departments::factory()->byFaculty($facultyID)->asArray();
             $this->response->body(json_encode($deps));  
         }
         

~dev_rating/application/classes/Controller/Teacher/Discipline.php

@@ -146,7 +146,7 @@ class Controller_Teacher_Discipline extends Controller_UserEnvi {
         $twig->Discipline = $this->getDisciplineInfo($db, $id);
         $twig->BindTeachersList = Model_Teachers::factory()->forDiscipline($id)->asArray();
         $twig->FacultiesList = Model_Faculties::factory()->common()->asArray();
-        $twig->Departments = DataArray::factory('Departments')->byFaculty($this->UserInfo['FacultyID'])->asArray();
+        $twig->Departments = Model_Departments::factory()->byFaculty($this->UserInfo['FacultyID'])->asArray();
         
         $this->response->body($twig);
     }

~dev_rating/application/classes/Controller/Teacher/Profile.php

@@ -6,7 +6,7 @@ class Controller_Teacher_Profile extends Controller_UserEnvi {
         $twig = Twig::factory('profile/settings');
         $twig->JobPositions = $this->getJobPositions();
         $twig->Faculties = $this->getFaculties();
-        $twig->Departments = DataArray::factory('Departments')->byFaculty($this->UserInfo['FacultyID'])->asArray();
+        $twig->Departments = Model_Departments::factory()->byFaculty($this->UserInfo['FacultyID'])->asArray();
         $twig->User = $this->UserInfo;
         $this->response->body($twig);
     }

~dev_rating/application/classes/DataArr/Departments.php

 <?php
 
+/** @deprecated use Model_Departments instead. */
 class DataArr_Departments {
     protected $model;
     
     public function __construct() {
         $this->model = new Model_DataArr_Departments;
     }
-    
+
+    /** @deprecated */
     public function byFaculty($facultyID)
     {
         if($facultyID != 0)

~dev_rating/application/classes/Model/DataArr/Departments.php

 <?php defined('SYSPATH') or die('No direct script access.');
-  
+
+/** @deprecated use Model_Departments instead. */
 class Model_DataArr_Departments extends Model
 {
+    /** @deprecated */
     public function getDepartmentsByFaculty($facultyID)
     {
         $sql = "CALL `GetDepartments`('$facultyID'); ";

~dev_rating/application/classes/Model/Departments.php

+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Model_Departments extends Model
+{
+    public static function factory() {
+        return new self();
+    }
+
+    public function getDepartmentsByFaculty($facultyID) {
+        $sql = "CALL `GetDepartments`('$facultyID'); ";
+        return DB::query(Database::SELECT, $sql)->execute();
+    }
+
+    public function byFaculty($facultyID) {
+        if ($facultyID != 0) {
+            $departments = $this->getDepartmentsByFaculty($facultyID);
+            $list = array();
+            foreach ($departments as $row) {
+                if ($row['Name'] == null)
+                    $row['Name'] = '<служебная кафедра>';
+                $list = $row;
+            }
+            return new DataArray_Result($list);
+        }
+    }
+}