Index: /trunk/grails-app/services/AssetReportService.groovy
===================================================================
--- /trunk/grails-app/services/AssetReportService.groovy	(revision 677)
+++ /trunk/grails-app/services/AssetReportService.groovy	(revision 678)
@@ -64,5 +64,5 @@
                 // Add all attribType columns.
                 result.attribTypes.each { column ->
-                    rows[assetResult.name][column] = null
+                    rows[assetResult.name][column] = '-'
                 }
             }
@@ -181,5 +181,5 @@
                 // Add all attribType columns.
                 result.attribTypes.each { column ->
-                    rows[rowKey][column] = null
+                    rows[rowKey][column] = '-'
                 }
             }
Index: /trunk/grails-app/services/CreateDataService.groovy
===================================================================
--- /trunk/grails-app/services/CreateDataService.groovy	(revision 677)
+++ /trunk/grails-app/services/CreateDataService.groovy	(revision 678)
@@ -1382,9 +1382,9 @@
 
         //ExtendedAttributeType #9
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Hazards Identified")
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "ecr")
         saveAndTest(extendedAttributeTypeInstance)
 
         //ExtendedAttributeType #10
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Risk Assesment")
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Risk Level")
         saveAndTest(extendedAttributeTypeInstance)
 
@@ -1394,9 +1394,9 @@
 
         //ExtendedAttributeType #12
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Maintenance Frequency")
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Regulatory Requirement")
         saveAndTest(extendedAttributeTypeInstance)
 
         //ExtendedAttributeType #13
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Maintenance Date")
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Maintenance % Completion")
         saveAndTest(extendedAttributeTypeInstance)
 
@@ -1600,5 +1600,5 @@
 
         //AssetExtendedAttribute #5
-        assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "Crushing, Electrical, Pinch Points, Trip/Fall, High Pressure Air",
+        assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "3",
                                                                                                                     asset: Asset.get(1),
                                                                                                                     extendedAttributeType: ExtendedAttributeType.get(9))
Index: /trunk/web-app/reports/assetRegister.jrxml
===================================================================
--- /trunk/web-app/reports/assetRegister.jrxml	(revision 677)
+++ /trunk/web-app/reports/assetRegister.jrxml	(revision 678)
@@ -43,9 +43,9 @@
 		<field name="Model Number" class="java.lang.String"/>
 		<field name="Manufacturer" class="java.lang.String"/>
-		<field name="Hazards Identified" class="java.lang.String"/>
-		<field name="Risk Assesment" class="java.lang.String"/>
+		<field name="ecr" class="java.lang.String"/>
+		<field name="Risk Level" class="java.lang.String"/>
 		<field name="Safe Work Procedure" class="java.lang.String"/>
-		<field name="Maintenance Frequency" class="java.lang.String"/>
-		<field name="Maintenance Date" class="java.lang.String"/>
+		<field name="Regulatory Requirement" class="java.lang.String"/>
+		<field name="Maintenance % Completion" class="java.lang.String"/>
 		<field name="Registration Required" class="java.lang.String"/>
 		<field name="Registration Expiry Date" class="java.lang.String"/>
@@ -223,14 +223,14 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<text><![CDATA[Hazards Identified]]></text>
-							</staticText>
-						</jr:columnHeader>
-						<jr:detailCell style="table_TD" height="36" rowSpan="1">
-							<textField isStretchWithOverflow="true">
-								<reportElement stretchType="RelativeToTallestObject" x="2" y="0" width="59" height="35" isPrintWhenDetailOverflows="true"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font fontName="Serif" size="8"/>
-								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA[$F{Hazards Identified}]]></textFieldExpression>
+								<text><![CDATA[Equipment Criticality (ecr)]]></text>
+							</staticText>
+						</jr:columnHeader>
+						<jr:detailCell style="table_TD" height="36" rowSpan="1">
+							<textField>
+								<reportElement x="0" y="0" width="63" height="36"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font fontName="Serif" size="8"/>
+								</textElement>
+								<textFieldExpression class="java.lang.String"><![CDATA[$F{ecr}]]></textFieldExpression>
 							</textField>
 						</jr:detailCell>
@@ -243,5 +243,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<text><![CDATA[Risk Assesment (Y/N)]]></text>
+								<text><![CDATA[Risk Level]]></text>
 							</staticText>
 						</jr:columnHeader>
@@ -252,5 +252,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA[$F{Risk Assesment}]]></textFieldExpression>
+								<textFieldExpression class="java.lang.String"><![CDATA[$F{Risk Level}]]></textFieldExpression>
 							</textField>
 						</jr:detailCell>
