Revision: 6546
http://care2002.svn.sourceforge.net/care2002/?rev=6546&view=rev
Author: mizuko
Date: 2010-07-07 12:29:13 +0000 (Wed, 07 Jul 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/gui/smarty_template/templates/default/common/duty_plan_entry_row.tpl
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_report.tpl
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_request.tpl
care2x/branches/gettext/help/en/help_en_contents.php
care2x/branches/gettext/help/en/help_en_employee_all.php
care2x/branches/gettext/help/en/help_en_employee_how2new.php
care2x/branches/gettext/help/en/help_en_employee_show.php
care2x/branches/gettext/help/en/help_en_employment_show.php
care2x/branches/gettext/help/en/help_en_op_duty.php
care2x/branches/gettext/help/en/help_en_tech.php
care2x/branches/gettext/language/en/lang_en_doctors.php
care2x/branches/gettext/language/en/lang_en_edp.php
care2x/branches/gettext/language/en/lang_en_nursing.php
care2x/branches/gettext/language/en/lang_en_or.php
care2x/branches/gettext/language/en/lang_en_products.php
care2x/branches/gettext/language/en/lang_en_specials.php
care2x/branches/gettext/language/en/lang_en_staff.php
care2x/branches/gettext/language/en/lang_en_stdpass.php
care2x/branches/gettext/language/en/lang_en_tech.php
care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
care2x/branches/gettext/modules/appointment_scheduler/appt_show.php
care2x/branches/gettext/modules/medocs/model/class_medocs.php
care2x/branches/gettext/modules/nursing/nursing-ward.php
care2x/branches/gettext/modules/nursing_or/nursing-or-list-add.php
care2x/branches/gettext/modules/nursing_or/nursing-or-main-pass.php
care2x/branches/gettext/modules/nursing_or/nursing-or-roster-poppersonselect.php
care2x/branches/gettext/modules/nursing_or/nursing-or-select-dept.php
care2x/branches/gettext/modules/registration_admission/admission_data_search.php
care2x/branches/gettext/modules/staff_admin/gui_bridge/default/gui_personell_register.php
care2x/branches/gettext/modules/staff_admin/gui_bridge/default/gui_staff_register_show.php
care2x/branches/gettext/modules/staff_admin/gui_bridge/default/gui_tabs_staff_reg.php
care2x/branches/gettext/modules/staff_admin/model/class_staff.php
care2x/branches/gettext/modules/staff_admin/person_register.php
care2x/branches/gettext/modules/staff_admin/person_register_show.php
care2x/branches/gettext/modules/staff_admin/staff_listall.php
care2x/branches/gettext/modules/staff_admin/staff_register.php
care2x/branches/gettext/modules/staff_admin/staff_register_show.php
care2x/branches/gettext/modules/staff_admin/staff_search.php
care2x/branches/gettext/modules/system_admin/admin_paginator_maxrows.php
care2x/branches/gettext/modules/tech/tech-repair-advice.php
care2x/branches/gettext/modules/tech/tech-repair-request.php
Modified:
care2x/branches/gettext/gui/smarty_template/templates/default/common/duty_plan_entry_row.tpl
===================================================================
---
care2x/branches/gettext/gui/smarty_template/templates/default/common/duty_plan_entry_row.tpl
2010-07-07 12:22:25 UTC (rev 6545)
+++
care2x/branches/gettext/gui/smarty_template/templates/default/common/duty_plan_entry_row.tpl
2010-07-07 12:29:13 UTC (rev 6546)
@@ -4,10 +4,10 @@
{{* $sIcon1 = decorative icon of the first duty *}}
{{* $sInput1 = input element of the first duty *}}
{{* $sIcon1 = decorative icon of the first duty *}}
-{{* $sPopWin1 = link to pop the personnel list for duty 1 *}}
+{{* $sPopWin1 = link to pop the staff list for duty 1 *}}
{{* $sIcon2 = decorative icon of the 2nd duty *}}
{{* $sInput2 = input element of the 2nd duty *}}
-{{* $sPopWin2 = link to pop the personnel list for duty 2 *}}
+{{* $sPopWin2 = link to pop the staff list for duty 2 *}}
<tr {{$sRowClass}}>
<td>{{$iDayNr}}</td>
Modified:
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_report.tpl
===================================================================
---
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_report.tpl
2010-07-07 12:22:25 UTC (rev 6545)
+++
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_report.tpl
2010-07-07 12:29:13 UTC (rev 6546)
@@ -21,7 +21,7 @@
{{$LDTechnician}}:<br>
{{* Note: never rename the input, when
redimensioning or repositioning it *}}
<input type="text" name="reporter" size=30 ><p>
- {{$LDPersonnelNr}}:<br>
+ {{$LDstaffNr}}:<br>
{{* Note: never rename the input, when
redimensioning or repositioning it *}}
<input type="text" name="id" size=30>
</td>
Modified:
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_request.tpl
===================================================================
---
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_request.tpl
2010-07-07 12:22:25 UTC (rev 6545)
+++
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_request.tpl
2010-07-07 12:29:13 UTC (rev 6546)
@@ -19,7 +19,7 @@
{{* Note: never rename the input, when
redimensioning or repositioning it *}}
<input type="text" name="reporter" size="30"
value="{{$sUserName}}">
<br>
- {{$LDPersonnelNr}}:<br>
+ {{$LDstaffNr}}:<br>
{{* Note: never rename the input, when
redimensioning or repositioning it *}}
<input type="text" name="id" size="30"
value=""><br>
{{$LDPhoneNr}}:<br>
Modified: care2x/branches/gettext/help/en/help_en_contents.php
===================================================================
--- care2x/branches/gettext/help/en/help_en_contents.php 2010-07-07
12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/help/en/help_en_contents.php 2010-07-07
12:29:13 UTC (rev 6546)
@@ -25,7 +25,7 @@
Pharmacy<br>
Physicians & Surgeons<br>
Person registration<br>
-Personnel Management<br>
+staff Management<br>
Radiology<br>
Telephone Directory<br>
</font>
Modified: care2x/branches/gettext/help/en/help_en_employee_all.php
===================================================================
--- care2x/branches/gettext/help/en/help_en_employee_all.php 2010-07-07
12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/help/en/help_en_employee_all.php 2010-07-07
12:29:13 UTC (rev 6546)
@@ -1,5 +1,5 @@
<font face="Verdana, Arial" size=3 color="#0000cc">
-<b>Personnel manager</b></font>
+<b>staff manager</b></font>
<p>
<font size=2 face="verdana,arial" >
Modified: care2x/branches/gettext/help/en/help_en_employee_how2new.php
===================================================================
--- care2x/branches/gettext/help/en/help_en_employee_how2new.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/help/en/help_en_employee_how2new.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -1,4 +1,4 @@
-<font face="Verdana, Arial" size=3 color="#0000cc"><b>Personnel
management</b></font><p>
+<font face="Verdana, Arial" size=3 color="#0000cc"><b>staff
management</b></font><p>
<?php
if(!$src&&!$x1){
?>
Modified: care2x/branches/gettext/help/en/help_en_employee_show.php
===================================================================
--- care2x/branches/gettext/help/en/help_en_employee_show.php 2010-07-07
12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/help/en/help_en_employee_show.php 2010-07-07
12:29:13 UTC (rev 6546)
@@ -1,5 +1,5 @@
<font face="Verdana, Arial" size=3 color="#0000cc">
-<b>Personnel manager</b></font>
+<b>staff manager</b></font>
<p>
<font size=2 face="verdana,arial" >
Modified: care2x/branches/gettext/help/en/help_en_employment_show.php
===================================================================
--- care2x/branches/gettext/help/en/help_en_employment_show.php 2010-07-07
12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/help/en/help_en_employment_show.php 2010-07-07
12:29:13 UTC (rev 6546)
@@ -1,5 +1,5 @@
<font face="Verdana, Arial" size=3 color="#0000cc">
-<b>Personnel manager - Employment data</b></font>
+<b>staff manager - Employment data</b></font>
<p>
<font size=2 face="verdana,arial" >
Modified: care2x/branches/gettext/help/en/help_en_op_duty.php
===================================================================
--- care2x/branches/gettext/help/en/help_en_op_duty.php 2010-07-07 12:22:25 UTC
(rev 6545)
+++ care2x/branches/gettext/help/en/help_en_op_duty.php 2010-07-07 12:29:13 UTC
(rev 6546)
@@ -19,7 +19,7 @@
break;
case "plan": print "Nurses on duty - Create dutyplan";
break;
- case "personlist": print "Create personnel list";
+ case "personlist": print "Create staff list";
break;
case "dutydoc": print "Nurses on duty - Documenting work done
on on-call-duty hours";
break;
Modified: care2x/branches/gettext/help/en/help_en_tech.php
===================================================================
--- care2x/branches/gettext/help/en/help_en_tech.php 2010-07-07 12:22:25 UTC
(rev 6545)
+++ care2x/branches/gettext/help/en/help_en_tech.php 2010-07-07 12:29:13 UTC
(rev 6546)
@@ -38,7 +38,7 @@
<ul> <b>Step 1: </b>Enter the localization of the damage in the
<nobr>"<span style="background-color:yellow" > Localization of the damage
<input type="text" name="d" size=20 maxlength=10> </span>"</nobr> field.<p>
<b>Step 2: </b>Enter your name in the <nobr>"<span
style="background-color:yellow" > Requested by: <input type="text" name="d"
size=20 maxlength=10> </span>"</nobr> field.<br>
- <b>Step 3: </b>Enter your personnel number in the <nobr>"<span
style="background-color:yellow" > Personnel nr.: <input type="text" name="d"
size=20 maxlength=5> </span>"</nobr> field.<br>
+ <b>Step 3: </b>Enter your staff number in the <nobr>"<span
style="background-color:yellow" > staff nr.: <input type="text" name="d"
size=20 maxlength=5> </span>"</nobr> field.<br>
<b>Step 4: </b>Enter your telephone number in the <nobr>"<span
style="background-color:yellow" > Telephone nr. <input type="text" name="d"
size=20 maxlength=5> </span>"</nobr> field in case the technical support
department has inquiries regarding your request.<p>
<b>Step 5: </b>Type the description of the damage in the <nobr>"<span
style="background-color:yellow" > Please describe the nature of the damage:
<input type="text" name="d" size=20 maxlength=5> </span>"</nobr> field.<br>
<b>Step 6: </b>Click the <img <?php echo
createLDImgSrc('../','abschic.gif','0') ?>> button to send your request. <br>
@@ -55,7 +55,7 @@
<nobr>"<span style="background-color:yellow" > Localization of the damage
<input type="text" name="d" size=20 maxlength=10> </span>"</nobr> field.<p>
<b>Step 2: </b>Enter the job id number in the <nobr>"<span
style="background-color:yellow" > Job ID nr.: <input type="text" name="d"
size=20 maxlength=10> </span>"</nobr> field.<br>
<b>Step 3: </b>Enter your name in the <nobr>"<span
style="background-color:yellow" > Technician: <input type="text" name="d"
size=20 maxlength=10> </span>"</nobr> field.<br>
- <b>Step 4: </b>Enter your personnel number in the <nobr>"<span
style="background-color:yellow" > Personnel nr.: <input type="text" name="d"
size=20 maxlength=5> </span>"</nobr> field.<br>
+ <b>Step 4: </b>Enter your staff number in the <nobr>"<span
style="background-color:yellow" > staff nr.: <input type="text" name="d"
size=20 maxlength=5> </span>"</nobr> field.<br>
<b>Step 5: </b>Type the description of the repair job you have done in the
<nobr>"<span style="background-color:yellow" > Please describe the repair job
you have done: <input type="text" name="d" size=20 maxlength=5> </span>"</nobr>
field.<br>
<b>Step 6: </b>Click the <input type="button" value="Send report"> button to
send your report. <br>
</ul>
Modified: care2x/branches/gettext/language/en/lang_en_doctors.php
===================================================================
--- care2x/branches/gettext/language/en/lang_en_doctors.php 2010-07-07
12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/language/en/lang_en_doctors.php 2010-07-07
12:29:13 UTC (rev 6546)
@@ -65,7 +65,7 @@
$LDBack='Back';
$LDHelp='Help';
$LDMakeDutyPlan='Create dutyplan';
-$LDClk2Plan='Click to open personnel list';
+$LDClk2Plan='Click to open staff list';
$LDInfo4Duty='Information';
$LDStayIn='Stay-in duty';
$LDOnCall='On call duty';
@@ -86,8 +86,8 @@
$LDChgDept='Change department: ';
$LDChange='Change';
-$LDCreatePersonList='Create a list for personnel';
-$LDNoPersonList='The list of personnel is not yet created. Please create the
list first.';
+$LDCreatePersonList='Create a list for staff';
+$LDNoPersonList='The list of staff is not yet created. Please create the list
first.';
$LDShow='Show';
$LDDOCS='DOC Scheduler';
@@ -107,7 +107,7 @@
$LDFamilyName='Family name';
$LDGivenName='Given name';
$LDDateOfBirth='Date of birth';
-$LDEntryPrompt='Please enter a search keyword:(e.g. family name, given name,
personnel number, etc.)';
+$LDEntryPrompt='Please enter a search keyword:(e.g. family name, given name,
staff number, etc.)';
$LDstaffNr='staff Nr.';
$LDFunction='Function';
$LDOptions='Options';
Modified: care2x/branches/gettext/language/en/lang_en_edp.php
===================================================================
--- care2x/branches/gettext/language/en/lang_en_edp.php 2010-07-07 12:22:25 UTC
(rev 6545)
+++ care2x/branches/gettext/language/en/lang_en_edp.php 2010-07-07 12:29:13 UTC
(rev 6546)
@@ -292,10 +292,10 @@
$LDInsuranceListTxt='When the insurance companies list is displayed in the
insurance company module.';
$LDInsuranceSearch='Insurance search';
$LDInsuranceSearchTxt='When the search for insurance company returns a list.';
-$LDPersonnelSearch='Employee search';
-$LDPersonnelSearchTxt='When the search for an employee returns a list.';
-$LDPersonnelList='Employee list';
-$LDPersonnelListTxt='When the employees list is displayed in the personnel
manager module.';
+$LDstaffSearch='Employee search';
+$LDstaffSearchTxt='When the search for an employee returns a list.';
+$LDstaffList='Employee list';
+$LDstaffListTxt='When the employees list is displayed in the staff manager
module.';
$LDPersonSearch='Person search';
$LDPersonSearchTxt='When the search for a person returns a list.';
$LDPatientSearch='Patient search';
Modified: care2x/branches/gettext/language/en/lang_en_nursing.php
===================================================================
--- care2x/branches/gettext/language/en/lang_en_nursing.php 2010-07-07
12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/language/en/lang_en_nursing.php 2010-07-07
12:29:13 UTC (rev 6546)
@@ -15,7 +15,7 @@
$LDQuickViewTxt='Quick view of todays occupancy of the nursing wards.';
$LDSearchPatientTxt='Search the wards for an admitted patient.';
$LDArchiveTxt='Research in the wards archived files.';
-$LDStationManTxt='Create a ward, initialize parameters like number of beds,
personnel, etc.';
+$LDStationManTxt='Create a ward, initialize parameters like number of beds,
staff, etc.';
$LDNewsTxt='Read, compose, or edit a news article.';
$LDMemoTxt='Read, compose, or edit a memo.';
$LDNursingForumTxt='Discussions forum about nursing.';
Modified: care2x/branches/gettext/language/en/lang_en_or.php
===================================================================
--- care2x/branches/gettext/language/en/lang_en_or.php 2010-07-07 12:22:25 UTC
(rev 6545)
+++ care2x/branches/gettext/language/en/lang_en_or.php 2010-07-07 12:29:13 UTC
(rev 6546)
@@ -313,7 +313,7 @@
$LDPhone='Phone';
$LDBeeper='Beeper';
$LDOn='on';
-$LDNoPersonList='The list of personnel is not yet created. Please create the
list first.';
+$LDNoPersonList='The list of staff is not yet created. Please create the list
first.';
$LDNoEntryFound='No entry in plan found!';
$LDShow='Show';
$LDShowPrevLog='Show the previous log entries';
Modified: care2x/branches/gettext/language/en/lang_en_products.php
===================================================================
--- care2x/branches/gettext/language/en/lang_en_products.php 2010-07-07
12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/language/en/lang_en_products.php 2010-07-07
12:29:13 UTC (rev 6546)
@@ -260,7 +260,7 @@
$LDReporter='Reporter';
$LDAlertName='Enter your name please!';
-$LDAlertPersonNr='Enter your personnel number please!';
+$LDAlertPersonNr='Enter your staff number please!';
$LDAlertReport='Please write your report!';
$LDOrderNrExists='The order number exists already! Please use a different
number.';
Modified: care2x/branches/gettext/language/en/lang_en_specials.php
===================================================================
--- care2x/branches/gettext/language/en/lang_en_specials.php 2010-07-07
12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/language/en/lang_en_specials.php 2010-07-07
12:29:13 UTC (rev 6546)
@@ -229,8 +229,8 @@
$LDNewPwDiffer='The new passwords differ from each other.<br> Please enter the
new password again.';
/* 2003-03-22 EL*/
-$LDstaffMngmnt='Personnel Manager';
-$LDstaffMngmntTxt='Tools and functions for managing personnel';
+$LDstaffMngmnt='staff Manager';
+$LDstaffMngmntTxt='Tools and functions for managing staff';
/* 2003-04-25 EL */
$LDBilling='eCombill';
$LDBillingTxt='Bill patient, create billable items, generate bill reports,
etc.';
Modified: care2x/branches/gettext/language/en/lang_en_staff.php
===================================================================
--- care2x/branches/gettext/language/en/lang_en_staff.php 2010-07-07
12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/language/en/lang_en_staff.php 2010-07-07
12:29:13 UTC (rev 6546)
@@ -37,6 +37,6 @@
$LDShowPersonalData='Show personal data';
/* 2003-05-17 EL */
$LDEnterEmployeeSearchKey='Enter search keyword: e.g. Employment-Nr., first
name, or family name.';
-$LDPersonnelManagement='Personnel Management';
+$LDstaffManagement='staff Management';
$LDNewEmployee='New employee';
?>
\ No newline at end of file
Modified: care2x/branches/gettext/language/en/lang_en_stdpass.php
===================================================================
--- care2x/branches/gettext/language/en/lang_en_stdpass.php 2010-07-07
12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/language/en/lang_en_stdpass.php 2010-07-07
12:29:13 UTC (rev 6546)
@@ -48,7 +48,7 @@
$LDOrLogBook='OR nursing logbook';
$LDOrNursing='OR nursing';
$LDCreate='Create';
-$LDPersonList='Personnel list';
+$LDPersonList='staff list';
$LDRepairbotActivate='Activate Repairbot';
$LDQBotActivate='Activate Q-Bot';
Modified: care2x/branches/gettext/language/en/lang_en_tech.php
===================================================================
--- care2x/branches/gettext/language/en/lang_en_tech.php 2010-07-07
12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/language/en/lang_en_tech.php 2010-07-07
12:29:13 UTC (rev 6546)
@@ -30,14 +30,14 @@
$LDReset='Reset';
$LDRepairArea='Localization of the damage';
$LDReporter='Requested by';
-$LDPersonnelNr='Personnel nr.';
+$LDstaffNr='staff nr.';
$LDPhoneNr='Telephone nr. (for eventual inquiries)';
$LDPlsDescribe='Please describe the nature of the damage';
$LDAlertName='Please enter your name.';
$LDAlertDept='Please enter your department or localisation of the damage.';
$LDAlertDeptOnly='Please enter your department.';
-$LDAlertPNr='Please enter your personnel number.';
+$LDAlertPNr='Please enter your staff number.';
$LDAck='Acknowledgement';
$LDYour='Your';
$LDReceived='was received on';
Modified: care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
===================================================================
--- care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -90,7 +90,7 @@
$elem='duty_1_pnr';
if(SHOW_DOC_2) $elem.=',duty_2_pnr';
- # Create personnel object
+ # Create staff object
include_once($root_path.'modules/staff_admin/model/class_staff.php');
$pers_obj=new staff;
Modified: care2x/branches/gettext/modules/appointment_scheduler/appt_show.php
===================================================================
--- care2x/branches/gettext/modules/appointment_scheduler/appt_show.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/appointment_scheduler/appt_show.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -187,7 +187,7 @@
<input type="hidden" name="name_last" value="">
<input type="hidden" name="name_first" value="">
<input type="hidden" name="date_birth" value="">
- <input type="hidden" name="personnel_nr" value="">
+ <input type="hidden" name="staff_nr" value="">
<input type="hidden" name="currYear"
value="'.$currYear.'">
<input type="hidden" name="currMonth"
value="'.$currMonth.'">
<input type="hidden" name="currDay"
value="'.$currDay.'">
Modified: care2x/branches/gettext/modules/medocs/model/class_medocs.php
===================================================================
--- care2x/branches/gettext/modules/medocs/model/class_medocs.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/medocs/model/class_medocs.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -103,8 +103,8 @@
* aux_notes = Auxilliary notes
* date = Date of creation
* time = Time of creation
- * staff_nr = Personnel number who created the document
- * staff_name = Personnel name
+ * staff_nr = staff number who created the document
+ * staff_name = staff name
* therapy = Therapy text
* @access public
* @param int document number
Modified: care2x/branches/gettext/modules/nursing/nursing-ward.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-ward.php 2010-07-07
12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/nursing/nursing-ward.php 2010-07-07
12:29:13 UTC (rev 6546)
@@ -100,7 +100,7 @@
$elem='duty_1_pnr';
if(SHOW_DOC_2) $elem.=',duty_2_pnr';
- # Create personnel object
+ # Create staff object
include_once($root_path.'modules/staff_admin/model/class_staff.php');
$pers_obj=new staff;
Modified: care2x/branches/gettext/modules/nursing_or/nursing-or-list-add.php
===================================================================
--- care2x/branches/gettext/modules/nursing_or/nursing-or-list-add.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/nursing_or/nursing-or-list-add.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -59,6 +59,6 @@
$pers_obj->setDataArray($data);
if(!$pers_obj->updateDataFromInternalArray($item_nr)) echo
"$obj->sql<br>$LDDbNoUpdate";
}
-header("location:nursing-or-roster-personnel-list.php".URL_REDIRECT_APPEND."&saved=1&retpath=$retpath&ipath=$ipath&dept_nr=$dept_nr&nr=$nr");
+header("location:nursing-or-roster-staff-list.php".URL_REDIRECT_APPEND."&saved=1&retpath=$retpath&ipath=$ipath&dept_nr=$dept_nr&nr=$nr");
exit;
?>
Modified: care2x/branches/gettext/modules/nursing_or/nursing-or-main-pass.php
===================================================================
--- care2x/branches/gettext/modules/nursing_or/nursing-or-main-pass.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/nursing_or/nursing-or-main-pass.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -16,7 +16,7 @@
case 'dutyplan':
$fileforward="nursing-or-roster-plan.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr&retpath=$retpath&pmonth=$pmonth&pyear=$pyear";
$title=$LDORNOCScheduler;
break;
- case 'setpersonal':
$fileforward="nursing-or-roster-personnel-list.php".URL_REDIRECT_APPEND."&ipath=$retpath&retpath=$retpath";
+ case 'setpersonal':
$fileforward="nursing-or-roster-staff-list.php".URL_REDIRECT_APPEND."&ipath=$retpath&retpath=$retpath";
$title=$LDNursesList;
break;
default:{
header("Location:".$root_path."language/".$lang."/lang_".$lang."_invalid-access-warning.php");
exit;}
Modified:
care2x/branches/gettext/modules/nursing_or/nursing-or-roster-poppersonselect.php
===================================================================
---
care2x/branches/gettext/modules/nursing_or/nursing-or-roster-poppersonselect.php
2010-07-07 12:22:25 UTC (rev 6545)
+++
care2x/branches/gettext/modules/nursing_or/nursing-or-roster-poppersonselect.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -112,7 +112,7 @@
echo '<form><font face="verdana,arial" size=2>
<img '.createMascot($root_path,'mascot1_r.gif','0','left').' >
'.$LDNoPersonList.'
<p>
- <input type="button" value="'.$LDCreatePersonList.'"
onClick="window.opener.location.href=\'nursing-or-roster-personnel-list.php?sid='.$sid.'&lang='.$lang.'&dept_nr='.$dept_nr.'&pmonth='.$month.'&pyear='.$year.'&retpath='.$retpath.'&ipath=plan\';window.opener.focus();window.close();">
+ <input type="button" value="'.$LDCreatePersonList.'"
onClick="window.opener.location.href=\'nursing-or-roster-staff-list.php?sid='.$sid.'&lang='.$lang.'&dept_nr='.$dept_nr.'&pmonth='.$month.'&pyear='.$year.'&retpath='.$retpath.'&ipath=plan\';window.opener.focus();window.close();">
</form>';
}
?>
Modified: care2x/branches/gettext/modules/nursing_or/nursing-or-select-dept.php
===================================================================
--- care2x/branches/gettext/modules/nursing_or/nursing-or-select-dept.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/nursing_or/nursing-or-select-dept.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -60,7 +60,7 @@
switch($target){
case 'plist': $title=$LDCreateNursesList;
-
$fileforward='nursing-or-roster-personnel-list.php'.URL_APPEND.'&retpath='.$retpath;
+
$fileforward='nursing-or-roster-staff-list.php'.URL_APPEND.'&retpath='.$retpath;
break;
case 'calendar_opt': $title=$LDSelectDept;
$fileforward=$root_path."modules/calendar/calendar-options.php".URL_APPEND."&year=$year&month=$month&day=$day";
Modified:
care2x/branches/gettext/modules/registration_admission/admission_data_search.php
===================================================================
---
care2x/branches/gettext/modules/registration_admission/admission_data_search.php
2010-07-07 12:22:25 UTC (rev 6545)
+++
care2x/branches/gettext/modules/registration_admission/admission_data_search.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -163,7 +163,7 @@
AND enc.is_discharged=0
AND enc.status NOT IN
('void','hidden','inactive','deleted') ORDER BY ";
- # Filter if it is personnel nr
+ # Filter if it is staff nr
if($oitem=='encounter_nr') $sql2.='enc.'.$oitem.'
'.$odir;
else $sql2.='reg.'.$oitem.' '.$odir;
Modified:
care2x/branches/gettext/modules/staff_admin/gui_bridge/default/gui_personell_register.php
===================================================================
---
care2x/branches/gettext/modules/staff_admin/gui_bridge/default/gui_personell_register.php
2010-07-07 12:22:25 UTC (rev 6545)
+++
care2x/branches/gettext/modules/staff_admin/gui_bridge/default/gui_personell_register.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -1,7 +1,7 @@
<?php
# Prepare title
-$sTitle="$LDPersonnelManagement :: $LDNewEmployee ";
+$sTitle="$LDstaffManagement :: $LDNewEmployee ";
if($full_nr) $sTitle=$sTitle.$full_pnr;
//gjergji : new calendar
Modified:
care2x/branches/gettext/modules/staff_admin/gui_bridge/default/gui_staff_register_show.php
===================================================================
---
care2x/branches/gettext/modules/staff_admin/gui_bridge/default/gui_staff_register_show.php
2010-07-07 12:22:25 UTC (rev 6545)
+++
care2x/branches/gettext/modules/staff_admin/gui_bridge/default/gui_staff_register_show.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -11,7 +11,7 @@
$smarty = new smarty_care('system_admin');
# Title in toolbar
- $smarty->assign('sToolbarTitle', "$LDPersonnelManagement :: $LDstaffData
($full_pnr)");
+ $smarty->assign('sToolbarTitle', "$LDstaffManagement :: $LDstaffData
($full_pnr)");
# hide return button
$smarty->assign('pbBack',FALSE);
@@ -23,7 +23,7 @@
$smarty->assign('breakfile',$breakfile);
# Window bar title
- $smarty->assign('sWindowTitle',"$LDPersonnelManagement :: $LDstaffData
($full_pnr)");
+ $smarty->assign('sWindowTitle',"$LDstaffManagement :: $LDstaffData
($full_pnr)");
# Colllect javascript code
Modified:
care2x/branches/gettext/modules/staff_admin/gui_bridge/default/gui_tabs_staff_reg.php
===================================================================
---
care2x/branches/gettext/modules/staff_admin/gui_bridge/default/gui_tabs_staff_reg.php
2010-07-07 12:22:25 UTC (rev 6545)
+++
care2x/branches/gettext/modules/staff_admin/gui_bridge/default/gui_tabs_staff_reg.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -1,5 +1,5 @@
<?php
-# Creates the tabs for the personnel administration module
+# Creates the tabs for the staff administration module
if(!isset($notabs)||!$notabs){
if($target=='person_reg') $tab_bot_line='reg_div';
Modified: care2x/branches/gettext/modules/staff_admin/model/class_staff.php
===================================================================
--- care2x/branches/gettext/modules/staff_admin/model/class_staff.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/staff_admin/model/class_staff.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -6,7 +6,7 @@
*/
require_once($root_path.'include/core/class_core.php');
/**
-* Personnel methods.
+* staff methods.
* Note this class should be instantiated only after a "$db" adodb connector
object has been established by an adodb instance
* @author Elpidio Latorilla
* @version beta 2.0.1
@@ -18,12 +18,12 @@
* @access private
*/
/**
- * Table name for personnel data
+ * Table name for staff data
* @var string
*/
var $tb='care_staff';
/**
- * Table name for personnel assignments
+ * Table name for staff assignments
* @var string
*/
var $tb_assign='care_staff_assignment';
@@ -74,7 +74,7 @@
*/
var $record_count;
/**
- * Personnel data buffer
+ * staff data buffer
* @var adodb record object
*/
var $staff_data;
@@ -178,9 +178,9 @@
$this->setRefArray($this->staff_fields);
}
/**
- * Checks if the personnel (employee) number exists in the database.
+ * Checks if the staff (employee) number exists in the database.
* @access public
- * @param int Personnel number
+ * @param int staff number
* @return boolean
*/
function InitstaffNrExists($init_nr){
@@ -195,9 +195,9 @@
/*...@+
*
* The returned adodb record object contains rows of arrays.
- * Each array contains the personnel data with the following index keys:
+ * Each array contains the staff data with the following index keys:
* - nr = record's primary key number
- * - staff_nr = personnel or employee number
+ * - staff_nr = staff or employee number
* - job_function_title = job function title or name
* - name_last = employee's last or family name
* - name_first = employee's first or given name
@@ -226,7 +226,7 @@
else return $this->_getAllstaff(1,16,$dept_nr); // 1= dept
(location); 16 = nurse (role)
}
/**
- * Returns information of all personnel (employee) based on location
type, role number and department number keys
+ * Returns information of all staff (employee) based on location type,
role number and department number keys
*
* @access private
* @param int Location type number
@@ -264,7 +264,7 @@
}
/**
- * Returns information of the selected personnel (employee) based on
staff id
+ * Returns information of the selected staff (employee) based on staff
id
*
* @access private
* @param int Location type number
@@ -300,7 +300,7 @@
}
/**
- * Returns information of all personnel (employee) based on role number
+ * Returns information of all staff (employee) based on role number
*
* @access private
* @param int Role number
@@ -442,9 +442,9 @@
/*...@-*/
/**
- * Gets the personnel information based on its personnel number key.
+ * Gets the staff information based on its staff number key.
*
- * The returned array contains the personnel data with the following
index keys:
+ * The returned array contains the staff data with the following index
keys:
* - all index keys as outlined in the <var>$staff_fields</var> array
* - all index keys as outlined in the <var>Person::$elems_array</var>
array
* - funk1 = first pager number
@@ -452,7 +452,7 @@
* - inphone2 = second internal phone number
* - inphone3 = third internal phone number
* @access public
- * @param int Personnel number
+ * @param int staff number
* @return mixed adodb record object or boolean
*/
function getstaffInfo($nr){
@@ -551,10 +551,10 @@
return $this->_getOCQuicklist(14,$year,$month);
}
/**
- * Searches and returns basic personnel information.
+ * Searches and returns basic staff information.
*
* The returned adodb record object contains rows of arrays.
- * Each array contains the personnel data with the following index keys:
+ * Each array contains the staff data with the following index keys:
* - nr = record's primary key number
* - job_function_title = job function title or name
* - name_last = employee's last or family name
@@ -644,12 +644,12 @@
}
}
/**
- * Loads the personnel data in the internal buffer
<var>$staff_data</var>. based on its personnel number key.
+ * Loads the staff data in the internal buffer <var>$staff_data</var>.
based on its staff number key.
*
* The data is stored in the internal buffer array <var>
$staff_data</var> .
* This method returns only TRUE or FALSE. The load success status is
also stored in the <var>$is_loaded</var> variable.
* @access public
- * @param int Personnel number
+ * @param int staff number
* @return boolean
*/
function loadstaffData($nr=0){
@@ -694,7 +694,7 @@
}
/*...@+
*
- * Use this methode only after the personnell data was successfully
loaded with the <var>loadstaffData()</var> method.
+ * Use this methode only after the staffl data was successfully loaded
with the <var>loadstaffData()</var> method.
* @access public
* @return string
*/
@@ -828,7 +828,7 @@
/**
* Returns person's PID number.
*
- * Use this methode only after the personnell data was successfully
loaded with the <var>loadstaffData()</var> method.
+ * Use this methode only after the staffl data was successfully loaded
with the <var>loadstaffData()</var> method.
* @access public
* @return string
*/
Modified: care2x/branches/gettext/modules/staff_admin/person_register.php
===================================================================
--- care2x/branches/gettext/modules/staff_admin/person_register.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/staff_admin/person_register.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -34,7 +34,7 @@
$smarty = new smarty_care('system_admin');
# Title in toolbar
- $smarty->assign('sToolbarTitle', "$LDPersonnelManagement ::
$LDPersonRegister");
+ $smarty->assign('sToolbarTitle', "$LDstaffManagement :: $LDPersonRegister");
# hide return button
$smarty->assign('pbBack',FALSE);
@@ -46,7 +46,7 @@
$smarty->assign('breakfile',$breakfile);
# Window bar title
- $smarty->assign('sWindowTitle',"$LDPersonnelManagement :: $LDPersonRegister");
+ $smarty->assign('sWindowTitle',"$LDstaffManagement :: $LDPersonRegister");
# Colllect javascript code
Modified: care2x/branches/gettext/modules/staff_admin/person_register_show.php
===================================================================
--- care2x/branches/gettext/modules/staff_admin/person_register_show.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/staff_admin/person_register_show.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -42,7 +42,7 @@
$smarty = new smarty_care('system_admin');
# Title in toolbar
- $smarty->assign('sToolbarTitle', "$LDPersonnelManagement :: $LDPersonData
($pid)");
+ $smarty->assign('sToolbarTitle', "$LDstaffManagement :: $LDPersonData
($pid)");
# hide return button
$smarty->assign('pbBack',FALSE);
@@ -54,7 +54,7 @@
$smarty->assign('breakfile',$breakfile);
# Window bar title
- $smarty->assign('sWindowTitle',"$LDPersonnelManagement :: $LDPersonData
($pid)");
+ $smarty->assign('sWindowTitle',"$LDstaffManagement :: $LDPersonData ($pid)");
# Buffer page output
Modified: care2x/branches/gettext/modules/staff_admin/staff_listall.php
===================================================================
--- care2x/branches/gettext/modules/staff_admin/staff_listall.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/staff_admin/staff_listall.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -106,7 +106,7 @@
$smarty = new smarty_care('system_admin');
# Title in toolbar
- $smarty->assign('sToolbarTitle', "$LDPersonnelManagement :: $LDstaffData ::
$LDSearch");
+ $smarty->assign('sToolbarTitle', "$LDstaffManagement :: $LDstaffData ::
$LDSearch");
# hide return button
$smarty->assign('pbBack',FALSE);
@@ -118,7 +118,7 @@
$smarty->assign('breakfile',$breakfile);
# Window bar title
- $smarty->assign('sWindowTitle',"$LDPersonnelManagement :: $LDstaffData ::
$LDSearch");
+ $smarty->assign('sWindowTitle',"$LDstaffManagement :: $LDstaffData ::
$LDSearch");
# Colllect javascript code
Modified: care2x/branches/gettext/modules/staff_admin/staff_register.php
===================================================================
--- care2x/branches/gettext/modules/staff_admin/staff_register.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/staff_admin/staff_register.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -181,7 +181,7 @@
$addr_citytown_name=$person_obj->CityTownName($addr_citytown_nr);
}
} elseif($staff_nr) {
- # Load personnel data
+ # Load staff data
$staff_obj->loadstaffData($staff_nr);
if($staff_obj->is_loaded) {
$zeile=&$staff_obj->staff_data;
Modified: care2x/branches/gettext/modules/staff_admin/staff_register_show.php
===================================================================
--- care2x/branches/gettext/modules/staff_admin/staff_register_show.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/staff_admin/staff_register_show.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -39,7 +39,7 @@
$default_photo_path=$root_path.'uploads/photos/registration';
$photo_filename='nopic';
-#Check whether the origin is phone directory and if session personnel nr. is ok
+#Check whether the origin is phone directory and if session staff nr. is ok
if($_SESSION['sess_user_origin']=='phonedir'&&$_SESSION['sess_staff_nr']){
$staff_nr=$_SESSION['sess_staff_nr'];
}else{
Modified: care2x/branches/gettext/modules/staff_admin/staff_search.php
===================================================================
--- care2x/branches/gettext/modules/staff_admin/staff_search.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/staff_admin/staff_search.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -154,7 +154,7 @@
$sql2.=" AND ps.status NOT IN
('void','hidden','deleted','inactive')
AND ps.is_discharged IN ('',0)
AND ps.pid=p.pid ";
- # Filter if it is personnel nr
+ # Filter if it is staff nr
if($oitem=='nr') $sql3.='ORDER BY ps.'.$oitem.' '.$odir;
else $sql3 ='ORDER BY p.'.$oitem.' '.$odir;
@@ -213,7 +213,7 @@
$smarty = new smarty_care('system_admin');
# Title in toolbar
- $smarty->assign('sToolbarTitle',"$LDPersonnelManagement :: $LDstaffData ::
$LDSearch");
+ $smarty->assign('sToolbarTitle',"$LDstaffManagement :: $LDstaffData ::
$LDSearch");
# hide return button
$smarty->assign('pbBack',FALSE);
@@ -225,7 +225,7 @@
$smarty->assign('breakfile',$breakfile);
# Window bar title
- $smarty->assign('sWindowTitle',"$LDPersonnelManagement :: $LDstaffData ::
$LDSearch");
+ $smarty->assign('sWindowTitle',"$LDstaffManagement :: $LDstaffData ::
$LDSearch");
# Body onLoad Javascript code
$smarty->assign('sOnLoadJs','onLoad="document.searchform.searchkey.select()"');
Modified:
care2x/branches/gettext/modules/system_admin/admin_paginator_maxrows.php
===================================================================
--- care2x/branches/gettext/modules/system_admin/admin_paginator_maxrows.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/system_admin/admin_paginator_maxrows.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -91,12 +91,12 @@
</td>
</tr>
<tr>
- <td class="adm_item"><FONT color="#0000cc"><?php echo
"<b>$LDPersonnelList</b><br><font color=#000000>$LDPersonnelListTxt</font><br>"
?></FONT></td>
+ <td class="adm_item"><FONT color="#0000cc"><?php echo
"<b>$LDstaffList</b><br><font color=#000000>$LDstaffListTxt</font><br>"
?></FONT></td>
<td class="adm_input"><input type="text"
name="pagin_staff_list_max_block_rows" size=2 maxlength=2 value="<?php echo
$GLOBAL_CONFIG['pagin_staff_list_max_block_rows'] ?>">
</td>
</tr>
<tr>
- <td class="adm_item"><FONT color="#0000cc"><?php echo
"<b>$LDPersonnelSearch</b><br><font
color=#000000>$LDPersonnelSearchTxt</font><br>" ?></FONT></td>
+ <td class="adm_item"><FONT color="#0000cc"><?php echo
"<b>$LDstaffSearch</b><br><font color=#000000>$LDstaffSearchTxt</font><br>"
?></FONT></td>
<td class="adm_input"><input type="text"
name="pagin_staff_search_max_block_rows" size=2 maxlength=2 value="<?php echo
$GLOBAL_CONFIG['pagin_staff_search_max_block_rows'] ?>">
</td>
</tr>
Modified: care2x/branches/gettext/modules/tech/tech-repair-advice.php
===================================================================
--- care2x/branches/gettext/modules/tech/tech-repair-advice.php 2010-07-07
12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/tech/tech-repair-advice.php 2010-07-07
12:29:13 UTC (rev 6546)
@@ -150,7 +150,7 @@
$smarty->assign('LDPlsDoneOnly',$LDPlsDoneOnly);
$smarty->assign('LDRepairArea',$LDRepairArea);
$smarty->assign('LDTechnician',$LDTechnician);
-$smarty->assign('LDPersonnelNr',$LDPersonnelNr);
+$smarty->assign('LDstaffNr',$LDstaffNr);
$smarty->assign('LDPlsTypeReport',$LDPlsTypeReport);
$smarty->assign('LDJobIdNr',$LDJobIdNr);
Modified: care2x/branches/gettext/modules/tech/tech-repair-request.php
===================================================================
--- care2x/branches/gettext/modules/tech/tech-repair-request.php
2010-07-07 12:22:25 UTC (rev 6545)
+++ care2x/branches/gettext/modules/tech/tech-repair-request.php
2010-07-07 12:29:13 UTC (rev 6546)
@@ -151,7 +151,7 @@
$smarty->assign('sArea',strtoupper($ward_id)." - ".$cfg['thispc_room_nr']." -
".$dept_name);
$smarty->assign('LDReporter',$LDReporter);
$smarty->assign('sUserName',$_SESSION['sess_user_name']);
-$smarty->assign('LDPersonnelNr',$LDPersonnelNr);
+$smarty->assign('LDstaffNr',$LDstaffNr);
$smarty->assign('LDPhoneNr',$LDPhoneNr);
$smarty->assign('sThisPhoneNr',$cfg['thispc_phone']);
$smarty->assign('LDPlsDescribe',$LDPlsDescribe);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Care2002-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/care2002-developers
