X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=5d85a33135d2084434d01a23a0b5b3354adb049c;hb=ade813c87bbfeb4da401a2bd68d4859880f09263;hp=54283fc37655e35006ab5942820ef5875eda1d9d;hpb=7536f56a8181f8024ae8da99bc31d7b1c43934a8;p=eq%2F.git diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php index 54283fc..5d85a33 100644 --- a/inc/class.tc.inc.php +++ b/inc/class.tc.inc.php @@ -35,6 +35,7 @@ class tc var $script_path; var $max_appointments; var $max_presidency_members; + var $ppi_frequency_label; var $public_functions = array ( @@ -105,6 +106,18 @@ class tc $this->current_month = $this->current_month-0; // Make it numeric $this->current_year = `date '+%Y'`; $this->current_year = $this->current_year-0; // Make it numeric + + if ($this->ppi_frequency == 12) { + $this->ppi_frequency_label = "Annual"; + } else if ($this->ppi_frequency == 6) { + $this->ppi_frequency_label = "Semi-Annual"; + } else if ($this->ppi_frequency == 3) { + $this->ppi_frequency_label = "Quarterly"; + } else if ($this->ppi_frequency == 1) { + $this->ppi_frequency_label = "Monthly"; + } else { + $this->ppi_frequency_label = "Periodic"; + } echo parse_navbar(); $this->display_app_header(); @@ -255,7 +268,7 @@ class tc for ($j=0; $j < count($unique_companionships); $j++) { $companion_table_entry = ""; // Select all the companions in each companionship - $sql = "SELECT * FROM tc_companionship where valid=1 and ". + $sql = "SELECT * FROM tc_companion where valid=1 and ". "companionship=". $unique_companionships[$j]['companionship']; $this->db->query($sql,__LINE__,__FILE__); @@ -725,7 +738,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 +763,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') . "
"; @@ -825,7 +838,7 @@ class tc $this->t->set_var('assignment_data',$assignment_data); // Create individual selection boxes - $sql = "SELECT * FROM tc_individual WHERE steward='$this->default_stewardship'"; + $sql = "SELECT * FROM tc_individual"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -1344,42 +1357,26 @@ class tc $this->t->set_var('lang_reset','Clear Changes'); $this->t->set_var('ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_view')); - $this->t->set_var('ppi_link_title','Yearly PPIs'); + $this->t->set_var('ppi_link_title',$this->ppi_frequency_label . ' PPIs'); $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched')); - $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs'); + $this->t->set_var('schedule_ppi_link_title','Schedule ' . $this->ppi_frequency_label . ' PPIs'); $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched&action=save')); - $this->t->set_var('title','Yearly PPI Scheduler'); - - $indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $ppi_date_width=20; - $table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $ppi_date_width; - $header_row = "individual Name"; - $header_row.= "Phone"; - $header_row.= "Priority"; - $header_row.= "Last PPI"; - $header_row.= "Scheduling Notes"; + $this->t->set_var('title',$this->ppi_frequency_label . ' PPI Scheduler'); + + $header_row = "Individual Name"; + $header_row.= "Phone"; + $header_row.= "Priority"; + $header_row.= "Last PPI"; + $header_row.= "Scheduling Notes"; $table_data=""; $completed_data=""; $totals_data=""; $year = date('Y'); - - // Get the President - $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti where tp.individual=ti.individual AND tp.president=1 AND tp.valid=1"; - $this->db->query($sql,__LINE__,__FILE__); - if($this->db->next_record()) { - $president_name = $this->db->f('name'); - $president_name_array = explode(",",$president_name); - $president_last_name = $president_name_array[0]; - $president_id = $this->db->f('individual'); - $presidency_id = $this->db->f('presidency'); - $interviewer = $this->db->f('individual'); - $district_number = '*'; - $district_name = $president_name; - $president_address = $this->db->f('address'); - } else { - print "

-E- Unable to locate President in tc_presidency table

"; - return; - } + $month = date('m'); + $period = intval(($month-1)/$this->ppi_frequency) + 1; + $start_of_period = ($period-1)*$this->ppi_frequency + 1; + $end_of_period = $period * $this->ppi_frequency; if($action == 'save') { // Save any changes made to the appointment table @@ -1389,7 +1386,8 @@ class tc $indiv = $entry['individual']; $appointment = $entry['appointment']; $location = $entry['location']; - if($location == "") { $location = "$president_last_name"." home ($president_address)"; } + $presidency_location = $entry['presidency_location']; + if($location == "") { $location = $presidency_location; } if($indiv == 0) { $location = ""; } //Only perform a database update if we have made a change to this appointment @@ -1442,39 +1440,52 @@ class tc array_multisort($indiv_name, $individual); // APPOINTMENT TABLE - $date_width=250; $time_width=100; $indiv_width=200; $location_width=100; - $appt_table_width=$date_width + $time_width + $indiv_width + $location_width; - $appt_header_row = "Date"; - $appt_header_row.= "Time"; - $appt_header_row.= "indiv"; - $appt_header_row.= "Location"; - $appt_table_data = ""; + $appt_header_row = "Date"; + $appt_header_row.= "Time"; + $appt_header_row.= "Individual"; + $appt_header_row.= "Location"; + $appt_table_data = ""; + $table_data=""; $total_indivs=0; $indivs_with_yearly_ppi=0; - // Display a scheduling table for the President - $table_data=""; $appt_table_data=""; - $table_title = "District ".$district_number.": ".$district_name.": All indivs with Yearly PPI Not Completed"; - $appt_table_title = "District ".$district_number.": ".$district_name.": Yearly PPI Appointment Slots"; - $this->t->set_var('table_title',$table_title); - $this->t->set_var('appt_table_title',$appt_table_title); - - // query the database for all the appointments - $sql = "SELECT * FROM tc_appointment where presidency=".$presidency_id." and date>=CURDATE() ORDER BY date ASC, time ASC"; + // Get the President + $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti where tp.individual=ti.individual AND tp.valid=1 AND "; + if($this->yearly_ppi_interviewer == 1) { $sql .= " (tp.president=1)"; } + if($this->yearly_ppi_interviewer == 2) { $sql .= " (tp.president=1 OR tp.counselor=1)"; } + if($this->yearly_ppi_interviewer == 3) { $sql .= " (tp.president=1 OR tp.counselor=1 OR tp.secretary=1)"; } $this->db->query($sql,__LINE__,__FILE__); - while ($this->db->next_record()) { - $appointment = $this->db->f('appointment'); - $indiv = $this->db->f('individual'); - $location = $this->db->f('location'); - if(($location == "") && ($indiv > 0)) { $location = "$president_last_name"." home ($president_address)"; } + $presidency_name = $this->db->f('name'); + $presidency_name_array = explode(",",$presidency_name); + $presidency_last_name = $presidency_name_array[0]; + $presidency_id = $this->db->f('presidency'); + $presidency_address = $this->db->f('address'); + $presidency_location = "$presidency_last_name"." home ($presidency_address)"; + $appt_table_data = ""; + + // Display a scheduling table for this presidency member + $not_completed_table_title = "All individuals with " . $this->ppi_frequency_label . " PPI Not Completed"; + $appt_table_title = $presidency_name . ": " . $this->ppi_frequency_label." PPI Appointment Slots"; + $this->t->set_var('not_completed_table_title',$not_completed_table_title); + $this->t->set_var('appt_table_title',$appt_table_title); + + // query the database for all the appointments + $sql = "SELECT * FROM tc_appointment where presidency=".$presidency_id." and date>=CURDATE() ORDER BY date ASC, time ASC"; + $this->db2->query($sql,__LINE__,__FILE__); + + while ($this->db2->next_record()) { + $appointment = $this->db2->f('appointment'); + $indiv = $this->db2->f('individual'); + $location = $this->db2->f('location'); + if(($location == "") && ($indiv > 0)) { $location = $presidency_location; } - $date = $this->db->f('date'); + $date = $this->db2->f('date'); $date_array = explode("-",$date); $year = $date_array[0]; $month = $date_array[1]; $day = $date_array[2]; $day_string = date("l d-M-Y", mktime(0,0,0,$month,$day,$year)); - $time = $this->db->f('time'); + $time = $this->db2->f('time'); $time_array = explode(":",$time); $time_string = date("g:i a", mktime($time_array[0], $time_array[1], $time_array[2])); @@ -1485,14 +1496,14 @@ class tc $appt_table_data.= ''; @@ -1503,12 +1514,14 @@ class tc $tr_color = $this->nextmatchs->alternate_row_color($tr_color); $this->t->set_var('tr_color',$tr_color); - } - - $this->t->set_var('appt_table_data',$appt_table_data); - $this->t->set_var('appt_header_row',$appt_header_row); - $this->t->set_var('appt_table_width',$appt_table_width); + } + $this->t->set_var('appt_table_data',$appt_table_data); + $this->t->set_var('appt_header_row',$appt_header_row); + $this->t->set_var('lang_save','Save Appts for ' . $presidency_name); + $this->t->fp('apptlist','appt_list',True); + } + // PPI SCHEDULING TABLE $sql = "SELECT * FROM tc_individual AS ti JOIN tc_scheduling_priority AS tsp WHERE ti.scheduling_priority=tsp.scheduling_priority AND steward='$this->default_stewardship' AND valid=1 ORDER BY tsp.priority ASC, ti.name ASC"; $this->db->query($sql,__LINE__,__FILE__); @@ -1526,7 +1539,7 @@ class tc } $max = count($individual); - + for($i=0; $i < $max; $i++) { $id = $individual[$i]; $name = $indiv_name[$i]; @@ -1534,10 +1547,11 @@ class tc $priority = $indiv_priority[$id]; $notes = $indiv_notes[$id]; - // 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'"; + // If this individual has had a PPI this period, don't show him on the schedule list + $year_start = $year . "-" . $start_of_period . "-01"; + $year_end = $year . "-" . $end_of_period . "-31"; + $sql = "SELECT * FROM tc_interview WHERE date >= '$year_start' AND date <= '$year_end' ". + "AND individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC"; $this->db2->query($sql,__LINE__,__FILE__); if(!$this->db2->next_record()) { @@ -1602,27 +1616,24 @@ class tc } } // End for individuals Loop - $name_width=175; $phone_width=100; $date_width=100; $notes_width=300; - $completed_table_width=$name_width + $phone_width + $date_width + $notes_width; - $completed_header_row = "Individual Name"; - $completed_header_row.= "Phone"; - $completed_header_row.= "Date"; - $completed_header_row.= "PPI Notes"; + $completed_table_title = "All individuals with " . $this->ppi_frequency_label . " PPI Completed"; + $completed_header_row = "Individual"; + $completed_header_row.= "Phone"; + $completed_header_row.= "Date"; + $completed_header_row.= "PPI Notes"; - $this->t->set_var('table_width',$table_width); + $this->t->set_var('completed_table_title',$completed_table_title); $this->t->set_var('header_row',$header_row); $this->t->set_var('table_data',$table_data); $this->t->set_var('completed_header_row',$completed_header_row); - $this->t->set_var('completed_table_width',$completed_table_width); $this->t->set_var('completed',$completed_data); + $this->t->set_var('lang_save','Save Pri / Notes'); $this->t->fp('indivlist','individual_list',True); - $indivs_width=300; $totals_width=100; - $totals_table_width=$indivs_width + $totals_width; - $totals_header_row = "Individuals"; - $totals_header_row.= "$year"; + $totals_header_row = "Individuals"; + $totals_header_row.= "$year"; $totals_data.= ""; - $totals_data.= "Total Individuals with yearly PPIs completed:"; + $totals_data.= "Total Individuals with " . $this->ppi_frequency_label . " PPIs completed:"; $totals_data.= "$indivs_with_yearly_ppi / $total_indivs"; $percent = ceil(($indivs_with_yearly_ppi / $total_indivs)*100); $tr_color = $this->nextmatchs->alternate_row_color($tr_color); @@ -1634,7 +1645,7 @@ class tc $this->t->set_var('totals',$totals_data); $this->t->set_var('totals_header_row',$totals_header_row); - $this->t->set_var('totals_table_width',$totals_table_width); + $this->t->set_var('ppi_frequency_label',$this->ppi_frequency_label); $this->t->pfp('out','ppi_sched_t'); $this->save_sessiondata(); @@ -1648,7 +1659,6 @@ class tc $this->t->set_block('int_sched_t','appt_list','apptlist'); $action = get_var('action',array('GET','POST')); - $this->t->set_var('lang_save','Save Appt / Pri / Notes'); $this->t->set_var('lang_reset','Clear Changes'); $this->t->set_var('int_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_view')); @@ -1660,13 +1670,11 @@ class tc $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_sched&action=save')); $this->t->set_var('title','Hometeaching Interviews Scheduler'); - $indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $int_date_width=20; - $table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $int_date_width; - $header_row = "individual Name"; - $header_row.= "Phone"; - $header_row.= "Priority"; - $header_row.= "Last Interview"; - $header_row.= "Scheduling Notes"; + $header_row = "Individual"; + $header_row.= "Phone"; + $header_row.= "Priority"; + $header_row.= "Last Interview"; + $header_row.= "Scheduling Notes"; $table_data=""; $completed_data=""; $totals_data=""; $year = date('Y'); @@ -1720,11 +1728,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 +1760,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'"); @@ -1784,12 +1787,10 @@ class tc // APPOINTMENT TABLE $district = 1; - $date_width=250; $time_width=100; $indiv_width=200; $location_width=100; - $appt_table_width=$date_width + $time_width + $indiv_width + $location_width; - $appt_header_row = "Date"; - $appt_header_row.= "Time"; - $appt_header_row.= "Individual"; - $appt_header_row.= "Location"; + $appt_header_row = "Date"; + $appt_header_row.= "Time"; + $appt_header_row.= "Individual"; + $appt_header_row.= "Location"; $appt_table_data = ""; $total_comps=0; $comps_with_quarterly_int=0; @@ -1804,11 +1805,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'); } @@ -1867,7 +1863,6 @@ class tc $this->t->set_var('appt_table_data',$appt_table_data); $this->t->set_var('appt_header_row',$appt_header_row); - $this->t->set_var('appt_table_width',$appt_table_width); // INTERVIEW SCHEDULING TABLE @@ -1884,7 +1879,7 @@ class tc $i=0; for ($j=0; $j < count($unique_companionships); $j++) { // Select all the companions from each companionship - $sql = "SELECT * FROM tc_companionship AS tc JOIN (tc_scheduling_priority AS tsp, tc_individual AS ti) WHERE tc.scheduling_priority=tsp.scheduling_priority AND tc.individual=ti.individual AND tc.valid=1 AND tc.companionship=". $unique_companionships[$j]['companionship']; + $sql = "SELECT * FROM tc_companion AS tc JOIN (tc_scheduling_priority AS tsp, tc_individual AS ti) WHERE tc.scheduling_priority=tsp.scheduling_priority AND tc.individual=ti.individual AND tc.valid=1 AND tc.companionship=". $unique_companionships[$j]['companionship']; $this->db->query($sql,__LINE__,__FILE__); $k=0; $int_completed=0; $comp = $unique_companionships[$j]['companionship']; @@ -1917,11 +1912,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'); @@ -1933,6 +1928,7 @@ class tc $link_data['name'] = $name; $link_data['interview'] = ''; $link_data['action'] = 'add'; + $link_data['interview_type'] = 'hti'; $link_data['interviewer'] = $districts[$d]['supervisor']; $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data); $table_data.= "$name"; @@ -1962,6 +1958,7 @@ class tc $link_data['individual'] = $this->db2->f('individual'); $link_data['name'] = $name; $link_data['interview'] = $this->db2->f('interview'); + $link_data['interview_type'] = 'hti'; $link_data['action'] = 'view'; $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data); $comps_with_quarterly_int++; @@ -1978,28 +1975,24 @@ class tc } } - $name_width=175; $phone_width=100; $date_width=100; $notes_width=300; - $completed_table_width=$name_width + $phone_width + $date_width + $notes_width; - $completed_header_row = "Individual Name"; - $completed_header_row.= "Phone"; - $completed_header_row.= "Date"; - $completed_header_row.= "Interview Notes"; + $completed_header_row = "Individual"; + $completed_header_row.= "Phone"; + $completed_header_row.= "Date"; + $completed_header_row.= "Interview Notes"; - $this->t->set_var('table_width',$table_width); $this->t->set_var('header_row',$header_row); $this->t->set_var('table_data',$table_data); $this->t->set_var('completed_header_row',$completed_header_row); - $this->t->set_var('completed_table_width',$completed_table_width); $this->t->set_var('completed',$completed_data); + $this->t->set_var('lang_save_appt','Save Appts for ' . $districts[$d]['name']); + $this->t->set_var('lang_save_pri_notes','Save Pri / Notes for '. $districts[$d]['name']); $this->t->fp('indivlist','individual_list',True); } // End for each district loop - $indivs_width=300; $totals_width=100; - $totals_table_width=$indivs_width + $totals_width; - $totals_header_row = "Individuals"; - $totals_header_row.= "$year"; + $totals_header_row = "Individuals"; + $totals_header_row.= "$year"; $totals_data.= ""; $totals_data.= "Total Companionships with interviews completed:"; $totals_data.= "$comps_with_quarterly_int / $total_comps"; @@ -2013,7 +2006,6 @@ class tc $this->t->set_var('totals',$totals_data); $this->t->set_var('totals_header_row',$totals_header_row); - $this->t->set_var('totals_table_width',$totals_table_width); $this->t->pfp('out','int_sched_t'); $this->save_sessiondata(); @@ -2027,7 +2019,6 @@ class tc $this->t->set_block('vis_sched_t','appt_list','apptlist'); $action = get_var('action',array('GET','POST')); - $this->t->set_var('lang_save','Save Appt / Pri / Notes'); $this->t->set_var('lang_reset','Clear Changes'); $this->t->set_var('vis_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.vis_view')); @@ -2039,13 +2030,11 @@ class tc $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.vis_sched&action=save')); $this->t->set_var('title','Presidency Yearly Visit Scheduler'); - $family_width=500; $phone_width=40; $pri_width=10; $notes_width=128; $visit_date_width=20; - $table_width=$family_width + $phone_width + $pri_width + $notes_width + $visit_date_width; - $header_row = "Family Name"; - $header_row.= "Phone"; - $header_row.= "Priority"; - $header_row.= "Last Visit"; - $header_row.= "Scheduling Notes"; + $header_row = "Family Name"; + $header_row.= "Phone"; + $header_row.= "Priority"; + $header_row.= "Last Visit"; + $header_row.= "Scheduling Notes"; $table_data=""; $completed_data=""; $totals_data=""; $year = date('Y'); @@ -2115,12 +2104,10 @@ class tc } // APPOINTMENT TABLE - $date_width=250; $time_width=100; $family_width=250; $location_width=100; - $appt_table_width=$date_width + $time_width + $family_width + $location_width; - $appt_header_row = "Date"; - $appt_header_row.= "Time"; - $appt_header_row.= "Family"; - $appt_header_row.= "Location"; + $appt_header_row = "Date"; + $appt_header_row.= "Time"; + $appt_header_row.= "Family"; + $appt_header_row.= "Location"; $appt_table_data = ""; // Find out what the President ID is @@ -2185,7 +2172,6 @@ class tc $this->t->set_var('appt_table_data',$appt_table_data); $this->t->set_var('appt_header_row',$appt_header_row); - $this->t->set_var('appt_table_width',$appt_table_width); // VISIT SCHEDULING TABLE @@ -2266,17 +2252,13 @@ class tc } } - $name_width=190; $phone_width=100; $date_width=100; $notes_width=300; - $completed_table_width=$name_width + $phone_width + $date_width + $notes_width; - $completed_header_row = "Family Name"; - $completed_header_row.= "Phone"; - $completed_header_row.= "Date"; - $completed_header_row.= "Visit Notes"; - - $family_width=300; $totals_width=100; - $totals_table_width=$family_width + $totals_width; - $totals_header_row = "Families"; - $totals_header_row.= "$year"; + $completed_header_row = "Family Name"; + $completed_header_row.= "Phone"; + $completed_header_row.= "Date"; + $completed_header_row.= "Visit Notes"; + + $totals_header_row = "Families"; + $totals_header_row.= "$year"; $totals_data.= ""; $totals_data.= "Total Families with yearly Visits completed:"; $totals_data.= "$families_with_yearly_visit / $total_families"; @@ -2288,16 +2270,15 @@ class tc $totals_data.= "$percent%"; $totals_data.= ""; - $this->t->set_var('table_width',$table_width); $this->t->set_var('header_row',$header_row); $this->t->set_var('table_data',$table_data); $this->t->set_var('totals_header_row',$totals_header_row); - $this->t->set_var('totals_table_width',$totals_table_width); $this->t->set_var('completed_header_row',$completed_header_row); - $this->t->set_var('completed_table_width',$completed_table_width); $this->t->set_var('completed',$completed_data); $this->t->set_var('totals',$totals_data); $this->t->fp('familylist','family_list',True); + $this->t->set_var('lang_save_appt','Save Appts'); + $this->t->set_var('lang_save_pri_notes','Save Pri / Notes'); $this->t->fp('apptlist','appt_list',True); $this->t->pfp('out','vis_sched_t'); @@ -2322,12 +2303,12 @@ class tc $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_view')); $this->t->set_var('ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_view')); - $this->t->set_var('ppi_link_title','Yearly PPIs'); + $this->t->set_var('ppi_link_title',$this->ppi_frequency_label . ' PPIs'); $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched')); - $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs'); + $this->t->set_var('schedule_ppi_link_title','Schedule ' . $this->ppi_frequency_label . ' PPIs'); - $this->t->set_var('title','Yearly PPIs'); + $this->t->set_var('title',$this->ppi_frequency_label . ' PPIs'); $num_months = get_var('num_months',array('GET','POST')); if($num_months == '') { $num_months = $this->default_ppi_num_years; } $this->t->set_var('num_months',$num_months); @@ -2342,7 +2323,6 @@ class tc if($this->db->next_record()) { $president_name = $this->db->f('name'); $interviewer = $this->db->f('individual'); - $interview_type = 'ppi'; } else { print "

-E- Unable to locate President in tc_presidency table

"; return; @@ -2365,7 +2345,7 @@ class tc array_multisort($indiv_name, $individual); //var_dump($indiv_name); print "

"; var_dump($individual); - $header_row="Individual Name"; + $header_row="Individual"; $indiv_width=400; $ppi_width=75; $table_width=$indiv_width + $num_months*$ppi_width; $table_data=""; @@ -2382,10 +2362,10 @@ class tc $link_data['menuaction'] = 'tc.tc.ppi_update'; $link_data['interviewer'] = $interviewer; - $link_data['indiv'] = $id; + $link_data['individual'] = $id; $link_data['name'] = $name; $link_data['interview'] = ''; - $link_data['interview_type'] = $interview_type; + $link_data['interview_type'] = 'ppi'; $link_data['action'] = 'add'; $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data); $this->nextmatchs->template_alternate_row_color(&$this->t); @@ -2396,7 +2376,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; } @@ -2408,7 +2388,7 @@ class tc $link_data['indiv'] = $id; $link_data['name'] = $name; $link_data['interview'] = $this->db2->f('interview'); - $link_data['interview_type'] = $interview_type; + $link_data['interview_type'] = 'ppi'; $link_data['action'] = 'view'; $date = $this->db2->f('date'); $date_array = explode("-",$date); @@ -2455,34 +2435,38 @@ class tc $interviewer = get_var('interviewer',array('GET','POST')); $name = get_var('name',array('GET','POST')); $interview = get_var('interview',array('GET','POST')); - $indiv = get_var('indiv',array('GET','POST')); + $individual = get_var('individual',array('GET','POST')); $date = get_var('date',array('GET','POST')); $notes = get_var('notes',array('GET','POST')); $interview_type = get_var('interview_type',array('GET','POST')); - $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 AND (tp.president=1 OR tp.counselor=1 OR tp.secretary=1)"; + $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 AND "; + if($this->yearly_ppi_interviewer == 1) { $sql .= " (tp.president=1)"; } + if($this->yearly_ppi_interviewer == 2) { $sql .= " (tp.president=1 OR tp.counselor=1)"; } + if($this->yearly_ppi_interviewer == 3) { $sql .= " (tp.president=1 OR tp.counselor=1 OR tp.secretary=1)"; } $this->db2->query($sql,__LINE__,__FILE__); while ($this->db2->next_record()) { $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('interview_type_checked',''); + $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 " . " interview='" . $interview . "'" . ", interviewer='" . $interviewer . "'" . - ", individual='" . $indiv . "'" . + ", individual='" . $individual . "'" . ", date='" . $date . "'" . - ", notes='" . $notes . "'" . + ", notes=\"" . $notes . "\"" . ", interview_type='" . $interview_type . "'" . " WHERE interview=" . $interview,__LINE__,__FILE__); $this->ppi_view(); @@ -2492,8 +2476,8 @@ class tc if($action == 'insert') { $notes = get_var('notes',array('POST')); $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " . - "VALUES ('" . $interviewer . "','" . $indiv . "','" . - $date . "','" . $notes . "','" . $interview_type ."')",__LINE__,__FILE__); + "VALUES ('" . $interviewer . "','" . $individual . "','" . + $date . "',\"" . $notes . "\",'" . $interview_type ."')",__LINE__,__FILE__); $this->ppi_view(); return false; } @@ -2503,11 +2487,11 @@ class tc $this->t->set_var('interview', ''); $this->t->set_var('interviewer', $interviewer); $this->t->set_var('name',$name); - $this->t->set_var('indiv',$indiv); + $this->t->set_var('individual',$individual); $this->t->set_var('date',''); $this->t->set_var('notes',''); $this->t->set_var('interview_type',$interview_type); - $this->t->set_var('interview_type_checked','checked'); + $this->t->set_var('eqpresppi_checked','checked'); $this->t->set_var('lang_done','Cancel'); $this->t->set_var('lang_action','Adding New PPI'); $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_update&interview=' . @@ -2515,17 +2499,17 @@ 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); $this->t->set_var('name',$name); $this->t->set_var('interviewer', $this->db->f('interviewer')); - $this->t->set_var('indiv',$this->db->f('indiv')); + $this->t->set_var('individual',$this->db->f('individual')); $this->t->set_var('date',$this->db->f('date')); $this->t->set_var('notes',$this->db->f('notes')); $this->t->set_var('interview_type',$this->db->f('interview_type')); - if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); } + if($this->db->f('interview_type') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); } } if($action == 'edit') { @@ -2639,7 +2623,7 @@ class tc for($m=$num_months; $m >= 0; $m--) { $ints[$m] = 0; } for ($j=0; $j < count($unique_companionships); $j++) { // Select all the companions in each companionship - $sql = "SELECT * FROM tc_companionship where valid=1 and ". + $sql = "SELECT * FROM tc_companion where valid=1 and ". "companionship=". $unique_companionships[$j]['companionship']; $this->db->query($sql,__LINE__,__FILE__); $k=0; @@ -2655,9 +2639,10 @@ class tc $link_data['menuaction'] = 'tc.tc.int_update'; $link_data['companionship'] = $companionship; $link_data['interviewer'] = $supervisor; - $link_data['indiv'] = $individual; + $link_data['individual'] = $individual; $link_data['name'] = $name; $link_data['interview'] = ''; + $link_data['interview_type'] = 'hti'; $link_data['action'] = 'add'; $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data); $table_data.= "$name"; @@ -2677,7 +2662,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"; @@ -2691,10 +2676,11 @@ class tc $link_data['menuaction'] = 'tc.tc.int_update'; $link_data['companionship'] = $companionship; $link_data['interviewer'] = $this->db2->f('interviewer'); - $link_data['indiv'] = $individual; + $link_data['individual'] = $individual; $link_data['name'] = $name; $link_data['interview'] = $this->db2->f('interview'); $link_data['action'] = 'view'; + $link_data['interview_type'] = 'hti'; $date = $this->db2->f('date'); $date_array = explode("-",$date); $month = $date_array[1]; @@ -2771,14 +2757,14 @@ class tc $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_view')); $this->t->set_var('readonly',''); $this->t->set_var('disabled',''); - $this->t->set_var('interview_type_checked',''); + $this->t->set_var('eqpresppi',''); $action = get_var('action',array('GET','POST')); $companionship = get_var('companionship',array('GET','POST')); $interviewer = get_var('interviewer',array('GET','POST')); $name = get_var('name',array('GET','POST')); $interview = get_var('interview',array('GET','POST')); - $indiv = get_var('indiv',array('GET','POST')); + $individual = get_var('individual',array('GET','POST')); $date = get_var('date',array('GET','POST')); $notes = get_var('notes',array('GET','POST')); $interview_type = get_var('interview_type',array('GET','POST')); @@ -2789,9 +2775,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); @@ -2802,9 +2788,9 @@ class tc $this->db->query("UPDATE tc_interview set " . " interview='" . $interview . "'" . ", interviewer='" . $interviewer . "'" . - ", individual='" . $indiv . "'" . + ", individual='" . $individual . "'" . ", date='" . $date . "'" . - ", notes='" . $notes . "'" . + ", notes=\"" . $notes . "\"" . ", interview_type='" . $interview_type . "'" . " WHERE interview=" . $interview,__LINE__,__FILE__); $this->int_view(); @@ -2814,8 +2800,8 @@ class tc if($action == 'insert') { $notes = get_var('notes',array('POST')); $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " . - "VALUES ('" . $interviewer . "','" . $indiv . "','" . - $date . "','" . $notes ."','" . $interview_type . "')",__LINE__,__FILE__); + "VALUES ('" . $interviewer . "','" . $individual . "','" . + $date . "',\"" . $notes ."\",'" . $interview_type . "')",__LINE__,__FILE__); $this->int_view(); return false; } @@ -2825,9 +2811,10 @@ class tc $this->t->set_var('interview', ''); $this->t->set_var('interviewer', $interviewer); $this->t->set_var('name',$name); - $this->t->set_var('indiv',$indiv); + $this->t->set_var('individual',$individual); $this->t->set_var('date',''); $this->t->set_var('notes',''); + $this->t->set_var('interview_type',$interview_type); $this->t->set_var('lang_done','Cancel'); $this->t->set_var('lang_action','Adding New Interview'); $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_update&interview=' . @@ -2835,16 +2822,17 @@ 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); $this->t->set_var('name',$name); $this->t->set_var('interviewer', $this->db->f('interviewer')); - $this->t->set_var('indiv',$this->db->f('individual')); + $this->t->set_var('individual',$this->db->f('individual')); $this->t->set_var('date',$this->db->f('date')); $this->t->set_var('notes',$this->db->f('notes')); - if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); } + $this->t->set_var('interview_type',$this->db->f('interview_type')); + if($this->db->f('interview_type') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); } } if($action == 'edit') { @@ -3009,7 +2997,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; @@ -3019,7 +3007,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; } @@ -3442,7 +3430,7 @@ class tc $this->t->set_block('org_view_t','org_list','list2'); # Display a list ordered alphabetically - $sql = "SELECT * FROM tc_calling ORDER BY name ASC"; + $sql = "SELECT * FROM tc_calling AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -3467,7 +3455,7 @@ class tc } # Display a list ordered by organization - $sql = "SELECT * FROM tc_calling ORDER BY organization ASC"; + $sql = "SELECT * FROM tc_calling AS tc JOIN tc_individual AS ti where tc.individual=ti.individual ORDER BY organization ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -3515,13 +3503,13 @@ class tc $this->t->set_var('schedule_int_link_title','Schedule Hometeaching Interviews'); $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched')); - $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs'); + $this->t->set_var('schedule_ppi_link_title','Schedule ' . $this->ppi_frequency_label . ' PPIs'); - $date_width=150; $time_width=220; $indiv_width=170; $family_width=180; $location_width=100; + $date_width=160; $time_width=220; $indiv_width=170; $family_width=180; $location_width=100; $table_width=$date_width + $time_width + $indiv_width + $family_width + $location_width; $header_row = "Date"; $header_row.= "Time"; - $header_row.= "individual"; + $header_row.= "Individual"; $header_row.= "Family"; $header_row.= "Location"; $table_data = ""; @@ -3534,11 +3522,11 @@ 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++; } - $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 ORDER BY ti.name ASC"; + $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND ti.steward='$this->default_stewardship' AND tf.valid=1 AND tf.individual != 0 ORDER BY ti.name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -3568,6 +3556,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) { @@ -3578,13 +3570,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'); } @@ -3704,11 +3692,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'); } @@ -3742,7 +3725,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]; @@ -3798,7 +3781,7 @@ class tc $table_data.= ""; // individual drop down list - $table_data.= ''; $table_data.= ''; for ($j=0; $j < count($individual); $j++) { $id = $individual[$j]; @@ -4267,10 +4250,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'); }