From 818e4b49705a25cd490ad41943d1cb51a0dc12de Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 4 Dec 2014 16:03:46 +0100
Subject: [PATCH] Updating notebook bundle.

---
 app/config/sonata/sonata_admin.yml            |  1 +
 .../CoreBundle/Admin/SettingsCurrentAdmin.php | 36 +++----------------
 src/Chamilo/CoreBundle/Entity/AccessUrl.php   |  8 ++++-
 .../CoreBundle/Entity/SettingsCurrent.php     | 25 ++++++-------
 .../CourseBundle/Event/CourseAccess.php       | 15 ++++++++
 .../NotebookBundle/Admin/CNotebookAdmin.php   | 21 ++++++-----
 .../Controller/CNotebookController.php        |  1 -
 .../ChamiloNotebookExtension.php              |  2 ++
 .../Form/Type/CNotebookType.php               |  7 +++-
 .../Migrations/Schema/v2/NotebookBundle.php   |  1 +
 .../NotebookBundle/Resources/config/admin.yml |  3 +-
 .../Settings/NotebookCourseSettingsSchema.php |  1 +
 .../Settings/NotebookSettingsSchema.php       |  1 +
 13 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/app/config/sonata/sonata_admin.yml b/app/config/sonata/sonata_admin.yml
index 491ade95aa..e104d42528 100644
--- a/app/config/sonata/sonata_admin.yml
+++ b/app/config/sonata/sonata_admin.yml
@@ -103,6 +103,7 @@ sonata_admin:
                     - sonata.admin.course
                     - sonata.admin.course_category
                     - sonata.admin.course_request
+                    - sonata.admin.notebook
             sonata.admin.group.session:
                   label: Sessions
                   icon:  '<i class="fa fa-play-circle"></i>'
diff --git a/src/Chamilo/CoreBundle/Admin/SettingsCurrentAdmin.php b/src/Chamilo/CoreBundle/Admin/SettingsCurrentAdmin.php
index 17a40e1028..4375b41c9d 100644
--- a/src/Chamilo/CoreBundle/Admin/SettingsCurrentAdmin.php
+++ b/src/Chamilo/CoreBundle/Admin/SettingsCurrentAdmin.php
@@ -26,42 +26,14 @@ class SettingsCurrentAdmin extends Admin
     protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
+            ->add('title')
             ->add('variable')
             ->add('subkey')
             ->add('type')
             ->add('category')
             ->add('selectedValue')
-            ->add('title')
             ->add('comment', 'textarea', array('attr' => array('class'=> 'ckeditor')))
-            ->add('urls', 'sonata_type_collection', array(
-                    'cascade_validation' => true,
-                ), array(
-                    'allow_delete' => true,
-                    'by_reference' => false,
-                    'edit'              => 'inline',
-                    'inline'            => 'table',
-                    //'btn_add' => true,
-                    //'multiple' => true
-                    //'sortable'          => 'position',
-                    //'link_parameters'   => array('content' => $users),
-                    'admin_code'        => 'sonata.admin.access_url_rel_course'
-                )
-            )
-            ->add('users', 'sonata_type_collection', array(
-                    'cascade_validation' => true,
-                ), array(
-                    'allow_delete' => true,
-                    'by_reference' => false,
-                    'edit'              => 'inline',
-                    'inline'            => 'table',
-                    //'btn_add' => true,
-                    //'multiple' => true
-                    //'sortable'          => 'position',
-                    //'link_parameters'   => array('content' => $users),
-                    'admin_code'        => 'sonata.admin.course_rel_user'
-                )
-            )
-            //->add('users', 'entity', array('class' => 'Chamilo\UserBundle\Entity\User', 'label' => 'Cliente'))
+            ->add('url')
         ;
     }
 
@@ -71,8 +43,9 @@ class SettingsCurrentAdmin extends Admin
     protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     {
         $datagridMapper
+            ->add('title')
             ->add('variable')
-            ->add('title')//->add('users')
+            ->add('category')
         ;
     }
 
