X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=b1dbb23a16972777e4cf215dba8e16f1032f7eb0;hb=7af932f11f7025c37945987840922f1786c4de5c;hp=3478b4c36014dcbbaeda88919dc97a9909b0c352;hpb=0967829c83769fc860dcda312d5e9374159b5694;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 3478b4c..b1dbb23 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
(
@@ -38,7 +40,8 @@ class eq
'vis_update' => True,
'att_view' => True,
'att_update' => True,
- 'dir_view' => True
+ 'dir_view' => True,
+ 'org_view' => True
);
function eq()
@@ -64,6 +67,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();
}
@@ -109,6 +118,9 @@ class eq
$link_data['menuaction'] = 'eq.eq.dir_view';
$this->t->set_var('link_dir',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_dir','Directory');
+ $link_data['menuaction'] = 'eq.eq.org_view';
+ $this->t->set_var('link_org',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+ $this->t->set_var('lang_org','Callings');
$this->t->pparse('out','eq_header');
}
@@ -128,7 +140,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 +228,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 +242,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' ".
@@ -441,6 +458,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())
{
@@ -861,10 +879,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";
@@ -976,10 +1000,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__);
@@ -1759,6 +1786,72 @@ class eq
$this->save_sessiondata();
}
+ function org_view()
+ {
+ $this->t->set_file(array('org_view_t' => 'org_view.tpl'));
+ $this->t->set_block('org_view_t','calling_list','list1');
+ $this->t->set_block('org_view_t','org_list','list2');
+
+ # Display a list ordered alphabetically
+ $sql = "SELECT * FROM eq_calling ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ while ($this->db->next_record())
+ {
+ $calling[$i]['id'] = $this->db->f('indiv_id');
+ $calling[$i]['name'] = $this->db->f('name');
+ $calling[$i]['position'] = $this->db->f('position');
+ $calling[$i]['sustained'] = $this->db->f('sustained');
+ $calling[$i]['organization'] = $this->db->f('organization');
+ $i++;
+ }
+ for ($i=0; $i < count($calling); $i++)
+ {
+ $name = $calling[$i]['name'];
+ $position = $calling[$i]['position'];
+ $sustained = $calling[$i]['sustained'];
+ $organization = $calling[$i]['organization'];
+ $this->t->set_var('name', $name);
+ $this->t->set_var('position', $position);
+ $this->t->set_var('sustained', $sustained);
+ $this->t->set_var('organization', $organization);
+ $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+ $this->t->set_var('tr_color',$tr_color);
+ $this->t->fp('list1','calling_list',True);
+ }
+
+ # Display a list ordered by organization
+ $sql = "SELECT * FROM eq_calling ORDER BY sequence ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ while ($this->db->next_record())
+ {
+ $calling[$i]['id'] = $this->db->f('indiv_id');
+ $calling[$i]['name'] = $this->db->f('name');
+ $calling[$i]['position'] = $this->db->f('position');
+ $calling[$i]['sustained'] = $this->db->f('sustained');
+ $calling[$i]['organization'] = $this->db->f('organization');
+ $i++;
+ }
+ for ($i=0; $i < count($calling); $i++)
+ {
+ $name = $calling[$i]['name'];
+ $position = $calling[$i]['position'];
+ $sustained = $calling[$i]['sustained'];
+ $organization = $calling[$i]['organization'];
+ $this->t->set_var('name', $name);
+ $this->t->set_var('position', $position);
+ $this->t->set_var('sustained', $sustained);
+ $this->t->set_var('organization', $organization);
+ $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+ $this->t->set_var('tr_color',$tr_color);
+ $this->t->fp('list2','org_list',True);
+ }
+
+ $this->t->pfp('out','org_view_t');
+ $this->save_sessiondata();
+ }
+
}
?>