This is an automated email from the ASF dual-hosted git repository. vitalii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit da7cb4e2fc67393f0ef26b0a03954ad139fdf7f9 Author: Kunal Khatua <kkha...@maprtech.com> AuthorDate: Mon Jan 14 11:53:15 2019 -0800 DRILL-6971: Labelled Query State with color coding closes #1611 --- .../java-exec/src/main/resources/rest/query/result.ftl | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/exec/java-exec/src/main/resources/rest/query/result.ftl b/exec/java-exec/src/main/resources/rest/query/result.ftl index 13e675d..d9f653f 100644 --- a/exec/java-exec/src/main/resources/rest/query/result.ftl +++ b/exec/java-exec/src/main/resources/rest/query/result.ftl @@ -33,11 +33,21 @@ <table><tr> <td align='left'> <button type="button" title="Open in new window" onclick="popOutProfile('${model.getQueryId()}');" class="btn btn-default btn-sm"> - <b>Query Profile:</b> ${model.getQueryId()} <span class="glyphicon glyphicon-new-window"/></button> + <b>Query Profile:</b> ${model.getQueryId()} <#switch model.getQueryState()> + <#case "COMPLETED"> + <span class="label label-success"> + <#break> + <#case "CANCELED"> + <span class="label label-warning"> + <#break> + <#case "FAILED"> + <span class="label label-danger"> + <#break> + <#default> + <span class="label label-default"> + </#switch>${model.getQueryState()}</span> <span class="glyphicon glyphicon-new-window"/></button> </td> - <td> - <span class="input-group-addon" style="font-size:95%"><b>Query State:</b> ${model.getQueryState()}</span> - </td><td align="right" width="100%"> + <td align="right" width="100%"> <div class="input-group"> <span class="input-group-addon" style="font-size:95%">Delimiter </span> <input id="delimitBy" type="text" class="form-control input-sm" name="delimitBy" title="Specify delimiter" placeholder="Required" maxlength="2" size="2" value=",">