Merge pull request #95 from mreishman/1.7

mreishman · web-flow · commit 001780ea633a · 2018-06-18T10:33:18.000-05:00
1.6.2
diff --git a/core/js/rend.js b/core/js/rend.js
@@ -16,6 +16,13 @@ function showRender(divId, id, renderInfo, logFile, container)
 	item = item.replace(/{{errorCount}}/g, getCountOfBlockType(renderInfo["info"], errorClass));
 	item = item.replace(/{{ProgressBlocks}}/g, generateProgressBlocks(renderInfo["info"],divId));
 	item = item.replace(/{{logFile}}/g, logFile);
+	if(id.indexOf("Test") === 0 && item.indexOf("{{date}}") > -1)
+	{
+		var newDate = id.replace("Test", "");
+		newDate = newDate.replace(".log","");
+		newDate = new Date(newDate);
+		item = item.replace(/{{date}}/g, newDate);
+	}
 	return item;
 }
 
diff --git a/core/js/run.js b/core/js/run.js
@@ -1144,11 +1144,9 @@ function getVideoLink(functionData)
 					var dataSuccess = dataInner["success"];
 					if(dataSuccess)
 					{
-						//http://192.168.1.151:3000/download_video/23ce6d4e7c00d6c57e358c0dc0d38ab0.mp4
 						dataMessage = dataInner["proxyId"]+"/download_video/"+dataInner["session"]+".mp4";
 						dataMessage = dataMessage.replace(/5555/g,"3000");
-						//dataMessage = "<video width=\"320\" height=\"240\" controls> <source src=\""+dataMessage+"\" type=\"video/mp4\"></video>";
-						dataMessage = "<a style=\"color: black;\" href=\""+dataMessage+"\" >"+dataMessage+"</a>";
+						dataMessage = "<iframe  src=\""+dataMessage+"\" ></iframe>";
 					}
 					var selector = "";
 					var keysOfObjectOfVideos = Object.keys(objectOfVideos);
diff --git a/core/js/sidebar.js b/core/js/sidebar.js
@@ -43,6 +43,10 @@ function browserNodeInfoLogic(data)
 		{
 			browserNow = "internet-explorer";
 		}
+		if(browserList[i] === "internet_explorer")
+		{
+			browserList[i] = "internet explorer";
+		}
 		var currentBrowserCount = getCurrentBrowserCount(data, browserList[i]);
 		var totalBrowserCount = getCurrentBrowserCountTotal(data, browserNow);
 		var browserSrc = "../core/img/chrome-hr.png";
diff --git a/core/js/view.js b/core/js/view.js
@@ -359,6 +359,8 @@ function showPopup(id)
 		popupImageLogic(id, document.getElementById(id+"JumbotronImage").src);
 	}
 	document.getElementById("popup").style.width = ""+((window.innerWidth*0.9)-280)+"px";
+	document.getElementById(id+"PopupJumbotronHolder").style.maxWidth = ""+((window.innerWidth*0.9)-540)+"px";
+	document.getElementById(id+"PopupJumbotronHolder").style.overflow = "auto";
 }
 
 function hidePopupWindow()
