Revision: 6390
http://care2002.svn.sourceforge.net/care2002/?rev=6390&view=rev
Author: mizuko
Date: 2010-06-28 14:13:50 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
see #32 - refactor: aufnahme_pass.php to admission_pass.php
Modified Paths:
--------------
care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
care2x/branches/gettext/modules/medocs/medocs_data_show.php
care2x/branches/gettext/modules/nursing/nursing-station.php
care2x/branches/gettext/modules/registration_admission/admission_data_search.php
care2x/branches/gettext/modules/registration_admission/admission_data_show.php
care2x/branches/gettext/modules/registration_admission/admission_start.php
care2x/branches/gettext/modules/registration_admission/aufnahme_pass.php
care2x/branches/gettext/modules/registration_admission/patient.php
care2x/branches/gettext/modules/registration_admission/patient_register.php
care2x/branches/gettext/modules/registration_admission/patient_register_pass.php
care2x/branches/gettext/modules/registration_admission/patient_register_show.php
Modified: care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
===================================================================
--- care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
2010-06-28 14:06:16 UTC (rev 6389)
+++ care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
2010-06-28 14:13:50 UTC (rev 6390)
@@ -342,7 +342,7 @@
# Show the patients name with link to open charts
if($edit){
- $sAstart = '<a
href="'.$root_path.'modules/registration_admission/aufnahme_pass.php'.URL_APPEND.'&target=search&fwd_nr='.$patient['encounter_nr'].'"
title="'.$LDClk2Show.'">';
+ $sAstart = '<a
href="'.$root_path.'modules/registration_admission/admission_pass.php'.URL_APPEND.'&target=search&fwd_nr='.$patient['encounter_nr'].'"
title="'.$LDClk2Show.'">';
}
@@ -385,7 +385,7 @@
if($edit){
- $smarty->assign('sAdmitDataIcon','<a
href="'.$root_path.'modules/registration_admission/aufnahme_pass.php'.URL_APPEND.'&target=search&fwd_nr='.$patient['encounter_nr'].'"
title="'.$LDAdmissionData.' : '.$LDClk2Show.'"><img
'.createComIcon($root_path,'pdata.gif','0','',TRUE).' alt="'.$LDAdmissionData.'
: '.$LDClk2Show.'"></a>');
+ $smarty->assign('sAdmitDataIcon','<a
href="'.$root_path.'modules/registration_admission/admission_pass.php'.URL_APPEND.'&target=search&fwd_nr='.$patient['encounter_nr'].'"
title="'.$LDAdmissionData.' : '.$LDClk2Show.'"><img
'.createComIcon($root_path,'pdata.gif','0','',TRUE).' alt="'.$LDAdmissionData.'
: '.$LDClk2Show.'"></a>');
$smarty->assign('sChartFolderIcon','<a
href="javascript:getinfo(\''.$patient['encounter_nr'].'\')"><img
'.createComIcon($root_path,'open.gif','0','',TRUE).'
alt="'.$LDShowPatData.'"></a>');
Modified: care2x/branches/gettext/modules/medocs/medocs_data_show.php
===================================================================
--- care2x/branches/gettext/modules/medocs/medocs_data_show.php 2010-06-28
14:06:16 UTC (rev 6389)
+++ care2x/branches/gettext/modules/medocs/medocs_data_show.php 2010-06-28
14:13:50 UTC (rev 6390)
@@ -26,7 +26,7 @@
$glob_obj=new GlobalConfig($GLOBAL_CONFIG);
$thisfile='admission_data_search.php';
-$breakfile='aufnahme_pass.php?sid='.$sid.'&lang='.$lang;
+$breakfile='admission_pass.php?sid='.$sid.'&lang='.$lang;
/* Get the patient global configs */
$glob_obj->getConfig('patient_%');
Modified: care2x/branches/gettext/modules/nursing/nursing-station.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station.php 2010-06-28
14:06:16 UTC (rev 6389)
+++ care2x/branches/gettext/modules/nursing/nursing-station.php 2010-06-28
14:13:50 UTC (rev 6390)
@@ -481,7 +481,7 @@
$sAstart = '<a href="';
if(!$bed_locked){
- $sAstart =
$sAstart.$root_path.'modules/registration_admission/aufnahme_pass.php'.URL_APPEND.'&target=search&fwd_nr='.$bed['encounter_nr'].'"
title="'.$LDClk2Show.'">';
+ $sAstart =
$sAstart.$root_path.'modules/registration_admission/admission_pass.php'.URL_APPEND.'&target=search&fwd_nr='.$bed['encounter_nr'].'"
title="'.$LDClk2Show.'">';
}else{
$sAstart =
$sAstart.'javascript:unlock(\''.strtoupper($j).'\',\''.$i.'\')"
title="'.$LDInfoUnlock.'">'.$LDLocked; //$j=bed $i=room number
}
@@ -541,7 +541,7 @@
if($edit){
if(($is_patient)&&!empty($bed['encounter_nr'])){
- $smarty->assign('sAdmitDataIcon','<a
href="'.$root_path.'modules/registration_admission/aufnahme_pass.php'.URL_APPEND.'&target=search&fwd_nr='.$bed['encounter_nr'].'"
title="'.$LDAdmissionData.' : '.$LDClk2Show.'"><img
'.createComIcon($root_path,'pdata.gif','0','',TRUE).' alt="'.$LDAdmissionData.'
: '.$LDClk2Show.'"></a>');
+ $smarty->assign('sAdmitDataIcon','<a
href="'.$root_path.'modules/registration_admission/admission_pass.php'.URL_APPEND.'&target=search&fwd_nr='.$bed['encounter_nr'].'"
title="'.$LDAdmissionData.' : '.$LDClk2Show.'"><img
'.createComIcon($root_path,'pdata.gif','0','',TRUE).' alt="'.$LDAdmissionData.'
: '.$LDClk2Show.'"></a>');
$smarty->assign('sChartFolderIcon','<a
href="javascript:getinfo(\''.$bed['encounter_nr'].'\')"><img
'.createComIcon($root_path,'open.gif','0','',TRUE).'
alt="'.$LDShowPatData.'"></a>');
Modified:
care2x/branches/gettext/modules/registration_admission/admission_data_search.php
===================================================================
---
care2x/branches/gettext/modules/registration_admission/admission_data_search.php
2010-06-28 14:06:16 UTC (rev 6389)
+++
care2x/branches/gettext/modules/registration_admission/admission_data_search.php
2010-06-28 14:13:50 UTC (rev 6390)
@@ -26,7 +26,7 @@
$toggle=0;
if($_COOKIE['ck_login_logged'.$sid])
$breakfile=$root_path.'main/startframe.php'.URL_APPEND;
- else $breakfile='aufnahme_pass.php'.URL_APPEND.'&target=entry';
+ else $breakfile='admission_pass.php'.URL_APPEND.'&target=entry';
# Set value for the search mask
$searchprompt=$LDEntryPrompt;
Modified:
care2x/branches/gettext/modules/registration_admission/admission_data_show.php
===================================================================
---
care2x/branches/gettext/modules/registration_admission/admission_data_show.php
2010-06-28 14:06:16 UTC (rev 6389)
+++
care2x/branches/gettext/modules/registration_admission/admission_data_show.php
2010-06-28 14:13:50 UTC (rev 6390)
@@ -33,9 +33,9 @@
$thisfile=basename(__FILE__);
if($_COOKIE['ck_login_logged'.$sid])
$breakfile=$root_path.'main/startframe.php'.URL_APPEND;
- else $breakfile='aufnahme_pass.php'.URL_APPEND.'&target=entry';
+ else $breakfile='admission_pass.php'.URL_APPEND.'&target=entry';
-//$breakfile='aufnahme_pass.php'.URL_APPEND;
+//$breakfile='admission_pass.php'.URL_APPEND;
$GLOBAL_CONFIG=array();
$glob_obj=new GlobalConfig($GLOBAL_CONFIG);
Modified:
care2x/branches/gettext/modules/registration_admission/admission_start.php
===================================================================
--- care2x/branches/gettext/modules/registration_admission/admission_start.php
2010-06-28 14:06:16 UTC (rev 6389)
+++ care2x/branches/gettext/modules/registration_admission/admission_start.php
2010-06-28 14:13:50 UTC (rev 6390)
@@ -35,7 +35,7 @@
if($origin=='patreg_reg') $breakfile =
'patient_register_show.php'.URL_APPEND.'&pid='.$pid;
elseif($_COOKIE["ck_login_logged".$sid]) $breakfile =
$root_path.'main/startframe.php'.URL_APPEND;
elseif(!empty($_SESSION['sess_path_referer']))
$breakfile=$root_path.$_SESSION['sess_path_referer'].URL_APPEND.'&pid='.$pid;
-else $breakfile = "aufnahme_pass.php".URL_APPEND."&target=entry";
+else $breakfile = "admission_pass.php".URL_APPEND."&target=entry";
$newdata=1;
Modified:
care2x/branches/gettext/modules/registration_admission/aufnahme_pass.php
===================================================================
--- care2x/branches/gettext/modules/registration_admission/aufnahme_pass.php
2010-06-28 14:06:16 UTC (rev 6389)
+++ care2x/branches/gettext/modules/registration_admission/aufnahme_pass.php
2010-06-28 14:13:50 UTC (rev 6390)
@@ -94,13 +94,13 @@
if(defined('ADMISSION_EXT_TABS') && ADMISSION_EXT_TABS){
if($target=="entry") echo '<img
'.createLDImgSrc($root_path,'admit-blue.gif','0').' alt="'.$LDAdmit.'">';
- else{ echo'<a
href="aufnahme_pass.php?sid='.$sid.'&target=entry&lang='.$lang.'"><img
'.createLDImgSrc($root_path,'admit-gray.gif','0').' alt="'.$LDAdmit.'"';
if($cfg['dhtml'])echo'class="fadeOut" '; echo '></a>';}
+ else{ echo'<a
href="admission_pass.php?sid='.$sid.'&target=entry&lang='.$lang.'"><img
'.createLDImgSrc($root_path,'admit-gray.gif','0').' alt="'.$LDAdmit.'"';
if($cfg['dhtml'])echo'class="fadeOut" '; echo '></a>';}
}
if($target=="search") echo '<img
'.createLDImgSrc($root_path,'such-b.gif','0').' alt="'.$LDSearch.'">';
- else{ echo '<a
href="aufnahme_pass.php?sid='.$sid.'&target=search&lang='.$lang.'"><img
'.createLDImgSrc($root_path,'such-gray.gif','0').' alt="'.$LDSearch.'"
';if($cfg['dhtml'])echo'class="fadeOut" '; echo '></a>';}
+ else{ echo '<a
href="admission_pass.php?sid='.$sid.'&target=search&lang='.$lang.'"><img
'.createLDImgSrc($root_path,'such-gray.gif','0').' alt="'.$LDSearch.'"
';if($cfg['dhtml'])echo'class="fadeOut" '; echo '></a>';}
if($target=="archiv") echo '<img
'.createLDImgSrc($root_path,'arch-blu.gif','0').' alt="'.$LDArchive.'">';
- else{ echo '<a
href="aufnahme_pass.php?sid='.$sid.'&target=archiv&lang='.$lang.'"><img
'.createLDImgSrc($root_path,'arch-gray.gif','0').' alt="'.$LDArchive.'"
';if($cfg['dhtml'])echo'class="fadeOut" '; echo '></a>';}
+ else{ echo '<a
href="admission_pass.php?sid='.$sid.'&target=archiv&lang='.$lang.'"><img
'.createLDImgSrc($root_path,'arch-gray.gif','0').' alt="'.$LDArchive.'"
';if($cfg['dhtml'])echo'class="fadeOut" '; echo '></a>';}
?>
</td>
</tr>
@@ -114,17 +114,17 @@
#
/*
if($target!="entry") : ?>
-<img <?php echo createComIcon($root_path,'update.gif','0','absmiddle') ?>> <a
href="aufnahme_pass.php?sid=<?php echo "$sid&lang=$lang" ?>&target=entry"><?php
echo $LDAdmWantEntry ?></a><br>
+<img <?php echo createComIcon($root_path,'update.gif','0','absmiddle') ?>> <a
href="admission_pass.php?sid=<?php echo "$sid&lang=$lang"
?>&target=entry"><?php echo $LDAdmWantEntry ?></a><br>
<?php
endif
*/
?>
<?php if($target!="search") : ?>
-<img <?php echo createComIcon($root_path,'update.gif','0','absmiddle') ?>> <a
href="aufnahme_pass.php?sid=<?php echo "$sid&lang=$lang"
?>&target=search"><?php echo $LDAdmWantSearch ?></a><br>
+<img <?php echo createComIcon($root_path,'update.gif','0','absmiddle') ?>> <a
href="admission_pass.php?sid=<?php echo "$sid&lang=$lang"
?>&target=search"><?php echo $LDAdmWantSearch ?></a><br>
<?php endif ?>
<?php if($target!="archiv") : ?>
-<img <?php echo createComIcon($root_path,'update.gif','0','absmiddle') ?>> <a
href="aufnahme_pass.php?sid=<?php echo "$sid&lang=$lang"
?>&target=archiv"><?php echo $LDAdmWantArchive ?></a><br>
+<img <?php echo createComIcon($root_path,'update.gif','0','absmiddle') ?>> <a
href="admission_pass.php?sid=<?php echo "$sid&lang=$lang"
?>&target=archiv"><?php echo $LDAdmWantArchive ?></a><br>
<?php endif ?>
<img <?php echo createComIcon($root_path,'frage.gif','0','absmiddle') ?>> <a
href="javascript:gethelp('admission_how2start.php','<?php echo $target
?>','entry')"><?php echo $LDAdmHow2Enter ?></a><br>
<img <?php echo createComIcon($root_path,'frage.gif','0','absmiddle') ?>> <a
href="javascript:gethelp('admission_how2start.php','<?php echo $target
?>','search')"><?php echo $LDAdmHow2Search ?></a><br>
Modified: care2x/branches/gettext/modules/registration_admission/patient.php
===================================================================
--- care2x/branches/gettext/modules/registration_admission/patient.php
2010-06-28 14:06:16 UTC (rev 6389)
+++ care2x/branches/gettext/modules/registration_admission/patient.php
2010-06-28 14:13:50 UTC (rev 6390)
@@ -68,8 +68,8 @@
# Prepare the submenu links indexed with their template tags
$aSubMenuItem = array('LDPatientRegister' => "<a
href=\"patient_register_pass.php".URL_APPEND."&retpath=docs\">$LDPatientRegister</a>",
-
'LDAdmission' => "<a
href=\"aufnahme_pass.php".URL_APPEND."&target=dutyplan&retpath=menu\">$LDAdmission</a>",
-
'LDVisit' => "<a
href=\"aufnahme_pass.php".URL_APPEND."&target=entry&retpath=docs\">$LDVisit</a>",
+
'LDAdmission' => "<a
href=\"admission_pass.php".URL_APPEND."&target=dutyplan&retpath=menu\">$LDAdmission</a>",
+
'LDVisit' => "<a
href=\"admission_pass.php".URL_APPEND."&target=entry&retpath=docs\">$LDVisit</a>",
'LDAppointments' => "<a
href=\"patient_register_pass.php".URL_APPEND."&target=search&retpath=docs\">$LDAppointments</a>",
'LDDiagXResults' => "<a
href=\"patient_register_pass.php".URL_APPEND."&target=search&retpath=docs\">$LDDiagXResults</a>",
'LDDRG' => "<a
href=\"patient_register_pass.php".URL_APPEND."&target=search&retpath=docs\">$LDDRG</a>",
Modified:
care2x/branches/gettext/modules/registration_admission/patient_register.php
===================================================================
--- care2x/branches/gettext/modules/registration_admission/patient_register.php
2010-06-28 14:06:16 UTC (rev 6389)
+++ care2x/branches/gettext/modules/registration_admission/patient_register.php
2010-06-28 14:13:50 UTC (rev 6390)
@@ -87,7 +87,7 @@
$sCancel="<a href=";
if($_COOKIE['ck_login_logged'.$sid]) $sCancel.=$breakfile;
-else $sCancel.='aufnahme_pass.php';
+else $sCancel.='admission_pass.php';
$sCancel.=URL_APPEND.'><img '.createLDImgSrc($root_path,'cancel.gif','0').'
alt="'.$LDCancelClose.'"></a>';
$smarty->assign('pbCancel',$sCancel);
Modified:
care2x/branches/gettext/modules/registration_admission/patient_register_pass.php
===================================================================
---
care2x/branches/gettext/modules/registration_admission/patient_register_pass.php
2010-06-28 14:06:16 UTC (rev 6389)
+++
care2x/branches/gettext/modules/registration_admission/patient_register_pass.php
2010-06-28 14:13:50 UTC (rev 6390)
@@ -123,13 +123,13 @@
<!-- <p>
<?php if($target!="entry") : ?>
-<img <?php echo createComIcon($root_path,'update.gif','0','absmiddle') ?>> <a
href="aufnahme_pass.php?sid=<?php echo "$sid&lang=$lang" ?>&target=entry"><?php
echo $LDAdmWantEntry ?></a><br>
+<img <?php echo createComIcon($root_path,'update.gif','0','absmiddle') ?>> <a
href="admission_pass.php?sid=<?php echo "$sid&lang=$lang"
?>&target=entry"><?php echo $LDAdmWantEntry ?></a><br>
<?php endif ?>
<?php if($target!="search") : ?>
-<img <?php echo createComIcon($root_path,'update.gif','0','absmiddle') ?>> <a
href="aufnahme_pass.php?sid=<?php echo "$sid&lang=$lang"
?>&target=search"><?php echo $LDAdmWantSearch ?></a><br>
+<img <?php echo createComIcon($root_path,'update.gif','0','absmiddle') ?>> <a
href="admission_pass.php?sid=<?php echo "$sid&lang=$lang"
?>&target=search"><?php echo $LDAdmWantSearch ?></a><br>
<?php endif ?>
<?php if($target!="archiv") : ?>
-<img <?php echo createComIcon($root_path,'update.gif','0','absmiddle') ?>> <a
href="aufnahme_pass.php?sid=<?php echo "$sid&lang=$lang"
?>&target=archiv"><?php echo $LDAdmWantArchive ?></a><br>
+<img <?php echo createComIcon($root_path,'update.gif','0','absmiddle') ?>> <a
href="admission_pass.php?sid=<?php echo "$sid&lang=$lang"
?>&target=archiv"><?php echo $LDAdmWantArchive ?></a><br>
<?php endif ?>
<img <?php echo createComIcon($root_path,'frage.gif','0','absmiddle') ?>> <a
href="javascript:gethelp('admission_how2start.php','<?php echo $target
?>','entry')"><?php echo $LDAdmHow2Enter ?></a><br>
<img <?php echo createComIcon($root_path,'frage.gif','0','absmiddle') ?>> <a
href="javascript:gethelp('admission_how2start.php','<?php echo $target
?>','search')"><?php echo $LDAdmHow2Search ?></a><br>
Modified:
care2x/branches/gettext/modules/registration_admission/patient_register_show.php
===================================================================
---
care2x/branches/gettext/modules/registration_admission/patient_register_show.php
2010-06-28 14:06:16 UTC (rev 6389)
+++
care2x/branches/gettext/modules/registration_admission/patient_register_show.php
2010-06-28 14:13:50 UTC (rev 6390)
@@ -169,7 +169,7 @@
$sCancel="<a href=";
if($_COOKIE['ck_login_logged'.$sid]) $sCancel.=$breakfile;
- else $sCancel.='aufnahme_pass.php';
+ else $sCancel.='admission_pass.php';
$sCancel.=URL_APPEND.'><img '.createLDImgSrc($root_path,'cancel.gif','0').'
alt="'.$LDCancelClose.'"></a>';
$smarty->assign('pbCancel',$sCancel);
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
