From c8e3d7cc559726db7b647a3f2ccfa6885f07cd39 Mon Sep 17 00:00:00 2001 From: sunsetsystems Date: Fri, 22 Dec 2006 00:57:32 +0000 Subject: [PATCH] more fixes for new frame layout --- .../pntemplates/default/views/day/default.html | 11 ++++- .../pntemplates/default/views/week/default.html | 11 ++++- interface/main/left_nav.php | 49 ++++++++++++++++++++++ 3 files changed, 67 insertions(+), 4 deletions(-) diff --git a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/default.html b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/default.html index b7724992b..f84fc53df 100644 --- a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/default.html +++ b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/default.html @@ -90,8 +90,15 @@ div.tiny { width:1px; height:1px; font-size:1px; } } function goPid(pid) { - top.location = '../../patient_file/patient_file.php' + - '?set_pid=' + pid + '&pid=' + pid; +[-php-] + if ($GLOBALS['concurrent_layout']) { + echo " top.RTop.location = '../../patient_file/summary/demographics.php' " . + "+ '?set_pid=' + pid;\n"; + } else { + echo " top.location = '../../patient_file/patient_file.php' " . + "+ '?set_pid=' + pid + '&pid=' + pid;\n"; + } +[-/php-] } function GoToToday(theForm){ diff --git a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/week/default.html b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/week/default.html index b7724992b..f84fc53df 100644 --- a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/week/default.html +++ b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/week/default.html @@ -90,8 +90,15 @@ div.tiny { width:1px; height:1px; font-size:1px; } } function goPid(pid) { - top.location = '../../patient_file/patient_file.php' + - '?set_pid=' + pid + '&pid=' + pid; +[-php-] + if ($GLOBALS['concurrent_layout']) { + echo " top.RTop.location = '../../patient_file/summary/demographics.php' " . + "+ '?set_pid=' + pid;\n"; + } else { + echo " top.location = '../../patient_file/patient_file.php' " . + "+ '?set_pid=' + pid + '&pid=' + pid;\n"; + } +[-/php-] } function GoToToday(theForm){ diff --git a/interface/main/left_nav.php b/interface/main/left_nav.php index 191975049..77f483257 100644 --- a/interface/main/left_nav.php +++ b/interface/main/left_nav.php @@ -140,6 +140,10 @@ $disallowed['fax'] = !($GLOBALS['hylafax_server'] || $GLOBALS['scanner_output_directory']); $disallowed['ros'] = !$GLOBALS['athletic_team']; + + $disallowed['iss'] = !((acl_check('encounters', 'notes') == 'write' || + acl_check('encounters', 'notes_a') == 'write') && + acl_check('patients', 'med') == 'write'); ?> @@ -176,6 +180,8 @@ } + + @@ -453,6 +480,28 @@ Active Encounter:
None + +
-- 2.11.4.GIT