Revision: 6428
          http://care2002.svn.sourceforge.net/care2002/?rev=6428&view=rev
Author:   mizuko
Date:     2010-06-30 08:43:47 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
see #54

Modified Paths:
--------------
    care2x/branches/gettext/modules/laboratory/labor-data-makegraph.php
    care2x/branches/gettext/modules/laboratory/labor-nodatafound.php
    care2x/branches/gettext/modules/laboratory/labor_data_check_arch.php
    care2x/branches/gettext/modules/laboratory/labor_datainput.php
    care2x/branches/gettext/modules/laboratory/labor_datainput_pass.php
    care2x/branches/gettext/modules/laboratory/labor_datalist_noedit.php
    care2x/branches/gettext/modules/laboratory/labor_datasearch_pass.php

Added Paths:
-----------
    care2x/branches/gettext/modules/laboratory/labor_data_patient_search.php

Removed Paths:
-------------
    care2x/branches/gettext/modules/laboratory/labor_data_patient_such.php

Modified: care2x/branches/gettext/modules/laboratory/labor-data-makegraph.php
===================================================================
--- care2x/branches/gettext/modules/laboratory/labor-data-makegraph.php 
2010-06-30 08:37:16 UTC (rev 6427)
+++ care2x/branches/gettext/modules/laboratory/labor-data-makegraph.php 
2010-06-30 08:43:47 UTC (rev 6428)
@@ -29,7 +29,7 @@
 
 if(!$_COOKIE[$local_user.$sid]) 
{header("Location:".$root_path."language/".$lang."/lang_".$lang."_invalid-access-warning.php");
 exit;}; 
 
-if(!$encounter_nr) 
header("location:".$root_path."modules/laboratory/labor_data_patient_such.php?sid=$sid&lang=$lang");
+if(!$encounter_nr) 
header("location:".$root_path."modules/laboratory/labor_data_patient_search.php?sid=$sid&lang=$lang");
 require_once($root_path.'include/helpers/inc_config_color.php');
 
 $thisfile=basename(__FILE__);
@@ -100,7 +100,7 @@
        return $txt;    
 }
 
-if($nostat) 
$ret=$root_path."modules/laboratory/labor_data_patient_such.php?sid=$sid&lang=$lang&versand=1&keyword=$pn";
+if($nostat) 
$ret=$root_path."modules/laboratory/labor_data_patient_search.php?sid=$sid&lang=$lang&versand=1&keyword=$pn";
        else 
$ret=$root_path."modules/nursing/nursing-station-patientdaten.php?sid=$sid&lang=$lang&station=$station&pn=$pn";
        
 # Load the date formatter

Modified: care2x/branches/gettext/modules/laboratory/labor-nodatafound.php
===================================================================
--- care2x/branches/gettext/modules/laboratory/labor-nodatafound.php    
2010-06-30 08:37:16 UTC (rev 6427)
+++ care2x/branches/gettext/modules/laboratory/labor-nodatafound.php    
2010-06-30 08:43:47 UTC (rev 6428)
@@ -16,7 +16,7 @@
 if(isset($from)&&$from=='input'){
        
$backfile="labor_datainput.php".URL_APPEND."&encounter_nr=$encounter_nr&job_id=$job_id&parameterselect=$parameterselect&allow_update=$allow_update&user_origin=$user_origin";
 }else{
-       $backfile="labor_data_patient_such.php".URL_APPEND."&search=1";
+       $backfile="labor_data_patient_search.php".URL_APPEND."&search=1";
 }
 ?>
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN" "html.dtd">

Modified: care2x/branches/gettext/modules/laboratory/labor_data_check_arch.php
===================================================================
--- care2x/branches/gettext/modules/laboratory/labor_data_check_arch.php        
2010-06-30 08:37:16 UTC (rev 6427)
+++ care2x/branches/gettext/modules/laboratory/labor_data_check_arch.php        
2010-06-30 08:43:47 UTC (rev 6428)
@@ -16,7 +16,7 @@
 require_once($root_path.'modules/laboratory/model/class_lab.php');
 
 $thisfile='labor_data_check_arch.php';
-$breakfile='labor_data_patient_such.php'.URL_APPEND.'&mode=edit';
+$breakfile='labor_data_patient_search.php'.URL_APPEND.'&mode=edit';
 
 $toggle=0;
 
@@ -57,7 +57,7 @@
 <img <?php echo createComIcon($root_path,'micros.gif','0','absmiddle') 
?>><FONT  COLOR="<?php echo $cfg[top_txtcolor] ?>"  SIZE=5  FACE="verdana"> 
<b><?php echo "$LDLabReport - $LDNewData" ?></b></font>
 <table width=100% border=0 cellpadding="0" cellspacing="0">
 <tr>
