Skip to content

Commit 0f4f486

Browse files
author
mreishman
committed
converts title to date if possible
1 parent d45aa4a commit 0f4f486

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

core/js/rend.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ function showRender(divId, id, renderInfo, logFile, container)
1616
item = item.replace(/{{errorCount}}/g, getCountOfBlockType(renderInfo["info"], errorClass));
1717
item = item.replace(/{{ProgressBlocks}}/g, generateProgressBlocks(renderInfo["info"],divId));
1818
item = item.replace(/{{logFile}}/g, logFile);
19+
if(id.indexOf("Test") === 0 && item.indexOf("{{date}}") > -1)
20+
{
21+
var newDate = id.replace("Test", "");
22+
newDate = newDate.replace(".log","");
23+
newDate = new Date(newDate);
24+
item = item.replace(/{{date}}/g, newDate);
25+
}
1926
return item;
2027
}
2128

view/tests.php

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ function genContainer($dataForContainer)
4545
{
4646
$stringGen = "<div style=\"background-color: white; border: 1px solid black;\" id=\"".$dataForContainer["id"]."\" class=\"scanBar containerMain\">";
4747
$stringGen .= "<div class=\"fontChange\" style=\"width: 100%; text-align: left;\" id=\"".$dataForContainer["id"]."Title\">";
48-
$stringGen .= "<h3><span id=\"".$dataForContainer["id"]."RenameDisplay\" >".$dataForContainer["logFile"]."</span><span style=\"display: none;\" id=\"".$dataForContainer["id"]."RenameInput\" > <input id=\"".$dataForContainer["id"]."RenameInputValue\" value=".$dataForContainer["logFile"]." ></input> <a onclick=\"renameCompare('".$dataForContainer["id"]."');\" class=\"link\" >Cancel</a> <a onclick=\"actuallyRenameCompare('".$dataForContainer["id"]."');\" class=\"link\" >Save</a> </span></h3>";
48+
$stringGen .= "<h3><span id=\"".$dataForContainer["id"]."RenameDisplay\" >".$dataForContainer["logFile"]."</span><span style=\"display: none;\" id=\"".$dataForContainer["id"]."RenameInput\" > <input id=\"".$dataForContainer["id"]."RenameInputValue\" value=".$dataForContainer["logFile"]." ></input> <a onclick=\"renameCompare('".$dataForContainer["id"]."');\" class=\"link\" >Cancel</a> <a onclick=\"actuallyRenameCompare('".$dataForContainer["id"]."');\" class=\"link\" >Save</a> </span>";
49+
if($dataForContainer["date"] !== "")
50+
{
51+
$stringGen .= "(".$dataForContainer["date"].")";
52+
}
53+
$stringGen .= "</h3>";
4954
$stringGen .= "<div style=\"font-size: 200%;\">";
5055
$stringGen .= "<img class=\"imageInHeaderContainer\" onclick=\"removeCompare('".$dataForContainer["id"]."');\" src=\"../core/img/trashCan.png\">";
5156
$stringGen .= "<img id=\"".$dataForContainer["id"]."RenameIcon\" class=\"imageInHeaderContainer\" onclick=\"renameCompare('".$dataForContainer["id"]."');\" src=\"../core/img/rename.png\">";
@@ -176,6 +181,13 @@ function generateProgressBlocks($info, $divId)
176181
}
177182
if(isset($dataForTest["info"]) && !empty((array)$dataForTest["info"]))
178183
{
184+
$date = "";
185+
if(strpos($value, "Test") === 0)
186+
{
187+
$newDate = str_replace("Test", "", $value);
188+
$newDate = str_replace(".log", "", $newDate);
189+
$date = "<span id=\"".$value."SpanForDateConvert\" ></span>";
190+
}
179191
$infoLocal = $dataForTest["info"];
180192
echo genContainer(array(
181193
"id" => $value,
@@ -185,8 +197,13 @@ function generateProgressBlocks($info, $divId)
185197
"totalCount" => getCountOfBlockType($infoLocal,"block"),
186198
"errorCount" => getCountOfBlockType($infoLocal,"blockError"),
187199
"website" => $websiteLocal,
188-
"file" => $fileLocal
200+
"file" => $fileLocal,
201+
"date" => $date
189202
));
203+
if(strpos($value, "Test") === 0)
204+
{
205+
echo "<script> document.getElementById(\"".$value."SpanForDateConvert\").innerHTML = new Date(".$newDate."); </script>";
206+
}
190207
}
191208
else
192209
{
@@ -217,7 +234,8 @@ function generateProgressBlocks($info, $divId)
217234
"totalCount" => "{{totalCount}}",
218235
"errorCount" => "{{errorCount}}",
219236
"website" => "{{website}}",
220-
"file" => "{{file}}"
237+
"file" => "{{file}}",
238+
"date" => "{{date}}"
221239
));
222240
?>
223241
</div>

0 commit comments

Comments
 (0)