diff --git a/~dev_rating/application/classes/Controller/Handler/GetData.php b/~dev_rating/application/classes/Controller/Handler/GetData.php index 62571ab5b6c22a178ac1ace7eeed2d110d9cf01b..dc6ebb27ec6a0e298ef04cafbee5a575e73a1264 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 61d8fbedd37cb8c94ffb99973689df0aa2c0e4fe..68857fcea76a7af1400e4727db024768f203765c 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 b687824fe3a2f2b2826f510b823841c579b3e72d..f2e9b5fe80048d09c88bace23708813965557307 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 0000000000000000000000000000000000000000..e4de1f76db9a6f3aec17a70c556dec3f1382f4d8 --- /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