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

     function renderDayViewRows(rows) {
         if (!rows || rows.length === 0) {
             $('#dayViewRows').html('<tr><td colspan="8" style="text-align:center; color:#999;">No beats scheduled in this range.</td></tr>');
             return;
+        }
+        // Assign Visit is only valid for TODAY's run — future/past dates hide the button.
+        var todayStr = (function () {
+            var d = new Date();
+            var mm = ('0' + (d.getMonth() + 1)).slice(-2);
+            var dd = ('0' + d.getDate()).slice(-2);
+            return d.getFullYear() + '-' + mm + '-' + dd;
+        })();
         var html = '';
         rows.forEach(function (r) {
+            var isToday = r.scheduleDate === todayStr;
             html += '<tr>'
                     + '<td>' + r.userName + '</td>'
                     + '<td><span class="label label-primary">' + r.scheduleDate + '</span></td>'
                     + '<td><span style="display:inline-block;width:10px;height:10px;border-radius:2px;background:' + (r.beatColor || '#3498db') + ';margin-right:6px;"></span>' + r.beatName + '</td>'
                     + '<td>' + r.dayNumber + '</td>'
                     + '<td><strong>' + r.visitCount + '</strong></td>'
                     + '<td>'
                     + '<button class="btn btn-xs btn-info view-user-calendar" data-userid="' + r.authUserId + '" data-username="' + r.userName + '">View Calendar</button> '
                     + '<button class="btn btn-xs btn-warning edit-beat-on-date" '
                     + 'data-userid="' + r.authUserId + '" data-username="' + r.userName + '" '
-                    + 'data-beatid="' + r.beatId + '" data-date="' + r.scheduleDate + '">Edit</button> '
+                    + 'data-beatid="' + r.beatId + '" data-date="' + r.scheduleDate + '">Edit</button>'
+                    + (isToday
-                    + '<button class="btn btn-xs btn-success assign-visit-btn" '
+                            ? ' <button class="btn btn-xs btn-success assign-visit-btn"'
-                    + 'data-userid="' + r.authUserId + '" data-username="' + r.userName + '" '
+                            + ' data-userid="' + r.authUserId + '" data-username="' + r.userName + '"'
+                            + ' data-beatid="' + r.beatId + '"'
-                    + 'data-date="' + r.scheduleDate + '">Assign Visit</button>'
+                            + ' data-date="' + r.scheduleDate + '">Assign Visit</button>'
+                            : '')
                     + '</td>'
                     + '</tr>';
         });
         $('#dayViewRows').html(html);
+    }
         $('#userCalendarFrame').attr('src', url);
         $('#userCalendarModal').modal('show');
     });
     // ---------- ASSIGN VISIT ----------
