Index: projects/DailyDrillingReport_1.2/XML/HTMLreport/ddr_HTMLReport_transformation_2011_02_07.xsl
===================================================================
--- projects/DailyDrillingReport_1.2/XML/HTMLreport/ddr_HTMLReport_transformation_2011_02_07.xsl (revision 146)
+++ projects/DailyDrillingReport_1.2/XML/HTMLreport/ddr_HTMLReport_transformation_2011_02_07.xsl (revision 150)
@@ -37,5 +37,5 @@
 							<xsl:variable name="element_statusInfo" select="document($ddrSchema)/xsd:schema/xsd:complexType[@name='statusInfo']/xsd:sequence"/>
 							<td>
-								<table id="table1">
+								<table id="table1" width="100%">
 									<!-- Added/changed 18jan2011 -->
 									<tr class="light">
@@ -47,6 +47,6 @@
 										</td>
 										<td class="ColHead">
-											<a target="_blank" href="{$urlRDS}">Period:</a>:</td>
-										<td colspan="5">
+											<a target="_blank" href="{$urlRDS}">Period:</a></td>
+										<td colspan="2">
 											<xsl:value-of select="substring(witsml:dTimStart, 0,17)"/> - <xsl:value-of select="substring(witsml:dTimEnd, 0,17)"/>
 										</td>
@@ -539,6 +539,6 @@
 												</td>
 												<td align="center">
-													<xsl:variable name="element_casing" select="document($ddrSchema)/xsd:schema/xsd:simpleType[@name='stimStageType']/xsd:restriction"/>
-													<xsl:variable name="casingTypes" select="witsml:casing_liner_tubing_run/witsml:kind" />
+													<xsl:variable name="element_casing" select="document($ddrSchema)/xsd:schema/xsd:simpleType[@name='tubularJobTypes']/xsd:restriction"/>
+													<xsl:variable name="casingTypes" select="witsml:casing_liner_tubing_run/witsml:tubularJobType" />
 													<xsl:value-of select="$element_casing//xsd:enumeration[@value=$casingTypes]"/>
 												</td>
@@ -667,5 +667,5 @@
 												</td>
 												<td align="center">
-													<xsl:value-of select="witsml:comment"/>
+													<xsl:value-of select="witsml:comments"/>
 												</td>
 												<td align="center">
@@ -676,5 +676,5 @@
 												</td>
 												<td align="center">
-													<xsl:value-of select="witsml:plugBumped"/>
+													<xsl:value-of select="not(witsml:plugBumped)"/>
 												</td>
 												<td align="center">
@@ -682,5 +682,5 @@
 												</td>
 												<td align="center">
-													<xsl:value-of select="witsml:floatFailed"/>
+													<xsl:value-of select="not(witsml:floatHeld)"/>
 												</td>
 												<td align="center">
@@ -737,11 +737,4 @@
 										<table id="table2">
 											<tr>
-												<td align="left"  width="60" valign="top">
-													<a target="_blank" href="{$url_dTimFluid}">Sample Time</a>
-												</td>
-												<td align="center" width="60" valign="top">
-													<a target="_blank" href="{$url_mdFluid}">MD At Logging <xsl:value-of select="witsml:cementingFluid/witsml:mdLog/@uom" />
-													</a>
-												</td>
 												<td align="center" width="100" valign="top">
 													<a target="_blank" href="{$url_mudClass}">Fluid Type</a>
@@ -756,8 +749,4 @@
 												<td align="center" width="100" valign="top">
 													<a target="_blank" href="{$url_density}">Fluid Density <xsl:value-of select="witsml:cementingFluid/witsml:density/@uom"/>
-													</a>
-												</td>
-												<td align="center" width="120" valign="top">
-													<a target="_blank" href="{$url_pv}">Fluid Viscosity <xsl:value-of select="witsml:cementingFluid/witsml:pv/@uom"/>
 													</a>
 												</td>
@@ -785,10 +774,4 @@
 											<xsl:for-each select="witsml:cementingFluid">
 												<tr class="light">
-													<td>
-														<xsl:value-of select="substring(witsml:dTimTest, 0, 17)"/>
-													</td>
-													<td align="center">
-														<xsl:value-of select="witsml:mdLog"/>
-													</td>
 													<td align="center">
 														<xsl:variable name="element_fluidTypes" select="document($ddrSchema)/xsd:schema/xsd:simpleType[@name='fluidTypes']/xsd:restriction"/>
@@ -806,7 +789,4 @@
 													</td>
 													<td align="center">
-														<xsl:value-of select="witsml:pv"/>
-													</td>
-													<td align="center">
 														<xsl:value-of select="witsml:yp"/>
 													</td>
@@ -821,5 +801,5 @@
 													</td>
 													<td align="center">