-<td colspan=3><img <?php echo createLDImgSrc($root_path,'newdata-b.gif','0') 
?>><a href="labor_data_patient_such.php?sid=<?php echo 
"$sid&lang=$lang&mode=$mode" ?>"><img <?php echo 
createLDImgSrc($root_path,'such-gray.gif','0') ?>></a></td>
+<td colspan=3><img <?php echo createLDImgSrc($root_path,'newdata-b.gif','0') 
?>><a href="labor_data_patient_search.php?sid=<?php echo 
"$sid&lang=$lang&mode=$mode" ?>"><img <?php echo 
createLDImgSrc($root_path,'such-gray.gif','0') ?>></a></td>
 </tr>
 <tr >
 <td bgcolor=#333399 colspan=3>

Copied: 
care2x/branches/gettext/modules/laboratory/labor_data_patient_search.php (from 
rev 6405, 
care2x/branches/gettext/modules/laboratory/labor_data_patient_such.php)
===================================================================
--- care2x/branches/gettext/modules/laboratory/labor_data_patient_search.php    
                        (rev 0)
+++ care2x/branches/gettext/modules/laboratory/labor_data_patient_search.php    
2010-06-30 08:43:47 UTC (rev 6428)
@@ -0,0 +1,337 @@
+<?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.2 - 2006-07-10
+* GNU General Public License
+* Copyright 2002,2003,2004,2005,2006 Elpidio Latorilla
+* elpi...@care2x.org, 
+*
+* See the file "copy_notice.txt" for the licence notice
+*/
+# Default value for the maximum nr of rows per block displayed, define this to 
the value you wish
+# In normal cases this value is derived from the db table "care_config_global" 
using the "pagin_insurance_list_max_block_rows" element.
+define('MAX_BLOCK_ROWS',30); 
+
+$lang_tables[]='search.php';
+
+define('LANG_FILE','lab.php');
+$local_user='ck_lab_user';
+require_once($root_path.'include/helpers/inc_front_chain_lang.php');
+
+$thisfile=basename(__FILE__);
+$breakfile='labor.php'.URL_APPEND;
+
+# Workaround
+if(!isset($mode)){
+       $mode='';
+}elseif($mode=='edit'){
+       $editmode=TRUE;
+}
+       
+//$db->debug=1;
+
+$keyword=trim($keyword);
+$toggle=0;
+
+# Initialize page's control variables
+if($mode=='paginate'){
+       $keyword=$_SESSION['sess_searchkey'];
+}else{
+       # Reset paginator variables
+       $pgx=0;
+       $totalcount=0;
+       $odir='ASC';
+       $oitem='name_last';
+
+       # Workaround: Resolve the search key variables
+       if(empty($keyword)&&!empty($searchkey)) $keyword=$searchkey;
+               
+       if(is_numeric($keyword)){
+               $keyword=(int) $keyword;
+       }else{
+               # Convert other wildcards
+               $keyword=strtr($keyword,'*&','%_');
+       }
+}
+
+if($search&&!empty($keyword)){
+
+       # Load the date formatter 
+       
include_once($root_path.'include/helpers/inc_date_format_functions.php');
+    
+       include_once($root_path.'modules/laboratory/model/class_lab.php');
+       
+       $lab_obj=new Lab();
+       
+       #Load and create paginator object
+       include_once($root_path.'include/core/class_paginator.php');
+       $pagen=& new 
Paginator($pgx,$thisfile,$_SESSION['sess_searchkey'],$root_path);
+
+       $GLOBAL_CONFIG=array();
+       include_once($root_path.'include/core/class_globalconfig.php');
+       $glob_obj=new GlobalConfig($GLOBAL_CONFIG);     
+       # Get the max nr of rows from global config
+       $glob_obj->getConfig('pagin_patient_search_max_block_rows');
+       if(empty($GLOBAL_CONFIG['pagin_patient_search_max_block_rows'])) 
$pagen->setMaxCount(MAX_BLOCK_ROWS); # Last resort, use the default defined at 
the start of this page
+               else 
$pagen->setMaxCount($GLOBAL_CONFIG['pagin_patient_search_max_block_rows']);
+
+       if($editmode){
+               # Search
+               
$encounter=&$lab_obj->searchLimitEncounterBasicInfo($keyword,$pagen->MaxCount(),$pgx,$oitem,$odir);
  
+       }else{
+               
$encounter=&$lab_obj->searchLimitEncounterLabResults($keyword,$pagen->MaxCount(),$pgx,$oitem,$odir);
+               # Get the number of results found
+       }  
+       //echo $lab_obj->getLastQuery()."<p>";
+       # Get the resulting record count
+       if($linecount=$lab_obj->LastRecordCount()){
+       
+               if($mode!='paginate') $_SESSION['sess_searchkey']=$keyword;
+
+               $pagen->setTotalBlockCount($linecount);
+               # Count total available data
+               if(isset($totalcount)&&$totalcount){
+                       $pagen->setTotalDataCount($totalcount);
+               }else{
+                       if($editmode){
+                               @$lab_obj->searchEncounterBasicInfo($keyword);
+                       }else{
+                               @$lab_obj->searchEncounterLabResults($keyword);
+                       }
+                       $totalcount=$lab_obj->LastRecordCount();
+                       $pagen->setTotalDataCount($totalcount);
+               }
+               $pagen->setSortItem($oitem);
+               $pagen->setSortDirection($odir);
+       }
+}
+?>
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN" "html.dtd">
+<?php html_rtl($lang); ?>
+<HEAD>
+<?php echo setCharSet(); ?>
+
+<?php
+require($root_path.'include/helpers/inc_js_gethelp.php');
+require($root_path.'include/helpers/inc_css_a_hilitebu.php');
+?>
+
+<script language="JavaScript">
+<!-- Script Begin
+function checkForm(v) {
+       if((v.value=="")||(v.value==" ")){
+               v.value="";
+               v.focus();
+               return false;
+       }else{
+               return true;
+       }
+}
+//  Script End -->
+</script>
+</HEAD>
+
+<BODY onLoad="document.sform.keyword.select()">
+
+<img
+       <?php echo createComIcon($root_path,'micros.gif','0','absmiddle') ?>>
+<FONT COLOR="<?php echo $cfg[top_txtcolor] ?>" SIZE=5> <b><?php echo 
"$LDMedLab - "; if($editmode) echo "$LDNewData"; else echo "$LDSeeData"; 
?></b></font>
+<table width=100% border=0 cellpadding="0" cellspacing="0">
+       <tr>
+               <td colspan=3><img
+                       <?php echo createLDImgSrc($root_path,'such-b.gif') 
?>></td>
+       </tr>
+       <tr>
+               <td bgcolor=#333399 colspan=3>&nbsp;</td>
+       </tr>
+       <tr bgcolor="#DDE1EC">
+               <td bgcolor=#333399>&nbsp;</td>
+               <td valign=top>
+               <p><br>
+               
+               
+               <ul>
+
+                       <!-- This is the search entry mask -->
+
+                       <FORM action="<?php echo $thisfile; ?>" method="post" 
name="sform"
+                               onSubmit="return 
checkForm(sform.keyword)"><B><?php echo $LDSearchWordPrompt ?></B></font>
+                       <p><font size=3> <INPUT type="text" name="keyword" 
size="20"
+                               maxlength="40" value="<?php echo $keyword 
?>"></font> <input
+                               type=hidden name="search" value=1> <input 
type=hidden name="sid"
+                               value=<?php echo $sid ?>> <input type=hidden 
name="lang"
+                               value=<?php echo $lang ?>> <input type=hidden 
name="editmode"
+                               value=<?php echo $editmode ?>> <INPUT 
type="image"
+                               <?php echo 
createLDImgSrc($root_path,'searchlamp.gif','0','absmiddle') 
?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                       <a
+                               
href="javascript:gethelp('lab.php','search','<?php echo $mode ?>','<?php echo 
$linecount ?>','<?php echo $datafound ?>')"><img
+                               <?php echo 
createLDImgSrc($root_path,'hilfe-r.gif','0','absmiddle') ?>></a>
+                       
+                       </FORM>
+                       <p>
+<?php 
+
+$prev_nr=0;
+
+# Print the search result message 
+if($search||$mode=='paginate'){
+       if ($linecount) echo str_replace('~nr~',$totalcount,$LDSearchFound).' 
'.$LDShowing.' '.$pagen->BlockStartNr().' '.$LDTo.' '.$pagen->BlockEndNr().'.';
+       else echo str_replace('~nr~','0',$LDSearchFound);
+}
+
+if($linecount){
+
+       $dcount=0;
+
+       $append="&search=1&editmode=$editmode";
+
+       $img_male=createComIcon($root_path,'spm.gif','0','',TRUE);
+       $img_female=createComIcon($root_path,'spf.gif','0','',TRUE);
+       $bgimg='tableHeaderbg3.gif';
+       $tbg= 
'background="'.$root_path.'gui/img/common/'.$theme_com_icon.'/'.$bgimg.'"';
+
+       # Create the column descriptors 
+?>     
+       
+                       
+                       
+                       <table border=0 cellpadding=3 cellspacing=1>
+                               <tr class="wardlisttitlerow">
+
+                                       <td><b>
+         <?php echo 
$pagen->makeSortLink($LDCaseNr,'encounter_nr',$oitem,$odir,$append);  
?></b></td>
+                                       <td><b>
+         <?php echo $pagen->makeSortLink($LDSex,'sex',$oitem,$odir,$append);  
?></b></td>
+                                       <td><b>
+         <?php echo 
$pagen->makeSortLink($LDLastName,'name_last',$oitem,$odir,$append);  ?></b></td>
+                                       <td><b>
+         <?php echo 
$pagen->makeSortLink($LDName,'name_first',$oitem,$odir,$append);  ?></b></td>
+                                       <td><b>
+         <?php echo 
$pagen->makeSortLink($LDBday,'date_birth',$oitem,$odir,$append);  ?></b></td>
+                                       <td
+                                               background="<?php echo 
createBgSkin($root_path,'tableHeaderbg.gif'); ?>"
+                                               align=center><font face=arial 
size=2 color="#ffffff"><b><?php echo $LDSelect; ?></td>
+                               </tr>
+
+<?php
+/*     for($i=0;$i<sizeof($LDfieldname);$i++) {
+               echo"<td><font face=arial size=2 
color=#ffffff><b>".$LDfieldname[$i]."</b></td>";
+       }
+*/
+
+           
+       # List all the stored lab result documents of the patient 
+       while($zeile=$encounter->FetchRow()){
+
+               if($zeile['encounter_nr']!=$prev_nr){
+
+                       $prev_nr=$zeile['encounter_nr'];
+                       $dcount++;
+
+                       echo '
+                       <tr class=';
+                       if($toggle) { echo 'wardlistrow2>';} else {echo 
'wardlistrow1>';}
+                       $toggle=!$toggle;
+                       echo '<td>';
+                       echo '&nbsp;'.$zeile['encounter_nr'];
+                       if($zeile['encounter_class_nr']==2) echo ' <img 
'.createComIcon($root_path,'redflag.gif','0','',TRUE).'> <font size=1 
color="red">'.$LDAmbulant.'</font>';
+               echo '</td>';
+                       
+                                               echo '<td>';
+                                               switch($zeile['sex']){
+                                                       case 'f': echo '<img 
'.$img_female.'>'; break;
+                                                       case 'm': echo '<img 
'.$img_male.'>'; break;
+                                                       default: echo '&nbsp;'; 
break;
+                                               }
+                       
+                       echo '</td><td>';
+                       echo '&nbsp;'.ucfirst($zeile['name_last']);
+                       echo '</td>
+                                       <td>';
+                       echo '&nbsp;'.ucfirst($zeile['name_first']);
+                       echo '</td>
+                                       <td>';
+                       echo 
'&nbsp;'.formatDate2Local($zeile['date_birth'],$date_format);
+                       echo '</td>';   
+                                               
+                                               
+                       #  if mode is edit, create the button linked to 
labor_data_check_arch.php 
+                       #  if mode is not edit, create button linked to 
labor_datalist_noedit.php (read only list)
+
+                       echo'
+                               <td>&nbsp';
+                                               
+                       if($editmode){ 
+                               echo'<a 
href="labor_data_check_arch.php'.URL_APPEND.'&mode=edit&encounter_nr='.$zeile['encounter_nr'].'&update=1"
  title="'.$LDEnterData.'">
+                                       <button 
onClick="javascript:window.location.href=\'labor_data_check_arch.php'.URL_REDIRECT_APPEND.'&mode=edit&encounter_nr='.$zeile['encounter_nr'].'&update=1\'"><img
 '.createComIcon($root_path,'update2.gif','0','absmiddle',FALSE).' 
alt="'.$LDEnterData.'"><font size=1> '.$LDNewData;
+                       }else{
+                               echo'
+                                       <a 
href="labor_datalist_noedit.php'.URL_APPEND.'&encounter_nr='.$zeile['encounter_nr'].'&noexpand=1&nostat=1&user_origin=lab"
  title="'.$LDClk2See.'">
+                                       <button 
onClick="javascript:window.location.href=\'labor_datalist_noedit.php'.URL_REDIRECT_APPEND.'&encounter_nr='.$zeile['encounter_nr'].'&noexpand=1&nostat=1&user_origin=lab\'"><img
 '.createComIcon($root_path,'update2.gif','0','absmiddle',FALSE).' 
alt="'.$LDClk2See.'"><font size=1> '.$LDLabReport;
+                       }
+                                               
+                       echo '</font></button></a>&nbsp;
+                               </td></tr>';
+
+               }
+       }
+       if($totalcount>$pagen->MaxCount()){
+               echo '
+                       <tr><td 
colspan=5>'.$pagen->makePrevLink($LDPrevious,$append).'</td>
+                                               <td 
align=right>'.$pagen->makeNextLink($LDNext,$append).'</td>
+                       </tr>';
+       }
+       echo '</table>';
+                                       
+       # If result is more than 15 items, create an additional search entry 
mask below the list
+       if($dcount>$pagen->MaxCount()){
+               echo '
+                               <p><font color=red><B>'.$LDNewSearch.':</font>
+                               <FORM action="'.$thisfile.'" method="post" 
name="form2" onSubmit="return checkForm(form2.keyword)">
+                               '.$LDSearchWordPrompt.'</B><p>
+                               <INPUT type="text" name="keyword" size="20" 
maxlength="40" value="'.$keyword.'"> 
+                               <input type=hidden name="search" value=1>
+                               <input type=hidden name="sid" value="'.$sid.'">
+                               <input type=hidden name="lang" 
value="'.$lang.'">
+                               <input type=hidden name="editmode" 
value="'.$editmode.'">
+                               <INPUT type="image"  
'.createLDImgSrc($root_path,'searchlamp.gif','0','absmiddle').'></FORM>
+                               <p>';
+       }
+}
+
+?>
+<p><br>
+                               &nbsp;
+                               
+                               
+                               <p><a href="<?php echo $breakfile ?>"><img
+                                       <?php echo 
createLDImgSrc($root_path,'cancel.gif','0') ?>></a>
+                               
+                               
+                               <p>
+                               
+                               
+                               </ul>
+                               &nbsp;
+                               </FONT>
+                               <p>
+                               
+                               
+                               </td>
+                               <td bgcolor=#333399>&nbsp;</td>
+                               </tr>
+                               <tr>
+                                       <td bgcolor="#333399" colspan=3><font 
size=1> &nbsp; </td>
+                               </tr>
+
+                       </table>
+                       <p>
+<?php
+require($root_path.'include/helpers/inc_load_copyrite.php');
+?>
+</FONT>
+
+</BODY>
+</HTML>