-    var avContext = {authUserId: null, userName: '', date: '', allParties: []};
+    var avContext = {authUserId: null, userName: '', date: '', beatId: null, allParties: [], agendaOptions: []};
     $(document).on('click', '.assign-visit-btn', function () {
         avContext.authUserId = $(this).data('userid');
         avContext.userName = $(this).data('username') || '';
         avContext.date = $(this).data('date');
+        avContext.beatId = $(this).data('beatid');
         avContext.allParties = [];
-        $('#avTitle').text('Assign Visit — ' + avContext.userName + ' on ' + avContext.date);
+        $('#avTitle').text('Assign Visit - ' + avContext.userName + ' on ' + avContext.date);
         $('#avSearch').val('');
+        // The default-agenda multiselect is rebuilt (and re-initialized) below in rebuildDefaultAgenda
         $('#avPartyList').html('<div style="padding:20px; color:#999; text-align:center;">Loading parties...</div>');
         $('#avMsg').text('');
         $('#avSelectedCount').text('0 selected');
         $('#avSubmit').prop('disabled', true);
         $('#assignVisitModal').modal('show');
-        $.get(context + '/beatPlan/assignVisit/parties', {authUserId: avContext.authUserId})
+        $.get(context + '/beatPlan/assignVisit/parties', {
+            authUserId: avContext.authUserId,
+            date: avContext.date,
+            beatId: avContext.beatId
-                .done(function (r) {
+        }).done(function (r) {
-                    var data = r.response || r;
+            var data = r.response || r;
+            // Drop parties already in the beat — they're handled by the beat plan itself,
+            // Assign Visit is purely for adding extra (non-beat) visits.
+            avContext.allParties = (data.parties || []).filter(function (p) {
+                return !p.inBeat;
+            });
-                    avContext.allParties = data.parties || [];
+            avContext.agendaOptions = data.agendaOptions || [];
-                    if (!data.dtrUserId) {
+            if (!data.dtrUserId) {
-                        $('#avPartyList').html('<div style="padding:20px; color:#c62828; text-align:center;">' +
+                $('#avPartyList').html('<div style="padding:20px; color:#c62828; text-align:center;">' +
-                                'This user has no dtr.users record (cannot create visit tasks).</div>');
+                        'This user has no dtr.users record (cannot create visit tasks).</div>');
-                        return;
+                return;
-                    }
+            }
+            rebuildDefaultAgenda();
-                    renderAvParties(avContext.allParties);
+            renderAvParties(avContext.allParties);
-                })
-                .fail(function (xhr) {
+        }).fail(function (xhr) {
-                    $('#avPartyList').html('<div style="padding:20px; color:#c62828; text-align:center;">' +
+            $('#avPartyList').html('<div style="padding:20px; color:#c62828; text-align:center;">' +
-                            'Error loading parties: ' + (xhr.responseText || xhr.statusText) + '</div>');
+                    'Error loading parties: ' + (xhr.responseText || xhr.statusText) + '</div>');
-                });
+        });
     });