@@ -83,6 +56,7 @@ class SettingsCurrentAdmin extends Admin
     {
         $listMapper
             ->addIdentifier('id')
+            ->add('category')
             ->addIdentifier('variable')
             ->addIdentifier('selected_value')
         ;
diff --git a/src/Chamilo/CoreBundle/Entity/AccessUrl.php b/src/Chamilo/CoreBundle/Entity/AccessUrl.php
index 11360a0a59..26dfbbf867 100644
--- a/src/Chamilo/CoreBundle/Entity/AccessUrl.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrl.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -66,7 +67,12 @@ class AccessUrl
     /**
      * @ORM\OneToMany(targetEntity="AccessUrlRelCourse", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
      **/
-    private $course;
+    protected $course;
+
+    /**
+     * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\SettingsCurrent", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
+     **/
+    protected $settings;
 
     /**
      * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\SessionCategory", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
diff --git a/src/Chamilo/CoreBundle/Entity/SettingsCurrent.php b/src/Chamilo/CoreBundle/Entity/SettingsCurrent.php
index 5c2b026165..cb99bb02bc 100644
--- a/src/Chamilo/CoreBundle/Entity/SettingsCurrent.php
+++ b/src/Chamilo/CoreBundle/Entity/SettingsCurrent.php
@@ -86,13 +86,6 @@ class SettingsCurrent implements ParameterInterface
      */
     private $subkeytext;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="access_url", type="integer", precision=0, scale=0, nullable=false, unique=false)
-     */
-    private $accessUrl;
-
     /**
      * @var integer
      *
@@ -107,9 +100,17 @@ class SettingsCurrent implements ParameterInterface
      */
     private $accessUrlLocked;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="AccessUrl", inversedBy="settings", cascade={"persist"})
+     * @ORM\JoinColumn(name="access_url", referencedColumnName="id")
+     */
+    protected $url;
+
+    /**
+     * Construct
+     */
     public function __construct()
     {
-        $this->accessUrl = 1;
         $this->accessUrlLocked = 0;
         $this->access_url_changeable = 1;
     }
@@ -337,9 +338,9 @@ class SettingsCurrent implements ParameterInterface
      * @param integer $accessUrl
      * @return SettingsCurrent
      */
-    public function setAccessUrl($accessUrl)
+    public function setUrl($accessUrl)
     {
-        $this->accessUrl = $accessUrl;
+        $this->url = $accessUrl;
 
         return $this;
     }
@@ -349,9 +350,9 @@ class SettingsCurrent implements ParameterInterface
      *
      * @return integer
      */
