X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=2c53def85f89b6bc3f2b096dac6fc36556b5b32a;hb=477ea41b8890c9ffefd9f9b0fb58367492a59de9;hp=1b33e7452a2a1e3a00a96e57b163b0f0a1276f2c;hpb=5f83e645f1ddac17fc64013713267a4c4ff3c9d6;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 1b33e74..2c53def 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -1,14 +1,15 @@
True,
'schedule' => True,
'admin' => True,
+ 'email' => True,
'email_appt' => True,
+ 'willing_view' => True,
+ 'willing_update' => True,
'send_ical_appt' => True,
'assign_view' => True,
'assign_update' => True,
+ 'get_time_selection_form' => True,
);
function eq()
{
- $this->default_ht_num_months = 3;
- $this->default_ppi_num_months = 3;
- $this->default_ppi_num_years = 0;
- $this->default_int_num_quarters = 1;
- $this->default_int_num_years = 0;
- $this->default_att_num_quarters = 1;
- $this->default_vis_num_years = 1;
- $this->upload_target_path = "/home/users/eqpres/eq_data/";
- $this->script_path = "/usr/share/phpgroupware/eq/";
+ if(file_exists("setup/eq_config.local")) {
+ include("setup/eq_config.local");
+ } else {
+ include("setup/eq_config");
+ }
+
+ $this->script_path = "$this->application_path"."/bin";
+ $this->max_presidency_members = 99;
+ $this->max_appointments = 32768;
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
@@ -81,13 +89,13 @@ class eq
$this->grants = $GLOBALS['phpgw']->acl->get_grants('eq');
$this->grants[$this->account] = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
- $this->jscal = CreateObject('phpgwapi.jscalendar'); // before phpgw_header() !!!
+ $this->jscal = CreateObject('eq.jscalendar'); // before phpgw_header() !!!
$this->cal_options = 'daFormat : "%Y-%m-%d",
ifFormat : "%Y-%m-%d",
mondayFirst : false,
weekNumbers : false';
- $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools';
+ $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools - The 3rd Counselor';
$GLOBALS['phpgw']->common->phpgw_header();
$this->current_day = `date '+%d'`;
@@ -108,11 +116,11 @@ class eq
function display_app_header()
{
- $this->t->set_file(array('eq_header' => 'header.tpl'));
+ $this->t->set_file(array('3rd_header' => 'header.tpl'));
- if (isset($phpgw_info['user']['preferences']['eq']['eq_font']))
+ if (isset($phpgw_info['user']['preferences']['eq']['3rd_font']))
{
- $font = $phpgw_info['user']['preferences']['eq']['eq_font'];
+ $font = $phpgw_info['user']['preferences']['eq']['3rd_font'];
}
else
{
@@ -127,6 +135,9 @@ class eq
$link_data['menuaction'] = 'eq.eq.act_list';
$this->t->set_var('link_activity',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_activity','Activities');
+ $link_data['menuaction'] = 'eq.eq.willing_view';
+ $this->t->set_var('link_willing',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+ $this->t->set_var('lang_willing','Willingness');
$link_data['menuaction'] = 'eq.eq.assign_view';
$this->t->set_var('link_assignment',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_assignment','Assignments');
@@ -157,8 +168,11 @@ class eq
$link_data['menuaction'] = 'eq.eq.schedule';
$this->t->set_var('link_schedule',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_schedule','Scheduling');
+ $link_data['menuaction'] = 'eq.eq.email';
+ $this->t->set_var('link_email',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+ $this->t->set_var('lang_email','Email');
- $this->t->pparse('out','eq_header');
+ $this->t->pparse('out','3rd_header');
}
function ht_view()
@@ -177,7 +191,7 @@ class eq
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ht_view'));
$this->t->set_var('title','Hometeaching');
- $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
+ $sql = "SELECT * FROM 3rd_district where valid=1 ORDER BY district ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -188,7 +202,7 @@ class eq
$i++;
}
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+ $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -206,7 +220,7 @@ class eq
$elders[$id] = $elder_name[$i];
}
- $sql = "SELECT * FROM eq_aaronic where valid=1 ORDER BY aaronic ASC";
+ $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
@@ -214,19 +228,18 @@ class eq
$aaronic[$aaronic_id]['name'] = $this->db->f('name');
$aaronic[$aaronic_id]['phone'] = $this->db->f('phone');
}
-
- $total_families = 0;
+
$this->nextmatchs->template_alternate_row_color(&$this->t);
+ for($m=$num_months; $m >= 0; $m--) { $total_families[$m]=0; }
for ($i=0; $i < count($districts); $i++) {
$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
- $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
+ $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $districts[$i]['district'];
$this->db->query($sql,__LINE__,__FILE__);
- $j=0;
+ $j=0; $unique_companionships = '';
while ($this->db->next_record())
{
$unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -234,12 +247,12 @@ class eq
}
$comp_width=450; $visit_width=25; $table_width=$comp_width + $num_months*$visit_width;
- $table_data=""; $num_companionships = 0; $num_families = 0;
- for($m=$num_months; $m >= 0; $m--) { $visits[$m] = 0; }
+ $table_data=""; $num_companionships = 0;
+ for($m=$num_months; $m >= 0; $m--) { $visits[$m]=0; $num_families[$m]=0; }
for ($j=0; $j < count($unique_companionships); $j++) {
$companion_table_entry = "";
// Select all the companions in each companionship
- $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+ $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".
"companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
@@ -263,13 +276,12 @@ class eq
$table_data.= "
$companion_table_entry
";
// Get the names of the families assigned this home teaching companionship
- $sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
+ $sql = "SELECT * from 3rd_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
$sql = $sql . " ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$k=0;
while ($this->db->next_record())
{
- $num_families++; $total_families++;
$family_name = $this->db->f('name');
$family_id = $this->db->f('family');
$this->nextmatchs->template_alternate_row_color(&$this->t);
@@ -285,12 +297,24 @@ class eq
$month_start = "$year"."-"."$month"."-"."01";
$month_end = "$year"."-"."$month"."-"."31";
$month = "$month"."/"."$year";
+
//print "m: $m month: $month year: $year month_start: $month_start month_end: $month_end ";
// Add this to the query to filter on only visits made by this companionship:
// " AND companionship=" . $unique_companionships[$j]['companionship'].
- $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
- " AND companionship!=0".
- " AND family=". $family_id;
+
+ // First check to see if the currently assigned companionship has visited them
+ $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+ " AND companionship=".$unique_companionships[$j]['companionship'].
+ " AND family=". $family_id;
+ $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->num_rows($query_id) == 0) {
+ // We did not find any visits made by the currently assigned companionship,
+ // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
+ $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+ " AND companionship!=0".
+ " AND family=". $family_id;
+ $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+ }
$this->db2->query($sql,__LINE__,__FILE__);
$link_data['menuaction'] = 'eq.eq.ht_update';
$link_data['date'] = $month_start;
@@ -305,19 +329,21 @@ class eq
if(!$total_visits[$m]) { $total_visits[$m] = 0; }
if($this->db2->next_record()) {
if($this->db2->f('visited') == 'y') {
- $visits[$m]++; $total_visits[$m]++;
- $table_data .= '
";
@@ -381,9 +415,9 @@ class eq
if($action == 'save')
{
// Get a list of all the companionships in this district
- $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
+ $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $district;
$this->db->query($sql,__LINE__,__FILE__);
- $j=0;
+ $j=0; $unique_companionships = '';
while ($this->db->next_record())
{
$unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -391,17 +425,10 @@ class eq
}
for ($j=0; $j < count($unique_companionships); $j++)
{
- // FIXME: We won't be able to go back and edit history on families that have been
- // reassigned to a different companionship. The following delete command will not delete
- // the history of visits under an older companionship, only the ones for the existing
- // companionship. This will lead to duplicate visits being entered for an older
- // month for the same family, making it impossible to change the past history once
- // a family is reassigned. However, you will be able to view the history just fine.
-
//$comp=$unique_companionships[$j]['companionship'];
- //print "deleting from eq_visit where companionship=$comp and date=$date and district=$district ";
- // Delete all the visits that have taken place for all families for this month
- $this->db->query("DELETE from eq_visit where companionship=" . $unique_companionships[$j]['companionship'] .
+ //print "deleting from 3rd_visit where companionship=$comp and date=$date and district=$district ";
+ // Delete all the visits that have taken place for all families for this companionsthip for this month
+ $this->db->query("DELETE from 3rd_visit where companionship=" . $unique_companionships[$j]['companionship'] .
" AND " . "date='" . $date . "'",__LINE__,__FILE__);
}
@@ -419,7 +446,7 @@ class eq
$visited = $data_array[3];
if($visited == "") { $visited = $data_array[4]; }
//print "family_id: $family_id companionship: $companionship date: $date visited: $visited ";
- $this->db->query("INSERT INTO eq_visit (family,companionship,date,notes,visited) "
+ $this->db->query("INSERT INTO 3rd_visit (family,companionship,date,notes,visited) "
. "VALUES (" . $family_id .",". $companionship .",'". $date ."','','". $visited ."')",__LINE__,__FILE__);
}
}
@@ -427,7 +454,7 @@ class eq
return false;
}
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+ $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -445,7 +472,7 @@ class eq
$elders[$id] = $elder_name[$i];
}
- $sql = "SELECT * FROM eq_aaronic where valid=1 ORDER BY aaronic ASC";
+ $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
@@ -455,9 +482,9 @@ class eq
}
// Select all the unique companionship numbers for this district
- $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
+ $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $district;
$this->db->query($sql,__LINE__,__FILE__);
- $j=0; $unique_companionships='';
+ $j=0; $unique_companionships = '';
while ($this->db->next_record())
{
$unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -469,7 +496,7 @@ class eq
for ($j=0; $j < count($unique_companionships); $j++) {
$companion_table_entry = "";
// Select all the companions in each companionship
- $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+ $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".
"companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
@@ -493,34 +520,45 @@ class eq
$table_data.= "
$companion_table_entry
";
// Get the names of the families assigned this home teaching companionship
- $sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
+ $sql = "SELECT * from 3rd_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
$sql = $sql . " ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
- $num_families++; $total_families++;
$family_name = $this->db->f('name');
$family_id = $this->db->f('family');
$this->nextmatchs->template_alternate_row_color(&$this->t);
$table_data.="
$family_name Family
";
$header_row="
Families
";
- $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+
+ // First check to see if the currently assigned companionship has visited them
+ $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+ " AND companionship=".$unique_companionships[$j]['companionship'].
+ " AND family=". $family_id;
+ $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->num_rows($query_id) == 0) {
+ // We did not find any visits made by the currently assigned companionship,
+ // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
+ $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship!=0".
" AND family=". $family_id;
- $this->db2->query($sql,__LINE__,__FILE__);
+ $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+ }
+
$value = $family_id . "/" . $unique_companionships[$j]['companionship'] . "/" . $date;
$header_row .= "
-E- Unable to locate EQ President in 3rd_presidency table
";
+ return;
+ }
+
if($action == 'save')
{
// Save any changes made to the appointment table
$new_data = get_var('appt_notes',array('POST'));
- foreach ($new_data as $entry)
- {
- $elder = $entry['elder'];
- $appointment = $entry['appointment'];
-
- //print "elder: $elder appointment: $appointment ";
-
- // Perform database save actions here
- $this->db->query("UPDATE eq_appointment set " .
- " elder='" . $elder . "'" .
- " WHERE appointment=" . $appointment,__LINE__,__FILE__);
-
- // Email the appointment
- $this->email_appt($appointment);
-
- }
+ if($new_data != "") {
+ foreach ($new_data as $entry)
+ {
+ $elder = $entry['elder'];
+ $appointment = $entry['appointment'];
+ $location = $entry['location'];
+ if($location == "") { $location = "$president_last_name"." home ($president_address)"; }
+ if($elder == 0) { $location = ""; }
+
+ //Only perform a database update if we have made a change to this appointment
+ $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and elder='$elder' and location='$location'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ if(!$this->db->next_record()) {
+ // Perform database save actions here
+ $this->db->query("UPDATE 3rd_appointment set " .
+ " elder='" . $elder . "'" .
+ ",location='" . $location . "'" .
+ " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+ // Email the appointment
+ $this->email_appt($appointment);
+ }
+
+ }
+ }
// Save any changes made to the ppi notes table
$new_data = get_var('ppi_notes',array('POST'));
@@ -1143,7 +1477,7 @@ class eq
$ppi_pri = $entry['pri'];
// Perform database save actions here
- $this->db->query("UPDATE eq_elder set " .
+ $this->db->query("UPDATE 3rd_elder set " .
" ppi_notes='" . $ppi_notes . "'" .
",ppi_pri='" . $ppi_pri . "'" .
" WHERE elder=" . $elder_id,__LINE__,__FILE__);
@@ -1151,25 +1485,11 @@ class eq
}
$take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched');
- Header('Location: ' . $take_me_to_url);
+ //Header('Location: ' . $take_me_to_url);
}
-
- // Get the EQ President
- $sql = "SELECT * FROM eq_presidency where president=1 and valid=1";
- $this->db->query($sql,__LINE__,__FILE__);
- if($this->db->next_record()) {
- $president_name = $this->db->f('name');
- $president_id = $this->db->f('elder');
- $presidency_id = $this->db->f('presidency');
- $district_number = '*';
- $district_name = $president_name;
- } else {
- print "
-E- Unable to locate EQ President in eq_presidency table
";
- return;
- }
// create the elder id -> elder name mapping
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY name ASC";
+ $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$elder_id = NULL;
@@ -1183,11 +1503,12 @@ class eq
array_multisort($elder_name, $elder_id);
// APPOINTMENT TABLE
- $date_width=150; $time_width=100; $elder_width=200;
- $appt_table_width=$date_width + $time_width + $elder_width;
+ $date_width=250; $time_width=100; $elder_width=200; $location_width=100;
+ $appt_table_width=$date_width + $time_width + $elder_width + $location_width;
$appt_header_row = "
Date
";
$appt_header_row.= "
Time
";
$appt_header_row.= "
Elder
";
+ $appt_header_row.= "
Location
";
$appt_table_data = "";
$total_elders=0; $elders_with_yearly_ppi=0;
@@ -1200,13 +1521,15 @@ class eq
$this->t->set_var('appt_table_title',$appt_table_title);
// query the database for all the appointments
- $sql = "SELECT * FROM eq_appointment where presidency=".$presidency_id." and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $sql = "SELECT * FROM 3rd_appointment where presidency=".$presidency_id." 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');
+ $location = $this->db->f('location');
+ if(($location == "") && ($elder > 0)) { $location = "$president_last_name"." home ($president_address)"; }
$date = $this->db->f('date');
$date_array = explode("-",$date);
@@ -1230,7 +1553,10 @@ class eq
$appt_table_data.= '';
}
$appt_table_data.='';
-
+
+ $appt_table_data.= '
';
+
$appt_table_data.= '';
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -1242,7 +1568,7 @@ class eq
$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";
+ $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY ppi_pri ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
@@ -1269,20 +1595,21 @@ 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;
+ $sql = "SELECT * FROM 3rd_interview WHERE date > '$year_start' AND date < '$year_end' ".
+ "AND elder=" . $id . " AND interview_type='ppi'";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC";
+ $sql = "SELECT * FROM 3rd_interview WHERE elder=" . $id . " AND interview_type='ppi' 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';
$link_data['elder'] = $id;
$link_data['name'] = $name;
- $link_data['ppi'] = '';
- $link_data['eqpresppi'] = 1;
+ $link_data['interview'] = '';
+ $link_data['interview_type'] = 1;
$link_data['action'] = 'add';
+ $link_data['interviewer'] = $interviewer;
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
$this->t->set_var('tr_color',$tr_color);
@@ -1308,8 +1635,8 @@ class eq
$link_data['interviewer'] = $this->db2->f('interviewer');
$link_data['elder'] = $this->db2->f('elder');
$link_data['name'] = $name;
- $link_data['ppi'] = $this->db2->f('ppi');
- $link_data['eqpresppi'] = $this->db2->f('eqpresppi');
+ $link_data['interview'] = $this->db2->f('interview');
+ $link_data['interview_type'] = $this->db2->f('interview_type');
$link_data['action'] = 'view';
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
$elders_with_yearly_ppi++;
@@ -1401,26 +1728,66 @@ class eq
if($month >= 7 && $month <= 9) { $quarter_start=$year."-07-01"; $quarter_end=$year."-10-01"; }
if($month >= 10 && $month <= 12) { $quarter_start=$year."-10-01"; $quarter_end=$nextyear."-01-01"; }
//print "year: $year month: $month quarter_start: $quarter_start quarter_end: $quarter_end ";
-
+
+ // create the elder id -> elder name mapping
+ $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ $elder_id_data = NULL;
+ $elder_name_data = NULL;
+ while ($this->db->next_record())
+ {
+ $elder_name_data[$i] = $this->db->f('name');
+ $elder_id_data[$i] = $this->db->f('elder');
+ $elderid2name[$elder_id_data[$i]] = $elder_name_data[$i];
+ $i++;
+ }
+ array_multisort($elder_name_data, $elder_id_data);
+
if($action == 'save')
{
// Save any changes made to the appointment table
$new_data = get_var('appt_notes',array('POST'));
- foreach ($new_data as $entry)
- {
- $elder = $entry['elder'];
- $appointment = $entry['appointment'];
-
- //print "elder: $elder appointment: $appointment ";
-
- // Perform database save actions here
- $this->db->query("UPDATE eq_appointment set " .
- " elder='" . $elder . "'" .
- " WHERE appointment=" . $appointment,__LINE__,__FILE__);
-
- // Email the appointment
- $this->email_appt($appointment);
- }
+ if($new_data != "") {
+ foreach ($new_data as $entry)
+ {
+ $elder = $entry['elder'];
+ $appointment = $entry['appointment'];
+ $location = $entry['location'];
+ if($location == "") {
+ $supervisor = $entry['supervisor'];
+ $supervisor_array = explode(",", $elderid2name[$supervisor]);
+ $supervisor_last_name = $supervisor_array[0];
+ $sql = "SELECT * FROM 3rd_elder where elder='$supervisor'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $indiv_id = $this->db2->f('indiv_id');
+ }
+ $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $supervisor_address = $this->db2->f('address');
+ }
+ $location = "$supervisor_last_name"." home ($supervisor_address)";
+ }
+ if($elder == 0) { $location = ""; }
+
+ //print "elder: $elder appointment: $appointment ";
+ //Only perform a database update if we have made a change to this appointment
+ $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and elder='$elder' and location='$location'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ if(!$this->db->next_record()) {
+ // Perform database save actions here
+ $this->db->query("UPDATE 3rd_appointment set " .
+ " elder='" . $elder . "'" .
+ ",location='" . $location . "'" .
+ " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+
+ // Email the appointment
+ $this->email_appt($appointment);
+ }
+ }
+ }
// Save any changes made to the int notes table
$new_data = get_var('int_notes',array('POST'));
@@ -1431,9 +1798,10 @@ class eq
$elder_name = $entry['elder_name'];
$int_pri = $entry['pri'];
$aaronic = $entry['aaronic'];
+ //print "int_notes: $int_notes elder_name: $elder_name aaronic: $aaronic ";
if($aaronic == 0) {
// Perform database save actions here
- $this->db->query("UPDATE eq_elder set " .
+ $this->db->query("UPDATE 3rd_elder set " .
" int_notes='" . $int_notes . "'" .
",int_pri='" . $int_pri . "'" .
" WHERE elder=" . $elder_id,__LINE__,__FILE__);
@@ -1442,11 +1810,11 @@ class eq
}
$take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_sched');
- Header('Location: ' . $take_me_to_url);
+ //Header('Location: ' . $take_me_to_url);
}
// Get the Districts
- $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
+ $sql = "SELECT * FROM 3rd_district where valid=1 ORDER BY district ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -1455,7 +1823,7 @@ class eq
$districts[$i]['district'] = $this->db->f('district');
$districts[$i]['name'] = $this->db->f('name');
$districts[$i]['supervisor'] = $this->db->f('supervisor');
- $sql = "SELECT * FROM eq_presidency where district=$district and valid=1";
+ $sql = "SELECT * FROM 3rd_presidency where district=$district and valid=1";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$districts[$i]['presidency'] = $this->db2->f('presidency');
@@ -1463,27 +1831,14 @@ class eq
$i++;
}
- // 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__);
- $i=0;
- $elder_id_data = NULL;
- $elder_name_data = NULL;
- while ($this->db->next_record())
- {
- $elder_name_data[$i] = $this->db->f('name');
- $elder_id_data[$i] = $this->db->f('elder');
- $i++;
- }
- array_multisort($elder_name_data, $elder_id_data);
-
// APPOINTMENT TABLE
$district = 1;
- $date_width=150; $time_width=100; $elder_width=200;
- $appt_table_width=$date_width + $time_width + $elder_width;
+ $date_width=250; $time_width=100; $elder_width=200; $location_width=100;
+ $appt_table_width=$date_width + $time_width + $elder_width + $location_width;
$appt_header_row = "
Date
";
$appt_header_row.= "
Time
";
$appt_header_row.= "
Elder
";
+ $appt_header_row.= "
Location
";
$appt_table_data = "";
$total_comps=0; $comps_with_quarterly_int=0;
@@ -1494,19 +1849,34 @@ class eq
$this->t->set_var('district_number',$districts[$d]['district']);
$this->t->set_var('district_name',$districts[$d]['name']);
$supervisor = $districts[$d]['supervisor'];
+ $supervisor_array = explode(",", $supervisor);
+ $supervisor_last_name = $supervisor_array[0];
+ $sql = "SELECT * FROM 3rd_elder where elder='$supervisor'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $indiv_id = $this->db2->f('indiv_id');
+ }
+ $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $supervisor_address = $this->db2->f('address');
+ }
+ $location = "$supervisor_last_name"." home ($supervisor_address)";
$table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": All Elders with Interviews Not Completed";
$appt_table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": Interview 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 presidency=".$districts[$d]['presidency']." and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $sql = "SELECT * FROM 3rd_appointment where presidency=".$districts[$d]['presidency']." 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');
+ $location = $this->db->f('location');
+ if(($location == "") && ($elder > 0)) { $location = "$supervisor_last_name"." home ($supervisor_address)"; }
$date = $this->db->f('date');
$date_array = explode("-",$date);
@@ -1531,7 +1901,11 @@ class eq
}
$appt_table_data.='';
+ $appt_table_data.= '
';
+
$appt_table_data.= '';
+ $appt_table_data.= '';
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
$this->t->set_var('tr_color',$tr_color);
@@ -1544,9 +1918,9 @@ class eq
// INTERVIEW SCHEDULING TABLE
// Select all the unique companionship numbers for this district
- $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$d]['district'];
+ $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $districts[$d]['district'];
$this->db->query($sql,__LINE__,__FILE__);
- $j=0;
+ $j=0; $unique_companionships = '';
while ($this->db->next_record())
{
$unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -1556,7 +1930,7 @@ class eq
$i=0;
for ($j=0; $j < count($unique_companionships); $j++) {
// Select all the companions from each companionship
- $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+ $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".
"companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
$k=0; $int_completed=0;
@@ -1570,7 +1944,7 @@ class eq
$elder_id = $this->db->f('elder');
$aaronic_id = $this->db->f('aaronic');
- $sql = "SELECT * FROM eq_elder where elder=$elder_id";
+ $sql = "SELECT * FROM 3rd_elder where elder=$elder_id";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record())
{
@@ -1582,7 +1956,7 @@ class eq
$elder_aaronic = 0;
}
else {
- $sql = "SELECT * FROM eq_aaronic where aaronic=$aaronic_id";
+ $sql = "SELECT * FROM 3rd_aaronic where aaronic=$aaronic_id";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record())
{
@@ -1616,12 +1990,12 @@ class eq
}
// If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list
- $sql = "SELECT * FROM eq_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' ".
+ $sql = "SELECT * FROM 3rd_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' ".
"AND elder=" . $id;
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM eq_interview WHERE elder=" . $id . " ORDER BY date DESC";
+ $sql = "SELECT * FROM 3rd_interview WHERE elder=" . $id . " ORDER BY date DESC";
$this->db3->query($sql,__LINE__,__FILE__);
if($this->db3->next_record()) { $date = $this->db3->f('date'); } else { $date = ""; }
$link_data['menuaction'] = 'eq.eq.int_update';
@@ -1630,24 +2004,29 @@ class eq
$link_data['name'] = $name;
$link_data['interview'] = '';
$link_data['action'] = 'add';
+ $link_data['interviewer'] = $districts[$d]['supervisor'];
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
$table_data.= "
';
+ $table_data.= ''."\n";
$i++;
} else {
$link_data['menuaction'] = 'eq.eq.int_update';
@@ -1655,7 +2034,7 @@ class eq
$link_data['elder'] = $this->db2->f('elder');
$link_data['aaronic'] = $this->db2->f('aaronic');
$link_data['name'] = $name;
- $link_data['interview'] = $this->db2->f('int');
+ $link_data['interview'] = $this->db2->f('interview');
$link_data['action'] = 'view';
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
$comps_with_quarterly_int++;
@@ -1743,86 +2122,114 @@ class eq
$table_data=""; $completed_data=""; $totals_data="";
$year = date('Y');
-
+
+ // create the family id -> family name mapping
+ $sql = "SELECT * FROM 3rd_family where valid=1 and elder_id != 0 ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ $family_id = NULL;
+ while ($this->db->next_record())
+ {
+ $family_id[$i] = $this->db->f('family');
+ $family_name[$i] = $this->db->f('name');
+ $familyid2name[$family_id[$i]] = $family_name[$i];
+ $sql = "SELECT * FROM 3rd_parent where family='$family_id[$i]'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $familyid2address[$family_id[$i]] = $this->db2->f('address');
+ }
+ $i++;
+ }
+ array_multisort($family_name, $family_id);
+
if($action == 'save')
{
// Save any changes made to the appointment table
$new_data = get_var('appt_notes',array('POST'));
- foreach ($new_data as $entry)
- {
- $family = $entry['family'];
- $appointment = $entry['appointment'];
-
- // Perform database save actions here
- $this->db->query("UPDATE eq_appointment set " .
- " family='" . $family . "'" .
- " WHERE appointment=" . $appointment,__LINE__,__FILE__);
-
- // Email the appointment
- $this->email_appt($appointment);
- }
+ if($new_data != "") {
+ foreach ($new_data as $entry)
+ {
+ $family = $entry['family'];
+ $appointment = $entry['appointment'];
+ $location = $entry['location'];
+ if($location == "") {
+ $family_name_array = explode(",", $familyid2name[$family]);
+ $family_last_name = $family_name_array[0];
+ $family_address = $familyid2address[$family];
+ $location = "$family_last_name"." home ($family_address)";
+ }
+ if($family == 0) { $location = ""; }
+
+ //Only perform a database update if we have made a change to this appointment
+ $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and family='$family' and location='$location'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ if(!$this->db->next_record()) {
+ // Perform database save actions here
+ $this->db->query("UPDATE 3rd_appointment set " .
+ " family='" . $family . "'" .
+ ",location='" . $location . "'" .
+ " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+
+ // Email the appointment
+ $this->email_appt($appointment);
+ }
+ }
+ }
// Save any changes made to the visit notes table
$new_data = get_var('vis_notes',array('POST'));
foreach ($new_data as $entry)
{
$visit_notes = $entry['notes'];
- $family_id = $entry['family_id'];
+ $family = $entry['family_id'];
$visit_pri = $entry['pri'];
// Perform database save actions here
- $this->db->query("UPDATE eq_family set " .
+ $this->db->query("UPDATE 3rd_family set " .
" visit_notes='" . $visit_notes . "'" .
",visit_pri='" . $visit_pri . "'" .
- " WHERE family=" . $family_id,__LINE__,__FILE__);
+ " WHERE family=" . $family,__LINE__,__FILE__);
}
$take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched');
- Header('Location: ' . $take_me_to_url);
+ //Header('Location: ' . $take_me_to_url);
}
// APPOINTMENT TABLE
- $date_width=150; $time_width=100; $family_width=250;
- $appt_table_width=$date_width + $time_width + $family_width;
+ $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_table_data = "";
// Find out what the EQ Presidency ID is
- $sql = "SELECT * FROM eq_presidency where president=0 and counselor=0 and secretary=0 and valid=1";
+ $sql = "SELECT * FROM 3rd_presidency where eqpres=1 and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$presidency_name = $this->db->f('name');
$presidency_id = $this->db->f('presidency');
} else {
- print "
-E- Unable to locate EQ Presidency in eq_presidency table
";
+ print "
-E- Unable to locate EQ Presidency in 3rd_presidency table
";
return;
}
-
- // create the family id -> family name mapping
- $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC";
- $this->db->query($sql,__LINE__,__FILE__);
- $i=0;
- $family_id = NULL;
- while ($this->db->next_record())
- {
- $family_id[$i] = $this->db->f('family');
- $family_name[$i] = $this->db->f('name');
- $i++;
- }
- array_multisort($family_name, $family_id);
-
+
// query the database for all the appointments
- $sql = "SELECT * FROM eq_appointment where presidency=$presidency_id and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $sql = "SELECT * FROM 3rd_appointment where presidency=$presidency_id 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');
$family = $this->db->f('family');
-
+ $location = $this->db->f('location');
+ $family_name_array = explode(",", $familyid2name[$family]);
+ $family_last_name = $family_name_array[0];
+ $family_address = $familyid2address[$family];
+ if(($location == "") && ($family > 0)) { $location = "$family_last_name"." home ($family_address)"; }
+
$date = $this->db->f('date');
$date_array = explode("-",$date);
$year = $date_array[0]; $month = $date_array[1]; $day = $date_array[2];
@@ -1846,6 +2253,9 @@ class eq
}
$appt_table_data.='';
+ $appt_table_data.= '
';
+
$appt_table_data.= '';
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -1858,7 +2268,7 @@ class eq
// VISIT SCHEDULING TABLE
- $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY visit_pri ASC";
+ $sql = "SELECT * FROM 3rd_family where valid=1 and elder_id != 0 ORDER BY visit_pri ASC";
$this->db->query($sql,__LINE__,__FILE__);
$total_families=0; $families_with_yearly_visit=0;
@@ -1880,7 +2290,7 @@ class eq
$total_families++;
}
- $sql = "SELECT * FROM eq_parent where valid=1";
+ $sql = "SELECT * FROM 3rd_parent where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
@@ -1900,12 +2310,12 @@ class eq
// If this family has had a yearly visit this year, don't show them on the schedule list
$year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
- $sql = "SELECT * FROM eq_visit WHERE date > '$year_start' AND date < '$year_end' ".
+ $sql = "SELECT * FROM 3rd_visit WHERE date > '$year_start' AND date < '$year_end' ".
"AND family=" . $id . " AND companionship=0";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM eq_visit WHERE family=" . $id . " AND companionship=0 ORDER BY date DESC";
+ $sql = "SELECT * FROM 3rd_visit WHERE family=" . $id . " AND companionship=0 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.vis_update';
@@ -1943,7 +2353,7 @@ class eq
$families_with_yearly_visit++;
$date = $this->db2->f('date');
$vis_notes = $this->db2->f('notes');
- if(strlen($vis_notes) > 40) { $vis_notes = substr($vis_notes,0,40) . "..."; }
+ if(strlen($vis_notes) > 40) { $vis_notes = stripslashes(substr($vis_notes,0,40) . "..."); }
$completed_data.= "
";
-
+
$this->t->set_var('totals',$totals);
$this->t->pfp('out','int_view_t');
$this->save_sessiondata();
@@ -2462,6 +2878,7 @@ class eq
$this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view'));
$this->t->set_var('readonly','');
$this->t->set_var('disabled','');
+ $this->t->set_var('interview_type_checked','');
$action = get_var('action',array('GET','POST'));
$companionship = get_var('companionship',array('GET','POST'));
@@ -2472,36 +2889,34 @@ class eq
$aaronic = get_var('aaronic',array('GET','POST'));
$date = get_var('date',array('GET','POST'));
$notes = get_var('notes',array('GET','POST'));
-
- $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
- $this->db->query($sql,__LINE__,__FILE__);
- while ($this->db->next_record())
- {
- $supervisor = $this->db->f('supervisor');
- $sql = "SELECT * FROM eq_elder WHERE elder=" . $supervisor;
- $this->db2->query($sql,__LINE__,__FILE__);
- $this->db2->next_record();
- $interviewer_name = $this->db2->f('name');
-
- if($supervisor == $interviewer) {
- $this->t->set_var('interviewer',$supervisor . ' selected');
- } else {
- $this->t->set_var('interviewer',$interviewer);
- }
- $this->t->set_var('interviewer_name',$interviewer_name);
- $this->t->fp('int_list','interviewer_list',True);
- }
+ $interview_type = get_var('interview_type',array('GET','POST'));
+
+ $sql = "SELECT * FROM 3rd_presidency where valid=1 and (president=1 or counselor=1 or secretary=1 or district!=0)";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ while ($this->db2->next_record())
+ {
+ $elder = $this->db2->f('elder');
+ $interviewer_name = $this->db2->f('name');
+ if($elder == $interviewer) {
+ $this->t->set_var('interviewer',$interviewer . ' selected');
+ } else {
+ $this->t->set_var('interviewer',$interviewer);
+ }
+ $this->t->set_var('interviewer_name',$interviewer_name);
+ $this->t->fp('int_list','interviewer_list',True);
+ }
if($action == 'save')
{
- $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
- $this->db->query("UPDATE eq_interview set " .
+ $notes = get_var('notes',array('POST'));
+ $this->db->query("UPDATE 3rd_interview set " .
" interview='" . $interview . "'" .
", interviewer='" . $interviewer . "'" .
", elder='" . $elder . "'" .
", aaronic='" . $aaronic . "'" .
", date='" . $date . "'" .
", notes='" . $notes . "'" .
+ ", interview_type='" . $interview_type . "'" .
" WHERE interview=" . $interview,__LINE__,__FILE__);
$this->int_view();
return false;
@@ -2509,10 +2924,10 @@ class eq
if($action == 'insert')
{
- $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
- $this->db->query("INSERT INTO eq_interview (interviewer,elder,aaronic,date,notes) "
+ $notes = get_var('notes',array('POST'));
+ $this->db->query("INSERT INTO 3rd_interview (interviewer,elder,aaronic,date,notes,interview_type) "
. "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
- . $date . "','" . $notes ."')",__LINE__,__FILE__);
+ . $date . "','" . $notes ."','" . $interview_type . "')",__LINE__,__FILE__);
$this->int_view();
return false;
}
@@ -2535,7 +2950,7 @@ class eq
if($action == 'edit' || $action == 'view')
{
- $sql = "SELECT * FROM eq_interview WHERE interview=".$interview;
+ $sql = "SELECT * FROM 3rd_interview WHERE interview=".$interview;
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('interview',$interview);
@@ -2545,6 +2960,7 @@ class eq
$this->t->set_var('aaronic',$this->db->f('aaronic'));
$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'); }
}
if($action == 'edit')
@@ -2609,7 +3025,7 @@ class eq
$year = date('Y') - $num_years + 1;
$year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
- $sql = "SELECT * FROM eq_visit WHERE companionship=0 and date > '$year_start' ORDER BY date DESC";
+ $sql = "SELECT * FROM 3rd_visit WHERE companionship=0 and date > '$year_start' ORDER BY date DESC";
$this->db->query($sql,__LINE__,__FILE__);
$total_records = $this->db->num_rows();
@@ -2626,7 +3042,7 @@ class eq
{
$this->nextmatchs->template_alternate_row_color(&$this->t);
- $sql = "SELECT * FROM eq_family WHERE family=".$visit_list[$i]['family'];
+ $sql = "SELECT * FROM 3rd_family WHERE family=".$visit_list[$i]['family'];
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
@@ -2654,7 +3070,7 @@ class eq
}
// List the families that are available to record a visit against
- $sql = "SELECT * FROM eq_family WHERE valid=1";
+ $sql = "SELECT * FROM 3rd_family WHERE valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$total_records = $this->db->num_rows();
@@ -2707,8 +3123,8 @@ class eq
if($action == 'save')
{
- $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
- $this->db->query("UPDATE eq_visit set " .
+ $notes = get_var('notes',array('POST'));
+ $this->db->query("UPDATE 3rd_visit set " .
" date='" . $date . "'" .
", notes='" . $notes . "'" .
" WHERE visit=" . $visit,__LINE__,__FILE__);
@@ -2718,8 +3134,8 @@ class eq
if($action == 'insert')
{
- $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
- $this->db->query("INSERT INTO eq_visit (family,companionship,date,notes) "
+ $notes = get_var('notes',array('POST'));
+ $this->db->query("INSERT INTO 3rd_visit (family,companionship,date,notes) "
. "VALUES ('" . $family . "','" . $companionship . "','"
. $date . "','" . $notes . "')",__LINE__,__FILE__);
$this->vis_view();
@@ -2742,7 +3158,7 @@ class eq
if($action == 'edit' || $action == 'view')
{
- $sql = "SELECT * FROM eq_visit WHERE visit=".$visit;
+ $sql = "SELECT * FROM 3rd_visit WHERE visit=".$visit;
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('visit',$visit);
@@ -2815,8 +3231,8 @@ class eq
else if($current_month >= 4 && $current_month <= 6) { $current_month=6; }
else if($current_month >= 7 && $current_month <= 9) { $current_month=9; }
else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
-
- $sql = "SELECT * FROM eq_elder where valid=1";
+
+ $sql = "SELECT * FROM 3rd_elder where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -2831,10 +3247,10 @@ class eq
$i=0;
$last_time = 0;
$found_sunday = 0;
- $sunday_list[0]['date'] = date("Y-m-d", mktime(0, 0, 0, $current_month-$num_months, 1, date("y")));
+ $sunday_list[0]['date'] = date("Y-m-d", mktime(0, 0, 0, ($current_month-$num_months)+1, 1, date("y")));
$last_date = explode("-",$sunday_list[0]['date']);
$last_time = mktime(0, 0, 0, $last_date[1], $last_date[2], $last_date[0]);
- $time_limit = mktime(0, 0, 0, date("m"), date("t"), date("y"));
+ $time_limit = mktime(0, 0, 0, $current_month, 31, date("y"));
while($last_time < $time_limit)
{
$day = date("w",$last_time);
@@ -2845,7 +3261,8 @@ class eq
$sunday_list[$i]['day'] = $last_date[2];
$sunday_list[$i]['month'] = date("M",$last_time);
$sunday_list[$i]['year'] = $last_date[0];
- $found_sunday = 1;
+ $found_sunday = 1;
+ $last_date = $sunday_list[$i]['date'];
}
$last_time += 90000;
if($found_sunday) { $i++; $found_sunday=0; }
@@ -2903,9 +3320,9 @@ class eq
#print "checking for elder: " . $elder_id[$i] . " ";
for ($j=0; $j < count($sunday_list); $j++) {
#print "checking for date: " . $sunday_list[$j]['date'] . " ";
- #print "SELECT * FROM eq_attendance WHERE date='"
+ #print "SELECT * FROM 3rd_attendance WHERE date='"
# . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i] . " ";
- $sql = "SELECT * FROM eq_attendance WHERE date='"
+ $sql = "SELECT * FROM 3rd_attendance WHERE date='"
. $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
@@ -2914,7 +3331,7 @@ class eq
$attended[$i][$cur_month]=1;
$attendance[$monthnum[$cur_month]]++;
}
- $att_table .= '
';
+ $att_table .= '
';
} else {
$att_table .= '
';
}
@@ -2987,11 +3404,11 @@ class eq
$month = $monthnum[$month]; if($month < 10) { $month = "0" . $month; }
if($action == 'save_month') {
- $this->db->query("DELETE from eq_attendance where date LIKE '".$year."-".$month."-%'",__LINE__,__FILE__);
+ $this->db->query("DELETE from 3rd_attendance where date LIKE '".$year."-".$month."-%'",__LINE__,__FILE__);
}
if($action == 'save_day') {
- $this->db->query("DELETE from eq_attendance where date LIKE '".$year."-".$month."-".$day."'",__LINE__,__FILE__);
+ $this->db->query("DELETE from 3rd_attendance where date LIKE '".$year."-".$month."-".$day."'",__LINE__,__FILE__);
}
foreach ($new_data as $data)
@@ -2999,7 +3416,7 @@ class eq
$data_array = explode("-",$data);
$elder = $data_array[0];
$date = "$data_array[1]-$data_array[2]-$data_array[3]";
- $this->db->query("INSERT INTO eq_attendance (elder,date) "
+ $this->db->query("INSERT INTO 3rd_attendance (elder,date) "
. "VALUES (" . $elder . ",'". $date . "')",__LINE__,__FILE__);
}
@@ -3007,7 +3424,7 @@ class eq
return false;
}
- $sql = "SELECT * FROM eq_elder where valid=1";
+ $sql = "SELECT * FROM 3rd_elder where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -3086,7 +3503,7 @@ class eq
$this->nextmatchs->template_alternate_row_color(&$this->t);
$this->t->set_var('elder_name',$elder_name[$i]);
for ($j=0; $j < count($sunday_list); $j++) {
- $sql = "SELECT * FROM eq_attendance WHERE date='"
+ $sql = "SELECT * FROM 3rd_attendance WHERE date='"
. $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
$this->db->query($sql,__LINE__,__FILE__);
$value = $elder_id[$i] . "-" . $sunday_list[$j]['date'];
@@ -3117,7 +3534,7 @@ class eq
$this->t->set_file(array('dir_view_t' => 'dir_view.tpl'));
$this->t->set_block('dir_view_t','dir_list','list');
- $sql = "SELECT * FROM eq_parent where valid=1 ORDER BY name ASC";
+ $sql = "SELECT * FROM 3rd_parent where valid=1 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -3153,7 +3570,7 @@ class eq
$this->t->set_block('org_view_t','org_list','list2');
# Display a list ordered alphabetically
- $sql = "SELECT * FROM eq_calling ORDER BY name ASC";
+ $sql = "SELECT * FROM 3rd_calling ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -3181,7 +3598,7 @@ class eq
}
# Display a list ordered by organization
- $sql = "SELECT * FROM eq_calling ORDER BY sequence ASC";
+ $sql = "SELECT * FROM 3rd_calling ORDER BY sequence ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -3234,14 +3651,45 @@ class eq
$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');
- $date_width=150; $time_width=200; $elder_width=200; $family_width=200;
- $table_width=$date_width + $time_width + $elder_width + $family_width;
+ $date_width=150; $time_width=220; $elder_width=170; $family_width=180; $location_width=100;
+ $table_width=$date_width + $time_width + $elder_width + $family_width + $location_width;
$header_row = "
Date
";
$header_row.= "
Time
";
$header_row.= "
Elder
";
$header_row.= "
Family
";
+ $header_row.= "
Location
";
$table_data = "";
+ $sql = "SELECT * FROM 3rd_presidency where valid=1";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ while ($this->db->next_record())
+ {
+ $presidency_data[$i]['id'] = $this->db->f('presidency');
+ $presidency_data[$i]['name'] = $this->db->f('name');
+ $presidency_data[$i]['elder'] = $this->db->f('elder');
+ $presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name'];
+ $presidency2elder[$presidency_data[$i]['id']] = $presidency_data[$i]['elder'];
+ $i++;
+ }
+
+ $sql = "SELECT * FROM 3rd_family where valid=1 and elder_id != 0 ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ while ($this->db->next_record())
+ {
+ $family_id[$i] = $this->db->f('family');
+ $family_name[$i] = $this->db->f('name');
+ $familyid2name[$family_id[$i]] = $family_name[$i];
+ $sql = "SELECT * FROM 3rd_parent where family='$family_id[$i]'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $familyid2address[$family_id[$i]] = $this->db2->f('address');
+ }
+ $i++;
+ }
+ array_multisort($family_name, $family_id);
+
if($action == 'save')
{
$new_data = get_var('sched',array('POST'));
@@ -3251,58 +3699,116 @@ class eq
{
$presidency = $entry['presidency'];
$appointment = $entry['appointment'];
+ $location = $entry['location'];
$date = $entry['date'];
$hour = $entry['hour'];
$minute = $entry['minute'];
$pm = $entry['pm'];
$elder = $entry['elder'];
$family = $entry['family'];
+ $location = $entry['location'];
if($pm) { $hour = $hour + 12; }
$time = $hour.':'.$minute.':'.'00';
$uid = 0;
+ // Update our location
+ if($location == "") {
+ if($family > 0) {
+ $family_name_array = explode(",", $familyid2name[$family]);
+ $family_last_name = $family_name_array[0];
+ $family_address = $familyid2address[$family];
+ $location = "$family_last_name"." home ($family_address)";
+ }
+ else if($elder > 0) {
+ $supervisor_name_array = explode(",",$presidency2name[$presidency]);
+ $supervisor_last_name = $supervisor_name_array[0];
+ $sql = "SELECT * FROM 3rd_elder where elder='$presidency2elder[$presidency]'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $indiv_id = $this->db2->f('indiv_id');
+ }
+ $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $supervisor_address = $this->db2->f('address');
+ }
+ $location = "$supervisor_last_name"." home ($supervisor_address)";
+ }
+ }
+
+ // Zero out the family or elder if date = NULL
+ if($date == "") {
+ $elder = 0;
+ $family = 0;
+ $location = "";
+ }
+
+ if(($elder == 0) && ($family == 0)) { $location = ""; }
+
// Update an existing appointment
- if($appointment != 0)
+ if($appointment < $this->max_appointments)
{
- $this->db->query("UPDATE eq_appointment set" .
- " family=" . $family .
- " ,elder=" . $elder .
- " ,date='" . $date . "'" .
- " ,time='" . $time . "'" .
- " WHERE appointment=" . $appointment,__LINE__,__FILE__);
-
- // Email the appointment
- $this->email_appt($appointment);
+ //Only perform a database update if we have made a change to this appointment
+ $sql = "SELECT * FROM 3rd_appointment where " .
+ "appointment='$appointment'" .
+ " and presidency='$presidency'" .
+ " and elder='$elder'" .
+ " and family='$family'" .
+ " and date='$date'" .
+ " and time='$time'" .
+ " and location='$location'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ if(!$this->db->next_record()) {
+ $old_date = $this->db->f('date');
+ $old_time = $this->db->f('time');
+ $this->db2->query("UPDATE 3rd_appointment set" .
+ " family=" . $family .
+ " ,elder=" . $elder .
+ " ,date='" . $date . "'" .
+ " ,time='" . $time . "'" .
+ " ,location='" . $location . "'" .
+ " ,presidency='" . $presidency . "'" .
+ " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+
+ // Email the appointment
+ $this->email_appt($appointment);
+ }
}
// Add a new appointment
- else if(($appointment == 0) && ($date != "") && ($time != ""))
+ else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
{
- $this->db->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time) "
- . "VALUES ('" . $appointment . "','" . $presidency . "','" . $family . "','"
- . $elder . "','" . $date . "','" . $time . "','" . $uid ."')",__LINE__,__FILE__);
-
- //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family ";
+ //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family ";
+ $this->db2->query("INSERT INTO 3rd_appointment (appointment,presidency,family,elder,date,time,location,uid) "
+ . "VALUES (NULL,'" . $presidency . "','" . $family . "','" . $elder . "','"
+ . $date . "','" . $time . "','" . $location . "','" . $uid ."')",__LINE__,__FILE__);
+
+ // Now reselect this entry from the database to see if we need
+ // to send an appointment out for it.
+ $sql = "SELECT * FROM 3rd_appointment where " .
+ "elder='$elder'" .
+ " and family='$family'" .
+ " and presidency='$presidency'" .
+ " and date='$date'" .
+ " and time='$time'" .
+ " and uid='$uid'" .
+ " and location='$location'";
+ $this->db3->query($sql,__LINE__,__FILE__);
+ if($this->db3->next_record()) {
+ // Email the appointment if warranted
+ if(($date != "") && ($time != "") && (($elder > 0) || $family > 0)) {
+ $this->email_appt($this->db3->f('appointment'));
+ }
+ }
}
}
}
$take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.schedule');
- Header('Location: ' . $take_me_to_url);
- }
-
- $sql = "SELECT * FROM eq_presidency where valid=1";
- $this->db->query($sql,__LINE__,__FILE__);
- $i=0;
- while ($this->db->next_record())
- {
- $presidency_data[$i]['id'] = $this->db->f('presidency');
- $presidency_data[$i]['name'] = $this->db->f('name');
- $presidency_data[$i]['elder'] = $this->db->f('elder');
- $i++;
+ //Header('Location: ' . $take_me_to_url);
}
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+ $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -3313,17 +3819,6 @@ class eq
$i++;
}
array_multisort($elder_name, $elder_id);
-
- $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC";
- $this->db->query($sql,__LINE__,__FILE__);
- $i=0;
- while ($this->db->next_record())
- {
- $family_id[$i] = $this->db->f('family');
- $family_name[$i] = $this->db->f('name');
- $i++;
- }
- array_multisort($family_name, $family_id);
for ($i=0; $i < count($presidency_data); $i++) {
$presidency = $presidency_data[$i]['id'];
@@ -3333,7 +3828,7 @@ class eq
$table_data="";
// query the database for all the appointments
- $sql = "SELECT * FROM eq_appointment where presidency=$presidency and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $sql = "SELECT * FROM 3rd_appointment where presidency=$presidency and date>=CURDATE() ORDER BY date ASC, time ASC";
$this->db->query($sql,__LINE__,__FILE__);
// Prefill any existing appointment slots
@@ -3342,6 +3837,31 @@ class eq
$appointment = $this->db->f('appointment');
$elder = $this->db->f('elder');
$family = $this->db->f('family');
+ $location = $this->db->f('location');
+
+ if($location == "") {
+ if($family > 0) {
+ $family_name_array = explode(",", $familyid2name[$family]);
+ $family_last_name = $family_name_array[0];
+ $family_address = $familyid2address[$family];
+ $location = "$family_last_name"." home ($family_address)";
+ }
+ else if($elder > 0) {
+ $supervisor_name_array = explode(",",$presidency2name[$presidency]);
+ $supervisor_last_name = $supervisor_name_array[0];
+ $sql = "SELECT * FROM 3rd_elder where elder='$presidency2elder[$presidency]'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $indiv_id = $this->db2->f('indiv_id');
+ }
+ $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $supervisor_address = $this->db2->f('address');
+ }
+ $location = "$supervisor_last_name"." home ($supervisor_address)";
+ }
+ }
$date = $this->db->f('date');
$date_array = explode("-",$date);
@@ -3365,28 +3885,11 @@ class eq
// Hour & Minutes selection
$table_data.= "