X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=2c53def85f89b6bc3f2b096dac6fc36556b5b32a;hb=061c8edc2c08b5463849df08d2a693398c379415;hp=4d129a1dba9be738f21f2e494715791c953014cf;hpb=d8baf26635d3b47c983a423b427920f0b60b3571;p=eq%2F.git diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index 4d129a1..2c53def 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -1,7 +1,8 @@ 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() { - // LOCAL CONFIGURATION. PLEASE UPDATE AS APPROPRIATE. - $this->upload_target_path = "/home/users/eqpres/eq_data"; - $this->script_path = "/usr/share/phpgroupware/eq/bin"; - $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->max_num_districts = 4; + 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; - // END LOCAL CONFIGURATION $this->db = $GLOBALS['phpgw']->db; $this->db2 = $this->db; @@ -118,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 { @@ -170,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() @@ -190,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()) @@ -201,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()) @@ -219,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()) { @@ -227,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'); @@ -247,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__); @@ -276,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); @@ -298,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; @@ -318,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]++; + $visits[$m]++; $total_visits[$m]++; + $num_families[$m]++; $total_families[$m]++; $table_data .= ''; } else if($this->db2->f('visited') == 'n') { + $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 .= " "; } } @@ -340,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 .= ""; @@ -355,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 .= ""; @@ -394,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'); @@ -404,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__); } @@ -432,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__); } } @@ -440,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()) @@ -458,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()) { @@ -468,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'); @@ -482,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__); @@ -506,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 .= "$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'; @@ -560,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); @@ -591,7 +616,7 @@ class eq $this->t->set_var('lang_date','Date'); $this->t->set_var('lang_notes','Description'); - $sql = "SELECT * FROM eq_activity ORDER BY date DESC"; + $sql = "SELECT * FROM 3rd_activity ORDER BY date DESC"; $this->db->query($sql,__LINE__,__FILE__); $total_records = $this->db->num_rows(); @@ -603,7 +628,7 @@ class eq $activity_list[$i]['date'] = $this->db->f('date'); $activity_list[$i]['notes'] = $this->db->f('notes'); - $sql = "SELECT * FROM eq_assignment WHERE assignment='" . $activity_list[$i]['assignment'] . "'"; + $sql = "SELECT * FROM 3rd_assignment WHERE assignment='" . $activity_list[$i]['assignment'] . "'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { @@ -634,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(); } @@ -652,14 +677,14 @@ class eq $this->t->set_file(array('act_view_t' => 'act_view.tpl')); $this->t->set_block('act_view_t','part_list','list'); - $sql = "SELECT * FROM eq_activity WHERE activity=" . intval(get_var('activity',array('GET','POST'))); + $sql = "SELECT * FROM 3rd_activity WHERE activity=" . intval(get_var('activity',array('GET','POST'))); $this->db->query($sql,__LINE__,__FILE__); $this->db->next_record(); $this->t->set_var('assignment', $this->db->f('assignment')); $this->t->set_var('date', $this->db->f('date')); $this->t->set_var('notes', $this->db->f('notes')); - $sql = "SELECT * FROM eq_assignment WHERE assignment='" . $this->db->f('assignment') . "'"; + $sql = "SELECT * FROM 3rd_assignment WHERE assignment='" . $this->db->f('assignment') . "'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { @@ -685,7 +710,7 @@ class eq $this->t->set_var('cal_date',$this->db->f('date')); // Now find out which elders participated in this activity - $sql = "SELECT * FROM eq_participation WHERE activity=" . intval(get_var('activity',array('GET','POST'))); + $sql = "SELECT * FROM 3rd_participation WHERE activity=" . intval(get_var('activity',array('GET','POST'))); $this->db->query($sql,__LINE__,__FILE__); $total_records = $this->db->num_rows(); @@ -698,7 +723,7 @@ class eq for ($i=0; $i < count($part_list); $i++) { - $sql = "SELECT * FROM eq_elder WHERE elder=" . $part_list[$i]['elder']; + $sql = "SELECT * FROM 3rd_elder WHERE elder=" . $part_list[$i]['elder']; $this->db->query($sql,__LINE__,__FILE__); $this->db->next_record(); $names[$i] = $this->db->f('name'); @@ -735,23 +760,25 @@ class eq $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 " . + $this->db->query("UPDATE 3rd_activity set " . " assignment='" . $activity['assignment'] . "', date='" . $activity['date'] . "'" . ", notes='" . $activity['notes'] . "'" . " WHERE activity=" . $activity['activity'],__LINE__,__FILE__); // Delete all the elders who have particiapted in this activity - $this->db->query("DELETE from eq_participation where activity=".$activity['activity'],__LINE__,__FILE__); + $this->db->query("DELETE from 3rd_participation where activity=".$activity['activity'],__LINE__,__FILE__); // 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 3rd_participation (elder,activity) " + . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__); + } + } + $this->act_list(); return false; } @@ -761,11 +788,11 @@ class eq $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) " + $this->db->query("INSERT INTO 3rd_activity (assignment,date,notes) " . "VALUES ('" . $activity['assignment'] . "','" . $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__); - $sql = "SELECT * FROM eq_activity WHERE assignment='".$activity['assignment']."' " + $sql = "SELECT * FROM 3rd_activity WHERE assignment='".$activity['assignment']."' " . " AND date='".$activity['date']."' AND notes='".$activity['notes']."'"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { @@ -776,7 +803,7 @@ class eq $elders = get_var('elder_name',array('POST')); foreach ($elders as $elder) { - $this->db->query("INSERT INTO eq_participation (elder,activity) " + $this->db->query("INSERT INTO 3rd_participation (elder,activity) " . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__); } @@ -799,7 +826,7 @@ class eq if($action == 'edit') { - $sql = "SELECT * FROM eq_activity WHERE activity=" . $activity['activity']; + $sql = "SELECT * FROM 3rd_activity WHERE activity=" . $activity['activity']; $this->db->query($sql,__LINE__,__FILE__); $this->db->next_record(); $this->t->set_var('cal_date',$this->jscal->input('date',$this->db->f('date'),'','','','','',$this->cal_options)); @@ -815,7 +842,7 @@ class eq } // Create the assignments drop-down list - $sql = "SELECT * FROM eq_assignment ORDER BY name ASC"; + $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i = 0; while ($this->db->next_record()) @@ -838,7 +865,7 @@ class eq $this->t->set_var('assignment_data',$assignment_data); // Create elder selection boxes - $sql = "SELECT * FROM eq_elder"; + $sql = "SELECT * FROM 3rd_elder"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) @@ -856,7 +883,7 @@ class eq for ($i=0; $i < count($elder_id); $i++) { //$this->nextmatchs->template_alternate_row_color(&$this->t); - $sql = "SELECT * FROM eq_participation where activity=". $activity['activity'] . " AND elder=" . $elder_id[$i]; + $sql = "SELECT * FROM 3rd_participation where activity=". $activity['activity'] . " AND elder=" . $elder_id[$i]; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $this->t->set_var('checked','checked'); $checked=1; } else { $this->t->set_var('checked',''); $checked=0; } @@ -892,7 +919,7 @@ class eq $this->t->set_var('lang_name','Assignment Name'); $this->t->set_var('lang_code','Code'); - $sql = "SELECT * FROM eq_assignment ORDER BY name ASC"; + $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $total_records = $this->db->num_rows(); @@ -945,7 +972,7 @@ class eq { $assignment['name'] = get_var('name',array('POST')); $assignment['code'] = get_var('code',array('POST')); - $this->db->query("UPDATE eq_assignment set " . + $this->db->query("UPDATE 3rd_assignment set " . " name='" . $assignment['name'] . "'" . ", code='" . $assignment['code'] . "'" . " WHERE assignment=" . $assignment['assignment'],__LINE__,__FILE__); @@ -958,7 +985,7 @@ class eq { $assignment['name'] = get_var('name',array('POST')); $assignment['code'] = get_var('code',array('POST')); - $this->db->query("INSERT INTO eq_assignment (name,code) " + $this->db->query("INSERT INTO 3rd_assignment (name,code) " . "VALUES ('" . $assignment['name'] . "','" . $assignment['code'] . "')",__LINE__,__FILE__); $this->assign_view(); @@ -978,7 +1005,7 @@ class eq if($action == 'edit') { - $sql = "SELECT * FROM eq_assignment WHERE assignment=" . $assignment['assignment']; + $sql = "SELECT * FROM 3rd_assignment WHERE assignment=" . $assignment['assignment']; $this->db->query($sql,__LINE__,__FILE__); $this->db->next_record(); $this->t->set_var('name', $this->db->f('name')); @@ -1009,7 +1036,7 @@ class eq $this->t->set_block('par_view_t','header_list','list1'); $this->t->set_block('par_view_t','elder_list','list2'); - $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()) @@ -1020,7 +1047,7 @@ class eq } array_multisort($elder_name, $elder_id); - $sql = "SELECT * FROM eq_activity ORDER BY date DESC"; + $sql = "SELECT * FROM 3rd_activity ORDER BY date DESC"; $this->db->query($sql,__LINE__,__FILE__); $total_records = $this->db->num_rows(); @@ -1033,7 +1060,7 @@ class eq $i++; } - $sql = "SELECT * FROM eq_assignment ORDER BY name ASC"; + $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while($this->db->next_record()) @@ -1061,7 +1088,7 @@ class eq $date = "0000-00-00"; $checkmark=0; $num_matches=0; for ($k=0; $k < count($activity_list); $k++) { if($assignment_list[$j]['assignment'] == $activity_list[$k]['assignment']) { - $sql = "SELECT * FROM eq_participation where " + $sql = "SELECT * FROM 3rd_participation where " . " activity=" . $activity_list[$k]['activity'] . " AND elder=" . $elder_id[$i]; $this->db->query($sql,__LINE__,__FILE__); @@ -1119,7 +1146,7 @@ class eq } $this->t->set_var('filter_input',$filter_input); - $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()) @@ -1131,7 +1158,7 @@ class eq } array_multisort($elder_name, $elder_id); - $sql = "SELECT * FROM eq_assignment ORDER BY name ASC"; + $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while($this->db->next_record()) @@ -1142,7 +1169,7 @@ class eq $i++; } - $sql = "SELECT * FROM eq_activity ORDER BY date DESC"; + $sql = "SELECT * FROM 3rd_activity ORDER BY date DESC"; $this->db->query($sql,__LINE__,__FILE__); $total_records = $this->db->num_rows(); @@ -1174,21 +1201,21 @@ class eq . $elder_id[$i] . '&action=' . 'edit')); for ($j=0; $j < count($assignment_list); $j++) { $found_willingness=0; - $sql = "SELECT * FROM eq_willingness where " + $sql = "SELECT * FROM 3rd_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 " + $sql = "SELECT * FROM 3rd_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 " + $sql = "SELECT * FROM 3rd_participation where " . " activity=" . $activity . " AND elder=". $elder_id[$i]; $this->db3->query($sql,__LINE__,__FILE__); @@ -1257,7 +1284,7 @@ class eq if($action == 'save') { // Delete all the previous willingness entries for this elder - $this->db->query("DELETE from eq_willingness where elder=" . $elder_id ,__LINE__,__FILE__); + $this->db->query("DELETE from 3rd_willingness where elder=" . $elder_id ,__LINE__,__FILE__); // Now, add the assignment willingness that is checked for this elder $new_data = get_var('willingness',array('POST')); @@ -1267,7 +1294,7 @@ class eq $assignment = $data_array[0]; $willing = $data_array[1]; //print "elder_id: $elder_id assignment: $assignment willing: $willing
"; - $this->db->query("INSERT INTO eq_willingness (elder,assignment,willing) " + $this->db->query("INSERT INTO 3rd_willingness (elder,assignment,willing) " . "VALUES (" . $elder_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__); } $this->willing_view(); @@ -1278,7 +1305,7 @@ class eq $table_data=""; // Find out the elder's name - $sql = "SELECT * FROM eq_elder WHERE elder=".$elder_id." AND valid=1"; + $sql = "SELECT * FROM 3rd_elder WHERE elder=".$elder_id." AND valid=1"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $elder_name = $this->db->f('name'); @@ -1286,7 +1313,7 @@ class eq } // Select all the assignments - $sql = "SELECT * FROM eq_assignment ORDER by name ASC"; + $sql = "SELECT * FROM 3rd_assignment ORDER by name ASC"; $this->db->query($sql,__LINE__,__FILE__); while ($this->db->next_record()) @@ -1299,7 +1326,7 @@ class eq $table_data.="$assignment_name"; $header_row="AssignmentsWillingness"; - $sql = "SELECT * FROM eq_willingness WHERE elder=".$elder_id." AND assignment=".$assignment; + $sql = "SELECT * FROM 3rd_willingness WHERE elder=".$elder_id." AND assignment=".$assignment; $this->db2->query($sql,__LINE__,__FILE__); $value = $assignment; @@ -1384,31 +1411,62 @@ class eq $table_data=""; $completed_data=""; $totals_data=""; $year = date('Y'); - + + // Get the EQ President + $sql = "SELECT * FROM 3rd_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 3rd_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 3rd_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 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
"; - - //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 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')); @@ -1419,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__); @@ -1427,26 +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'); - $interviewer = $this->db->f('elder'); - $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; @@ -1460,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; @@ -1477,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); @@ -1507,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); @@ -1519,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; @@ -1546,19 +1595,19 @@ 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); @@ -1586,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++; @@ -1679,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 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
"; - //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 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')); @@ -1716,7 +1801,7 @@ class eq //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__); @@ -1725,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()) @@ -1738,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'); @@ -1746,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; @@ -1777,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); @@ -1814,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); @@ -1827,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'); @@ -1839,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; @@ -1853,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()) { @@ -1865,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()) { @@ -1899,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'; @@ -1943,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++; @@ -2031,92 +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']; - - //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 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 eqpres=1 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]; @@ -2140,6 +2253,9 @@ class eq } $appt_table_data.=''; + $appt_table_data.= ''; + $appt_table_data.= ''; $tr_color = $this->nextmatchs->alternate_row_color($tr_color); @@ -2152,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; @@ -2174,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()) { @@ -2194,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'; @@ -2314,20 +2430,20 @@ class eq if($num_months == 1) { $this->t->set_var('lang_num_months','Year of History'); } else { $this->t->set_var('lang_num_months','Years of History'); } - $sql = "SELECT * FROM eq_presidency where president=1 and valid=1"; + $sql = "SELECT * FROM 3rd_presidency where president=1 and valid=1"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $president_name = $this->db->f('name'); $interviewer = $this->db->f('elder'); - $eqpresppi = 1; + $interview_type = 'ppi'; } else { - print "

-E- Unable to locate EQ President in eq_presidency table

"; + print "

-E- Unable to locate EQ President in 3rd_presidency table

"; return; } $this->t->set_var('district_number','*'); $this->t->set_var('district_name',$president_name); - $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()) @@ -2362,8 +2478,8 @@ class eq $link_data['interviewer'] = $interviewer; $link_data['elder'] = $id; $link_data['name'] = $name; - $link_data['ppi'] = ''; - $link_data['eqpresppi'] = $eqpresppi; + $link_data['interview'] = ''; + $link_data['interview_type'] = $interview_type; $link_data['action'] = 'add'; $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); $this->nextmatchs->template_alternate_row_color(&$this->t); @@ -2373,8 +2489,8 @@ class eq for($m=$num_months; $m >= 0; $m--) { $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; + $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(!$total_ppis[$m]) { $total_ppis[$m] = 0; } @@ -2385,8 +2501,8 @@ class eq $link_data['interviewer'] = $this->db2->f('interviewer'); $link_data['elder'] = $id; $link_data['name'] = $name; - $link_data['ppi'] = $this->db2->f('ppi'); - $link_data['eqpresppi'] = $eqpresppi; + $link_data['interview'] = $this->db2->f('interview'); + $link_data['interview_type'] = $interview_type; $link_data['action'] = 'view'; $date = $this->db2->f('date'); $date_array = explode("-",$date); @@ -2431,32 +2547,41 @@ class eq $companionship = get_var('companionship',array('GET','POST')); $interviewer = get_var('interviewer',array('GET','POST')); $name = get_var('name',array('GET','POST')); - $ppi = get_var('ppi',array('GET','POST')); + $interview = get_var('interview',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')); - $eqpresppi = get_var('eqpresppi',array('GET','POST')); - - $sql = "SELECT * FROM eq_elder WHERE elder=" . $interviewer; + $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)"; $this->db2->query($sql,__LINE__,__FILE__); - $this->db2->next_record(); - $interviewer_name = $this->db2->f('name'); - $this->t->set_var('interviewer',$interviewer . ' selected'); - $this->t->set_var('interviewer_name',$interviewer_name); - $this->t->fp('int_list','interviewer_list',True); + 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('interview_type_checked',''); + $this->t->fp('int_list','interviewer_list',True); + } if($action == 'save') { $notes = get_var('notes',array('POST')); - $this->db->query("UPDATE eq_ppi set " . - " ppi='" . $ppi . "'" . + $this->db->query("UPDATE 3rd_interview set " . + " interview='" . $interview . "'" . ", interviewer='" . $interviewer . "'" . ", elder='" . $elder . "'" . + ", aaronic='" . $aaronic . "'" . ", date='" . $date . "'" . ", notes='" . $notes . "'" . - ", eqpresppi='" . $eqpresppi . "'" . - " WHERE ppi=" . $ppi,__LINE__,__FILE__); + ", interview_type='" . $interview_type . "'" . + " WHERE interview=" . $interview,__LINE__,__FILE__); $this->ppi_view(); return false; } @@ -2464,9 +2589,9 @@ class eq if($action == 'insert') { $notes = get_var('notes',array('POST')); - $this->db->query("INSERT INTO eq_ppi (interviewer,elder,date,notes,eqpresppi) " - . "VALUES ('" . $interviewer . "','" . $elder . "','" - . $date . "','" . $notes . "','" . $eqpresppi ."')",__LINE__,__FILE__); + $this->db->query("INSERT INTO 3rd_interview (interviewer,elder,aaronic,date,notes,interview_type) " + . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','" + . $date . "','" . $notes . "','" . $interview_type ."')",__LINE__,__FILE__); $this->ppi_view(); return false; } @@ -2474,31 +2599,33 @@ class eq if($action == 'add') { $this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options)); - $this->t->set_var('ppi', ''); + $this->t->set_var('interview', ''); $this->t->set_var('interviewer', $interviewer); $this->t->set_var('name',$name); $this->t->set_var('elder',$elder); $this->t->set_var('date',''); $this->t->set_var('notes',''); - $this->t->set_var('eqpresppi',$eqpresppi); + $this->t->set_var('interview_type',$interview_type); + $this->t->set_var('interview_type_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=' - . $ppi . '&action=' . 'insert')); + $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&interview=' + . $interview . '&action=' . 'insert')); } if($action == 'edit' || $action == 'view') { - $sql = "SELECT * FROM eq_ppi WHERE ppi=".$ppi; + $sql = "SELECT * FROM 3rd_interview WHERE interview=".$interview; $this->db->query($sql,__LINE__,__FILE__); $this->db->next_record(); - $this->t->set_var('ppi',$ppi); + $this->t->set_var('interview',$interview); $this->t->set_var('name',$name); $this->t->set_var('interviewer', $this->db->f('interviewer')); $this->t->set_var('elder',$this->db->f('elder')); $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')); + $this->t->set_var('interview_type',$this->db->f('interview_type')); + if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); } } if($action == 'edit') @@ -2506,8 +2633,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 PPI'); - $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&ppi=' - . $ppi . '&action=' . 'save')); + $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&interview=' + . $interview . '&action=' . 'save')); } if($action == 'view') @@ -2518,8 +2645,8 @@ class eq $this->t->set_var('disabled','DISABLED'); $this->t->set_var('lang_done','Done'); $this->t->set_var('lang_action','Viewing PPI'); - $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&ppi=' - . $ppi . '&action=' . 'edit')); + $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&interview=' + . $interview . '&action=' . 'edit')); } $this->t->set_var('lang_reset','Clear Form'); @@ -2565,7 +2692,7 @@ class eq 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_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()) @@ -2576,7 +2703,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()) @@ -2592,7 +2719,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()) { @@ -2607,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']; - + $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'); @@ -2625,7 +2750,7 @@ class eq for($m=$num_months; $m >= 0; $m--) { $ints[$m] = 0; } for ($j=0; $j < count($unique_companionships); $j++) { // Select all the companions in each companionship - $sql = "SELECT * FROM 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; @@ -2667,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 3rd_interview 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"; @@ -2700,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); @@ -2718,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(); @@ -2745,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')); @@ -2755,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 = get_var('notes',array('POST')); - $this->db->query("UPDATE eq_interview set " . + $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; @@ -2793,9 +2925,9 @@ class eq if($action == 'insert') { $notes = get_var('notes',array('POST')); - $this->db->query("INSERT INTO eq_interview (interviewer,elder,aaronic,date,notes) " + $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; } @@ -2818,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); @@ -2828,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') @@ -2892,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(); @@ -2909,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(); @@ -2937,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(); @@ -2991,7 +3124,7 @@ class eq if($action == 'save') { $notes = get_var('notes',array('POST')); - $this->db->query("UPDATE eq_visit set " . + $this->db->query("UPDATE 3rd_visit set " . " date='" . $date . "'" . ", notes='" . $notes . "'" . " WHERE visit=" . $visit,__LINE__,__FILE__); @@ -3002,7 +3135,7 @@ class eq if($action == 'insert') { $notes = get_var('notes',array('POST')); - $this->db->query("INSERT INTO eq_visit (family,companionship,date,notes) " + $this->db->query("INSERT INTO 3rd_visit (family,companionship,date,notes) " . "VALUES ('" . $family . "','" . $companionship . "','" . $date . "','" . $notes . "')",__LINE__,__FILE__); $this->vis_view(); @@ -3025,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); @@ -3098,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()) @@ -3114,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); @@ -3128,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; } @@ -3186,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()) { @@ -3270,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) @@ -3282,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__); } @@ -3290,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()) @@ -3369,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']; @@ -3400,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()) @@ -3436,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()) @@ -3464,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()) @@ -3517,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')); @@ -3534,42 +3699,74 @@ 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 < $this->max_appointments) { //Only perform a database update if we have made a change to this appointment - $sql = "SELECT * FROM eq_appointment where " . + $sql = "SELECT * FROM 3rd_appointment where " . "appointment='$appointment'" . " and presidency='$presidency'" . " and elder='$elder'" . " and family='$family'" . " and date='$date'" . - " and time='$time'"; + " 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 eq_appointment set" . + $this->db2->query("UPDATE 3rd_appointment set" . " family=" . $family . " ,elder=" . $elder . " ,date='" . $date . "'" . " ,time='" . $time . "'" . + " ,location='" . $location . "'" . " ,presidency='" . $presidency . "'" . " WHERE appointment=" . $appointment,__LINE__,__FILE__); @@ -3582,19 +3779,20 @@ class eq else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != "")) { //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,uid) " - . "VALUES (NULL,'" . $presidency . "','" . $family . "','" - . $elder . "','" . $date . "','" . $time . "','" . $uid ."')",__LINE__,__FILE__); + $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 eq_appointment where " . + $sql = "SELECT * FROM 3rd_appointment where " . "elder='$elder'" . " and family='$family'" . " and presidency='$presidency'" . " and date='$date'" . " and time='$time'" . - " and uid='$uid'"; + " and uid='$uid'" . + " and location='$location'"; $this->db3->query($sql,__LINE__,__FILE__); if($this->db3->next_record()) { // Email the appointment if warranted @@ -3607,21 +3805,10 @@ class eq } $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()) @@ -3632,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']; @@ -3652,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 @@ -3661,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); @@ -3684,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]; @@ -3716,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]; @@ -3725,6 +3909,10 @@ class eq $table_data.= ''; } $table_data.=''; + + // Location text box + $table_data.= ''; $table_data.= ''; $table_data.= ''; @@ -3746,29 +3934,11 @@ class eq // Time selection $table_data.= ""; - $table_data.= ''; - $table_data.= ' : '; - $table_data.= ''; - $table_data.= ''; + $table_data .= $this->get_time_selection_form(0, 0, 0, $presidency, $appointment); $table_data.= ""; // Elder drop down list - $table_data.= ''; $table_data.= ''; for ($j=0; $j < count($elder_id); $j++) { $id = $elder_id[$j]; @@ -3778,7 +3948,7 @@ class eq $table_data.=''; // Family drop down list - $table_data.= ''; $table_data.= ''; for ($j=0; $j < count($elder_id); $j++) { $id = $family_id[$j]; @@ -3786,6 +3956,10 @@ class eq $table_data.= ''; } $table_data.=''; + + // Location text box + $table_data.= ''; $table_data.= ''; $table_data.= ''; @@ -3804,7 +3978,39 @@ 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')); @@ -3820,7 +4026,7 @@ class eq $this->t->pfp('out','admin_t'); - $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()) @@ -3844,6 +4050,12 @@ class eq 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; @@ -3884,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; } @@ -3967,7 +4178,7 @@ class eq if(($elder > 0) || ($name != "")) { if($id < $this->max_presidency_members) { //print "Updating Existing Entry
"; - $this->db2->query("UPDATE eq_presidency set" . + $this->db2->query("UPDATE 3rd_presidency set" . " elder=" . $elder . " ,district=" . $district . " ,name='" . $name . "'" . @@ -3980,7 +4191,7 @@ class eq } else { //print "Adding New Entry
"; - $this->db2->query("INSERT INTO eq_presidency (presidency,elder,district,name," + $this->db2->query("INSERT INTO 3rd_presidency (presidency,elder,district,name," . "email,president,counselor,secretary,eqpres,valid) " . "VALUES (NULL,'" . $elder . "','" . $district . "','" . $name . "','" . $email . "','" . $president . "','" @@ -3992,25 +4203,25 @@ class eq } } - // Now update the eq_district table appropriately + // Now update the 3rd_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__); + $this->db->query("DELETE from 3rd_district where valid=1",__LINE__,__FILE__); + $this->db->query("DELETE from 3rd_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) " + $this->db2->query("INSERT INTO 3rd_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"; + // Requery the 3rd_presidency table + $sql = "SELECT * FROM 3rd_presidency where valid=1"; $this->db->query($sql,__LINE__,__FILE__); while ($this->db->next_record()) { @@ -4024,7 +4235,7 @@ class eq // 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) " + $this->db2->query("INSERT INTO 3rd_district (district,name,supervisor,valid) " . "VALUES ('" . $district . "','" . $name . "','" . $elder . "','" . $valid . "'" .")",__LINE__,__FILE__); @@ -4043,7 +4254,7 @@ class eq // Now save off the data needed for an EQ Presidency Table Update - $sql = "SELECT * FROM eq_presidency where valid=1"; + $sql = "SELECT * FROM 3rd_presidency where valid=1"; $this->db->query($sql,__LINE__,__FILE__); $table_data = ""; $header_row = "ElderEmailDistrictPresidentCounselorSecretaryEQ Presidency"; @@ -4182,13 +4393,14 @@ class eq { //print "Emailing notification of appointment: $appointment
"; - $sql = "SELECT * FROM eq_appointment where appointment='$appointment'"; + $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment'"; $this->db->query($sql,__LINE__,__FILE__); while ($this->db->next_record()) { $appointment = $this->db->f('appointment'); $presidency = $this->db->f('presidency'); + $location = $this->db->f('location'); $interviewer = ""; $email = ""; $elder = $this->db->f('elder'); @@ -4197,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 @@ -4211,53 +4422,49 @@ 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)); + $dtstartstr = date("l, F d, o g:i A", 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'] . ">"; - - $sql = "SELECT * FROM eq_presidency where presidency='$presidency'"; + $sql = "SELECT * FROM 3rd_presidency where presidency='$presidency'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $email = $this->db2->f('email'); $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'"; + $sql = "SELECT * FROM 3rd_elder where elder='$elder'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $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; } } if($family > 0) { - $sql = "SELECT * FROM eq_family where family='$family'"; + $sql = "SELECT * FROM 3rd_family where family='$family'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $family_name = $this->db2->f('name'); $phone = $this->db2->f('phone'); $elder_id = $this->db2->f('elder_id'); $appt_name = $family_name . " Family Visit"; - $sql = "SELECT * FROM eq_elder where elder='$elder_id'"; + $sql = "SELECT * FROM 3rd_elder where elder='$elder_id'"; $this->db3->query($sql,__LINE__,__FILE__); 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 != "")) { @@ -4267,13 +4474,13 @@ class eq $uid = rand() . rand(); // Generate a random identifier for this appointment $subject = "Created: $appt_name"; - $this->db->query("UPDATE eq_appointment set" . + $this->db->query("UPDATE 3rd_appointment set" . " uid=" . $uid . " WHERE appointment=" . $appointment,__LINE__,__FILE__); $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 @@ -4281,13 +4488,13 @@ class eq print "Sent deleted appointment to " . $interviewer . " at " . $email . " for " . $appt_date . " " . $appt_time . "
"; $subject = "Canceled: $appt_date $appt_time"; - $this->db->query("UPDATE eq_appointment set" . + $this->db->query("UPDATE 3rd_appointment set" . " uid=0" . " WHERE appointment=" . $appointment,__LINE__,__FILE__); $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 @@ -4296,17 +4503,17 @@ 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" . + $this->db->query("UPDATE 3rd_appointment set" . " uid=" . $uid . " WHERE appointment=" . $appointment,__LINE__,__FILE__); $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); } } @@ -4314,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"; @@ -4342,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; + } } ?>