Changeset 654 for trunk

Timestamp:

Sep 23, 2010, 5:01:46 AM (14 years ago)

Author:

gav

Message:

New asset report: Equipment Register.

Location:

trunk

Files:

• grails-app/controllers/ReportController.groovy (modified) (1 diff)
• grails-app/services/AssetReportService.groovy (modified) (1 diff)
• grails-app/views/appCore/start.gsp (modified) (2 diffs)
• web-app/reports/equipmentRegister.jrxml (copied) (copied from trunk/web-app/reports/assetRegister.jrxml) (5 diffs)

trunk/grails-app/controllers/ReportController.groovy

@@ -173 +173 @@
     } // assetRegister
 
+    def equipmentRegister = {
+
+        params.reportTitle = "Equipment Register"
+        params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
+        params.currentUser = authService.currentUser
+        if(params.section.id == 'all')
+            params.section = "All"
+        else
+            params.section = Section.get(params.section.id.toLong())
+
+        def dataModel = assetReportService.getEquipmentRegister(params, RCU.getLocale(request))
+
+        // Jasper plugin controller expects data to be a Collection.
+        chain(controller:'jasper', action:'index', model:[data: [dataModel]], params:params)
+
+//         render {
+//             dataModel.dataList.each {
+//                 p("$it")
+//             }
+//         }
+
+    } // equipmentRegister
+
 } // end of class.

trunk/grails-app/services/AssetReportService.groovy

@@ -117 +117 @@
     } // getAssetDetail
 
+    /**
+    * Selects and returns level 1 sub items (aka machines or equipment) and their details.
+    * @param params The request params, may contain params to specify the search.
+    * @param locale The locale to use when generating result.message.
+    */
+    def getEquipmentRegister(params, locale) {
+        def result = [:]
+
+        // 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'
+        }
+        result.attribTypes = Asset.executeQuery(attribTypesQ.query, attribTypesQ.namedParams)
+
+        // Since there will be nothing to show in the report table for assets without level 1 assetSubItems,
+        // a list needs to be given to the user.
+        def assetsWithoutEquipmentQ = new HqlBuilder().query {
+            select 'distinct asset'
+            from 'Asset asset',
+                    'left join asset.assetSubItems as assetSubItem'
+            where 'assetSubItem = null'
+        }
+        result.assetsWithoutEquipment = AssetSubItem.executeQuery(assetsWithoutEquipmentQ.query, assetsWithoutEquipmentQ.namedParams)
+
+        // A result is returned for every level 1 assetSubItem and for any extended attributes.
+        def q = new HqlBuilder().query {
+            select 'new map(asset.name as assetName',
+                        'assetSubItem.name as name',
+                        'assetSubItem.description as description',
+                        'assetSubItem.comment as comment',
+                        'attribT.name as attribType',
+                        'attrib.value as attribValue)'
+            from 'AssetSubItem assetSubItem',
+                    'inner join assetSubItem.assets as asset',
+                    'left join assetSubItem.assetSubItemExtendedAttributes as attrib',
+                    'left join attrib.extendedAttributeType as attribT'
+            where 'asset != null' // ensure that only level 1 assetSubItems are returned.
+            if(params.section instanceof Section) {
+                namedParams.section = params.section
+                and 'asset.section = :section'
+            }
+            order 'by asset.name asc, assetSubItem.name asc, attribT.name asc'
+        }
+        def equipmentResults = AssetSubItem.executeQuery(q.query, q.namedParams)
+
+        // Build the report table rows.
+        // Rows are keyed by equipmentResult.assetName+equipmentResult.name` while the value is a Map of the attributes.
+        // The report table then groups by assetName.
+        def rows = [:]
+        equipmentResults.each { equipmentResult ->
+            // Create row if it does not exist yet.
+            def rowKey = equipmentResult.assetName+equipmentResult.name
+            if(!rows.containsKey(rowKey)) {
+                rows[rowKey] = ['assetName': equipmentResult.assetName,
+                                                            'name':equipmentResult.name,
+                                                            'description':equipmentResult.description,
+                                                            'comment':equipmentResult.comment]
+
+                // Add all attribType columns.
+                result.attribTypes.each { column ->
+                    rows[rowKey][column] = null
+                }
+            }
+
+            // Assign value to column.
+            rows[rowKey][equipmentResult.attribType] = equipmentResult.attribValue
+        }
+
+        // The value of each row is the dataList used by the report table.
+        result.dataList = rows.collect {it.value}
+        // Print formatting, since we are done with these as objects.
+        result.attribTypes = result.attribTypes.join(', ')
+        result.assetsWithoutEquipment = result.assetsWithoutEquipment.collect {it.name}.join(', ')
+
+        // Success.
+        return result
+
+    } // getEquipmentRegister
+
 } // end class

trunk/grails-app/views/appCore/start.gsp

@@ -148 +148 @@
                                                 </g:select>
                                             </g:jasperReport>
+                                            <br />
                                             <g:jasperReport controller="report"
                                                                             action="assetRegister"
@@ -161 +162 @@
                                             <br />
                                             <g:jasperReport controller="report"
+                                                                            action="equipmentRegister"
+                                                                            jasper="equipmentRegister"
+                                                                            name="Equipment Register"
+                                                                            format="PDF, XLS">
+                                                <g:select optionKey="id"
+                                                                    from="${Section.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                                    name="section.id"
+                                                                    noSelection="['all':/${g.message(code:'default.all.select.text')}/]">
+                                                </g:select>
+                                            </g:jasperReport>
+                                            <br />
+                                            <g:jasperReport controller="report"
                                                                             action="templatePortrait"
                                                                             jasper="templatePortrait"

