From 7b312712c3cdf34946b225cef85b518de255f95c Mon Sep 17 00:00:00 2001
From: Ryan Hyma <ryan.hyma@gmail.com>
Date: Wed, 15 Jul 2020 22:08:02 -0400
Subject: [PATCH 1/2] Updates to include Find what you were looking for data

---
 .DS_Store              | Bin 0 -> 6148 bytes
 .vscode/launch.json    |  18 ++++++++++
 assets/js/i18n/en.json |   9 +++--
 assets/js/i18n/fr.json |   9 +++--
 index.html             |  73 ++++++++++++++++++++++++---------------
 js/api.js              |  76 ++++++++++++++++++++++++++++++++++-------
 js/api.min.js          |   2 +-
 php/data.php           |   4 ++-
 php/process-cj.php     |  58 ++++++++++++++++---------------
 php/process-new.php    |  22 ++++++------
 php/process.php        |   2 +-
 11 files changed, 188 insertions(+), 85 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 .vscode/launch.json

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..3f14a8a4c66f8600891db4d74bfa5c5dd2ab050d
GIT binary patch
literal 6148
zcmeHK%Wl&^6upy#;us;aKx&uXAhD>b1PTQqq%=(zT_7QhU;(JL>nJgGJXY)wN(jn^
z4`2uU0l&cx7Hs(tJ^;=<6xj}CR|M5u>&}^(`>^NOGvgs5))@yaq6QIJP=PfY#cxE|
zg)T`&_gn%pnIofgFXD%O#Qi02(_t7e4E$>hh`GB$9;LW?RGhzJQMd!W`csO0belqo
zDS+=w+Mod<h7{%IyomW!imA}^!nyz-wp#M3(GhYUm;Gd}_qqEo{QOCp=ym3cpG0Ar
zHJjgArCK|;a^A9R%f4toa|e9lW?nW<JKpGtXx;a+fv@WiIgb`~&wmv5Ci{)cJ3P+3
zFz$_Ha2WL9^7L^S2Yk}u<2XoV9#<JGt8Ufz8*9_)=B;b%&gShKvvp^>wbexZ`pwy_
zZmnKv-Q7DF9>1Etp1t`XDI|u)Qi>oyFCWoZ3^3}q+(SN0at;gIkaxR!@Yc6?Us-?W
z^L9RV$b&!HlflWkU$~<<;&C7O#B)|D!D~*6ub91sCI4Ayue176^zcg5)ae23(l&MJ
z9&iIQAt=%GqePQUBjV&kG1Cx{VHRb@7&+teUp!KrlIYLSx^PPQO<Kc%Vc`E|K&%fA
zRA5`<T%lY#P{<<yu!e3asEc0!5#wlVYn&^D1;SJ)P=zvm#9%5M{f_o)Yn&@o;l%Xe
zgXudneL`XK?#S;*cVcaYrZfx~28s++RkI=X|J{?%|HUBFG7K07&J+Wz)^)ob3`y^;
zOM?@8tph!P3K4#Dg)#(%-i~EOY{hF(DX=-B0&HuXD?|^({0K-IOko)Ks|@@CB4Y$)

literal 0
HcmV?d00001

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..93bf69fd
--- /dev/null
+++ b/.vscode/launch.json
@@ -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"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/assets/js/i18n/en.json b/assets/js/i18n/en.json
index 8c28ba39..66e8e98c 100644
--- a/assets/js/i18n/en.json
+++ b/assets/js/i18n/en.json
@@ -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"
 }
\ No newline at end of file
diff --git a/assets/js/i18n/fr.json b/assets/js/i18n/fr.json
index 17785374..fadf3f7d 100644
--- a/assets/js/i18n/fr.json
+++ b/assets/js/i18n/fr.json
@@ -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"
 }
\ No newline at end of file
diff --git a/index.html b/index.html
index 524060e2..e2eaf3bc 100644
--- a/index.html
+++ b/index.html
@@ -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 -->
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
        
@@ -355,18 +372,18 @@ <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(){
@@ -374,7 +391,7 @@ <h2 id="fn" data-i18n="Footnotes"></h2>
           $("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>
\ No newline at end of file
diff --git a/js/api.js b/js/api.js
index 8cbe9bfe..ce059e46 100644
--- a/js/api.js
+++ b/js/api.js
@@ -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;
 
@@ -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;
@@ -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"];
@@ -820,6 +860,11 @@ 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) {
@@ -827,12 +872,18 @@ const jsonMetrics = ( json, day ) => {
         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])
@@ -848,7 +899,7 @@ const jsonMetrics = ( json, day ) => {
         $rap.html("0");
     }
 
-}
+} 
 
 
 
@@ -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);
         }