@@ -263,5 +263,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<text><![CDATA[Safe Work Procedure (Y/N)]]></text>
+								<text><![CDATA[Safe Work Procedure]]></text>
 							</staticText>
 						</jr:columnHeader>
@@ -283,5 +283,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<text><![CDATA[Maintenance Frequency]]></text>
+								<text><![CDATA[Regulatory Requirement (Y/N)]]></text>
 							</staticText>
 						</jr:columnHeader>
@@ -292,5 +292,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance Frequency}]]></textFieldExpression>
+								<textFieldExpression class="java.lang.String"><![CDATA[$F{Regulatory Requirement}]]></textFieldExpression>
 							</textField>
 						</jr:detailCell>
@@ -303,5 +303,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<text><![CDATA[Maintenance Date]]></text>
+								<text><![CDATA[Maintenance % Completion]]></text>
 							</staticText>
 						</jr:columnHeader>
@@ -312,5 +312,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance Date}]]></textFieldExpression>
+								<textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance % Completion}]]></textFieldExpression>
 							</textField>
 						</jr:detailCell>
Index: /trunk/web-app/reports/equipmentRegister.jrxml
===================================================================
--- /trunk/web-app/reports/equipmentRegister.jrxml	(revision 677)
+++ /trunk/web-app/reports/equipmentRegister.jrxml	(revision 678)
@@ -5,5 +5,5 @@
 	<property name="ireport.zoom" value="1.5"/>
 	<property name="ireport.x" value="31"/>
-	<property name="ireport.y" value="672"/>
+	<property name="ireport.y" value="0"/>
 	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
@@ -43,9 +43,9 @@
 		<field name="Model Number" class="java.lang.String"/>
 		<field name="Manufacturer" class="java.lang.String"/>
-		<field name="Hazards Identified" class="java.lang.String"/>
-		<field name="Risk Assesment" class="java.lang.String"/>
+		<field name="ecr" class="java.lang.String"/>
+		<field name="Risk Level" class="java.lang.String"/>
 		<field name="Safe Work Procedure" class="java.lang.String"/>
-		<field name="Maintenance Frequency" class="java.lang.String"/>
-		<field name="Maintenance Date" class="java.lang.String"/>
+		<field name="Regulatory Requirement" class="java.lang.String"/>
+		<field name="Maintenance % Completion" class="java.lang.String"/>
 		<field name="Registration Required" class="java.lang.String"/>
 		<field name="Registration Expiry Date" class="java.lang.String"/>
@@ -241,5 +241,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<text><![CDATA[Hazards Identified]]></text>
+								<text><![CDATA[Equipment Criticality (ecr)]]></text>
 							</staticText>
 						</jr:columnHeader>
@@ -250,5 +250,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA[$F{Hazards Identified}]]></textFieldExpression>
+								<textFieldExpression class="java.lang.String"><![CDATA[$F{ecr}]]></textFieldExpression>
 							</textField>
 						</jr:detailCell>
@@ -261,5 +261,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<text><![CDATA[Risk Assesment (Y/N)]]></text>
+								<text><![CDATA[Risk Level]]></text>
 							</staticText>
 						</jr:columnHeader>
@@ -270,5 +270,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA[$F{Risk Assesment}]]></textFieldExpression>
+								<textFieldExpression class="java.lang.String"><![CDATA[$F{Risk Level}]]></textFieldExpression>
 							</textField>
 						</jr:detailCell>
@@ -281,5 +281,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<text><![CDATA[Safe Work Procedure (Y/N)]]></text>
+								<text><![CDATA[Safe Work Procedure]]></text>
 							</staticText>
 						</jr:columnHeader>
@@ -301,5 +301,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<text><![CDATA[Maintenance Frequency]]></text>
+								<text><![CDATA[Regulatory Requirement (Y/N)]]></text>
 							</staticText>
 						</jr:columnHeader>
@@ -310,5 +310,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance Frequency}]]></textFieldExpression>
+								<textFieldExpression class="java.lang.String"><![CDATA[$F{Regulatory Requirement}]]></textFieldExpression>
 							</textField>
 						</jr:detailCell>
@@ -321,5 +321,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<text><![CDATA[Maintenance Date]]></text>
+								<text><![CDATA[Maintenance % Completion]]></text>
 							</staticText>
 						</jr:columnHeader>
@@ -330,5 +330,5 @@
 									<font fontName="Serif" size="8"/>
 								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance Date}]]></textFieldExpression>
+								<textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance % Completion}]]></textFieldExpression>
 							</textField>
 						</jr:detailCell>