Changeset 2124

Timestamp:

Nov 8, 2013, 8:15:38 AM (10 years ago)

Author:

Nicklas Nordborg

Message:

References #489: Histology scoring wizard

Implemented 'Find HE glass', 'Select HE glass' and menu with uncompleted HE glass functions.

Location:

extensions/net.sf.basedb.reggie/branches/ticket-489

Files:

• resources/sampleproc/histology_score.jsp (modified) (12 diffs)
• src/net/sf/basedb/reggie/servlet/HistologyServlet.java (modified) (2 diffs)

extensions/net.sf.basedb.reggie/branches/ticket-489/resources/sampleproc/histology_score.jsp

@@ -7 +7 @@
   import="net.sf.basedb.core.Application"
   import="net.sf.basedb.clients.web.Base" 
+  import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
   import="java.text.SimpleDateFormat"
@@ -26 +27 @@
   final User user = User.getById(dc, sc.getLoggedInUserId());
   final String today = new SimpleDateFormat("yyyyMMdd").format(new Date());
+  final String name = request.getParameter("name");
 %>
 <base:page type="default" >
@@ -41 +43 @@
 {
   var frm = document.forms['reggie'];
-  heGlass = getHeGlassForScoring();
+  
+  var glassName = '<%=HTML.javaScriptEncode(name)%>'
+  heGlass = getHeGlassForScoring(glassName);
   
   if (heGlass != null && heGlass.length > 0)
@@ -98 +102 @@
   else
   {
-    var msg = 'No HE glass available for scoring.';
-    msg += ' Specify HE glass name above to re-score.';
+    var msg;
+    if (glassName)
+    {
+      msg = 'Could not find HE glass with name: ' + Main.encodeTags(glassName);
+    }
+    else
+    {
+      msg = 'No HE glass available for scoring.';
+      msg += ' Specify HE glass name above to re-score.';
+    }
     setInnerHTML('he-glass-container', '<div class="messagecontainer note">'+msg+'</div>');
     Main.show('he-glass-container');
   }
-}
-
-function getHeGlassForScoring()
+  
+  // Wait a second until loading uncompleted HE glass
+  setTimeout(loadUncompletedHeGlass, 1000);
+}
+
+function findHeGlass(glassName)
+{
+  var frm = document.forms['reggie'];
+  if (!glassName)
+  {
+    glassName = frm.findGlassName.value;
+    if (glassName.match(/^\d+$/))
+    {
+      while (glassName.length < 5)
+      {
+        glassName = '0'+glassName;
+      }
+      glassName = 'HE'+glassName;
+    }
+  }
+  location.href = '<%=home%>/sampleproc/histology_score.jsp?ID=<%=ID%>&name='+encodeURIComponent(glassName);
+}
+
+function selectHeGlass()
+{
+  var url = getRoot() + 'biomaterials/bioplates/index.jsp?ID=<%=ID%>&cmd=UpdateContext&mode=selectone';
+  url += '&resetTemporary=1';
+  url += '&tmpfilter:STRING:name='+encodeURIComponent('HE%');
+  url += '&callback=setSelectedHeGlass'
+  Main.openPopup(url, 'SelectHeGlass', 1050, 700);
+}
+
+function setSelectedHeGlass(id, name)
+{
+  findHeGlass(name);
+}
+
+function getHeGlassForScoring(glassName)
 {
   var frm = document.forms['reggie']; 
-  
   var request = Ajax.getXmlHttpRequest();
   try
   {
-    showLoadingAnimation('Loading next HE glass for scoring...');
-    var url = '../Histology.servlet?ID=<%=ID%>&cmd=GetHeGlassToScore';    
+    var msg = glassName ? 'Finding HE glass: '+Main.encodeTags(glassName) : 'Loading next HE glass for scoring...';
+    showLoadingAnimation(msg);
+    var url = '../Histology.servlet?ID=<%=ID%>&cmd=GetHeGlassToScore';
+    if (glassName)
+    {
+      url += '&name='+encodeURIComponent(glassName);
+    }
     request.open("GET", url, false);  
     request.send(null);
@@ -131 +182 @@
   return response.heGlasses;
 }
+
 
 function createHeGlassSection(glass)
@@ -360 +412 @@
 }
 
-function selectHeGlass()
-{
-  var url = getRoot() + 'biomaterials/bioplates/index.jsp?ID=<%=ID%>&cmd=UpdateContext&mode=selectone';
-  url += '&resetTemporary=1';
-  url += '&filter:STRING:name=HE%'; 
-  Main.openPopup(url, 'SelectHeGlass', 1050, 700);
+function loadUncompletedHeGlass()
+{
+  var request = Ajax.getXmlHttpRequest();
+  try
+  {
+    //showLoadingAnimation('Loading next HE glass for scoring...');
+    var url = '../Histology.servlet?ID=<%=ID%>&cmd=GetUncompletedHeGlass';
+    request.open("GET", url, false);  
+    request.send(null);
+  }
+  finally
+  {
+    //hideLoadingAnimation();
+  }
+  
+  if (debug) Main.debug(request.responseText);
+  var response = JSON.parse(request.responseText);  
+  if (response.status == 'ok')
+  {
+    var uncompleted = response.heGlasses;
+    
+    if (uncompleted.length > 0)
+    {
+      // Populate menu item
+      setInnerHTML('uncompletedHeGlass.text', uncompleted.length + ' uncompleted');
+      var html = '';  
+      for (var glassNo = 0; glassNo < uncompleted.length; glassNo++)
+      {
+        var glass = uncompleted[glassNo];
+      
+        html += '<div class="menuitem enabled" id="glass-'+glass.id+'">';
+        html += Main.encodeTags(glass.name)+'</div>';
+      }
+      setInnerHTML('select-uncompleted-heglass-menu', html);
+      Main.show('uncompletedHeGlass');
+    }
+    else
+    {
+      Main.hide('uncompletedHeGlass');
+    }
+  }
+}
+
+function showUncompletedHeGlassMenu(event)
+{
+  var menu = document.getElementById('select-uncompleted-heglass');
+  menu.style.display = 'block';
+  
+  var pos = Main.getElementPosition(document.getElementById('uncompletedHeGlass'));
+  var x = pos.left;
+  var y = pos.top+pos.height;
+
+  menu.style.left = (x)+'px';
+  menu.style.top = (y)+'px';
+  event.stopPropagation();
+}
+
+function uncompletedGlassSelected(event)
+{
+  findHeGlass(event.target.innerHTML);
 }
 </script>
@@ -541 +647 @@
 }
 