@@ -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" ];
diff --git a/js/api.min.js b/js/api.min.js
index d2997002..2a1ac934 100644
--- a/js/api.min.js
+++ b/js/api.min.js
@@ -1 +1 @@
-function getQueryParams(){let e={},t=window.location.search;return(t=t.substr(1)).split("&").forEach(function(t){let a=t.split("=");e[a[0]]=decodeURIComponent(a[1])}),e}function getSpecifiedParam(e,t){for(let[a,n]of Object.entries(e))if(a===t)return n}$(document).on("wb-ready.wb",function(){$.i18n().load({en:"./assets/js/i18n/en.json",fr:"./assets/js/i18n/fr.json"}).done(function(){$("html").i18n(),$(".app-name").text($.i18n("app-title")),$("#allspan").removeClass("hidden")});let e=getQueryParams();var t,a,n;t=getSpecifiedParam(e,"url"),a=getSpecifiedParam(e,"start"),n=getSpecifiedParam(e,"end"),a&&n&&(a=moment(a).format("MMMM D, YYYY"),n=moment(n).format("MMMM D, YYYY"),$(".dr-date-start").html(a),$(".dr-date-end").html(n)),t&&($("#urlval").val(t),mainQueue(t,a,n,0))});const kFormatter=e=>Math.abs(e)>999?Math.sign(e)*(Math.abs(e)/1e3).toFixed(1)+"k":Math.sign(e)*Math.abs(e),dynamicColors=()=>"rgba("+Math.floor(200*Math.random())+","+Math.floor(200*Math.random())+","+Math.floor(200*Math.random())+", 0.7)",poolColors=e=>{var t=[];for(i=0;i<e;i++)t.push(dynamicColors());return t};function isInt(e){return!isNaN(e)&&parseInt(Number(e))==e&&!isNaN(parseInt(e,10))}function generateTableHead(e,t,a){e.createCaption().innerHTML="<div class='wb-inv'>"+a+"</div";let n=e.createTHead().insertRow();for(let e of t){let t=document.createElement("th"),a=document.createTextNode(e);t.appendChild(a),n.appendChild(t)}}function generateTable(e,t){for(let n of t){let t=e.insertRow();for(a in n){var a=n[a];let e=t.insertCell();isInt(a)&&(a=a.toLocaleString(document.documentElement.lang+"-CA"));let r=document.createTextNode(a);e.appendChild(r)}}}const jsonPieGenerate=e=>{$("#chart").remove(),$("#chart-canvas").append("<canvas id='chart'></canvas>"),val=e,cnt=val.length;var t=[{data:val,backgroundColor:poolColors(cnt)}],a={plugins:{beforeInit:(e,t)=>{Chart.Legend.afterFit=function(){this.height=this.height+50}},datalabels:{formatter:(e,t)=>{let a=0;t.chart.data.datasets[0].data.map(e=>{a+=e});let n=parseFloat((100*e/a).toFixed(1)).toLocaleString(document.documentElement.lang+"-CA");if("fr"==document.documentElement.lang)var r=" %";else r="%";return n+r},backgroundColor:function(e){return e.dataset.backgroundColor},borderRadius:4,color:"white",font:{weight:"bold"}}},tooltips:{enabled:!1},legend:{position:"bottom",minSize:{height:500}},layout:{padding:{top:25}}},n=document.getElementById("chart").getContext("2d"),r=new Chart(n,{type:"pie",data:{datasets:t,labels:[$.i18n("Desktop"),$.i18n("MobilePhone"),$.i18n("Tablet"),$.i18n("Other")]},options:a});sum=val.reduce(function(e,t){return e+t},0);let l=[];$.each(val,function(e,t){if(val=t,lab=r.data.labels[e],per=parseFloat((100*val/sum).toFixed(2)).toLocaleString(document.documentElement.lang+"-CA"),"fr"==document.documentElement.lang)var a=" %";else a="%";per+=a,val=t.toLocaleString(document.documentElement.lang+"-CA");var n={};n[$.i18n("DeviceType")]=lab,n[$.i18n("Visits")]=val,n[$.i18n("Percent")]=per,l.push(n)});let s=document.querySelector("table#tbl-pltfrm"),o=Object.keys(l[0]);s.innerHTML="",generateTable(s,l),generateTableHead(s,o,$.i18n("Number of visits by devices used")),$("#chart-pltfrms").show(),$("#chrtp").hide()},RANGE=(e,t)=>Array.from(function*(e,t){for(;e<=t;)yield e++}(e,t)),jsonTrendGenerate=(e,t)=>{var a=e.rows[0];if(null!=a){$("#trends").remove(),$("#trends-canvas").append("<canvas id='trends'></canvas>"),arr=a.data,$cnt=arr.length,val=arr.slice(0,$cnt/2),lval=arr.slice($cnt/2,$cnt),$rng=RANGE(1,$cnt/2);const e=t.replace(/^\w/,e=>e.toUpperCase());var n={plugins:{datalabels:{display:!1}},scales:{yAxes:[{scaleLabel:{display:!0,labelString:$.i18n("Numberofvisits")}}],xAxes:[{scaleLabel:{display:!0,labelString:$.i18n(e)+$.i18n("Dayofselecteddaterange")}}]},tooltips:{mode:"index",intersect:!1},hover:{mode:"nearest",intersect:!0},legend:{position:"bottom",labels:{usePointStyle:!0}},layout:{padding:{top:25}}},r=document.getElementById("trends").getContext("2d"),l=new Chart(r,{type:"line",data:{labels:$rng,datasets:[{label:$.i18n("CurrentYear"),data:val,backgroundColor:dynamicColors()},{label:$.i18n("PreviousYear"),data:lval,backgroundColor:dynamicColors()}]},options:n});let o=[];var s=1;$.each(val,function(t,a){vals=val[t],lvals=lval[t],lab=l.data.labels[t],gran=$.i18n(e)+" "+s,s++,diff=((vals-lvals)/lvals*100).toFixed(1),"Infinity"==diff?diff=$.i18n("NotAvailable"):"fr"==document.documentElement.lang?diff=parseFloat(diff).toLocaleString(document.documentElement.lang+"-CA")+" %":diff=parseFloat(diff)+"%",vals=val[t].toLocaleString(document.documentElement.lang+"-CA"),lvals=lval[t].toLocaleString(document.documentElement.lang+"-CA");var n={};n[$.i18n(e)]=gran,n[$.i18n("CurrentYear")]=vals,n[$.i18n("PreviousYear")]=lvals,n[$.i18n("Difference")]=diff,o.push(n)});let i=document.querySelector("table#tbl-trnds"),c=Object.keys(o[0]);i.innerHTML="",generateTable(i,o),generateTableHead(i,c,$.i18n("Visitstrendbycurrentyearandpreviousyear")),$("#chart-trnds").show(),$("#chrtt").hide()}else $("#chart-trnds").hide(),$("#chrtt").show()},jsonUv=e=>{var t=e.rows[0],a=$("#uv"),n=$("#rap"),r=parseInt($("#numDays").html()),l=parseInt($("#numWeeks").html());if(a.html(""),n.html(""),null!=t)return uv=t.data[0],uvDays=parseInt(uv/r).toLocaleString(document.documentElement.lang+"-CA"),uv=parseInt(uv).toLocaleString(document.documentElement.lang+"-CA"),a.prepend("<span class='h1'>"+uvDays+"</span> <strong>"+$.i18n("averageperday")+"</strong></br><span class='small'>"+uv+" "+$.i18n("total")+"</span>"),rap=t.data[1],rapWeeks=parseInt(rap/l).toLocaleString(document.documentElement.lang+"-CA"),rap=parseInt(rap).toLocaleString(document.documentElement.lang+"-CA"),n.prepend("<span class='h1'>"+rapWeeks+"</span> <strong>"+$.i18n("averageperweek")+"</strong></br><span class='small'>"+rap+" "+$.i18n("total")+"</span>"),itemid=t.itemId,itemid;a.html("0"),n.html("0")},jsonFile=e=>{},getPageTitle=e=>Object.keys(e).map((t,a)=>{var n=e[t].value;if(-1!==(n=-1!==n.indexOf("https://")?n:"https://"+n).indexOf("canada.ca")){let e=new Request(n,{method:"GET"});return fetch(e).then(e=>e.text()).then(e=>$(e).find("h1:first").text()).catch(console.error.bind(console))}}),getPageH1=e=>{if(-1!==(e=-1!==e.indexOf("https://")?e:"https://"+e).indexOf("canada.ca")){let t=new Request(e,{method:"GET"});return fetch(t).then(e=>e.text()).then(e=>$(e).find("h1:first").text()).catch(console.error.bind(console))}},getPage=e=>{if(-1!==(e=-1!==e.indexOf("https://")?e:"https://"+e).indexOf("canada.ca")){let t=new Request(e,{method:"GET"});return fetch(t).then(e=>e.text()).then(e=>({html:e})).catch(console.error.bind(console))}},jsonPrevious=e=>{var t=e.rows[0],a=$("#pp");null!=t?(arrayP=e.rows,a.html(""),a.append($("<ul>")),a=$("#pp ul"),Promise.all(getPageTitle(arrayP)).then(e=>{$.each(arrayP,function(t,n){url=n.value,term=null==e[t]?url:e[t],val=n.data[0],f="blank page url"==url?$.i18n("Directtraffic/Bookmark"):"<a href='"+url+"'>"+term+"</a>",a.append($("<li>").append(f))})}).catch(console.error.bind(console))):a.html($.i18n("Nodata"))},jsonForward=e=>{},jsonSnum=(e,t)=>{var a=e.rows[0],n=$("#snum"),r=parseInt($("#numDays").html());if(n.html(""),null!=a)return snum=a.data[t],snumDays=parseInt(snum/r).toLocaleString(document.documentElement.lang+"-CA"),snum=parseInt(snum).toLocaleString(document.documentElement.lang+"-CA"),n.prepend("<span class='h1'>"+snumDays+"</span> <strong>"+$.i18n("averageperday")+"</strong></br><span class='small'>"+snum+" "+$.i18n("total")+"</span>"),itemid=a.itemId,itemid;n.html("No data")},jsonSearches=(e,t)=>{if(null!=e.rows[0]){var a=e.rows,n=[];$.each(a,function(e,a){search=a.value,searchurl="https://www.canada.ca/en/revenue-agency/search.html?cdn=canada&st=s&num=10&langs=en&st1rt=1&s5bm3ts21rch=x&q="+search+"&_charset_=UTF-8&wb-srch-sub=",searchv=a.data[t],"0"!=searchv&&n.push({Term:search,url:searchurl,Clicks:searchv})}),0!=n.length&&(n.sort((e,t)=>t.Clicks-e.Clicks),$.each(n,function(e,t){$search="#search"+e,$searchhtml=$($search),$searchhtml.html(""),$($search).append("<a href='"+t.url+"'>"+t.Term+"</a>").append(" ("+t.Clicks.toLocaleString(document.documentElement.lang+"-CA")+")")}))}else a=new Array(4),$search=$("#search0"),$search.html($.i18n("Nodata")),$.each(a,function(e,t){0!=e&&($search=$("#search"+e),$search.html(""))})},jsonDownload=e=>{var t=e.rows[0];if($dwnld=$("#dwnld"),null!=t){var a=e.rows;$dwnld.html(""),$dwnld.append($("<ul class='colcount-sm-2'>")),$dwnld=$("#dwnld ul");var n=[],r=[];$.each(a,function(e,t){var a=t.value,l=t.data[0];a.includes(".pdf")?(a.includes("-lp")&&(type="Large Print"),a.includes("-fill-")?type="Fillable":type="Flat"):a.includes(".txt")?type="E-Text":type=a.split("/").pop().split(".").pop().toUpperCase();var s=a.split("/").pop();n.push(a),r.push({term:a,clicks:l,type:type,filename:s})}),$url="https://www.canada.ca/en/revenue-agency/services/forms-publications/td1-personal-tax-credits-returns/td1-forms-pay-received-on-january-1-later/td1.html";var l=$url.split("/").pop().split(".").shift(),s=n.findReg("^https://www.canada.ca/.*?"+l+"-(fill-)*([0-9]{1,2})"),o=$("#np");o.html(""),o.append($("<ul class='colcount-sm-2>")),o=$("#np ul"),$.each(r,function(e,t){$.each(s,function(e,a){t.term==a&&o.append($("<li>").append(t.filename+" ("+t.clicks.toLocaleString(document.documentElement.lang+"-CA")+") [<em>"+t.type+"</em>]"))})})}else $dwnld.html($.i18n("Nodata"))},jsonOutbound=(e,t)=>{var a=e.rows[0];if($outbnd=$("#outbnd"),null!=a){var n=e.rows;$outbnd.html(""),$outbnd.append($("<ul class='colcount-sm-2'>")),$outbnd=$("#outbnd ul"),Promise.all([getPage(t)]).then(e=>{e[0].html,$.each(n,function(e,t){text=t.value,outbnd=t.data[0],$outbnd.append($("<li>").append(text+" ("+outbnd.toLocaleString(document.documentElement.lang+"-CA")+")"))})})}else $outbnd.html($.i18n("Nodata"))},jsonRT=(e,t)=>{var a=e.rows[0];val="#reft",title="Referring types";var n=$(val);if(null!=a){var r=e.rows;n.html("");var l=[];if($.each(r,function(e,a){term=a.value,clicks=a.data[t];var n={};n[$.i18n("Type")]=$.i18n(term.replace(/\s/g,"")),n[$.i18n("Visits")]=clicks,l.push(n)}),0!=l.length){l.sort((e,t)=>t.Visits-e.Visits);let e=document.querySelector("table#reft"),t=Object.keys(l[0]);generateTable(e,l),generateTableHead(e,t,title),$(val).trigger("wb-init.wb-tables")}else n.html($.i18n("Nodata"))}else n.html($.i18n("Nodata"))},jsonSearch=(e,t,a,n)=>{var r=e.rows[0],l=$(t);if(null!=r){var s=e.rows;l.html("");var o=[];if($.each(s,function(e,t){if(term=t.value,clicks=t.data[n],"(Low Traffic)"!=term&&"Unspecified"!=term&&0!=clicks){var a={};a[$.i18n("Term")]=term,a[$.i18n("Clicks")]=clicks,o.push(a)}}),0!=o.length){o.sort((e,t)=>t.Clicks-e.Clicks);let e=document.querySelector("table"+t),n=Object.keys(o[0]);generateTable(e,o),generateTableHead(e,n,a)}else l.html($.i18n("Nodata"))}else l.html($.i18n("Nodata"))},jsonSearchesAll=(e,t)=>{var a=$.i18n("Searches to page");jsonSearch(e,"#srchA",a,t),$("#srchA").trigger("wb-init.wb-tables")},jsonSearchesInstitution=e=>{var t=$.i18n("Contextualsearchestopage");jsonSearch(e,"#srchI",t),$("#srchI").trigger("wb-init.wb-tables")},jsonSearchesGlobal=e=>{var t=$.i18n("Globalsearchestopage");jsonSearch(e,"#srchG",t),$("#srchG").trigger("wb-init.wb-tables")};function sortByCol(e){return e.sort((e,t)=>t.Clicks-e.Clicks)}const jsonAM=(e,t)=>{var a=e.rows[0],n=$("#np");if(null!=a){var r=e.rows;n.html("");var l=[];if($.each(r,function(e,a){if(term=a.value,val=a.data[t],"(Low Traffic)"!=term&&"Unspecified"!=term&&"0"!=val){var n={};n[$.i18n("LinkText")]=term,n[$.i18n("Clicks")]=val,l.push(n)}}),0!=l.length){l.sort((e,t)=>t.Clicks-e.Clicks);let e=document.querySelector("table#np"),t=Object.keys(l[0]);generateTable(e,l),generateTableHead(e,t,$.i18n("OutboundClicksonPage"))}else n.html($.i18n("Nodata"))}else n.html($.i18n("Nodata"))},jsonMetrics=(e,t)=>{var a=e.summaryData.filteredTotals,n=$("#uv"),r=$("#rap"),l=parseInt($("#numDays").html()),s=parseFloat($("#numWeeks").html()),o=9+parseInt(t),i=36+parseInt(t),c=12+parseInt(t),d=15+parseInt(t),u=18+parseInt(t),m=21+parseInt(t);if(n.html(""),r.html(""),null!=a){uv=parseInt(a[o]),uvDays=parseInt(uv/l).toLocaleString(document.documentElement.lang+"-CA"),uv=parseInt(uv).toLocaleString(document.documentElement.lang+"-CA"),n.prepend("<span class='h1'>"+uvDays+"</span> <strong>"+$.i18n("averageperday")+"</strong></br><span class='small'>"+uv+" "+$.i18n("total")+"</span>"),rap=parseInt(a[i]),2==t&&(s=1),rapWeeks=parseInt(rap/s).toLocaleString(document.documentElement.lang+"-CA"),rap=parseInt(rap).toLocaleString(document.documentElement.lang+"-CA"),r.prepend("<span class='h1'>"+rapWeeks+"</span> <strong>"+$.i18n("averageperweek")+"</strong></br><span class='small'>"+rap+" "+$.i18n("total")+"</span>"),desktop=parseInt(a[c]),mobile=parseInt(a[d]),tablet=parseInt(a[u]),other=parseInt(a[m]);var h=[desktop,mobile,tablet,other];jsonPieGenerate(h)}else n.html("0"),r.html("0")};function fetchWithTimeout(e,t,a,n){const r=new Promise(e=>{setTimeout(e,a,{timeout:!0})});return Promise.race([fetch(e,t),r]).then(e=>(e.timeout&&n(),e))}const apiCall=(e,t,a,n,r)=>a.map(a=>{url="fle"==a?"php/file.php":"php/process.php",post={dates:e,url:t,type:a,oUrl:n};let l=new Request(url,{method:"POST",body:JSON.stringify(post)});return fetch(l).then(e=>e.json()).then(e=>{switch(a){case"fle":return;case"snmAll":return jsonSnum(e,r);case"srchLeftAll":return jsonSearches(e,r);case"trnd":return jsonTrendGenerate(e,"day");case"prvs":return jsonPrevious(e);case"frwrd":return;case"srchAll":return jsonSearchesAll(e,r);case"activityMap":return jsonAM(e,r);case"metrics":return jsonMetrics(e,r);case"refType":return jsonRT(e,r)}}).catch(function(e){console.log(a),console.log(e.message),console.log(e.stack)})}),apiCall2=(e,t,a,n,r)=>a.map(a=>{url="php/process-new.php",post={dates:e,url:t,oUrl:n,lang:r};let l=new Request(url,{method:"POST",body:JSON.stringify(post)});return fetch(l).then(e=>e.json()).then(e=>($("#urlStatic").html("https://"+e.url),e.url)).catch(function(e){console.log(a),console.log(e.message),console.log(e.stack)})});$("#urlform").submit(function(e){e.preventDefault(),url=$("#urlval").val(),$("#urlStatic").html(url),start=$(".dr-date-start").html(),end=moment(),mainQueue(url,start,end,0)}),$("a#h2href").click(function(){event.preventDefault(),url=$("#urlStatic").html(),start=$(".dr-date-start").html(),end=moment(),mainQueue(url,start,end,1)});const removeQueryString=e=>{var t=document.createElement("a");return t.href=e,t.search="",$href=t.href,/Edge/.test(navigator.userAgent)&&($href=$href.substring(0,$href.length-1)),$href},mainQueue=(e,t,a,n)=>{if(e=removeQueryString(e),$("#canvas-container").addClass("hidden"),$("#notfound").addClass("hidden"),$("#loading").removeClass("hidden"),$success=0,console.log(e),"www."==(e="https://"==e.substring(0,8)?e.substring(8,e.length):e).substring(0,4)&&".html"==e.substring(e.length-5,e.length)){if(oUrl="https://"+e,e=e.length>255?e.substring(e.length-255,e.length):e,moment.locale("en"),$dd=$("input[name=dd-value").val(),$dd||($dd=1),t&&a)vStart=t,r=a;else{t=moment();var r=moment().format("dddd MMMM DD, YYYY");0==$dd?vStart=moment(t).subtract(30,"days").format("dddd MMMM DD, YYYY"):1==$dd?vStart=moment(t).subtract(7,"days").format("dddd MMMM DD, YYYY"):2==$dd&&(vStart=moment(t).subtract(1,"days").format("dddd MMMM DD, YYYY"))}var l=[t=moment(vStart).format("YYYY-MM-DDTHH:mm:ss.SSS"),a=moment(r).format("YYYY-MM-DDTHH:mm:ss.SSS")],s=moment(vStart),o=moment(r);s.locale(document.documentElement.lang),o.locale(document.documentElement.lang);var i=s.format("dddd MMMM DD, YYYY"),c=o.subtract(1,"days").format("dddd MMMM DD, YYYY");$("#fromdaterange").html("<strong>"+i+"</strong>"),$("#todaterange").html("<strong>"+c+"</strong>"),t=moment(vStart),a=moment(r),dDay=a.diff(t,"days"),dWeek=a.diff(t,"week",!0),$("#numDays").html(dDay),$("#numWeeks").html(dWeek),$("#searchBttn").prop("disabled",!0);var d=["dbGet"],u=["trnd","fle","prvs","srchAll","snmAll","srchLeftAll","activityMap","refType","metrics"];const m=()=>(e=$("#urlStatic").html(),oUrl=$("#urlStatic").html(),Promise.all(apiCall(l,e,u,oUrl,$dd))),h=e=>Promise.all([getPageH1(e)]);(()=>Promise.all(apiCall2(l,e,d,oUrl,n)))().then(e=>h(e)).then(e=>{$("#h2title").html(e)}).then(()=>m()).then(()=>{$("#loading").addClass("hidden"),$("#notfound").addClass("hidden"),$("#canvas-container").removeClass("hidden"),$("#searchBttn").prop("disabled",!1)}).catch(console.error.bind(console)),$success=1}$success||($("#loading").addClass("hidden"),$("#notfound").removeClass("hidden"))};
\ No newline at end of file
+function getQueryParams(){let e={},t=window.location.search;return(t=t.substr(1)).split("&").forEach(function(t){let a=t.split("=");e[a[0]]=decodeURIComponent(a[1])}),e}function getSpecifiedParam(e,t){for(let[a,n]of Object.entries(e))if(a===t)return n}$(document).on("wb-ready.wb",function(){$.i18n().load({en:"./assets/js/i18n/en.json",fr:"./assets/js/i18n/fr.json"}).done(function(){$("html").i18n(),$(".app-name").text($.i18n("app-title")),$("#allspan").removeClass("hidden")});let e=getQueryParams();var t,a,n;t=getSpecifiedParam(e,"url"),a=getSpecifiedParam(e,"start"),n=getSpecifiedParam(e,"end"),a&&n&&(a=moment(a).format("MMMM D, YYYY"),n=moment(n).format("MMMM D, YYYY"),$(".dr-date-start").html(a),$(".dr-date-end").html(n)),t&&($("#urlval").val(t),mainQueue(t,a,n,0))});const kFormatter=e=>Math.abs(e)>999?Math.sign(e)*(Math.abs(e)/1e3).toFixed(1)+"k":Math.sign(e)*Math.abs(e),dynamicColors=()=>{return"rgba("+Math.floor(200*Math.random())+","+Math.floor(200*Math.random())+","+Math.floor(200*Math.random())+", 0.7)"},poolColors=e=>{var t=[];for(i=0;i<e;i++)t.push(dynamicColors());return t};function isInt(e){return!isNaN(e)&&parseInt(Number(e))==e&&!isNaN(parseInt(e,10))}function generateTableHead(e,t,a){e.createCaption().innerHTML="<div class='wb-inv'>"+a+"</div";let n=e.createTHead().insertRow();for(let e of t){let t=document.createElement("th"),a=document.createTextNode(e);t.appendChild(a),n.appendChild(t)}}function generateTable(e,t){for(let n of t){let t=e.insertRow();for(a in n){var a=n[a];let e=t.insertCell();isInt(a)&&(a=a.toLocaleString(document.documentElement.lang+"-CA"));let r=document.createTextNode(a);e.appendChild(r)}}}const jsonPieGenerate=e=>{$("#chart").remove(),$("#chart-canvas").append("<canvas id='chart'></canvas>"),val=e,cnt=val.length;var t=[{data:val,backgroundColor:poolColors(cnt)}],a={plugins:{beforeInit:(e,t)=>{Chart.Legend.afterFit=function(){this.height=this.height+50}},datalabels:{formatter:(e,t)=>{let a=0;t.chart.data.datasets[0].data.map(e=>{a+=e});let n=parseFloat((100*e/a).toFixed(1)).toLocaleString(document.documentElement.lang+"-CA");if("fr"==document.documentElement.lang)var r=" %";else r="%";return n+r},backgroundColor:function(e){return e.dataset.backgroundColor},borderRadius:4,color:"white",font:{weight:"bold"}}},tooltips:{enabled:!1},legend:{position:"bottom",minSize:{height:500}},layout:{padding:{top:25}}},n=document.getElementById("chart").getContext("2d"),r=new Chart(n,{type:"pie",data:{datasets:t,labels:[$.i18n("Desktop"),$.i18n("MobilePhone"),$.i18n("Tablet"),$.i18n("Other")]},options:a});sum=val.reduce(function(e,t){return e+t},0);let l=[];$.each(val,function(e,t){if(val=t,lab=r.data.labels[e],per=parseFloat((100*val/sum).toFixed(2)).toLocaleString(document.documentElement.lang+"-CA"),"fr"==document.documentElement.lang)var a=" %";else a="%";per+=a,val=t.toLocaleString(document.documentElement.lang+"-CA");var n={};n[$.i18n("DeviceType")]=lab,n[$.i18n("Visits")]=val,n[$.i18n("Percent")]=per,l.push(n)});let s=document.querySelector("table#tbl-pltfrm"),o=Object.keys(l[0]);s.innerHTML="",generateTable(s,l),generateTableHead(s,o,$.i18n("Number of visits by devices used")),$("#chart-pltfrms").show(),$("#chrtp").hide()},RANGE=(e,t)=>Array.from(function*(e,t){for(;e<=t;)yield e++}(e,t)),jsonTrendGenerate=(e,t)=>{var a=e.rows[0];if(null!=a){$("#trends").remove(),$("#trends-canvas").append("<canvas id='trends'></canvas>"),arr=a.data,$cnt=arr.length,val=arr.slice(0,$cnt/2),lval=arr.slice($cnt/2,$cnt),$rng=RANGE(1,$cnt/2);const e=t.replace(/^\w/,e=>e.toUpperCase());var n={plugins:{datalabels:{display:!1}},scales:{yAxes:[{scaleLabel:{display:!0,labelString:$.i18n("Numberofvisits")}}],xAxes:[{scaleLabel:{display:!0,labelString:$.i18n(e)+$.i18n("Dayofselecteddaterange")}}]},tooltips:{mode:"index",intersect:!1},hover:{mode:"nearest",intersect:!0},legend:{position:"bottom",labels:{usePointStyle:!0}},layout:{padding:{top:25}}},r=document.getElementById("trends").getContext("2d"),l=new Chart(r,{type:"line",data:{labels:$rng,datasets:[{label:$.i18n("CurrentYear"),data:val,backgroundColor:dynamicColors()},{label:$.i18n("PreviousYear"),data:lval,backgroundColor:dynamicColors()}]},options:n});let o=[];var s=1;$.each(val,function(t,a){vals=val[t],lvals=lval[t],lab=l.data.labels[t],gran=$.i18n(e)+" "+s,s++,diff=((vals-lvals)/lvals*100).toFixed(1),"Infinity"==diff?diff=$.i18n("NotAvailable"):"fr"==document.documentElement.lang?diff=parseFloat(diff).toLocaleString(document.documentElement.lang+"-CA")+" %":diff=parseFloat(diff)+"%",vals=val[t].toLocaleString(document.documentElement.lang+"-CA"),lvals=lval[t].toLocaleString(document.documentElement.lang+"-CA");var n={};n[$.i18n(e)]=gran,n[$.i18n("CurrentYear")]=vals,n[$.i18n("PreviousYear")]=lvals,n[$.i18n("Difference")]=diff,o.push(n)});let i=document.querySelector("table#tbl-trnds"),c=Object.keys(o[0]);i.innerHTML="",generateTable(i,o),generateTableHead(i,c,$.i18n("Visitstrendbycurrentyearandpreviousyear")),$("#chart-trnds").show(),$("#chrtt").hide()}else $("#chart-trnds").hide(),$("#chrtt").show()},jsonUv=e=>{var t=e.rows[0],a=$("#uv"),n=$("#rap"),r=parseInt($("#numDays").html()),l=parseInt($("#numWeeks").html());if(a.html(""),n.html(""),null!=t)return uv=t.data[0],uvDays=parseInt(uv/r).toLocaleString(document.documentElement.lang+"-CA"),uv=parseInt(uv).toLocaleString(document.documentElement.lang+"-CA"),a.prepend("<span class='h1'>"+uvDays+"</span> <strong>"+$.i18n("averageperday")+"</strong></br><span class='small'>"+uv+" "+$.i18n("total")+"</span>"),rap=t.data[1],rapWeeks=parseInt(rap/l).toLocaleString(document.documentElement.lang+"-CA"),rap=parseInt(rap).toLocaleString(document.documentElement.lang+"-CA"),n.prepend("<span class='h1'>"+rapWeeks+"</span> <strong>"+$.i18n("averageperweek")+"</strong></br><span class='small'>"+rap+" "+$.i18n("total")+"</span>"),itemid=t.itemId,itemid;a.html("0"),n.html("0")},jsonFile=e=>{},getPageTitle=e=>Object.keys(e).map((t,a)=>{var n=e[t].value;if(-1!==(n=-1!==n.indexOf("https://")?n:"https://"+n).indexOf("canada.ca")){let e=new Request(n,{method:"GET"});return fetch(e).then(e=>e.text()).then(e=>$(e).find("h1:first").text()).catch(console.error.bind(console))}}),getPageH1=e=>{if(-1!==(e=-1!==e.indexOf("https://")?e:"https://"+e).indexOf("canada.ca")){let t=new Request(e,{method:"GET"});return fetch(t).then(e=>e.text()).then(e=>$(e).find("h1:first").text()).catch(console.error.bind(console))}},getPage=e=>{if(-1!==(e=-1!==e.indexOf("https://")?e:"https://"+e).indexOf("canada.ca")){let t=new Request(e,{method:"GET"});return fetch(t).then(e=>e.text()).then(e=>{return{html:e}}).catch(console.error.bind(console))}},jsonPrevious=e=>{var t=e.rows[0],a=$("#pp");null!=t?(arrayP=e.rows,a.html(""),a.append($("<ul>")),a=$("#pp ul"),Promise.all(getPageTitle(arrayP)).then(e=>{$.each(arrayP,function(t,n){url=n.value,term=null==e[t]?url:e[t],val=n.data[0],f="blank page url"==url?$.i18n("Directtraffic/Bookmark"):"<a href='"+url+"'>"+term+"</a>",a.append($("<li>").append(f))})}).catch(console.error.bind(console))):a.html($.i18n("Nodata"))},jsonForward=e=>{},jsonSnum=(e,t)=>{var a=e.rows[0],n=$("#snum"),r=parseInt($("#numDays").html());if(n.html(""),null!=a)return snum=a.data[t],snumDays=parseInt(snum/r).toLocaleString(document.documentElement.lang+"-CA"),snum=parseInt(snum).toLocaleString(document.documentElement.lang+"-CA"),n.prepend("<span class='h1'>"+snumDays+"</span> <strong>"+$.i18n("averageperday")+"</strong></br><span class='small'>"+snum+" "+$.i18n("total")+"</span>"),itemid=a.itemId,itemid;n.html("No data")},jsonSearches=(e,t)=>{if(null!=e.rows[0]){var a=e.rows,n=[];$.each(a,function(e,a){search=a.value,searchurl="https://www.canada.ca/en/revenue-agency/search.html?cdn=canada&st=s&num=10&langs=en&st1rt=1&s5bm3ts21rch=x&q="+search+"&_charset_=UTF-8&wb-srch-sub=",searchv=a.data[t],"0"!=searchv&&n.push({Term:search,url:searchurl,Clicks:searchv})}),0!=n.length&&(n.sort((e,t)=>t.Clicks-e.Clicks),$.each(n,function(e,t){$search="#search"+e,$searchhtml=$($search),$searchhtml.html(""),$($search).append("<a href='"+t.url+"'>"+t.Term+"</a>").append(" ("+t.Clicks.toLocaleString(document.documentElement.lang+"-CA")+")")}))}else{a=new Array(4);$search=$("#search0"),$search.html($.i18n("Nodata")),$.each(a,function(e,t){0!=e&&($search=$("#search"+e),$search.html(""))})}},jsonDownload=e=>{var t=e.rows[0];if($dwnld=$("#dwnld"),null!=t){var a=e.rows;$dwnld.html(""),$dwnld.append($("<ul class='colcount-sm-2'>")),$dwnld=$("#dwnld ul");var n=[],r=[];$.each(a,function(e,t){var a=t.value,l=t.data[0];a.includes(".pdf")?(a.includes("-lp")&&(type="Large Print"),a.includes("-fill-")?type="Fillable":type="Flat"):a.includes(".txt")?type="E-Text":type=a.split("/").pop().split(".").pop().toUpperCase();var s=a.split("/").pop();n.push(a),r.push({term:a,clicks:l,type:type,filename:s})}),$url="https://www.canada.ca/en/revenue-agency/services/forms-publications/td1-personal-tax-credits-returns/td1-forms-pay-received-on-january-1-later/td1.html";var l=$url.split("/").pop().split(".").shift(),s=n.findReg("^https://www.canada.ca/.*?"+l+"-(fill-)*([0-9]{1,2})"),o=$("#np");o.html(""),o.append($("<ul class='colcount-sm-2>")),o=$("#np ul"),$.each(r,function(e,t){$.each(s,function(e,a){t.term==a&&o.append($("<li>").append(t.filename+" ("+t.clicks.toLocaleString(document.documentElement.lang+"-CA")+") [<em>"+t.type+"</em>]"))})})}else $dwnld.html($.i18n("Nodata"))},jsonOutbound=(e,t)=>{var a=e.rows[0];if($outbnd=$("#outbnd"),null!=a){var n=e.rows;$outbnd.html(""),$outbnd.append($("<ul class='colcount-sm-2'>")),$outbnd=$("#outbnd ul"),Promise.all([getPage(t)]).then(e=>{e[0].html;$.each(n,function(e,t){text=t.value,outbnd=t.data[0],$outbnd.append($("<li>").append(text+" ("+outbnd.toLocaleString(document.documentElement.lang+"-CA")+")"))})})}else $outbnd.html($.i18n("Nodata"))},jsonRT=(e,t)=>{var a=e.rows[0];val="#reft",title="Referring types";var n=$(val);if(null!=a){var r=e.rows;n.html("");var l=[];if($.each(r,function(e,a){term=a.value,clicks=a.data[t];var n={};n[$.i18n("Type")]=$.i18n(term.replace(/\s/g,"")),n[$.i18n("Visits")]=clicks,l.push(n)}),0!=l.length){l.sort((e,t)=>t.Visits-e.Visits);let e=document.querySelector("table#reft"),t=Object.keys(l[0]);generateTable(e,l),generateTableHead(e,t,title),$(val).trigger("wb-init.wb-tables")}else n.html($.i18n("Nodata"))}else n.html($.i18n("Nodata"))},jsonSearch=(e,t,a,n)=>{var r=e.rows[0],l=$(t);if(null!=r){var s=e.rows;l.html("");var o=[];if($.each(s,function(e,t){if(term=t.value,clicks=t.data[n],"(Low Traffic)"!=term&&"Unspecified"!=term&&0!=clicks){var a={};a[$.i18n("Term")]=term,a[$.i18n("Clicks")]=clicks,o.push(a)}}),0!=o.length){o.sort((e,t)=>t.Clicks-e.Clicks);let e=document.querySelector("table"+t),n=Object.keys(o[0]);generateTable(e,o),generateTableHead(e,n,a)}else l.html($.i18n("Nodata"))}else l.html($.i18n("Nodata"))},jsonSearchesAll=(e,t)=>{var a=$.i18n("Searches to page");jsonSearch(e,"#srchA",a,t),$("#srchA").trigger("wb-init.wb-tables")},jsonSearchesInstitution=e=>{var t=$.i18n("Contextualsearchestopage");jsonSearch(e,"#srchI",t),$("#srchI").trigger("wb-init.wb-tables")},jsonSearchesGlobal=e=>{var t=$.i18n("Globalsearchestopage");jsonSearch(e,"#srchG",t),$("#srchG").trigger("wb-init.wb-tables")};function sortByCol(e){return e.sort((e,t)=>t.Clicks-e.Clicks)}const jsonAM=(e,t)=>{var a=e.rows[0],n=$("#np");if(null!=a){var r=e.rows;n.html("");var l=[];if($.each(r,function(e,a){if(term=a.value,val=a.data[t],"(Low Traffic)"!=term&&"Unspecified"!=term&&"0"!=val){var n={};n[$.i18n("LinkText")]=term,n[$.i18n("Clicks")]=val,l.push(n)}}),0!=l.length){l.sort((e,t)=>t.Clicks-e.Clicks);let e=document.querySelector("table#np"),t=Object.keys(l[0]);generateTable(e,l),generateTableHead(e,t,$.i18n("OutboundClicksonPage"))}else n.html($.i18n("Nodata"))}else n.html($.i18n("Nodata"))},jsonFWYLF=(e,t)=>{var a=e.rows[0],n=$("#fwylfReason");if(null!=a){var r=e.rows;n.html("");var l=[];if($.each(r,function(e,a){term=a.value,val=a.data[t];var n={};n[$.i18n("Reason")]=term,n[$.i18n("Clicks")]=val,l.push(n)}),0!=l.length){l.sort((e,t)=>t.NumSelected-e.NumSelected);let e=document.querySelector("table#fwylfReason"),t=Object.keys(l[0]);generateTable(e,l),generateTableHead(e,t,$.i18n("NoClicks"))}else n.html($.i18n("Nodata"))}else n.html($.i18n("Nodata"))},jsonMetrics=(e,t)=>{var a=e.summaryData.filteredTotals,n=$("#uv"),r=$("#rap"),l=parseInt($("#numDays").html()),s=parseFloat($("#numWeeks").html()),o=9+parseInt(t),i=36+parseInt(t),c=12+parseInt(t),d=15+parseInt(t),u=18+parseInt(t),m=21+parseInt(t),h=45+parseInt(t),p=(parseInt(t),51+parseInt(t)),f=54+parseInt(t);if(n.html(""),r.html(""),null!=a){uv=parseInt(a[o]),uvDays=parseInt(uv/l).toLocaleString(document.documentElement.lang+"-CA"),uv=parseInt(uv).toLocaleString(document.documentElement.lang+"-CA"),n.prepend("<span class='h1'>"+uvDays+"</span> <strong>"+$.i18n("averageperday")+"</strong></br><span class='small'>"+uv+" "+$.i18n("total")+"</span>"),NaN==parseInt(a[f])||0==parseInt(a[h])?(rap=parseInt(a[i]),2==t&&(s=1),rapWeeks=parseInt(rap/s).toLocaleString(document.documentElement.lang+"-CA"),rap=parseInt(rap).toLocaleString(document.documentElement.lang+"-CA"),r.prepend("<span class='h1'>"+rapWeeks+"</span> <strong>"+$.i18n("averageperweek")+"</strong></br><span class='small'>"+rap+" "+$.i18n("total")+"</span>"),$("#fwylfCont").html("")):($("#fwylfYes").html(a[p]),$("#fwylfNo").html(a[h]),$("#rapCont").html("")),desktop=parseInt(a[c]),mobile=parseInt(a[d]),tablet=parseInt(a[u]),other=parseInt(a[m]);var g=[desktop,mobile,tablet,other];jsonPieGenerate(g)}else n.html("0"),r.html("0")};function fetchWithTimeout(e,t,a,n){const r=new Promise(e=>{setTimeout(e,a,{timeout:!0})});return Promise.race([fetch(e,t),r]).then(e=>(e.timeout&&n(),e))}const apiCall=(e,t,a,n,r)=>a.map(a=>{url="fle"==a?"php/file.php":"php/process.php",post={dates:e,url:t,type:a,oUrl:n};let l=new Request(url,{method:"POST",body:JSON.stringify(post)});return fetch(l).then(e=>e.json()).then(e=>{switch(a){case"fle":return;case"snmAll":return jsonSnum(e,r);case"srchLeftAll":return jsonSearches(e,r);case"trnd":return jsonTrendGenerate(e,"day");case"prvs":return jsonPrevious(e);case"frwrd":return;case"srchAll":return jsonSearchesAll(e,r);case"activityMap":return jsonAM(e,r);case"metrics":return jsonMetrics(e,r);case"refType":return jsonRT(e,r);case"fwylf":return jsonFWYLF(e,r)}}).catch(function(e){console.log(a),console.log(e.message),console.log(e.stack)})}),apiCall2=(e,t,a,n,r)=>a.map(a=>{url="php/process-new.php",post={dates:e,url:t,oUrl:n,lang:r};let l=new Request(url,{method:"POST",body:JSON.stringify(post)});return fetch(l).then(e=>e.json()).then(e=>($("#urlStatic").html("https://"+e.url),e.url)).catch(function(e){console.log(a),console.log(e.message),console.log(e.stack)})});$("#urlform").submit(function(e){e.preventDefault(),url=$("#urlval").val(),$("#urlStatic").html(url),start=$(".dr-date-start").html(),end=moment(),mainQueue(url,start,end,0)}),$("a#h2href").click(function(){event.preventDefault(),url=$("#urlStatic").html(),start=$(".dr-date-start").html(),end=moment(),mainQueue(url,start,end,1)});const removeQueryString=e=>{var t=document.createElement("a");return t.href=e,t.search="",$href=t.href,/Edge/.test(navigator.userAgent)&&($href=$href.substring(0,$href.length-1)),$href},mainQueue=(e,t,a,n)=>{if(e=removeQueryString(e),$("#canvas-container").addClass("hidden"),$("#notfound").addClass("hidden"),$("#loading").removeClass("hidden"),$success=0,console.log(e),"www."==(e="https://"==e.substring(0,8)?e.substring(8,e.length):e).substring(0,4)&&".html"==e.substring(e.length-5,e.length)){if(oUrl="https://"+e,e=e.length>255?e.substring(e.length-255,e.length):e,moment.locale("en"),$dd=$("input[name=dd-value").val(),$dd||($dd=1),t&&a)vStart=t,r=a;else{t=moment();var r=moment().format("dddd MMMM DD, YYYY");0==$dd?vStart=moment(t).subtract(30,"days").format("dddd MMMM DD, YYYY"):1==$dd?vStart=moment(t).subtract(7,"days").format("dddd MMMM DD, YYYY"):2==$dd&&(vStart=moment(t).subtract(1,"days").format("dddd MMMM DD, YYYY"))}var l=[t=moment(vStart).format("YYYY-MM-DDTHH:mm:ss.SSS"),a=moment(r).format("YYYY-MM-DDTHH:mm:ss.SSS")],s=moment(vStart),o=moment(r);s.locale(document.documentElement.lang),o.locale(document.documentElement.lang);var i=s.format("dddd MMMM DD, YYYY"),c=o.subtract(1,"days").format("dddd MMMM DD, YYYY");$("#fromdaterange").html("<strong>"+i+"</strong>"),$("#todaterange").html("<strong>"+c+"</strong>");t=moment(vStart),a=moment(r);dDay=a.diff(t,"days"),dWeek=a.diff(t,"week",!0),$("#numDays").html(dDay),$("#numWeeks").html(dWeek),$("#searchBttn").prop("disabled",!0);var d=["dbGet"],u=["trnd","fle","prvs","srchAll","snmAll","srchLeftAll","activityMap","refType","metrics","fwylf"];const m=()=>(e=$("#urlStatic").html(),oUrl=$("#urlStatic").html(),Promise.all(apiCall(l,e,u,oUrl,$dd))),h=e=>Promise.all([getPageH1(e)]);(()=>Promise.all(apiCall2(l,e,d,oUrl,n)))().then(e=>h(e)).then(e=>{$("#h2title").html(e)}).then(()=>m()).then(()=>{$("#loading").addClass("hidden"),$("#notfound").addClass("hidden"),$("#canvas-container").removeClass("hidden"),$("#searchBttn").prop("disabled",!1)}).catch(console.error.bind(console)),$success=1}$success||($("#loading").addClass("hidden"),$("#notfound").removeClass("hidden"))};
\ No newline at end of file
diff --git a/php/data.php b/php/data.php
index 1e52d910..0a71e433 100644
--- a/php/data.php
+++ b/php/data.php
@@ -25,9 +25,11 @@
     'dwnld' => '{"rsid":"canadalivemain","globalFilters":[{"type":"dateRange","dateRange":"%s/%s"}],"metricContainer":{"metrics":[{"columnId":"0","id":"metrics/event25","sort":"desc","filters":["0"]}],"metricFilters":[{"id":"0","type":"breakdown","dimension":"variables/evar22","itemId":"%s"}]},"dimension":"variables/evar28","settings":{"countRepeatInstances":true,"limit":50,"page":0,"nonesBehavior":"return-nones"},"statistics":{"functions":["col-max","col-min"]}}',
     'outbnd' => '{"rsid":"canadalivemain","globalFilters":[{"type":"dateRange","dateRange":"%s/%s"}],"metricContainer":{"metrics":[{"columnId":"0","id":"metrics/event26","sort":"desc","filters":["0"]}],"metricFilters":[{"id":"0","type":"breakdown","dimension":"variables/evar22","itemId":"%s"}]},"dimension":"variables/evar28","settings":{"countRepeatInstances":true,"limit":50,"page":0,"nonesBehavior":"return-nones"},"statistics":{"functions":["col-max","col-min"]}}',
     'activityMap' => '{"rsid":"canadalivemain","globalFilters":[{"type":"segment","segmentDefinition":{"container":{"func":"container","context":"hits","pred":{"func":"streq","str":"%s","val":{"func":"attr","name":"variables/clickmappage"},"description":"Activity Map Page"}},"func":"segment","version":[1,0,0]}},{"type":"dateRange","dateRange":"2020-05-01T00:00:00.000/2020-06-01T00:00:00.000"}],"metricContainer":{"metrics":[{"columnId":"1","id":"metrics/clickmaplinkinstances","filters":["0"]},{"columnId":"2","id":"metrics/clickmaplinkinstances","filters":["1"]},{"columnId":"3","id":"metrics/clickmaplinkinstances","sort":"desc","filters":["2"]}],"metricFilters":[{"id":"0","type":"dateRange","dateRange":"%s/2020-05-16T00:00:00.000"},{"id":"1","type":"dateRange","dateRange":"%s/2020-05-16T00:00:00.000"},{"id":"2","type":"dateRange","dateRange":"%s/2020-05-16T00:00:00.000"}]},"dimension":"variables/clickmaplink","settings":{"countRepeatInstances":true,"limit":25,"page":0,"nonesBehavior":"return-nones"},"statistics":{"functions":["col-max","col-min"]}}',
