Forráskód Böngészése

Reordering controller/views

Julio Montoya 12 éve
szülő
commit
8c43406e9b

+ 10 - 9
main/inc/routes.php

@@ -478,26 +478,27 @@ $app->match('/data/upload/users/', 'index.controller:getUserFile', 'GET|POST')
     ->assert('type', '.+');
 
 /** Question manager - admin */
-$app->match('/admin/questions', 'admin.controller:questionsAction', 'GET|POST')
+
+$app->get('/admin/questionmanager/', 'question_manager.controller:questionManagerIndexAction')
+    ->assert('type', '.+')
+    ->before($adminAndQuestionManagerCondition)
+    ->bind('admin_questionmanager');
+
+$app->match('/admin/questionmanager/questions', 'question_manager.controller:questionsAction', 'GET|POST')
     ->assert('type', '.+')
     ->before($adminAndQuestionManagerCondition)
     ->bind('admin_questions');
 
-$app->match('/admin/questions/edit/{id}', 'admin.controller:editQuestionAction', 'GET|POST')
+$app->match('/admin/questionmanager/questions/edit/{id}', 'question_manager.controller:editQuestionAction', 'GET|POST')
     ->assert('type', '.+')
     ->before($adminAndQuestionManagerCondition)
     ->bind('admin_questions_edit');
 
-$app->get('/admin/questions/get-categories/{id}', 'admin.controller:getCategoriesAction')
+$app->get('/admin/questionmanager/questions/get-categories/{id}', 'question_manager.controller:getCategoriesAction')
     ->before($adminAndQuestionManagerCondition)
     ->bind('admin_questions_get_categories');
 
-$app->get('/admin/questions/get-questions-by-category/{categoryId}', 'admin.controller:getQuestionsByCategoryAction')
+$app->get('/admin/questionmanager/questions/get-questions-by-category/{categoryId}', 'question_manager.controller:getQuestionsByCategoryAction')
     ->before($adminAndQuestionManagerCondition)
     ->bind('admin_get_questions_by_category');
 
-$app->get('/admin/questionmanager', 'admin.controller:questionManagerIndexAction')
-    ->before($adminAndQuestionManagerCondition)
-    ->bind('admin_questionmanager');
-
-

+ 2 - 2
main/inc/services.php

@@ -458,8 +458,8 @@ $app['news.controller'] = $app->share(
     }
 );
 
-$app['admin.controller'] = $app->share(
+$app['question_manager.controller'] = $app->share(
     function () use ($app) {
-        return new ChamiloLMS\Controller\AdminController();
+        return new ChamiloLMS\Controller\Admin\QuestionManager\QuestionManagerController();
     }
 );

+ 0 - 0
main/template/default/admin/edit_question.tpl → main/template/default/admin/questionmanager/edit_question.tpl


+ 0 - 0
main/template/default/admin/question_categories.tpl → main/template/default/admin/questionmanager/question_categories.tpl


+ 0 - 0
main/template/default/admin/questionmanager.tpl → main/template/default/admin/questionmanager/questionmanager.tpl


+ 0 - 0
main/template/default/admin/questions.tpl → main/template/default/admin/questionmanager/questions.tpl


+ 28 - 12
src/ChamiloLMS/Controller/AdminController.php → src/ChamiloLMS/Controller/Admin/QuestionManager/QuestionManagerController.php

@@ -1,6 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
-namespace ChamiloLMS\Controller;
+namespace ChamiloLMS\Controller\Admin\QuestionManager;
 
 use Silex\Application;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
@@ -9,11 +9,11 @@ use Pagerfanta\Adapter\DoctrineCollectionAdapter;
 use Pagerfanta\Pagerfanta;
 
 /**
- * Class AdminController
+ * Class QuestionManagerController
  * @package ChamiloLMS\Controller
  * @author Julio Montoya <gugli100@gmail.com>
  */
-class AdminController
+class QuestionManagerController
 {
     /**
      * @param Application $app
@@ -23,9 +23,16 @@ class AdminController
 
     }
 
+    /**
+     *
+     * Edits a question
+     *
+     * @param Application $app
+     * @param int $id
+     * @return Response
+     */
     public function editQuestionAction(Application $app, $id)
     {
-
         $extraJS = array();
         //@todo improve this JS includes should be added using twig
         $extraJS[] = '<link href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/style.css" rel="stylesheet" type="text/css" />';
@@ -33,6 +40,7 @@ class AdminController
         $app['extraJS'] = $extraJS;
 
         $exercise = new \Exercise();
+        /** @var  \Question $question */
         $question = \Question::read($id, null, $exercise);
         $question->setDefaultValues = true;
         $form = new \FormValidator('edit_question');
@@ -42,23 +50,29 @@ class AdminController
 
         $app['template']->assign('form', $form->toHtml());
 
-        $response = $app['template']->render_template('admin/edit_question.tpl');
+        $response = $app['template']->render_template('admin/questionmanager/edit_question.tpl');
         return new Response($response, 200, array());
 
     }
 
+    /**
+     * Show the index page for the question manager
+     * @param Application $app
+     * @return Response
+     */
     public function questionManagerIndexAction(Application $app)
     {
-        $response = $app['template']->render_template('admin/questionmanager.tpl');
+        $response = $app['template']->render_template('admin/questionmanager/questionmanager.tpl');
         return new Response($response, 200, array());
     }
 
 
 
     /**
+     * Get question categories per id
      * @param Application $app
      * @param int $id
-     * @return mixed
+     * @return string
      */
     public function getCategoriesAction(Application $app, $id)
     {
@@ -91,7 +105,7 @@ class AdminController
      * Gets the question list per category
      * @param Application $app
      * @param $categoryId
-     * @return int
+     * @return Response
      */
     public function getQuestionsByCategoryAction(Application $app, $categoryId)
     {
@@ -177,13 +191,15 @@ class AdminController
         foreach ($questions as $question) {
 
         }
-        $response = $app['template']->render_template('admin/questions.tpl');
+        $response = $app['template']->render_template('admin/questionmanager/questions.tpl');
         return new Response($response, 200, array());
     }
 
     /**
-     *
+     * Index of the question manager
      * @param Application $app
+     * @return Response
+     *
      */
     public function questionsAction(Application $app)
     {
@@ -233,8 +249,8 @@ class AdminController
         $tree = $repo->buildTree($query->getArrayResult(), $options);
         $app['template']->assign('global_category_tree', $tree);
 
-        $response = $app['template']->render_template('admin/question_categories.tpl');
+        $response = $app['template']->render_template('admin/questionmanager/question_categories.tpl');
         return new Response($response, 200, array());
 
     }
-}
+}