diff --git a/.buildpath b/.buildpath deleted file mode 100755 index 8bcb4b5fd612e3ad55fb07e4bed087c55afd0861..0000000000000000000000000000000000000000 --- a/.buildpath +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<buildpath> - <buildpathentry kind="src" path=""/> - <buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/> -</buildpath> diff --git a/.gitignore b/.gitignore index 571fae6c47d839b7cfb0bfa10081f95fd5ff4abf..94b9f04df02d8320e0ee0c7fd2bb801b7084c356 100755 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ Thumbs.db *.project *.idea *nbproject +.settings +.buildpath diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs deleted file mode 100755 index 314d1472429e80217eb5fa2b138c0ceae34857b5..0000000000000000000000000000000000000000 --- a/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,8 +0,0 @@ -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 diff --git a/config/database.php b/config/database.php index c207313d81bb8b9e60c661fdadca8739159b4dae..97c4fbf5b398039dd3554cca51be20a3d5ac4d88 100644 --- a/config/database.php +++ b/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') ), diff --git a/~dev_rating/application/bootstrap.php b/~dev_rating/application/bootstrap.php index b1c56b9d488aec0b0fce136b862a4979bd3023a7..daa6b5adef5879c87d74c3900af2891800e63eec 100644 --- a/~dev_rating/application/bootstrap.php +++ b/~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>))') diff --git a/~dev_rating/application/classes/Controller/DeanOffice/Bill.php b/~dev_rating/application/classes/Controller/DeanOffice/Bill.php index 37b01ee137c6d5298b901fdeffcd02a14b270189..2bf08ca2283a8c158f4f4577e87cf7e05811a22d 100644 --- a/~dev_rating/application/classes/Controller/DeanOffice/Bill.php +++ b/~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 diff --git a/~dev_rating/application/classes/Model/Discipline.php b/~dev_rating/application/classes/Model/Discipline.php index f2094e85dc20c5277b4c54e5cb73c75b3aff50a0..06abaa31ddfba38dc555fbcf96ba56d09e11899b 100644 --- a/~dev_rating/application/classes/Model/Discipline.php +++ b/~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]; } /**