-    'metrics' => '{"rsid":"canadalivemain","globalFilters":[{"type":"segment","segmentDefinition":{"container":{"func":"container","context":"hits","pred":{"func":"streq","str":"%s","val":{"func":"attr","name":"variables/evar22"},"description":"Page URL Last 255 Chars (v22)"}},"func":"segment","version":[1,0,0]}},{"type":"dateRange","dateRange":"2020-05-01T00:00:00.000/2020-06-01T00:00:00.000"}],"metricContainer":{"metrics":[{"columnId":"metrics/pageviews:::0","id":"metrics/pageviews","filters":["0"]},{"columnId":"metrics/pageviews:::1","id":"metrics/pageviews","filters":["1"]},{"columnId":"metrics/pageviews:::2","id":"metrics/pageviews","filters":["2"]},{"columnId":"metrics/referrerinstances:::3","id":"metrics/referrerinstances","filters":["3"]},{"columnId":"metrics/referrerinstances:::4","id":"metrics/referrerinstances","filters":["4"]},{"columnId":"metrics/referrerinstances:::5","id":"metrics/referrerinstances","filters":["5"]},{"columnId":"metrics/visits:::6","id":"metrics/visits","filters":["6"]},{"columnId":"metrics/visits:::7","id":"metrics/visits","filters":["7"]},{"columnId":"metrics/visits:::8","id":"metrics/visits","filters":["8"]},{"columnId":"metrics/visitors:::12","id":"metrics/visitors","filters":["9"]},{"columnId":"metrics/visitors:::13","id":"metrics/visitors","filters":["10"]},{"columnId":"metrics/visitors:::14","id":"metrics/visitors","filters":["11"]},{"columnId":"cm300000938_5ec603fa86fd4d00d83b4ae7:::9","id":"cm300000938_5ec603fa86fd4d00d83b4ae7","filters":["12"]},{"columnId":"cm300000938_5ec603fa86fd4d00d83b4ae7:::10","id":"cm300000938_5ec603fa86fd4d00d83b4ae7","filters":["13"]},{"columnId":"cm300000938_5ec603fa86fd4d00d83b4ae7:::11","id":"cm300000938_5ec603fa86fd4d00d83b4ae7","filters":["14"]},{"columnId":"cm300000938_5ec603c086fd4d00d83b4adb:::15","id":"cm300000938_5ec603c086fd4d00d83b4adb","filters":["15"]},{"columnId":"cm300000938_5ec603c086fd4d00d83b4adb:::16","id":"cm300000938_5ec603c086fd4d00d83b4adb","filters":["16"]},{"columnId":"cm300000938_5ec603c086fd4d00d83b4adb:::17","id":"cm300000938_5ec603c086fd4d00d83b4adb","filters":["17"]},{"columnId":"cm300000938_5ec6041b4c546630df64a161:::18","id":"cm300000938_5ec6041b4c546630df64a161","filters":["18"]},{"columnId":"cm300000938_5ec6041b4c546630df64a161:::19","id":"cm300000938_5ec6041b4c546630df64a161","filters":["19"]},{"columnId":"cm300000938_5ec6041b4c546630df64a161:::20","id":"cm300000938_5ec6041b4c546630df64a161","filters":["20"]},{"columnId":"cm300000938_5ec605734c546630df64a183:::21","id":"cm300000938_5ec605734c546630df64a183","filters":["21"]},{"columnId":"cm300000938_5ec605734c546630df64a183:::22","id":"cm300000938_5ec605734c546630df64a183","filters":["22"]},{"columnId":"cm300000938_5ec605734c546630df64a183:::23","id":"cm300000938_5ec605734c546630df64a183","filters":["23"]},{"columnId":"cm300000938_596f57a33f1e926c2080a403:::24","id":"cm300000938_596f57a33f1e926c2080a403","filters":["24"]},{"columnId":"cm300000938_596f57a33f1e926c2080a403:::25","id":"cm300000938_596f57a33f1e926c2080a403","filters":["25"]},{"columnId":"cm300000938_596f57a33f1e926c2080a403:::26","id":"cm300000938_596f57a33f1e926c2080a403","filters":["26"]},{"columnId":"metrics/pageviewspervisit:::27","id":"metrics/pageviewspervisit","filters":["27"]},{"columnId":"metrics/pageviewspervisit:::28","id":"metrics/pageviewspervisit","filters":["28"]},{"columnId":"metrics/pageviewspervisit:::29","id":"metrics/pageviewspervisit","filters":["29"]},{"columnId":"metrics/event75:::30","id":"metrics/event75","filters":["30"]},{"columnId":"metrics/event75:::31","id":"metrics/event75","filters":["31"]},{"columnId":"metrics/event75:::32","id":"metrics/event75","filters":["32"]},{"columnId":"cm_exit_rate_defaultmetric:::33","id":"cm_exit_rate_defaultmetric","filters":["33"]},{"columnId":"cm_exit_rate_defaultmetric:::34","id":"cm_exit_rate_defaultmetric","filters":["34"]},{"columnId":"cm_exit_rate_defaultmetric:::35","id":"cm_exit_rate_defaultmetric","filters":["35"]},{"columnId":"cm_entry_rate_defaultmetric:::36","id":"cm_entry_rate_defaultmetric","filters":["36"]},{"columnId":"cm_entry_rate_defaultmetric:::37","id":"cm_entry_rate_defaultmetric","filters":["37"]},{"columnId":"cm_entry_rate_defaultmetric:::38","id":"cm_entry_rate_defaultmetric","filters":["38"]},{"columnId":"metrics/bouncerate:::39","id":"metrics/bouncerate","filters":["39"]},{"columnId":"metrics/bouncerate:::40","id":"metrics/bouncerate","filters":["40"]},{"columnId":"metrics/bouncerate:::41","id":"metrics/bouncerate","filters":["41"]},{"columnId":"metrics/event50:::42","id":"metrics/event50","filters":["42"]},{"columnId":"metrics/event50:::43","id":"metrics/event50","filters":["43"]},{"columnId":"metrics/event50:::44","id":"metrics/event50","filters":["44"]}],"metricFilters":[{"id":"0","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"1","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"2","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"3","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"4","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"5","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"6","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"7","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"8","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"9","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"10","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"11","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"12","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"13","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"14","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"15","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"16","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"17","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"18","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"19","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"20","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"21","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"22","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"23","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"24","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"25","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"26","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"27","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"28","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"29","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"30","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"31","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"32","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"33","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"34","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"35","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"36","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"37","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"38","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"39","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"40","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"41","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"},{"id":"42","type":"dateRange","dateRange":"*month*/2020-05-16T00:00:00.000"},{"id":"43","type":"dateRange","dateRange":"*week*/2020-05-16T00:00:00.000"},{"id":"44","type":"dateRange","dateRange":"*yesterday*/2020-05-16T00:00:00.000"}]},"settings":{"countRepeatInstances":true},"statistics":{"functions":["col-max","col-min"]}}'
+    'metrics' => '{"rsid":"canadalivemain","globalFilters":[{"type":"segment","segmentDefinition":{"container":{"func":"container","context":"hits","pred":{"func":"streq","str":"%s","val":{"func":"attr","name":"variables\/evar22"},"description":"Page URL Last 255 Chars (v22)"}},"func":"segment","version":[1,0,0]}},{"type":"dateRange","dateRange":"2020-05-01T00:00:00.000\/2020-06-01T00:00:00.000"}],"metricContainer":{"metrics":[{"columnId":"metrics\/pageviews:::0","id":"metrics\/pageviews","filters":["0"]},{"columnId":"metrics\/pageviews:::1","id":"metrics\/pageviews","filters":["1"]},{"columnId":"metrics\/pageviews:::2","id":"metrics\/pageviews","filters":["2"]},{"columnId":"metrics\/referrerinstances:::3","id":"metrics\/referrerinstances","filters":["3"]},{"columnId":"metrics\/referrerinstances:::4","id":"metrics\/referrerinstances","filters":["4"]},{"columnId":"metrics\/referrerinstances:::5","id":"metrics\/referrerinstances","filters":["5"]},{"columnId":"metrics\/visits:::6","id":"metrics\/visits","filters":["6"]},{"columnId":"metrics\/visits:::7","id":"metrics\/visits","filters":["7"]},{"columnId":"metrics\/visits:::8","id":"metrics\/visits","filters":["8"]},{"columnId":"metrics\/visitors:::12","id":"metrics\/visitors","filters":["9"]},{"columnId":"metrics\/visitors:::13","id":"metrics\/visitors","filters":["10"]},{"columnId":"metrics\/visitors:::14","id":"metrics\/visitors","filters":["11"]},{"columnId":"cm300000938_5ec603fa86fd4d00d83b4ae7:::9","id":"cm300000938_5ec603fa86fd4d00d83b4ae7","filters":["12"]},{"columnId":"cm300000938_5ec603fa86fd4d00d83b4ae7:::10","id":"cm300000938_5ec603fa86fd4d00d83b4ae7","filters":["13"]},{"columnId":"cm300000938_5ec603fa86fd4d00d83b4ae7:::11","id":"cm300000938_5ec603fa86fd4d00d83b4ae7","filters":["14"]},{"columnId":"cm300000938_5ec603c086fd4d00d83b4adb:::15","id":"cm300000938_5ec603c086fd4d00d83b4adb","filters":["15"]},{"columnId":"cm300000938_5ec603c086fd4d00d83b4adb:::16","id":"cm300000938_5ec603c086fd4d00d83b4adb","filters":["16"]},{"columnId":"cm300000938_5ec603c086fd4d00d83b4adb:::17","id":"cm300000938_5ec603c086fd4d00d83b4adb","filters":["17"]},{"columnId":"cm300000938_5ec6041b4c546630df64a161:::18","id":"cm300000938_5ec6041b4c546630df64a161","filters":["18"]},{"columnId":"cm300000938_5ec6041b4c546630df64a161:::19","id":"cm300000938_5ec6041b4c546630df64a161","filters":["19"]},{"columnId":"cm300000938_5ec6041b4c546630df64a161:::20","id":"cm300000938_5ec6041b4c546630df64a161","filters":["20"]},{"columnId":"cm300000938_5ec605734c546630df64a183:::21","id":"cm300000938_5ec605734c546630df64a183","filters":["21"]},{"columnId":"cm300000938_5ec605734c546630df64a183:::22","id":"cm300000938_5ec605734c546630df64a183","filters":["22"]},{"columnId":"cm300000938_5ec605734c546630df64a183:::23","id":"cm300000938_5ec605734c546630df64a183","filters":["23"]},{"columnId":"cm300000938_596f57a33f1e926c2080a403:::24","id":"cm300000938_596f57a33f1e926c2080a403","filters":["24"]},{"columnId":"cm300000938_596f57a33f1e926c2080a403:::25","id":"cm300000938_596f57a33f1e926c2080a403","filters":["25"]},{"columnId":"cm300000938_596f57a33f1e926c2080a403:::26","id":"cm300000938_596f57a33f1e926c2080a403","filters":["26"]},{"columnId":"metrics\/pageviewspervisit:::27","id":"metrics\/pageviewspervisit","filters":["27"]},{"columnId":"metrics\/pageviewspervisit:::28","id":"metrics\/pageviewspervisit","filters":["28"]},{"columnId":"metrics\/pageviewspervisit:::29","id":"metrics\/pageviewspervisit","filters":["29"]},{"columnId":"metrics\/event75:::30","id":"metrics\/event75","filters":["30"]},{"columnId":"metrics\/event75:::31","id":"metrics\/event75","filters":["31"]},{"columnId":"metrics\/event75:::32","id":"metrics\/event75","filters":["32"]},{"columnId":"cm_exit_rate_defaultmetric:::33","id":"cm_exit_rate_defaultmetric","filters":["33"]},{"columnId":"cm_exit_rate_defaultmetric:::34","id":"cm_exit_rate_defaultmetric","filters":["34"]},{"columnId":"cm_exit_rate_defaultmetric:::35","id":"cm_exit_rate_defaultmetric","filters":["35"]},{"columnId":"cm_entry_rate_defaultmetric:::36","id":"cm_entry_rate_defaultmetric","filters":["36"]},{"columnId":"cm_entry_rate_defaultmetric:::37","id":"cm_entry_rate_defaultmetric","filters":["37"]},{"columnId":"cm_entry_rate_defaultmetric:::38","id":"cm_entry_rate_defaultmetric","filters":["38"]},{"columnId":"metrics\/bouncerate:::39","id":"metrics\/bouncerate","filters":["39"]},{"columnId":"metrics\/bouncerate:::40","id":"metrics\/bouncerate","filters":["40"]},{"columnId":"metrics\/bouncerate:::41","id":"metrics\/bouncerate","filters":["41"]},{"columnId":"metrics\/event50:::42","id":"metrics\/event50","filters":["42"]},{"columnId":"metrics\/event50:::43","id":"metrics\/event50","filters":["43"]},{"columnId":"metrics\/event50:::44","id":"metrics\/event50","filters":["44"]},{"columnId":"metrics\/event85:::45","id":"metrics\/event85","filters":["45"]},{"columnId":"metrics\/event85:::46","id":"metrics\/event85","filters":["46"]},{"columnId":"metrics\/event85:::47","id":"metrics\/event85","filters":["47"]},{"columnId":"metrics\/event84:::48","id":"metrics\/event84","filters":["48"]},{"columnId":"metrics\/event84:::49","id":"metrics\/event84","filters":["49"]},{"columnId":"metrics\/event84:::50","id":"metrics\/event84","filters":["50"]},{"columnId":"metrics\/event83:::51","id":"metrics\/event83","filters":["51"]},{"columnId":"metrics\/event83:::52","id":"metrics\/event83","filters":["52"]},{"columnId":"metrics\/event83:::53","id":"metrics\/event83","filters":["53"]},{"columnId":"metrics\/evar80instances:::54","id":"metrics\/evar80instances","filters":["54"]},{"columnId":"metrics\/evar80instances:::55","id":"metrics\/evar80instances","filters":["55"]},{"columnId":"metrics\/evar80instances:::56","id":"metrics\/evar80instances","filters":["56"]}],"metricFilters":[{"id":"0","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"1","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"2","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"3","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"4","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"5","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"6","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"7","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"8","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"9","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"10","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"11","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"12","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"13","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"14","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"15","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"16","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"17","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"18","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"19","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"20","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"21","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"22","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"23","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"24","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"25","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"26","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"27","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"28","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"29","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"30","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"31","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"32","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"33","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"34","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"35","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"36","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"37","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"38","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"39","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"40","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"41","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"42","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"43","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"44","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"45","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"46","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"47","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"48","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"49","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"50","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"51","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"52","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"53","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"},{"id":"54","type":"dateRange","dateRange":"*month*\/2020-05-16T00:00:00.000"},{"id":"55","type":"dateRange","dateRange":"*week*\/2020-05-16T00:00:00.000"},{"id":"56","type":"dateRange","dateRange":"*yesterday*\/2020-05-16T00:00:00.000"}]},"settings":{"countRepeatInstances":true},"statistics":{"functions":["col-max","col-min"]}}',
+    'fwylf' => '{"rsid":"canadalivemain","globalFilters":[{"type":"segment","segmentDefinition":{"container":{"func":"container","context":"hits","pred":{"func":"streq","str":"%s","val":{"func":"attr","name":"variables\/evar22"},"description":"Page URL Last 255 Chars (v22)"}},"func":"segment","version":[1,0,0]}},{"type":"dateRange","dateRange":"2020-06-01T00:00:00.000\/2020-07-01T00:00:00.000"}],"metricContainer":{"metrics":[{"columnId":"1","id":"metrics\/evar80instances","sort":"desc","filters":["0"]},{"columnId":"2","id":"metrics\/evar80instances","filters":["1"]},{"columnId":"3","id":"metrics\/evar80instances","filters":["2"]}],"metricFilters":[{"id":"0","type":"dateRange","dateRange":"%s\/2020-05-16T00:00:00.000"},{"id":"1","type":"dateRange","dateRange":"%s\/2020-05-16T00:00:00.000"},{"id":"2","type":"dateRange","dateRange":"%s\/2020-05-16T00:00:00.000"}]},"dimension":"variables\/evar80","settings":{"countRepeatInstances":true,"limit":50,"page":0,"nonesBehavior":"return-nones"},"statistics":{"functions":["col-max","col-min"]}}'
 );
 
