Changeset 1213 for trunk/grails-app/domain

Timestamp:

Nov 29, 2010, 4:56:48 PM (10 years ago)

Author:

robert@…

Message:

Improved the study overview page such that the different tabs are loaded when needed. Also rewritten parts of the code. See ticket #155

Location:

trunk/grails-app/domain/dbnp

Files:

• authentication/SecUser.groovy (modified) (1 diff)
• studycapturing/Subject.groovy (modified) (1 diff)
• studycapturing/TemplateField.groovy (modified) (1 diff)

trunk/grails-app/domain/dbnp/authentication/SecUser.groovy

@@ -29 +29 @@
         }
 
-        public boolean equals(Object y)
-        {
-            if( !( y instanceof SecUser ) ) {
-                return false;
-            }
+        public boolean equals(Object y)
+        {
+                if( !( y instanceof SecUser ) ) {
+                        return false;
+                }
 
-            if (y == null) return false;
+                if (y == null) return false;
 
-            return this.id == y.id
-        }
+                return this.id == y.id
+        }
+
+        public boolean hasAdminRights() {
+                return getAuthorities().contains( SecRole.findByAuthority( 'ROLE_ADMIN' ) );
+        }
+
 }

trunk/grails-app/domain/dbnp/studycapturing/Subject.groovy

@@ -68 +68 @@
                 return name
         }
+
+        /**
+         * Returns a human readable string of a list of subjects, with a maximum number
+         * of characters
+         *
+         * @param subjectList   List with Subject objects
+         * @param maxChars              maximum number of characters returned
+         * @return                              human readble string with at most maxChars characters, representing the subjects given.
+         */
+        public static String trimSubjectNames( ArrayList subjectList, Integer maxChars ) {
+                def simpleSubjects = subjectList.name.join( ', ' );
+                def showSubjects
+                
+                // If the subjects will fit, show them all
+                if( !maxChars || simpleSubjects.size() < maxChars ) {
+                  showSubjects = simpleSubjects;
+                } else {
+                  // Always add the first name
+                  def subjectNames = subjectList[0]?.name;
+
+                  // Continue adding names until the length is to long
+                  def id = 0;
+                  subjectList.each { subject ->
+                        if( id > 0 ) {
+                          if( subjectNames?.size() + subject.name?.size() < maxChars - 15 ) {
+                                subjectNames += ", " + subject.name;
+                          } else {
+                                return;
+                          }
+                        }
+                        id++;
+                  }
+
+                  // Add a postfix
+                  subjectNames += " and " + ( subjectList?.size() - id ) + " more";
+
+                  showSubjects = subjectNames;
+                }
+
+                return showSubjects
+        }
 }

trunk/grails-app/domain/dbnp/studycapturing/TemplateField.groovy

@@ -353 +353 @@
         }
 
+        /**
+         * Checks whether this field is filled in any of the entities in the given list
+         *
+         * @param       List    List of TemplateEntities to search in
+         * @return      boolean True iff any of the given entities has this field as template field, and has a value for it. False otherwise
+         */
+        def isFilledInList( entityList ) {
+                if( !entityList )
+                        return false;
+                        
+                return true in entityList.collect { it.fieldExists( this.name ) && it.getFieldValue( this.name ) != null }?.flatten()
+        }
+
 }