Skip to content

Commit

Permalink
Merge pull request #5 from ryanhyma/master
Browse files Browse the repository at this point in the history 
Pull request for "Find what you were looking for"
  • Loading branch information
@amonsour
amonsour authored Jul 16, 2020
2 parents a82195c + 56e5fdc commit aa8be77
Show file tree
Hide file tree
Showing 11 changed files with 188 additions and 85 deletions.
Binary file added .DS_Store
View file
Binary file not shown.
18 changes: 18 additions & 0 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": "0.2.0",
"configurations": [{
"name": "Listen for XDebug",
"type": "php",
"request": "launch",
"port": 9000,
"log": true,
"externalConsole": false,
"pathMappings": {
"/var/www/html/php": "${workspaceRoot}/php"
},
"ignore": [
"**/vendor/**/*.php"
]
}
]
}
9 changes: 7 additions & 2 deletions assets/js/i18n/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@
"Dayofselecteddaterange" : " of selected date range",
"NotAvailable" : "N/A",
"Alpha" : "Alpha",
"AlphaMsg" : "This is an experimental version of Canada.ca for public testing.",
"Type" : "Type"
"alphaMsg" : "This is an experimental version of Canada.ca for public testing.",
"Type" : "Type",
"FindWhatYoureLookingFor" : "Find What You Were Looking For",
"Yes" : "Yes",
"No" : "No",
"Reason" : "Reason",
"No Clicks" : "No Clicks"
}
9 changes: 7 additions & 2 deletions assets/js/i18n/fr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@
"Dayofselecteddaterange" : " de l'intervalle de dates sélectionné",
"NotAvailable" : "s/o",
"Alpha" : "Alpha",
"AlphaMsg" : "Ceci est une version expérimentale du site Canada.ca destinée à être testée par le public.",
"Type" : "Type"
"alphaMsg" : "Ceci est une version expérimentale du site Canada.ca destinée à être testée par le public.",
"Type" : "Type",
"FindWhatYoureLookingFor" : "Avez-vous trouvé ce que vous cherchiez?",
"Yes" : "Oui",
"No" : "Non",
"Reason" : "Raison",
"No Clicks" : "Non clics"
}
73 changes: 45 additions & 28 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@
//script.onreadystatechange = script.onload = null;
document.write(wet.builder.refTop({
"isApplication": true
}));
}));
</script>
</head>

<body vocab="http://schema.org/" typeof="WebPage">
<span id="allspan" class="hidden">
<section class="experimental alpha-top"><h2 class="wb-inv" data-i18n="Alpha"></h2><div class="container"><small><label class="alpha-label" data-i18n="Alpha"></label>&nbsp;&nbsp; <span data-i18n="AlphaMsg"></span> </small></div></section >
<section class="experimental alpha-top"><h2 class="wb-inv" data-i18n="Alpha"></h2><div class="container"><small><label class="alpha-label" data-i18n="Alpha"></label>&nbsp;&nbsp; <span data-i18n="alphaMsg"></span> </small></div></section >
<div id="def-top">
<!-- Write closure fall-back static file -->
<!-- /ROOT/app/cls/WET/gcweb/v4_0_28/cdts/static/appTop-en.html -->
Expand All @@ -167,10 +167,10 @@
<input type="checkbox" class="dd-input" />

<ul class="dd-menu">
<li data-value="31" data-index="0"><i class="fas fa-calendar-alt"></i>&nbsp;<span data-i18n="Last30days"></span></li>
<li data-value="8" data-index="1"><i class="fas fa-calendar-week"></i>&nbsp;<span data-i18n="Last7days"></span></li>
<li data-value="2" data-index="2"><i class="fas fa-calendar-day"></i>&nbsp;<span data-i18n="Yesterday"></span></li>
</ul>
<li data-value="31" data-index="0"><i class="fas fa-calendar-alt"></i>&nbsp;<span data-i18n="Last30days"></span></li>
<li data-value="8" data-index="1"><i class="fas fa-calendar-week"></i>&nbsp;<span data-i18n="Last7days"></span></li>
<li data-value="2" data-index="2"><i class="fas fa-calendar-day"></i>&nbsp;<span data-i18n="Yesterday"></span></li>
</ul>

</label>
</div>
Expand Down Expand Up @@ -220,8 +220,25 @@ <h2><span id="h2title" data-i18n="Page-levelstatistics"></span> <sup class="smal

