X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=7dea31762c1808d7d497a940997f2b17f755bcc0;hb=b64d6c81558b47272c0b2311a93e32de0bfbb1b8;hp=c47ef9552c14ac35c527bc07dbc28b4cad865a95;hpb=90140f92cb6d1c31d7ef617796b580d22b10ab47;p=eq%2F.git diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php index c47ef95..7dea317 100644 --- a/inc/class.tc.inc.php +++ b/inc/class.tc.inc.php @@ -203,7 +203,7 @@ class tc $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_view')); $this->t->set_var('title','Hometeaching'); - $sql = "SELECT * FROM tc_district where valid=1 ORDER BY district ASC"; + $sql = "SELECT * FROM tc_district AS td JOIN tc_individual AS ti WHERE td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -255,7 +255,7 @@ class tc for ($j=0; $j < count($unique_companionships); $j++) { $companion_table_entry = ""; // Select all the companions in each companionship - $sql = "SELECT * FROM tc_companionship where valid=1 and ". + $sql = "SELECT * FROM tc_companion where valid=1 and ". "companionship=". $unique_companionships[$j]['companionship']; $this->db->query($sql,__LINE__,__FILE__); @@ -692,7 +692,7 @@ class tc for ($i=0; $i < count($names); $i++) { //$this->nextmatchs->template_alternate_row_color(&$this->t); - $this->t->set_var('indiv_name',$names[$i]); + $this->t->set_var('individual_name',$names[$i]); if(($i+1) % 3 == 0) { $this->t->set_var('table_sep',""); } else { @@ -734,7 +734,7 @@ class tc // Re-add the individuals who are checked as having participated in this activity $indivs = get_var('individual_name',array('POST')); if(is_array($indivs)) { // Only do the foreach loop if we have a valid array of indivs to work with - foreach ($indivs as $indiv) { + foreach ($indivs as $individual) { $this->db->query("INSERT INTO tc_participation (individual,activity) " . "VALUES (" . $individual . ",". $activity['activity'] . ")",__LINE__,__FILE__); } @@ -761,7 +761,7 @@ class tc } $indivs = get_var('individual_name',array('POST')); - foreach ($indivs as $indiv) + foreach ($indivs as $individual) { $this->db->query("INSERT INTO tc_participation (individual,activity) " . "VALUES (" . $individual . ",". $activity['activity'] . ")",__LINE__,__FILE__); @@ -825,7 +825,7 @@ class tc $this->t->set_var('assignment_data',$assignment_data); // Create individual selection boxes - $sql = "SELECT * FROM tc_individual"; + $sql = "SELECT * FROM tc_individual WHERE steward='$this->default_stewardship'"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -996,8 +996,7 @@ class tc $this->t->set_block('par_view_t','header_list','list1'); $this->t->set_block('par_view_t','individual_list','list2'); - // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1"; + $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -1107,8 +1106,7 @@ class tc } $this->t->set_var('filter_input',$filter_input); - // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1"; + $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -1366,7 +1364,7 @@ class tc $year = date('Y'); // Get the President - $sql = "SELECT * FROM tc_presidency where president=1 and valid=1"; + $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti where tp.individual=ti.individual AND tp.president=1 AND tp.valid=1"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $president_name = $this->db->f('name'); @@ -1377,16 +1375,7 @@ class tc $interviewer = $this->db->f('individual'); $district_number = '*'; $district_name = $president_name; - $sql = "SELECT * FROM tc_individual where individual='$president_id'"; - $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()) { - $president_address = $this->db2->f('address'); - } + $president_address = $this->db->f('address'); } else { print "

-E- Unable to locate President in tc_presidency table

