Merge pull request #696 from DavidVorick/master

An inital fix for stats.html

Author: Colin Rice

bitHopper/templates/.stats.html.swp

@@ -67,6 +67,8 @@
 
 				return 'white';
 			}
+		
+
 			function numberWithCommas(x) {
 				return x.toString().replace(/\B(?=(?:\d{3})+(?!\d))/g, ",");
 			}
@@ -299,53 +301,6 @@
 				return srvhist[srv['name']];
 			}
 
-			function getSlice(payload, srv) {
-				var name = srv['pool_index'];
-				if (payload['sliceinfo'] == undefined && srv['slice'] == undefined)
-					 return "-"
-				if (payload['sliceinfo'] != undefined && payload['sliceinfo'][name] >= 0)
-					return parseFloat(payload['sliceinfo'][name]).toFixed(0)
-				else if (srv['slice'] >= 0)
-					return parseFloat(srv['slice']).toFixed(0)
-				else
-					return "-"
-			}
-
-			function getWait(payload, srv) {
-				if (payload['wait'] == undefined && srv['wait'] == undefined)
-					 return "-"
-				var wait = 0.0
-				if (srv['wait'] && srv['wait'] > 0) {
-					 wait = parseFloat(srv['wait']);
-				}
-				var wait_html = "<a href='#' onFocus='this.blur();' onClick=\"setWait('"
-				wait_html = wait_html + srvName + "', " + wait + ");\" style='text-decoration:underline;color:" + getColor(payload,srv) + ";'>"
-				wait_html = wait_html + wait.toFixed(2) + "</a>";
-				return wait_html;
-			}
-
-			function getPenalty(payload, srv) {
-				var penalty = 1.00
-				if (srv['penalty'] && srv['penalty'] > 0) {
-					 penalty = parseFloat(srv['penalty']);
-				}
-				var penalty_html = "<a href='#' onFocus='this.blur();' onClick=\"setPenalty('"
-				penalty_html = penalty_html + srvName + "', " + penalty + ");\" style='text-decoration:underline;color:" + getColor(payload,srv) + ";'>"
-				penalty_html = penalty_html + penalty.toFixed(2) + "</a>";
-				return penalty_html;
-			}
-
-			function getLPPenalty(payload, srv) {
-				var penalty = 0.00
-				if (srv['lp_penalty']) {
-					 penalty = parseFloat(srv['lp_penalty']);
-				}
-				var penalty_html = "<a href='#' onFocus='this.blur();' onClick=\"setLPPenalty('"
-				penalty_html = penalty_html + srvName + "', " + penalty + ");\" style='text-decoration:underline;color:" + getColor(payload,srv) + ";'>"
-				penalty_html = penalty_html + penalty.toFixed(2) + "</a>";
-				return penalty_html;
-			}
-
 			function getPoolSpeed(payload, srv) {
 				if (srv['ghash'] > 0) {
 					if (srv["isSpeedEstimated"] == true) {
@@ -480,6 +435,12 @@
 						if( !showInfoPools && row_role == "info" ){
 							continue; //Skip info pools
 						}
+						
+						var htmlRepresentationOfShares = columns['Shares']['data'](payload, row, r);
+    						var intRepresentationOfShares = htmlRepresentationOfShares.replace(/[^0-9]/g, '');
+						if(intRepresentationOfShares == 0 || intRepresentationOfShares > 50000000) {
+							continue;
+						}
 					}
 
 					html += "<tr id=\"row_" + i + "\">";
@@ -574,10 +535,6 @@
 							'Round<br>Time': { 'data':getRoundDuration, 'align':'center'},
 							'Payout': { 'data':getPayout, 'color':getColor, 'align':'right' },
 							'Eff.': { 'data':getEfficiency, 'color':getColor, 'align':'center' },
-							'ThrPnlty': { 'data':getPenalty, 'color':getColor, 'align':'center' },
-							'LP-Pnlty': { 'data':getLPPenalty, 'color':getColor, 'align':'center' },
-							'Wait': { 'data':getWait, 'color':getColor, 'align':'center' },
-							'Slice': { 'data':getSlice, 'color':getColor, 'align':'center', 'display':'' },
 							'Round Shares': { 'data':getRoundShares, 'type':'linechart', 'width':'100%' },
 							'Role String': { 'data':getRoleString, 'display':'none' }
 						},
@@ -596,8 +553,9 @@
 					);
 
 					users = data["user"];
-
-					buildTable("#users", users, users,
+					
+					//buildTable has been commented out because none of the getUserX calls are working and I don't know what is supposed to be happening. Functionality may one day be readded
+					/*buildTable("#users", users, users,
 						{
 							"User": { 'data':getUserName } ,
 							"Last Seen": { 'data':getUserTime, 'align':'left' },
@@ -610,7 +568,7 @@
 						function(c,d){
 							return c > d;
 						},""
-					);
+					);*/
 
 				});
 			}