Skip to content

Commit

Permalink
template changes
Browse files Browse the repository at this point in the history
  • Loading branch information
joofio committed Dec 5, 2023
1 parent 57ed40e commit a4ecfd7
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 152 deletions.
40 changes: 0 additions & 40 deletions ig-template/package/includes/ppd-package copy.liquid

This file was deleted.

150 changes: 38 additions & 112 deletions ig-template/package/includes/ppd-package.liquid
Original file line number Diff line number Diff line change
@@ -1,117 +1,43 @@
<p>Package: {{ pckg.quantity }} {{ pckg.type.coding[0].display }} [{{ pckg.material[0].coding[0].display }}]</p>


{% for pckgitem in pckg.containedItem %}
{% assign innerpckg = pckg.package %}
<div class="container rcorners pack bleft">{% comment %}Include the ppd-package (recursive, with pckg as the object to parse) {% endcomment %}
</div>
{% endfor %}

{% assign mids = entry | where: "resource.resourceType", "ManufacturedItemDefinition" %}
{% for midr in mids %}
{% assign mid = midr.resource %}
{% assign fmid = mid.id | prepend: 'ManufacturedItemDefinition/' %}



{% comment %}
pckg = packaging element
{% endcomment %}
<p>Package:
<b>{{ pckg.quantity }} {{ pckg.type.coding[0].display }}</b>
{% assign pcks = pckg.material | size %}
{% if pcks != 0 %}
{% for pckgm in pckg.material %}
<b>({{ pckgm.coding[0].display }})</b>
{% endfor %}
{% endif %}
</p>

<p>Containing:
{% for pckgcontainedItem in pckg.containedItem %}
{% if pckgcontainedItem.item.reference.reference == fmid %}
{% for pckgitem in pckg.containedItem %}
<div class="container rcorners pack bleft">
<div class="container rcorners packitem">
Containing: {{ pckgitem.amount.value }} {{ pckgitem.amount.unit }}
<div class="container rcorners mid">
<p>
Dose form:
<b>
{{ mid.manufacturedDoseForm.coding[0].display }}
</b>
</p>
<p>
Presentation unit:
<b>
{{ mid.unitOfPresentation.coding[0].display }}
</b>
</p>

{% assign midings = entry | where: "resource.resourceType", "Ingredient" %}

{% for midingr in midings %}

{% assign miding = midingr.resource %}

{% assign midid = mid.id | prepend: 'ManufacturedItemDefinition/' %}
{% if miding.for[2].reference == midid %}
<div class="container m-1 p-1 rcorners miding">
Ingredient
<b>
{{ miding.idxxx }}</b>
<p>
Status:
<b>
{{ miding.status | capitalize }}
</b>
</p>

<p>
Role:
<b>
{{ miding.role.coding[0].display }}
</b>
</p>

<p>
Substance:
<b>
{{ miding.substance.code.concept.coding[0].display }}
</b>
</p>

{% for strn in miding.substance.strength %}
{% if strn.concentrationRatio %}
<p>
Concentration strength:
<b>
{{ strn.concentrationRatio.numerator.value }}{{ strn.concentrationRatio.numerator.unit }} /
{{ strn.concentrationRatio.denominator.value }}{{ strn.concentrationRatio.denominator.unit }}
</b>
</p>
{% endif %}
{% endfor %}

{% for strn in miding.substance.strength %}
{% if strn.presentationRatio %}
<p>
Presentation strength:
<b>
{{ strn.presentationRatio.numerator.value }} {{ strn.presentationRatio.numerator.unit }} /

{{ strn.presentationRatio.denominator.value }} {{ strn.presentationRatio.denominator.unit }}
</b>
</p>
{% endif %}
{% endfor %}
</div>
{% comment %}{% endcomment %}

{% endif %}
{% endfor %}


</div>

</div>
</div>



{% endfor %}

<b>{{ pckgcontainedItem.amount.value }} {{ pckgcontainedItem.amount.unit }}
{{ pckgcontainedItem.item.concept.coding[0].display }}
</b>
</p>
{% assign mids = bundle.entry | where: "resource.resourceType", "ManufacturedItemDefinition" %}