Deleted: care2x/branches/gettext/modules/laboratory/labor_data_patient_such.php
===================================================================
--- care2x/branches/gettext/modules/laboratory/labor_data_patient_such.php      
2010-06-30 08:37:16 UTC (rev 6427)
+++ care2x/branches/gettext/modules/laboratory/labor_data_patient_such.php      
2010-06-30 08:43:47 UTC (rev 6428)
@@ -1,337 +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.2 - 2006-07-10
-* GNU General Public License
-* Copyright 2002,2003,2004,2005,2006 Elpidio Latorilla
-* elpi...@care2x.org, 
-*
-* See the file "copy_notice.txt" for the licence notice
-*/
-# Default value for the maximum nr of rows per block displayed, define this to 
the value you wish
-# In normal cases this value is derived from the db table "care_config_global" 
using the "pagin_insurance_list_max_block_rows" element.
-define('MAX_BLOCK_ROWS',30); 
-
-$lang_tables[]='search.php';
-
-define('LANG_FILE','lab.php');
-$local_user='ck_lab_user';
-require_once($root_path.'include/helpers/inc_front_chain_lang.php');
-
-$thisfile=basename(__FILE__);
-$breakfile='labor.php'.URL_APPEND;
-
-# Workaround
-if(!isset($mode)){
-       $mode='';
-}elseif($mode=='edit'){
-       $editmode=TRUE;
-}
-       
-//$db->debug=1;
-
-$keyword=trim($keyword);
-$toggle=0;
-
-# Initialize page's control variables
-if($mode=='paginate'){
-       $keyword=$_SESSION['sess_searchkey'];
-}else{
-       # Reset paginator variables
-       $pgx=0;
-       $totalcount=0;
-       $odir='ASC';
-       $oitem='name_last';
-
-       # Workaround: Resolve the search key variables
-       if(empty($keyword)&&!empty($searchkey)) $keyword=$searchkey;
-               
-       if(is_numeric($keyword)){
-               $keyword=(int) $keyword;
-       }else{
-               # Convert other wildcards
-               $keyword=strtr($keyword,'*&','%_');
-       }
-}
-
-if($search&&!empty($keyword)){
-
-       # Load the date formatter 
-       
include_once($root_path.'include/helpers/inc_date_format_functions.php');
-    
-       include_once($root_path.'modules/laboratory/model/class_lab.php');
-       
-       $lab_obj=new Lab();
-       
-       #Load and create paginator object
-       include_once($root_path.'include/core/class_paginator.php');
-       $pagen=& new 
Paginator($pgx,$thisfile,$_SESSION['sess_searchkey'],$root_path);
-
-       $GLOBAL_CONFIG=array();
-       include_once($root_path.'include/core/class_globalconfig.php');
-       $glob_obj=new GlobalConfig($GLOBAL_CONFIG);     
-       # Get the max nr of rows from global config
-       $glob_obj->getConfig('pagin_patient_search_max_block_rows');
-       if(empty($GLOBAL_CONFIG['pagin_patient_search_max_block_rows'])) 
$pagen->setMaxCount(MAX_BLOCK_ROWS); # Last resort, use the default defined at 
the start of this page
-               else 
$pagen->setMaxCount($GLOBAL_CONFIG['pagin_patient_search_max_block_rows']);
-
-       if($editmode){
-               # Search
-               
$encounter=&$lab_obj->searchLimitEncounterBasicInfo($keyword,$pagen->MaxCount(),$pgx,$oitem,$odir);
  
-       }else{
-               
$encounter=&$lab_obj->searchLimitEncounterLabResults($keyword,$pagen->MaxCount(),$pgx,$oitem,$odir);
-               # Get the number of results found
-       }  
-       //echo $lab_obj->getLastQuery()."<p>";
-       # Get the resulting record count
-       if($linecount=$lab_obj->LastRecordCount()){
-       
-               if($mode!='paginate') $_SESSION['sess_searchkey']=$keyword;
-
-               $pagen->setTotalBlockCount($linecount);
-               # Count total available data
-               if(isset($totalcount)&&$totalcount){
-                       $pagen->setTotalDataCount($totalcount);
-               }else{
-                       if($editmode){
-                               @$lab_obj->searchEncounterBasicInfo($keyword);
-                       }else{
-                               @$lab_obj->searchEncounterLabResults($keyword);
-                       }
-                       $totalcount=$lab_obj->LastRecordCount();
-                       $pagen->setTotalDataCount($totalcount);
-               }
-               $pagen->setSortItem($oitem);
-               $pagen->setSortDirection($odir);
-       }
-}
-?>
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN" "html.dtd">
-<?php html_rtl($lang); ?>
-<HEAD>
-<?php echo setCharSet(); ?>
-
-<?php
-require($root_path.'include/helpers/inc_js_gethelp.php');
-require($root_path.'include/helpers/inc_css_a_hilitebu.php');
-?>
-
-<script language="JavaScript">
-<!-- Script Begin
-function checkForm(v) {
-       if((v.value=="")||(v.value==" ")){
-               v.value="";
-               v.focus();
-               return false;
-       }else{
-               return true;
-       }
-}
-//  Script End -->
-</script>
-</HEAD>
-
-<BODY onLoad="document.sform.keyword.select()">
-
-<img
-       <?php echo createComIcon($root_path,'micros.gif','0','absmiddle') ?>>
-<FONT COLOR="<?php echo $cfg[top_txtcolor] ?>" SIZE=5> <b><?php echo 
"$LDMedLab - "; if($editmode) echo "$LDNewData"; else echo "$LDSeeData"; 
?></b></font>
-<table width=100% border=0 cellpadding="0" cellspacing="0">
-       <tr>
-               <td colspan=3><img
-                       <?php echo createLDImgSrc($root_path,'such-b.gif') 
?>></td>
-       </tr>
-       <tr>
-               <td bgcolor=#333399 colspan=3>&nbsp;</td>
-       </tr>
-       <tr bgcolor="#DDE1EC">
-               <td bgcolor=#333399>&nbsp;</td>
-               <td valign=top>
-               <p><br>
-               
-               
-               <ul>
-
-                       <!-- This is the search entry mask -->
-
-                       <FORM action="<?php echo $thisfile; ?>" method="post" 
name="sform"
-                               onSubmit="return 
checkForm(sform.keyword)"><B><?php echo $LDSearchWordPrompt ?></B></font>
-                       <p><font size=3> <INPUT type="text" name="keyword" 
size="20"
-                               maxlength="40" value="<?php echo $keyword 
?>"></font> <input
-                               type=hidden name="search" value=1> <input 
type=hidden name="sid"
-                               value=<?php echo $sid ?>> <input type=hidden 
name="lang"
-                               value=<?php echo $lang ?>> <input type=hidden 
name="editmode"
-                               value=<?php echo $editmode ?>> <INPUT 
type="image"
-                               <?php echo 
createLDImgSrc($root_path,'searchlamp.gif','0','absmiddle') 
?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                       <a
-                               
href="javascript:gethelp('lab.php','search','<?php echo $mode ?>','<?php echo 
$linecount ?>','<?php echo $datafound ?>')"><img
-                               <?php echo 
createLDImgSrc($root_path,'hilfe-r.gif','0','absmiddle') ?>></a>
-                       
-                       </FORM>
-                       <p>
-<?php 
-
-$prev_nr=0;
-
-# Print the search result message 
-if($search||$mode=='paginate'){
-       if ($linecount) echo str_replace('~nr~',$totalcount,$LDSearchFound).' 
'.$LDShowing.' '.$pagen->BlockStartNr().' '.$LDTo.' '.$pagen->BlockEndNr().'.';
-       else echo str_replace('~nr~','0',$LDSearchFound);
-}
-
-if($linecount){
-
-       $dcount=0;
-
-       $append="&search=1&editmode=$editmode";
-
-       $img_male=createComIcon($root_path,'spm.gif','0','',TRUE);
-       $img_female=createComIcon($root_path,'spf.gif','0','',TRUE);
-       $bgimg='tableHeaderbg3.gif';
-       $tbg= 
'background="'.$root_path.'gui/img/common/'.$theme_com_icon.'/'.$bgimg.'"';
-
-       # Create the column descriptors 
-?>     
-       
-                       
-                       
-                       <table border=0 cellpadding=3 cellspacing=1>
-                               <tr class="wardlisttitlerow">
-
-                                       <td><b>
-         <?php echo 
$pagen->makeSortLink($LDCaseNr,'encounter_nr',$oitem,$odir,$append);  
?></b></td>
-                                       <td><b>
-         <?php echo $pagen->makeSortLink($LDSex,'sex',$oitem,$odir,$append);  
?></b></td>
-                                       <td><b>
-         <?php echo 
$pagen->makeSortLink($LDLastName,'name_last',$oitem,$odir,$append);  ?></b></td>
-                                       <td><b>
-         <?php echo 
$pagen->makeSortLink($LDName,'name_first',$oitem,$odir,$append);  ?></b></td>
-                                       <td><b>
-         <?php echo 
$pagen->makeSortLink($LDBday,'date_birth',$oitem,$odir,$append);  ?></b></td>
-                                       <td
-                                               background="<?php echo 
createBgSkin($root_path,'tableHeaderbg.gif'); ?>"
-                                               align=center><font face=arial 
size=2 color="#ffffff"><b><?php echo $LDSelect; ?></td>
-                               </tr>
-
-<?php
-/*     for($i=0;$i<sizeof($LDfieldname);$i++) {
-               echo"<td><font face=arial size=2 
color=#ffffff><b>".$LDfieldname[$i]."</b></td>";
-       }
-*/
-
-           
-       # List all the stored lab result documents of the patient 
-       while($zeile=$encounter->FetchRow()){
-
-               if($zeile['encounter_nr']!=$prev_nr){
-
-                       $prev_nr=$zeile['encounter_nr'];
-                       $dcount++;
-
-                       echo '
-                       <tr class=';
-                       if($toggle) { echo 'wardlistrow2>';} else {echo 
'wardlistrow1>';}
-                       $toggle=!$toggle;
-                       echo '<td>';
-                       echo '&nbsp;'.$zeile['encounter_nr'];
-                       if($zeile['encounter_class_nr']==2) echo ' <img 
'.createComIcon($root_path,'redflag.gif','0','',TRUE).'> <font size=1 
color="red">'.$LDAmbulant.'</font>';
-               echo '</td>';
-                       
-                                               echo '<td>';
-                                               switch($zeile['sex']){
-                                                       case 'f': echo '<img 
'.$img_female.'>'; break;
-                                                       case 'm': echo '<img 
'.$img_male.'>'; break;
-                                                       default: echo '&nbsp;'; 
break;
-                                               }
-                       
-                       echo '</td><td>';
-                       echo '&nbsp;'.ucfirst($zeile['name_last']);
-                       echo '</td>
-                                       <td>';
-                       echo '&nbsp;'.ucfirst($zeile['name_first']);
-                       echo '</td>
-                                       <td>';
-                       echo 
'&nbsp;'.formatDate2Local($zeile['date_birth'],$date_format);
-                       echo '</td>';   
-                                               
-                                               
-                       #  if mode is edit, create the button linked to 
labor_data_check_arch.php 
-                       #  if mode is not edit, create button linked to 
labor_datalist_noedit.php (read only list)
-
-                       echo'
-                               <td>&nbsp';
-                                               
-                       if($editmode){ 
-                               echo'<a 
href="labor_data_check_arch.php'.URL_APPEND.'&mode=edit&encounter_nr='.$zeile['encounter_nr'].'&update=1"
  title="'.$LDEnterData.'">
-                                       <button 
onClick="javascript:window.location.href=\'labor_data_check_arch.php'.URL_REDIRECT_APPEND.'&mode=edit&encounter_nr='.$zeile['encounter_nr'].'&update=1\'"><img
 '.createComIcon($root_path,'update2.gif','0','absmiddle',FALSE).' 
alt="'.$LDEnterData.'"><font size=1> '.$LDNewData;
-                       }else{
-                               echo'
-                                       <a 
href="labor_datalist_noedit.php'.URL_APPEND.'&encounter_nr='.$zeile['encounter_nr'].'&noexpand=1&nostat=1&user_origin=lab"
  title="'.$LDClk2See.'">
-                                       <button 
onClick="javascript:window.location.href=\'labor_datalist_noedit.php'.URL_REDIRECT_APPEND.'&encounter_nr='.$zeile['encounter_nr'].'&noexpand=1&nostat=1&user_origin=lab\'"><img
 '.createComIcon($root_path,'update2.gif','0','absmiddle',FALSE).' 
alt="'.$LDClk2See.'"><font size=1> '.$LDLabReport;
-                       }
-                                               
-                       echo '</font></button></a>&nbsp;
-                               </td></tr>';
-
-               }
-       }
-       if($totalcount>$pagen->MaxCount()){
-               echo '
-                       <tr><td 
colspan=5>'.$pagen->makePrevLink($LDPrevious,$append).'</td>
-                                               <td 
align=right>'.$pagen->makeNextLink($LDNext,$append).'</td>
-                       </tr>';
-       }
-       echo '</table>';
-                                       
-       # If result is more than 15 items, create an additional search entry 
mask below the list
-       if($dcount>$pagen->MaxCount()){
-               echo '
-                               <p><font color=red><B>'.$LDNewSearch.':</font>
-                               <FORM action="'.$thisfile.'" method="post" 
name="form2" onSubmit="return checkForm(form2.keyword)">
-                               '.$LDSearchWordPrompt.'</B><p>
-                               <INPUT type="text" name="keyword" size="20" 
maxlength="40" value="'.$keyword.'"> 
-                               <input type=hidden name="search" value=1>
-                               <input type=hidden name="sid" value="'.$sid.'">
-                               <input type=hidden name="lang" 
value="'.$lang.'">
-                               <input type=hidden name="editmode" 
value="'.$editmode.'">
-                               <INPUT type="image"  
'.createLDImgSrc($root_path,'searchlamp.gif','0','absmiddle').'></FORM>
-                               <p>';
-       }
-}
-
-?>
-<p><br>
-                               &nbsp;
-                               
-                               
-                               <p><a href="<?php echo $breakfile ?>"><img
-                                       <?php echo 
createLDImgSrc($root_path,'cancel.gif','0') ?>></a>
-                               
-                               
-                               <p>
-                               
-                               
-                               </ul>
-                               &nbsp;
-                               </FONT>
-                               <p>
-                               
-                               
-                               </td>
-                               <td bgcolor=#333399>&nbsp;</td>
-                               </tr>
-                               <tr>
-                                       <td bgcolor="#333399" colspan=3><font 
size=1> &nbsp; </td>
-                               </tr>
-
-                       </table>
-                       <p>
-<?php
-require($root_path.'include/helpers/inc_load_copyrite.php');
-?>
-</FONT>
-
-</BODY>
-</HTML>

