X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=fc699ea7f203c7a61639acd744339d9aac6ec174;hb=df98b91223853d33672c1dc5038df0d4d10f146f;hp=15086be6a9b14cde1086a9d24bff95c20cdbdcea;hpb=39346e4dae3d877b8aceec8ed6b3dadd2be42d0c;p=eq%2F.git diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php index 15086be..fc699ea 100644 --- a/inc/class.tc.inc.php +++ b/inc/class.tc.inc.php @@ -426,7 +426,7 @@ class tc $unassigned_family_list = get_var('unassignedFamilies',array('POST')); if ($assignedHT_list || $unassignedHT_list) { - $sql = "INSERT INTO tc_companionship_sandbox (district) VALUES (\"$district\")"; + $sql = "INSERT INTO tc_companionship_sandbox (tc_companionship,district) VALUES (\"NULL\",\"$district\")"; $this->db2->query($sql,__LINE__,__FILE__); $companionship_sandbox = mysql_insert_id(); @@ -540,11 +540,11 @@ class tc while ($this->db->next_record()) { $companionship = $this->db->f('companionship'); $district = $this->db->f('district'); - $sql = "INSERT INTO tc_companionship_sandbox (district) VALUES (\"$district\")"; + $sql = "INSERT INTO tc_companionship_sandbox (tc_companionship,district) VALUES (\"$companionship\",\"$district\")"; $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'); @@ -673,11 +673,12 @@ class tc while ($this->db2->next_record()) { $family_name = $this->db2->f('name') . " Family"; $family_id = $this->db2->f('tc_family'); + $tc_companionship = $this->db2->f('tc_companionship'); $sandbox_table_data .= ""; - $sandbox_table_data .= "$family_name"; + $sandbox_table_data .= "$family_name"; # get 12 months visit data for given family - for($m=12; $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; } @@ -686,7 +687,11 @@ class tc $month_end = "$year"."-"."$month"."-"."31"; $month = "$month"."/"."$year"; - $sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' AND companionship!=0 AND family=". $family_id; + if ($this->sandbox_visits_comp_only == 0) { + $sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' AND companionship!=0 AND family=". $family_id; + } else { + $sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' AND companionship=$tc_companionship AND family=". $family_id; + } $query_id = $this->db3->query($sql,__LINE__,__FILE__); if($this->db3->next_record()) { @@ -3918,6 +3923,35 @@ class tc // Update an existing appointment if($appointment < $this->max_appointments) { + // If we deleted the appointment, we still need to send a cancellation to the right people + // Make a note of the old email now in case we need it later + $old_indiv_email = ""; + $sql = "SELECT * FROM tc_appointment where appointment='$appointment'"; + $this->db->query($sql,__LINE__,__FILE__); + if($this->db->next_record()) { + $old_individual = $this->db->f('individual'); + $old_family = $this->db->f('family'); + if($old_individual > 0) { + $sql = "SELECT * FROM tc_individual where individual='$old_individual'"; + $this->db2->query($sql,__LINE__,__FILE__); + if($this->db2->next_record()) { + $old_indiv_email = $this->db2->f('email'); + } + } + if($old_family > 0) { + $sql = "SELECT * FROM tc_family WHERE family='$old_family'"; + $this->db2->query($sql,__LINE__,__FILE__); + if($this->db2->next_record()) { + $old_individual = $this->db2->f('individual'); + $sql = "SELECT * FROM tc_individual where individual='$old_individual'"; + $this->db3->query($sql,__LINE__,__FILE__); + if($this->db3->next_record()) { + $old_indiv_email = $this->db3->f('email'); + } + } + } + } + //Only perform a database update if we have made a change to this appointment $sql = "SELECT * FROM tc_appointment where " . "appointment='$appointment'" . @@ -3941,7 +3975,7 @@ class tc " WHERE appointment=" . $appointment,__LINE__,__FILE__); // Email the appointment - $this->email_appt($appointment); + $this->email_appt($appointment, $old_indiv_email); } } @@ -4542,7 +4576,7 @@ class tc $this->save_sessiondata(); } - function email_appt($appointment) + function email_appt($appointment, $old_indiv_email) { //print "Emailing notification of appointment: $appointment
"; @@ -4562,7 +4596,7 @@ class tc $appt_name = ""; $phone = ""; $uid = $this->db->f('uid'); - + // Extract the year, month, day, hours, minutes, seconds from the appointment time $appt_date = $this->db->f('date'); $date_array = explode("-",$appt_date); @@ -4596,6 +4630,10 @@ class tc if($this->db2->next_record()) { $indiv_name = $this->db2->f('name'); $phone = $this->db2->f('phone'); + $indiv_email = $this->db2->f('email'); + if(($this->email_individual_appt == 1) && ($indiv_email != "")) { + $email .= ", $indiv_email"; + } $appt_name = $indiv_name . " Interview"; $duration = $this->default_ppi_appt_duration * 60; } @@ -4612,6 +4650,10 @@ class tc $phone = $this->db3->f('phone'); $family_name = $this->db3->f('name'); $phone = $this->db3->f('phone'); + $indiv_email = $this->db3->f('email'); + if(($this->email_individual_appt == 1) && ($indiv_email != "")) { + $email .= ", $indiv_email"; + } } $appt_name = $family_name . " Family Visit"; $duration = $this->default_visit_appt_duration * 60; @@ -4626,7 +4668,7 @@ class tc if(($uid == 0) && ($appt_name != "")) { // Create a new calendar item for this appointment, since this must be the first time we // are sending it out. - print "Sent new appointment to " . $interviewer . " at " . $email . " for " . $appt_name . "
"; + print "Sent new appointment for " . $interviewer . " to '" . $email . "' for " . $appt_name . "
"; $uid = rand() . rand(); // Generate a random identifier for this appointment $subject = "Created: $appt_name"; @@ -4640,7 +4682,10 @@ class tc } else if(($uid != 0) && ($appt_name == "")) { // Remove the calendar item for this appointment since it has already been sent // and there is no name we have changed it to. - print "Sent deleted appointment to " . $interviewer . " at " . $email . " for " . $appt_date . " " . $appt_time . "
"; + if(($this->email_individual_appt == 1) && ($old_indiv_email != "")) { + $email .= ", $old_indiv_email"; + } + print "Sent deleted appointment for " . $interviewer . " to '" . $email . "' for " . $appt_date . " " . $appt_time . "
"; $subject = "Canceled: $appt_date $appt_time"; $this->db->query("UPDATE tc_appointment set" . @@ -4652,7 +4697,7 @@ class tc $dtend, $date, $location, $subject, $subject, $uid); } else if($uid != 0) { // Update the existing appointment since we have changed it - print "Sent updated appointment to " . $interviewer . " at " . $email . " for " . $appt_name . "
"; + print "Sent updated appointment for " . $interviewer . " to '" . $email . "' for " . $appt_name . "
"; $subject = "Canceled: $appt_date $appt_time"; $action = "CANCEL";