{% for midr in mids %}
{% assign mid = midr.resource %}
{% assign fmid = mid.id | prepend: 'ManufacturedItemDefinition/' %}

{% if pckgcontainedItem.item.reference.reference == fmid %}
{% include mid.liquid mid=mid %}
{% elif pckgcontainedItem.packaging.item.reference.reference == fmid%}
{% include mid.liquid mid=mid %}
{% endif %}



{% endfor %}
{% endfor %}

{% for pckg in pckg.packaging %}
<br/>
<div class="container rcorners innerpack">
{% include ppd-package.liquid pckg=pckg %}
</div>
{% endfor %}

{% endfor %}
{% comment %}
<div class="container rcorners innerpack"></div>
{% endcomment %}
117 changes: 117 additions & 0 deletions ig-template/package/includes/ppd-package_old.liquid
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
<p>Package: {{ pckg.quantity }} {{ pckg.type.coding[0].display }} [{{ pckg.material[0].coding[0].display }}]</p>


{% for pckgitem in pckg.containedItem %}
{% assign innerpckg = pckg.package %}
<div class="container rcorners pack bleft">{% comment %}Include the ppd-package (recursive, with pckg as the object to parse) {% endcomment %}
</div>
{% endfor %}

{% assign mids = entry | where: "resource.resourceType", "ManufacturedItemDefinition" %}
{% for midr in mids %}
{% assign mid = midr.resource %}
{% assign fmid = mid.id | prepend: 'ManufacturedItemDefinition/' %}



{% for pckgcontainedItem in pckg.containedItem %}
{% if pckgcontainedItem.item.reference.reference == fmid %}
{% for pckgitem in pckg.containedItem %}
<div class="container rcorners pack bleft">
<div class="container rcorners packitem">
Containing: {{ pckgitem.amount.value }} {{ pckgitem.amount.unit }}
<div class="container rcorners mid">
<p>
Dose form:
<b>
{{ mid.manufacturedDoseForm.coding[0].display }}
</b>
</p>
<p>
Presentation unit:
<b>
{{ mid.unitOfPresentation.coding[0].display }}
</b>
</p>

{% assign midings = entry | where: "resource.resourceType", "Ingredient" %}

{% for midingr in midings %}

{% assign miding = midingr.resource %}

{% assign midid = mid.id | prepend: 'ManufacturedItemDefinition/' %}
{% if miding.for[2].reference == midid %}
<div class="container m-1 p-1 rcorners miding">
Ingredient
<b>
{{ miding.idxxx }}</b>
<p>
Status:
<b>
{{ miding.status | capitalize }}
</b>
</p>

<p>
Role:
<b>
{{ miding.role.coding[0].display }}
</b>
</p>

<p>
Substance:
<b>
{{ miding.substance.code.concept.coding[0].display }}
</b>
</p>

{% for strn in miding.substance.strength %}
{% if strn.concentrationRatio %}
<p>
Concentration strength:
<b>
{{ strn.concentrationRatio.numerator.value }}{{ strn.concentrationRatio.numerator.unit }} /
{{ strn.concentrationRatio.denominator.value }}{{ strn.concentrationRatio.denominator.unit }}
</b>
</p>
{% endif %}
{% endfor %}

{% for strn in miding.substance.strength %}
{% if strn.presentationRatio %}
<p>
Presentation strength:
<b>
{{ strn.presentationRatio.numerator.value }} {{ strn.presentationRatio.numerator.unit }} /

{{ strn.presentationRatio.denominator.value }} {{ strn.presentationRatio.denominator.unit }}
</b>
</p>
{% endif %}
{% endfor %}
</div>
{% comment %}{% endcomment %}

{% endif %}
{% endfor %}


</div>

</div>
</div>



{% endfor %}


{% endif %}



{% endfor %}

{% endfor %}

0 comments on commit a4ecfd7

Please sign in to comment.