Merge commit 'origin/master' into ht_sandbox
authorOwen Leonard <owen@balawis.leonard.fam>
Wed, 20 Oct 2010 18:41:02 +0000 (12:41 -0600)
committerOwen Leonard <owen@balawis.leonard.fam>
Wed, 20 Oct 2010 18:41:02 +0000 (12:41 -0600)
1  2 
inc/class.tc.inc.php

diff --combined inc/class.tc.inc.php
index 9684e8e114691f1970584e306b2a62e9cd3db97d,5d85a33135d2084434d01a23a0b5b3354adb049c..15086be6a9b14cde1086a9d24bff95c20cdbdcea
@@@ -68,7 -68,6 +68,7 @@@ class t
                'assign_view'    => True,
                'assign_update'  => True,
                'get_time_selection_form' => True,
 +              'ht_sandbox' => True,
        );
   
        function tc()
                $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_view'));
                $this->t->set_var('title','Hometeaching'); 
  
 +              $this->t->set_var('ht_sandbox_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_sandbox'));
 +              $this->t->set_var('ht_sandbox_link_title','Hometeaching Sandbox'); 
 +
                $sql = "SELECT * FROM tc_district AS td JOIN tc_individual AS ti WHERE td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
        }
        
  
 +      function ht_sandbox()
 +      {
 +              $this->t->set_file(array('ht_sandbox_t' => 'ht_sandbox.tpl'));
 +              $this->t->set_block('ht_sandbox_t','comp_list','c_list');
 +              $this->t->set_block('ht_sandbox_t','district_list','d_list');
 +              $this->t->set_block('ht_sandbox_t','unassigned_ht_list','uht_list');
 +              $this->t->set_block('ht_sandbox_t','assigned_ht_list','aht_list');
 +              $this->t->set_block('ht_sandbox_t','unassigned_family_list','uf_list');
 +              $this->t->set_block('ht_sandbox_t','assigned_family_list','af_list');
 +              $this->t->set_block('ht_sandbox_t','district_table_list','dt_list');
 +              $this->t->set_block('ht_sandbox_t','companionship_table_list','ct_list');
 +
 +              $this->t->set_var('submit_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_sandbox&action=add'));
 +              
 +          $action = get_var('action',array('GET','POST'));
 +
 +              $this->t->set_var('title','Hometeaching Sandbox'); 
 +
 +              if ($_POST['add']) {
 +                      #$this->t->set_var('debug_list',$_POST['add']);
 +                      $companionship = get_var('companionship',array('POST'));
 +                      $district = get_var('district',array('POST'));
 +                      $assignedHT_list = get_var('assignedHT',array('POST'));
 +                      $unassignedHT_list = get_var('unassignedHT',array('POST'));
 +                      $assigned_family_list = get_var('assignedFamiles',array('POST'));
 +                      $unassigned_family_list = get_var('unassignedFamilies',array('POST'));
 +                      
 +                      if ($assignedHT_list || $unassignedHT_list) {
 +                              $sql = "INSERT INTO tc_companionship_sandbox (district) VALUES (\"$district\")";
 +                              $this->db2->query($sql,__LINE__,__FILE__);
 +                              $companionship_sandbox = mysql_insert_id();
 +                              
 +                              foreach ($assignedHT_list as $individual) {
 +                                      $sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship_sandbox\")";
 +                                      $this->db->query($sql,__LINE__,__FILE__);
 +                              }
 +                              foreach ($unassignedHT_list as $individual) {
 +                                      $sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship_sandbox\")";
 +                                      $this->db->query($sql,__LINE__,__FILE__);
 +                              }
 +                              foreach ($assigned_family_list as $family) {
 +                                      $sql = "UPDATE tc_family_sandbox SET companionship=$companionship_sandbox WHERE family=$family";
 +                                      $this->db->query($sql,__LINE__,__FILE__);
 +                              }
 +                              foreach ($unassigned_family_list as $family) {
 +                                      $sql = "UPDATE tc_family_sandbox SET companionship=$companionship_sandbox WHERE family=$family";
 +                                      $this->db->query($sql,__LINE__,__FILE__);
 +                              }
 +                      } else {
 +                              $this->t->set_var('debug_list','You must select at least one companion!');
 +                      }
 +              } else if ($_POST['delete']) {
 +                      #$this->t->set_var('debug_list',$_POST['delete']);
 +                      $companionship = get_var('companionship',array('POST'));
 +                      #$this->t->set_var('debug_list',$companionship);
 +                      
 +                      if ($companionship > 0) {
 +                              # unassign families
 +                              $sql = "UPDATE tc_family_sandbox SET companionship=NULL WHERE companionship=$companionship";
 +                              $this->db->query($sql,__LINE__,__FILE__);
 +                              
 +                              # remove companions
 +                              $sql = "DELETE FROM tc_companion_sandbox WHERE companionship=$companionship";
 +                              $this->db->query($sql,__LINE__,__FILE__);
 +                              
 +                              # remove companionship
 +                              $sql = "DELETE FROM tc_companionship_sandbox WHERE companionship=$companionship";
 +                              $this->db->query($sql,__LINE__,__FILE__);
 +                      } else {
 +                              $this->t->set_var('debug_list','You must select a companionship to delete!');
 +                      }
 +              } else if ($_POST['update']) {
 +                      #$this->t->set_var('debug_list',$_POST['update']);
 +                      $companionship = get_var('companionship',array('POST'));
 +                      $district = get_var('district',array('POST'));
 +                      $assignedHT_list = get_var('assignedHT',array('POST'));
 +                      $unassignedHT_list = get_var('unassignedHT',array('POST'));
 +                      $assigned_family_list = get_var('assignedFamiles',array('POST'));
 +                      $unassigned_family_list = get_var('unassignedFamilies',array('POST'));
 +                      #$this->t->set_var('debug_list',$district);
 +                      
 +                      if ($companionship > 0) {
 +                              if ($assignedHT_list || $unassignedHT_list) {
 +                                      # clear out existing info about companionship
 +                                      $sql = "UPDATE tc_family_sandbox SET companionship=NULL WHERE companionship=$companionship";
 +                                      $this->db->query($sql,__LINE__,__FILE__);
 +                                      $sql = "DELETE FROM tc_companion_sandbox WHERE companionship=$companionship";
 +                                      $this->db->query($sql,__LINE__,__FILE__);
 +                                      
 +                                      # set new info about companionship
 +                                      $sql = "UPDATE tc_companionship_sandbox SET district=$district WHERE companionship=$companionship";
 +                                      $this->db->query($sql,__LINE__,__FILE__);
 +                                      foreach ($assignedHT_list as $individual) {
 +                                              $sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship\")";
 +                                              $this->db->query($sql,__LINE__,__FILE__);
 +                                      }
 +                                      foreach ($unassignedHT_list as $individual) {
 +                                              $sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship\")";
 +                                              $this->db->query($sql,__LINE__,__FILE__);
 +                                      }
 +                                      foreach ($assigned_family_list as $family) {
 +                                              $sql = "UPDATE tc_family_sandbox SET companionship=$companionship WHERE family=$family";
 +                                              $this->db->query($sql,__LINE__,__FILE__);
 +                                      }
 +                                      foreach ($unassigned_family_list as $family) {
 +                                              $sql = "UPDATE tc_family_sandbox SET companionship=$companionship WHERE family=$family";
 +                                              $this->db->query($sql,__LINE__,__FILE__);
 +                                      }
 +                              } else {
 +                                      $this->t->set_var('debug_list','You must select at least one companion!');
 +                              }
 +                      } else {
 +                              $this->t->set_var('debug_list','You must select a companionship to update!');
 +                      }
 +              } else if ($_POST['reset']) {
 +                      #$this->t->set_var('debug_list',$_POST['reset']);
 +                      
 +                      $sql = "TRUNCATE TABLE tc_district_sandbox";
 +                      $this->db->query($sql,__LINE__,__FILE__);
 +                      $sql = "TRUNCATE TABLE tc_family_sandbox";
 +                      $this->db->query($sql,__LINE__,__FILE__);
 +                      $sql = "TRUNCATE TABLE tc_companion_sandbox";
 +                      $this->db->query($sql,__LINE__,__FILE__);
 +                      $sql = "TRUNCATE TABLE tc_companionship_sandbox";
 +                      $this->db->query($sql,__LINE__,__FILE__);
 +                      
 +                      # populate tc_district_sandbox
 +                      $sql = "SELECT * FROM tc_district WHERE valid=1";
 +                      $this->db->query($sql,__LINE__,__FILE__);
 +                      while ($this->db->next_record()) {
 +                              $district = $this->db->f('district');
 +                              $supervisor = $this->db->f('supervisor');
 +                              $sql = "INSERT INTO tc_district_sandbox (district,supervisor) VALUES (\"$district\",\"$supervisor\")";
 +                              $this->db2->query($sql,__LINE__,__FILE__);
 +                      }
 +                      
 +                      # populate family, companion, and companionship tables
 +                      $sql = "SELECT * FROM tc_companionship WHERE valid=1";
 +                      $this->db->query($sql,__LINE__,__FILE__);
 +                      while ($this->db->next_record()) {
 +                              $companionship = $this->db->f('companionship');
 +                              $district = $this->db->f('district');
 +                              $sql = "INSERT INTO tc_companionship_sandbox (district) VALUES (\"$district\")";
 +                              $this->db2->query($sql,__LINE__,__FILE__);
 +                              $companionship_sandbox = mysql_insert_id();
 +                              
 +                              $sql = "SELECT * FROM tc_companion WHERE companionship=$companionship AND valid=1";
 +                              $this->db2->query($sql,__LINE__,__FILE__);
 +                              while ($this->db2->next_record()) {
 +                                      $individual = $this->db2->f('individual');
 +                                      $sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship_sandbox\")";
 +                                      $this->db3->query($sql,__LINE__,__FILE__);
 +                              }
 +                              
 +                              $sql = "SELECT * FROM tc_family WHERE companionship=$companionship AND valid=1";
 +                              $this->db2->query($sql,__LINE__,__FILE__);
 +                              while ($this->db2->next_record()) {
 +                                      $individual = $this->db2->f('individual');
 +                                      $family = $this->db2->f('family');
 +                                      $sql = "INSERT INTO tc_family_sandbox (tc_family,individual,companionship) VALUES (\"$family\",\"$individual\",\"$companionship_sandbox\")";
 +                                      $this->db3->query($sql,__LINE__,__FILE__);
 +                              }
 +                      }
 +              }
 +              
 +              // get list of companionships
 +              $sql = "SELECT DISTINCT companionship FROM tc_companionship_sandbox ORDER BY companionship ASC";
 +              $this->db->query($sql,__LINE__,__FILE__);
 +              $unique_companionships = '';
 +              $unique_companionships[0]['companionship'] = 0;
 +              $this->t->set_var('companionship_list','<option value="0">New Companionship</option>');
 +              $this->t->fp('c_list','comp_list',True);
 +              $j=1;
 +              while ($this->db->next_record()) {
 +                      $companionship = $this->db->f('companionship');
 +                      $unique_companionships[$j]['companionship'] = $companionship;
 +                      $combined_companionship = "";
 +                      $sql = "SELECT * FROM tc_companion_sandbox AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND tc.companionship=$companionship ORDER BY ti.name ASC";
 +                      $this->db2->query($sql,__LINE__,__FILE__);
 +                      while ($this->db2->next_record()) {
 +                              if ($combined_companionship == "") {
 +                                      $combined_companionship .= $this->db2->f('name');
 +                              } else {
 +                                      $combined_companionship .= " / " . $this->db2->f('name');
 +                              }
 +                      }
 +                      $this->t->set_var('companionship_list','<option value="'.$companionship.'">'.$combined_companionship.'</option>');
 +                      $this->t->fp('c_list','comp_list',True);
 +                      $j++;
 +              }
 +
 +              # get list of districts
 +              $sql = "SELECT DISTINCT district FROM tc_district_sandbox ORDER BY district ASC";
 +              $this->db->query($sql,__LINE__,__FILE__);
 +              $districts = '';
 +              $num_districts=0;
 +              while ($this->db->next_record()) {
 +                      $districts[$num_districts] = $this->db->f('district');
 +                      $this->t->set_var('district','<option value="'.$districts[$num_districts].'">'.$districts[$num_districts].'</option>');
 +                      $this->t->fp('d_list','district_list',True);
 +                      $num_districts++;
 +              }
 +
 +              # get list of individuals who are and are not home teachers
 +              $sql = "SELECT * FROM tc_individual WHERE steward='$this->default_stewardship' AND valid=1 ORDER BY name ASC";
 +              $this->db->query($sql,__LINE__,__FILE__);
 +              while ($this->db->next_record()) {
 +                      $individual = $this->db->f('individual');
 +                      $name = $this->db->f('name');
 +                      $sql = "SELECT DISTINCT * FROM tc_companion_sandbox WHERE individual=$individual";
 +                      $this->db2->query($sql,__LINE__,__FILE__);
 +                      if ($this->db2->next_record()) {
 +                              $this->t->set_var('assigned_ht','<option value="'.$individual.'">'.$name.'</option>');
 +                              $this->t->fp('aht_list','assigned_ht_list',True);
 +                      } else {
 +                              $this->t->set_var('unassigned_ht','<option value="'.$individual.'">'.$name.'</option>');
 +                              $this->t->fp('uht_list','unassigned_ht_list',True);
 +                      }
 +              }
 +              
 +              # get list of families who are and are not assigned home teachers
 +              $sql = "SELECT * FROM tc_family_sandbox AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual ORDER BY ti.name ASC";
 +              $this->db->query($sql,__LINE__,__FILE__);
 +              while ($this->db->next_record()) {
 +                      $individual = $this->db->f('individual');
 +                      $family = $this->db->f('family');
 +                      $name = $this->db->f('name');
 +                      if ($this->db->f('companionship') != 0) {
 +                              $this->t->set_var('assigned_family','<option value="'.$family.'">'.$name.' Family</option>');
 +                              $this->t->fp('af_list','assigned_family_list',True);
 +                      } else {
 +                              $this->t->set_var('unassigned_family','<option value="'.$family.'">'.$name.' Family</option>');
 +                              $this->t->fp('uf_list','unassigned_family_list',True);
 +                      }
 +              }
 +              
 +              # populate ht districts table
 +              $sandbox_table_data = "<table border=\"0\" cellspacing=\"2\" cellpadding=\"2\">";
 +              
 +              # set up column headers
 +              $sandbox_table_data .= "<tr>";
 +              for ($d = 0; $d < $num_districts; $d++) {
 +                      $sandbox_table_data .= "<th align=\"center\" bgcolor=\"#c9c9c9\">District " . $districts[$d] . "</th>";
 +              }
 +
 +              # get each companionship in each district
 +              $sandbox_table_data .= "<tr>";
 +              for ($d = 0; $d < $num_districts; $d++) {
 +                      $sandbox_table_data .= "<td valign=\"Top\">";
 +                      $sandbox_table_data .= "<table>";
 +                      $sql = "SELECT DISTINCT companionship FROM tc_companionship_sandbox WHERE district=$districts[$d] ORDER BY companionship ASC";
 +                      $this->db->query($sql,__LINE__,__FILE__);
 +                      while ($this->db->next_record()) {
 +                              $sandbox_table_data .= "<tr><td><table>";
 +                              $companionship = $this->db->f('companionship');
 +                              # get names of companions in this companionship
 +                              $sql = "SELECT * FROM tc_companion_sandbox AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND companionship=$companionship ORDER BY ti.name ASC";
 +                              $this->db2->query($sql,__LINE__,__FILE__);
 +                              $companion_names = "";
 +                              while ($this->db2->next_record()) {
 +                                      if ($companion_names == "") {
 +                                              $companion_names .= $this->db2->f('name');
 +                                      } else {
 +                                              $companion_names .= " / " . $this->db2->f('name');
 +                                      }
 +                              }
 +                              $sandbox_table_data .= "<tr><th align=\"Left\" bgcolor=\"#c9c9c9\">$companion_names</th></tr>";
 +                              $sandbox_table_data .= "<tr><td><table>";
 +                              
 +                              # get families they visit
 +                              $sql = "SELECT * FROM tc_companionship_sandbox AS tcp JOIN (tc_family_sandbox AS tf, tc_individual AS ti) WHERE tcp.companionship=$companionship AND tcp.companionship=tf.companionship AND tf.individual=ti.individual";
 +                              $this->db2->query($sql,__LINE__,__FILE__);
 +                              while ($this->db2->next_record()) {
 +                                      $family_name = $this->db2->f('name') . " Family";
 +                                      $family_id = $this->db2->f('tc_family');
 +                                      $sandbox_table_data .= "<tr>";
 +                                      $sandbox_table_data .= "<td align=\"Left\">$family_name</td>";
 +                                      
 +                                      # get 12 months visit data for given family
 +                                      for($m=12; $m >= 0; $m--) {
 +                                              $month = $this->current_month - $m;
 +                                              $year = $this->current_year;
 +                                              if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; }
 +                                              if($month < 10) { $month = "0"."$month"; }
 +                                              $month_start = "$year"."-"."$month"."-"."01";
 +                                              $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;
 +                                              $query_id = $this->db3->query($sql,__LINE__,__FILE__);
 +
 +                                              if($this->db3->next_record()) {
 +                                                      if($this->db3->f('visited') == 'y') {
 +                                                              $sandbox_table_data .= "<td align=\"Right\"><img src=\"images/checkmark.gif\"></td>";
 +                                                      } else if($this->db3->f('visited') == 'n') {
 +                                                              $sandbox_table_data .= "<td align=\"Right\"><img src=\"images/x.gif\"></td>";
 +                                                      } else {
 +                                                              $sandbox_table_data .= "<td>&nbsp;</td>";
 +                                                      }
 +                                              } else {
 +                                                      $sandbox_table_data .= "<td>&nbsp;</td>";
 +                                              }
 +                                      }
 +                                      $sandbox_table_data .= "</tr>";
 +                              }
 +                              $sandbox_table_data .= "</table></td></tr>";
 +                              $sandbox_table_data .= "</table></td></tr>";
 +                      }
 +                      
 +                      $sandbox_table_data .= "</table>";
 +                      $sandbox_table_data .= "</td>";
 +              }
 +              $sandbox_table_data .= "</tr>";
 +              
 +              $sandbox_table_data .= "</table>";
 +              $this->t->set_var('district_table',$sandbox_table_data);
 +
 +              $this->t->pfp('out','ht_sandbox_t');
 +              $this->save_sessiondata();
 +      }
 +      
 +
        function ht_update()
        {
                $this->t->set_file(array('ht_update_t' => 'ht_update.tpl'));
                $this->t->set_file(array('ppi_sched_t' => 'ppi_sched.tpl'));
                $this->t->set_block('ppi_sched_t','individual_list','indivlist');
                $this->t->set_block('ppi_sched_t','appt_list','apptlist');
-           $action = get_var('action',array('GET','POST'));
+               $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('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched&action=save'));
                $this->t->set_var('title',$this->ppi_frequency_label . ' 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 = "<th width=$indiv_width><font size=-2>individual Name</th>";
-               $header_row.= "<th width=$phone_width><font size=-2>Phone</th>";
-               $header_row.= "<th width=$pri_width><font size=-2>Priority</th>";
-               $header_row.= "<th width=$ppi_date_width><font size=-2>Last PPI</th>";
-               $header_row.= "<th width=$notes_width><font size=-2>Scheduling Notes</th>";
+               $header_row = "<th ><font size=-2>Individual Name</th>";
+               $header_row.= "<th><font size=-2>Phone</th>";
+               $header_row.= "<th><font size=-2>Priority</th>";
+               $header_row.= "<th><font size=-2>Last PPI</th>";
+               $header_row.= "<th><font size=-2>Scheduling Notes</th>";
                $table_data=""; $completed_data=""; $totals_data="";
  
                $year = date('Y');
                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 = "<th width=$date_width><font size=-2>Date</th>";
-               $appt_header_row.= "<th width=$time_width><font size=-2>Time</th>";      
-               $appt_header_row.= "<th width=$indiv_width><font size=-2>Individual</th>";
-               $appt_header_row.= "<th width=$location_width><font size=-2>Location</th>";
+               $appt_header_row = "<th><font size=-2>Date</th>";
+               $appt_header_row.= "<th><font size=-2>Time</th>";      
+               $appt_header_row.= "<th><font size=-2>Individual</th>";
+               $appt_header_row.= "<th><font size=-2>Location</th>";
                $appt_table_data = "";
                $table_data="";
  
                  $appt_table_data = "";
  
                  // Display a scheduling table for this presidency member
-                 $district_number = '*';
-                 $district_name = $presidency_name;
-                 $not_completed_table_title = "District ".$district_number.": ".$district_name.": All indivs with " . $this->ppi_frequency_label . " PPI Not Completed";
-                 $appt_table_title = "District ".$district_number.": ".$district_name.": ".$this->ppi_frequency_label." PPI Appointment Slots";
+                 $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);
  
                  }
                  $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('lang_save','Save Appts for ' . $presidency_name);
                  $this->t->fp('apptlist','appt_list',True);
                }
                
                        }
                } // End for individuals Loop
  
