Revision: 6464
http://care2002.svn.sourceforge.net/care2002/?rev=6464&view=rev
Author: mizuko
Date: 2010-06-30 11:15:23 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/js/cal.js
care2x/branches/gettext/main/op-docu.php
care2x/branches/gettext/main/op-pflege.php
care2x/branches/gettext/modules/calendar/calendar-options.php
care2x/branches/gettext/modules/nursing_or/nursing-or-roster-day.php
care2x/branches/gettext/modules/or_logbook/op-nursing-select-dept.php
care2x/branches/gettext/modules/or_logbook/op-pflege-graph-getwaittime.php
care2x/branches/gettext/modules/or_logbook/op-pflege-log-getinfo.php
care2x/branches/gettext/modules/or_logbook/op-pflege-log-getpersonell.php
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-edit.php
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-javastart.php
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-start.php
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-javastart.php
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-pass.php
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-poptimeinput.php
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-such-javastart.php
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-xtsuch-start.php
care2x/branches/gettext/modules/or_logbook/oploginput.php
care2x/branches/gettext/modules/or_logbook/oplogmain.php
care2x/branches/gettext/modules/or_logbook/oplogtime.php
care2x/branches/gettext/modules/system_admin/edv-datenbank-pass.php
Modified: care2x/branches/gettext/js/cal.js
===================================================================
--- care2x/branches/gettext/js/cal.js 2010-06-30 11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/js/cal.js 2010-06-30 11:15:23 UTC (rev 6464)
@@ -9,7 +9,7 @@
var jbuf = document.direct.jahr.value;
if (!isNaN(jbuf)) {
jbuf = parseInt(jbuf);
- var urltarget = "op-pflege-calendar.php?sid=<?print $ck_sid;
?>&pmonth=" + mbuf + "&pyear=" + jbuf;
+ var urltarget = "op-care-calendar.php?sid=<?print $ck_sid;
?>&pmonth=" + mbuf + "&pyear=" + jbuf;
window.location.replace(urltarget);
} else
document.direct.jahr.select();
Modified: care2x/branches/gettext/main/op-docu.php
===================================================================
--- care2x/branches/gettext/main/op-docu.php 2010-06-30 11:13:54 UTC (rev
6463)
+++ care2x/branches/gettext/main/op-docu.php 2010-06-30 11:15:23 UTC (rev
6464)
@@ -92,15 +92,15 @@
$smarty->assign('LDOrNursing',"<img
".createLDImgSrc($root_path,'pflege2.gif','0','absmiddle')."
alt=\"$LDNursing\">");
//PLog
-$smarty->assign('LDOrLogBook',"<a
href=\"".$root_path."modules/or_logbook/op-pflege-logbuch-pass.php".URL_APPEND."\">$LDOrLogBook</a>");
+$smarty->assign('LDOrLogBook',"<a
href=\"".$root_path."modules/or_logbook/op-care-logbuch-pass.php".URL_APPEND."\">$LDOrLogBook</a>");
$smarty->assign('LDOrLogBookTxt',$LDOrLogBookTxt);
$smarty->assign('LDOrLogBookMenu',
'<TABLE cellSpacing=1 cellPadding=5 width="100%"
bgColor=#dddddd border=0>
<TR>
<TD bgColor=#ffffff><font face=arial,verdana
size=2><nobr>
- \xBB <A href="' . $root_path .
'modules/or_logbook/op-pflege-logbuch-pass.php' .
URL_REDIRECT_APPEND.'&target=entry";>'. $LDNewDocu .'</A>
- \xBB <A href="'. $root_path
.'modules/or_logbook/op-pflege-logbuch-pass.php' . URL_REDIRECT_APPEND .
'&target=search";">' . $LDSearch . '</A>
- \xBB <A href="'. $root_path .
'modules/or_logbook/op-pflege-logbuch-pass.php' . URL_REDIRECT_APPEND .
'&target=archiv";">' . $LDArchive . '</A>
+ \xBB <A href="' . $root_path .
'modules/or_logbook/op-care-logbuch-pass.php' .
URL_REDIRECT_APPEND.'&target=entry";>'. $LDNewDocu .'</A>
+ \xBB <A href="'. $root_path
.'modules/or_logbook/op-care-logbuch-pass.php' . URL_REDIRECT_APPEND .
'&target=search";">' . $LDSearch . '</A>
+ \xBB <A href="'. $root_path .
'modules/or_logbook/op-care-logbuch-pass.php' . URL_REDIRECT_APPEND .
'&target=archiv";">' . $LDArchive . '</A>
</font></TD>
</TR>
</TABLE>');
Modified: care2x/branches/gettext/main/op-pflege.php
===================================================================
--- care2x/branches/gettext/main/op-pflege.php 2010-06-30 11:13:54 UTC (rev
6463)
+++ care2x/branches/gettext/main/op-pflege.php 2010-06-30 11:15:23 UTC (rev
6464)
@@ -40,8 +40,8 @@
<td valign=top bgcolor=#cde1ec colspan=2><p><br>
<ul>
<FONT SIZE=-1 FACE="Arial">
-<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="op-pflege-dienst-schnellsicht.php">Schnell\xFCbersicht \xFCber die
gegenw\xE4rtige diensthabende OP Pfleger</a><br>
-<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="op-pflege-logbuch-pass.php">OP Logbuch</a><br>
+<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="op-care-dienst-schnellsicht.php">Schnell\xFCbersicht \xFCber die
gegenw\xE4rtige diensthabende OP Pfleger</a><br>
+<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="op-care-logbuch-pass.php">OP Logbuch</a><br>
<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a href="#"
ONCLICK="bdienstwin()">Bereitschaftsdienst - Zeiterfassung</a><br>
<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="#">Dienstplan</a><br>
<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="#">Nachrichten</a><br>
Modified: care2x/branches/gettext/modules/calendar/calendar-options.php
===================================================================
--- care2x/branches/gettext/modules/calendar/calendar-options.php
2010-06-30 11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/calendar/calendar-options.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -136,16 +136,16 @@
-->
<?php if($i_date==date('Y-m-d'))
{ echo '
- <li><a
href="'.$root_path.'modules/or_logbook/op-pflege-logbuch-pass.php'.URL_APPEND;
+ <li><a
href="'.$root_path.'modules/or_logbook/op-care-logbuch-pass.php'.URL_APPEND;
echo
"&target=entry&lang=$lang&pday=$day&pmonth=$month&pyear=$year&dept_nr=$dept_nr";
echo '&retpath=calendar_opt">'.$LDORLogbook.'</a></li>
';
}
?>
-<li><a href="<?php echo $root_path
?>modules/or_logbook/op-pflege-logbuch-pass.php<?php echo
URL_APPEND."&target=search&lang=$lang&pday=$day&pmonth=$month&pyear=$year&dept=$dept"
?>&retpath=calendar_opt"><?php echo $LDORLogbookSearch ?></a></li>
+<li><a href="<?php echo $root_path
?>modules/or_logbook/op-care-logbuch-pass.php<?php echo
URL_APPEND."&target=search&lang=$lang&pday=$day&pmonth=$month&pyear=$year&dept=$dept"
?>&retpath=calendar_opt"><?php echo $LDORLogbookSearch ?></a></li>
<?php if($i_date<=date('Y-m-d'))
{ echo '
- <li><a
href="'.$root_path.'modules/or_logbook/op-pflege-logbuch-pass.php'.URL_APPEND;
+ <li><a
href="'.$root_path.'modules/or_logbook/op-care-logbuch-pass.php'.URL_APPEND;
echo
"&target=archiv&pday=$day&pmonth=$month&pyear=$year&dept_nr=$dept_nr";
echo
'&retpath=calendar_opt">'.$LDORLogbookArch.'</a></li>';
}
Modified: care2x/branches/gettext/modules/nursing_or/nursing-or-roster-day.php
===================================================================
--- care2x/branches/gettext/modules/nursing_or/nursing-or-roster-day.php
2010-06-30 11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/nursing_or/nursing-or-roster-day.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -115,7 +115,7 @@
h=window.screen.height;
ww=400;
wh=400;
-
urlholder="op-pflege-dienstplan-popinfo.php?ln="+l+"&fn="+f+"&bd="+b+"&dept=<?php
echo "$dept&sid=$sid&lang=$lang" ?>&route=validroute&user=<?php echo
$aufnahme_user.'"' ?>;
+
urlholder="op-care-dienstplan-popinfo.php?ln="+l+"&fn="+f+"&bd="+b+"&dept=<?php
echo "$dept&sid=$sid&lang=$lang" ?>&route=validroute&user=<?php echo
$aufnahme_user.'"' ?>;
infowin=window.open(urlholder,"infowin","width=" + ww + ",height=" + wh
+",menubar=no,resizable=yes,scrollbars=yes");
window.infowin.moveTo((w/2)+20,(h/2)-(wh/2));
Modified: care2x/branches/gettext/modules/or_logbook/op-nursing-select-dept.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-nursing-select-dept.php
2010-06-30 11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/or_logbook/op-nursing-select-dept.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -20,16 +20,16 @@
switch($target){
case 'search': $title="$LDOrLogBook :: $LDSearch";
-
//$fileforward='op-pflege-logbuch-such-javastart.php'.URL_APPEND.'&retpath='.$retpath;
-
$targetfile='op-pflege-logbuch-such-javastart.php';
+
//$fileforward='op-care-logbuch-such-javastart.php'.URL_APPEND.'&retpath='.$retpath;
+
$targetfile='op-care-logbuch-such-javastart.php';
break;
case 'archiv': $title="$LDOrLogBook :: $LDArchive";
-
//$fileforward='op-pflege-logbuch-arch-javastart.php'.URL_APPEND.'&retpath='.$retpath;
-
$targetfile='op-pflege-logbuch-arch-javastart.php';
+
//$fileforward='op-care-logbuch-arch-javastart.php'.URL_APPEND.'&retpath='.$retpath;
+
$targetfile='op-care-logbuch-arch-javastart.php';
break;
default: $title=$LDOrLogBook;
-
//$fileforward='op-pflege-logbuch-javastart.php'.URL_APPEND.'&retpath='.$retpath;
-
$targetfile='op-pflege-logbuch-javastart.php';
+
//$fileforward='op-care-logbuch-javastart.php'.URL_APPEND.'&retpath='.$retpath;
+
$targetfile='op-care-logbuch-javastart.php';
break;
}
$dept_ok=false;
Modified:
care2x/branches/gettext/modules/or_logbook/op-pflege-graph-getwaittime.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-pflege-graph-getwaittime.php
2010-06-30 11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/or_logbook/op-pflege-graph-getwaittime.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -12,7 +12,7 @@
$local_user='ck_op_pflegelogbuch_user';
require_once($root_path.'include/helpers/inc_front_chain_lang.php');
-$thisfile="op-pflege-graph-getwaittime.php";
+$thisfile="op-care-graph-getwaittime.php";
switch($winid)
{
Modified: care2x/branches/gettext/modules/or_logbook/op-pflege-log-getinfo.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-pflege-log-getinfo.php
2010-06-30 11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/or_logbook/op-pflege-log-getinfo.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -245,7 +245,7 @@
onLoad="<?php if($mode=="saveok") echo "refreshparent();window.focus();"; ?>if
(window.focus) window.focus();
window.focus();document.infoform.inputdata.focus();" >
<a href="javascript:gethelp('oplog.php','person','<?php echo $winid ?>')"><img
<?php echo createLDImgSrc($root_path,'hilfe-r.gif','0') ?> alt="<?php echo
$LDHelp ?>" align="right"></a>
-<form name="infoform" action="op-pflege-log-getpersonell.php" method="post"
onSubmit="return pruf(this)">
+<form name="infoform" action="op-care-log-getpersonell.php" method="post"
onSubmit="return pruf(this)">
<font face=verdana,arial size=5 color=maroon>
<b>
Modified:
care2x/branches/gettext/modules/or_logbook/op-pflege-log-getpersonell.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-pflege-log-getpersonell.php
2010-06-30 11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/or_logbook/op-pflege-log-getpersonell.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -32,7 +32,7 @@
}
$thisfile=basename(__FILE__);
-$forwardfile="op-pflege-log-getinfo.php?sid=$sid&lang=$lang&winid=$winid&mode=save&enc_nr=$enc_nr&dept_nr=$dept_nr&saal=$saal&pyear=$pyear&pmonth=$pmonth&pday=$pday&op_nr=$op_nr";
+$forwardfile="op-care-log-getinfo.php?sid=$sid&lang=$lang&winid=$winid&mode=save&enc_nr=$enc_nr&dept_nr=$dept_nr&saal=$saal&pyear=$pyear&pmonth=$pmonth&pday=$pday&op_nr=$op_nr";
$search=$pers_obj->searchPersonellBasicInfo($inputdata);
@@ -59,7 +59,7 @@
//urlholder="<?php echo $forwardfile
?>&ln="+ln+"&fn="+fn+"&nx="+d[x].value;
//window.location.replace(urlholder);
d=document.infoform;
- d.action="op-pflege-log-getinfo.php";
+ d.action="op-care-log-getinfo.php";
d.ln.value=iln;
d.fn.value=ifn;
d.pr.value=ipr;
@@ -87,7 +87,7 @@
onLoad="<?php if($saved) echo "parentrefresh();"; ?>if (window.focus)
window.focus(); window.focus();document.infoform.inputdata.focus();" >
<a href="javascript:gethelp()"><img <?php echo
createLDImgSrc($root_path,'hilfe-r.gif','0') ?> alt="<?php echo $LDHelp ?>"
align="right"></a>
-<form name="infoform" action="op-pflege-log-getpersonell.php" method="post"
onSubmit="return pruf(this)">
+<form name="infoform" action="op-care-log-getpersonell.php" method="post"
onSubmit="return pruf(this)">
<img <?php echo createComIcon($root_path,'magnify.gif','0','absmiddle');
?>><font face=verdana,arial size=5 color=maroon>
<b>
<?php
@@ -223,7 +223,7 @@
</form>
<p>
-<a href="<?php echo
"op-pflege-log-getinfo.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&saal=$saal&op_nr=$op_nr&enc_nr=$enc_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear&winid=$winid";?>"><img
<?php echo createLDImgSrc($root_path,'back2.gif','0','left'); ?>>
+<a href="<?php echo
"op-care-log-getinfo.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&saal=$saal&op_nr=$op_nr&enc_nr=$enc_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear&winid=$winid";?>"><img
<?php echo createLDImgSrc($root_path,'back2.gif','0','left'); ?>>
</a><a href="javascript:window.close()">
<img <?php echo createLDImgSrc($root_path,'cancel.gif','0') ?> border="0"
alt="<?php echo $LDClose ?>" align="right">
</a>
Modified:
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-edit.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-edit.php
2010-06-30 11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-edit.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -393,7 +393,7 @@
</TR>
</TABLE>
-<FORM METHOD="post" ACTION="op-pflege-logbuch-arch-edit.php?mode=save"
+<FORM METHOD="post" ACTION="op-care-logbuch-arch-edit.php?mode=save"
name="oppflegepatinfo" onSubmit="return checksubmit()"><input
type="hidden" name="processer"
value="<?php
@@ -443,7 +443,7 @@
<!--
-<a href="op-pflege-logbuch-arch-edit.php?mode=fresh&filename=<?php
+<a href="op-care-logbuch-arch-edit.php?mode=fresh&filename=<?php
echo $filename . '&pyear=' . date ( Y ) . '&pmonth=' . date ( m ) . '&pday=' .
date ( d ) ;
?>"><img src="../img/newpat2.gif" border=0></a>
-->
Modified:
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-javastart.php
===================================================================
---
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-javastart.php
2010-06-30 11:13:54 UTC (rev 6463)
+++
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-javastart.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -38,7 +38,7 @@
w=800;
h=650;';
?>
- logbuchwin=window.open("op-pflege-logbuch-arch-start.php?sid=<?php echo
"$sid&lang=$lang&dept_nr=$dept_nr";?>","archlogbuchwin","menubar=no,resizable=yes,scrollbars=yes,
width=" + (w-15) + ", height=" + (h-60));
+ logbuchwin=window.open("op-care-logbuch-arch-start.php?sid=<?php echo
"$sid&lang=$lang&dept_nr=$dept_nr";?>","archlogbuchwin","menubar=no,resizable=yes,scrollbars=yes,
width=" + (w-15) + ", height=" + (h-60));
window.logbuchwin.moveTo(0,0);
window.location.replace('<?php if($retpath=="calendar_opt") echo
$root_path."calendar/calendar-options.php?sid=$sid&lang=$lang&day=$pday&month=$pmonth&year=$pyear";
else echo
$root_path."main/op-docu.php?sid=".$sid."&lang=".$lang;?>&forcestation=1&nofocus=1');
Modified:
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-start.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-start.php
2010-06-30 11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-start.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -245,7 +245,7 @@
<?php if ($datafound) { ?>
function openeditwin(filename,y,m,d)
{
-
url="op-pflege-logbuch-arch-edit.php?mode=edit&fileid="+filename+"&sid=<?php
echo $sid; ?>&user=<?php echo str_replace(" ","+",$user);
?>&pyear="+y+"&pmonth="+m+"&pday="+d+"&dept_nr=<?php echo
$dept_nr;?>&saal=<?php echo $saal;?>";
+
url="op-care-logbuch-arch-edit.php?mode=edit&fileid="+filename+"&sid=<?php echo
$sid; ?>&user=<?php echo str_replace(" ","+",$user);
?>&pyear="+y+"&pmonth="+m+"&pday="+d+"&dept_nr=<?php echo
$dept_nr;?>&saal=<?php echo $saal;?>";
w=window.parent.screen.width;
h=window.parent.screen.height;
@@ -290,7 +290,7 @@
<tr class="wardlisttitlerow"><td colspan=2 ><nobr>';
echo '
- <a
href="op-pflege-logbuch-arch-start.php?sid='.$sid.'&lang='.$lang.'&nogetlast=1&dept_nr='.$dept_nr.'&saal='.$saal.'&thisday='.$yesday.'&noseek=1"
+ <a
href="op-care-logbuch-arch-start.php?sid='.$sid.'&lang='.$lang.'&nogetlast=1&dept_nr='.$dept_nr.'&saal='.$saal.'&thisday='.$yesday.'&noseek=1"
title="'.formatDate2Local($yesday,$date_format).'">
<< '.$LDPrevDay.'</a>';
@@ -304,7 +304,7 @@
<td colspan=2 align=right >';
if($thisday!=$today) echo '
- <a
href="op-pflege-logbuch-arch-start.php?sid='.$sid.'&lang='.$lang.'&nogetlast=1&dept_nr='.$dept_nr.'&saal='.$saal.'&thisday='.$tomorow.'&noseek=1"
+ <a
href="op-care-logbuch-arch-start.php?sid='.$sid.'&lang='.$lang.'&nogetlast=1&dept_nr='.$dept_nr.'&saal='.$saal.'&thisday='.$tomorow.'&noseek=1"
title="'.formatDate2Local($tomorow,$date_format).'">
<nobr>'.$LDNextDay.'
>></a></td></tr>';
echo '
@@ -333,7 +333,7 @@
echo '
<td valign=top><font size="1" ><font size=2
color=red><b>'.$pdata['op_nr'].'</b></font><hr>'.formatDate2Local($pdata['op_date'],$date_format).'<br>
'.$tage[date("w",mktime(0,0,0,$imonth,$iday,$iyear))].'<br>
- <a
href="op-pflege-logbuch-start.php?sid='.$sid.'&lang='.$lang.'&mode=saveok&enc_nr='.$pdata['encounter_nr'].'&op_nr='.$pdata['op_nr'].'&dept_nr='.$pdata['dept_nr'].'&saal='.$pdata['op_room'].'&thisday='.$pdata['op_date'].'"
';
+ <a
href="op-care-logbuch-start.php?sid='.$sid.'&lang='.$lang.'&mode=saveok&enc_nr='.$pdata['encounter_nr'].'&op_nr='.$pdata['op_nr'].'&dept_nr='.$pdata['dept_nr'].'&saal='.$pdata['op_room'].'&thisday='.$pdata['op_date'].'"
';
if ($child) echo 'target="_parent"';
@@ -464,7 +464,7 @@
{
echo '
<MAP NAME="catcom">
- <AREA SHAPE="RECT" COORDS="158,90,230,110"
HREF="op-pflege-logbuch-xtsuch-start.php?sid='.$sid.'&lang='.$lang.'&mode=fresh&dept_nr='.$dept_nr.'&saal='.$saal.'"
title="'.$LDSearchPatient.' ['.$LDOrLogBook.']" >
+ <AREA SHAPE="RECT" COORDS="158,90,230,110"
HREF="op-care-logbuch-xtsuch-start.php?sid='.$sid.'&lang='.$lang.'&mode=fresh&dept_nr='.$dept_nr.'&saal='.$saal.'"
title="'.$LDSearchPatient.' ['.$LDOrLogBook.']" >
</MAP><img ismap usemap="#catcom"
'.createLDImgSrc($root_path,'cat-com2.gif','0').'>
<DIV id=dLogoTable style=" VISIBILITY: hidden;
POSITION: relative">
<table border=0 bgcolor="#33333" cellspacing=0
cellpadding=1>
@@ -510,7 +510,7 @@
<ul>
-<form action="op-pflege-logbuch-arch-start.php" method="post" name="chgdept"
onSubmit="return pruf(this)">
+<form action="op-care-logbuch-arch-start.php" method="post" name="chgdept"
onSubmit="return pruf(this)">
<input type="hidden" name="sid" value="<?php echo $sid; ?>">
<input type="hidden" name="lang" value="<?php echo $lang; ?>">
@@ -561,8 +561,8 @@
</form><p>
<b><?php echo $LDOtherFunctions ?>:</b><br>
-<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="op-pflege-logbuch-xtsuch-start.php?sid=<?php echo
"$sid&lang=$lang&mode=fresh&dept_nr=$dept_nr&saal=$saal&child=$child" ?>"><?php
echo "$LDSearchPatient [$LDOrLogBook]" ?></a><br>
-<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="op-pflege-logbuch-start.php?sid=<?php echo
"$sid&lang=$lang&mode=fresh&dept_nr=$dept_nr&saal=$saal" ?>" <?php if ($child)
echo "target=\"_parent\""; ?>><?php echo "$LDStartNewDocu [$opabt[$dept_nr]
$LDRoom $saal]" ?></a><br>
+<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="op-care-logbuch-xtsuch-start.php?sid=<?php echo
"$sid&lang=$lang&mode=fresh&dept_nr=$dept_nr&saal=$saal&child=$child" ?>"><?php
echo "$LDSearchPatient [$LDOrLogBook]" ?></a><br>
+<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="op-care-logbuch-start.php?sid=<?php echo
"$sid&lang=$lang&mode=fresh&dept_nr=$dept_nr&saal=$saal" ?>" <?php if ($child)
echo "target=\"_parent\""; ?>><?php echo "$LDStartNewDocu [$opabt[$dept_nr]
$LDRoom $saal]" ?></a><br>
<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="javascript:gethelp('oplog.php','arch','<?php echo $dif ?>','<?php echo
$lastlog ?>','<?php echo $datafound ?>')"><?php echo "$LDHelp" ?></a><br>
<!--
<p>
Modified:
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-javastart.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-javastart.php
2010-06-30 11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-javastart.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -43,7 +43,7 @@
h=650;';
?>
- logbuchwin=window.open("<?php echo $root_path.$top_dir;
?>op-pflege-logbuch-start.php?sid=<?php echo
"$sid&lang=$lang&internok=$internok&dept_nr=$dept_nr&saal=$saal";
?>","logbuchwin<?php echo $sid ?>","menubar=no,resizable=yes,scrollbars=yes,
width=" + (w-15) + ", height=" + (h-60));
+ logbuchwin=window.open("<?php echo $root_path.$top_dir;
?>op-care-logbuch-start.php?sid=<?php echo
"$sid&lang=$lang&internok=$internok&dept_nr=$dept_nr&saal=$saal";
?>","logbuchwin<?php echo $sid ?>","menubar=no,resizable=yes,scrollbars=yes,
width=" + (w-15) + ", height=" + (h-60));
window.logbuchwin.moveTo(0,0);
window.location.replace('<?php if($retpath=="calendar_opt") echo
$root_path."calendar/calendar-options.php?sid=$sid&lang=$lang&day=$pday&month=$pmonth&year=$pyear";
else echo
$root_path."main/op-docu.php?sid=".$sid."&lang=".$lang;?>&forcestation=1&nofocus=1&nointern=1');
}
Modified: care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-pass.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-pass.php
2010-06-30 11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-pass.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -22,13 +22,13 @@
switch($target)
{
- case
'search':$fileforward="op-pflege-logbuch-such-javastart.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr";
+ case
'search':$fileforward="op-care-logbuch-such-javastart.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr";
$title=$LDSearch;
break;
- case
'archiv':$fileforward="op-pflege-logbuch-arch-javastart.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr";
+ case
'archiv':$fileforward="op-care-logbuch-arch-javastart.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr";
$title=$LDArchive;
break;
-
default:$fileforward="op-pflege-logbuch-javastart.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr";
+
default:$fileforward="op-care-logbuch-javastart.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr";
$target="entry";
$title=$LDNewData;
}
Modified:
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-poptimeinput.php
===================================================================
---
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-poptimeinput.php
2010-06-30 11:13:54 UTC (rev 6463)
+++
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-poptimeinput.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -128,7 +128,7 @@
<td bgcolor="navy" align=right>
<font face=arial size=2 >
<?php
-$thisurl="op-pflege-logbuch-poptimeinput.php?rt=optimeinput&filename=";
+$thisurl="op-care-logbuch-poptimeinput.php?rt=optimeinput&filename=";
if($scope==1) echo '<font color=silver>Ein/Aus </font>';
else echo '<a href="'.$thisurl.$filename.'&scope=1"><font
color=white>Ein/Aus</a> </font>';
@@ -156,7 +156,7 @@
<p>
<ul>
-<form method="post" name="timeform"
action="op-pflege-logbuch-poptimeinput.php?mode=save&rt=optimeinput&scope=<?php
echo $scope; ?>&filename=<?php echo $filename; ?>" onSubmit=checkform()>
+<form method="post" name="timeform"
action="op-care-logbuch-poptimeinput.php?mode=save&rt=optimeinput&scope=<?php
echo $scope; ?>&filename=<?php echo $filename; ?>" onSubmit=checkform()>
<font face=verdana,arial size=2>
<?php if (($scope==1)||($scope==0))
Modified:
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-such-javastart.php
===================================================================
---
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-such-javastart.php
2010-06-30 11:13:54 UTC (rev 6463)
+++
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-such-javastart.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -38,7 +38,7 @@
w=800;
h=650;';
?>
- logbuchwin<?php echo $sid
?>=window.open("op-pflege-logbuch-xtsuch-start.php?sid=<?php echo
"$sid&lang=$lang&dept_nr=$dept_nr";?>&user=<?php echo str_replace("
","+",$op_pflegelogbuch_user);?>","logbuchwin<?php echo $sid
?>","menubar=no,resizable=yes,scrollbars=yes, width=" + (w-15) + ", height=" +
(h-60));
+ logbuchwin<?php echo $sid
?>=window.open("op-care-logbuch-xtsuch-start.php?sid=<?php echo
"$sid&lang=$lang&dept_nr=$dept_nr";?>&user=<?php echo str_replace("
","+",$op_pflegelogbuch_user);?>","logbuchwin<?php echo $sid
?>","menubar=no,resizable=yes,scrollbars=yes, width=" + (w-15) + ", height=" +
(h-60));
window.logbuchwin<?php echo $sid ?>.moveTo(0,0);
window.location.replace('<?php if($retpath=="calendar_opt") echo
$root_path."calendar/calendar-options.php?sid=$sid&lang=$lang&day=$pday&month=$pmonth&year=$pyear";
else echo
$root_path."main/op-docu.php?sid=".$sid."&lang=".$lang;?>&forcestation=1&nofocus=1');
Modified:
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-xtsuch-start.php
===================================================================
---
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-xtsuch-start.php
2010-06-30 11:13:54 UTC (rev 6463)
+++
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-xtsuch-start.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -265,7 +265,7 @@
function open_such_editwin(filename,y,m,d,dp,sl)
{
-
url="op-pflege-logbuch-arch-edit.php?mode=edit&fileid="+filename+"&sid=<?php
echo "$sid&lang=$lang"; ?>&user=<?php echo str_replace(" ","+",$user);
?>&pyear="+y+"&pmonth="+m+"&pday="+d+"&dept_nr="+dp+"&saal="+sl;
+
url="op-care-logbuch-arch-edit.php?mode=edit&fileid="+filename+"&sid=<?php echo
"$sid&lang=$lang"; ?>&user=<?php echo str_replace(" ","+",$user);
?>&pyear="+y+"&pmonth="+m+"&pday="+d+"&dept_nr="+dp+"&saal="+sl;
<?php if($cfg['dhtml'])
echo '
w=window.parent.screen.width;
@@ -345,7 +345,7 @@
echo '
<td valign=top><font size="1" ><font size=2
color=red><b>'.$pdata['op_nr'].'</b></font><hr>'.formatDate2Local($pdata['op_date'],$date_format).'<br>
'.$tage[date("w",mktime(0,0,0,$imonth,$iday,$iyear))].'<br>
- <a
href="op-pflege-logbuch-start.php?sid='.$sid.'&lang='.$lang.'&mode=saveok&enc_nr='.$pdata['encounter_nr'].'&op_nr='.$pdata[op_nr].'&dept_nr='.$pdata[dept_nr].'&saal='.$pdata[op_room].'&thisday='.$pdata['op_date'].'">
+ <a
href="op-care-logbuch-start.php?sid='.$sid.'&lang='.$lang.'&mode=saveok&enc_nr='.$pdata['encounter_nr'].'&op_nr='.$pdata[op_nr].'&dept_nr='.$pdata[dept_nr].'&saal='.$pdata[op_room].'&thisday='.$pdata['op_date'].'">
<img '.$img_arrow.'
alt="'.str_replace("~tagword~",$pdata['name_last'],$LDEditPatientData).'"></a>
</td>';
@@ -509,7 +509,7 @@
while($pdata=$ergebnis->FetchRow()){
//echo "
- // <a
href=\"op-pflege-logbuch-xtsuch-start.php?sid=$sid&lang=$lang&mode=get&dept_nr=$pdata[dept_nr]&op_nr=$pdata[op_nr]&srcword=".strtr($srcword,"
","+")."\">";
+ // <a
href=\"op-care-logbuch-xtsuch-start.php?sid=$sid&lang=$lang&mode=get&dept_nr=$pdata[dept_nr]&op_nr=$pdata[op_nr]&srcword=".strtr($srcword,"
","+")."\">";
echo '
<tr class="submenu"><td>';
@@ -521,7 +521,7 @@
echo "</td>
<td>
- <a
href=\"op-pflege-logbuch-xtsuch-start.php?sid=$sid&lang=$lang&mode=getbypid&nr=".$pdata['pid']."&dept_nr=$dept_nr&saal=$saal&srcword=".strtr($srcword,"
","+")."\"> ";
+ <a
href=\"op-care-logbuch-xtsuch-start.php?sid=$sid&lang=$lang&mode=getbypid&nr=".$pdata['pid']."&dept_nr=$dept_nr&saal=$saal&srcword=".strtr($srcword,"
","+")."\"> ";
//echo $img_src;
@@ -543,17 +543,17 @@
</td>
<td align="center">';
- echo "<a
href=\"op-pflege-logbuch-xtsuch-start.php?sid=$sid&lang=$lang&mode=get&nr=".$pdata['nr']."&dept_nr=$dept_nr&saal=$saal&srcword=".strtr($srcword,"
","+")."\"> ";
+ echo "<a
href=\"op-care-logbuch-xtsuch-start.php?sid=$sid&lang=$lang&mode=get&nr=".$pdata['nr']."&dept_nr=$dept_nr&saal=$saal&srcword=".strtr($srcword,"
","+")."\"> ";
echo '<b>'.$pdata[op_room].'</b></a></td>
<td align="center"
><b>'.formatDate2Local($pdata['op_date'],$date_format).'</b> </td>
<td align="center" >';
- echo "<a
href=\"op-pflege-logbuch-xtsuch-start.php?sid=$sid&lang=$lang&mode=get&nr=".$pdata['nr']."&dept_nr=$dept_nr&saal=$saal&srcword=".strtr($srcword,"
","+")."\"> ";
+ echo "<a
href=\"op-care-logbuch-xtsuch-start.php?sid=$sid&lang=$lang&mode=get&nr=".$pdata['nr']."&dept_nr=$dept_nr&saal=$saal&srcword=".strtr($srcword,"
","+")."\"> ";
echo $pdata['op_nr'];
echo '</a>
</td>
<td align="center" >';
- echo "<a
href=\"op-pflege-logbuch-xtsuch-start.php?sid=$sid&lang=$lang&mode=getbyenc&nr=".$pdata['encounter_nr']."&dept_nr=$dept_nr&saal=$saal&srcword=".strtr($srcword,"
","+")."\"> ";
+ echo "<a
href=\"op-care-logbuch-xtsuch-start.php?sid=$sid&lang=$lang&mode=getbyenc&nr=".$pdata['encounter_nr']."&dept_nr=$dept_nr&saal=$saal&srcword=".strtr($srcword,"
","+")."\"> ";
echo $pdata['encounter_nr'];
echo '</a>
</td>
@@ -617,8 +617,8 @@
<p>
<b><?php echo $LDOtherFunctions ?>:</b><br>
-<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="op-pflege-logbuch-arch-start.php?sid=<?php echo
"$sid&lang=$lang&dept_nr=$dept_nr&saal=$saal&child=$child" ?>"><?php echo
"$LDResearchArchive [$LDOrLogBook]" ?></a><br>
-<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="op-pflege-logbuch-start.php?sid=<?php echo
"$sid&lang=$lang&mode=fresh&dept_nr=$dept_nr&saal=$saal" ?>" <?php if ($child)
echo "target=\"_parent\""; ?>><?php echo "$LDStartNewDocu [$LDOrLogBook]"
?></a><br>
+<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="op-care-logbuch-arch-start.php?sid=<?php echo
"$sid&lang=$lang&dept_nr=$dept_nr&saal=$saal&child=$child" ?>"><?php echo
"$LDResearchArchive [$LDOrLogBook]" ?></a><br>
+<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="op-care-logbuch-start.php?sid=<?php echo
"$sid&lang=$lang&mode=fresh&dept_nr=$dept_nr&saal=$saal" ?>" <?php if ($child)
echo "target=\"_parent\""; ?>><?php echo "$LDStartNewDocu [$LDOrLogBook]"
?></a><br>
<img <?php echo createComIcon($root_path,'varrow.gif','0') ?>> <a
href="javascript:gethelp('oplog.php','search','<?php echo $mode ?>','<?php echo
$rows ?>','<?php echo $datafound ?>')"><?php echo "$LDHelp" ?></a><br>
</ul>
Modified: care2x/branches/gettext/modules/or_logbook/oploginput.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/oploginput.php 2010-06-30
11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/or_logbook/oploginput.php 2010-06-30
11:15:23 UTC (rev 6464)
@@ -538,7 +538,7 @@
function getinfo(m)
{
- urlholder="<?php echo
"op-pflege-log-getinfo.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&saal=$saal&op_nr=$op_nr&enc_nr=$enc_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear&winid=";?>"+m;
+ urlholder="<?php echo
"op-care-log-getinfo.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&saal=$saal&op_nr=$op_nr&enc_nr=$enc_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear&winid=";?>"+m;
getinfowin=window.open(urlholder,"getinfo","width=800,height=500,menubar=no,resizable=yes,scrollbars=yes");
}
function openfolder(pid,pdata){
@@ -654,8 +654,8 @@
}
?><a
href="oploginput.php?sid=<?php echo
"$sid&lang=$lang&dept_nr=$dept_nr&saal=$saal" ?>&mode=fresh"><img <?php echo
createLDImgSrc($root_path,'newpat2.gif','0','absmiddle') ?>
- alt="<?php echo $LDStartNewDocu ?>"></a><A
href="op-pflege-logbuch-xtsuch-start.php?sid=<?php echo
"$sid&lang=$lang&internok=$internok&dept_nr=$dept_nr&saal=$saal"; ?>&user=<?php
echo str_replace(' ','+',$op_pflegelogbuch_user); ?>" target="_parent"><img
<?php echo createLDImgSrc($root_path,'searchlamp.gif','0','absmiddle') ?>
- alt="<?php echo $LDSearchPatient ?>"></a><A
href="op-pflege-logbuch-arch-start.php?sid=<?php echo
"$sid&lang=$lang&internok=$internok&dept_nr=$dept_nr&saal=$saal"; ?>&user=<?php
echo str_replace(' ','+',$op_pflegelogbuch_user); ?>"
+ alt="<?php echo $LDStartNewDocu ?>"></a><A
href="op-care-logbuch-xtsuch-start.php?sid=<?php echo
"$sid&lang=$lang&internok=$internok&dept_nr=$dept_nr&saal=$saal"; ?>&user=<?php
echo str_replace(' ','+',$op_pflegelogbuch_user); ?>" target="_parent"><img
<?php echo createLDImgSrc($root_path,'searchlamp.gif','0','absmiddle') ?>
+ alt="<?php echo $LDSearchPatient ?>"></a><A
href="op-care-logbuch-arch-start.php?sid=<?php echo
"$sid&lang=$lang&internok=$internok&dept_nr=$dept_nr&saal=$saal"; ?>&user=<?php
echo str_replace(' ','+',$op_pflegelogbuch_user); ?>"
target="_parent"><img <?php echo
createLDImgSrc($root_path,'archive.gif','0','absmiddle') ?>
alt="<?php echo $LDArchive ?>"></a><br>
Modified: care2x/branches/gettext/modules/or_logbook/oplogmain.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/oplogmain.php 2010-06-30
11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/or_logbook/oplogmain.php 2010-06-30
11:15:23 UTC (rev 6464)
@@ -329,7 +329,7 @@
{
echo '
<MAP NAME="catcom">
- <AREA SHAPE="RECT" COORDS="158,90,230,110"
HREF="op-pflege-logbuch-xtsuch-start.php?sid='.$sid.'&lang='.$lang.'&mode=fresh&dept_nr='.$dept_nr.'&saal='.$saal.'&child=1"
target="_parent" title="'.$LDSearchPatient.' ['.$LDOrLogBook.']" >
+ <AREA SHAPE="RECT" COORDS="158,90,230,110"
HREF="op-care-logbuch-xtsuch-start.php?sid='.$sid.'&lang='.$lang.'&mode=fresh&dept_nr='.$dept_nr.'&saal='.$saal.'&child=1"
target="_parent" title="'.$LDSearchPatient.' ['.$LDOrLogBook.']" >
</MAP><img ismap usemap="#catcom"
'.createLDImgSrc($root_path,'cat-com2.gif','0').'>';
?>
<DIV id=dLogoTable style=" VISIBILITY: hidden;
POSITION: relative">
Modified: care2x/branches/gettext/modules/or_logbook/oplogtime.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/oplogtime.php 2010-06-30
11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/or_logbook/oplogtime.php 2010-06-30
11:15:23 UTC (rev 6464)
@@ -24,7 +24,7 @@
h=window.parent.screen.height;
ww=550;
wh=500;
- if(s=="wait_time") t="op-pflege-graph-getwaittime.php";
+ if(s=="wait_time") t="op-care-graph-getwaittime.php";
else t="op-care-graph-getinfo.php";
timewin=window.open(t+"<?php echo $comdat
?>&winid="+s,"timewin","menubar=no,resizable=yes,scrollbars=yes, width=" + ww +
", height=" + wh);
window.timewin.moveTo((w/2)-(ww/2),(h/2)-(wh/2));
Modified: care2x/branches/gettext/modules/system_admin/edv-datenbank-pass.php
===================================================================
--- care2x/branches/gettext/modules/system_admin/edv-datenbank-pass.php
2010-06-30 11:13:54 UTC (rev 6463)
+++ care2x/branches/gettext/modules/system_admin/edv-datenbank-pass.php
2010-06-30 11:15:23 UTC (rev 6464)
@@ -100,7 +100,7 @@
<p>
<table width=100% border=0 cellpadding="0" cellspacing="0">
<tr>
-<td colspan=3><img src=../img/einga-b.gif border=0 width=130 height=25><!--
<a href="op-pflege-logbuch-such-pass.php?sid=<?php echo
$$ck_sid_buffer;?>"><img src="../img/such-gray.gif" border=0 width=130
height=25 <?php if($cfg['dhtml'])echo'class="fadeOut" >';?></a><a
href="op-pflege-logbuch-arch-pass.php?sid=<?php echo $$ck_sid_buffer;?>"><img
src="../img/arch-gray.gif" border=0 width=130 height=25 <?php
if($cfg['dhtml'])echo'class="fadeOut" >';?></a> --></td>
+<td colspan=3><img src=../img/einga-b.gif border=0 width=130 height=25><!--
<a href="op-care-logbuch-such-pass.php?sid=<?php echo $$ck_sid_buffer;?>"><img
src="../img/such-gray.gif" border=0 width=130 height=25 <?php
if($cfg['dhtml'])echo'class="fadeOut" >';?></a><a
href="op-care-logbuch-arch-pass.php?sid=<?php echo $$ck_sid_buffer;?>"><img
src="../img/arch-gray.gif" border=0 width=130 height=25 <?php
if($cfg['dhtml'])echo'class="fadeOut" >';?></a> --></td>
</tr>
<tr>
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
