From: Owen Leonard Date: Wed, 27 Oct 2010 01:16:53 +0000 (-0600) Subject: Merge branch 'owenleonard/ht_sandbox' of git@github.com:apippin/tc into ht_sandbox X-Git-Tag: release_1_1_0^2~2 X-Git-Url: http://git.pippins.net/embedvideo/.git/static/%7Bg-%3Eurl%20arg1=?a=commitdiff_plain;h=62439f1775384dd8bb79054789c143031b6dbd60;hp=-c;p=eq%2F.git Merge branch 'owenleonard/ht_sandbox' of git@github.com:apippin/tc into ht_sandbox --- 62439f1775384dd8bb79054789c143031b6dbd60 diff --combined inc/class.tc.inc.php index 8f69a8b,ac36a1e..b3ea4a9 --- a/inc/class.tc.inc.php +++ b/inc/class.tc.inc.php @@@ -401,6 -401,7 +401,7 @@@ class t function ht_sandbox() { $this->t->set_file(array('ht_sandbox_t' => 'ht_sandbox.tpl')); + $this->t->set_block('ht_sandbox_t','switch_case_list','sc_list'); $this->t->set_block('ht_sandbox_t','comp_list','c_list'); $this->t->set_block('ht_sandbox_t','district_list','d_list'); $this->t->set_block('ht_sandbox_t','unassigned_ht_list','uht_list'); @@@ -411,7 -412,8 +412,8 @@@ $this->t->set_block('ht_sandbox_t','companionship_table_list','ct_list'); $this->t->set_var('submit_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_sandbox&action=add')); - + $this->t->set_var('jquery_url',$GLOBALS['phpgw']->link('inc/jquery.js')); + $action = get_var('action',array('GET','POST')); $this->t->set_var('title','Hometeaching Sandbox'); @@@ -561,8 -563,6 +563,8 @@@ $this->db3->query($sql,__LINE__,__FILE__); } } + } else if ($_POST['changes']) { + $this->ht_sandbox_changes(); } // get list of companionships @@@ -653,8 -653,16 +655,16 @@@ $sql = "SELECT DISTINCT companionship FROM tc_companionship_sandbox WHERE district=$districts[$d] ORDER BY companionship ASC"; $this->db->query($sql,__LINE__,__FILE__); while ($this->db->next_record()) { + $switch_case_list = ""; $sandbox_table_data .= ""; $companionship = $this->db->f('companionship'); + + $switch_case_list .= "case '". $companionship ."':\n"; + $switch_case_list .= " $(\"#district option:selected\").removeAttr(\"selected\");\n"; + $switch_case_list .= " $(\"#assignedHT option:selected\").removeAttr(\"selected\");\n"; + $switch_case_list .= " $(\"#assignedFamilies option:selected\").removeAttr(\"selected\");\n"; + $switch_case_list .= " $(\"#district option[value='".$districts[$d]."']\").attr(\"selected\",true);\n"; + # get names of companions in this companionship $sql = "SELECT * FROM tc_companion_sandbox AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND companionship=$companionship ORDER BY ti.name ASC"; $this->db2->query($sql,__LINE__,__FILE__); @@@ -665,10 -673,12 +675,12 @@@ } else { $companion_names .= " / " . $this->db2->f('name'); } + $individual = $this->db2->f('individual'); + $switch_case_list .= " $(\"#assignedHT option[value='".$individual."']\").attr(\"selected\",true);\n"; } $this->nextmatchs->template_alternate_row_color(&$this->t); $sandbox_table_data .= ""; - $sandbox_table_data .= ""; + $sandbox_table_data .= ""; $sandbox_table_data .= ""; $sandbox_table_data .= "
$companion_names
$companion_names
"; # get families they visit @@@ -677,11 -687,13 +689,13 @@@ while ($this->db2->next_record()) { $family_name = $this->db2->f('name') . " Family"; $family_id = $this->db2->f('tc_family'); + $family = $this->db2->f('family'); $tc_companionship = $this->db2->f('tc_companionship'); $this->nextmatchs->template_alternate_row_color(&$this->t); $sandbox_table_data .= ""; $sandbox_table_data .= ""; - + $switch_case_list .= " $(\"#assignedFamilies option[value='".$family."']\").attr(\"selected\",true);\n"; + # get 12 months visit data for given family for($m=$this->sandbox_stats_num_months; $m > 0; $m--) { $month = $this->current_month - $m; @@@ -715,8 -727,10 +729,10 @@@ } $sandbox_table_data .= "
$family_name
"; + $switch_case_list .= "break;\n"; + $this->t->set_var('switch_case_list',$switch_case_list); + $this->t->fp('sc_list','switch_case_list',True); } - $sandbox_table_data .= ""; $sandbox_table_data .= ""; } @@@ -728,81 -742,7 +744,81 @@@ $this->t->pfp('out','ht_sandbox_t'); $this->save_sessiondata(); } - + + function ht_sandbox_changes() + { + // list all companionships deleted + $email_contents = "Removed Companionships\n\n"; + $sql = "SELECT * FROM tc_companionship WHERE companionship NOT IN (SELECT tc_companionship FROM tc_companionship_sandbox) AND valid=1"; + $this->db->query($sql,__LINE__,__FILE__); + while ($this->db->next_record()) { + $companionship = $this->db->f('companionship'); + $sql = "SELECT * FROM tc_companion AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND tc.companionship=$companionship"; + $this->db2->query($sql,__LINE__,__FILE__); + $companion_names = ""; + while ($this->db2->next_record()) { + if ($companion_names == "") { + $companion_names .= $this->db2->f('name'); + } else { + $companion_names .= " / " . $this->db2->f('name'); + } + } + $email_contents .= "\t$companion_names\n"; + } + $email_contents .= "\n\n\n"; + + // list all companionships added + $email_contents .= "New Companionships\n\n"; + $sql = "SELECT * FROM tc_companionship_sandbox WHERE tc_companionship=0"; + $this->db->query($sql,__LINE__,__FILE__); + while ($this->db->next_record()) { + $companionship = $this->db->f('companionship'); + $sql = "SELECT * FROM tc_companion_sandbox AS tcs JOIN tc_individual AS ti WHERE tcs.individual=ti.individual AND tcs.companionship=$companionship"; + $this->db2->query($sql,__LINE__,__FILE__); + $companion_names = ""; + while ($this->db2->next_record()) { + if ($companion_names == "") { + $companion_names .= $this->db2->f('name'); + } else { + $companion_names .= " / " . $this->db2->f('name'); + } + } + $email_contents .= "\t$companion_names\n"; + $sql = "SELECT * FROM tc_family_sandbox AS tfs JOIN tc_individual AS ti WHERE tfs.individual=ti.individual AND companionship=$companionship"; + $this->db2->query($sql,__LINE__,__FILE__); + while ($this->db2->next_record()) { + $family_name = $this->db2->f('name') . " Family"; + $email_contents .= "\t\t$family_name\n"; + } + } + $email_contents .= "\n\n\n"; + + // list all companionships with changes + $email_contents .= "Modified Companionships\n\n"; + $sql = "SELECT tcps.* FROM tc_companionship AS tc JOIN tc_companionship_sandbox AS tcps WHERE tc.companionship=tcps.tc_companionship"; + $this->db->query($sql,__LINE__,__FILE__); + while ($this->db->next_record()) { + $companionship = $this->db->f('companionship'); + $tc_companionship = $this->db->f('tc_companionship'); + $changed = 0; + // compare companion list + + // list removed families + // list added families + } + $email_contents .= "\n\n\n"; + + // email changes to presidency + $to = "owenleonard@gmail.com"; + $subject = "HomeTeaching Changes"; + $message .= "$email_contents"; + $headers = 'From: webmaster@example.com' . "\r\n" . + 'Reply-To: webmaster@example.com' . "\r\n" . + 'X-Mailer: PHP/' . phpversion(); + + + mail($to, $subject, $message, $headers); + } function ht_update() { diff --combined templates/default/ht_sandbox.tpl index c7a9d82,9c4c7b5..3e60921 --- a/templates/default/ht_sandbox.tpl +++ b/templates/default/ht_sandbox.tpl @@@ -1,5 -1,25 +1,25 @@@
+ + +
@@@ -21,7 -41,7 +41,7 @@@ + + +
Companionship
- {companionship_list} @@@ -29,35 -49,35 +49,35 @@@

District
- {district}
- {unassigned_ht} - {assigned_ht} - {unassigned_family} - {assigned_family} @@@ -90,11 -110,6 +110,11 @@@
+ +