X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;ds=inline;f=inc%2Fclass.eq.inc.php;h=05547b1393767651a89a5570cf64419b91fd40a9;hb=5b62f4c79ef2986d105798d2f74dcffb557bb88f;hp=acd33b51b5bc68d70f937f5aba4ca0473eeffe0c;hpb=0aecbb28d5f57d35e39df632866c578310f96958;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index acd33b5..05547b1 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -8,7 +8,7 @@
* Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. *
\**************************************************************************/
- /* $Id: class.eq.inc.php,v 1.1.1.1 2001/05/20 07:40:32 seek3r Exp $ */
+ /* $Id: class.eq.inc.php,v 1.1.1.1 2005/07/20 07:40:32 ajp Exp $ */
class eq
{
@@ -26,10 +26,13 @@ class eq
var $default_int_num_years;
var $default_vis_num_years;
var $default_att_num_quarters;
+ var $max_num_districts;
var $current_year;
var $current_month;
var $upload_target_path;
var $script_path;
+ var $max_appointments;
+ var $max_presidency_members;
var $public_functions = array
(
@@ -55,11 +58,18 @@ class eq
'schedule' => True,
'admin' => True,
'email_appt' => True,
- 'send_ical_appt' => True
+ 'willing_view' => True,
+ 'willing_update' => True,
+ 'send_ical_appt' => True,
+ 'assign_view' => True,
+ 'assign_update' => 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;
@@ -67,8 +77,10 @@ class eq
$this->default_int_num_years = 0;
$this->default_att_num_quarters = 1;
$this->default_vis_num_years = 1;
- $this->upload_target_path = "/home/users/eqpres/eq_data/";
- $this->script_path = "/usr/share/phpgroupware/eq/";
+ $this->max_num_districts = 4;
+ $this->max_presidency_members = 99;
+ $this->max_appointments = 32768;
+ // END LOCAL CONFIGURATION
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
@@ -79,13 +91,13 @@ class eq
$this->grants = $GLOBALS['phpgw']->acl->get_grants('eq');
$this->grants[$this->account] = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
- $this->jscal = CreateObject('phpgwapi.jscalendar'); // before phpgw_header() !!!
+ $this->jscal = CreateObject('eq.jscalendar'); // before phpgw_header() !!!
$this->cal_options = 'daFormat : "%Y-%m-%d",
ifFormat : "%Y-%m-%d",
mondayFirst : false,
weekNumbers : false';
- $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools';
+ $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools - The 3rd Counselor';
$GLOBALS['phpgw']->common->phpgw_header();
$this->current_day = `date '+%d'`;
@@ -125,6 +137,12 @@ class eq
$link_data['menuaction'] = 'eq.eq.act_list';
$this->t->set_var('link_activity',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_activity','Activities');
+ $link_data['menuaction'] = 'eq.eq.willing_view';
+ $this->t->set_var('link_willing',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+ $this->t->set_var('lang_willing','Willingness');
+ $link_data['menuaction'] = 'eq.eq.assign_view';
+ $this->t->set_var('link_assignment',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+ $this->t->set_var('lang_assignment','Assignments');
$link_data['menuaction'] = 'eq.eq.par_view';
$this->t->set_var('link_participation',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_participation','Participation');
@@ -301,10 +319,10 @@ class eq
if($this->db2->next_record()) {
if($this->db2->f('visited') == 'y') {
$visits[$m]++; $total_visits[$m]++;
- $table_data .= '
';
+ $table_data .= ' ';
}
else if($this->db2->f('visited') == 'n') {
- $table_data .= ' ';
+ $table_data .= ' ';
}
else {
$visits[$m]++; $total_visits[$m]++;
@@ -569,8 +587,9 @@ class eq
$this->t->set_file(array('act_list_t' => 'act_list.tpl'));
$this->t->set_block('act_list_t','act_list','list');
- $this->t->set_var('lang_name','Activity Name');
+ $this->t->set_var('lang_name','Assignment');
$this->t->set_var('lang_date','Date');
+ $this->t->set_var('lang_notes','Description');
$sql = "SELECT * FROM eq_activity ORDER BY date DESC";
$this->db->query($sql,__LINE__,__FILE__);
@@ -579,9 +598,18 @@ class eq
$i = 0;
while ($this->db->next_record())
{
- $activity_list[$i]['name'] = $this->db->f('name');
- $activity_list[$i]['date'] = $this->db->f('date');
$activity_list[$i]['activity'] = $this->db->f('activity');
+ $activity_list[$i]['assignment'] = $this->db->f('assignment');
+ $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'] . "'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record())
+ {
+ $activity_list[$i]['name'] = $this->db2->f('name');
+ $activity_list[$i]['code'] = $this->db2->f('code');
+ }
$i++;
}
@@ -590,6 +618,9 @@ class eq
$this->nextmatchs->template_alternate_row_color(&$this->t);
$this->t->set_var('name',$activity_list[$i]['name']);
$this->t->set_var('date',$activity_list[$i]['date']);
+ $activity_notes = $activity_list[$i]['notes'];
+ if(strlen($activity_notes) > 40) { $activity_notes = substr($activity_notes,0,40) . "..."; }
+ $this->t->set_var('notes',$activity_notes);
$link_data['menuaction'] = 'eq.eq.act_view';
$link_data['activity'] = $activity_list[$i]['activity'];
@@ -624,13 +655,20 @@ class eq
$sql = "SELECT * FROM eq_activity WHERE activity=" . intval(get_var('activity',array('GET','POST')));
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
- $this->t->set_var('name', $this->db->f('name'));
+ $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'));
-
- $this->t->set_var('lang_name','Activity Name');
+
+ $sql = "SELECT * FROM eq_assignment WHERE assignment='" . $this->db->f('assignment') . "'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record())
+ {
+ $this->t->set_var('name', $this->db2->f('name'));
+ $this->t->set_var('code', $this->db2->f('code'));
+ }
+ $this->t->set_var('lang_name','Assignment');
$this->t->set_var('lang_date','Date');
- $this->t->set_var('lang_notes','Notes');
+ $this->t->set_var('lang_notes','Description');
$this->t->set_var('lang_done','Done');
$this->t->set_var('lang_action','View');
@@ -645,7 +683,7 @@ class eq
$this->t->set_var('edit',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_edit','Edit');
$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')));
$this->db->query($sql,__LINE__,__FILE__);
@@ -691,14 +729,14 @@ class eq
$action = get_var('action',array('GET','POST'));
$this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.act_list'));
$activity['activity'] = intval(get_var('activity',array('GET','POST')));
-
+
if($action == 'save')
{
- $activity['name'] = $this->db->db_addslashes(get_var('name',array('POST')));
- $activity['date'] = $this->db->db_addslashes(get_var('date',array('POST')));
- $activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST')));
+ $activity['assignment'] = get_var('assignment',array('POST'));
+ $activity['date'] = get_var('date',array('POST'));
+ $activity['notes']= get_var('notes',array('POST'));
$this->db->query("UPDATE eq_activity set " .
- " name='" . $activity['name'] .
+ " assignment='" . $activity['assignment'] .
"', date='" . $activity['date'] . "'" .
", notes='" . $activity['notes'] . "'" .
" WHERE activity=" . $activity['activity'],__LINE__,__FILE__);
@@ -720,12 +758,28 @@ class eq
if($action == 'insert')
{
- $activity['name'] = $this->db->db_addslashes(get_var('name',array('POST')));
- $activity['date'] = $this->db->db_addslashes(get_var('date',array('POST')));
- $activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST')));
- $this->db->query("INSERT INTO eq_activity (name,date,notes) "
- . "VALUES ('" . $activity['name'] . "','"
+ $activity['assignment'] = get_var('assignment',array('POST'));
+ $activity['date'] = get_var('date',array('POST'));
+ $activity['notes']= get_var('notes',array('POST'));
+ $this->db->query("INSERT INTO eq_activity (assignment,date,notes) "
+ . "VALUES ('" . $activity['assignment'] . "','"
. $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__);
+
+ $sql = "SELECT * FROM eq_activity WHERE assignment='".$activity['assignment']."' "
+ . " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ if($this->db->next_record()) {
+ //print "activity: " . $this->db->f('activity') . " ";
+ $activity['activity'] = $this->db->f('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__);
+ }
+
$this->act_list();
return false;
}
@@ -734,7 +788,7 @@ class eq
{
$activity['activity'] = 0;
$this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options));
- $this->t->set_var('name','');
+ $this->t->set_var('assignment','');
$this->t->set_var('date','');
$this->t->set_var('notes','');
$this->t->set_var('lang_done','Cancel');
@@ -749,7 +803,8 @@ class eq
$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));
- $this->t->set_var('name', $this->db->f('name'));
+ $this->t->set_var('assignment', $this->db->f('assignment'));
+ $assignment = $this->db->f('assignment');
$this->t->set_var('date', $this->db->f('date'));
$this->t->set_var('notes', $this->db->f('notes'));
$this->t->set_var('lang_done','Cancel');
@@ -759,6 +814,30 @@ class eq
}
+ // Create the assignments drop-down list
+ $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $assignments[$i]['assignment'] = $this->db->f('assignment');
+ $assignments[$i]['name'] = $this->db->f('name');
+ $assignments[$i]['code'] = $this->db->f('code');
+ $i++;
+ }
+
+ $assignment_data.= '';
+ $assignment_data.= ' ';
+ for ($j=0; $j < count($assignments); $j++) {
+ $id = $assignments[$j]['assignment'];
+ $name = $assignments[$j]['name'];
+ if($assignments[$j]['assignment'] == $assignment) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
+ $assignment_data.= ''.$name.' ';
+ }
+ $assignment_data.=' ';
+ $this->t->set_var('assignment_data',$assignment_data);
+
+ // Create elder selection boxes
$sql = "SELECT * FROM eq_elder";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
@@ -805,6 +884,125 @@ class eq
$this->save_sessiondata();
}
+ function assign_view()
+ {
+ $this->t->set_file(array('assign_view_t' => 'assign_view.tpl'));
+ $this->t->set_block('assign_view_t','assign_view','list');
+
+ $this->t->set_var('lang_name','Assignment Name');
+ $this->t->set_var('lang_code','Code');
+
+ $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $total_records = $this->db->num_rows();
+
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $assignment_list[$i]['assignment'] = $this->db->f('assignment');
+ $assignment_list[$i]['name'] = $this->db->f('name');
+ $assignment_list[$i]['code'] = $this->db->f('code');
+ $i++;
+ }
+
+ for ($i=0; $i < count($assignment_list); $i++)
+ {
+ $this->nextmatchs->template_alternate_row_color(&$this->t);
+ $this->t->set_var('name',$assignment_list[$i]['name']);
+ $this->t->set_var('code',$assignment_list[$i]['code']);
+
+ $link_data['menuaction'] = 'eq.eq.assign_update';
+ $link_data['assignment'] = $assignment_list[$i]['assignment'];
+ $link_data['action'] = 'edit';
+ $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.assign_update';
+ $link_data['assignment'] = '0';
+ $link_data['action'] = 'add';
+ $this->t->set_var('add','');
+
+ $this->t->fp('list','assign_view',True);
+ }
+
+ $this->t->pfp('out','assign_view_t');
+ $this->save_sessiondata();
+ }
+
+ function assign_update()
+ {
+ $this->t->set_file(array('form' => 'assign_update.tpl'));
+ $this->t->set_block('form','add','addhandle');
+ $this->t->set_block('form','edit','edithandle');
+ $this->t->set_var('lang_done','Done');
+
+ $action = get_var('action',array('GET','POST'));
+ $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.assign_view'));
+ $assignment['assignment'] = intval(get_var('assignment',array('GET','POST')));
+
+ if($action == 'save')
+ {
+ $assignment['name'] = get_var('name',array('POST'));
+ $assignment['code'] = get_var('code',array('POST'));
+ $this->db->query("UPDATE eq_assignment set " .
+ " name='" . $assignment['name'] . "'" .
+ ", code='" . $assignment['code'] . "'" .
+ " WHERE assignment=" . $assignment['assignment'],__LINE__,__FILE__);
+
+ $this->assign_view();
+ return false;
+ }
+
+ if($action == 'insert')
+ {
+ $assignment['name'] = get_var('name',array('POST'));
+ $assignment['code'] = get_var('code',array('POST'));
+ $this->db->query("INSERT INTO eq_assignment (name,code) "
+ . "VALUES ('" . $assignment['name'] . "','"
+ . $assignment['code'] . "')",__LINE__,__FILE__);
+ $this->assign_view();
+ return false;
+ }
+
+ if($action == 'add')
+ {
+ $assignment['assignment'] = 0;
+ $this->t->set_var('name','');
+ $this->t->set_var('code','');
+ $this->t->set_var('lang_done','Cancel');
+ $this->t->set_var('lang_action','Adding New Assignment');
+ $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.assign_update&assignment='
+ . $assignment['assignment'] . '&action=' . 'insert'));
+ }
+
+ if($action == 'edit')
+ {
+ $sql = "SELECT * FROM eq_assignment WHERE assignment=" . $assignment['assignment'];
+ $this->db->query($sql,__LINE__,__FILE__);
+ $this->db->next_record();
+ $this->t->set_var('name', $this->db->f('name'));
+ $this->t->set_var('code', $this->db->f('code'));
+ $this->t->set_var('lang_done','Cancel');
+ $this->t->set_var('lang_action','Editing Assignment');
+ $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.assign_update&assignment='
+ . $assignment['assignment'] . '&action=' . 'save'));
+
+ }
+
+ $this->t->set_var('lang_reset','Clear Form');
+ $this->t->set_var('lang_add','Add Assignment');
+ $this->t->set_var('lang_save','Save Changes');
+ $this->t->set_var('edithandle','');
+ $this->t->set_var('addhandle','');
+
+ $this->t->pfp('out','form');
+ if($action == 'edit') { $this->t->pfp('addhandle','edit'); }
+ if($action == 'add') { $this->t->pfp('addhandle','add'); }
+
+ $this->save_sessiondata();
+ }
+
function par_view()
{
$this->t->set_file(array('par_view_t' => 'par_view.tpl'));
@@ -829,38 +1027,63 @@ class eq
$i = 0;
while ($this->db->next_record())
{
- $activity_list[$i]['name'] = $this->db->f('name');
+ $activity_list[$i]['assignment'] = $this->db->f('assignment');
$activity_list[$i]['date'] = $this->db->f('date');
$activity_list[$i]['activity'] = $this->db->f('activity');
- if($activity_list[$i]['date'] == '0000-00-00') { $activity_list[$i]['date']=""; }
$i++;
}
- $elder_width=250; $part_width=25; $act_width=50;
+ $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ while($this->db->next_record())
+ {
+ $assignment_list[$i]['assignment'] = $this->db->f('assignment');
+ $assignment_list[$i]['name'] = $this->db->f('name');
+ $assignment_list[$i]['code'] = $this->db->f('code');
+ $i++;
+ }
+
+ $elder_width=300; $part_width=25; $assignment_width=50;
$total_width=$elder_width+$part_width;
- for ($i=0; $i < count($activity_list); $i++) {
- $this->t->set_var('activity_name',$activity_list[$i]['name']);
- $this->t->set_var('activity_date',$activity_list[$i]['date']);
+ for ($i=0; $i < count($assignment_list); $i++) {
+ $this->t->set_var('assignment_name',$assignment_list[$i]['name']);
+ $this->t->set_var('assignment_code',$assignment_list[$i]['code']);
$this->t->fp('list1','header_list',True);
- $total_width += $act_width;
+ $total_width += $assignment_width;
}
for ($i=0; $i < count($elder_id); $i++) {
$participated=0; $part_table = '';
$this->nextmatchs->template_alternate_row_color(&$this->t);
$this->t->set_var('elder_name',$elder_name[$i]);
- for ($j=0; $j < count($activity_list); $j++) {
- $sql = "SELECT * FROM eq_participation where activity="
- . $activity_list[$j]['activity'] . " AND elder=" . $elder_id[$i];
- $this->db->query($sql,__LINE__,__FILE__);
- if($this->db->next_record()) {
- $part_table .= ' ';
- $participated++;
+ for ($j=0; $j < count($assignment_list); $j++) {
+ $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 "
+ . " activity=" . $activity_list[$k]['activity']
+ . " AND elder=" . $elder_id[$i];
+ $this->db->query($sql,__LINE__,__FILE__);
+ while($this->db->next_record()) {
+ if($activity_list[$k]['date'] > $date) {
+ $date = $activity_list[$k]['date'];
+ }
+ $checkmark=1;
+ $num_matches++;
+ $participated++;
+ }
+ }
+ }
+ if($checkmark) {
+ $part_table .= ' ';
+ $part_table .= ''.$num_matches.' ';
+ $part_table .= ''.$date.' ';
} else {
$part_table .= ' ';
}
}
- if($participated) { $part_table .= ' '.$participated.' '; }
+ if($participated) { $part_table .= ' '.$participated.' '; }
else { $part_table .= ' '; }
$this->t->set_var('part_table',$part_table);
$this->t->fp('list2','elder_list',True);
@@ -872,9 +1095,268 @@ class eq
$this->t->pfp('out','par_view_t');
$this->save_sessiondata();
}
-
- function ppi_sched()
+
+ function willing_view()
+ {
+ $this->t->set_file(array('willing_view_t' => 'willing_view.tpl'));
+ $this->t->set_block('willing_view_t','header_list','list1');
+ $this->t->set_block('willing_view_t','elder_list','list2');
+
+ $this->t->set_var('lang_filter','Filter');
+ $this->t->set_var('lang_filter_unwilling','Filter out unwilling Elders:');
+
+ $filter_unwilling = get_var('filter_unwilling',array('POST'));
+ $this->t->set_var('filter_unwilling',$filter_unwilling);
+
+ if($filter_unwilling == 'y' || $filter_unwilling == '') {
+ $filter_input = " Y";
+ $filter_input.= " N";
+ $filter_input.= " ";
+ } else {
+ $filter_input = " Y";
+ $filter_input.= " N";
+ $filter_input.= " ";
+ }
+ $this->t->set_var('filter_input',$filter_input);
+
+ $sql = "SELECT * FROM eq_elder where valid=1";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ while ($this->db->next_record())
+ {
+ $elder_name[$i] = $this->db->f('name');
+ $elder_id[$i] = $this->db->f('elder');
+ $elder_phone[$elder_id[$i]] = $this->db->f('phone');
+ $i++;
+ }
+ array_multisort($elder_name, $elder_id);
+
+ $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ while($this->db->next_record())
+ {
+ $assignment_list[$i]['assignment'] = $this->db->f('assignment');
+ $assignment_list[$i]['name'] = $this->db->f('name');
+ $assignment_list[$i]['code'] = $this->db->f('code');
+ $i++;
+ }
+
+ $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $total_records = $this->db->num_rows();
+
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $activity_list[$i]['assignment'] = $this->db->f('assignment');
+ $activity_list[$i]['date'] = $this->db->f('date');
+ $activity_list[$i]['activity'] = $this->db->f('activity');
+ $i++;
+ }
+
+ $elder_width=275; $willing_width=40; $assignment_width=50;
+ $total_width=$elder_width+$willing_width;
+
+ for ($i=0; $i < count($assignment_list); $i++) {
+ $this->t->set_var('assignment_name',$assignment_list[$i]['name']);
+ $this->t->set_var('assignment_code',$assignment_list[$i]['code']);
+ $this->t->fp('list1','header_list',True);
+ $total_width += $assignment_width;
+ $total_willing[$i] = 0;
+ }
+
+ for ($i=0; $i < count($elder_id); $i++) {
+ $willing_table = ''; $elder_willing=0;
+ $this->t->set_var('elder_name',$elder_name[$i]);
+ $this->t->set_var('elder_phone',$elder_phone[$elder_id[$i]]);
+ $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&elder_id='
+ . $elder_id[$i] . '&action=' . 'edit'));
+ for ($j=0; $j < count($assignment_list); $j++) {
+ $found_willingness=0;
+ $sql = "SELECT * FROM eq_willingness where "
+ . " assignment=" . $assignment_list[$j]['assignment']
+ . " AND elder=" . $elder_id[$i];
+ $this->db->query($sql,__LINE__,__FILE__);
+ while($this->db->next_record()) {
+ $found_willingness=1;
+ $date_part="";
+ $sql = "SELECT * FROM eq_activity where "
+ . " assignment=". $assignment_list[$j]['assignment']
+ . " ORDER by date DESC";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $activity = $this->db2->f('activity');
+ $date = $this->db2->f('date');
+ $sql = "SELECT * FROM eq_participation where "
+ . " activity=" . $activity
+ . " AND elder=". $elder_id[$i];
+ $this->db3->query($sql,__LINE__,__FILE__);
+ if($this->db3->next_record()) {
+ $date_part = $date;
+ }
+ }
+
+ if($this->db->f('willing') == 'y') {
+ $total_willing[$j]++;
+ $elder_willing=1;
+ $willing_table .= ''.$date_part.' ';
+ }
+ else if($this->db->f('willing') == 'n') {
+ $willing_table .= ' ';
+ }
+ else {
+ $elder_willing=1;
+ $willing_table .= " ";
+ }
+ }
+ if(!$found_willingness) {
+ $elder_willing=1;
+ $willing_table .= " ";
+ }
+ }
+ if(($elder_willing == 1) || ($filter_unwilling == 'n')) {
+ $this->t->set_var('willing_table',$willing_table);
+ $this->t->fp('list2','elder_list',True);
+ $this->nextmatchs->template_alternate_row_color(&$this->t);
+ }
+ }
+
+ $stat_table = 'Total Willing to Serve ';
+ for ($j=0; $j < count($assignment_list); $j++) {
+ $stat_table .= "".$total_willing[$j]." ";
+ }
+ $this->t->set_var('stat_table',$stat_table);
+
+ $this->t->set_var('total_width',$total_width);
+ $this->t->set_var('elder_width',$elder_width);
+ $this->t->set_var('willing_width',$willing_width);
+ $this->t->pfp('out','willing_view_t');
+ $this->save_sessiondata();
+ }
+
+ function willing_update()
{
+ //print "Willingness Update Under Constrcution ";
+ //$this->willing_view();
+ //return false;
+
+ $this->t->set_file(array('willing_update_t' => 'willing_update.tpl'));
+ $this->t->set_block('willing_update_t','assignment_list','list');
+ $this->t->set_block('willing_update_t','save','savehandle');
+
+ $elder_id = get_var('elder_id',array('GET','POST'));
+ $this->t->set_var('elder_id',$elder_id);
+ $action = get_var('action',array('GET','POST'));
+
+ $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_view'));
+ $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&action=save'));
+ $this->t->set_var('lang_done','Cancel');
+ $this->t->set_var('title','Willingness Update ');
+
+ 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__);
+
+ // Now, add the assignment willingness that is checked for this elder
+ $new_data = get_var('willingness',array('POST'));
+ foreach ($new_data as $data)
+ {
+ $data_array = explode("/",$data);
+ $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) "
+ . "VALUES (" . $elder_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
+ }
+ $this->willing_view();
+ return false;
+ }
+
+ $assignment_width=300; $willing_width=25; $table_width=$assignment_width + $willing_width;
+ $table_data="";
+
+ // Find out the elder's name
+ $sql = "SELECT * FROM eq_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');
+ $this->t->set_var('elder_name',$elder_name);
+ }
+
+ // Select all the assignments
+ $sql = "SELECT * FROM eq_assignment ORDER by name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ while ($this->db->next_record())
+ {
+ $assignment = $this->db->f('assignment');
+ $assignment_name = $this->db->f('name');
+ $assignment_code = $this->db->f('code');
+
+ $this->nextmatchs->template_alternate_row_color(&$this->t);
+ $table_data.="$assignment_name ";
+
+ $header_row="Assignments Willingness ";
+ $sql = "SELECT * FROM eq_willingness WHERE elder=".$elder_id." AND assignment=".$assignment;
+ $this->db2->query($sql,__LINE__,__FILE__);
+ $value = $assignment;
+
+ if($this->db2->next_record()) {
+ if($this->db2->f('willing') == 'y') {
+ $table_data .= '';
+ $table_data .= ' Y';
+ $table_data .= ' N';
+ $table_data .= ' ';
+ $table_data .= ' ';
+ } else if($this->db2->f('willing') == 'n') {
+ $table_data .= '';
+ $table_data .= ' Y';
+ $table_data .= ' N';
+ $table_data .= ' ';
+ $table_data .= ' ';
+ } else {
+ $table_data .= '';
+ $table_data .= ' Y';
+ $table_data .= ' N';
+ $table_data .= ' ';
+ $table_data .= ' ';
+ }
+ }
+ else {
+ $table_data .= '';
+ $table_data .= ' Y';
+ $table_data .= ' N';
+ $table_data .= ' ';
+ $table_data .= ' ';
+ }
+
+ $table_data .= "\n";
+ $table_data .= " ";
+ $table_data .= " ";
+ }
+
+ $table_data .= " ";
+
+ $this->t->set_var('table_width',$table_width);
+ $this->t->set_var('header_row',$header_row);
+ $this->t->set_var('table_data',$table_data);
+ $this->t->fp('list','assignment_list',True);
+
+ $this->t->set_var('lang_reset','Clear Form');
+ $this->t->set_var('lang_save','Save Changes');
+ $this->t->set_var('savehandle','');
+
+ $this->t->pfp('out','willing_update_t');
+ $this->t->pfp('addhandle','save');
+
+ $this->save_sessiondata();
+ }
+
+
+ function ppi_sched()
+ {
$this->t->set_file(array('ppi_sched_t' => 'ppi_sched.tpl'));
$this->t->set_block('ppi_sched_t','elder_list','elderlist');
$this->t->set_block('ppi_sched_t','appt_list','apptlist');
@@ -907,22 +1389,28 @@ class eq
{
// Save any changes made to the appointment table
$new_data = get_var('appt_notes',array('POST'));
- foreach ($new_data as $entry)
- {
- $elder = $entry['elder'];
- $appointment = $entry['appointment'];
-
- //print "elder: $elder appointment: $appointment ";
-
- // Perform database save actions here
- $this->db->query("UPDATE eq_appointment set " .
- " elder='" . $elder . "'" .
- " WHERE appointment=" . $appointment,__LINE__,__FILE__);
-
- // Email the appointment
- $this->email_appt($appointment);
-
- }
+ if($new_data != "") {
+ foreach ($new_data as $entry)
+ {
+ $elder = $entry['elder'];
+ $appointment = $entry['appointment'];
+
+ //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);
+ }
+
+ }
+ }
// Save any changes made to the ppi notes table
$new_data = get_var('ppi_notes',array('POST'));
@@ -941,7 +1429,7 @@ 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
@@ -951,6 +1439,7 @@ class eq
$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 {
@@ -1073,6 +1562,7 @@ class eq
$link_data['ppi'] = '';
$link_data['eqpresppi'] = 1;
$link_data['action'] = 'add';
+ $link_data['interviewer'] = $interviewer;
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
$this->t->set_var('tr_color',$tr_color);
@@ -1196,21 +1686,27 @@ class eq
{
// Save any changes made to the appointment table
$new_data = get_var('appt_notes',array('POST'));
- foreach ($new_data as $entry)
- {
- $elder = $entry['elder'];
- $appointment = $entry['appointment'];
-
- //print "elder: $elder appointment: $appointment ";
-
- // Perform database save actions here
- $this->db->query("UPDATE eq_appointment set " .
- " elder='" . $elder . "'" .
- " WHERE appointment=" . $appointment,__LINE__,__FILE__);
-
- // Email the appointment
- $this->email_appt($appointment);
- }
+ if($new_data != "") {
+ foreach ($new_data as $entry)
+ {
+ $elder = $entry['elder'];
+ $appointment = $entry['appointment'];
+
+ //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);
+ }
+ }
+ }
// Save any changes made to the int notes table
$new_data = get_var('int_notes',array('POST'));
@@ -1221,6 +1717,7 @@ class eq
$elder_name = $entry['elder_name'];
$int_pri = $entry['pri'];
$aaronic = $entry['aaronic'];
+ //print "int_notes: $int_notes elder_name: $elder_name aaronic: $aaronic ";
if($aaronic == 0) {
// Perform database save actions here
$this->db->query("UPDATE eq_elder set " .
@@ -1232,7 +1729,7 @@ class eq
}
$take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_sched');
- Header('Location: ' . $take_me_to_url);
+ //Header('Location: ' . $take_me_to_url);
}
// Get the Districts
@@ -1420,24 +1917,29 @@ class eq
$link_data['name'] = $name;
$link_data['interview'] = '';
$link_data['action'] = 'add';
+ $link_data['interviewer'] = $districts[$d]['supervisor'];
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
$table_data.= "$name ";
$table_data.= "$phone ";
$table_data.= "";
- $table_data.= '';
- foreach(range(0,6) as $num) {
- if($num == 0) { $num = 1; } else {$num = $num*5; }
- if($int_pri == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
- $table_data.= ''.$num.' ';
+ if($aaronic == 0) {
+ $table_data.= '';
+ foreach(range(0,6) as $num) {
+ if($num == 0) { $num = 1; } else {$num = $num*5; }
+ if($int_pri == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
+ $table_data.= ''.$num.' ';
+ }
+ $table_data.= ' ';
}
- $table_data.= '';
$table_data.= "$date ";
- $table_data.= ' ';
+ if($aaronic == 0) {
+ $table_data.= ' ';
+ }
$table_data.= ' ';
$table_data.= ' ';
$table_data.= ' ';
$table_data.= ' ';
- $table_data.= ' ';
+ $table_data.= ''."\n";
$i++;
} else {
$link_data['menuaction'] = 'eq.eq.int_update';
@@ -1538,19 +2040,27 @@ class eq
{
// Save any changes made to the appointment table
$new_data = get_var('appt_notes',array('POST'));
- foreach ($new_data as $entry)
- {
- $family = $entry['family'];
- $appointment = $entry['appointment'];
-
- // Perform database save actions here
- $this->db->query("UPDATE eq_appointment set " .
- " family='" . $family . "'" .
- " WHERE appointment=" . $appointment,__LINE__,__FILE__);
-
- // Email the appointment
- $this->email_appt($appointment);
- }
+ if($new_data != "") {
+ foreach ($new_data as $entry)
+ {
+ $family = $entry['family'];
+ $appointment = $entry['appointment'];
+
+ //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);
+ }
+ }
+ }
// Save any changes made to the visit notes table
$new_data = get_var('vis_notes',array('POST'));
@@ -1569,7 +2079,7 @@ class eq
}
$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
@@ -1581,7 +2091,7 @@ class eq
$appt_table_data = "";
// Find out what the EQ Presidency ID is
- $sql = "SELECT * FROM eq_presidency where president=0 and counselor=0 and secretary=0 and valid=1";
+ $sql = "SELECT * FROM eq_presidency where eqpres=1 and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$presidency_name = $this->db->f('name');
@@ -1733,7 +2243,7 @@ class eq
$families_with_yearly_visit++;
$date = $this->db2->f('date');
$vis_notes = $this->db2->f('notes');
- if(strlen($vis_notes) > 40) { $vis_notes = substr($vis_notes,0,40) . "..."; }
+ if(strlen($vis_notes) > 40) { $vis_notes = stripslashes(substr($vis_notes,0,40) . "..."); }
$completed_data.= "$name Family ";
$completed_data.= "$phone ";
$completed_data.= "$date ";
@@ -1744,7 +2254,7 @@ class eq
}
}
- $name_width=175; $phone_width=100; $date_width=100; $notes_width=300;
+ $name_width=190; $phone_width=100; $date_width=100; $notes_width=300;
$completed_table_width=$name_width + $phone_width + $date_width + $notes_width;
$completed_header_row = "Family Name ";
$completed_header_row.= "Phone ";
@@ -1889,7 +2399,7 @@ class eq
$month = $date_array[1];
$day = $date_array[2];
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
- $table_data .= ' '.$month.'-'.$day.' ';
+ $table_data .= ' '.$month.'-'.$day.' ';
}
else { $table_data .= " "; }
}
@@ -1934,28 +2444,17 @@ class eq
$notes = get_var('notes',array('GET','POST'));
$eqpresppi = get_var('eqpresppi',array('GET','POST'));
- $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
- $this->db->query($sql,__LINE__,__FILE__);
- while ($this->db->next_record())
- {
- $supervisor = $this->db->f('supervisor');
- $sql = "SELECT * FROM eq_elder WHERE elder=" . $supervisor;
- $this->db2->query($sql,__LINE__,__FILE__);
- $this->db2->next_record();
- $interviewer_name = $this->db2->f('name');
-
- if($supervisor == $interviewer) {
- $this->t->set_var('interviewer',$supervisor . ' selected');
- } else {
- $this->t->set_var('interviewer',$interviewer);
- }
- $this->t->set_var('interviewer_name',$interviewer_name);
- $this->t->fp('int_list','interviewer_list',True);
- }
-
+ $sql = "SELECT * FROM eq_elder WHERE elder=" . $interviewer;
+ $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);
+
if($action == 'save')
{
- $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+ $notes = get_var('notes',array('POST'));
$this->db->query("UPDATE eq_ppi set " .
" ppi='" . $ppi . "'" .
", interviewer='" . $interviewer . "'" .
@@ -1970,7 +2469,7 @@ class eq
if($action == 'insert')
{
- $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+ $notes = get_var('notes',array('POST'));
$this->db->query("INSERT INTO eq_ppi (interviewer,elder,date,notes,eqpresppi) "
. "VALUES ('" . $interviewer . "','" . $elder . "','"
. $date . "','" . $notes . "','" . $eqpresppi ."')",__LINE__,__FILE__);
@@ -2197,7 +2696,7 @@ class eq
$month = $date_array[1];
$day = $date_array[2];
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
- $table_data .= ' '.$month.'-'.$day.' ';
+ $table_data .= ' '.$month.'-'.$day.' ';
}
else { $table_data .= " "; }
}
@@ -2284,7 +2783,7 @@ class eq
if($action == 'save')
{
- $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+ $notes = get_var('notes',array('POST'));
$this->db->query("UPDATE eq_interview set " .
" interview='" . $interview . "'" .
", interviewer='" . $interviewer . "'" .
@@ -2299,7 +2798,7 @@ class eq
if($action == 'insert')
{
- $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+ $notes = get_var('notes',array('POST'));
$this->db->query("INSERT INTO eq_interview (interviewer,elder,aaronic,date,notes) "
. "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
. $date . "','" . $notes ."')",__LINE__,__FILE__);
@@ -2497,7 +2996,7 @@ class eq
if($action == 'save')
{
- $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+ $notes = get_var('notes',array('POST'));
$this->db->query("UPDATE eq_visit set " .
" date='" . $date . "'" .
", notes='" . $notes . "'" .
@@ -2508,7 +3007,7 @@ class eq
if($action == 'insert')
{
- $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+ $notes = get_var('notes',array('POST'));
$this->db->query("INSERT INTO eq_visit (family,companionship,date,notes) "
. "VALUES ('" . $family . "','" . $companionship . "','"
. $date . "','" . $notes . "')",__LINE__,__FILE__);
@@ -2704,7 +3203,7 @@ class eq
$attended[$i][$cur_month]=1;
$attendance[$monthnum[$cur_month]]++;
}
- $att_table .= ' ';
+ $att_table .= ' ';
} else {
$att_table .= ' ';
}
@@ -3051,34 +3550,70 @@ class eq
$time = $hour.':'.$minute.':'.'00';
$uid = 0;
+ // Zero out the family or elder if date = NULL
+ if($date == "") {
+ $elder = 0;
+ $family = 0;
+ }
+
// Update an existing appointment
- if($appointment != 0)
+ if($appointment < $this->max_appointments)
{
- $this->db->query("UPDATE eq_appointment set" .
- " family=" . $family .
- " ,elder=" . $elder .
- " ,date='" . $date . "'" .
- " ,time='" . $time . "'" .
- " WHERE appointment=" . $appointment,__LINE__,__FILE__);
-
- // Email the appointment
- $this->email_appt($appointment);
+ //Only perform a database update if we have made a change to this appointment
+ $sql = "SELECT * FROM eq_appointment where " .
+ "appointment='$appointment'" .
+ " and presidency='$presidency'" .
+ " and elder='$elder'" .
+ " and family='$family'" .
+ " and date='$date'" .
+ " and time='$time'";
+ $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" .
+ " family=" . $family .
+ " ,elder=" . $elder .
+ " ,date='" . $date . "'" .
+ " ,time='" . $time . "'" .
+ " ,presidency='" . $presidency . "'" .
+ " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+
+ // Email the appointment
+ $this->email_appt($appointment);
+ }
}
// Add a new appointment
- else if(($appointment == 0) && ($date != "") && ($time != ""))
+ else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
{
- $this->db->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time) "
- . "VALUES ('" . $appointment . "','" . $presidency . "','" . $family . "','"
+ //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__);
-
- //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family ";
+
+ // Now reselect this entry from the database to see if we need
+ // to send an appointment out for it.
+ $sql = "SELECT * FROM eq_appointment where " .
+ "elder='$elder'" .
+ " and family='$family'" .
+ " and presidency='$presidency'" .
+ " and date='$date'" .
+ " and time='$time'" .
+ " and uid='$uid'";
+ $this->db3->query($sql,__LINE__,__FILE__);
+ if($this->db3->next_record()) {
+ // Email the appointment if warranted
+ if(($date != "") && ($time != "") && (($elder > 0) || $family > 0)) {
+ $this->email_appt($this->db3->f('appointment'));
+ }
+ }
}
}
}
$take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.schedule');
- Header('Location: ' . $take_me_to_url);
+ //Header('Location: ' . $take_me_to_url);
}
$sql = "SELECT * FROM eq_presidency where valid=1";
@@ -3206,59 +3741,64 @@ class eq
}
// Create blank appointment slot
- $appointment = 0;
- $table_data.= "";
-
- // Date selection
- $table_data.= '';
- $table_data.= $this->jscal->input('sched['.$presidency.']['.$appointment.'][date]','','','','','','',$this->cal_options);
- $table_data.= ' ';
+ for ($b=0; $b < 4; $b++) {
+ $appointment = $this->max_appointments + $b;
+ $table_data.= " ";
+
+ // Date selection
+ $table_data.= '';
+ $table_data.= $this->jscal->input('sched['.$presidency.']['.$appointment.'][date]','','','','','','',$this->cal_options);
+ $table_data.= ' ';
- // Time selection
- $table_data.= "";
- $table_data.= '';
- $table_data.= ' ';
- foreach(range(1,12) as $num) {
- $table_data.= ''.$num.' ';
- }
- $table_data.= ' ';
- $table_data.= ' : ';
- $table_data.= '';
- $table_data.= ' ';
- foreach(range(0,3) as $num) {
- $num = $num * 15; if($num == 0) { $num = "00"; }
- $table_data.= ''.$num.' ';
- }
- $table_data.= ' ';
- $table_data.= '';
- $table_data.= ' ';
- $table_data.= 'am ';
- $table_data.= 'pm ';
- $table_data.= ' ';
- $table_data.= " ";
-
- // Elder drop down list
- $table_data.= '';
- $table_data.= ' ';
- for ($j=0; $j < count($elder_id); $j++) {
- $id = $elder_id[$j];
- $name = $elder_name[$j];
- $table_data.= ''.$name.' ';
- }
- $table_data.=' ';
-
- // Family drop down list
- $table_data.= '';
- $table_data.= ' ';
- for ($j=0; $j < count($elder_id); $j++) {
- $id = $family_id[$j];
- $name = $family_name[$j];
- $table_data.= ''.$name.' Family ';
- }
- $table_data.=' ';
-
- $table_data.= ' ';
- $table_data.= ' ';
+ // Time selection
+ $table_data.= "";
+ $table_data.= '';
+ $table_data.= ' ';
+ foreach(range(1,12) as $num) {
+ $table_data.= ''.$num.' ';
+ }
+ $table_data.= ' ';
+ $table_data.= ' : ';
+ $table_data.= '';
+ $table_data.= ' ';
+ foreach(range(0,3) as $num) {
+ $num = $num * 15; if($num == 0) { $num = "00"; }
+ $table_data.= ''.$num.' ';
+ }
+ $table_data.= ' ';
+ $table_data.= '';
+ $table_data.= ' ';
+ $table_data.= 'am ';
+ $table_data.= 'pm ';
+ $table_data.= ' ';
+ $table_data.= " ";
+
+ // Elder drop down list
+ $table_data.= '';
+ $table_data.= ' ';
+ for ($j=0; $j < count($elder_id); $j++) {
+ $id = $elder_id[$j];
+ $name = $elder_name[$j];
+ $table_data.= ''.$name.' ';
+ }
+ $table_data.=' ';
+
+ // Family drop down list
+ $table_data.= '';
+ $table_data.= ' ';
+ for ($j=0; $j < count($elder_id); $j++) {
+ $id = $family_id[$j];
+ $name = $family_name[$j];
+ $table_data.= ''.$name.' Family ';
+ }
+ $table_data.=' ';
+
+ $table_data.= ' ';
+ $table_data.= ' ';
+
+ $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+ $this->t->set_var('tr_color',$tr_color);
+ }
$this->t->set_var('table_data',$table_data);
$this->t->set_var('header_row',$header_row);
@@ -3277,22 +3817,44 @@ class eq
$this->t->set_block('admin_t','upload','uploadhandle');
$this->t->set_block('admin_t','admin','adminhandle');
$this->t->set_block('admin_t','cmd','cmdhandle');
+ $this->t->set_block('admin_t','presidency','presidencyhandle');
$this->t->set_var('upload_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.admin&action=upload'));
+ $this->t->set_var('presidency_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.admin&action=presidency'));
$action = get_var('action',array('GET','POST'));
$this->t->pfp('out','admin_t');
-
+
+ $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ while ($this->db->next_record())
+ {
+ $elder_id[$i] = $this->db->f('elder');
+ $elder_name[$i] = $this->db->f('name');
+ $elder2name[$elder_id[$i]] = $elder_name[$i];
+ $i++;
+ }
+ array_multisort($elder_name, $elder_id);
+
if($action == 'upload')
{
- $target_path = $this->upload_target_path . basename( $_FILES['uploadedfile']['name']);
+ $target_path = $this->upload_target_path . '/' . basename( $_FILES['uploadedfile']['name']);
- if((($_FILES['uploadedfile']['type'] == "application/zip") ||
- ($_FILES['uploadedfile']['type'] == "application/x-zip-compressed") ||
- ($_FILES['uploadedfile']['type'] == "application/x-zip") ||
- ($_FILES['uploadedfile']['type'] == "application/octet-stream")) &&
- (move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path))) {
+ if(($_FILES['uploadedfile']['type'] == "application/zip") ||
+ ($_FILES['uploadedfile']['type'] == "application/x-zip-compressed") ||
+ ($_FILES['uploadedfile']['type'] == "application/x-zip") ||
+ ($_FILES['uploadedfile']['type'] == "application/octet-stream")) {
+
+ if(!move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path)) {
+ $uploadstatus = " -E- Unable to move the uploaded file to ";
+ $uploadstatus.= "the target path (check the path and permissions) of: $target_path ";
+ $this->t->set_var('uploadstatus',$uploadstatus);
+ $this->t->pfp('uploadhandle','upload',True);
+ return 0;
+ }
+
$uploadstatus = "The following file was uploaded successfully: ";
$uploadstatus.= "Filename : " . $_FILES['uploadedfile']['name'] . " ";
$uploadstatus.= "Type : " . $_FILES['uploadedfile']['type'] . " ";
@@ -3304,9 +3866,9 @@ class eq
# make a directory for this data to be stored in
$date="data_" . date("Y_m_d");
- $data_dir = $this->upload_target_path . $date;
+ $data_dir = $this->upload_target_path . '/' . $date;
print "-> Making the data directory: $date \n";
- exec('mkdir ' . $data_dir . ' 2>&1', $result, $return_code);
+ exec('mkdir -p ' . $data_dir . ' 2>&1', $result, $return_code);
if($return_code != 0) {
print implode('\n',$result) . " ";
print "";
@@ -3341,7 +3903,7 @@ class eq
# update the data_latest link to point to this new directory
print "-> Updating the latest data dir link \n";
- $data_latest = $this->upload_target_path . 'data_latest';
+ $data_latest = $this->upload_target_path . '/data_latest';
exec('rm ' . $data_latest. '; ln -s ' . $data_dir .' '. $data_latest .' 2>&1', $result, $return_code);
if($return_code != 0) {
print implode('\n',$result) . " ";
@@ -3357,8 +3919,8 @@ class eq
ob_flush(); flush(); sleep(1);
$import_log = $this->upload_target_path . '/import.log';
$data_log = $this->upload_target_path . '/data.log';
- $import_cmd = $this->script_path . 'import_ward_data ' . $data_latest . ' | tee ' . $import_log;
- $parse_cmd = $this->script_path . 'parse_ward_data -v ' . $data_latest . ' > ' . $data_log;
+ $import_cmd = $this->script_path . '/import_ward_data ' . $data_latest . ' 2>&1 | tee ' . $import_log;
+ $parse_cmd = $this->script_path . '/parse_ward_data -v ' . $data_latest . ' > ' . $data_log . '2>&1';
#print "import_cmd: $import_cmd ";
#print "parse_cmd: $parse_cmd ";
ob_start('ob_logstdout', 2);
@@ -3387,12 +3949,238 @@ class eq
$this->t->pfp('uploadhandle','upload',True);
}
}
+ else if($action == "presidency")
+ {
+ $new_data = get_var('eqpres',array('POST'));
+ foreach ($new_data as $entry)
+ {
+ $id = $entry['id'];
+ $email = $entry['email'];
+ $elder = $entry['elder'];
+ $name = $entry['name'];
+ $district = $entry['district'];
+ $president = $entry['president'];
+ $counselor = $entry['counselor'];
+ $secretary = $entry['secretary'];
+ $eqpresidency = $entry['eqpresidency'];
+ // Set the elder id to 0 for EQ Presidency tagged entry
+ if($eqpresidency == 1) { $elder="0"; }
+ // Re-look up the elder name for the ID if we aren't an EQ Presidency tagged entry
+ else { $name = $elder2name[$elder]; }
+ //print "id=$id elder=$elder name=$name email=$email district=$district president=$president ";
+ //print "counselor=$counselor secretary=$secretary eqpres=$eqpresidency ";
+
+ if(($elder > 0) || ($name != "")) {
+ if($id < $this->max_presidency_members) {
+ //print "Updating Existing Entry ";
+ $this->db2->query("UPDATE eq_presidency set" .
+ " elder=" . $elder .
+ " ,district=" . $district .
+ " ,name='" . $name . "'" .
+ " ,email='" . $email . "'" .
+ " ,president='" . $president . "'" .
+ " ,counselor='" . $counselor . "'" .
+ " ,secretary='" . $secretary . "'" .
+ " ,eqpres='" . $eqpresidency . "'" .
+ " WHERE presidency=" . $id,__LINE__,__FILE__);
+
+ } else {
+ //print "Adding New Entry ";
+ $this->db2->query("INSERT INTO eq_presidency (presidency,elder,district,name,"
+ . "email,president,counselor,secretary,eqpres,valid) "
+ . "VALUES (NULL,'" . $elder . "','" . $district . "','"
+ . $name . "','" . $email . "','" . $president . "','"
+ . $counselor . "','" . $secretary . "','" . $eqpres . "','1'"
+ .")",__LINE__,__FILE__);
+ }
+ } else {
+ //print "Ignoring Blank Entry ";
+ }
+ }
+
+ // Now update the eq_district table appropriately
+
+ // Delete all the previous district entries from the table
+ $this->db->query("DELETE from eq_district where valid=1",__LINE__,__FILE__);
+ $this->db->query("DELETE from eq_district where valid=0",__LINE__,__FILE__);
+
+ // Always add a "District 0" assigned to the High Priests Group
+ $district = 0;
+ $name = "High Priests";
+ $elder = 0;
+ $valid = 0;
+ $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) "
+ . "VALUES ('" . $district . "','" . $name . "','"
+ . $elder . "','" . $valid . "'"
+ .")",__LINE__,__FILE__);
+
+
+ // Requery the eq_presidency table
+ $sql = "SELECT * FROM eq_presidency where valid=1";
+ $this->db->query($sql,__LINE__,__FILE__);
+ while ($this->db->next_record())
+ {
+ // Extract the data for each presidency record
+ $id = $this->db->f('presidency');
+ $elder = $this->db->f('elder');
+ $name = $this->db->f('name');
+ $district = $this->db->f('district');
+ $name = $this->db->f('name');
+ $valid = 1;
+
+ // If we have a valid district, add it to the district table
+ if($district > 0) {
+ $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) "
+ . "VALUES ('" . $district . "','" . $name . "','"
+ . $elder . "','" . $valid . "'"
+ .")",__LINE__,__FILE__);
+ }
+
+ }
+
+ $this->t->set_var('adminhandle','');
+ $this->t->pfp('adminhandle','admin');
+ }
else
{
$this->t->set_var('adminhandle','');
$this->t->pfp('adminhandle','admin');
}
+
+ // Now save off the data needed for an EQ Presidency Table Update
+ $sql = "SELECT * FROM eq_presidency where valid=1";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $table_data = "";
+ $header_row = " Elder Email District President Counselor Secretary EQ Presidency ";
+ while ($this->db->next_record())
+ {
+ // Extract the data for each presidency record
+ $id = $this->db->f('presidency');
+ $elder = $this->db->f('elder');
+ $district = $this->db->f('district');
+ $name = $this->db->f('name');
+ $email = $this->db->f('email');
+ $president = $this->db->f('president');
+ $counselor = $this->db->f('counselor');
+ $secretary = $this->db->f('secretary');
+ $eqpresidency = $this->db->f('eqpres');
+
+ // Create the forms needed in the table
+ $table_data .= " ";
+
+ // Presidency ID
+ $table_data .= ' ';
+
+ // Elder
+ if($eqpresidency == 0) {
+ $table_data.= '';
+ $table_data.= ' ';
+ for ($j=0; $j < count($elder_id); $j++) {
+ $tmp_id = $elder_id[$j];
+ $name = $elder_name[$j];
+ if($elder_id[$j] == $elder) { $eldername = $name; $selected = 'selected="selected"'; } else { $selected = ''; }
+ $table_data.= ''.$name.' ';
+ }
+ $table_data.=' ';
+ $table_data.=' ';
+ } else {
+ $table_data.= ' ';
+ $table_data.= ' ';
+ }
+
+ // Email Address
+ $table_data .= ' ';
+
+ // District
+ $table_data.= '';
+ $table_data.= ' ';
+ for ($j=0; $j <= $this->max_num_districts; $j++) {
+ if($district == $j) { $selected = 'selected="selected"'; } else { $selected = ''; }
+ $table_data.= ''.$j.' ';
+ }
+ $table_data.=' ';
+
+ // President
+ $table_data.= '';
+ if($president == 1) { $table_data .= '0 1 '; }
+ else { $table_data .= '0 1 '; }
+ $table_data.=' ';
+
+ // Counselor
+ $table_data.= '';
+ if($counselor == 1) { $table_data .= '0 1 '; }
+ else { $table_data .= '0 1 '; }
+ $table_data.=' ';
+
+ // Secretary
+ $table_data.= '';
+ if($secretary == 1) { $table_data .= '0 1 '; }
+ else { $table_data .= '0 1 '; }
+ $table_data.=' ';
+
+ // EQ Presidency
+ $table_data.= '';
+ if($eqpresidency == 1) { $table_data .= '0 1 '; }
+ else { $table_data .= '0 1 '; }
+ $table_data.=' ';
+
+ // End of ROW
+ $table_data .= " \n";
+ $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+ $this->t->set_var('tr_color',$tr_color);
+ }
+
+ // Now create 1 blank row to always have a line available to add a new elder with
+ $id = $this->max_presidency_members;
+ $table_data .= "";
+ // Presidency ID
+ $table_data .= ' ';
+ // Elder
+ $table_data.= '';
+ $table_data.= ' ';
+ for ($j=0; $j < count($elder_id); $j++) {
+ $tmp_id = $elder_id[$j];
+ $name = $elder_name[$j];
+ $table_data.= ''.$name.' ';
+ }
+ $table_data.=' ';
+ $table_data.=' ';
+ // Email Address
+ $table_data.=' ';
+ // District
+ $table_data.= '';
+ $table_data.= ' ';
+ for ($j=0; $j <= $this->max_num_districts; $j++) {
+ if($j == 0) { $selected = 'selected="selected"'; } else { $selected = ''; }
+ $table_data.= ''.$j.' ';
+ }
+ $table_data.=' ';
+ // President
+ $table_data.= '';
+ $table_data.= '0 1 ';
+ $table_data.=' ';
+ // Counselor
+ $table_data.= '';
+ $table_data.= '0 1 ';
+ $table_data.=' ';
+ // Secretary
+ $table_data.= '';
+ $table_data.= '0 1 ';
+ $table_data.=' ';
+ // EQ Presidency
+ $table_data.= '';
+ $table_data.= '0 1 ';
+ $table_data.=' ';
+ // End of ROW
+ $table_data .= " \n";
+ $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+ $this->t->set_var('tr_color',$tr_color);
+
+ $this->t->set_var('header_row',$header_row);
+ $this->t->set_var('table_data',$table_data);
+ $this->t->pfp('presidencyhandle','presidency',True);
+
$this->save_sessiondata();
}
@@ -3466,7 +4254,11 @@ class eq
if($this->db3->next_record()) {
$phone = $this->db3->f('phone');
}
- $location="";
+ $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
}
}