diff --git a/core/php/commonFunctions.php b/core/php/commonFunctions.php
@@ -209,7 +209,7 @@ function findUpdateValue($newestVersionCount, $versionCount, $newestVersion, $ve
 		{
 			if(isset($newestVersion[$i]) && $newestVersion[$i] !== $version[$i])
 			{
-				if($newestVersion[$i] > $version[$i])
+				if(intval($newestVersion[$i]) > intval($version[$i]))
 				{
 					$calcuation = 3-$i;
 					return max(1, $calcuation);
diff --git a/core/php/configStatic.php b/core/php/configStatic.php
@@ -2,7 +2,7 @@
 <?php
 
 $configStatic = array(
-  'version'   => '1.6.1',
+  'version'   => '1.6.2',
   'lastCheck'   => '10-30-2017',
   'newestVersion' => '1.3.1',
   'versionList' => array(
diff --git a/core/template/viewcss.css b/core/template/viewcss.css
@@ -5,7 +5,7 @@
 
 .mainBox
 {
-	width: 333px;
+	width: 356px;
 	height: 450px;
 	display: inline-table;
 	background-color: #777;
diff --git a/settings/changelog.html b/settings/changelog.html
@@ -3,6 +3,36 @@
 		<li>
 			<h2>Changelog</h2>
 		</li>
+		<li>
+			1.6.2
+			<ul>
+				<li>
+					Features
+					<ul>
+						<li>
+							Added date next to title on cached test results (if not renamed)
+						</li>
+						<li>
+							Moved video to iframe on running tests
+						</li>
+					</ul>
+				</li>
+				<li>
+					Bug Fixes
+					<ul>
+						<li>
+							Fixed js issue with sidebar and IE
+						</li>
+						<li>
+							Fixed some style issues and popup for viewing nodes
+						</li>
+						<li>
+							Fixed image display issue with IE on sidebar & overview page
+						</li>
+					</ul>
+				</li>
+			</ul>
+		</li>
 		<li>
 			1.6.1
 			<ul>
diff --git a/view/index.php b/view/index.php
@@ -144,7 +144,7 @@
 								</span>
 							</div>
 						</td>
-						<td id="{{id}}" width="240px" style="vertical-align: top;">
+						<td id="{{id}}" width="260px" style="vertical-align: top;">
 							<span id="popupSpanLeftHeight" style="display: block;">
 								<div onclick="hidePopupWindow();" class="link" style="width: 100%; text-align: center; margin-bottom: 10px;" >Close Popup</div>
 								<br>
diff --git a/view/overview.php b/view/overview.php
@@ -52,7 +52,7 @@
 	
 
 	<div id="main" style="right: 0; top: 62px;">
-		<canvas class="canvasMonitor" id="useageCanvas" width="300" height="300" style="height: 350px; border: 0;" ></canvas>
+		<canvas class="canvasMonitor" id="useageCanvas" width="300" height="300" style="height: 350px; border: 0; background-color: #FFF;" ></canvas>
 		<table width="100%">
 			<tr>
 				<?php if ($logFileLocation != ""): ?>
@@ -158,6 +158,10 @@ function browserNodeInfoLogicOverview(data)
 				{
 					browserNow = "internet_explorer";
 				}
+				if(browserList[i] === "internet_explorer")
+				{
+					browserList[i] = "internet explorer";
+				}
 				var currentBrowserCount = getCurrentBrowserCount(data, browserList[i]);
 				var totalBrowserCount = getCurrentBrowserCountTotal(data, browserNow);
 				var browserSrc = "../core/img/chrome-hr.png";
diff --git a/view/tests.php b/view/tests.php
@@ -45,7 +45,12 @@ function genContainer($dataForContainer)
 {
 	$stringGen = "<div style=\"background-color: white; border: 1px solid black;\" id=\"".$dataForContainer["id"]."\" class=\"scanBar containerMain\">";
 	$stringGen .= "<div class=\"fontChange\" style=\"width: 100%; text-align: left;\" id=\"".$dataForContainer["id"]."Title\">";
-	$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>";
+	$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>";
+	if($dataForContainer["date"] !== "")
+	{
+		$stringGen .= "(".$dataForContainer["date"].")";
+	}
+	$stringGen .= "</h3>";
 	$stringGen .= "<div style=\"font-size: 200%;\">";
 	$stringGen .= "<img class=\"imageInHeaderContainer\" onclick=\"removeCompare('".$dataForContainer["id"]."');\" src=\"../core/img/trashCan.png\">";
 	$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)
 				}
 				if(isset($dataForTest["info"]) && !empty((array)$dataForTest["info"]))
 				{
+					$date = "";
+					if(strpos($value, "Test") === 0)
+					{
+						$newDate = str_replace("Test", "", $value);
+						$newDate = str_replace(".log", "", $newDate);
+						$date = "<span id=\"".$value."SpanForDateConvert\" ></span>";
+					}
 					$infoLocal = $dataForTest["info"];
 					echo genContainer(array(
 						"id"				=>	$value,
@@ -185,8 +197,13 @@ function generateProgressBlocks($info, $divId)
 						"totalCount"		=>	getCountOfBlockType($infoLocal,"block"),
 						"errorCount"		=>	getCountOfBlockType($infoLocal,"blockError"),
 						"website"			=>	$websiteLocal,
-						"file"				=>	$fileLocal
+						"file"				=>	$fileLocal,
+						"date"				=>	$date
 					));
+					if(strpos($value, "Test") === 0)
+					{
+						echo "<script> document.getElementById(\"".$value."SpanForDateConvert\").innerHTML = new Date(".$newDate."); </script>";
+					}
 				}
 				else
 				{
@@ -217,7 +234,8 @@ function generateProgressBlocks($info, $divId)
 					"totalCount"		=>	"{{totalCount}}",
 					"errorCount"		=>	"{{errorCount}}",
 					"website"			=>	"{{website}}",
-					"file"				=>	"{{file}}"
+					"file"				=>	"{{file}}",
+					"date"				=>	"{{date}}"
 				));
 			?>
 		</div>

Original file line number	Diff line number	Diff line change
`@@ -1144,11 +1144,9 @@ function getVideoLink(functionData)`
`1144`	`1144`	`var dataSuccess = dataInner["success"];`
`1145`	`1145`	`if(dataSuccess)`
`1146`	`1146`	`{`
`1147`		`- //http://192.168.1.151:3000/download_video/23ce6d4e7c00d6c57e358c0dc0d38ab0.mp4`
`1148`	`1147`	`dataMessage = dataInner["proxyId"]+"/download_video/"+dataInner["session"]+".mp4";`
`1149`	`1148`	`dataMessage = dataMessage.replace(/5555/g,"3000");`
`1150`		`- //dataMessage = "<video width=\"320\" height=\"240\" controls> <source src=\""+dataMessage+"\" type=\"video/mp4\"></video>";`
`1151`		`- dataMessage = "<a style=\"color: black;\" href=\""+dataMessage+"\" >"+dataMessage+"</a>";`
	`1149`	`+ dataMessage = "<iframe src=\""+dataMessage+"\" ></iframe>";`
`1152`	`1150`	`}`
`1153`	`1151`	`var selector = "";`
`1154`	`1152`	`var keysOfObjectOfVideos = Object.keys(objectOfVideos);`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,10 @@ function browserNodeInfoLogic(data)`
`43`	`43`	`{`
`44`	`44`	`browserNow = "internet-explorer";`
`45`	`45`	`}`
	`46`	`+ if(browserList[i] === "internet_explorer")`
	`47`	`+ {`
	`48`	`+ browserList[i] = "internet explorer";`
	`49`	`+ }`
`46`	`50`	`var currentBrowserCount = getCurrentBrowserCount(data, browserList[i]);`
`47`	`51`	`var totalBrowserCount = getCurrentBrowserCountTotal(data, browserNow);`
`48`	`52`	`var browserSrc = "../core/img/chrome-hr.png";`
Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,8 @@ function showPopup(id)`
`359`	`359`	`popupImageLogic(id, document.getElementById(id+"JumbotronImage").src);`
`360`	`360`	`}`
`361`	`361`	`document.getElementById("popup").style.width = ""+((window.innerWidth*0.9)-280)+"px";`
	`362`	`+ document.getElementById(id+"PopupJumbotronHolder").style.maxWidth = ""+((window.innerWidth*0.9)-540)+"px";`
	`363`	`+ document.getElementById(id+"PopupJumbotronHolder").style.overflow = "auto";`
`362`	`364`	`}`
`363`	`365`
`364`	`366`	`function hidePopupWindow()`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ function findUpdateValue($newestVersionCount, $versionCount, $newestVersion, $ve`
`209`	`209`	`{`
`210`	`210`	`if(isset($newestVersion[$i]) && $newestVersion[$i] !== $version[$i])`
`211`	`211`	`{`
`212`		`- if($newestVersion[$i] > $version[$i])`
	`212`	`+ if(intval($newestVersion[$i]) > intval($version[$i]))`
`213`	`213`	`{`
`214`	`214`	`$calcuation = 3-$i;`
`215`	`215`	`return max(1, $calcuation);`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`.mainBox`
`7`	`7`	`{`
`8`		`- width: 333px;`
	`8`	`+ width: 356px;`
`9`	`9`	`height: 450px;`
`10`	`10`	`display: inline-table;`
`11`	`11`	`background-color: #777;`