[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 04/09: Documentation
From: |
dwm |
Subject: |
[Noalyss-commit] [noalyss] 04/09: Documentation |
Date: |
Mon, 19 Aug 2024 15:03:10 -0400 (EDT) |
sparkyx pushed a commit to branch unstable
in repository noalyss.
commit 7828333c02ac45ff8984cb3479afb550531698ff
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Sun Aug 18 22:42:39 2024 +0200
Documentation
---
include/ajax/ajax_calendar_zoom.php | 2 +-
include/class/calendar.class.php | 12 ++++++------
include/class/noalyss_user.class.php | 1 +
3 files changed, 8 insertions(+), 7 deletions(-)
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
- [Noalyss-commit] [noalyss] branch unstable updated (bed2fd54a -> ffa6cb848), dwm, 2024/08/19
- [Noalyss-commit] [noalyss] 04/09: Documentation,
dwm <=
- [Noalyss-commit] [noalyss] 02/09: Widget : add install.php for each, dwm, 2024/08/19
- [Noalyss-commit] [noalyss] 03/09: Widget : javascript variable uniq, dwm, 2024/08/19
- [Noalyss-commit] [noalyss] 08/09: PHPUnit : update test, dwm, 2024/08/19
- [Noalyss-commit] [noalyss] 09/09: Cosmetic : loading of widget, dwm, 2024/08/19
- [Noalyss-commit] [noalyss] 06/09: WIDGET : ergonomy, show a number on the widget the dialog box to manage them appears, dwm, 2024/08/19
- [Noalyss-commit] [noalyss] 01/09: widget : Creation of widget for the DASHBOARD Contains widget Agenda, Todo List, Report , ..., dwm, 2024/08/19
- [Noalyss-commit] [noalyss] 05/09: Cosmetic and Documentation, dwm, 2024/08/19
- [Noalyss-commit] [noalyss] 07/09: WIDGET : db upgrade 199, dwm, 2024/08/19