<div class="row">
<div class="col-md-6">
<p class="h2" data-i18n="Reportaproblem"></p>
<p id="rap"></p>
<div id="rapCont">
<p class="h2" data-i18n="Reportaproblem"></p>
<p id="rap"></p>
</div>
<div id="fwylfCont">
<p class="h2" data-i18n="FindWhatYoureLookingFor"></p>
<table id="fwylfTable" class="table table-striped">
<thead>
<th data-i18n="Yes"></th>
<th data-i18n="No"></th>
</thead>
<tr>
<td id="fwylfYes"></td>
<td id="fwylfNo"></td>
</tr>
</table>
<table id="fwylfReason" class="table table-striped">
</table>
</div>
</div>
<div class="col-md-6">
<p class="h2" data-i18n="Phrasessearchedfromthispage"></p>
Expand All @@ -246,7 +263,7 @@ <h2><span id="h2title" data-i18n="Page-levelstatistics"></span> <sup class="smal

</div>
</div>

<div class="row">
<div class="col-md-6">
<p class="h2" data-i18n="Referringtypes"></p>
Expand All @@ -257,8 +274,8 @@ <h2><span id="h2title" data-i18n="Page-levelstatistics"></span> <sup class="smal
<p id="pp" data-i18n="Nodata"></p>
</div>
</div>



<div class="row">
<div class="col-md-6">
<p class="h2" data-i18n="Searchtermsleadingtothispage"></p>
Expand All @@ -271,7 +288,7 @@ <h2><span id="h2title" data-i18n="Page-levelstatistics"></span> <sup class="smal
</table>
</div>
</div>

<div class="row">
<div class="col-md-6">
<p class="h2" data-i18n="Devicesused"></p>
Expand Down Expand Up @@ -304,8 +321,8 @@ <h2><span id="h2title" data-i18n="Page-levelstatistics"></span> <sup class="smal
</div>
</div>
</div>


<aside class="wb-fnote" role="note">
<h2 id="fn" data-i18n="Footnotes"></h2>
<dl>
Expand Down Expand Up @@ -333,7 +350,7 @@ <h2 id="fn" data-i18n="Footnotes"></h2>
<script>
var defPreFooter = document.getElementById("def-preFooter");
defPreFooter.outerHTML = wet.builder.preFooter({
"dateModified": "2020-06-11"
"dateModified": "2020-07-15"
});
</script>

Expand All @@ -355,26 +372,26 @@ <h2 id="fn" data-i18n="Footnotes"></h2>
"isApplication": true
}));
</script>
<script type="text/javascript" src="assets/js/Chart.min.js"></script>
<script type="text/javascript" src="assets/js/chartjs-plugin-datalabels.min.js"></script>
<script type="text/javascript" src="assets/js/moment.min.js"></script>
<script type="text/javascript" src="assets/js/moment-with-locales.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.messagestore.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.fallbacks.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.language.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.parser.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.emitter.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.emitter.bidi.min.js"></script>

<script type="text/javascript" src="assets/js/Chart.min.js"></script>
<script type="text/javascript" src="assets/js/chartjs-plugin-datalabels.min.js"></script>
<script type="text/javascript" src="assets/js/moment.min.js"></script>
<script type="text/javascript" src="assets/js/moment-with-locales.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.messagestore.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.fallbacks.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.language.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.parser.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.emitter.min.js"></script>
<script type="text/javascript" src="assets/js/jquery.i18n.emitter.bidi.min.js"></script>

