Merge branch 'issue-12' of http://gitlab.mmcs.sfedu.ru/Nekrolm/grade into issue-12

.buildpath

-<?xml version="1.0" encoding="UTF-8"?>
-<buildpath>
-	<buildpathentry kind="src" path=""/>
-	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
-</buildpath>

.gitignore

@@ -20,3 +20,5 @@ Thumbs.db
 *.project
 *.idea
 *nbproject
+.settings
+.buildpath

.settings/org.eclipse.wst.validation.prefs

-DELEGATES_PREFERENCE=delegateValidatorList
-USER_BUILD_PREFERENCE=enabledBuildValidatorList
-USER_MANUAL_PREFERENCE=enabledManualValidatorList
-USER_PREFERENCE=overrideGlobalPreferencesfalse
-eclipse.preferences.version=1
-override=false
-suspend=false
-vf.version=3

config/database.php

@@ -14,8 +14,8 @@ return array
 			 * boolean  persistent  use persistent connections?
 			 */
 			'dsn'        => 'mysql:host=127.0.0.1;dbname=mmcs_rating',
-			'username'   => 'root',
-			'password'   => '',
+			'username'   => 'mmcs_rating',
+-			'password'   => 'Pefnesdy',
 			'persistent' => FALSE,
 			'options' => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8')
 		),

~dev_rating/application/bootstrap.php

@@ -176,12 +176,6 @@ Route::set('sign:restore', 'remind/<token>')
         'action'     => 'restore',
     ]);
 
-//Route::set('handler2', 'handler/task/get')
-//    ->defaults([
-//        'directory' => 'Handler',
-//        'controller' => 'Task',
-//        'action'    => 'get',
-//    ]);
 
 // --------------- Ajax features ----------------
 Route::set('handler', 'handler/<controller>(/<action>(/<id>))')

~dev_rating/application/classes/Controller/DeanOffice/Bill.php

@@ -16,6 +16,7 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice
 
         foreach ($disciplines as &$dis) {
             $disInfo = Model_Discipline::getDisciplineRateInfo($dis['ID']);
+            //echo Debug::vars($disInfo);
             $rates = Model_Rating::getRatesForStudentsGroup((int)$dis['ID'], $groupID);
             foreach ($rates as $record) {
                 if (!isset($table[$record['ID']])) {
@@ -31,7 +32,7 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice
                         'bonus'        => $record['bonus'],
                         'exam'         => $record['exam']
                     ],
-                    'debt'   => $record['intermediate'] + $record['bonus'] + $record['exam'] < 0.6 * $disInfo['Current']
+                    'debt'   => (float)($record['intermediate'] + $record['bonus'] + $record['exam']) < 0.6 * $disInfo['Current']
                 ];
             }
             //check: student may not be attach to discipline

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

@@ -146,7 +146,7 @@ class Model_Discipline extends Model_Container
     public static function getDisciplineRateInfo($disciplineID) {
         $sql = "CALL `GetDisciplineRateInfo`(:id)";
         return DB::query(Database::SELECT, $sql)
-            ->param(':id', $disciplineID)->execute()->as_array();
+            ->param(':id', $disciplineID)->execute()->as_array()[0];
     }
 
     /**