Index: /trunk/Care2007/include/inc_vars_resolve.php =================================================================== --- /trunk/Care2007/include/inc_vars_resolve.php (revision 6130) +++ /trunk/Care2007/include/inc_vars_resolve.php (revision 6193) @@ -123,4 +123,5 @@ */ + //$HTTP_SESSION_VARS=&importGlobalVariable('session'); Index: /trunk/Care2007/include/inc_date_format_functions.php =================================================================== --- /trunk/Care2007/include/inc_date_format_functions.php (revision 6130) +++ /trunk/Care2007/include/inc_date_format_functions.php (revision 6193) @@ -61,5 +61,5 @@ * therefore a validation routine must be done at the client side */ -function formatDate2Local($stdDate, $localFormat, $retTime=FALSE, $timeOnly=FALSE) +function formatDate2Local($stdDate, $localFormat, $retTime=FALSE, $timeOnly=FALSE, &$sepChars) { global $lang; Index: /trunk/Care2007/include/inc_rightcolumn_menu.php =================================================================== --- /trunk/Care2007/include/inc_rightcolumn_menu.php (revision 6130) +++ /trunk/Care2007/include/inc_rightcolumn_menu.php (revision 6193) @@ -16,12 +16,15 @@ $url_mgmt="newscolumns.php".URL_APPEND."&dept_nr=28&user_origin=dept"; $url_dept="".$root_path.'modules/news/'."departments.php".URL_APPEND; -$url_cafe="http://www.paginesanitarie.com/skfarmaci/farmacialfaba.htm".URL_APPEND; -$url_adm="http://www.paginesanitarie.com/glossarioa.htm".URL_APPEND; -$url_exh="http://www.paginesanitarie.com/homeinformazione.htm".URL_APPEND; -$url_tips="http://www.paginesanitarie.com/ticket.htm".URL_APPEND; +$url_cafe="".$root_path.'modules/cafeteria/'."cafenews.php".URL_APPEND; +$url_adm="newscolumns.php".URL_APPEND."&dept_nr=33&user_origin=dept"; +$url_exh="newscolumns.php".URL_APPEND."&dept_nr=29&user_origin=dept"; +$url_edu="newscolumns.php".URL_APPEND."&dept_nr=30&user_origin=dept"; +$url_stud="newscolumns.php".URL_APPEND."&dept_nr=31&user_origin=dept"; +$url_phys="newscolumns.php".URL_APPEND."&dept_nr=10&user_origin=dept"; +$url_tips="newscolumns.php".URL_APPEND."&dept_nr=32&user_origin=dept"; $url_calendar=$root_path."modules/calendar/calendar.php".URL_APPEND."&retpath=home"; $url_jshelp="javascript:gethelp()"; - - +$url_news="editor-pass.php".URL_APPEND; +$url_jscredits="javascript:openCreditsWindow()"; $TP_com_img_path=$root_path.'gui/img/common'; Index: /trunk/Care2007/include/inc_products_db_save_mod.php =================================================================== --- /trunk/Care2007/include/inc_products_db_save_mod.php (revision 5995) +++ /trunk/Care2007/include/inc_products_db_save_mod.php (revision 6193) @@ -103,4 +103,5 @@ 'picfile'=>$picfilename, 'packing'=>$pack, + 'dose'=>$dose, 'minorder'=>$minorder, 'maxorder'=>$maxorder, @@ -128,4 +129,5 @@ description='$besc', packing='$pack', + dose='$dose', minorder='$minorder', maxorder='$maxorder', Index: /trunk/Care2007/include/inc_test_request_printout_patho.php =================================================================== --- /trunk/Care2007/include/inc_test_request_printout_patho.php (revision 6067) +++ /trunk/Care2007/include/inc_test_request_printout_patho.php (revision 6193) @@ -93,5 +93,5 @@ if($stored_request['quick_diagnosis']) $smarty->assign('input_quick_diagnosis',''); - else $smarty->assign('input_quick_diagnosis', ''); +else $smarty->assign('input_quick_diagnosis', ''); $smarty->assign('LDSpeedTest',$LDSpeedTest); Index: /trunk/Care2007/include/inc_db_makelink.php =================================================================== --- /trunk/Care2007/include/inc_db_makelink.php (revision 5995) +++ /trunk/Care2007/include/inc_db_makelink.php (revision 6193) @@ -34,4 +34,5 @@ # Set the "no-date" value based on the dbtype, Values defined at include/inc_environment_global.php switch($dbtype){ + case 'mysqli': case 'mysql': $dbf_nodate=NODATE_MYSQL; @@ -93,5 +94,5 @@ # Set dbtype to mysql if not set or empty -if(!isset($dbtype)||empty($dbtype)) $dbtype='mysql'; +if(!isset($dbtype)||empty($dbtype)) $dbtype='mysqli'; # ADODB connection Index: /trunk/Care2007/include/inc_visual_signalling_fx.php =================================================================== --- /trunk/Care2007/include/inc_visual_signalling_fx.php (revision 6130) +++ /trunk/Care2007/include/inc_visual_signalling_fx.php (revision 6193) @@ -30,4 +30,6 @@ define('SIGNAL_COLOR_DIAGNOSTICS_REQUEST','blue_pale'); // color to be set for signalling a diagnostic/consult request +define('SIGNAL_COLOR_BLOOD_REQUEST','red'); //color to be set for blood request / transfusion + define('SIGNAL_COLOR_QUERY_DOCTOR','yellow'); // color to be set for signalling a query to the doctor define('SIGNAL_COLOR_DOCTOR_INFO','black'); // color to be set for signalling a doctor's instruction or answer @@ -37,5 +39,5 @@ define('SIGNAL_COLOR_DIURETIC','yellow_pale'); // color to be set for signalling the prescription of diuretics define('SIGNAL_COLOR_ANTICOAG','violet'); // color to be set for signalling the prescription of anticoagulants -define('SIGNAL_COLOR_IV','pink'); // color to be set for signalling the prescription of anticoagulants +define('SIGNAL_COLOR_IV','pink'); // color to be set for signalling the prescription of IV //gjergji : //pink modified to show the hour to do the prescription @@ -55,4 +57,5 @@ if($ergebnis->RecordCount()){ $sql="UPDATE $event_table SET $color ='$status' WHERE encounter_nr=$pn"; + //echo $sql; $db->Execute($sql); if(!$db->Affected_Rows()){ Index: /trunk/Care2007/include/inc_init_main.php =================================================================== --- /trunk/Care2007/include/inc_init_main.php (revision 6130) +++ /trunk/Care2007/include/inc_init_main.php (revision 6193) @@ -1,5 +1,5 @@ Index: /trunk/Care2007/include/inc_test_findings_form_baclabor.php =================================================================== --- /trunk/Care2007/include/inc_test_findings_form_baclabor.php (revision 6067) +++ /trunk/Care2007/include/inc_test_findings_form_baclabor.php (revision 6193) @@ -6,5 +6,5 @@ if(file_exists($root_path.'language/'.$lang.'/lang_'.$lang.'_konsil_baclabor.php')) include_once($root_path.'language/'.$lang.'/lang_'.$lang.'_konsil_baclabor.php'); else include_once($root_path.'language/'.LANG_DEFAULT.'/lang_'.LANG_DEFAULT.'_konsil_baclabor.php'); -?> + ?> @@ -42,5 +42,4 @@ @@ -157,5 +155,4 @@ echo ''; if($edit) echo ''; @@ -515,5 +512,5 @@
'; - if($edit) echo ''; @@ -64,5 +63,4 @@ echo 'border=0 width=18 height=6 align="absmiddle" id="'.$x.'">'; - if($edit) echo ''; echo '
"> show_calendar($calendar,$date_format,'rec_date',$dateRec); //end gjergji - } - else - { + } else { if($stored_findings['rec_date']) echo formatDate2Local($stored_findings['rec_date'],$date_format); } Index: /trunk/Care2007/include/inc_environment_global.php =================================================================== --- /trunk/Care2007/include/inc_environment_global.php (revision 6175) +++ /trunk/Care2007/include/inc_environment_global.php (revision 6193) @@ -4,5 +4,5 @@ # define to 1 to measure page generation time # -define('USE_PAGE_GEN_TIME',1); +define('USE_PAGE_GEN_TIME',0); # @@ -37,5 +37,5 @@ # Define to TRUE for extended tabs mode # -define('ADMISSION_EXT_TABS',FALSE); +define('ADMISSION_EXT_TABS',TRUE); # @@ -80,5 +80,5 @@ if(session_id()) session_destroy(); # Set sessions handler to "user" - ini_set('session.save_handler','user'); + ini_set('session.save_handler','files'); # Set transparent session id if(!ini_get('session.use_trans_sid')) ini_set('session.use_trans_sid',1); Index: /trunk/Care2007/include/inc_front_chain_lang.php =================================================================== --- /trunk/Care2007/include/inc_front_chain_lang.php (revision 5995) +++ /trunk/Care2007/include/inc_front_chain_lang.php (revision 6193) @@ -25,10 +25,8 @@ # return = 1 if language table exists -function getLang($chk_file) -{ +function getLang($chk_file) { global $lang, $root_path, $sid; - if(!isset($lang)||empty($lang)) - { + if(!isset($lang)||empty($lang)) { $ck_lang_buffer='ck_lang'.$sid; if(!isset($HTTP_COOKIE_VARS[$ck_lang_buffer])||empty($HTTP_COOKIE_VARS[$ck_lang_buffer])) include($root_path.'chklang.php'); Index: /trunk/Care2007/include/inc_test_request_lister_fx.php =================================================================== --- /trunk/Care2007/include/inc_test_request_lister_fx.php (revision 6130) +++ /trunk/Care2007/include/inc_test_request_lister_fx.php (revision 6193) @@ -104,9 +104,9 @@ $result=$enc_obj->encounter; //gjergji ... urgent is available only for chamlabor - //if($subtarget == trim('chemlabor') ) { - // $urgent = $lab_obj->GetTestUrgent($test_request['batch_nr']); - // $tmp = $urgent->FetchRow(); - // if($tmp['urgent'] == 1) $bgcolor="red"; else $bgcolor = "#D3E3F6"; - //} + if($subtarget == trim('chemlabor') ) { + $urgent = $lab_obj->GetTestUrgent($test_request['batch_nr']); + $tmp = $urgent->FetchRow(); + if($tmp['urgent'] == 1) $bgcolor="red"; else $bgcolor = "#D3E3F6"; + } $info = $result['name_last']. " " . $result['name_first'] . "
" . $result['encounter_date'] . "
" . $result['pid']; } Index: /trunk/Care2007/include/inc_test_findings_form_patho.php =================================================================== --- /trunk/Care2007/include/inc_test_findings_form_patho.php (revision 6067) +++ /trunk/Care2007/include/inc_test_findings_form_patho.php (revision 6193) @@ -1,25 +1,26 @@ '.stripslashes($stored_findings[$param]).''; - }else{ + ' ; + } else { echo ' -
'.nl2br(stripslashes($stored_findings[$param])).'
'; +
' . nl2br ( stripslashes ( $stored_findings [ $param ] ) ) . '
' ; } } -function createInputBlock($param, $value){ - global $stored_findings, $date_format, $edit, $lang; +function createInputBlock ( $param , $value ) { + global $stored_findings, $date_format, $edit, $lang ; - if ($edit){ - echo ' '; - else echo '10 maxlength=10 onBlur="IsValidDate(this,\''.$date_format.'\')" onKeyUp="setDate(this,\''.$date_format.'\',\''. $lang.'\')">'; - }else{ - echo ' '.$value.'
 '; + if ($edit) { + echo ' ' ; else + echo '10 maxlength=10 onBlur="IsValidDate(this,\'' . $date_format . '\')" onKeyUp="setDate(this,\'' . $date_format . '\',\'' . $lang . '\')">' ; + } else { + echo ' ' . $value . '
 ' ; } } @@ -27,30 +28,34 @@
