Merge pull request #2300 from aschio/develop

NEW: search filter fields in list project page

htdocs/projet/list.php

@@ -4,6 +4,7 @@
  * Copyright (C) 2005      Marc Bariley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015 		 Claudio Aschieri 		<c.aschieri@19.coop>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +29,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 $langs->load('projects');
 
@@ -64,6 +66,16 @@ $search_label=GETPOST("search_label");
 $search_societe=GETPOST("search_societe");
 $search_year=GETPOST("search_year");
 $search_all=GETPOST("search_all");
+$search_status=GETPOST("search_status",'int');
+$search_public=GETPOST("search_public",'int');
+$search_user=GETPOST('search_user','int');
+$search_sale=GETPOST('search_sale','int');
+
+$day		= GETPOST('day','int');
+$month	= GETPOST('month','int');
+$year		= GETPOST('year','int');
+
+
 
 // Purge criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
@@ -73,6 +85,13 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_societe="";
 	$search_year="";
 	$search_all=0;
+	$search_status=1;
+	$search_public="";
+	$search_sale="";
+	$search_user='';
+	$day="";
+	$month="";
+	$year="";
 }
 
 /*
@@ -81,6 +100,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 
 $projectstatic = new Project($db);
 $socstatic = new Societe($db);
+$form = new Form($db);
+$formother = new FormOther($db);
 
 llxHeader("",$langs->trans("Projects"),"EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos");
 
@@ -92,6 +113,15 @@ $sql.= ", p.datec as date_create, p.dateo as date_start, p.datee as date_end";
 $sql.= ", s.nom as name, s.rowid as socid";
 $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+
+// We'll need this table joined to the select in order to filter by sale
+if ($search_sale || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if ($search_user > 0)
+{
+	$sql.=", ".MAIN_DB_PREFIX."element_contact as c";
+	$sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
+}
+
 $sql.= " WHERE p.entity = ".$conf->entity;
 if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
 // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
@@ -109,14 +139,36 @@ if ($search_societe)
 {
 	$sql .= natural_search('s.nom', $search_societe);
 }
-if ($search_year) {
+if ($month > 0)
-	$sql .= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($search_year,12,false)).")";
+{
-	$sql .= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($search_year,1,false)).")";
+    if ($year > 0 && empty($day))
+    	$sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
+    else if ($year > 0 && ! empty($day))
+    	$sql.= " AND p.datee BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+    else
+    	$sql.= " AND date_format(p.datee, '%m') = '".$month."'";
 }
+else if ($year > 0)
+{
+    $sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+}
+
 if ($search_all)
 {
 	$sql .= natural_search(array('p.ref','p.title','s.nom'), $search_all);
 }
+
+if ($search_status!='') $sql .= " AND p.fk_statut = ".$db->escape($search_status);
+
+if ($search_public!='') $sql .= " AND p.public = ".$db->escape($search_public);
+
+if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
+if ($search_user > 0)
+{
+	$sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='project' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$search_user;
+}
+
+
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($conf->liste_limit+1, $offset);
 
@@ -127,11 +179,28 @@ if ($resql)
 	$var=true;
 	$num = $db->num_rows($resql);
 	$i = 0;
+	
+	$param='';
+	if ($month)              		$param.='&month='.$month;
+	if ($year)               		$param.='&year=' .$year;
+	if ($search_ref != '') 			$param.='&amp;search_ref='.$search_ref;
+	if ($search_label != '') 		$param.='&amp;search_label='.$search_label;
+	if ($search_societe != '') 	$param.='&amp;search_societe='.$search_societe;
+	if ($search_status != '') 	$param.='&amp;search_status='.$search_status;
+	if ($search_public != '') 	$param.='&amp;search_public='.$search_public;
+	if ($search_user > 0)    		$param.='&search_user='.$search_user;
+	if ($search_sale > 0)    		$param.='&search_sale='.$search_sale;
+	
 
 	$text=$langs->trans("Projects");
 	if ($mine) $text=$langs->trans('MyProjects');
 	print_barre_liste($text, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
 
+	print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
+	
+	print '<table class="noborder" width="100%">';
+	
+	
 	// Show description of content
 	if ($mine) print $langs->trans("MyProjectsDesc").'<br><br>';
 	else
@@ -139,16 +208,40 @@ if ($resql)
 		if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>';
 		else print $langs->trans("ProjectsPublicDesc").'<br><br>';
 	}
+	
+	// If the user can view prospects other than his'
+	if ($user->rights->societe->client->voir || $socid)
+	{
+		$langs->load("commercial");
+		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
+		$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
+	}
+	// If the user can view prospects other than his'
+	
+	if (($user->rights->societe->client->voir || $socid) && !$mine)
+	{
+		$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
+		$moreforfilter.=$form->select_dolusers($search_user,'search_user',1);
+	}
+	if (! empty($moreforfilter))
+	{
+		print '<tr class="liste_titre">';
+		print '<td class="liste_titre" colspan="10">';
+		print $moreforfilter;
+		print '</td></tr>';
+	}
+	
 
-	print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
-
-	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.ref","","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"p.title","","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"p.title","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Visibility"),$_SERVER["PHP_SELF"],"p.public","","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("SalesRepresentative"),$_SERVER["PHP_SELF"],"","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],'p.fk_statut',"","",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"p.datee","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Visibility"),$_SERVER["PHP_SELF"],"p.public","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],'p.fk_statut',"",$param,'align="right"',$sortfield,$sortorder);
+	print '<td class="liste_titre">&nbsp;</td>';
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
@@ -162,6 +255,22 @@ if ($resql)
 	print '<input type="text" class="flat" name="search_societe" value="'.$search_societe.'">';
 	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
+	
+	print '<td class="liste_titre">';
+	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+	$formother->select_year($year?$year:-1,'year',1, 20, 5);
+	print '</td>';
+	
+	print '<td class="liste_titre">';
+	$array=array(''=>'',0 => $langs->trans("PrivateProject"),1 => $langs->trans("SharedProject"));
+  print $form->selectarray('search_public',$array,$search_public);
+  print '</td>';
+	print '<td class="liste_titre" align="right">';
+	
+	print $form->selectarray('search_status', array(''=>'', '0'=>$langs->trans('Draft'),'1'=>$langs->trans('Opened'),'2'=>$langs->trans('Closed')),$search_status);
+	
+	print '</td>';
 	print '<td class="liste_titre nowrap" align="right">';
     print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
     print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
@@ -207,6 +316,46 @@ if ($resql)
 			}
 			print '</td>';
 
+			
+			// Sales Rapresentatives
+			print '<td>';
+			if($objp->socid)
+			{
+				$listsalesrepresentatives=$socstatic->getSalesRepresentatives($user);
+        $nbofsalesrepresentative=count($listsalesrepresentatives);
+        if ($nbofsalesrepresentative > 3)   // We print only number
+        {
+            print '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$socstatic->id.'">';
+            print $nbofsalesrepresentative;
+            print '</a>';
+        }
+        else if ($nbofsalesrepresentative > 0)
+        {
+            $userstatic=new User($db);
+            $j=0;
+            foreach($listsalesrepresentatives as $val)
+            {
+                $userstatic->id=$val['id'];
+                $userstatic->lastname=$val['lastname'];
+                $userstatic->firstname=$val['firstname'];
+                print $userstatic->getNomUrl(1);
+                $j++;
+                if ($j < $nbofsalesrepresentative) print ', ';
+            }
+        }
+        else print $langs->trans("NoSalesRepresentativeAffected");
+			}
+			else
+			{
+				print '&nbsp';
+			}
+			print '</td>';
+			
+			// Date end
+			print '<td align="left">';
+			print dol_print_date($db->jdate($objp->date_end),'day');
+			print '</td>';
+			
 			// Visibility
 			print '<td align="left">';
 			if ($objp->public) print $langs->trans('SharedProject');