+    // Per-row agenda markup. Initialized as bootstrap-multiselect dropdown
+    // (project standard — same as today-offer.vm, lead.vm, etc.) after render.
+    // In-beat parties are filtered out of the list entirely, so only non-beat
+    // (extra-visit) parties show up here. existingAgendas[] is pre-selected for
+    // parties that already have a saved visit today (so editing existing ones works).
+    function agendaSelectHtml(p) {
+        var preset = {};
+        (p.existingAgendas || []).forEach(function (a) {
+            preset[a] = true;
+        });
+        var html = '<select multiple class="av-party-agenda"'
+                + ' data-fofoid="' + p.fofoStoreId + '">';
+        avContext.agendaOptions.forEach(function (opt) {
+            html += '<option value="' + opt + '"' + (preset[opt] ? ' selected' : '') + '>' + opt + '</option>';
+        });
+        html += '</select>';
+        return html;
+    }
+    var AGENDA_MULTISELECT_OPTS = {
+        includeSelectAllOption: false,
+        maxHeight: 220,
+        buttonWidth: '240px',
+        numberDisplayed: 2,
+        nonSelectedText: 'Pick agenda(s)',
+        nSelectedText: ' agendas',
+        allSelectedText: 'All agendas',
+        enableFiltering: true,
+        enableCaseInsensitiveFiltering: true
+    };
+    function rebuildDefaultAgenda() {
+        var $sel = $('#avDefaultAgenda');
+        // Destroy any prior instance before re-initing (re-open of the modal)
+        try {
+                $sel.multiselect('destroy');
+        } catch (e) {
+        }
+        var html = '';
+        avContext.agendaOptions.forEach(function (opt) {
+            html += '<option value="' + opt + '">' + opt + '</option>';
+        });
+            $sel.html(html);
+        // Build opts as a variable — inline {...} object literal after $.extend()
+        // confused Velocity's parser ("Encountered { ... was expecting ...").
+        var defaultOpts = $.extend({}, AGENDA_MULTISELECT_OPTS);
+        defaultOpts.nonSelectedText = 'Pick agenda(s) to apply';
+            $sel.multiselect(defaultOpts);
+    }
+    function initRowMultiselects() {
+        $('.av-party-agenda').each(function () {
+            var $sel = $(this);
+            try {
+                    $sel.multiselect('destroy');
+            } catch (e) {
+            }
+                $sel.multiselect(AGENDA_MULTISELECT_OPTS);
+        });
+    }
     function renderAvParties(list) {
         if (!list || list.length === 0) {
             $('#avPartyList').html('<div style="padding:20px; color:#999; text-align:center;">No parties found.</div>');
             return;
+        }
         var html = '<table class="table table-condensed table-hover" style="margin-bottom:0; font-size:13px;">';
         html += '<thead><tr>'
                 + '<th style="width:30px;"><input type="checkbox" id="avSelectAll" title="Select all"></th>'
                 + '<th>Code</th><th>Outlet</th><th>City</th>'
-                + '<th style="width:220px;">Agenda</th>'
+                + '<th style="width:260px;">Agenda</th>'
+                + '<th style="width:260px;">Description</th>'
                 + '</tr></thead><tbody>';
         list.forEach(function (p) {
             var safeName = (p.outletName || '').replace(/"/g, '&quot;');
+            var existingDesc = (p.existingDescription || '').replace(/"/g, '&quot;');
             html += '<tr>'
                     + '<td><input type="checkbox" class="av-party-chk" '
                     + 'data-fofoid="' + p.fofoStoreId + '" '
                     + 'data-name="' + safeName + '" '
                     + 'data-lat="' + (p.latitude || '') + '" '
                     + 'data-lng="' + (p.longitude || '') + '"></td>'
                     + '<td>' + (p.code || '') + '</td>'
                     + '<td>' + (p.outletName || '') + '</td>'
                     + '<td>' + (p.city || '') + '</td>'
+                    + '<td>' + agendaSelectHtml(p) + '</td>'
-                    + '<td><input type="text" class="form-control input-sm av-party-agenda" '
+                    + '<td><textarea class="form-control input-sm av-party-desc"'
-                    + 'placeholder="e.g. Stock review" '
+                    + ' data-fofoid="' + p.fofoStoreId + '"'
-                    + 'data-fofoid="' + p.fofoStoreId + '"></td>'
+                    + ' rows="2" placeholder="Optional notes..."'
+                    + ' style="resize:vertical; min-height:34px;">' + existingDesc + '</textarea></td>'
                     + '</tr>';
         });
         html += '</tbody></table>';
         $('#avPartyList').html(html);
+        initRowMultiselects();
         updateAvSelectedCount();
+    }
     // Search filter
     $(document).on('input', '#avSearch', function () {
     $(document).on('change', '#avSelectAll', function () {
         $('.av-party-chk').prop('checked', this.checked);
         updateAvSelectedCount();
     });
-    // Per-row checkbox
     $(document).on('change', '.av-party-chk', updateAvSelectedCount);
     function updateAvSelectedCount() {
         var n = $('.av-party-chk:checked').length;
         $('#avSelectedCount').text(n + ' selected');
         $('#avSubmit').prop('disabled', n === 0);
+    }
-    // Apply the default agenda value to all currently-selected rows
+    // Apply the default agendas (multi-select) to all currently-selected rows.
+    // MERGES with each row's existing selections so in-beat rows keep prior agendas.
+    // After updating <select>.val(), call multiselect('refresh') so the checkbox
+    // UI re-syncs with the underlying option state.
     $(document).on('click', '#avApplyAgenda', function () {
-        var def = $('#avDefaultAgenda').val();
+        var defValues = $('#avDefaultAgenda').val() || [];
-        if (!def) {
+        if (defValues.length === 0) {
-            alert('Type an agenda first');
+            alert('Pick at least one agenda above first');
             return;
+        }
         $('.av-party-chk:checked').each(function () {
             var fid = $(this).data('fofoid');
-            $('.av-party-agenda[data-fofoid="' + fid + '"]').val(def);
+            var $sel = $('.av-party-agenda[data-fofoid="' + fid + '"]');
+            var existing = $sel.val() || [];
+            var merged = existing.slice();
+            defValues.forEach(function (v) {
+                if (merged.indexOf(v) === -1) merged.push(v);
+            });
+                $sel.val(merged);
+            try {
+                    $sel.multiselect('refresh');
+            } catch (e) {
+            }
         });
     });
     // Submit
     $(document).on('click', '#avSubmit', function () {
         var picks = [];
         var missing = 0;
         $('.av-party-chk:checked').each(function () {
             var fid = parseInt($(this).data('fofoid'));
-            var agenda = $('.av-party-agenda[data-fofoid="' + fid + '"]').val();
+            var agendas = $('.av-party-agenda[data-fofoid="' + fid + '"]').val() || [];
-            agenda = agenda ? agenda.trim() : '';
+            var description = ($('.av-party-desc[data-fofoid="' + fid + '"]').val() || '').trim();
-            if (!agenda) missing++;
+            if (agendas.length === 0) missing++;
             picks.push({
                 fofoStoreId: fid,
                 outletName: $(this).data('name'),
                 latitude: $(this).data('lat') ? String($(this).data('lat')) : null,
                 longitude: $(this).data('lng') ? String($(this).data('lng')) : null,
-                agenda: agenda
+                agendas: agendas,
+                description: description
             });
         });
         if (picks.length === 0) return;
         if (missing > 0) {
             if (!confirm(missing + ' selected row(s) have no agenda. Submit anyway with default "Visit"?')) return;
                 planDate: avContext.date,
                 parties: picks
             }),
             success: function (r) {
                 var d = r.response || r;
-                $('#avMsg').html('<span style="color:#2e7d32;">' + (d.message || 'Assigned successfully') + '</span>');
+                $('#avMsg').html('<span style="color:#2e7d32;">' + (d.message || 'Saved') + '</span>');
-                btn.prop('disabled', false).text('Assign Selected');
+                btn.prop('disabled', false).text('Save Assignments');
                 setTimeout(function () {
                     $('#assignVisitModal').modal('hide');
-                }, 1200);
+                }, 1500);
             },
             error: function (xhr) {
                 var msg = 'Failed';
                 try {
                     msg = (JSON.parse(xhr.responseText).response.message) || msg;
                 } catch (e) {
+                }
                 $('#avMsg').html('<span style="color:#c62828;">' + msg + '</span>');
-                btn.prop('disabled', false).text('Assign Selected');
+                btn.prop('disabled', false).text('Save Assignments');
+            }
         });
     });
 </script>
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
                 <h4 class="modal-title" id="avTitle">Assign Visit</h4>
             </div>
             <div class="modal-body">
