Revision: 6392
http://care2002.svn.sourceforge.net/care2002/?rev=6392&view=rev
Author: mizuko
Date: 2010-06-28 14:21:40 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
see #33 - refactor: aufnahme_list.php to admission_list.php
Modified Paths:
--------------
care2x/branches/gettext/docs/NEWS
care2x/branches/gettext/installer/db/sql/mysql_dump.sql
care2x/branches/gettext/modules/medocs/gui_bridge/default/gui_medocs_archive.php
care2x/branches/gettext/modules/medocs/medocs_data_delete.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_pass.php
care2x/branches/gettext/modules/registration_admission/admission_start.php
care2x/branches/gettext/modules/registration_admission/aufnahme_list.php
care2x/branches/gettext/modules/registration_admission/gui_bridge/default/gui_aufnahme_list.php
care2x/branches/gettext/modules/registration_admission/gui_bridge/default/gui_tabs_patadmit.php
Modified: care2x/branches/gettext/docs/NEWS
===================================================================
--- care2x/branches/gettext/docs/NEWS 2010-06-28 14:15:26 UTC (rev 6391)
+++ care2x/branches/gettext/docs/NEWS 2010-06-28 14:21:40 UTC (rev 6392)
@@ -18,8 +18,8 @@
* Fix in smarty_care.class.php that causes blank page result in some setups.
* Delete phpinfo.php - security issue.
* Fixed the problem of coming to patient.php page in English (not the
-selected language) after closing the aufnahme_list.php page.
- * Fixed broken link for the Cancel button in the aufnahme_list.php page.
+selected language) after closing the admission_list.php page.
+ * Fixed broken link for the Cancel button in the admission_list.php page.
* Fixed broken links for city and insurance company selection in the
personell register page.
* Fixes language problems in nursing module. It involves usage of the
Modified: care2x/branches/gettext/installer/db/sql/mysql_dump.sql
===================================================================
--- care2x/branches/gettext/installer/db/sql/mysql_dump.sql 2010-06-28
14:15:26 UTC (rev 6391)
+++ care2x/branches/gettext/installer/db/sql/mysql_dump.sql 2010-06-28
14:21:40 UTC (rev 6392)
@@ -4885,7 +4885,7 @@
INSERT INTO care_menu_main VALUES ('1', '1', 'Home', '','LDHome',
'main/startframe.php', '1', '', '', 20030922232015, 00000000000000);
INSERT INTO care_menu_main VALUES ('2', '5', 'Patient', '', 'LDPatient',
'modules/registration_admission/patient_register_pass.php', '1', '', '',
20030922232015, 00000000000000);
-INSERT INTO care_menu_main VALUES ('3', '10', 'Admission', '', 'LDAdmission',
'modules/registration_admission/aufnahme_pass.php', '1', '', '',
20030922232015, 00000000000000);
+INSERT INTO care_menu_main VALUES ('3', '10', 'Admission', '', 'LDAdmission',
'modules/registration_admission/admission_pass.php', '1', '', '',
20030922232015, 00000000000000);
INSERT INTO care_menu_main VALUES ('4', '15', 'Ambulatory', '',
'LDAmbulatory', 'modules/ambulatory/ambulatory.php', '1', '', '',
20030922232015, 00000000000000);
INSERT INTO care_menu_main VALUES ('5', '20', 'Medocs', '', 'LDMedocs',
'modules/medocs/medocs_pass.php', '1', '', '', 20030922232015, 00000000000000);
INSERT INTO care_menu_main VALUES ('6', '25', 'Doctors', '', 'LDDoctors',
'modules/doctors/doctors.php', '1', '', '', 20030922232015, 00000000000000);
@@ -4912,14 +4912,14 @@
INSERT INTO care_menu_sub VALUES ('70', '0', '7', '0', '', '', '', '',
'../gui/img/common/default/nurse.gif', '../gui/img/common/default/nurse.gif',
'', '', '', '', '0001-01-01 00:00:00');
INSERT INTO care_menu_sub VALUES ('20', '0', '1', '0', '', '', '', '',
'../gui/img/common/default/articles.gif', '../gui/img/common/default/home.gif',
'', '', '', '', '0001-01-01 00:00:00');
INSERT INTO care_menu_sub VALUES ('30', '0', '20', '0', '', '', '', '',
'../gui/img/common/default/calendar.gif', '', '', '', '', '', '0001-01-01
00:00:00');
-INSERT INTO care_menu_sub VALUES ('5', '2', '2', '1', 'Admission',
'LDAdmission', '../modules/registration_admission/aufnahme_pass.php', '',
'../gui/img/common/default/bn.gif', '../gui/img/common/default/bn.gif', '1',
'', '', '', '0001-01-01 00:00:00');
+INSERT INTO care_menu_sub VALUES ('5', '2', '2', '1', 'Admission',
'LDAdmission', '../modules/registration_admission/admission_pass.php', '',
'../gui/img/common/default/bn.gif', '../gui/img/common/default/bn.gif', '1',
'', '', '', '0001-01-01 00:00:00');
INSERT INTO care_menu_sub VALUES ('1', '1', '2', '1', 'Registration', '',
'../modules/registration_admission/patient_register_pass.php', '&target=entry',
'../gui/img/common/default/post_discussion.gif', '', '1', '', '', '',
'0001-01-01 00:00:00');
INSERT INTO care_menu_sub VALUES ('130', '1', '2', '1', 'Search', 'LDSearch',
'../modules/registration_admission/patient_register_pass.php',
'&target=search', '../gui/img/common/default/findnew.gif',
'../gui/img/common/default/findnew.gif', '1', '', '', '', '0001-01-01
00:00:00');
INSERT INTO care_menu_sub VALUES ('135', '1', '2', '1', 'Archive',
'LDArchive', '../modules/registration_admission/patient_register_pass.php',
'&target=archiv', '', '', '1', '', '', '', '0001-01-01 00:00:00');
-INSERT INTO care_menu_sub VALUES ('140', '5', '2', '2', 'Search', 'LDSearch',
'../modules/registration_admission/aufnahme_pass.php', '&target=search',
'../gui/img/common/default/findnew.gif',
'../gui/img/common/default/findnew.gif', '1', '', '', '', '0001-01-01
00:00:00');
-INSERT INTO care_menu_sub VALUES ('145', '6', '2', '2', 'Archive',
'LDArchive', '../modules/registration_admission/aufnahme_pass.php',
'&target=archiv', '', '', '1', '', '', '', '0001-01-01 00:00:00');
+INSERT INTO care_menu_sub VALUES ('140', '5', '2', '2', 'Search', 'LDSearch',
'../modules/registration_admission/admission_pass.php', '&target=search',
'../gui/img/common/default/findnew.gif',
'../gui/img/common/default/findnew.gif', '1', '', '', '', '0001-01-01
00:00:00');
+INSERT INTO care_menu_sub VALUES ('145', '6', '2', '2', 'Archive',
'LDArchive', '../modules/registration_admission/admission_pass.php',
'&target=archiv', '', '', '1', '', '', '', '0001-01-01 00:00:00');
INSERT INTO care_menu_sub VALUES ('71', '1', '7', '1', 'Wards', '',
'../modules/nursing/nursing.php', '',
'../gui/img/common/default/bul_arrowgrnsm.gif',
'../gui/img/common/default/bul_arrowgrnsm.gif', '', '', '[station]', '',
'0001-01-01 00:00:00');
-INSERT INTO care_menu_sub VALUES ('155', '1', '3', '1', 'Archive',
'LDArchive', '../modules/registration_admission/aufnahme_pass.php',
'&target=archiv', '', '', '1', '', '', '', '0001-01-01 00:00:00');
+INSERT INTO care_menu_sub VALUES ('155', '1', '3', '1', 'Archive',
'LDArchive', '../modules/registration_admission/admission_pass.php',
'&target=archiv', '', '', '1', '', '', '', '0001-01-01 00:00:00');
INSERT INTO care_menu_sub VALUES ('40', '0', '3', '0', '', '', '', '',
'../gui/img/common/default/bn.gif', '../gui/img/common/default/bn.gif', '', '',
'', '', '0001-01-01 00:00:00');
INSERT INTO care_menu_sub VALUES ('165', '0', '13', '0', '', '', '', '',
'../gui/img/common/default/violet_phone.gif',
'../gui/img/common/default/violet_phone.gif', '', '', '', '', '0001-01-01
00:00:00');
INSERT INTO care_menu_sub VALUES ('7', '3', '7', '1', 'Search', '',
'../modules/nursing/nursing-patient-such-start.php', '',
'../gui/img/common/default/findnew.gif', '', '', '', '', '', '0001-01-01
00:00:00');
@@ -4974,7 +4974,7 @@
INSERT INTO care_registry VALUES ('cafe', 'modules/cafeteria/cafenews.php',
'modules/cafeteria/cafenews.php', 'modules/cafenews/cafenews-edit.php',
'modules/cafenews/cafenews-read.php',
'modules/cafenews/cafenews-edit-pass.php', '', '', '', 00000000000000, '',
00000000000000);
INSERT INTO care_registry VALUES ('main_start', 'modules/news/start_page.php',
'modules/news/start_page.php', 'modules/news/headline-edit-select-art.php',
'modules/news/headline-read.php', '', '', '', '', 00000000000000, '',
00000000000000);
INSERT INTO care_registry VALUES ('it', 'modules/system_admin/edv.php',
'modules/news/newscolumns.php', 'modules/news/editor-4plus1-select-art.php',
'modules/news/editor-4plus1-read.php', '', '', '', '', 00000000000000, '',
00000000000000);
-INSERT INTO care_registry VALUES ('admission_module',
'modules/admission/admission_start.php', '', '', '',
'modules/admission/aufnahme_pass.php', '', '', '', 00000000000000, '',
00000000000000);
+INSERT INTO care_registry VALUES ('admission_module',
'modules/admission/admission_start.php', '', '', '',
'modules/admission/admission_pass.php', '', '', '', 00000000000000, '',
00000000000000);
--
-- Dumping data for table care_role_person
Modified:
care2x/branches/gettext/modules/medocs/gui_bridge/default/gui_medocs_archive.php
===================================================================
---
care2x/branches/gettext/modules/medocs/gui_bridge/default/gui_medocs_archive.php
2010-06-28 14:15:26 UTC (rev 6391)
+++
care2x/branches/gettext/modules/medocs/gui_bridge/default/gui_medocs_archive.php
2010-06-28 14:21:40 UTC (rev 6392)
@@ -146,7 +146,7 @@
</table>
<p>
-<form method="post" action="aufnahme_list.php" >
+<form method="post" action="admission_list.php" >
<input type="hidden" name="sid" value="<?php echo $sid ?>">
<input type="hidden" name="lang" value="<?php echo $lang ?>">
<input type="hidden" name="mode" value="?">
Modified: care2x/branches/gettext/modules/medocs/medocs_data_delete.php
===================================================================
--- care2x/branches/gettext/modules/medocs/medocs_data_delete.php
2010-06-28 14:15:26 UTC (rev 6391)
+++ care2x/branches/gettext/modules/medocs/medocs_data_delete.php
2010-06-28 14:21:40 UTC (rev 6392)
@@ -8,8 +8,8 @@
$dbpassword="";
$dbname="maho";
$dbtable='care_admission_patient';
-$forwardfile="aufnahme_list.php";
-$breakfile="aufnahme_list.php";
+$forwardfile="admission_list.php";
+$breakfile="admission_list.php";
$thisfile="aufnahme_daten_delete.php";
@@ -55,7 +55,7 @@
if
(($buffer+1)==$linecount)
{ $pagecount--; if($batchnum>1) $batchnum--; };
$linecount--;
-
header("Location:
aufnahme_list.php?route=validroute&remark=itemdelete&batchnum=".$batchnum."&displaysize=".$displaysize."&linecount=".$linecount."&pagecount=".$pagecount);
exit;
+
header("Location:
admission_list.php?route=validroute&remark=itemdelete&batchnum=".$batchnum."&displaysize=".$displaysize."&linecount=".$linecount."&pagecount=".$pagecount);
exit;
}else
{
$sql='SELECT * FROM '.$dbtable.' WHERE
care_admission_patient_item="'.$itemname.'"';
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:15:26 UTC (rev 6391)
+++
care2x/branches/gettext/modules/registration_admission/admission_data_search.php
2010-06-28 14:21:40 UTC (rev 6392)
@@ -382,9 +382,9 @@
}
/*
$smarty->assign('sPostText','<a
href="admission_start.php'.URL_APPEND.'&mode=?">'.$LDAdmWantEntry.'</a><br>
- <a href="aufnahme_list.php'.URL_APPEND.'">'.$LDAdmWantArchive.'</a>');
+ <a href="admission_list.php'.URL_APPEND.'">'.$LDAdmWantArchive.'</a>');
*/
-$smarty->assign('sPostText','<a
href="aufnahme_list.php'.URL_APPEND.'">'.$LDAdmWantArchive.'</a>');
+$smarty->assign('sPostText','<a
href="admission_list.php'.URL_APPEND.'">'.$LDAdmWantArchive.'</a>');
# Stop buffering, assign contents and display template
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:15:26 UTC (rev 6391)
+++
care2x/branches/gettext/modules/registration_admission/admission_data_show.php
2010-06-28 14:21:40 UTC (rev 6392)
@@ -483,7 +483,7 @@
$smarty->assign('sAdmitLink','<img
'.createComIcon($root_path,'varrow.gif','0').'> <a
href="admission_start.php'.URL_APPEND.'&mode=?">'.$LDAdmWantEntry.'</a>');
$smarty->assign('sSearchLink','<img
'.createComIcon($root_path,'varrow.gif','0').'> <a
href="admission_data_search.php'.URL_APPEND.'">'.$LDAdmWantSearch.'</a>');
-$smarty->assign('sArchiveLink','<img
'.createComIcon($root_path,'varrow.gif','0').'> <a
href="aufnahme_list.php'.URL_APPEND.'&newdata=1">'.$LDAdmWantArchive.'</a>');
+$smarty->assign('sArchiveLink','<img
'.createComIcon($root_path,'varrow.gif','0').'> <a
href="admission_list.php'.URL_APPEND.'&newdata=1">'.$LDAdmWantArchive.'</a>');
$smarty->assign('sMainBlockIncludeFile','registration_admission/admit_show.tpl');
Modified:
care2x/branches/gettext/modules/registration_admission/admission_pass.php
===================================================================
--- care2x/branches/gettext/modules/registration_admission/admission_pass.php
2010-06-28 14:15:26 UTC (rev 6391)
+++ care2x/branches/gettext/modules/registration_admission/admission_pass.php
2010-06-28 14:21:40 UTC (rev 6392)
@@ -35,7 +35,7 @@
case 'search':$fileforward='admission_data_search.php'.$append;
$lognote='Admision search ok';
break;
- case 'archiv':$fileforward='aufnahme_list.php'.$append;
+ case 'archiv':$fileforward='admission_list.php'.$append;
$lognote='Admission archive ok';
break;
default: $target='search';
Modified:
care2x/branches/gettext/modules/registration_admission/admission_start.php
===================================================================
--- care2x/branches/gettext/modules/registration_admission/admission_start.php
2010-06-28 14:15:26 UTC (rev 6391)
+++ care2x/branches/gettext/modules/registration_admission/admission_start.php
2010-06-28 14:21:40 UTC (rev 6392)
@@ -942,7 +942,7 @@
# Prepare shortcut links to other functions
$smarty->assign('sSearchLink','<img
'.createComIcon($root_path,'varrow.gif','0').'> <a
href="admission_data_search.php'.URL_APPEND.'">'.$LDPatientSearch.'</a>');
-$smarty->assign('sArchiveLink','<img
'.createComIcon($root_path,'varrow.gif','0').'> <a
href="aufnahme_list.php'.URL_APPEND.'&newdata=1&from=entry">'.$LDArchive.'</a>');
+$smarty->assign('sArchiveLink','<img
'.createComIcon($root_path,'varrow.gif','0').'> <a
href="admission_list.php'.URL_APPEND.'&newdata=1&from=entry">'.$LDArchive.'</a>');
$smarty->assign('sMainBlockIncludeFile','registration_admission/admit_input.tpl');
Modified:
care2x/branches/gettext/modules/registration_admission/aufnahme_list.php
===================================================================
--- care2x/branches/gettext/modules/registration_admission/aufnahme_list.php
2010-06-28 14:15:26 UTC (rev 6391)
+++ care2x/branches/gettext/modules/registration_admission/aufnahme_list.php
2010-06-28 14:21:40 UTC (rev 6392)
@@ -268,5 +268,5 @@
}
}
# Load GUI page
-require('./gui_bridge/default/gui_aufnahme_list.php');
+require('./gui_bridge/default/gui_admission_list.php');
?>
Modified:
care2x/branches/gettext/modules/registration_admission/gui_bridge/default/gui_aufnahme_list.php
===================================================================
---
care2x/branches/gettext/modules/registration_admission/gui_bridge/default/gui_aufnahme_list.php
2010-06-28 14:15:26 UTC (rev 6391)
+++
care2x/branches/gettext/modules/registration_admission/gui_bridge/default/gui_aufnahme_list.php
2010-06-28 14:21:40 UTC (rev 6392)
@@ -231,7 +231,7 @@
<p>
-<form method="post" action="aufnahme_list.php" >
+<form method="post" action="admission_list.php" >
<input type="hidden" name="sid" value="<?php echo $sid ?>">
<input type="hidden" name="lang" value="<?php echo $lang ?>">
<input type="hidden" name="mode" value="?">
Modified:
care2x/branches/gettext/modules/registration_admission/gui_bridge/default/gui_tabs_patadmit.php
===================================================================
---
care2x/branches/gettext/modules/registration_admission/gui_bridge/default/gui_tabs_patadmit.php
2010-06-28 14:15:26 UTC (rev 6391)
+++
care2x/branches/gettext/modules/registration_admission/gui_bridge/default/gui_tabs_patadmit.php
2010-06-28 14:21:40 UTC (rev 6392)
@@ -33,7 +33,7 @@
if($target=="archiv") $img='arch-blu.gif'; //echo '<img
'.createLDImgSrc($root_path,'archive_green.gif','0').' alt="'.$LDArchive.'">';
else{$img='arch-gray.gif'; }
- $pbBuffer='<a href="aufnahme_list.php'.URL_APPEND.'&target=archiv"><img
'.createLDImgSrc($root_path,$img,'0').' alt="'.$LDArchive.'"
title="'.$LDArchive.'" ';
+ $pbBuffer='<a
href="admission_list.php'.URL_APPEND.'&target=archiv"><img
'.createLDImgSrc($root_path,$img,'0').' alt="'.$LDArchive.'"
title="'.$LDArchive.'" ';
if($cfg['dhtml']) $pbBuffer.='class="fadeOut" ';
$pbBuffer.=' align=middle></a>';
$smarty->assign('pbAdvSearch',$pbBuffer);
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
