Changeset 678
- Timestamp:
- Oct 4, 2010, 8:32:56 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
grails-app/services/AssetReportService.groovy (modified) (2 diffs)
-
grails-app/services/CreateDataService.groovy (modified) (3 diffs)
-
web-app/reports/assetRegister.jrxml (modified) (9 diffs)
-
web-app/reports/equipmentRegister.jrxml (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/services/AssetReportService.groovy
r654 r678 64 64 // Add all attribType columns. 65 65 result.attribTypes.each { column -> 66 rows[assetResult.name][column] = null66 rows[assetResult.name][column] = '-' 67 67 } 68 68 } … … 181 181 // Add all attribType columns. 182 182 result.attribTypes.each { column -> 183 rows[rowKey][column] = null183 rows[rowKey][column] = '-' 184 184 } 185 185 } -
trunk/grails-app/services/CreateDataService.groovy
r665 r678 1382 1382 1383 1383 //ExtendedAttributeType #9 1384 extendedAttributeTypeInstance = new ExtendedAttributeType(name: " Hazards Identified")1384 extendedAttributeTypeInstance = new ExtendedAttributeType(name: "ecr") 1385 1385 saveAndTest(extendedAttributeTypeInstance) 1386 1386 1387 1387 //ExtendedAttributeType #10 1388 extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Risk Assesment")1388 extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Risk Level") 1389 1389 saveAndTest(extendedAttributeTypeInstance) 1390 1390 … … 1394 1394 1395 1395 //ExtendedAttributeType #12 1396 extendedAttributeTypeInstance = new ExtendedAttributeType(name: " Maintenance Frequency")1396 extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Regulatory Requirement") 1397 1397 saveAndTest(extendedAttributeTypeInstance) 1398 1398 1399 1399 //ExtendedAttributeType #13 1400 extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Maintenance Date")1400 extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Maintenance % Completion") 1401 1401 saveAndTest(extendedAttributeTypeInstance) 1402 1402 … … 1600 1600 1601 1601 //AssetExtendedAttribute #5 1602 assetExtendedAttributeInstance = new AssetExtendedAttribute(value: " Crushing, Electrical, Pinch Points, Trip/Fall, High Pressure Air",1602 assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "3", 1603 1603 asset: Asset.get(1), 1604 1604 extendedAttributeType: ExtendedAttributeType.get(9)) -
trunk/web-app/reports/assetRegister.jrxml
r653 r678 43 43 <field name="Model Number" class="java.lang.String"/> 44 44 <field name="Manufacturer" class="java.lang.String"/> 45 <field name=" Hazards Identified" class="java.lang.String"/>46 <field name="Risk Assesment" class="java.lang.String"/>45 <field name="ecr" class="java.lang.String"/> 46 <field name="Risk Level" class="java.lang.String"/> 47 47 <field name="Safe Work Procedure" class="java.lang.String"/> 48 <field name=" Maintenance Frequency" class="java.lang.String"/>49 <field name="Maintenance Date" class="java.lang.String"/>48 <field name="Regulatory Requirement" class="java.lang.String"/> 49 <field name="Maintenance % Completion" class="java.lang.String"/> 50 50 <field name="Registration Required" class="java.lang.String"/> 51 51 <field name="Registration Expiry Date" class="java.lang.String"/> … … 223 223 <font fontName="Serif" size="8"/> 224 224 </textElement> 225 <text><![CDATA[ Hazards Identified]]></text>226 </staticText> 227 </jr:columnHeader> 228 <jr:detailCell style="table_TD" height="36" rowSpan="1"> 229 <textField isStretchWithOverflow="true">230 <reportElement stretchType="RelativeToTallestObject" x="2" y="0" width="59" height="35" isPrintWhenDetailOverflows="true"/>231 <textElement textAlignment="Center" verticalAlignment="Middle"> 232 <font fontName="Serif" size="8"/> 233 </textElement> 234 <textFieldExpression class="java.lang.String"><![CDATA[$F{ Hazards Identified}]]></textFieldExpression>225 <text><![CDATA[Equipment Criticality (ecr)]]></text> 226 </staticText> 227 </jr:columnHeader> 228 <jr:detailCell style="table_TD" height="36" rowSpan="1"> 229 <textField> 230 <reportElement x="0" y="0" width="63" height="36"/> 231 <textElement textAlignment="Center" verticalAlignment="Middle"> 232 <font fontName="Serif" size="8"/> 233 </textElement> 234 <textFieldExpression class="java.lang.String"><![CDATA[$F{ecr}]]></textFieldExpression> 235 235 </textField> 236 236 </jr:detailCell> … … 243 243 <font fontName="Serif" size="8"/> 244 244 </textElement> 245 <text><![CDATA[Risk Assesment (Y/N)]]></text>245 <text><![CDATA[Risk Level]]></text> 246 246 </staticText> 247 247 </jr:columnHeader> … … 252 252 <font fontName="Serif" size="8"/> 253 253 </textElement> 254 <textFieldExpression class="java.lang.String"><![CDATA[$F{Risk Assesment}]]></textFieldExpression>254 <textFieldExpression class="java.lang.String"><![CDATA[$F{Risk Level}]]></textFieldExpression> 255 255 </textField> 256 256 </jr:detailCell> … … 263 263 <font fontName="Serif" size="8"/> 264 264 </textElement> 265 <text><![CDATA[Safe Work Procedure (Y/N)]]></text>265 <text><![CDATA[Safe Work Procedure]]></text> 266 266 </staticText> 267 267 </jr:columnHeader> … … 283 283 <font fontName="Serif" size="8"/> 284 284 </textElement> 285 <text><![CDATA[ Maintenance Frequency]]></text>285 <text><![CDATA[Regulatory Requirement (Y/N)]]></text> 286 286 </staticText> 287 287 </jr:columnHeader> … … 292 292 <font fontName="Serif" size="8"/> 293 293 </textElement> 294 <textFieldExpression class="java.lang.String"><![CDATA[$F{ Maintenance Frequency}]]></textFieldExpression>294 <textFieldExpression class="java.lang.String"><![CDATA[$F{Regulatory Requirement}]]></textFieldExpression> 295 295 </textField> 296 296 </jr:detailCell> … … 303 303 <font fontName="Serif" size="8"/> 304 304 </textElement> 305 <text><![CDATA[Maintenance Date]]></text>305 <text><![CDATA[Maintenance % Completion]]></text> 306 306 </staticText> 307 307 </jr:columnHeader> … … 312 312 <font fontName="Serif" size="8"/> 313 313 </textElement> 314 <textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance Date}]]></textFieldExpression>314 <textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance % Completion}]]></textFieldExpression> 315 315 </textField> 316 316 </jr:detailCell> -
trunk/web-app/reports/equipmentRegister.jrxml
r654 r678 5 5 <property name="ireport.zoom" value="1.5"/> 6 6 <property name="ireport.x" value="31"/> 7 <property name="ireport.y" value=" 672"/>7 <property name="ireport.y" value="0"/> 8 8 <import value="net.sf.jasperreports.engine.*"/> 9 9 <import value="java.util.*"/> … … 43 43 <field name="Model Number" class="java.lang.String"/> 44 44 <field name="Manufacturer" class="java.lang.String"/> 45 <field name=" Hazards Identified" class="java.lang.String"/>46 <field name="Risk Assesment" class="java.lang.String"/>45 <field name="ecr" class="java.lang.String"/> 46 <field name="Risk Level" class="java.lang.String"/> 47 47 <field name="Safe Work Procedure" class="java.lang.String"/> 48 <field name=" Maintenance Frequency" class="java.lang.String"/>49 <field name="Maintenance Date" class="java.lang.String"/>48 <field name="Regulatory Requirement" class="java.lang.String"/> 49 <field name="Maintenance % Completion" class="java.lang.String"/> 50 50 <field name="Registration Required" class="java.lang.String"/> 51 51 <field name="Registration Expiry Date" class="java.lang.String"/> … … 241 241 <font fontName="Serif" size="8"/> 242 242 </textElement> 243 <text><![CDATA[ Hazards Identified]]></text>243 <text><![CDATA[Equipment Criticality (ecr)]]></text> 244 244 </staticText> 245 245 </jr:columnHeader> … … 250 250 <font fontName="Serif" size="8"/> 251 251 </textElement> 252 <textFieldExpression class="java.lang.String"><![CDATA[$F{ Hazards Identified}]]></textFieldExpression>252 <textFieldExpression class="java.lang.String"><![CDATA[$F{ecr}]]></textFieldExpression> 253 253 </textField> 254 254 </jr:detailCell> … … 261 261 <font fontName="Serif" size="8"/> 262 262 </textElement> 263 <text><![CDATA[Risk Assesment (Y/N)]]></text>263 <text><![CDATA[Risk Level]]></text> 264 264 </staticText> 265 265 </jr:columnHeader> … … 270 270 <font fontName="Serif" size="8"/> 271 271 </textElement> 272 <textFieldExpression class="java.lang.String"><![CDATA[$F{Risk Assesment}]]></textFieldExpression>272 <textFieldExpression class="java.lang.String"><![CDATA[$F{Risk Level}]]></textFieldExpression> 273 273 </textField> 274 274 </jr:detailCell> … … 281 281 <font fontName="Serif" size="8"/> 282 282 </textElement> 283 <text><![CDATA[Safe Work Procedure (Y/N)]]></text>283 <text><![CDATA[Safe Work Procedure]]></text> 284 284 </staticText> 285 285 </jr:columnHeader> … … 301 301 <font fontName="Serif" size="8"/> 302 302 </textElement> 303 <text><![CDATA[ Maintenance Frequency]]></text>303 <text><![CDATA[Regulatory Requirement (Y/N)]]></text> 304 304 </staticText> 305 305 </jr:columnHeader> … … 310 310 <font fontName="Serif" size="8"/> 311 311 </textElement> 312 <textFieldExpression class="java.lang.String"><![CDATA[$F{ Maintenance Frequency}]]></textFieldExpression>312 <textFieldExpression class="java.lang.String"><![CDATA[$F{Regulatory Requirement}]]></textFieldExpression> 313 313 </textField> 314 314 </jr:detailCell> … … 321 321 <font fontName="Serif" size="8"/> 322 322 </textElement> 323 <text><![CDATA[Maintenance Date]]></text>323 <text><![CDATA[Maintenance % Completion]]></text> 324 324 </staticText> 325 325 </jr:columnHeader> … … 330 330 <font fontName="Serif" size="8"/> 331 331 </textElement> 332 <textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance Date}]]></textFieldExpression>332 <textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance % Completion}]]></textFieldExpression> 333 333 </textField> 334 334 </jr:detailCell>
Note: See TracChangeset
for help on using the changeset viewer.
