projects
/
eq
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8abee5d
)
removed more references to EQ
author
Owen Leonard
<owen@balawis.leonard.fam>
Wed, 15 Sep 2010 07:00:42 +0000
(
01:00
-0600)
committer
Owen Leonard
<owen@balawis.leonard.fam>
Wed, 15 Sep 2010 07:00:42 +0000
(
01:00
-0600)
bin/import_ward_data
patch
|
blob
|
history
inc/class.tc.inc.php
patch
|
blob
|
history
setup/phpgw_en.lang
patch
|
blob
|
history
setup/phpgw_fr.lang
patch
|
blob
|
history
setup/phpgw_sv.lang
patch
|
blob
|
history
tc.spec
patch
|
blob
|
history
templates/default/admin.tpl
patch
|
blob
|
history
templates/default/att_update.tpl
patch
|
blob
|
history
templates/default/vis_update.tpl
patch
|
blob
|
history
diff --git
a/bin/import_ward_data
b/bin/import_ward_data
index 70f500ed260b038452c712f14b3b75317dfab88a..57a7f51ae7dcc9fd5bbca49a35b6425a8c5149b8 100755
(executable)
--- a/
bin/import_ward_data
+++ b/
bin/import_ward_data
@@
-474,7
+474,7
@@
sub update_tc_visit_table
#print "family_id = $family_id\n";
#print "comp_id = $comp_id\n";
#print "family_id = $family_id\n";
#print "comp_id = $comp_id\n";
- # ignore visits that weren't done by the
EQ
+ # ignore visits that weren't done by the
quorum
if ($comp_id == 0) { next; }
# retrieve the month header if not already done
if ($comp_id == 0) { next; }
# retrieve the month header if not already done
diff --git
a/inc/class.tc.inc.php
b/inc/class.tc.inc.php
index b57856160c79ba01143957b2aad9c8e9db739e0e..fd885ae33ab0b519bb1bea858d2021d2edd39dc4 100644
(file)
--- a/
inc/class.tc.inc.php
+++ b/
inc/class.tc.inc.php
@@
-290,7
+290,7
@@
class tc
$query_id = $this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->num_rows($query_id) == 0) {
// We did not find any visits made by the currently assigned companionship,
$query_id = $this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->num_rows($query_id) == 0) {
// We did not find any visits made by the currently assigned companionship,
- // look for visits made by any other companionship other than 0. (0 ==
EQ
Presidency Visit)
+ // look for visits made by any other companionship other than 0. (0 == Presidency Visit)
$sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship!=0".
" AND family=". $family_id;
$sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship!=0".
" AND family=". $family_id;
@@
-492,7
+492,7
@@
class tc
$query_id = $this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->num_rows($query_id) == 0) {
// We did not find any visits made by the currently assigned companionship,
$query_id = $this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->num_rows($query_id) == 0) {
// We did not find any visits made by the currently assigned companionship,
- // look for visits made by any other companionship other than 0. (0 ==
EQ
Presidency Visit)
+ // look for visits made by any other companionship other than 0. (0 == Presidency Visit)
$sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship!=0".
" AND family=". $family_id;
$sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship!=0".
" AND family=". $family_id;
@@
-1352,7
+1352,7
@@
class tc
$year = date('Y');
$year = date('Y');
- // Get the
EQ
President
+ // Get the President
$sql = "SELECT * FROM tc_presidency where president=1 and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$sql = "SELECT * FROM tc_presidency where president=1 and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
@@
-1449,7
+1449,7
@@
class tc
$total_indivs=0; $indivs_with_yearly_ppi=0;
$total_indivs=0; $indivs_with_yearly_ppi=0;
- // Display a scheduling table for the
EQ
President
+ // Display a scheduling table for the President
$table_data=""; $appt_table_data="";
$table_title = "District ".$district_number.": ".$district_name.": All indivs with Yearly PPI Not Completed";
$appt_table_title = "District ".$district_number.": ".$district_name.": Yearly PPI Appointment Slots";
$table_data=""; $appt_table_data="";
$table_title = "District ".$district_number.": ".$district_name.": All indivs with Yearly PPI Not Completed";
$appt_table_title = "District ".$district_number.": ".$district_name.": Yearly PPI Appointment Slots";
@@
-2137,7
+2137,7
@@
class tc
$appt_header_row.= "<th width=$location_width><font size=-2>Location</th>";
$appt_table_data = "";
$appt_header_row.= "<th width=$location_width><font size=-2>Location</th>";
$appt_table_data = "";
- // Find out what the
EQ Presidency
ID is
+ // Find out what the
President
ID is
$sql = "SELECT * FROM tc_presidency where president=1 and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$sql = "SELECT * FROM tc_presidency where president=1 and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
@@
-4147,7
+4147,7
@@
class tc
$this->t->pfp('adminhandle','admin');
}
$this->t->pfp('adminhandle','admin');
}
- // Now save off the data needed for a
n EQ
Presidency Table Update
+ // Now save off the data needed for a Presidency Table Update
$sql = "SELECT * FROM tc_presidency where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$sql = "SELECT * FROM tc_presidency where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
diff --git
a/setup/phpgw_en.lang
b/setup/phpgw_en.lang
index 41a5875c9e82589aa8178b8819346d2f4de0426e..02a8daa9bff22cd09df019bc72e31b995f557e6e 100644
(file)
--- a/
setup/phpgw_en.lang
+++ b/
setup/phpgw_en.lang
@@
-1
+1
@@
-eq common en EQ
+tc common en TC
diff --git
a/setup/phpgw_fr.lang
b/setup/phpgw_fr.lang
index 7cc3ceb651900c4ca33f46e7148c8cf8bf1b6070..4b36c7126056789acb5741d0f23a479210d96921 100644
(file)
--- a/
setup/phpgw_fr.lang
+++ b/
setup/phpgw_fr.lang
@@
-1
+1
@@
-eq common fr EQ
+tc common fr TC
diff --git
a/setup/phpgw_sv.lang
b/setup/phpgw_sv.lang
index 1b63b1861a671d0bcfb95184bda08e67eb62d8b0..dffdaa5f978618af846ac7ec8ecefed4a19a827c 100644
(file)
--- a/
setup/phpgw_sv.lang
+++ b/
setup/phpgw_sv.lang
@@
-1
+1
@@
-eq common sv EQ
+tc common sv TC
diff --git
a/tc.spec
b/tc.spec
index 1e88ce7af53e9179e1c5875cc762e286268bf566..1f384273e8c3332a3e42b039bfc6d5ad47bcf1b2 100644
(file)
--- a/
tc.spec
+++ b/
tc.spec
@@
-51,6
+51,6
@@
rm -rf $RPM_BUILD_ROOT
%{prefix}/%{phpgwdirname}
%changelog
%{prefix}/%{phpgwdirname}
%changelog
--
EQ
App Update
+-
TC
App Update
# end of file
# end of file
diff --git
a/templates/default/admin.tpl
b/templates/default/admin.tpl
index a8a3cdf23de9aaf1a2f9d3064a06090b4493547c..31de491e4e12722e8d13705beb665d57aff262b4 100644
(file)
--- a/
templates/default/admin.tpl
+++ b/
templates/default/admin.tpl
@@
-47,7
+47,7
@@
<tr>
<td align="left">
<hr>
<tr>
<td align="left">
<hr>
- <b>Update the
EQ
Presidency Table</b>
+ <b>Update the Presidency Table</b>
<br><br>
<form enctype="multipart/form-data" action="{presidency_action}" method="POST">
<table border="0" width="80%" cellspacing="2" cellpadding="2">
<br><br>
<form enctype="multipart/form-data" action="{presidency_action}" method="POST">
<table border="0" width="80%" cellspacing="2" cellpadding="2">
@@
-56,14
+56,12
@@
</table>
<b>Notes:</b>
<br>- The District is a drop-down list. Please assign a unique district number per district supervisor.
</table>
<b>Notes:</b>
<br>- The District is a drop-down list. Please assign a unique district number per district supervisor.
- <br>- The President, Counselor, Secretary, and
EQ
Presidency fields are boolean value (true|false) flags.
+ <br>- The President, Counselor, Secretary, and Presidency fields are boolean value (true|false) flags.
<br>- If a member of the presidency is not a District Leader, make sure to set their "District=0".
<br>- If a district leader is not a member of the presidency, add them without setting any other flags except the district.
<br>- You can only add 1 new presidency member at a time (1 per each update request to the table).
<br>- If a member of the presidency is not a District Leader, make sure to set their "District=0".
<br>- If a district leader is not a member of the presidency, add them without setting any other flags except the district.
<br>- You can only add 1 new presidency member at a time (1 per each update request to the table).
- <br>- Make sure you have 1 EQ Presidency member that is marked as EQ Presidency=1 with no Elder selected.
- <br>This entry is used to email the entire presidency, and its email address should cause that to happen.
<br><br>
<br><br>
- <input type="submit" value="Update
EQ
Presidency Table">
+ <input type="submit" value="Update Presidency Table">
</form>
</td>
</tr>
</form>
</td>
</tr>
diff --git
a/templates/default/att_update.tpl
b/templates/default/att_update.tpl
index 2719796e2e0e9bb96dabf6d40de2a658349ab6c8..62219b539eebc1d7c9e3f028410b9ee6c120dc87 100644
(file)
--- a/
templates/default/att_update.tpl
+++ b/
templates/default/att_update.tpl
@@
-10,7
+10,7
@@
</tr>
</table>
<br>
</tr>
</table>
<br>
- <b>Note:</b> All individuals serving in the
EQ
Presidency, Young Men, Sunday School, or Primary
+ <b>Note:</b> All individuals serving in the Presidency, Young Men, Sunday School, or Primary
<br>have been automarked as attending. Feel free to adjust this accordingly.
<br>
<table border="0" width="{total_width}" cellspacing="2" cellpadding="2">
<br>have been automarked as attending. Feel free to adjust this accordingly.
<br>
<table border="0" width="{total_width}" cellspacing="2" cellpadding="2">
diff --git
a/templates/default/vis_update.tpl
b/templates/default/vis_update.tpl
index eb23b39684bbfc3a08a2fd4314919702398d6172..f43912ebbc11bc0279eb49d8f14a9ddca16e80a6 100644
(file)
--- a/
templates/default/vis_update.tpl
+++ b/
templates/default/vis_update.tpl
@@
-15,7
+15,7
@@
</tr>
<tr>
<td align="left"><font face="{font}"><b>Companionship: </b>
</tr>
<tr>
<td align="left"><font face="{font}"><b>Companionship: </b>
- <input type=text size="30" name="companionship" value="
EQ
Presidency" READONLY></td>
+ <input type=text size="30" name="companionship" value="Presidency" READONLY></td>
</tr>
<tr>
</tr>
<tr>