Revision: 6456
http://care2002.svn.sourceforge.net/care2002/?rev=6456&view=rev
Author: mizuko
Date: 2010-06-30 11:00:39 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/modules/calendar/calendar-options.php
care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan-planen.php
care2x/branches/gettext/modules/nursing_or/nursing-or-main-pass.php
care2x/branches/gettext/modules/nursing_or/nursing-or-roster-personelliste.php
care2x/branches/gettext/modules/nursing_or/nursing-or-select-dept.php
Added Paths:
-----------
care2x/branches/gettext/modules/nursing_or/nursing-or-roster-day.php
Removed Paths:
-------------
care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan-day.php
Modified: care2x/branches/gettext/modules/calendar/calendar-options.php
===================================================================
--- care2x/branches/gettext/modules/calendar/calendar-options.php
2010-06-30 10:58:18 UTC (rev 6455)
+++ care2x/branches/gettext/modules/calendar/calendar-options.php
2010-06-30 11:00:39 UTC (rev 6456)
@@ -129,7 +129,7 @@
<!--
<li><a href="#"><?php echo $LDORProgram ?></a></li>
-->
- <li><a href="<?php echo $root_path
?>modules/nursing_or/nursing-or-dienstplan-day.php<?php echo
URL_APPEND."&dept_nr=$dept_nr&pday=$day&pmonth=$month&pyear=$year"
?>&retpath=calendar_opt"><?php echo "$LDDutyPerson $LDOn
(".formatDate2Local($i_date,$date_format).")" ?></a></li>
+ <li><a href="<?php echo $root_path
?>modules/nursing_or/nursing-or-roster-day.php<?php echo
URL_APPEND."&dept_nr=$dept_nr&pday=$day&pmonth=$month&pyear=$year"
?>&retpath=calendar_opt"><?php echo "$LDDutyPerson $LDOn
(".formatDate2Local($i_date,$date_format).")" ?></a></li>
<!--
<li><a href="<?php echo $root_path
?>modules/nursing_or/nursing-or-dienstplan.php<?php echo
URL_APPEND."&dept_nr=$dept_nr&cday=$day&cmonth=$month&cyear=$year&pmonth=".((int)$month)."&pyear=".((int)$year)
?>&noedit=1&retpath=calendar_opt" onClick="window.resizeTo(600,700)"><?php
echo "$LDDutyPerson ($LDMonth)" ?></a></li>
<li><a href="<?php echo $root_path
?>modules/doctors/doctors-rosterplan.php<?php echo
URL_APPEND."&dept_nr=$dept_nr&cday=$day&cmonth=$month&cyear=$year&pmonth=".((int)$month)."&pyear=".((int)$year)
?>&noedit=1&retpath=calendar_opt" onClick="window.resizeTo(600,700)"><?php
echo "$LDDocsOnDuty (".formatDate2Local($i_date,$date_format).")" ?></a></li>
Deleted:
care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan-day.php
===================================================================
--- care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan-day.php
2010-06-30 10:58:18 UTC (rev 6455)
+++ care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan-day.php
2010-06-30 11:00:39 UTC (rev 6456)
@@ -1,254 +0,0 @@
-<?php
-error_reporting(E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR);
-require('./roots.php');
-require($root_path.'include/helpers/inc_environment_global.php');
-/**
-* CARE2X Integrated Hospital Information System beta 1.0.03 - 2002-10-26
-* GNU General Public License
-* Copyright 2002,2003,2004,2005 Elpidio Latorilla
-* elpi...@care2x.org,
-*
-* See the file "copy_notice.txt" for the licence notice
-*/
-
-$lang_tables=array('doctors.php','departments.php');
-define('LANG_FILE','or.php');
-define('NO_2LEVEL_CHK',1);
-require_once($root_path.'include/helpers/inc_front_chain_lang.php');
-
-require_once($root_path.'include/helpers/inc_date_format_functions.php');
-
-if($pmonth=='') $pmonth=date('n');
-if($pyear=='') $pyear=date('Y');
-if($pday=='') $pday=date('d');
-//$thisfile=basename(__FILE__);
-
-$offset_day=$pday-1;
-
-switch($retpath)
-{
- case "menu":
$rettarget=$root_path.'modules/main/op-docu.php'.URL_APPEND; break;
- case "qview":
$rettarget=$root_path.'modules/nursing_or/nursing-or-roster-quickview.php'.URL_APPEND;
break;
- case "calendar_opt":
$rettarget=$root_path."modules/calendar/calendar-options.php".URL_APPEND."&dept_nr=$dept_nr&forcestation=1&day=$pday&month=$pmonth&year=$pyear";break;
- default: $rettarget="javascript:window.history.back()";
-}
-
-$dbtable='care_dutyplan_oncall';
-
-// test dept nr
-//$dept_nr=4;
-
-$sql="SELECT duty_1_pnr,duty_2_pnr FROM $dbtable
- WHERE dept_nr='$dept_nr'
- AND year='$pyear'
- AND
month='".(int)$pmonth."'";
-
-if($ergebnis=$db->Execute($sql)){
- if($rows=$ergebnis->RecordCount()){
- $result=$ergebnis->FetchRow();
- $duty1=unserialize($result['duty_1_pnr']);
- $duty2=unserialize($result['duty_2_pnr']);
- //echo $sql."<br>";
- }
-}
-
-//echo $sql;
-
-require_once($root_path.'modules/personell_admin/model/class_personell.php');
-$pers_obj=new Personell;
-
-if($pnr=$duty1['ha'.$offset_day]){
- $person1=&$pers_obj->getPersonellInfo($pnr);
-}
-if($pnr=$duty2['hr'.$offset_day]){
- $person2=&$pers_obj->getPersonellInfo($pnr);
-}
-
-require_once($root_path.'modules/dept_admin/model/class_department.php');
-$dept_obj=new Department;
-$dept=&$dept_obj->getPhoneInfo($dept_nr);
-/* Resolve the departments name "language dependent" */
-$dept_ldvar=$dept_obj->LDvar($dept_nr);
-if(isset($$dept_ldvar)&&!empty($$dept_ldvar)) $dept_name=$$dept_ldvar;
- else $dept_name=$dept_obj->FormalName($dept_nr);
-
-require_once($root_path.'include/core/class_globalconfig.php');
-$glob_obj=new GlobalConfig($GLOBAL_CONFIG);
-$glob_obj->getConfig('person_%');
-/* Check whether config foto path exists, else use default path */
-$default_photo_path='uploads/photos/registration';
-$photo_path = (is_dir($root_path.$GLOBAL_CONFIG['person_foto_path'])) ?
$GLOBAL_CONFIG['person_foto_path'] : $default_photo_path;
-
-?>
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN" "html.dtd">
-<?php html_rtl($lang); ?>
-<HEAD>
-<?php echo setCharSet(); ?>
- <TITLE><?php echo "$LDOR $LDNursing $LDOnCallDuty" ?></TITLE>
-
-<style type="text/css">
- A:link {text-decoration: none; }
- A:hover {text-decoration: underline; color: red; }
-
- A:visited {text-decoration: none;}
-
-div.a3 {font-family: arial; font-size: 14; margin-left: 3; margin-right:3; }
-
-.infolayer {
- position:absolute;
- visibility: hide;
- left: 100;
- top: 10;
-
-}
-
-</style>
-
-<script language="javascript">
-
- var urlholder;
- var infowinflag=0;
-
-function popinfo(l,f,b)
-{
- w=window.screen.width;
- 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.'"' ?>;
-
- 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));
-
-}
-
-</script>
-
-</HEAD>
-
-<BODY bgcolor="#ffffff" alink="navy" vlink="navy"
onLoad="window.resizeTo(600,600)">
-<font face="Verdana, Arial" size=2>
-
-<b> <?php echo "$LDOnCallDuty ($dept_name) $LDOn
".formatDate2Local("$pyear-$pmonth-$pday",$date_format); ?></b>
-<p>
-<?php if($person1) {
-
- $photo_filename=$person1['photo_filename'];
- include($root_path.'include/helpers/inc_photo_filename_resolve.php');
-?>
-
-<font face=verdana,arial size=+1 color=maroon>
-<b>
-<?php
-echo ucfirst($person1['name_last']).', '.ucfirst($person1['name_first']);
-?>
-</b>
-<img <?php echo $img_source; ?> align="right">
-</font>
-<p>
-
-<table border=0>
-<tr>
-<td bgcolor=#ffffcc><img <?php echo createComIcon($root_path,'authors.gif')
?>> <font face=verdana,arial size=2 ><b><?php echo $LDContactInfo
?></b><br></font>
-</td>
-</tr>
-<tr>
-<td><font face=verdana,arial size=2 > <b><?php echo $LDBeeper
?>:</b><font color=red> <?php echo $person1['funk1']; ?><br>
-<font color=navy> <b><?php echo $LDPhone ?>:</b> <?php echo
$person1['inphone1']; ?></font>
-</td>
-</tr>
-<tr>
-<td bgcolor=#ffffcc><img <?php echo
createComIcon($root_path,'listen-sm-legend.gif') ?>> <font
face=verdana,arial size=2 ><b><?php echo $LDOnCallContactInfo ?></b><br></font>
-</td>
-</tr>
-<tr>
-<td><font face=verdana,arial size=2 > <b><?php echo $LDBeeper
?>:</b><font color=red> <?php echo $dept['funk1']; ?>
-<br>
-<font color=navy> <b><?php echo $LDPhone ?>:</b> <?php echo
$dept['inphone1']; ?></font>
-</td>
-</tr>
-
-<!-- <tr>
-<td bgcolor=#ffffcc><img <?php echo createComIcon($root_path,'warn.gif')
?>> <font face=verdana,arial size=2 ><b><?php echo $LDMoreInfo
?></b><br></font>
-</td>
-</tr>
-<tr>
-<td><font face=verdana,arial size=2 ><?php echo $pinfo["info"]; ?></font>
-</td>
-</tr>
- --></table>
-<p>
-
-<?php } ?>
-<?php if($person2) {
-
- $photo_filename=$person2['photo_filename'];
- include($root_path.'include/helpers/inc_photo_filename_resolve.php');
-?>
-<hr>
-
-
-<font face=verdana,arial size=+1 color=maroon>
-<b>
-<?php
-echo ucfirst($person2['name_last']).', '.ucfirst($person2['name_first']);
-?>
-</b>
-<img <?php echo $img_source; ?> align="right">
-</font>
-<p>
-
-<table border=0 >
-<tr>
-<td bgcolor=#ffffcc>
-
-<img <?php echo createComIcon($root_path,'authors.gif') ?>> <font
face=verdana,arial size=2 ><b><?php echo $LDContactInfo ?></b><br></font>
-</td>
-</tr>
-<tr>
-<td><font face=verdana,arial size=2 ><b><?php echo $LDBeeper ?>:</b><font
color=red> <?php echo $person2['funk1']; ?><br>
-<font color=navy><b><?php echo $LDPhone ?>:</b> <?php echo
$person2['inphone1']; ?><br></font>
-</td>
-</tr>
-<tr>
-<td bgcolor=#ffffcc><img <?php echo
createComIcon($root_path,'listen-sm-legend.gif') ?>> <font
face=verdana,arial size=2 ><b><?php echo $LDOnCallContactInfo ?></b><br></font>
-</td>
-</tr>
-<tr>
-<td><font face=verdana,arial size=2 > <b><?php echo $LDBeeper
?>:</b><font color=red> <?php echo $dept['funk1']; ?>
-<br>
-<font color=navy> <b><?php echo $LDPhone ?>:</b> <?php echo
$dept['inphone1']; ?><br></font>
-</td>
-</tr>
-
-<!-- <tr>
-<td bgcolor=#ffffcc><img <?php echo createComIcon($root_path,'warn.gif')
?>> <font face=verdana,arial size=2 ><b><?php echo $LDMoreInfo
?></b><br></font>
-</td>
-</tr>
-<tr>
-<td><font face=verdana,arial size=2 ><?php echo $pinfo["info"]; ?></font>
-</td>
-</tr>
- --></table>
-
-
-<p>
-
-<?php } ?>
-
- <?php
- if(!($person1||$person2)){
- ?>
-<table border=0>
- <tr>
- <td><img <?php echo createMascot($root_path,'mascot1_r.gif','0') ?>></td>
- <td><font face="Verdana, Arial" size=3 color="#cc0000"><b><?php echo
$LDNoEntryFound ?></b></font></td>
- </tr>
-</table>
-
-<?php } ?>
-<p>
-<a href="<?php echo $rettarget ?>"><img <?php echo
createLDImgSrc($root_path,'back2.gif','0') ?>></a>
-</FONT>
-</BODY>
-</HTML>
Modified:
care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan-planen.php
===================================================================
--- care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan-planen.php
2010-06-30 10:58:18 UTC (rev 6455)
+++ care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan-planen.php
2010-06-30 11:00:39 UTC (rev 6456)
@@ -217,7 +217,7 @@
function cal_update()
{
- var filename="nursing-or-dienstplan-planen.php?<?php echo
"sid=$sid&lang=$lang" ?>&retpath=<?php echo $retpath ?>&dept_nr=<?php echo
$dept_nr;
?>&pmonth="+document.dienstplan.month.value+"&pyear="+document.dienstplan.jahr.value;
+ var filename="nursing-or-roster-plan.php?<?php echo
"sid=$sid&lang=$lang" ?>&retpath=<?php echo $retpath ?>&dept_nr=<?php echo
$dept_nr;
?>&pmonth="+document.dienstplan.month.value+"&pyear="+document.dienstplan.jahr.value;
window.location.replace(filename);
}
</script>
@@ -255,7 +255,7 @@
$sBuffer = $sBuffer.'</select>';
$smarty->assign('sYearSelect',$sBuffer);
-$smarty->assign('sFormAction','action="nursing-or-dienstplan-planen.php"');
+$smarty->assign('sFormAction','action="nursing-or-roster-plan.php"');
# collect hidden inputs
Modified: care2x/branches/gettext/modules/nursing_or/nursing-or-main-pass.php
===================================================================
--- care2x/branches/gettext/modules/nursing_or/nursing-or-main-pass.php
2010-06-30 10:58:18 UTC (rev 6455)
+++ care2x/branches/gettext/modules/nursing_or/nursing-or-main-pass.php
2010-06-30 11:00:39 UTC (rev 6456)
@@ -13,7 +13,7 @@
switch($target)
{
- case 'dutyplan':
$fileforward="nursing-or-dienstplan-planen.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr&retpath=$retpath&pmonth=$pmonth&pyear=$pyear";
+ case 'dutyplan':
$fileforward="nursing-or-roster-plan.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr&retpath=$retpath&pmonth=$pmonth&pyear=$pyear";
$title=$LDORNOCScheduler;
break;
case 'setpersonal':
$fileforward="nursing-or-roster-personelliste.php".URL_REDIRECT_APPEND."&ipath=$retpath&retpath=$retpath";
Copied: care2x/branches/gettext/modules/nursing_or/nursing-or-roster-day.php
(from rev 6455,
care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan-day.php)
===================================================================
--- care2x/branches/gettext/modules/nursing_or/nursing-or-roster-day.php
(rev 0)
+++ care2x/branches/gettext/modules/nursing_or/nursing-or-roster-day.php
2010-06-30 11:00:39 UTC (rev 6456)
@@ -0,0 +1,254 @@
+<?php
+error_reporting(E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR);
+require('./roots.php');
+require($root_path.'include/helpers/inc_environment_global.php');
+/**
+* CARE2X Integrated Hospital Information System beta 1.0.03 - 2002-10-26
+* GNU General Public License
+* Copyright 2002,2003,2004,2005 Elpidio Latorilla
+* elpi...@care2x.org,
+*
+* See the file "copy_notice.txt" for the licence notice
+*/
+
+$lang_tables=array('doctors.php','departments.php');
+define('LANG_FILE','or.php');
+define('NO_2LEVEL_CHK',1);
+require_once($root_path.'include/helpers/inc_front_chain_lang.php');
+
+require_once($root_path.'include/helpers/inc_date_format_functions.php');
+
+if($pmonth=='') $pmonth=date('n');
+if($pyear=='') $pyear=date('Y');
+if($pday=='') $pday=date('d');
+//$thisfile=basename(__FILE__);
+
+$offset_day=$pday-1;
+
+switch($retpath)
+{
+ case "menu":
$rettarget=$root_path.'modules/main/op-docu.php'.URL_APPEND; break;
+ case "qview":
$rettarget=$root_path.'modules/nursing_or/nursing-or-roster-quickview.php'.URL_APPEND;
break;
+ case "calendar_opt":
$rettarget=$root_path."modules/calendar/calendar-options.php".URL_APPEND."&dept_nr=$dept_nr&forcestation=1&day=$pday&month=$pmonth&year=$pyear";break;
+ default: $rettarget="javascript:window.history.back()";
+}
+
+$dbtable='care_dutyplan_oncall';
+
+// test dept nr
+//$dept_nr=4;
+
+$sql="SELECT duty_1_pnr,duty_2_pnr FROM $dbtable
+ WHERE dept_nr='$dept_nr'
+ AND year='$pyear'
+ AND
month='".(int)$pmonth."'";
+
+if($ergebnis=$db->Execute($sql)){
+ if($rows=$ergebnis->RecordCount()){
+ $result=$ergebnis->FetchRow();
+ $duty1=unserialize($result['duty_1_pnr']);
+ $duty2=unserialize($result['duty_2_pnr']);
+ //echo $sql."<br>";
+ }
+}
+
+//echo $sql;
+
+require_once($root_path.'modules/personell_admin/model/class_personell.php');
+$pers_obj=new Personell;
+
+if($pnr=$duty1['ha'.$offset_day]){
+ $person1=&$pers_obj->getPersonellInfo($pnr);
+}
+if($pnr=$duty2['hr'.$offset_day]){
+ $person2=&$pers_obj->getPersonellInfo($pnr);
+}
+
+require_once($root_path.'modules/dept_admin/model/class_department.php');
+$dept_obj=new Department;
+$dept=&$dept_obj->getPhoneInfo($dept_nr);
+/* Resolve the departments name "language dependent" */
+$dept_ldvar=$dept_obj->LDvar($dept_nr);
+if(isset($$dept_ldvar)&&!empty($$dept_ldvar)) $dept_name=$$dept_ldvar;
+ else $dept_name=$dept_obj->FormalName($dept_nr);
+
+require_once($root_path.'include/core/class_globalconfig.php');
+$glob_obj=new GlobalConfig($GLOBAL_CONFIG);
+$glob_obj->getConfig('person_%');
+/* Check whether config foto path exists, else use default path */
+$default_photo_path='uploads/photos/registration';
+$photo_path = (is_dir($root_path.$GLOBAL_CONFIG['person_foto_path'])) ?
$GLOBAL_CONFIG['person_foto_path'] : $default_photo_path;
+
+?>
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN" "html.dtd">
+<?php html_rtl($lang); ?>
+<HEAD>
+<?php echo setCharSet(); ?>
+ <TITLE><?php echo "$LDOR $LDNursing $LDOnCallDuty" ?></TITLE>
+
+<style type="text/css">
+ A:link {text-decoration: none; }
+ A:hover {text-decoration: underline; color: red; }
+
+ A:visited {text-decoration: none;}
+
+div.a3 {font-family: arial; font-size: 14; margin-left: 3; margin-right:3; }
+
+.infolayer {
+ position:absolute;
+ visibility: hide;
+ left: 100;
+ top: 10;
+
+}
+
+</style>
+
+<script language="javascript">
+
+ var urlholder;
+ var infowinflag=0;
+
+function popinfo(l,f,b)
+{
+ w=window.screen.width;
+ 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.'"' ?>;
+
+ 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));
+
+}
+
+</script>
+
+</HEAD>
+
+<BODY bgcolor="#ffffff" alink="navy" vlink="navy"
onLoad="window.resizeTo(600,600)">
+<font face="Verdana, Arial" size=2>
+
+<b> <?php echo "$LDOnCallDuty ($dept_name) $LDOn
".formatDate2Local("$pyear-$pmonth-$pday",$date_format); ?></b>
+<p>
+<?php if($person1) {
+
+ $photo_filename=$person1['photo_filename'];
+ include($root_path.'include/helpers/inc_photo_filename_resolve.php');
+?>
+
+<font face=verdana,arial size=+1 color=maroon>
+<b>
+<?php
+echo ucfirst($person1['name_last']).', '.ucfirst($person1['name_first']);
+?>
+</b>
+<img <?php echo $img_source; ?> align="right">
+</font>
+<p>
+
+<table border=0>
+<tr>
+<td bgcolor=#ffffcc><img <?php echo createComIcon($root_path,'authors.gif')
?>> <font face=verdana,arial size=2 ><b><?php echo $LDContactInfo
?></b><br></font>
+</td>
+</tr>
+<tr>
+<td><font face=verdana,arial size=2 > <b><?php echo $LDBeeper
?>:</b><font color=red> <?php echo $person1['funk1']; ?><br>
+<font color=navy> <b><?php echo $LDPhone ?>:</b> <?php echo
$person1['inphone1']; ?></font>
+</td>
+</tr>
+<tr>
+<td bgcolor=#ffffcc><img <?php echo
createComIcon($root_path,'listen-sm-legend.gif') ?>> <font
face=verdana,arial size=2 ><b><?php echo $LDOnCallContactInfo ?></b><br></font>
+</td>
+</tr>
+<tr>
+<td><font face=verdana,arial size=2 > <b><?php echo $LDBeeper
?>:</b><font color=red> <?php echo $dept['funk1']; ?>
+<br>
+<font color=navy> <b><?php echo $LDPhone ?>:</b> <?php echo
$dept['inphone1']; ?></font>
+</td>
+</tr>
+
+<!-- <tr>
+<td bgcolor=#ffffcc><img <?php echo createComIcon($root_path,'warn.gif')
?>> <font face=verdana,arial size=2 ><b><?php echo $LDMoreInfo
?></b><br></font>
+</td>
+</tr>
+<tr>
+<td><font face=verdana,arial size=2 ><?php echo $pinfo["info"]; ?></font>
+</td>
+</tr>
+ --></table>
+<p>
+
+<?php } ?>
+<?php if($person2) {
+
+ $photo_filename=$person2['photo_filename'];
+ include($root_path.'include/helpers/inc_photo_filename_resolve.php');
+?>
+<hr>
+
+
+<font face=verdana,arial size=+1 color=maroon>
+<b>
+<?php
+echo ucfirst($person2['name_last']).', '.ucfirst($person2['name_first']);
+?>
+</b>
+<img <?php echo $img_source; ?> align="right">
+</font>
+<p>
+
+<table border=0 >
+<tr>
+<td bgcolor=#ffffcc>
+
+<img <?php echo createComIcon($root_path,'authors.gif') ?>> <font
face=verdana,arial size=2 ><b><?php echo $LDContactInfo ?></b><br></font>
+</td>
+</tr>
+<tr>
+<td><font face=verdana,arial size=2 ><b><?php echo $LDBeeper ?>:</b><font
color=red> <?php echo $person2['funk1']; ?><br>
+<font color=navy><b><?php echo $LDPhone ?>:</b> <?php echo
$person2['inphone1']; ?><br></font>
+</td>
+</tr>
+<tr>
+<td bgcolor=#ffffcc><img <?php echo
createComIcon($root_path,'listen-sm-legend.gif') ?>> <font
face=verdana,arial size=2 ><b><?php echo $LDOnCallContactInfo ?></b><br></font>
+</td>
+</tr>
+<tr>
+<td><font face=verdana,arial size=2 > <b><?php echo $LDBeeper
?>:</b><font color=red> <?php echo $dept['funk1']; ?>
+<br>
+<font color=navy> <b><?php echo $LDPhone ?>:</b> <?php echo
$dept['inphone1']; ?><br></font>
+</td>
+</tr>
+
+<!-- <tr>
+<td bgcolor=#ffffcc><img <?php echo createComIcon($root_path,'warn.gif')
?>> <font face=verdana,arial size=2 ><b><?php echo $LDMoreInfo
?></b><br></font>
+</td>
+</tr>
+<tr>
+<td><font face=verdana,arial size=2 ><?php echo $pinfo["info"]; ?></font>
+</td>
+</tr>
+ --></table>
+
+
+<p>
+
+<?php } ?>
+
+ <?php
+ if(!($person1||$person2)){
+ ?>
+<table border=0>
+ <tr>
+ <td><img <?php echo createMascot($root_path,'mascot1_r.gif','0') ?>></td>
+ <td><font face="Verdana, Arial" size=3 color="#cc0000"><b><?php echo
$LDNoEntryFound ?></b></font></td>
+ </tr>
+</table>
+
+<?php } ?>
+<p>
+<a href="<?php echo $rettarget ?>"><img <?php echo
createLDImgSrc($root_path,'back2.gif','0') ?>></a>
+</FONT>
+</BODY>
+</HTML>
Modified:
care2x/branches/gettext/modules/nursing_or/nursing-or-roster-personelliste.php
===================================================================
---
care2x/branches/gettext/modules/nursing_or/nursing-or-roster-personelliste.php
2010-06-30 10:58:18 UTC (rev 6455)
+++
care2x/branches/gettext/modules/nursing_or/nursing-or-roster-personelliste.php
2010-06-30 11:00:39 UTC (rev 6456)
@@ -83,7 +83,7 @@
switch($ipath){
case 'menu':
$breakfile=$root_path.'main/op-docu.php'.URL_APPEND; break;
case 'qview':
$breakfile="nursing-or-roster-quickview.php".URL_APPEND."&hilitedept=$dept_nr";
break;
- case 'plan':
$breakfile="nursing-or-dienstplan-planen.php".URL_APPEND."&dept_nr=$dept_nr&pmonth=$pmonth&pyear=$pyear&retpath=$retpath";
break;
+ case 'plan':
$breakfile="nursing-or-roster-plan.php".URL_APPEND."&dept_nr=$dept_nr&pmonth=$pmonth&pyear=$pyear&retpath=$retpath";
break;
default: $breakfile="javascript:window.history.back()";
}
}
Modified: care2x/branches/gettext/modules/nursing_or/nursing-or-select-dept.php
===================================================================
--- care2x/branches/gettext/modules/nursing_or/nursing-or-select-dept.php
2010-06-30 10:58:18 UTC (rev 6455)
+++ care2x/branches/gettext/modules/nursing_or/nursing-or-select-dept.php
2010-06-30 11:00:39 UTC (rev 6456)
@@ -66,7 +66,7 @@
$fileforward=$root_path."modules/calendar/calendar-options.php".URL_APPEND."&year=$year&month=$month&day=$day";
break;
default: $title=$LDMakeDutyPlan;
-
$fileforward='nursing-or-dienstplan-planen.php'.URL_APPEND.'&retpath='.$retpath;
+
$fileforward='nursing-or-roster-plan.php'.URL_APPEND.'&retpath='.$retpath;
break;
}
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
