X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclass.eq.inc.php;h=3dea44ff2d06daca12fbf7ead4ff3166c6a69874;hb=1325d1fb1384df8e2e24903947c80ea315d67be5;hp=6a197a22a2b4697bbae99c34839494a809ea94cd;hpb=f851dee007f0c3a6dd802ddc4dd37cfb038b8208;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 6a197a2..3dea44f 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -30,6 +30,7 @@ class eq
var $current_month;
var $upload_target_path;
var $script_path;
+ var $max_appointments;
var $public_functions = array
(
@@ -71,6 +72,7 @@ class eq
$this->default_int_num_years = 0;
$this->default_att_num_quarters = 1;
$this->default_vis_num_years = 1;
+ $this->max_appointments = 32768;
$this->upload_target_path = "/home/users/eqpres/eq_data/";
$this->script_path = "/usr/share/phpgroupware/eq/";
@@ -724,9 +726,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'] . "'" .
@@ -750,9 +752,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__);
@@ -761,7 +763,7 @@ class eq
. " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
- print "activity: " . $this->db->f('activity') . "
";
+ //print "activity: " . $this->db->f('activity') . "
";
$activity['activity'] = $this->db->f('activity');
}
@@ -935,8 +937,8 @@ class eq
if($action == 'save')
{
- $assignment['name'] = $this->db->db_addslashes(get_var('name',array('POST')));
- $assignment['code'] = $this->db->db_addslashes(get_var('code',array('POST')));
+ $assignment['name'] = get_var('name',array('POST'));
+ $assignment['code'] = get_var('code',array('POST'));
$this->db->query("UPDATE eq_assignment set " .
" name='" . $assignment['name'] . "'" .
", code='" . $assignment['code'] . "'" .
@@ -948,8 +950,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__);
@@ -1094,6 +1096,23 @@ class eq
$this->t->set_block('willing_view_t','header_list','list1');
$this->t->set_block('willing_view_t','elder_list','list2');
+ $this->t->set_var('lang_filter','Filter');
+ $this->t->set_var('lang_filter_unwilling','Filter out unwilling Elders:');
+
+ $filter_unwilling = get_var('filter_unwilling',array('POST'));
+ $this->t->set_var('filter_unwilling',$filter_unwilling);
+
+ if($filter_unwilling == 'y' || $filter_unwilling == '') {
+ $filter_input = "Y";
+ $filter_input.= "N";
+ $filter_input.= " ";
+ } else {
+ $filter_input = "Y";
+ $filter_input.= "N";
+ $filter_input.= " ";
+ }
+ $this->t->set_var('filter_input',$filter_input);
+
$sql = "SELECT * FROM eq_elder where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
@@ -1101,6 +1120,7 @@ class eq
{
$elder_name[$i] = $this->db->f('name');
$elder_id[$i] = $this->db->f('elder');
+ $elder_phone[$elder_id[$i]] = $this->db->f('phone');
$i++;
}
array_multisort($elder_name, $elder_id);
@@ -1115,8 +1135,21 @@ class eq
$assignment_list[$i]['code'] = $this->db->f('code');
$i++;
}
+
+ $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $total_records = $this->db->num_rows();
+
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $activity_list[$i]['assignment'] = $this->db->f('assignment');
+ $activity_list[$i]['date'] = $this->db->f('date');
+ $activity_list[$i]['activity'] = $this->db->f('activity');
+ $i++;
+ }
- $elder_width=300; $willing_width=40; $assignment_width=50;
+ $elder_width=275; $willing_width=40; $assignment_width=50;
$total_width=$elder_width+$willing_width;
for ($i=0; $i < count($assignment_list); $i++) {
@@ -1129,40 +1162,63 @@ class eq
for ($i=0; $i < count($elder_id); $i++) {
$willing_table = '';
- $this->nextmatchs->template_alternate_row_color(&$this->t);
$this->t->set_var('elder_name',$elder_name[$i]);
+ $this->t->set_var('elder_phone',$elder_phone[$elder_id[$i]]);
$this->t->set_var('editurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&elder_id='
. $elder_id[$i] . '&action=' . 'edit'));
for ($j=0; $j < count($assignment_list); $j++) {
- $found_willingness=0;
+ $found_willingness=0; $elder_willing=0;
$sql = "SELECT * FROM eq_willingness where "
. " assignment=" . $assignment_list[$j]['assignment']
. " AND elder=" . $elder_id[$i];
$this->db->query($sql,__LINE__,__FILE__);
while($this->db->next_record()) {
$found_willingness=1;
+ $date_part="";
+ $sql = "SELECT * FROM eq_activity where "
+ . " assignment=". $assignment_list[$j]['assignment']
+ . " ORDER by date DESC";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $activity = $this->db2->f('activity');
+ $date = $this->db2->f('date');
+ $sql = "SELECT * FROM eq_participation where "
+ . " activity=" . $activity
+ . " AND elder=". $elder_id[$i];
+ $this->db3->query($sql,__LINE__,__FILE__);
+ if($this->db3->next_record()) {
+ $date_part = $date;
+ }
+ }
+
if($this->db->f('willing') == 'y') {
$total_willing[$j]++;
- $willing_table .= '
| ';
+ $elder_willing=1;
+ $willing_table .= ' '.$date_part.' | ';
}
else if($this->db->f('willing') == 'n') {
$willing_table .= ' | ';
}
else {
+ $elder_willing=1;
$willing_table .= " | ";
}
}
if(!$found_willingness) {
+ $elder_willing=1;
$willing_table .= " | ";
}
}
- $this->t->set_var('willing_table',$willing_table);
- $this->t->fp('list2','elder_list',True);
+ if(($elder_willing == 1) || ($filter_unwilling == 'n')) {
+ $this->t->set_var('willing_table',$willing_table);
+ $this->t->fp('list2','elder_list',True);
+ $this->nextmatchs->template_alternate_row_color(&$this->t);
+ }
}
$stat_table = 'Total Willing to Serve | ';
for ($j=0; $j < count($assignment_list); $j++) {
- $stat_table .= "".$total_willing[$j]." | ";
+ $stat_table .= "".$total_willing[$j]." | ";
}
$this->t->set_var('stat_table',$stat_table);
@@ -1375,6 +1431,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 {
@@ -1497,6 +1554,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);
@@ -1649,6 +1707,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 " .
@@ -1848,24 +1907,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.= ' | ';
}
- $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';
@@ -2167,7 +2231,7 @@ class eq
$families_with_yearly_visit++;
$date = $this->db2->f('date');
$vis_notes = $this->db2->f('notes');
- if(strlen($vis_notes) > 40) { $vis_notes = substr($vis_notes,0,40) . "..."; }
+ if(strlen($vis_notes) > 40) { $vis_notes = stripslashes(substr($vis_notes,0,40) . "..."); }
$completed_data.= "$name Family | ";
$completed_data.= "$phone | ";
$completed_data.= "$date | ";
@@ -2178,7 +2242,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 | ";
@@ -2368,28 +2432,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 . "'" .
@@ -2404,7 +2457,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__);
@@ -2718,7 +2771,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 . "'" .
@@ -2733,7 +2786,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__);
@@ -2931,7 +2984,7 @@ class eq
if($action == 'save')
{
- $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+ $notes = get_var('notes',array('POST'));
$this->db->query("UPDATE eq_visit set " .
" date='" . $date . "'" .
", notes='" . $notes . "'" .
@@ -2942,7 +2995,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__);
@@ -3485,40 +3538,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)
{
//Only perform a database update if we have made a change to this appointment
$sql = "SELECT * FROM eq_appointment where " .
"appointment='$appointment'" .
- "and elder='$elder'" .
- "and family='$family'" .
- "and date='$date'" .
- "and time='$time'";
+ " and presidency='$presidency'" .
+ " and elder='$elder'" .
+ " and family='$family'" .
+ " and date='$date'" .
+ " and time='$time'";
$this->db->query($sql,__LINE__,__FILE__);
if(!$this->db->next_record()) {
- $this->db->query("UPDATE eq_appointment set" .
+ $old_date = $this->db->f('date');
+ $old_time = $this->db->f('time');
+ $this->db2->query("UPDATE eq_appointment set" .
" family=" . $family .
" ,elder=" . $elder .
" ,date='" . $date . "'" .
" ,time='" . $time . "'" .
+ " ,presidency='" . $presidency . "'" .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
// Email the appointment
- if(($date != "") && ($time != "")) {
- $this->email_appt($appointment);
- }
+ $this->email_appt($appointment);
}
}
// Add a new appointment
- else if(($appointment == 0) && ($date != "") && ($time != ""))
+ else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
{
- $this->db->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time,uid) "
- . "VALUES ('" . $appointment . "','" . $presidency . "','" . $family . "','"
+ //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'));
+ }
+ }
}
}
}
@@ -3652,59 +3729,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.= '';
- }
- $table_data.= '';
- $table_data.= ' : ';
- $table_data.= '';
- $table_data.= '';
- foreach(range(0,3) as $num) {
- $num = $num * 15; if($num == 0) { $num = "00"; }
- $table_data.= '';
- }
- $table_data.= '';
- $table_data.= '';
- $table_data.= '';
- $table_data.= '';
- $table_data.= '';
- $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.= '';
- }
- $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.= '';
- }
- $table_data.=' | ';
-
- $table_data.= '';
- $table_data.= '';
+ // Time selection
+ $table_data.= "";
+ $table_data.= '';
+ $table_data.= '';
+ foreach(range(1,12) as $num) {
+ $table_data.= '';
+ }
+ $table_data.= '';
+ $table_data.= ' : ';
+ $table_data.= '';
+ $table_data.= '';
+ foreach(range(0,3) as $num) {
+ $num = $num * 15; if($num == 0) { $num = "00"; }
+ $table_data.= '';
+ }
+ $table_data.= '';
+ $table_data.= '';
+ $table_data.= '';
+ $table_data.= '';
+ $table_data.= '';
+ $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.= '';
+ }
+ $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.= '';
+ }
+ $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);