-               $completed_table_title = "District ".$district_number.": ".$district_name.": All indivs with " . $this->ppi_frequency_label . " PPI Completed";
-               $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 = "<th width=$name_width><font size=-2>Individual</th>";
-               $completed_header_row.= "<th width=$phone_width><font size=-2>Phone</th>";      
-               $completed_header_row.= "<th width=$date_width><font size=-2>Date</th>";
-               $completed_header_row.= "<th width=$notes_width><font size=-2>PPI Notes</th>";
+               $completed_table_title = "All individuals with " . $this->ppi_frequency_label . " PPI Completed";
+               $completed_header_row = "<th><font size=-2>Individual</th>";
+               $completed_header_row.= "<th><font size=-2>Phone</th>";      
+               $completed_header_row.= "<th><font size=-2>Date</th>";
+               $completed_header_row.= "<th><font size=-2>PPI Notes</th>";
  
                $this->t->set_var('completed_table_title',$completed_table_title);
-               $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','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 = "<th width=$indivs_width><font size=-2>Individuals</th>";
-               $totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>";
+               $totals_header_row = "<th><font size=-2>Individuals</th>";
+               $totals_header_row.= "<th><font size=-2>$year</th>";
                $totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
                $totals_data.= "<td align=left><font size=-2><b>Total Individuals with " . $this->ppi_frequency_label . " PPIs completed:</b></font></td>";
                $totals_data.= "<td align=center><font size=-2><b>$indivs_with_yearly_ppi / $total_indivs</b></font></td>";
  
                $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(); 
                $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'));
                $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 = "<th width=$indiv_width><font size=-2>Individual</th>";
