WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-journey.vm

 function pScoreTable(rows){
   if(!rows.length) return '<p class="desc">No executives in scope.</p>';
   var h='<table><thead><tr><th>Executive</th><th class="num">Plan</th><th class="num">Done</th><th class="num">Adher.</th>'+
     '<th class="num" title="Avg lead visits per active (punched-in) day">Lead/day</th>'+
     '<th class="num" title="Avg franchisee visits per active (punched-in) day">Fr/day</th>'+
-    '<th class="num">Disc.</th><th class="num">Hrs</th><th class="num">Leads</th><th class="num">Geo&#9888;</th></tr></thead><tbody>';
+    '<th class="num">Disc.</th><th class="num">Hrs</th><th class="num">Leads</th></tr></thead><tbody>';
   rows.forEach(function(r){
     var c=adhColor(r.adherencePct);
     h+='<tr class="clickable" onclick="openExecPeriod('+r.authUserId+',\''+js(r.name)+'\')">'+
        '<td><span class="lvl">'+esc(r.level)+'</span> <b>'+esc(r.name)+'</b></td>'+
        '<td class="num">'+r.planned+'</td><td class="num">'+r.done+'</td>'+
        '<td class="num"><b style="color:'+c+'">'+r.adherencePct+'%</b></td>'+
        '<td class="num">'+(r.avgLeadVisitsPerDay||'-')+'</td>'+
        '<td class="num">'+(r.avgFranchiseeVisitsPerDay||'-')+'</td>'+
        '<td class="num'+(r.discussionMin>0&&r.discussionMin<10?' warnflag':'')+'">'+(r.discussionMin||'-')+(r.discussionMin?'m':'')+'</td>'+
-       '<td class="num">'+r.workingHrs+'</td><td class="num">'+r.leads+'</td>'+
+       '<td class="num">'+r.workingHrs+'</td><td class="num">'+r.leads+'</td></tr>';
-       '<td class="num'+(r.geoFlags>0?' badflag':'')+'">'+r.geoFlags+'</td></tr>';
   });
   return h+'</tbody></table>';
+}
 // Funnel stage → the executives behind it (the scorecard, focused).
 function openPFunnel(key){
   var h='<table id="scTbl"><thead><tr>'+
     '<th onclick="sortCard(\'name\')">Executive</th>'+
     '<th class="num" onclick="sortCard(\'planned\')">Plan</th>'+
     '<th class="num" onclick="sortCard(\'done\')">Done</th>'+
     '<th class="num" onclick="sortCard(\'adherencePct\')">Adher.</th>'+
+    '<th class="num" onclick="sortCard(\'avgLeadVisitsPerDay\')" title="Avg lead visits per active (punched-in) day">Lead/day</th>'+
+    '<th class="num" onclick="sortCard(\'avgFranchiseeVisitsPerDay\')" title="Avg franchisee visits per active (punched-in) day">Fr/day</th>'+
     '<th class="num" onclick="sortCard(\'discussionMin\')">Disc.</th>'+
     '<th class="num" onclick="sortCard(\'workingHrs\')">Hrs</th>'+
-    '<th class="num" onclick="sortCard(\'leads\')">Leads</th>'+
-    '<th class="num" onclick="sortCard(\'geoFlags\')">Geo&#9888;</th></tr></thead><tbody>';
+    '<th class="num" onclick="sortCard(\'leads\')">Leads</th></tr></thead><tbody>';
   rows.forEach(function(r){
     var c=adhColor(r.adherencePct);
-    h+='<tr class="clickable" onclick="openExecPeriod('+r.authUserId+',\''+js(r.name)+'\')"><td>'+esc(r.name)+' <span class="lvl">'+esc(r.level)+'</span></td>'+
+    h+='<tr class="clickable" onclick="openExecPeriod('+r.authUserId+',\''+js(r.name)+'\')"><td><span class="lvl">'+esc(r.level)+'</span>'+esc(r.name)+'</td>'+
        '<td class="num">'+r.planned+'</td><td class="num">'+r.done+'</td>'+
        '<td class="num"><b style="color:'+c+'">'+r.adherencePct+'%</b><span class="meter"><i style="width:'+Math.min(100,r.adherencePct)+'%;background:'+c+'"></i></span></td>'+
+       '<td class="num">'+(r.avgLeadVisitsPerDay||'-')+'</td>'+
+       '<td class="num">'+(r.avgFranchiseeVisitsPerDay||'-')+'</td>'+
        '<td class="num'+(r.discussionMin>0&&r.discussionMin<10?' warnflag':'')+'">'+(r.discussionMin||'-')+(r.discussionMin?'m':'')+'</td>'+
-       '<td class="num">'+r.workingHrs+'</td><td class="num">'+r.leads+'</td>'+
+       '<td class="num">'+r.workingHrs+'</td><td class="num">'+r.leads+'</td></tr>';
-       '<td class="num'+(r.geoFlags>0?' badflag':'')+'">'+r.geoFlags+'</td></tr>';
   });
   return h+'</tbody></table>';
+}
 function coverageBars(rows){
   if(!rows||!rows.length) return '<p class="desc">No coverage data.</p>';
       'Punch out'+(data.punchOut.time?' · '+data.punchOut.time:''),
       '<div style="font-size:12px"><b>&#9873; Punch out</b>'+(data.punchOut.time?'<br>'+esc(data.punchOut.time):'')+'</div>');
+  }
   // 5) routes — actual road taken vs Google-suggested optimal, for comparison.
+  // Suggested-route checkpoints = the whole day's stops (planned + visited), not
+  // just the ones already visited, so the suggestion shows from punch-in onward
+  // (and even before the first check-in). optimizeWaypoints reorders them, so the
-  // Checkpoints in journey order: punch in → visits (by check-in time) → punch out.
+  // input order only needs to keep punch-in first / punch-out last; visited stops
+  // are listed by check-in time and still-pending stops after them.
   var cps=[];
   if(data.punchIn) cps.push({lat:data.punchIn.lat,lng:data.punchIn.lng});
   (data.visits||[]).slice()
-    .filter(function(v){ return v.lat && v.lng && v.checkInTime; })   // visited stops only
+    .filter(function(v){ return v.lat && v.lng; })                   // every stop with coords
     .sort(function(a,b){ return tlSecs(a.checkInTime)-tlSecs(b.checkInTime); })
     .forEach(function(v){ cps.push({lat:v.lat,lng:v.lng}); });
   if(data.punchOut) cps.push({lat:data.punchOut.lat,lng:data.punchOut.lng});
   // Actual time window of the GPS trail (first → last breadcrumb timestamp),
   // shown on the taken-route click detail alongside the driving estimate.

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-journey.vm – Rev 37020 → 37028