Undid the change of the include path. It was better the way it was.
[eq/.git] / inc / class.eq.inc.php
index 2af40b12a295756e52b9fadcb3a591cf6c302974..a5cc2b4df67691b13f929f8b6fb99894078d34d4 100644 (file)
@@ -68,12 +68,12 @@ class eq
  
   function eq()
     {
-      if(file_exists('setup/eq_config.local')) {
-       include('setup/eq_config.local');
+      if(file_exists("setup/eq_config.local")) {
+       include("setup/eq_config.local");
       } else {
-       include('setup/eq_config');
+       include("setup/eq_config");
       }
-
+      
       $this->script_path = "$this->application_path"."/bin";
       $this->max_presidency_members = 99;
       $this->max_appointments = 32768;
@@ -294,12 +294,24 @@ class eq
                $month_start = "$year"."-"."$month"."-"."01";
                $month_end = "$year"."-"."$month"."-"."31";
                $month = "$month"."/"."$year";
+               
                //print "m: $m month: $month year: $year month_start: $month_start month_end: $month_end<br>";
                // Add this to the query to filter on only visits made by this companionship:
                // " AND companionship=" . $unique_companionships[$j]['companionship'].
+
+               // First check to see if the currently assigned companionship has visited them
                $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
-                      " AND companionship!=0".
-                      " AND family=". $family_id;
+                  " AND companionship=".$unique_companionships[$j]['companionship'].
+                  " AND family=". $family_id;
+               $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+               if($this->db2->num_rows($query_id) == 0) {
+                 // We did not find any visits made by the currently assigned companionship,
+                 // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
+                 $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+                    " AND companionship!=0".
+                    " AND family=". $family_id;
+                 $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+               }
                $this->db2->query($sql,__LINE__,__FILE__);
                $link_data['menuaction'] = 'eq.eq.ht_update';
                $link_data['date'] = $month_start;
@@ -507,10 +519,21 @@ class eq
            $table_data.="<tr bgcolor=". $this->t->get_var('tr_color') ."><td>$family_name Family</td>";
            
            $header_row="<th width=$comp_width><font size=-2>Families</th>";
+
+           // First check to see if the currently assigned companionship has visited them
            $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+                  " AND companionship=".$unique_companionships[$j]['companionship'].
+                  " AND family=". $family_id;
+           $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+           if($this->db2->num_rows($query_id) == 0) {
+             // We did not find any visits made by the currently assigned companionship,
+             // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
+             $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
                   " AND companionship!=0".
                   " AND family=". $family_id;
-           $this->db2->query($sql,__LINE__,__FILE__);
+             $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+           }
+           
            $value = $family_id . "/" . $unique_companionships[$j]['companionship'] . "/" . $date;
            $header_row .= "<th width=$visit_width><font size=-2><a href=$link>$month</a></th>";
            if(!$total_visits) { $total_visits = 0; }
@@ -2699,26 +2722,21 @@ class eq
          $table_data .= "<tr><td colspan=20><hr></td></tr>";
        }
        $total_companionships += $num_companionships;
-       $stat_data = "<tr><td><b><font size=-2>$num_companionships Companionships<br>Interview Quarterly Totals:</font></b></td>";
+       $stat_data = "<tr><td><b><font size=-2>$num_companionships Companionships<br>Interview Totals:</font></b></td>";
 
        // Print the hometeaching interview stats
-       if($this->monthly_hometeaching_interview_stats == 0) { //Quarterly
-         for($m=$num_months; $m >=0; $m--) {
-           $month = $current_month - $m;
-           if(($month % 3) == 1) { $quarter_total = $ints[$m]; }
-           else { $quarter_total += $ints[$m]; }
-           $percent = ceil(($quarter_total / $num_companionships)*100);
-           $stat_data .= "<td align=center><font size=-2><b>$quarter_total<br>$percent%</font></b></td>";
-         }
-         $stat_data .= "</tr>";
-       }
-       else { // Monthly
-         for($m=$num_months; $m >=0; $m--) {
-           $percent = ceil(($ints[$m] / $num_companionships)*100);
-           $stat_data .= "<td align=center><font size=-2><b>$ints[$m]<br>$percent%</font></b></td>";
-         }
-         $stat_data .= "</tr>";
+       for($m=$num_months; $m >=0; $m--) {
+         $month = $current_month - $m;
+         if($month < 0) { $month = 12 + $month; } // Handle going backwards over a year boundary
+         $month_begins = $month % $this->monthly_hometeaching_interview_stats;
+         //print "$month % $this->monthly_hometeaching_interview_stats = $month_begins <br>";
+         if($this->monthly_hometeaching_interview_stats == 1) { $month_begins = 1; }
+         if(($month_begins) == 1) { $total = $ints[$m]; }
+         else { $total += $ints[$m]; }
+         $percent = ceil(($total / $num_companionships)*100);
+         $stat_data .= "<td align=center><font size=-2><b>$total<br>$percent%</font></b></td>";
        }
+       $stat_data .= "</tr>";
        
        $this->t->set_var('table_width',$table_width);
        $this->t->set_var('header_row',$header_row);
@@ -2728,27 +2746,20 @@ class eq
       }
 
       // Display the totals
-      if($this->monthly_hometeaching_interview_stats == 0) { //Quarterly
-       $quarter_total = 0;
-       $totals = "<tr><td><b><font size=-2>$total_companionships Total Comps<br>Interview Quarterly Totals:</font></b></td>";
-       for($m=$num_months; $m >=0; $m--) {
-         $month = $current_month - $m;
-         if(($month % 3) == 1) { $quarter_total = $total_ints[$m]; }
-         else { $quarter_total += $total_ints[$m]; }
-         $percent = ceil(($quarter_total / $total_companionships)*100);
-         $totals .= "<td align=center><font size=-2><b>$quarter_total<br>$percent%</font></b></td>";
-       }
-       $totals .= "</tr>";
-      }
-      else { //Monthly
-       $totals = "<tr><td><b><font size=-2>$total_companionships Total Comps<br>Interview Monthly Totals:</font></b></td>";
-       for($m=$num_months; $m >=0; $m--) {
-         $percent = ceil(($total_ints[$m] / $total_companionships)*100);
-         $totals .= "<td align=center><font size=-2><b>$total_ints[$m]<br>$percent%</font></b></td>";
-       }
-       $totals .= "</tr>";
+      $total = 0;
+      $totals = "<tr><td><b><font size=-2>$total_companionships Total Comps<br>Interview Totals:</font></b></td>";
+      for($m=$num_months; $m >=0; $m--) {
+       $month = $current_month - $m;
+       if($month < 0) { $month = 12 + $month; } // Handle going backwards over a year boundary
+       $month_begins = $month % $this->monthly_hometeaching_interview_stats;
+       if($this->monthly_hometeaching_interview_stats == 1) { $month_begins = 1; }
+       if(($month_begins) == 1) { $total = $total_ints[$m]; }
+       else { $total += $total_ints[$m]; }
+       $percent = ceil(($total / $total_companionships)*100);
+       $totals .= "<td align=center><font size=-2><b>$total<br>$percent%</font></b></td>";
       }
-      
+      $totals .= "</tr>";
+          
       $this->t->set_var('totals',$totals);
       $this->t->pfp('out','int_view_t');
       $this->save_sessiondata();