From d65396a69dd69cc366030ca8aaf3db32669fd206 Mon Sep 17 00:00:00 2001
From: bradymiller <bradymiller@users.sourceforge.net>
Date: Sun, 24 Apr 2011 01:55:52 -0700
Subject: [PATCH]     CDR Module: Incorporated restore session in admin gui
 scripts.

    TO DO before commit to sourceforge:
     1) allow non-continuous group ids in engine
     2) Fix bugs in reports related to cqm/amc mechanism.
---
 .../super/rules/controllers/add/view/add.php  |  6 ++--
 .../controllers/alerts/view/list_actmgr.php   |  4 +--
 .../rules/controllers/browse/view/list.php    |  6 ++--
 .../rules/controllers/detail/view/view.php    | 30 +++++++++----------
 .../controllers/edit/template/criteria.php    |  8 ++---
 .../rules/controllers/edit/view/action.php    | 10 +++----
 .../controllers/edit/view/add_criteria.php    |  6 ++--
 .../rules/controllers/edit/view/bucket.php    |  6 ++--
 .../rules/controllers/edit/view/intervals.php |  6 ++--
 .../rules/controllers/edit/view/summary.php   |  6 ++--
 10 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/interface/super/rules/controllers/add/view/add.php b/interface/super/rules/controllers/add/view/add.php
index ca27d1dec49..3cfe66eee50 100644
--- a/interface/super/rules/controllers/add/view/add.php
+++ b/interface/super/rules/controllers/add/view/add.php
@@ -10,8 +10,8 @@
   <tr >
         <td class="title"><?php echo out( xl( 'Add Rule' ) ); ?></td>
         <td>
-            <a href="index.php?action=add!add" class="iframe_medium css_button"><span><?php echo out( xl( 'Save' ) ); ?></span></a>
-            <a href="index.php?action=browse!list" class="iframe_medium css_button"><span><?php echo out( xl( 'Cancel') ); ?></span></a>
+            <a href="index.php?action=add!add" class="iframe_medium css_button" onclick="top.restoreSession()"><span><?php echo out( xl( 'Save' ) ); ?></span></a>
+            <a href="index.php?action=browse!list" class="iframe_medium css_button" onclick="top.restoreSession()"><span><?php echo out( xl( 'Cancel') ); ?></span></a>
         </td>
   </tr>
-</table>
\ No newline at end of file
+</table>
diff --git a/interface/super/rules/controllers/alerts/view/list_actmgr.php b/interface/super/rules/controllers/alerts/view/list_actmgr.php
index d70eb2cefd9..6e2236fee07 100644
--- a/interface/super/rules/controllers/alerts/view/list_actmgr.php
+++ b/interface/super/rules/controllers/alerts/view/list_actmgr.php
@@ -5,14 +5,14 @@
   </tr>
   <tr>
         <td>
-        	<a href="javascript:document.cdralertmgr.submit();" class="css_button"><span><?php echo out( xl('Save') ); ?></span></a><a href="javascript:document.cdralertmgr.reset();" class="css_button" ><span><?php echo out( xl('Reset') ); ?></span></a>
+        	<a href="javascript:document.cdralertmgr.submit();" class="css_button" onclick="top.restoreSession()"><span><?php echo out( xl('Save') ); ?></span></a><a href="javascript:document.cdralertmgr.reset();" class="css_button" onclick="top.restoreSession()"><span><?php echo out( xl('Reset') ); ?></span></a>
         </td>
   </tr>        
 </table>
 
 &nbsp;
 
-<form name="cdralertmgr" method="post" action="index.php?action=alerts!submitactmgr" >
+<form name="cdralertmgr" method="post" action="index.php?action=alerts!submitactmgr" onsubmit="return top.restoreSession()">
 <table cellpadding="1" cellspacing="0" class="showborder">
         <tr class="showborder_head">
                 <th width="250px"><?php echo out( xl('Title') ); ?></th>
diff --git a/interface/super/rules/controllers/browse/view/list.php b/interface/super/rules/controllers/browse/view/list.php
index 66208200049..754acac0594 100644
--- a/interface/super/rules/controllers/browse/view/list.php
+++ b/interface/super/rules/controllers/browse/view/list.php
@@ -18,7 +18,7 @@
   <tr>
         <td class="title"><?php echo out( xl( 'Rules Configuration' ) ); ?></td>
         <td>
-            <a href="index.php?action=edit!summary" class="iframe_medium css_button">
+            <a href="index.php?action=edit!summary" class="iframe_medium css_button" onclick="top.restoreSession()">
                 <span><?php echo out( xl( 'Add new' ) ); ?></span>
             </a>
         </td>
@@ -34,7 +34,7 @@
 
 <!-- template -->
 <div class="rule_row data template">
-    <span class="rule_title"><a href="index.php?action=detail!view"></a></span>
-    <span class="rule_type"><a href="index.php?action=detail!view"></a></span>
+    <span class="rule_title"><a href="index.php?action=detail!view" onclick="top.restoreSession()"></a></span>
+    <span class="rule_type"><a href="index.php?action=detail!view" onclick="top.restoreSession()"></a></span>
 </div>
 
diff --git a/interface/super/rules/controllers/detail/view/view.php b/interface/super/rules/controllers/detail/view/view.php
index 866b215ee05..c538f581ae1 100644
--- a/interface/super/rules/controllers/detail/view/view.php
+++ b/interface/super/rules/controllers/detail/view/view.php
@@ -18,7 +18,7 @@
   <tr >
         <td class="title"><?php echo out( xl( 'Rule Detail' ) ); ?></td>
         <td>
-            <a href="index.php?action=browse!list" class="iframe_medium css_button"><span><?php echo out( xl( 'Back' ) ); ?></span></a>
+            <a href="index.php?action=browse!list" class="iframe_medium css_button" onclick="top.restoreSession()"><span><?php echo out( xl( 'Back' ) ); ?></span></a>
         </td>
   </tr>
 </table>
@@ -31,7 +31,7 @@
         <p class="header">
             <?php echo out( xl( 'Summary' ) ); ?>
             <a href="index.php?action=edit!summary&id=<?php echo out( $rule->id ); ?>"
-               class="action_link" id="edit_summary">(<?php echo out( xl( 'edit' ) ); ?>)</a>
+               class="action_link" id="edit_summary" onclick="top.restoreSession()">(<?php echo out( xl( 'edit' ) ); ?>)</a>
         </p>
         <p><b><?php echo out( xl( $rule->title ) ); ?></b>
         (<?php echo implode_funcs( ", ", $rule->getRuleTypeLabels(), array( 'xl', 'out' ) ); ?>)
@@ -45,7 +45,7 @@ class="action_link" id="edit_summary">(<?php echo out( xl( 'edit' ) ); ?>)</a>
     <div class="section text">
         <p class="header">
             <?php echo out( xl( 'Reminder intervals' ) ); ?>
-            <a href="index.php?action=edit!intervals&id=<?php echo $rule->id ?>" class="action_link">(<?php echo out( xl( 'edit' ) ); ?>)</a>
+            <a href="index.php?action=edit!intervals&id=<?php echo $rule->id ?>" class="action_link" onclick="top.restoreSession()">(<?php echo out( xl( 'edit' ) ); ?>)</a>
         </p>
 
         <?php if ( $intervals->getTypes() ) {?>
@@ -75,7 +75,7 @@ class="action_link" id="edit_summary">(<?php echo out( xl( 'edit' ) ); ?>)</a>
     <!--                      -->
     <?php $filters = $rule->filters; if ( $filters ) { ?>
     <div class="section text">
-        <p class="header"><?php echo out( xl( 'Demographics filter criteria' ) ); ?> <a href="index.php?action=edit!add_criteria&id=<?php echo out( $rule->id ); ?>&criteriaType=filter" class="action_link">(<?php echo out( xl( 'add' ) ); ?>)</a></p>
+        <p class="header"><?php echo out( xl( 'Demographics filter criteria' ) ); ?> <a href="index.php?action=edit!add_criteria&id=<?php echo out( $rule->id ); ?>&criteriaType=filter" class="action_link" onclick="top.restoreSession()">(<?php echo out( xl( 'add' ) ); ?>)</a></p>
         <p>
             <?php if ( $filters->criteria ) { ?>
 
@@ -90,11 +90,11 @@ class="action_link" id="edit_summary">(<?php echo out( xl( 'edit' ) ); ?>)</a>
                     <div>
                         <span class="left_col">
                             <a href="index.php?action=edit!filter&id=<?php echo out( $rule->id ); ?>&guid=<?php echo out( $criteria->guid ); ?>"
-                               class="action_link">
+                               class="action_link" onclick="top.restoreSession()">
                                 (<?php echo out( xl( 'edit' ) ); ?>)
                             </a>
                             <a href="index.php?action=edit!delete_filter&id=<?php echo out( $rule->id ); ?>&guid=<?php echo out( $criteria->guid ); ?>" 
-                               class="action_link">
+                               class="action_link" onclick="top.restoreSession()">
                                 (<?php echo out( xl( 'delete' ) ); ?>)
                             </a>
                         </span>
@@ -126,7 +126,7 @@ class="action_link">
         <?php $targets = $group->ruleTargets; if ( $targets ) { ?>
         <div class="section text">
             <p class="header"><?php echo out( xl( 'Clinical targets' ) ); ?> 
-            	<a href="index.php?action=edit!add_criteria&id=<?php echo out( $rule->id ); ?>&group_id=<?php echo out( $group->groupId ); ?>&criteriaType=target" class="action_link">
+            	<a href="index.php?action=edit!add_criteria&id=<?php echo out( $rule->id ); ?>&group_id=<?php echo out( $group->groupId ); ?>&criteriaType=target" class="action_link" onclick="top.restoreSession()">
             		(<?php echo out( xl( 'add' ) ); ?>)
             	</a>
             </p>
@@ -144,11 +144,11 @@ class="action_link">
                         <div class="row">
                             <span class="left_col">
                                 <a href="index.php?action=edit!target&id=<?php echo out( $rule->id ); ?>&guid=<?php echo out( $criteria->guid ); ?>"
-                                   class="action_link">
+                                   class="action_link" onclick="top.restoreSession()">
                                     (<?php echo out( xl( 'edit' ) ); ?>)
                                 </a>
                                 <a href="index.php?action=edit!delete_target&id=<?php echo out( $rule->id ); ?>&guid=<?php echo out( $criteria->guid ); ?>"
-                                   class="action_link">
+                                   class="action_link" onclick="top.restoreSession()">
                                     (<?php echo out( xl( 'delete' ) ); ?>)
                                 </a>
                             </span>
@@ -175,7 +175,7 @@ class="action_link">
         <?php $actions = $group->ruleActions; if ( $actions ) { ?>
         <div class="section text">
             <p class="header"><?php echo out( xl( 'Actions' ) ); ?>
-                <a href="index.php?action=edit!add_action&id=<?php echo out( $rule->id ); ?>&group_id=<?php echo out( $group->groupId );?>" class="action_link">
+                <a href="index.php?action=edit!add_action&id=<?php echo out( $rule->id ); ?>&group_id=<?php echo out( $group->groupId );?>" class="action_link" onclick="top.restoreSession()">
                     (<?php echo out( xl( 'add' ) ); ?>)
                 </a>
             </p>
@@ -190,10 +190,10 @@ class="action_link">
                     <?php foreach($actions->actions as $action) { ?>
                         <span class="left_col">
                             <a href="index.php?action=edit!action&id=<?php echo out( $rule->id ); ?>&guid=<?php echo out( $action->guid ); ?>"
-                               class="action_link">
+                               class="action_link" onclick="top.restoreSession()">
                                 (<?php echo out( xl( 'edit' ) ); ?>)</a>
                             <a href="index.php?action=edit!delete_action&id=<?php echo out( $rule->id ); ?>&guid=<?php echo out( $action->guid ); ?>"
-                               class="action_link">
+                               class="action_link" onclick="top.restoreSession()">
                                 (<?php echo out( xl( 'delete' ) ); ?>)</a>
                         </span>
                         <span class="end_col"><?php echo out( $action->getTitle() ); ?></span>
@@ -211,14 +211,14 @@ class="action_link">
     		<?php $nextGroupId = $groupId + 1; ?>
     		<div class="section text">
         		<p class="header"><?php echo out( xl( 'Clinical targets' ) ); ?> 
-        			<a href="index.php?action=edit!add_criteria&id=<?php echo out( $rule->id ); ?>&group_id=<?php echo $nextGroupId; ?>&criteriaType=target" class="action_link">
+        			<a href="index.php?action=edit!add_criteria&id=<?php echo out( $rule->id ); ?>&group_id=<?php echo $nextGroupId; ?>&criteriaType=target" class="action_link" onclick="top.restoreSession()">
         				(<?php echo out( xl( 'add' ) ); ?>)
         			</a>
         		</p>
     		</div>
     		<div class="section text">
         		<p class="header"><?php echo out( xl( 'Actions' ) ); ?>
-                    <a href="index.php?action=edit!add_action&id=<?php echo out( $rule->id ); ?>&group_id=<?php echo $nextGroupId; ?>" class="action_link">
+                    <a href="index.php?action=edit!add_action&id=<?php echo out( $rule->id ); ?>&group_id=<?php echo $nextGroupId; ?>" class="action_link" onclick="top.restoreSession()">
                         (<?php echo out( xl( 'add' ) ); ?>)
                     </a>
                 </p>
@@ -227,4 +227,4 @@ class="action_link">
     
     </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/interface/super/rules/controllers/edit/template/criteria.php b/interface/super/rules/controllers/edit/template/criteria.php
index 16fa6220f77..226766dd6ab 100644
--- a/interface/super/rules/controllers/edit/template/criteria.php
+++ b/interface/super/rules/controllers/edit/template/criteria.php
@@ -29,17 +29,17 @@
   <tr>
         <td class="title"><?php echo out( xl( 'Rule Edit' ) ); ?></td>
         <td>
-            <a href="index.php?action=detail!view&id=<?php echo out( $rule->id ); ?>" class="iframe_medium css_button">
+            <a href="index.php?action=detail!view&id=<?php echo out( $rule->id ); ?>" class="iframe_medium css_button" onclick="top.restoreSession()">
                 <span><?php echo out( xl( 'Cancel' ) ); ?></span>
             </a>
-            <a href="javascript:;" class="iframe_medium css_button" id="btn_save"><span><?php echo out( xl( 'Save' ) ); ?></span></a>
+            <a href="javascript:;" class="iframe_medium css_button" id="btn_save" onclick="top.restoreSession()"><span><?php echo out( xl( 'Save' ) ); ?></span></a>
         </td>
   </tr>
 </table>
 
 <div class="rule_detail edit text">
 
-    <form action="index.php?action=edit!submit_criteria" method="post" id="frm_submit">
+    <form action="index.php?action=edit!submit_criteria" method="post" id="frm_submit" onsubmit="return top.restoreSession()">
     <input type="hidden" name="id" value="<?php echo out( $rule->id ); ?>"/>
     <input type="hidden" name="group_id" value="<?php echo out( $criteria->groupId ); ?>"/>
     <input type="hidden" name="guid" value="<?php echo out( $criteria->guid ); ?>"/>
@@ -64,4 +64,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/interface/super/rules/controllers/edit/view/action.php b/interface/super/rules/controllers/edit/view/action.php
index 1eef09fef78..2d4d4b77b0a 100644
--- a/interface/super/rules/controllers/edit/view/action.php
+++ b/interface/super/rules/controllers/edit/view/action.php
@@ -23,10 +23,10 @@
   <tr>
         <td class="title"><?php echo out( xl( 'Rule Edit' ) ); ?></td>
         <td>
-            <a href="index.php?action=detail!view&id=<?php echo $action->id ?>" class="iframe_medium css_button">
+            <a href="index.php?action=detail!view&id=<?php echo $action->id ?>" class="iframe_medium css_button" onclick="top.restoreSession()">
                 <span><?php echo out( xl( 'Cancel' ) ); ?></span>
             </a>
-            <a href="javascript:;" class="iframe_medium css_button" id="btn_save"><span><?php echo out( xl('Save' ) );  ?></span></a>
+            <a href="javascript:;" class="iframe_medium css_button" id="btn_save" onclick="top.restoreSession()"><span><?php echo out( xl('Save' ) );  ?></span></a>
         </td>
   </tr>
 </table>
@@ -34,7 +34,7 @@
 <div class="rule_detail edit text">
     <p class="header"><?php echo out( xl( 'Action' ) ); ?> </p>
 
-    <form action="index.php?action=edit!submit_action" method="post" id="frm_submit">
+    <form action="index.php?action=edit!submit_action" method="post" id="frm_submit" onsubmit="return top.restoreSession()">
     <input type="hidden" name="guid" value="<?php echo out( $action->guid ); ?>"/>
     <input type="hidden" name="group_id" value="<?php echo out( $action->groupId ); ?>"/>
     <input type="hidden" name="id" value="<?php echo out( $action->id ); ?>"/>
@@ -47,7 +47,7 @@
                                    "name" => "fld_category_lbl",
                                    "title" => xl("Category"),
                                    "value" => out( $action->getCategoryLabel() ) ) ); ?>
-    <br/><a href="javascript:;" id="change_category">(change)</a>
+    <br/><a href="javascript:;" id="change_category" onclick="top.restoreSession()">(change)</a>
     <input type="hidden" id="fld_category" name="fld_category" value="<?php echo out( $action->category ); ?>" />
 
     <!-- item -->
@@ -55,7 +55,7 @@
                                    "name" => "fld_item_lbl",
                                    "title" => xl("Item"),
                                    "value" => out( $action->getItemLabel() ) ) ); ?>
-    <br/><a href="javascript:;" id="change_item">(change)</a>
+    <br/><a href="javascript:;" id="change_item" onclick="top.restoreSession()">(change)</a>
     <input type="hidden" id="fld_item" name="fld_item" value="<?php echo out( $action->item ); ?>" />
 
     <!-- reminder link  -->
diff --git a/interface/super/rules/controllers/edit/view/add_criteria.php b/interface/super/rules/controllers/edit/view/add_criteria.php
index a070d1ff86b..078e6efddfc 100644
--- a/interface/super/rules/controllers/edit/view/add_criteria.php
+++ b/interface/super/rules/controllers/edit/view/add_criteria.php
@@ -17,7 +17,7 @@
   <tr>
         <td class="title"><?php echo out( xl( 'Rule Edit' ) ); ?></td>
         <td>
-            <a href="index.php?action=detail!view&id=<?php echo out( $ruleId ); ?>" class="iframe_medium css_button">
+            <a href="index.php?action=detail!view&id=<?php echo out( $ruleId ); ?>" class="iframe_medium css_button" onclick="top.restoreSession()">
                 <span><?php echo out( xl( 'Cancel' ) ); ?></span>
             </a>
         </td>
@@ -29,10 +29,10 @@
     <ul>
     <?php foreach ( $allowed as $type ) { ?>
         <li>
-        <a href="index.php?action=edit!choose_criteria&id=<?php echo out( $ruleId ); ?>&group_id=<?php echo out( $groupId ); ?>&type=<?php echo out( $viewBean->type ); ?>&criteriaType=<?php echo out( $type->code ); ?>">
+        <a href="index.php?action=edit!choose_criteria&id=<?php echo out( $ruleId ); ?>&group_id=<?php echo out( $groupId ); ?>&type=<?php echo out( $viewBean->type ); ?>&criteriaType=<?php echo out( $type->code ); ?>" onclick="top.restoreSession()">
             <?php echo out( xl( $type->lbl ) ); ?>
         </a>
         </li>
     <?php } ?>
     </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/interface/super/rules/controllers/edit/view/bucket.php b/interface/super/rules/controllers/edit/view/bucket.php
index b00aec2fae6..6e4217ccdf0 100644
--- a/interface/super/rules/controllers/edit/view/bucket.php
+++ b/interface/super/rules/controllers/edit/view/bucket.php
@@ -20,7 +20,7 @@
                                "name" => "fld_category_lbl",
                                "title" => xl("Category"),
                                "value" => $criteria->getCategoryLabel() ) ); ?>
-<br/><a href="javascript:;" id="change_category">(change)</a>
+<br/><a href="javascript:;" id="change_category" onclick="top.restoreSession()">(change)</a>
 <input type="hidden" id="fld_category" name="fld_category" value="<?php echo $criteria->category?>" />
 
 <!-- item -->
@@ -28,7 +28,7 @@
                                "name" => "fld_item_lbl",
                                "title" => xl("Item"),
                                "value" => $criteria->getItemLabel() ) ); ?>
-<br/><a href="javascript:;" id="change_item">(change)</a>
+<br/><a href="javascript:;" id="change_item" onclick="top.restoreSession()">(change)</a>
 <input type="hidden" id="fld_item" name="fld_item" value="<?php echo out( $criteria->item ); ?>" />
 
 <!-- completed -->
@@ -66,4 +66,4 @@
 <br/>
 
 <!-- optional/required and inclusion/exclusion fields -->
-<?php echo common_fields( array( "criteria" => $criteria) ); ?>
\ No newline at end of file
+<?php echo common_fields( array( "criteria" => $criteria) ); ?>
diff --git a/interface/super/rules/controllers/edit/view/intervals.php b/interface/super/rules/controllers/edit/view/intervals.php
index fc301bce949..cbe642ca2bb 100644
--- a/interface/super/rules/controllers/edit/view/intervals.php
+++ b/interface/super/rules/controllers/edit/view/intervals.php
@@ -11,10 +11,10 @@
   <tr>
         <td class="title"><?php echo out( xl( 'Rule Edit' ) ); ?></td>
         <td>