Modified: care2x/branches/gettext/modules/laboratory/labor_datainput.php
===================================================================
--- care2x/branches/gettext/modules/laboratory/labor_datainput.php      
2010-06-30 08:37:16 UTC (rev 6427)
+++ care2x/branches/gettext/modules/laboratory/labor_datainput.php      
2010-06-30 08:43:47 UTC (rev 6428)
@@ -192,7 +192,7 @@
                        default: 
$breakfile="labor_data_check_arch.php".URL_APPEND."&versand=1&encounter_nr=$encounter_nr";
                }
        }else{
-               
$breakfile="labor_data_patient_such.php".URL_APPEND."&mode=edit";
+               
$breakfile="labor_data_patient_search.php".URL_APPEND."&mode=edit";
        }
 }
 

Modified: care2x/branches/gettext/modules/laboratory/labor_datainput_pass.php
===================================================================
--- care2x/branches/gettext/modules/laboratory/labor_datainput_pass.php 
2010-06-30 08:37:16 UTC (rev 6427)
+++ care2x/branches/gettext/modules/laboratory/labor_datainput_pass.php 
2010-06-30 08:43:47 UTC (rev 6428)
@@ -20,7 +20,7 @@
 
 $allowedarea=&$allow_area['lab_w'];
 
-$fileforward="labor_data_patient_such.php?sid=$sid&lang=$lang&editmode=1";
+$fileforward="labor_data_patient_search.php?sid=$sid&lang=$lang&editmode=1";
 $thisfile=basename(__FILE__);
 
 $breakfile="labor.php?sid=".$sid."&lang=".$lang;

