Ignore:
Timestamp:
Oct 11, 2010, 10:23:13 PM (10 years ago)
Author:
t.w.abma@…
Message:
  • Nimble removed, AAAA-plugin installed (based on Spring Security), login panel needs fix still, please login using gscf/login
Location:
trunk/grails-app/domain
Files:
2 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/domain/dbnp/importer/MappingColumn.groovy

    r784 r936  
    2727    }
    2828
     29    static mapping = {
     30            tablePerHierarchy false
     31    }
     32
    2933    String toString() {
    3034        return "Name:" + name + "/TemplateFieldType:" + templatefieldtype + "/Entity:" + entity + "/Property:" + property + "/Index:" + index + "/Value:" + value + "/Identifier:" + identifier
  • trunk/grails-app/domain/dbnp/studycapturing/Identity.groovy

    r798 r936  
    11package dbnp.studycapturing
     2
     3import org.nmcdsp.plugins.aaaa.Entity
    24
    35/**
     
    4143 * $Date$
    4244 */
    43 abstract class Identity implements Serializable {
     45abstract class Identity extends Entity implements Serializable {
    4446        // keep an internal identifier for use in dynamic forms
    4547        private int identifier = 0
  • trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

    r934 r936  
    11package dbnp.studycapturing
    22
    3 import dbnp.user.User
     3import org.nmcdsp.plugins.aaaa.SecUser
    44
    55/**
     
    1616    }
    1717
    18         User owner   // The owner of the study. A new study is automatically owned by its creator.
     18        SecUser owner   // The owner of the study. A new study is automatically owned by its creator.
    1919        String title        // The title of the study
    2020        String code             // currently used as the external study ID, e.g. to reference a study in a SAM module
     
    2222        Date lastUpdated
    2323        Date startDate
    24     List subjects
     24        List subjects
    2525        List events
    2626        List samplingEvents
     
    2929        List assays
    3030
    31         static hasMany = [
    32                 editors: User,   // Users with read/write access to the study
    33                 readers: User,   // Users with only read access to the study
     31        static hasMany = [             
    3432                subjects: Subject,
    3533                samplingEvents: SamplingEvent,
     
    5250                // Workaround for bug http://jira.codehaus.org/browse/GRAILS-6754
    5351                templateTextFields type: 'text'
     52                owner column:"studyowner"
     53                title column:"studytitle"
     54                code column:"studycode"
     55                subjects column:"studysubjects"
     56                events column:"studyevents"
     57                samplingEvents column:"studysamplingevents"
     58                eventGroups column:"studyeventgroups"
     59                samples column:"studysamples"
     60                assays column:"studyassays"
    5461
    5562        }
  • trunk/grails-app/domain/dbnp/studycapturing/Subject.groovy

    r874 r936  
    3131        }
    3232
     33        static mapping = {
     34                name column:"subjectname"
     35        }
     36
    3337
    3438        /**
  • trunk/grails-app/domain/dbnp/studycapturing/Template.groovy

    r896 r936  
    11package dbnp.studycapturing
    22
    3 import dbnp.user.User
     3import org.nmcdsp.plugins.aaaa.SecUser
     4import org.nmcdsp.plugins.aaaa.Entity
    45
    56/**
     
    3132
    3233        /** The owner of the template. If the owner is not defined, it is a shared/public template */
    33         User owner
     34        SecUser owner
    3435
    3536        /** The template fields which are the members of this template. This is a List to preserve the field order */
     
    3738
    3839        static hasMany = [fields: TemplateField]
     40
     41        static mapping = {
     42                name column:"templatename"
     43                description column:"templatedescription"
     44                entity column:"templateentity"
     45                owner column:"templateowner"
     46                fields column:"templatefields"
     47        }
    3948
    4049        // constraints
  • trunk/grails-app/domain/dbnp/studycapturing/TemplateEntity.groovy

    r902 r936  
    33import dbnp.data.Term
    44import org.springframework.validation.FieldError
     5import org.nmcdsp.plugins.aaaa.Entity
    56
    67/**
     
    4344        static hasMany = [
    4445                templateStringFields    : String,
    45                 templateTextFields              : String,
     46                templateTextFields      : String,
    4647                templateStringListFields: TemplateFieldListItem,
    4748                templateIntegerFields   : int,
    48                 templateFloatFields             : float,
     49                templateFloatFields     : float,
    4950                templateDoubleFields    : double,
    50                 templateDateFields              : Date,
    51                 templateTermFields              : Term,
     51                templateDateFields      : Date,
     52                templateTermFields      : Term,
    5253                templateRelTimeFields   : long,
    53                 templateFileFields              : String,
     54                templateFileFields      : String,
    5455                templateBooleanFields   : boolean,
    5556                templateTemplateFields  : Template,
    5657                templateModuleFields    : AssayModule,
    57                 templateLongFields              : long,
    58                 systemFields                    : TemplateField
     58                templateLongFields      : long,
     59                systemFields            : TemplateField
    5960        ]
    6061
     
    7071                // Make sure that the text fields are really stored as TEXT, so that those Strings can have an arbitrary length.
    7172                templateTextFields type: 'text'
     73
     74                template column:"templateentitytemplate"
    7275        }
    7376
  • trunk/grails-app/domain/dbnp/studycapturing/TemplateField.groovy

    r803 r936  
    7272                // Make sure the comments can be Strings of arbitrary length
    7373                comment type: 'text'
     74                name column:"templatefieldname"
     75                type column:"templatefieldtype"
     76                entity column:"templatefieldentity"
     77                unit column:"templatefieldunit"
     78                comment column:"templatefieldcomment"               
    7479        }
    7580
  • trunk/grails-app/domain/dbnp/studycapturing/TemplateFieldListItem.groovy

    r784 r936  
    2020        }
    2121
     22        static mapping = {
     23                name column:"templatefieldlistitemname"
     24        }
     25
    2226        String toString() {
    2327                return name;
Note: See TracChangeset for help on using the changeset viewer.