";
- $appt_table_data = "";
-
+ // Get the Districts
+ $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ while ($this->db->next_record())
+ {
+ $districts[$i]['district'] = $this->db->f('district');
+ $districts[$i]['name'] = $this->db->f('name');
+ $districts[$i]['supervisor'] = $this->db->f('supervisor');
+ $i++;
+ }
+ $districts[$i]['district'] = $i + 1;
+ $districts[$i]['name'] = "Unassigned";
+ $districts[$i]['supervisor'] = "Unassigned";
+
// create the elder id -> elder name mapping
$sql = "SELECT * FROM eq_elder where valid=1 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
@@ -951,16 +963,38 @@ class eq
$i++;
}
array_multisort($elder_name, $elder_id);
-
+
+ // APPOINTMENT TABLE
+ $district = 1;
+ $date_width=150; $time_width=100; $elder_width=200;
+ $appt_table_width=$date_width + $time_width + $elder_width;
+ $appt_header_row = "
Date
";
+ $appt_header_row.= "
Time
";
+ $appt_header_row.= "
Elder
";
+ $appt_table_data = "";
+
+ $total_elders=0; $elders_with_yearly_ppi=0;
+
+ // Display a scheduling table for each district
+ for ($d=0; $d < count($districts); $d++) {
+ $table_data=""; $appt_table_data="";
+ $this->t->set_var('district_number',$districts[$d]['district']);
+ $this->t->set_var('district_name',$districts[$d]['name']);
+ $supervisor = $districts[$d]['supervisor'];
+ $table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": All Elders with Yearly PPI Not Completed";
+ $appt_table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['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 eq_appointment where district=$district and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $sql = "SELECT * FROM eq_appointment where district=".$districts[$d]['district']." and date>=CURDATE() ORDER BY date ASC, time ASC";
$this->db->query($sql,__LINE__,__FILE__);
-
+
while ($this->db->next_record())
{
$appointment = $this->db->f('appointment');
$elder = $this->db->f('elder');
-
+
$date = $this->db->f('date');
$date_array = explode("-",$date);
$year = $date_array[0]; $month = $date_array[1]; $day = $date_array[2];
@@ -994,24 +1028,27 @@ class eq
$this->t->set_var('appt_header_row',$appt_header_row);
$this->t->set_var('appt_table_width',$appt_table_width);
-
// PPI SCHEDULING TABLE
$sql = "SELECT * FROM eq_elder where valid=1 ORDER BY ppi_pri ASC";
$this->db->query($sql,__LINE__,__FILE__);
-
- $total_elders=0; $elders_with_yearly_ppi=0;
$i=0;
$elder_id = NULL;
while ($this->db->next_record())
{
- $elder_id[$i] = $this->db->f('elder');
- $elder_name[$i] = $this->db->f('name');
- $elder_phone[$elder_id[$i]] = $this->db->f('phone');
- $elder_ppi_pri[$elder_id[$i]] = $this->db->f('ppi_pri');
- $elder_ppi_notes[$elder_id[$i]] = $this->db->f('ppi_notes');
- $i++;
- $total_elders++;
+ $sql2 = "SELECT * FROM eq_companionship where valid=1 and elder=".$this->db->f('elder');
+ $this->db2->query($sql2,__LINE__,__FILE__);
+
+ if(((!$this->db2->next_record()) && ($d == count($districts) - 1)) ||
+ ($this->db2->f('district') == $districts[$d]['district'])) {
+ $elder_id[$i] = $this->db->f('elder');
+ $elder_name[$i] = $this->db->f('name');
+ $elder_phone[$elder_id[$i]] = $this->db->f('phone');
+ $elder_ppi_pri[$elder_id[$i]] = $this->db->f('ppi_pri');
+ $elder_ppi_notes[$elder_id[$i]] = $this->db->f('ppi_notes');
+ $i++;
+ $total_elders++;
+ }
}
$max = count($elder_id);
@@ -1026,11 +1063,11 @@ class eq
// If this elder 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 eq_ppi WHERE date > '$year_start' AND date < '$year_end' ".
- "AND elder=" . $id . " AND eqpresppi=1";
+ "AND elder=" . $id;
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " AND eqpresppi=1 ORDER BY date DESC";
+ $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
$link_data['menuaction'] = 'eq.eq.ppi_update';
@@ -1090,6 +1127,19 @@ class eq
$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('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->fp('elderlist','elder_list',True);
+
+ } // End for each district loop
+
+ // Now display a table of those elders not assigned to any companionships
+
$elders_width=300; $totals_width=100;
$totals_table_width=$elders_width + $totals_width;
@@ -1105,18 +1155,10 @@ class eq
$totals_data.= "
Percentage:
";
$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',$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('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('elderlist','elder_list',True);
- $this->t->fp('apptlist','appt_list',True);
$this->t->pfp('out','ppi_sched_t');
$this->save_sessiondata();
@@ -1403,44 +1445,30 @@ class eq
else { $this->t->set_var('lang_num_months','Months of History'); }
$this->t->set_var('lang_filter','Filter');
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_view'));
-
+
$this->t->set_var('ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_view'));
- $this->t->set_var('ppi_link_title','Hometeaching PPIs');
-
- $this->t->set_var('eqpres_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_view&eqpresppi=1'));
- $this->t->set_var('eqpres_ppi_link_title','EQ President Yearly PPIs');
- $eqpresppi = get_var('eqpresppi',array('GET','POST'));
+ $this->t->set_var('ppi_link_title','Yearly PPIs');
+ $eqpresppi = 0;
$this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched'));
$this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
- if($eqpresppi == 1) {
- $this->t->set_var('title','EQ President Yearly 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);
- if($num_months == 1) { $this->t->set_var('lang_num_months','Year of History'); }
- else { $this->t->set_var('lang_num_months','Years of History'); }
- }
- else {
- $this->t->set_var('title','Hometeaching PPIs');
- }
+ $this->t->set_var('title','Yearly 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);
+ if($num_months == 1) { $this->t->set_var('lang_num_months','Year of History'); }
+ else { $this->t->set_var('lang_num_months','Years of History'); }
$sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
{
- if(($eqpresppi == 1) && ($this->db->f('district') == 1)) {
- $districts[$i]['district'] = $this->db->f('district');
- $districts[$i]['name'] = $this->db->f('name');
- $districts[$i]['supervisor'] = $this->db->f('supervisor');
- } else if($eqpresppi == 0) {
- $districts[$i]['district'] = $this->db->f('district');
- $districts[$i]['name'] = $this->db->f('name');
- $districts[$i]['supervisor'] = $this->db->f('supervisor');
- $i++;
- }
+ $districts[$i]['district'] = $this->db->f('district');
+ $districts[$i]['name'] = $this->db->f('name');
+ $districts[$i]['supervisor'] = $this->db->f('supervisor');
+ $i++;
}
$sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
@@ -1471,25 +1499,17 @@ class eq
}
$total_companionships = 0;
+ $total_elders = 0;
$this->nextmatchs->template_alternate_row_color(&$this->t);
for ($i=0; $i < count($districts); $i++) {
- if($eqpresppi == 1) {
- $this->t->set_var('district_number','*');
- $this->t->set_var('district_name','EQ President');
- } else {
- $this->t->set_var('district_number',$districts[$i]['district']);
- $this->t->set_var('district_name',$districts[$i]['name']);
- }
+ $this->t->set_var('district_number',$districts[$i]['district']);
+ $this->t->set_var('district_name',$districts[$i]['name']);
$supervisor = $districts[$i]['supervisor'];
$unique_companionships='';
// Select all the unique companionship numbers for this district
- if($eqpresppi == 1) {
- $sql = "SELECT distinct companionship FROM eq_companionship where valid=1";
- }
- else {
- $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
- }
+ $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
+
$this->db->query($sql,__LINE__,__FILE__);
$j=0;
while ($this->db->next_record())
@@ -1498,19 +1518,13 @@ class eq
$j++;
}
- $comp_width=400; $ppi_width=25; $table_width=$comp_width + $num_months*$ppi_width;
+ $comp_width=400; $ppi_width=75; $table_width=$comp_width + $num_months*$ppi_width;
$table_data=""; $num_companionships = $j; $num_elders = 0;
for($m=$num_months; $m >= 0; $m--) { $ppis[$m] = 0; }
for ($j=0; $j < count($unique_companionships); $j++) {
// Select all the companions in each companionship
- if($eqpresppi) {
- $sql = "SELECT * FROM eq_companionship where valid=1 and aaronic=0 and ".
- "companionship=". $unique_companionships[$j]['companionship'];
- }
- else {
- $sql = "SELECT * FROM eq_companionship where valid=1 and ".
- "companionship=". $unique_companionships[$j]['companionship'];
- }
+ $sql = "SELECT * FROM eq_companionship where valid=1 and aaronic=0 and ".
+ "companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
$k=0;
$comp = $unique_companionships[$j]['companionship'];
@@ -1545,32 +1559,16 @@ class eq
// Find out how many times PPIs were performed in the past $num_months for this Elder
$header_row="
Companionship
";
for($m=$num_months; $m >= 0; $m--) {
- if($eqpresppi == 1) {
- $year = date('Y') - $m;
- $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
- $sql = "SELECT * FROM eq_ppi WHERE date > '$year_start' AND date < '$year_end' ".
- "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id . " AND eqpresppi=1";
- $this->db2->query($sql,__LINE__,__FILE__);
- $header_row .= "
";
}
- // Now add Elders not assigned to any companionship to the table if we are in eqpresppi mode
- if($eqpresppi == 1) {
- $table_data .= "
Unassigned Potential Home Teachers
";
- foreach($elders as $elder_id => $value) {
- $sql = "SELECT * FROM eq_companionship where valid=1 and elder=".$elder_id;
- $this->db->query($sql,__LINE__,__FILE__);
- if(!$this->db->next_record()) {
- // We found an Elder not in a companionship, add them to the table
- $num_elders++;
- $companionship=0;
- $name = $elders[$elder_id];
+
+ $total_companionships += $num_companionships;
+ $total_elders += $num_elders;
+ $stat_data = "