X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=4198742697a8bd37196a62f2f05f8f6d326404a3;hb=82963f2191eff35b295440782e4309ea3632cf55;hp=ac8246539d01c1b24958a305dc8f292a4aa5f7a4;hpb=ec15c903b3ffd8a47a26c57bf4265403af18b4e2;p=eq%2F.git diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index ac82465..4198742 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,6 +58,8 @@ class eq 'schedule' => True, 'admin' => True, 'email_appt' => True, + 'willing_view' => True, + 'willing_update' => True, 'send_ical_appt' => True, 'assign_view' => True, 'assign_update' => True, @@ -62,6 +67,9 @@ class eq 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; @@ -69,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; @@ -87,7 +97,7 @@ class eq 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'`; @@ -127,6 +137,9 @@ class eq $link_data['menuaction'] = 'eq.eq.act_list'; $this->t->set_var('link_activity',$GLOBALS['phpgw']->link('/eq/index.php',$link_data)); $this->t->set_var('lang_activity','Activities'); + $link_data['menuaction'] = 'eq.eq.willing_view'; + $this->t->set_var('link_willing',$GLOBALS['phpgw']->link('/eq/index.php',$link_data)); + $this->t->set_var('lang_willing','Willingness'); $link_data['menuaction'] = 'eq.eq.assign_view'; $this->t->set_var('link_assignment',$GLOBALS['phpgw']->link('/eq/index.php',$link_data)); $this->t->set_var('lang_assignment','Assignments'); @@ -306,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]++; @@ -719,9 +732,9 @@ class eq if($action == 'save') { - $activity['assignment'] = $this->db->db_addslashes(get_var('assignment',array('POST'))); - $activity['date'] = $this->db->db_addslashes(get_var('date',array('POST'))); - $activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST'))); + $activity['assignment'] = get_var('assignment',array('POST')); + $activity['date'] = get_var('date',array('POST')); + $activity['notes']= get_var('notes',array('POST')); $this->db->query("UPDATE eq_activity set " . " assignment='" . $activity['assignment'] . "', date='" . $activity['date'] . "'" . @@ -745,9 +758,9 @@ class eq if($action == 'insert') { - $activity['assignment'] = $this->db->db_addslashes(get_var('assignment',array('POST'))); - $activity['date'] = $this->db->db_addslashes(get_var('date',array('POST'))); - $activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST'))); + $activity['assignment'] = get_var('assignment',array('POST')); + $activity['date'] = get_var('date',array('POST')); + $activity['notes']= get_var('notes',array('POST')); $this->db->query("INSERT INTO eq_activity (assignment,date,notes) " . "VALUES ('" . $activity['assignment'] . "','" . $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__); @@ -756,7 +769,7 @@ class eq . " AND date='".$activity['date']."' AND notes='".$activity['notes']."'"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { - print "activity: " . $this->db->f('activity') . "
"; + //print "activity: " . $this->db->f('activity') . "
"; $activity['activity'] = $this->db->f('activity'); } @@ -930,8 +943,8 @@ class eq if($action == 'save') { - $assignment['name'] = $this->db->db_addslashes(get_var('name',array('POST'))); - $assignment['code'] = $this->db->db_addslashes(get_var('code',array('POST'))); + $assignment['name'] = get_var('name',array('POST')); + $assignment['code'] = get_var('code',array('POST')); $this->db->query("UPDATE eq_assignment set " . " name='" . $assignment['name'] . "'" . ", code='" . $assignment['code'] . "'" . @@ -943,8 +956,8 @@ class eq if($action == 'insert') { - $assignment['name'] = $this->db->db_addslashes(get_var('name',array('POST'))); - $assignment['code'] = $this->db->db_addslashes(get_var('code',array('POST'))); + $assignment['name'] = get_var('name',array('POST')); + $assignment['code'] = get_var('code',array('POST')); $this->db->query("INSERT INTO eq_assignment (name,code) " . "VALUES ('" . $assignment['name'] . "','" . $assignment['code'] . "')",__LINE__,__FILE__); @@ -1014,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); @@ -1057,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="AssignmentsWillingness"; + $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'); @@ -1099,13 +1396,17 @@ class eq //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); + //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); + } } @@ -1136,6 +1437,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 { @@ -1258,6 +1560,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); @@ -1387,14 +1690,18 @@ class eq $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); + //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 @@ -1406,6 +1713,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 " . @@ -1605,24 +1913,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.= ''; + } + $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'; @@ -1727,14 +2040,20 @@ class eq { $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); + //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 @@ -1766,7 +2085,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'); @@ -1918,7 +2237,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"; @@ -1929,7 +2248,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"; @@ -2074,7 +2393,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 .= " "; } } @@ -2119,28 +2438,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 . "'" . @@ -2155,7 +2463,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__); @@ -2382,7 +2690,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 .= " "; } } @@ -2469,7 +2777,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 . "'" . @@ -2484,7 +2792,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__); @@ -2682,7 +2990,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 . "'" . @@ -2693,7 +3001,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__); @@ -2889,7 +3197,7 @@ class eq $attended[$i][$cur_month]=1; $attendance[$monthnum[$cur_month]]++; } - $att_table .= ''; + $att_table .= ''; } else { $att_table .= ' '; } @@ -3236,28 +3544,64 @@ 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')); + } + } } } } @@ -3391,59 +3735,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.= ''; - - // Time selection - $table_data.= ""; - $table_data.= ''; - $table_data.= ' : '; - $table_data.= ''; - $table_data.= ''; - $table_data.= ""; - - // Elder drop down list - $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.= ''; - // Family drop down list - $table_data.= ''; - - $table_data.= ''; - $table_data.= ''; + // Time selection + $table_data.= ""; + $table_data.= ''; + $table_data.= ' : '; + $table_data.= ''; + $table_data.= ''; + $table_data.= ""; + + // Elder drop down list + $table_data.= ''; + + // Family drop down list + $table_data.= ''; + + $table_data.= ''; + $table_data.= ''; + + $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); @@ -3462,13 +3811,27 @@ 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']); @@ -3572,12 +3935,238 @@ class eq $this->t->pfp('uploadhandle','upload',True); } } + else if($action == "presidency") + { + $new_data = get_var('eqpres',array('POST')); + foreach ($new_data as $entry) + { + $id = $entry['id']; + $email = $entry['email']; + $elder = $entry['elder']; + $name = $entry['name']; + $district = $entry['district']; + $president = $entry['president']; + $counselor = $entry['counselor']; + $secretary = $entry['secretary']; + $eqpresidency = $entry['eqpresidency']; + // Set the elder id to 0 for EQ Presidency tagged entry + if($eqpresidency == 1) { $elder="0"; } + // Re-look up the elder name for the ID if we aren't an EQ Presidency tagged entry + else { $name = $elder2name[$elder]; } + //print "id=$id elder=$elder name=$name email=$email district=$district president=$president "; + //print "counselor=$counselor secretary=$secretary eqpres=$eqpresidency
"; + + if(($elder > 0) || ($name != "")) { + if($id < $this->max_presidency_members) { + //print "Updating Existing Entry
"; + $this->db2->query("UPDATE eq_presidency set" . + " elder=" . $elder . + " ,district=" . $district . + " ,name='" . $name . "'" . + " ,email='" . $email . "'" . + " ,president='" . $president . "'" . + " ,counselor='" . $counselor . "'" . + " ,secretary='" . $secretary . "'" . + " ,eqpres='" . $eqpresidency . "'" . + " WHERE presidency=" . $id,__LINE__,__FILE__); + + } else { + //print "Adding New Entry
"; + $this->db2->query("INSERT INTO eq_presidency (presidency,elder,district,name," + . "email,president,counselor,secretary,eqpres,valid) " + . "VALUES (NULL,'" . $elder . "','" . $district . "','" + . $name . "','" . $email . "','" . $president . "','" + . $counselor . "','" . $secretary . "','" . $eqpres . "','1'" + .")",__LINE__,__FILE__); + } + } else { + //print "Ignoring Blank Entry
"; + } + } + + // Now update the eq_district table appropriately + + // Delete all the previous district entries from the table + $this->db->query("DELETE from eq_district where valid=1",__LINE__,__FILE__); + $this->db->query("DELETE from eq_district where valid=0",__LINE__,__FILE__); + + // Always add a "District 0" assigned to the High Priests Group + $district = 0; + $name = "High Priests"; + $elder = 0; + $valid = 0; + $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) " + . "VALUES ('" . $district . "','" . $name . "','" + . $elder . "','" . $valid . "'" + .")",__LINE__,__FILE__); + + + // Requery the eq_presidency table + $sql = "SELECT * FROM eq_presidency where valid=1"; + $this->db->query($sql,__LINE__,__FILE__); + while ($this->db->next_record()) + { + // Extract the data for each presidency record + $id = $this->db->f('presidency'); + $elder = $this->db->f('elder'); + $name = $this->db->f('name'); + $district = $this->db->f('district'); + $name = $this->db->f('name'); + $valid = 1; + + // If we have a valid district, add it to the district table + if($district > 0) { + $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) " + . "VALUES ('" . $district . "','" . $name . "','" + . $elder . "','" . $valid . "'" + .")",__LINE__,__FILE__); + } + + } + + $this->t->set_var('adminhandle',''); + $this->t->pfp('adminhandle','admin'); + } else { $this->t->set_var('adminhandle',''); $this->t->pfp('adminhandle','admin'); } + + // Now save off the data needed for an EQ Presidency Table Update + $sql = "SELECT * FROM eq_presidency where valid=1"; + $this->db->query($sql,__LINE__,__FILE__); + $table_data = ""; + $header_row = "ElderEmailDistrictPresidentCounselorSecretaryEQ Presidency"; + while ($this->db->next_record()) + { + // Extract the data for each presidency record + $id = $this->db->f('presidency'); + $elder = $this->db->f('elder'); + $district = $this->db->f('district'); + $name = $this->db->f('name'); + $email = $this->db->f('email'); + $president = $this->db->f('president'); + $counselor = $this->db->f('counselor'); + $secretary = $this->db->f('secretary'); + $eqpresidency = $this->db->f('eqpres'); + + // Create the forms needed in the table + $table_data .= ""; + + // Presidency ID + $table_data .= ''; + + // Elder + if($eqpresidency == 0) { + $table_data.= ''; + $table_data.=''; + } else { + $table_data.= ''; + $table_data.= ''; + } + + // Email Address + $table_data .= ''; + + // District + $table_data.= ''; + + // President + $table_data.= ''; + + // Counselor + $table_data.= ''; + + // Secretary + $table_data.= ''; + + // EQ Presidency + $table_data.= ''; + + // End of ROW + $table_data .= "\n"; + $tr_color = $this->nextmatchs->alternate_row_color($tr_color); + $this->t->set_var('tr_color',$tr_color); + } + + // Now create 1 blank row to always have a line available to add a new elder with + $id = $this->max_presidency_members; + $table_data .= ""; + // Presidency ID + $table_data .= ''; + // Elder + $table_data.= ''; + $table_data.=''; + // Email Address + $table_data.=''; + // District + $table_data.= ''; + // President + $table_data.= ''; + // Counselor + $table_data.= ''; + // Secretary + $table_data.= ''; + // EQ Presidency + $table_data.= ''; + // End of ROW + $table_data .= "\n"; + $tr_color = $this->nextmatchs->alternate_row_color($tr_color); + $this->t->set_var('tr_color',$tr_color); + + $this->t->set_var('header_row',$header_row); + $this->t->set_var('table_data',$table_data); + $this->t->pfp('presidencyhandle','presidency',True); + $this->save_sessiondata(); }