<script>
$('.dd-menu li').click(function(){
$(this).parents('.dropdown').find('.dd-button').html($(this).html());
$("input[name='dd-value']").val( $(this).attr("data-index") );;
});
</script>
<script type="text/javascript" src="js/api.min.js"></script>
</span>
<script type="text/javascript" src="js/api.js"></script>
</span>
</body>
</html>
76 changes: 64 additions & 12 deletions js/api.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ function generateTable(table, data) {
*/
const jsonPieGenerate = (arr) => {

$("#chart").remove()
$("#chart-canvas").append("<canvas id='chart'></canvas>")
$("#chart").remove()
$("#chart-canvas").append("<canvas id='chart'></canvas>")

val = arr;
cnt = val.length;

Expand Down Expand Up @@ -210,7 +210,7 @@ const jsonPieGenerate = (arr) => {
}
per = per + end;
val = value.toLocaleString(document.documentElement.lang+"-CA")
var obj = {};
var obj = {};
obj[$.i18n("DeviceType")] = lab;
obj[$.i18n("Visits")] = val;
obj[$.i18n("Percent")] = per;
Expand Down Expand Up @@ -804,6 +804,46 @@ const jsonAM = ( json, day ) => {

}

const jsonFWYLF = ( json, day ) => {
var rows = json["rows"][0];
var $next = $("#fwylfReason");

if (rows != null) {
var array = json["rows"];
$next.html("");

var next = [];

$.each(array, function(index, value) {
term = value["value"];
val = value["data"][day];

//if (term != "(Low Traffic)" && term != "Unspecified" && val != "0") {
var obj = {};
obj[$.i18n("Reason")] = term;
obj[$.i18n("Clicks")] = val;
next.push(obj);
//}
});

if (next.length != 0) {
next.sort((a, b)=> b.NumSelected - a.NumSelected);

let table = document.querySelector("table#fwylfReason");
let data = Object.keys(next[0]);
generateTable(table, next);
generateTableHead(table, data, $.i18n("NoClicks"));

} else {
$next.html($.i18n("Nodata"));
}


} else {
$next.html($.i18n("Nodata"));
}
}

const jsonMetrics = ( json, day ) => {

var rows = json["summaryData"]["filteredTotals"];
Expand All @@ -820,19 +860,30 @@ const jsonMetrics = ( json, day ) => {
var tabletNum = 18 + parseInt(day);
var otherNum = 21 + parseInt(day);

var findLookingForTotalNum = 45 + parseInt(day);
var findLookingForNoNum = 48 + parseInt(day);
var findLookingForYesNum = 51 + parseInt(day);
var findLookingForInstancesNum = 54 + parseInt(day);

$uv.html("")
$rap.html("")
if (rows != null) {
uv = parseInt(rows[uvNum])
uvDays = parseInt( uv / $days ).toLocaleString(document.documentElement.lang+"-CA");
uv = parseInt(uv).toLocaleString(document.documentElement.lang+"-CA");
$uv.prepend("<span class='h1'>" + uvDays +"</span> <strong>"+$.i18n("averageperday")+"</strong></br><span class='small'>" + uv +" "+ $.i18n("total")+"</span>");

rap = parseInt(rows[rapNum])
if (day == 2) $weeks = 1;
rapWeeks = parseInt( rap / $weeks ).toLocaleString(document.documentElement.lang+"-CA");
rap = parseInt(rap).toLocaleString(document.documentElement.lang+"-CA");
$rap.prepend("<span class='h1'>" + rapWeeks +"</span> <strong>"+$.i18n("averageperweek")+"</strong></br><span class='small'>" + rap +" "+ $.i18n("total")+"</span>");
if (parseInt(rows[findLookingForInstancesNum]) == NaN || parseInt(rows[findLookingForTotalNum]) == 0) {
rap = parseInt(rows[rapNum])
if (day == 2) $weeks = 1;
rapWeeks = parseInt( rap / $weeks ).toLocaleString(document.documentElement.lang+"-CA");
rap = parseInt(rap).toLocaleString(document.documentElement.lang+"-CA");
$rap.prepend("<span class='h1'>" + rapWeeks +"</span> <strong>"+$.i18n("averageperweek")+"</strong></br><span class='small'>" + rap +" "+ $.i18n("total")+"</span>");
$("#fwylfCont").html("");
} else {
$("#fwylfYes").html(rows[findLookingForYesNum]);
$("#fwylfNo").html(rows[findLookingForTotalNum]);
$("#rapCont").html("");
}

desktop = parseInt(rows[desktopNum])
mobile = parseInt(rows[mobileNum])
Expand All @@ -848,7 +899,7 @@ const jsonMetrics = ( json, day ) => {
$rap.html("0");
}

}
}



Expand Down Expand Up @@ -896,6 +947,7 @@ const apiCall = (d, i, a, uu, dd) => a.map( type => {
case "activityMap" : return jsonAM(res, dd);
case "metrics" : return jsonMetrics(res, dd);
case "refType" : return jsonRT(res, dd);
case "fwylf" : return jsonFWYLF(res,dd);
//case "dwnld" : return jsonDownload(res, uu);
//case "outbnd" : return jsonOutbound(res, uu);
}
Expand Down Expand Up @@ -1030,7 +1082,7 @@ const mainQueue = (url, start, end, lang) => {
$("#searchBttn").prop("disabled",true);

var dbCall = [ "dbGet" ];
var match = [ "trnd", "fle", "prvs", "srchAll", "snmAll", "srchLeftAll", "activityMap", "refType", "metrics" ];
var match = [ "trnd", "fle", "prvs", "srchAll", "snmAll", "srchLeftAll", "activityMap", "refType", "metrics", "fwylf" ];
//var match = [ "snm", "uvrap" ];
var previousURL = [];
var pageURL = [ ]; //, "dwnld", "outbnd" ];
Expand Down
2 changes: 1 addition & 1 deletion js/api.min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit aa8be77

Please # to comment.