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

   .jstats{display:flex;gap:9px;margin:12px 0 2px;flex-wrap:wrap}
   .js{flex:1;min-width:104px;background:#f8f9fc;border:1px solid var(--line2);border-radius:10px;padding:9px 10px;text-align:center}
   .js .jv{font-size:15.5px;font-weight:760;color:var(--ink);font-variant-numeric:tabular-nums}
   .js .jl{font-size:10px;color:var(--soft);text-transform:uppercase;letter-spacing:.04em;margin-top:3px;font-weight:600}
   .btn-ok{background:var(--good);border:0;color:#fff;font-weight:650;padding:6px 12px;border-radius:7px;cursor:pointer;font-size:12px}
+  .btn-no{background:var(--bad);border:0;color:#fff;font-weight:650;padding:6px 12px;border-radius:7px;cursor:pointer;font-size:12px}
   /* journey timeline (exec drilldown) */
   .tl{position:relative;margin:14px 2px 4px;padding:4px 0}
   .tl::before{content:"";position:absolute;left:50%;top:6px;bottom:6px;width:2px;background:#e9edf5;transform:translateX(-50%)}
   .tlgap{position:relative;display:flex;justify-content:center;margin:-3px 0}
   .tlgap .gappill{background:#fff;border:1px solid var(--line);border-radius:999px;padding:3px 11px;font-size:11px;font-weight:600;color:var(--muted);z-index:2;box-shadow:0 1px 2px rgba(20,30,60,.05);font-variant-numeric:tabular-nums}
   .bjlegend{display:flex;gap:16px;align-items:center;flex-wrap:wrap;margin-top:12px;padding:10px 12px;border:1px solid var(--line);border-radius:10px;background:#f8f9fc;font-size:12.5px;min-height:20px}
   .bjlegend .lg{font-weight:700}
   .bjlegend .sw{display:inline-block;width:24px;vertical-align:middle;margin-right:7px}
   .bjlegend .ln{border-top:4px solid #e03131}
   .bjlegend .dt{border-top:4px dotted #2f9e44}
-  .valwrap{display:flex;justify-content:center;margin:14px 0 6px}
+  .valwrap{display:flex;justify-content:center;align-items:flex-start;gap:16px;flex-wrap:wrap;margin:14px 0 6px}
+  .valfig{display:flex;flex-direction:column;align-items:center;gap:6px;margin:0;max-width:100%}
+  .valcap{font-size:11px;font-weight:650;color:var(--soft);text-transform:uppercase;letter-spacing:.03em}
   .valimg{max-width:100%;max-height:440px;border-radius:12px;border:1px solid var(--line);cursor:zoom-in}
   .valph{width:100%;padding:48px;text-align:center;color:var(--soft);border:1px dashed #cfd6e6;border-radius:12px;background:#f4f6fb;font-size:14px}
   .valactions{display:flex;justify-content:center;gap:10px;margin-top:8px}
   @media (max-width:1000px){.kpis{grid-template-columns:repeat(3,1fr)}.g2,.g3{grid-template-columns:1fr}.funnel{flex-wrap:wrap}.fstep{min-width:46%}.fstep .arrow{display:none}}
   @media (max-width:560px){.tl::before{left:20px}.tlrow.left,.tlrow.right{justify-content:flex-end}.tlrow .node{left:20px}.tlcard{width:calc(100% - 44px)}.tlrow.left .tlcard{flex-direction:row;text-align:left}.tlremark{display:none}}
 // Step 2: review the check-in photo/document before approving.
 function openValidate(trackingId){
   var list=(window._att&&window._att.geofence)||[], item=null;
   for(var i=0;i<list.length;i++){ if(list[i].trackingId===trackingId){ item=list[i]; break; } }
   if(!item){ return; }
-  var img = (item.attachment && window._mediaUrl)
-    ? '<img class="valimg" src="'+esc(window._mediaUrl+item.attachment)+'" onclick="bjOpenImage(this.src)" onerror="this.outerHTML=\'<div class=&quot;valph&quot;>&#128247; Photo unavailable</div>\'">'
-    : '<div class="valph">&#128247; No photo on this check-in</div>';
+  var img = bjValImg(item.attachment) || '<div class="valph">&#128247; No photo on this check-in</div>';
   el('bj-modal').innerHTML='<button class="x" onclick="closeModal()">&times;</button><h3>Validate check-in</h3>'+
     '<p class="desc">'+esc(item.name)+' &middot; '+esc(item.detail||'')+'</p>'+
-    '<div class="valwrap">'+img+'</div>'+
+    '<div class="valwrap">'+
+      '<figure class="valfig"><figcaption class="valcap">This check-in</figcaption>'+img+'</figure>'+
+      // Previous visit photo (same store) — hidden until the lazy fetch fills it in.
+      '<figure class="valfig" id="bj-prevfig" style="display:none"><figcaption class="valcap" id="bj-prevcap">Previous visit</figcaption><div id="bj-previmg"></div></figure>'+
+    '</div>'+
     '<div class="valactions">'+
       '<button class="exectab" onclick="openAttention(\'geofence\')">&larr; Back</button>'+
+      '<button class="btn-no" onclick="rejectValidated('+trackingId+',this)">Reject</button>'+
       '<button class="btn-ok" onclick="approveValidated('+trackingId+',this)">Approve</button>'+
     '</div>';
+  bjLoadPrevCheckin(trackingId);
+}
+// Build the <img> markup for a check-in attachment (empty string when there's none).
+function bjValImg(att){
+  return (att && window._mediaUrl)
+    ? '<img class="valimg" src="'+esc(window._mediaUrl+att)+'" onclick="bjOpenImage(this.src)" onerror="this.outerHTML=\'<div class=&quot;valph&quot;>&#128247; Photo unavailable</div>\'">'
+    : '';
+}
+// Lazily fetch the most recent OTHER check-in photo at the same store and, if one
+// exists, reveal it beside the current photo so the reviewer can compare shopfronts.
+function bjLoadPrevCheckin(trackingId){
+  fetch(CTX+'/beat-journey/prev-checkin?trackingId='+trackingId,{headers:{'Accept':'application/json'}})
+    .then(function(r){ return r.ok ? r.json() : null; })
+    .then(function(d){
+      if(!d || !d.attachment) return;
+      var fig=el('bj-prevfig'); if(!fig) return;
+      var im=bjValImg(d.attachment); if(!im) return;
+      el('bj-previmg').innerHTML=im;
+      var when=[d.date,d.time].filter(Boolean).join(' ');
+      el('bj-prevcap').innerHTML='Previous visit'+(when?' &middot; '+esc(when):'');
+      fig.style.display='';
+    })
+    .catch(function(){});
+}
 function approveValidated(trackingId, btn){
   btn.disabled=true; btn.textContent='Approving…';
   fetch(CTX+'/beat-journey/approve-checkin',{method:'POST',headers:{'Content-Type':'application/x-www-form-urlencoded'},body:'trackingId='+trackingId})
     .then(function(r){ if(!r.ok) throw new Error('HTTP '+r.status); return r.json(); })
       if(window._att && window._att.geofence && window._att.geofence.length) openAttention('geofence');
       else closeModal();
     })
     .catch(function(){ btn.disabled=false; btn.textContent='Approve'; alert('Approve failed (not authorised, or server error).'); });
+}
+// Reject the off-site check-in: coords are left untouched (unlike approve), and the
+// executive, their reporting manager and ops are emailed. Optional reason is prompted.
+function rejectValidated(trackingId, btn){
+  var reason = prompt('Reject this off-site check-in?\nThe executive and their manager will be emailed.\nOptional reason:', '');
+  if(reason===null) return;   // cancelled
+  btn.disabled=true; btn.textContent='Rejecting…';
+  var body='trackingId='+trackingId+'&reason='+encodeURIComponent(reason||'');
+  fetch(CTX+'/beat-journey/reject-checkin',{method:'POST',headers:{'Content-Type':'application/x-www-form-urlencoded'},body:body})
+    .then(function(r){ if(!r.ok) throw new Error('HTTP '+r.status); return r.json(); })
+    .then(function(){
+      if(window._att && window._att.geofence){ window._att.geofence = window._att.geofence.filter(function(x){ return x.trackingId!==trackingId; }); }
+      if(window._att && window._att.geofence && window._att.geofence.length) openAttention('geofence');
+      else closeModal();
+    })
+    .catch(function(){ btn.disabled=false; btn.textContent='Reject'; alert('Reject failed (not authorised, or server error).'); });
+}
 // Mark an executive on leave for the board date (unscheduled, or scheduled but not
 // started / agenda unfilled). Manager / super-user only (server-enforced).
 // Optimistically flips the row to "On leave" and re-renders the open drill-down.
 function markLeave(authUserId, name, btn){

Subversion Repositories SmartDukaan

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