Unified Model_Semesters class added

~dev_rating/application/classes/Controller/Student/Index.php

@@ -33,7 +33,7 @@ class Controller_Student_Index extends Controller_UserEnvi {
             $twig->disciplines = $disciplinesHandled;
         $twig->User = $this->UserInfo;
         $twig->Semester = $this->SemesterInfo;
-        $twig->SemesterList = DataArray::factory('Semesters')->getList();
+        $twig->SemesterList = Model_Semesters::factory()->getList();
         $this->response->body($twig);
     }
     

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

@@ -219,7 +219,7 @@ class Controller_Teacher_Discipline extends Controller_UserEnvi {
         $subject['IsBonus'] = $info['IsBonus'];
         
         $subject['SemesterID'] = $info['SemesterID'];
-        $semester = DataArray::factory('Semesters')->bySemester($subject['SemesterID'])->asArray();
+        $semester = Model_Semesters::factory()->bySemester($subject['SemesterID'])->asArray();
         $subject['SemesterNum'] = $semester['SemesterNum'] == 1 ? 'Осенний' : 'Весенний';
         $subject['SemesterYear'] = $semester['SemesterYear'];
         

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

@@ -41,7 +41,7 @@ class Controller_Teacher_Index extends Controller_UserEnvi {
             $disciplinesHandled[$i]['Disciplines'][$j]['Groups'] = implode(', ', $groupsInDiscipline);
         } //!for_each
         $twig->Subjects = $disciplinesHandled;
-        $twig->SemesterList = DataArray::factory('Semesters')->getList();
+        $twig->SemesterList = Model_Semesters::factory()->getList();
         $twig->Semester = $this->SemesterInfo;
         $twig->User = $this->UserInfo;
         $this->response->body($twig);

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

 <?php
 
+/** @deprecated use Model_Semesters instead. */
 class DataArr_Semesters {
     protected $model;
     
@@ -7,11 +8,13 @@ class DataArr_Semesters {
         $this->model = new Model_DataArr_Semesters;
     }
 
+    /** @deprecated */
     public function bySemester($SemesterID){
     	$departaments = $this->model->getSemesterInfo($SemesterID);
-    	return new DataArray_Result($departamentsHandled);
+    	return new DataArray_Result($departaments);
     }
 
+    /** @deprecated */
     public function getList()
     {
         $semesters = $this->model->getSemesters();

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

 <?php defined('SYSPATH') or die('No direct script access.');
-  
+
+/** @deprecated use Model_Semesters instead. */
 class Model_DataArr_Semesters extends Model
 {
+    /** @deprecated */
    	public function getSemesterInfo($id)
     {
         $sql = "CALL `GetSemesterInfo`('$id'); ";
         return DB::query(Database::SELECT, $sql)->execute()->offsetGet(0);
     }
 
+    /** @deprecated */
     public function getSemesters()
     {
         $sql = "CALL `GetSemesters`()";

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

+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Model_Semesters extends Model
+{
+    public static function factory() {
+        return new self();
+    }
+
+    public function getSemesterInfo($id) {
+        $sql = "CALL `GetSemesterInfo`('$id'); ";
+        return DB::query(Database::SELECT, $sql)->execute()->offsetGet(0);
+    }
+
+    public function getSemesters() {
+        $sql = "CALL `GetSemesters`()";
+        return DB::query(Database::SELECT, $sql)->execute();
+    }
+
+    public function bySemester($SemesterID) {
+        $departaments = $this->getSemesterInfo($SemesterID);
+        return new DataArray_Result($departaments);
+    }
+
+    public function getList() {
+        $semesters = $this->getSemesters();
+        $semestersHandled = array();
+        $i = 0;
+        foreach ($semesters as $value) {
+            $semestersHandled[$i] = $value;
+            $semestersHandled[$i]['Num'] = $value['Num'] == 1 ? 'Осенний' : 'Весенний';
+            $i++;
+        }
+        return $semestersHandled;
+    }
+}
\ No newline at end of file