diff --git a/include/ajax/ajax_calendar_zoom.php b/include/ajax/ajax_calendar_zoom.php index 594bddd7d..23d5da39d 100644 --- a/include/ajax/ajax_calendar_zoom.php +++ b/include/ajax/ajax_calendar_zoom.php @@ -23,7 +23,7 @@ */ if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); $http=new HttpInput(); - +$distype=$http->request('distype'); ob_start(); if ($notitle==0) { diff --git a/include/class/calendar.class.php b/include/class/calendar.class.php index d3a5fb962..450e293dd 100644 --- a/include/class/calendar.class.php +++ b/include/class/calendar.class.php @@ -313,8 +313,8 @@ class Calendar return $ret; } /** - * Display the next events for 30 days - * todo list + action to remind + * @brief Display the next events for 30 days + * @todo todo list + action to remind */ function zoom_list($notitle) { @@ -323,7 +323,8 @@ class Calendar $profile=$g_user->get_profile(); // Get the event from now and before 30 before - // union the TODO list + + $sql = " select ag_id,ag_remind_date,to_char(ag_remind_date,'DD.MM.YY') as str_date,ag_title,ag_hour, coalesce(name,'interne') as str_name, @@ -334,9 +335,8 @@ class Calendar coalesce (ag_remind_date::date,current_date) - current_date as delta_days from action_gestion left join vw_fiche_name on (f_id=f_id_dest) - where - ag_dest in (select p_granted from user_sec_action_profile where p_id =$1) - and ag_state IN (2, 3) + where ag_dest in (select p_granted from user_sec_action_profile where p_id =$1) + and ag_state IN (2, 3) and ag_remind_date is not null order by ag_remind_date,ag_hour "; diff --git a/include/class/noalyss_user.class.php b/include/class/noalyss_user.class.php index 250ec4733..d05ae8d53 100644 --- a/include/class/noalyss_user.class.php +++ b/include/class/noalyss_user.class.php @@ -1496,6 +1496,7 @@ class Noalyss_User */ function can_add_action($p_profile) { + $r=$this->db->get_value(' select count(*) from user_sec_action_profile where p_granted=$2