Merge branch 'spudfix'

@@ -13,19 +13,23 @@
 		let:activityStart="{# SELECT ?activityStart WHERE {?activity ep-activity:startedAt ?activityStart}}"
 		let:activityEnd="{# SELECT ?activityEnd WHERE {?activity ep-activity:finishedAt ?activityEnd}}"
 		let:spudDate="{# SELECT ?spudDate WHERE {?wb ep-well:wellBoreSpudAt ?spudDate}}"
+		let:completeDate="{# SELECT ?completeDate WHERE {?wb ep-well:wellBoreCompletedAt ?completeDate}}"
 		>
+		
 		<h1>Summary report Wellbore: {# SELECT ?wbName WHERE {?wb ep-core:npdCode ?wbName}}</h1>
-		<div>End time: {= ui:label(spif:dateFormat(?activityEnd, 'yyyy-MM-dd HH:mm')) }</div>
+		<div>End time: {= smf:if(smf:isBound(?activityEnd),spif:dateFormat(?activityEnd, 'yyyy-MM-dd HH:mm')) }</div>
 		<hr /> 
-		<table><tr>
+		<table>
+			
+		<tr>
 			<td class="ddrSummaryLeft">
 				<rhswp:NameValuePair arg:name="Report Number:" 				arg:value="{# SELECT ?repNum WHERE {?report ep-report:dailyDrillingReportNumber ?repNum}}"  />
 				<rhswp:NameValuePair arg:name="Wellbore:" 					arg:value="{# SELECT ?wbName WHERE {?wb ep-core:npdCode ?wbName}}" />
 				<rhswp:NameValuePair arg:name="Status:" 					arg:value="{# SELECT ?repTypeName WHERE {?report a ?repType . ?repType rdfs:label ?repTypeName}}" />
 				<rhswp:NameValuePair arg:name="Operator:" 					arg:value="{# SELECT ?parentName WHERE {?activity ep-activity:drillingOperator ?opCo . ?opCo ep-core:temporalPartOf ?parentCo . ?parentCo ep-core:name ?parentName }}"  />
 				<rhswp:NameValuePair arg:name="Rig name:" 					arg:value="{# SELECT ?rigName WHERE {?rig ep-core:npdName ?rigName}}"  />
-				<rhswp:NameValuePair arg:name="Spud date:" 					arg:value="{= spif:dateFormat(?spudDate, 'yyyy-MM-dd')}"  />
-				<rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" 		arg:value="{# SELECT ?kellyElevMeas WHERE {?activity ep-activity:onRig ?rigState . ?rigState ep-core:hasPart ?kellyBushing . ?kellyBushing a ep-eqt:KellyBushing . ?kellyBushing ep-eqt:elevationOfKellyBushing ?kellyElev . ?kellyElev ep-core:metre ?kellyElevMeas}}" />
+				<rhswp:NameValuePair arg:name="Spud date:" 					arg:value="{= smf:if(smf:isBound(?spudDate),spif:dateFormat(?spudDate, 'yyyy-MM-dd')) }"  />
+				<rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" 		arg:value="{# SELECT ?kellyElevVMeas WHERE {?activity ep-activity:onRig ?rigState . ?rigState ep-core:hasPart ?kellyBushing . ?kellyBushing a ep-eqt:KellyBushing . ?kellyBushing ep-eqt:elevationOfKellyBushing ?kellyElev . ?kellyElev ep-core:metre ?kellyElevMeas}}" />
 				<rhswp:NameValuePair arg:name="Tight well:" 				arg:value="{# SELECT ?wbTightTypeLabel WHERE { ?statusActivityWb a ?wbTightType . ?wbTightType a ep-well:WellBoreTightnessType . ?wbTightType rdfs:label ?wbTightTypeLabel} }"  />
 				<rhswp:NameValuePair arg:name="Pressure psig:" 				arg:value="{# SELECT ?buttHolePresVal WHERE {?statusActivityWb ep-well:averageBottomHolePressure ?buttHolePres . ?buttHolePres ep-core:psig ?buttHolePresVal}}" />
 				<rhswp:NameValuePair arg:name="Fixed rig:" 					arg:value="{# SELECT ?rigTypeName WHERE {?rig a ?rigType . ?rigType rdfs:label ?rigTypeName . ?rigType rdfs:subClassOf ep-fac:Rig}}"  />
@@ -39,14 +43,14 @@
 			</td>
 			<td class="ddrSummaryRight">
 			
-				<rhswp:NameValuePair arg:name="Period:" 					arg:value="{= fn:concat(ui:label(spif:dateFormat(?activityStart, 'yyyy-MM-dd HH:mm')), ' - ', ui:label(spif:dateFormat(?activityEnd, 'yyyy-MM-dd HH:mm'))) }" />
+				<rhswp:NameValuePair arg:name="Period:" 					arg:value="{= fn:concat(spif:dateFormat(?activityStart, 'yyyy-MM-dd HH:mm'), ' - ', spif:dateFormat(?activityEnd, 'yyyy-MM-dd HH:mm')) }" />
 	
 			
 				<rhswp:NameValuePair arg:name="Wellbore Id:" 				arg:value="{# SELECT DISTINCT ?wbID WHERE {?wb ep-core:npdNumber ?wbID}}" />
-				<rhswp:NameValuePair arg:name="Created date:"				arg:value="{= spif:dateFormat(?createdAt, 'yyyy-MM-dd HH:mm')}" />
+				<rhswp:NameValuePair arg:name="Created date:"				arg:value="{= smf:if(smf:isBound(?createdAt),spif:dateFormat(?createdAt, 'yyyy-MM-dd HH:mm')) }" />
 				<rhswp:NameValuePair arg:name="Drilling contractor:" 		arg:value="{# SELECT ?parentName WHERE {?activity ep-activity:drillingContractor ?contractor . ?contractor ep-core:temporalPartOf ?parentCo . ?parentCo ep-core:name ?parentName}}" />
 				<rhswp:NameValuePair arg:name="NPD Rig Id:" 				arg:value="{= spl:object(?rig, ep-core:npdCode) }" />
-				<rhswp:NameValuePair arg:name="Date Well Complete:" 		arg:value="{# SELECT ?completeDate WHERE {?wb ep-well:wellBoreCompletedAt ?completeDate}}"  />
+				<rhswp:NameValuePair arg:name="Date Well Complete:" 		arg:value="{= smf:if(smf:isBound(?completeDate),spif:dateFormat(?completeDate, 'yyyy-MM-dd')) }"  />
 				<rhswp:NameValuePair arg:name="Water depth MSL m:" 			arg:value="{# SELECT ?waterDepthVal WHERE {?activity ep-activity:onRig ?rigState . ?rigState a ep-fac:TemporalPartOfARig . ?rigState ep-core:hasPart ?water . ?water a ep-fac:SurroundingWater . ?water ep-fac:depthOfSurroundingWater ?waterDepth . ?waterDepth ep-core:metre ?waterDepthVal}}"  />
 				<rhswp:NameValuePair arg:name="High pressure - High temperature:" arg:value="{# SELECT ?wbPTTypeLabel WHERE { ?statusActivityWb a ?wbPTType . ?wbPTType a ep-well:WellBoreHphtType . ?wbPTType rdfs:label ?wbPTTypeLabel} }" />
 				<rhswp:NameValuePair arg:name="Temperature degC:" 			arg:value="{# SELECT ?buttHoleTempVal WHERE {?statusActivityWb ep-well:averageBottomHoleTemperature ?buttHoleTemp . ?buttHoleTemp ep-core:celsius ?buttHoleTempVal}}" />

@@ -53,7 +53,7 @@
 		<witsml:wellboreInfo>
 			<witsml:dTimSpud>1986-06-06T13:15:00.000Z</witsml:dTimSpud>
 			<witsml:dTimPreSpud>1982-06-06T13:15:00.000Z</witsml:dTimPreSpud>
-			<witsml:dateDrillComplete>1984-06-06T13:15:00.000Z</witsml:dateDrillComplete>
+			<witsml:dateDrillComplete>1984-06-06</witsml:dateDrillComplete>
 			<witsml:operator>Big operator Inc</witsml:operator>
 			<witsml:drillContractor>Smaller contractor Inc</witsml:drillContractor>
 			<witsml:rigAlias>