Changeset 547

Timestamp:

Jun 9, 2010, 1:11:31 PM (12 years ago)

Author:

vinlud

Message:

Base simpleQuery

Location:

trunk

Files:

• grails-app/controllers/dbnp/query/SimpleQueryController.groovy (modified) (3 diffs)
• grails-app/taglib/dbnp/simpleQuery (added)
• grails-app/views/simpleQuery/common/_query.gsp (modified) (3 diffs)
• web-app/css/simpleQuery.css (modified) (1 diff)
• web-app/js/simpleQuery.js (modified) (1 diff)

trunk/grails-app/controllers/dbnp/query/SimpleQueryController.groovy

@@ -15 +15 @@
 package dbnp.query
 
+import dbnp.data.*
+import dbnp.studycapturing.Study
+import org.compass.core.engine.SearchEngineQueryParseException
+
 class SimpleQueryController {
         /**
@@ -22 +26 @@
       redirect( action:'pages')
     }
+
+    def searchableService
 
     def pagesFlow = {
@@ -36 +42 @@
                 query {
                         render(view: "/simpleQuery/mainPage")
+            onRender {
+              println "Rendering mainPage"
+            }
+            on("addCompound") {
+                println "addCompound"              
+            }.to "query"
+
+            on("addTransciptome") {
+              println "addTransciptome"
+            }.to "query"
+
+            on("search") {
+              println "Search!"
+              println params
+              if (!params.term.trim()) {
+                return [:]
+              }
+              
+              flow.term = params.term
+            }.to "results"
+
+            on("refresh").to "query"
                 }
+
+        results {
+            def results
+
+            render(view: "/simpleQuery/mainPage")
+            onRender {
+              println "Rendering resultPage"
+              println flow.term
+
+
+
+              Study.findAll().each() {
+                println it
+              }
+            }
+
+            on("search").to "searching"
+            on("refresh").to "results"
+        }
+
+        searching {
+           action {
+              try {
+                println searchableService.search(params.q)
+              } catch (SearchEngineQueryParseException ex) {
+                return [parseException: true]
+              }
+           } on("success").to ("query")
+        }
     }
+  
+
+
+
+
 }

trunk/grails-app/views/simpleQuery/common/_query.gsp

@@ -8 +8 @@
 <div id="simpleQuery" class="simplequery">
         <h1>Simple Query</h1>
-
-    
 
     <g:form action="pages" name="simpleQueryForm" id="simpleQueryForm">
@@ -27 +25 @@
     </div>
     <g:submitButton name="search" value="Search" />
+    </g:form>
 
     <br><br>
@@ -34 +33 @@
       <h3><a href="#">Clinical Data</a></h3>
       <div class="element">
+        <g:form action="pages" name="addCompound" id="addCompound">
         <div class="description">Compound (e.g. 'glucose')</div>
         <div class="input"><g:textField name="compound" value="" /></div>
         <div class="description">Value</div>
         <div class="input"><g:textField name="compound_value" value="" /></div>
-        <g:submitButton name="add_compound" value="Add compound" />
+        <g:submitButton id="addCompound" name="addCompound" value="Add compound" />
+        </g:form>
       </div>
 
       <h3><a href="#">Transcriptomics</a></h3>
+
       <div class="element">
+        <g:form action="pages" name="addTransciptome" id="addTransciptome">
         <div class="description">List of Gene IDs or pathway IDs</div>
         <div class="input"><g:textField name="genepath" value="" /></div>
         <div class="description">Type of regulations</div>
         <div class="input"><g:select name="regulation" from="" value="${regulation}" noSelection="['':'--- select regulation ---']"/></div>
-        <g:submitButton name="add_transciptome" value="Add transciptome" />
+        <g:submitButton id="addTransciptome" name="addTransciptome" value="Add transciptome" />
+        </g:form>
       </div>
-      
-      <h3><a href="#">Metabolomics</a></h3>
-      <div>boe boe boe</div>
     </div>
 
-    </g:form>
+    <br><br>
+
+    <g:if test="${term}">
+        <div class="table">
+          Search results for term ${term}
+
+        <g:each var="tmpStudy" in="${studies}">
+            <g:set var="study" value="${tmpStudy.getValue()}" />
+            <div class="row">
+              study x
+            </div>
+        </g:each>
+        </div>
+    </g:if>
 
 </div>

trunk/web-app/css/simpleQuery.css

@@ -29 +29 @@
     padding: 2px 4px;
 }
+
+.table {
+    display: block;
+    border: 1px solid #575a5d;
+    background-color: #ebf7fc;
+    margin-top: 10px;
+    font-size: 11px;
+    overflow: hidden;
+    white-space: nowrap;
+}

trunk/web-app/js/simpleQuery.js

@@ -14 +14 @@
   $(document).ready(function() {
     $("#accordion").accordion({collapsible: true,
-    autoHeight: false,
-    active: false});
+        autoHeight: false,
+        active: false});
+
+    $('#addCompound').submit(function() {
+        alert('Handler for adding compound called');
+        return true;
+    });
+
+    $('#addTransciptome').submit(function() {
+        alert('Handler for adding transcriptome called');
+        return true;
+    });
   });
-