- - + - + ?>   - + @@ -58,5 +63,5 @@
'.$result['name_last'].'
'.$result['name_first'].'
'.formatDate2Local($result['date_birth'],$date_format); + echo $full_en . '
' . $result [ 'name_last' ] . '
' . $result [ 'name_first' ] . '
' . formatDate2Local ( $result [ 'date_birth' ], $date_format ) ; ?>
@@ -64,67 +69,95 @@ - - + - - + - - + - - + - - + - - - + - + ';*/ } - - /** - * Displays the GUI showing the data - */ + + /** + * Displays the GUI showing the data + */ function display($pid=0){ global $HTTP_SESSION_VARS, $root_path, $dbf_nodate, $newdata, $kb_other_his_array, $lang; - + $validdata = TRUE; - + if(!empty($pid)) $this->pid=$pid; - + # Load the language tables $lang_tables =$this->langfiles; include($root_path.'include/inc_load_lang_tables.php'); - + # Load the other hospitals array include_once($root_path.'global_conf/other_hospitals.php'); - + include_once($root_path.'include/inc_date_format_functions.php'); - + include_once($root_path.'include/care_api_classes/class_insurance.php'); $pinsure_obj=new PersonInsurance($this->pid); - + # Get the global config for personŽs registration form include_once($root_path.'include/care_api_classes/class_globalconfig.php'); - + $GLOBAL_CONFIG = array(); - + $glob_obj=new GlobalConfig($GLOBAL_CONFIG); $glob_obj->getConfig('person_%'); - + //extract($GLOBAL_CONFIG); - + if(empty($this->pid)) { @@ -189,13 +187,13 @@ }else{ - + //if($data_obj=&$this->person_obj->getAllInfoObject()){ // $this->data=$data_obj->FetchRow(); if($this->is_loaded){ extract($this->data); - + # Get related insurance data $p_insurance=&$pinsure_obj->getPersonInsuranceObject($this->pid); - + if($p_insurance==FALSE) { $insurance_show=true; @@ -206,5 +204,5 @@ $buffer= $p_insurance->FetchRow(); extract($buffer); - + $insurance_show=true; # Get insurace firm name @@ -218,40 +216,40 @@ # Check if person is currently admitted $this->current_encounter=$this->person_obj->CurrentEncounter($this->pid); - + # update the recordŽs history if(empty($newdata)) @$this->person_obj->setHistorySeen($HTTP_SESSION_VARS['sess_user_name']); - + # Check whether config foto path exists, else use default path $photo_path = (is_dir($root_path.$GLOBAL_CONFIG['person_foto_path'])) ? $GLOBAL_CONFIG['person_foto_path'] : $this->default_photo_path; - + }else{ $validdata = FALSE; } - - } - + + } + if($validdata){ - + include_once($root_path.'include/inc_photo_filename_resolve.php'); - - ############ Here starts the GUI output ################## - - # Start Smarty templating here - # Create smarty object without initiliazing the GUI (2nd param = FALSE) - + + ############ Here starts the GUI output ################## + + # Start Smarty templating here + # Create smarty object without initiliazing the GUI (2nd param = FALSE) + include_once($root_path.'gui/smarty_template/smarty_care.class.php'); $this->smarty = new smarty_care('common',FALSE); - - # Set from width + + # Set from width $this->smarty->assign('sFormWidth','width="100%"'); - + $img_male=createComIcon($root_path,'spm.gif','0'); $img_female=createComIcon($root_path,'spf.gif','0'); - + if(!empty($this->pretext)) $this->smarty->assign('pretext',$this->pretext); - + $this->smarty->assign('LDRegistryNr',$LDRegistryNr); $this->smarty->assign('pid',$pid); - + if(file_exists($root_path.'cache/barcodes/pn_'.$pid.'.png')){ $this->smarty->assign('sBarcodeImg',''); @@ -259,26 +257,32 @@ $this->smarty->assign('sBarcodeImg',""); $this->smarty->assign('sBarcodeImg',""); - } - + } + $this->smarty->assign('img_source',$img_source); - - # iRowSpanCount counts the rows on the left of the photo image. Begin with 5 because there are 5 static rows. - $iRowSpanCount = 5; - + + //gjergji + if ($photo_filename=='' || $photo_filename=='nopic' || !file_exists($root_path.$photo_path.'/'.$photo_filename)){ + $this->smarty->assign('sFileBrowserInput',''); + } + //end : gjergji + + # iRowSpanCount counts the rows on the left of the photo image. Begin with 5 because there are 5 static rows. + $iRowSpanCount = 5; + $this->smarty->assign('LDRegDate',$LDRegDate); $this->smarty->assign('sRegDate',@formatDate2Local($date_reg,$date_format).'smarty->assign('LDRegTime',$LDRegTime); $this->smarty->assign('sRegTime',convertTimeToLocal(@formatDate2Local($date_reg,$date_format,0,1))); - + if (!$GLOBAL_CONFIG['person_title_hide']){ $this->smarty->assign('sPersonTitle',$this->createTR( $LDTitle, $title)); $iRowSpanCount++; - } - + } + $this->smarty->assign('sNameLast',$this->createTR($LDLastName,$name_last,1,TRUE)); - //$iRowSpanCount++; - + //$iRowSpanCount++; + # If person is dead show a black cross if($death_date&&$death_date!=$dbf_nodate) $sCross = ' '; @@ -306,32 +310,32 @@ $this->smarty->assign('sNameOthers',$this->createTR($LDNameOthers,$name_others)); $iRowSpanCount++; - } - - # Set the rowspan value for the photo image
- -
-
- '.$LDTel.' '.$global_phone[$subtarget] ?> +
+

