David Price

Improved Well Injection table and started Well Injection Results table

...@@ -315,9 +315,445 @@ dpr-tables:WellInformation ...@@ -315,9 +315,445 @@ dpr-tables:WellInformation
315 ] ; 315 ] ;
316 rhspin:tableHeaders ("Description"^^xsd:string "Oil Net m3"^^xsd:string "Choke %"^^xsd:string "Prod Hours"^^xsd:string) . 316 rhspin:tableHeaders ("Description"^^xsd:string "Oil Net m3"^^xsd:string "Choke %"^^xsd:string "Prod Hours"^^xsd:string) .
317 317
318 +dpr-tables:WellInjectionTest
319 + rdf:type rhspin:TableTemplate ;
320 + rdfs:label "Well Injection Tests"^^xsd:string ;
321 + rdfs:subClassOf rhspin:DPRTableTemplates ;
322 + spin:body
323 + [ rdf:type sp:Select ;
324 + sp:orderBy ([ sp:varName "wellboreName"^^xsd:string
325 + ] [ sp:varName "activityStart"^^xsd:string
326 + ]) ;
327 + sp:resultVariables ([ sp:varName "wellboreName"^^xsd:string
328 + ] [ sp:varName "wellTestTypeName"^^xsd:string
329 + ] [ sp:varName "activityStart"^^xsd:string
330 + ] [ sp:varName "duration"^^xsd:string
331 + ] [ sp:varName "injectionFluidName"^^xsd:string
332 + ] [ sp:varName "wellTestReasonTypeName"^^xsd:string
333 + ] [ sp:varName "minAnnularPresValue"^^xsd:string
334 + ] [ sp:varName "maxAnnularPresValue"^^xsd:string
335 + ] [ sp:varName "wellheadFlowingPresValue"^^xsd:string
336 + ] [ sp:varName "wellheadMaxPresValue"^^xsd:string
337 + ] [ sp:varName "chokeOrificeSizeValue"^^xsd:string
338 + ]) ;
339 + sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
340 + sp:predicate rdf:type ;
341 + sp:subject
342 + [ sp:varName "productionReport"^^xsd:string
343 + ]
344 + ] [ sp:object
345 + [ sp:varName "productionReport"^^xsd:string
346 + ] ;
347 + sp:predicate <http://www.reportinghub.no/ep/schema/core#partOf> ;
348 + sp:subject
349 + [ sp:varName "wellTestReport"^^xsd:string
350 + ]
351 + ] [ sp:object <http://www.reportinghub.no/ep/schema/report#WellTestReport> ;
352 + sp:predicate rdf:type ;
353 + sp:subject
354 + [ sp:varName "wellTestReport"^^xsd:string
355 + ]
356 + ] [ sp:object
357 + [ sp:varName "wellTest"^^xsd:string
358 + ] ;
359 + sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ;
360 + sp:subject
361 + [ sp:varName "wellTestReport"^^xsd:string
362 + ]
363 + ] [ sp:object <http://www.reportinghub.no/ep/schema/activity#WellTest> ;
364 + sp:predicate rdf:type ;
365 + sp:subject
366 + [ sp:varName "wellTest"^^xsd:string
367 + ]
368 + ] [ sp:object
369 + [ sp:varName "wellborePart"^^xsd:string
370 + ] ;
371 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#onWellBore> ;
372 + sp:subject
373 + [ sp:varName "wellTest"^^xsd:string
374 + ]
375 + ] [ sp:object
376 + [ sp:varName "wellbore"^^xsd:string
377 + ] ;
378 + sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
379 + sp:subject
380 + [ sp:varName "wellborePart"^^xsd:string
381 + ]
382 + ] [ sp:object <http://www.reportinghub.no/ep/schema/well#WellBore> ;
383 + sp:predicate rdf:type ;
384 + sp:subject
385 + [ sp:varName "wellbore"^^xsd:string
386 + ]
387 + ] [ sp:object
388 + [ sp:varName "wellboreName"^^xsd:string
389 + ] ;
390 + sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
391 + sp:subject
392 + [ sp:varName "wellbore"^^xsd:string
393 + ]
394 + ] [ sp:object
395 + [ sp:varName "wellTestType"^^xsd:string
396 + ] ;
397 + sp:predicate rdf:type ;
398 + sp:subject
399 + [ sp:varName "wellTest"^^xsd:string
400 + ]
401 + ] [ sp:object <http://www.reportinghub.no/ep/schema/activity#WellTestType> ;
402 + sp:predicate rdf:type ;
403 + sp:subject
404 + [ sp:varName "wellTestType"^^xsd:string
405 + ]
406 + ] [ sp:object
407 + [ sp:varName "wellTestTypeName"^^xsd:string
408 + ] ;
409 + sp:predicate rdfs:label ;
410 + sp:subject
411 + [ sp:varName "wellTestType"^^xsd:string
412 + ]
413 + ] [ sp:object
414 + [ sp:varName "injectionWellTest"^^xsd:string
415 + ] ;
416 + sp:predicate <http://www.reportinghub.no/ep/schema/core#hasPart> ;
417 + sp:subject
418 + [ sp:varName "wellTest"^^xsd:string
419 + ]
420 + ] [ sp:object <http://www.reportinghub.no/ep/schema/production-activity#InjectionWellTest> ;
421 + sp:predicate rdf:type ;
422 + sp:subject
423 + [ sp:varName "injectionWellTest"^^xsd:string
424 + ]
425 + ] [ sp:object
426 + [ sp:varName "timeDuration"^^xsd:string
427 + ] ;
428 + sp:predicate rdf:type ;
429 + sp:subject
430 + [ sp:varName "injectionWellTest"^^xsd:string
431 + ]
432 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#TimeDuration> ;
433 + sp:predicate rdf:type ;
434 + sp:subject
435 + [ sp:varName "timeDuration"^^xsd:string
436 + ]
437 + ] [ sp:object
438 + [ sp:varName "duration"^^xsd:string
439 + ] ;
440 + sp:predicate <http://www.reportinghub.no/ep/schema/core#hour> ;
441 + sp:subject
442 + [ sp:varName "timeDuration"^^xsd:string
443 + ]
444 + ] [ sp:object
445 + [ sp:varName "injectionWellTestFlow"^^xsd:string
446 + ] ;
447 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#hasFlow> ;
448 + sp:subject
449 + [ sp:varName "injectionWellTest"^^xsd:string
450 + ]
451 + ] [ sp:object
452 + [ sp:varName "injectionFluidType"^^xsd:string
453 + ] ;
454 + sp:predicate rdf:type ;
455 + sp:subject
456 + [ sp:varName "injectionWellTestFlow"^^xsd:string
457 + ]
458 + ] [ sp:object <http://www.reportinghub.no/ep/schema/production-well#InjectionFluidType> ;
459 + sp:predicate rdf:type ;
460 + sp:subject
461 + [ sp:varName "injectionFluidType"^^xsd:string
462 + ]
463 + ] [ sp:object
464 + [ sp:varName "injectionFluidName"^^xsd:string
465 + ] ;
466 + sp:predicate rdfs:label ;
467 + sp:subject
468 + [ sp:varName "injectionFluidType"^^xsd:string
469 + ]
470 + ] [ rdf:type sp:Optional ;
471 + sp:elements ([ sp:object
472 + [ sp:varName "minAnnularPres"^^xsd:string
473 + ] ;
474 + sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#injectionWellTestMinimumAnnularPressure> ;
475 + sp:subject
476 + [ sp:varName "injectionWellTest"^^xsd:string
477 + ]
478 + ] [ sp:object
479 + [ sp:varName "minAnnularPresValue"^^xsd:string
480 + ] ;
481 + sp:predicate <http://www.reportinghub.no/ep/schema/core#bar> ;
482 + sp:subject
483 + [ sp:varName "minAnnularPres"^^xsd:string
484 + ]
485 + ])
486 + ] [ rdf:type sp:Optional ;
487 + sp:elements ([ sp:object
488 + [ sp:varName "maxAnnularPres"^^xsd:string
489 + ] ;
490 + sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#injectionWellTestMaximumAnnularPressure> ;
491 + sp:subject
492 + [ sp:varName "injectionWellTest"^^xsd:string
493 + ]
494 + ] [ sp:object
495 + [ sp:varName "maxAnnularPresValue"^^xsd:string
496 + ] ;
497 + sp:predicate <http://www.reportinghub.no/ep/schema/core#bar> ;
498 + sp:subject
499 + [ sp:varName "maxAnnularPres"^^xsd:string
500 + ]
501 + ])
502 + ] [ rdf:type sp:Optional ;
503 + sp:elements ([ sp:object
504 + [ sp:varName "wellheadFlowingPres"^^xsd:string
505 + ] ;
506 + sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#injectionWellTestWellheadFlowingPressure> ;
507 + sp:subject
508 + [ sp:varName "injectionWellTest"^^xsd:string
509 + ]
510 + ] [ sp:object
511 + [ sp:varName "wellheadFlowingPresValue"^^xsd:string
512 + ] ;
513 + sp:predicate <http://www.reportinghub.no/ep/schema/core#bar> ;
514 + sp:subject
515 + [ sp:varName "wellheadFlowingPres"^^xsd:string
516 + ]
517 + ])
518 + ] [ rdf:type sp:Optional ;
519 + sp:elements ([ sp:object
520 + [ sp:varName "wellheadMaxPres"^^xsd:string
521 + ] ;
522 + sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#injectionWellTestWellheadMaximumPressure> ;
523 + sp:subject
524 + [ sp:varName "injectionWellTest"^^xsd:string
525 + ]
526 + ] [ sp:object
527 + [ sp:varName "wellheadMaxPresValue"^^xsd:string
528 + ] ;
529 + sp:predicate <http://www.reportinghub.no/ep/schema/core#bar> ;
530 + sp:subject
531 + [ sp:varName "wellheadMaxPres"^^xsd:string
532 + ]
533 + ])
534 + ] [ rdf:type sp:Optional ;
535 + sp:elements ([ sp:object
536 + [ sp:varName "wellTestChoke"^^xsd:string
537 + ] ;
538 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#hasWellTestChoke> ;
539 + sp:subject
540 + [ sp:varName "injectionWellTest"^^xsd:string
541 + ]
542 + ] [ sp:object
543 + [ sp:varName "chokeOrificeSize"^^xsd:string
544 + ] ;
545 + sp:predicate <http://www.reportinghub.no/ep/schema/equipment#chokeOrificeSize> ;
546 + sp:subject
547 + [ sp:varName "wellTestChoke"^^xsd:string
548 + ]
549 + ] [ sp:object
550 + [ sp:varName "chokeOrificeSizeValue"^^xsd:string
551 + ] ;
552 + sp:predicate <http://www.reportinghub.no/ep/schema/core#sixtyFourth_Inch> ;
553 + sp:subject
554 + [ sp:varName "chokeOrificeSize"^^xsd:string
555 + ]
556 + ])
557 + ] [ rdf:type sp:Optional ;
558 + sp:elements ([ sp:object
559 + [ sp:varName "wellTestReasonType"^^xsd:string
560 + ] ;
561 + sp:predicate rdf:type ;
562 + sp:subject
563 + [ sp:varName "wellTest"^^xsd:string
564 + ]
565 + ] [ sp:object <http://www.reportinghub.no/ep/schema/production-activity#WellTestReasonType> ;
566 + sp:predicate rdf:type ;
567 + sp:subject
568 + [ sp:varName "wellTestReasonType"^^xsd:string
569 + ]
570 + ] [ sp:object
571 + [ sp:varName "wellTestReasonTypeName"^^xsd:string
572 + ] ;
573 + sp:predicate rdfs:label ;
574 + sp:subject
575 + [ sp:varName "wellTestReasonType"^^xsd:string
576 + ]
577 + ])
578 + ] [ rdf:type sp:Optional ;
579 + sp:elements ([ sp:object
580 + [ sp:varName "activityStart"^^xsd:string
581 + ] ;
582 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#nominallyAt> ;
583 + sp:subject
584 + [ sp:varName "wellTest"^^xsd:string
585 + ]
586 + ])
587 + ])
588 + ] ;
589 + rhspin:tableHeaders ("Wellbore"^^xsd:string "Test Type"^^xsd:string "Nominally At"^^xsd:string """Duration
590 +hr"""^^xsd:string "Injected Fluid"^^xsd:string "Reason"^^xsd:string """Min Annular Pressure
591 +bar"""^^xsd:string """Max Annular Pressure
592 +bar"""^^xsd:string """Wellhead Flowing Pressure
593 +bar"""^^xsd:string """Wellhead Max Pressure
594 +bar"""^^xsd:string "Choke 64 inch"^^xsd:string) .
595 +
596 +dpr-tables:WellInjectionTestResults
597 + rdf:type rhspin:TableTemplate ;
598 + rdfs:label "Well Injection Test Results"^^xsd:string ;
599 + rdfs:subClassOf rhspin:DPRTableTemplates ;
600 + spin:body
601 + [ rdf:type sp:Select ;
602 + sp:orderBy ([ sp:varName "wellboreName"^^xsd:string
603 + ] [ sp:varName "activityStart"^^xsd:string
604 + ]) ;
605 + sp:resultVariables ([ sp:varName "wellboreName"^^xsd:string
606 + ] [ sp:varName "wellTestTypeName"^^xsd:string
607 + ] [ sp:varName "activityStart"^^xsd:string
608 + ] [ sp:varName "materialName"^^xsd:string
609 + ]) ;
610 + sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
611 + sp:predicate rdf:type ;
612 + sp:subject
613 + [ sp:varName "productionReport"^^xsd:string
614 + ]
615 + ] [ sp:object
616 + [ sp:varName "productionReport"^^xsd:string
617 + ] ;
618 + sp:predicate <http://www.reportinghub.no/ep/schema/core#partOf> ;
619 + sp:subject
620 + [ sp:varName "wellTestReport"^^xsd:string
621 + ]
622 + ] [ sp:object <http://www.reportinghub.no/ep/schema/report#WellTestReport> ;
623 + sp:predicate rdf:type ;
624 + sp:subject
625 + [ sp:varName "wellTestReport"^^xsd:string
626 + ]
627 + ] [ sp:object
628 + [ sp:varName "wellTest"^^xsd:string
629 + ] ;
630 + sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ;
631 + sp:subject
632 + [ sp:varName "wellTestReport"^^xsd:string
633 + ]
634 + ] [ sp:object <http://www.reportinghub.no/ep/schema/activity#WellTest> ;
635 + sp:predicate rdf:type ;
636 + sp:subject
637 + [ sp:varName "wellTest"^^xsd:string
638 + ]
639 + ] [ sp:object
640 + [ sp:varName "wellborePart"^^xsd:string
641 + ] ;
642 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#onWellBore> ;
643 + sp:subject
644 + [ sp:varName "wellTest"^^xsd:string
645 + ]
646 + ] [ sp:object
647 + [ sp:varName "wellbore"^^xsd:string
648 + ] ;
649 + sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
650 + sp:subject
651 + [ sp:varName "wellborePart"^^xsd:string
652 + ]
653 + ] [ sp:object <http://www.reportinghub.no/ep/schema/well#WellBore> ;
654 + sp:predicate rdf:type ;
655 + sp:subject
656 + [ sp:varName "wellbore"^^xsd:string
657 + ]
658 + ] [ sp:object
659 + [ sp:varName "wellboreName"^^xsd:string
660 + ] ;
661 + sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
662 + sp:subject
663 + [ sp:varName "wellbore"^^xsd:string
664 + ]
665 + ] [ sp:object
666 + [ sp:varName "wellTestType"^^xsd:string
667 + ] ;
668 + sp:predicate rdf:type ;
669 + sp:subject
670 + [ sp:varName "wellTest"^^xsd:string
671 + ]
672 + ] [ sp:object <http://www.reportinghub.no/ep/schema/activity#WellTestType> ;
673 + sp:predicate rdf:type ;
674 + sp:subject
675 + [ sp:varName "wellTestType"^^xsd:string
676 + ]
677 + ] [ sp:object
678 + [ sp:varName "wellTestTypeName"^^xsd:string
679 + ] ;
680 + sp:predicate rdfs:label ;
681 + sp:subject
682 + [ sp:varName "wellTestType"^^xsd:string
683 + ]
684 + ] [ sp:object
685 + [ sp:varName "injectionWellTest"^^xsd:string
686 + ] ;
687 + sp:predicate <http://www.reportinghub.no/ep/schema/core#hasPart> ;
688 + sp:subject
689 + [ sp:varName "wellTest"^^xsd:string
690 + ]
691 + ] [ sp:object <http://www.reportinghub.no/ep/schema/production-activity#InjectionWellTest> ;
692 + sp:predicate rdf:type ;
693 + sp:subject
694 + [ sp:varName "injectionWellTest"^^xsd:string
695 + ]
696 + ] [ sp:object
697 + [ sp:varName "injectionWellTestFlow"^^xsd:string
698 + ] ;
699 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#hasFlow> ;
700 + sp:subject
701 + [ sp:varName "injectionWellTest"^^xsd:string
702 + ]
703 + ] [ sp:object
704 + [ sp:varName "injectionWellTestFlowPart"^^xsd:string
705 + ] ;
706 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasMixedPart> ;
707 + sp:subject
708 + [ sp:varName "injectionWellTestFlow"^^xsd:string
709 + ]
710 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#Flow> ;
711 + sp:predicate rdf:type ;
712 + sp:subject
713 + [ sp:varName "injectionWellTestFlowPart"^^xsd:string
714 + ]
715 + ] [ sp:object
716 + [ sp:varName "materialFlow"^^xsd:string
717 + ] ;
718 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#materialThatFlows> ;
719 + sp:subject
720 + [ sp:varName "injectionWellTestFlowPart"^^xsd:string
721 + ]
722 + ] [ sp:object
723 + [ sp:varName "materialFlowType"^^xsd:string
724 + ] ;
725 + sp:predicate rdf:type ;
726 + sp:subject
727 + [ sp:varName "materialFlow"^^xsd:string
728 + ]
729 + ] [ sp:object <http://www.reportinghub.no/ep/schema/well#FluidComponentType> ;
730 + sp:predicate rdf:type ;
731 + sp:subject
732 + [ sp:varName "materialFlowType"^^xsd:string
733 + ]
734 + ] [ sp:object
735 + [ sp:varName "materialName"^^xsd:string
736 + ] ;
737 + sp:predicate rdfs:label ;
738 + sp:subject
739 + [ sp:varName "materialFlowType"^^xsd:string
740 + ]
741 + ] [ rdf:type sp:Optional ;
742 + sp:elements ([ sp:object
743 + [ sp:varName "activityStart"^^xsd:string
744 + ] ;
745 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#nominallyAt> ;
746 + sp:subject
747 + [ sp:varName "wellTest"^^xsd:string
748 + ]
749 + ])
750 + ])
751 + ] ;
752 + rhspin:tableHeaders ("Wellbore"^^xsd:string "Test Type"^^xsd:string "Nominally At"^^xsd:string "Fluid"^^xsd:string) .
753 +
318 dpr-tables:WellTest 754 dpr-tables:WellTest
319 rdf:type rhspin:TableTemplate ; 755 rdf:type rhspin:TableTemplate ;
320 - rdfs:label "Well Test8"^^xsd:string ; 756 + rdfs:label "Well Test Report"^^xsd:string ;
321 rdfs:subClassOf rhspin:DPRTableTemplates ; 757 rdfs:subClassOf rhspin:DPRTableTemplates ;
322 spin:body 758 spin:body
323 [ rdf:type sp:Select ; 759 [ rdf:type sp:Select ;
...@@ -327,7 +763,8 @@ dpr-tables:WellTest ...@@ -327,7 +763,8 @@ dpr-tables:WellTest
327 sp:resultVariables ([ sp:varName "wellboreName"^^xsd:string 763 sp:resultVariables ([ sp:varName "wellboreName"^^xsd:string
328 ] [ sp:varName "wellTestTypeName"^^xsd:string 764 ] [ sp:varName "wellTestTypeName"^^xsd:string
329 ] [ sp:varName "activityStart"^^xsd:string 765 ] [ sp:varName "activityStart"^^xsd:string
330 - ] [ sp:varName "activityFinish"^^xsd:string 766 + ] [ sp:varName "predecessorAt"^^xsd:string
767 + ] [ sp:varName "validPredecessorAt"^^xsd:string
331 ] [ sp:varName "wellTestReasonTypeName"^^xsd:string 768 ] [ sp:varName "wellTestReasonTypeName"^^xsd:string
332 ]) ; 769 ]) ;
333 sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ; 770 sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
...@@ -434,9 +871,41 @@ dpr-tables:WellTest ...@@ -434,9 +871,41 @@ dpr-tables:WellTest
434 [ sp:varName "wellTestReasonType"^^xsd:string 871 [ sp:varName "wellTestReasonType"^^xsd:string
435 ] 872 ]
436 ]) 873 ])
874 + ] [ rdf:type sp:Optional ;
875 + sp:elements ([ sp:object
876 + [ sp:varName "predecessor"^^xsd:string
877 + ] ;
878 + sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#hasPredecessor> ;
879 + sp:subject
880 + [ sp:varName "wellTest"^^xsd:string
881 + ]
882 + ] [ sp:object
883 + [ sp:varName "predecessorAt"^^xsd:string
884 + ] ;
885 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#nominallyAt> ;
886 + sp:subject
887 + [ sp:varName "predecessor"^^xsd:string
888 + ]
889 + ])
890 + ] [ rdf:type sp:Optional ;
891 + sp:elements ([ sp:object
892 + [ sp:varName "validPredecessor"^^xsd:string
893 + ] ;
894 + sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#hasValidPredecessor> ;
895 + sp:subject
896 + [ sp:varName "wellTest"^^xsd:string
897 + ]
898 + ] [ sp:object
899 + [ sp:varName "validPredecessorAt"^^xsd:string
900 + ] ;
901 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#nominallyAt> ;
902 + sp:subject
903 + [ sp:varName "validPredecessor"^^xsd:string
904 + ]
905 + ])
437 ]) 906 ])
438 ] ; 907 ] ;
439 - rhspin:tableHeaders ("Wellbore"^^xsd:string "Test Type"^^xsd:string "Started or Nominally At"^^xsd:string "Finished At"^^xsd:string "Reason"^^xsd:string) . 908 + rhspin:tableHeaders ("Wellbore"^^xsd:string "Test Type"^^xsd:string "Started or Nominally At"^^xsd:string "Predecessor At"^^xsd:string "Last Valid At"^^xsd:string "Reason"^^xsd:string) .
440 909
441 _:b2 sp:varName "dailyProductionActivity"^^xsd:string . 910 _:b2 sp:varName "dailyProductionActivity"^^xsd:string .
442 911
......
...@@ -48,10 +48,14 @@ WHERE { ...@@ -48,10 +48,14 @@ WHERE {
48 <tr><td>{= ?facilityName }</td><td>{= ?beds}</td></tr> 48 <tr><td>{= ?facilityName }</td><td>{= ?beds}</td></tr>
49 </ui:forEach> 49 </ui:forEach>
50 </table> 50 </table>
51 - 51 + <hr />
52 - 52 + <h2>General Well Test Information</h2>
53 53
54 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellTest" /> 54 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellTest" />
55 + <hr />
56 + <h2>Well Injection Test Information</h2>
55 57
58 + <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellInjectionTest" />
59 + <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellInjectionTestResults" />
56 60
57 </ui:group> 61 </ui:group>
...\ No newline at end of file ...\ No newline at end of file
......