[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5050 - in phpcompta/tags/rel650: html html/js include i
From: |
phpcompta-dev |
Subject: |
[Phpcompta-dev] r5050 - in phpcompta/tags/rel650: html html/js include include/template |
Date: |
Sat, 30 Jun 2012 07:07:54 +0200 (CEST) |
Author: danydb
Date: 2012-06-30 07:07:54 +0200 (Sat, 30 Jun 2012)
New Revision: 5050
Modified:
phpcompta/tags/rel650/html/ajax_misc.php
phpcompta/tags/rel650/html/js/scripts.js
phpcompta/tags/rel650/include/class_follow_up.php
phpcompta/tags/rel650/include/dashboard.inc.php
phpcompta/tags/rel650/include/template/dashboard.php
Log:
------------------------------------------------------------------------
r5048 | danydb | 2012-06-30 06:09:28 +0200 (Sat, 30 Jun 2012) | 1 line
Cosmetic : select tva
------------------------------------------------------------------------
r5049 | danydb | 2012-06-30 06:31:21 +0200 (Sat, 30 Jun 2012) | 1 line
Cosmetic: ajout action - retard
------------------------------------------------------------------------
Modified: phpcompta/tags/rel650/html/ajax_misc.php
===================================================================
--- phpcompta/tags/rel650/html/ajax_misc.php 2012-06-30 04:31:21 UTC (rev
5049)
+++ phpcompta/tags/rel650/html/ajax_misc.php 2012-06-30 05:07:54 UTC (rev
5050)
@@ -185,7 +185,7 @@
$r = HtmlInput::anchor_close('tva_select');
$r.=h2info('Choississez la TVA ');
$r.='<div >';
- $r.= '<TABLE
style="padding-left:10%;padding-right:10%;width:80%">';
+ $r.= '<TABLE style="width:100%">';
$r.=th('');
$r.=th(_('code'));
$r.=th(_('Taux'));
@@ -218,7 +218,8 @@
}
}
$set = '<INPUT TYPE="BUTTON" class="button"
Value="select" ' . $script . '>';
- $r.='<tr>';
+ $class=($i%2 == 0)?' class="odd" ':' class="even" ';
+ $r.='<tr'.$class. '>';
$r.=td($set);
$r.=td($row['tva_id']);
$r.=td($row['tva_rate']);
Modified: phpcompta/tags/rel650/html/js/scripts.js
===================================================================
--- phpcompta/tags/rel650/html/js/scripts.js 2012-06-30 04:31:21 UTC (rev
5049)
+++ phpcompta/tags/rel650/html/js/scripts.js 2012-06-30 05:07:54 UTC (rev
5050)
@@ -473,7 +473,7 @@
var nTop=posY-50;
var nLeft="35%";
- var str_style="top:"+nTop+";left:"+nLeft+";width:50em;height:auto";
+ var str_style="top:"+nTop+";left:"+nLeft+";width:55em;height:auto";
var popup={'id':
'tva_select','cssclass':'inner_box','style':str_style,'html':loading(),'drag':true};
add_div(popup);
Modified: phpcompta/tags/rel650/include/class_follow_up.php
===================================================================
--- phpcompta/tags/rel650/include/class_follow_up.php 2012-06-30 04:31:21 UTC
(rev 5049)
+++ phpcompta/tags/rel650/include/class_follow_up.php 2012-06-30 05:07:54 UTC
(rev 5050)
@@ -823,7 +823,7 @@
*/
function Update()
{
-
+
// if ag_id == 0 nothing to do
if ($this->ag_id == 0)
return;
@@ -1021,11 +1021,24 @@
{
$sql = "select coalesce(vw_name,'Interne') as
vw_name,ag_id,ag_title,ag_ref, dt_value,to_char(ag_timestamp,'DD.MM.YYYY') as
ag_timestamp_fmt,ag_timestamp " .
" from action_gestion join document_type " .
- " on (ag_type=dt_id) left join vw_fiche_attr on
(f_id=f_id_dest) where ag_state in (2,3)
+ " on (ag_type=dt_id) left join vw_fiche_attr on
(f_id=f_id_dest) where ag_state not in (1,4)
and
to_char(ag_remind_date,'DDMMYYYY')=to_char(now(),'DDMMYYYY') ";
$array = $this->db->get_array($sql);
return $array;
}
+ /**
+ * get the action where the remind day is today
+ * @return array
+ */
+ function get_late()
+ {
+ $sql = "select coalesce(vw_name,'Interne') as
vw_name,ag_id,ag_title,ag_ref, dt_value,to_char(ag_timestamp,'DD.MM.YYYY') as
ag_timestamp_fmt,ag_timestamp " .
+ " from action_gestion join document_type " .
+ " on (ag_type=dt_id) left join vw_fiche_attr on
(f_id=f_id_dest) where ag_state not in (1,4)
+ and
to_char(ag_remind_date,'DDMMYYYY')<=to_char(now(),'DDMMYYYY') ";
+ $array = $this->db->get_array($sql);
+ return $array;
+ }
/**
* insert a related operation
*/
@@ -1152,7 +1165,7 @@
/**
address@hidden show a list of actions
* @param $cn database connextion
- * @param $p_base base URL
+ * @param $p_base base URL
*/
static function show_action_list($cn, $p_base)
{
@@ -1185,7 +1198,7 @@
extract($p_array);
$query = "";
-
+
if (isset($_REQUEST['query']))
{
// if a query is request build the sql stmt
Modified: phpcompta/tags/rel650/include/dashboard.inc.php
===================================================================
--- phpcompta/tags/rel650/include/dashboard.inc.php 2012-06-30 04:31:21 UTC
(rev 5049)
+++ phpcompta/tags/rel650/include/dashboard.inc.php 2012-06-30 05:07:54 UTC
(rev 5050)
@@ -21,6 +21,7 @@
$cal->get_preference();
$Operation=new Follow_Up($cn);
$last_operation=$Operation->get_today();
+$late_operation=$Operation->get_late();
$Ledger=new Acc_Ledger($cn,0);
$last_ledger=array();
$last_ledger=$Ledger->get_last(20);
Modified: phpcompta/tags/rel650/include/template/dashboard.php
===================================================================
--- phpcompta/tags/rel650/include/template/dashboard.php 2012-06-30
04:31:21 UTC (rev 5049)
+++ phpcompta/tags/rel650/include/template/dashboard.php 2012-06-30
05:07:54 UTC (rev 5050)
@@ -1,5 +1,5 @@
-<div style="float:left;width:50%">
-<fieldset style="width:100%">
+<div style="float:left;width: 45%">
+<fieldset >
<legend><?=_('Calendrier')?>
</legend>
<?php echo $cal->display(); ?>
@@ -24,7 +24,7 @@
$array=$todo->load_all();
?>
-<div style="float:right;width:45%">
+<div style="float:right;width: 45%">
<fieldset> <legend><?=_('Pense-Bête')?></legend>
<?php
@@ -57,65 +57,63 @@
?>
</fieldset>
</div>
-<div style="float:right;width:45%">
-<fieldset>
-<legend><?=_('Action pour aujourd\'hui')?>
-</legend>
-<ol>
-<?php
-for($i=0;$i<count($last_operation);$i++):
-?>
-<li>
-<span>
-<?=smaller_date($last_operation[$i]['ag_timestamp_fmt'])?>
-</span>
- <span style="font-weight: bolder ">
- <?=h($last_operation[$i]['vw_name'])?>
+<div style="float:left;clear:both"></div>
+<div style="float:right;width: 45%">
+<? if (count($last_operation)> 0) : ?>
+ <fieldset>
+ <legend><?=_('Action pour aujourd\'hui')?>
+ </legend>
+ <ol>
+ <?php
+ for($i=0;$i<count($last_operation);$i++):
+ ?>
+ <li>
+ <span>
+ <?=smaller_date($last_operation[$i]['ag_timestamp_fmt'])?>
</span>
-<span>
- <?=h(mb_substr($last_operation[$i]['ag_title'],0,40,'UTF-8'))?>
-</span>
-<span style="font-style: italic">
-<?=$last_operation[$i]['dt_value']?>
-</span>
-</li>
-<? endfor;?>
-</ol>
-</fieldset>
-</div>
+ <span style="font-weight: bolder ">
+ <?=h($last_operation[$i]['vw_name'])?>
+ </span>
+ <span>
+ <?=h(mb_substr($last_operation[$i]['ag_title'],0,60,'UTF-8'))?>
+ </span>
+ <span style="font-style: italic">
+ <?=$last_operation[$i]['dt_value']?>
+ </span>
+ </li>
+ <? endfor;?>
+ </ol>
+ </fieldset>
+<? endif; ?>
-<div style="float:right;width:45%">
-<fieldset>
-<legend><?=_('Dernières opérations')?>
-</legend>
-<table style="width: 100%">
-<?php
-for($i=0;$i<count($last_ledger);$i++):
- $class=($i%2==0)?' class="even" ':' class="odd" ';
-?>
-<tr <?=$class ?>>
- <td><?= smaller_date($last_ledger[$i]['jr_date_fmt'])?>
- </td>
- <td>
- <?=$last_ledger[$i]['jrn_def_code']?>
- </td>
-<td>
- <?=h(mb_substr($last_ledger[$i]['jr_comment'],0,40,'UTF-8'))?>
-</td>
-<td>
-<?=HtmlInput::detail_op($last_ledger[$i]['jr_id'],
$last_ledger[$i]['jr_internal'])?>
-</td>
-<td class="num">
-<?=nbm($last_ledger[$i]['jr_montant'])?>
-</td>
-
-</tr>
-<? endfor;?>
-</ul></table>
-</fieldset>
+<? if (count($late_operation)> 0) : ?>
+ <fieldset>
+ <legend><?=_('Action en retard ')?>
+ </legend>
+ <ol>
+ <?php
+ for($i=0;$i<count($late_operation);$i++):
+ ?>
+ <li>
+ <span>
+ <?=smaller_date($late_operation[$i]['ag_timestamp_fmt'])?>
+ </span>
+ <span style="font-weight: bolder ">
+ <?=h($late_operation[$i]['vw_name'])?>
+ </span>
+ <span>
+ <?=h(mb_substr($late_operation[$i]['ag_title'],0,60,'UTF-8'))?>
+ </span>
+ <span style="font-style: italic">
+ <?=$late_operation[$i]['dt_value']?>
+ </span>
+ </li>
+ <? endfor;?>
+ </ol>
+ </fieldset>
+<? endif; ?>
</div>
-
- <div style="float:left;width:50%;clear:left">
+ <div style="float:left;width: 45%">
<?php
/*
* Mini Report
@@ -162,8 +160,40 @@
?>
</div>
+
+<div style="float:right;width: 45%">
+<fieldset>
+<legend><?=_('Dernières opérations')?>
+</legend>
+<table style="width: 100%">
+<?php
+for($i=0;$i<count($last_ledger);$i++):
+ $class=($i%2==0)?' class="even" ':' class="odd" ';
+?>
+<tr <?=$class ?>>
+ <td><?= smaller_date($last_ledger[$i]['jr_date_fmt'])?>
+ </td>
+ <td>
+ <?=$last_ledger[$i]['jrn_def_code']?>
+ </td>
+<td>
+ <?=h(mb_substr($last_ledger[$i]['jr_comment'],0,40,'UTF-8'))?>
+</td>
+<td>
+<?=HtmlInput::detail_op($last_ledger[$i]['jr_id'],
$last_ledger[$i]['jr_internal'])?>
+</td>
+<td class="num">
+<?=nbm($last_ledger[$i]['jr_montant'])?>
+</td>
+
+</tr>
+<? endfor;?>
+</ul></table>
+</fieldset>
</div>
+
+
<div id="add_todo_list" class="add_todo_list">
<script charset="utf8" type="text/javascript" language="javascript">
new Draggable($('add_todo_list'),{});
---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r5050 - in phpcompta/tags/rel650: html html/js include include/template,
phpcompta-dev <=