missed a space

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

diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index 2ba160b6e96ef975fee667f0e94478be0876ae0e..1e9a46a65ec6c5beb5e33d1259f16427f58b7ab2 100644 (file)
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -725,7 +725,7 @@ class tc
                        $this->db->query("UPDATE tc_activity set " .
                                         "   assignment='" . $activity['assignment'] .
                                         "', date='" . $activity['date'] . "'" .
-                                        ", notes='" . $activity['notes'] . "'" .
+                                        ", notes=\"" . $activity['notes'] . "\"" .
                                         " WHERE activity=" . $activity['activity'],__LINE__,__FILE__);
 
                        // Delete all the individuals who have particiapted in this activity
@@ -750,10 +750,10 @@ class tc
                        $activity['notes']= get_var('notes',array('POST'));
                        $this->db->query("INSERT INTO tc_activity (assignment,date,notes) " .
                                         "VALUES ('" . $activity['assignment'] . "','" .
-                                        $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__);
+                                        $activity['date'] . "',\"" . $activity['notes'] . "\")",__LINE__,__FILE__);
 
                        $sql = "SELECT * FROM tc_activity WHERE assignment='".$activity['assignment']."' " .
-                              " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
+                              " AND date='".$activity['date']."' AND notes=\"".$activity['notes']."\"";
                        $this->db->query($sql,__LINE__,__FILE__);
                        if($this->db->next_record()) {
                                //print "activity: " . $this->db->f('activity') . "<br>";
@@ -1537,7 +1537,7 @@ class tc
                        // If this individual has had a yearly PPI this year, don't show him on the schedule list
                        $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
                        $sql = "SELECT * FROM tc_interview WHERE date > '$year_start' AND date < '$year_end' ".
-                              "AND individual=" . $id . " AND interview_type='ppi'";
+                              "AND individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
                        $this->db2->query($sql,__LINE__,__FILE__);
 
                        if(!$this->db2->next_record()) {
@@ -1720,11 +1720,6 @@ class tc
                                                $supervisor_last_name = $supervisor_array[0];
                                                $sql = "SELECT * FROM tc_individual where individual='$supervisor'";
                                                $this->db2->query($sql,__LINE__,__FILE__);
-                                               if($this->db2->next_record()) {
-                                                       $mls_id = $this->db2->f('mls_id');
-                                               }
-                                               $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
-                                               $this->db2->query($sql,__LINE__,__FILE__);
                                                if($this->db2->next_record()) {
                                                        $supervisor_address = $this->db2->f('address');
                                                }
@@ -1804,11 +1799,6 @@ class tc
                        $supervisor_last_name = $supervisor_array[0];
                        $sql = "SELECT * FROM tc_individual where individual='$supervisor'";
                        $this->db2->query($sql,__LINE__,__FILE__);
-                       if($this->db2->next_record()) {
-                               $mls_id = $this->db2->f('mls_id');
-                       }
-                       $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
-                       $this->db2->query($sql,__LINE__,__FILE__);
                        if($this->db2->next_record()) {
                                $supervisor_address = $this->db2->f('address');
                        }
@@ -1917,11 +1907,11 @@ class tc
                                        }
 
                                        // If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list
-                                       $sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' AND individual='$id'";
+                                       $sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' AND individual='$id' AND interview_type='hti'";
                                        $this->db2->query($sql,__LINE__,__FILE__);
 
                                        if(!$this->db2->next_record()) {
-                                               $sql = "SELECT * FROM tc_interview WHERE individual='$id' ORDER BY date DESC";
+                                               $sql = "SELECT * FROM tc_interview WHERE individual='$id' AND interview_type='hti' ORDER BY date DESC";
                                                $this->db3->query($sql,__LINE__,__FILE__);
                                                if($this->db3->next_record()) { 
                                                        $date = $this->db3->f('date'); 
@@ -2397,7 +2387,7 @@ class tc
                                $year = date('Y') - $m;
                                $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
                                $sql = "SELECT * FROM tc_interview WHERE date > '$year_start' AND date < '$year_end' ".
-                                      "AND individual=" . $id . " AND interview_type='ppi'";
+                                      "AND individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
                                $this->db2->query($sql,__LINE__,__FILE__);
 
                                if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
@@ -2483,7 +2473,7 @@ class tc
                                         ", interviewer='" . $interviewer . "'" .
                                         ", individual='" . $individual . "'" .
                                         ", date='" . $date . "'" .
-                                        ", notes='" . $notes . "'" .
+                                        ", notes=\"" . $notes . "\"" .
                                         ", interview_type='" . $interview_type . "'" .
                                         " WHERE interview=" . $interview,__LINE__,__FILE__);
                        $this->ppi_view();
@@ -2494,7 +2484,7 @@ class tc
                        $notes = get_var('notes',array('POST'));
                        $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " .
                                         "VALUES ('" . $interviewer . "','" . $individual . "','" .
-                                        $date . "','" . $notes . "','" . $interview_type  ."')",__LINE__,__FILE__);
+                                        $date . "',\"" . $notes . "\",'" . $interview_type  ."')",__LINE__,__FILE__);
                        $this->ppi_view();
                        return false;
                }
