changes for new flexible frame-based layout - not yet complete

DiscoverAndChange · Dec 9, 2006 · 370671a · 370671a
1 parent b8315cf
commit 370671a
Show file tree

Hide file tree

Showing 26 changed files with 700 additions and 114 deletions.
diff --git a/interface/billing/billing_report.php b/interface/billing/billing_report.php
@@ -153,15 +153,13 @@ function set_button_states() {
 <body <?php echo $top_bg_line; ?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
 <p style='margin-top:5px;margin-bottom:5px;margin-left:5px'>
-<?php
-if ($userauthorized) {
-?>
+<?php if ($GLOBALS['concurrent_layout']) { ?>
+<font class='title'><?php xl('Billing Report','e') ?></font>
+<?php } else if ($userauthorized) { ?>
 <a href="../main/main.php" target=Main><font class=title><?php xl('Billing Report','e') ?></font><font class=more> <?php echo $tback; ?></font></a>
 <?php } else { ?>
 <a href="../main/onotes/office_comments.php" target=Main><font class=title><?php xl('Billing Report','e') ?></font><font class=more><?php echo $tback; ?></font></a>
-<?php
-}
-?>
+<?php } ?>
 </p>
 
 <form name=the_form method=post action=billing_report.php>

diff --git a/interface/forms/newpatient/new.php b/interface/forms/newpatient/new.php
@@ -73,7 +73,8 @@ function refreshIssue(issue, title) {
 <!-- Required for the popup date selectors -->
 <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
 
-<form method='post' action="<?echo $rootdir?>/forms/newpatient/save.php" name='new_encounter' target='Main'>
+<form method='post' action="<?echo $rootdir?>/forms/newpatient/save.php" name='new_encounter'
+ <?php if (!$GLOBALS['concurrent_layout']) echo "target='Main'"; ?>>
 <input type='hidden' name='mode' value='new'>
 <span class='title'>New Encounter Form</span>
 <br>
@@ -192,7 +193,15 @@ function refreshIssue(issue, title) {
 <a href="javascript:document.new_encounter.submit();" class="link_submit">[Save]</a>
 <? if (!isset($_GET["autoloaded"]) || $_GET["autoloaded"] != "1") { ?>
 &nbsp; &nbsp;
-<a href="<?echo "$rootdir/patient_file/encounter/patient_encounter.php";?>" class="link_submit">[Don't Save]</a>
+
+<?php if ($GLOBALS['concurrent_layout']) { ?>
+<a href="<?php echo "$rootdir/patient_file/encounter/encounter_top.php"; ?>"
+ class="link_submit">[Cancel]</a>
+<?php } else { ?>
+<a href="<?echo "$rootdir/patient_file/encounter/patient_encounter.php";?>"
+ class="link_submit">[Don't Save]</a>
+<?php } ?>
+
 <? } ?>
 &nbsp; &nbsp;
 <a href="" onclick="return newissue()" class="link_submit">[Add Issue]</a>

diff --git a/interface/forms/newpatient/save.php b/interface/forms/newpatient/save.php
@@ -22,7 +22,11 @@
 $reason = $_POST['reason'];
 $mode = $_POST['mode'];
 
-$normalurl = "$rootdir/patient_file/encounter/patient_encounter.php";
+if ($GLOBALS['concurrent_layout'])
+ $normalurl = "$rootdir/patient_file/encounter/encounter_top.php";
+else
+ $normalurl = "$rootdir/patient_file/encounter/patient_encounter.php";
+
 $nexturl = $normalurl;
 
 if ($mode == 'new')

diff --git a/interface/forms/newpatient/view.php b/interface/forms/newpatient/view.php
@@ -76,7 +76,8 @@ function refreshIssue(issue, title) {
 <!-- Required for the popup date selectors -->
 <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
 
-<form method='post' action="<?echo $rootdir?>/forms/newpatient/save.php" name='new_encounter' target='Main'>
+<form method='post' action="<?echo $rootdir?>/forms/newpatient/save.php" name='new_encounter'
+ <?php if (!$GLOBALS['concurrent_layout']) echo "target='Main'"; ?>>
 <input type=hidden name='mode' value='update'>
 <input type=hidden name='id' value='<? echo $_GET["id"] ?>'>
 <span class=title>Patient Encounter Form</span>
@@ -201,7 +202,15 @@ function refreshIssue(issue, title) {
 <p>
 <a href="javascript:document.new_encounter.submit();" class="link_submit">[Save]</a>
 &nbsp; &nbsp;
-<a href="<?echo "$rootdir/patient_file/encounter/patient_encounter.php";?>" class="link_submit" target='Main'>[Cancel]</a>
+
+<?php if ($GLOBALS['concurrent_layout']) { ?>
+<a href="<?php echo "$rootdir/patient_file/encounter/encounter_top.php"; ?>"
+ class="link_submit">[Cancel]</a>
+<?php } else { ?>
+<a href="<?php echo "$rootdir/patient_file/encounter/patient_encounter.php"; ?>"
+ class="link_submit" target='Main'>[Cancel]</a>
+<?php } ?>
+
 &nbsp; &nbsp;
 <a href="" onclick="return newissue()" class="link_submit">[Add Issue]</a>
 

diff --git a/interface/globals.php b/interface/globals.php
@@ -128,6 +128,11 @@
  include_once("$srcdir/auth.inc");
 }
 
+// Set this to true to activate support for the new frame layout.
+// THIS IS NOT YET COMPLETE, DO NOT USE IT YET!
+//
+$GLOBALS['concurrent_layout'] = false;
+
 // If you do not want your accounting system to have a customer added to it
 // for each insurance company, then set this to true. SQL-Ledger currently
 // (2005-03-21) does nothing useful with insurance companies as customers.

diff --git a/interface/main/blank.php b/interface/main/blank.php
@@ -0,0 +1,11 @@
+<?php
+include_once("../globals.php");
+include_once("$srcdir/sql.inc");
+?>
+<html>
+<head>
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+</head>
+<body <?php echo $bottom_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
+</body>
+</html>
diff --git a/interface/main/finder/patient_select.php b/interface/main/finder/patient_select.php
@@ -1,45 +1,80 @@
-<?php 
+<?php
 include_once("../../globals.php");
 include_once("$srcdir/patient.inc");
 
 //the maximum number of patient records to display:
 $M = 2000;
 
-// this is a quick fix so it doesn't go to thousands records. 
+// this is a quick fix so it doesn't go to thousands records.
 // the searching functions on patient.inc need improvement.
-if ($patient=='') $patient=xl('Please enter some information','e'); 
+if ($patient=='') $patient=xl('Please enter some information','e');
 ?>
 
 <html>
 <head>
 
-
 <link rel=stylesheet href="<?php echo $css_header;?>" type="text/css">
 
 </head>
-<body <?php echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
-
-<a class="title" href="../main_screen.php" target="_top"><?php xl('Select Patient','e');?>: <?php echo $patient; xl('by','e'); echo xl($findBy,'e');?></a>
+<body <?php echo $top_bg_line; ?> topmargin='0' rightmargin='0' leftmargin='2'
+ bottommargin='0' marginwidth='2' marginheight='0'>
 
+<a class="title" href="../main_screen.php" target="_top"><?php echo xl('Select Patient') . ' ' . $patient . ' ' . xl('by') . ' ' . xl($findBy); ?></a>
 
 <br>
 
-<table border=0 cellpadding=5 cellspacing=0>
+<table border='0' cellpadding='5' cellspacing='0'>
 <tr>
 <td>
-<span class=bold><?php xl('Name','e');?></span>
+<span class='bold'><?php xl('Name','e');?></span>
 </td><td>
-<span class=bold><?php xl('SS','e');?></span>
+<span class='bold'><?php xl('SS','e');?></span>
 </td><td>
-<span class=bold><?php xl('DOB','e');?></span>
+<span class='bold'><?php xl('DOB','e');?></span>
 </td><td>
-<span class=bold><?php xl('ID','e');?></span>
+<span class='bold'><?php xl('ID','e');?></span>
 </td></tr>
-<?php 
 
-$count=0;
+<?php
+
 $total=0;
 
+if ($findBy == "Last")
+ $result = getPatientLnames("$patient","*, DATE_FORMAT(DOB,'%m/%d/%Y') as DOB_TS");
+else if ($findBy == "ID")
+ $result = getPatientId("$patient","*, DATE_FORMAT(DOB,'%m/%d/%Y') as DOB_TS");
+else if ($findBy == "DOB")
+ $result = getPatientDOB("$patient","*, DATE_FORMAT(DOB,'%m/%d/%Y') as DOB_TS");
+else if ($findBy == "SSN")
+ $result = getPatientSSN("$patient","*, DATE_FORMAT(DOB,'%m/%d/%Y') as DOB_TS");
+
+if ($result) {
+ foreach ($result as $iter) {
+ if ($total >= $M) break;
+ // For the old layout we load a frameset that also sets up the new pid.
+ // The new layout loads just the demographics frame here, which in turn
+ // will set the pid and load all the other frames.
+ if ($GLOBALS['concurrent_layout']) {
+ $anchor = "<a href='../../patient_file/summary/demographics.php?set_pid=" . $iter['pid'] . "'>";
+ } else {
+ $anchor = "<a class='text' target='_top' " .
+ "href='../../patient_file/patient_file.php?set_pid=" .
+ $iter['pid'] . "'>";
+ }
+ print "<tr><td>$anchor" . $iter['lname'] . ", " . $iter['fname'] . "</a></td>\n";
+ print "<td>$anchor" . $iter['ss'] . "</a></td>";
+ if ($iter{"DOB"} != "0000-00-00 00:00:00") {
+ print "<td>$anchor" . $iter['DOB_TS'] . "</a></td>";
+ } else {
+ print "<td>$anchor&nbsp;</a></td>";
+ }
+ print "<td>$anchor" . $iter['pubpid'] . "</a></td>";
+ $total++;
+ }
+}
+
+
+/****
 if ($findBy == "Last" && $result = getPatientLnames("$patient","*, DATE_FORMAT(DOB,'%m/%d/%Y') as DOB_TS") ) {
  foreach ($result as $iter) {
  
@@ -97,7 +132,6 @@
  }
 }
 
-
 if ($findBy == "SSN" && $result = getPatientSSN("$patient","*, DATE_FORMAT(DOB,'%m/%d/%Y') as DOB_TS") ) {
  foreach ($result as $iter) {
  
@@ -117,12 +151,11 @@
  }
 }
 
-
+****/
 
 
 ?>
 </table>
 
-
 </body>
 </html>