Revision: 6460
http://care2002.svn.sourceforge.net/care2002/?rev=6460&view=rev
Author: mizuko
Date: 2010-06-30 11:10:26 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/modules/or_logbook/op-logbuch-container-entry-manual.php
care2x/branches/gettext/modules/or_logbook/op-logbuch-container-input.php
care2x/branches/gettext/modules/or_logbook/op-logbuch-container-list.php
care2x/branches/gettext/modules/or_logbook/op-logbuch-material-entry-manual.php
care2x/branches/gettext/modules/or_logbook/op-logbuch-material-input.php
care2x/branches/gettext/modules/or_logbook/op-logbuch-material-list.php
care2x/branches/gettext/modules/or_logbook/op-logbuch-material-parentframe.php
care2x/branches/gettext/modules/or_logbook/oploginput.php
Modified:
care2x/branches/gettext/modules/or_logbook/op-logbuch-container-entry-manual.php
===================================================================
---
care2x/branches/gettext/modules/or_logbook/op-logbuch-container-entry-manual.php
2010-06-30 11:05:09 UTC (rev 6459)
+++
care2x/branches/gettext/modules/or_logbook/op-logbuch-container-entry-manual.php
2010-06-30 11:10:26 UTC (rev 6460)
@@ -57,7 +57,7 @@
//echo $sql;
if($mat_result=$db->Execute($sql))
{
-
header("location:op-logbuch-container-list.php?$globdata&item_idx=$item_idx&chg=1");
+
header("location:log-container-list.php?$globdata&item_idx=$item_idx&chg=1");
exit;
} else { echo
"$LDDbNoSave<br>$sql"; }
@@ -119,7 +119,7 @@
</head>
<body leftmargin=0 marginwidth=0>
-<form name="plist" action="op-logbuch-container-entry-manual.php"
method="post">
+<form name="plist" action="log-container-entry-manual.php" method="post">
<table border=0>
<tr>
<?php
@@ -159,7 +159,7 @@
<input type="image" <?php echo createLDImgSrc($root_path,'savedisc.gif','0')
?> width=99 height=24 align="absmiddle" alt="<?php echo $LDSave ?>">
<a
href="javascript:document.plist.reset()" title="<?php echo $LDReset ?>"><img
<?php echo createLDImgSrc($root_path,'reset.gif','0','absmiddle') ?>></a>
-<a href="op-logbuch-material-list.php?<?php echo $globdata ?>"><img <?php echo
createLDImgSrc($root_path,'cancel.gif','0','absmiddle') ?> alt="<?php echo
$LDCancel ?>"></a>
+<a href="log-material-list.php?<?php echo $globdata ?>"><img <?php echo
createLDImgSrc($root_path,'cancel.gif','0','absmiddle') ?> alt="<?php echo
$LDCancel ?>"></a>
</form>
Modified:
care2x/branches/gettext/modules/or_logbook/op-logbuch-container-input.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-logbuch-container-input.php
2010-06-30 11:05:09 UTC (rev 6459)
+++ care2x/branches/gettext/modules/or_logbook/op-logbuch-container-input.php
2010-06-30 11:10:26 UTC (rev 6460)
@@ -18,7 +18,7 @@
d.material_nr.select();
if(d.material_nr.value=="") return false;
else
- {
window.parent.OPMLISTFRAME.location.replace('op-logbuch-container-list.php?sid=<?php
echo
"$sid&lang=$lang&op_nr=$op_nr&dept_nr=$dept_nr&saal=$saal&enc_nr=$enc_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>&mode=search&material_nr='+d.material_nr.value);
+ {
window.parent.OPMLISTFRAME.location.replace('log-container-list.php?sid=<?php
echo
"$sid&lang=$lang&op_nr=$op_nr&dept_nr=$dept_nr&saal=$saal&enc_nr=$enc_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>&mode=search&material_nr='+d.material_nr.value);
return false;
}
}
Modified:
care2x/branches/gettext/modules/or_logbook/op-logbuch-container-list.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-logbuch-container-list.php
2010-06-30 11:05:09 UTC (rev 6459)
+++ care2x/branches/gettext/modules/or_logbook/op-logbuch-container-list.php
2010-06-30 11:10:26 UTC (rev 6460)
@@ -119,7 +119,7 @@
//echo $sql;
if($mat_result=$db->Execute($sql))
{
-
header("location:op-logbuch-container-list.php?$globdata&item_idx=$item_idx&chg=1");
+
header("location:log-container-list.php?$globdata&item_idx=$item_idx&chg=1");
exit;
} else { echo
"$LDDbNoSave<br>$sql"; }
@@ -144,7 +144,7 @@
//echo $sql;
if($mat_result=$db->Execute($sql))
{
-
header("location:op-logbuch-container-list.php?$globdata");
+
header("location:log-container-list.php?$globdata");
exit;
} else { echo "$LDDbNoSave<br>$sql"; }
break;
@@ -168,7 +168,7 @@
//echo "update ".$sql;
if($mat_result=$db->Execute($sql))
{
-
header("location:op-logbuch-container-list.php?$globdata");
+
header("location:log-container-list.php?$globdata");
exit;
} else { echo "$LDDbNosave<br>$sql"; }
break;
@@ -200,7 +200,7 @@
<?php if(empty($material_nr)||($art_avail==1)) : ?>
function delete_item(x)
{
- window.location.replace('op-logbuch-container-list.php?<?php echo
$globdata; ?>&mode=delete&art_idx='+x);
+ window.location.replace('log-container-list.php?<?php echo $globdata;
?>&mode=delete&art_idx='+x);
}
// -->
@@ -249,7 +249,7 @@
if($rows)
{
echo'
-<form action="op-logbuch-container-list.php" method="post" name="plist"
onReset="hsm()">
+<form action="log-container-list.php" method="post" name="plist"
onReset="hsm()">
<table border=0 cellpadding=0 cellspacing=0 width="100%">
<tr>';
for($i=0;$i<sizeof($LDContainerElements);$i++)
@@ -337,9 +337,9 @@
{
echo'
<tr bgcolor="#ffffff">
- <td class="v12" valign="top"> <a
href="op-logbuch-container-list.php?'.$globdata.'&mode=search&material_nr='.$pdata[bestellnum].'"><img
'.createComIcon($root_path,'bul_arrowgrnlrg.gif','0','absmiddle').'
alt="'.$LDSelectArticle.'"></a></td>
- <td class="v12" valign="top"> <a
href="op-logbuch-container-list.php?'.$globdata.'&mode=search&material_nr='.$pdata[bestellnum].'"
title="'.$LDSelectArticle.'">'.$pdata[containernum].'</a> </td>
- <td class="v12" valign="top"><a
href="op-logbuch-container-list.php?'.$globdata.'&mode=search&material_nr='.$pdata[bestellnum].'"
title="'.$LDSelectArticle.'">'.$pdata[containername].'</a> </td>
+ <td class="v12" valign="top"> <a
href="log-container-list.php?'.$globdata.'&mode=search&material_nr='.$pdata[bestellnum].'"><img
'.createComIcon($root_path,'bul_arrowgrnlrg.gif','0','absmiddle').'
alt="'.$LDSelectArticle.'"></a></td>
+ <td class="v12" valign="top"> <a
href="log-container-list.php?'.$globdata.'&mode=search&material_nr='.$pdata[bestellnum].'"
title="'.$LDSelectArticle.'">'.$pdata[containernum].'</a> </td>
+ <td class="v12" valign="top"><a
href="log-container-list.php?'.$globdata.'&mode=search&material_nr='.$pdata[bestellnum].'"
title="'.$LDSelectArticle.'">'.$pdata[containername].'</a> </td>
<td class="v12" valign="top"> <a
href="javascript:popinfo(\''.$pdata[bestellnum].'\')"><img
'.createComIcon($root_path,'info3.gif','0').'></a> </td>
<td class="v12" valign="top"> '.$pdata[industrynum].' </td>
<td class="v12" valign="top"> '.$pdata[bestellnum].' </td>
@@ -360,10 +360,10 @@
<img
'.createMascot($root_path,'mascot1_r.gif','0','absmiddle').'>
<b>'.$LDArticleNotFound.'</b><p></font> '.$LDNoArticleTxt.'<p>';
$databuf="$sid&lang=$lang&op_nr=$op_nr&dept_nr=$dept_nr&saal=$saal&enc_nr=$enc_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear&artikelnum=$material_nr";
echo '
- <a
href="op-logbuch-container-entry-manual.php?sid='.$databuf.'"><img
'.createComIcon($root_path,'accessrights.gif','0','absmiddle').'>
+ <a
href="log-container-entry-manual.php?sid='.$databuf.'"><img
'.createComIcon($root_path,'accessrights.gif','0','absmiddle').'>
<font size=3 > '.$LDClk2ManualEntry.'</font></a>
</font><p>
- <a
href="op-logbuch-container-list.php?sid='.$databuf.'"><img
'.createLDImgSrc($root_path,'cancel.gif','0').' alt="'.$LDCancel.'">
+ <a href="log-container-list.php?sid='.$databuf.'"><img
'.createLDImgSrc($root_path,'cancel.gif','0').' alt="'.$LDCancel.'">
</a>
</center>
';
Modified:
care2x/branches/gettext/modules/or_logbook/op-logbuch-material-entry-manual.php
===================================================================
---
care2x/branches/gettext/modules/or_logbook/op-logbuch-material-entry-manual.php
2010-06-30 11:05:09 UTC (rev 6459)
+++
care2x/branches/gettext/modules/or_logbook/op-logbuch-material-entry-manual.php
2010-06-30 11:10:26 UTC (rev 6460)
@@ -56,7 +56,7 @@
AND
encounter_nr='$enc_nr'";
//echo $sql;
if($mat_result=$core->Transact($sql)){
-
header("location:op-logbuch-material-list.php?$globdata&item_idx=$item_idx&chg=1");
+
header("location:log-material-list.php?$globdata&item_idx=$item_idx&chg=1");
exit;
}else{
echo "$LDDbNoSave<br>$sql";
@@ -115,7 +115,7 @@
</head>
<body leftmargin=0 marginwidth=0>
-<form name="plist" action="op-logbuch-material-entry-manual.php" method="post">
+<form name="plist" action="log-material-entry-manual.php" method="post">
<table border=0>
<tr>
<?php
@@ -155,7 +155,7 @@
<input type="image" <?php echo
createLDImgSrc($root_path,'savedisc.gif','0','absmiddle') ?> alt="<?php echo
$LDSave ?>">
<a
href="javascript:document.plist.reset()" title="<?php echo $LDReset ?>"><img
<?php echo createLDImgSrc($root_path,'reset.gif','0','absmiddle') ?>></a>
-<a href="op-logbuch-material-list.php?<?php echo $globdata ?>"><img <?php echo
createLDImgSrc($root_path,'cancel.gif','0','absmiddle') ?> alt="<?php echo
$LDCancel ?>"></a>
+<a href="log-material-list.php?<?php echo $globdata ?>"><img <?php echo
createLDImgSrc($root_path,'cancel.gif','0','absmiddle') ?> alt="<?php echo
$LDCancel ?>"></a>
</form>
Modified:
care2x/branches/gettext/modules/or_logbook/op-logbuch-material-input.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-logbuch-material-input.php
2010-06-30 11:05:09 UTC (rev 6459)
+++ care2x/branches/gettext/modules/or_logbook/op-logbuch-material-input.php
2010-06-30 11:10:26 UTC (rev 6460)
@@ -18,7 +18,7 @@
d.material_nr.select();
if(d.material_nr.value==""){
return false;
- }else{
window.parent.OPMLISTFRAME.location.replace('op-logbuch-material-list.php?sid=<?php
echo
"$sid&lang=$lang&op_nr=$op_nr&dept_nr=$dept_nr&saal=$saal&enc_nr=$enc_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>&mode=search&material_nr='+d.material_nr.value);
+ }else{
window.parent.OPMLISTFRAME.location.replace('log-material-list.php?sid=<?php
echo
"$sid&lang=$lang&op_nr=$op_nr&dept_nr=$dept_nr&saal=$saal&enc_nr=$enc_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>&mode=search&material_nr='+d.material_nr.value);
return false;
}
}
Modified:
care2x/branches/gettext/modules/or_logbook/op-logbuch-material-list.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-logbuch-material-list.php
2010-06-30 11:05:09 UTC (rev 6459)
+++ care2x/branches/gettext/modules/or_logbook/op-logbuch-material-list.php
2010-06-30 11:10:26 UTC (rev 6460)
@@ -136,7 +136,7 @@
if($mat_result=$core->Transact($sql))
{
-
header("location:op-logbuch-material-list.php?$globdata&item_idx=$item_idx&chg=1");
+
header("location:log-material-list.php?$globdata&item_idx=$item_idx&chg=1");
exit;
} else { echo
"$LDDbNoSave<br>"; }
@@ -172,7 +172,7 @@
if($mat_result=$core->Transact($sql))
{
-
header("location:op-logbuch-material-list.php?$globdata");
+
header("location:log-material-list.php?$globdata");
exit;
} else { echo "$LDDbNoSave<br>"; }
break;
@@ -206,7 +206,7 @@
if($mat_result=$core->Transact($sql))
{
-
header("location:op-logbuch-material-list.php?$globdata");
+
header("location:log-material-list.php?$globdata");
exit;
}
else
@@ -238,7 +238,7 @@
<?php if(empty($material_nr)||($art_avail==1)) : ?>
function delete_item(x)
{
- window.location.replace('op-logbuch-material-list.php?<?php echo
$globdata; ?>&mode=delete&art_idx='+x);
+ window.location.replace('log-material-list.php?<?php echo $globdata;
?>&mode=delete&art_idx='+x);
}
// -->
@@ -285,7 +285,7 @@
if(($rows==1)&&(trim($matbuf[0])=="")) $rows=0;
if($rows){
echo'
-<form action="op-logbuch-material-list.php" method="post" name="plist"
onReset="hsm()">
+<form action="log-material-list.php" method="post" name="plist"
onReset="hsm()">
<table border=0 cellpadding=0 cellspacing=0 width="100%">
<tr>';
for($i=0;$i<sizeof($LDMaterialElements);$i++)
@@ -363,9 +363,9 @@
while($pdata=$ergebnis->FetchRow()){
echo'
<tr bgcolor="#ffffff">
- <td class="v12" valign="top"> <a
href="op-logbuch-material-list.php?'.$globdata.'&mode=search&material_nr='.$pdata[bestellnum].'"><img
'.createComIcon($root_path,'bul_arrowgrnlrg.gif','0','absmiddle').'
alt="'.$LDSelectArticle.'"></a></td>
- <td class="v12" valign="top"> <a
href="op-logbuch-material-list.php?'.$globdata.'&mode=search&material_nr='.$pdata[bestellnum].'"
title="'.$LDSelectArticle.'">'.$pdata[artikelnum].'</a> </td>
- <td class="v12" valign="top"><a
href="op-logbuch-material-list.php?'.$globdata.'&mode=search&material_nr='.$pdata[bestellnum].'"
title="'.$LDSelectArticle.'">'.$pdata[artikelname].'</a> </td>
+ <td class="v12" valign="top"> <a
href="log-material-list.php?'.$globdata.'&mode=search&material_nr='.$pdata[bestellnum].'"><img
'.createComIcon($root_path,'bul_arrowgrnlrg.gif','0','absmiddle').'
alt="'.$LDSelectArticle.'"></a></td>
+ <td class="v12" valign="top"> <a
href="log-material-list.php?'.$globdata.'&mode=search&material_nr='.$pdata[bestellnum].'"
title="'.$LDSelectArticle.'">'.$pdata[artikelnum].'</a> </td>
+ <td class="v12" valign="top"><a
href="log-material-list.php?'.$globdata.'&mode=search&material_nr='.$pdata[bestellnum].'"
title="'.$LDSelectArticle.'">'.$pdata[artikelname].'</a> </td>
<td class="v12" valign="top">'.$pdata[description].' </td>
<td class="v12" valign="top"> <a
href="javascript:popinfo(\''.$pdata[bestellnum].'\')"><img
'.createComIcon($root_path,'info3.gif','0').'></a> </td>
<td class="v12" valign="top"> '.$pdata[generic].' </td>
@@ -385,10 +385,10 @@
<img
'.createMascot($root_path,'mascot1_r.gif','0','absmiddle').'>
<b>'.$LDArticleNotFound.'</b><p></font> '.$LDNoArticleTxt.'<p>';
$databuf="$sid&lang=$lang&op_nr=$op_nr&dept_nr=$dept_nr&saal=$saal&enc_nr=$enc_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear";
echo '
- <a
href="op-logbuch-material-entry-manual.php?sid='.$databuf.'"><img
'.createComIcon($root_path,'accessrights.gif','0','absmiddle').'>
+ <a
href="log-material-entry-manual.php?sid='.$databuf.'"><img
'.createComIcon($root_path,'accessrights.gif','0','absmiddle').'>
<font size=3 > '.$LDClk2ManualEntry.'</font></a>
</font><p>
- <a
href="op-logbuch-material-list.php?sid='.$databuf.'"><img
'.createLDImgSrc($root_path,'cancel.gif','0').' alt="'.$LDCancel.'">
+ <a href="log-material-list.php?sid='.$databuf.'"><img
'.createLDImgSrc($root_path,'cancel.gif','0').' alt="'.$LDCancel.'">
</a>
</center>
';
Modified:
care2x/branches/gettext/modules/or_logbook/op-logbuch-material-parentframe.php
===================================================================
---
care2x/branches/gettext/modules/or_logbook/op-logbuch-material-parentframe.php
2010-06-30 11:05:09 UTC (rev 6459)
+++
care2x/branches/gettext/modules/or_logbook/op-logbuch-material-parentframe.php
2010-06-30 11:10:26 UTC (rev 6460)
@@ -24,11 +24,11 @@
</head>
<frameset cols="16%,*">
<?php if($mode=="cont") : ?>
- <frame name="OPMINPUTFRAME" src="op-logbuch-container-input.php?sid=<?php
echo
"$sid&lang=$lang&op_nr=$op_nr&enc_nr=$enc_nr&dept_nr=$dept_nr&saal=$saal&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>">
- <frame name="OPMLISTFRAME" src="op-logbuch-container-list.php?sid=<?php
echo
"$sid&lang=$lang&op_nr=$op_nr&enc_nr=$enc_nr&dept_nr=$dept_nr&saal=$saal&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>">
+ <frame name="OPMINPUTFRAME" src="log-container-input.php?sid=<?php echo
"$sid&lang=$lang&op_nr=$op_nr&enc_nr=$enc_nr&dept_nr=$dept_nr&saal=$saal&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>">
+ <frame name="OPMLISTFRAME" src="log-container-list.php?sid=<?php echo
"$sid&lang=$lang&op_nr=$op_nr&enc_nr=$enc_nr&dept_nr=$dept_nr&saal=$saal&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>">
<?php else : ?>
- <frame name="OPMINPUTFRAME" src="op-logbuch-material-input.php?sid=<?php
echo
"$sid&lang=$lang&op_nr=$op_nr&enc_nr=$enc_nr&dept_nr=$dept_nr&saal=$saal&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>">
- <frame name="OPMLISTFRAME" src="op-logbuch-material-list.php?sid=<?php echo
"$sid&lang=$lang&op_nr=$op_nr&enc_nr=$enc_nr&dept_nr=$dept_nr&saal=$saal&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>">
+ <frame name="OPMINPUTFRAME" src="log-material-input.php?sid=<?php echo
"$sid&lang=$lang&op_nr=$op_nr&enc_nr=$enc_nr&dept_nr=$dept_nr&saal=$saal&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>">
+ <frame name="OPMLISTFRAME" src="log-material-list.php?sid=<?php echo
"$sid&lang=$lang&op_nr=$op_nr&enc_nr=$enc_nr&dept_nr=$dept_nr&saal=$saal&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>">
<?php endif ?>
<noframes>
<body>
Modified: care2x/branches/gettext/modules/or_logbook/oploginput.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/oploginput.php 2010-06-30
11:05:09 UTC (rev 6459)
+++ care2x/branches/gettext/modules/or_logbook/oploginput.php 2010-06-30
11:10:26 UTC (rev 6460)
@@ -634,9 +634,9 @@
<A onClick="document.oppflegepatinfo.xx2.value='drg'"
href="javascript:openDRGComposite()"><img <?php echo
createLDImgSrc($root_path,'drg.gif','0','absmiddle') ?>
alt="<?php echo $LDDRG ?>"></a><A
onClick="document.oppflegepatinfo.xx2.value='material'"
- href="op-logbuch-material-parentframe.php?sid=<?php echo
"$sid&lang=$lang&op_nr=$op_nr&enc_nr=".$pdata['encounter_nr']."&dept_nr=$dept_nr&saal=$saal&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>" target="OPLOGMAIN"><img <?php echo
createLDImgSrc($root_path,'material.gif','0','absmiddle') ?>
+ href="log-material-parentframe.php?sid=<?php echo
"$sid&lang=$lang&op_nr=$op_nr&enc_nr=".$pdata['encounter_nr']."&dept_nr=$dept_nr&saal=$saal&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>" target="OPLOGMAIN"><img <?php echo
createLDImgSrc($root_path,'material.gif','0','absmiddle') ?>
alt="<?php echo $LDUsedMaterial ?>"></a><!-- <A
onClick="document.oppflegepatinfo.xx2.value='container'"
- href="op-logbuch-material-parentframe.php?sid=<?php echo
"$sid&lang=$lang&mode=cont&op_nr=$op_nr&enc_nr=".$pdata['encounter_nr']."&dept_nr=$dept_nr&saal=$saal&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>" target="OPLOGMAIN"><img <?php echo
createLDImgSrc($root_path,'instrument.gif','0','absmiddle') ?>
+ href="log-material-parentframe.php?sid=<?php echo
"$sid&lang=$lang&mode=cont&op_nr=$op_nr&enc_nr=".$pdata['encounter_nr']."&dept_nr=$dept_nr&saal=$saal&pday=$pday&pmonth=$pmonth&pyear=$pyear";
?>" target="OPLOGMAIN"><img <?php echo
createLDImgSrc($root_path,'instrument.gif','0','absmiddle') ?>
alt="<?php echo $LDContainer ?>"></a>--><?php } ?> <a
href="javascript:gethelp('oplog.php','create','<?php echo $mode ?>')"><img
<?php echo createLDImgSrc($root_path,'hilfe-r.gif','0','absmiddle') ?>
alt="<?php echo $LDHelp ?>"></a><a
href="javascript:if(!window.parent.opener.closed)window.parent.opener.focus();window.parent.close();"><img
<?php echo createLDImgSrc($root_path,'close2.gif','0','absmiddle') ?>
alt="<?php echo $LDClose ?>"></a><br>
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
