Index: trunk/grails-app/services/CreateDataService.groovy
===================================================================
--- trunk/grails-app/services/CreateDataService.groovy	(revision 266)
+++ trunk/grails-app/services/CreateDataService.groovy	(revision 268)
@@ -60,4 +60,5 @@
         createBaseSupplierType()
         createBaseManufacturerType()
+        createBaseExtenededAttributeTypes()
 
         // Tasks
@@ -76,5 +77,4 @@
 
         // Assets
-        createBaseAssetExtenededAttributeTypes()
 
         // Record that data has been created.
@@ -128,9 +128,6 @@
         createDemoTaskProcedure()
         createDemoMaintenanceActions()
-        createDemoSystemSections()
-        createDemoAssetTypes()
-        createDemoAssemblies()
-        createDemoSubAssemblies()
-        createDemoComponentItems()
+        createDemoSections()
+        createDemoAssetSubItems()
         createDemoAssets()
         createDemoAssetExtenedAttributes()
@@ -993,164 +990,130 @@
     }
 
-    def createDemoSystemSections() {
-
-        //SystemSection
-        def systemSectionInstance
-
-        //SystemSection #1
-        systemSectionInstance = new SystemSection(name: "Press Section",
+    def createDemoSections() {
+
+        //Section
+        def sectionInstance
+
+        //Section #1
+        sectionInstance = new Section(name: "Press Section",
                                                                                     site: Site.get(1),
                                                                                     department: Department.get(1))
-        saveAndTest(systemSectionInstance)
-
-        //SystemSection #2
-        systemSectionInstance = new SystemSection(name: "RO System",
+        saveAndTest(sectionInstance)
+
+        //Section #2
+        sectionInstance = new Section(name: "RO System",
                                                                                     site: Site.get(2),
                                                                                     department: Department.get(2))
-        saveAndTest(systemSectionInstance)
-
-        //SystemSection #3
-        systemSectionInstance = new SystemSection(name: "Auxilliray Section",
+        saveAndTest(sectionInstance)
+
+        //Section #3
+        sectionInstance = new Section(name: "Auxilliray Section",
                                                                                     site: Site.get(1),
                                                                                     department: Department.get(1))
-        saveAndTest(systemSectionInstance)
-    }
-
-    def createDemoAssetTypes() {
-
-        //AssetType
-        def assetTypeInstance
-
-        //AssetType #1
-        assetTypeInstance = new AssetType(name: "Print Unit")
-        saveAndTest(assetTypeInstance)
-
-        //AssetType #2
-        assetTypeInstance = new AssetType(name: "Reactor Tower")
-        saveAndTest(assetTypeInstance)
-    }
-
-    def createDemoAssemblies() {
-
-        //Assembly
-        def assemblyInstance
-
-        //Assembly #1
-        assemblyInstance = new Assembly(name: "Print Couple",
-                                                                        assetType: AssetType.get(1))
-        saveAndTest(assemblyInstance)
-//        assemblyInstance.addToMaintenanceActions(MaintenanceAction.get(1))
-
-        //Assembly #2
-        assemblyInstance = new Assembly(name: "Agitator",
-                                                                        assetType: AssetType.get(2))
-        saveAndTest(assemblyInstance)
-    }
-
-    def createDemoSubAssemblies() {
-
-        //SubAssembly
-        def subAssemblyInstance
-
-        //SubAssembly #1
-        subAssemblyInstance = new SubAssembly(name: "Cylinder",
-                                                                                    assembly: Assembly.get(1))
-        saveAndTest(subAssemblyInstance)
-
-         //SubAssembly #2
-        subAssemblyInstance = new SubAssembly(name: "Gearmotor",
-                                                                                    assembly: Assembly.get(2))
-        saveAndTest(subAssemblyInstance)
-    }
-
-    def createDemoComponentItems() {
-
-        //ComponentItem
-        def componentItemInstance
-
-        //ComponentItem #1
-        componentItemInstance = new ComponentItem(name: "Bearing",
-                                                                                            subAssembly: SubAssembly.get(1))
-        saveAndTest(componentItemInstance)
-
-         //ComponentItem #2
-        componentItemInstance = new ComponentItem(name: "Drive shaft oil seal",
-                                                                                            subAssembly: SubAssembly.get(2))
-        saveAndTest(componentItemInstance)
+        saveAndTest(sectionInstance)
+    }
+
+    def createDemoAssetSubItems() {
+
+//         //AssetSubItem
+//         def assetSubItemInstance
+// 
+//         //AssetSubItem #1
+//         assetSubItemInstance = new AssetSubItem(name: "Print Unit")
+//         saveAndTest(assetSubItemInstance)
+// 
+//         //AssetSubItem #2
+//         assetSubItemInstance = new AssetSubItem(name: "Reactor Tower")
+//         saveAndTest(assetSubItemInstance)
     }
 
     def createDemoAssets() {
 
-        //Asset
-        def assetInstance
-
-        //Asset #1
-        assetInstance = new Asset(name: "Print Unit 22",
-                                                        assetType: AssetType.get(1),
-                                                        systemSection: SystemSection.get(1))
-        saveAndTest(assetInstance)
-//        assetInstance.addToMaintenanceActions(MaintenanceAction.get(1))
-
-        //Asset #2
-        assetInstance = new Asset(name: "Print Unit 21",
-                                                        assetType: AssetType.get(1),
-                                                        systemSection: SystemSection.get(1))
-        saveAndTest(assetInstance)
-
-        //Asset #3
-        assetInstance = new Asset(name: "Print Unit 23",
-                                                        assetType: AssetType.get(1),
-                                                        systemSection: SystemSection.get(1))
-        saveAndTest(assetInstance)
-
-        //Asset #4
-        assetInstance = new Asset(name: "RO 1",
-                                                        assetType: AssetType.get(2),
-                                                        systemSection: SystemSection.get(2))
-        saveAndTest(assetInstance)
-    }
-
-    def createBaseAssetExtenededAttributeTypes() {
-
-        //AssetExtendedAttributeType
-        def assetExtendedAttributeInstanceType
-
-        //AssetExtendedAttributeType #1
-        assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Model Number")
-        saveAndTest(assetExtendedAttributeInstanceType)
-
-        //AssetExtendedAttributeType #2
-        assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Purchase Cost")
-        saveAndTest(assetExtendedAttributeInstanceType)
-
-        //AssetExtendedAttributeType #3
-        assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Serial Number")
-        saveAndTest(assetExtendedAttributeInstanceType)
-
-        //AssetExtendedAttributeType #4
-        assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Manufactured Date")
-        saveAndTest(assetExtendedAttributeInstanceType)
-
-        //AssetExtendedAttributeType #5
-        assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Location Description")
-        saveAndTest(assetExtendedAttributeInstanceType)
+//         //Asset
+//         def assetInstance
+// 
+//         //Asset #1
+//         assetInstance = new Asset(name: "Print Unit 22",
+//                                                         section: Section.get(1))
+//         saveAndTest(assetInstance)
+// //        assetInstance.addToMaintenanceActions(MaintenanceAction.get(1))
+// 
+//         //Asset #2
+//         assetInstance = new Asset(name: "Print Unit 21",
+//                                                         assetSubItem: AssetSubItem.get(1),
+//                                                         section: Section.get(1))
+//         saveAndTest(assetInstance)
+// 
+//         //Asset #3
+//         assetInstance = new Asset(name: "Print Unit 23",
+//                                                         assetSubItem: AssetSubItem.get(1),
+//                                                         section: Section.get(1))
+//         saveAndTest(assetInstance)
+// 
+//         //Asset #4
+//         assetInstance = new Asset(name: "RO 1",
+//                                                         assetSubItem: AssetSubItem.get(2),
+//                                                         section: Section.get(2))
+//         saveAndTest(assetInstance)
+    }
+
+    def createBaseExtenededAttributeTypes() {
+
+        //ExtendedAttributeType
+        def extendedAttributeTypeInstance
+
+        //ExtendedAttributeType #1
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Model Number")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #2
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Purchase Cost")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #3
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Serial Number")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #4
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Manufactured Date")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #5
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Location Description")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #6
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Cost Centre")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #7
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Cost Code")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #8
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Manufacturer's Number")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #9
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Inventory Number")
+        saveAndTest(extendedAttributeTypeInstance)
     }
 
     def createDemoAssetExtenedAttributes() {
 
-        //AssetExtendedAttribute
-        def assetExtendedAttributeInstance
-
-        //AssetExtendedAttribute #1
-        assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "PU Mark 2",
-                                                                                                                    asset: Asset.get(1),
-                                                                                                                    assetExtendedAttributeType: AssetExtendedAttributeType.get(1))
-        saveAndTest(assetExtendedAttributeInstance)
-
-        //AssetExtendedAttribute #2
-        assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "On the far side of Tank 5",
-                                                                                                                    asset: Asset.get(1),
-                                                                                                                    assetExtendedAttributeType: AssetExtendedAttributeType.get(5))
-        saveAndTest(assetExtendedAttributeInstance)
+//         //AssetExtendedAttribute
+//         def assetExtendedAttributeInstance
+// 
+//         //AssetExtendedAttribute #1
+//         assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "PU Mark 2",
+//                                                                                                                     asset: Asset.get(1),
+//                                                                                                                     assetExtendedAttributeType: ExtendedAttributeType.get(1))
+//         saveAndTest(assetExtendedAttributeInstance)
+// 
+//         //AssetExtendedAttribute #2
+//         assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "On the far side of Tank 5",
+//                                                                                                                     asset: Asset.get(1),
+//                                                                                                                     assetExtendedAttributeType: ExtendedAttributeType.get(5))
+//         saveAndTest(assetExtendedAttributeInstance)
     }