From 3863cd10053208a8b4203a228dd367d435fd0c5f Mon Sep 17 00:00:00 2001 From: Alan Jack Pippin Date: Sun, 7 Jan 2007 21:50:03 -0700 Subject: [PATCH] Added new elder_id field to the family table. Changed yearly visit search criteria on family table to only match families with elders in them. --- import_ward_data | 14 +++++++++++++- inc/class.eq.inc.php | 15 ++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/import_ward_data b/import_ward_data index 423223b..5d9b754 100755 --- a/import_ward_data +++ b/import_ward_data @@ -351,6 +351,7 @@ sub update_eq_companionship_table #| hofh_id | int(16) unsigned | YES | | NULL | | #| name | varchar(30) | YES | | NULL | | #| name_id | varchar(30) | YES | | NULL | | +#| elder_id | int(16) unsigned | YES | | NULL | | #| companionship | int(16) unsigned | YES | | NULL | | #| visit_pri | int(10) unsigned | YES | | 1 | | #| visit_notes | varchar(128) | YES | | NULL | | @@ -386,7 +387,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,1,'')"); + $sth = $dbh->prepare("insert into eq_family values (NULL,$id,'$family_name','$name_id','0','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 @@ -399,6 +400,17 @@ sub update_eq_family_table # More than one record was found. Error! This shouldn't happen. print " -E- More than one record found ($rows) for family name: $family_name\n"; } + + # Now update the elder_id field for this family + $sth = $dbh->prepare("select * from eq_elder WHERE name='$family_name'"); + $sth->execute or die "-E- DB error: $DBI::errstr\n"; + while($sqlhashref = $sth->fetchrow_hashref) { + $elder_id = $sqlhashref->{elder}; + print " Updating family elder_id: $family_name -> $elder_id\n"; + $sth = $dbh->prepare("update eq_family set elder_id=$elder_id where name_id='$name_id'"); + $sth->execute or die "-E- DB error: $DBI::errstr\n"; + } + # Now update the hometeaching field for this family foreach $index (keys %hometeaching_data) { diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index 8802e75..8058a9d 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -1191,7 +1191,7 @@ class eq $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"; + $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; $family_id = NULL; @@ -1247,7 +1247,7 @@ class eq // VISIT SCHEDULING TABLE - $sql = "SELECT * FROM eq_family where valid=1 and companionship != 0 ORDER BY visit_pri ASC"; + $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY visit_pri ASC"; $this->db->query($sql,__LINE__,__FILE__); $total_families=0; $families_with_yearly_visit=0; @@ -2496,7 +2496,7 @@ class eq } array_multisort($elder_name, $elder_id); - $sql = "SELECT * FROM eq_family where valid=1 and companionship != 0 ORDER BY name ASC"; + $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) @@ -2680,7 +2680,10 @@ class eq { $target_path = $this->upload_target_path . basename( $_FILES['uploadedfile']['name']); - if((($_FILES['uploadedfile']['type'] == "application/zip") || ($_FILES['uploadedfile']['type'] == "application/x-zip-compressed")) && + 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))) { $uploadstatus = "The following file was uploaded successfully:

"; $uploadstatus.= "Filename : " . $_FILES['uploadedfile']['name'] . "
"; @@ -2762,7 +2765,9 @@ class eq print ""; } else if(($_FILES['uploadedfile']['type'] != "application/zip") && - ($_FILES['uploadedfile']['type'] != "application/x-zip-compressed")) { + ($_FILES['uploadedfile']['type'] != "application/x-zip-compressed") && + ($_FILES['uploadedfile']['type'] != "application/x-zip") && + ($_FILES['uploadedfile']['type'] != "application/octet-stream")) { $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); -- 2.34.1