From fcd809d95772f33ac232309c3caa3d0c85307963 Mon Sep 17 00:00:00 2001 From: Alan Jack Pippin Date: Sun, 26 Nov 2006 22:28:56 -0700 Subject: [PATCH] Added new vis_sched and schedule tools. Fixed import bug related to finding a family_id for parent records. --- import_ward_data | 38 +- inc/class.eq.inc.php | 642 +++++++++++++++++++++++++++++++- templates/default/header.tpl | 7 + templates/default/ppi_sched.tpl | 34 ++ templates/default/schedule.tpl | 45 +++ templates/default/vis_sched.tpl | 93 +++++ templates/default/vis_view.tpl | 6 + 7 files changed, 842 insertions(+), 23 deletions(-) create mode 100644 templates/default/schedule.tpl create mode 100644 templates/default/vis_sched.tpl diff --git a/import_ward_data b/import_ward_data index 8cf3d0d..423223b 100755 --- a/import_ward_data +++ b/import_ward_data @@ -135,9 +135,7 @@ sub update_eq_aaronic_table #| name | varchar(60) | YES | | NULL | | #| phone | varchar(12) | YES | | NULL | | #| ppi_pri | int(10) unsigned | YES | | 1 | | -#| visit_pri | int(10) unsigned | YES | | 1 | | #| ppi_notes | varchar(128) | YES | | NULL | | -#| visit_notes | varchar(128) | YES | | NULL | | #| valid | tinyint(1) | YES | | NULL | | #+-------------+------------------+------+-----+---------+----------------+ sub update_eq_elder_table @@ -165,7 +163,7 @@ sub update_eq_elder_table if($rows == 0) { # No existing records found for this elder, make a new entry print " Adding new Elder: $elder_name\n"; - $sth = $dbh->prepare("insert into eq_elder values (NULL,'$elder_name','$phone','1','1','','',1)"); + $sth = $dbh->prepare("insert into eq_elder values (NULL,'$elder_name','$phone','1','',1)"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; } elsif($rows == 1) { # An existing record was found for this elder, update it @@ -354,6 +352,8 @@ sub update_eq_companionship_table #| name | varchar(30) | YES | | NULL | | #| name_id | varchar(30) | YES | | NULL | | #| companionship | int(16) unsigned | YES | | NULL | | +#| visit_pri | int(10) unsigned | YES | | 1 | | +#| visit_notes | varchar(128) | YES | | NULL | | #| valid | tinyint(1) | YES | | NULL | | #+---------------+------------------+------+-----+---------+-------+ sub update_eq_family_table @@ -386,7 +386,7 @@ sub update_eq_family_table if($rows == 0) { # No existing records found for this family, make a new entry print " Adding new Family: $family_name\n"; - $sth = $dbh->prepare("insert into eq_family values (NULL,$id,'$family_name','$name_id','0',1)"); + $sth = $dbh->prepare("insert into eq_family values (NULL,$id,'$family_name','$name_id','0',1,1,'')"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; } elsif($rows == 1) { # An existing record was found for this family, update it @@ -475,11 +475,14 @@ sub update_eq_parent_table } # Find the family id for this parent's HofH_ID. - $sth = $dbh->prepare("select * from eq_family where hofh_id='$hofh_id'"); + $sth = $dbh->prepare("select * from eq_family where hofh_id='$hofh_id' and valid=1"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; - $sqlhashref = $sth->fetchrow_hashref(); - $family_id = $sqlhashref->{'family'}; - + my @family_data = (); + while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); } + my $family_rows = scalar @family_data; + if($family_rows > 0) { $family_id = $family_data[0]->{'family'}; } + else { $family_id = 0; } + # Find out how many parents match this parent's name $sth = $dbh->prepare("select * from eq_parent where name='$parent_name'"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; @@ -487,12 +490,12 @@ sub update_eq_parent_table while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); } my $rows = scalar @data; - if($rows == 0) { + if($rows == 0 && $family_rows > 0) { # No existing records found for this parent, make a new entry print " Adding new Parent: $parent_name\n"; $sth = $dbh->prepare("insert into eq_parent values (NULL,$family_id,'$parent_name','$year-$month-$day','$phone','$address','$id',1)"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; - } elsif($rows == 1) { + } elsif($rows == 1 && $family_rows > 0) { # An existing record was found for this parent, update it print " Updating existing parent: $parent_name\n"; $sth = $dbh->prepare("update eq_parent set family='$family_id' where name='$parent_name'"); @@ -549,11 +552,14 @@ sub update_eq_child_table $hofh_id = $membership_data{$index}{'HofH ID'}; # Find the family id for this child's HofH_ID. - $sth = $dbh->prepare("select * from eq_family where hofh_id='$hofh_id'"); + $sth = $dbh->prepare("select * from eq_family where hofh_id='$hofh_id' and valid=1"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; - $sqlhashref = $sth->fetchrow_hashref(); - $family_id = $sqlhashref->{'family'}; - + my @family_data = (); + while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); } + my $family_rows = scalar @family_data; + if($family_rows > 0) { $family_id = $family_data[0]->{'family'}; } + else { $family_id = 0; } + # Find out how many children have the same name for the same family $sth = $dbh->prepare("select * from eq_child where name='$child_name'"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; @@ -561,12 +567,12 @@ sub update_eq_child_table while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); } my $rows = scalar @data; - if($rows == 0) { + if($rows == 0 && $family_rows > 0) { # No existing records found for this child, make a new entry print " Adding new Child: $child_name\n"; $sth = $dbh->prepare("insert into eq_child values (NULL,$family_id,'$child_name','$year-$month-$day','$id',1)"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; - } elsif($rows == 1) { + } elsif($rows == 1 && $family_rows > 0) { # An existing record was found for this child, update it print " Updating existing child: $child_name\n"; $sth = $dbh->prepare("update eq_child set family='$family_id' where name='$child_name'"); diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index c253f15..8802e75 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -39,12 +39,14 @@ class eq 'ppi_view' => True, 'ppi_update' => True, 'ppi_sched' => True, + 'vis_sched' => True, 'vis_view' => True, 'vis_update' => True, 'att_view' => True, 'att_update' => True, 'dir_view' => True, 'org_view' => True, + 'schedule' => True, 'admin' => True ); @@ -73,7 +75,9 @@ class eq $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools'; $GLOBALS['phpgw']->common->phpgw_header(); - + + $this->current_day = `date '+%d'`; + $this->current_day = $this->current_day-0; // Make it numeric $this->current_month = `date '+%m'`; $this->current_month = $this->current_month-0; // Make it numeric $this->current_year = `date '+%Y'`; @@ -130,6 +134,9 @@ class eq $link_data['menuaction'] = 'eq.eq.admin'; $this->t->set_var('link_admin',$GLOBALS['phpgw']->link('/eq/index.php',$link_data)); $this->t->set_var('lang_admin','Admin'); + $link_data['menuaction'] = 'eq.eq.schedule'; + $this->t->set_var('link_schedule',$GLOBALS['phpgw']->link('/eq/index.php',$link_data)); + $this->t->set_var('lang_schedule','Scheduling'); $this->t->pparse('out','eq_header'); } @@ -854,10 +861,11 @@ class eq function ppi_sched() { $this->t->set_file(array('ppi_sched_t' => 'ppi_sched.tpl')); - $this->t->set_block('ppi_sched_t','elder_list','list'); + $this->t->set_block('ppi_sched_t','elder_list','elderlist'); + $this->t->set_block('ppi_sched_t','appt_list','apptlist'); $action = get_var('action',array('GET','POST')); - $this->t->set_var('lang_save','Save Priorities & Notes'); + $this->t->set_var('lang_save','Save Appt / Pri / Notes'); $this->t->set_var('lang_reset','Clear Changes'); $this->t->set_var('ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_view')); @@ -885,6 +893,23 @@ class eq if($action == 'save') { + // Save any changes made to the appointment table + $new_data = get_var('appt_notes',array('POST')); + foreach ($new_data as $entry) + { + $elder = $entry['elder']; + $appointment = $entry['appointment']; + + //print "elder: $elder appointment: $appointment
"; + + // Perform database save actions here + $this->db->query("UPDATE eq_appointment set " . + " elder='" . $elder . "'" . + " WHERE appointment=" . $appointment,__LINE__,__FILE__); + + } + + // Save any changes made to the ppi notes table $new_data = get_var('ppi_notes',array('POST')); foreach ($new_data as $entry) { @@ -904,6 +929,73 @@ class eq Header('Location: ' . $take_me_to_url); } + // APPOINTMENT TABLE + $district = 1; + $date_width=150; $time_width=100; $elder_width=200; + $appt_table_width=$date_width + $time_width + $elder_width; + $appt_header_row = "Date"; + $appt_header_row.= "Time"; + $appt_header_row.= "Elder"; + $appt_table_data = ""; + + // create the elder id -> elder name mapping + $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY name ASC"; + $this->db->query($sql,__LINE__,__FILE__); + $i=0; + $elder_id = NULL; + $elder_name = NULL; + while ($this->db->next_record()) + { + $elder_name[$i] = $this->db->f('name'); + $elder_id[$i] = $this->db->f('elder'); + $i++; + } + array_multisort($elder_name, $elder_id); + + // query the database for all the appointments + $sql = "SELECT * FROM eq_appointment where district=$district and date>=CURDATE() ORDER BY date ASC, time ASC"; + $this->db->query($sql,__LINE__,__FILE__); + + while ($this->db->next_record()) + { + $appointment = $this->db->f('appointment'); + $elder = $this->db->f('elder'); + + $date = $this->db->f('date'); + $date_array = explode("-",$date); + $year = $date_array[0]; $month = $date_array[1]; $day = $date_array[2]; + $day_string = date("l d-M-Y", mktime(0,0,0,$month,$day,$year)); + + $time = $this->db->f('time'); + $time_array = explode(":",$time); + $time_string = date("g:i a", mktime($time_array[0], $time_array[1], $time_array[2])); + + $appt_table_data.= ""; + $appt_table_data.= "$day_string"; + $appt_table_data.= "$time_string"; + + $appt_table_data.= ''; + + $appt_table_data.= ''; + + $tr_color = $this->nextmatchs->alternate_row_color($tr_color); + $this->t->set_var('tr_color',$tr_color); + } + + $this->t->set_var('appt_table_data',$appt_table_data); + $this->t->set_var('appt_header_row',$appt_header_row); + $this->t->set_var('appt_table_width',$appt_table_width); + + + // PPI SCHEDULING TABLE $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY ppi_pri ASC"; $this->db->query($sql,__LINE__,__FILE__); @@ -1015,13 +1107,275 @@ class eq $this->t->set_var('completed_table_width',$completed_table_width); $this->t->set_var('completed',$completed_data); $this->t->set_var('totals',$totals_data); - $this->t->fp('list','elder_list',True); + $this->t->fp('elderlist','elder_list',True); + $this->t->fp('apptlist','appt_list',True); $this->t->pfp('out','ppi_sched_t'); $this->save_sessiondata(); } + function vis_sched() + { + $this->t->set_file(array('vis_sched_t' => 'vis_sched.tpl')); + $this->t->set_block('vis_sched_t','family_list','familylist'); + $this->t->set_block('vis_sched_t','appt_list','apptlist'); + $action = get_var('action',array('GET','POST')); + + $this->t->set_var('lang_save','Save Appt / Pri / Notes'); + $this->t->set_var('lang_reset','Clear Changes'); + + $this->t->set_var('vis_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_view')); + $this->t->set_var('vis_link_title','View Yearly Visits'); + + $this->t->set_var('schedule_vis_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched')); + $this->t->set_var('schedule_vis_link_title','Schedule Yearly Visits'); + + $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched&action=save')); + $this->t->set_var('title','EQ Presidency Yearly Visit Scheduler'); + + $family_width=500; $phone_width=40; $pri_width=10; $notes_width=128; $visit_date_width=20; + $table_width=$family_width + $phone_width + $pri_width + $notes_width + $visit_date_width; + $header_row = "Family Name"; + $header_row.= "Phone"; + $header_row.= "Priority"; + $header_row.= "Last Visit"; + $header_row.= "Scheduling Notes"; + $table_data=""; $completed_data=""; $totals_data=""; + + $year = date('Y'); + + if($action == 'save') + { + // Save any changes made to the appointment table + $new_data = get_var('appt_notes',array('POST')); + foreach ($new_data as $entry) + { + $family = $entry['family']; + $appointment = $entry['appointment']; + + // Perform database save actions here + $this->db->query("UPDATE eq_appointment set " . + " family='" . $family . "'" . + " WHERE appointment=" . $appointment,__LINE__,__FILE__); + + } + + // Save any changes made to the visit notes table + $new_data = get_var('vis_notes',array('POST')); + foreach ($new_data as $entry) + { + $visit_notes = $entry['notes']; + $family_id = $entry['family_id']; + $visit_pri = $entry['pri']; + + // Perform database save actions here + $this->db->query("UPDATE eq_family set " . + " visit_notes='" . $visit_notes . "'" . + ",visit_pri='" . $visit_pri . "'" . + " WHERE family=" . $family_id,__LINE__,__FILE__); + + } + + $take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched'); + Header('Location: ' . $take_me_to_url); + } + + // APPOINTMENT TABLE + $district = 4; + $date_width=150; $time_width=100; $family_width=250; + $appt_table_width=$date_width + $time_width + $family_width; + $appt_header_row = "Date"; + $appt_header_row.= "Time"; + $appt_header_row.= "Family"; + $appt_table_data = ""; + + // create the family id -> family name mapping + $sql = "SELECT * FROM eq_family where valid=1 and companionship != 0 ORDER BY name ASC"; + $this->db->query($sql,__LINE__,__FILE__); + $i=0; + $family_id = NULL; + while ($this->db->next_record()) + { + $family_id[$i] = $this->db->f('family'); + $family_name[$i] = $this->db->f('name'); + $i++; + } + array_multisort($family_name, $family_id); + + // query the database for all the appointments + $sql = "SELECT * FROM eq_appointment where district=$district and date>=CURDATE() ORDER BY date ASC, time ASC"; + $this->db->query($sql,__LINE__,__FILE__); + + while ($this->db->next_record()) + { + $appointment = $this->db->f('appointment'); + $family = $this->db->f('family'); + + $date = $this->db->f('date'); + $date_array = explode("-",$date); + $year = $date_array[0]; $month = $date_array[1]; $day = $date_array[2]; + $day_string = date("l d-M-Y", mktime(0,0,0,$month,$day,$year)); + + $time = $this->db->f('time'); + $time_array = explode(":",$time); + $time_string = date("g:i a", mktime($time_array[0], $time_array[1], $time_array[2])); + + $appt_table_data.= ""; + $appt_table_data.= "$day_string"; + $appt_table_data.= "$time_string"; + + $appt_table_data.= ''; + + $appt_table_data.= ''; + + $tr_color = $this->nextmatchs->alternate_row_color($tr_color); + $this->t->set_var('tr_color',$tr_color); + } + + $this->t->set_var('appt_table_data',$appt_table_data); + $this->t->set_var('appt_header_row',$appt_header_row); + $this->t->set_var('appt_table_width',$appt_table_width); + + + // VISIT SCHEDULING TABLE + $sql = "SELECT * FROM eq_family where valid=1 and companionship != 0 ORDER BY visit_pri ASC"; + $this->db->query($sql,__LINE__,__FILE__); + + $total_families=0; $families_with_yearly_visit=0; + + $i=0; + $family_id = NULL; + $family_name = NULL; + $family_phone = NULL; + $family_visit_pri = NULL; + $family_visit_notes = NULL; + while ($this->db->next_record()) + { + $family_id[$i] = $this->db->f('family'); + $family_name[$i] = $this->db->f('name'); + $family_phone[$family_id[$i]] = $family_id[$i] . " ERROR"; + $family_visit_pri[$family_id[$i]] = $this->db->f('visit_pri'); + $family_visit_notes[$family_id[$i]] = $this->db->f('visit_notes'); + $i++; + $total_families++; + } + + $sql = "SELECT * FROM eq_parent where valid=1"; + $this->db->query($sql,__LINE__,__FILE__); + while ($this->db->next_record()) + { + $family = $this->db->f('family'); + $phone = $this->db->f('phone'); + $family_phone[$family] = $phone; + } + + $max = count($family_id); + + for($i=0; $i < $max; $i++) { + $id = $family_id[$i]; + $name = $family_name[$i]; + $phone = $family_phone[$id]; + $vis_pri = $family_visit_pri[$id]; + $vis_notes = $family_visit_notes[$id]; + + // If this family has had a yearly visit this year, don't show them on the schedule list + $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01"; + $sql = "SELECT * FROM eq_visit WHERE date > '$year_start' AND date < '$year_end' ". + "AND family=" . $id . " AND companionship=0"; + $this->db2->query($sql,__LINE__,__FILE__); + + if(!$this->db2->next_record()) { + $sql = "SELECT * FROM eq_visit WHERE family=" . $id . " AND companionship=0 ORDER BY date DESC"; + $this->db->query($sql,__LINE__,__FILE__); + if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; } + $table_data.= "$name Family"; + $table_data.= "$phone"; + $table_data.= ""; + $table_data.= ''; + $table_data.= "$date"; + $table_data.= ''; + $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); + } else { + $link_data['menuaction'] = 'eq.eq.vis_update'; + $link_data['visit'] = $this->db2->f('visit'); + $link_data['family'] = $this->db2->f('family'); + $link_data['name'] = $name; + $link_data['date'] = $this->db2->f('date'); + $link_data['action'] = 'view'; + $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); + $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) . "..."; } + $completed_data.= "$name Family"; + $completed_data.= "$phone"; + $completed_data.= "$date"; + $completed_data.= "$vis_notes"; + $completed_data.= ''; + $tr_color2 = $this->nextmatchs->alternate_row_color($tr_color2); + $this->t->set_var('tr_color2',$tr_color2); + } + } + + $name_width=175; $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"; + $completed_header_row.= "Date"; + $completed_header_row.= "Visit Notes"; + + $family_width=300; $totals_width=100; + $totals_table_width=$family_width + $totals_width; + $totals_header_row = "Families"; + $totals_header_row.= "$year"; + $totals_data.= ""; + $totals_data.= "Total Families with yearly Visits completed:"; + $totals_data.= "$families_with_yearly_visit / $total_families"; + $percent = ceil(($families_with_yearly_visit / $total_families)*100); + $tr_color = $this->nextmatchs->alternate_row_color($tr_color); + $this->t->set_var('tr_color',$tr_color); + $totals_data.= ""; + $totals_data.= "Percentage:"; + $totals_data.= "$percent%"; + $totals_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->set_var('totals_header_row',$totals_header_row); + $this->t->set_var('totals_table_width',$totals_table_width); + $this->t->set_var('completed_header_row',$completed_header_row); + $this->t->set_var('completed_table_width',$completed_table_width); + $this->t->set_var('completed',$completed_data); + $this->t->set_var('totals',$totals_data); + $this->t->fp('familylist','family_list',True); + $this->t->fp('apptlist','appt_list',True); + + $this->t->pfp('out','vis_sched_t'); + $this->save_sessiondata(); + + } + function ppi_view() { $this->t->set_file(array('ppi_view_t' => 'ppi_view.tpl')); @@ -1449,6 +1803,13 @@ class eq $this->t->set_var('lang_name','Family Name'); $this->t->set_var('lang_date','Date'); + + $this->t->set_var('vis_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_view')); + $this->t->set_var('vis_link_title','View Yearly Visits'); + + $this->t->set_var('schedule_vis_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched')); + $this->t->set_var('schedule_vis_link_title','Schedule Yearly Visits'); + $sql = "SELECT * FROM eq_visit WHERE companionship=0 ORDER BY date DESC"; $this->db->query($sql,__LINE__,__FILE__); @@ -2037,7 +2398,271 @@ class eq $this->t->pfp('out','org_view_t'); $this->save_sessiondata(); } + + function schedule() + { + $this->t->set_file(array('sched_t' => 'schedule.tpl')); + $this->t->set_block('sched_t','district_list','list'); + + $action = get_var('action',array('GET','POST')); + + $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.schedule&action=save')); + $this->t->set_var('title','EQ Scheduling Tool'); + + $this->t->set_var('lang_save','Save Schedule'); + $this->t->set_var('lang_reset','Cancel'); + + $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched')); + $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs'); + + $this->t->set_var('schedule_vis_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched')); + $this->t->set_var('schedule_vis_link_title','Schedule Yearly Visits'); + + $date_width=150; $time_width=200; $elder_width=200; $family_width=200; + $table_width=$date_width + $time_width + $elder_width + $family_width; + $header_row = "Date"; + $header_row.= "Time"; + $header_row.= "Elder"; + $header_row.= "Family"; + $table_data = ""; + + if($action == 'save') + { + $new_data = get_var('sched',array('POST')); + foreach ($new_data as $district_array) + { + foreach ($district_array as $entry) + { + $district = $entry['district']; + $appointment = $entry['appointment']; + $date = $entry['date']; + $hour = $entry['hour']; + $minute = $entry['minute']; + $pm = $entry['pm']; + $elder = $entry['elder']; + $family = $entry['family']; + if($pm) { $hour = $hour + 12; } + $time = $hour.':'.$minute.':'.'00'; + + // Update an existing appointment + if($appointment != 0) + { + $this->db->query("UPDATE eq_appointment set" . + " family=" . $family . + " ,elder=" . $elder . + " ,date='" . $date . "'" . + " ,time='" . $time . "'" . + " WHERE appointment=" . $appointment,__LINE__,__FILE__); + + //print "updating entry: appt=$appointment date: $date time: $time elder: $elder family: $family
"; + } + + // Add a new appointment + else if(($appointment == 0) && ($date != "") && ($time != "")) + { + $this->db->query("INSERT INTO eq_appointment (appointment,district,family,elder,date,time) " + . "VALUES ('" . $appointment . "','" . $district . "','" . $family . "','" + . $elder . "','" . $date . "','" . $time ."')",__LINE__,__FILE__); + + //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family
"; + } + } + } + + $take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.schedule'); + Header('Location: ' . $take_me_to_url); + } + + $sql = "SELECT * FROM eq_district where district != 0 ORDER BY district ASC"; + $this->db->query($sql,__LINE__,__FILE__); + $i=0; + while ($this->db->next_record()) + { + $districts[$i]['district'] = $this->db->f('district'); + $districts[$i]['name'] = $this->db->f('name'); + $districts[$i]['supervisor'] = $this->db->f('supervisor'); + $i++; + } + + $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'); + $elder_phone[$elder_id[$i]] = $this->db->f('phone'); + $i++; + } + array_multisort($elder_name, $elder_id); + + $sql = "SELECT * FROM eq_family where valid=1 and companionship != 0 ORDER BY name ASC"; + $this->db->query($sql,__LINE__,__FILE__); + $i=0; + while ($this->db->next_record()) + { + $family_id[$i] = $this->db->f('family'); + $family_name[$i] = $this->db->f('name'); + $i++; + } + array_multisort($family_name, $family_id); + + for ($i=0; $i < count($districts); $i++) { + $district = $districts[$i]['district']; + $this->t->set_var('district_number',$districts[$i]['district']); + $this->t->set_var('district_name',$districts[$i]['name']); + $supervisor = $districts[$i]['supervisor']; + $table_data=""; + + // query the database for all the appointments + $sql = "SELECT * FROM eq_appointment where district=$district and date>=CURDATE() ORDER BY date ASC, time ASC"; + $this->db->query($sql,__LINE__,__FILE__); + + // Prefill any existing appointment slots + while ($this->db->next_record()) + { + $appointment = $this->db->f('appointment'); + $elder = $this->db->f('elder'); + $family = $this->db->f('family'); + + $date = $this->db->f('date'); + $date_array = explode("-",$date); + $year = $date_array[0]; $month = $date_array[1]; $day = $date_array[2]; + $day_string = date("l d-M-Y", mktime(0,0,0,$month,$day,$year)); + + $time = $this->db->f('time'); + $time_array = explode(":",$time); + $hour = $time_array[0]; + $minute = $time_array[1]; + $pm = 0; + if($hour > 12) { $pm=1; $hour = $hour - 12; } + $time_string = date("g:i a", mktime($time_array[0], $time_array[1], $time_array[2])); + + $table_data.= ""; + + // Date selection + $table_data.= ''; + $table_data.= $this->jscal->input('sched['.$district.']['.$appointment.'][date]',$date,'','','','','',$this->cal_options); + $table_data.= ''; + + // Hour & Minutes selection + $table_data.= ""; + $table_data.= ''; + $table_data.= ' : '; + $table_data.= ''; + $table_data.= ''; + $table_data.= ""; + + // Elder drop down list (for PPIs) + $table_data.= ''; + + // Family drop down list (for Visits) + $table_data.= ''; + + $table_data.= ''; + $table_data.= ''; + + $tr_color = $this->nextmatchs->alternate_row_color($tr_color); + $this->t->set_var('tr_color',$tr_color); + + } + + // Create blank appointment slot + $appointment = 0; + $table_data.= ""; + + // Date selection + $table_data.= ''; + $table_data.= $this->jscal->input('sched['.$district.']['.$appointment.'][date]','','','','','','',$this->cal_options); + $table_data.= ''; + + // Time selection + $table_data.= ""; + $table_data.= ''; + $table_data.= ' : '; + $table_data.= ''; + $table_data.= ''; + $table_data.= ""; + + // Elder drop down list + $table_data.= ''; + + // Family drop down list + $table_data.= ''; + $table_data.= ''; + $table_data.= ''; + + $this->t->set_var('table_data',$table_data); + $this->t->set_var('header_row',$header_row); + $this->t->set_var('table_width',$table_width); + $this->t->fp('list','district_list',True); + + } + + $this->t->pfp('out','sched_t'); + $this->save_sessiondata(); + } + function admin() { $this->t->set_file(array('admin_t' => 'admin.tpl')); @@ -2055,7 +2680,7 @@ class eq { $target_path = $this->upload_target_path . basename( $_FILES['uploadedfile']['name']); - if(($_FILES['uploadedfile']['type'] == "application/zip") && + if((($_FILES['uploadedfile']['type'] == "application/zip") || ($_FILES['uploadedfile']['type'] == "application/x-zip-compressed")) && (move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path))) { $uploadstatus = "The following file was uploaded successfully:

