Changeset 678 for trunk/grails-app


Ignore:
Timestamp:
Oct 4, 2010, 8:32:56 PM (14 years ago)
Author:
gav
Message:

Update asset and equipment register reports with new headers.

Location:
trunk/grails-app/services
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/grails-app/services/AssetReportService.groovy

    r654 r678  
    6464                // Add all attribType columns.
    6565                result.attribTypes.each { column ->
    66                     rows[assetResult.name][column] = null
     66                    rows[assetResult.name][column] = '-'
    6767                }
    6868            }
    … …  
    181181                // Add all attribType columns.
    182182                result.attribTypes.each { column ->
    183                     rows[rowKey][column] = null
     183                    rows[rowKey][column] = '-'
    184184                }
    185185            }

  • trunk/grails-app/services/CreateDataService.groovy

    r665 r678  
    13821382
    13831383        //ExtendedAttributeType #9
    1384         extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Hazards Identified")
     1384        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "ecr")
    13851385        saveAndTest(extendedAttributeTypeInstance)
    13861386
    13871387        //ExtendedAttributeType #10
    1388         extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Risk Assesment")
     1388        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Risk Level")
    13891389        saveAndTest(extendedAttributeTypeInstance)
    13901390
    … …  
    13941394
    13951395        //ExtendedAttributeType #12
    1396         extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Maintenance Frequency")
     1396        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Regulatory Requirement")
    13971397        saveAndTest(extendedAttributeTypeInstance)
    13981398
    13991399        //ExtendedAttributeType #13
    1400         extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Maintenance Date")
     1400        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Maintenance % Completion")
    14011401        saveAndTest(extendedAttributeTypeInstance)
    14021402
    … …  
    16001600
    16011601        //AssetExtendedAttribute #5
    1602         assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "Crushing, Electrical, Pinch Points, Trip/Fall, High Pressure Air",
     1602        assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "3",
    16031603                                                                                                                    asset: Asset.get(1),
    16041604                                                                                                                    extendedAttributeType: ExtendedAttributeType.get(9))
Note: See TracChangeset for help on using the changeset viewer.