-														<xsl:value-of select="witsml:comment"/>
+														<xsl:value-of select="witsml:comments"/>
 													</td>
 												</tr>
@@ -2522,4 +2502,6 @@
 				<xsl:value-of select="witsml:rigAlias[witsml:namingSystem='NPD code']/witsml:name"/>
 			</td>
+			</tr>
+			<tr class="light">
 			<td class="ColHead">
 				<a href="{$url_elevKelly}" target="_blank">Elevation RKB-MSL (<xsl:value-of select="../witsml:statusInfo/witsml:elevKelly/@uom"/>):</a>
@@ -2527,4 +2509,10 @@
 			<td>
 				<xsl:value-of select="../witsml:statusInfo/witsml:elevKelly"/>
+			</td>
+			<td class="ColHead">
+				<a target="_blank" href="{$urlRDS}">Water Depth MSL (<xsl:value-of select="../witsml:statusInfo/witsml:waterDepth/@uom" />):</a>
+			</td>
+			<td class="light">
+				<xsl:value-of select="../witsml:statusInfo/witsml:waterDepth"/>
 			</td>
 		</tr>
@@ -2545,10 +2533,4 @@
 			<td class="light">
 				<xsl:value-of select="substring-before(witsml:dateDrillComplete, 'T')"/>
-			</td>
-			<td class="ColHead">
-				<a target="_blank" href="{$urlRDS}">Water Depth MSL (<xsl:value-of select="../witsml:statusInfo/witsml:waterDepth/@uom" />):</a>
-			</td>
-			<td class="light">
-				<xsl:value-of select="../witsml:statusInfo/witsml:waterDepth"/>
 			</td>
 		</tr>
@@ -2648,8 +2630,6 @@
 				<xsl:value-of select="$element_rigTypes//xsd:enumeration[@value=$element_rigType]" />
 			</td>
-		</tr>
 		<!-- END Added 07feb2011 -->
 		<!-- wellbore type and kick off -->
-		<tr class="light">
 			<td class="dark">
 				<a target="_blank" href="{$url_typeWellbore}">Wellbore type:</a>
@@ -2658,4 +2638,6 @@
 				<xsl:value-of select="witsml:typeWellbore"/>
 			</td>
+			</tr>
+			<tr class="light">
 			<td class="dark">
 				<a target="_blank" href="{$url_mdKickoff}">Depth at Kick Off mMD:</a>
@@ -2684,4 +2666,6 @@
 				<xsl:value-of select="witsml:tvd"/>
 			</td>
+			</tr>
+			<tr class="light">
 			<td>
 				<a target="_blank" href="{$url_mdPlugTop}">Plug Back Depth mMD:</a>
@@ -2690,6 +2674,4 @@
 				<xsl:value-of select="witsml:mdPlugTop"/>
 			</td>
-		</tr>
-		<tr class="light">
 			<td class="dark">
 				<a target="_blank" href="{$url_distDrill}">Dist Drilled <xsl:value-of select="witsml:distDrill/@uom"/>:</a>
@@ -2698,4 +2680,6 @@
 				<xsl:value-of select="witsml:distDrill"/>
 			</td>
+			</tr>
+		<tr class="light">
 			<!-- 
 			<td class="dark"><a target="_blank" href="{$urlRDS}">Depth planned mMD:</a></td>
@@ -2705,10 +2689,8 @@
 				<a target="_blank" href="{$url_ropCurrent}">Penetration Rate <xsl:value-of select="witsml:ropCurrent/@uom"/>:</a>
 			</td>
-			<td colspan="3">
+			<td class="light">
 				<xsl:value-of select="witsml:ropCurrent"/>
 			</td>
-		</tr>
 		<!-- hole dia -->
-		<tr class="light">
 			<td width="160">
 				<a target="_blank" href="{$url_diaHole}">Hole Dia <xsl:value-of select="witsml:diaHole/@uom"/>:</a>
@@ -2717,13 +2699,13 @@
 				<xsl:value-of select="witsml:diaHole"/>
 			</td>
+			</tr>
+		<tr class="light">
 			<td>
 				<a target="_blank" href="{$url_presTestType}">Pressure Test Type:</a>
 			</td>
-			<td colspan="3">
+			<td class="light">
 				<xsl:value-of select="witsml:presTestType"/>
 			</td>
-		</tr>
 		<!-- formation strength and  pressure test -->
-		<tr class="light">
 			<td width="160">
 				<a target="_blank" href="{$url_strengthForm}">Formation Strength <xsl:value-of select="witsml:strengthForm/@uom"/>:</a>
@@ -2732,4 +2714,6 @@
 				<xsl:value-of select="witsml:strengthForm"/>
 			</td>
+			</tr>
+		<tr class="light">
 			<td width="215">
 				<a target="_blank" href="{$url_mdStrengthForm}">Depth At Formation Strength mMD:</a>