@@ -2516,7 +2506,7 @@ class tc
                }
 
                if($action == 'edit' || $action == 'view') {
-                       $sql = "SELECT * FROM tc_interview WHERE interview=".$interview;
+                       $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND interview_type='ppi'";
                        $this->db->query($sql,__LINE__,__FILE__);
                        $this->db->next_record();
                        $this->t->set_var('interview',$interview);
@@ -2679,7 +2669,7 @@ class tc
                                                $month_end = "$year"."-"."$month"."-"."31";
                                                $month = "$month"."/"."$year";
                                                $sql = "SELECT * FROM tc_interview WHERE date >= '$month_start' AND date <= '$month_end' ".
-                                                      "AND individual=" . $individual;
+                                                      "AND individual=" . $individual . " AND interview_type='hti' ORDER BY date DESC";
                                                $this->db2->query($sql,__LINE__,__FILE__);
                                                $header_row .= "<th width=$int_width><font size=-2>$month</th>";
 
@@ -2807,7 +2797,7 @@ class tc
                                         ", interviewer='" . $interviewer . "'" .
                                         ", individual='" . $individual . "'" .
                                         ", date='" . $date . "'" .
-                                        ", notes='" . $notes . "'" .
+                                        ", notes=\"" . $notes . "\"" .
                                         ", interview_type='" . $interview_type . "'" .
                                         " WHERE interview=" . $interview,__LINE__,__FILE__);
                        $this->int_view();
@@ -2818,7 +2808,7 @@ class tc
                        $notes = get_var('notes',array('POST'));
                        $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " .
                                         "VALUES ('" . $interviewer . "','" . $individual . "','" .
-                                        $date . "','" . $notes ."','" . $interview_type . "')",__LINE__,__FILE__);
+                                        $date . "',\"" . $notes ."\",'" . $interview_type . "')",__LINE__,__FILE__);
                        $this->int_view();
                        return false;
                }
@@ -2839,7 +2829,7 @@ class tc
                }
 
                if($action == 'edit' || $action == 'view') {
-                       $sql = "SELECT * FROM tc_interview WHERE interview=".$interview;
+                       $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND interview_type='hti'";
                        $this->db->query($sql,__LINE__,__FILE__);
                        $this->db->next_record();
                        $this->t->set_var('interview',$interview);
@@ -3014,7 +3004,7 @@ class tc
                        $notes = get_var('notes',array('POST'));
                        $this->db->query("UPDATE tc_visit set " .
                                         "  date='" . $date . "'" .
-                                        ", notes='" . $notes . "'" .
+                                        ", notes=\"" . $notes . "\"" .
                                         " WHERE visit=" . $visit,__LINE__,__FILE__);
                        $this->vis_view();
                        return false;
@@ -3024,7 +3014,7 @@ class tc
                        $notes = get_var('notes',array('POST'));
                        $this->db->query("INSERT INTO tc_visit (family,companionship,date,notes) " .
                                         "VALUES ('" . $family . "','" . $companionship . "','" .
-                                        $date . "','" . $notes . "')",__LINE__,__FILE__);
+                                        $date . "',\"" . $notes . "\")",__LINE__,__FILE__);
                        $this->vis_view();
                        return false;
                }
