X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;ds=inline;f=inc%2Fclass.tc.inc.php;h=07c0b0e06e97ea6d00a60d641be19ebe2df4867c;hb=868fb3cf0a52bd6d4f613c30e40f75ad35fde4b3;hp=49d9a49e615b8f2e5aea3f42dc423b54efe7f188;hpb=428f6a4f9c29acce79cd2a94081185bd3fd262d9;p=eq%2F.git
diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index 49d9a49..07c0b0e 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -584,7 +584,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 +638,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 +792,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 +870,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 +880,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 +921,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 +933,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 +944,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 +957,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 +1012,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 +1020,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 +1112,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 +1133,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 +1261,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 | ";
@@ -1367,9 +1367,9 @@ class tc
$sql = "SELECT * FROM tc_individual where individual='$president_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $mls_indiv_id = $this->db2->f('mls_indiv_id');
+ $mls_id = $this->db2->f('mls_id');
}
- $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$president_address = $this->db2->f('address');
@@ -1406,17 +1406,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 +1518,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 +1527,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 +1539,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 +1568,12 @@ class tc
$this->t->set_var('tr_color',$tr_color);
$table_data.= "
$name | ";
$table_data.= "$phone | ";
- //$table_data.= "$ppi_pri | ";
+ //$table_data.= "$priority | ";
$table_data.= "";
- $table_data.= ' | ';
$table_data.= "$date | ";
- $table_data.= '';
- $table_data.= '';
- $table_data.= '';
+ $table_data.= ' | ';
+ $table_data.= '';
+ $table_data.= '';
$table_data.= ' | ';
$table_data.= '
';
} else {
@@ -1588,14 +1598,14 @@ class tc
$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
$indivs_with_yearly_ppi++;
$date = $this->db2->f('date');
- $ppi_notes = $this->db2->f('notes');
- if(strlen($ppi_notes) > 40) { $ppi_notes = substr($ppi_notes,0,40) . "..."; }
+ $notes = $this->db2->f('notes');
+ if(strlen($notes) > 40) { $notes = substr($notes,0,40) . "..."; }
$tr_color2 = $this->nextmatchs->alternate_row_color($tr_color2);
$this->t->set_var('tr_color2',$tr_color2);
$completed_data.= "$name | ";
$completed_data.= "$phone | ";
$completed_data.= "$date | ";
- $completed_data.= "$ppi_notes | ";
+ $completed_data.= "$notes | ";
$completed_data.= '
';
}
} // End for individuals Loop
@@ -1720,9 +1730,9 @@ class tc
$sql = "SELECT * FROM tc_individual where individual='$supervisor'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $mls_indiv_id = $this->db2->f('mls_indiv_id');
+ $mls_id = $this->db2->f('mls_id');
}
- $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
@@ -1756,10 +1766,17 @@ class tc
$hti_pri = $entry['pri'];
//print "hti_notes: $hti_notes indiv_name: $indiv_name
";
// Perform database save actions here
+ $this->db->query("SELECT * FROM tc_companionship WHERE individual=$individual and valid=1",__LINE__,__FILE__);
+ if ($this->db->next_record()) {
+ $scheduling_priority = $this->db->f('scheduling_priority');
+ $this->db2->query("UPDATE tc_scheduling_priority SET priority='$hti_pri' and notes=\"hti_notes\" where scheduling_priority=$scheduling_priority",__LINE__,__FILE__);
+ }
+/*
$this->db->query("UPDATE tc_individual set " .
" hti_notes='" . $hti_notes . "'" .
",hti_pri='" . $hti_pri . "'" .
" WHERE individual=" . $individual,__LINE__,__FILE__);
+*/
}
$take_me_to_url = $GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_sched');
@@ -1806,9 +1823,9 @@ class tc
$sql = "SELECT * FROM tc_individual where individual='$supervisor'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $mls_indiv_id = $this->db2->f('mls_indiv_id');
+ $mls_id = $this->db2->f('mls_id');
}
- $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
@@ -1885,7 +1902,7 @@ class tc
$i=0;
for ($j=0; $j < count($unique_companionships); $j++) {
// Select all the companions from each companionship
- $sql = "SELECT * FROM tc_companionship where valid=1 and companionship=". $unique_companionships[$j]['companionship'];
+ $sql = "SELECT * FROM tc_companionship AS tc JOIN (tc_scheduling_priority AS tsp, tc_individual as ti) WHERE tc.scheduling_priority=tsp.scheduling_priority AND tc.individual=ti.individual AND tc.valid=1 AND tc.companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
$k=0; $int_completed=0;
$comp = $unique_companionships[$j]['companionship'];
@@ -1896,20 +1913,11 @@ class tc
// Get this companions information
$individual = $this->db->f('individual');
- $sql = "SELECT * FROM tc_individual where individual='$individual'";
- $this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $individual = $this->db2->f('individual');
- $indiv_name = $this->db2->f('name');
- $indiv_phone[$individual] = $this->db2->f('phone');
- $indiv_hti_pri[$individual] = $this->db2->f('hti_pri');
- $indiv_hti_notes[$individual] = $this->db2->f('hti_notes');
- }
- $id = $individual;
- $name = $indiv_name;
- $phone = $indiv_phone[$id];
- $hti_pri = $indiv_hti_pri[$id];
- $hti_notes = $indiv_hti_notes[$id];
+ $id = $this->db->f('individual');
+ $name = $this->db->f('name');
+ $phone = $this->db->f('phone');
+ $hti_pri = $this->db->f('priority');
+ $hti_notes = $this->db->f('notes');
// If the companionship has already had its quarterly interview,
// Skip the other companion in the companionship.
@@ -2118,10 +2126,17 @@ class tc
$visit_pri = $entry['pri'];
// Perform database save actions here
+ $this->db->query("SELECT * FROM tc_family WHERE family='$family'",__LINE__,__FILE__);
+ if ($this->db->next_record()) {
+ $scheduling_priority = $this->db->f('scheduling_priority');
+ $this->db2->query("UPDATE tc_scheduling_priority SET priority='$visit_pri' AND notes=\"$visit_notes\" WHERE scheduling_priority='$scheduling_priority'",__LINE__,__FILE__);
+ }
+/*
$this->db->query("UPDATE tc_family set " .
" visit_notes='" . $visit_notes . "'" .
",visit_pri='" . $visit_pri . "'" .
" WHERE family=" . $family,__LINE__,__FILE__);
+*/
}
$take_me_to_url = $GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.vis_sched');
@@ -2203,7 +2218,7 @@ class tc
// VISIT SCHEDULING TABLE
- $sql = "SELECT * FROM tc_family where valid=1 and individual != 0 and companionship != 0 ORDER BY visit_pri ASC, name ASC";
+ $sql = "SELECT * FROM tc_family AS tf JOIN tc_scheduling_priority AS tsp WHERE tf.scheduling_priority=tsp.scheduling_priority AND tf.valid=1 AND tf.individual != 0 AND tf.companionship != 0 ORDER BY tsp.priority ASC, tf.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$total_families=0; $families_with_yearly_visit=0;
@@ -2390,15 +2405,15 @@ class tc
$this->t->set_var('district_name',$president_name);
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY individual ASC";
+ $sql = "SELECT * FROM tc_individual AS ti JOIN tc_scheduling_priority as tsp where ti.scheduling_priority=tsp.scheduling_priority and ti.steward='Elder' and ti.valid=1 ORDER BY ti.individual ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
$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=$i;
@@ -3629,9 +3644,9 @@ class tc
$sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $mls_indiv_id = $this->db2->f('mls_indiv_id');
+ $mls_id = $this->db2->f('mls_id');
}
- $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
@@ -3754,9 +3769,9 @@ class tc
$sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $mls_indiv_id = $this->db2->f('mls_indiv_id');
+ $mls_id = $this->db2->f('mls_id');
}
- $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');