X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;ds=inline;f=inc%2Fclass.eq.inc.php;h=a5cc2b4df67691b13f929f8b6fb99894078d34d4;hb=c98a532f9ec4c806eda3e0a91ebbf7da6886102e;hp=3dac97e0e4e3ce2ecc1c5e4665740e756a2bd9d1;hpb=af61eec323981d19d4d95a90aa26fa761e904194;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 3dac97e..a5cc2b4 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -68,24 +68,15 @@ class eq
function eq()
{
- // LOCAL CONFIGURATION. PLEASE UPDATE AS APPROPRIATE.
- $this->upload_target_path = "/home/users/eqpres/eq_data";
- $this->script_path = "/usr/share/phpgroupware/eq/bin";
- $this->default_ht_num_months = 3;
- $this->default_ppi_num_months = 3;
- $this->default_ppi_num_years = 0;
- $this->default_int_num_quarters = 1;
- $this->default_int_num_years = 0;
- $this->default_att_num_quarters = 1;
- $this->default_vis_num_years = 1;
- $this->max_num_districts = 4;
- $this->time_drop_down_lists = 1;
- $this->time_drop_down_list_inc = 15;
- $this->default_visit_appt_duration = 45;
- $this->default_ppi_appt_duration = 30;
+ if(file_exists("setup/eq_config.local")) {
+ include("setup/eq_config.local");
+ } else {
+ include("setup/eq_config");
+ }
+
+ $this->script_path = "$this->application_path"."/bin";
$this->max_presidency_members = 99;
$this->max_appointments = 32768;
- // END LOCAL CONFIGURATION
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
@@ -303,12 +294,24 @@ class eq
$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'].
+
+ // First check to see if the currently assigned companionship has visited them
$sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
- " AND companionship!=0".
- " AND family=". $family_id;
+ " AND companionship=".$unique_companionships[$j]['companionship'].
+ " AND family=". $family_id;
+ $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->num_rows($query_id) == 0) {
+ // We did not find any visits made by the currently assigned companionship,
+ // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
+ $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+ " AND companionship!=0".
+ " AND family=". $family_id;
+ $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+ }
$this->db2->query($sql,__LINE__,__FILE__);
$link_data['menuaction'] = 'eq.eq.ht_update';
$link_data['date'] = $month_start;
@@ -409,16 +412,9 @@ class eq
}
for ($j=0; $j < count($unique_companionships); $j++)
{
- // FIXME: We won't be able to go back and edit history on families that have been
- // reassigned to a different companionship. The following delete command will not delete
- // the history of visits under an older companionship, only the ones for the existing
- // 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
+ // Delete all the visits that have taken place for all families for this companionsthip for this month
$this->db->query("DELETE from eq_visit where companionship=" . $unique_companionships[$j]['companionship'] .
" AND " . "date='" . $date . "'",__LINE__,__FILE__);
}
@@ -523,10 +519,21 @@ class eq
$table_data.="
$family_name Family | ";
$header_row="Families | ";
+
+ // First check to see if the currently assigned companionship has visited them
$sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+ " AND companionship=".$unique_companionships[$j]['companionship'].
+ " AND family=". $family_id;
+ $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->num_rows($query_id) == 0) {
+ // We did not find any visits made by the currently assigned companionship,
+ // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
+ $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship!=0".
" AND family=". $family_id;
- $this->db2->query($sql,__LINE__,__FILE__);
+ $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+ }
+
$value = $family_id . "/" . $unique_companionships[$j]['companionship'] . "/" . $date;
$header_row .= "$month | ";
if(!$total_visits) { $total_visits = 0; }
@@ -1908,19 +1915,19 @@ class eq
}
// If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list
- $sql = "SELECT * FROM eq_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' ".
+ $sql = "SELECT * FROM eq_ppi WHERE date >= '$quarter_start' AND date < '$quarter_end' ".
"AND elder=" . $id;
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM eq_interview WHERE elder=" . $id . " ORDER BY date DESC";
+ $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC";
$this->db3->query($sql,__LINE__,__FILE__);
if($this->db3->next_record()) { $date = $this->db3->f('date'); } else { $date = ""; }
$link_data['menuaction'] = 'eq.eq.int_update';
$link_data['elder'] = $id;
$link_data['aaronic'] = 0;
$link_data['name'] = $name;
- $link_data['interview'] = '';
+ $link_data['ppi'] = '';
$link_data['action'] = 'add';
$link_data['interviewer'] = $districts[$d]['supervisor'];
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
@@ -1952,7 +1959,7 @@ class eq
$link_data['elder'] = $this->db2->f('elder');
$link_data['aaronic'] = $this->db2->f('aaronic');
$link_data['name'] = $name;
- $link_data['interview'] = $this->db2->f('int');
+ $link_data['ppi'] = $this->db2->f('ppi');
$link_data['action'] = 'view';
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
$comps_with_quarterly_int++;
@@ -2385,7 +2392,7 @@ class eq
$year = date('Y') - $m;
$year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
$sql = "SELECT * FROM eq_ppi WHERE date > '$year_start' AND date < '$year_end' ".
- "AND elder=" . $id;
+ "AND elder=" . $id . " AND eqpresppi=1";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
@@ -2455,6 +2462,7 @@ class eq
$interviewer_name = $this->db2->f('name');
$this->t->set_var('interviewer',$interviewer . ' selected');
$this->t->set_var('interviewer_name',$interviewer_name);
+ $this->t->set_var('eqpresppi_checked','');
$this->t->fp('int_list','interviewer_list',True);
if($action == 'save')
@@ -2464,6 +2472,7 @@ class eq
" ppi='" . $ppi . "'" .
", interviewer='" . $interviewer . "'" .
", elder='" . $elder . "'" .
+ ", aaronic='" . $aaronic . "'" .
", date='" . $date . "'" .
", notes='" . $notes . "'" .
", eqpresppi='" . $eqpresppi . "'" .
@@ -2475,8 +2484,8 @@ class eq
if($action == 'insert')
{
$notes = get_var('notes',array('POST'));
- $this->db->query("INSERT INTO eq_ppi (interviewer,elder,date,notes,eqpresppi) "
- . "VALUES ('" . $interviewer . "','" . $elder . "','"
+ $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) "
+ . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
. $date . "','" . $notes . "','" . $eqpresppi ."')",__LINE__,__FILE__);
$this->ppi_view();
return false;
@@ -2492,6 +2501,7 @@ class eq
$this->t->set_var('date','');
$this->t->set_var('notes','');
$this->t->set_var('eqpresppi',$eqpresppi);
+ $this->t->set_var('eqpresppi_checked','checked');
$this->t->set_var('lang_done','Cancel');
$this->t->set_var('lang_action','Adding New PPI');
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&ppi='
@@ -2510,6 +2520,7 @@ class eq
$this->t->set_var('date',$this->db->f('date'));
$this->t->set_var('notes',$this->db->f('notes'));
$this->t->set_var('eqpresppi',$this->db->f('eqpresppi'));
+ if($this->db->f('eqpresppi') == 1) { $this->t->set_var('eqpresppi_checked','checked'); }
}
if($action == 'edit')
@@ -2663,7 +2674,7 @@ class eq
$link_data['elder'] = $elder_id;
$link_data['aaronic'] = $aaronic_id;
$link_data['name'] = $name;
- $link_data['interview'] = '';
+ $link_data['ppi'] = '';
$link_data['action'] = 'add';
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
$table_data.= "
---|
$name | ";
@@ -2678,7 +2689,7 @@ class eq
$month_start = "$year"."-"."$month"."-"."01";
$month_end = "$year"."-"."$month"."-"."31";
$month = "$month"."/"."$year";
- $sql = "SELECT * FROM eq_interview WHERE date >= '$month_start' AND date <= '$month_end' ".
+ $sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ".
"AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id;
$this->db2->query($sql,__LINE__,__FILE__);
$header_row .= "$month | ";
@@ -2694,7 +2705,7 @@ class eq
$link_data['elder'] = $elder_id;
$link_data['aaronic'] = $aaronic_id;
$link_data['name'] = $name;
- $link_data['interview'] = $this->db2->f('interview');
+ $link_data['ppi'] = $this->db2->f('ppi');
$link_data['action'] = 'view';
$date = $this->db2->f('date');
$date_array = explode("-",$date);
@@ -2711,17 +2722,22 @@ class eq
$table_data .= "
---|
|
";
}
$total_companionships += $num_companionships;
- $stat_data = "$num_companionships Companionships Interview Quarterly Totals: | ";
+ $stat_data = "
$num_companionships Companionships Interview Totals: | ";
+ // Print the hometeaching interview stats
for($m=$num_months; $m >=0; $m--) {
$month = $current_month - $m;
- if(($month % 3) == 1) { $quarter_total = $ints[$m]; }
- else { $quarter_total += $ints[$m]; }
- $percent = ceil(($quarter_total / $num_companionships)*100);
- $stat_data .= "$quarter_total $percent% | ";
+ if($month < 0) { $month = 12 + $month; } // Handle going backwards over a year boundary
+ $month_begins = $month % $this->monthly_hometeaching_interview_stats;
+ //print "$month % $this->monthly_hometeaching_interview_stats = $month_begins
";
+ if($this->monthly_hometeaching_interview_stats == 1) { $month_begins = 1; }
+ if(($month_begins) == 1) { $total = $ints[$m]; }
+ else { $total += $ints[$m]; }
+ $percent = ceil(($total / $num_companionships)*100);
+ $stat_data .= "$total $percent% | ";
}
$stat_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);
@@ -2729,18 +2745,21 @@ class eq
$this->t->fp('list','district_list',True);
}
- // Display the totals, cummulative per quarter
- $quarter_total = 0;
- $totals = "$total_companionships Total Comps Interview Quarterly Totals: | ";
+ // Display the totals
+ $total = 0;
+ $totals = "
$total_companionships Total Comps Interview Totals: | ";
for($m=$num_months; $m >=0; $m--) {
$month = $current_month - $m;
- if(($month % 3) == 1) { $quarter_total = $total_ints[$m]; }
- else { $quarter_total += $total_ints[$m]; }
- $percent = ceil(($quarter_total / $total_companionships)*100);
- $totals .= "$quarter_total $percent% | ";
+ if($month < 0) { $month = 12 + $month; } // Handle going backwards over a year boundary
+ $month_begins = $month % $this->monthly_hometeaching_interview_stats;
+ if($this->monthly_hometeaching_interview_stats == 1) { $month_begins = 1; }
+ if(($month_begins) == 1) { $total = $total_ints[$m]; }
+ else { $total += $total_ints[$m]; }
+ $percent = ceil(($total / $total_companionships)*100);
+ $totals .= "$total $percent% | ";
}
$totals .= "
";
-
+
$this->t->set_var('totals',$totals);
$this->t->pfp('out','int_view_t');
$this->save_sessiondata();
@@ -2756,16 +2775,18 @@ class eq
$this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view'));
$this->t->set_var('readonly','');
$this->t->set_var('disabled','');
+ $this->t->set_var('eqpresppi_checked','');
$action = get_var('action',array('GET','POST'));
$companionship = get_var('companionship',array('GET','POST'));
$interviewer = get_var('interviewer',array('GET','POST'));
$name = get_var('name',array('GET','POST'));
- $interview = get_var('interview',array('GET','POST'));
+ $ppi = get_var('ppi',array('GET','POST'));
$elder = get_var('elder',array('GET','POST'));
$aaronic = get_var('aaronic',array('GET','POST'));
$date = get_var('date',array('GET','POST'));
$notes = get_var('notes',array('GET','POST'));
+ $eqpresppi = get_var('eqpresppi',array('GET','POST'));
$sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
$this->db->query($sql,__LINE__,__FILE__);
@@ -2789,14 +2810,15 @@ class eq
if($action == 'save')
{
$notes = get_var('notes',array('POST'));
- $this->db->query("UPDATE eq_interview set " .
- " interview='" . $interview . "'" .
+ $this->db->query("UPDATE eq_ppi set " .
+ " ppi='" . $ppi . "'" .
", interviewer='" . $interviewer . "'" .
", elder='" . $elder . "'" .
", aaronic='" . $aaronic . "'" .
", date='" . $date . "'" .
", notes='" . $notes . "'" .
- " WHERE interview=" . $interview,__LINE__,__FILE__);
+ ", eqpresppi='" . $eqpresppi . "'" .
+ " WHERE ppi=" . $ppi,__LINE__,__FILE__);
$this->int_view();
return false;
}
@@ -2804,9 +2826,9 @@ class eq
if($action == 'insert')
{
$notes = get_var('notes',array('POST'));
- $this->db->query("INSERT INTO eq_interview (interviewer,elder,aaronic,date,notes) "
+ $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) "
. "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
- . $date . "','" . $notes ."')",__LINE__,__FILE__);
+ . $date . "','" . $notes ."','" . $eqpresppi . "')",__LINE__,__FILE__);
$this->int_view();
return false;
}
@@ -2814,7 +2836,7 @@ class eq
if($action == 'add')
{
$this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options));
- $this->t->set_var('interview', '');
+ $this->t->set_var('ppi', '');
$this->t->set_var('interviewer', $interviewer);
$this->t->set_var('name',$name);
$this->t->set_var('elder',$elder);
@@ -2823,22 +2845,23 @@ class eq
$this->t->set_var('notes','');
$this->t->set_var('lang_done','Cancel');
$this->t->set_var('lang_action','Adding New Interview');
- $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
- . $interview . '&action=' . 'insert'));
+ $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
+ . $ppi . '&action=' . 'insert'));
}
if($action == 'edit' || $action == 'view')
{
- $sql = "SELECT * FROM eq_interview WHERE interview=".$interview;
+ $sql = "SELECT * FROM eq_ppi WHERE ppi=".$ppi;
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
- $this->t->set_var('interview',$interview);
+ $this->t->set_var('ppi',$ppi);
$this->t->set_var('name',$name);
$this->t->set_var('interviewer', $this->db->f('interviewer'));
$this->t->set_var('elder',$this->db->f('elder'));
$this->t->set_var('aaronic',$this->db->f('aaronic'));
$this->t->set_var('date',$this->db->f('date'));
$this->t->set_var('notes',$this->db->f('notes'));
+ if($this->db->f('eqpresppi') == 1) { $this->t->set_var('eqpresppi_checked','checked'); }
}
if($action == 'edit')
@@ -2846,8 +2869,8 @@ class eq
$this->t->set_var('cal_date',$this->jscal->input('date',$date,'','','','','',$this->cal_options));
$this->t->set_var('lang_done','Cancel');
$this->t->set_var('lang_action','Editing Interview');
- $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
- . $interview . '&action=' . 'save'));
+ $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
+ . $ppi . '&action=' . 'save'));
}
if($action == 'view')
@@ -2858,8 +2881,8 @@ class eq
$this->t->set_var('disabled','DISABLED');
$this->t->set_var('lang_done','Done');
$this->t->set_var('lang_action','Viewing Interview');
- $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
- . $interview . '&action=' . 'edit'));
+ $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
+ . $ppi . '&action=' . 'edit'));
}
$this->t->set_var('lang_reset','Clear Form');
@@ -3860,12 +3883,11 @@ class eq
# unzip the data into this directory
print "-> Unzipping the data
\n";
- $data_file = $data_dir . '';
- exec('unzip ' . $data_dir . '/*.zip -d ' . $data_dir . ' 2>&1', $result, $return_code);
+ exec($this->unzip_path .' -u '. $data_dir . '/*.zip -d ' . $data_dir . ' 2>&1', $result, $return_code);
if($return_code != 0) {
print implode('\n',$result) . "
";
print "";
- print "-E- Unable to unzip the uploaded file into the data dir. Aborting import.";
+ print "-E- Unable to unzip the uploaded file into the data dir: $data_dir. Aborting import.";
print "";
return 0;
}