projects
/
eq
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix some filtering of visit data like families to visit so they only list the ones...
[eq/.git]
/
inc
/
class.tc.inc.php
diff --git
a/inc/class.tc.inc.php
b/inc/class.tc.inc.php
index 93d8aedbbedff77584ba1b739f22b5fdca9167cf..2a7310975746abfcf381838cfcde17e37f1455d9 100644
(file)
--- a/
inc/class.tc.inc.php
+++ b/
inc/class.tc.inc.php
@@
-1540,7
+1540,7
@@
class tc
// PPI SCHEDULING TABLE
// TODO: changed this so it picks the quorum dynamically
// PPI SCHEDULING TABLE
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_indiv where valid=1 and steward='Elder' ORDER BY ppi_pri ASC";
+ $sql = "SELECT * FROM tc_indiv where valid=1 and steward='Elder' ORDER BY ppi_pri ASC
, name ASC
";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
@@
-2085,7
+2085,7
@@
class tc
$year = date('Y');
// create the family id -> family name mapping
$year = date('Y');
// create the family id -> family name mapping
- $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0 ORDER BY name ASC";
+ $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0
and companionship != 0
ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$family_id = NULL;
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$family_id = NULL;
@@
-2229,7
+2229,7
@@
class tc
// VISIT SCHEDULING TABLE
// VISIT SCHEDULING TABLE
- $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0
ORDER BY visit_pri
ASC";
+ $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0
and companionship != 0 ORDER BY visit_pri ASC, name
ASC";
$this->db->query($sql,__LINE__,__FILE__);
$total_families=0; $families_with_yearly_visit=0;
$this->db->query($sql,__LINE__,__FILE__);
$total_families=0; $families_with_yearly_visit=0;