-                <div style="display:flex; gap:10px; align-items:center; margin-bottom:10px;">
+                <div style="display:flex; gap:10px; align-items:flex-start; margin-bottom:10px;">
+                    <div style="flex:1;">
-                    <input type="text" id="avDefaultAgenda" class="form-control input-sm"
+                        <label style="font-size:11px; color:#666; font-weight:normal; margin-bottom:2px;">
-                           placeholder="Agenda (applies to selected rows)" style="flex:1;">
+                            Agenda - applies to selected rows
+                        </label>
+                        <select id="avDefaultAgenda" multiple></select>
+                    </div>
                     <button type="button" class="btn btn-default btn-sm" id="avApplyAgenda"
+                            style="margin-top:18px;"
-                            title="Fill agenda into all selected rows">
+                            title="Add the picked agendas into all selected rows (merges with existing)">
                         Apply to Selected
                     </button>
                 </div>
                 <div style="display:flex; gap:10px; align-items:center; margin-bottom:10px;">
                     <input type="text" id="avSearch" class="form-control input-sm"
                      style="max-height:50vh; overflow-y:auto; border:1px solid #e5e5e5; border-radius:4px;"></div>
                 <div id="avMsg" style="margin-top:10px; font-size:12px;"></div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-success" id="avSubmit" disabled>Assign Selected</button>
+                <button type="button" class="btn btn-success" id="avSubmit" disabled>Save Assignments</button>
             </div>
         </div>
     </div>
 </div>

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-day-view.vm – Rev 36663 → 36716