Revision: 6424
http://care2002.svn.sourceforge.net/care2002/?rev=6424&view=rev
Author: mizuko
Date: 2010-06-30 08:27:41 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/main/op-docu.php
care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
care2x/branches/gettext/modules/calendar/calendar-options.php
care2x/branches/gettext/modules/doctors/doctors-dienst-personalliste.php
care2x/branches/gettext/modules/doctors/doctors-dienst-schnellsicht.php
care2x/branches/gettext/modules/doctors/doctors-dienstplan-planen.php
care2x/branches/gettext/modules/doctors/doctors-dienstplan-poppersonselect.php
care2x/branches/gettext/modules/doctors/doctors-dienstplan.php
care2x/branches/gettext/modules/doctors/doctors-list-add.php
care2x/branches/gettext/modules/doctors/doctors-main-pass.php
care2x/branches/gettext/modules/doctors/doctors-select-dept.php
care2x/branches/gettext/modules/doctors/doctors.php
care2x/branches/gettext/modules/nursing/nursing-station.php
care2x/branches/gettext/modules/op_document/op-docu-select-dept.php
Modified: care2x/branches/gettext/main/op-docu.php
===================================================================
--- care2x/branches/gettext/main/op-docu.php 2010-06-30 08:19:06 UTC (rev
6423)
+++ care2x/branches/gettext/main/op-docu.php 2010-06-30 08:27:41 UTC (rev
6424)
@@ -85,7 +85,7 @@
</TR>
</TABLE>');
-$smarty->assign('LDQviewDocs',"<a
href=\"".$root_path."modules/doctors/doctors-dienst-schnellsicht.php".URL_APPEND."&retpath=op\">$LDDOC
$LDQuickView</a>");
+$smarty->assign('LDQviewDocs',"<a
href=\"".$root_path."modules/doctors/doctors-roster-quickview.php".URL_APPEND."&retpath=op\">$LDDOC
$LDQuickView</a>");
$smarty->assign('LDQviewTxtDocs',$LDQviewTxtDocs);
# OR Nursing submenu block
Modified: care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
===================================================================
--- care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
2010-06-30 08:19:06 UTC (rev 6423)
+++ care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
2010-06-30 08:27:41 UTC (rev 6424)
@@ -191,7 +191,7 @@
function popinfo(l,d)
{
- urlholder="<?php echo $root_path
?>modules/doctors/doctors-dienstplan-popinfo.php<?php echo URL_REDIRECT_APPEND
?>&nr="+l+"&dept_nr="+d+"&user=<?php echo $aufnahme_user.'"' ?>;
+ urlholder="<?php echo $root_path
?>modules/doctors/doctors-rosterplan-popinfo.php<?php echo URL_REDIRECT_APPEND
?>&nr="+l+"&dept_nr="+d+"&user=<?php echo $aufnahme_user.'"' ?>;
infowin=window.open(urlholder,"dienstinfo","width=400,height=450,menubar=no,resizable=yes,scrollbars=yes");
Modified: care2x/branches/gettext/modules/calendar/calendar-options.php
===================================================================
--- care2x/branches/gettext/modules/calendar/calendar-options.php
2010-06-30 08:19:06 UTC (rev 6423)
+++ care2x/branches/gettext/modules/calendar/calendar-options.php
2010-06-30 08:27:41 UTC (rev 6424)
@@ -132,7 +132,7 @@
<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-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-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 "$LDDocsOnDuty (".formatDate2Local($i_date,$date_format).")" ?></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>
-->
<?php if($i_date==date('Y-m-d'))
{ echo '
Modified:
care2x/branches/gettext/modules/doctors/doctors-dienst-personalliste.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-dienst-personalliste.php
2010-06-30 08:19:06 UTC (rev 6423)
+++ care2x/branches/gettext/modules/doctors/doctors-dienst-personalliste.php
2010-06-30 08:27:41 UTC (rev 6424)
@@ -74,8 +74,8 @@
switch($ipath)
{
case 'menu': $breakfile="doctors.php".URL_APPEND; break;
- case 'qview':
$breakfile="doctors-dienst-schnellsicht.php".URL_APPEND."&hilitedept=$dept_nr";
break;
- case 'plan':
$breakfile="doctors-dienstplan-planen.php".URL_APPEND."&dept_nr=$dept_nr&pmonth=$pmonth&pyear=$pyear&retpath=$retpath";
break;
+ case 'qview':
$breakfile="doctors-roster-quickview.php".URL_APPEND."&hilitedept=$dept_nr";
break;
+ case 'plan':
$breakfile="doctors-rosterplan-planen.php".URL_APPEND."&dept_nr=$dept_nr&pmonth=$pmonth&pyear=$pyear&retpath=$retpath";
break;
default: $breakfile="javascript:window.history.back()";
}
}
@@ -181,7 +181,7 @@
<!--
var urlholder;
function popinfo(l,d){
- urlholder="doctors-dienstplan-popinfo.php<?php echo URL_REDIRECT_APPEND
?>&nr="+l+"&dept_nr="+d+"&user=<?php echo $aufnahme_user.'"' ?>;
+ urlholder="doctors-rosterplan-popinfo.php<?php echo URL_REDIRECT_APPEND
?>&nr="+l+"&dept_nr="+d+"&user=<?php echo $aufnahme_user.'"' ?>;
infowin=window.open(urlholder,"dienstinfo","width=400,height=300,menubar=no,resizable=yes,scrollbars=yes");
}
function deleteItem(nr){
Modified:
care2x/branches/gettext/modules/doctors/doctors-dienst-schnellsicht.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-dienst-schnellsicht.php
2010-06-30 08:19:06 UTC (rev 6423)
+++ care2x/branches/gettext/modules/doctors/doctors-dienst-schnellsicht.php
2010-06-30 08:27:41 UTC (rev 6424)
@@ -122,7 +122,7 @@
var urlholder;
function popinfo(l,d)
{
- urlholder="doctors-dienstplan-popinfo.php<?php echo URL_REDIRECT_APPEND
?>&nr="+l+"&dept_nr="+d+"&user=<?php echo $aufnahme_user.'"' ?>;
+ urlholder="doctors-rosterplan-popinfo.php<?php echo URL_REDIRECT_APPEND
?>&nr="+l+"&dept_nr="+d+"&user=<?php echo $aufnahme_user.'"' ?>;
infowin=window.open(urlholder,"dienstinfo","width=400,height=300,menubar=no,resizable=yes,scrollbars=yes");
@@ -237,8 +237,8 @@
}
$temp_out.='
- </td><td > <a
href="doctors-dienstplan.phpURLAPPEND&dept_nr='.$v['nr'].'&retpath=qview">
- <button
onClick="javascript:window.location.href=\'doctors-dienstplan.phpURLREDIRECTAPPEND&dept_nr='.$v['nr'].'&retpath=qview\'"><img
'.createComIcon($root_path,'new_address.gif','0','absmiddle',FALSE).'
alt="IMGALT" ><font size=1> SHOWBUTTON </font></button></a> </td></tr>';
+ </td><td > <a
href="doctors-rosterplan.phpURLAPPEND&dept_nr='.$v['nr'].'&retpath=qview">
+ <button
onClick="javascript:window.location.href=\'doctors-rosterplan.phpURLREDIRECTAPPEND&dept_nr='.$v['nr'].'&retpath=qview\'"><img
'.createComIcon($root_path,'new_address.gif','0','absmiddle',FALSE).'
alt="IMGALT" ><font size=1> SHOWBUTTON </font></button></a> </td></tr>';
}
# Save in cache
Modified: care2x/branches/gettext/modules/doctors/doctors-dienstplan-planen.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-dienstplan-planen.php
2010-06-30 08:19:06 UTC (rev 6423)
+++ care2x/branches/gettext/modules/doctors/doctors-dienstplan-planen.php
2010-06-30 08:27:41 UTC (rev 6424)
@@ -23,7 +23,7 @@
//$db->debug=1;
$thisfile=basename(__FILE__);
-$breakfile="doctors-dienstplan.php".URL_APPEND."&dept_nr=$dept_nr&pmonth=$pmonth&pyear=$pyear&retpath=$retpath";
+$breakfile="doctors-rosterplan.php".URL_APPEND."&dept_nr=$dept_nr&pmonth=$pmonth&pyear=$pyear&retpath=$retpath";
require_once($root_path.'modules/dept_admin/model/class_department.php');
$dept_obj=new Department;
@@ -136,7 +136,7 @@
{
if ($path==1)
{
- $fwdpath='doctors-dienstplan.php?';
+ $fwdpath='doctors-rosterplan.php?';
if($saved!="1")
{
if ($mo==1) {$mo=12; $yr--;}
@@ -144,7 +144,7 @@
}
return $fwdpath.'dept='.$dpt.'&pmonth='.$mo.'&pyear='.$yr;
}
- else return "doctors-dienstplan-checkpoint.php";
+ else return "doctors-rosterplan-checkpoint.php";
}
# Prepare page title
@@ -200,7 +200,7 @@
wh=500;
var tmonth=document.dienstplan.month.value;
var tyear=document.dienstplan.jahr.value;
- urlholder="doctors-dienstplan-poppersonselect.php?elemid="+elem +
"&dept_nr=<?php echo $dept_nr ?>&month="+tmonth+"&year="+tyear+ "&mode=" + mode
+ "&retpath=<?php echo $retpath ?>&user=<?php echo
$ck_doctors_dienstplan_user."&lang=$lang&sid=$sid"; ?>";
+ urlholder="doctors-rosterplan-poppersonselect.php?elemid="+elem +
"&dept_nr=<?php echo $dept_nr ?>&month="+tmonth+"&year="+tyear+ "&mode=" + mode
+ "&retpath=<?php echo $retpath ?>&user=<?php echo
$ck_doctors_dienstplan_user."&lang=$lang&sid=$sid"; ?>";
popselectwin=window.open(urlholder,"pop","width=" + ww + ",height=" +
wh + ",menubar=no,resizable=yes,scrollbars=yes,dependent=yes");
window.popselectwin.moveTo((w/2)+80,(h/2)-(wh/2));
@@ -213,7 +213,7 @@
function cal_update()
{
- var filename="doctors-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="doctors-rosterplan-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;
window.location.replace(filename);
}
</script>
@@ -251,7 +251,7 @@
$sBuffer = $sBuffer.'</select>';
$smarty->assign('sYearSelect',$sBuffer);
-$smarty->assign('sFormAction','action="doctors-dienstplan-planen.php"');
+$smarty->assign('sFormAction','action="doctors-rosterplan-planen.php"');
# collect hidden inputs
Modified:
care2x/branches/gettext/modules/doctors/doctors-dienstplan-poppersonselect.php
===================================================================
---
care2x/branches/gettext/modules/doctors/doctors-dienstplan-poppersonselect.php
2010-06-30 08:19:06 UTC (rev 6423)
+++
care2x/branches/gettext/modules/doctors/doctors-dienstplan-poppersonselect.php
2010-06-30 08:27:41 UTC (rev 6424)
@@ -114,7 +114,7 @@
echo '<form><font face="verdana,arial" size=2>
<img '.createMascot($root_path,'mascot1_r.gif','0','left').' >
'.$LDNoPersonList.'
<p>
- <input type="button" value="'.$LDCreatePersonList.'"
onClick="window.opener.location.href=\'doctors-dienst-personalliste.php?sid='.$sid.'&lang='.$lang.'&dept_nr='.$dept_nr.'&pmonth='.$month.'&pyear='.$year.'&retpath='.$retpath.'&ipath=plan\';window.opener.focus();window.close();">
+ <input type="button" value="'.$LDCreatePersonList.'"
onClick="window.opener.location.href=\'doctors-roster-personal-list.php?sid='.$sid.'&lang='.$lang.'&dept_nr='.$dept_nr.'&pmonth='.$month.'&pyear='.$year.'&retpath='.$retpath.'&ipath=plan\';window.opener.focus();window.close();">
</form>';
}
?>
Modified: care2x/branches/gettext/modules/doctors/doctors-dienstplan.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-dienstplan.php
2010-06-30 08:19:06 UTC (rev 6423)
+++ care2x/branches/gettext/modules/doctors/doctors-dienstplan.php
2010-06-30 08:27:41 UTC (rev 6424)
@@ -38,7 +38,7 @@
switch($retpath)
{
case "menu": $rettarget='doctors.php'.URL_APPEND; break;
- case "qview":
$rettarget='doctors-dienst-schnellsicht.php'.URL_APPEND.'&hilitedept='.$dept_nr;
break;
+ case "qview":
$rettarget='doctors-roster-quickview.php'.URL_APPEND.'&hilitedept='.$dept_nr;
break;
default: $rettarget="javascript:window.history.back()";
}
@@ -88,7 +88,7 @@
h=window.screen.height;
ww=400;
wh=400;
- urlholder="doctors-dienstplan-popinfo.php<?php echo URL_REDIRECT_APPEND
?>&nr="+l+"&dept_nr=<?php echo $dept_nr ?>&route=validroute&user=<?php echo
$aufnahme_user.'"' ?>;
+ urlholder="doctors-rosterplan-popinfo.php<?php echo URL_REDIRECT_APPEND
?>&nr="+l+"&dept_nr=<?php echo $dept_nr ?>&route=validroute&user=<?php echo
$aufnahme_user.'"' ?>;
infowin<?php echo $sid ?>=window.open(urlholder,"infowin<?php echo $sid
?>","width=" + ww + ",height=" + wh
+",menubar=no,resizable=yes,scrollbars=yes");
window.infowin<?php echo $sid ?>.moveTo((w/2)+20,(h/2)-(wh/2));
Modified: care2x/branches/gettext/modules/doctors/doctors-list-add.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-list-add.php
2010-06-30 08:19:06 UTC (rev 6423)
+++ care2x/branches/gettext/modules/doctors/doctors-list-add.php
2010-06-30 08:27:41 UTC (rev 6424)
@@ -59,6 +59,6 @@
$pers_obj->setDataArray($data);
if(!$pers_obj->updateDataFromInternalArray($item_nr)) echo
"$obj->sql<br>$LDDbNoUpdate";
}
-header("location:doctors-dienst-personalliste.php".URL_REDIRECT_APPEND."&saved=1&retpath=$retpath&ipath=$ipath&dept_nr=$dept_nr&user_origin=$user_origin&nr=$nr");
+header("location:doctors-roster-personal-list.php".URL_REDIRECT_APPEND."&saved=1&retpath=$retpath&ipath=$ipath&dept_nr=$dept_nr&user_origin=$user_origin&nr=$nr");
exit;
?>
Modified: care2x/branches/gettext/modules/doctors/doctors-main-pass.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-main-pass.php
2010-06-30 08:19:06 UTC (rev 6423)
+++ care2x/branches/gettext/modules/doctors/doctors-main-pass.php
2010-06-30 08:27:41 UTC (rev 6424)
@@ -13,10 +13,10 @@
switch($target)
{
- case 'dutyplan':
$fileforward="doctors-dienstplan-planen.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr&retpath=$retpath&pmonth=$pmonth&pyear=$pyear";
+ case 'dutyplan':
$fileforward="doctors-rosterplan-planen.php".URL_REDIRECT_APPEND."&dept_nr=$dept_nr&retpath=$retpath&pmonth=$pmonth&pyear=$pyear";
$title=$LDDOCScheduler;
break;
- case 'setpersonal':
$fileforward="doctors-dienst-personalliste.php".URL_REDIRECT_APPEND."&ipath=$retpath&retpath=$retpath";
+ case 'setpersonal':
$fileforward="doctors-roster-personal-list.php".URL_REDIRECT_APPEND."&ipath=$retpath&retpath=$retpath";
$title=$LDDocsList;
break;
default:{
header("Location:".$root_path."language/".$lang."/lang_".$lang."_invalid-access-warning.php");
exit;}
Modified: care2x/branches/gettext/modules/doctors/doctors-select-dept.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-select-dept.php
2010-06-30 08:19:06 UTC (rev 6423)
+++ care2x/branches/gettext/modules/doctors/doctors-select-dept.php
2010-06-30 08:27:41 UTC (rev 6424)
@@ -50,10 +50,10 @@
switch($target){
case 'plist': $title=$LDCreateDoctorsList;
-
$fileforward='doctors-dienst-personalliste.php'.URL_APPEND.'&retpath='.$retpath;
+
$fileforward='doctors-roster-personal-list.php'.URL_APPEND.'&retpath='.$retpath;
break;
default: $title=$LDMakeDutyPlan;
-
$fileforward='doctors-dienstplan-planen.php'.URL_APPEND.'&retpath='.$retpath;
+
$fileforward='doctors-rosterplan-planen.php'.URL_APPEND.'&retpath='.$retpath;
break;
}
Modified: care2x/branches/gettext/modules/doctors/doctors.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors.php 2010-06-30 08:19:06 UTC
(rev 6423)
+++ care2x/branches/gettext/modules/doctors/doctors.php 2010-06-30 08:27:41 UTC
(rev 6424)
@@ -68,7 +68,7 @@
# Prepare the submenu item links indexed by their template tags
-$aSubMenuItem=array('LDQViewTxt' => '<a
href="doctors-dienst-schnellsicht.php'.URL_APPEND.'&retpath=docs">'.$LDQView.'</a>',
+$aSubMenuItem=array('LDQViewTxt' => '<a
href="doctors-roster-quickview.php'.URL_APPEND.'&retpath=docs">'.$LDQView.'</a>',
'LDDutyPlanTxt' => '<a
href="doctors-main-pass.php'.URL_APPEND.'&target=dutyplan&retpath=menu">'.$LDDOCS.'</a>',
'LDDocsForumTxt' => '<a
href="doctors-main-pass.php'.URL_APPEND.'&target=setpersonal&retpath=menu">'.$LDDocsList.'</a>',
'LDNewsTxt' => '<a
href="'.$root_path.'modules/news/newscolumns.php'.URL_APPEND.'&dept_nr=37&user_origin=dept">'.$LDNews.'</a>',
Modified: care2x/branches/gettext/modules/nursing/nursing-station.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station.php 2010-06-30
08:19:06 UTC (rev 6423)
+++ care2x/branches/gettext/modules/nursing/nursing-station.php 2010-06-30
08:27:41 UTC (rev 6424)
@@ -243,7 +243,7 @@
function popinfo(l,d)
{
- urlholder="<?php echo $root_path
?>modules/doctors/doctors-dienstplan-popinfo.php<?php echo URL_REDIRECT_APPEND
?>&nr="+l+"&dept_nr="+d+"&user=<?php echo $aufnahme_user.'"' ?>;
+ urlholder="<?php echo $root_path
?>modules/doctors/doctors-rosterplan-popinfo.php<?php echo URL_REDIRECT_APPEND
?>&nr="+l+"&dept_nr="+d+"&user=<?php echo $aufnahme_user.'"' ?>;
infowin=window.open(urlholder,"dienstinfo","width=400,height=450,menubar=no,resizable=yes,scrollbars=yes");
Modified: care2x/branches/gettext/modules/op_document/op-docu-select-dept.php
===================================================================
--- care2x/branches/gettext/modules/op_document/op-docu-select-dept.php
2010-06-30 08:19:06 UTC (rev 6423)
+++ care2x/branches/gettext/modules/op_document/op-docu-select-dept.php
2010-06-30 08:27:41 UTC (rev 6424)
@@ -90,7 +90,7 @@
var urlholder;
function popinfo(l,d)
{
- urlholder="doctors-dienstplan-popinfo.php<?php echo URL_REDIRECT_APPEND
?>&nr="+l+"&dept_nr="+d+"&user=<?php echo $aufnahme_user.'"' ?>;
+ urlholder="doctors-rosterplan-popinfo.php<?php echo URL_REDIRECT_APPEND
?>&nr="+l+"&dept_nr="+d+"&user=<?php echo $aufnahme_user.'"' ?>;
infowin=window.open(urlholder,"dienstinfo","width=400,height=300,menubar=no,resizable=yes,scrollbars=yes");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Care2002-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/care2002-developers
