Removed `create` method from Groups model

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

@@ -17,8 +17,8 @@ class Controller_Handler_GetData extends Controller_Handler
         $this->post -> rule('GradeID', 'not_empty')
                     -> rule('GradeID', 'digit');
         if($this->post->check()) {
-            $data['data'] = Model_Groups::create()->ordByGroups(
-                    $this->post->offsetGet('GradeID'), $this->user['FacultyID'] )->asArray();
+            $data['data'] = Model_Groups::orderByGroups(
+                    $this->post->offsetGet('GradeID'), $this->user['FacultyID'] );
 
 			$data['success'] = true;
         }

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

@@ -458,9 +458,11 @@ class Controller_Handler_Map extends Controller_Handler {
 			$this->post -> rule('GradeID', 'digit')
 						-> rule('FacultyID', 'digit');
 			if($this->post->check()) {
-				$Groups = Model_Groups::create()->ordByGroups($this->post->offsetGet('GradeID'), $this->post->offsetGet('FacultyID'))->asJSON();
+                $grade = $this->post->offsetGet('GradeID');
+                $faculty = $this->post->offsetGet('FacultyID');
+				$groups = Model_Groups::orderByGroups($grade, $faculty);
             }
-			$this->response->body($Groups);
+            $this->response->body(json_encode($groups));
 		}
 		
 		// Поиск студентов

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

@@ -52,8 +52,8 @@ class Controller_Teacher_Discipline extends Controller_UserEnvi {
         $twig->User = $this->UserInfo;
         $twig->Discipline = $this->GetDisciplineInfo($db, $id);
 
-        $twig->GroupsForDiscipline = Model_Groups::create()->forDiscipline($id)->asArray();
-        $twig->Groups = Model_Groups::create()->ordByGroups($twig->Discipline['GradeID'], $twig->Discipline['FacultyID'])->asArray();
+        $twig->GroupsForDiscipline = Model_Groups::forDiscipline($id);
+        $twig->Groups = Model_Groups::orderByGroups($twig->Discipline['GradeID'], $twig->Discipline['FacultyID']);
         
         $this->response->body($twig);
     }
@@ -67,7 +67,7 @@ class Controller_Teacher_Discipline extends Controller_UserEnvi {
         $twig->User = $this->UserInfo;
         $twig->Discipline = $this->GetDisciplineInfo($db, $id);
         $twig->GradesList = Model_Grades::toArray();
-        $twig->Groups = Model_Groups::create()->ordByGroups($twig->Discipline['GradeID'], $twig->Discipline['FacultyID'])->asArray();
+        $twig->Groups = Model_Groups::orderByGroups($twig->Discipline['GradeID'], $twig->Discipline['FacultyID']);
 
         $students = $db->getStudentsForDiscipline($id);
         $stdHandled = array();

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

@@ -2,38 +2,34 @@
 
 class Model_Groups extends Model
 {
-    public static function create() {
-        return new self();
-    }
-
-    public function getGroupsForDiscipline($disciplineID) {
+    public static function getGroupsForDiscipline($disciplineID) {
         $sql = "CALL `GetGroupsForDiscipline`('$disciplineID'); ";
         return DB::query(Database::SELECT, $sql)->execute();
     }
 
-    public function getGroups($grade, $facultyID) {
+    public static function getGroups($grade, $facultyID) {
         $sql = "CALL `GetGroups`('$grade', '$facultyID'); ";
         return DB::query(Database::SELECT, $sql)->execute();
     }
 
-    public function forDiscipline($DisciplineID) {
-        $groups = $this->getGroupsForDiscipline($DisciplineID);
+    public static function forDiscipline($DisciplineID) {
+        $groups = self::getGroupsForDiscipline($DisciplineID);
 
         $list = array();
         foreach ($groups as $row)
             $list[] = $row;
 
-        return new DataArray_Result($list);
+        return $list;
     }
 
-    public function ordByGroups($GradeID, $FacultyID) {
-        $groups = $this->getGroups($GradeID, $FacultyID);
+    public static function orderByGroups($GradeID, $FacultyID) {
+        $groups = self::getGroups($GradeID, $FacultyID);
 
         $list = array();
         foreach ($groups as $row)
             $list[] = $row;
 
-        return new DataArray_Result($list);
+        return $list;
     }
 
     // TODO: Методы для получения списка учебных групп