Improved semester model (static access)

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

@@ -28,7 +28,7 @@ class Controller_Student_Subject extends Controller_UserEnvi {
 		$subject['LabCount'] = $info['LabCount'];
         $subject['DepName'] = $info['DepName'];
         $subject['Teachers'] = $this->getTeachersForDiscipline($id);
-        $semester = $db->getSemesterInfo($info['SemesterID']);
+        $semester = Model_Semesters::getInfo($info['SemesterID']);
         $semester['Num'] = $semester['Num'] == 1 ? 'Осенний' : 'Весенний';
         $subject['Num'] = $semester['Num'];
         $subject['Year'] = $semester['Year'];

~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 = Model_Semesters::create()->bySemester($subject['SemesterID'])->asArray();
+        $semester = Model_Semesters::getInfo($subject['SemesterID']);
         $subject['SemesterNum'] = $semester['SemesterNum'] == 1 ? 'Осенний' : 'Весенний';
         $subject['SemesterYear'] = $semester['SemesterYear'];
         

~dev_rating/application/classes/Controller/UserEnvi.php

@@ -13,8 +13,7 @@ class Controller_UserEnvi extends Controller {
         } 
         $this->UserInfo = $user->getInfoAsArray();
 
-        $db = new Model_Student;
-        $semester = $db->getSemesterInfo($this->UserInfo['SemesterID']);
+        $semester = Model_Semesters::getInfo($this->UserInfo['SemesterID']);
         // $semester['Num'] = $semester['Num'] == 1 ? 'Осень' : 'Весна';
         if($semester['Num'] == 1)
         {

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

@@ -6,7 +6,11 @@ class Model_Semesters extends Model
         return new self();
     }
 
-    public function getSemesterInfo($id) {
+    /**
+     * @param $id int semester id
+     * @return array data from <tt>semesters</tt> table
+     */
+    public static function getInfo($id) {
         $sql = "CALL `GetSemesterInfo`('$id'); ";
         return DB::query(Database::SELECT, $sql)->execute()->offsetGet(0);
     }
@@ -16,11 +20,6 @@ class Model_Semesters extends Model
         return DB::query(Database::SELECT, $sql)->execute();
     }
 
-    public function bySemester($SemesterID) {
-        $departments = $this->getSemesterInfo($SemesterID);
-        return new DataArray_Result($departments);
-    }
-
     public function getList() {
         $semesters = $this->getSemesters();
         $list = array();

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

@@ -7,10 +7,4 @@ class Model_Student extends Model
         $sql = "CALL `GetRates`('$student_id', '$subject_id'); ";
         return DB::query(Database::SELECT, $sql)->execute();
     }
-    
-    public function getSemesterInfo($id) // TODO: перенести в common.php
-    {
-        $sql = "CALL `GetSemesterInfo`('$id'); ";
-        return DB::query(Database::SELECT, $sql)->execute()->offsetGet(0);
-    }   
 }