-    public function getAccessUrl()
+    public function getUrl()
     {
-        return $this->accessUrl;
+        return $this->url;
     }
 
     /**
diff --git a/src/Chamilo/CourseBundle/Event/CourseAccess.php b/src/Chamilo/CourseBundle/Event/CourseAccess.php
index 1649428021..74f1db7f05 100644
--- a/src/Chamilo/CourseBundle/Event/CourseAccess.php
+++ b/src/Chamilo/CourseBundle/Event/CourseAccess.php
@@ -1,25 +1,40 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CourseBundle\Event;
 
 use Symfony\Component\EventDispatcher\Event;
 
+/**
+ * Class CourseAccess
+ * @package Chamilo\CourseBundle\Event
+ */
 class CourseAccess extends Event
 {
     protected $user;
     protected $course;
 
+    /**
+     * @param $user
+     * @param $course
+     */
     public function __construct($user, $course)
     {
         $this->user = $user;
         $this->course = $course;
     }
 
+    /**
+     * @return User
+     */
     public function getUser()
     {
         return $this->user;
     }
 
+    /**
+     * @return Course
+     */
     public function getCourse()
     {
         return $this->course;
diff --git a/src/Chamilo/NotebookBundle/Admin/CNotebookAdmin.php b/src/Chamilo/NotebookBundle/Admin/CNotebookAdmin.php
index fdc3bf99c0..9af9392fb4 100644
--- a/src/Chamilo/NotebookBundle/Admin/CNotebookAdmin.php
+++ b/src/Chamilo/NotebookBundle/Admin/CNotebookAdmin.php
@@ -15,8 +15,8 @@ use Chamilo\CourseBundle\ToolChain;
 use Knp\Menu\ItemInterface as MenuItemInterface;
 
 /**
- * Class CourseAdmin (Sonata)
- * @package Chamilo\CoreBundle\Admin
+ * Class CNotebookAdmin (Sonata)
+ * @package Chamilo\NotebookBundle\Admin
  */
 class CNotebookAdmin extends Admin
 {
@@ -26,13 +26,12 @@ class CNotebookAdmin extends Admin
     protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
-            ->add('title')
-            ->add('description', 'textarea', array('attr' => array('class'=> 'ckeditor')))
-            ->add('cId')
-            ->add('notebookId')
-            ->add('userId')
-            ->add('course')
-            ->add('sessionId')
+            ->add('name', 'text')
+            ->add(
+                'description',
+                'textarea',
+                array('attr' => array('class' => 'ckeditor'))
+            )
         ;
     }
 
@@ -42,7 +41,7 @@ class CNotebookAdmin extends Admin
     protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     {
         $datagridMapper
-            ->add('title')
+            ->add('name')
         ;
     }
 
@@ -53,7 +52,7 @@ class CNotebookAdmin extends Admin
     {
         $listMapper
             ->addIdentifier('id')
-            ->addIdentifier('title')
+            ->addIdentifier('name')
         ;
     }
 }
diff --git a/src/Chamilo/NotebookBundle/Controller/CNotebookController.php b/src/Chamilo/NotebookBundle/Controller/CNotebookController.php
index 61f120f5be..52a1b9a924 100644
--- a/src/Chamilo/NotebookBundle/Controller/CNotebookController.php
+++ b/src/Chamilo/NotebookBundle/Controller/CNotebookController.php
@@ -27,7 +27,6 @@ use Chamilo\NotebookBundle\Entity\CNotebook;
  */
 class CNotebookController extends ResourceController
 {
-
     /**
      * @Route("/")
      */
diff --git a/src/Chamilo/NotebookBundle/DependencyInjection/ChamiloNotebookExtension.php b/src/Chamilo/NotebookBundle/DependencyInjection/ChamiloNotebookExtension.php
index 3952adbf8f..b1b605db5f 100644
--- a/src/Chamilo/NotebookBundle/DependencyInjection/ChamiloNotebookExtension.php
+++ b/src/Chamilo/NotebookBundle/DependencyInjection/ChamiloNotebookExtension.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\NotebookBundle\DependencyInjection;
 
@@ -21,5 +22,6 @@ class ChamiloNotebookExtension extends Extension
     {
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
+        $loader->load('admin.yml');
     }
 }
diff --git a/src/Chamilo/NotebookBundle/Form/Type/CNotebookType.php b/src/Chamilo/NotebookBundle/Form/Type/CNotebookType.php
index 4b2d20aea9..07835f4863 100644
--- a/src/Chamilo/NotebookBundle/Form/Type/CNotebookType.php
+++ b/src/Chamilo/NotebookBundle/Form/Type/CNotebookType.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\NotebookBundle\Form\Type;
 
@@ -12,7 +13,11 @@ class CNotebookType extends AbstractType
     {
         $builder
             ->add('name')
-            ->add('description', 'textarea')
+            ->add(
+                'description',
+                'textarea',
+                array('attr' => array('class' => 'ckeditor'))
+            )
             /*->add('cId')
             ->add('notebookId')
             ->add('userId')
diff --git a/src/Chamilo/NotebookBundle/Migrations/Schema/v2/NotebookBundle.php b/src/Chamilo/NotebookBundle/Migrations/Schema/v2/NotebookBundle.php
index ba3f1d4d33..7384652b50 100644
--- a/src/Chamilo/NotebookBundle/Migrations/Schema/v2/NotebookBundle.php
+++ b/src/Chamilo/NotebookBundle/Migrations/Schema/v2/NotebookBundle.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Migrations\Schema\v2;
 
diff --git a/src/Chamilo/NotebookBundle/Resources/config/admin.yml b/src/Chamilo/NotebookBundle/Resources/config/admin.yml
index 94f299ff9e..46de3e43db 100644
--- a/src/Chamilo/NotebookBundle/Resources/config/admin.yml
+++ b/src/Chamilo/NotebookBundle/Resources/config/admin.yml
@@ -2,11 +2,10 @@ services:
     sonata.admin.notebook:
         class: Chamilo\NotebookBundle\Admin\CNotebookAdmin
         tags:
-            - { name: sonata.admin, manager_type: orm, group: "LMS", label: "Course" }
+            - { name: sonata.admin, manager_type: orm, group: "LMS", label: "Notebook" }
         arguments:
             - ~
             - Chamilo\NotebookBundle\Entity\CNotebook
             - ~
         calls:
             - [ setTranslationDomain, [ChamiloCoreBundle]]
-
diff --git a/src/Chamilo/NotebookBundle/Settings/NotebookCourseSettingsSchema.php b/src/Chamilo/NotebookBundle/Settings/NotebookCourseSettingsSchema.php
index 661f7a1ccd..436fe87b1f 100644
--- a/src/Chamilo/NotebookBundle/Settings/NotebookCourseSettingsSchema.php
+++ b/src/Chamilo/NotebookBundle/Settings/NotebookCourseSettingsSchema.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\NotebookBundle\Settings;
 
diff --git a/src/Chamilo/NotebookBundle/Settings/NotebookSettingsSchema.php b/src/Chamilo/NotebookBundle/Settings/NotebookSettingsSchema.php
index b592266b72..69b7e7a8c9 100644
--- a/src/Chamilo/NotebookBundle/Settings/NotebookSettingsSchema.php
+++ b/src/Chamilo/NotebookBundle/Settings/NotebookSettingsSchema.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\NotebookBundle\Settings;