"; $uploadstatus.= "Filename : " . $_FILES['uploadedfile']['name'] . "
"; @@ -2136,14 +2761,17 @@ class eq $this->t->pfp('cmdhandle','cmd'); print ""; - } else if($_FILES['uploadedfile']['type'] != "application/zip") { + } else if(($_FILES['uploadedfile']['type'] != "application/zip") && + ($_FILES['uploadedfile']['type'] != "application/x-zip-compressed")) { $uploadstatus = "The file format must be a .zip file, please try again! "; + $uploadstatus.= "

Detected file format: " . $_FILES['uploadedfile']['type'] . ""; $this->t->set_var('uploadstatus',$uploadstatus); - + $this->t->pfp('uploadhandle','upload',True); } else { $uploadstatus = " There was an error (" . $_FILES['uploadedfile']['error']; $uploadstatus.= ") uploading the file, please try again! "; $this->t->set_var('uploadstatus',$uploadstatus); + $this->t->pfp('uploadhandle','upload',True); } } else diff --git a/templates/default/header.tpl b/templates/default/header.tpl index 3e109a4..59fd827 100644 --- a/templates/default/header.tpl +++ b/templates/default/header.tpl @@ -29,9 +29,16 @@ {lang_org}     + {lang_schedule} +   +   {lang_admin} + + + + diff --git a/templates/default/ppi_sched.tpl b/templates/default/ppi_sched.tpl index f3ce6d7..cb4dc1b 100644 --- a/templates/default/ppi_sched.tpl +++ b/templates/default/ppi_sched.tpl @@ -16,6 +16,32 @@
+ + + + + + {appt_header_row} + {appt_table_data} + + + +
+ Yearly PPI Appointment Slots +
+ + + + +
+ +     + + +
+ + + @@ -60,3 +86,11 @@
+ + + + + + + + diff --git a/templates/default/schedule.tpl b/templates/default/schedule.tpl new file mode 100644 index 0000000..8c2db3a --- /dev/null +++ b/templates/default/schedule.tpl @@ -0,0 +1,45 @@ +
+
+
+ + + +
{title}
+ + {schedule_vis_link_title} +   |   + {schedule_ppi_link_title} +

