Merge pull request #1264 from HL7/Branch_RequirementsGenerationFixes2

Updated rendering of conformance statement table

Author: grahamegrieve

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/ConformanceClause.java

@@ -126,6 +126,7 @@ else if (categories.contains(category))
           }
         }
       }
+      handler.processConditional(conditional);
     }
 
     private void fixRefs(XhtmlNode node, String fileName) {

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/ConformanceStatementHandler.java

@@ -74,6 +74,8 @@ private HomeInfo(LoadedFile source, XhtmlNode node) {
   private HTMLInspector inspector;
   private Map<String, ActorDefinition> usedActors = new HashMap<>();
   private Map<String, Coding> usedCategories = new HashMap<>();
+  private boolean hasConditionalTrue = false;
+  private boolean hasConditionalFalse = false;
   private List<String> foundExpectations = new ArrayList<>();
   private String termShallNot;
   private String termShall;
@@ -416,6 +418,9 @@ private void renderConformanceHome(String lang) throws IOException {
     HomeInfo info = confHomes.get(lang);
     XhtmlNode confHome = info.node;
     if (confHome != null) {
+      if (!confHome.hasClass("grid")) {
+        confHome.clss("grid");
+      }
       XhtmlNode thead = confHome.addTag("thead");
       XhtmlNode tbody = confHome.addTag("tbody");
       XhtmlNode header = thead.tr().style("background-color: WhiteSmoke;");
@@ -424,11 +429,13 @@ private void renderConformanceHome(String lang) throws IOException {
 
       header.th().style("text-align: center;").tx(rc.formatPhrase(RenderingContext.CSTABLE_HEAD_ID));
       header.th().style("text-align: center;").tx(rc.formatPhrase(RenderingContext.CSTABLE_HEAD_EXPECT));
-      header.th().style("text-align: center;").tx(rc.formatPhrase(RenderingContext.CSTABLE_HEAD_COND));
+      if (hasConditionalTrue && hasConditionalFalse) {
+        header.th().style("text-align: center;").tx(rc.formatPhrase(RenderingContext.CSTABLE_HEAD_COND));
+      }
       if (!usedActors.isEmpty())
-        header.th().style("text-align: center;").tx(rc.formatPhrase(RenderingContext.CSTABLE_HEAD_ACTOR));
+        header.th().style("text-align: center;").tx(rc.formatPhrasePlural(usedActors.size(), RenderingContext.CSTABLE_HEAD_ACTOR, ""));
       if (!usedCategories.isEmpty())
-        header.th().style("text-align: center;").tx(rc.formatPhrase(RenderingContext.CSTABLE_HEAD_CAT));
+        header.th().style("text-align: center;").tx(rc.formatPhrasePlural(usedCategories.size(), RenderingContext.CSTABLE_HEAD_CAT, ""));
       header.th().style("text-align: center;").tx(rc.formatPhrase(RenderingContext.CSTABLE_HEAD_RULE));
 
       XhtmlNode filters = thead.tr().style("background-color: WhiteSmoke;");
@@ -441,13 +448,15 @@ private void renderConformanceHome(String lang) throws IOException {
           expectFilter.br();
         expectFilter.input("expect" + count++,  "checkbox",  null, 0).nbsp().tx(translateExpectationEnglish(expect));
       }
-      XhtmlNode conditionFilter = filters.td();
-      conditionFilter.attribute("title", rc.formatPhrase(RenderingContext.CSTABLE_TITLE_COND));
-      conditionFilter.input("conditionFilter", "radio",  null, 0).attribute("id", "conditionYes").attribute("value", "true").nbsp().tx(rc.formatPhrase(RenderingContext.CSTABLE_COND_YES));
-      conditionFilter.br();
-      conditionFilter.input("conditionFilter", "radio",  null, 0).attribute("id", "conditionNo").attribute("value", "false").nbsp().tx(rc.formatPhrase(RenderingContext.CSTABLE_COND_NO));
-      conditionFilter.br();
-      conditionFilter.input("conditionFilter", "radio",  null, 0).nbsp().attribute("id", "conditionAny").attribute("value", "").attribute("checked", "true").tx(rc.formatPhrase(RenderingContext.CSTABLE_COND_ANY));
+      if (hasConditionalTrue && hasConditionalFalse) {
+        XhtmlNode conditionFilter = filters.td();
+        conditionFilter.attribute("title", rc.formatPhrase(RenderingContext.CSTABLE_TITLE_COND));
+        conditionFilter.input("conditionFilter", "radio",  null, 0).attribute("id", "conditionYes").attribute("value", "true").nbsp().tx(rc.formatPhrase(RenderingContext.CSTABLE_COND_YES));
+        conditionFilter.br();
+        conditionFilter.input("conditionFilter", "radio",  null, 0).attribute("id", "conditionNo").attribute("value", "false").nbsp().tx(rc.formatPhrase(RenderingContext.CSTABLE_COND_NO));
+        conditionFilter.br();
+        conditionFilter.input("conditionFilter", "radio",  null, 0).nbsp().attribute("id", "conditionAny").attribute("value", "").attribute("checked", "true").tx(rc.formatPhrase(RenderingContext.CSTABLE_COND_ANY));
+      }
       if (!usedActors.isEmpty()) {
         XhtmlNode actorFilter = filters.td();
         actorFilter.attribute("title", rc.formatPhrase(RenderingContext.CSTABLE_TITLE_ACTOR));
@@ -517,7 +526,9 @@ private void renderConformanceHome(String lang) throws IOException {
             expectNode.br();
           expectNode.tx(translateExpectationEnglish(expectation));
         }
-        tr.td().style("text-align: center;").tx(clause.isConditional() ? "X" : " ");
+        if (hasConditionalTrue && hasConditionalFalse) {
+          tr.td().style("text-align: center;").tx(clause.isConditional() ? "X" : " ");
+        }
         if (!usedActors.isEmpty()) {
           XhtmlNode actors = tr.td();
           boolean firstActor = true;
@@ -959,6 +970,13 @@ public void categoryUsed(Coding category) {
     if (!usedCategories.containsKey(category.getCode()))
       usedCategories.put(category.getCode(), category);
   }
+  
+  public void processConditional(boolean conditional) {
+    if (conditional)
+      hasConditionalTrue = true;
+    else
+      hasConditionalFalse = true;
+  }
 
   public void extractExpectations(List<String> expectations, String text) {
     if (text.contains(termShallNot) || text.contains(termShallNotPlural)) {