Changeset 269
- Timestamp:
- Mar 15, 2010, 10:40:37 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
-
application.properties (modified) (1 diff)
-
grails-app/conf/BootStrap.groovy (modified) (4 diffs)
-
grails-app/controllers/dbnp/studycapturing/StudyController.groovy (modified) (2 diffs)
-
grails-app/domain/dbnp/studycapturing/Template.groovy (modified) (2 diffs)
-
grails-app/views/study/list_extended.gsp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/application.properties
r222 r269 13 13 plugins.shiro=1.0.1 14 14 plugins.tomcat=1.2.1 15 plugins.webflow=1.2. 015 plugins.webflow=1.2.1 -
trunk/grails-app/conf/BootStrap.groovy
r266 r269 161 161 162 162 def ageField = new TemplateField( 163 name: 'Age ',type: TemplateFieldType.INTEGER)163 name: 'Age (years)',type: TemplateFieldType.INTEGER,unit: 'years') 164 164 .with { if (!validate()) { errors.each { println it} } else save()} 165 165 166 166 // Nutritional study template 167 167 168 println "Adding academic study template..." 168 169 def studyTemplate = new Template( 169 name: 'Nutritional study', entity: dbnp.studycapturing.Study 170 ).addToFields(new TemplateField( 171 name: 'NuGO Code',type: TemplateFieldType.STRING) 172 ).with { if (!validate()) { errors.each { println it} } else save()} 173 170 name: 'Academic study', entity: dbnp.studycapturing.Study) 171 .addToFields(new TemplateField(name: 'Consortium',type: TemplateFieldType.STRING)) 172 .addToFields(new TemplateField(name: 'Cohort name',type: TemplateFieldType.STRING)) 173 .addToFields(new TemplateField(name: 'Time zone',type: TemplateFieldType.STRING)) 174 .addToFields(new TemplateField(name: 'Responsible scientist',type: TemplateFieldType.STRING)) 175 .addToFields(new TemplateField(name: 'Lab code',type: TemplateFieldType.STRING)) 176 .addToFields(new TemplateField(name: 'Institute',type: TemplateFieldType.STRING)) 177 .with { if (!validate()) { errors.each { println it} } else save()} 174 178 175 179 // Mouse template 176 180 def mouseTemplate = new Template( 177 name: 'Mouse', entity: dbnp.studycapturing.Subject 178 ).addToFields(new TemplateField( 179 name: 'Genotype',type: TemplateFieldType.STRINGLIST, 180 listEntries: [new TemplateFieldListItem(name:'C57/Bl6j'),new TemplateFieldListItem(name:'wild type')])) 181 name: 'Mouse', entity: dbnp.studycapturing.Subject) 182 .addToFields(new TemplateField( 183 name: 'Strain', type: TemplateFieldType.ONTOLOGYTERM)) 184 .addToFields(new TemplateField( 185 name: 'Genotype', type: TemplateFieldType.STRING)) 186 .addToFields(new TemplateField( 187 name: 'Genotype type',type: TemplateFieldType.STRINGLIST, 188 listEntries: [new TemplateFieldListItem(name:'transgenic'),new TemplateFieldListItem(name:'knock-out'),new TemplateFieldListItem(name:'knock-in')])) 181 189 .addToFields(genderField) 182 .addToFields(ageField) 183 .addToFields(new TemplateField( 184 name: 'Cage',type: TemplateFieldType.INTEGER)) 185 .addToFields(new TemplateField( 186 name: 'SomeDouble', type: TemplateFieldType.DOUBLE)) 190 .addToFields(new TemplateField( 191 name: 'Age (weeks)', type: TemplateFieldType.INTEGER, unit: 'weeks')) 192 .addToFields(new TemplateField( 193 name: 'Age type',type: TemplateFieldType.STRINGLIST, 194 listEntries: [new TemplateFieldListItem(name:'postnatal'),new TemplateFieldListItem(name:'embryonal')])) 195 .addToFields(new TemplateField( 196 name: 'Cage',type: TemplateFieldType.STRING)) 197 .addToFields(new TemplateField( 198 name: '#Mice in cage',type: TemplateFieldType.INTEGER)) 199 .addToFields(new TemplateField( 200 name: 'Litter size',type: TemplateFieldType.INTEGER)) 201 .addToFields(new TemplateField( 202 name: 'Weight (g)', type: TemplateFieldType.DOUBLE, unit: 'gram')) 187 203 .addToFields(new TemplateField( 188 204 name: 'SomeOntology', type: TemplateFieldType.ONTOLOGYTERM)) … … 197 213 name: 'DOB',type: TemplateFieldType.DATE)) 198 214 .addToFields(new TemplateField( 199 name: 'Height',type: TemplateFieldType.DOUBLE)) 200 .addToFields(new TemplateField( 201 name: 'Weight',type: TemplateFieldType.DOUBLE)) 202 .addToFields(new TemplateField( 203 name: 'BMI',type: TemplateFieldType.DOUBLE)) 215 name: 'Height',type: TemplateFieldType.DOUBLE, unit: 'm')) 216 .addToFields(new TemplateField( 217 name: 'Weight (kg)',type: TemplateFieldType.DOUBLE, unit: 'kg')) 218 .addToFields(new TemplateField( 219 name: 'BMI',type: TemplateFieldType.DOUBLE, unit: 'kg/m2')) 220 .addToFields(new TemplateField( 221 name: 'Race',type: TemplateFieldType.STRING)) 222 .addToFields(new TemplateField( 223 name: 'Waist circumvence',type: TemplateFieldType.FLOAT, unit: 'cm')) 224 .addToFields(new TemplateField( 225 name: 'Hip circumvence',type: TemplateFieldType.FLOAT, unit: 'cm')) 226 .addToFields(new TemplateField( 227 name: 'Systolic blood pressure',type: TemplateFieldType.FLOAT, unit: 'mmHg')) 228 .addToFields(new TemplateField( 229 name: 'Diastolic blood pressure',type: TemplateFieldType.FLOAT, unit: 'mmHg')) 230 .addToFields(new TemplateField( 231 name: 'Heart rate',type: TemplateFieldType.FLOAT, unit: 'beats/min')) 232 .addToFields(new TemplateField( 233 name: 'Run-in-food',type: TemplateFieldType.TEXT)) 234 .with { if (!validate()) { errors.each { println it} } else save()} 235 236 237 // Human sample template 238 def humanSampleTemplate = new Template( 239 name: 'Human tissue sample', entity: dbnp.studycapturing.Sample) 240 .addToFields(new TemplateField( 241 name: 'Description',type: TemplateFieldType.TEXT)) 242 .addToFields(new TemplateField( 243 name: 'SampleType',type: TemplateFieldType.STRING)) 244 .addToFields(new TemplateField( 245 name: 'SampleProtocol',type: TemplateFieldType.STRING)) 246 .addToFields(new TemplateField( 247 name: 'Text on vial',type: TemplateFieldType.STRING)) 204 248 .with { if (!validate()) { errors.each { println it} } else save()} 205 249 … … 391 435 .setFieldValue("Gender", "Male") 392 436 .setFieldValue("Genotype", "C57/Bl6j") 393 .setFieldValue("Age ", 17)394 .setFieldValue("Cage", (int)(x/2))437 .setFieldValue("Age (weeks)", 17) 438 .setFieldValue("Cage", "" + (int)(x/2)) 395 439 .with { if (!validate()) { errors.each { println it} } else save()} 396 440 … … 456 500 name: "" + y++, 457 501 species: humanTerm, 458 template: humanTemplate).setFieldValue("Gender", (boolean) (x / 2) ? "Male" : "Female").setFieldValue("DOB", new java.text.SimpleDateFormat("dd-mm-yy").parse("01-02-19" + (10 + (int) (Math.random() * 80)))).setFieldValue("Age ", 30).setFieldValue("Height", Math.random() * 2F).setFieldValue("Weight", Math.random() * 150F).setFieldValue("BMI", 20 + Math.random() * 10F).with { if (!validate()) { errors.each { println it} } else save()}502 template: humanTemplate).setFieldValue("Gender", (boolean) (x / 2) ? "Male" : "Female").setFieldValue("DOB", new java.text.SimpleDateFormat("dd-mm-yy").parse("01-02-19" + (10 + (int) (Math.random() * 80)))).setFieldValue("Age (years)", 30).setFieldValue("Height", Math.random() * 2F).setFieldValue("Weight (kg)", Math.random() * 150F).setFieldValue("BMI", 20 + Math.random() * 10F).with { if (!validate()) { errors.each { println it} } else save()} 459 503 460 504 rootGroup.addToSubjects currentSubject -
trunk/grails-app/controllers/dbnp/studycapturing/StudyController.groovy
r253 r269 12 12 params.max = Math.min(params.max ? params.int('max') : 10, 100) 13 13 [studyInstanceList: Study.list(params), studyInstanceTotal: Study.count()] 14 } 15 16 def list_extended = { 17 params.max = Math.min(params.max ? params.int('max') : 10, 100) 18 [studyList: Study.list(params), studyInstanceTotal: Study.count()] 14 19 } 15 20 … … 41 46 } 42 47 } 48 43 49 44 50 /*def edit = { -
trunk/grails-app/domain/dbnp/studycapturing/Template.groovy
r247 r269 19 19 20 20 static constraints = { 21 name(unique:['entity']) 21 22 // outcommented for now due to bug in Grails / Hibernate 23 // see http://jira.codehaus.org/browse/GRAILS-6020 24 // name(unique:['entity']) 22 25 } 23 26 … … 61 64 public static findAllByEntity(java.lang.Class entity) { 62 65 def results = [] 63 66 println "Searching for" + entity 64 67 // 'this' should not work in static context, however it does so I'll keep 65 68 // this in for now :) -
trunk/grails-app/views/study/list_extended.gsp
r247 r269 1 2 1 <%@ page import="dbnp.studycapturing.Study" %> 3 2 <html> … … 8 7 <title><g:message code="default.list.label" args="[entityName]" /></title> 9 8 10 <my:jqueryui/>11 9 <script type="text/javascript"> 12 10 $(function() { … … 290 288 <tr> 291 289 <td><g:link controller="event" action="show" id="${e.id}"> ${e.eventDescription.name}</g:link></td> 292 <td> ${e.subject.id}</td>290 <td>?</td> 293 291 <td>${e.getPrettyDuration(stud.startDate,e.startTime)}</td> 294 292 <td>${e.getPrettyDuration()}</td> … … 305 303 <tr> 306 304 <td><g:link controller="event" action="show" id="${e.id}">${e.eventDescription.name}</g:link></td> 307 <td> ${e.subject.id}</td>305 <td>?</td> 308 306 <td>${e.getPrettyDuration(stud.startDate,e.startTime)}</td> 309 307 <td>${e.getPrettyDuration()}</td>
Note: See TracChangeset
for help on using the changeset viewer.