+#select-uncompleted-heglass-menu
+{
+  max-height: 20em;
+  overflow: auto;
+}
+
+#select-uncompleted-heglass .menuitem
+{
+  padding-left: 16px;
+}
+
+#select-uncompleted-heglass .menuitem:hover
+{
+  padding-left: 14px;
+  background-position: 0px 50%;
+}
 </style>
 
@@ -551 +673 @@
     /></p:path>
 
-  <div class="content">
+  <div class="content" onclick="Main.hide('select-uncompleted-heglass')">
   <%
   if (sc.getActiveProjectId() == 0)
@@ -563 +685 @@
   }
   %>
+  
+  <div id="select-uncompleted-heglass" class="menu vertical" style="width: 150px; display: none;"
+    onclick="uncompletedGlassSelected(event)">
+    <div id="select-uncompleted-heglass-menu"></div>
+  </div>
+  
   <form name="reggie" onsubmit="return false;">
   
@@ -574 +702 @@
       <tbl:toolbar subclass="bottomborder">
         <tbl:label>
-        <input type="text" style="width: 12em;" placeholder="Find HE glass" tooltip="Enter a HE glass name">
-        <img src="../images/gonext.png">
+        <input type="text" style="width: 12em;" name="findGlassName" 
+          placeholder="Find HE glass" title="Enter a full HE glass name or the last digits in the it's number before the dot"
+          onkeypress="if (event.keyCode==13 && this.value) findHeGlass()"
+          >
+          <base:icon image="<%=home+"/images/gonext.png"%>" onclick="findHeGlass()"></base:icon>
         </tbl:label>
         
-        <tbl:button
-          id="uncompletedHeGlass"
-          title="4 uncompleted HE glass"
-          image="mini_scroll_down.png"
-        />
       
         <tbl:button 
@@ -590 +716 @@
           tooltip="Manually select a different HE glass"
         />
+
+        <tbl:button
+          id="uncompletedHeGlass"
+          title="Loading..."
+          image="mini_scroll_down.png"
+          onclick="showUncompletedHeGlassMenu(event)"
+          tooltip="This list contain HE glass with partial scores"
+        />
+
       </tbl:toolbar>
       
@@ -719 +854 @@
   <table style="margin-left: 20px; margin-top: 10px;" class="navigation" id="navigation">
     <tr>
-      <td><base:button id="gocancel" title="Cancel" onclick="goRestart(false)" /></td>
+      <td><base:button id="gocancel" title="Cancel" onclick="goRestart(false)" style="display: none;" /></td>
       <td><base:button id="gonext" title="Next" image="<%=home+"/images/gonext.png"%>" onclick="goNext(true)" style="display: none;" /></td>
       <td><base:button id="gocreate" title="Save" image="<%=home+"/images/gonext.png"%>" onclick="goCreate()" style="display: none;" /></td>

extensions/net.sf.basedb.reggie/branches/ticket-489/src/net/sf/basedb/reggie/servlet/HistologyServlet.java

@@ -392 +392 @@
         {
           // Now, find all HE glass that are related to the original
-          String prefix = name.substring(0, name.indexOf('.'));
+          int dotIndex = name.indexOf('.');
+          String prefix = dotIndex > 0 ? name.substring(0, dotIndex) : name;
           ItemQuery<BioPlate> query = BioPlate.getQuery();
           query.setIncludes(Reggie.INCLUDE_IN_CURRENT_PROJECT);
@@ -411 +412 @@
         json.put("heGlasses", jsonHeGlasses);
       }
+      else if ("GetUncompletedHeGlass".equals(cmd))
+      {
+        dc = sc.newDbControl();
+        JSONArray jsonHeGlasses = new JSONArray();
+
+        ItemQuery<BioPlate> query = BioPlate.getQuery();
+        query.setIncludes(Reggie.INCLUDE_IN_CURRENT_PROJECT);
+        BioplateType.HE_GLASS.addFilter(dc, query, false);
+        query.join(Annotations.leftJoin(null, Annotationtype.SCORE_COMPLETE.load(dc), "sc"));
+        query.restrict(Restrictions.eq(Hql.alias("sc"), Expressions.bool(false)));
+        query.order(Orders.asc(Hql.property("name")));
+          
+        List<HeGlass> plates = HeGlass.toList(query.list(dc));
+        for (HeGlass heGlass : plates)
+        {
+          jsonHeGlasses.add(heGlass.asJSONObject());
+        }
+        
+        json.put("heGlasses", jsonHeGlasses);
+      }
+      
     }
     catch (Throwable t)