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 159)
+++ projects/DailyDrillingReport_1.2/XML/HTMLreport/ddr_HTMLReport_transformation_2011_02_07.xsl (revision 171)
@@ -492,7 +492,4 @@
 												<a target="_blank" href="{$urlRDS}">Run time</a>
 											</td>
-											<td align="center" width="100" valign="top">
-												<a target="_blank" href="{$urlRDS}">Description</a>
-											</td>
 											<td align="center" width="60" valign="top">
 												<a target="_blank" href="{$urlRDS}">Nominal outside diameter<br />
@@ -522,12 +519,15 @@
 											</td>
 											<td align="center" width="60" valign="top">
-												<a target="_blank" href="{$urlRDS}">Top/Hangar MD<br />
+												<a target="_blank" href="{$urlRDS}">MD Top/Hangar<br />
 													<xsl:value-of select="witsml:casing_liner_tubing/witsml:mdTop/@uom"/>
 												</a>
 											</td>
 											<td align="center" width="60" valign="top">
-												<a target="_blank" href="{$urlRDS}">Bottom/Shoe MD<br />
+												<a target="_blank" href="{$urlRDS}">MD Bottom/Shoe<br />
 													<xsl:value-of select="witsml:casing_liner_tubing/witsml:mdBottom/@uom"/>
 												</a>
+											</td>
+											<td align="center" width="100" valign="top">
+												<a target="_blank" href="{$urlRDS}">Description</a>
 											</td>
 										</tr>
@@ -543,32 +543,32 @@
 												</td>
 												<td align="center">
-													<xsl:value-of select="substring-after(substring(witsml:casing_liner_tubing_run/witsml:dTimStart, 0, 17), 'T')"/>
+													<xsl:value-of select="substring-after(substring(witsml:casing_liner_tubing_run/witsml:dTimEnd, 0, 17), 'T')"/>
+												</td>
+												<td align="center">
+													<xsl:value-of select="witsml:od"/>
+												</td>
+												<td align="center">
+													<xsl:value-of select="witsml:id"/>
+												</td>
+												<td align="center">
+													<xsl:value-of select="witsml:weight"/>
+												</td>
+												<td align="center">
+													<xsl:value-of select="witsml:grade"/>
+												</td>
+												<td align="center">
+													<xsl:value-of select="witsml:connection"/>
+												</td>
+												<td align="center">
+													<xsl:value-of select="witsml:length"/>
+												</td>
+												<td align="center">
+													<xsl:value-of select="witsml:mdTop"/>
+												</td>
+												<td align="center">
+													<xsl:value-of select="witsml:mdBottom"/>
 												</td>
 												<td align="center">
 													<xsl:value-of select="witsml:casing_liner_tubing_run/witsml:description"/>
-												</td>
-												<td align="center">
-													<xsl:value-of select="witsml:od"/>
-												</td>
-												<td align="center">
-													<xsl:value-of select="witsml:id"/>
-												</td>
-												<td align="center">
-													<xsl:value-of select="witsml:weight"/>
-												</td>
-												<td align="center">
-													<xsl:value-of select="witsml:grade"/>
-												</td>
-												<td align="center">
-													<xsl:value-of select="witsml:connection"/>
-												</td>
-												<td align="center">
-													<xsl:value-of select="witsml:length"/>
-												</td>
-												<td align="center">
-													<xsl:value-of select="witsml:mdTop"/>
-												</td>
-												<td align="center">
-													<xsl:value-of select="witsml:mdBottom"/>
 												</td>
 											</tr>
@@ -614,7 +614,4 @@
 													<a target="_blank" href="{$urlRDS}">Casing string diameter</a>
 												</td>
-												<td align="center" width="100" valign="top">
-													<a target="_blank" href="{$urlRDS}">Comments</a>
-												</td>
 												<td align="center" width="60" valign="top">
 													<a target="_blank" href="{$urlRDS}">Top plug used</a>
@@ -649,4 +646,7 @@
 													<a target="_blank" href="{$urlRDS}">Rotated</a>
 												</td>
+												<td align="center" width="100" valign="top">
+													<a target="_blank" href="{$urlRDS}">Comments</a>
+												</td>
 											</tr>
 											<tr class="light">
@@ -664,7 +664,4 @@
 												</td>
 												<td align="center">
-													<xsl:value-of select="witsml:comments"/>
-												</td>
-												<td align="center">
 													<xsl:if test="witsml:topPlug='true' or witsml:topPlug='1'">yes</xsl:if>
 													<xsl:if test="witsml:topPlug='false' or witsml:topPlug='0'">no</xsl:if>
@@ -702,4 +699,7 @@
 													<xsl:if test="witsml:rotated='true' or witsml:rotated='1'">yes</xsl:if>
 													<xsl:if test="witsml:rotated='false' or witsml:rotated='0'">no</xsl:if>
+												</td>
+												<td align="center">
+													<xsl:value-of select="witsml:comments"/>
 												</td>
 											</tr>
@@ -2631,9 +2631,11 @@
 			<!-- Added 07feb2011 -->
 			<td class="ColHead">
-				<a target="_blank" href="{$urlRDS}">Rig Type:</a>
+				<a target="_blank" href="{$urlRDS}">Fixed rig:</a>
 			</td>
 			<td class="light">
-				<xsl:variable name="element_rigType" select="witsml:rigType" />
-				<xsl:value-of select="$element_rigTypes//xsd:enumeration[@value=$element_rigType]" />
+			<xsl:if test="witsml:fixedRig='true' or witsml:fixedRig='1'">yes</xsl:if>
+				<xsl:if test="witsml:fixedRig='false' or witsml:fixedRig='0'">no</xsl:if>
+				<!--<xsl:variable name="element_rigType" select="witsml:rigType" />
+				<xsl:value-of select="$element_rigTypes//xsd:enumeration[@value=$element_rigType]" />-->
 			</td>
 			<!-- END Added 07feb2011 -->
@@ -2750,4 +2752,6 @@
 				<xsl:value-of select="witsml:mdCsgLast"/>
 			</td>
+			</tr>
+		<tr class="light">
 			<td class="dark">
 				<a target="_blank" href="{$url_tvdCsgLast}">Depth At Last Casing mTVD:</a>
