From cc6586cc8d06cf056668bec44036acd208af8eeb Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Mon, 30 Dec 2013 14:37:49 +0000
Subject: [PATCH] Agenda de base Task #957 - Agenda

---
 html/admin/sql/patch/upgrade111.sql | 7 +++++++
 html/ajax_misc.php                  | 2 +-
 html/js/scripts.js                  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/html/admin/sql/patch/upgrade111.sql b/html/admin/sql/patch/upgrade111.sql
index be7d5bc1e..f7614e80b 100644
--- a/html/admin/sql/patch/upgrade111.sql
+++ b/html/admin/sql/patch/upgrade111.sql
@@ -16,6 +16,13 @@ insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_display,pm_de
 values
 ('CFGDEFMENU','MOD',1,30,'E',0);
 
+insert into menu_ref(me_code,me_menu,me_file, me_url,me_description,me_parameter,me_javascript,me_type,me_description_etendue)
+values
+('AGENDA','Agenda','calendar.inc.php',null,'Agenda',null,null,'ME','Agenda, présentation du suivi sous forme d''agenda ');
+
+insert into profile_menu (me_code,me_code_dep,p_id,p_order, p_type_display,pm_default) 
+values
+('AGENDA','NULL',1,410,'M',0),('AGENDA','NULL',2,410,'M',0);
 
 create table menu_default
 (
diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index 91aa9338a..584481b1b 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -126,7 +126,7 @@ EOF;
 		$cal->set_periode($per);
 
 		$html = "";
-		$html = $cal->display();
+		$html = $cal->display($_GET['t']);
 		$html = escape_xml($html);
 		header('Content-type: text/xml; charset=UTF-8');
 		echo <<<EOF
diff --git a/html/js/scripts.js b/html/js/scripts.js
index b796ce9c2..cb6b2d12f 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -342,7 +342,7 @@ function getNodeText(xmlNode)
  */
 function change_month(obj)
 {
-    var queryString = "gDossier=" + obj.gDossier + "&op=cal" + "&per=" + obj.value;
+    var queryString = "gDossier=" + obj.gDossier + "&op=cal" + "&per=" + obj.value+"&t="+obj.type_display;
     var action = new Ajax.Request(
             "ajax_misc.php", {method: 'get', parameters: queryString, onFailure: ajax_misc_failure, onSuccess: success_misc}
     );