Revision: 6453
http://care2002.svn.sourceforge.net/care2002/?rev=6453&view=rev
Author: mizuko
Date: 2010-06-30 09:51:24 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/gui/smarty_template/templates/default/nursing/basic_data_admit.tpl
care2x/branches/gettext/gui/smarty_template/templates/default/nursing/nursing-schnellansicht.tpl
care2x/branches/gettext/gui/smarty_template/templates/default/nursing/ward_create_form.tpl
care2x/branches/gettext/main/menu/dtree/mainmenu.inc.php
care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
care2x/branches/gettext/modules/nursing/nursing-patient-search-start.php
care2x/branches/gettext/modules/nursing/nursing-quickview.php
care2x/branches/gettext/modules/nursing/nursing-station-archiv.php
care2x/branches/gettext/modules/nursing/nursing-station-assignwaiting.php
care2x/branches/gettext/modules/nursing/nursing-station-bed-occupancy.php
care2x/branches/gettext/modules/nursing/nursing-station-getlast.php
care2x/branches/gettext/modules/nursing/nursing-station-info.php
care2x/branches/gettext/modules/nursing/nursing-station-manage-pass.php
care2x/branches/gettext/modules/nursing/nursing-station-manage.php
care2x/branches/gettext/modules/nursing/nursing-station-new-createbeds.php
care2x/branches/gettext/modules/nursing/nursing-station-new.php
care2x/branches/gettext/modules/nursing/nursing-station-noclose.php
care2x/branches/gettext/modules/nursing/nursing-station-noedit.php
care2x/branches/gettext/modules/nursing/nursing-station-pass.php
care2x/branches/gettext/modules/nursing/nursing-station-patient-release.php
care2x/branches/gettext/modules/nursing/nursing-station-patientdaten.php
care2x/branches/gettext/modules/nursing/nursing-station-remarks.php
care2x/branches/gettext/modules/nursing/nursing-station-transfer-save.php
care2x/branches/gettext/modules/nursing/nursing-station-transfer-select.php
care2x/branches/gettext/modules/nursing/nursing-station.php
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-ddc.php
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-inout.php
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-noc.php
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-tc.php
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-diagnosis.php
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-pbericht.php
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-rootinfo.php
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-todo.php
care2x/branches/gettext/modules/nursing/nursing.php
care2x/branches/gettext/modules/registration_admission/admission_data_show.php
care2x/branches/gettext/modules/registration_admission/gui_bridge/default/gui_patient_encounter_showdata_options.php
care2x/branches/gettext/modules/system_admin/edv-system-admi-menu.php
Modified:
care2x/branches/gettext/gui/smarty_template/templates/default/nursing/basic_data_admit.tpl
===================================================================
---
care2x/branches/gettext/gui/smarty_template/templates/default/nursing/basic_data_admit.tpl
2010-06-30 09:48:13 UTC (rev 6452)
+++
care2x/branches/gettext/gui/smarty_template/templates/default/nursing/basic_data_admit.tpl
2010-06-30 09:51:24 UTC (rev 6453)
@@ -1,5 +1,5 @@
{{* Template for displaying basic data of patient/person *}}
-{{* Used by /nursing/nursing-station-assignwaiting.php *}}
+{{* Used by /nursing/nursing-ward-assignwaiting.php *}}
<table border="0" cellspacing=1 cellpadding=0 width="100%">
Modified:
care2x/branches/gettext/gui/smarty_template/templates/default/nursing/nursing-schnellansicht.tpl
===================================================================
---
care2x/branches/gettext/gui/smarty_template/templates/default/nursing/nursing-schnellansicht.tpl
2010-06-30 09:48:13 UTC (rev 6452)
+++
care2x/branches/gettext/gui/smarty_template/templates/default/nursing/nursing-schnellansicht.tpl
2010-06-30 09:51:24 UTC (rev 6453)
@@ -12,7 +12,7 @@
winh=(winh / 2) - 300;
winspecs="width=800,height=600,screenX=" + winw + ",screenY=" + winh +
",menubar=no,resizable=yes,scrollbars=yes";
-
urlholder="nursing-station.php?route=validroute&user={$aufnahme_user}&station="
+ station;
+
urlholder="nursing-ward.php?route=validroute&user={$aufnahme_user}&station=" +
station;
stationwin=window.open(urlholder,station,winspecs);
}
@@ -28,8 +28,8 @@
winspecs="menubar=no,resizable=yes,scrollbars=yes,width=" + (w-15) + ",
height=" + (h-60);
- if (e==1)
urlholder="nursing-station-pass.php?rt=pflege&sid={{$SID_Parameter}}&edit=1&retpath=quick&ward_nr="+ward_nr+"&station="+st;
- else
urlholder="nursing-station.php?rt=pflege&sid={{$SID_Parameter}}&edit=0&retpath=quick&ward_nr="+ward_nr+"&station="+st;
+ if (e==1)
urlholder="nursing-ward-pass.php?rt=pflege&sid={{$SID_Parameter}}&edit=1&retpath=quick&ward_nr="+ward_nr+"&station="+st;
+ else
urlholder="nursing-ward.php?rt=pflege&sid={{$SID_Parameter}}&edit=0&retpath=quick&ward_nr="+ward_nr+"&station="+st;
//stationwin=window.open(urlholder,station,winspecs);
window.location.href=urlholder;
}
Modified:
care2x/branches/gettext/gui/smarty_template/templates/default/nursing/ward_create_form.tpl
===================================================================
---
care2x/branches/gettext/gui/smarty_template/templates/default/nursing/ward_create_form.tpl
2010-06-30 09:48:13 UTC (rev 6452)
+++
care2x/branches/gettext/gui/smarty_template/templates/default/nursing/ward_create_form.tpl
2010-06-30 09:51:24 UTC (rev 6453)
@@ -7,7 +7,7 @@
{{$sMascotImg}} {{$sStationExists}} {{$LDEnterAllFields}}
<p>
-<form action="nursing-station-new.php" method="post" name="newstat"
onSubmit="return check(this)">
+<form action="nursing-ward-new.php" method="post" name="newstat"
onSubmit="return check(this)">
<table>
<tbody>
<tr>
Modified: care2x/branches/gettext/main/menu/dtree/mainmenu.inc.php
===================================================================
--- care2x/branches/gettext/main/menu/dtree/mainmenu.inc.php 2010-06-30
09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/main/menu/dtree/mainmenu.inc.php 2010-06-30
09:51:24 UTC (rev 6453)
@@ -178,7 +178,7 @@
$st_ward_id = $stat ['ward_id'];
$st_dept = $stat ['dept_nr'];
- $erg =
"m.add($j,$i_stat,'$st_name','javascript:runModul(\'../modules/nursing/nursing-station-pass.php"
. URL_APPEND .
"&rt=pflege&edit=1&station=$st_ward_id&location_id=$st_ward_nr&ward_nr=$st_nr\')','','','../gui/img/common/default/blue_bullet.gif');";
+ $erg =
"m.add($j,$i_stat,'$st_name','javascript:runModul(\'../modules/nursing/nursing-ward-pass.php"
. URL_APPEND .
"&rt=pflege&edit=1&station=$st_ward_id&location_id=$st_ward_nr&ward_nr=$st_nr\')','','','../gui/img/common/default/blue_bullet.gif');";
$j += 1;
echo "\n$erg\n";
Modified: care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
===================================================================
--- care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -48,7 +48,7 @@
{
case 'quick': $breakfile='nursing-quickview.php'.URL_APPEND;
break;
- case 'ward_mng':
$breakfile='nursing-station-info.php'.URL_APPEND.'&ward_nr='.$ward_nr.'&mode=show';
+ case 'ward_mng':
$breakfile='nursing-ward-info.php'.URL_APPEND.'&ward_nr='.$ward_nr.'&mode=show';
}
}
# Mark where we are
@@ -160,11 +160,11 @@
';
}
/*else echo '
-
window.location.href=\'nursing-station-pass.php'.URL_APPEND.'&rt=pflege&edit=1&station='.$station.'\'';*/
+
window.location.href=\'nursing-ward-pass.php'.URL_APPEND.'&rt=pflege&edit=1&station='.$station.'\'';*/
?>
}
function getrem(pn){
- urlholder="<?php echo $root_path
?>modules/nursing/nursing-station-remarks.php<?php echo URL_REDIRECT_APPEND;
?>&pn="+pn+"<?php echo
"&dept_nr=$dept_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear"; ?>";
+ urlholder="<?php echo $root_path
?>modules/nursing/nursing-ward-remarks.php<?php echo URL_REDIRECT_APPEND;
?>&pn="+pn+"<?php echo
"&dept_nr=$dept_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear"; ?>";
patientwin=window.open(urlholder,pn,"width=700,height=500,menubar=no,resizable=yes,scrollbars=yes");
}
function release(nr)
Modified:
care2x/branches/gettext/modules/nursing/nursing-patient-search-start.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-patient-search-start.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-patient-search-start.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -172,7 +172,7 @@
$rows=$ergebnis->RecordCount();
/* if($rows==1){
$result=$ergebnis->FetchRow();
-
header("location:nursing-station.php?sid=$sid&lang=$lang&ward_nr=".$result['ward_nr']."&station=".$result['ward_name']);
+
header("location:nursing-ward.php?sid=$sid&lang=$lang&ward_nr=".$result['ward_nr']."&station=".$result['ward_name']);
exit;
}
*/
@@ -245,7 +245,7 @@
?>
winspecs="menubar=no,resizable=yes,scrollbars=yes,width=" + (w-15) + ",
height=" + (h-60);
- urlholder="nursing-station-pass.php?rt=pflege&sid=<?php echo
"$sid&lang=$lang";
?>&pday="+d+"&pmonth="+m+"&pyear="+y+"&edit=1&retpath=search_patient&ward_nr="+ward_nr+"&station="+st;
+ urlholder="nursing-ward-pass.php?rt=pflege&sid=<?php echo
"$sid&lang=$lang";
?>&pday="+d+"&pmonth="+m+"&pyear="+y+"&edit=1&retpath=search_patient&ward_nr="+ward_nr+"&station="+st;
window.location.href=urlholder;
}
@@ -379,8 +379,8 @@
list($pyear,$pmonth,$pday)=explode('-',$result['ward_date']);
-
//$buf="nursing-station.php".URL_APPEND."&station=".$result['ward_name']."&ward_nr=".$result['ward_nr'];
-
//$buf="nursing-station.php".URL_APPEND."&ward_nr=".$result['ward_nr']."&pyear=$pyear&pmonth=$pmonth&pday=$pday";
+
//$buf="nursing-ward.php".URL_APPEND."&station=".$result['ward_name']."&ward_nr=".$result['ward_nr'];
+
//$buf="nursing-ward.php".URL_APPEND."&ward_nr=".$result['ward_nr']."&pyear=$pyear&pmonth=$pmonth&pday=$pday";
$buf="javascript:gotoWard('".$result['ward_nr']."','".addslashes($result['ward_name'])."','$pyear','$pmonth','$pday')";
echo '>';
@@ -467,7 +467,7 @@
<ul>
<b><?php echo $LDMoreFunctions ?>:</b><br>
-<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="nursing-station-archiv.php?sid=<?php echo "$sid&lang=$lang";?>&user=<?php
echo str_replace(" ","+",$user);?>"><?php echo $LDArchive ?></a><br>
+<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="nursing-ward-archiv.php?sid=<?php echo "$sid&lang=$lang";?>&user=<?php
echo str_replace(" ","+",$user);?>"><?php echo $LDArchive ?></a><br>
<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="javascript:gethelp('nursing_how2search.php','<?php echo $mode ?>','<?php
echo $rows ?>','search')"><?php echo $LDHow2Search ?></a><br>
<p>
Modified: care2x/branches/gettext/modules/nursing/nursing-quickview.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-quickview.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-quickview.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -282,7 +282,7 @@
* IF ($from == "arch")
*/
$smarty->assign('from',$from);
-
$smarty->assign('LINKArchiv','nursing-station-archiv.php'.URL_APPEND.'&pyear='.$pyear.'&pmonth='.$pmonth);
+
$smarty->assign('LINKArchiv','nursing-ward-archiv.php'.URL_APPEND.'&pyear='.$pyear.'&pmonth='.$pmonth);
$smarty->assign('pbBack2',createLDImgSrc($root_path,'back2.gif','0') );
/* ELSE */
$smarty->assign('pbClose2',createLDImgSrc($root_path,'close2.gif','0') );
Modified: care2x/branches/gettext/modules/nursing/nursing-station-archiv.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-archiv.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-archiv.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -98,7 +98,7 @@
if(!isNaN(jbuf))
{
jbuf=parseInt(jbuf);
- var urltarget="nursing-station-archiv.php<?php echo
URL_REDIRECT_APPEND; ?>&pmonth="+mbuf+"&pyear="+jbuf;
+ var urltarget="nursing-ward-archiv.php<?php echo URL_REDIRECT_APPEND;
?>&pmonth="+mbuf+"&pyear="+jbuf;
window.location.replace(urltarget);
}
else document.direct.jahr.select();
@@ -141,13 +141,13 @@
<?php
echo '<table cellspacing=0 cellpadding=0 border=0>
<tr><td align=left>';
-echo '<a href="nursing-station-archiv.php'.URL_APPEND.'&pmonth=';
+echo '<a href="nursing-ward-archiv.php'.URL_APPEND.'&pmonth=';
if($pmonth<2) echo '12&pyear='.($pyear-1).'"
title="'.$LDLastMonth.'"><'.$monat[11];
else echo ($pmonth-1).'&pyear='.$pyear.'"
title="'.$LDLastMonth.'"><'.$monat[$pmonth-2];
echo '</a></td><td align=center>';
echo '<FONT color=navy><b>'.$monat[$pmonth-1].' '.$pyear.'</b></font>';
echo '</td><td align=right>';
-echo '<a href="nursing-station-archiv.php'.URL_APPEND.'&pmonth=';
+echo '<a href="nursing-ward-archiv.php'.URL_APPEND.'&pmonth=';
if($pmonth>11) echo '1&pyear='.($pyear+1).'"
title="'.$LDNextMonth.'">'.$monat[0];
else echo ($pmonth+1).'&pyear='.$pyear.'"
title="'.$LDNextMonth.'">'.$monat[$pmonth];
echo '></a></td></tr><tr><td bgcolor=black colspan=3>';
Modified:
care2x/branches/gettext/modules/nursing/nursing-station-assignwaiting.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-assignwaiting.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-assignwaiting.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -142,7 +142,7 @@
var urlholder;
function getrem(pn){
- urlholder="nursing-station-remarks.php<?php echo URL_REDIRECT_APPEND;
?>&pn="+pn+"<?php echo
"&pday=$pday&pmonth=$pmonth&pyear=$pyear&station=$station"; ?>";
+ urlholder="nursing-ward-remarks.php<?php echo URL_REDIRECT_APPEND;
?>&pn="+pn+"<?php echo
"&pday=$pday&pmonth=$pmonth&pyear=$pyear&station=$station"; ?>";
patientwin=window.open(urlholder,pn,"width=700,height=500,menubar=no,resizable=yes,scrollbars=yes");
}
@@ -157,7 +157,7 @@
{
<?php
echo '
-
urlholder="nursing-station.php?mode=newdata&sid='.$sid.'&lang='.$lang.'&rm="+rm+"&bd="+bd+"&pyear='.$pyear.'&pmonth='.$pmonth.'&pday='.$pday.'&pn="+pn+"&station='.$station.'&ward_nr='.$ward_nr.'"
+
urlholder="nursing-ward.php?mode=newdata&sid='.$sid.'&lang='.$lang.'&rm="+rm+"&bd="+bd+"&pyear='.$pyear.'&pmonth='.$pmonth.'&pday='.$pday.'&pn="+pn+"&station='.$station.'&ward_nr='.$ward_nr.'"
';
?>
window.opener.location.replace(urlholder);
@@ -168,7 +168,7 @@
<?php
echo '
-urlholder="nursing-station-transfer-save.php?mode=transferbed&sid='.$sid.'&lang='.$lang.'&rm="+rm+"&bd="+bd+"&pyear='.$pyear.'&pmonth='.$pmonth.'&pday='.$pday.'&pn="+pn+"&station='.$station.'&ward_nr='.$ward_nr.'"
+urlholder="nursing-ward-transfer-save.php?mode=transferbed&sid='.$sid.'&lang='.$lang.'&rm="+rm+"&bd="+bd+"&pyear='.$pyear.'&pmonth='.$pmonth.'&pday='.$pday.'&pn="+pn+"&station='.$station.'&ward_nr='.$ward_nr.'"
';
?>
window.opener.location.replace(urlholder);
@@ -501,7 +501,7 @@
echo '
<ul><img
'.createMascot($root_path,'mascot1_r.gif','0','absmiddle').'><font
face="Verdana, Arial" size=3>
<font
class="prompt"><b>'.str_replace("~station~",strtoupper($station),$LDNoInit).'</b></font><br>
- <a
href="nursing-station-new.php'.URL_APPEND.'&station='.$station.'&edit='.$edit.'">'.$LDIfInit.'
<img
'.createComIcon($root_path,'bul_arrowgrnlrg.gif','0','',TRUE).'></a><p></font>
+ <a
href="nursing-ward-new.php'.URL_APPEND.'&station='.$station.'&edit='.$edit.'">'.$LDIfInit.'
<img
'.createComIcon($root_path,'bul_arrowgrnlrg.gif','0','',TRUE).'></a><p></font>
</ul>';
}
Modified:
care2x/branches/gettext/modules/nursing/nursing-station-bed-occupancy.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-bed-occupancy.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-bed-occupancy.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -93,7 +93,7 @@
<?php
echo '
-
urlholder="nursing-station.php?mode=newdata&sid='.$sid.'&lang='.$lang.'&rm='.$rm.'&bd='.$bd.'&pyear='.$py.'&pmonth='.$pm.'&pday='.$pd.'&pn="+anum+"&station='.$s.'&ward_nr='.$wnr.'";
+
urlholder="nursing-ward.php?mode=newdata&sid='.$sid.'&lang='.$lang.'&rm='.$rm.'&bd='.$bd.'&pyear='.$py.'&pmonth='.$pm.'&pday='.$pd.'&pn="+anum+"&station='.$s.'&ward_nr='.$wnr.'";
';
?>
window.opener.location.replace(urlholder);
@@ -131,7 +131,7 @@
<p>
<ul>
- <form action="nursing-station-bed-occupancy.php" method="post" name="psearch"
onSubmit="return pruf(this)">
+ <form action="nursing-ward-bed-occupancy.php" method="post" name="psearch"
onSubmit="return pruf(this)">
<div class="prompt"><?php echo $LDSearchPatient; ?></div>
<table border=0 cellspacing=0 cellpadding=1>
<tr>
Modified: care2x/branches/gettext/modules/nursing/nursing-station-getlast.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-getlast.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-getlast.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -11,7 +11,7 @@
</head>
<body>
<a href="<?php
-echo
"nursing-station.php?mode=getlast&rt=pflege&sid=$sid&pyear=".$pyear."&pmonth=".$pmonth."&pday=".$pday."&c=".$c."&station=".$station;
+echo
"nursing-ward.php?mode=getlast&rt=pflege&sid=$sid&pyear=".$pyear."&pmonth=".$pmonth."&pday=".$pday."&c=".$c."&station=".$station;
?>">Bitte clicken Sie hier an.....
</a>
</body>
Modified: care2x/branches/gettext/modules/nursing/nursing-station-info.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-info.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-info.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -43,10 +43,10 @@
}
*/
}else{
-
header('location:nursing-station-info.php'.URL_REDIRECT_APPEND);
+
header('location:nursing-ward-info.php'.URL_REDIRECT_APPEND);
exit;
}
- $breakfile='nursing-station-info.php'.URL_APPEND;
+ $breakfile='nursing-ward-info.php'.URL_APPEND;
break;
}
@@ -54,7 +54,7 @@
{
$_POST['nr']=$_POST['ward_nr'];
if($ward_obj->updateWard($ward_nr,$_POST)){
-
header("location:nursing-station-info.php".URL_REDIRECT_APPEND."&edit=0&mode=show&ward_id=$station&ward_nr=$ward_nr");
+
header("location:nursing-ward-info.php".URL_REDIRECT_APPEND."&edit=0&mode=show&ward_id=$station&ward_nr=$ward_nr");
exit;
}else{
echo
$ward_obj->getLastQuery()."<br>$LDDbNoSave";
@@ -66,7 +66,7 @@
case 'close_ward':
{
if($ward_obj->hasPatient($ward_nr)){
-
header("location:nursing-station-noclose.php".URL_REDIRECT_APPEND."&ward_id=$ward_id&ward_nr=$ward_nr");
+
header("location:nursing-ward-noclose.php".URL_REDIRECT_APPEND."&ward_id=$ward_id&ward_nr=$ward_nr");
exit;
}else{
switch($close_type)
@@ -89,7 +89,7 @@
}
}
-
header("location:nursing-station-info.php".URL_REDIRECT_APPEND);
+
header("location:nursing-ward-info.php".URL_REDIRECT_APPEND);
exit;
}
}
@@ -114,7 +114,7 @@
//echo
$ward_obj->getLastQuery()."<br>$LDDbNoRead";
}
-
$breakfile='nursing-station-manage.php?sid='.$sid.'&lang='.$lang;
+
$breakfile='nursing-ward-manage.php?sid='.$sid.'&lang='.$lang;
}
} # End of switch($mode)
@@ -324,7 +324,7 @@
if($toggle) $trc='wardlistrow2';
else $trc='wardlistrow1';
$toggle=!$toggle;
-
$buf='nursing-station-info.php'.URL_APPEND.'&mode=show&station='.$result['name'].'&ward_nr='.$result['nr'];
+
$buf='nursing-ward-info.php'.URL_APPEND.'&mode=show&station='.$result['name'].'&ward_nr='.$result['nr'];
echo '
<tr class="'.$trc.'">
<td> <a href="'.$buf.'"><img
'.createComIcon($root_path,'bul_arrowgrnsm.gif','0','absmiddle').'> <font
face="Verdana, Arial" size=2>'.strtoupper($result[station]).'</a></td>
@@ -335,7 +335,7 @@
if($result['is_temp_closed']){
echo '<font color="red">'.$LDTemporaryClosed.'</font>';
}elseif(empty($wbuf[$result['nr']])){
- echo $LDRoomNotCreated.'<a
href="nursing-station-new-createbeds.php'.URL_APPEND.'&ward_nr='.$result['nr'].'">
'.$LDCreate.'>></a>';
+ echo $LDRoomNotCreated.'<a
href="nursing-ward-new-createbeds.php'.URL_APPEND.'&ward_nr='.$result['nr'].'">
'.$LDCreate.'>></a>';
}else{
echo $wbuf[$result['nr']].' '.$LDRoom;
}
@@ -356,7 +356,7 @@
# If no wards available, prompt no ward
- $sTemp = '<p><font size=2
face="verdana,arial,helvetica">'.$LDNoWardsYet.'<br><img
'.createComIcon($root_path,'redpfeil.gif','0','absmiddle').'> <a
href="nursing-station-new.php'.URL_APPEND.'">'.$LDClk2CreateWard.'</a></font>';
+ $sTemp = '<p><font size=2
face="verdana,arial,helvetica">'.$LDNoWardsYet.'<br><img
'.createComIcon($root_path,'redpfeil.gif','0','absmiddle').'> <a
href="nursing-ward-new.php'.URL_APPEND.'">'.$LDClk2CreateWard.'</a></font>';
}
Modified:
care2x/branches/gettext/modules/nursing/nursing-station-manage-pass.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-manage-pass.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-manage-pass.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -10,8 +10,8 @@
$allowedarea=&$allow_area['wards'];
-$fileforward="nursing-station-manage.php?sid=".$sid."&lang=".$lang;
-$thisfile="nursing-station-manage-pass.php";
+$fileforward="nursing-ward-manage.php?sid=".$sid."&lang=".$lang;
+$thisfile="nursing-ward-manage-pass.php";
$breakfile="nursing.php?sid=".$sid."&lang=".$lang;
$lognote="$LDNursingManage ok";
Modified: care2x/branches/gettext/modules/nursing/nursing-station-manage.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-manage.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-manage.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -40,11 +40,11 @@
# Assign submenu items
$smarty->assign('LDProfile',$LDProfile);
- $smarty->assign('sCreate',"<a
href=\"nursing-station-new.php".URL_APPEND."&mw=1&station=$ck_thispc_station&name=$ck_thispc_dept\"><b>$LDCreate</b></a>");
+ $smarty->assign('sCreate',"<a
href=\"nursing-ward-new.php".URL_APPEND."&mw=1&station=$ck_thispc_station&name=$ck_thispc_dept\"><b>$LDCreate</b></a>");
$smarty->assign('LDNewStation',$LDNewStation);
if ($ck_thispc_station) $mode="show";
- $smarty->assign('sShowStationData',"<a
href=\"nursing-station-info.php".URL_APPEND."&mode=$mode&station=$ck_thispc_station\"><b>$LDShowStationData</b></a>");
+ $smarty->assign('sShowStationData',"<a
href=\"nursing-ward-info.php".URL_APPEND."&mode=$mode&station=$ck_thispc_station\"><b>$LDShowStationData</b></a>");
$smarty->assign('LDShowStationDataTxt',$LDShowStationDataTxt);
Modified:
care2x/branches/gettext/modules/nursing/nursing-station-new-createbeds.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-new-createbeds.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-new-createbeds.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -18,7 +18,7 @@
require_once($root_path.'include/helpers/inc_front_chain_lang.php');
$thisfile=basename(__FILE__);
-$breakfile='nursing-station-info.php?sid='.$sid.'&lang='.$lang;
+$breakfile='nursing-ward-info.php?sid='.$sid.'&lang='.$lang;
/* Load the ward object */
require_once($root_path.'include/core/class_ward.php');
$ward_obj=new Ward($ward_nr);
@@ -52,8 +52,8 @@
if($saved_ok){
//gjergji : commented it out for the changing of the magament
-
//header("location:nursing-station.php".URL_REDIRECT_APPEND."&edit=1&ward_nr=$ward_nr&retpath=ward_mng");
-
header("location:nursing-station-info.php".URL_REDIRECT_APPEND."&edit=0&mode=show&ward_id=$station&ward_nr=$ward_nr");
+
//header("location:nursing-ward.php".URL_REDIRECT_APPEND."&edit=1&ward_nr=$ward_nr&retpath=ward_mng");
+
header("location:nursing-ward-info.php".URL_REDIRECT_APPEND."&edit=0&mode=show&ward_id=$station&ward_nr=$ward_nr");
//end : gjergji
exit;
}else{
@@ -134,7 +134,7 @@
$bgc2='#eeeeee';
?>
-<form action="nursing-station-new-createbeds.php" method="post" name="newbeds"
onSubmit="return checkForm(this)">
+<form action="nursing-ward-new-createbeds.php" method="post" name="newbeds"
onSubmit="return checkForm(this)">
<table border=0 cellpadding=2 cellspacing=1>
<tr>
Modified: care2x/branches/gettext/modules/nursing/nursing-station-new.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-new.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-new.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -21,7 +21,7 @@
require_once($root_path.'modules/dept_admin/model/class_department.php');
$dept=new Department;
-$breakfile='nursing-station-manage.php'.URL_APPEND;
+$breakfile='nursing-ward-manage.php'.URL_APPEND;
if($pday=='') $pday=date('d');
if($pmonth=='') $pmonth=date('m');
@@ -45,7 +45,7 @@
}else{
$ward_nr=$ward->postgre_Insert_ID($dbtable,'nr',$db->Insert_ID());
}
-
header("location:nursing-station-new-createbeds.php?sid=$sid&lang=$lang&ward_nr=$ward_nr");
+
header("location:nursing-ward-new-createbeds.php?sid=$sid&lang=$lang&ward_nr=$ward_nr");
exit;
}else{echo "$sql<br>$LDDbNoSave";}
}else{
$ward_exists=true;}
Modified: care2x/branches/gettext/modules/nursing/nursing-station-noclose.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-noclose.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-noclose.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -41,10 +41,10 @@
<p>
<font size=2 face="verdana,arial" color="#990000">
-<a href="nursing-station-info.php<?php echo
URL_APPEND."&mode=show&ward_id=$ward_id&ward_nr=$ward_nr"; ?>">
+<a href="nursing-ward-info.php<?php echo
URL_APPEND."&mode=show&ward_id=$ward_id&ward_nr=$ward_nr"; ?>">
<?php echo $LDBackToWardProfile.'... '.$LDClkHere ?></a>
<p>
- <a href="nursing-station.php<?php echo
URL_APPEND."&edit=1&ward_id=$ward_id&ward_nr=$ward_nr&retpath=ward_mng"; ?>">
+ <a href="nursing-ward.php<?php echo
URL_APPEND."&edit=1&ward_id=$ward_id&ward_nr=$ward_nr&retpath=ward_mng"; ?>">
<?php echo $LDShowWardOccupancy.'... '.$LDClkHere ?></a>
</center>
Modified: care2x/branches/gettext/modules/nursing/nursing-station-noedit.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-noedit.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-noedit.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -93,7 +93,7 @@
function indata(room,bed)
{
- urlholder="nursing-station-bed-occupancy.php?sid=<?php echo $sid;
?>&s=<?php echo $station; ?>&rm="+room+"&bd="+bed+"<?php echo
"&py=".$pyear."&pm=".$pmonth."&pd=".$pday."&tb=".str_replace("#","",$cfg['top_bgcolor'])."&tt=".str_replace("#","",$cfg['top_txtcolor'])."&bb=".str_replace("#","",$cfg['body_bgcolor'])."&d=".$cfg['dhtml'];
?>";
+ urlholder="nursing-ward-bed-occupancy.php?sid=<?php echo $sid;
?>&s=<?php echo $station; ?>&rm="+room+"&bd="+bed+"<?php echo
"&py=".$pyear."&pm=".$pmonth."&pd=".$pday."&tb=".str_replace("#","",$cfg['top_bgcolor'])."&tt=".str_replace("#","",$cfg['top_txtcolor'])."&bb=".str_replace("#","",$cfg['body_bgcolor'])."&d=".$cfg['dhtml'];
?>";
indatawin=window.open(urlholder,"bedroom","width=700,height=450,menubar=no,resizable=yes,scrollbars=yes");
}
@@ -101,7 +101,7 @@
{
<?php
echo '
-
urlholder="nursing-station.php?mode=newdata&patnum=unlock&rt=pflege&sid='.$sid.'&station='.$station.'&rm="+r+"&bd="+b+"&pyear='.$pyear.'&pmonth='.$pmonth.'&pday='.$pday.'";
+
urlholder="nursing-ward.php?mode=newdata&patnum=unlock&rt=pflege&sid='.$sid.'&station='.$station.'&rm="+r+"&bd="+b+"&pyear='.$pyear.'&pmonth='.$pmonth.'&pday='.$pday.'";
';
?>
if(confirm("Die Sperre des Bett "+b+" im Zimmer "+r+" aufheben:"))
Modified: care2x/branches/gettext/modules/nursing/nursing-station-pass.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-pass.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-pass.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -22,10 +22,10 @@
//if(isset($station)&&!empty($station))
$_SESSION['sess_nursing_station']=$station;
$allowedarea=&$allow_area['wards'];
-//$fileforward="nursing-station.php".URL_REDIRECT_APPEND."&edit=$edit&retpath=$retpath&station=".$_SESSION['sess_nursing_station'];
-$fileforward="nursing-station.php".URL_REDIRECT_APPEND."&fwd_nr=$fwd_nr&edit=$edit&retpath=$retpath&station=$station&ward_nr=$ward_nr&dept_nr=$dept_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear";
-//$fileforward="nursing-station.php?sid=$sid&edit=$edit&retpath=$retpath&station=$station";
-$thisfile="nursing-station-pass.php";
+//$fileforward="nursing-ward.php".URL_REDIRECT_APPEND."&edit=$edit&retpath=$retpath&station=".$_SESSION['sess_nursing_station'];
+$fileforward="nursing-ward.php".URL_REDIRECT_APPEND."&fwd_nr=$fwd_nr&edit=$edit&retpath=$retpath&station=$station&ward_nr=$ward_nr&dept_nr=$dept_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear";
+//$fileforward="nursing-ward.php?sid=$sid&edit=$edit&retpath=$retpath&station=$station";
+$thisfile="nursing-ward-pass.php";
if($retpath=="quick") $breakfile="nursing-quickview.php".URL_APPEND;
else $breakfile="nursing.php".URL_APPEND;
Modified:
care2x/branches/gettext/modules/nursing/nursing-station-patient-release.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-patient-release.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-patient-release.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -18,7 +18,7 @@
//$db->debug=true;
if(!$encoder) $encoder=$_COOKIE[$local_user.$sid];
-$breakfile="nursing-station.php".URL_APPEND."&edit=1&station=$station&ward_nr=$ward_nr";
+$breakfile="nursing-ward.php".URL_APPEND."&edit=1&station=$station&ward_nr=$ward_nr";
$thisfile=basename(__FILE__);
# Load date formatter
Modified:
care2x/branches/gettext/modules/nursing/nursing-station-patientdaten.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-patientdaten.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-patientdaten.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -274,7 +274,7 @@
}
function getinfo(patientID){
- urlholder="nursing-station.php?route=validroute&patient=" + patientID +
"&user=<?php echo $aufnahme_user.'"' ?>;
+ urlholder="nursing-ward.php?route=validroute&patient=" + patientID +
"&user=<?php echo $aufnahme_user.'"' ?>;
patientwin=window.open(urlholder,patientID,"width=700,height=600,menubar=no,resizable=yes,scrollbars=yes");
}
Modified: care2x/branches/gettext/modules/nursing/nursing-station-remarks.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-remarks.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-remarks.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -179,7 +179,7 @@
<ul>
-<form method="post" name=remform action="nursing-station-remarks.php"
onSubmit="return checkForm(this)">
+<form method="post" name=remform action="nursing-ward-remarks.php"
onSubmit="return checkForm(this)">
<textarea name="notes" cols=60 rows=5 wrap="physical"
onKeyup="setChg()"></textarea>
<input type="text" name="personell_name" size=60 maxlength=60 value="<?php
echo $_SESSION['sess_user_name']; ?>" readonly>
<input type="hidden" name="sid" value="<?php echo $sid ?>">
Modified:
care2x/branches/gettext/modules/nursing/nursing-station-transfer-save.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-transfer-save.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-transfer-save.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -32,8 +32,8 @@
else $is_today=false;
$fileappend="&edit=1&mode=&pday=$pday&pmonth=$pmonth&pyear=$pyear&station=$station&ward_nr=$ward_nr";
-$breakfile="location:nursing-station.php".URL_APPEND.$fileappend;
-$forwardfile="location:nursing-station.php".URL_REDIRECT_APPEND.$fileappend;
+$breakfile="location:nursing-ward.php".URL_APPEND.$fileappend;
+$forwardfile="location:nursing-ward.php".URL_REDIRECT_APPEND.$fileappend;
# Create ward object
require_once($root_path.'include/core/class_ward.php');
$ward_obj= new Ward;
Modified:
care2x/branches/gettext/modules/nursing/nursing-station-transfer-select.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-transfer-select.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station-transfer-select.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -66,7 +66,7 @@
function TransferWard(wd){
<?php
echo '
-urlholder="nursing-station-transfer-save.php?mode=transferward&sid='.$sid.'&lang='.$lang.'&pyear='.$pyear.'&pmonth='.$pmonth.'&pday='.$pday.'&pn='.$pn.'&station='.$station.'&ward_nr='.$ward_nr.'&trwd="+wd;
+urlholder="nursing-ward-transfer-save.php?mode=transferward&sid='.$sid.'&lang='.$lang.'&pyear='.$pyear.'&pmonth='.$pmonth.'&pday='.$pday.'&pn='.$pn.'&station='.$station.'&ward_nr='.$ward_nr.'&trwd="+wd;
';
?>
window.opener.location.replace(urlholder);
@@ -97,7 +97,7 @@
</table>
<table border=0 cellpadding=4 cellspacing=1 width=100%>
- <form method="post" name="transbed"
action="nursing-station-assignwaiting.php">
+ <form method="post" name="transbed"
action="nursing-ward-assignwaiting.php">
<tr>
<td colspan=2 bgcolor="#f6f6f6"><?php echo $LDTransferToBed.'
('.$station.')'; ?></td>
<td bgcolor="#f6f6f6">
Modified: care2x/branches/gettext/modules/nursing/nursing-station.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station.php 2010-06-30
09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-station.php 2010-06-30
09:51:24 UTC (rev 6453)
@@ -46,7 +46,7 @@
{
case 'quick': $breakfile='nursing-quickview.php'.URL_APPEND;
break;
- case 'ward_mng':
$breakfile='nursing-station-info.php'.URL_APPEND.'&ward_nr='.$ward_nr.'&mode=show';
+ case 'ward_mng':
$breakfile='nursing-ward-info.php'.URL_APPEND.'&ward_nr='.$ward_nr.'&mode=show';
break;
case 'search_patient':
$breakfile='nursing-patient-search-start.php'.URL_APPEND;
}
@@ -131,17 +131,17 @@
if($pn=='lock') $ward_obj->closeBed($ward_nr,$rm,$bd);
else $ward_obj->openBed($ward_nr,$rm,$bd);
-
//header("location:nursing-station.php".URL_REDIRECT_APPEND."&edit=1&mode=&pday=$pday&pmonth=$pmonth&pyear=$pyear&station=$station&ward_nr=$ward_nr");
+
//header("location:nursing-ward.php".URL_REDIRECT_APPEND."&edit=1&mode=&pday=$pday&pmonth=$pmonth&pyear=$pyear&station=$station&ward_nr=$ward_nr");
//exit;
}else{
if($ward_obj->AdmitInWard($pn,$ward_nr,$rm,$bd)){
//echo "ok";
$ward_obj->setAdmittedInWard($pn,$ward_nr,$rm,$bd);
}
-
//header("location:nursing-station.php".URL_REDIRECT_APPEND."&edit=1&mode=&pday=$pday&pmonth=$pmonth&pyear=$pyear&station=$station&ward_nr=$ward_nr");
+
//header("location:nursing-ward.php".URL_REDIRECT_APPEND."&edit=1&mode=&pday=$pday&pmonth=$pmonth&pyear=$pyear&station=$station&ward_nr=$ward_nr");
//exit;
}
-
header("location:nursing-station.php".URL_REDIRECT_APPEND."&edit=1&mode=&pday=$pday&pmonth=$pmonth&pyear=$pyear&station=$station&ward_nr=$ward_nr");
+
header("location:nursing-ward.php".URL_REDIRECT_APPEND."&edit=1&mode=&pday=$pday&pmonth=$pmonth&pyear=$pyear&station=$station&ward_nr=$ward_nr");
exit;
}
@@ -193,12 +193,12 @@
';
}
/*else echo '
-
window.location.href=\'nursing-station-pass.php'.URL_APPEND.'&rt=pflege&edit=1&station='.$station.'\'';*/
+
window.location.href=\'nursing-ward-pass.php'.URL_APPEND.'&rt=pflege&edit=1&station='.$station.'\'';*/
?>
}
function getrem(pn){
- urlholder="nursing-station-remarks.php<?php echo URL_REDIRECT_APPEND;
?>&pn="+pn+"<?php echo
"&dept_nr=$ward_nr&location_nr=$ward_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear&station=$station";
?>";
+ urlholder="nursing-ward-remarks.php<?php echo URL_REDIRECT_APPEND;
?>&pn="+pn+"<?php echo
"&dept_nr=$ward_nr&location_nr=$ward_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear&station=$station";
?>";
patientwin=window.open(urlholder,pn,"width=700,height=500,menubar=no,resizable=yes,scrollbars=yes");
}
@@ -218,12 +218,12 @@
function indata(room,bed)
{
- urlholder="nursing-station-bed-occupancy.php<?php echo
URL_REDIRECT_APPEND; ?>&rm="+room+"&bd="+bed+"<?php echo
"&py=".$pyear."&pm=".$pmonth."&pd=".$pday."&tb=".str_replace("#","",$cfg['top_bgcolor'])."&tt=".str_replace("#","",$cfg['top_txtcolor'])."&bb=".str_replace("#","",$cfg['body_bgcolor'])."&d=".$cfg['dhtml'];
?>&s=<?php echo $station; ?>&wnr=<?php echo $ward_nr; ?>";
+ urlholder="nursing-ward-bed-occupancy.php<?php echo
URL_REDIRECT_APPEND; ?>&rm="+room+"&bd="+bed+"<?php echo
"&py=".$pyear."&pm=".$pmonth."&pd=".$pday."&tb=".str_replace("#","",$cfg['top_bgcolor'])."&tt=".str_replace("#","",$cfg['top_txtcolor'])."&bb=".str_replace("#","",$cfg['body_bgcolor'])."&d=".$cfg['dhtml'];
?>&s=<?php echo $station; ?>&wnr=<?php echo $ward_nr; ?>";
indatawin=window.open(urlholder,"bedroom","width=700,height=450,menubar=no,resizable=yes,scrollbars=yes");
}
function release(room,bed,pid)
{
- urlholder="nursing-station-patient-release.php<?php echo
URL_REDIRECT_APPEND; ?>&rm="+room+"&bd="+bed+"&pn="+pid+"<?php echo
"&pyear=".$pyear."&pmonth=".$pmonth."&pday=".$pday."&tb=".str_replace("#","",$cfg['top_bgcolor'])."&tt=".str_replace("#","",$cfg['top_txtcolor'])."&bb=".str_replace("#","",$cfg['body_bgcolor'])."&d=".$cfg['dhtml'];
?>&station=<?php echo $station; ?>&ward_nr=<?php echo $ward_nr; ?>";
+ urlholder="nursing-ward-patient-release.php<?php echo
URL_REDIRECT_APPEND; ?>&rm="+room+"&bd="+bed+"&pn="+pid+"<?php echo
"&pyear=".$pyear."&pmonth=".$pmonth."&pday=".$pday."&tb=".str_replace("#","",$cfg['top_bgcolor'])."&tt=".str_replace("#","",$cfg['top_txtcolor'])."&bb=".str_replace("#","",$cfg['body_bgcolor'])."&d=".$cfg['dhtml'];
?>&station=<?php echo $station; ?>&ward_nr=<?php echo $ward_nr; ?>";
//indatawin=window.open(urlholder,"bedroom","width=700,height=450,menubar=no,resizable=yes,scrollbars=yes"
window.location.href=urlholder;
}
@@ -232,7 +232,7 @@
{
<?php
echo '
-
urlholder="nursing-station.php'.URL_REDIRECT_APPEND.'&mode=newdata&pn=unlock&rm="+r+"&bd="+b+"&pyear='.$pyear.'&pmonth='.$pmonth.'&pday='.$pday.'&station='.$station.'&ward_nr='.$ward_nr.'";
+
urlholder="nursing-ward.php'.URL_REDIRECT_APPEND.'&mode=newdata&pn=unlock&rm="+r+"&bd="+b+"&pyear='.$pyear.'&pmonth='.$pmonth.'&pday='.$pday.'&station='.$station.'&ward_nr='.$ward_nr.'";
';
?>
if(confirm('<?php echo $LDConfirmUnlock ?>'))
@@ -250,14 +250,14 @@
}
function assignWaiting(pn,pw)
{
- urlholder="nursing-station-assignwaiting.php<?php echo
URL_REDIRECT_APPEND ?>&pn="+pn+"&pat_station="+pw+"&ward_nr=<?php echo $ward_nr
?>&station=<?php echo $station ?>";
+ urlholder="nursing-ward-assignwaiting.php<?php echo URL_REDIRECT_APPEND
?>&pn="+pn+"&pat_station="+pw+"&ward_nr=<?php echo $ward_nr ?>&station=<?php
echo $station ?>";
asswin<?php echo $sid ?>=window.open(urlholder,"asswind<?php echo $sid
?>","width=650,height=600,menubar=no,resizable=yes,scrollbars=yes");
}
function Transfer(pn,pw)
{
if(confirm("<?php echo $LDSureTransferPatient ?>")){
- urlholder="nursing-station-transfer-select.php<?php echo
URL_REDIRECT_APPEND ?>&pn="+pn+"&pat_station="+pw+"&ward_nr=<?php echo $ward_nr
?>&station=<?php echo $station ?>";
+ urlholder="nursing-ward-transfer-select.php<?php echo
URL_REDIRECT_APPEND ?>&pn="+pn+"&pat_station="+pw+"&ward_nr=<?php echo $ward_nr
?>&station=<?php echo $station ?>";
transwin<?php echo $sid ?>=window.open(urlholder,"transwin<?php
echo $sid ?>","width=650,height=600,menubar=no,resizable=yes,scrollbars=yes");
}
}
@@ -282,7 +282,7 @@
if(($occup=='template')&&(!$mode)&&(!isset($list)||!$list)){
$smarty->assign('sWarningPrompt'.$LDNoListYet.'<br>
- <form action="nursing-station.php" method=post>
+ <form action="nursing-ward.php" method=post>
<input type="hidden" name="sid" value="'.$sid.'">
<input type="hidden" name="lang" value="'.$lang.'">
<input type="hidden" name="pyear" value="'.$pyear.'">
@@ -303,7 +303,7 @@
else $sWarnBuffer = $sWarnBuffer.'<font
color=red><b>'.$LDFromYesterday.'</b></font><br>
';
$sWarnBuffer = $sWarnBuffer.'
- <form action="nursing-station.php" method=post>
+ <form action="nursing-ward.php" method=post>
<input type="hidden" name="sid" value="'.$sid.'">
<input type="hidden" name="lang" value="'.$lang.'">
<input type="hidden" name="pyear" value="'.$pyear.'">
@@ -316,7 +316,7 @@
else $sWarnBuffer = $sWarnBuffer.'
<input type="submit"
value="'.$LDTakeoverList.'" >';
$sWarnBuffer = $sWarnBuffer.'
- <input type="button"
value="'.$LDDoNotCopy.'"
onClick="javascript:window.location.href=\'nursing-station.php?sid='.$sid.'&edit=1&list=1&station='.$station.'&mode=fresh\'">
+ <input type="button"
value="'.$LDDoNotCopy.'"
onClick="javascript:window.location.href=\'nursing-ward.php?sid='.$sid.'&edit=1&list=1&station='.$station.'&mode=fresh\'">
</form>';
$smarty->assign('sWarningPrompt',$sWarnBuffer);
@@ -663,20 +663,20 @@
$smarty->assign('sNewWardLink','<ul><div class="prompt"><img
'.createMascot($root_path,'mascot1_r.gif','0','absmiddle').'>
'.str_replace("~station~",strtoupper($station),$LDNoInit).'</b></font><br>
- <a
href="nursing-station-new.php'.URL_APPEND.'&station='.$station.'&edit='.$edit.'">'.$LDIfInit.'
<img '.createComIcon($root_path,'bul_arrowgrnlrg.gif','0','',TRUE).'></a><p>
+ <a
href="nursing-ward-new.php'.URL_APPEND.'&station='.$station.'&edit='.$edit.'">'.$LDIfInit.'
<img '.createComIcon($root_path,'bul_arrowgrnlrg.gif','0','',TRUE).'></a><p>
</div></ul>');
} // end of if ward_ok
if($pday.$pmonth.$pyear<>date('dmY'))
$smarty->assign('sToArchiveLink','<p>
- <a
href="nursing-station-archiv.php'.URL_APPEND.'">'.$LDClk2Archive.' <img
'.createComIcon($root_path,'bul_arrowgrnlrg.gif','0','',TRUE).'></a>
+ <a
href="nursing-ward-archiv.php'.URL_APPEND.'">'.$LDClk2Archive.' <img
'.createComIcon($root_path,'bul_arrowgrnlrg.gif','0','',TRUE).'></a>
<p>');
$smarty->assign('pbClose','<a href="'.$breakfile.'"><img
'.createLDImgSrc($root_path,'close2.gif','0','absmiddle').'></a>  ');
if(!$edit){
- $smarty->assign('sOpenWardMngmt','<a
href="nursing-station-pass.php'.URL_APPEND.'&edit=1&rt=pflege&ward_nr='.$ward_nr.'&station='.$ward_info['name'].'"><img
'.createComIcon($root_path,'uparrowgrnlrg.gif','0','absmiddle',TRUE).'>
'.$LDOpenWardManagement.'</a>');
+ $smarty->assign('sOpenWardMngmt','<a
href="nursing-ward-pass.php'.URL_APPEND.'&edit=1&rt=pflege&ward_nr='.$ward_nr.'&station='.$ward_info['name'].'"><img
'.createComIcon($root_path,'uparrowgrnlrg.gif','0','absmiddle',TRUE).'>
'.$LDOpenWardManagement.'</a>');
}
Modified:
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-ddc.php
===================================================================
---
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-ddc.php
2010-06-30 09:48:13 UTC (rev 6452)
+++
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-ddc.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -215,7 +215,7 @@
}
function getinfo(patientID){
- urlholder="nursing-station.php?sid=<?php echo "$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
+ urlholder="nursing-ward.php?sid=<?php echo "$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
patientwin=window.open(urlholder,patientID,"width=600,height=400,menubar=no,resizable=yes,scrollbars=yes");
}
function sethilite(d){
Modified:
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-inout.php
===================================================================
---
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-inout.php
2010-06-30 09:48:13 UTC (rev 6452)
+++
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-inout.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -225,7 +225,7 @@
}
function getinfo(patientID){
- urlholder="nursing-station.php?sid=<?php echo "$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
+ urlholder="nursing-ward.php?sid=<?php echo "$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
patientwin=window.open(urlholder,patientID,"width=600,height=400,menubar=no,resizable=yes,scrollbars=yes");
}
function sethilite(d){
Modified:
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-noc.php
===================================================================
---
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-noc.php
2010-06-30 09:48:13 UTC (rev 6452)
+++
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-noc.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -209,7 +209,7 @@
}
function getinfo(patientID){
- urlholder="nursing-station.php?sid=<?php echo "$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
+ urlholder="nursing-ward.php?sid=<?php echo "$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
patientwin=window.open(urlholder,patientID,"width=600,height=400,menubar=no,resizable=yes,scrollbars=yes");
}
function sethilite(d){
Modified:
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-tc.php
===================================================================
---
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-tc.php
2010-06-30 09:48:13 UTC (rev 6452)
+++
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-custom-tc.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -238,7 +238,7 @@
}
function getinfo(patientID){
- urlholder="nursing-station.php?sid=<?php echo "$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
+ urlholder="nursing-ward.php?sid=<?php echo "$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
patientwin=window.open(urlholder,patientID,"width=600,height=400,menubar=no,resizable=yes,scrollbars=yes");
}
function sethilite(d){
Modified:
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-diagnosis.php
===================================================================
---
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-diagnosis.php
2010-06-30 09:48:13 UTC (rev 6452)
+++
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-diagnosis.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -146,7 +146,7 @@
}
function getinfo(patientID){
- urlholder="nursing-station.php?<?php echo "sid=$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
+ urlholder="nursing-ward.php?<?php echo "sid=$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
patientwin=window.open(urlholder,patientID,"width=600,height=400,menubar=no,resizable=yes,scrollbars=yes");
}
function sethilite(d){
Modified:
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-pbericht.php
===================================================================
---
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-pbericht.php
2010-06-30 09:48:13 UTC (rev 6452)
+++
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-pbericht.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -184,7 +184,7 @@
}
function getinfo(patientID){
- urlholder="nursing-station.php?sid=<?php echo "$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
+ urlholder="nursing-ward.php?sid=<?php echo "$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
patientwin=window.open(urlholder,patientID,"width=600,height=400,menubar=no,resizable=yes,scrollbars=yes");
}
function sethilite(d){
Modified:
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-rootinfo.php
===================================================================
---
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-rootinfo.php
2010-06-30 09:48:13 UTC (rev 6452)
+++
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-rootinfo.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -177,7 +177,7 @@
}
function getinfo(patientID){
- urlholder="nursing-station.php?route=validroute&patient=" + patientID +
"&user=<?php echo $aufnahme_user.'"' ?>;
+ urlholder="nursing-ward.php?route=validroute&patient=" + patientID +
"&user=<?php echo $aufnahme_user.'"' ?>;
patientwin=window.open(urlholder,patientID,"width=600,height=400,menubar=no,resizable=yes,scrollbars=yes");
}
function sethilite(d){
Modified:
care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-todo.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-todo.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing-ward-patientdata-todo.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -176,7 +176,7 @@
}
function getinfo(patientID){
- urlholder="nursing-station.php?<?php echo "sid=$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
+ urlholder="nursing-ward.php?<?php echo "sid=$sid&lang=$lang"
?>&route=validroute&patient=" + patientID + "&user=<?php echo
$_COOKIE[$local_user.$sid].'"' ?>;
patientwin=window.open(urlholder,patientID,"width=600,height=400,menubar=no,resizable=yes,scrollbars=yes");
}
function sethilite(d){
Modified: care2x/branches/gettext/modules/nursing/nursing.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing.php 2010-06-30 09:48:13 UTC
(rev 6452)
+++ care2x/branches/gettext/modules/nursing/nursing.php 2010-06-30 09:51:24 UTC
(rev 6453)
@@ -44,13 +44,13 @@
if(is_object($ward_info))
{
while($stations=$ward_info->FetchRow()) {
- $sWardInfo = $sWardInfo.'<tr><td><a
href="'.strtr('nursing-station-pass.php'.URL_APPEND.'&rt=pflege&edit=1&station='.$stations['ward_id'].'&location_id='.$stations['ward_id'].'&ward_nr='.$stations['nr'].'&dept_nr='.$stations['dept_nr'],'
',' ').'"><div
class="wardname"><li>'.strtoupper($stations['ward_id']).' </div></a> ';
+ $sWardInfo = $sWardInfo.'<tr><td><a
href="'.strtr('nursing-ward-pass.php'.URL_APPEND.'&rt=pflege&edit=1&station='.$stations['ward_id'].'&location_id='.$stations['ward_id'].'&ward_nr='.$stations['nr'].'&dept_nr='.$stations['dept_nr'],'
',' ').'"><div
class="wardname"><li>'.strtoupper($stations['ward_id']).' </div></a> ';
$sWardInfo = $sWardInfo."\n";
$sWardInfo = $sWardInfo.'</td><td>'.$stations['name'].'</td></tr>';
}
} else {
- $sWardInfo = $LDNoWardsYet.'<br><img
'.createComIcon($root_path,'redpfeil.gif','0','absmiddle').'> <a
href="nursing-station-manage-pass.php'.URL_APPEND.'">'.$LDClk2CreateWard.'</a>';
+ $sWardInfo = $LDNoWardsYet.'<br><img
'.createComIcon($root_path,'redpfeil.gif','0','absmiddle').'> <a
href="nursing-ward-manage-pass.php'.URL_APPEND.'">'.$LDClk2CreateWard.'</a>';
}
@@ -74,7 +74,7 @@
$aSubMenuItem = array('LDNursingStations' => $LDNursingStations." <img
".createComIcon($root_path,'dwn-arrow-grn.gif','0','absmiddle').">",
'LDQuickView' => "<a
href=\"".$root_path."modules/nursing/nursing-quickview.php".URL_APPEND."\">$LDQuickView</a>",
'LDSearchPatient' => "<a
href=\"".$root_path."modules/nursing/nursing-patient-search-start.php".URL_APPEND."\">$LDSearchPatient</a>",
-
'LDArchive' => "<a
href=\"".$root_path."modules/nursing/nursing-station-archiv.php".URL_APPEND."\">$LDArchive</a>",
+
'LDArchive' => "<a
href=\"".$root_path."modules/nursing/nursing-ward-archiv.php".URL_APPEND."\">$LDArchive</a>",
'LDNursesList' => "<a
href=\"".$root_path."modules/nursing_or/nursing-or-main-pass.php".URL_APPEND."&target=setpersonal&retpath=menu\">$LDNursesList</a>",
'LDNews' => "<a
href=\"".$root_path."modules/news/newscolumns.php".URL_APPEND."&dept_nr=36\">$LDNews</a>"
);
Modified:
care2x/branches/gettext/modules/registration_admission/admission_data_show.php
===================================================================
---
care2x/branches/gettext/modules/registration_admission/admission_data_show.php
2010-06-30 09:48:13 UTC (rev 6452)
+++
care2x/branches/gettext/modules/registration_admission/admission_data_show.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -338,7 +338,7 @@
$smarty->assign('LDWard',$LDWard);
- $smarty->assign('sWardInput','<a
href="'.$root_path.'modules/nursing/'.strtr('nursing-station-pass.php'.URL_APPEND.'&rt=pflege&edit=1&station='.$current_ward_name.'&location_id='.$current_ward_name.'&ward_nr='.$current_ward_nr,'
',' ').'">'.$current_ward_name.'</a>');
+ $smarty->assign('sWardInput','<a
href="'.$root_path.'modules/nursing/'.strtr('nursing-ward-pass.php'.URL_APPEND.'&rt=pflege&edit=1&station='.$current_ward_name.'&location_id='.$current_ward_name.'&ward_nr='.$current_ward_nr,'
',' ').'">'.$current_ward_name.'</a>');
}elseif($encounter_class_nr==2){
Modified:
care2x/branches/gettext/modules/registration_admission/gui_bridge/default/gui_patient_encounter_showdata_options.php
===================================================================
---
care2x/branches/gettext/modules/registration_admission/gui_bridge/default/gui_patient_encounter_showdata_options.php
2010-06-30 09:48:13 UTC (rev 6452)
+++
care2x/branches/gettext/modules/registration_admission/gui_bridge/default/gui_patient_encounter_showdata_options.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -27,7 +27,7 @@
';
}
/*else echo '
-
window.location.href=\'nursing-station-pass.php'.URL_APPEND.'&rt=pflege&edit=1&station='.$station.'\'';*/
+
window.location.href=\'nursing-ward-pass.php'.URL_APPEND.'&rt=pflege&edit=1&station='.$station.'\'';*/
?>
}
function cancelEnc(){
Modified: care2x/branches/gettext/modules/system_admin/edv-system-admi-menu.php
===================================================================
--- care2x/branches/gettext/modules/system_admin/edv-system-admi-menu.php
2010-06-30 09:48:13 UTC (rev 6452)
+++ care2x/branches/gettext/modules/system_admin/edv-system-admi-menu.php
2010-06-30 09:51:24 UTC (rev 6453)
@@ -141,8 +141,8 @@
<tr>
<td bgcolor="#ffffff" valign="top">
<FONT color="#0000cc" FACE="verdana,arial" size=2>
- <img <?php echo
createComIcon($root_path,'redpfeil.gif','0','absmiddle') ?>> <a href="<?php
echo $root_path; ?>modules/nursing/nursing-station-new.php<?php echo
URL_APPEND; ?>" target="SYSADMIN_WFRAME"><?php echo $LDCreate ?></a><br>
- <img <?php echo
createComIcon($root_path,'redpfeil.gif','0','absmiddle') ?>> <a href="<?php
echo $root_path; ?>modules/nursing/nursing-station-info.php<?php echo
URL_APPEND; ?>" target="SYSADMIN_WFRAME"><?php echo $LDProfile ?></a><br>
+ <img <?php echo
createComIcon($root_path,'redpfeil.gif','0','absmiddle') ?>> <a href="<?php
echo $root_path; ?>modules/nursing/nursing-ward-new.php<?php echo URL_APPEND;
?>" target="SYSADMIN_WFRAME"><?php echo $LDCreate ?></a><br>
+ <img <?php echo
createComIcon($root_path,'redpfeil.gif','0','absmiddle') ?>> <a href="<?php
echo $root_path; ?>modules/nursing/nursing-ward-info.php<?php echo URL_APPEND;
?>" target="SYSADMIN_WFRAME"><?php echo $LDProfile ?></a><br>
</td>
</tr>
<!-- end : gjergji -->
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
Care2002-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/care2002-developers
