scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correction requete sql

Browse Source
This commit is contained in:
Michael RICOIS 2010-04-21 11:55:52 +00:00
parent 3f9fc4476e
commit a413b9ffe5
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
includes/infogreffe/gestion.php
View File

@ -204,7 +204,7 @@ function documentStatut($commande){
* @param unknown_type $etat
* @param unknown_type $date
*/
function commandesListe($type, $etat, $date, $mode){
function commandesListe($type, $etat, $date, $mode = ''){
setDbConn('sdv1');
$table = tableTypeCommande($type);
@ -224,7 +224,7 @@ function commandesListe($type, $etat, $date, $mode){
} else {
switch($etat){
case 'commande':
$q->andWhere('statutCommande = ?', 0);
$q->andWhere('statutCommande != ?', 9);
$q->andWhere('dateReception = ?', '0000-00-00 00:00:00');
break;
case 'reception':
@ -237,14 +237,20 @@ function commandesListe($type, $etat, $date, $mode){
}
}
if ($mode!=''){
$q->andWhere('typeCommande = ?', $mode);
if ($mode!='-'){
if ($mode == 'G') {
$q->orWhereIn('typeCommande', array('', $mode));
} else {
$q->andWhere('typeCommande = ?', $mode);
}
}
if (!hasModeEdition()){
$q->andWhere('login = ?', $_SESSION['tabInfo']['login']);
}
FB::log($q->getSqlQuery(),'SQL');
FB::log($q->getFlattenedParams(),'SQL');
//Résultat
$commandes = $q->execute();
FB::log($commandes->toArray(), 'commandes');

2
www/pages/greffescmd.php
View File

@ -226,7 +226,7 @@ for($i=$dateToday-$dateIntervalle; $i<=$dateToday; $i++)
$dateTime = mktime(0, 0, 0, $i+1, 0, date('Y'));
$selected = '';
if ($date=='' && $i==$dateToday ){ $selected = 'selected'; }
if ($date!='' && $dateTime=$date){ $selected = 'selected'; }
if ($date!='' && $dateTime==$date){ $selected = 'selected'; }
?>
<option value="<?=$dateTime?>" <?=$selected?>>
<?=date('m/Y', $dateTime)?>