-               $header_row.= "<th width=$phone_width><font size=-2>Phone</th>";
-               $header_row.= "<th width=$pri_width><font size=-2>Priority</th>";
-               $header_row.= "<th width=$int_date_width><font size=-2>Last Interview</th>";
-               $header_row.= "<th width=$notes_width><font size=-2>Scheduling Notes</th>";
+               $header_row = "<th><font size=-2>Individual</th>";
+               $header_row.= "<th><font size=-2>Phone</th>";
+               $header_row.= "<th><font size=-2>Priority</th>";
+               $header_row.= "<th><font size=-2>Last Interview</th>";
+               $header_row.= "<th><font size=-2>Scheduling Notes</th>";
                $table_data=""; $completed_data=""; $totals_data="";
  
                $year = date('Y');
  
                // 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 = "<th width=$date_width><font size=-2>Date</th>";
-               $appt_header_row.= "<th width=$time_width><font size=-2>Time</th>";      
-               $appt_header_row.= "<th width=$indiv_width><font size=-2>Individual</th>";
-               $appt_header_row.= "<th width=$location_width><font size=-2>Location</th>";
+               $appt_header_row = "<th><font size=-2>Date</th>";
+               $appt_header_row.= "<th><font size=-2>Time</th>";      
+               $appt_header_row.= "<th><font size=-2>Individual</th>";
+               $appt_header_row.= "<th><font size=-2>Location</th>";
                $appt_table_data = ""; 
  
                $total_comps=0; $comps_with_quarterly_int=0;
  
                        $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
  
                                }
                        }
  
