Skip to content

Commit

Permalink
Add version warnings on IGs to qa.html
Browse files Browse the repository at this point in the history
  • Loading branch information
Grahame Grieve committed Oct 21, 2024
1 parent 1917a48 commit 9bcf077
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,14 @@ public ValidationMessage getVm() {
boolean showReferenceMessages = false;
boolean noExperimentalContent = false;
boolean displayWarnings = false;
private List<String> versionProblems;


public ValidationPresenter(String statedVersion, String igVersion, IGKnowledgeProvider provider, IGKnowledgeProvider altProvider, String root, String packageId, String altPackageId,
String toolsVersion, String currentToolsVersion, RealmBusinessRules realm, PreviousVersionComparator previousVersionComparator, IpaComparator ipaComparator, IpsComparator ipsComparator,
String dependencies, String csAnalysis, String pubReqCheck, String globalCheck, String copyrightYear, IWorkerContext context,
Set<String> r5Extensions, List<StructureDefinition> modifierExtensions, String draftDependencies,
List<FetchedResource> noNarratives, List<FetchedResource> noValidation, boolean noValidate, boolean noGenerate, DependentIGFinder dependentIgs, TerminologyClientManager txServers) {
List<FetchedResource> noNarratives, List<FetchedResource> noValidation, boolean noValidate, boolean noGenerate, DependentIGFinder dependentIgs, TerminologyClientManager txServers, List<String> versionProblems) {
super();
this.statedVersion = statedVersion;
this.igVersion = igVersion;
Expand Down Expand Up @@ -341,6 +342,7 @@ public ValidationPresenter(String statedVersion, String igVersion, IGKnowledgePr
this.draftDependencies = draftDependencies;
this.globalCheck = globalCheck;
this.txServers = txServers;
this.versionProblems = versionProblems;
ruleDateCutoff = Date.from(LocalDate.now().minusMonths(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
determineCode();
}
Expand Down Expand Up @@ -733,6 +735,10 @@ public List<FetchedFile> genQAHtml(String title, List<FetchedFile> files, String
b.append(genEnd());
b.append(genStartInternal());
int id = 0;
for (String vp : versionProblems) {
b.append(genDetails(vp, id));
id++;
}
for (ValidationMessage vm : linkErrors) {
b.append(genDetails(vm, id));
id++;
Expand Down Expand Up @@ -1032,12 +1038,12 @@ public static List<ValidationMessage> filterMessages(List<ValidationMessage> mes

private final String detailsTemplateTxLink =
" <tr style=\"background-color: $color$\">\r\n"+
" <td><b>$path$</b></td><td><b>$level$</b></td><td><b>$msg$</b>$comment$ (from <a href=\"qa-txservers.html#$txsrvr$\">$txsrvr$</ta>, see <a href=\"$tx$\">log</a>)</td>\r\n"+
" <td><b>$path$</b></td><td><b>$level$</b></td><td><b>$msg$</b>$comment$ (from <a href=\"qa-txservers.html#$txsrvr$\">$txsrvr$<ta>, see <a href=\"$tx$\">log</a>)</td>\r\n"+
" </tr>\r\n";

private final String detailsTemplateTxNoLink =
" <tr style=\"background-color: $color$\">\r\n"+
" <td><b>$path$</b></td><td><b>$level$</b></td><td><b>$msg$</b>$comment$ (from <a href=\"qa-txservers.html#$txsrvr$\">$txsrvr$</ta>)</td>\r\n"+
" <td><b>$path$</b></td><td><b>$level$</b></td><td><b>$msg$</b>$comment$ (from <a href=\"qa-txservers.html#$txsrvr$\">$txsrvr$<ta>)</td>\r\n"+
" </tr>\r\n";

private final String detailsTemplateWithExtraDetails =
Expand Down Expand Up @@ -1543,6 +1549,25 @@ private String genDetails(ValidationMessage vm, int id) {
return t.render();
}

private String genDetails(String vp, int id) {
String tid = null;
tid = detailsTemplate;
ST t = template(tid);
t.add("path", "");
t.add("pathlink", "");
t.add("level", "warning");
t.add("color", colorForLevel(IssueSeverity.WARNING, false));
t.add("halfcolor", halfColorForLevel(IssueSeverity.WARNING, false));
t.add("id", "l"+id);
t.add("mid", "");
t.add("msg", vp);
t.add("msgdetails", vp);
t.add("comment", "");
t.add("tx", "");
t.add("txsrvr", "");
return t.render();
}

private String getServer(String server) {
if (txServers.getServerMap().containsKey(server)) {
return txServers.getServerMap().get(server).getClient().getAddress();
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<packaging>pom</packaging>

<properties>
<core_version>6.3.32</core_version>
<core_version>6.3.33-SNAPSHOT</core_version>
<maven_surefire_version>3.0.0-M5</maven_surefire_version>
<apache_poi_version>5.2.1</apache_poi_version>
<okhttp.version>4.11.0</okhttp.version>
Expand Down

0 comments on commit 9bcf077

Please sign in to comment.