@@ -3539,7 +3529,7 @@ class tc
                        $presidency_data[$i]['name'] = $this->db->f('name');
                        $presidency_data[$i]['indiv'] = $this->db->f('individual');
                        $presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name'];
-                       $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['individual'];
+                       $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['indiv'];
                        $i++;
                }
 
@@ -3587,13 +3577,9 @@ class tc
                                                } else if($indiv > 0) {
                                                        $supervisor_name_array = explode(",",$presidency2name[$presidency]);
                                                        $supervisor_last_name = $supervisor_name_array[0];
+                                                       print "presidency2indiv: $presidency $presidency2indiv[$presidency]<br>";
                                                        $sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
                                                        $this->db2->query($sql,__LINE__,__FILE__);
-                                                       if($this->db2->next_record()) {
-                                                               $mls_id = $this->db2->f('mls_id');
-                                                       }
-                                                       $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
-                                                       $this->db2->query($sql,__LINE__,__FILE__);
                                                        if($this->db2->next_record()) {
                                                                $supervisor_address = $this->db2->f('address');
                                                        }
@@ -3713,11 +3699,6 @@ class tc
                                                $supervisor_last_name = $supervisor_name_array[0];
                                                $sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
                                                $this->db2->query($sql,__LINE__,__FILE__);
-                                               if($this->db2->next_record()) {
-                                                       $mls_id = $this->db2->f('mls_id');
-                                               }
-                                               $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
-                                               $this->db2->query($sql,__LINE__,__FILE__);
                                                if($this->db2->next_record()) {
                                                        $supervisor_address = $this->db2->f('address');
                                                }
@@ -3751,7 +3732,7 @@ class tc
                                $table_data.= "</td>";
 
                                // individual drop down list (for PPIs)
-                               $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv] STYLE="font-size : 8pt">';
+                               $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][individual] STYLE="font-size : 8pt">';
                                $table_data.= '<option value=0></option>';  
                                for ($j=0; $j < count($individual); $j++) {
                                        $id = $individual[$j];
@@ -3807,7 +3788,7 @@ class tc
                                $table_data.= "</td>";
 
                                // individual drop down list
-                               $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv] STYLE="font-size : 8pt">';
+                               $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][individual] STYLE="font-size : 8pt">';
                                $table_data.= '<option value=0></option>';  
                                for ($j=0; $j < count($individual); $j++) {
                                        $id = $individual[$j];
@@ -4276,10 +4257,14 @@ class tc
                        $dtstart = gmdate("Ymd"."\T"."His"."\Z", mktime($hour,$minute,$seconds,$month,$day,$year));
                        $dtstartstr = date("l, F d, o g:i A", mktime($hour,$minute,$seconds,$month,$day,$year));
 
-                       $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.presidency='$presidency'";
+                       $sql = "SELECT tp.email AS email1, ti.email AS email2, ti.name AS name FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.presidency='$presidency'";
                        $this->db2->query($sql,__LINE__,__FILE__);
                        if($this->db2->next_record()) {
-                               $email = $this->db2->f('email');
+                               if ($this->db2->f('email1') != "") {
+                                       $email = $this->db2->f('email1');
+                               } else { 
+                                       $email = $this->db2->f('email2');
+                               }
                                $interviewer = $this->db2->f('name');
                        }