-                       $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 = "<th width=$name_width><font size=-2>Individual</th>";
-                       $completed_header_row.= "<th width=$phone_width><font size=-2>Phone</th>";      
-                       $completed_header_row.= "<th width=$date_width><font size=-2>Date</th>";
-                       $completed_header_row.= "<th width=$notes_width><font size=-2>Interview Notes</th>";
+                       $completed_header_row = "<th><font size=-2>Individual</th>";
+                       $completed_header_row.= "<th><font size=-2>Phone</th>";      
+                       $completed_header_row.= "<th><font size=-2>Date</th>";
+                       $completed_header_row.= "<th><font size=-2>Interview Notes</th>";
  
-                       $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 = "<th width=$indivs_width><font size=-2>Individuals</th>";
-               $totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>";
+               $totals_header_row = "<th><font size=-2>Individuals</th>";
+               $totals_header_row.= "<th><font size=-2>$year</th>";
                $totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
                $totals_data.= "<td align=left><font size=-2><b>Total Companionships with interviews completed:</b></font></td>";
                $totals_data.= "<td align=center><font size=-2><b>$comps_with_quarterly_int / $total_comps</b></font></td>";
  
                $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(); 
                $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'));
                $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 = "<th width=$family_width><font size=-2>Family Name</th>";
