X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=921c142ca88a4bcadc5858172d4bba5ba75b21fb;hb=8720abcdfd49bddf12b95383e558525efd8fed72;hp=427e95021e2a509bd8f0e9195c980b1611a4dd31;hpb=1ed3cf0b101b2828ddecb49a5cca923eedde8e9f;p=eq%2F.git diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index 427e950..921c142 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; @@ -83,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'`; @@ -162,6 +168,9 @@ 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'); } @@ -219,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']; $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'); @@ -239,8 +247,8 @@ 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 @@ -274,7 +282,6 @@ class eq $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); @@ -290,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']. + + // First check to see if the currently assigned companionship has visited them $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ". - " AND companionship!=0". - " AND family=". $family_id; + " 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 eq_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; @@ -310,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 .= ''; + $visits[$m]++; $total_visits[$m]++; + $num_families[$m]++; $total_families[$m]++; + $table_data .= ''; } else if($this->db2->f('visited') == 'n') { - $table_data .= ''; + $num_families[$m]++; $total_families[$m]++; + $table_data .= ''; } else { - $visits[$m]++; $total_visits[$m]++; + //$visits[$m]++; $total_visits[$m]++; $table_data .= " "; } } else { - $visits[$m]++; $total_visits[$m]++; + //$visits[$m]++; $total_visits[$m]++; $table_data .= " "; } } @@ -332,11 +353,15 @@ class eq $table_data .= ""; } $table_data .= "
"; - $stat_data = "$num_families Families
Visit Totals:"; + $stat_data = "Families Hometaught:
Hometeaching Percentage:"; for($m=$num_months; $m >=0; $m--) { - $percent = ceil(($visits[$m] / $num_families)*100); - $stat_data .= "$visits[$m]
$percent%"; + if($num_families[$m] > 0) { + $percent = ceil(($visits[$m] / $num_families[$m])*100); + } else { + $percent = 0; + } + $stat_data .= "$visits[$m] / $num_families[$m]
$percent%"; } $stat_data .= ""; @@ -347,10 +372,14 @@ class eq $this->t->fp('list','district_list',True); } - $totals = "$total_families Total Families
Visit Totals:"; + $totals = "Total Families Hometaught:
Total Hometeaching Percentage:"; for($m=$num_months; $m >=0; $m--) { - $percent = ceil(($total_visits[$m] / $total_families)*100); - $totals .= "$total_visits[$m]
$percent%"; + if($total_families[$m] > 0) { + $percent = ceil(($total_visits[$m] / $total_families[$m])*100); + } else { + $percent = 0; + } + $totals .= "$total_visits[$m] / $total_families[$m]
$percent%"; } $totals .= ""; @@ -388,7 +417,7 @@ class eq // Get a list of all the companionships in this district $sql = "SELECT distinct companionship FROM eq_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'); @@ -396,16 +425,9 @@ 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 + // Delete all the visits that have taken place for all families for this companionsthip for this month $this->db->query("DELETE from eq_visit where companionship=" . $unique_companionships[$j]['companionship'] . " AND " . "date='" . $date . "'",__LINE__,__FILE__); } @@ -462,7 +484,7 @@ class eq // Select all the unique companionship numbers for this district $sql = "SELECT distinct companionship FROM eq_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'); @@ -503,29 +525,40 @@ class eq $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"; + + // First check to see if the currently assigned companionship has visited them $sql = "SELECT * FROM eq_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 eq_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 .= "$month"; if(!$total_visits) { $total_visits = 0; } if($this->db2->next_record()) { if($this->db2->f('visited') == 'y') { - $visits++; $total_visits++; + $visits++; $total_visits++; $num_families++; $table_data .= ''; $table_data .= 'Y'; $table_data .= 'N'; $table_data .= ' '; $table_data .= ''; } else if($this->db2->f('visited') == 'n') { + $num_families++; $table_data .= ''; $table_data .= 'Y'; $table_data .= 'N'; @@ -552,10 +585,10 @@ class eq $table_data .= ""; } $table_data .= "
"; - $stat_data = "$num_families Families
Visit Totals:"; + $stat_data = "Families Hometaught:
Hometeaching Percentage:"; $percent = ceil(($visits / $num_families)*100); - $stat_data .= "$visits
$percent%"; + $stat_data .= "$visits / $num_families
$percent%"; $stat_data .= ""; $this->t->set_var('table_width',$table_width); @@ -579,7 +612,7 @@ class eq $this->t->set_file(array('act_list_t' => 'act_list.tpl')); $this->t->set_block('act_list_t','act_list','list'); - $this->t->set_var('lang_name','Activity Name'); + $this->t->set_var('lang_name','Assignment'); $this->t->set_var('lang_date','Date'); $this->t->set_var('lang_notes','Description'); @@ -626,15 +659,15 @@ class eq $this->t->set_var('edit',$GLOBALS['phpgw']->link('/eq/index.php',$link_data)); $this->t->set_var('lang_edit','Edit'); - $link_data['menuaction'] = 'eq.eq.act_update'; - $link_data['activity'] = '0'; - $link_data['action'] = 'add'; - $this->t->set_var('add','
'); - $this->t->fp('list','act_list',True); } + $link_data['menuaction'] = 'eq.eq.act_update'; + $link_data['activity'] = '0'; + $link_data['action'] = 'add'; + $this->t->set_var('add','
'); + $this->t->pfp('out','act_list_t'); $this->save_sessiondata(); } @@ -658,7 +691,7 @@ class eq $this->t->set_var('name', $this->db2->f('name')); $this->t->set_var('code', $this->db2->f('code')); } - $this->t->set_var('lang_name','Activity Name'); + $this->t->set_var('lang_name','Assignment'); $this->t->set_var('lang_date','Date'); $this->t->set_var('lang_notes','Description'); $this->t->set_var('lang_done','Done'); @@ -724,9 +757,9 @@ class eq if($action == 'save') { - $activity['assignment'] = $this->db->db_addslashes(get_var('assignment',array('POST'))); - $activity['date'] = $this->db->db_addslashes(get_var('date',array('POST'))); - $activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST'))); + $activity['assignment'] = get_var('assignment',array('POST')); + $activity['date'] = get_var('date',array('POST')); + $activity['notes']= get_var('notes',array('POST')); $this->db->query("UPDATE eq_activity set " . " assignment='" . $activity['assignment'] . "', date='" . $activity['date'] . "'" . @@ -738,21 +771,23 @@ class eq // Re-add the elders who are checked as having participated in this activity $elders = get_var('elder_name',array('POST')); - foreach ($elders as $elder) - { - $this->db->query("INSERT INTO eq_participation (elder,activity) " - . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__); - } - + if(is_array($elders)) { // Only do the foreach loop if we have a valid array of elders to work with + foreach ($elders as $elder) + { + $this->db->query("INSERT INTO eq_participation (elder,activity) " + . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__); + } + } + $this->act_list(); return false; } if($action == 'insert') { - $activity['assignment'] = $this->db->db_addslashes(get_var('assignment',array('POST'))); - $activity['date'] = $this->db->db_addslashes(get_var('date',array('POST'))); - $activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST'))); + $activity['assignment'] = get_var('assignment',array('POST')); + $activity['date'] = get_var('date',array('POST')); + $activity['notes']= get_var('notes',array('POST')); $this->db->query("INSERT INTO eq_activity (assignment,date,notes) " . "VALUES ('" . $activity['assignment'] . "','" . $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__); @@ -761,7 +796,7 @@ class eq . " AND date='".$activity['date']."' AND notes='".$activity['notes']."'"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { - print "activity: " . $this->db->f('activity') . "
"; + //print "activity: " . $this->db->f('activity') . "
"; $activity['activity'] = $this->db->f('activity'); } @@ -935,8 +970,8 @@ class eq if($action == 'save') { - $assignment['name'] = $this->db->db_addslashes(get_var('name',array('POST'))); - $assignment['code'] = $this->db->db_addslashes(get_var('code',array('POST'))); + $assignment['name'] = get_var('name',array('POST')); + $assignment['code'] = get_var('code',array('POST')); $this->db->query("UPDATE eq_assignment set " . " name='" . $assignment['name'] . "'" . ", code='" . $assignment['code'] . "'" . @@ -948,8 +983,8 @@ class eq if($action == 'insert') { - $assignment['name'] = $this->db->db_addslashes(get_var('name',array('POST'))); - $assignment['code'] = $this->db->db_addslashes(get_var('code',array('POST'))); + $assignment['name'] = get_var('name',array('POST')); + $assignment['code'] = get_var('code',array('POST')); $this->db->query("INSERT INTO eq_assignment (name,code) " . "VALUES ('" . $assignment['name'] . "','" . $assignment['code'] . "')",__LINE__,__FILE__); @@ -1068,14 +1103,14 @@ class eq } } if($checkmark) { - $part_table .= ''; + $part_table .= ''; $part_table .= ''.$num_matches.'
'; $part_table .= ''.$date.''; } else { $part_table .= ' '; } } - if($participated) { $part_table .= ''.$participated.''; } + if($participated) { $part_table .= ''.$participated.''; } else { $part_table .= ' '; } $this->t->set_var('part_table',$part_table); $this->t->fp('list2','elder_list',True); @@ -1094,6 +1129,23 @@ class eq $this->t->set_block('willing_view_t','header_list','list1'); $this->t->set_block('willing_view_t','elder_list','list2'); + $this->t->set_var('lang_filter','Filter'); + $this->t->set_var('lang_filter_unwilling','Filter out unwilling Elders:'); + + $filter_unwilling = get_var('filter_unwilling',array('POST')); + $this->t->set_var('filter_unwilling',$filter_unwilling); + + if($filter_unwilling == 'y' || $filter_unwilling == '') { + $filter_input = "Y"; + $filter_input.= "N"; + $filter_input.= "  "; + } else { + $filter_input = "Y"; + $filter_input.= "N"; + $filter_input.= "  "; + } + $this->t->set_var('filter_input',$filter_input); + $sql = "SELECT * FROM eq_elder where valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; @@ -1101,6 +1153,7 @@ class eq { $elder_name[$i] = $this->db->f('name'); $elder_id[$i] = $this->db->f('elder'); + $elder_phone[$elder_id[$i]] = $this->db->f('phone'); $i++; } array_multisort($elder_name, $elder_id); @@ -1115,8 +1168,21 @@ class eq $assignment_list[$i]['code'] = $this->db->f('code'); $i++; } + + $sql = "SELECT * FROM eq_activity ORDER BY date DESC"; + $this->db->query($sql,__LINE__,__FILE__); + $total_records = $this->db->num_rows(); + + $i = 0; + while ($this->db->next_record()) + { + $activity_list[$i]['assignment'] = $this->db->f('assignment'); + $activity_list[$i]['date'] = $this->db->f('date'); + $activity_list[$i]['activity'] = $this->db->f('activity'); + $i++; + } - $elder_width=300; $willing_width=40; $assignment_width=50; + $elder_width=275; $willing_width=40; $assignment_width=50; $total_width=$elder_width+$willing_width; for ($i=0; $i < count($assignment_list); $i++) { @@ -1128,36 +1194,59 @@ class eq } for ($i=0; $i < count($elder_id); $i++) { - $willing_table = ''; - $this->nextmatchs->template_alternate_row_color(&$this->t); + $willing_table = ''; $elder_willing=0; $this->t->set_var('elder_name',$elder_name[$i]); + $this->t->set_var('elder_phone',$elder_phone[$elder_id[$i]]); $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&elder_id=' . $elder_id[$i] . '&action=' . 'edit')); for ($j=0; $j < count($assignment_list); $j++) { - $found_willingness=0; + $found_willingness=0; $sql = "SELECT * FROM eq_willingness where " . " assignment=" . $assignment_list[$j]['assignment'] . " AND elder=" . $elder_id[$i]; $this->db->query($sql,__LINE__,__FILE__); while($this->db->next_record()) { $found_willingness=1; + $date_part=""; + $sql = "SELECT * FROM eq_activity where " + . " assignment=". $assignment_list[$j]['assignment'] + . " ORDER by date DESC"; + $this->db2->query($sql,__LINE__,__FILE__); + if($this->db2->next_record()) { + $activity = $this->db2->f('activity'); + $date = $this->db2->f('date'); + $sql = "SELECT * FROM eq_participation where " + . " activity=" . $activity + . " AND elder=". $elder_id[$i]; + $this->db3->query($sql,__LINE__,__FILE__); + if($this->db3->next_record()) { + $date_part = $date; + } + } + if($this->db->f('willing') == 'y') { $total_willing[$j]++; - $willing_table .= ''; + $elder_willing=1; + $willing_table .= '
'.$date_part.''; } else if($this->db->f('willing') == 'n') { - $willing_table .= ''; + $willing_table .= ''; } else { + $elder_willing=1; $willing_table .= " "; } } if(!$found_willingness) { + $elder_willing=1; $willing_table .= " "; } } - $this->t->set_var('willing_table',$willing_table); - $this->t->fp('list2','elder_list',True); + if(($elder_willing == 1) || ($filter_unwilling == 'n')) { + $this->t->set_var('willing_table',$willing_table); + $this->t->fp('list2','elder_list',True); + $this->nextmatchs->template_alternate_row_color(&$this->t); + } } $stat_table = 'Total Willing to Serve'; @@ -1322,31 +1411,62 @@ class eq $table_data=""; $completed_data=""; $totals_data=""; $year = date('Y'); - + + // 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_name_array = explode(",",$president_name); + $president_last_name = $president_name_array[0]; + $president_id = $this->db->f('elder'); + $presidency_id = $this->db->f('presidency'); + $interviewer = $this->db->f('elder'); + $district_number = '*'; + $district_name = $president_name; + $sql = "SELECT * FROM eq_elder where elder='$president_id'"; + $this->db2->query($sql,__LINE__,__FILE__); + if($this->db2->next_record()) { + $indiv_id = $this->db2->f('indiv_id'); + } + $sql = "SELECT * FROM eq_parent where indiv_id='$indiv_id'"; + $this->db2->query($sql,__LINE__,__FILE__); + if($this->db2->next_record()) { + $president_address = $this->db2->f('address'); + } + } else { + print "

-E- Unable to locate EQ President in eq_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
"; - - //Only perform a database update if we have made a change to this appointment - $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and elder='$elder'"; - $this->db->query($sql,__LINE__,__FILE__); - if(!$this->db->next_record()) { - // 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 eq_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 eq_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')); @@ -1365,22 +1485,8 @@ 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"; @@ -1397,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; @@ -1421,6 +1528,8 @@ class eq { $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); @@ -1444,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); @@ -1484,11 +1596,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 elder=" . $id . " AND eqpresppi=1"; $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 eq_ppi WHERE elder=" . $id . " AND eqpresppi=1 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'; @@ -1497,6 +1609,7 @@ class eq $link_data['ppi'] = ''; $link_data['eqpresppi'] = 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); @@ -1615,30 +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 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'); + $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
"; - //Only perform a database update if we have made a change to this appointment - $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and elder='$elder'"; - $this->db->query($sql,__LINE__,__FILE__); - if(!$this->db->next_record()) { - // 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 eq_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 eq_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 eq_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 eq_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')); @@ -1649,6 +1798,7 @@ 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 " . @@ -1660,7 +1810,7 @@ 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 @@ -1681,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; @@ -1712,6 +1849,19 @@ 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 eq_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 eq_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); @@ -1725,6 +1875,8 @@ class eq { $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); @@ -1749,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); @@ -1764,7 +1920,7 @@ class eq // Select all the unique companionship numbers for this district $sql = "SELECT distinct companionship FROM eq_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'); @@ -1834,38 +1990,43 @@ 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 eq_ppi 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 eq_ppi 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'; $link_data['elder'] = $id; $link_data['aaronic'] = 0; $link_data['name'] = $name; - $link_data['interview'] = ''; + $link_data['ppi'] = ''; $link_data['action'] = 'add'; + $link_data['interviewer'] = $districts[$d]['supervisor']; $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); $table_data.= "$name"; $table_data.= "$phone"; $table_data.= ""; - $table_data.= ''; + foreach(range(0,6) as $num) { + if($num == 0) { $num = 1; } else {$num = $num*5; } + if($int_pri == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; } + $table_data.= ''; + } + $table_data.= ''; } - $table_data.= ''; $table_data.= "$date"; - $table_data.= ''; + if($aaronic == 0) { + $table_data.= ''; + } $table_data.= ''; $table_data.= ''; $table_data.= ''; $table_data.= ''; - $table_data.= ''; + $table_data.= ''."\n"; $i++; } else { $link_data['menuaction'] = 'eq.eq.int_update'; @@ -1873,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['ppi'] = $this->db2->f('ppi'); $link_data['action'] = 'view'; $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); $comps_with_quarterly_int++; @@ -1961,61 +2122,91 @@ class eq $table_data=""; $completed_data=""; $totals_data=""; $year = date('Y'); - + + // 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'); + $familyid2name[$family_id[$i]] = $family_name[$i]; + $sql = "SELECT * FROM eq_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']; - - //Only perform a database update if we have made a change to this appointment - $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and family='$family'"; - $this->db->query($sql,__LINE__,__FILE__); - if(!$this->db->next_record()) { - - // 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 eq_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 eq_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 " . " 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 eq_presidency where eqpres=1 and valid=1"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $presidency_name = $this->db->f('name'); @@ -2024,20 +2215,7 @@ class eq print "

-E- Unable to locate EQ Presidency in eq_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"; $this->db->query($sql,__LINE__,__FILE__); @@ -2046,7 +2224,12 @@ class eq { $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]; @@ -2070,6 +2253,9 @@ class eq } $appt_table_data.=''; + $appt_table_data.= ''; + $appt_table_data.= ''; $tr_color = $this->nextmatchs->alternate_row_color($tr_color); @@ -2167,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.= "$name Family"; $completed_data.= "$phone"; $completed_data.= "$date"; @@ -2178,7 +2364,7 @@ class eq } } - $name_width=175; $phone_width=100; $date_width=100; $notes_width=300; + $name_width=190; $phone_width=100; $date_width=100; $notes_width=300; $completed_table_width=$name_width + $phone_width + $date_width + $notes_width; $completed_header_row = "Family Name"; $completed_header_row.= "Phone"; @@ -2304,7 +2490,7 @@ class eq $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=" . $id; + "AND elder=" . $id . " AND eqpresppi=1"; $this->db2->query($sql,__LINE__,__FILE__); if(!$total_ppis[$m]) { $total_ppis[$m] = 0; } @@ -2323,7 +2509,7 @@ class eq $month = $date_array[1]; $day = $date_array[2]; $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); - $table_data .= ' '.$month.'-'.$day.''; + $table_data .= ' '.$month.'-'.$day.''; } else { $table_data .= " "; } } @@ -2367,33 +2553,31 @@ class eq $date = get_var('date',array('GET','POST')); $notes = get_var('notes',array('GET','POST')); $eqpresppi = get_var('eqpresppi',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); + + $sql = "SELECT * FROM eq_presidency where valid=1 and (president=1 or counselor=1 or secretary=1)"; + $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->set_var('eqpresppi_checked',''); + $this->t->fp('int_list','interviewer_list',True); + } + if($action == 'save') { - $notes = $this->db->db_addslashes(get_var('notes',array('POST'))); + $notes = get_var('notes',array('POST')); $this->db->query("UPDATE eq_ppi set " . " ppi='" . $ppi . "'" . ", interviewer='" . $interviewer . "'" . ", elder='" . $elder . "'" . + ", aaronic='" . $aaronic . "'" . ", date='" . $date . "'" . ", notes='" . $notes . "'" . ", eqpresppi='" . $eqpresppi . "'" . @@ -2404,9 +2588,9 @@ class eq if($action == 'insert') { - $notes = $this->db->db_addslashes(get_var('notes',array('POST'))); - $this->db->query("INSERT INTO eq_ppi (interviewer,elder,date,notes,eqpresppi) " - . "VALUES ('" . $interviewer . "','" . $elder . "','" + $notes = get_var('notes',array('POST')); + $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) " + . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','" . $date . "','" . $notes . "','" . $eqpresppi ."')",__LINE__,__FILE__); $this->ppi_view(); return false; @@ -2422,6 +2606,7 @@ class eq $this->t->set_var('date',''); $this->t->set_var('notes',''); $this->t->set_var('eqpresppi',$eqpresppi); + $this->t->set_var('eqpresppi_checked','checked'); $this->t->set_var('lang_done','Cancel'); $this->t->set_var('lang_action','Adding New PPI'); $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&ppi=' @@ -2440,6 +2625,7 @@ class eq $this->t->set_var('date',$this->db->f('date')); $this->t->set_var('notes',$this->db->f('notes')); $this->t->set_var('eqpresppi',$this->db->f('eqpresppi')); + if($this->db->f('eqpresppi') == 1) { $this->t->set_var('eqpresppi_checked','checked'); } } if($action == 'edit') @@ -2548,13 +2734,11 @@ class eq $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']; - $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'); @@ -2593,7 +2777,7 @@ class eq $link_data['elder'] = $elder_id; $link_data['aaronic'] = $aaronic_id; $link_data['name'] = $name; - $link_data['interview'] = ''; + $link_data['ppi'] = ''; $link_data['action'] = 'add'; $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); $table_data.= "$name"; @@ -2608,7 +2792,7 @@ class eq $month_start = "$year"."-"."$month"."-"."01"; $month_end = "$year"."-"."$month"."-"."31"; $month = "$month"."/"."$year"; - $sql = "SELECT * FROM eq_interview WHERE date >= '$month_start' AND date <= '$month_end' ". + $sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ". "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id; $this->db2->query($sql,__LINE__,__FILE__); $header_row .= "$month"; @@ -2624,14 +2808,14 @@ class eq $link_data['elder'] = $elder_id; $link_data['aaronic'] = $aaronic_id; $link_data['name'] = $name; - $link_data['interview'] = $this->db2->f('interview'); + $link_data['ppi'] = $this->db2->f('ppi'); $link_data['action'] = 'view'; $date = $this->db2->f('date'); $date_array = explode("-",$date); $month = $date_array[1]; $day = $date_array[2]; $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); - $table_data .= ' '.$month.'-'.$day.''; + $table_data .= ' '.$month.'-'.$day.''; } else { $table_data .= " "; } } @@ -2641,17 +2825,22 @@ class eq $table_data .= "
"; } $total_companionships += $num_companionships; - $stat_data = "$num_companionships Companionships
Interview Quarterly Totals:"; + $stat_data = "$num_companionships Companionships
Interview Totals:"; + // Print the hometeaching interview stats for($m=$num_months; $m >=0; $m--) { $month = $current_month - $m; - if(($month % 3) == 1) { $quarter_total = $ints[$m]; } - else { $quarter_total += $ints[$m]; } - $percent = ceil(($quarter_total / $num_companionships)*100); - $stat_data .= "$quarter_total
$percent%"; + if($month < 0) { $month = 12 + $month; } // Handle going backwards over a year boundary + $month_begins = $month % $this->monthly_hometeaching_interview_stats; + //print "$month % $this->monthly_hometeaching_interview_stats = $month_begins
"; + if($this->monthly_hometeaching_interview_stats == 1) { $month_begins = 1; } + if(($month_begins) == 1) { $total = $ints[$m]; } + else { $total += $ints[$m]; } + $percent = ceil(($total / $num_companionships)*100); + $stat_data .= "$total
$percent%"; } $stat_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); @@ -2659,18 +2848,21 @@ class eq $this->t->fp('list','district_list',True); } - // Display the totals, cummulative per quarter - $quarter_total = 0; - $totals = "$total_companionships Total Comps
Interview Quarterly Totals:"; + // Display the totals + $total = 0; + $totals = "$total_companionships Total Comps
Interview Totals:"; for($m=$num_months; $m >=0; $m--) { $month = $current_month - $m; - if(($month % 3) == 1) { $quarter_total = $total_ints[$m]; } - else { $quarter_total += $total_ints[$m]; } - $percent = ceil(($quarter_total / $total_companionships)*100); - $totals .= "$quarter_total
$percent%"; + if($month < 0) { $month = 12 + $month; } // Handle going backwards over a year boundary + $month_begins = $month % $this->monthly_hometeaching_interview_stats; + if($this->monthly_hometeaching_interview_stats == 1) { $month_begins = 1; } + if(($month_begins) == 1) { $total = $total_ints[$m]; } + else { $total += $total_ints[$m]; } + $percent = ceil(($total / $total_companionships)*100); + $totals .= "$total
$percent%"; } $totals .= ""; - + $this->t->set_var('totals',$totals); $this->t->pfp('out','int_view_t'); $this->save_sessiondata(); @@ -2686,57 +2878,56 @@ 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('eqpresppi_checked',''); $action = get_var('action',array('GET','POST')); $companionship = get_var('companionship',array('GET','POST')); $interviewer = get_var('interviewer',array('GET','POST')); $name = get_var('name',array('GET','POST')); - $interview = get_var('interview',array('GET','POST')); + $ppi = get_var('ppi',array('GET','POST')); $elder = get_var('elder',array('GET','POST')); $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); - } + $eqpresppi = get_var('eqpresppi',array('GET','POST')); + + $sql = "SELECT * FROM eq_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 " . - " interview='" . $interview . "'" . + $notes = get_var('notes',array('POST')); + $this->db->query("UPDATE eq_ppi set " . + " ppi='" . $ppi . "'" . ", interviewer='" . $interviewer . "'" . ", elder='" . $elder . "'" . ", aaronic='" . $aaronic . "'" . ", date='" . $date . "'" . ", notes='" . $notes . "'" . - " WHERE interview=" . $interview,__LINE__,__FILE__); + ", eqpresppi='" . $eqpresppi . "'" . + " WHERE ppi=" . $ppi,__LINE__,__FILE__); $this->int_view(); return false; } 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 eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) " . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','" - . $date . "','" . $notes ."')",__LINE__,__FILE__); + . $date . "','" . $notes ."','" . $eqpresppi . "')",__LINE__,__FILE__); $this->int_view(); return false; } @@ -2744,7 +2935,7 @@ class eq if($action == 'add') { $this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options)); - $this->t->set_var('interview', ''); + $this->t->set_var('ppi', ''); $this->t->set_var('interviewer', $interviewer); $this->t->set_var('name',$name); $this->t->set_var('elder',$elder); @@ -2753,22 +2944,23 @@ class eq $this->t->set_var('notes',''); $this->t->set_var('lang_done','Cancel'); $this->t->set_var('lang_action','Adding New Interview'); - $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview=' - . $interview . '&action=' . 'insert')); + $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi=' + . $ppi . '&action=' . 'insert')); } if($action == 'edit' || $action == 'view') { - $sql = "SELECT * FROM eq_interview WHERE interview=".$interview; + $sql = "SELECT * FROM eq_ppi WHERE ppi=".$ppi; $this->db->query($sql,__LINE__,__FILE__); $this->db->next_record(); - $this->t->set_var('interview',$interview); + $this->t->set_var('ppi',$ppi); $this->t->set_var('name',$name); $this->t->set_var('interviewer', $this->db->f('interviewer')); $this->t->set_var('elder',$this->db->f('elder')); $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('eqpresppi') == 1) { $this->t->set_var('eqpresppi_checked','checked'); } } if($action == 'edit') @@ -2776,8 +2968,8 @@ class eq $this->t->set_var('cal_date',$this->jscal->input('date',$date,'','','','','',$this->cal_options)); $this->t->set_var('lang_done','Cancel'); $this->t->set_var('lang_action','Editing Interview'); - $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview=' - . $interview . '&action=' . 'save')); + $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi=' + . $ppi . '&action=' . 'save')); } if($action == 'view') @@ -2788,8 +2980,8 @@ class eq $this->t->set_var('disabled','DISABLED'); $this->t->set_var('lang_done','Done'); $this->t->set_var('lang_action','Viewing Interview'); - $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview=' - . $interview . '&action=' . 'edit')); + $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi=' + . $ppi . '&action=' . 'edit')); } $this->t->set_var('lang_reset','Clear Form'); @@ -2931,7 +3123,7 @@ class eq if($action == 'save') { - $notes = $this->db->db_addslashes(get_var('notes',array('POST'))); + $notes = get_var('notes',array('POST')); $this->db->query("UPDATE eq_visit set " . " date='" . $date . "'" . ", notes='" . $notes . "'" . @@ -2942,7 +3134,7 @@ class eq if($action == 'insert') { - $notes = $this->db->db_addslashes(get_var('notes',array('POST'))); + $notes = get_var('notes',array('POST')); $this->db->query("INSERT INTO eq_visit (family,companionship,date,notes) " . "VALUES ('" . $family . "','" . $companionship . "','" . $date . "','" . $notes . "')",__LINE__,__FILE__); @@ -3039,7 +3231,7 @@ 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"; $this->db->query($sql,__LINE__,__FILE__); $i=0; @@ -3055,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); @@ -3069,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; } @@ -3138,7 +3331,7 @@ class eq $attended[$i][$cur_month]=1; $attendance[$monthnum[$cur_month]]++; } - $att_table .= ''; + $att_table .= ''; } else { $att_table .= ' '; } @@ -3458,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 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'); + $presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name']; + $presidency2elder[$presidency_data[$i]['id']] = $presidency_data[$i]['elder']; + $i++; + } + + $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'); + $familyid2name[$family_id[$i]] = $family_name[$i]; + $sql = "SELECT * FROM eq_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')); @@ -3475,67 +3699,113 @@ 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 eq_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 eq_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) { //Only perform a database update if we have made a change to this appointment $sql = "SELECT * FROM eq_appointment where " . "appointment='$appointment'" . - "and elder='$elder'" . - "and family='$family'" . - "and date='$date'" . - "and time='$time'"; + " 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()) { - $this->db->query("UPDATE eq_appointment set" . + $old_date = $this->db->f('date'); + $old_time = $this->db->f('time'); + $this->db2->query("UPDATE eq_appointment set" . " family=" . $family . " ,elder=" . $elder . " ,date='" . $date . "'" . " ,time='" . $time . "'" . + " ,location='" . $location . "'" . + " ,presidency='" . $presidency . "'" . " WHERE appointment=" . $appointment,__LINE__,__FILE__); // Email the appointment - if(($date != "") && ($time != "")) { - $this->email_appt($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,uid) " - . "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 eq_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 eq_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"; @@ -3549,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']; @@ -3578,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 eq_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 eq_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); @@ -3601,28 +3885,11 @@ class eq // Hour & Minutes selection $table_data.= ""; - $table_data.= ''; - $table_data.= ' : '; - $table_data.= ''; - $table_data.= ''; + $table_data .= $this->get_time_selection_form($hour, $minute, $pm, $presidency, $appointment); $table_data.= ""; // Elder drop down list (for PPIs) - $table_data.= ''; $table_data.= ''; for ($j=0; $j < count($elder_id); $j++) { $id = $elder_id[$j]; @@ -3633,7 +3900,7 @@ class eq $table_data.=''; // Family drop down list (for Visits) - $table_data.= ''; $table_data.= ''; for ($j=0; $j < count($elder_id); $j++) { $id = $family_id[$j]; @@ -3642,6 +3909,10 @@ class eq $table_data.= ''; } $table_data.=''; + + // Location text box + $table_data.= ''; $table_data.= ''; $table_data.= ''; @@ -3652,59 +3923,50 @@ class eq } // Create blank appointment slot - $appointment = 0; - $table_data.= ""; - - // Date selection - $table_data.= ''; - $table_data.= $this->jscal->input('sched['.$presidency.']['.$appointment.'][date]','','','','','','',$this->cal_options); - $table_data.= ''; + for ($b=0; $b < 4; $b++) { + $appointment = $this->max_appointments + $b; + $table_data.= ""; + + // Date selection + $table_data.= ''; + $table_data.= $this->jscal->input('sched['.$presidency.']['.$appointment.'][date]','','','','','','',$this->cal_options); + $table_data.= ''; - // Time selection - $table_data.= ""; - $table_data.= ''; - $table_data.= ' : '; - $table_data.= ''; - $table_data.= ''; - $table_data.= ""; - - // Elder drop down list - $table_data.= ''; - - // Family drop down list - $table_data.= ''; - - $table_data.= ''; - $table_data.= ''; + // Time selection + $table_data.= ""; + $table_data .= $this->get_time_selection_form(0, 0, 0, $presidency, $appointment); + $table_data.= ""; + + // Elder drop down list + $table_data.= ''; + + // Family drop down list + $table_data.= ''; + + // Location text box + $table_data.= ''; + + $table_data.= ''; + $table_data.= ''; + + $tr_color = $this->nextmatchs->alternate_row_color($tr_color); + $this->t->set_var('tr_color',$tr_color); + } $this->t->set_var('table_data',$table_data); $this->t->set_var('header_row',$header_row); @@ -3716,29 +3978,89 @@ class eq $this->t->pfp('out','sched_t'); $this->save_sessiondata(); } - + + function email() + { + $this->t->set_file(array('email_t' => 'email.tpl')); + $this->t->set_block('email_t','elder_list','list'); + + $action = get_var('action',array('GET','POST')); + + $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email')); + $this->t->set_var('title','EQ Email Tool'); + + $this->t->set_var('lang_email','Send Email'); + $this->t->set_var('lang_reset','Cancel'); + + $this->t->set_var('email_member_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email&action=member')); + $this->t->set_var('email_member_link_title','Email Quorum Member'); + + $this->t->set_var('email_quorum_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email&action=quorum')); + $this->t->set_var('email_quorum_link_title','Email Quorum'); + + $this->t->set_var('email_reminder_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email&action=reminder')); + $this->t->set_var('email_reminder_link_title','Email Reminders'); + + $this->t->set_var('email_edit_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email&action=edit')); + $this->t->set_var('email_edit_link_title','Edit Email Addresses'); + + $table_width=600; + $this->t->set_var('table_width',$table_width); + + $this->t->pfp('out','email_t'); + $this->save_sessiondata(); + } + function admin() { $this->t->set_file(array('admin_t' => 'admin.tpl')); $this->t->set_block('admin_t','upload','uploadhandle'); $this->t->set_block('admin_t','admin','adminhandle'); $this->t->set_block('admin_t','cmd','cmdhandle'); + $this->t->set_block('admin_t','presidency','presidencyhandle'); $this->t->set_var('upload_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.admin&action=upload')); + $this->t->set_var('presidency_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.admin&action=presidency')); $action = get_var('action',array('GET','POST')); $this->t->pfp('out','admin_t'); - + + $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC"; + $this->db->query($sql,__LINE__,__FILE__); + $i=0; + while ($this->db->next_record()) + { + $elder_id[$i] = $this->db->f('elder'); + $elder_name[$i] = $this->db->f('name'); + $elder2name[$elder_id[$i]] = $elder_name[$i]; + $i++; + } + array_multisort($elder_name, $elder_id); + if($action == 'upload') { - $target_path = $this->upload_target_path . basename( $_FILES['uploadedfile']['name']); + $target_path = $this->upload_target_path . '/' . basename( $_FILES['uploadedfile']['name']); - if((($_FILES['uploadedfile']['type'] == "application/zip") || - ($_FILES['uploadedfile']['type'] == "application/x-zip-compressed") || - ($_FILES['uploadedfile']['type'] == "application/x-zip") || - ($_FILES['uploadedfile']['type'] == "application/octet-stream")) && - (move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path))) { + if(($_FILES['uploadedfile']['type'] == "application/zip") || + ($_FILES['uploadedfile']['type'] == "application/x-zip-compressed") || + ($_FILES['uploadedfile']['type'] == "application/x-zip") || + ($_FILES['uploadedfile']['type'] == "application/octet-stream")) { + + if(!move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path)) { + $uploadstatus = " -E- Unable to move the uploaded file to "; + $uploadstatus.= "the target path (check the path and permissions) of: $target_path"; + $uploadstatus = "The following file was uploaded successfully:

"; + $uploadstatus.= "Tmp Filename : " . $_FILES['uploadedfile']['tmp_name'] . "
"; + $uploadstatus.= "Filename : " . $_FILES['uploadedfile']['name'] . "
"; + $uploadstatus.= "Type : " . $_FILES['uploadedfile']['type'] . "
"; + $uploadstatus.= "Size : " . $_FILES['uploadedfile']['size'] . "
"; + $uploadstatus.= "Error : " . $_FILES['uploadedfile']['error'] . "
"; + $this->t->set_var('uploadstatus',$uploadstatus); + $this->t->pfp('uploadhandle','upload',True); + return 0; + } + $uploadstatus = "The following file was uploaded successfully:

"; $uploadstatus.= "Filename : " . $_FILES['uploadedfile']['name'] . "
"; $uploadstatus.= "Type : " . $_FILES['uploadedfile']['type'] . "
"; @@ -3750,9 +4072,9 @@ class eq # make a directory for this data to be stored in $date="data_" . date("Y_m_d"); - $data_dir = $this->upload_target_path . $date; + $data_dir = $this->upload_target_path . '/' . $date; print "-> Making the data directory: $date
\n"; - exec('mkdir ' . $data_dir . ' 2>&1', $result, $return_code); + exec('mkdir -p ' . $data_dir . ' 2>&1', $result, $return_code); if($return_code != 0) { print implode('\n',$result) . "
"; print ""; @@ -3774,12 +4096,11 @@ class eq # unzip the data into this directory print "-> Unzipping the data
\n"; - $data_file = $data_dir . ''; - exec('unzip ' . $data_dir . '/*.zip -d ' . $data_dir . ' 2>&1', $result, $return_code); + exec($this->unzip_path .' -u '. $data_dir . '/*.zip -d ' . $data_dir . ' 2>&1', $result, $return_code); if($return_code != 0) { print implode('\n',$result) . "
"; print ""; - print "-E- Unable to unzip the uploaded file into the data dir. Aborting import."; + print "-E- Unable to unzip the uploaded file into the data dir: $data_dir. Aborting import."; print ""; return 0; } @@ -3787,7 +4108,7 @@ class eq # update the data_latest link to point to this new directory print "-> Updating the latest data dir link
\n"; - $data_latest = $this->upload_target_path . 'data_latest'; + $data_latest = $this->upload_target_path . '/data_latest'; exec('rm ' . $data_latest. '; ln -s ' . $data_dir .' '. $data_latest .' 2>&1', $result, $return_code); if($return_code != 0) { print implode('\n',$result) . "
"; @@ -3803,8 +4124,8 @@ class eq ob_flush(); flush(); sleep(1); $import_log = $this->upload_target_path . '/import.log'; $data_log = $this->upload_target_path . '/data.log'; - $import_cmd = $this->script_path . 'import_ward_data ' . $data_latest . ' | tee ' . $import_log; - $parse_cmd = $this->script_path . 'parse_ward_data -v ' . $data_latest . ' > ' . $data_log; + $import_cmd = $this->script_path . '/import_ward_data ' . $data_latest . ' 2>&1 | tee ' . $import_log; + $parse_cmd = $this->script_path . '/parse_ward_data -v ' . $data_latest . ' > ' . $data_log . '2>&1'; #print "import_cmd: $import_cmd
"; #print "parse_cmd: $parse_cmd
"; ob_start('ob_logstdout', 2); @@ -3833,12 +4154,238 @@ class eq $this->t->pfp('uploadhandle','upload',True); } } + else if($action == "presidency") + { + $new_data = get_var('eqpres',array('POST')); + foreach ($new_data as $entry) + { + $id = $entry['id']; + $email = $entry['email']; + $elder = $entry['elder']; + $name = $entry['name']; + $district = $entry['district']; + $president = $entry['president']; + $counselor = $entry['counselor']; + $secretary = $entry['secretary']; + $eqpresidency = $entry['eqpresidency']; + // Set the elder id to 0 for EQ Presidency tagged entry + if($eqpresidency == 1) { $elder="0"; } + // Re-look up the elder name for the ID if we aren't an EQ Presidency tagged entry + else { $name = $elder2name[$elder]; } + //print "id=$id elder=$elder name=$name email=$email district=$district president=$president "; + //print "counselor=$counselor secretary=$secretary eqpres=$eqpresidency
"; + + if(($elder > 0) || ($name != "")) { + if($id < $this->max_presidency_members) { + //print "Updating Existing Entry
"; + $this->db2->query("UPDATE eq_presidency set" . + " elder=" . $elder . + " ,district=" . $district . + " ,name='" . $name . "'" . + " ,email='" . $email . "'" . + " ,president='" . $president . "'" . + " ,counselor='" . $counselor . "'" . + " ,secretary='" . $secretary . "'" . + " ,eqpres='" . $eqpresidency . "'" . + " WHERE presidency=" . $id,__LINE__,__FILE__); + + } else { + //print "Adding New Entry
"; + $this->db2->query("INSERT INTO eq_presidency (presidency,elder,district,name," + . "email,president,counselor,secretary,eqpres,valid) " + . "VALUES (NULL,'" . $elder . "','" . $district . "','" + . $name . "','" . $email . "','" . $president . "','" + . $counselor . "','" . $secretary . "','" . $eqpres . "','1'" + .")",__LINE__,__FILE__); + } + } else { + //print "Ignoring Blank Entry
"; + } + } + + // Now update the eq_district table appropriately + + // Delete all the previous district entries from the table + $this->db->query("DELETE from eq_district where valid=1",__LINE__,__FILE__); + $this->db->query("DELETE from eq_district where valid=0",__LINE__,__FILE__); + + // Always add a "District 0" assigned to the High Priests Group + $district = 0; + $name = "High Priests"; + $elder = 0; + $valid = 0; + $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) " + . "VALUES ('" . $district . "','" . $name . "','" + . $elder . "','" . $valid . "'" + .")",__LINE__,__FILE__); + + + // Requery the eq_presidency table + $sql = "SELECT * FROM eq_presidency where valid=1"; + $this->db->query($sql,__LINE__,__FILE__); + while ($this->db->next_record()) + { + // Extract the data for each presidency record + $id = $this->db->f('presidency'); + $elder = $this->db->f('elder'); + $name = $this->db->f('name'); + $district = $this->db->f('district'); + $name = $this->db->f('name'); + $valid = 1; + + // If we have a valid district, add it to the district table + if($district > 0) { + $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) " + . "VALUES ('" . $district . "','" . $name . "','" + . $elder . "','" . $valid . "'" + .")",__LINE__,__FILE__); + } + + } + + $this->t->set_var('adminhandle',''); + $this->t->pfp('adminhandle','admin'); + } else { $this->t->set_var('adminhandle',''); $this->t->pfp('adminhandle','admin'); } + + // Now save off the data needed for an EQ Presidency Table Update + $sql = "SELECT * FROM eq_presidency where valid=1"; + $this->db->query($sql,__LINE__,__FILE__); + $table_data = ""; + $header_row = "ElderEmailDistrictPresidentCounselorSecretaryEQ Presidency"; + while ($this->db->next_record()) + { + // Extract the data for each presidency record + $id = $this->db->f('presidency'); + $elder = $this->db->f('elder'); + $district = $this->db->f('district'); + $name = $this->db->f('name'); + $email = $this->db->f('email'); + $president = $this->db->f('president'); + $counselor = $this->db->f('counselor'); + $secretary = $this->db->f('secretary'); + $eqpresidency = $this->db->f('eqpres'); + + // Create the forms needed in the table + $table_data .= ""; + + // Presidency ID + $table_data .= ''; + + // Elder + if($eqpresidency == 0) { + $table_data.= ''; + $table_data.=''; + } else { + $table_data.= ''; + $table_data.= ''; + } + + // Email Address + $table_data .= ''; + + // District + $table_data.= ''; + + // President + $table_data.= ''; + + // Counselor + $table_data.= ''; + + // Secretary + $table_data.= ''; + + // EQ Presidency + $table_data.= ''; + + // End of ROW + $table_data .= "\n"; + $tr_color = $this->nextmatchs->alternate_row_color($tr_color); + $this->t->set_var('tr_color',$tr_color); + } + + // Now create 1 blank row to always have a line available to add a new elder with + $id = $this->max_presidency_members; + $table_data .= ""; + // Presidency ID + $table_data .= ''; + // Elder + $table_data.= ''; + $table_data.=''; + // Email Address + $table_data.=''; + // District + $table_data.= ''; + // President + $table_data.= ''; + // Counselor + $table_data.= ''; + // Secretary + $table_data.= ''; + // EQ Presidency + $table_data.= ''; + // End of ROW + $table_data .= "\n"; + $tr_color = $this->nextmatchs->alternate_row_color($tr_color); + $this->t->set_var('tr_color',$tr_color); + + $this->t->set_var('header_row',$header_row); + $this->t->set_var('table_data',$table_data); + $this->t->pfp('presidencyhandle','presidency',True); + $this->save_sessiondata(); } @@ -3853,6 +4400,7 @@ class eq { $appointment = $this->db->f('appointment'); $presidency = $this->db->f('presidency'); + $location = $this->db->f('location'); $interviewer = ""; $email = ""; $elder = $this->db->f('elder'); @@ -3861,7 +4409,6 @@ class eq $family_name = ""; $appt_name = ""; $phone = ""; - $location = ""; $uid = $this->db->f('uid'); // Extract the year, month, day, hours, minutes, seconds from the appointment time @@ -3875,10 +4422,7 @@ class eq // Format the appointment time into an iCal UTC equivalent $dtstamp = gmdate("Ymd"."\T"."His"."\Z"); $dtstart = gmdate("Ymd"."\T"."His"."\Z", mktime($hour,$minute,$seconds,$month,$day,$year)); - - // Set the email address of the person making the appointment - $from = $GLOBALS['phpgw_info']['user']['fullname'] . "<" . - $GLOBALS['phpgw_info']['user']['preferences']['email']['address'] . ">"; + $dtstartstr = date("l, F d, o g:i A", mktime($hour,$minute,$seconds,$month,$day,$year)); $sql = "SELECT * FROM eq_presidency where presidency='$presidency'"; $this->db2->query($sql,__LINE__,__FILE__); @@ -3887,6 +4431,9 @@ class eq $interviewer = $this->db2->f('name'); } + // Set the email address of the interviewer + $from = $email; + if($elder > 0) { $sql = "SELECT * FROM eq_elder where elder='$elder'"; $this->db2->query($sql,__LINE__,__FILE__); @@ -3894,8 +4441,7 @@ class eq $elder_name = $this->db2->f('name'); $phone = $this->db2->f('phone'); $appt_name = $elder_name . " Interview"; - $location = "$interviewer"."'s home"; - $duration = 1800; // 30 minutes + $duration = $this->default_ppi_appt_duration * 60; } } @@ -3912,16 +4458,13 @@ class eq if($this->db3->next_record()) { $phone = $this->db3->f('phone'); } - $sql = "SELECT * FROM eq_parent where family='$family'"; - $this->db3->query($sql,__LINE__,__FILE__); - if($this->db3->next_record()) { - $location=$this->db3->f('address'); - } - $duration = 2700; // 45 minutes + $duration = $this->default_visit_appt_duration * 60; } } $dtend = gmdate("Ymd"."\T"."His"."\Z", mktime($hour,$minute,$seconds+$duration,$month,$day,$year)); + $dtendstr = date("g:i A", mktime($hour,$minute,$seconds+$duration,$month,$day,$year)); + $date = $dtstartstr . "-" . $dtendstr; $description = "$appt_name : $phone"; if(($uid == 0) && ($appt_name != "")) { @@ -3937,7 +4480,7 @@ class eq $action = "PUBLISH"; $this->send_ical_appt($action, $email, $from, $subject, $dtstamp, $dtstart, - $dtend, $location, $appt_name, $description, $uid); + $dtend, $date, $location, $appt_name, $description, $uid); } else if(($uid != 0) && ($appt_name == "")) { // Remove the calendar item for this appointment since it has already been sent @@ -3951,7 +4494,7 @@ class eq $action = "CANCEL"; $this->send_ical_appt($action, $email, $from, $subject, $dtstamp, $dtstart, - $dtend, $location, $appt_name, $description, $uid); + $dtend, $date, $location, $subject, $subject, $uid); } else if($uid != 0) { // Update the existing appointment since we have changed it @@ -3960,7 +4503,7 @@ class eq $subject = "Canceled: $appt_date $appt_time"; $action = "CANCEL"; $this->send_ical_appt($action, $email, $from, $subject, $dtstamp, $dtstart, - $dtend, $location, $appt_name, $description, $uid); + $dtend, $date, $location, $subject, $subject, $uid); $uid = rand() . rand(); // Generate a random identifier for this appointment $this->db->query("UPDATE eq_appointment set" . @@ -3970,7 +4513,7 @@ class eq $subject = "Updated: $appt_name"; $action = "PUBLISH"; $this->send_ical_appt($action, $email, $from, $subject, $dtstamp, $dtstart, - $dtend, $location, $appt_name, $description, $uid); + $dtend, $date, $location, $appt_name, $description, $uid); } } @@ -3978,16 +4521,36 @@ class eq return true; } - function send_ical_appt($action, $to, $from, $subject, $dtstamp, $dtstart, $dtend, $location, $summary, $description, $uid) + function send_ical_appt($action, $to, $from, $subject, $dtstamp, $dtstart, $dtend, $date, $location, $summary, $description, $uid) { - $headers = 'From: ' . "$from" . "\n" . - 'Reply-To: ' . "$from" . "\n" . - 'X-Mailer: PHP/' . phpversion() . "\n" . - 'Content-Type: text/calendar;' . "\n" . - 'Content-Transfer-Encoding: 7bit' . "\n"; - - //$message = "phone: $phone date: $date time: $time"; - $message =""; + // Initialize our local variables + $boundary = "=MIME_APPOINTMENT_BOUNDARY"; + $message = ""; + $headers = ""; + + // Form the headers for the email message + $headers.="X-Mailer: PHP/" . phpversion() . "\n"; + $headers.="Mime-Version: 1.0\n"; + $headers.="Content-Type: multipart/mixed; boundary=\"$boundary\"\n"; + $headers.="Content-Disposition: inline\n"; + $headers.="Reply-To: $from\n"; + $headers.="From: $from\n"; + + // Print the plaintext version of the appointment + $message.="--$boundary\n"; + $message.="Content-Type: text/plain; charset=us-ascii\n"; + $message.="Content-Disposition: inline\n"; + $message.="\n"; + $message.="What: $description\n"; + $message.="When: $date\n"; + $message.="Where: $location\n"; + $message.="\n"; + + // Print the .ics attachment version of the appointment + $message.="--$boundary\n"; + $message.="Content-Type: text/calendar; charset=us-ascii\n"; + $message.="Content-Disposition: attachment; filename=\"appointment.ics\"\n"; + $message.="\n"; $message.="BEGIN:VCALENDAR" . "\n"; $message.="VERSION:2.0" . "\n"; $message.="PRODID:-//Microsoft Corporation//Outlook 11.0 MIMEDIR//EN" . "\n"; @@ -4006,10 +4569,65 @@ class eq $message.="CLASS:PUBLIC" . "\n"; $message.="END:VEVENT" . "\n"; $message.="END:VCALENDAR" . "\n"; - + + // Complete the message + $message.="--$boundary\n"; + + // Send the message mail($to, $subject, $message, $headers); } + + function get_time_selection_form($hour, $minute, $pm, $presidency, $appointment) + { + $form_data = ""; + $blank = 0; + + if($hour == 0) { $blank = 1; } + + if($this->time_drop_down_lists == 1) { + // Create drop down lists to get the time + $form_data.= ''; + $form_data.= ' : '; + $form_data.= ''; + } else { + // Use free form text fields to get the time + if($blank == 1) { $hour = ""; $minute = ""; $ampm = ""; } + $form_data.= ''; + $form_data.= ':'; + $form_data.= ''; + $form_data.= ' '; + } + // Always use a drop-down select form for am/pm + $form_data.= ''; + + return $form_data; + } } ?>