+
+ ' . $LDTel . ' ' . $global_phone [ $subtarget ] ?> +
- + '; - echo ""; + echo $batch_nr . '  
' ; + echo "" ; ?>  
'; - if($entry_date!="0000-00-00") echo formatDate2Local($entry_date,$date_format); + echo $LDEntryDate . '  
' ; + if ($entry_date != "0000-00-00") + echo formatDate2Local ( $entry_date, $date_format ) ; - ?>   -
'.$LDFamilyName.'
'.$LDName.'
'.$LDBDay; + echo $LDCaseNr . '
' . $LDFamilyName . '
' . $LDName . '
' . $LDBDay ; ?>
-
- +
+
+
+
-
- +
+
+
+
-
- +
+
+
+
-
- +
+
+
+
-
- +
+
+
+
- : +load_files(); +//end gjergji +?> +
+
: + load_files(); - - echo $calendar->show_calendar($calendar,$date_format,'findings_date',$stored_findings['findings_date']); - //end gjergji + if ($edit) { + echo $calendar->show_calendar($calendar,$date_format,'findings_date',$stored_findings ['findings_date']); + } else { + echo @formatDate2Local($stored_findings ['findings_date'],$date_format) ; } ?> -
- : - +
+ 		+
+ : +   
Index: /trunk/Care2007/include/care_api_classes/class_diagnostics.php =================================================================== --- /trunk/Care2007/include/care_api_classes/class_diagnostics.php (revision 5995) +++ /trunk/Care2007/include/care_api_classes/class_diagnostics.php (revision 6193) @@ -22,8 +22,28 @@ var $tb_req_chem='care_test_request_chemlabor'; /** + * Table name for chemical lab test request lab parameters + * @var string + */ + var $tb_req_chem_sub='care_test_request_chemlabor_sub'; + /** * Table name for bacteriology lab test request * @var string */ var $tb_req_bac='care_test_request_baclabor'; + /** + * Table name for bacteriology lab test findings + * @var string + */ + var $tb_find_bac_sub='care_test_findings_baclabor_sub'; + /** + * Table name for bacteriology lab test findings + * @var string + */ + var $tb_find_bac='care_test_findings_baclabor'; + /** + * Table name for bacteriology lab test request + * @var string + */ + var $tb_req_bac_sub='care_test_request_baclabor_sub'; /** * Table name for blood bank request @@ -67,4 +87,81 @@ 'sample_weekday', 'status', + 'urgent', + 'history', + 'modify_id', + 'modify_time', + 'create_id', + 'create_time'); + /** + * Field names of care_test_request_chemlabor_sub + * @var array + */ + var $chemlabor_sub=array('batch_nr', + 'encounter_nr', + 'paramater_name', + 'parameter_value'); + + /** + * Field names of care_test_request_baclabor + * @var array + */ + var $baclabor=array('batch_nr', + 'encounter_nr', + 'dept_nr', + 'material', + 'test_type', + 'material_note', + 'diagnosis_note', + 'immune_supp', + 'send_date', + 'sample_date', + 'status', + 'history', + 'create_id', + 'create_time'); + /** + * Field names of care_test_request_baclabor_sub + * @var array + */ + var $baclabor_sub=array('batch_nr', + 'encounter_nr', + 'test_type', + 'test_type_value', + 'material', + 'material_value'); + /** + * Field names of care_test_findings_baclabor + * @var array + */ + var $baclaborFindings=array('batch_nr', + 'encounter_nr', + 'room_nr', + 'dept_nr', + 'notes', + 'findings_init', + 'findings_current', + 'findings_final', + 'entry_nr', + 'rec_date', + 'doctor_id', + 'status', + 'history', + 'modify_id', + 'modify_time', + 'create_id', + 'create_time'); + /** + * Field names of care_test_findings_baclabor_sub + * @var array + */ + var $baclaborFindings_sub=array('batch_nr', + 'encounter_nr', + 'type_general', + 'resist_anaerob', + 'resist_aerob', + 'findings', + 'findings_date', + 'findings_time', + 'status', 'history', 'modify_id', @@ -80,4 +177,48 @@ $this->setRefArray($this->chemlabor); } + + /** + * Sets the core to point to the care_test_request_chemlabor_sub table + * @access public + */ + function useChemLabRequestSubTable(){ + $this->setTable($this->tb_req_chem_sub); + $this->setRefArray($this->chemlabor_sub); + } + /** + * Sets the core to point to the care_test_request_baclabor table + * @access public + */ + function useBacLabRequestTable(){ + $this->setTable($this->tb_req_bac); + $this->setRefArray($this->baclabor); + } + + /** + * Sets the core to point to the care_test_request_baclabor_sub table + * @access public + */ + function useBacLabRequestSubTable(){ + $this->setTable($this->tb_req_bac_sub); + $this->setRefArray($this->baclabor_sub); + } + /** + * Sets the core to point to the care_test_findings_baclabor table + * @access public + */ + function useBacLabFindingsTable(){ + $this->setTable($this->tb_find_bac); + $this->setRefArray($this->baclaborFindings); + } + + /** + * Sets the core to point to the care_test_findings_baclabor_sub table + * @access public + */ + function useBacLabFindingsSubTable(){ + $this->setTable($this->tb_find_bac_sub); + $this->setRefArray($this->baclaborFindings_sub); + } + /** * Sets the core to point to the a care_test_request_????? table. Index: /trunk/Care2007/include/care_api_classes/class_gui_person_show.php =================================================================== --- /trunk/Care2007/include/care_api_classes/class_gui_person_show.php (revision 6130) +++ /trunk/Care2007/include/care_api_classes/class_gui_person_show.php (revision 6193) @@ -4,6 +4,4 @@ */ -/** -*/ /** * GUI person registration data show methods. @@ -23,5 +21,5 @@ # Language files to be loaded var $langfiles=array('prompt.php','person.php','aufnahme.php'); - + # Filename of script to run in fallback state (when something goes wrong) var $fallbackfile = ''; @@ -36,8 +34,8 @@ # The text holder in front of output block var $pretext=''; - + # The text holder after the output block var $posttext=''; - + # Current encounter number var $current_encounter=0; @@ -62,6 +60,6 @@ /** - * Constructor - */ + * Constructor + */ function GuiPersonShow($pid=0, $filename='', $fallbackfile=''){ global $thisfile, $root_path; @@ -80,12 +78,12 @@ } /** - * Sets the file name of the script to run when something goes wrong - */ + * Sets the file name of the script to run when something goes wrong + */ function setFallbackFile($target){ $this->fallbackfile = $target; } /** - * Sets the PID value - */ + * Sets the PID value + */ function setPID($nr){ $this->pid = $nr; @@ -94,6 +92,6 @@ } /** - * Returns the death data - */ + * Returns the death data + */ function DeathDate(){ if($this->data['death_date']) return $this->data['death_date']; @@ -101,6 +99,6 @@ } /** - * Gets the encounter number if person is currently admitted - */ + * Gets the encounter number if person is currently admitted + */ function CurrentEncounter(){ global $root_path; @@ -112,9 +110,9 @@ } /** - * (pre)Loads the person registration data. - * - * Can be checked if data is loaded with the $this->is_loaded variable - * @access private - */ + * (pre)Loads the person registration data. + * + * Can be checked if data is loaded with the $this->is_loaded variable + * @access private + */ function _load(){ if($this->data_obj=&$this->person_obj->getAllInfoObject()){ @@ -126,8 +124,8 @@ } /** - * Function to generate demographic data dynamically depending on the global config - */ + * Function to generate demographic data dynamically depending on the global config + */ function createTR($ld_text, $input_val, $colspan = 1, $vidata = FALSE){ - + ob_start(); if($vidata) $input_val="
$input_val
"; @@ -139,7 +137,7 @@ $sBuffer = ob_get_contents(); ob_end_clean(); - + //$this->toggle=!$this->toggle; - + return $sBuffer; /* @@ -151,37 +149,37 @@
+ } + + # Set the rowspan value for the photo image $this->smarty->assign('sPicTdRowSpan',"rowspan=$iRowSpanCount"); - - $this->smarty->assign('LDBday',"$LDBday"); - + + $this->smarty->assign('LDBday',"$LDBday:"); + if($death_date&&$death_date!=$dbf_nodate){ $this->smarty->assign('sCrossImg',$sCross); $this->smarty->assign('sDeathDate',''.@formatDate2Local($death_date,$date_format).''); - } + } $this->smarty->assign('sBdayInput','
'.@formatDate2Local($date_birth,$date_format).'
'); - - $this->smarty->assign('LDSex', "$LDSex"); - + + $this->smarty->assign('LDSex', "$LDSex:"); + if($sex=="m") $this->smarty->assign('LDMale','
'.$LDMale.'
'); elseif($sex=="f") $this->smarty->assign('LDFemale','
'.$LDFemale.'
'); - + if (!$GLOBAL_CONFIG['person_bloodgroup_hide'] && trim($blood_group)) { - // KB: make blood group hideable + // KB: make blood group hideable $this->smarty->assign('LDBloodGroup',$LDBloodGroup); $buf='LD'.trim($blood_group); $this->smarty->assign('sBGAInput',$$buf); - } - + } + if (!$GLOBAL_CONFIG['person_civilstatus_hide'] && trim($civil_status)) { $this->smarty->assign('LDCivilStatus',$LDCivilStatus); - + if($civil_status=="single") $sCSBuffer = $LDSingle; elseif($civil_status=="married") $sCSBuffer = $LDMarried; @@ -339,106 +343,106 @@ elseif($civil_status=="widowed") $sCSBuffer = $LDWidowed; elseif($civil_status=="separated") $sCSBuffer = $LDSeparated; - + $this->smarty->assign('sCSSingleInput',$sCSBuffer); - } - - $this->smarty->assign('LDAddress',"$LDAddress"); - - $this->smarty->assign('LDStreet',"$LDStreet"); - + } + + $this->smarty->assign('LDAddress',"$LDAddress:"); + + $this->smarty->assign('LDStreet',"$LDStreet:"); + $this->smarty->assign('sStreetInput',$addr_str); - - $this->smarty->assign('LDStreetNr',"$LDStreetNr"); - + + $this->smarty->assign('LDStreetNr',"$LDStreetNr:"); + $this->smarty->assign('sStreetNrInput',$addr_str_nr); - - $this->smarty->assign('LDTownCity',"$LDTownCity"); + + $this->smarty->assign('LDTownCity',"$LDTownCity:"); $this->smarty->assign('sTownCityInput',$addr_citytown_name); - $this->smarty->assign('LDZipCode',"$LDZipCode "); + $this->smarty->assign('LDZipCode',"$LDZipCode :"); $this->smarty->assign('sZipCodeInput',$addr_zip); - + if (!$GLOBAL_CONFIG['person_insurance_hide']) { if (!$GLOBAL_CONFIG['person_insurance_1_nr_hide']&&$insurance_show&&$insurance_nr){ - + $this->smarty->assign('bShowInsurance',TRUE); - + $this->smarty->assign('sInsuranceNr',$this->createTR($LDInsuranceNr,$insurance_nr,2)); - + $buffer=$insurance_class_info['LD_var']; if(isset($$buffer)&&!empty($$buffer)) $this->smarty->append('sInsClasses',$$buffer); else $this->smarty->append('sInsClasses',$insurance_class_info['name']); - + $this->smarty->assign('LDInsuranceCo',$LDInsuranceCo); $this->smarty->assign('sInsCoNameInput',$insurance_firm_name); - + $this->createTR($LDInsuranceCo.' 1',$insurance_firm_name,2); - } - } + } + } if (!$GLOBAL_CONFIG['person_phone_1_nr_hide']&&$phone_1_nr){ $this->smarty->assign('sPhone1',$this->createTR($LDPhone.' 1',$phone_1_nr,2)); - } + } if (!$GLOBAL_CONFIG['person_phone_2_nr_hide']&&$phone_2_nr){ $this->smarty->assign('sPhone2',$this->createTR($LDPhone.' 2',$phone_2_nr,2)); - } + } if (!$GLOBAL_CONFIG['person_cellphone_1_nr_hide']&&$cellphone_1_nr){ $this->smarty->assign('sCellPhone1',$this->createTR($LDCellPhone.' 1',$cellphone_1_nr,2)); - } + } if (!$GLOBAL_CONFIG['person_cellphone_2_nr_hide']&&$cellphone_2_nr){ $this->smarty->assign('sCellPhone2',$this->createTR($LDCellPhone.' 2',$cellphone_2_nr,2)); - } + } if (!$GLOBAL_CONFIG['person_fax_hide']&&$fax){ $this->smarty->assign('sFax',$this->createTR($LDFax,$fax,2)); - } + } if (!$GLOBAL_CONFIG['person_email_hide']&&$email){ $this->smarty->assign('sEmail',$this->createTR($LDEmail,"$email",2)); - } - + } + if (!$GLOBAL_CONFIG['person_citizenship_hide']&&$citizenship){ $this->smarty->assign('sCitzenship',$this->createTR($LDCitizenship,$citizenship,2)); - } + } if (!$GLOBAL_CONFIG['person_sss_nr_hide']&&$sss_nr){ $this->smarty->assign('sSSSNr',$this->createTR($LDSSSNr,$sss_nr,2)); - } + } if (!$GLOBAL_CONFIG['person_nat_id_nr_hide']&&$nat_id_nr){ $this->smarty->assign('sNatIdNr',$this->createTR($LDNatIdNr,$nat_id_nr,2)); - } + } if (!$GLOBAL_CONFIG['person_religion_hide']&&$religion){ $this->smarty->assign('sReligion',$this->createTR($LDReligion,$religion,2)); - } + } if (!$GLOBAL_CONFIG['person_ethnic_orig_hide']&&$ethnic_orig){ $this->smarty->assign('LDEthnicOrig',$LDEthnicOrigin); $this->smarty->assign('sEthnicOrigInput',$ethnic_orig_txt); - } - + } + if (!$GLOBAL_CONFIG['person_other_his_nr_hide']){ $other_hosp_list = $this->person_obj->OtherHospNrList(); $iHospCount = sizeof($other_hosp_list); - + if($iHospCount) { $this->smarty->assign('bShowOtherHospNr',TRUE); - + $this->smarty->assign('LDOtherHospitalNr',$LDOtherHospitalNr); - + $sOtherNrBuffer=''; if(is_array($other_hosp_list) && $iHospCount){ - + foreach( $other_hosp_list as $k=>$v ){ $sOtherNrBuffer.="".$kb_other_his_array[$k].": ".$v."
\n"; + } } + $this->smarty->assign('sOtherNr',$sOtherNrBuffer); } - $this->smarty->assign('sOtherNr',$sOtherNrBuffer); - } - } - + } + $this->smarty->assign('LDRegBy',$LDRegBy); if(empty($modify_id)) $buffer=$create_id; else $buffer=$modify_id; - + $this->smarty->assign('sRegByInput',$buffer); - + }else{ $this->smarty->assign('pretext','Invalid PID number or the data is not available from the databank! Please report this to info@care2x.org. Thank you.'); } - + /* SalvoRossitto 27/11/2007 */ if ($errorrelative) $this->smarty->assign('LDRelative',"$LDRelative"); @@ -463,6 +467,6 @@ /** - * Creates the data but returns it as a string instead of outputting it - */ + * Creates the data but returns it as a string instead of outputting it + */ function create(){ $this->bReturnOnly=TRUE; Index: /trunk/Care2007/include/care_api_classes/class_product.php =================================================================== --- /trunk/Care2007/include/care_api_classes/class_product.php (revision 6144) +++ /trunk/Care2007/include/care_api_classes/class_product.php (revision 6193) @@ -260,5 +260,4 @@ if(empty($type)||empty($bestellnum)) return false; $this->useOrderCatalog($type); - //TODO ndryshue ci me marre simas emnit te farmacise...nuk e di a me kalon ne kete nivel $this->sql="SELECT * FROM care_pharma_products_main_sub WHERE bestellnum='$bestellnum' AND pcs > 0 AND idcare_pharma = $pharma ORDER BY skadenca ASC"; if($this->res['aoc']=$db->Execute($this->sql)) { Index: /trunk/Care2007/include/care_api_classes/class_immunization.php =================================================================== --- /trunk/Care2007/include/care_api_classes/class_immunization.php (revision 6130) +++ /trunk/Care2007/include/care_api_classes/class_immunization.php (revision 6193) @@ -17,9 +17,4 @@ */ class Immunization extends Core { - /** - * Database table for encounter's immunization data - * @var string - */ - var $tb='care_encounter_immunization'; // table name /** * Database table for encounter's immunization data Index: /trunk/Care2007/include/care_api_classes/class_insurance.php =================================================================== --- /trunk/Care2007/include/care_api_classes/class_insurance.php (revision 5995) +++ /trunk/Care2007/include/care_api_classes/class_insurance.php (revision 6193) @@ -135,10 +135,9 @@ global $db; - - if ($this->res['gicio']=$db->Execute("SELECT $items FROM $this->tb_class")) { + if ($this->res['gicio']=$db->Execute("SELECT $items FROM $this->tb_class WHERE status='active'")) { if ($this->res['gicio']->RecordCount()) { return $this->res['gicio']; } else {return FALSE;} - } else {return FALSE; } + } else {return FALSE; } } /** Index: /trunk/Care2007/include/care_api_classes/class_core.php =================================================================== --- /trunk/Care2007/include/care_api_classes/class_core.php (revision 6067) +++ /trunk/Care2007/include/care_api_classes/class_core.php (revision 6193) @@ -186,4 +186,6 @@ $x=''; $v=''; + reset($this->ref_array); + reset($this->data_array); while(list($x,$v)=each($this->ref_array)) { // Gjergj Sheldija : @@ -343,5 +345,5 @@ while(list($x,$v)=each($array)) { # use backquoting for mysql and no-quoting for other dbs - if ($dbtype=='mysql') $index.="`$x`,"; + if ($dbtype=='mysql' || $dbtype=='mysqli') $index.="`$x`,"; else $index.="$x,"; @@ -378,5 +380,5 @@ while(list($x,$v)=each($array)) { # use backquoting for mysql and no-quoting for other dbs. - if ($dbtype=='mysql') $elems.="`$x`="; + if ($dbtype=='mysql' || $dbtype=='mysqli') $elems.="`$x`="; else $elems.="$x="; @@ -505,4 +507,18 @@ return $this->Transact(); } + /** + * Deletes data from a database table based on the job_id and + * batch_nr. Used in the update action for the laboratory tables + * ( chemlabor and baclabor ) + * @access public + * @param varchar $batch_nr + * @param varchar $job_id + * @return boolean + */ + function deleteOldValues($batch_nr, $encounter_nr){ + if(empty($batch_nr) || empty($encounter_nr)) return FALSE; + $this->sql="DELETE FROM $this->coretable WHERE batch_nr = '$batch_nr' AND encounter_nr = '$encounter_nr'"; + return $this->Transact(); + } /** * Returns the core field names of the core table in an array. @@ -592,4 +608,5 @@ }else{ switch($dbtype){ + case 'mysqli': case 'mysql': return $oid; break; @@ -614,4 +631,5 @@ switch($dbtype){ + case 'mysqli': case 'mysql': return "CONCAT($fieldname,'$str')"; break; @@ -656,4 +674,5 @@ switch($dbtype){ + case 'mysqli' : case 'mysql': return "REPLACE($fieldname,'$str1','$str2')"; break; Index: /trunk/Care2007/include/care_api_classes/class_notes.php =================================================================== --- /trunk/Care2007/include/care_api_classes/class_notes.php (revision 6130) +++ /trunk/Care2007/include/care_api_classes/class_notes.php (revision 6193) @@ -117,5 +117,5 @@ if(empty($sort)) $sort=" ORDER BY nr"; else $sort=" ORDER BY $sort"; - if ($this->result=$db->Execute("SELECT nr,type,name,LD_var AS \"LD_var\" FROM $this->tb_types $sort")) { + if ($this->result=$db->Execute("SELECT nr,type,name,LD_var AS \"LD_var\" FROM $this->tb_types WHERE status NOT IN ($this->dead_stat) $sort")) { if ($this->result->RecordCount()) { return $this->result->GetArray(); Index: /trunk/Care2007/include/care_api_classes/class_gui_input_person.php =================================================================== --- /trunk/Care2007/include/care_api_classes/class_gui_input_person.php (revision 6130) +++ /trunk/Care2007/include/care_api_classes/class_gui_input_person.php (revision 6193) @@ -4,7 +4,7 @@ */ -/** -*/ -//require_once($root_path.'include/care_api_classes/class_core.php'); + +require_once($root_path.'include/care_api_classes/class_core.php'); + /** * GUI input form for person registration methods. @@ -84,8 +84,12 @@ */ function createTR($error_handler, $input_name, $ld_text, $input_val, $colspan = 1, $input_size = 35,$red=FALSE){ - ob_start(); - if ($error_handler || $red) $sBuffer="error_fontcolor\">$ld_text"; + $this->smarty->assign('must',''); + if ($error_handler || $red) { + $sBuffer="error_fontcolor\">* $ld_text"; + $this->smarty->assign('must',1); + } else $sBuffer=$ld_text; + //$this->smarty->assign('must',1); $this->smarty->assign('sItem',$sBuffer); $this->smarty->assign('sColSpan2',"colspan=$colspan"); @@ -99,5 +103,4 @@ return $sBuffer; } - /** * Displays the GUI input form @@ -154,7 +157,7 @@ if($mode!='forcesave') { # clean and check input data variables - if(trim($encoder)=='') $encoder=$aufnahme_user; + if (trim($encoder)=='') $encoder=$aufnahme_user; if (trim($name_last)=='') { $errornamelast=1; $error++;} - if(trim($name_first)=='') { $errornamefirst=1; $error++; } + if (trim($name_first)=='') { $errornamefirst=1; $error++; } if (trim($date_birth)=='') { $errordatebirth=1; $error++;} if (trim($addr_str)=='') { $errorstreet=1; $error++;} @@ -187,5 +190,5 @@ //echo formatDate2STD($geburtsdatum,$date_format); - $sql.="UPDATE $dbtable SET + $sql="UPDATE $dbtable SET title='$title', name_last='$name_last', @@ -217,5 +220,4 @@ date_update='".date('Y-m-d H:i:s')."',"; - //if ($old_fn!=$photo_filename){ if ($valid_image){ # Compose the new filename @@ -296,5 +298,5 @@ # However, the sequence generator must be configured during db creation to start at # the initial value set in the global config - if($dbtype=='mysql'){ + if($dbtype=='mysql' || $dbtype=='mysqli'){ $HTTP_POST_VARS['pid']=$GLOBAL_CONFIG['person_id_nr_init']; } @@ -422,5 +424,5 @@ ?> smarty->assign('LDRelative',"$LDRelative"); - else $this->smarty->assign('LDRelative',"$LDRelative"); - $this->smarty->assign('sRelativeNameLast',$this->createTR($errorrelativenamelast, 'relative_name_last', $LDLastName,$relative_name_last,2,35,FALSE)); - $this->smarty->assign('sRelativeNameFirst',$this->createTR($errorrelativenamefirst, 'relative_name_first', $LDFirstName,$relative_name_first,2,35,FALSE)); - $this->smarty->assign('sRelativePhone',$this->createTR($errorrelativephone, 'relative_phone', $LDPhone,$relative_phone,2,35,FALSE)); - /* Begin SalvoRossitto 26/11/2007 */ - + if (!$GLOBAL_CONFIG['person_name_2_hide']){ @@ -625,18 +607,6 @@ $this->smarty->assign('sPicTdRowSpan',"rowspan=$iRowSpanCount"); - - if ($errordatebirth) $this->smarty->assign('LDBday',"$LDBday"); - else $this->smarty->assign('LDBday'," $LDBday"); - - //gjergji : new calendar -/* if($date_birth){ - if($mode=='save'||$error||$error_person_exists) $sBdayBuffer = $date_birth; - else $sBdayBuffer = formatDate2Local($date_birth,$date_format); - }*/ - # Uncomment the following when the current date must be inserted - # automatically at the start of each document - /*else{ - $sBdayBuffer = formatDate2Local(date('Y-m-d'),$date_format); - }*/ + if ($errordatebirth) $this->smarty->assign('LDBday',"* $LDBday:"); + else $this->smarty->assign('LDBday',"* $LDBday:"); //gjergji : new calendar @@ -644,6 +614,6 @@ //end gjergji - if ($errorsex) $this->smarty->assign('LDSex', "$LDSex:"); - else $this->smarty->assign('LDSex', " $LDSex"); + if ($errorsex) $this->smarty->assign('LDSex', "* $LDSex:"); + else $this->smarty->assign('LDSex', "* $LDSex:"); $sSexMBuffer='smarty->assign('LDAddress',"$LDAddress"); - else $this->smarty->assign('LDAddress',"$LDAddress"); - - if ($errorstreet) $this->smarty->assign('LDStreet'," $LDStreet"); - else $this->smarty->assign('LDStreet'," $LDStreet"); + if ($erroraddress) $this->smarty->assign('LDAddress',"$LDAddress:"); + else $this->smarty->assign('LDAddress',"$LDAddress:"); + + if ($errorstreet) $this->smarty->assign('LDStreet',"* $LDStreet:"); + else $this->smarty->assign('LDStreet',"* $LDStreet:"); $this->smarty->assign('sStreetInput',''); - if ($errorstreetnr) $this->smarty->assign('LDStreetNr'," $LDStreetNr"); - else $this->smarty->assign('LDStreetNr'," $LDStreetNr"); + if ($errorstreetnr) $this->smarty->assign('LDStreetNr'," $LDStreetNr:"); + else $this->smarty->assign('LDStreetNr'," $LDStreetNr:"); $this->smarty->assign('sStreetNrInput',''); - if ($errortown) $this->smarty->assign('LDStreet',"$LDTownCity"); - else $this->smarty->assign('LDTownCity',"$LDTownCity"); - $this->smarty->assign('sTownCityInput',''); - $this->smarty->assign('sTownCityMiniCalendar',""); - - if ($errorzip) $this->smarty->assign('LDZipCode'," $LDZipCode "); - else $this->smarty->assign('LDZipCode'," $LDZipCode "); - $this->smarty->assign('sZipCodeInput',''); + if ($errortown) $this->smarty->assign('LDStreet',"$LDTownCity:"); + else $this->smarty->assign('LDTownCity',"$LDTownCity:"); + + require_once($root_path.'include/care_api_classes/class_address.php'); + $sAddress = ''; + $this->smarty->assign('sTownCityInput',$sAddress); + //$this->smarty->assign('sTownCityInput',''); + //$this->smarty->assign('sTownCityMiniCalendar',""); + + if ($errorzip) $this->smarty->assign('LDZipCode'," $LDZipCode :"); + else $this->smarty->assign('LDZipCode'," $LDZipCode :"); + $this->smarty->assign('sZipCodeInput',''); @@ -758,5 +738,5 @@ $this->smarty->assign('bShowInsurance',TRUE); - $this->smarty->assign('sInsuranceNr',$this->createTR($errorinsurancenr, 'insurance_nr', $LDInsuranceNr.' 1',$insurance_nr,2)); + $this->smarty->assign('sInsuranceNr',$this->createTR($errorinsurancenr, 'insurance_nr', $LDInsuranceNr.' 1',$insurance_nr,2,35,true)); if ($errorinsuranceclass) $this->smarty->assign('sErrorInsClass',""); @@ -766,5 +746,5 @@ while($result=$insurance_classes->FetchRow()) { - $sInsClassBuffer.='smarty->assign('sInsClasses','no insurance class'); + $this->smarty->assign('sInsClasses','No insurance classes defined'); } if ($errorinsurancecoid) $this->smarty->assign('LDInsuranceCo',"$LDInsuranceCo :"); else $this->smarty->assign('LDInsuranceCo',"$LDInsuranceCo :"); - + //gjergji mod for insurance + $insurance_firm_name = $pinsure_obj->getFirmName($GLOBAL_CONFIG['person_insurace_firm_default_id']); $this->smarty->assign('sInsCoNameInput',''); $this->smarty->assign('sInsCoMiniCalendar',""); @@ -876,5 +857,5 @@ - + Index: /trunk/Care2007/include/care_api_classes/class_ward.php =================================================================== --- /trunk/Care2007/include/care_api_classes/class_ward.php (revision 6130) +++ /trunk/Care2007/include/care_api_classes/class_ward.php (revision 6193) @@ -139,5 +139,4 @@ while (list($key, $val) = each($dept_nr)) { $tmp .= "dept_nr = " . $val . " OR "; - } $this->sql .= substr($tmp,0,-4) ; @@ -145,11 +144,11 @@ } //echo $this->sql; - if($this->res['gawio']=$db->Execute($this->sql)) { + if($this->res['gawio']=$db->Execute($this->sql)) { if($this->rec_count=$this->res['gawio']->RecordCount()) { - return $this->res['gawio']; - } else { return false; } - } else { return false; } - } - /** + return $this->res['gawio']; + } else { return false; } + } else { return false; } + } + /** * Returns all wards data. * @@ -404,4 +403,5 @@ global $dbtype; switch ($dbtype){ + case 'mysqli': case 'mysql': $this->sql="UPDATE $this->tb_room SET closed_beds=".$this->ReplaceFieldString("closed_beds","$bed_nr/","")." WHERE type_nr=1 AND room_nr=$room_nr AND ward_nr=$ward_nr"; break; Index: /trunk/Care2007/include/care_api_classes/class_department.php =================================================================== --- /trunk/Care2007/include/care_api_classes/class_department.php (revision 6130) +++ /trunk/Care2007/include/care_api_classes/class_department.php (revision 6193) @@ -164,6 +164,14 @@ * @return mixed boolean or adodb record object or assoc array */ - function getAllActive() { + function getAllActive($dept_nr) { return $this->_getalldata("is_inactive='0'"); + } + /** + * Gets all ACTIVE sub - departments. The result is assoc array sorted by departments formal name + * @access public + * @return mixed boolean or adodb record object or assoc array + */ + function getAllSubDepts($dept_nr) { + return $this->_getalldata('is_inactive=\'0\' AND parent_dept_nr='.$dept_nr); } /** @@ -190,5 +198,5 @@ */ function getAllActiveSort($sort='') { - return $this->_getalldata("is_inactive='0'",$sort); + return $this->_getalldata("parent_dept_nr='0' AND is_inactive='0'",$sort); } /** Index: /trunk/Care2007/include/care_api_classes/class_address.php =================================================================== --- /trunk/Care2007/include/care_api_classes/class_address.php (revision 5995) +++ /trunk/Care2007/include/care_api_classes/class_address.php (revision 6193) @@ -31,4 +31,5 @@ 'unece_locode', 'name', + 'zip_code', 'iso_country_id', 'unece_locode_type', Index: /trunk/Care2007/include/care_api_classes/class_lab.php =================================================================== --- /trunk/Care2007/include/care_api_classes/class_lab.php (revision 6081) +++ /trunk/Care2007/include/care_api_classes/class_lab.php (revision 6193) @@ -23,4 +23,9 @@ var $tb_find_chemlab='care_test_findings_chemlab'; /** + * Table name for test findings for chemical lab paramters + * @var string + */ + var $tb_find_chemlab_sub='care_test_findings_chemlabor_sub'; + /** * Table name for test paramaters * @var string @@ -66,4 +71,19 @@ 'modify_id', 'modify_time', + 'create_id', + 'create_time'); + /** + * Field names for care_test_findings_chemlab_sub table + * @var array + */ + var $fld_find_chemlab_sub=array( + 'batch_nr', + 'job_id', + 'encounter_nr', + 'paramater_name', + 'parameter_value', + 'test_date', + 'test_time', + 'history', 'create_id', 'create_time'); @@ -127,10 +147,16 @@ * @param int Encounter number */ - function Lab($enc_nr=''){ + function Lab($enc_nr='', $subTable = false){ if(!empty($enc_nr)) $this->enc_nr=$enc_nr; + if($subTable == true) { + $this->setTable($this->tb_find_chemlab_sub); + $this->setRefArray($this->fld_find_chemlab_sub); + } else { $this->setTable($this->tb_find_chemlab); $this->setRefArray($this->fld_find_chemlab); + } //$this->en_prepend=date('Y')*1000000; } + /** * Sets the core table name and field names to the care_test_param table. @@ -192,11 +218,10 @@ * @param int Encounter number * @param int Job (test request) id - * @param int Test group id * @return boolean */ - function hideResultIfExists($enc_nr,$job_id,$grp_id){ + function hideResultIfExists($enc_nr,$job_id){ global $HTTP_SESSION_VARS; - $this->sql="UPDATE $this->tb_find_chemlab SET status='hidden',history=".$this->ConcatHistory("Hide ".date('Y-m-d H:i:s')." ".$HTTP_SESSION_VARS['sess_user_name']."\n")." - WHERE encounter_nr='$enc_nr' AND job_id='$job_id' AND group_id='$grp_id' AND status NOT IN ($this->dead_stat)"; + $this->sql="UPDATE $this->tb_find_chemlab_sub SET status='hidden',history=".$this->ConcatHistory("Hide ".date('Y-m-d H:i:s')." ".$HTTP_SESSION_VARS['sess_user_name']."\n")." + WHERE encounter_nr='$enc_nr' AND job_id='$job_id' AND status NOT IN ($this->dead_stat)"; return $this->Transact(); } @@ -212,5 +237,7 @@ function getBatchResult($bn){ global $db; - $this->sql="SELECT * FROM $this->tb_find_chemlab WHERE batch_nr=$bn"; + $this->sql = "SELECT * FROM $this->tb_find_chemlab INNER JOIN $this->tb_find_chemlab_sub "; + $this->sql .= "ON ($this->tb_find_chemlab.job_id = $this->tb_find_chemlab_sub.job_id) "; + $this->sql .= "WHERE $this->tb_find_chemlab.batch_nr=$bn"; if($this->result=$db->Execute($this->sql)){ if($this->rec_count=$this->result->RecordCount()) { @@ -233,5 +260,7 @@ global $db; if(!$this->internResolveEncounterNr($enc_nr)) return FALSE; - $this->sql="SELECT * FROM $this->tb_find_chemlab WHERE encounter_nr='$this->enc_nr' AND job_id='$job_id' AND group_id='$grp_id' AND status<>'hidden'"; + $this->sql = "SELECT * FROM $this->tb_find_chemlab INNER JOIN $this->tb_find_chemlab_sub "; + $this->sql .= "ON ($this->tb_find_chemlab.job_id = $this->tb_find_chemlab_sub.job_id) "; + $this->sql .= "WHERE $this->tb_find_chemlab.encounter_nr='$this->enc_nr' AND $this->tb_find_chemlab.job_id='$job_id' AND $this->tb_find_chemlab.group_id='$grp_id' AND $this->tb_find_chemlab.status<>'hidden'"; if($this->result=$db->Execute($this->sql)){ if($this->rec_count=$this->result->RecordCount()) { @@ -252,5 +281,7 @@ global $db; if(!$this->internResolveEncounterNr($enc_nr)) return FALSE; - $this->sql="SELECT * FROM $this->tb_find_chemlab WHERE encounter_nr='$this->enc_nr' AND status NOT IN ($this->dead_stat) ORDER BY test_date"; + $this->sql = "SELECT * FROM $this->tb_find_chemlab INNER JOIN $this->tb_find_chemlab_sub "; + $this->sql .= "ON ($this->tb_find_chemlab.job_id = $this->tb_find_chemlab_sub.job_id) "; + $this->sql .= "WHERE $this->tb_find_chemlab.encounter_nr='$this->enc_nr' AND $this->tb_find_chemlab.status NOT IN ($this->dead_stat) ORDER BY $this->tb_find_chemlab_sub.test_date"; if($this->result=$db->Execute($this->sql)){ if($this->rec_count=$this->result->RecordCount()) { @@ -314,5 +345,6 @@ if(empty($id)) $cond=''; else $cond="batch_nr='$id'"; - $this->sql="SELECT parameters FROM $this->tb_req_chemlab WHERE $cond"; + $sub = "_sub"; + $this->sql = "SELECT paramater_name, parameter_value FROM $this->tb_req_chemlab$sub WHERE $cond"; if($this->tparams=$db->Execute($this->sql)){ if($this->rec_count=$this->tparams->RecordCount()) { Index: /trunk/Care2007/include/care_api_classes/class_encounter.php =================================================================== --- /trunk/Care2007/include/care_api_classes/class_encounter.php (revision 6130) +++ /trunk/Care2007/include/care_api_classes/class_encounter.php (revision 6193) @@ -82,4 +82,9 @@ var $tb_appt='care_appointment'; /** + * Table name for encounter type + * @var string + */ + var $tb_enc_type='care_type_encounter'; + /** * Current encounter number * @var int @@ -162,5 +167,6 @@ 'referrer_institution', 'referrer_notes', - 'regional_code', + 'admit_type', + 'triage', 'financial_class', 'insurance_nr', @@ -664,5 +670,5 @@ $this->sql="SELECT e.*, p.pid, p.title,p.name_last, p.name_first, p.date_birth, p.sex, p.addr_str,p.addr_str_nr,p.addr_zip, p.blood_group, - p.photo_filename, t.name AS citytown_name,p.death_date,p.sss_nr + p.photo_filename, t.name AS citytown_name,p.death_date FROM $this->tb_enc AS e, $this->tb_person AS p @@ -1275,4 +1281,28 @@ } } + /** + * Gets the encounter type + * + * The returned array contains data with following index keys: + * - type_nr = the class id (alphanumeric) + * - name = the class name + * - LD_var = the variable's name for the language dependent version of the class name + * + * + * @access public + * @return mixed array or boolean + */ + function getEncounterType(){ + global $db; + $this->sql="SELECT type_nr,type,name, LD_var AS \"LD_var\" FROM $this->tb_enc_type"; + if($this->result=$db->Execute($this->sql)){ + if($this->result->RecordCount()) { + $this->row=$this->result; + return $this->row; + } else return FALSE; + }else { + return FALSE; + } + } /** * Gets the insurance class' information based on its class_nr key. Index: /trunk/Care2007/include/inc_test_request_printout_chemlabor.php =================================================================== --- /trunk/Care2007/include/inc_test_request_printout_chemlabor.php (revision 6081) +++ /trunk/Care2007/include/inc_test_request_printout_chemlabor.php (revision 6193) @@ -437,5 +437,4 @@ '; if($edit) { + if( isset($stored_param[$LD_Elements[$j][$i]['id']]) && !empty($stored_param[$LD_Elements[$j][$i]['id']])) { + echo ' + '; + } else { echo ' '; + } } if( isset($stored_param[$LD_Elements[$j][$i]['id']]) && !empty($stored_param[$LD_Elements[$j][$i]['id']])) { @@ -455,5 +459,6 @@ } else { echo ''; - } if($edit) { + } + if($edit) { echo ''; } Index: /trunk/Care2007/include/inc_test_request_printout_baclabor.php =================================================================== --- /trunk/Care2007/include/inc_test_request_printout_baclabor.php (revision 6081) +++ /trunk/Care2007/include/inc_test_request_printout_baclabor.php (revision 6193) @@ -24,6 +24,5 @@