admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Documentation

Browse source
This commit is contained in:
sparkyx 2024-08-18 22:42:39 +02:00
parent 9d1f7bf29d
commit 7828333c02
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/ajax/ajax_calendar_zoom.php
View file

@ -23,7 +23,7 @@
*/ */
if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
$http=new HttpInput(); $http=new HttpInput();
$distype=$http->request('distype');
ob_start(); ob_start();
if ($notitle==0) if ($notitle==0)
{ {

12
include/class/calendar.class.php
View file

@ -313,8 +313,8 @@ class Calendar
return $ret; return $ret;
} }
/** /**
* Display the next events for 30 days * @brief Display the next events for 30 days
* todo list + action to remind * @todo todo list + action to remind
*/ */
function zoom_list($notitle) function zoom_list($notitle)
{ {
@ -323,7 +323,8 @@ class Calendar
$profile=$g_user->get_profile(); $profile=$g_user->get_profile();
// Get the event from now and before 30 before // Get the event from now and before 30 before
// union the TODO list
$sql = " $sql = "
select ag_id,ag_remind_date,to_char(ag_remind_date,'DD.MM.YY') as str_date,ag_title,ag_hour, 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, coalesce(name,'interne') as str_name,
@ -334,9 +335,8 @@ class Calendar
coalesce (ag_remind_date::date,current_date) - current_date as delta_days coalesce (ag_remind_date::date,current_date) - current_date as delta_days
from action_gestion from action_gestion
left join vw_fiche_name on (f_id=f_id_dest) left join vw_fiche_name on (f_id=f_id_dest)
where where ag_dest in (select p_granted from user_sec_action_profile where p_id =$1)
ag_dest in (select p_granted from user_sec_action_profile where p_id =$1) and ag_state IN (2, 3)
and ag_state IN (2, 3)
and ag_remind_date is not null and ag_remind_date is not null
order by ag_remind_date,ag_hour order by ag_remind_date,ag_hour
"; ";

1
include/class/noalyss_user.class.php
View file

@ -1496,6 +1496,7 @@ class Noalyss_User
*/ */
function can_add_action($p_profile) function can_add_action($p_profile)
{ {
$r=$this->db->get_value(' select count(*) $r=$this->db->get_value(' select count(*)
from user_sec_action_profile from user_sec_action_profile
where p_granted=$2 where p_granted=$2