+ + + + + + + {header_row} + {table_data} + + + + +
+ District {district_number} : {district_name} : Appointment Slots +
+ + +
+

+ + + + + + + + + + + + + + diff --git a/templates/default/vis_sched.tpl b/templates/default/vis_sched.tpl new file mode 100644 index 0000000..51ccf37 --- /dev/null +++ b/templates/default/vis_sched.tpl @@ -0,0 +1,93 @@ +
+
+ + + + +
{title}
+ + {vis_link_title} +   |   + {schedule_vis_link_title} +

+ + + + + + + + + {appt_header_row} + {appt_table_data} + + + +
+ Yearly Visits Appointment Slots +
+ + + + +
+ +     + + +
+ + + + + + + + + {header_row} + {table_data} + + + + +
+ All Elders with Yearly Visit Not Completed +
+ +     + + +
+ + + + + + + {completed_header_row} + {completed} +
+ All Elders with Yearly Visit Completed +
+

+ + + + + + {totals_header_row} + {totals} +
+ Total EQ Presidency Yearly Visits +
+
+
+ + + + + + + + + diff --git a/templates/default/vis_view.tpl b/templates/default/vis_view.tpl index 4cffa74..b2e18f2 100644 --- a/templates/default/vis_view.tpl +++ b/templates/default/vis_view.tpl @@ -1,6 +1,12 @@
+ + {vis_link_title} +   |   + {schedule_vis_link_title} +

+

Presidency Visits

-- 2.34.1