diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql index d3843bc3466964e219d63b73ea60424e75652297..587edd2db38e80c91f85e2b10ed8ef7440f7fc90 100644 --- a/db/StoredProcedures.sql +++ b/db/StoredProcedures.sql @@ -3399,7 +3399,7 @@ BEGIN INSERT INTO `requests` (requests.AccountID, requests.Title, requests.Description, requests.Status) VALUES (AccountID, vTitle, vDescription, 'opened'); - RETURN 0; + RETURN LAST_INSERT_ID(); END// diff --git a/~dev_rating/application/classes/Controller/Handler/ErrMessages.php b/~dev_rating/application/classes/Controller/Handler/ErrMessages.php index 3be159e8a43112c3614ebca563a4159d9305ab64..ac9c7947dfbb4fd32305ecdc41e94a94aa203984 100644 --- a/~dev_rating/application/classes/Controller/Handler/ErrMessages.php +++ b/~dev_rating/application/classes/Controller/Handler/ErrMessages.php @@ -19,19 +19,26 @@ class Controller_Handler_ErrMessages extends Controller_Handler { ++$i; } $res['num'] = --$i; + $this->response->body(json_encode($res)); } public function action_createRequest() { $title = $_POST['title']; $text = $_POST['text']; + $result = $this->model->newRequest($this->user['AccID'], $title, $text); - $to = "it.lab.mmcs@gmail.com"; - //$headers = "From: it.lab.mmcs@gmail.com"; - mail($to, $title, $text);// $headers); - $result = $this->model->newRequest($this->user['AccID'], $title, $text); - $data['success'] = ($result[0]['Num'] == 0); + if ($result[0]['Num'] > 0) { + $to = "it.lab.mmcs@gmail.com"; + $header = "Reply-To: ".$this->user['AccEMail']; + $title = "Request ".$result[0]['Num'].": ".$title; + $data['success'] = true; + mail($to, $title, $text, $headers); + } + else + $data['success'] = false; + $this->response->body(json_encode($data)); } } diff --git a/~dev_rating/application/classes/Model/errMessages.php b/~dev_rating/application/classes/Model/errMessages.php index 12da2cd776973569f885391323b77bdfe85a6ad6..5ae82590bd648a655787cd82523399e79c922491 100644 --- a/~dev_rating/application/classes/Model/errMessages.php +++ b/~dev_rating/application/classes/Model/errMessages.php @@ -11,8 +11,7 @@ class Model_errMessages extends Model public function newRequest($accID, $title, $description) { - $sql = "SELECT `CreateRequest`('$accID', '$title', '$description') AS 'result'; "; - + $sql = "SELECT `CreateRequest`('$accID', '$title', '$description') AS 'Num'; "; return DB::query(Database::SELECT, $sql)->execute(); } diff --git a/~dev_rating/media/js/errDialog.js b/~dev_rating/media/js/errDialog.js index 1ba20052340f2b9fac397f5b28aa98a57d750ba7..5186fb79443db283427d89dc0dae9892a77f5a67 100644 --- a/~dev_rating/media/js/errDialog.js +++ b/~dev_rating/media/js/errDialog.js @@ -9,8 +9,8 @@ $(document).ready(function() { modal: false, width: 490, show: { - effect: "fade", - duration: 300 + effect: "fade", + duration: 300 } }); @@ -86,6 +86,10 @@ $(document).ready(function() { $('#errButton').click(function() { + $('.dialogMyMessages').animate({height: "0px"}, 0).html(''); + checkMessages = false; + $('#messageTitle').val(''); + $('#message').val(''); $('#errDialog').dialog("open"); });