Changeset 148

Timestamp:

Jan 29, 2010, 12:51:25 PM (13 years ago)

Author:

ademcan

Message:

reorganization of the study views : template and protocol views in the accordion menu

Location:

trunk/grails-app

Files:

• conf/BootStrap.groovy (modified) (1 diff)
• views/study/list.gsp (modified) (1 diff)
• views/study/list_extended.gsp (modified) (2 diffs)
• views/study/show.gsp (modified) (3 diffs)

trunk/grails-app/conf/BootStrap.groovy

@@ -140 +140 @@
                         }
 
-                        new Study(title:"example",code:"Excode",researchQuestion:"ExRquestion",description:"Exdescription",ecCode:"ExecCode",dateCreated:new Date(),lastUpdated:new Date(),startDate:new Date()).save()
-                        new Study(title:"testAgain",code:"testcode",researchQuestion:"testRquestion",description:"testdescription",ecCode:"testCode",dateCreated:new Date(),lastUpdated:new Date(),startDate:new Date()).save()
-                        new Study(title:"Exampletest",code:"Examplecode",researchQuestion:"ExampleRquestion",description:"Exampledescription",ecCode:"ExampleecCode",dateCreated:new Date(),lastUpdated:new Date(),startDate:new Date()).save()
+
+                        def secondStudy = new Study(
+                                title:"NuGO PPS1 mouse study leptin module",
+                                code:"PPS1",
+                                researchQuestion:"etc.",
+                                description:"C57Bl/6 mice were fed a high fat (45 en%) or low fat (10 en%) diet after a four week run-in on low fat diet. After 1 week 10 mice that received a low fat diet were given an IP leptin challenge and 10 mice of the low-fat group received placebo injections. The same procedure was performed with mice that were fed the high-fat diet. After 4 weeks the procedure was repeated. In total 80 mice were culled.",
+                                ecCode:"2007.c",
+                                startDate: Date.parse('yyyy-MM-dd','2007-12-11'),
+                                template: mouseTemplate
+                        ).with { if (!validate()) { errors.each { println it} } else save()}
+
+                        def y=1
+                        5.times {
+                                def currentSubject = new Subject(
+                                        name: "A" + y++,
+                                        species: mouseTerm,
+                                        template: mouseTemplate,
+                                        templateStringFields: ["Genotype" : "C57/Bl6j", "Gender" : "Male"],
+                                        templateIntegerFields: ["Age" : 17, "Cage" : (int)(y/2)]
+                                ).with { if (!validate()) { errors.each { println it} } else save()}
+
+                                secondStudy.addToSubjects(currentSubject)
+                                .addToEvents(new Event(
+                                        subject: currentSubject,
+                                        startTime: Date.parse('yyyy-MM-dd','2008-01-07'),
+                                        endTime: Date.parse('yyyy-MM-dd','2008-01-14'),
+                                        eventDescription: eventTreatment,
+                                        parameterStringValues: ['Diet':'10% fat (palm oil)','Compound':'Vehicle','Administration':'intraperitoneal injection'])
+                                ).with { if (!validate()) { errors.each { println it} } else save()}
+                        }
+
+//                        new Study(title:"example",code:"Excode",researchQuestion:"ExRquestion",description:"Exdescription",ecCode:"ExecCode",dateCreated:new Date(),lastUpdated:new Date(),startDate:new Date()).save()
+//                        new Study(title:"testAgain",code:"testcode",researchQuestion:"testRquestion",description:"testdescription",ecCode:"testCode",dateCreated:new Date(),lastUpdated:new Date(),startDate:new Date()).save()
+//                        new Study(title:"Exampletest",code:"Examplecode",researchQuestion:"ExampleRquestion",description:"Exampledescription",ecCode:"ExampleecCode",dateCreated:new Date(),lastUpdated:new Date(),startDate:new Date()).save()
                 }
         }

trunk/grails-app/views/study/list.gsp

@@ -10 +10 @@
 <body>
 
- <!--g:form url="[action:'list_extended',controller:'study']"-->
   <g:form action="list_extended.gsp">
 

trunk/grails-app/views/study/list_extended.gsp

@@ -44 +44 @@
      <% }} %>
 
+    <% if (selectedStudies.size()>0) {%>
 
     <div id="tabs">
@@ -51 +52 @@
       </g:each>
       </ul>
-
       <g:each in="${selectedStudies}" status="i" var="studyIns">
-
-        
       <div id="${studyIns}">
         <g:each in="${att_list}" status="s" var="attribute">
               ${message(code: 'study.id.'+attribute , default: attribute)} :
-              ${fieldValue(bean: studyIns, field: attribute)}
-                            <br>
+              ${fieldValue(bean: studyIns, field: attribute)}<br>
         </g:each>
       </div>
-
         </g:each>
     </div>
+
+    <% } %>
+    
+     <% if (selectedStudies.size()==0) {%>
+    Please select studies to compare.
+    <% } %>
 
     </div>

trunk/grails-app/views/study/show.gsp

@@ -28 +28 @@
   </g:if>
   <div class="dialog">
+
+    <% protocolList = dbnp.studycapturing.Protocol.list() %>
 
     <div id="accordion">
@@ -64 +66 @@
           <tr>
             <td><b>Id </b></td>
-            <td><b>Template Integer Fields</b></td>
             <td><b>Species</b></td>
-            <td><b>Template Term Fields</b></td>
             <td><b>Name</b></td>
-            <td><b>Template Float Fields</b></td>
-            <td><b>Template String Fields</b></td>
+          <g:each in="${studyInstance.template.subjectFields}" var="g">
+            <td><b>
+              <g:link controller="templateSubjectField" action="show" id="${g.id}">
+              ${g}</b></td>
+            </g:link>
+          </g:each>
           </tr>
+
           <g:each in="${studyInstance.subjects}" var="s">
             <tr>
               <td><g:link controller="subject" action="show" id="${s.id}">${s.id}</g:link></td>
-              <td>${s.templateIntegerFields}</td>
               <td>${s.species}</td>
-              <td>${s.templateTermFields}</td>
               <td>${s.name}</td>
-              <td>${s.templateFloatFields}</td>
-              <td>${s.templateStringFields}</td>
+
+                <g:each in="${studyInstance.template.subjectFields}" var="g">
+               <td>
+              <% if (g.type==dbnp.studycapturing.TemplateFieldType.INTEGER){ %>
+                  <% print s.templateIntegerFields.get(g.toString())  %>
+              <% } %>
+               <% if (g.type==dbnp.studycapturing.TemplateFieldType.STRINGLIST){ %>
+                <% print s.templateStringFields.get(g.toString())  %>
+              <% } %>
+
+            </td>
+          </g:each>
           </tr>
           </g:each>
@@ -99 +112 @@
             <td><b>Reference</b></td>
           </tr>
-          <g:each in="${studyInstance.events.eventDescription.protocol}" var="s">
+          <g:each in="${protocolList}" var="s">
             <tr>
               <td><g:link controller="protocol" action="show" id="${s.id}">${s.id}</g:link></td>
           <td>${s.name}</td>
           <td>
-          <g:each in="${s.parameters}" var="p">
+          <g:each in="${s.parameters}" var="p"><ul><li>
             <g:link controller="protocolParameter" action="show" id="${p.id}">${p.name}</g:link>
+            </li></ul>
           </g:each>
           </td>