Fixed handling of logical models to exclude JSON/XML tabs and to properly display name of artifact

Moved Questionnaire contained information to appear in a more logical place

Author: lmckenzi

layouts/layout-instance-base.html

@@ -6,15 +6,26 @@
 <div class="col-12">
   <!--ReleaseHeader--><p id="publish-box">Publish Box goes here</p><!--EndReleaseHeader-->
 
+{% if site.data.artifacts[localPage].logical %}
+  <p>{{site.data.stringsBase['{{[lang]}}']['ModelOf']}} 
+  {% if site.data.artifacts[localPage].logicalInstanceOfLocal %}
+    {% assign localRef = site.data.artifacts[localPage].logicalInstanceOfLocal %}
+    <a href="{{site.data.resources[localRef].path}}">{{site.data.resources[localRef].titlelang['{{[lang]}}']}}</a>
+  {% else %}
+    {{site.data.artifacts[localPage].logicalInstanceOf}}
+  {% endif %}
+  </p>
+{% else %}
   {% include fragment-base-navtabs.html type='{{[type]}}' id='{{[id]}}' active='content' lang="{{[lang]}}" %}
+{% endif %}
 
   <a name="root"> </a>
 {% if site.data.artifacts[localPage].example %}
   {% assign example = site.data.stringsBase['{{[lang]}}']['Example'] | append: ' ' %}
 {% endif %}
 {% assign prefix = site.data.artifacts[localPage].type %}
 {% assign respath = site.data.resources[resource_].path %}
-  <h2 id="root">{{example}}{{prefix}}: {{site.data.pages[respath].titlelang['{{[lang]}}'] | escape_once}}</h2>
+  <h2 id="root">{{example}}{{prefix}}: {{site.data.pages[localPage].titlelang['{{[lang]}}'] | escape_once}}</h2>
 
 {% include fragment-simpletable.html lang="{{[lang]}}" %}
 {% unless example %}

layouts/layout-questionnaire.html

@@ -62,6 +62,11 @@ <h2 id="root">Questionnaire: {{site.data.resources[resource_].titlelang['{{[lang
     </div>
   </div>
 
+  {% if site.data.resources[resource_].contained != nil %}
+  <h4>{{site.data.stringsBase['{{[lang]}}']['Contained']}}</h4>
+  {% include {{[type]}}-{{[id]}}-contained-index{{[langsuffix]}}.xhtml %}
+  {% endif %}
+
   <a name="test"> </a>
   <h3>{{site.data.stringsBase['{{[lang]}}']['TestQuestionnaire']}}</h3>
   {% include {{[type]}}-{{[id]}}-links{{[langsuffix]}}.xhtml %}
@@ -75,11 +80,6 @@ <h3>{{site.data.stringsBase['{{[lang]}}']['ResponsesQuestionnaire']}}</h3>
     {{responses}}
   {% endif %}
 
-  {% if site.data.resources[resource_].contained != nil %}
-  <h4>{{site.data.stringsBase['{{[lang]}}']['Contained']}}</h4>
-  {% include {{[type]}}-{{[id]}}-contained-index{{[langsuffix]}}.xhtml %}
-  {% endif %}
-
   <!-- insert notes if present -->
   {% include fragment-notes.html type='{{[type]}}' id='{{[id]}}' lang="{{[lang]}}" %}
 

scripts/onGenerate.data.xslt

@@ -26,6 +26,26 @@
         <xsl:value-of select="concat(',&quot;exampleOf&quot;:{&quot;name&quot;:&quot;', f:name/@value, '&quot;,&quot;url&quot;:&quot;', $page, '&quot;}')"/>
       </xsl:for-each>
     </xsl:for-each>
+    <xsl:for-each select="f:extension[@url='http://hl7.org/fhir/tools/StructureDefinition/implementationguide-resource-logical']/f:valueCanonical">
+      <xsl:text>,"logical":true</xsl:text>
+      <xsl:variable name="baseUrl" select="substring-before(ancestor::f:ImplementationGuide/f:url/@value, 'ImplementationGuide/')"/>
+      <xsl:choose>
+        <xsl:when test="contains(@value, $baseUrl)">
+          <xsl:variable name="localUrl" select="substring-after(@value, $baseUrl)"/>
+          <xsl:choose>
+            <xsl:when test="contains($localUrl, '|')">
+              <xsl:value-of select="concat(',&quot;logicalInstanceOfLocal&quot;:&quot;', substring-before($localUrl, '|'), '&quot;')"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="concat(',&quot;logicalInstanceOfLocal&quot;:&quot;', $localUrl, '&quot;')"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="concat(',&quot;logicalInstanceOf&quot;:&quot;', @value, '&quot;')"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
     <xsl:text>}</xsl:text>
   </xsl:template>
 </xsl:stylesheet>  

translations/stringsBase.json

@@ -124,6 +124,7 @@
     "HighlightChangesHelp": "Enable this to see changes since the last official release",
     "NewContent": "New Content",
     "ModifiedContent": "Modified Content",
-    "TermParameters": "Terminology Parameters"
+    "TermParameters": "Terminology Parameters",
+    "ModelOf": "Instance of logical model"
   }
 }