From ce9fcdf61328914326ba92de32950a239900e743 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Sat, 9 Oct 2010 11:55:56 +0300
Subject: [PATCH] Feature #2099 - Confirmation and error messages have been
 added.

---
 main/admin/course_request_accepted.php    | 10 ++++-
 main/admin/course_request_rejected.php    | 39 +++++++++++++------
 main/admin/course_request_review.php      | 46 ++++++++++++++++-------
 main/lang/bulgarian/create_course.inc.php | 10 ++++-
 main/lang/english/create_course.inc.php   |  8 ++++
 5 files changed, 86 insertions(+), 27 deletions(-)

diff --git a/main/admin/course_request_accepted.php b/main/admin/course_request_accepted.php
index 4620d7aa63..21d8e1b970 100644
--- a/main/admin/course_request_accepted.php
+++ b/main/admin/course_request_accepted.php
@@ -46,7 +46,15 @@ $is_error_message = !empty($_GET['is_error_message']);
  * Deletion of a course request.
  */
 if (!empty($delete_course_request)) {
-    CourseRequestManager::delete_course_request($delete_course_request);
+    $course_request_code = CourseRequestManager::get_course_request_code($delete_course_request);
+    $result = CourseRequestManager::delete_course_request($delete_course_request);
+    if ($result) {
+        $message = sprintf(get_lang('CourseRequestDeleted'), $course_request_code);
+        $is_error_message = false;
+    } else {
+        $message = sprintf(get_lang('CourseRequestDeletionFailed'), $course_request_code);
+        $is_error_message = true;
+    }
 }
 
 /**
diff --git a/main/admin/course_request_rejected.php b/main/admin/course_request_rejected.php
index edaf0b3b0b..558fc57b64 100644
--- a/main/admin/course_request_rejected.php
+++ b/main/admin/course_request_rejected.php
@@ -50,29 +50,46 @@ $is_error_message = !empty($_GET['is_error_message']);
  * Acceptance and creation of the requested course.
  */
 if (!empty($accept_course_request)) {
-
+    $course_request_code = CourseRequestManager::get_course_request_code($accept_course_request);
     $course_id = CourseRequestManager::accept_course_request($accept_course_request);
-
     if ($course_id) {
-        // TODO: Prepare a confirmation message.
+        $course_code = CourseManager::get_course_code_from_course_id($course_id);
+        $message = sprintf(get_lang('CourseRequestAccepted'), $course_request_code, $course_code);
+        $is_error_message = false;
     } else {
-        // Prepare an error message.
+        $message = sprintf(get_lang('CourseRequestAcceptanceFailed'), $course_request_code);
+        $is_error_message = true;
     }
-
 }
 
 /**
- * Deletion of a course request.
+ * Sending to the teacher a request for additional information about the proposed course.
  */
