Merge lp:~dkessel/ubuntu-qa-website/fix-date-filtering into lp:ubuntu-qa-website

[Daniel Kessel]

This branch fixes two issues:

1. It fixes the currently broken SQL query that is generated when entering anything into the date range text fields. The current code refers to a non-existing database field...
2. It sets the default date range in all date filters in the website to be "from today minus 31 days until today", so those expensive queries are no longer performed by default.

[lp:~dkessel/ubuntu-qa-website/fix-date-filtering]

403. By Daniel Kessel on 2014-10-31

convert tabs to spaces. use single quotes instead for double quotes in the modified code lines. rename date variables for consistency.

[Daniel Kessel (dkessel)]

This is ready for a new review.

I fixed the following issues that came up yesterday:
- usage of a mix of single and double quotes => I now use single quotes throughout the modified code
- inconsistent naming - the existing code used 'date_to', I used 'to_date' => I changed those variable names to match the existing code

I also noticed the rest of the code was using space instead of tabs, so I fixed that too and converted all of my tabs to spaces.

review: Needs Resubmitting

[Nicholas Skaggs (nskaggs)]

+1 now from me. 30 days seems reasonable, and we can adjust if prod still feels like it's taking too long.

review: Approve

=== modified file 'modules/qatracker/qatracker.functions.php'
--- modules/qatracker/qatracker.functions.php	2013-06-26 03:09:53 +0000
+++ modules/qatracker/qatracker.functions.php	2014-10-31 06:54:11 +0000
@@ -626,29 +626,34 @@
 
     $items['datefilter'] = array(
         '#type' => 'fieldset',
-        '#title' => t("Filter results by time"),
+        '#title' => t('Filter results by time'),
         '#collapsible' => true,
         '#collapsed' => true,
     );
 
+    $date_from = new DateTime();
+    $date_from->sub(new DateInterval('P31D'));
+    
     $items['datefilter']['date_from'] = array(
         '#type'  => 'textfield',
-        '#title' => t("Shows result from"),
-        '#attributes' => array('class' => array('datepicker')),
-        '#description' => t("Date in MM/DD/YYYY format. Time is 00:00 unless manually specified.")
+        '#title' => t('Shows result from'),
+        '#attributes' => array('class' => array('datepicker'), 'value' => $date_from->format('m/d/Y')),
+        '#description' => t('Date in MM/DD/YYYY format.')
     );
 
+    $date_to = new DateTime();
+    
     $items['datefilter']['date_to'] = array(
         '#type'  => 'textfield',
-        '#title' => t("Show results to"),
-        '#attributes' => array('class' => array('datepicker')),
-        '#description' => t("Date in MM/DD/YYYY format. Time is 00:00 unless manually specified.")
+        '#title' => t('Show results to'),
+        '#attributes' => array('class' => array('datepicker'), 'value' => $date_to->format('m/d/Y')),
+        '#description' => t('Date in MM/DD/YYYY format.')
     );
 
     $items['datefilter']['submit'] = array(
         '#type'  => 'submit',
-        '#submit' => array("qatracker_filter_by_date_submit"),
-        '#value' => t("Filter results"),
+        '#submit' => array('qatracker_filter_by_date_submit'),
+        '#value' => t('Filter results'),
     );
 
     return $items;

=== modified file 'modules/qatracker/user/qatracker.user.builds.php'
--- modules/qatracker/user/qatracker.user.builds.php	2013-06-25 19:02:45 +0000
+++ modules/qatracker/user/qatracker.user.builds.php	2014-10-31 06:54:11 +0000
@@ -118,11 +118,19 @@
         $query->condition('qatracker_build_milestone.status', array(0, 1, 4), "IN");
     }
     else {
-        if(array_key_exists("date_from", $_POST) && $_POST['date_from']) {
-            $query->condition('qatracker_build.date', DateTime::createFromFormat('m/d/Y', $_POST['date_from'])->format("Ymd"), ">=");
+        if(array_key_exists('date_from', $_POST) && $_POST['date_from']) {
+            $query->condition('qatracker_build_milestone.date', DateTime::createFromFormat('m/d/Y', $_POST['date_from'])->format('Ymd'), '>=');
+        } else {
+            $date_from = new DateTime();
+            $date_from->sub(new DateInterval('P31D'));
+            $query->condition('qatracker_build_milestone.date', $date_from->format('Ymd'), '>=');
         }
-        if(array_key_exists("date_to", $_POST) && $_POST['date_to']) {
-            $query->condition('qatracker_build.date', DateTime::createFromFormat('m/d/Y', $_POST['date_to'])->format("Ymd"), "<=");
+        
+        if(array_key_exists('date_to', $_POST) && $_POST['date_to']) {
+            $query->condition('qatracker_build_milestone.date', DateTime::createFromFormat('m/d/Y', $_POST['date_to'])->format('Ymd'), '<=');
+        } else {
+            $date_to = new DateTime();
+            $query->condition('qatracker_build_milestone.date', $date_to->format('Ymd'), '<=');
         }
     }
     $query->condition('qatracker_build_milestone.milestoneid', $milestoneid);