Revision: 6447
http://care2002.svn.sourceforge.net/care2002/?rev=6447&view=rev
Author: mizuko
Date: 2010-06-30 09:35:19 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/installer/db/sql/mysql_dump.sql
care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
care2x/branches/gettext/modules/nursing/nursing-station-archiv.php
care2x/branches/gettext/modules/nursing/nursing-station-pass.php
care2x/branches/gettext/modules/nursing/nursing-station.php
care2x/branches/gettext/modules/nursing/nursing.php
Added Paths:
-----------
care2x/branches/gettext/modules/nursing/nursing-quickview.php
Removed Paths:
-------------
care2x/branches/gettext/modules/nursing/nursing-schnellsicht.php
Modified: care2x/branches/gettext/installer/db/sql/mysql_dump.sql
===================================================================
--- care2x/branches/gettext/installer/db/sql/mysql_dump.sql 2010-06-30
09:34:14 UTC (rev 6446)
+++ care2x/branches/gettext/installer/db/sql/mysql_dump.sql 2010-06-30
09:35:19 UTC (rev 6447)
@@ -4923,7 +4923,7 @@
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-search-start.php', '',
'../gui/img/common/default/findnew.gif', '', '', '', '', '', '0001-01-01
00:00:00');
-INSERT INTO care_menu_sub VALUES ('72', '2', '7', '1', 'Quick view', '',
'../modules/nursing/nursing-schnellsicht.php', '',
'../gui/img/common/default/eye_s.gif', '', '1', '', '', '', '0001-01-01
00:00:00');
+INSERT INTO care_menu_sub VALUES ('72', '2', '7', '1', 'Quick view', '',
'../modules/nursing/nursing-quickview.php', '',
'../gui/img/common/default/eye_s.gif', '', '1', '', '', '', '0001-01-01
00:00:00');
INSERT INTO care_menu_sub VALUES ('50', '0', '4', '0', '', '', '', '',
'../gui/img/common/default/disc_unrd.gif', '', '', '', '', '', '0001-01-01
00:00:00');
INSERT INTO care_menu_sub VALUES ('120', '0', '6', '0', '', '', '', '',
'../gui/img/common/default/forums.gif', '', '', '', '', '', '0001-01-01
00:00:00');
INSERT INTO care_menu_sub VALUES ('160', '0', '17', '0', '', '', '', '',
'../gui/img/common/default/c-mail.gif', '', '', '', '', '', '0001-01-01
00:00:00');
Modified: care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
===================================================================
--- care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
2010-06-30 09:34:14 UTC (rev 6446)
+++ care2x/branches/gettext/modules/ambulatory/amb_clinic_patients.php
2010-06-30 09:35:19 UTC (rev 6447)
@@ -46,7 +46,7 @@
if(isset($retpath)){
switch($retpath)
{
- case 'quick': $breakfile='nursing-schnellsicht.php'.URL_APPEND;
+ case 'quick': $breakfile='nursing-quickview.php'.URL_APPEND;
break;
case 'ward_mng':
$breakfile='nursing-station-info.php'.URL_APPEND.'&ward_nr='.$ward_nr.'&mode=show';
}
Copied: care2x/branches/gettext/modules/nursing/nursing-quickview.php (from rev
6440, care2x/branches/gettext/modules/nursing/nursing-schnellsicht.php)
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-quickview.php
(rev 0)
+++ care2x/branches/gettext/modules/nursing/nursing-quickview.php
2010-06-30 09:35:19 UTC (rev 6447)
@@ -0,0 +1,306 @@
+<?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 Deployment 2.1 - 2004-10-02
+ * GNU General Public License
+ * Copyright 2002,2003,2004,2005 Elpidio Latorilla
+ * elpi...@care2x.org,
+ *
+ * See the file "copy_notice.txt" for the licence notice
+ */
+ define('USE_PIE_CHART',1); // define to 1 if pie chart is preferred as
display, define to 0 if tiny person icons
+ define('PIE_CHART_USED_COLOR','red'); // define the color of the used bed
portion of the graph
+
+ $lang_tables=array('date_time.php');
+ define('LANG_FILE','nursing.php');
+ define('NO_2LEVEL_CHK',1);
+ require_once($root_path.'include/helpers/inc_front_chain_lang.php');
+
+ $breakfile='nursing.php'.URL_APPEND;
+ $thisfile=basename(__FILE__);
+
+ $today = date('Y-m-d');
+
+ // Let us make some interface for calendar class
+ if($from=='arch'){
+ if($pday=='') $pday=date('d');
+ if($pmonth=='') $pmonth=date('m');
+ if($pyear=='') $pyear=date('Y');
+ $currDay=$pday;
+ $currMonth=$pmonth;
+ $currYear=$pyear;
+ } else {
+ if($currDay=='') $currDay=date('d');
+ if($currMonth=='') $currMonth=date('m');
+ if($currYear=='') $currYear=date('Y');
+ $pday=$currDay;
+ $pmonth=$currMonth;
+ $pyear=$currYear;
+ }
+
+ $s_date=$pyear.'-'.$pmonth.'-'.$pday;
+
+ if($s_date==date('Y-m-d')) $is_today=true;
+ else $is_today=false;
+///$db->debug=1;
+$dbtable='care_ward';
+
+ /* Load date formatter */
+ include_once($root_path.'include/helpers/inc_date_format_functions.php');
+
+ # Get the wards\xB4 info
+ $sql="SELECT nr,ward_id,name,room_nr_start,room_nr_end
+ FROM $dbtable
+ WHERE is_temp_closed IN ('',0)
+ AND status NOT IN
('hide','delete','void','inactive')
+ AND
date_create<='$s_date' ";
+ //gjergji - show only info on my departement
+ if(isset($_SESSION['department_nr']) &&
!empty($_SESSION['department_nr']) ) {
+ $sql.=" AND ( ";
+ while (list($key, $val) = each($_SESSION['department_nr'])) {
+ $tmp .= "dept_nr = " . $val . " OR ";
+
+ }
+ $sql .= substr($tmp,0,-4) ;
+ $sql .= " ) " ;
+ }
+ $sql .= " ORDER BY nr";
+ //echo $sql.'<p>';
+ if($wards=$db->Execute($sql)){
+ $rows=$wards->RecordCount();
+ }else{echo "$sql<br>$LDDbNoRead";}
+
+
+ # Get the rooms\xB4 info
+ $sql="SELECT SUM(r.nr_of_beds) AS maxbed
+ FROM $dbtable AS w LEFT JOIN care_room AS r ON
r.ward_nr=w.nr
+ WHERE w.is_temp_closed IN ('',0)
+ AND w.status NOT IN
('hide','delete','void','inactive')
+ AND w.date_create<='$s_date'
+ GROUP BY w.nr
+ ORDER BY w.nr";
+ //echo $sql.'<p>';
+ if($rooms=$db->Execute($sql)){
+ $roomcount=$rooms->RecordCount();
+ }else{echo "$sql<br>$LDDbNoRead";}
+
+ # Get the today\xB4s occupancy
+ $sql="SELECT COUNT(l.location_nr) AS maxoccbed, w.nr AS ward_nr
+ FROM $dbtable AS w
+ LEFT JOIN care_encounter_location AS l ON l.group_nr=w.nr AND l.type_nr=5
";
+ if($is_today)
+ $sql.=" AND '$s_date'>=l.date_from AND l.date_to = '$dbf_nodate'";
+ else
+ $sql.=" AND '$s_date'>= l.date_from AND '$s_date' <='".date('Y-m-d')."' AND
('$s_date'<=l.date_to OR l.date_to = '$dbf_nodate')";
+
+ $sql.=" WHERE w.is_temp_closed IN('',0) AND w.status NOT IN
('hide','delete','void','inactive') AND w.date_create<='$s_date' ";
+ $sql.=" GROUP BY w.nr ORDER BY w.nr";
+ if($occbed=$db->Execute($sql)){
+ //echo $sql;
+ $bedcount=$occbed->RecordCount();
+ }else{echo "$sql<br>$LDDbNoRead";}
+
+ /**
+ * LOAD Smarty
+ */
+
+ # Note: it is advisable to load this after the inc_front_chain_lang.php so
+ # that the smarty script can use the user configured template theme
+ require_once($root_path.'gui/smarty_template/smarty_care.class.php');
+ $smarty = new smarty_care('nursing');
+
+ $sTemp =
$sid.'&lang='.$lang.'&pday='.$pday.'&pmonth='.$pmonth.'&pyear='.$pyear;
+ $smarty->assign('SID_Parameter',$sTemp);
+ $smarty->assign('aufnahme_user',$aufnahme_user);
+
+ $smarty->assign('sToolbarTitle',$LDNursing );
+ $smarty->assign('Subtitle',$LDQuickView ); // Nursing-Subtitle
(header_toblock.tpl)
+
+ # Added for the common header top block
+
$smarty->assign('pbHelp','javascript:gethelp(\'nursing_how2search.php\',\'\','.$rows.',\'quick\',\'\')');
+
+ /*generate the calendar */
+ include($root_path.'classes/calendar_jl/class.calendar.php');
+ /** CREATE CALENDAR OBJECT **/
+ $Calendar = new Calendar;
+ $Calendar->deactivateFutureDay();
+
+
+ /** WRITE CALENDAR **/
+ ob_start();
+ $Calendar -> mkCalendar ($currYear, $currMonth, $currDay);
+ $sTemp = ob_get_contents();
+ ob_end_clean();
+ $smarty->assign('tblCalendar',$sTemp);
+
+ $smarty->assign('gifVarrow',createComIcon($root_path,'varrow.gif','0') );
+
+ // ECHO "DATE".date(Ymd);
+ $smarty->assign('LDOld',$LDOld);
+ $smarty->assign('LDTodays',$LDTodays);
+ $smarty->assign('LDOccupancy',$LDOccupancy);
+
$smarty->assign('formatDate2Local',@formatDate2Local($pyear.'-'.$pmonth.'-'.$pday,$date_format));
+
+ /**
+ * wards count
+ */
+ if($rows) {
+
+ /* Load the common icons */
+ $img_mangr=createComIcon($root_path,'man-gr.gif','0');
+ $img_mans_gr=createComIcon($root_path,'mans-gr.gif','0','absmiddle');
+ $img_mans_red=createComIcon($root_path,'mans-red.gif','0','absmiddle');
+ $img_statbel=createComIcon($root_path,'statbel2.gif','0','absmiddle');
+
+
+ $randombett=0;
+ $randommaxbett=0;
+ $frei=0;
+
+ // srand(time());
+
+ $sWardrows = "";
+
+ while ($result=$wards->FetchRow())
+ {
+
+ $maxbed=$result['room_nr_end']-$result['room_nr_start'];
+
+ $roomrow=$rooms->FetchRow();
+ $bedrow=$occbed->FetchRow();
+ $freebeds=$roomrow['maxbed']-$bedrow['maxoccbed'];
+ // Patch 2004-05-15
+ if($roomrow['maxbed']){
+ $frei=floor(($freebeds/$roomrow['maxbed'])*10);
+ }else{
+ $frei=0;
+ }
+ if ($toggler==0) {
+ //$bgc='ffffcc';
+ $toggler=1;
+ $sStatListClass='wardlistrow1';
+ } else {
+ //$bgc='dfdfdf';
+ $toggler=0;
+ $sStatListClass='wardlistrow2';
+ }
+
+ /**
+ * collect the hole ward block into $sWardrows
+ */
+
+ ob_start();
+ echo '
+ <tr class="'.$sStatListClass.'">';
+ echo '
+ <td align=center><a
href="javascript:statbel(\'1\',\''.$result['nr'].'\',\''.$result['ward_id'].'\')"
title="'.$LDClk2Show.'">';
+ echo strtoupper($result['name']).'
+ </a>';
+ echo '</td>
+ <td align=center>
+ '.$freebeds.' </td>
+ <td align=center><font color="'.PIE_CHART_USED_COLOR.'">
+ ';
+ if($bedrow['maxoccbed']) echo $bedrow['maxoccbed'];
+ echo ' </td>
+ ';
+ echo '
+ <td align="center">';
+ if($is_today){
+ echo '<a
href="javascript:statbel(\'1\',\''.$result['nr'].'\',\''.$result['ward_id'].'\')"
title="'.str_replace("~station~",$result['name'],$LDEditStation).'" >';
+ }
+ if(defined('USE_PIE_CHART')&&USE_PIE_CHART){
+ echo '<img
src="occupancy_pie_chart.php?qouta='.($roomrow['maxbed']-$bedrow['maxoccbed']).'&used='.$bedrow['maxoccbed'].'&bgc='.$bgc.'&uc='.PIE_CHART_USED_COLOR.'"
border="0">';
+ }else{
+ for ($n=0;$n<(10-$frei);$n++) echo '<img '.$img_mans_red.'>';
+ for ($n=0;$n<$frei;$n++) echo '<img '.$img_mans_gr.'>';
+ }
+ if($is_today){
+ echo '</a>';
+ }
+ echo '
+ </td><td align=center>'.$roomrow['maxbed'].'
+ </td>';
+ echo "\r\n";
+ echo '
+ </td><td align=center>';
+
+ if($is_today){
+ echo '
+ <a
href="javascript:statbel(\'1\',\''.$result['nr'].'\',\''.$result['ward_id'].'\')"
title="'.str_replace("~station~",$result['name'],$LDEditStation).'" >
+ <img '.$img_statbel.'
alt="'.str_replace("~station~",$result['name'],$LDEditStation).'"
border="0"></a>';
+ }
+ if($is_today){
+ echo '</a>';
+ }
+ echo '
+ </td></tr>
+ <tr><td class="thinrow_vspacer" colspan="7"><img
src="../../gui/img/common/default/pixel.gif" border=0 width=1
height=1></td></tr>
+ ';
+
+
+ $sWardrows = $sWardrows . ob_get_contents();
+ ob_end_clean();
+
+
+ } // end While
+ } // if ($rows)
+
+ /**
+ * ========= start with GUI - Block =======================
+ */
+
+ $smarty->assign('LDNrUnocc',$LDNrUnocc);
+ $smarty->assign('gifImg_mangr',$img_mangr);
+ $smarty->assign('LDStation',$LDStation);
+ $smarty->assign('LDFreeBed',$LDFreeBed);
+ $smarty->assign('PIE_CHART_USED_COLOR',PIE_CHART_USED_COLOR);
+ $smarty->assign('LDOccupied',$LDOccupied);
+ $smarty->assign('LDOccupancy',$LDOccupancy);
+ $smarty->assign('LDBedNr',$LDBedNr);
+ $smarty->assign('LDOptions',$LDOptions);
+
+ $smarty->assign('WardRows',$sWardrows);
+
+// $smarty->assign('maxbed',$roomrow['maxbed']);
+//
$smarty->assign('LINKstatbel','javascript:statbel(\'1\',\''.$result['nr'].'\',\''.$result['ward_id'].'\')'
);
+//
$smarty->assign('altImg_statbel',str_replace("~station~",$result['name'],$LDEditStation));
+// $smarty->assign('gifImg_statbel',$img_statbel);
+
+ /**
+ * IF ($is_today)
+ */
+ $smarty->assign('is_today',$is_today);
+
$smarty->assign('gifBul_arrowgrnlrg',createComIcon($root_path,'bul_arrowgrnlrg.gif','0','absmiddle')
);
+
$smarty->assign('gifMascot1_r',createMascot($root_path,'mascot1_r.gif','0','absmiddle')
);
+ $smarty->assign('LDNoOcc',$LDNoOcc);
+ $smarty->assign('LDClk2Archive',$LDClk2Archive);
+
+ /**
+ * IF ($from == "arch")
+ */
+ $smarty->assign('from',$from);
+
$smarty->assign('LINKArchiv','nursing-station-archiv.php'.URL_APPEND.'&pyear='.$pyear.'&pmonth='.$pmonth);
+ $smarty->assign('pbBack2',createLDImgSrc($root_path,'back2.gif','0') );
+ /* ELSE */
+ $smarty->assign('pbClose2',createLDImgSrc($root_path,'close2.gif','0') );
+ $smarty->assign('breakfile',$breakfile);
+
+ # Assign nr of wards available
+
+ $smarty->assign('iWardCount',$rows);
+
+ # Assign quick view template to the mainframe block
+
+ $smarty->assign('sMainBlockIncludeFile','nursing/nursing-schnellansicht.tpl');
+
+ /**
+ * show Template
+ */
+
+ $smarty->display('common/mainframe.tpl');
+
+?>
+
Deleted: care2x/branches/gettext/modules/nursing/nursing-schnellsicht.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-schnellsicht.php
2010-06-30 09:34:14 UTC (rev 6446)
+++ care2x/branches/gettext/modules/nursing/nursing-schnellsicht.php
2010-06-30 09:35:19 UTC (rev 6447)
@@ -1,306 +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 Deployment 2.1 - 2004-10-02
- * GNU General Public License
- * Copyright 2002,2003,2004,2005 Elpidio Latorilla
- * elpi...@care2x.org,
- *
- * See the file "copy_notice.txt" for the licence notice
- */
- define('USE_PIE_CHART',1); // define to 1 if pie chart is preferred as
display, define to 0 if tiny person icons
- define('PIE_CHART_USED_COLOR','red'); // define the color of the used bed
portion of the graph
-
- $lang_tables=array('date_time.php');
- define('LANG_FILE','nursing.php');
- define('NO_2LEVEL_CHK',1);
- require_once($root_path.'include/helpers/inc_front_chain_lang.php');
-
- $breakfile='nursing.php'.URL_APPEND;
- $thisfile=basename(__FILE__);
-
- $today = date('Y-m-d');
-
- // Let us make some interface for calendar class
- if($from=='arch'){
- if($pday=='') $pday=date('d');
- if($pmonth=='') $pmonth=date('m');
- if($pyear=='') $pyear=date('Y');
- $currDay=$pday;
- $currMonth=$pmonth;
- $currYear=$pyear;
- } else {
- if($currDay=='') $currDay=date('d');
- if($currMonth=='') $currMonth=date('m');
- if($currYear=='') $currYear=date('Y');
- $pday=$currDay;
- $pmonth=$currMonth;
- $pyear=$currYear;
- }
-
- $s_date=$pyear.'-'.$pmonth.'-'.$pday;
-
- if($s_date==date('Y-m-d')) $is_today=true;
- else $is_today=false;
-///$db->debug=1;
-$dbtable='care_ward';
-
- /* Load date formatter */
- include_once($root_path.'include/helpers/inc_date_format_functions.php');
-
- # Get the wards\xB4 info
- $sql="SELECT nr,ward_id,name,room_nr_start,room_nr_end
- FROM $dbtable
- WHERE is_temp_closed IN ('',0)
- AND status NOT IN
('hide','delete','void','inactive')
- AND
date_create<='$s_date' ";
- //gjergji - show only info on my departement
- if(isset($_SESSION['department_nr']) &&
!empty($_SESSION['department_nr']) ) {
- $sql.=" AND ( ";
- while (list($key, $val) = each($_SESSION['department_nr'])) {
- $tmp .= "dept_nr = " . $val . " OR ";
-
- }
- $sql .= substr($tmp,0,-4) ;
- $sql .= " ) " ;
- }
- $sql .= " ORDER BY nr";
- //echo $sql.'<p>';
- if($wards=$db->Execute($sql)){
- $rows=$wards->RecordCount();
- }else{echo "$sql<br>$LDDbNoRead";}
-
-
- # Get the rooms\xB4 info
- $sql="SELECT SUM(r.nr_of_beds) AS maxbed
- FROM $dbtable AS w LEFT JOIN care_room AS r ON
r.ward_nr=w.nr
- WHERE w.is_temp_closed IN ('',0)
- AND w.status NOT IN
('hide','delete','void','inactive')
- AND w.date_create<='$s_date'
- GROUP BY w.nr
- ORDER BY w.nr";
- //echo $sql.'<p>';
- if($rooms=$db->Execute($sql)){
- $roomcount=$rooms->RecordCount();
- }else{echo "$sql<br>$LDDbNoRead";}
-
- # Get the today\xB4s occupancy
- $sql="SELECT COUNT(l.location_nr) AS maxoccbed, w.nr AS ward_nr
- FROM $dbtable AS w
- LEFT JOIN care_encounter_location AS l ON l.group_nr=w.nr AND l.type_nr=5
";
- if($is_today)
- $sql.=" AND '$s_date'>=l.date_from AND l.date_to = '$dbf_nodate'";
- else
- $sql.=" AND '$s_date'>= l.date_from AND '$s_date' <='".date('Y-m-d')."' AND
('$s_date'<=l.date_to OR l.date_to = '$dbf_nodate')";
-
- $sql.=" WHERE w.is_temp_closed IN('',0) AND w.status NOT IN
('hide','delete','void','inactive') AND w.date_create<='$s_date' ";
- $sql.=" GROUP BY w.nr ORDER BY w.nr";
- if($occbed=$db->Execute($sql)){
- //echo $sql;
- $bedcount=$occbed->RecordCount();
- }else{echo "$sql<br>$LDDbNoRead";}
-
- /**
- * LOAD Smarty
- */
-
- # Note: it is advisable to load this after the inc_front_chain_lang.php so
- # that the smarty script can use the user configured template theme
- require_once($root_path.'gui/smarty_template/smarty_care.class.php');
- $smarty = new smarty_care('nursing');
-
- $sTemp =
$sid.'&lang='.$lang.'&pday='.$pday.'&pmonth='.$pmonth.'&pyear='.$pyear;
- $smarty->assign('SID_Parameter',$sTemp);
- $smarty->assign('aufnahme_user',$aufnahme_user);
-
- $smarty->assign('sToolbarTitle',$LDNursing );
- $smarty->assign('Subtitle',$LDQuickView ); // Nursing-Subtitle
(header_toblock.tpl)
-
- # Added for the common header top block
-
$smarty->assign('pbHelp','javascript:gethelp(\'nursing_how2search.php\',\'\','.$rows.',\'quick\',\'\')');
-
- /*generate the calendar */
- include($root_path.'classes/calendar_jl/class.calendar.php');
- /** CREATE CALENDAR OBJECT **/
- $Calendar = new Calendar;
- $Calendar->deactivateFutureDay();
-
-
- /** WRITE CALENDAR **/
- ob_start();
- $Calendar -> mkCalendar ($currYear, $currMonth, $currDay);
- $sTemp = ob_get_contents();
- ob_end_clean();
- $smarty->assign('tblCalendar',$sTemp);
-
- $smarty->assign('gifVarrow',createComIcon($root_path,'varrow.gif','0') );
-
- // ECHO "DATE".date(Ymd);
- $smarty->assign('LDOld',$LDOld);
- $smarty->assign('LDTodays',$LDTodays);
- $smarty->assign('LDOccupancy',$LDOccupancy);
-
$smarty->assign('formatDate2Local',@formatDate2Local($pyear.'-'.$pmonth.'-'.$pday,$date_format));
-
- /**
- * wards count
- */
- if($rows) {
-
- /* Load the common icons */
- $img_mangr=createComIcon($root_path,'man-gr.gif','0');
- $img_mans_gr=createComIcon($root_path,'mans-gr.gif','0','absmiddle');
- $img_mans_red=createComIcon($root_path,'mans-red.gif','0','absmiddle');
- $img_statbel=createComIcon($root_path,'statbel2.gif','0','absmiddle');
-
-
- $randombett=0;
- $randommaxbett=0;
- $frei=0;
-
- // srand(time());
-
- $sWardrows = "";
-
- while ($result=$wards->FetchRow())
- {
-
- $maxbed=$result['room_nr_end']-$result['room_nr_start'];
-
- $roomrow=$rooms->FetchRow();
- $bedrow=$occbed->FetchRow();
- $freebeds=$roomrow['maxbed']-$bedrow['maxoccbed'];
- // Patch 2004-05-15
- if($roomrow['maxbed']){
- $frei=floor(($freebeds/$roomrow['maxbed'])*10);
- }else{
- $frei=0;
- }
- if ($toggler==0) {
- //$bgc='ffffcc';
- $toggler=1;
- $sStatListClass='wardlistrow1';
- } else {
- //$bgc='dfdfdf';
- $toggler=0;
- $sStatListClass='wardlistrow2';
- }
-
- /**
- * collect the hole ward block into $sWardrows
- */
-
- ob_start();
- echo '
- <tr class="'.$sStatListClass.'">';
- echo '
- <td align=center><a
href="javascript:statbel(\'1\',\''.$result['nr'].'\',\''.$result['ward_id'].'\')"
title="'.$LDClk2Show.'">';
- echo strtoupper($result['name']).'
- </a>';
- echo '</td>
- <td align=center>
- '.$freebeds.' </td>
- <td align=center><font color="'.PIE_CHART_USED_COLOR.'">
- ';
- if($bedrow['maxoccbed']) echo $bedrow['maxoccbed'];
- echo ' </td>
- ';
- echo '
- <td align="center">';
- if($is_today){
- echo '<a
href="javascript:statbel(\'1\',\''.$result['nr'].'\',\''.$result['ward_id'].'\')"
title="'.str_replace("~station~",$result['name'],$LDEditStation).'" >';
- }
- if(defined('USE_PIE_CHART')&&USE_PIE_CHART){
- echo '<img
src="occupancy_pie_chart.php?qouta='.($roomrow['maxbed']-$bedrow['maxoccbed']).'&used='.$bedrow['maxoccbed'].'&bgc='.$bgc.'&uc='.PIE_CHART_USED_COLOR.'"
border="0">';
- }else{
- for ($n=0;$n<(10-$frei);$n++) echo '<img '.$img_mans_red.'>';
- for ($n=0;$n<$frei;$n++) echo '<img '.$img_mans_gr.'>';
- }
- if($is_today){
- echo '</a>';
- }
- echo '
- </td><td align=center>'.$roomrow['maxbed'].'
- </td>';
- echo "\r\n";
- echo '
- </td><td align=center>';
-
- if($is_today){
- echo '
- <a
href="javascript:statbel(\'1\',\''.$result['nr'].'\',\''.$result['ward_id'].'\')"
title="'.str_replace("~station~",$result['name'],$LDEditStation).'" >
- <img '.$img_statbel.'
alt="'.str_replace("~station~",$result['name'],$LDEditStation).'"
border="0"></a>';
- }
- if($is_today){
- echo '</a>';
- }
- echo '
- </td></tr>
- <tr><td class="thinrow_vspacer" colspan="7"><img
src="../../gui/img/common/default/pixel.gif" border=0 width=1
height=1></td></tr>
- ';
-
-
- $sWardrows = $sWardrows . ob_get_contents();
- ob_end_clean();
-
-
- } // end While
- } // if ($rows)
-
- /**
- * ========= start with GUI - Block =======================
- */
-
- $smarty->assign('LDNrUnocc',$LDNrUnocc);
- $smarty->assign('gifImg_mangr',$img_mangr);
- $smarty->assign('LDStation',$LDStation);
- $smarty->assign('LDFreeBed',$LDFreeBed);
- $smarty->assign('PIE_CHART_USED_COLOR',PIE_CHART_USED_COLOR);
- $smarty->assign('LDOccupied',$LDOccupied);
- $smarty->assign('LDOccupancy',$LDOccupancy);
- $smarty->assign('LDBedNr',$LDBedNr);
- $smarty->assign('LDOptions',$LDOptions);
-
- $smarty->assign('WardRows',$sWardrows);
-
-// $smarty->assign('maxbed',$roomrow['maxbed']);
-//
$smarty->assign('LINKstatbel','javascript:statbel(\'1\',\''.$result['nr'].'\',\''.$result['ward_id'].'\')'
);
-//
$smarty->assign('altImg_statbel',str_replace("~station~",$result['name'],$LDEditStation));
-// $smarty->assign('gifImg_statbel',$img_statbel);
-
- /**
- * IF ($is_today)
- */
- $smarty->assign('is_today',$is_today);
-
$smarty->assign('gifBul_arrowgrnlrg',createComIcon($root_path,'bul_arrowgrnlrg.gif','0','absmiddle')
);
-
$smarty->assign('gifMascot1_r',createMascot($root_path,'mascot1_r.gif','0','absmiddle')
);
- $smarty->assign('LDNoOcc',$LDNoOcc);
- $smarty->assign('LDClk2Archive',$LDClk2Archive);
-
- /**
- * IF ($from == "arch")
- */
- $smarty->assign('from',$from);
-
$smarty->assign('LINKArchiv','nursing-station-archiv.php'.URL_APPEND.'&pyear='.$pyear.'&pmonth='.$pmonth);
- $smarty->assign('pbBack2',createLDImgSrc($root_path,'back2.gif','0') );
- /* ELSE */
- $smarty->assign('pbClose2',createLDImgSrc($root_path,'close2.gif','0') );
- $smarty->assign('breakfile',$breakfile);
-
- # Assign nr of wards available
-
- $smarty->assign('iWardCount',$rows);
-
- # Assign quick view template to the mainframe block
-
- $smarty->assign('sMainBlockIncludeFile','nursing/nursing-schnellansicht.tpl');
-
- /**
- * show Template
- */
-
- $smarty->display('common/mainframe.tpl');
-
-?>
-
Modified: care2x/branches/gettext/modules/nursing/nursing-station-archiv.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-archiv.php
2010-06-30 09:34:14 UTC (rev 6446)
+++ care2x/branches/gettext/modules/nursing/nursing-station-archiv.php
2010-06-30 09:35:19 UTC (rev 6447)
@@ -178,7 +178,7 @@
if($pyear.$mn.$dn>date(Ymd)) echo 'color="#dfdfdf"';
else echo 'color="#000088"';
echo '><b> ';
if($pyear.$mn.$dn<=date(Ymd)) echo '
- <a
href="nursing-schnellsicht.php'.URL_APPEND.'&from=arch&dept='.$dept.'&edit=0&pday='.$dn.'&pmonth='.$mn.'&pyear='.$pyear.'">';
+ <a
href="nursing-quickview.php'.URL_APPEND.'&from=arch&dept='.$dept.'&edit=0&pday='.$dn.'&pmonth='.$mn.'&pyear='.$pyear.'">';
echo $daynumber[$j];
if($pyear.$mn.$dn<=date(Ymd)) echo '</a>';
echo '</b></td>'; $j++;
@@ -190,7 +190,7 @@
<FONT face="times new roman" SIZE=5 ';
if($pyear.$mn.$dn>date(Ymd)) echo 'color="#dfdfdf"'; else echo
'color="#ff0000"';
echo '><b> ';
- if($pyear.$mn.$dn<=date(Ymd)) echo '<a
href="nursing-schnellsicht.php'.URL_APPEND.'&from=arch&dept='.$dept.'&edit=0&pday='.$dn.'&pmonth='.$mn.'&pyear='.$pyear.'">';
+ if($pyear.$mn.$dn<=date(Ymd)) echo '<a
href="nursing-quickview.php'.URL_APPEND.'&from=arch&dept='.$dept.'&edit=0&pday='.$dn.'&pmonth='.$mn.'&pyear='.$pyear.'">';
echo $daynumber[$j];
if($pyear.$mn.$dn<=date(Ymd)) echo '</a>';
echo '</b></td>'; $j++;
Modified: care2x/branches/gettext/modules/nursing/nursing-station-pass.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station-pass.php
2010-06-30 09:34:14 UTC (rev 6446)
+++ care2x/branches/gettext/modules/nursing/nursing-station-pass.php
2010-06-30 09:35:19 UTC (rev 6447)
@@ -26,7 +26,7 @@
$fileforward="nursing-station.php".URL_REDIRECT_APPEND."&fwd_nr=$fwd_nr&edit=$edit&retpath=$retpath&station=$station&ward_nr=$ward_nr&dept_nr=$dept_nr&pday=$pday&pmonth=$pmonth&pyear=$pyear";
//$fileforward="nursing-station.php?sid=$sid&edit=$edit&retpath=$retpath&station=$station";
$thisfile="nursing-station-pass.php";
-if($retpath=="quick") $breakfile="nursing-schnellsicht.php".URL_APPEND;
+if($retpath=="quick") $breakfile="nursing-quickview.php".URL_APPEND;
else $breakfile="nursing.php".URL_APPEND;
$lognote="$LDNursingStation $station ok";
Modified: care2x/branches/gettext/modules/nursing/nursing-station.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-station.php 2010-06-30
09:34:14 UTC (rev 6446)
+++ care2x/branches/gettext/modules/nursing/nursing-station.php 2010-06-30
09:35:19 UTC (rev 6447)
@@ -44,7 +44,7 @@
if(isset($retpath)){
switch($retpath)
{
- case 'quick': $breakfile='nursing-schnellsicht.php'.URL_APPEND;
+ case 'quick': $breakfile='nursing-quickview.php'.URL_APPEND;
break;
case 'ward_mng':
$breakfile='nursing-station-info.php'.URL_APPEND.'&ward_nr='.$ward_nr.'&mode=show';
break;
Modified: care2x/branches/gettext/modules/nursing/nursing.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing.php 2010-06-30 09:34:14 UTC
(rev 6446)
+++ care2x/branches/gettext/modules/nursing/nursing.php 2010-06-30 09:35:19 UTC
(rev 6447)
@@ -72,7 +72,7 @@
# Prepare the submenu links indexed with their template tags
$aSubMenuItem = array('LDNursingStations' => $LDNursingStations." <img
".createComIcon($root_path,'dwn-arrow-grn.gif','0','absmiddle').">",
-
'LDQuickView' => "<a
href=\"".$root_path."modules/nursing/nursing-schnellsicht.php".URL_APPEND."\">$LDQuickView</a>",
+
'LDQuickView' => "<a
href=\"".$root_path."modules/nursing/nursing-quickview.php".URL_APPEND."\">$LDQuickView</a>",
'LDSearchPatient' => "<a
href=\"".$root_path."modules/nursing/nursing-patient-search-start.php".URL_APPEND."\">$LDSearchPatient</a>",
'LDArchive' => "<a
href=\"".$root_path."modules/nursing/nursing-station-archiv.php".URL_APPEND."\">$LDArchive</a>",
'LDNursesList' => "<a
href=\"".$root_path."modules/nursing_or/nursing-or-main-pass.php".URL_APPEND."&target=setpersonal&retpath=menu\">$LDNursesList</a>",
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