+
 /* Platform (Desktop, Phone, Tablet, All Others)
 
 {"rsid":"canadalivemain","globalFilters":[{"type":"dateRange","dateRange":"%s/%s"}],"metricContainer":{"metrics":[{"columnId":"1","id":"metrics/visits","sort":"desc","filters":["0"]},{"columnId":"2","id":"metrics/visits","filters":["1"]},{"columnId":"3","id":"metrics/visits","filters":["2"]},{"columnId":"4","id":"metrics/visits","filters":["3"]}],"metricFilters":[{"id":"0","type":"segment","segmentId":"s300000938_5d2f4947546d675d29e8817b"},{"id":"1","type":"segment","segmentId":"s300000938_5e0e240f1212e638f4382d0d"},{"id":"2","type":"segment","segmentId":"s300000938_5e0e2426b81a6c715e018e90"},{"id":"3","type":"segment","segmentId":"s300000938_5c6d65e5cfb25208c24ebcd1"}]},"dimension":"variables/evar22","search":{"clause":"( MATCH \'%s\' )"},"settings":{"countRepeatInstances":true,"limit":50,"page":0,"nonesBehavior":"return-nones"},"statistics":{"functions":["col-max","col-min"]}}
diff --git a/php/process-cj.php b/php/process-cj.php
index 481f2938..017e2a84 100644
--- a/php/process-cj.php
+++ b/php/process-cj.php
@@ -114,30 +114,30 @@ function strposa($haystack, $needle, $offset=0) {
             */
             //echo "Starting " . $url . "<br />";
 
