projects
/
eq
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed all references to mls_id, these were unncessary.
[eq/.git]
/
inc
/
class.tc.inc.php
diff --git
a/inc/class.tc.inc.php
b/inc/class.tc.inc.php
index a5e3138315ffe8938fe390b86d3a5a0180f3fff8..ae33d78589d6d5141c7d7a97f89f56039a56f8ed 100644
(file)
--- a/
inc/class.tc.inc.php
+++ b/
inc/class.tc.inc.php
@@
-1720,11
+1720,6
@@
class tc
$supervisor_last_name = $supervisor_array[0];
$sql = "SELECT * FROM tc_individual where individual='$supervisor'";
$this->db2->query($sql,__LINE__,__FILE__);
$supervisor_last_name = $supervisor_array[0];
$sql = "SELECT * FROM tc_individual where individual='$supervisor'";
$this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $mls_id = $this->db2->f('mls_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');
}
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
}
@@
-1804,11
+1799,6
@@
class tc
$supervisor_last_name = $supervisor_array[0];
$sql = "SELECT * FROM tc_individual where individual='$supervisor'";
$this->db2->query($sql,__LINE__,__FILE__);
$supervisor_last_name = $supervisor_array[0];
$sql = "SELECT * FROM tc_individual where individual='$supervisor'";
$this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $mls_id = $this->db2->f('mls_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');
}
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
}
@@
-3522,7
+3512,7
@@
class tc
$this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched'));
$this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
$this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched'));
$this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
- $date_width=1
5
0; $time_width=220; $indiv_width=170; $family_width=180; $location_width=100;
+ $date_width=1
6
0; $time_width=220; $indiv_width=170; $family_width=180; $location_width=100;
$table_width=$date_width + $time_width + $indiv_width + $family_width + $location_width;
$header_row = "<th width=$date_width><font size=-2>Date</th>";
$header_row.= "<th width=$time_width><font size=-2>Time</th>";
$table_width=$date_width + $time_width + $indiv_width + $family_width + $location_width;
$header_row = "<th width=$date_width><font size=-2>Date</th>";
$header_row.= "<th width=$time_width><font size=-2>Time</th>";
@@
-3539,7
+3529,7
@@
class tc
$presidency_data[$i]['name'] = $this->db->f('name');
$presidency_data[$i]['indiv'] = $this->db->f('individual');
$presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name'];
$presidency_data[$i]['name'] = $this->db->f('name');
$presidency_data[$i]['indiv'] = $this->db->f('individual');
$presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name'];
- $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['indiv
idual
'];
+ $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['indiv'];
$i++;
}
$i++;
}
@@
-3573,6
+3563,10
@@
class tc
$time = $hour.':'.$minute.':'.'00';
$uid = 0;
$time = $hour.':'.$minute.':'.'00';
$uid = 0;
+ // Zero out family or individual if they are invalid
+ if($indiv == "") { $indiv=0; }
+ if($family == "") { $family=0; }
+
// Update our location
if($location == "") {
if($family > 0) {
// Update our location
if($location == "") {
if($family > 0) {
@@
-3583,13
+3577,9
@@
class tc
} else if($indiv > 0) {
$supervisor_name_array = explode(",",$presidency2name[$presidency]);
$supervisor_last_name = $supervisor_name_array[0];
} else if($indiv > 0) {
$supervisor_name_array = explode(",",$presidency2name[$presidency]);
$supervisor_last_name = $supervisor_name_array[0];
+ print "presidency2indiv: $presidency $presidency2indiv[$presidency]<br>";
$sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
$this->db2->query($sql,__LINE__,__FILE__);
$sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
$this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $mls_id = $this->db2->f('mls_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');
}
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
}
@@
-3709,11
+3699,6
@@
class tc
$supervisor_last_name = $supervisor_name_array[0];
$sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
$this->db2->query($sql,__LINE__,__FILE__);
$supervisor_last_name = $supervisor_name_array[0];
$sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
$this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $mls_id = $this->db2->f('mls_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');
}
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
}
@@
-3747,7
+3732,7
@@
class tc
$table_data.= "</td>";
// individual drop down list (for PPIs)
$table_data.= "</td>";
// individual drop down list (for PPIs)
- $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv] STYLE="font-size : 8pt">';
+ $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv
idual
] STYLE="font-size : 8pt">';
$table_data.= '<option value=0></option>';
for ($j=0; $j < count($individual); $j++) {
$id = $individual[$j];
$table_data.= '<option value=0></option>';
for ($j=0; $j < count($individual); $j++) {
$id = $individual[$j];
@@
-3803,7
+3788,7
@@
class tc
$table_data.= "</td>";
// individual drop down list
$table_data.= "</td>";
// individual drop down list
- $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv] STYLE="font-size : 8pt">';
+ $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv
idual
] STYLE="font-size : 8pt">';
$table_data.= '<option value=0></option>';
for ($j=0; $j < count($individual); $j++) {
$id = $individual[$j];
$table_data.= '<option value=0></option>';
for ($j=0; $j < count($individual); $j++) {
$id = $individual[$j];