[Phpcompta-dev] r5481 - in phpcompta/trunk/include: . template

[phpcompta-dev]

Author: danydb
Date: 2013-10-09 20:21:43 +0200 (Wed, 09 Oct 2013)
New Revision: 5481

Modified:
   phpcompta/trunk/include/class_calendar.php
   phpcompta/trunk/include/template/calendar.php
   phpcompta/trunk/include/template/dashboard.php
Log:
Improve calendar and fix bug for appearance in chrome


Modified: phpcompta/trunk/include/class_calendar.php
===================================================================
--- phpcompta/trunk/include/class_calendar.php  2013-10-09 17:53:24 UTC (rev 
5480)
+++ phpcompta/trunk/include/class_calendar.php  2013-10-09 18:21:43 UTC (rev 
5481)
@@ -53,9 +53,11 @@
                $profile=$g_user->get_profile();
 
         $cn=new Database(dossier::id());
-        $sql="select ag_id,to_char(ag_remind_date,'DD')::integer as 
ag_timestamp_day,ag_title,ag_hour
+        $sql="select ag_id,to_char(ag_remind_date,'DD')::integer as 
ag_timestamp_day,ag_title,ag_hour,
+             coalesce(name,'interne') as str_name
                        ".
              " from action_gestion ".
+             "  left join vw_fiche_name  on (f_id=f_id_dest) ".
              " where ".
              " to_char(ag_remind_date,'MM')::integer=$1 ".
              " and to_char(ag_remind_date,'YYYY')::integer=$2 ".
@@ -70,6 +72,7 @@
             $this->action[$ind][]=$array[$i]['ag_id'];
             $this->title[$ind][]=$array[$i]['ag_title'];
             $this->hour[$ind][]=$array[$i]['ag_hour'];
+            $this->str_name[$ind][]=$array[$i]['str_name'];
 
         }
                /*
@@ -99,7 +102,7 @@
                         $p_array[$day].="<ol>";
                        for ($i=0;$i<count($aAction);$i++)
                        {
-                               
$p_array[$day].='<li>&rarr;'.HtmlInput::detail_action($aAction[$i], 
$this->hour[$day][$i]." ".$this->title[$day][$i]).'</li>';
+                               
$p_array[$day].='<li>'.hb($this->str_name[$day][$i]).'&rarr;'.HtmlInput::detail_action($aAction[$i],
 $this->hour[$day][$i]." ".$this->title[$day][$i]).'</li>';
                        }
                        $p_array[$day].='</ol>';
                }
@@ -171,6 +174,7 @@
         $wMonth->set_attribute('gDossier',dossier::id());
         $month_year=$wMonth->input().$wMonth->get_js_attr();
         ob_start();
+        $zoom=0;
         require_once('template/calendar.php');
 
                if (count($this->action_div) > 0)
@@ -257,6 +261,7 @@
             dossier::id(),'per_div','calendar_zoom_div');
         $wMonth->set_attribute('gDossier',dossier::id());
         $month_year=$wMonth->input().$wMonth->get_js_attr();
+        $zoom=1;
         ob_start();
         require_once('template/calendar.php');
 

Modified: phpcompta/trunk/include/template/calendar.php
===================================================================
--- phpcompta/trunk/include/template/calendar.php       2013-10-09 17:53:24 UTC 
(rev 5480)
+++ phpcompta/trunk/include/template/calendar.php       2013-10-09 18:21:43 UTC 
(rev 5481)
@@ -1,6 +1,10 @@
 <div class="pc_calendar" id="user_cal" style="width:100%">
 <?php echo $month_year?>
+<?php if ($zoom == 1 ): ?>    
 <table style="width:100%;height:80%">
+    <?php else: ?>
+<table style="width:100%;">
+    <?php endif; ?>
 <tr>
 <?php
 for ($i=0;$i<=6;$i++){

Modified: phpcompta/trunk/include/template/dashboard.php
===================================================================
--- phpcompta/trunk/include/template/dashboard.php      2013-10-09 17:53:24 UTC 
(rev 5480)
+++ phpcompta/trunk/include/template/dashboard.php      2013-10-09 18:21:43 UTC 
(rev 5481)
@@ -153,7 +153,7 @@
 ?>
 </fieldset>
 </div>
-<div style="float:left;clear:both"></div>
+
 <div style="float:right;width: 49%">
        
 <div id="action_late_div"  class="inner_box" 
style="display:none;margin-left:25%;top:25%;width: 50%;height:50%;overflow: 
auto;">



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu