Changeset 2144

Timestamp:

Nov 19, 2013, 10:13:28 AM (10 years ago)

Author:

olle

Message:

Refs #534. Case summary updated to use an input personal number instead of a case name, provided the user has sufficient permissions to do so:

1. Java servlet CaseSummaryServlet.java in reggie/src/net/sf/basedb/reggie/servlet/ updates:
   a. Protected method void doGet(HttpServletRequest req, HttpServletResponse resp) should be updated for command "GetCaseInfo" to call new private method boolean caseNameIsValid(String caseName, boolean allowSuffix) to check if the input string is a valid case name, and if not, perform a search for a patient record with the input string used as a potential personal number. If a patient record is found, a new search is performed to find a case for the patient. If more than one case are found, the first found case is used. If a case name is found from an input personal number, case and patient data that has already been found, should not be obtained again from the case name, in order to speed up the database search.
   b. New private method boolean caseNameIsValid(String caseName, boolean allowSuffix) added. It checks if the input string is a 7-digit value + optional 'C' suffix.
   
   
2. JSP script case_summary.jsp in reggie/resources/reports/ updates:
   a. Variable caseName is made a global variable, in order for its value to be accessible for the print dialog header line, in case a personal number is used as input.
   b. Function init() should be updated to used the case name returned from the servlet request, as the former may have been found from an input personal number. Header texts for main web page and pop-up window should be updated to use the potentially changed case name.
   c. Function goPrint() should update the header text in the print dialog to use the potentially changed case name.
   
   
3. Java data access object Case.java in reggie/src/net/sf/basedb/reggie/dao/ updated in JavaDoc comment for public static method List<Case> findByPatient(DbControl dc, Patient patient) to note that the returned list is sorted in ascending order after case name.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/reports/case_summary.jsp (modified) (6 diffs)
• src/net/sf/basedb/reggie/dao/Case.java (modified) (1 diff)
• src/net/sf/basedb/reggie/servlet/CaseSummaryServlet.java (modified) (6 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/reports/case_summary.jsp

@@ -74 +74 @@
 var debug = false;
 var ID = '<%=ID%>';
+var caseName= '';
 
 var TRUNCATE_SIZE = [-1, 30, 20, 15];
@@ -296 +297 @@
   if (frm.caseName) frm.caseName.focus();
   
-  var caseName = '<%=HTML.javaScriptEncode(caseName)%>';
+  caseName = '<%=HTML.javaScriptEncode(caseName)%>';
   var isAdmin = <%=isAdmin ? "true" : "false"%>;
   var isPatientCurator = <%=isPatientCurator ? "true" : "false"%>;
@@ -303 +304 @@
   url += '&caseName=<%=HTML.urlEncode(caseName)%>';
   var request = Ajax.getXmlHttpRequest();
-  request.open("GET", url, false); 
+  request.open("GET", url, false);
   request.send(null);
   
@@ -324 +325 @@
   if (caseInfo)
   {
+    // Use returned case name, as it may have been found from personal number
+    caseName = caseInfo.name;
+    // Update header text to use the potentially changed case name
+    if (document.getElementById('path-case-summary') != null)
+    {
+      document.getElementById('path-case-summary').innerHTML = 'Case summary - ' + escape(caseName);
+    }
+    if (document.getElementById('path-case-summary-popup') != null)
+    {
+      document.getElementById('path-case-summary-popup').innerHTML = 'Case summary - ' + escape(caseName);
+    }
     consentOk = !caseInfo.consent || caseInfo.consent == 'Yes';
     addColumn('case.name', makeLink('SAMPLE', caseInfo));
@@ -802 +814 @@
   var printNote = '<b>Note!</b> For better printing set page orientation to <i>portrait</i>.<br>';
   printNote += ' You may have to <i>scale down</i> to fit everything on the width of the page.';
-  openPrintWindow('<%=ID%>', 'all-content', 'Case summary - <%=HTML.encodeTags(caseName)%>', 'portrait', printNote, '../', 'case_summary.css');
+  openPrintWindow('<%=ID%>', 'all-content', 'Case summary - ' + escape(caseName), 'portrait', printNote, '../', 'case_summary.css');
 }
 
@@ -873 +885 @@
   {
     %>
-    <h1>Case summary - <%= HTML.encodeTags(caseName)%></h1>
+    <h1  id="path-case-summary-popup">Case summary - <%= HTML.encodeTags(caseName)%></h1>
     <%
   }

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/Case.java

@@ -102 +102 @@
   /**
     Find all cases linked with a patient. A patient can have 0, 1 or 2
-    cases. If more than two are found an exception is thrown. 
+    cases. If more than two are found an exception is thrown.
+    The cases are sorted in ascending order after case name.
   */
   public static List<Case> findByPatient(DbControl dc, Patient patient)

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/CaseSummaryServlet.java

@@ -5 +5 @@
 import java.util.List;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.servlet.ServletException;
@@ -26 +28 @@
 import net.sf.basedb.core.MeasuredBioMaterial;
 import net.sf.basedb.core.Permission;
+import net.sf.basedb.core.PermissionDeniedException;
 import net.sf.basedb.core.Sample;
 import net.sf.basedb.core.SessionControl;
@@ -90 +93 @@
         
         String caseName = req.getParameter("caseName");
+        // Check if input 'caseName' is valid, or is personal number
+        boolean validCaseName = caseNameIsValid(caseName, true);
+        Patient patient = null;
+        Case theCase = null;
+        List<Case> caseList = null;
+        if (!validCaseName)
+        {
+          // Input 'caseName' may be personal number
+          String potentialPnr = caseName;
+          // Find cases by personal number if user has permission to do so
+          try
+          {
+            patient = Patient.findByPersonalNumber(dc, potentialPnr);
+          }
+          catch (PermissionDeniedException e)
+          {}
+          if (patient != null)
+          {
+            caseList = Case.findByPatient(dc, patient);
+            if (caseList != null && caseList.size() > 0)
+            {
+              // Use lowest case name (a patient can have at most 2 cases)
+              theCase = (Case) caseList.get(0);
+            }
+            if (theCase != null)
+            {
+              // Use case name found from personal number
+              caseName = theCase.getName();
+            }
+          }
+        }
+        
         JSONArray jsonSections = new JSONArray();
         json.put("sections", jsonSections);
@@ -101 +136 @@
         
         // Load case (null if not found) and patient
-        Case theCase = Case.findByName(dc, caseName);
-        Patient patient = null;
+        if (theCase == null)
+        {
+          theCase = Case.findByName(dc, caseName);
+        }
         if (theCase != null) 
         {
@@ -108 +145 @@
           jsonSections.add(loadSectionInfo(sc, "case"));
           json.put("caseInfo", theCase.asJSONObject());
-          patient = Patient.findByCase(dc, theCase);
+          if (patient == null)
+          {
+            patient = Patient.findByCase(dc, theCase);
+          }
         }
 
@@ -346 +386 @@
       json.writeJSONString(resp.getWriter());
     }
+  }
+
+  /*
+    Verify that the 'case' name is a 7-digit value + optional 'C' suffix.
+    
+    @param caseName String Input case name to check.
+    @param allowSuffix boolean Flag indicating if optional 'C' suffix is allowed.
+    @return boolean True if potential case name (not necessarily in database), false otherwise.
+   */
+  private boolean caseNameIsValid(String caseName, boolean allowSuffix)
+  {
+    boolean isValid = false;
+    if (caseName != null)
+    {
+      String regex = allowSuffix ? "^\\d{7}C?$" : "^\\d{7}$";
+      Pattern pattern = Pattern.compile(regex);
+      Matcher matcher = pattern.matcher(caseName);
+      isValid = matcher.matches();
+    }
+    return isValid;
   }