From 1a9506150ecb7fa0574b6b4a2a5e73c78debaa3d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Mar 2020 03:04:53 +0100
Subject: [PATCH] NEW Can filter on donation status in list

---
 htdocs/don/index.php |  2 +-
 htdocs/don/list.php  | 15 ++++++++++++---
 htdocs/mrp/index.php |  3 +--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 122fe61dee4..93ce0e910ac 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -159,7 +159,7 @@ $totalnb = 0;
 foreach ($listofstatus as $status)
 {
     print '<tr class="oddeven">';
-    print '<td><a href="list.php?statut='.$status.'">'.$donstatic->LibStatut($status, 4).'</a></td>';
+    print '<td><a href="list.php?search_status='.$status.'">'.$donstatic->LibStatut($status, 4).'</a></td>';
     print '<td class="right">'.(!empty($nb[$status]) ? $nb[$status] : '&nbsp;').'</td>';
     print '<td class="right">'.(!empty($nb[$status]) ?price($somme[$status], 'MT') : '&nbsp;').'</td>';
     print '<td class="right">'.(!empty($nb[$status]) ?price(price2num($somme[$status] / $nb[$status], 'MT')) : '&nbsp;').'</td>';
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 48b5f108b81..3cd49a20649 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -43,7 +43,7 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="d.datedon";
 
-$search_status=(GETPOST("search_status", 'intcomma') != '') ? GETPOST("search_status", 'intcomma') : "-1";
+$search_status=(GETPOST("search_status", 'intcomma') != '') ? GETPOST("search_status", 'intcomma') : "-4";
 $search_all=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
 $search_ref=GETPOST('search_ref', 'alpha');
 $search_company=GETPOST('search_company', 'alpha');
@@ -60,6 +60,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_company = "";
 	$search_name = "";
 	$search_amount = "";
+	$search_status = '';
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -91,7 +92,7 @@ $sql.= " d.amount, d.fk_statut as status,";
 $sql.= " p.rowid as pid, p.ref, p.title, p.public";
 $sql.= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
 $sql.= " ON p.rowid = d.fk_projet WHERE d.entity IN (".getEntity('donation').")";
-if ($search_status != '' && $search_status != '-1')
+if ($search_status != '' && $search_status != '-4')
 {
 	$sql .= " AND d.fk_statut IN (".$db->escape($search_status).")";
 }
@@ -196,7 +197,15 @@ if ($resql)
         print '</td>';
     }
     print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
-    print '<td class="liste_titre right"></td>';
+    print '<td class="liste_titre right">';
+    $liststatus = array(
+    	Don::STATUS_DRAFT=>$langs->trans("DonationStatusPromiseNotValidated"),
+    	Don::STATUS_VALIDATED=>$langs->trans("DonationStatusPromiseValidated"),
+    	Don::STATUS_PAID=>$langs->trans("DonationStatusPaid"),
+    	Don::STATUS_CANCELED=>$langs->trans("Canceled")
+    );
+    print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+    print '</td>';
     print '<td class="liste_titre maxwidthsearch">';
     $searchpicto=$form->showFilterAndCheckAddButtons(0);
     print $searchpicto;
diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php
index 26524b2df6d..5b730adab6f 100644
--- a/htdocs/mrp/index.php
+++ b/htdocs/mrp/index.php
@@ -104,8 +104,7 @@ if ($conf->use_javascript_ajax)
     		$dolgraph->setShowLegend(1);
     		$dolgraph->setShowPercent(1);
     		$dolgraph->SetType(array('pie'));
-    		$dolgraph->setWidth('100%');
-    		$dolgraph->SetHeight(180);
+    		$dolgraph->SetHeight(200);
     		$dolgraph->draw('idgraphstatus');
     		print $dolgraph->show($totalnb?0:1);