X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=47dee2eccb243054f448a2bb54852aab0d608844;hb=10ad4c2678cb664844bfbc5066f0b817c6cb4a2f;hp=c44a589a02f7bd4c4621bc095aa6bb2f48d2107f;hpb=48822498ab9ae5faa5d30ddfe8b9113a22e1e0c3;p=eq%2F.git diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php index c44a589..47dee2e 100644 --- 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') . "
"; @@ -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'); } @@ -1757,7 +1752,7 @@ class tc $hti_pri = $entry['pri']; //print "hti_notes: $hti_notes indiv_name: $indiv_name
"; // Perform database save actions here - $this->db->query("SELECT * FROM tc_companionship WHERE individual=$individual and valid=1",__LINE__,__FILE__); + $this->db->query("SELECT * FROM tc_companion WHERE individual=$individual and valid=1",__LINE__,__FILE__); if ($this->db->next_record()) { $scheduling_priority = $this->db->f('scheduling_priority'); //$this->logToFile("int_sched", "UPDATE tc_scheduling_priority SET priority='$hti_pri', notes=\"$hti_notes\" WHERE scheduling_priority='$scheduling_priority'"); @@ -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; } @@ -2467,15 +2457,16 @@ class tc $indiv = $this->db2->f('individual'); $interviewer_name = $this->db2->f('name'); if($indiv == $interviewer) { - $this->t->set_var('interviewer',$interviewer . ' selected'); + $this->t->set_var('interviewer',$indiv . ' selected'); } else { - $this->t->set_var('interviewer',$interviewer); + $this->t->set_var('interviewer',$indiv); } + #print "indiv: $indiv interviewer: $interviewer
"; $this->t->set_var('interviewer_name',$interviewer_name); $this->t->set_var('eqpresppi_checked','checked'); $this->t->fp('int_list','interviewer_list',True); } - + #print "selected interviewer: $interviewer
"; if($action == 'save') { $notes = get_var('notes',array('POST')); $this->db->query("UPDATE tc_interview set " . @@ -2483,7 +2474,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 +2485,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 +2507,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 +2670,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 .= "$month"; @@ -2792,9 +2783,9 @@ class tc $indiv = $this->db2->f('individual'); $interviewer_name = $this->db2->f('name'); if($indiv == $interviewer) { - $this->t->set_var('interviewer',$interviewer . ' selected'); + $this->t->set_var('interviewer',$indiv . ' selected'); } else { - $this->t->set_var('interviewer',$interviewer); + $this->t->set_var('interviewer',$indiv); } $this->t->set_var('interviewer_name',$interviewer_name); $this->t->fp('int_list','interviewer_list',True); @@ -2807,7 +2798,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 +2809,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 +2830,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 +3005,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 +3015,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 +3530,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++; } @@ -3573,6 +3564,10 @@ class tc $time = $hour.':'.$minute.':'.'00'; $uid = 0; + // Zero out family or individual if they are invalid + if($indiv == "") { $indiv=0; } + if($family == "") { $family=0; } + // Update our location if($location == "") { if($family > 0) { @@ -3583,13 +3578,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]
"; $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'); } @@ -3709,11 +3700,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'); } @@ -3747,7 +3733,7 @@ class tc $table_data.= ""; // individual drop down list (for PPIs) - $table_data.= ''; $table_data.= ''; for ($j=0; $j < count($individual); $j++) { $id = $individual[$j]; @@ -3803,7 +3789,7 @@ class tc $table_data.= ""; // individual drop down list - $table_data.= ''; $table_data.= ''; for ($j=0; $j < count($individual); $j++) { $id = $individual[$j]; @@ -4272,10 +4258,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'); }