-               $header_row.= "<th width=$phone_width><font size=-2>Phone</th>";
-               $header_row.= "<th width=$pri_width><font size=-2>Priority</th>";
-               $header_row.= "<th width=$visit_date_width><font size=-2>Last Visit</th>";
-               $header_row.= "<th width=$notes_width><font size=-2>Scheduling Notes</th>";
+               $header_row = "<th><font size=-2>Family Name</th>";
+               $header_row.= "<th><font size=-2>Phone</th>";
+               $header_row.= "<th><font size=-2>Priority</th>";
+               $header_row.= "<th><font size=-2>Last Visit</th>";
+               $header_row.= "<th><font size=-2>Scheduling Notes</th>";
                $table_data=""; $completed_data=""; $totals_data="";
  
                $year = date('Y');
                }
  
                // 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 = "<th width=$date_width><font size=-2>Date</th>";
-               $appt_header_row.= "<th width=$time_width><font size=-2>Time</th>";      
-               $appt_header_row.= "<th width=$family_width><font size=-2>Family</th>";
-               $appt_header_row.= "<th width=$location_width><font size=-2>Location</th>";
+               $appt_header_row = "<th><font size=-2>Date</th>";
+               $appt_header_row.= "<th><font size=-2>Time</th>";      
+               $appt_header_row.= "<th><font size=-2>Family</th>";
+               $appt_header_row.= "<th><font size=-2>Location</th>";
                $appt_table_data = ""; 
  
                // Find out what the President ID is
  
                $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
                        }
                }
  
