fixed sandbox so it doesn't show last month of visits since the current month is...

[eq/.git] / inc / class.tc.inc.php

diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index dee205c5ed178e6d8682324c09da8fc66fa35595..bcf18e26a79ba6cfb9ee1f9b721ed95a6b287e56 100644 (file)
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -544,7 +544,7 @@ class tc
                                $this->db2->query($sql,__LINE__,__FILE__);
                                $companionship_sandbox = mysql_insert_id();
                                
-                               $sql = "SELECT * FROM tc_companion WHERE companionship=$companionship AND valid=1";
+                               $sql = "SELECT * FROM tc_companion AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND tc.companionship=$companionship AND tc.valid=1 AND ti.valid=1";
                                $this->db2->query($sql,__LINE__,__FILE__);
                                while ($this->db2->next_record()) {
                                        $individual = $this->db2->f('individual');
@@ -664,8 +664,10 @@ class tc
                                                $companion_names .= " / " . $this->db2->f('name');
                                        }
                                }
-                               $sandbox_table_data .= "<tr><th align=\"Left\" bgcolor=\"#c9c9c9\">$companion_names</th></tr>";
-                               $sandbox_table_data .= "<tr><td><table>";
+                               $this->nextmatchs->template_alternate_row_color(&$this->t);
+                               $sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+                               $sandbox_table_data .= "<th bgcolor=#d3dce3 align=\"Left\" bgcolor=\"#c9c9c9\">$companion_names</th></tr>";
+                               $sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td><table>";
                                
                                # get families they visit
                                $sql = "SELECT * FROM tc_companionship_sandbox AS tcp JOIN (tc_family_sandbox AS tf, tc_individual AS ti) WHERE tcp.companionship=$companionship AND tcp.companionship=tf.companionship AND tf.individual=ti.individual";
@@ -674,11 +676,12 @@ class tc
                                        $family_name = $this->db2->f('name') . " Family";
                                        $family_id = $this->db2->f('tc_family');
                                        $tc_companionship = $this->db2->f('tc_companionship');
-                                       $sandbox_table_data .= "<tr>";
+                                   $this->nextmatchs->template_alternate_row_color(&$this->t);
+                                   $sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
                                        $sandbox_table_data .= "<td align=\"Left\" width=\"1000\">$family_name</td>";
                                        
                                        # get 12 months visit data for given family
-                                       for($m=$this->sandbox_stats_num_months; $m >= 0; $m--) {
+                                       for($m=$this->sandbox_stats_num_months; $m > 0; $m--) {
                                                $month = $this->current_month - $m;
                                                $year = $this->current_year;
                                                if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; }