X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=883884f76abfc8aab0ca4e2d608ac592f5e28a1f;hb=4c8106c717ade1fb6854922662ff87e7ff262c08;hp=15086be6a9b14cde1086a9d24bff95c20cdbdcea;hpb=39346e4dae3d877b8aceec8ed6b3dadd2be42d0c;p=eq%2F.git diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php index 15086be..883884f 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 .= "