"; return; @@ -1440,8 +1429,7 @@ class tc } // create the individual id -> individual name mapping - // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_individual where valid=1 and steward='Elder' ORDER BY name ASC"; + $sql = "SELECT * FROM tc_individual where valid=1 and steward='$this->default_stewardship' ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; $individual = NULL; @@ -1522,8 +1510,7 @@ class tc $this->t->set_var('appt_table_width',$appt_table_width); // PPI SCHEDULING TABLE - // TODO: changed this so it picks the quorum dynamically - $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"; + $sql = "SELECT * FROM tc_individual AS ti JOIN tc_scheduling_priority AS tsp WHERE ti.scheduling_priority=tsp.scheduling_priority AND steward='$this->default_stewardship' AND valid=1 ORDER BY tsp.priority ASC, ti.name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; @@ -1692,8 +1679,7 @@ class tc //print "year: $year month: $month quarter_start: $quarter_start quarter_end: $quarter_end
"; // create the individual id -> individual name mapping - // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY name ASC"; + $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1 ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; $individual_data = NULL; @@ -1734,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__); - 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'); } @@ -1771,7 +1752,7 @@ 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__); + $this->db->query("SELECT * FROM tc_companion WHERE individual=$individual and valid=1",__LINE__,__FILE__); if ($this->db->next_record()) { $scheduling_priority = $this->db->f('scheduling_priority'); //$this->logToFile("int_sched", "UPDATE tc_scheduling_priority SET priority='$hti_pri', notes=\"$hti_notes\" WHERE scheduling_priority='$scheduling_priority'"); @@ -1784,7 +1765,7 @@ class tc } // Get the Districts - $sql = "SELECT * FROM tc_district where valid=1 ORDER BY district ASC"; + $sql = "SELECT * FROM tc_district AS td JOIN (tc_presidency AS tp, tc_individual AS ti) WHERE td.district=tp.district AND td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -1792,11 +1773,7 @@ class tc $districts[$i]['district'] = $this->db->f('district'); $districts[$i]['name'] = $this->db->f('name'); $districts[$i]['supervisor'] = $this->db->f('supervisor'); - $sql = "SELECT * FROM tc_presidency where district=$district and valid=1"; - $this->db2->query($sql,__LINE__,__FILE__); - if($this->db2->next_record()) { - $districts[$i]['presidency'] = $this->db2->f('presidency'); - } + $districts[$i]['presidency'] = $this->db->f('presidency'); $i++; } @@ -1822,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__); - 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'); } @@ -1902,7 +1874,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 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']; + $sql = "SELECT * FROM tc_companion 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']; @@ -1951,6 +1923,7 @@ class tc $link_data['name'] = $name; $link_data['interview'] = ''; $link_data['action'] = 'add'; + $link_data['interview_type'] = 'hti'; $link_data['interviewer'] = $districts[$d]['supervisor']; $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data); $table_data.= "$name"; @@ -1980,6 +1953,7 @@ class tc $link_data['individual'] = $this->db2->f('individual'); $link_data['name'] = $name; $link_data['interview'] = $this->db2->f('interview'); + $link_data['interview_type'] = 'hti'; $link_data['action'] = 'view'; $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data); $comps_with_quarterly_int++; @@ -2069,7 +2043,7 @@ class tc $year = date('Y'); // create the family id -> family name mapping - $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 AND tf.companionship != 0 ORDER BY ti.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.individual != 0 AND tf.companionship != 0 AND ti.steward='$this->default_stewardship' ORDER BY ti.name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; $family_id = NULL; @@ -2120,12 +2094,10 @@ class tc $visit_notes = $entry['notes']; $family = $entry['family_id']; $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->logToFile("vis_sched", "UPDATE tc_scheduling_priority SET priority='$visit_pri', notes=\"$visit_notes\" WHERE scheduling_priority='$scheduling_priority'"); $this->db2->query("UPDATE tc_scheduling_priority SET priority='$visit_pri', notes=\"$visit_notes\" WHERE scheduling_priority='$scheduling_priority'", __LINE__, __FILE__); } } @@ -2144,7 +2116,7 @@ class tc $appt_table_data = ""; // Find out what the President ID is - $sql = "SELECT * FROM tc_presidency where president=1 and valid=1"; + $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.president=1 AND tp.valid=1"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $presidency_name = $this->db->f('name'); @@ -2209,7 +2181,7 @@ class tc // VISIT SCHEDULING TABLE - $sql = "SELECT * FROM tc_family AS tf JOIN (tc_scheduling_priority AS tsp, tc_individual as ti) WHERE tf.scheduling_priority=tsp.scheduling_priority AND tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 AND tf.companionship != 0 ORDER BY tsp.priority ASC, ti.name ASC"; + $sql = "SELECT * FROM tc_family AS tf JOIN (tc_scheduling_priority AS tsp, tc_individual as ti) WHERE tf.scheduling_priority=tsp.scheduling_priority AND tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 AND tf.companionship != 0 AND ti.steward='$this->default_stewardship' ORDER BY tsp.priority ASC, ti.name ASC"; $this->db->query($sql,__LINE__,__FILE__); $total_families=0; $families_with_yearly_visit=0; @@ -2245,7 +2217,7 @@ class tc $table_data.= "$name Family"; $table_data.= "$phone"; $table_data.= ""; - $table_data.= ''; foreach(range(0,6) as $num) { if($num == 0) { $num = 1; } else {$num = $num*5; } if($vis_pri == $num) { @@ -2257,9 +2229,9 @@ class tc } $table_data.= ''; $table_data.= "$date"; - $table_data.= ''; - $table_data.= ''; - $table_data.= ''; + $table_data.= ''; + $table_data.= ''; + $table_data.= ''; $table_data.= ''; $table_data.= ''; $tr_color = $this->nextmatchs->alternate_row_color($tr_color); @@ -2357,12 +2329,11 @@ class tc $this->t->set_var('lang_num_months','Years of History'); } - $sql = "SELECT * FROM tc_presidency where president=1 and valid=1"; + $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.president=1 AND tp.valid=1"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $president_name = $this->db->f('name'); $interviewer = $this->db->f('individual'); - $interview_type = 'ppi'; } else { print "