-if (!empty($delete_course_request)) {
-    CourseRequestManager::delete_course_request($delete_course_request);
+elseif (!empty($request_info)) {
+    $course_request_code = CourseRequestManager::get_course_request_code($request_info);
+    $result = CourseRequestManager::ask_for_additional_info($request_info);
+    if ($result) {
+        $message = sprintf(get_lang('CourseRequestInfoAsked'), $course_request_code);
+        $is_error_message = false;
+    } else {
+        $message = sprintf(get_lang('CourseRequestInfoFailed'), $course_request_code);
+        $is_error_message = true;
+    }
 }
 
 /**
- * Sending to the teacher a request for additional information about the proposed course.
+ * Deletion of a course request.
  */
-if (!empty($request_info)) {
-    CourseRequestManager::ask_for_additional_info($request_info);
+elseif (!empty($delete_course_request)) {
+    $course_request_code = CourseRequestManager::get_course_request_code($delete_course_request);
+    $result = CourseRequestManager::delete_course_request($delete_course_request);
+    if ($result) {
+        $message = sprintf(get_lang('CourseRequestDeleted'), $course_request_code);
+        $is_error_message = false;
+    } else {
+        $message = sprintf(get_lang('CourseRequestDeletionFailed'), $course_request_code);
+        $is_error_message = true;
+    }
 }
 
 /**
diff --git a/main/admin/course_request_review.php b/main/admin/course_request_review.php
index b4bde601d1..65fda6e542 100644
--- a/main/admin/course_request_review.php
+++ b/main/admin/course_request_review.php
@@ -49,43 +49,61 @@ $is_error_message = !empty($_GET['is_error_message']);
  * Course acceptance and creation.
  */
 if (!empty($accept_course_request)) {
-
+    $course_request_code = CourseRequestManager::get_course_request_code($accept_course_request);
     $course_id = CourseRequestManager::accept_course_request($accept_course_request);
-
     if ($course_id) {
-        // TODO: Prepare a confirmation message.
+        $course_code = CourseManager::get_course_code_from_course_id($course_id);
+        $message = sprintf(get_lang('CourseRequestAccepted'), $course_request_code, $course_code);
+        $is_error_message = false;
     } else {
-        // Prepare an error message.
+        $message = sprintf(get_lang('CourseRequestAcceptanceFailed'), $course_request_code);
+        $is_error_message = true;
     }
-
 }
 
 /**
  * Course rejection
  */
-if (!empty($reject_course_request)) {
-
+elseif (!empty($reject_course_request)) {
+    $course_request_code = CourseRequestManager::get_course_request_code($reject_course_request);
     $result = CourseRequestManager::reject_course_request($reject_course_request);
-
     if ($result) {
-        // TODO: Prepare a confirmation message.
+        $message = sprintf(get_lang('CourseRequestRejected'), $course_request_code);
+        $is_error_message = false;
     } else {
-        // Prepare an error message.
+        $message = sprintf(get_lang('CourseRequestRejectionFailed'), $course_request_code);
+        $is_error_message = true;
     }
 }
 
 /**
  * Sending to the teacher a request for additional information about the proposed course.
  */
-if (!empty($request_info)) {
-    CourseRequestManager::ask_for_additional_info($request_info);
+elseif (!empty($request_info)) {
+    $course_request_code = CourseRequestManager::get_course_request_code($request_info);
+    $result = CourseRequestManager::ask_for_additional_info($request_info);
+    if ($result) {
+        $message = sprintf(get_lang('CourseRequestInfoAsked'), $course_request_code);
+        $is_error_message = false;
+    } else {
+        $message = sprintf(get_lang('CourseRequestInfoFailed'), $course_request_code);
+        $is_error_message = true;
+    }
 }
 
 /**
  * Deletion of a course request.
  */
-if (!empty($delete_course_request)) {
-    CourseRequestManager::delete_course_request($delete_course_request);
+elseif (!empty($delete_course_request)) {
+    $course_request_code = CourseRequestManager::get_course_request_code($delete_course_request);
+    $result = CourseRequestManager::delete_course_request($delete_course_request);
+    if ($result) {
+        $message = sprintf(get_lang('CourseRequestDeleted'), $course_request_code);
+        $is_error_message = false;
+    } else {
+        $message = sprintf(get_lang('CourseRequestDeletionFailed'), $course_request_code);
+        $is_error_message = true;
+    }
 }
 
 
diff --git a/main/lang/bulgarian/create_course.inc.php b/main/lang/bulgarian/create_course.inc.php
index 1c556516fe..f4eaa5f7a3 100644
--- a/main/lang/bulgarian/create_course.inc.php
+++ b/main/lang/bulgarian/create_course.inc.php
@@ -119,5 +119,13 @@ $AskAdditionalInfo = "Искане на допълнителна информа
 $DeleteThisCourseRequest = "Изтриване на заявката";
 $ACourseRequestWillBeDeleted = "Заявката %s ще бъде изтрита. Да се изпълни ли това действие?";
 $RejectThisCourseRequest = "Отхвърляне на заявката";
-$ACourseRequestWillBeRejected = "Заявката %s ще бъде отхвърлена (fjudpdkd). Да се изпълни ли това действие?";
+$ACourseRequestWillBeRejected = "Заявката %s ще бъде отхвърлена. Да се изпълни ли това действие?";
+$CourseRequestAccepted = "Заявката %s е одобрена. Създаден е нов курс %s.";
+$CourseRequestAcceptanceFailed = "Заявката %s не можа да бъде одобрена поради появила се грешка.";
+$CourseRequestRejected = "Заявката %s е отхвърлена.";
+$CourseRequestRejectionFailed = "Заявката %s не можа да бъде отхвърлена поради появила се грешка.";
+$CourseRequestInfoAsked = "Изпратено е искане за допълнителна информация по заявката %s.";
+$CourseRequestInfoFailed = "Искане за допълнителна информация по заявката %s не беше изпратено поради появила се грешка.";
+$CourseRequestDeleted = "Заявката %s е изтрита.";
+$CourseRequestDeletionFailed = "Заявката %s не можа да бъде изтрита поради появила се грешка.";
 ?>
\ No newline at end of file
diff --git a/main/lang/english/create_course.inc.php b/main/lang/english/create_course.inc.php
index 75fb78b14d..7b11556023 100644
--- a/main/lang/english/create_course.inc.php
+++ b/main/lang/english/create_course.inc.php
@@ -120,4 +120,12 @@ $DeleteThisCourseRequest = "Delete this training request";
 $ACourseRequestWillBeDeleted = "The training request %s is going to be deleted. Is it OK to proceed?";
 $RejectThisCourseRequest = "Reject this training request";
 $ACourseRequestWillBeRejected = "The training request %s is going to be rejected. Is it OK to proceed?";
+$CourseRequestAccepted = "The course request %s has been accepted. A new training %s has been created.";
+$CourseRequestAcceptanceFailed = "The course request %s has not been accepted due to internal error.";
+$CourseRequestRejected = "The training request %s has been rejected.";
+$CourseRequestRejectionFailed = "The training request %s has not been rejected due to internal error.";
+$CourseRequestInfoAsked = "Additional information about the training request %s has been asked.";
+$CourseRequestInfoFailed = "Additional information about the training request %s has not been asked due to internal error.";
+$CourseRequestDeleted = "The training request %s has been deleted.";
+$CourseRequestDeletionFailed = "The training request %s has not been deleted due to internal error.";
 ?>
\ No newline at end of file