diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index 66e68779a..39371f252 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -244,7 +244,9 @@ $path = array(
// From FollowUp , update a comment on a file
'update_comment_followUp'=>'ajax_follow_up',
// TVA param
- "tva_parameter"=>"ajax_tva_parameter"
+ "tva_parameter"=>"ajax_tva_parameter",
+ // Display all cards using an accounting
+ "display_all_card"=>"ajax_display_all_card"
) ;
if (array_key_exists($op, $path)) {
diff --git a/html/js/accounting_item.js b/html/js/accounting_item.js
index 80cae00f4..41f3a34ff 100644
--- a/html/js/accounting_item.js
+++ b/html/js/accounting_item.js
@@ -244,3 +244,28 @@ function pausecomp(millis)
do { curDate = new Date(); }
while(curDate-date < millis);
}
+/**
+ * Display the list of card using a given accounting
+ * @param dossier
+ * @param accounting
+ *
+ */
+function display_all_card(p_dossier,p_accounting)
+{
+ waiting_box();
+ var div_dest=add_div({id:'info_card_accounting',cssclass:"inner_box",style:fixed_position(100,250)+";width:auto"});
+ var action=new Ajax.Request ( 'ajax_misc.php',
+ {
+ method:'get',
+ parameters:{op:"display_all_card",
+ gDossier:p_dossier,
+ p_accounting:p_accounting
+ },
+ onSuccess:function (req)
+ {
+ div_dest.innerHTML=req.responseText;
+ remove_waiting_box();
+ }
+ }
+ );
+}
\ No newline at end of file
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 59575a8c0..694f3f358 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -26,6 +26,10 @@
var ask_reload = 0;
var tag_choose = '';
var aDraggableElement=new Array();
+var viewport = document.viewport.getDimensions(); // Gets the viewport as an object literal
+var width = viewport.width; // Usable window width
+var height = viewport.height;
+
/**
* callback function when we just need to update a hidden div with an info
* message
@@ -1486,6 +1490,9 @@ function calcy(p_sy)
{
sy = document.documentElement.scrollTop + p_sy;
}
+ if ( width < 801 ) {
+ sy=sy/2;
+ }
return sy;
}
diff --git a/include/ajax/ajax_display_all_card.php b/include/ajax/ajax_display_all_card.php
new file mode 100644
index 000000000..4f9b5168e
--- /dev/null
+++ b/include/ajax/ajax_display_all_card.php
@@ -0,0 +1,56 @@
+
+
+if (!defined('ALLOWED'))
+ die('Appel direct ne sont pas permis');
+
+/**
+ * @file
+ * @brief Display all cards using an accounting
+ */
+$accounting=$http->get("p_accounting");
+
+$a_card=$cn->get_array("
+ select f1.f_id,f3.ad_value as qcode, f2.ad_value as name
+ from fiche_detail as f1
+ join fiche_detail as f2 on (f1.f_id=f2.f_id and f2.ad_id=1)
+ join fiche_detail as f3 on (f1.f_id=f3.f_id and f3.ad_id=23)
+ where
+ f1.ad_id=5 and f1.ad_value=$1
+ order by 3", [$accounting]);
+$nb_card=count($a_card);
+echo HtmlInput::title_box($accounting, "info_card_accounting");
+echo '';
+echo '
';
+for ($i=0; $i<$nb_card; $i++)
+{
+ echo '- ';
+ echo HtmlInput::card_detail($a_card[$i]['qcode'], $a_card[$i]['name']);
+ echo '
';
+}
+echo '
';
+echo '
';
+echo '- ';
+echo HtmlInput::button_close("info_card_accounting");
+echo '
';
+echo '
';
+
+echo '
';
+ echo HtmlInput::card_detail($p_row[$v]) ;
+ echo ' | ';
+
+ }
+ elseif ($count > 1) {
+ echo '';
+ $a_code=explode(",",$p_row[$v]);
+ $nb_code=count($a_code);
+ for ($xx = 0;$xx < $nb_code;$xx++)
+ {
+ echo HtmlInput::card_detail($a_code[$xx]) ;
+ }
+ echo " ($count) ";
+ echo Icon_Action::detail(uniqid(), sprintf("display_all_card('%s','%s')",$dossier_id,$p_row["pcm_val"]));
+ echo ' | ';
+
+ }
}
elseif ($v=="pcm_lib")
{
@@ -160,6 +177,16 @@ class Acc_Plan_MTable extends Manage_Table_SQL
return true;
}
-
+ /**
+ * @brief display into a dialog box the datarow in order
+ * to be appended or modified. Can be override if you need
+ * a more complex form
+ */
+ function input()
+ {
+ parent::input();
+ $dossier_id=Dossier::id();
+ echo HtmlInput::button_action(_("Toutes les fiches") , sprintf("display_all_card('%s','%s')",$dossier_id,$this->table->pcm_val));
+ }
}
diff --git a/include/lib/icon_action.class.php b/include/lib/icon_action.class.php
index ad9a30bb9..8d31bc801 100644
--- a/include/lib/icon_action.class.php
+++ b/include/lib/icon_action.class.php
@@ -229,4 +229,18 @@ class Icon_Action
return $r;
}
+ static function detail($p_id,$p_javascript)
+ {
+ $r=sprintf('',
+ $p_id,
+ $p_javascript);
+ return $r;
+ }
+ static function more($p_id,$p_javascript)
+ {
+ $r=sprintf('...',
+ $p_id,
+ $p_javascript);
+ return $r;
+ }
}
diff --git a/include/template/account_result.php b/include/template/account_result.php
index d196bd50d..550535c27 100644
--- a/include/template/account_result.php
+++ b/include/template/account_result.php
@@ -42,7 +42,7 @@
$sep=" , ";
}
if ($max < count($det_qcode)) {
- echo "...";
+ echo Icon_Action::detail(uniqid(), sprintf("display_all_card('%s','%s')",$dossier_id,$array[$i]['pcm_val']));
}
} else {
echo HtmlInput::card_detail($array[$i]['acode']);