-            <a href="index.php?action=detail!view&id=<?php echo out( $rule->id ); ?>" class="iframe_medium css_button">
+            <a href="index.php?action=detail!view&id=<?php echo out( $rule->id ); ?>" class="iframe_medium css_button" onclick="top.restoreSession()">
                 <span><?php echo out( xl( 'Cancel' ) ); ?></span>
             </a>
-            <a href="javascript:;" class="iframe_medium css_button" id="btn_save"><span><?php echo out( xl( 'Save' ) ); ?></span></a>
+            <a href="javascript:;" class="iframe_medium css_button" id="btn_save" onclick="top.restoreSession()"><span><?php echo out( xl( 'Save' ) ); ?></span></a>
         </td>
   </tr>
 </table>
@@ -22,7 +22,7 @@
 <div class="rule_detail edit text">
     <p class="header"><?php echo out( xl( 'Reminder intervals' ) ); ?> </p>
 
-    <form action="index.php?action=edit!submit_intervals" method="post" id="frm_submit">
+    <form action="index.php?action=edit!submit_intervals" method="post" id="frm_submit" onsubmit="return top.restoreSession()">
     <input type="hidden" name="id" value="<?php echo out( $rule->id ); ?>"/>
 
     <div class="intervals">
diff --git a/interface/super/rules/controllers/edit/view/summary.php b/interface/super/rules/controllers/edit/view/summary.php
index 2d586eece54..e0ff4805daa 100644
--- a/interface/super/rules/controllers/edit/view/summary.php
+++ b/interface/super/rules/controllers/edit/view/summary.php
@@ -17,10 +17,10 @@
   <tr>
         <td class="title"><?php echo $rule->id ? out( xl( 'Rule Edit' ) ) : out( xl( 'Rule Add' ) ); ?></td>
         <td>
-            <a href="index.php?action=detail!view&id=<?php echo out( $rule->id ); ?>" class="iframe_medium css_button">
+            <a href="index.php?action=detail!view&id=<?php echo out( $rule->id ); ?>" class="iframe_medium css_button" onclick="top.restoreSession()">
                 <span><?php echo out( xl( 'Cancel' ) ); ?></span>
             </a>
-            <a href="javascript:;" class="iframe_medium css_button" id="btn_save"><span><?php echo out( xl( 'Save' ) ); ?></span></a>
+            <a href="javascript:;" class="iframe_medium css_button" id="btn_save" onclick="top.restoreSession()"><span><?php echo out( xl( 'Save' ) ); ?></span></a>
         </td>
   </tr>
 </table>
@@ -28,7 +28,7 @@
 <div class="rule_detail edit summry text">
     <p class="header"><?php echo out( xl( 'Summary' ) ); ?> </p>
 
-    <form action="index.php?action=edit!submit_summary" method="post" id="frm_submit">
+    <form action="index.php?action=edit!submit_summary" method="post" id="frm_submit" onsubmit="return top.restoreSession()">
     <input type="hidden" name="id" value="<?php echo out( $rule->id ); ?>"/>
 
     <p class="row">