-include ('lib/simple_html_dom.php');
+            include ('lib/simple_html_dom.php');
 
-if (substr($url, 0, 8) == "https://")
-            {
-                $url = substr($url, 8, strlen($url));
-            }
-            $html = file_get_html('https://' . $url);
-
-            if ($oLang) {
-                foreach ($html->find('a') as $e) {
-                    if ( ($e->lang == "en" || $e->lang == "fr") &&
-                       ( trim($e->innertext) == "English" || trim($e->innertext) == "Fran&ccedil;ais" )  ) {
-                        $otherLang = $e->href;
-                        break;
-                    }
-                }
-
-                $url = "www.canada.ca" . $otherLang;
-            }
-
-            //echo $url;
-
-            $html = file_get_html('https://' . $url);
-	    
+            if (substr($url, 0, 8) == "https://")
+                        {
+                            $url = substr($url, 8, strlen($url));
+                        }
+                        $html = file_get_html('https://' . $url);
+            
+                        if ($oLang) {
+                            foreach ($html->find('a') as $e) {
+                                if ( ($e->lang == "en" || $e->lang == "fr") &&
+                                   ( trim($e->innertext) == "English" || trim($e->innertext) == "Fran&ccedil;ais" )  ) {
+                                    $otherLang = $e->href;
+                                    break;
+                                }
+                            }
+            
+                            $url = "www.canada.ca" . $otherLang;
+                        }
+            
+                        //echo $url;
+            
+                        $html = file_get_html('https://' . $url);
+            
             if (substr($url, 0, 8) == "https://")
             {
                 $url = substr($url, 8, strlen($url));
@@ -188,16 +188,16 @@ function strposa($haystack, $needle, $offset=0) {
             $globalSearchFr = "www.canada.ca/fr/sr/srb.html";
 
             if ($searchURL === $globalSearchEn || $searchURL === $globalSearchFr) {
-                $type = ["trnd", "prvs", "srchAll", "refType", "snmAll", "srchLeftAll", "activityMap", "metrics"];
+                $type = ["trnd", "prvs", "srchAll", "refType", "snmAll", "srchLeftAll", "activityMap", "metrics","fwylf"];
                 $hasContextual = false;
             }
             else {
                 if ($origUrl == 'www.canada.ca' || $origUrl == 'www.canada.ca/home.html') {
-                    $type = ["trnd", "prvs", "activityMap", "refType", "metrics"];
+                    $type = ["trnd", "prvs", "activityMap", "refType", "metrics","fwylf"];
                     $hasContextual = false;
                 }
                 else {
-                    $type = ["trnd", "prvs", "srchAll", "refType", "snmAll", "srchLeftAll", "activityMap", "metrics"];
+                    $type = ["trnd", "prvs", "srchAll", "refType", "snmAll", "srchLeftAll", "activityMap", "metrics","fwylf"];
                     $hasContextual = true;
                 }
             }
@@ -218,7 +218,7 @@ function strposa($haystack, $needle, $offset=0) {
                     foreach ($type as $t)
                     {
                         $sm = "single";
-                        if ( $t == "activityMap" || $t == "metrics" || $t == "srchAll" || $t == "refType" || $t == "snmAll" || $t == "srchLeftAll") {
+                        if ( $t == "activityMap" || $t == "metrics" || $t == "srchAll" || $t == "refType" || $t == "snmAll" || $t == "srchLeftAll" || $t = "fwylf") {
                             $oDate = $dates[0] . "/" . $end;
                             $sm = "multi";
                         }
@@ -235,6 +235,8 @@ function strposa($haystack, $needle, $offset=0) {
                             $array = array_merge(array($bUrl), $dates);
                         } else if ($t == "refType") {
                             $array = array_merge(array($oUrl), $dates);
+                        } else if ($t == "fwylf") {
+                            $array = array_merge(array($oUrl), $dates);
                         } else if ($t == "prvs") {
                             $array = array_merge( array( $oUrl ), $array );
                         } else if ( $t == "activityMap" ) {
@@ -301,7 +303,7 @@ function strposa($haystack, $needle, $offset=0) {
                         }
 
                         $json = vsprintf($json, $array);
-                        if ($t == "activityMap" || $t == "metrics" || $t == "srchAll" || $t == "refType" || $t == "snmAll" || $t == "srchLeftAll") {
+                        if ($t == "activityMap" || $t == "metrics" || $t == "srchAll" || $t == "refType" || $t == "snmAll" || $t == "srchLeftAll" || $t == "fwylf") {
                             $json = str_replace("2020-05-16T00:00:00.000", $end, $json);
                             //echo $json;
                         }
diff --git a/php/process-new.php b/php/process-new.php
index 2a386d8e..68f882ae 100644
--- a/php/process-new.php
+++ b/php/process-new.php
@@ -1,7 +1,7 @@
 <?php
 session_start();
+//session_unset();
 //ini_set('display_errors', 1);
-
 function dateRange($first, $last, $step, $format = 'Y-m-d\TH:i:s.v') {
     $dates = [];
     $step = '+1 ' . $step;
@@ -98,7 +98,7 @@ function strposa($haystack, $needle, $offset = 0) {
             require_once('api_post.php');
             $data = include ('data.php');
             $config = include ('config.php');
-
+            
             include ('lib/simple_html_dom.php');
 
             if (substr($url, 0, 8) == "https://") {
@@ -125,7 +125,7 @@ function strposa($haystack, $needle, $offset = 0) {
 
             $html = file_get_html('https://' . $url);
 
-            $pUrl = substr($url, 0, 255 - 8);
+                        $pUrl = substr($url, 0, 255 - 8);
             $origUrl = $url;
 
             $url = substr($url, -255);
@@ -136,7 +136,7 @@ function strposa($haystack, $needle, $offset = 0) {
                 $pUrl = "www.canada.ca/home.html";
             }
 
-
+          
             $bUrl = substr('https://' . $origUrl, 0, 255);
             $html = file_get_html('https://' . $origUrl);
 
@@ -168,16 +168,16 @@ function strposa($haystack, $needle, $offset = 0) {
             $globalSearchEn = "www.canada.ca/en/sr/srb.html";
             $globalSearchFr = "www.canada.ca/fr/sr/srb.html";
             if ($searchURL === $globalSearchEn || $searchURL === $globalSearchFr) {
-                $type = ["trnd", "prvs", "srchAll", "snmAll", "srchLeftAll", "activityMap", "refType", "metrics"];
+                $type = ["trnd", "prvs", "srchAll", "snmAll", "srchLeftAll", "activityMap", "refType", "metrics","fwylf"];
                 $hasContextual = false;
             }
             else {
                 if ($origUrl == 'www.canada.ca' || $origUrl == 'www.canada.ca/home.html') {
-                    $type = [ "trnd", "prvs", "activityMap", "refType", "metrics"];
+                    $type = [ "trnd", "prvs", "activityMap", "refType", "metrics","fwylf"];
                     $hasContextual = false;
                 }
                 else {
-                    $type = ["trnd", "prvs", "srchAll", "activityMap", "refType", "snmAll", "srchLeftAll", "metrics"];
+                    $type = ["trnd", "prvs", "srchAll", "activityMap", "refType", "snmAll", "srchLeftAll", "metrics","fwylf"];
                     $hasContextual = true;
                 }
             }
@@ -195,7 +195,7 @@ function strposa($haystack, $needle, $offset = 0) {
                     foreach ($type as $t) {
 
                         $sm = "single";
-                        if ( $t == "activityMap" || $t == "metrics" || $t == "srchAll" || $t == "refType" || $t == "snmAll" || $t == "srchLeftAll") {
+                        if ( $t == "activityMap" || $t == "metrics" || $t == "srchAll" || $t == "refType" || $t == "snmAll" || $t == "srchLeftAll" || $t == "fwylf") {
                             $oDate = $dates2[0] . "/" . $end;
                             $sm = "multi";
                         }
@@ -211,6 +211,8 @@ function strposa($haystack, $needle, $offset = 0) {
                             $array = array_merge(array($bUrl), $dates2);
                         } else if ($t == "refType") {
                             $array = array_merge(array($oUrl), $dates2);
+                        } else if ($t == "fwylf") {
+                            $array = array_merge(array($oUrl), $dates2);
                         } else if ($t == "prvs") {
                             $array = array_merge( array( $oUrl ), $array );
                         } else if ( $t == "activityMap" ) {
@@ -272,7 +274,7 @@ function strposa($haystack, $needle, $offset = 0) {
                         }
 
                         $json = vsprintf($json, $array);
-                        if ($t == "activityMap" || $t == "metrics" || $t == "srchAll" || $t == "refType" || $t == "snmAll" || $t == "srchLeftAll") {
+                        if ($t == "activityMap" || $t == "metrics" || $t == "srchAll" || $t == "refType" || $t == "fwylf") {
                             $json = str_replace("2020-05-16T00:00:00.000", $end, $json);
                             //echo $json;
                         }
@@ -293,7 +295,7 @@ function strposa($haystack, $needle, $offset = 0) {
                               echo "<br />JSON:<br />$json<br />";
                               echo "<br />API:<br />$api<br />";
                           }
-                        */
+                        */ 
 /*
                         $api2 = json_decode($api);
                         $itemid = $api2->rows[0]->itemId;
diff --git a/php/process.php b/php/process.php
index 880c1e73..a7ad6133 100644
--- a/php/process.php
+++ b/php/process.php
@@ -50,7 +50,7 @@
         foreach ($dates as $key => $start) {
             $oDate = "$start/$end";
 
-            if ( $type == "activityMap" || $type == "metrics" || $type == "srchAll" || $type == "refType" || $type == "snmAll" || $type == "srchLeftAll" ) {
+            if ( $type == "activityMap" || $type == "metrics" || $type == "srchAll" || $type == "refType" || $type == "snmAll" || $type == "srchLeftAll" || $type == "fwylf" ) {
                 $oDate = $dates2[0] . "/" . $end;
                 $sm = "multi";
             } else {

From 56e5fdcd7783832473cb887bc83eae68303dbf9d Mon Sep 17 00:00:00 2001
From: Ryan Hyma <ryan.hyma@gmail.com>
Date: Wed, 15 Jul 2020 22:13:49 -0400
Subject: [PATCH 2/2] Fix for potential bug after pull request review

---
 php/process-new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/process-new.php b/php/process-new.php
index 68f882ae..e1f51493 100644
--- a/php/process-new.php
+++ b/php/process-new.php
@@ -274,7 +274,7 @@ function strposa($haystack, $needle, $offset = 0) {
                         }
 
                         $json = vsprintf($json, $array);
-                        if ($t == "activityMap" || $t == "metrics" || $t == "srchAll" || $t == "refType" || $t == "fwylf") {
+                        if ($t == "activityMap" || $t == "metrics" || $t == "srchAll" || $t == "refType" || $t == "snmAll" || $t == "srchLeftAll" || $t == "fwylf") {
                             $json = str_replace("2020-05-16T00:00:00.000", $end, $json);
                             //echo $json;
                         }