X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=aab3ffd61d40b3792059fcc712c4cdb8d8e1d6e7;hb=0a859add5e1ba3f0f19114fb7cde8d93fbf61097;hp=0512ca0c74d492a201e542759d9edafefd8c81ca;hpb=fe1acd0acba1dabf6685fed613bf21f967c2b25d;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 0512ca0..aab3ffd 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -23,6 +23,8 @@ class eq
var $default_ppi_num_months;
var $default_ppi_num_years;
var $default_att_num_months;
+ var $current_year;
+ var $current_month;
var $public_functions = array
(
@@ -43,10 +45,10 @@ class eq
function eq()
{
- $this->default_ht_num_months = 1;
- $this->default_ppi_num_months = 1;
+ $this->default_ht_num_months = 3;
+ $this->default_ppi_num_months = 3;
$this->default_ppi_num_years = 0;
- $this->default_att_num_months = 1;
+ $this->default_att_num_months = 3;
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
@@ -64,6 +66,12 @@ class eq
$GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools';
$GLOBALS['phpgw']->common->phpgw_header();
+
+ $this->current_month = `date '+%m'`;
+ $this->current_month = $this->current_month-0; // Make it numeric
+ $this->current_year = `date '+%Y'`;
+ $this->current_year = $this->current_year-0; // Make it numeric
+
echo parse_navbar();
$this->display_app_header();
}
@@ -128,7 +136,7 @@ class eq
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ht_view'));
$this->t->set_var('title','Hometeaching');
-
+
$sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
@@ -216,6 +224,7 @@ class eq
// Get the names of the families assigned this home teaching companionship
$sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
+ $sql = $sql . " ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$k=0;
while ($this->db->next_record())
@@ -229,10 +238,14 @@ class eq
// in the past $num_months for this Family
$header_row="| Families | ";
for($m=$num_months; $m >= 0; $m--) {
- if(`date '+%d'` == 31) { $d = 1; } else { $d = 0; }
- $month = date('m/Y', strtotime('-'.$m.' month -'.$d.' day'));
- $month_start = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_start .= "-01";
- $month_end = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_end .= "-31";
+ $month = $this->current_month - $m;
+ $year = $this->current_year;
+ if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; }
+ if($month < 10) { $month = "0"."$month"; }
+ $month_start = "$year"."-"."$month"."-"."01";
+ $month_end = "$year"."-"."$month"."-"."31";
+ $month = "$month"."/"."$year";
+ //print "m: $m month: $month year: $year month_start: $month_start month_end: $month_end
";
// Add this to the query to filter on only visits made by this companionship:
// " AND companionship=" . $unique_companionships[$j]['companionship'].
$sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
@@ -328,7 +341,7 @@ class eq
if($action == 'save')
{
// Get a list of all the companionships in this district
- $sql = "SELECT distinct companionship FROM eq_companionship where district=". $district;
+ $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
$this->db->query($sql,__LINE__,__FILE__);
$j=0;
while ($this->db->next_record())
@@ -344,7 +357,9 @@ class eq
// companionship. This will lead to duplicate visits being entered for an older
// month for the same family, making it impossible to change the past history once
// a family is reassigned. However, you will be able to view the history just fine.
-
+
+ //$comp=$unique_companionships[$j]['companionship'];
+ //print "deleting from eq_visit where companionship=$comp and date=$date and district=$district
";
// Delete all the visits that have taken place for all families for this month
$this->db->query("DELETE from eq_visit where companionship=" . $unique_companionships[$j]['companionship'] .
" AND " . "date='" . $date . "'",__LINE__,__FILE__);
@@ -439,6 +454,7 @@ class eq
// Get the names of the families assigned this home teaching companionship
$sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
+ $sql = $sql . " ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
@@ -859,10 +875,16 @@ class eq
$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');
- if($eqpresppi == 0) { $i++; }
+ if($eqpresppi == 1 && $this->db->f('district') == 1) {
+ $districts[$i]['district'] = $this->db->f('district');
+ $districts[$i]['name'] = $this->db->f('name');
+ $districts[$i]['supervisor'] = $this->db->f('supervisor');
+ } else if($eqpresppi == 0) {
+ $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";
@@ -905,7 +927,7 @@ class eq
// Select all the unique companionship numbers for this district
if($eqpresppi == 1) {
- $sql = "SELECT distinct companionship FROM eq_companionship";
+ $sql = "SELECT distinct companionship FROM eq_companionship where valid=1";
}
else {
$sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
@@ -974,10 +996,13 @@ class eq
$header_row .= "$year | ";
}
else {
- if(`date '+%d'` == 31) { $d = 1; } else { $d = 0; }
- $month = date('m/Y', strtotime('-'.$m.' month -'.$d.' day'));
- $month_start = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_start .= "-01";
- $month_end = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_end .= "-31";
+ $month = $this->current_month - $m;
+ $year = $this->current_year;
+ if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; }
+ if($month < 10) { $month = "0"."$month"; }
+ $month_start = "$year"."-"."$month"."-"."01";
+ $month_end = "$year"."-"."$month"."-"."31";
+ $month = "$month"."/"."$year";
$sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ".
"AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id . " AND eqpresppi=0";
$this->db2->query($sql,__LINE__,__FILE__);
@@ -1725,9 +1750,35 @@ class eq
function dir_view()
{
- $this->t->set_file(array('form' => 'dir_view.tpl'));
+ $this->t->set_file(array('dir_view_t' => 'dir_view.tpl'));
+ $this->t->set_block('dir_view_t','dir_list','list');
- $this->t->pfp('out','form');
+ $sql = "SELECT * FROM eq_parent where valid=1 ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ while ($this->db->next_record())
+ {
+ $parent[$i]['id'] = $this->db->f('parent');
+ $parent[$i]['name'] = $this->db->f('name');
+ $parent[$i]['phone'] = $this->db->f('phone');
+ $parent[$i]['address'] = $this->db->f('address');
+ $i++;
+ }
+
+ for ($i=0; $i < count($parent); $i++)
+ {
+ $name = $parent[$i]['name'];
+ $phone = $parent[$i]['phone'];
+ $address = $parent[$i]['address'];
+ $this->t->set_var('name', $name);
+ $this->t->set_var('address', $address);
+ $this->t->set_var('phone', $phone);
+ $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+ $this->t->set_var('tr_color',$tr_color);
+ $this->t->fp('list','dir_list',True);
+ //print "$phone $name $address
";
+ }
+ $this->t->pfp('out','dir_view_t');
$this->save_sessiondata();
}