-               $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 = "<th width=$name_width><font size=-2>Family Name</th>";
-               $completed_header_row.= "<th width=$phone_width><font size=-2>Phone</th>";      
-               $completed_header_row.= "<th width=$date_width><font size=-2>Date</th>";
-               $completed_header_row.= "<th width=$notes_width><font size=-2>Visit Notes</th>";
+               $completed_header_row = "<th><font size=-2>Family Name</th>";
+               $completed_header_row.= "<th><font size=-2>Phone</th>";      
+               $completed_header_row.= "<th><font size=-2>Date</th>";
+               $completed_header_row.= "<th><font size=-2>Visit Notes</th>";
  
-               $family_width=300; $totals_width=100;
-               $totals_table_width=$family_width + $totals_width;
-               $totals_header_row = "<th width=$family_width><font size=-2>Families</th>";
-               $totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>";
+               $totals_header_row = "<th><font size=-2>Families</th>";
+               $totals_header_row.= "<th><font size=-2>$year</th>";
                $totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
                $totals_data.= "<td align=left><font size=-2><b>Total Families with yearly Visits completed:</b></font></td>";
                $totals_data.= "<td align=center><font size=-2><b>$families_with_yearly_visit / $total_families</b></font></td>";
                $totals_data.= "<td align=center><font size=-2><b>$percent%</b></font></td>";
                $totals_data.= "</tr>";
  
-               $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');