Cleanup Drilling Fluid header and add to DDR report.

@@ -1541,7 +1541,7 @@ m"""^^xsd:string "Inner barrel type"^^xsd:string "Description"^^xsd:string) .
 
 ddr-tables:DrillingFluidInformation
       rdf:type rhspin:TableTemplate ;
-      rdfs:label "Cement Fluid Information"^^xsd:string ;
+      rdfs:label "Drilling Fluid Information"^^xsd:string ;
       rdfs:subClassOf rhspin:DDRTableTemplates ;
       spin:body
               [ rdf:type sp:Select ;
@@ -1711,13 +1711,13 @@ ddr-tables:DrillingFluidInformation
                                       ])
                           ])
               ] ;
-      rhspin:tableHeaders ("""Start
-time"""^^xsd:string "Fluid type"^^xsd:string """Volume pumped
-m3"""^^xsd:string "Fluid density"^^xsd:string """Yield point
-ft3/sack"""^^xsd:string """Mix water ratio
-gal/sack"""^^xsd:string """Free water
-%"""^^xsd:string """Thickening time
-h"""^^xsd:string "Fluid Description"^^xsd:string "Comments"^^xsd:string) .
+      rhspin:tableHeaders ("""Sample
+time"""^^xsd:string """Depth At
+Logging
+mMD"""^^xsd:string "Fluid Type"^^xsd:string """Fluid density
+g/cm3"""^^xsd:string """Fluid Viscosity
+Pa.s"""^^xsd:string """Yield point
+Pa"""^^xsd:string) .
 
 ddr-tables:EquipmentFailure
       rdf:type rhspin:TableTemplate ;
@@ -4347,6 +4347,57 @@ ppm"""^^xsd:string """H2S
 content
 ppm"""^^xsd:string) .
 
+_:b54
+      sp:varName "ed"^^xsd:string .
+
+_:b53
+      sp:varName "id"^^xsd:string .
+
+_:b52
+      sp:varName "wellbore"^^xsd:string .
+
+_:b51
+      sp:varName "subactclass"^^xsd:string .
+
+_:b50
+      sp:varName "stateclass"^^xsd:string .
+
+_:b49
+      sp:varName "finishedAt"^^xsd:string .
+
+_:b48
+      sp:varName "startedAt"^^xsd:string .
+
+_:b47
+      sp:varName "part"^^xsd:string .
+
+_:b46
+      sp:varName "reportOn"^^xsd:string .
+
+_:b45
+      sp:varName "remark"^^xsd:string .
+
+_:b44
+      sp:varName "state"^^xsd:string .
+
+_:b43
+      sp:varName "mainSubActivity"^^xsd:string .
+
+_:b42
+      sp:varName "depth"^^xsd:string .
+
+_:b41
+      sp:varName "endDepth"^^xsd:string .
+
+_:b40
+      sp:varName "startDepth"^^xsd:string .
+
+_:b39
+      sp:varName "endTime"^^xsd:string .
+
+_:b38
+      sp:varName "startTime"^^xsd:string .
+
 _:b37
       sp:varName "tvd"^^xsd:string .
 
@@ -4448,54 +4499,3 @@ _:b3  sp:varName "depthBottommMDCore"^^xsd:string .
 _:b2  sp:varName "depthTopmMD"^^xsd:string .
 
 _:b1  sp:varName "coreNo"^^xsd:string .
-
-_:b54
-      sp:varName "ed"^^xsd:string .
-
-_:b53
-      sp:varName "id"^^xsd:string .
-
-_:b52
-      sp:varName "wellbore"^^xsd:string .
-
-_:b51
-      sp:varName "subactclass"^^xsd:string .
-
-_:b50
-      sp:varName "stateclass"^^xsd:string .
-
-_:b49
-      sp:varName "finishedAt"^^xsd:string .
-
-_:b48
-      sp:varName "startedAt"^^xsd:string .
-
-_:b47
-      sp:varName "part"^^xsd:string .
-
-_:b46
-      sp:varName "reportOn"^^xsd:string .
-
-_:b45
-      sp:varName "remark"^^xsd:string .
-
-_:b44
-      sp:varName "state"^^xsd:string .
-
-_:b43
-      sp:varName "mainSubActivity"^^xsd:string .
-
-_:b42
-      sp:varName "depth"^^xsd:string .
-
-_:b41
-      sp:varName "endDepth"^^xsd:string .
-
-_:b40
-      sp:varName "startDepth"^^xsd:string .
-
-_:b39
-      sp:varName "endTime"^^xsd:string .
-
-_:b38
-      sp:varName "startTime"^^xsd:string .

@@ -87,6 +87,8 @@
 
 		<ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:CementFluidInformation" />
 
+		<ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:DrillingFluidInformation" />
+
 		<ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:PorePressure" />		
 
 		<ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:SurveyStation" />