|
|
@@ -331,30 +331,49 @@ class Data_Source {
|
|
|
if (array_key_exists('L_APPOITMENT_DATE', $this->_cols)) {
|
|
|
switch ($value) {
|
|
|
case 'OLD':
|
|
|
- $sqlFltr = " UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`)<UNIX_TIMESTAMP(now()) and t.`L_APPOITMENT_DATE`!='' ";
|
|
|
+ $sqlFltr = "
|
|
|
+ UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`) < UNIX_TIMESTAMP(now())
|
|
|
+ and t.`L_APPOITMENT_DATE` != ''
|
|
|
+ and t.`L_APPOITMENT_DATE` != '0000-00-00 00:00:00'
|
|
|
+ ";
|
|
|
break;
|
|
|
case 'NOW':
|
|
|
- $sqlFltr = " UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`)<UNIX_TIMESTAMP(now())+3600 and UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`)>UNIX_TIMESTAMP(now())-3600 ";
|
|
|
+ $sqlFltr = "
|
|
|
+ UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`) < UNIX_TIMESTAMP(now())+3600
|
|
|
+ and UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`) > UNIX_TIMESTAMP(now())-3600
|
|
|
+ ";
|
|
|
break;
|
|
|
case 'TODAY':
|
|
|
$start = mktime(0,0,0, date("m"), date("d"), date("Y"));
|
|
|
$end = mktime(0,0,0, date("m"), date("d") + 1, date("Y"));
|
|
|
- $sqlFltr = " UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`)>'{$start}' and UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`)<'{$end}' ";
|
|
|
+ $sqlFltr = "
|
|
|
+ UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`) > '{$start}'
|
|
|
+ and UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`) < '{$end}'
|
|
|
+ ";
|
|
|
break;
|
|
|
case 'TOMORROW':
|
|
|
$start = mktime(0,0,0, date("m"), date("d") + 1, date("Y"));
|
|
|
$end = mktime(0,0,0, date("m"), date("d") + 2, date("Y"));
|
|
|
- $sqlFltr = " UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`)>'{$start}' and UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`)<'{$end}' ";
|
|
|
+ $sqlFltr = "
|
|
|
+ UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`) > '{$start}'
|
|
|
+ and UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`) < '{$end}'
|
|
|
+ ";
|
|
|
break;
|
|
|
case 'YESTERDAY':
|
|
|
$start = mktime(0,0,0, date("m"), date("d") - 1, date("Y"));
|
|
|
$end = mktime(0,0,0, date("m"), date("d") - 2, date("Y"));
|
|
|
- $sqlFltr = " UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`)>'{$start}' and UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`)<'{$end}' ";
|
|
|
+ $sqlFltr = "
|
|
|
+ UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`) > '{$start}'
|
|
|
+ and UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`) < '{$end}'
|
|
|
+ ";
|
|
|
break;
|
|
|
case 'BRAK':
|
|
|
$start = mktime(0,0,0, date("m"), date("d") - 1, date("Y"));
|
|
|
$end = mktime(0,0,0, date("m"), date("d") - 2, date("Y"));
|
|
|
- $sqlFltr = " t.`L_APPOITMENT_DATE`='' ";
|
|
|
+ $sqlFltr = "
|
|
|
+ (t.`L_APPOITMENT_DATE` = ''
|
|
|
+ or t.`L_APPOITMENT_DATE` = '0000-00-00 00:00:00')
|
|
|
+ ";
|
|
|
break;
|
|
|
}
|
|
|
}
|