Fix category creation

main/inc/lib/sessionmanager.lib.php

@@ -2546,7 +2546,7 @@ class SessionManager
             $msg = get_lang('InvalidStartDate');
             return $msg;
         } elseif (!$month_end && !$day_end && !$year_end) {
-            $date_end = "null";
+            $date_end = '';
         } elseif (!$month_end || !$day_end || !$year_end || !checkdate($month_end, $day_end, $year_end)) {
             $msg = get_lang('InvalidEndDate');
             return $msg;
@@ -2559,21 +2559,26 @@ class SessionManager
         $params = [
             'name' => $name,
             'date_start' => $date_start,
-            'date_end' => $date_end,
             'access_url_id' => $access_url_id
         ];
-        $id_session = Database::insert($tbl_session_category, $params);
+
+        if (!empty($date_end)) {
+            $params['date_end'] = $date_end;
+        }
+
+        $id = Database::insert($tbl_session_category, $params);
 
         // Add event to system log
         $user_id = api_get_user_id();
         Event::addEvent(
             LOG_SESSION_CATEGORY_CREATE,
             LOG_SESSION_CATEGORY_ID,
-            $id_session,
+            $id,
             api_get_utc_datetime(),
             $user_id
         );
-        return $id_session;
+
+        return $id;
     }
 
     /**
@@ -6994,9 +6999,14 @@ class SessionManager
         $form->addButtonAdvancedSettings('advanced_params');
         $form->addElement('html','<div id="advanced_params_options" style="display:none">');
 
-        $form->addSelect('session_category', get_lang('SessionCategory'), $categoriesOptions, array(
-            'id' => 'session_category'
-        ));
+        $form->addSelect(
+            'session_category',
+            get_lang('SessionCategory'),
+            $categoriesOptions,
+            array(
+                'id' => 'session_category',
+            )
+        );
 
         $form->addHtmlEditor(
             'description',

main/inc/lib/userportal.lib.php

@@ -1411,12 +1411,19 @@ class IndexManager
                             'id' => $session_category['session_category']['id'],
                             'title' => $session_category['session_category']['name'],
                             'show_actions' => api_is_platform_admin(),
-                            'subtitle' => null,
+                            'subtitle' => '',
                             'sessions' => $html_sessions
                         );
 
                         $session_category_start_date = $session_category['session_category']['date_start'];
                         $session_category_end_date = $session_category['session_category']['date_end'];
+                        if ($session_category_start_date == '0000-00-00') {
+                            $session_category_start_date = '';
+                        }
+
+                        if ($session_category_end_date == '0000-00-00') {
+                            $session_category_end_date = '';
+                        }
 
                         if (
                             !empty($session_category_start_date) &&
@@ -1424,8 +1431,8 @@ class IndexManager
                         ) {
                             $categoryParams['subtitle'] = sprintf(
                                 get_lang('FromDateXToDateY'),
-                                $session_category['session_category']['date_start'],
-                                $session_category['session_category']['date_end']
+                                $session_category_start_date,
+                                $session_category_end_date
                             );
                         } else {
                             if (

main/session/session_category_list.php

@@ -4,9 +4,7 @@
  * List sessions categories
  * @package chamilo.admin
  */
-/**
- * Code
- */
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -42,7 +40,6 @@ if ($action == 'delete_on_session' || $action == 'delete_off_session') {
     exit();
 }
 
-//$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('PlatformAdmin'));
 $interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
 
 if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
@@ -91,7 +88,6 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
 	 			LIMIT $from,".($limit + 1);
 
     $query_rows = "SELECT count(*) as total_rows FROM $tbl_session_category sc $where ";
-
     $order = ($order == 'ASC') ? 'DESC' : 'ASC';
     $result_rows = Database::query($query_rows);
     $recorset = Database::fetch_array($result_rows);
@@ -173,8 +169,12 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
                     break;
                 }
                 $sql = 'SELECT COUNT(session_category_id)
-                FROM '.$tbl_session.' s INNER JOIN '.$table_access_url_rel_session.'  us ON (s.id = us.session_id)
-                WHERE s.session_category_id = '.intval($enreg['id']).' AND us.access_url_id = '.api_get_current_access_url_id();
+                        FROM '.$tbl_session.' s 
+                        INNER JOIN '.$table_access_url_rel_session.'  us 
+                        ON (s.id = us.session_id)
+                        WHERE 
+                            s.session_category_id = '.intval($enreg['id']).' AND 
+                            us.access_url_id = '.api_get_current_access_url_id();
 
                 $rs = Database::query($sql);
                 list($nb_courses) = Database::fetch_array($rs);
@@ -184,7 +184,15 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
                     <td><?php echo api_htmlentities($enreg['name'], ENT_QUOTES, $charset); ?></td>
                     <td><?php echo "<a href=\"session_list.php?id_category=".$enreg['id']."\">".$nb_courses." Session(s) </a>"; ?></td>
                     <td><?php echo api_format_date($enreg['date_start'], DATE_FORMAT_SHORT); ?></td>
-                    <td><?php echo api_format_date($enreg['date_end'], DATE_FORMAT_SHORT); ?></td>
+                    <td>
+                        <?php
+                        if (!empty($enreg['date_end']) && $enreg['date_end'] != '0000-00-00') {
+                            echo api_format_date($enreg['date_end'], DATE_FORMAT_SHORT);
+                        } else {
+                            echo '-';
+                        }
+                        ?>
+                    </td>
                     <td>
                         <a href="session_category_edit.php?&id=<?php echo $enreg['id']; ?>">
                             <?php Display::display_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL); ?>

src/Chamilo/CoreBundle/Entity/SessionCategory.php

@@ -16,7 +16,7 @@ class SessionCategory
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer", precision=0, scale=0, nullable=false, unique=false)
+     * @ORM\Column(name="id", type="integer", nullable=false, unique=false)
      * @ORM\Id
      * @ORM\GeneratedValue
      */
@@ -25,21 +25,21 @@ class SessionCategory
     /**
      * @var string
      *
-     * @ORM\Column(name="name", type="string", length=100, precision=0, scale=0, nullable=true, unique=false)
+     * @ORM\Column(name="name", type="string", length=100, nullable=true, unique=false)
      */
     private $name;
 
     /**
      * @var \DateTime
      *
-     * @ORM\Column(name="date_start", type="date", precision=0, scale=0, nullable=true, unique=false)
+     * @ORM\Column(name="date_start", type="date", nullable=true, unique=false)
      */
     private $dateStart;
 
     /**
      * @var \DateTime
      *
-     * @ORM\Column(name="date_end", type="date", precision=0, scale=0, nullable=true, unique=false)
+     * @ORM\Column(name="date_end", type="date", nullable=true, unique=false)
      */
     private $dateEnd;
 
@@ -66,7 +66,7 @@ class SessionCategory
      * Set url
      *
      * @param $url
-     * @return AccessUrlRelCourse
+     * @return SessionCategory
      */
     public function setUrl($url)
     {