[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 01/01: #1263 : representation hierarchique d
|
From: |
Dany De Bontridder |
|
Subject: |
[Noalyss-commit] [noalyss] 01/01: #1263 : representation hierarchique des tâches Montre les différents parents dans un onglet séparé |
|
Date: |
Fri, 29 Jan 2016 09:31:27 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit ae0e2185452947825685bd455de40d5aae43e807
Author: Dany De Bontridder <address@hidden>
Date: Fri Jan 29 10:23:51 2016 +0100
#1263 : representation hierarchique des tâches
Montre les différents parents dans un onglet séparé
---
include/class/class_follow_up.php | 84 +++++++++++++++++++++++++++++++++--
include/template/detail-action.php | 19 ++++++++-
2 files changed, 97 insertions(+), 6 deletions(-)
diff --git a/include/class/class_follow_up.php
b/include/class/class_follow_up.php
index 13323bd..86bec9b 100644
--- a/include/class/class_follow_up.php
+++ b/include/class/class_follow_up.php
@@ -1442,8 +1442,13 @@ class Follow_Up
$array=explode(",", $this->action);
for ($i=0; $i<count($array); $i++)
{
+ // Do not insert an option child of himself
+ if ( $this->ag_id == $array[$i]) {
+ continue;
+ }
+
if ($this->db->get_value("select count(*) from
action_gestion_related
- where (aga_least=$1 and aga_greatest=$2) or
(aga_greatest=$1 and aga_least=$2)", array($array[$i],
$this->ag_id))==0&&$this->ag_id!=$array[$i])
+ where (aga_least=$1 and aga_greatest=$2) or
(aga_greatest=$1 and aga_least=$2)", array($array[$i], $this->ag_id))==0)
{
$this->db->exec_sql("insert into
action_gestion_related(aga_least,aga_greatest) values ($1,$2)",
array($this->ag_id, $array[$i]));
}
@@ -1887,7 +1892,7 @@ class Follow_Up
p1.aga_greatest is not null and
p1.aga_greatest = p2.aga_least
)
- select key_path,aga_greatest,ag_title as title,depth
,to_char(ag_timestamp,'DD/MM/YY') as str_date,dt_value as action_ref
+ select key_path,aga_greatest,ag_title as title,depth
,to_char(ag_timestamp,'DD/MM/YY') as str_date,ag_ref||' '||dt_value as
action_ref
from
action_gestion join t on (ag_id=aga_greatest)
join document_type on (ag_type=dt_id)
@@ -1942,6 +1947,11 @@ class Follow_Up
for ($o=0; $o<count($action); $o++)
{
$class=($this->ag_id == $action[$o]['aga_greatest'])?'
class="highlight" ':'';
+
+ // Count the number of direct parents
+ $count_parent =$this->db->get_value('select count(*) from
action_gestion_related where aga_greatest =
$1',array($action[$o]['aga_greatest']));
+ $direct_parent=($count_parent > 1 ) ? _('direct parent
').$count_parent:"";
+
$margin=($action[$o]['depth']>1
)?str_repeat(" ",$action[$o]['depth']-1)."⇨":"";
if ($p_view!='READ'&&$p_base!='ajax')
{
@@ -1951,7 +1961,7 @@ class Follow_Up
$showAction='<a class="line"
href="'.$base."&ag_id=".$action[$o]['aga_greatest'].'">';
$js='<a class="tinybutton"
id="acact'.$action[$o]['aga_greatest'].'" href="javascript:void(0)"
onclick="'.$rmAction.'">'.SMALLX.'</a>';
echo '<li '.$class.'
id="act'.$action[$o]['aga_greatest'].'">'.$margin.$showAction.$action[$o]['str_date'].
-
h($action[$o]['title']).'('.h($action[$o]['action_ref']).')</a>'." "
+
h($action[$o]['title']).'('.h($action[$o]['action_ref']).')'.$direct_parent.'</a>'."
"
.$js.'</li>';
}
else
@@ -1964,7 +1974,7 @@ class Follow_Up
Dossier::id(), 1);
$showAction='<a class="line" href="javascript:'.$xaction.'">';
echo '<li '.$class.'
>'.$margin.$showAction.$action[$o]['str_date']." ".
-
h($action[$o]['title']).'('.h($action[$o]['action_ref']).')</a>'." "
+
h($action[$o]['title']).'('.h($action[$o]['action_ref']).')'.$direct_parent.'</a>'."
"
.'</li>';
}
/*
@@ -1974,7 +1984,71 @@ class Follow_Up
{
$showAction='<a class="line"
href="'.$base."&ag_id=".$action[$o]['aga_greatest'].'">';
echo '<li '.$class.'
>'.$margin.$showAction.$action[$o]['str_date']." ".
-
h($action[$o]['sub_title']).'('.h($action[$o]['action_ref']).')</a>'." "
+
h($action[$o]['sub_title']).'('.h($action[$o]['action_ref']).')'.$direct_parent.'</a>'."
"
+ .'</li>';
+ }
+ }
+ echo '</ul>';
+ }
+ /**
+ * Display the list of parent of the current Follow_Up
+ * \param $p_view form will be in readonly mode (value: READ, UPD or NEW )
+ * \param $p_base is the ac parameter
+ * \see Follow_Up::Display
+ * \return None display the HTML list
+ */
+ function display_parent($p_view,$p_base)
+ {
+ $a_parent=$this->db->get_array(
+ "
+ select ag_id,ag_title as title
,to_char(ag_timestamp,'DD/MM/YY') as str_date,ag_ref||' '||dt_value as
action_ref
+ from
+ action_gestion
+ join document_type on (ag_type=dt_id)
+ where ag_id in (select aga_least from action_gestion_related
where aga_greatest = $1)
+ order by ag_id
+ ", array($this->ag_id)
+ );
+ if ( empty($a_parent ) ) return;
+ echo '<ul style="padding-left:10px;list-style-type: none;">';
+ $base=HtmlInput::request_to_string(array("gDossier", "ac", "sa", "sb",
"sc",
+ "f_id"));
+ for ($o=0; $o<count($a_parent); $o++)
+ {
+ $class=($this->ag_id == $a_parent[$o]['ag_id'])?'
class="highlight" ':'';
+
+ if ($p_view!='READ'&&$p_base!='ajax')
+ {
+ $rmAction=sprintf("return confirm_box(null,'"._('Voulez-vous
effacer cette action ')."', function () {remove_action('%s','%s','%s');});",
+ dossier::id(), $a_parent[$o]['ag_id'],
+ $_REQUEST['ag_id']);
+ $showAction='<a class="line"
href="'.$base."&ag_id=".$a_parent[$o]['ag_id'].'">';
+ $js='<a class="tinybutton"
id="acact'.$a_parent[$o]['ag_id'].'" href="javascript:void(0)"
onclick="'.$rmAction.'">'.SMALLX.'</a>';
+ echo '<li '.$class.'
id="act'.$a_parent[$o]['ag_id'].'">'.$showAction.$a_parent[$o]['str_date'].
+
h($a_parent[$o]['title']).'('.h($a_parent[$o]['action_ref']).')'.'</a>'." "
+ .$js.'</li>';
+ }
+ else
+ /*
+ * Display detail requested from Ajax Div
+ */
+ if ($p_base=='ajax')
+ {
+ $xaction=sprintf('view_action(%d,%d,%d)',
$a_parent[$o]['ag_id'],
+ Dossier::id(), 1);
+ $showAction='<a class="line" href="javascript:'.$xaction.'">';
+ echo '<li '.$class.'
>'.$margin.$showAction.$a_parent[$o]['str_date']." ".
+
h($a_parent[$o]['title']).'('.h($a_parent[$o]['action_ref']).')'.'</a>'." "
+ .'</li>';
+ }
+ /*
+ * READ ONLY
+ */
+ else
+ {
+ $showAction='<a class="line"
href="'.$base."&ag_id=".$a_parent[$o]['ag_id'].'">';
+ echo '<li '.$class.'
>'.$margin.$showAction.$a_parent[$o]['str_date']." ".
+
h($a_parent[$o]['sub_title']).'('.h($a_parent[$o]['action_ref']).')'.'</a>'." "
.'</li>';
}
}
diff --git a/include/template/detail-action.php
b/include/template/detail-action.php
index 2d90e9b..2821975 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -165,6 +165,7 @@ $uniq=HtmlInput::generate_id("tab");
<ul class="tabs">
<li id="related_action_tab<?php echo $uniq?>"
class="tabs_selected"><?php echo _("Actions concernées")?></li>
<li id="related_operation_tab<?php echo $uniq?>" class="tabs"><?php
echo _('Opérations concernées')?></li>
+ <li id="dependant_action_tab<?php echo $uniq?>" class="tabs"><?php
echo _('Dépendant')?></li>
</ul>
<div id="related_operation_div<?php echo $uniq?>" style="display:none">
@@ -204,6 +205,11 @@ $uniq=HtmlInput::generate_id("tab");
<?php if ( $p_view != 'READ') echo '<span
class="noprint">'.$iaction->input().'</span>';?>
</div>
+ <div id="dependant_action_div<?php echo $uniq?>" style="display:none">
+ <?php
+ $this->display_parent($p_view,$p_base);
+ ?>
+ </div>
</div>
</div>
@@ -482,14 +488,25 @@ Document créé le <?php echo $this->ag_timestamp ?> par
<?php echo $this->ag_ow
$('related_action_tab<?php echo $uniq?>').onclick=function() {
$('related_action_tab<?php echo $uniq?>').className='tabs_selected';
$('related_operation_tab<?php echo $uniq?>').className='tabs';
+ $('dependant_action_tab<?php echo $uniq?>').className='tabs';
$('related_operation_div<?php echo $uniq?>').hide();
+ $('dependant_action_div<?php echo $uniq?>').hide();
$('related_action_div<?php echo $uniq?>').show();
}
$('related_operation_tab<?php echo $uniq?>').onclick=function() {
$('related_operation_tab<?php echo $uniq?>').className='tabs_selected';
$('related_action_tab<?php echo $uniq?>').className='tabs';
+ $('dependant_action_tab<?php echo $uniq?>').className='tabs';
$('related_action_div<?php echo $uniq?>').hide();
+ $('dependant_action_div<?php echo $uniq?>').hide();
$('related_operation_div<?php echo $uniq?>').show();
}
-
+ $('dependant_action_tab<?php echo $uniq?>').onclick=function() {
+ $('dependant_action_tab<?php echo $uniq?>').className='tabs_selected';
+ $('related_action_tab<?php echo $uniq?>').className='tabs';
+ $('related_operation_tab<?php echo $uniq?>').className='tabs';
+ $('related_operation_div<?php echo $uniq?>').hide();
+ $('related_action_div<?php echo $uniq?>').hide();
+ $('dependant_action_div<?php echo $uniq?>').show();
+ }
</script>
\ No newline at end of file