trunk/web-app/reports/equipmentRegister.jrxml

@@ -4 +4 @@
         <property name="ireport.encoding" value="UTF-8"/>
         <property name="ireport.zoom" value="1.5"/>
-        <property name="ireport.x" value="15"/>
-        <property name="ireport.y" value="0"/>
+        <property name="ireport.x" value="31"/>
+        <property name="ireport.y" value="672"/>
         <import value="net.sf.jasperreports.engine.*"/>
         <import value="java.util.*"/>
@@ -50 +50 @@
                 <field name="Registration Required" class="java.lang.String"/>
                 <field name="Registration Expiry Date" class="java.lang.String"/>
+                <field name="assetName" class="java.lang.String"/>
                 <group name="assetName">
-                        <groupExpression><![CDATA[$F{name}]]></groupExpression>
+                        <groupExpression><![CDATA[$F{assetName}]]></groupExpression>
                 </group>
         </subDataset>
@@ -65 +66 @@
         </queryString>
         <field name="dataList" class="java.util.List"/>
-        <field name="attribTypes" class="java.util.List"/>
+        <field name="attribTypes" class="java.lang.String"/>
+        <field name="assetsWithoutEquipment" class="java.lang.String"/>
         <background>
                 <band splitType="Stretch"/>
@@ -103 +105 @@
                                         </datasetRun>
                                         <jr:column width="100">
-                                                <jr:columnHeader style="table_CH" height="32" rowSpan="1">
-                                                        <staticText>
-                                                                <reportElement stretchType="RelativeToTallestObject" x="2" y="0" width="96" height="32" isPrintWhenDetailOverflows="true"/>
-                                                                <textElement textAlignment="Center" verticalAlignment="Middle">
-                                                                        <font fontName="Serif" size="8"/>
+                                                <jr:groupHeader groupName="assetName">
+                                                        <jr:cell height="20" rowSpan="1">
+                                                                <textField isStretchWithOverflow="true">
+                                                                        <reportElement stretchType="RelativeToTallestObject" x="2" y="2" width="96" height="16" isPrintWhenDetailOverflows="true"/>
+                                                                        <textElement verticalAlignment="Middle">
+                                                                                <font fontName="Serif" size="10"/>
+                                                                        </textElement>
+                                                                        <textFieldExpression class="java.lang.String"><![CDATA[$F{assetName}]]></textFieldExpression>
+                                                                </textField>
+                                                        </jr:cell>
+                                                </jr:groupHeader>
+                                                <jr:columnHeader style="table_CH" height="32" rowSpan="1">
+                                                        <staticText>
+                                                                <reportElement stretchType="RelativeToTallestObject" x="2" y="0" width="96" height="16" isPrintWhenDetailOverflows="true"/>
+                                                                <textElement verticalAlignment="Middle">
+                                                                        <font fontName="Serif"/>
                                                                 </textElement>
                                                                 <text><![CDATA[Asset]]></text>
+                                                        </staticText>
+                                                        <staticText>
+                                                                <reportElement x="2" y="16" width="96" height="16"/>
+                                                                <textElement textAlignment="Center"/>
+                                                                <text><![CDATA[Equipment]]></text>
                                                         </staticText>
                                                 </jr:columnHeader>
@@ -457 +475 @@
         <summary>
                 <band height="369">
-                        <textField>
-                                <reportElement x="0" y="30" width="824" height="91"/>
+                        <textField isStretchWithOverflow="true">
+                                <reportElement stretchType="RelativeToTallestObject" x="13" y="36" width="824" height="25" isPrintWhenDetailOverflows="true"/>
                                 <textElement>
                                         <font fontName="Serif"/>
                                 </textElement>
-                                <textFieldExpression class="java.lang.String"><![CDATA["Asset Extended Attributes: \n"+$F{attribTypes}]]></textFieldExpression>
+                                <textFieldExpression class="java.lang.String"><![CDATA["AssetSubItem Extended Attributes: \n"+$F{attribTypes}]]></textFieldExpression>
+                        </textField>
+                        <textField>
+                                <reportElement key="staticText-1" x="242" y="0" width="340" height="30"/>
+                                <textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+                                        <font size="20"/>
+                                </textElement>
+                                <textFieldExpression class="java.lang.String"><![CDATA["Summary"]]></textFieldExpression>
+                        </textField>
+                        <textField isStretchWithOverflow="true">
+                                <reportElement stretchType="RelativeToTallestObject" x="13" y="85" width="824" height="26" isPrintWhenDetailOverflows="true"/>
+                                <textElement>
+                                        <font fontName="Serif"/>
+                                </textElement>
+                                <textFieldExpression class="java.lang.String"><![CDATA[$F{assetsWithoutEquipment}]]></textFieldExpression>
+                        </textField>
+                        <textField>
+                                <reportElement x="13" y="66" width="824" height="19" forecolor="#FF0033">
+                                        <printWhenExpression><![CDATA[$F{assetsWithoutEquipment}]]></printWhenExpression>
+                                </reportElement>
+                                <textElement>
+                                        <font fontName="Serif"/>
+                                </textElement>
+                                <textFieldExpression class="java.lang.String"><![CDATA["The following assets have no sub items (equipment) and therefore are not listed in the equipment table: \n"+$F{assetsWithoutEquipment}]]></textFieldExpression>
                         </textField>
                 </band>