From 563f474d48f26e72c320a543daf56bb91dd99463 Mon Sep 17 00:00:00 2001
From: xamgore <xamgore@ya.ru>
Date: Mon, 9 Mar 2015 22:01:34 +0300
Subject: [PATCH] Unified Model_Disciplines class added

---
 .../classes/Controller/Handler/GetData.php    |  2 +-
 .../classes/DataArr/Disciplines.php           |  4 +++-
 .../classes/Model/DataArr/Disciplines.php     |  3 ++-
 .../application/classes/Model/Disciplines.php | 21 +++++++++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 ~dev_rating/application/classes/Model/Disciplines.php

diff --git a/~dev_rating/application/classes/Controller/Handler/GetData.php b/~dev_rating/application/classes/Controller/Handler/GetData.php
index 62571ab5b..dc6ebb27e 100644
--- a/~dev_rating/application/classes/Controller/Handler/GetData.php
+++ b/~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;
diff --git a/~dev_rating/application/classes/DataArr/Disciplines.php b/~dev_rating/application/classes/DataArr/Disciplines.php
index 61d8fbedd..68857fcea 100644
--- a/~dev_rating/application/classes/DataArr/Disciplines.php
+++ b/~dev_rating/application/classes/DataArr/Disciplines.php
@@ -1,5 +1,6 @@
 <?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
diff --git a/~dev_rating/application/classes/Model/DataArr/Disciplines.php b/~dev_rating/application/classes/Model/DataArr/Disciplines.php
index b687824fe..f2e9b5fe8 100644
--- a/~dev_rating/application/classes/Model/DataArr/Disciplines.php
+++ b/~dev_rating/application/classes/Model/DataArr/Disciplines.php
@@ -1,5 +1,6 @@
 <?php defined('SYSPATH') or die('No direct script access.');
-  
+
+/** @deprecated use Model_Disciplines instead. */
 class Model_DataArr_Disciplines extends Model
 {
 
diff --git a/~dev_rating/application/classes/Model/Disciplines.php b/~dev_rating/application/classes/Model/Disciplines.php
new file mode 100644
index 000000000..e4de1f76d
--- /dev/null
+++ b/~dev_rating/application/classes/Model/Disciplines.php
@@ -0,0 +1,21 @@
+<?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
-- 
GitLab