Modified: care2x/branches/gettext/modules/laboratory/labor_datalist_noedit.php
===================================================================
--- care2x/branches/gettext/modules/laboratory/labor_datalist_noedit.php        
2010-06-30 08:37:16 UTC (rev 6427)
+++ care2x/branches/gettext/modules/laboratory/labor_datalist_noedit.php        
2010-06-30 08:43:47 UTC (rev 6428)
@@ -85,7 +85,7 @@
 if($user_origin=='lab'||$user_origin=='lab_mgmt'){
        $local_user='ck_lab_user';
        if(isset($from)&&$from=='input') 
$breakfile=$root_path.'modules/laboratory/labor_datainput.php'.URL_APPEND.'&encounter_nr='.$encounter_nr.'&job_id='.$job_id.'&parameterselect='.$parameterselect.'&allow_update='.$allow_update.'&user_origin='.$user_origin;
-               else 
$breakfile=$root_path.'modules/laboratory/labor_data_patient_such.php'.URL_APPEND;
+               else 
$breakfile=$root_path.'modules/laboratory/labor_data_patient_search.php'.URL_APPEND;
 }else{
        $local_user='ck_pflege_user';
        
$breakfile=$root_path.'modules/nursing/nursing-station-patientdaten.php'.URL_APPEND.'&pn='.$pn.'&edit='.$edit;
@@ -93,7 +93,7 @@
 }
 if(!$_COOKIE[$local_user.$sid]) 
{header("Location:".$root_path."language/".$lang."/lang_".$lang."_invalid-access-warning.php");
 exit;}; 
 
