fhirsmith 0.8.4 → 0.8.6

package/server.js

@@ -28,7 +28,7 @@ try {
 }
 
 const Logger = require('./library/logger');
-const serverLog = Logger.getInstance().child({ module: 'server' });
+const serverLog = Logger.getInstance(config.logging || {}).child({ module: 'server' });
 const packageJson = require('./package.json');
 
 // Startup banner
@@ -64,6 +64,7 @@ const FolderModule = require("./folder/folder");
 const ExtensionTrackerModule = require("./extension-tracker/extension-tracker");
 
 htmlServer.useLog(serverLog);
+htmlServer.setSponsorMessage(config.sponsorMessage ? config.sponsorMessage : '');
 
 const app = express();
 
@@ -386,22 +387,44 @@ async function buildRootPageContent() {
 
   // Memory usage
   const memUsage = process.memoryUsage();
-  const heapUsedMB = (memUsage.heapUsed / 1024 / 1024).toFixed(2);
-  const heapAvailableMB = ((memUsage.heapTotal - memUsage.heapUsed) / 1024 / 1024).toFixed(2);
-  const rssMB = (memUsage.rss / 1024 / 1024).toFixed(2);
-  const freeMemMB = (os.freemem() / 1024 / 1024).toFixed(0);
+  const heapStats = v8.getHeapStatistics();
+
+  // V8 heap: used vs limit
+  const v8UsedMB = (memUsage.heapUsed / 1024 / 1024).toFixed(0);
+  const v8LimitMB = (heapStats.heap_size_limit / 1024 / 1024).toFixed(0);
+  const v8PCT = (memUsage.heapUsed * 100) / heapStats.heap_size_limit;
+
+  // Process RSS vs cgroup limit (or system total)
+  const rssMB = (memUsage.rss / 1024 / 1024).toFixed(0);
+  let memLimit;
+  try {
+    const raw = fs.readFileSync('/sys/fs/cgroup/memory.max', 'utf8').trim();
+    memLimit = raw === 'max' ? os.totalmem() : parseInt(raw);
+  } catch {
+    memLimit = os.totalmem();
+  }
+  const memLimitMB = (memLimit / 1024 / 1024).toFixed(0);
+  const processPCT = (memUsage.rss * 100) / memLimit;
+
+  // System memory
   const totalMemMB = (os.totalmem() / 1024 / 1024).toFixed(0);
+  const usedMemMB = ((os.totalmem() - os.freemem()) / 1024 / 1024).toFixed(0);
+  const sysMemPCT = ((os.totalmem() - os.freemem()) * 100) / os.totalmem();
+
+  // Average requests per minute
+  const uptimeMinutesTotal = uptimeMs / 60000;
+  const avgReqPerMin = uptimeMinutesTotal > 0 ? (stats.requestCount / uptimeMinutesTotal).toFixed(1) : '0.0';
 
   content += '<table class="grid">';
   content += '<tr>';
   content += `<td><strong>Uptime:</strong> ${escape(uptimeStr)}</td>`;
   content += `<td><strong>Request Count:</strong> ${stats.requestCount} (static: ${stats.staticRequestCount})</td>`;
-  content += `<td><strong>Free Memory:</strong> ${freeMemMB} MB of ${totalMemMB} MB</td>`;
+  content += `<td><strong>Avg Requests/min:</strong> ${avgReqPerMin}</td>`;
   content += '</tr>';
   content += '<tr>';
-  content += `<td><strong>Heap Used:</strong> ${heapUsedMB} MB</td>`;
-  content += `<td><strong>Heap Available:</strong> ${heapAvailableMB} MB</td>`;
-  content += `<td><strong>Process Memory:</strong> ${rssMB} MB</td>`;
+  content += `<td style="background-color:${pctColor(v8PCT)}"><strong>V8 Memory:</strong> ${v8UsedMB} MB of ${v8LimitMB} MB (${v8PCT.toFixed(0)}%)</td>`;
+  content += `<td style="background-color:${pctColor(processPCT)}"><strong>Process Memory:</strong> ${rssMB} MB of ${memLimitMB} MB (${processPCT.toFixed(0)}%)</td>`;
+  content += `<td style="background-color:${pctColor(sysMemPCT)}"><strong>System Memory:</strong> ${usedMemMB} MB of ${totalMemMB} MB (${sysMemPCT.toFixed(0)}%)</td>`;
   content += '</tr>';
   content += getLogStats();
   content += '</table>';
@@ -543,10 +566,24 @@ app.get('/dashboard', async (req, res) => {
     // Memory usage
     const memUsage = process.memoryUsage();
     const heapStats = v8.getHeapStatistics();
-    const nodeMemPCT = (memUsage.heapUsed * 100) / heapStats.heap_size_limit;  // % of Node.js memory limit used
+    const v8PCT = (memUsage.heapUsed * 100) / heapStats.heap_size_limit;  // % of V8 heap limit used
+
+    // Process RSS as % of cgroup memory limit (or system total as fallback)
+    let memLimit;
+    try {
+      const raw = fs.readFileSync('/sys/fs/cgroup/memory.max', 'utf8').trim();
+      memLimit = raw === 'max' ? os.totalmem() : parseInt(raw);
+    } catch {
+      memLimit = os.totalmem();
+    }
+    const processPCT = (memUsage.rss * 100) / memLimit;
+
     const totalMemBytes = os.totalmem();
     const freeMemBytes = os.freemem();
     const sysMemPCT = ((totalMemBytes - freeMemBytes) * 100) / totalMemBytes;  // % of system memory used
+
+    const memMaxPCT = Math.max(v8PCT, processPCT, sysMemPCT);
+
     const fstats = fs.statfsSync(folders.logsDir());
     const diskPCT = 100 - ((fstats.bavail * 100) / fstats.blocks);  // % of disk used
 
@@ -555,8 +592,7 @@ app.get('/dashboard', async (req, res) => {
     content += '<tr>';
     content += `<td><strong>Uptime:</strong> ${escape(uptimeStr)}</td>`;
     content += `<td><strong>Request Count:</strong> ${stats.requestCount} (static: ${stats.staticRequestCount})</td>`;
-    content += `<td style="background-color:${pctColor(nodeMemPCT)}"><strong>Node Memory:</strong> ${nodeMemPCT.toFixed(0)}%</td>`;
-    content += `<td style="background-color:${pctColor(sysMemPCT)}"><strong>System Memory:</strong> ${sysMemPCT.toFixed(0)}%</td>`;
+    content += `<td style="background-color:${pctColor(memMaxPCT)}"><strong>Memory:</strong> ${v8PCT.toFixed(0)}% V8, ${processPCT.toFixed(0)}% Process, ${sysMemPCT.toFixed(0)}% System</td>`;
     content += `<td style="background-color:${pctColor(diskPCT)}"><strong>Disk:</strong> ${diskPCT.toFixed(0)}%</td>`;
     content += '</tr>';
     content += '</table>';

package/static/assets/js/clipboard-btn.js

@@ -0,0 +1,31 @@
+
+// Tooltip
+$('.btn-copy').tooltip({
+  trigger: 'hover',
+  placement: 'bottom' 
+});
+
+function setTooltip(message) {
+  button = $(event.target)
+  oldMsg = button.tooltip().attr('data-original-title')
+  button.tooltip()
+    .attr('data-original-title', message)
+    .tooltip('show');
+  setTimeout(function() {
+    button.tooltip()
+    .attr('data-original-title', oldMsg)
+    .tooltip('hide');
+  }, 1000);
+}
+
+// Clipboard
+
+var clipboard = new ClipboardJS('.btn-copy');
+
+clipboard.on('success', function(e) {
+  setTooltip('Copied!');
+});
+
+clipboard.on('error', function(e) {
+  setTooltip('Failed :( - copy manually');
+});

package/static/assets/js/clipboard.min.js

@@ -0,0 +1,7 @@
+/*!
+ * clipboard.js v2.0.8
+ * https://clipboardjs.com/
+ *
+ * Licensed MIT © Zeno Rocha
+ */
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return n={686:function(t,e,n){"use strict";n.d(e,{default:function(){return o}});var e=n(279),i=n.n(e),e=n(370),u=n.n(e),e=n(817),c=n.n(e);function a(t){try{return document.execCommand(t)}catch(t){return}}var f=function(t){t=c()(t);return a("cut"),t};var l=function(t){var e,n,o,r=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{container:document.body},i="";return"string"==typeof t?(e=t,n="rtl"===document.documentElement.getAttribute("dir"),(o=document.createElement("textarea")).style.fontSize="12pt",o.style.border="0",o.style.padding="0",o.style.margin="0",o.style.position="absolute",o.style[n?"right":"left"]="-9999px",n=window.pageYOffset||document.documentElement.scrollTop,o.style.top="".concat(n,"px"),o.setAttribute("readonly",""),o.value=e,o=o,r.container.appendChild(o),i=c()(o),a("copy"),o.remove()):(i=c()(t),a("copy")),i};function r(t){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}var s=function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},e=t.action,n=void 0===e?"copy":e,o=t.container,e=t.target,t=t.text;if("copy"!==n&&"cut"!==n)throw new Error('Invalid "action" value, use either "copy" or "cut"');if(void 0!==e){if(!e||"object"!==r(e)||1!==e.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===n&&e.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===n&&(e.hasAttribute("readonly")||e.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes')}return t?l(t,{container:o}):e?"cut"===n?f(e):l(e,{container:o}):void 0};function d(t){return(d="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function p(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}function y(t,e){return(y=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function h(n){var o=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(t){return!1}}();return function(){var t,e=m(n);return t=o?(t=m(this).constructor,Reflect.construct(e,arguments,t)):e.apply(this,arguments),e=this,!(t=t)||"object"!==d(t)&&"function"!=typeof t?function(t){if(void 0!==t)return t;throw new ReferenceError("this hasn't been initialised - super() hasn't been called")}(e):t}}function m(t){return(m=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function v(t,e){t="data-clipboard-".concat(t);if(e.hasAttribute(t))return e.getAttribute(t)}var o=function(){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&y(t,e)}(r,i());var t,e,n,o=h(r);function r(t,e){var n;return function(t){if(!(t instanceof r))throw new TypeError("Cannot call a class as a function")}(this),(n=o.call(this)).resolveOptions(e),n.listenClick(t),n}return t=r,n=[{key:"copy",value:function(t){var e=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{container:document.body};return l(t,e)}},{key:"cut",value:function(t){return f(t)}},{key:"isSupported",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:["copy","cut"],t="string"==typeof t?[t]:t,e=!!document.queryCommandSupported;return t.forEach(function(t){e=e&&!!document.queryCommandSupported(t)}),e}}],(e=[{key:"resolveOptions",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{};this.action="function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText,this.container="object"===d(t.container)?t.container:document.body}},{key:"listenClick",value:function(t){var e=this;this.listener=u()(t,"click",function(t){return e.onClick(t)})}},{key:"onClick",value:function(t){var e=t.delegateTarget||t.currentTarget,t=s({action:this.action(e),container:this.container,target:this.target(e),text:this.text(e)});this.emit(t?"success":"error",{action:this.action,text:t,trigger:e,clearSelection:function(){e&&e.focus(),document.activeElement.blur(),window.getSelection().removeAllRanges()}})}},{key:"defaultAction",value:function(t){return v("action",t)}},{key:"defaultTarget",value:function(t){t=v("target",t);if(t)return document.querySelector(t)}},{key:"defaultText",value:function(t){return v("text",t)}},{key:"destroy",value:function(){this.listener.destroy()}}])&&p(t.prototype,e),n&&p(t,n),r}()},828:function(t){var e;"undefined"==typeof Element||Element.prototype.matches||((e=Element.prototype).matches=e.matchesSelector||e.mozMatchesSelector||e.msMatchesSelector||e.oMatchesSelector||e.webkitMatchesSelector),t.exports=function(t,e){for(;t&&9!==t.nodeType;){if("function"==typeof t.matches&&t.matches(e))return t;t=t.parentNode}}},438:function(t,e,n){var u=n(828);function i(t,e,n,o,r){var i=function(e,n,t,o){return function(t){t.delegateTarget=u(t.target,n),t.delegateTarget&&o.call(e,t)}}.apply(this,arguments);return t.addEventListener(n,i,r),{destroy:function(){t.removeEventListener(n,i,r)}}}t.exports=function(t,e,n,o,r){return"function"==typeof t.addEventListener?i.apply(null,arguments):"function"==typeof n?i.bind(null,document).apply(null,arguments):("string"==typeof t&&(t=document.querySelectorAll(t)),Array.prototype.map.call(t,function(t){return i(t,e,n,o,r)}))}},879:function(t,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){return"[object Function]"===Object.prototype.toString.call(t)}},370:function(t,e,n){var f=n(879),l=n(438);t.exports=function(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!f.string(e))throw new TypeError("Second argument must be a String");if(!f.fn(n))throw new TypeError("Third argument must be a Function");if(f.node(t))return c=e,a=n,(u=t).addEventListener(c,a),{destroy:function(){u.removeEventListener(c,a)}};if(f.nodeList(t))return o=t,r=e,i=n,Array.prototype.forEach.call(o,function(t){t.addEventListener(r,i)}),{destroy:function(){Array.prototype.forEach.call(o,function(t){t.removeEventListener(r,i)})}};if(f.string(t))return t=t,e=e,n=n,l(document.body,t,e,n);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList");var o,r,i,u,c,a}},817:function(t){t.exports=function(t){var e,n="SELECT"===t.nodeName?(t.focus(),t.value):"INPUT"===t.nodeName||"TEXTAREA"===t.nodeName?((e=t.hasAttribute("readonly"))||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),e||t.removeAttribute("readonly"),t.value):(t.hasAttribute("contenteditable")&&t.focus(),n=window.getSelection(),(e=document.createRange()).selectNodeContents(t),n.removeAllRanges(),n.addRange(e),n.toString());return n}},279:function(t){function e(){}e.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){var o=this;function r(){o.off(t,r),e.apply(n,arguments)}return r._=e,this.on(t,r,n)},emit:function(t){for(var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,r=n.length;o<r;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],r=[];if(o&&e)for(var i=0,u=o.length;i<u;i++)o[i].fn!==e&&o[i].fn._!==e&&r.push(o[i]);return r.length?n[t]=r:delete n[t],this}},t.exports=e,t.exports.TinyEmitter=e}},r={},o.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(e,{a:e}),e},o.d=function(t,e){for(var n in e)o.o(e,n)&&!o.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:e[n]})},o.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},o(686).default;function o(t){if(r[t])return r[t].exports;var e=r[t]={exports:{}};return n[t](e,e.exports,o),e.exports}var n,r});

package/static/fhir.css

@@ -623,4 +623,23 @@ div.warning {
   background-color: #FFE6E6;
   border: 1px silver solid;
   padding: 5px;
-}
+}
+
+
+.copy-text .btn-copy{
+	visibility: hidden;
+}
+
+.copy-text:hover .btn-copy {
+	visibility: visible;
+}
+
+.btn-copy {
+	height: 14px;
+	width: 17px;
+	background-image: url('images/noun_copy to clipboard_1669410.png');
+	background-size: 22px;
+	padding: 0px 0px;
+	border-width: 0px;
+	background-color: transparent;
+}

package/translations/Messages.properties

@@ -1274,7 +1274,7 @@ VALUESET_SHAREABLE_MISSING = Published value sets SHOULD conform to the Shareabl
 VALUESET_SHAREABLE_MISSING_HL7 = Value sets published by HL7 SHALL conform to the ShareableValueSet profile, which says that the element ValueSet.{0} is mandatory, but it is not present
 VALUESET_SUPPLEMENT_MISSING_one = Required supplement not found: {1}
 VALUESET_SUPPLEMENT_MISSING_other = Required supplements not found: {1}
-VALUESET_TOO_COSTLY = The value set ''{0}'' expansion has too many codes to display ({1})
+VALUESET_TOO_COSTLY = The value set ''{0}'' expansion has too many codes to produce ({1})
 VALUESET_TOO_COSTLY_COUNT = The value set ''{0}'' expansion has {2} codes, which is too many to display ({1})
 VALUESET_TOO_COSTLY_TIME = The value set ''{0}'' {2} took too long to process (>{1}sec)
 VALUESET_UNC_SYSTEM_WARNING = Unknown System ''{0}'' specified, so Concepts and Filters can''t be checked (Details: {1})

package/translations/rendering-phrases.properties

@@ -931,7 +931,7 @@ OP_OUT_SUMM = OperationOutcome ({0} Error(s), {1} Warning(s), {2} Hint(s))
 BUNDLE_SUMMARY = {0} Bundle, {1} Entries
 PROF_DRIV_SUMM_PROP = {0} = {1}
 PROF_DRIV_SUMM_NONE = {0}
-PROF_DRIV_SUMM = {0}: {1} 
+PROF_DRIV_SUMM = {0}: {1}
 BUNDLE_HEADER_DOCUMENT_CONTENTS = Additional Resources Included in Document
 DOCUMENT_SUMMARY = <param name="status"/> Document at <param name="date"/> by <param name="author"/> for <param name="subject"/> <if test="has-encounter = true"> in encounter <param name="encounter"/></if>
 DATA_REND_ATT_URL = {0} @ {1}
@@ -950,36 +950,36 @@ MATURITY_PUBLISHER = Publisher: {0}
 MATURITY_STATUS = Status
 MATURITY_MATURITY = Maturity Level: {0}
 MATURITY_STDS_STATUS = Standards Status: {0}
-DATA_REND_MORNING = Morning 
-DATA_REND_MORNING_EARLY = Early Morning 
-DATA_REND_MORNING_LATE = Late Morning 
-DATA_REND_NOON = Noon 
-DATA_REND_AFTERNOON = Afternoon 
-DATA_REND_AFTERNOON_EARLY = Early Afternoon 
-DATA_REND_AFTERNOON_LATE = Late Afternoon 
-DATA_REND_EVENING = Evening 
-DATA_REND_EVENING_EARLY = Early Evening 
-DATA_REND_EVENING_LATE = Late Evening 
-DATA_REND_NIGHT = Night 
-DATA_REND_AFTER_SLEEP = After Sleep 
-DATA_REND_IMMEDIATE = Immediate 
+DATA_REND_MORNING = Morning
+DATA_REND_MORNING_EARLY = Early Morning
+DATA_REND_MORNING_LATE = Late Morning
+DATA_REND_NOON = Noon
+DATA_REND_AFTERNOON = Afternoon
+DATA_REND_AFTERNOON_EARLY = Early Afternoon
+DATA_REND_AFTERNOON_LATE = Late Afternoon
+DATA_REND_EVENING = Evening
+DATA_REND_EVENING_EARLY = Early Evening
+DATA_REND_EVENING_LATE = Late Evening
+DATA_REND_NIGHT = Night
+DATA_REND_AFTER_SLEEP = After Sleep
+DATA_REND_IMMEDIATE = Immediate
 VALUE_SET_AR = Argentinian Edition
-VALUE_SET_AT = Austrian Edition 
+VALUE_SET_AT = Austrian Edition
 VALUE_SET_BE = Belgian Edition
-VALUE_SET_CA_EN = Canadian English Edition   
-VALUE_SET_CA = Canadian Edition  
-VALUE_SET_EE = Estonian Edition  
+VALUE_SET_CA_EN = Canadian English Edition
+VALUE_SET_CA = Canadian Edition
+VALUE_SET_EE = Estonian Edition
 VALUE_SET_FI = Finnish Edition
 VALUE_SET_DE = German Edition
 VALUE_SET_IE = Irish Edition
-VALUE_SET_NZ = New Zealand Edition  
-VALUE_SET_NO = Norwegian Edition  
+VALUE_SET_NZ = New Zealand Edition
+VALUE_SET_NO = Norwegian Edition
 VALUE_SET_KR = Republic of Korea Edition (South Korea)
-VALUE_ES_ES = Spanish National Edition  
+VALUE_ES_ES = Spanish National Edition
 VALUE_SET_CH = Swiss Edition
-VALUE_SET_UK_CLIN = UK Clinical Edition 
-VALUE_SET_UY = Uruguay Edition  
-VALUE_SET_US_ICD10CM = US Edition (with ICD-10-CM maps) 
+VALUE_SET_UK_CLIN = UK Clinical Edition
+VALUE_SET_UY = Uruguay Edition
+VALUE_SET_US_ICD10CM = US Edition (with ICD-10-CM maps)
 VALUE_SET_OTHER_DISPLAY = Other Display ({0})
 GENERAL_VALUE_BOUNDED = The value must be between {0} and {1} (or equal)
 GENERAL_VALUE_MAX = The value must be less or equal to {0}
@@ -1009,12 +1009,12 @@ SDT_RES = Resource
 SDT_DEF = Definition
 SDT_ORIGINAL_SOURCE = Original Source
 SDR_USAGE = Usages
-SDR_DERIVED = Derived from this {0} 
+SDR_DERIVED = Derived from this {0}
 SDR_DRAW_IN = Draw in Obligations & Additional Bindings from this {0}
 SDR_IMPOSE = Impose this profile {0}
 SDR_COMPLY = Comply with this profile {0}
 SDR_USE = Use this {0}
-SDR_REFER = Refer to this {0}    
+SDR_REFER = Refer to this {0}
 SDR_EXAMPLE = Examples for this {0}
 SDR_SEARCH= Search Parameters using this {0}
 SDR_CAPSTMT = CapabilityStatements using this {0}
@@ -1043,54 +1043,54 @@ SDR_FROM = From {0}
 SDR_SRC_FHIR = FHIR Std.
 SDR_SRC_IG = This IG
 SDR_CODE_FROM = (a valid code from {0})
-SDR_ALL_ELEM = **ALL** elements 
-SDR_ALL_EXT = **ALL** extensions 
+SDR_ALL_ELEM = **ALL** elements
+SDR_ALL_EXT = **ALL** extensions
 SDR_BP = best practice
 SDR_GUIDANCE_PFX = Guidance on how to interpret the contents of this table can be found
 SDR_GUIDANCE_HERE = here
-SDR_GUIDANCE_SFX = 
+SDR_GUIDANCE_SFX =
 SDR_OFF_URL = The official URL for this profile is
 SDR_FROM_ELEM = // from Element: <a href="{0}">extension</a>
-SDR_MOD_SUPP = (this element modifies the meaning of other elements, and must be supported) 
-SDR_MOD = (this element modifies the meaning of other elements) 
+SDR_MOD_SUPP = (this element modifies the meaning of other elements, and must be supported)
+SDR_MOD = (this element modifies the meaning of other elements)
 SDR_SUPP = (this element must be supported)
 SDR_ANY_ORDER = // sliced by {0} in any order
 SDR_SORTED = // sliced by {0} in the specified order {1}
 SDR_PRIM_VALUE = Primitive Value {0}
-SDR_META_CH_NO = Unable to evaluate changes to metadata 
-SDR_META_CH_DET = The resource metadata has changed ({0})           
+SDR_META_CH_NO = Unable to evaluate changes to metadata
+SDR_META_CH_DET = The resource metadata has changed ({0})
 SDR_CONT_CH_NO = Unable to evaluate changes to content
-SDR_CONT_CH_DET_SD = The data elements list has changed  
+SDR_CONT_CH_DET_SD = The data elements list has changed
 SDR_CONT_CH_DET_CS = The list of codes defined by the code system has changed
-SDR_DEFN_CH_NO = Unable to evaluate changes to definitions 
-SDR_DEFN_CH_DET_SD = One or more text definitions, invariants or bindings have changed  
-SDR_DEFN_CH_DET_CS = One or more text definitions/displays have changed 
+SDR_DEFN_CH_NO = Unable to evaluate changes to definitions
+SDR_DEFN_CH_DET_SD = One or more text definitions, invariants or bindings have changed
+SDR_DEFN_CH_DET_CS = One or more text definitions/displays have changed
 SDR_CONT_CH_DET_VS = The logical definition of the value set has changed
 SDR_DEFN_CH_DET_VS = One or more text definitions/displays have changed
 SDR_INTRP_CH_NO_VS = Unable to evaluate changes to the expansion
 SDR_INTRP_CH_DET_VS = The expansion has changed
-SDR_CH_DET = New Content 
+SDR_CH_DET = New Content
 SDR_CH_NO = No changes
 SDR_DRAFT = This is an draft extension definition; the committee is seeking implementation feedback, and the definition or contents of the extension may change in future versions
-SDR_EXPERIMENTAL = This is an experimental extension definition; the definition is intended for testing purposes, education or evaluation, and the definition is not anticipated to be matured to a point where it is intended for genuine usage.
+SDR_EXPERIMENTAL = This is an experimental extension definition; the definition is intended for testing purposes, education or evaluation, and the definition is not anticipated to be matured to a point where it is intended for production use.
 SDR_EXT_DEPR = This extension is deprecated and should no longer be used
 SDR_EXT_ANY = This extension does not specify which elements it should be used on
-SDR_EXT_ELEM = This extension may be used on the following element(s) 
+SDR_EXT_ELEM = This extension may be used on the following element(s)
 SDR_EXT_MOD = This extension is a modifier extension.
-SDR_EXT_ELEM_ID = Element ID 
-SDR_EXT_EXT = Extension 
+SDR_EXT_ELEM_ID = Element ID
+SDR_EXT_EXT = Extension
 SDR_EXT_PATH = Path
-SDR_EXT_CTXT_PATH = In addition, the extension can only be used when this FHIRPath expression is true 
-SDR_EXT_CTXT_PATHS = In addition, the extension can only be used when these FHIRPath expressions are true 
-SDR_EXT_VER_PFX = This extension is allowed for use with  
-SDR_EXT_VER_SFX = .        
-SDR_VER_TO_PFX = FHIR versions up to 
-SDR_VER_TO_SFX =  
-SDR_VER_FROM_PFX = FHIR versions 
+SDR_EXT_CTXT_PATH = In addition, the extension can only be used when this FHIRPath expression is true
+SDR_EXT_CTXT_PATHS = In addition, the extension can only be used when these FHIRPath expressions are true
+SDR_EXT_VER_PFX = This extension is allowed for use with
+SDR_EXT_VER_SFX = .
+SDR_VER_TO_PFX = FHIR versions up to
+SDR_VER_TO_SFX =
+SDR_VER_FROM_PFX = FHIR versions
 SDR_VER_FROM_SFX = and after
 SDR_VER_RANGE_PFX = FHIR versions
 SDR_VER_RANGE_MID = to
-SDR_VER_RANGE_SFX =  
+SDR_VER_RANGE_SFX =
 SDR_EXT_UNCHANGED = The extension is unchanged in {0}
 SDR_EXT_CHANGED = The extension is represented a little differently in {0}
 VSR_LOGICAL = Logical Definition (CLD)
@@ -1105,7 +1105,7 @@ R44B_REFERS_TO = <a href="{0}">{1}}</a> refers to the canonical type at {2}
 R44B_HAS_TARGET = has target
 R44B_WRONG_MSG = Something went wrong with the cross-version analysis because
 R44B_USE_OK = This is an {0} IG. None of the features it uses are changed in {1}, so it can be used as is with {1} systems.
-R44B_PACKAGE_REF = Packages for both <a href="{0}">R4 ({1}.r4)</a> and <a href=\"{2}\">R4B ({3}.r4b)</a> are available.
+R44B_PACKAGE_REF = Packages for both <a href="{0}">R4 ({1}.r4)</a> and <a href="{2}">R4B ({3}.r4b)</a> are available.
 R44B_NOT_COMP = This is an {0} IG that is not compatible with {1}" because
 R44B_NOT_IN = The following resources are not in the {0} version
 R44B_ONLY_IN = The following resources are only in the {0} version
@@ -1116,13 +1116,104 @@ VALUE_SET_NEEDS_SUPPL_one = This ValueSet requires the Code system Supplement
 VALUE_SET_NEEDS_SUPPL_other = This ValueSet requires the Code system Supplements 
 SD_XIG_LINK = <p>You can also check for <a href="https://packages2.fhir.org/xig/{0}|current/StructureDefinition/{1}">usages in the FHIR IG Statistics</a></p>
 VS_VERSION_STATED = Version is explicitly stated to be {0}
+VS_VERSION_LATEST = Version is always the latest available, which is {0} at this time
 VS_VERSION_WILDCARD_BY_PACKAGE = Version is stated to be {0}, which means it is fixed to {1}, the version found through the package references
 VS_VERSION_WILDCARD = Version is stated to be {0}. When building this specification, the most recent matching version {1} has been used 
 VS_VERSION_BY_PACKAGE = Version is not explicitly stated, which means it is fixed to {0}, the version found through the package references
 VS_VERSION_THIS_PACKAGE = Version is not explicitly stated, which means it is fixed to the version provided in this specification
-VS_VERSION_FOUND =  Version is not explicity stated. When building this specification, the most recent version {0} has been used
-VS_VERSION_NONE = Version is not explicity stated, and the target {0} has no stated version either
-VS_VERSION_NOTHING = Version is not explicity stated. No matching {0} found
+VS_VERSION_FOUND =  Version is not explicitly stated. When building this specification, the most recent version {0} has been used
+VS_VERSION_NONE = Version is not explicitly stated, and the target {0} has no stated version either
+VS_VERSION_NOTHING = Version is not explicitly stated. No matching {0} found
 CS_VERSION_NOTHING_TEXT = Not Stated (use latest from terminology server)
 VS_VERSION_NOTHING_TEXT = Not State
-STRUC_DEF_IMPLEMENTS = Interfaces Implemented
+STRUC_DEF_IMPLEMENTS = Interfaces Implemented
+PROV_REFERENCE = This {0} is referenced from the following provenance resources: 
+CONF_SHALL = SHALL
+CONF_SHALLNOT = SHALL NOT
+CONF_SHOULD = SHOULD
+CONF_SHOULDNOT = SHOULD NOT
+CONF_MAY = MAY
+CONF_SHALL_PLURAL = SHALL
+CONF_SHALLNOT_PLURAL = SHALL NOT
+CONF_SHOULD_PLURAL = SHOULD
+CONF_SHOULDNOT_PLURAL = SHOULD NOT
+CONF_MAY_PLURAL = MAY
+CSREQ_TITLE = Narrative Conformance Statements
+CSREQ_DESC = Conformance statements found throughout the narrative of the IG consolidated into this computable resource for traceability purposes
+CSTABLE_HEAD_ID = Id
+CSTABLE_HEAD_EXPECT = Expectation
+CSTABLE_HEAD_COND = Conditional?
+CSTABLE_HEAD_ACTOR_one = Actor{1}
+CSTABLE_HEAD_ACTOR_other = Actors{1}
+CSTABLE_HEAD_CAT_one = Category{1}
+CSTABLE_HEAD_CAT_other = Categories{1}
+CSTABLE_HEAD_RULE = Rule
+CSTABLE_TITLE_ID = Filter to only statements with ids that contain the specified text
+CSTABLE_TITLE_EXPECT = Filter to only statements with one of the selected expectation type(s)
+CSTABLE_TITLE_COND = Filter to only statements that are conditional, not conditional, or no constraint
+CSTABLE_TITLE_ACTOR = Filter to only statements that apply to the specified actor(s)
+CSTABLE_TITLE_CAT = Filter to only statements that apply to the specified category(ies)
+CSTABLE_TITLE_RULE = Filter to only statements that contain the specified text
+CSTABLE_TITLE_CLEAR = Clear the Filter
+CSTABLE_COND_YES = Yes
+CSTABLE_COND_NO = No
+CSTABLE_COND_ANY = Any
+CSTABLE_CLEAR_FILTERS = Clear Filters
+CONSENT_DATE = Agreement Date
+CONSENT_PERIOD = Applicable Period
+CONSENT_HT_PERIOD = Period
+CONSENT_HT_DATA_PERIOD = Data from Period
+CONSENT_CATEGORY_one = Category
+CONSENT_CATEGORY_other = Categories
+CONSENT_SCOPE_one = Scope
+CONSENT_SCOPE_other = Scopes
+GENERAL_IDENTIFIER_one = Identifier
+GENERAL_IDENTIFIER_other = Identifiers
+CONSENT_PART_TBL_ROLE = Role
+CONSENT_PART_TBL_DETAILS = Details
+CONSENT_PART_TBL_PATIENT = Patient
+CONSENT_PART_TBL_PARTY = Party
+CONSENT_PART_TBL_GRANTOR = Grantor
+CONSENT_PART_TBL_GRANTEE = Grantee
+CONSENT_PART_TBL_MANAGER = Manager
+CONSENT_PART_TBL_CONTROLLER = Controller
+CONSENT_PART_TBL_PATIENT_DESC = Who the consent applies to
+CONSENT_PART_TBL_GRANTOR_DESC = Who is granting rights according to the policy and rules
+CONSENT_PART_TBL_PARTY_DESC = Who is agreeing to the policy and rules
+CONSENT_PART_TBL_GRANTEE_DESC = Who is agreeing to the policy and rules
+CONSENT_PART_TBL_MANAGER_DESC = Who manages the consent through its lifecycle.
+CONSENT_PART_TBL_CONTROLLER_DESC = Who controls/enforces the access according to the consent.
+CONSENT_BASIS_REGULATION_PREFIX_one = This consent is made under the regulation 
+CONSENT_BASIS_REGULATION_PREFIX_other = This consent is made under the regulations 
+CONSENT_BASIS_REGULATION_SUFFIX_MORE = and
+CONSENT_BASIS_REGULATION_SUFFIX = .
+CONSENT_BASIS_REGULATION_NONE = This consent is made under 
+CONSENT_BASIS_POLICY_PREFIX_one = the policy  
+CONSENT_BASIS_POLICY_PREFIX_other = the policies  
+CONSENT_BASIS_POLICY_SUFFIX = .
+CONSENT_HTABLE_RULE = Rule
+CONSENT_HTABLE_RULE_DESC = Applicable Rule
+CONSENT_HTABLE_WHEN = Time Period
+CONSENT_HTABLE_WHEN_DESC = Applicable Period
+CONSENT_HTABLE_WHO = Who
+CONSENT_HTABLE_WHO_DESC = Applicable Parties
+CONSENT_HTABLE_WHAT = What
+CONSENT_HTABLE_WHAT_DESC = Applicable Data
+CONSENT_HTABLE_RULES = Rules
+CONSENT_HTABLE_RULES_DESC = Other Applicable Rules
+CONSENT_PERMIT = permit
+CONSENT_DENY = deny
+CONSENT_PERMIT_DESC = The subject has given their consent.
+CONSENT_DENY_DESC = The subject has NOT given their consent.
+CONSENT_PROVISION = Consent Provision
+CONSENT_HT_SEC_LABEL = Labled as
+CONSENT_HT_ACTION = For action 
+CONSENT_HT_PURPOSE = Purpose
+CONSENT_HT_CLASS = Class
+CONSENT_HT_RESOURCE_TYPE = Resource Type
+CONSENT_HT_DOC_TYPE = Document Type
+CONSENT_HT_CODE = Code
+WEB_SOURCE = Web Source
+GENERAL_COPY = Click to Copy
+CODESYSTEM_LVL = Level
+FEATURE = Feature

package/tx/cs/cs-api.js

@@ -719,7 +719,11 @@ class CodeSystemProvider {
     return false;
   }
 
+  hasMultiHierarchy() {
+    return false;
+  }
   /**
+   *
    * @returns {string} valueset for the code system
    */
   valueSet() {
@@ -919,6 +923,14 @@ class CodeSystemFactoryProvider {
   async close() {
 
   }
+
+  /**
+   * if known, the right place to point to on the web for the code system
+   * @returns {String}
+   */
+  webSource() {
+    return undefined;
+  }
 }
 
 module.exports = {

package/tx/cs/cs-cs.js

@@ -1521,7 +1521,11 @@ class FhirCodeSystemProvider extends BaseCSServices {
   }
 
   versionNeeded() {
-    return this.codeSystem.jsonObj.versionNeeded;
+    return this.codeSystem.jsonObj.versionNeeded ? true : false;
+  }
+
+  hasMultiHierarchy() {
+    return this.codeSystem.hasMultiHierarchy;
   }
 
 }

package/tx/cs/cs-snomed.js

@@ -401,20 +401,24 @@ class SnomedServices {
   }
 
 
-  filterIn(id) {
+  filterIn(idList) {
     const result = new SnomedFilterContext();
-    const conceptResult = this.concepts.findConcept(id);
+    let members = [];
+    for (let id of idList.split(',')) {
+      const conceptResult = this.concepts.findConcept(id);
 
-    if (!conceptResult.found) {
-      throw new Error(`The SNOMED CT Concept ${id} is not known`);
-    }
+      if (!conceptResult.found) {
+        throw new Error(`The SNOMED CT Concept ${id} is not known`);
+      }
 
-    const refSetIndex = this.getConceptRefSet(conceptResult.index, false);
-    if (refSetIndex === 0) {
-      throw new Error(`The SNOMED CT Concept ${id} is not a reference set`);
+      const refSetIndex = this.getConceptRefSet(conceptResult.index, false);
+      if (refSetIndex === 0) {
+        members.push(conceptResult.index);
+      } else {
+        members.push(...this.refSetMembers.getMembers(refSetIndex));
+      }
     }
-
-    result.members = this.refSetMembers.getMembers(refSetIndex) || [];
+    result.members = members;
     return result;
   }
 
@@ -894,6 +898,17 @@ class SnomedProvider extends BaseCSServices {
       if (id !== 0n && ['=', 'is-a', 'descendent-of', 'in', 'generalizes', 'child-of'].includes(op)) {
         return this.sct.conceptExists(value);
       }
+      if (op === 'in' && value.includes(',')) {
+        let ok = true;
+        for (const idStr of value.split(',')) {
+          const id = this.sct.stringToIdOrZero(idStr);
+          if (id === 0n) {
+            ok = false;
+            break;
+          }
+        }
+        return ok;
+      }
     }
     if (prop === 'inactive') {
       return op === '=' && ['true', 'false'].includes(value);
@@ -927,7 +942,7 @@ class SnomedProvider extends BaseCSServices {
 
     if (prop === 'concept') {
       const id = this.sct.stringToIdOrZero(value);
-      if (id === 0n) {
+      if (id === 0n && op !== 'in') {
         throw new Error(`Invalid concept ID: ${value}`);
       }
 
@@ -953,7 +968,7 @@ class SnomedProvider extends BaseCSServices {
           return null;
         }
         case 'in': {
-          filterContext.filters.push(this.sct.filterIn(id));
+          filterContext.filters.push(this.sct.filterIn(value));
           return null;
         }
         default:
@@ -1333,6 +1348,10 @@ class SnomedProvider extends BaseCSServices {
     return result;
   }
 
+  hasMultiHierarchy() {
+    return true;
+  }
+
 }
 
 /**
@@ -1621,6 +1640,11 @@ class SnomedServicesFactory extends CodeSystemFactoryProvider {
       return null;
     }
   }
+
+  webSource() {
+    return this.version();
+  }
+
 }
 
 function getEditionName(edition) {

package/tx/html/tx-template.html

@@ -117,18 +117,22 @@
 		<div class="container">
 			<div class="inner-wrapper">
 				<p>
-                    <a href="http://www.hl7.org/fhir" style="color: gold" title="Fast Healthcare Interoperability Resources - Home Page"><img border="0" src="/icon-fhir-16.png" style="vertical-align: text-bottom"/> <b>FHIR</b></a> &copy; HL7.org 2011+.  &nbsp;|&nbsp;
+                    <a href="http://www.hl7.org/fhir" style="color: gold" title="Fast Healthcare Interoperability Resources - Home Page"><img border="0" src="/icon-fhir-16.png" style="vertical-align: text-bottom"/> <b>FHIR</b></a> v[%fhir-version%] &copy; HL7.org 2011+.  &nbsp;|&nbsp;
                     <a href="https://github.com/HealthIntersections/FHIRsmith/blob/main/README.md" style="color: gold"><img border="0" src="/FHIRsmith16.png" style="vertical-align: text-bottom"/> FHIRsmith</a>  [%ver%]  &copy; HealthIntersections.com.au 2023+ &nbsp;|&nbsp;
-         FHIR Version [%fhir-version%] &nbsp;|&nbsp; ([%ms%] ms)
+                    &nbsp; ([%ms%] ms)
+                    [%sponsorMessage%]
         </p>
 			</div>
 		</div>
 	</div>
 
       <!-- JS and analytics only. -->
-<script src="/assets/js/respond.min.js"/>
-<script src="/assets/js/fhir.js"/>
+<script src="/assets/js/respond.min.js"> </script>
+<script src="/assets/js/fhir.js"> </script>
+  <script src="/assets/js/clipboard.min.js"> </script>
+  <script src="/assets/js/clipboard-btn.js"> </script>
 
 </body>
 
 </html>
+