-E- Unable to locate President in tc_presidency table

"; return; @@ -2370,8 +2341,7 @@ class tc $this->t->set_var('district_number','*'); $this->t->set_var('district_name',$president_name); - // TODO: changed this so it picks the quorum dynamically - $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"; + $sql = "SELECT * FROM tc_individual AS ti JOIN tc_scheduling_priority as tsp where ti.scheduling_priority=tsp.scheduling_priority and ti.steward='$this->default_stewardship' and ti.valid=1 ORDER BY ti.individual ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -2403,10 +2373,10 @@ class tc $link_data['menuaction'] = 'tc.tc.ppi_update'; $link_data['interviewer'] = $interviewer; - $link_data['indiv'] = $id; + $link_data['individual'] = $id; $link_data['name'] = $name; $link_data['interview'] = ''; - $link_data['interview_type'] = $interview_type; + $link_data['interview_type'] = 'ppi'; $link_data['action'] = 'add'; $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data); $this->nextmatchs->template_alternate_row_color(&$this->t); @@ -2429,7 +2399,7 @@ class tc $link_data['indiv'] = $id; $link_data['name'] = $name; $link_data['interview'] = $this->db2->f('interview'); - $link_data['interview_type'] = $interview_type; + $link_data['interview_type'] = 'ppi'; $link_data['action'] = 'view'; $date = $this->db2->f('date'); $date_array = explode("-",$date); @@ -2476,12 +2446,12 @@ class tc $interviewer = get_var('interviewer',array('GET','POST')); $name = get_var('name',array('GET','POST')); $interview = get_var('interview',array('GET','POST')); - $indiv = get_var('indiv',array('GET','POST')); + $individual = get_var('individual',array('GET','POST')); $date = get_var('date',array('GET','POST')); $notes = get_var('notes',array('GET','POST')); $interview_type = get_var('interview_type',array('GET','POST')); - $sql = "SELECT * FROM tc_presidency where valid=1 and (president=1 or counselor=1 or secretary=1)"; + $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 AND (tp.president=1 OR tp.counselor=1 OR tp.secretary=1)"; $this->db2->query($sql,__LINE__,__FILE__); while ($this->db2->next_record()) { $indiv = $this->db2->f('individual'); @@ -2492,7 +2462,7 @@ class tc $this->t->set_var('interviewer',$interviewer); } $this->t->set_var('interviewer_name',$interviewer_name); - $this->t->set_var('interview_type_checked',''); + $this->t->set_var('eqpresppi_checked','checked'); $this->t->fp('int_list','interviewer_list',True); } @@ -2501,7 +2471,7 @@ class tc $this->db->query("UPDATE tc_interview set " . " interview='" . $interview . "'" . ", interviewer='" . $interviewer . "'" . - ", individual='" . $indiv . "'" . + ", individual='" . $individual . "'" . ", date='" . $date . "'" . ", notes='" . $notes . "'" . ", interview_type='" . $interview_type . "'" . @@ -2513,7 +2483,7 @@ class tc if($action == 'insert') { $notes = get_var('notes',array('POST')); $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " . - "VALUES ('" . $interviewer . "','" . $indiv . "','" . + "VALUES ('" . $interviewer . "','" . $individual . "','" . $date . "','" . $notes . "','" . $interview_type ."')",__LINE__,__FILE__); $this->ppi_view(); return false; @@ -2524,11 +2494,11 @@ class tc $this->t->set_var('interview', ''); $this->t->set_var('interviewer', $interviewer); $this->t->set_var('name',$name); - $this->t->set_var('indiv',$indiv); + $this->t->set_var('individual',$individual); $this->t->set_var('date',''); $this->t->set_var('notes',''); $this->t->set_var('interview_type',$interview_type); - $this->t->set_var('interview_type_checked','checked'); + $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('/tc/index.php','menuaction=tc.tc.ppi_update&interview=' . @@ -2542,11 +2512,11 @@ class tc $this->t->set_var('interview',$interview); $this->t->set_var('name',$name); $this->t->set_var('interviewer', $this->db->f('interviewer')); - $this->t->set_var('indiv',$this->db->f('indiv')); + $this->t->set_var('individual',$this->db->f('individual')); $this->t->set_var('date',$this->db->f('date')); $this->t->set_var('notes',$this->db->f('notes')); $this->t->set_var('interview_type',$this->db->f('interview_type')); - if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); } + if($this->db->f('interview_type') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); } } if($action == 'edit') { @@ -2614,7 +2584,7 @@ class tc else if($current_month >= 7 && $current_month <= 9) { $current_month=9; } else if($current_month >= 10 && $current_month <= 12) { $current_month=12; } - $sql = "SELECT * FROM tc_district where valid=1 ORDER BY district ASC"; + $sql = "SELECT * FROM tc_district AS td JOIN tc_individual AS ti WHERE td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -2660,7 +2630,7 @@ class tc for($m=$num_months; $m >= 0; $m--) { $ints[$m] = 0; } for ($j=0; $j < count($unique_companionships); $j++) { // Select all the companions in each companionship - $sql = "SELECT * FROM tc_companionship where valid=1 and ". + $sql = "SELECT * FROM tc_companion where valid=1 and ". "companionship=". $unique_companionships[$j]['companionship']; $this->db->query($sql,__LINE__,__FILE__); $k=0; @@ -2676,9 +2646,10 @@ class tc $link_data['menuaction'] = 'tc.tc.int_update'; $link_data['companionship'] = $companionship; $link_data['interviewer'] = $supervisor; - $link_data['indiv'] = $individual; + $link_data['individual'] = $individual; $link_data['name'] = $name; $link_data['interview'] = ''; + $link_data['interview_type'] = 'hti'; $link_data['action'] = 'add'; $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data); $table_data.= "$name"; @@ -2712,10 +2683,11 @@ class tc $link_data['menuaction'] = 'tc.tc.int_update'; $link_data['companionship'] = $companionship; $link_data['interviewer'] = $this->db2->f('interviewer'); - $link_data['indiv'] = $individual; + $link_data['individual'] = $individual; $link_data['name'] = $name; $link_data['interview'] = $this->db2->f('interview'); $link_data['action'] = 'view'; + $link_data['interview_type'] = 'hti'; $date = $this->db2->f('date'); $date_array = explode("-",$date); $month = $date_array[1]; @@ -2792,19 +2764,19 @@ class tc $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_view')); $this->t->set_var('readonly',''); $this->t->set_var('disabled',''); - $this->t->set_var('interview_type_checked',''); + $this->t->set_var('eqpresppi',''); $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')); - $indiv = get_var('indiv',array('GET','POST')); + $individual = get_var('individual',array('GET','POST')); $date = get_var('date',array('GET','POST')); $notes = get_var('notes',array('GET','POST')); $interview_type = get_var('interview_type',array('GET','POST')); - $sql = "SELECT * FROM tc_presidency where valid=1 and (president=1 or counselor=1 or secretary=1 or district!=0)"; + $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 AND (tp.president=1 OR tp.counselor=1 OR tp.secretary=1 OR tp.district!=0)"; $this->db2->query($sql,__LINE__,__FILE__); while ($this->db2->next_record()) { $indiv = $this->db2->f('individual'); @@ -2823,7 +2795,7 @@ class tc $this->db->query("UPDATE tc_interview set " . " interview='" . $interview . "'" . ", interviewer='" . $interviewer . "'" . - ", individual='" . $indiv . "'" . + ", individual='" . $individual . "'" . ", date='" . $date . "'" . ", notes='" . $notes . "'" . ", interview_type='" . $interview_type . "'" . @@ -2835,7 +2807,7 @@ class tc if($action == 'insert') { $notes = get_var('notes',array('POST')); $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " . - "VALUES ('" . $interviewer . "','" . $indiv . "','" . + "VALUES ('" . $interviewer . "','" . $individual . "','" . $date . "','" . $notes ."','" . $interview_type . "')",__LINE__,__FILE__); $this->int_view(); return false; @@ -2846,9 +2818,10 @@ class tc $this->t->set_var('interview', ''); $this->t->set_var('interviewer', $interviewer); $this->t->set_var('name',$name); - $this->t->set_var('indiv',$indiv); + $this->t->set_var('individual',$individual); $this->t->set_var('date',''); $this->t->set_var('notes',''); + $this->t->set_var('interview_type',$interview_type); $this->t->set_var('lang_done','Cancel'); $this->t->set_var('lang_action','Adding New Interview'); $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_update&interview=' . @@ -2862,10 +2835,11 @@ class tc $this->t->set_var('interview',$interview); $this->t->set_var('name',$name); $this->t->set_var('interviewer', $this->db->f('interviewer')); - $this->t->set_var('indiv',$this->db->f('individual')); + $this->t->set_var('individual',$this->db->f('individual')); $this->t->set_var('date',$this->db->f('date')); $this->t->set_var('notes',$this->db->f('notes')); - if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); } + $this->t->set_var('interview_type',$this->db->f('interview_type')); + if($this->db->f('interview_type') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); } } if($action == 'edit') { @@ -2946,7 +2920,7 @@ class tc for ($i=0; $i < count($visit_list); $i++) { $this->nextmatchs->template_alternate_row_color(&$this->t); - $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.family=".$visit_list[$i]['family']; + $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.family=".$visit_list[$i]['family']." AND ti.steward='$this->default_stewardship'"; $this->db->query($sql,__LINE__,__FILE__); $this->db->next_record(); @@ -2974,7 +2948,7 @@ class tc } // List the families that are available to record a visit against - $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.companionship != 0 and tf.valid=1"; + $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.companionship != 0 AND tf.valid=1 AND ti.steward='$this->default_stewardship'"; $this->db->query($sql,__LINE__,__FILE__); $total_records = $this->db->num_rows(); @@ -3134,8 +3108,7 @@ class tc else if($current_month >= 7 && $current_month <= 9) { $current_month=9; } else if($current_month >= 10 && $current_month <= 12) { $current_month=12; } - // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1"; + $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -3324,8 +3297,7 @@ class tc return false; } - // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1"; + $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -3465,7 +3437,7 @@ class tc $this->t->set_block('org_view_t','org_list','list2'); # Display a list ordered alphabetically - $sql = "SELECT * FROM tc_calling ORDER BY name ASC"; + $sql = "SELECT * FROM tc_calling AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -3490,7 +3462,7 @@ class tc } # Display a list ordered by organization - $sql = "SELECT * FROM tc_calling ORDER BY organization ASC"; + $sql = "SELECT * FROM tc_calling AS tc JOIN tc_individual AS ti where tc.individual=ti.individual ORDER BY organization ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -3540,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'); - $date_width=150; $time_width=220; $indiv_width=170; $family_width=180; $location_width=100; + $date_width=160; $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 = "Date"; $header_row.= "Time"; @@ -3549,7 +3521,7 @@ class tc $header_row.= "Location"; $table_data = ""; - $sql = "SELECT * FROM tc_presidency where valid=1 GROUP BY individual ORDER BY name ASC"; + $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 GROUP BY tp.individual ORDER BY ti.name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -3557,11 +3529,11 @@ 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']; - $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['individual']; + $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['indiv']; $i++; } - $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 ORDER BY ti.name ASC"; + $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND ti.steward='$this->default_stewardship' AND tf.valid=1 AND tf.individual != 0 ORDER BY ti.name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -3591,6 +3563,10 @@ class tc $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) { @@ -3601,13 +3577,9 @@ class tc } else if($indiv > 0) { $supervisor_name_array = explode(",",$presidency2name[$presidency]); $supervisor_last_name = $supervisor_name_array[0]; + print "presidency2indiv: $presidency $presidency2indiv[$presidency]
"; $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'); } @@ -3687,8 +3659,7 @@ class tc //Header('Location: ' . $take_me_to_url); } - // 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 where steward='$this->default_stewardship' and valid=1 ORDER BY individual ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -3728,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__); - 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'); } @@ -3766,7 +3732,7 @@ class tc $table_data.= ""; // individual drop down list (for PPIs) - $table_data.= ''; $table_data.= ''; for ($j=0; $j < count($individual); $j++) { $id = $individual[$j]; @@ -3822,7 +3788,7 @@ class tc $table_data.= ""; // individual drop down list - $table_data.= ''; $table_data.= ''; for ($j=0; $j < count($individual); $j++) { $id = $individual[$j]; @@ -3909,8 +3875,7 @@ class tc $this->t->pfp('out','admin_t'); - // 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 where steward='$this->default_stewardship' and valid=1 ORDER BY individual ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -4056,7 +4021,6 @@ class tc $this->db2->query("UPDATE tc_presidency set" . " individual=" . $indiv . " ,district=" . $district . - " ,name='" . $name . "'" . " ,email='" . $email . "'" . " ,president='" . $president . "'" . " ,counselor='" . $counselor . "'" . @@ -4064,10 +4028,10 @@ class tc " WHERE presidency=" . $id,__LINE__,__FILE__); } else { //print "Adding New Entry
"; - $this->db2->query("INSERT INTO tc_presidency (presidency,individual,district,name," . + $this->db2->query("INSERT INTO tc_presidency (presidency,individual,district," . "email,president,counselor,secretary,valid) " . "VALUES (NULL,'" . $indiv . "','" . $district . "','" . - $name . "','" . $email . "','" . $president . "','" . + $email . "','" . $president . "','" . $counselor . "','" . $secretary . "','1'" . ")",__LINE__,__FILE__); } @@ -4087,13 +4051,13 @@ class tc $name = "High Priests"; $indiv = 0; $valid = 0; - $this->db2->query("INSERT INTO tc_district (district,name,supervisor,valid) " . - "VALUES ('" . $district . "','" . $name . "','" . + $this->db2->query("INSERT INTO tc_district (district,supervisor,valid) " . + "VALUES ('" . $district . "','" . $indiv . "','" . $valid . "'" . ")",__LINE__,__FILE__); // Requery the tc_presidency table - $sql = "SELECT * FROM tc_presidency where valid=1"; + $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1"; $this->db->query($sql,__LINE__,__FILE__); while ($this->db->next_record()) { // Extract the data for each presidency record @@ -4101,13 +4065,12 @@ class tc $indiv = $this->db->f('individual'); $name = $this->db->f('name'); $district = $this->db->f('district'); - $name = $this->db->f('name'); $valid = 1; // If we have a valid district, add it to the district table if($district > 0) { - $this->db2->query("INSERT INTO tc_district (district,name,supervisor,valid) " . - "VALUES ('" . $district . "','" . $name . "','" . + $this->db2->query("INSERT INTO tc_district (district,supervisor,valid) " . + "VALUES ('" . $district . "','" . $indiv . "','" . $valid . "'" . ")",__LINE__,__FILE__); } @@ -4124,7 +4087,7 @@ class tc // Now save off the data needed for a Presidency Table Update - $sql = "SELECT * FROM tc_presidency where valid=1"; + $sql = "SELECT tp.*, ti.name FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1"; $this->db->query($sql,__LINE__,__FILE__); $table_data = ""; $header_row = "IndividualEmailDistrictPresidentCounselorSecretary"; @@ -4294,10 +4257,14 @@ class tc $dtstart = gmdate("Ymd"."\T"."His"."\Z", mktime($hour,$minute,$seconds,$month,$day,$year)); $dtstartstr = date("l, F d, o g:i A", mktime($hour,$minute,$seconds,$month,$day,$year)); - $sql = "SELECT * FROM tc_presidency where presidency='$presidency'"; + $sql = "SELECT tp.email AS email1, ti.email AS email2, ti.name AS name FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.presidency='$presidency'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { - $email = $this->db2->f('email'); + if ($this->db2->f('email1') != "") { + $email = $this->db2->f('email1'); + } else { + $email = $this->db2->f('email2'); + } $interviewer = $this->db2->f('name'); }