-if(!$encounter_nr) 
header("location:".$root_path."modules/laboratory/labor_data_patient_such.php?sid=$sid&lang=$lang");
+if(!$encounter_nr) 
header("location:".$root_path."modules/laboratory/labor_data_patient_search.php?sid=$sid&lang=$lang");
 
 $thisfile=basename(__FILE__);
 
@@ -106,7 +106,7 @@
 
 $cache='';
 
-if($nostat) 
$ret=$root_path."modules/laboratory/labor_data_patient_such.php?sid=$sid&lang=$lang&versand=1&keyword=$encounter_nr";
+if($nostat) 
$ret=$root_path."modules/laboratory/labor_data_patient_search.php?sid=$sid&lang=$lang&versand=1&keyword=$encounter_nr";
        else 
$ret=$root_path."modules/nursing/nursing-station-patientdaten.php?sid=$sid&lang=$lang&station=$station&pn=$encounter_nr";
        
 # Load the date formatter */

Modified: care2x/branches/gettext/modules/laboratory/labor_datasearch_pass.php
===================================================================
--- care2x/branches/gettext/modules/laboratory/labor_datasearch_pass.php        
2010-06-30 08:37:16 UTC (rev 6427)
+++ care2x/branches/gettext/modules/laboratory/labor_datasearch_pass.php        
2010-06-30 08:43:47 UTC (rev 6428)
@@ -19,7 +19,7 @@
 
 $allowedarea=&$allow_area['lab_r'];
 
-$fileforward='labor_data_patient_such.php?sid='.$sid.'&lang='.$lang;
+$fileforward='labor_data_patient_search.php?sid='.$sid.'&lang='.$lang;
 $thisfile='labor_datasearch_pass.php';
 
  if ($pdatencookie=='ja') 


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

Reply via email to