Unified Model_Disciplines class added

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

@@ -31,7 +31,7 @@ class Controller_Handler_GetData extends Controller_Handler
         $this->post -> rule('GroupID', 'not_empty')
             -> rule('GroupID', 'digit');
         if($this->post->check()) {
-            $data['data'] = DataArray::factory('Disciplines')->forGroup(
+            $data['data'] = Model_Disciplines::factory()->forGroup(
                 $this->post->offsetGet('GroupID'))->asArray();
 
             $data['success'] = true;

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

 <?php
 
+/** @deprecated use Model_Disciplines instead. */
 class DataArr_Disciplines {
     protected $model;
     
@@ -7,6 +8,7 @@ class DataArr_Disciplines {
         $this->model = new Model_DataArr_Disciplines;
     }
 
+    /** @deprecated */
     public function forGroup($GroupID) {
         $teacherModel = new Model_Teacher_Rating;
         $Disciplines = $teacherModel->getDisciplinesForGroup($GroupID);
@@ -24,5 +26,5 @@ class DataArr_Disciplines {
         return new DataArray_Result($DisciplinesHandled);
     }
     
-    // TODO: Методы для получения списка дисциплин
+    // Методы для получения списка дисциплин
 }
\ No newline at end of file

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

 <?php defined('SYSPATH') or die('No direct script access.');
-  
+
+/** @deprecated use Model_Disciplines instead. */
 class Model_DataArr_Disciplines extends Model
 {
 

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

+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Model_Disciplines extends Model
+{
+    public static function factory() {
+        return new self();
+    }
+
+    public function forGroup($GroupID) {
+        $teacherModel = new Model_Teacher_Rating;
+        $disciplines = $teacherModel->getDisciplinesForGroup($GroupID);
+
+        $DisciplinesHandled = array();
+        foreach ($disciplines as $row)
+            $DisciplinesHandled[] = $row;
+
+        return new DataArray_Result($DisciplinesHandled);
+    }
+
+    // TODO: Методы для получения списка дисциплин
+}
\ No newline at end of file