Ignore:
Timestamp:
Jan 21, 2011, 7:37:02 PM (11 years ago)
Author:
work@…
Message:
  • Resolved part of improvement #225
  • refactored the template model out of GSCF into the GDT (Grails Domain Templates) plugin version 0.0.1
  • still work needs to be done (move template editor into gdt, etcetera)
  • fix template owner
  • some methods are missing from Template, but most of it works
Location:
trunk/grails-app/domain/dbnp
Files:
8 deleted
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/domain/dbnp/authentication/SecUser.groovy

    r1213 r1426  
    55        String username
    66        String password
    7         String email
     7        String email
    88        Date dateCreated
    99        boolean enabled
     
    1111        boolean accountLocked
    1212        boolean passwordExpired
    13         boolean userConfirmed   // True if the user has confirmed his subscription using the link in the email
    14         boolean adminConfirmed  // True if the administrator has confirmed this subscription using the link in the email
     13        boolean userConfirmed   // True if the user has confirmed his subscription using the link in the email
     14        boolean adminConfirmed  // True if the administrator has confirmed this subscription using the link in the email
    1515
    1616        static constraints = {
    1717                username blank: false, unique: true
    1818                password blank: false
    19                 email blank: false
     19                email blank: false
    2020        }
    2121
    2222        static mapping = {
    2323                password column: '`password`'
    24                 enabled formula: 'USER_CONFIRMED AND ADMIN_CONFIRMED'
     24                enabled formula: 'USER_CONFIRMED AND ADMIN_CONFIRMED'
    2525        }
    2626
     
    2929        }
    3030
    31         public boolean equals(Object y)
    32         {
    33                 if( !( y instanceof SecUser ) ) {
     31        public boolean equals(Object y) {
     32                if (!(y instanceof SecUser)) {
    3433                        return false;
    3534                }
     
    4140
    4241        public boolean hasAdminRights() {
    43                 return getAuthorities().contains( SecRole.findByAuthority( 'ROLE_ADMIN' ) );
     42                return getAuthorities().contains(SecRole.findByAuthority('ROLE_ADMIN'));
    4443        }
    4544
  • trunk/grails-app/domain/dbnp/importer/ImportCell.groovy

    r1277 r1426  
    11package dbnp.importer
    2 
    3 import dbnp.studycapturing.Identity
    42
    53/**
     
    1816 */
    1917
    20 class ImportCell extends Identity implements Serializable {
     18class ImportCell extends nl.grails.plugins.gdt.Identity implements Serializable {
    2119    MappingColumn mappingcolumn
    2220    int entityidentifier
  • trunk/grails-app/domain/dbnp/importer/ImportRecord.groovy

    r1277 r1426  
    1414 */
    1515package dbnp.importer
    16 import dbnp.studycapturing.Identity
    1716
    18 class ImportRecord extends Identity implements Serializable {
     17class ImportRecord extends nl.grails.plugins.gdt.Identity implements Serializable {
    1918    static hasMany = [ importcells: ImportCell ]
    2019   
  • trunk/grails-app/domain/dbnp/importer/MappingColumn.groovy

    r1277 r1426  
    11package dbnp.importer
    2 import dbnp.studycapturing.TemplateField
    3 import dbnp.studycapturing.Identity
     2
     3import nl.grails.plugins.gdt.*
    44
    55/**
     
    1515
    1616        String name
    17         dbnp.studycapturing.TemplateFieldType templatefieldtype
     17        nl.grails.plugins.gdt.TemplateFieldType templatefieldtype
    1818        Class entity
    1919        String property
  • trunk/grails-app/domain/dbnp/studycapturing/Assay.groovy

    r1198 r1426  
    11package dbnp.studycapturing
     2import nl.grails.plugins.gdt.*
    23
    34/**
     
    67 * this data can be found.
    78 */
    8 class Assay extends TemplateEntity {
     9class Assay extends nl.grails.plugins.gdt.TemplateEntity {
    910        // The name of the assay, which should indicate the measurements represented in this assay to the user.
    1011        String name
  • trunk/grails-app/domain/dbnp/studycapturing/Event.groovy

    r1198 r1426  
    11package dbnp.studycapturing
     2
     3import nl.grails.plugins.gdt.*
    24
    35/**
     
    1113 * $Date$
    1214 */
    13 class Event extends TemplateEntity {
     15class Event extends nl.grails.plugins.gdt.TemplateEntity {
    1416
    1517        // uncommented due to searchable issue
  • trunk/grails-app/domain/dbnp/studycapturing/EventGroup.groovy

    r959 r1426  
    99 * $Date$
    1010 */
    11 class EventGroup extends Identity {
     11class EventGroup extends nl.grails.plugins.gdt.Identity {
    1212        String name
    1313
  • trunk/grails-app/domain/dbnp/studycapturing/Person.groovy

    r1154 r1426  
    1111 * $Date$
    1212 */
    13 class Person extends Identity {
     13class Person extends nl.grails.plugins.gdt.Identity {
    1414        String title
    1515        String gender
  • trunk/grails-app/domain/dbnp/studycapturing/PersonAffiliation.groovy

    r959 r1426  
    1010 * $Date$
    1111 */
    12 class PersonAffiliation extends Identity {
     12class PersonAffiliation extends nl.grails.plugins.gdt.Identity {
    1313
    1414        String institute
  • trunk/grails-app/domain/dbnp/studycapturing/PersonRole.groovy

    r959 r1426  
    1111 * $Date$
    1212 */
    13 class PersonRole extends Identity {
     13class PersonRole extends nl.grails.plugins.gdt.Identity {
    1414
    1515        /** The name of the role, such as Project Leader or PI */
  • trunk/grails-app/domain/dbnp/studycapturing/Publication.groovy

    r959 r1426  
    1212 * $Date$
    1313 */
    14 class Publication extends Identity {
     14class Publication extends nl.grails.plugins.gdt.Identity {
    1515        String title
    1616        String pubMedID
  • trunk/grails-app/domain/dbnp/studycapturing/Sample.groovy

    r1373 r1426  
    11package dbnp.studycapturing
    22
    3 import dbnp.data.Term
     3import nl.grails.plugins.gdt.*
    44
    55/**
     
    1111 * $Date$
    1212 */
    13 class Sample extends TemplateEntity {
     13class Sample extends nl.grails.plugins.gdt.TemplateEntity {
    1414        // uncommented due to searchable issue
    1515        // @see http://jira.codehaus.org/browse/GRAILSPLUGINS-1577
  • trunk/grails-app/domain/dbnp/studycapturing/SamplingEvent.groovy

    r1198 r1426  
    11package dbnp.studycapturing
     2import nl.grails.plugins.gdt.*
    23
    34/**
     
    1314 * $Date$
    1415 */
    15 class SamplingEvent extends TemplateEntity {
     16class SamplingEvent extends nl.grails.plugins.gdt.TemplateEntity {
    1617        // A SamplingEvent always belongs to one study.
    1718        // Although this is technically inherited from Event, we have to specify it here again.
  • trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

    r1357 r1426  
    22
    33import dbnp.authentication.SecUser
     4import nl.grails.plugins.gdt.*
    45
    56/**
     
    1112 * $Date$
    1213 */
    13 class Study extends TemplateEntity {
     14class Study extends nl.grails.plugins.gdt.TemplateEntity {
    1415        static searchable = true
    1516       
  • trunk/grails-app/domain/dbnp/studycapturing/StudyPerson.groovy

    r959 r1426  
    99 * $Date$
    1010 */
    11 class StudyPerson extends Identity {
     11class StudyPerson extends nl.grails.plugins.gdt.Identity {
    1212
    1313        // A StudyPerson relation always belongs to one study.
  • trunk/grails-app/domain/dbnp/studycapturing/Subject.groovy

    r1314 r1426  
    11package dbnp.studycapturing
    22
    3 import dbnp.data.Term
    4 import dbnp.data.Ontology
     3import nl.grails.plugins.gdt.*
    54
    65/**
     
    1211 * $Date$
    1312 */
    14 class Subject extends TemplateEntity {
     13class Subject extends nl.grails.plugins.gdt.TemplateEntity {
    1514        // uncommented due to searchable issue
    1615        // @see http://jira.codehaus.org/browse/GRAILSPLUGINS-1577
Note: See TracChangeset for help on using the changeset viewer.