Changeset 3997

Timestamp:

04/12/11 16:21:25 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1595 - Relatorio mensal da agenda adiciona um dia a mais na listagem do que o requisitado

Location:

branches/2.2.0.1/calendar

Files:

• inc/class.uicalendar.inc.php (modified) (4 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)
• templates/default/footer.tpl (modified) (2 diffs)

branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php

@@ -581 +581 @@
                         else
                         {
-                                $num_dias = 0;
+                                $num_dias = '';
                         }
 
@@ -3174 +3174 @@
                                 $str_ini .= '<option value="'.$i.'"'.($i == $day?' selected':'').'>'.$i.'</option>'."\n";
                         }
-                        $str_qtd = '<option value="'.''.'"'.($i == $_POST['qtd_dias']?' selected':'').'>'.''.'</option>'."\n";
+                        $str_qtd = '<option value="'.''.'"'.(!$_POST['qtd_dias']?' selected':'').'>'.''.'</option>'."\n";
                         for ($i = 1; $i <= 45; $i++)
                         {
@@ -3194 +3194 @@
                                 'formname'              => 'SelectDay',
                                 'formonchange'          => 'document.SelectDay.submit()',
-                                'day_ini_label'         => lang('print starting in'),
+                                'day_ini_label'         => lang('print start day'),
                                 'num_dias_label'        => lang('quantity of days'),
-                                'tip'                   => lang('empty prints from the day chosen below to the end of the current month'),
+                                'tip'                   => lang('empty prints from the start day chosen to the end of the current month'),
                                 'day_ini_name'          => 'day',
                                 'num_dias_name'         => 'qtd_dias',
@@ -4304 +4304 @@
 //                      $monthend   = (int)(date('Ymd',mktime(0,0,0,$month + 1,0,$year)));
 
-                        if($num_dias != 0)
+                        if($num_dias != '')
                         {
                                 //se a qtde de dias for informada, a data final para impressao considera a soma $day_ini+$num_dias;
-                                $monthend   = (int)(date('Ymd',mktime(0,0,0,$month,$day_ini+$num_dias,$year)));
+                                $monthend   = (int)(date('Ymd',mktime(0,0,0,$month,$day_ini+$num_dias-1,$year)));
                         }
                         else

branches/2.2.0.1/calendar/templates/default/footer.tpl

@@ -37 +37 @@
  <font size="-1">
     <form action="{acao}" method="post" name="{formname}">
+
+        <span style="display: {display}">
+            <b>{day_ini_label}:</b>
+            <select name="{day_ini_name}" onchange="{formonchange}">
+                {row_ini}
+            </select>
+        </span>
+
+        <br /> <br />
+
     <span style="display: {display}" >
- 
         <label>
                 <b>{num_dias_label}:</b>
@@ -49 +58 @@
                 {tip}
         </span>
-        <br /> <br />
     </span>
-<span style="display: {display}">
-        <b>{day_ini_label}:</b>
-        <select name="{day_ini_name}" onchange="{formonchange}">
-        {row_ini}
-        </select>
-        </span>
 <input type="hidden" name="user" value="{user}">
         <noscript><input type="submit" value="{go}"></noscript>