Changeset 686 for trunk/grails-app

Timestamp:

Oct 6, 2010, 12:58:13 AM (14 years ago)

Author:

gav

Message:

Tweak asset and equipment register reports to show blank strings in empty cells.

File:

• trunk/grails-app/services/AssetReportService.groovy (modified) (4 diffs)

trunk/grails-app/services/AssetReportService.groovy

@@ -29 +29 @@
         // Inner join used to return only attribTypes that are used by AssetExtendedAttributes.
         // So the result is only asset extendedAttributeTypes.
+//         def attribTypesQ = new HqlBuilder().query {
+//             select 'distinct attribT.name'
+//             from 'AssetExtendedAttribute attrib',
+//                     'join attrib.extendedAttributeType as attribT'
+//             order 'by attribT.name asc'
+//         }
+
+        // All active ExtendedAttributes.
         def attribTypesQ = new HqlBuilder().query {
             select 'distinct attribT.name'
-            from 'AssetExtendedAttribute attrib',
-                    'join attrib.extendedAttributeType as attribT'
+            from 'ExtendedAttributeType attribT'
+            where 'attribT.isActive = true'
             order 'by attribT.name asc'
         }
-        result.attribTypes = Asset.executeQuery(attribTypesQ.query, attribTypesQ.namedParams)
+        result.attribTypes = ExtendedAttributeType.executeQuery(attribTypesQ.query, attribTypesQ.namedParams)
 
         // A result is returned for every asset and for any extended attributes.
@@ -65 +73 @@
                 // Add all attribType columns.
                 result.attribTypes.each { column ->
-                    rows[assetResult.name][column] = '-'
+                    rows[assetResult.name][column] = ' '
                 }
             }
@@ -131 +139 @@
         // Inner join used to return only attribTypes that are used by AssetSubItemExtendedAttributes.
         // So the result is only assetSubItem extendedAttributeTypes.
+//         def attribTypesQ = new HqlBuilder().query {
+//             select 'distinct attribT.name'
+//             from 'AssetSubItemExtendedAttribute attrib',
+//                     'join attrib.extendedAttributeType as attribT'
+//             order 'by attribT.name asc'
+//         }
+
+        // All active ExtendedAttributes.
         def attribTypesQ = new HqlBuilder().query {
             select 'distinct attribT.name'
-            from 'AssetSubItemExtendedAttribute attrib',
-                    'join attrib.extendedAttributeType as attribT'
+            from 'ExtendedAttributeType attribT'
+            where 'attribT.isActive = true'
             order 'by attribT.name asc'
         }
-        result.attribTypes = Asset.executeQuery(attribTypesQ.query, attribTypesQ.namedParams)
+        result.attribTypes = ExtendedAttributeType.executeQuery(attribTypesQ.query, attribTypesQ.namedParams)
 
         // A useful list of assets without subItems to be given to the user.
@@ -205 +221 @@
                 // Add all attribType columns.
                 result.attribTypes.each { column ->
-                    rows[rowKey][column] = '-'
+                    rows[rowKey][column] = ' '
                 }
             }