X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclass.tc.inc.php;h=8de0e856b0d29cded864d91961f4f7b7a5ec61ea;hb=17b6c5b5bedf4d243eb5aae967a14aece783f17b;hp=cf456d0a24c20ecf2607ec542459236a7cabcd76;hpb=e9ca9544dc03c8e3e554c619d1a5dcf8599cb65a;p=eq%2F.git
diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index cf456d0..8de0e85 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -15,6 +15,7 @@ class tc
{
var $db;
var $db2;
+ var $db3;
var $t;
var $nextmatchs;
var $grants;
@@ -258,7 +259,7 @@ class tc
$table_data.= "
$companion_table_entry
";
// Get the names of the families assigned this home teaching companionship
- $sql = "SELECT * from tc_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
+ $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.companionship=".$unique_companionships[$j]['companionship'];
$sql = $sql . " ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$k=0;
@@ -474,8 +475,8 @@ class tc
$table_data.= "
$companion_table_entry
";
// Get the names of the families assigned this home teaching companionship
- $sql = "SELECT * from tc_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
- $sql = $sql . " ORDER BY name ASC";
+ $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.companionship=".$unique_companionships[$j]['companionship'];
+ $sql = $sql . " ORDER BY ti.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$family_name = $this->db->f('name');
@@ -584,7 +585,7 @@ class tc
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$activity_list[$i]['name'] = $this->db2->f('name');
- $activity_list[$i]['code'] = $this->db2->f('code');
+ $activity_list[$i]['abbreviation'] = $this->db2->f('abbreviation');
}
$i++;
}
@@ -638,7 +639,7 @@ class tc
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$this->t->set_var('name', $this->db2->f('name'));
- $this->t->set_var('code', $this->db2->f('code'));
+ $this->t->set_var('abbreviation', $this->db2->f('abbreviation'));
}
$this->t->set_var('lang_name','Assignment');
$this->t->set_var('lang_date','Date');
@@ -792,7 +793,7 @@ class tc
while ($this->db->next_record()) {
$assignments[$i]['assignment'] = $this->db->f('assignment');
$assignments[$i]['name'] = $this->db->f('name');
- $assignments[$i]['code'] = $this->db->f('code');
+ $assignments[$i]['abbreviation'] = $this->db->f('abbreviation');
$i++;
}
@@ -870,7 +871,7 @@ class tc
$this->t->set_block('assign_view_t','assign_view','list');
$this->t->set_var('lang_name','Assignment Name');
- $this->t->set_var('lang_code','Code');
+ $this->t->set_var('lang_code','Abbreviation');
$sql = "SELECT * FROM tc_assignment ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
@@ -880,14 +881,14 @@ class tc
while ($this->db->next_record()) {
$assignment_list[$i]['assignment'] = $this->db->f('assignment');
$assignment_list[$i]['name'] = $this->db->f('name');
- $assignment_list[$i]['code'] = $this->db->f('code');
+ $assignment_list[$i]['abbreviation'] = $this->db->f('abbreviation');
$i++;
}
for ($i=0; $i < count($assignment_list); $i++) {
$this->nextmatchs->template_alternate_row_color(&$this->t);
$this->t->set_var('name',$assignment_list[$i]['name']);
- $this->t->set_var('code',$assignment_list[$i]['code']);
+ $this->t->set_var('abbreviation',$assignment_list[$i]['abbreviation']);
$link_data['menuaction'] = 'tc.tc.assign_update';
$link_data['assignment'] = $assignment_list[$i]['assignment'];
@@ -921,10 +922,10 @@ class tc
if($action == 'save') {
$assignment['name'] = get_var('name',array('POST'));
- $assignment['code'] = get_var('code',array('POST'));
+ $assignment['abbreviation'] = get_var('abbreviation',array('POST'));
$this->db->query("UPDATE tc_assignment set " .
" name='" . $assignment['name'] . "'" .
- ", code='" . $assignment['code'] . "'" .
+ ", abbreviation='" . $assignment['abbreviation'] . "'" .
" WHERE assignment=" . $assignment['assignment'],__LINE__,__FILE__);
$this->assign_view();
@@ -933,10 +934,10 @@ class tc
if($action == 'insert') {
$assignment['name'] = get_var('name',array('POST'));
- $assignment['code'] = get_var('code',array('POST'));
- $this->db->query("INSERT INTO tc_assignment (name,code) " .
+ $assignment['abbreviation'] = get_var('abbreviation',array('POST'));
+ $this->db->query("INSERT INTO tc_assignment (name,abbreviation) " .
"VALUES ('" . $assignment['name'] . "','" .
- $assignment['code'] . "')",__LINE__,__FILE__);
+ $assignment['abbreviation'] . "')",__LINE__,__FILE__);
$this->assign_view();
return false;
}
@@ -944,7 +945,7 @@ class tc
if($action == 'add') {
$assignment['assignment'] = 0;
$this->t->set_var('name','');
- $this->t->set_var('code','');
+ $this->t->set_var('abbreviation','');
$this->t->set_var('lang_done','Cancel');
$this->t->set_var('lang_action','Adding New Assignment');
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.assign_update&assignment=' .
@@ -957,7 +958,7 @@ class tc
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('name', $this->db->f('name'));
- $this->t->set_var('code', $this->db->f('code'));
+ $this->t->set_var('abbreviation', $this->db->f('abbreviation'));
$this->t->set_var('lang_done','Cancel');
$this->t->set_var('lang_action','Editing Assignment');
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.assign_update&assignment=' .
@@ -1012,7 +1013,7 @@ class tc
while($this->db->next_record()) {
$assignment_list[$i]['assignment'] = $this->db->f('assignment');
$assignment_list[$i]['name'] = $this->db->f('name');
- $assignment_list[$i]['code'] = $this->db->f('code');
+ $assignment_list[$i]['abbreviation'] = $this->db->f('abbreviation');
$i++;
}
@@ -1020,7 +1021,7 @@ class tc
$total_width=$individual_width+$part_width;
for ($i=0; $i < count($assignment_list); $i++) {
$this->t->set_var('assignment_name',$assignment_list[$i]['name']);
- $this->t->set_var('assignment_code',$assignment_list[$i]['code']);
+ $this->t->set_var('assignment_abbreviation',$assignment_list[$i]['abbreviation']);
$this->t->fp('list1','header_list',True);
$total_width += $assignment_width;
}
@@ -1112,7 +1113,7 @@ class tc
while($this->db->next_record()) {
$assignment_list[$i]['assignment'] = $this->db->f('assignment');
$assignment_list[$i]['name'] = $this->db->f('name');
- $assignment_list[$i]['code'] = $this->db->f('code');
+ $assignment_list[$i]['abbreviation'] = $this->db->f('abbreviation');
$i++;
}
@@ -1133,7 +1134,7 @@ class tc
for ($i=0; $i < count($assignment_list); $i++) {
$this->t->set_var('assignment_name',$assignment_list[$i]['name']);
- $this->t->set_var('assignment_code',$assignment_list[$i]['code']);
+ $this->t->set_var('assignment_abbreviation',$assignment_list[$i]['abbreviation']);
$this->t->fp('list1','header_list',True);
$total_width += $assignment_width;
$total_willing[$i] = 0;
@@ -1261,7 +1262,7 @@ class tc
while ($this->db->next_record()) {
$assignment = $this->db->f('assignment');
$assignment_name = $this->db->f('name');
- $assignment_code = $this->db->f('code');
+ $assignment_abbreviation = $this->db->f('abbreviation');
$this->nextmatchs->template_alternate_row_color(&$this->t);
$table_data.="
$assignment_name
";
@@ -1406,17 +1407,27 @@ class tc
}
// Save any changes made to the ppi notes table
- $new_data = get_var('ppi_notes',array('POST'));
+ $new_data = get_var('notes',array('POST'));
foreach ($new_data as $entry) {
- $ppi_notes = $entry['notes'];
+ $notes = $entry['notes'];
$individual = $entry['individual'];
- $ppi_pri = $entry['pri'];
+ $priority = $entry['pri'];
// Perform database save actions here
+ $sql = "SELECT * FROM tc_individual WHERE individual='$individual'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ if ($this->db->next_record()) {
+ $scheduling_priority = $this->db->f('scheduling_priority');
+ $this->db2->query("UPDATE tc_scheduling_priority SET priority='$priority' AND notes=\"$notes\" WHERE scheduling_priority='$scheduling_priority'", __LINE__, __FILE__);
+ }
+
+/*
$this->db->query("UPDATE tc_individual set " .
- " ppi_notes='" . $ppi_notes . "'" .
- ",ppi_pri='" . $ppi_pri . "'" .
+ " notes='" . $notes . "'" .
+ ",priority='" . $priority . "'" .
" WHERE individual=" . $individual,__LINE__,__FILE__);
+*/
+
}
@@ -1508,7 +1519,7 @@ class tc
// PPI SCHEDULING TABLE
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual where valid=1 and steward='Elder' ORDER BY ppi_pri ASC, name ASC";
+ $sql = "SELECT * FROM tc_individual as ti JOIN tc_scheduling_priority as tsp where ti.scheduling_priority=tsp.scheduling_priority and steward='Elder' and valid=1 ORDER by tsp.priority ASC, ti.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
@@ -1517,8 +1528,8 @@ class tc
$individual[$i] = $this->db->f('individual');
$indiv_name[$i] = $this->db->f('name');
$indiv_phone[$individual[$i]] = $this->db->f('phone');
- $indiv_ppi_pri[$individual[$i]] = $this->db->f('ppi_pri');
- $indiv_ppi_notes[$individual[$i]] = $this->db->f('ppi_notes');
+ $indiv_priority[$individual[$i]] = $this->db->f('priority');
+ $indiv_notes[$individual[$i]] = $this->db->f('notes');
$i++;
$total_indivs++;
}
@@ -1529,8 +1540,8 @@ class tc
$id = $individual[$i];
$name = $indiv_name[$i];
$phone = $indiv_phone[$id];
- $ppi_pri = $indiv_ppi_pri[$id];
- $ppi_notes = $indiv_ppi_notes[$id];
+ $priority = $indiv_priority[$id];
+ $notes = $indiv_notes[$id];
// If this individual has had a yearly PPI this year, don't show him on the schedule list
$year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
@@ -1558,12 +1569,12 @@ class tc
$this->t->set_var('tr_color',$tr_color);
$table_data.= "