From 75647674c810ab046d66668982e50104d30a8ec0 Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Tue, 28 Oct 2025 20:32:11 -0700
Subject: [PATCH 01/12] Checkpoint

---
 resources/views/scheduleInstrument.html       | 253 ++++++++++++++----
 .../labkey/targetedms/TargetedMSManager.java  |   5 +
 .../labkey/targetedms/TargetedMSSchema.java   |  39 ++-
 .../query/InstrumentScheduleTable.java        |  73 +++++
 .../query/InstrumentUsagePaymentTrigger.java  |  86 ++++++
 .../query/SimpleTargetedMSTable.java          |  32 +++
 6 files changed, 408 insertions(+), 80 deletions(-)
 create mode 100644 src/org/labkey/targetedms/query/InstrumentScheduleTable.java
 create mode 100644 src/org/labkey/targetedms/query/InstrumentUsagePaymentTrigger.java
 create mode 100644 src/org/labkey/targetedms/query/SimpleTargetedMSTable.java

diff --git a/resources/views/scheduleInstrument.html b/resources/views/scheduleInstrument.html
index 1526f1333..9ceacdfce 100644
--- a/resources/views/scheduleInstrument.html
+++ b/resources/views/scheduleInstrument.html
@@ -13,12 +13,14 @@
             <td><select id="projectDropDown" name="projectDropDown"></select></td>
         </tr>
         <tr>
-            <td class="labkey-form-label"><label for="paymentMethodDropDown">Payment method</label></td>
+            <td class="labkey-form-label" rowspan="10"><label for="paymentMethodDropDown">Payment method</label></td>
             <td><div id="paymentMethodDropDown"></div></td>
         </tr>
         <tr>
-            <td class="labkey-form-label"></td>
-            <td><span id="addPaymentMethod" role="button" style="cursor: pointer;">[Add Payment Method]</span></td>
+            <td>
+                <div id="addPaymentMethod" role="button" style="cursor: pointer;">[Add payment method]</div>
+                <div id="payment-method-error" class="labkey-error"></div>
+            </td>
         </tr>
     </table>
 </div>
@@ -337,26 +339,147 @@ <h3>Time Scheduled</h3>
             }
         });
 
+        function validatePaymentMethodPercentsAndShow() {
+            const errorEl = document.getElementById('payment-method-error');
+            const scheduleError = document.getElementById('schedule-save-error');
+            const selects = document.querySelectorAll('#paymentMethodDropDown select');
+            const percents = document.querySelectorAll('.paymentMethodPercent');
+
+            // Default: clear
+            let message = '';
+            let total = 0;
+            let invalid = false;
+
+            // Only validate when there are percent inputs (i.e., multiple methods in use UI-wise)
+            if (percents.length > 0 && selects.length > 0) {
+                for (let i = 0; i < selects.length; i++) {
+                    const val = percents[i] ? percents[i].value : (selects.length === 1 ? '100' : '0');
+                    const num = parseFloat(val);
+                    if (isNaN(num) || num < 0 || num > 100) {
+                        invalid = true;
+                    }
+                    total += isNaN(num) ? 0 : num;
+                }
+
+                if (invalid) {
+                    message = 'Each payment percentage must be a number between 0 and 100.';
+                }
+                else if (percents.length > 1 && total !== 100) {
+                    message = 'When multiple payment methods are used, the percentages must add up to 100% (current total: ' + total + '%).';
+                }
+            }
+
+            if (errorEl) errorEl.textContent = message;
+            if (scheduleError) scheduleError.textContent = message; // mirror below modal as well
+
+            return { valid: !message, total: total };
+        }
+
+        const validationCallback = validatePaymentMethodPercentsAndShow;
+
+        function updatePercentInputsVisibility() {
+            const container = document.getElementById('paymentMethodDropDown');
+            if (!container) return;
+
+            const selects = container.querySelectorAll('select');
+            const groups = container.querySelectorAll('.paymentPercentGroup');
+            const inputs = container.querySelectorAll('.paymentMethodPercent');
+            const rowCount = selects.length;
+
+            // Show when multiple rows, hide when single
+            const show = rowCount > 1;
+
+            // If only one row remains, reset its percent back to 100 before hiding
+            if (!show && inputs.length > 0) {
+                inputs[0].value = '100';
+            }
+
+            groups.forEach(function (grp) {
+                grp.style.display = show ? '' : 'none';
+            });
+
+            // When first transitioning to multi-row, ensure sensible defaults
+            if (show && inputs.length > 0) {
+                // If first value is empty, default to 100
+                if (inputs[0].value === '') inputs[0].value = '100';
+                // For others, if empty, default to 0
+                for (let i = 1; i < inputs.length; i++) {
+                    if (inputs[i].value === '') inputs[i].value = '0';
+                }
+            }
+
+            // Clear the top message when hiding
+            if (!show) {
+                const topErr = document.getElementById('payment-method-error');
+                if (topErr) topErr.textContent = '';
+            }
+        }
+
         LABKEY.Query.selectRows({
             schemaName: 'targetedms',
-            queryName: 'paymentMethod',
-            sort: 'name',
-            columns: 'Id,UWBudgetNumber,worktag, budgetExpirationDate, name',
+            queryName: 'projectPaymentMethod',
+            sort: 'paymentMethod/name',
+            columns: 'paymentMethod,paymentMethod/name,paymentMethod/UWBudgetNumber,paymentMethod/worktag,paymentMethod/budgetExpirationDate',
+            filterArray: [
+                LABKEY.Filter.create('project', project, LABKEY.Filter.Types.EQUAL)
+            ],
             scope: this,
             success: function (result) {
-                let rows = result.rows;
-                paymentMethodsData = rows;
+                let rows = result.rows || [];
+                // Normalize to the same shape used elsewhere in this file
+                paymentMethodsData = rows.map(function(r) {
+                    return {
+                        Id: r.paymentMethod,
+                        name: r['paymentMethod/name'],
+                        UWBudgetNumber: r['paymentMethod/UWBudgetNumber'],
+                        worktag: r['paymentMethod/worktag'],
+                        budgetExpirationDate: r['paymentMethod/budgetExpirationDate']
+                    };
+                });
                 let paymentMethodDropDown = '<select id="paymentMethodDropDown" name="paymentMethodDropDown">';
-                for (let i = 0; i < rows.length; i++) {
-                    paymentMethodDropDown += '<option value="' + LABKEY.Utils.encodeHtml(rows[i].Id) + '">' + LABKEY.Utils.encodeHtml(rows[i].name) + '</option>';
+                for (let i = 0; i < paymentMethodsData.length; i++) {
+                    paymentMethodDropDown += '<option value="' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].Id) + '">' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].name) + '</option>';
                 }
                 paymentMethodDropDown += '</select>';
-
-                paymentMethodDropDown += '&nbsp<input type="text" id="paymentMethodPercent" name="paymentMethodPercent" value="100" size="3" maxlength="3">';
-                paymentMethodDropDown += '<label for="paymentMethodPercent">%</label>';
+                // Always render a percent input for the first row; visibility will be toggled based on row count
+                paymentMethodDropDown += '&nbsp;<span class="paymentPercentGroup" style="display:none;"><input type="text" class="paymentMethodPercent" name="paymentMethodPercent" value="100" size="3" maxlength="3"><label>%</label></span>';
 
                 jQuery('#paymentMethodDropDown').html(paymentMethodDropDown);
 
+                // Attach live validation listeners to the first row percent input
+                const firstPercent = document.querySelector('#paymentMethodDropDown .paymentMethodPercent');
+                if (firstPercent) {
+                    firstPercent.addEventListener('input', validationCallback);
+                    firstPercent.addEventListener('change', validationCallback);
+                }
+
+                // Toggle visibility based on how many rows are present
+                updatePercentInputsVisibility();
+                // Run validation once to clear or show any messages
+                validatePaymentMethodPercentsAndShow();
+
+                // Hide or show the Add Payment Method control based on count
+                const addBtn = document.getElementById('addPaymentMethod');
+                if (addBtn) {
+                    if (paymentMethodsData.length <= 1) {
+                        addBtn.style.display = 'none';
+                    } else {
+                        addBtn.style.display = '';
+                    }
+                }
+
+                // If there are no payment methods, disable Save and inform the user
+                const saveBtn = document.getElementById('save-event');
+                const scheduleError = document.getElementById('schedule-save-error');
+                if (paymentMethodsData.length === 0) {
+                    if (saveBtn) saveBtn.setAttribute('disabled', 'disabled');
+                    if (scheduleError) scheduleError.textContent = 'No payment methods are configured for this project. Please contact an administrator.';
+                }
+                else {
+                    if (saveBtn) saveBtn.removeAttribute('disabled');
+                    if (scheduleError) scheduleError.textContent = '';
+                }
+
             }
         });
 
@@ -460,16 +583,40 @@ <h3>Time Scheduled</h3>
             // get the paymentMethod and percentPayment from the html fields
             paymentMethods = [];
             let paymentMethodDropDowns = document.querySelectorAll('#paymentMethodDropDown select');
-            let percentPaymentFields = document.querySelectorAll('#paymentMethodPercent');
+            let percentPaymentFields = document.querySelectorAll('.paymentMethodPercent');
+
+            // Validation: ensure numeric values and totals add to 100 when multiple entries
+            let percentTotal = 0;
+            let invalidPercent = false;
             for (let i = 0; i < paymentMethodDropDowns.length; i++) {
                 let paymentMethodId = paymentMethodDropDowns[i].value;
-                let paymentMethodPercent = percentPaymentFields[i].value;
+                let percentVal = percentPaymentFields[i] ? percentPaymentFields[i].value : (paymentMethodDropDowns.length === 1 ? '100' : '0');
+                let percentNum = parseFloat(percentVal);
+                if (percentPaymentFields.length > 0) {
+                    // only validate when inputs are present (multiple methods)
+                    if (isNaN(percentNum) || percentNum < 0 || percentNum > 100) {
+                        invalidPercent = true;
+                    }
+                    percentTotal += isNaN(percentNum) ? 0 : percentNum;
+                }
                 paymentMethods.push({
                     paymentMethod: paymentMethodId,
-                    percentPayment: paymentMethodPercent
+                    percentPayment: percentVal
                 });
             }
 
+            const scheduleError = document.getElementById('schedule-save-error');
+            if (invalidPercent) {
+                if (scheduleError) scheduleError.textContent = 'Each payment percentage must be a number between 0 and 100.';
+                return;
+            }
+            if (percentPaymentFields.length > 1 && percentTotal !== 100) {
+                if (scheduleError) scheduleError.textContent = 'When multiple payment methods are used, the percentages must add up to 100% (current total: ' + percentTotal + '%).';
+                return;
+            } else if (scheduleError) {
+                scheduleError.textContent = '';
+            }
+
             fetchInstrumentCosts(eventToSave.instrument, eventToSave.startTime, eventToSave.endTime, true);
 
             // TODO: Make sure user has not exceeded instrument time quota
@@ -538,40 +685,27 @@ <h3>Time Scheduled</h3>
 
         function saveEvent() {
 
-            let instrumentScheduleCommand = {
-                command: eventToSave.id ? 'update' : 'insert',
-                schemaName: 'targetedms',
-                queryName: 'instrumentSchedule',
-                rows: [
-                    eventToSave
-                ]
-            };
-
             let instrumentUsagePaymentRows = [];
             if (paymentMethods.length > 0) {
                 for (let i = 0; i < paymentMethods.length; i++) {
                     instrumentUsagePaymentRows.push({
-                        instrumentScheduleId: eventToSave.id,
                         paymentMethod: paymentMethods[i].paymentMethod,
                         percentPayment: paymentMethods[i].percentPayment
                     });
                 }
             }
 
-            let instrumentUsagePaymentCommand = {
+            eventToSave.usagePayments = instrumentUsagePaymentRows;
+
+            let instrumentScheduleCommand = {
                 command: eventToSave.id ? 'update' : 'insert',
                 schemaName: 'targetedms',
-                queryName: 'instrumentUsagePayment',
-                rows: instrumentUsagePaymentRows
+                queryName: 'instrumentSchedule',
+                rows: [
+                    eventToSave
+                ]
             };
 
-
-            let commandsToExecute = [instrumentScheduleCommand];
-            if (eventToSave.id) {
-                commandsToExecute.push(instrumentUsagePaymentCommand);
-            }
-
-
             LABKEY.Query.saveRows({
                 commands: [instrumentScheduleCommand],
                 success: function (response) {
@@ -589,16 +723,6 @@ <h3>Time Scheduled</h3>
                         for (let i = 0; i < instrumentUsagePaymentRows.length; i++) {
                             instrumentUsagePaymentRows[i].instrumentScheduleId = instrumentScheduleId;
                         }
-
-                        LABKEY.Query.saveRows({
-                            commands: [instrumentUsagePaymentCommand],
-                            success: function () {
-                                // Do nothing
-                            },
-                            failure: function (errorInfo) {
-                                $('#schedule-save-error').text('Error saving. ' + (errorInfo.exception ? errorInfo.exception : ''));
-                            }
-                        });
                     }
                 },
                 failure: function (errorInfo) {
@@ -694,7 +818,7 @@ <h3>Time Scheduled</h3>
                 queryName: 'instrumentSchedule',
                 columns: 'Id,startTime,endTime,name,notes,instrument/color,instrument/Id,project/Id, project/Title',
                 filterArray: [
-                    LABKEY.Filter.create('instrument', instrument ? instrument : $('#instrumentDropDown').val()),
+                    LABKEY.Filter.create('instrument', currentInstrument),
                 ],
                 success: function (data) {
                     let rows = data.rows;
@@ -737,36 +861,51 @@ <h3>Time Scheduled</h3>
             $('#event-modal').modal('hide');
         });
 
-    });
-    let paymentMethodsData;
-    let paymentMethodCount = 1;
-    document.addEventListener('DOMContentLoaded', function () {
+        let paymentMethodsData;
+        let paymentMethodCount = 1;
         const addPaymentMethodEl = document.getElementById('addPaymentMethod');
         addPaymentMethodEl.addEventListener('click', function () {
             paymentMethodCount++;
             let id = 'paymentMethodDropDown' + paymentMethodCount;
-            let paymentMethodDropDown = '<select id=' + id + ' name=' + id + '">';
+            let paymentMethodDropDown = '<select id="' + id + '" name="' + id + '">';
             for (let i = 0; i < paymentMethodsData.length; i++) {
                 paymentMethodDropDown += '<option value="' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].Id) + '">' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].name) + '</option>';
             }
             paymentMethodDropDown += '</select>';
 
-            paymentMethodDropDown += '&nbsp<input type="text" id="paymentMethodPercent" name="paymentMethodPercent" value="0" size="3" maxlength="3">';
-            paymentMethodDropDown += '<label for="paymentMethodPercent">%</label>';
+            // Always render a percent input group; visibility toggled by updatePercentInputsVisibility
+            paymentMethodDropDown += '&nbsp;<span class="paymentPercentGroup" style="display:none;"><input type="text" class="paymentMethodPercent" name="paymentMethodPercent" value="0" size="3" maxlength="3"><label>%</label></span>';
 
-            // TODO: add delete icon
             paymentMethodDropDown += '&nbsp' +
                     '<span id="removePaymentMethod" role="button" style="cursor: pointer;">[Remove]</span>';
             let logElt = document.createElement('div');
             logElt.innerHTML = paymentMethodDropDown;
 
-            document.querySelector('#paymentMethodDropDown').appendChild(logElt);
+            const container = document.querySelector('#paymentMethodDropDown');
+            container.appendChild(logElt);
+
+            // Attach live validation listeners to the newly added input
+            const newInput = logElt.querySelector('.paymentMethodPercent');
+            if (newInput) {
+                newInput.addEventListener('input', validatePaymentMethodPercentsAndShow);
+                newInput.addEventListener('change', validatePaymentMethodPercentsAndShow);
+            }
+
+            // Ensure percent inputs are shown only when multiple rows are present
+            updatePercentInputsVisibility();
+
+            // Re-run validation after adding a row
+            validatePaymentMethodPercentsAndShow();
         });
 
         document.addEventListener('click', function (event) {
             if (event.target.id === 'removePaymentMethod') {
                 event.preventDefault();
                 event.target.parentElement.remove();
+                // Update visibility after removal
+                updatePercentInputsVisibility();
+                // Re-validate after removal to update the message and totals
+                validatePaymentMethodPercentsAndShow();
             }
         });
 
@@ -781,7 +920,5 @@ <h3>Time Scheduled</h3>
         });
 
         document.getElementById('instrument-rates').innerHTML = LABKEY.Utils.textLink({text: 'View the current rates for instruments', href: LABKEY.ActionURL.buildURL('query', 'executeQuery', LABKEY.ActionURL.getContainer(), {schemaName: 'targetedms', 'query.queryName': 'InstrumentRate'})});
-
     });
-
 </script>
\ No newline at end of file
diff --git a/src/org/labkey/targetedms/TargetedMSManager.java b/src/org/labkey/targetedms/TargetedMSManager.java
index 46ef668b3..7af575ee6 100644
--- a/src/org/labkey/targetedms/TargetedMSManager.java
+++ b/src/org/labkey/targetedms/TargetedMSManager.java
@@ -689,6 +689,11 @@ public static TableInfo getTableInfoInstrumentSchedule()
         return getSchema().getTable(TargetedMSSchema.TABLE_INSTRUMENT_SCHEDULE);
     }
 
+    public static TableInfo getTableInfoInstrumentUsagePayment()
+    {
+        return getSchema().getTable(TargetedMSSchema.TABLE_INSTRUMENT_USAGE_PAYMENT);
+    }
+
     /** @return rowId for pipeline job that will perform the import asynchronously */
     public static Long addRunToQueue(ViewBackgroundInfo info,
                                         final Path path) throws XarFormatException, PipelineValidationException
diff --git a/src/org/labkey/targetedms/TargetedMSSchema.java b/src/org/labkey/targetedms/TargetedMSSchema.java
index 748540ab4..ac0e68e9e 100644
--- a/src/org/labkey/targetedms/TargetedMSSchema.java
+++ b/src/org/labkey/targetedms/TargetedMSSchema.java
@@ -17,6 +17,7 @@
 package org.labkey.targetedms;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
@@ -50,7 +51,6 @@
 import org.labkey.api.gwt.client.AuditBehaviorType;
 import org.labkey.api.module.Module;
 import org.labkey.api.query.CustomView;
-import org.labkey.api.query.DefaultQueryUpdateService;
 import org.labkey.api.query.DefaultSchema;
 import org.labkey.api.query.DetailsURL;
 import org.labkey.api.query.ExprColumn;
@@ -62,15 +62,12 @@
 import org.labkey.api.query.QuerySchema;
 import org.labkey.api.query.QueryService;
 import org.labkey.api.query.QuerySettings;
-import org.labkey.api.query.QueryUpdateService;
 import org.labkey.api.query.QueryView;
 import org.labkey.api.query.SchemaKey;
 import org.labkey.api.query.SimpleUserSchema;
 import org.labkey.api.query.UserIdQueryForeignKey;
 import org.labkey.api.query.UserSchema;
 import org.labkey.api.security.User;
-import org.labkey.api.security.UserPrincipal;
-import org.labkey.api.security.permissions.Permission;
 import org.labkey.api.targetedms.RepresentativeDataState;
 import org.labkey.api.targetedms.RunRepresentativeDataState;
 import org.labkey.api.util.ContainerContext;
@@ -87,6 +84,8 @@
 import org.labkey.targetedms.parser.Chromatogram;
 import org.labkey.targetedms.parser.ChromatogramBinaryFormat;
 import org.labkey.targetedms.parser.SkylineBinaryParser;
+import org.labkey.targetedms.query.InstrumentScheduleTable;
+import org.labkey.targetedms.query.InstrumentUsagePaymentTrigger;
 import org.labkey.targetedms.query.AnnotatedTargetedMSTable;
 import org.labkey.targetedms.query.CalibrationCurveTable;
 import org.labkey.targetedms.query.DocTransitionsTableInfo;
@@ -111,6 +110,7 @@
 import org.labkey.targetedms.query.QCTraceMetricValuesTable;
 import org.labkey.targetedms.query.RepresentativeStateDisplayColumn;
 import org.labkey.targetedms.query.SampleFileTable;
+import org.labkey.targetedms.query.SimpleTargetedMSTable;
 import org.labkey.targetedms.query.SkylineAuditTable;
 import org.labkey.targetedms.query.TargetedMSCrosstabView;
 import org.labkey.targetedms.query.TargetedMSForeignKey;
@@ -1602,36 +1602,31 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
         {
             return new QCEmailNotificationsTable(this, cf);
         }
+
+        if (TABLE_INSTRUMENT_SCHEDULE.equalsIgnoreCase(name))
+        {
+            return new InstrumentScheduleTable(this, cf);
+        }
+
         if (TABLE_MS_PROJECT.equalsIgnoreCase(name) ||
                 TABLE_PROJECT_RESEARCHER.equalsIgnoreCase(name) ||
                 TABLE_MS_INSTRUMENT.equalsIgnoreCase(name) ||
                 TABLE_PAYMENT_METHOD.equalsIgnoreCase(name) ||
                 TABLE_PROJECT_PAYMENT_METHOD.equalsIgnoreCase(name) ||
-                TABLE_INSTRUMENT_SCHEDULE.equalsIgnoreCase(name) ||
                 TABLE_RATE_TYPE.equalsIgnoreCase(name) ||
                 TABLE_INSTRUMENT_RATE.equalsIgnoreCase(name) ||
                 TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name) ||
                 TABLE_INSTRUMENT_NICKNAME.equalsIgnoreCase(name))
         {
-            var result = new FilteredTable<>(getSchema().getTable(name), this, cf)
-            {
-                @Override
-                public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class<? extends Permission> perm)
-                {
-                    return getContainer().hasPermission(user, perm);
-                }
-
-                @Override @NotNull
-                public QueryUpdateService getUpdateService()
-                {
-                    return new DefaultQueryUpdateService(this, getRealTable());
-                }
-            };
-            result.wrapAllColumns(true);
+            var result = new SimpleTargetedMSTable(name, this, cf);
             if (TABLE_INSTRUMENT_NICKNAME.equalsIgnoreCase(name))
             {
                 result.setAuditBehavior(AuditBehaviorType.DETAILED);
             }
+            if (TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name))
+            {
+                result.addTriggerFactory((c, table, extraContext) -> List.of(new InstrumentUsagePaymentTrigger("InstrumentScheduleId")));
+            }
             TargetedMSTable.fixupLookups(result);
             return result;
         }
@@ -1862,12 +1857,12 @@ public QueryDefinition getQueryDef(@NotNull String queryName)
     {
         QueryDefinition result = super.getQueryDef(queryName);
 
-        if (result == null && StringUtils.startsWithIgnoreCase(queryName, QUERY_PTM_PERCENTS_PREFIX))
+        if (result == null && Strings.CI.startsWith(queryName, QUERY_PTM_PERCENTS_PREFIX))
         {
             result = createRunScopedPTMQuery(QUERY_PTM_PERCENTS_PREFIX, "PTMPercents", queryName);
         }
 
-        if (result == null && StringUtils.startsWithIgnoreCase(queryName, QUERY_PTM_PERCENTS_GROUPED_PREFIX))
+        if (result == null && Strings.CI.startsWith(queryName, QUERY_PTM_PERCENTS_GROUPED_PREFIX))
         {
             result = createRunScopedPTMQuery(QUERY_PTM_PERCENTS_GROUPED_PREFIX, "PTMPercentsGrouped", queryName);
         }
diff --git a/src/org/labkey/targetedms/query/InstrumentScheduleTable.java b/src/org/labkey/targetedms/query/InstrumentScheduleTable.java
new file mode 100644
index 000000000..9eb6ef354
--- /dev/null
+++ b/src/org/labkey/targetedms/query/InstrumentScheduleTable.java
@@ -0,0 +1,73 @@
+package org.labkey.targetedms.query;
+
+import org.jetbrains.annotations.NotNull;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.labkey.api.data.Container;
+import org.labkey.api.data.ContainerFilter;
+import org.labkey.api.data.TableInfo;
+import org.labkey.api.query.BatchValidationException;
+import org.labkey.api.query.DefaultQueryUpdateService;
+import org.labkey.api.query.DuplicateKeyException;
+import org.labkey.api.query.QueryUpdateService;
+import org.labkey.api.query.QueryUpdateServiceException;
+import org.labkey.api.query.ValidationException;
+import org.labkey.api.security.User;
+import org.labkey.targetedms.TargetedMSSchema;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class InstrumentScheduleTable extends SimpleTargetedMSTable
+{
+    public InstrumentScheduleTable(TargetedMSSchema schema, ContainerFilter cf)
+    {
+        super(TargetedMSSchema.TABLE_INSTRUMENT_SCHEDULE, schema, cf);
+        addTriggerFactory((c, table, extraContext) -> List.of(new InstrumentUsagePaymentTrigger("Id")));
+    }
+
+    @Override
+    public @NotNull QueryUpdateService getUpdateService()
+    {
+        return new DefaultQueryUpdateService(this, getRealTable())
+        {
+            @Override
+            protected Map<String, Object> insertRow(User user, Container container, Map<String, Object> row) throws DuplicateKeyException, ValidationException, QueryUpdateServiceException, SQLException
+            {
+                Map<String, Object> result = super.insertRow(user, container, row);
+                Object paymentInfo = row.get("UsagePayments");
+                if (paymentInfo instanceof JSONArray a)
+                {
+                    List<Map<String, Object>> paymentRows = new ArrayList<>();
+                    for (Object o : a)
+                    {
+                        if (o instanceof JSONObject jsonObject)
+                        {
+                            Map<String, Object> rowMap = jsonObject.toMap();
+                            rowMap.put("InstrumentScheduleId", result.get("Id"));
+                            paymentRows.add(rowMap);
+                        }
+                    }
+
+                    TableInfo paymentTable = getUserSchema().getTableOrThrow(TargetedMSSchema.TABLE_INSTRUMENT_USAGE_PAYMENT);
+                    BatchValidationException errors = new BatchValidationException();
+                    try
+                    {
+                        paymentTable.getUpdateService().insertRows(getUserSchema().getUser(), getUserSchema().getContainer(), paymentRows, errors, null, null);
+                    }
+                    catch (BatchValidationException e)
+                    {
+                        throw e.getLastRowError();
+                    }
+                    if (errors.hasErrors())
+                    {
+                        throw errors.getLastRowError();
+                    }
+                }
+                return result;
+            }
+        };
+    }
+}
diff --git a/src/org/labkey/targetedms/query/InstrumentUsagePaymentTrigger.java b/src/org/labkey/targetedms/query/InstrumentUsagePaymentTrigger.java
new file mode 100644
index 000000000..8c08da313
--- /dev/null
+++ b/src/org/labkey/targetedms/query/InstrumentUsagePaymentTrigger.java
@@ -0,0 +1,86 @@
+package org.labkey.targetedms.query;
+
+import org.jetbrains.annotations.Nullable;
+import org.labkey.api.action.ApiUsageException;
+import org.labkey.api.data.Container;
+import org.labkey.api.data.DbScope;
+import org.labkey.api.data.SQLFragment;
+import org.labkey.api.data.SqlSelector;
+import org.labkey.api.data.TableInfo;
+import org.labkey.api.data.triggers.Trigger;
+import org.labkey.api.query.BatchValidationException;
+import org.labkey.api.query.ValidationException;
+import org.labkey.api.security.User;
+import org.labkey.targetedms.TargetedMSManager;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Ensures that all edits to instrument usage payments add up to 100%.
+ */
+public class InstrumentUsagePaymentTrigger implements Trigger
+{
+    private final Set<Integer> _schedulesToCheck = new HashSet<>();
+    private final String _instrumentScheduleColumnName;
+
+    public InstrumentUsagePaymentTrigger(String instrumentScheduleColumnName)
+    {
+        _instrumentScheduleColumnName = instrumentScheduleColumnName;
+    }
+
+    @Override
+    public void afterUpdate(TableInfo table, Container c, User user, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
+    {
+        trackChange(newRow);
+    }
+
+    private void trackChange(Map<String, Object> row) throws ValidationException
+    {
+        Number number = (Number) row.get(_instrumentScheduleColumnName);
+        if (number == null)
+        {
+            throw new ValidationException(_instrumentScheduleColumnName + " cannot be null");
+        }
+        _schedulesToCheck.add(number.intValue());
+    }
+
+    @Override
+    public void afterInsert(TableInfo table, Container c, User user, @Nullable Map<String, Object> newRow, ValidationException errors, Map<String, Object> extraContext, @Nullable Map<String, Object> existingRecord) throws ValidationException
+    {
+        trackChange(newRow);
+    }
+
+    @Override
+    public void beforeDelete(TableInfo table, Container c, User user, @Nullable Map<String, Object> oldRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
+    {
+        trackChange(oldRow);
+    }
+
+    @Override
+    public void complete(TableInfo table, Container c, User user, TableInfo.TriggerType event, BatchValidationException errors, Map<String, Object> extraContext)
+    {
+        table.getSchema().getScope().addCommitTask(() ->
+        {
+            SQLFragment sql = new SQLFragment("SELECT * FROM (\n");
+            sql.append("SELECT COUNT(*) AS C, s.Id, SUM(PercentPayment) AS PercentTotal FROM ");
+            sql.append(TargetedMSManager.getTableInfoInstrumentSchedule(), "s");
+            sql.append(" LEFT OUTER JOIN ");
+            sql.append(TargetedMSManager.getTableInfoInstrumentUsagePayment(), "iup");
+            sql.append(" ON s.Id = iup.InstrumentScheduleId\n");
+            sql.append(" GROUP BY s.Id\n");
+            sql.append(") x\n");
+            sql.append(" WHERE (PercentTotal != 100 OR PercentTotal IS NULL) AND Id ");
+            sql.appendInClause(_schedulesToCheck, table.getSchema().getSqlDialect());
+
+            Collection<Map<String, Object>> rows = new SqlSelector(TargetedMSManager.getSchema(), sql).getMapCollection();
+
+            if (!rows.isEmpty())
+            {
+                throw new ApiUsageException("Instrument usage payments do not add up to 100%");
+            }
+        }, DbScope.CommitTaskOption.PRECOMMIT);
+    }
+}
diff --git a/src/org/labkey/targetedms/query/SimpleTargetedMSTable.java b/src/org/labkey/targetedms/query/SimpleTargetedMSTable.java
new file mode 100644
index 000000000..79309419e
--- /dev/null
+++ b/src/org/labkey/targetedms/query/SimpleTargetedMSTable.java
@@ -0,0 +1,32 @@
+package org.labkey.targetedms.query;
+
+import org.jetbrains.annotations.NotNull;
+import org.labkey.api.data.ContainerFilter;
+import org.labkey.api.query.DefaultQueryUpdateService;
+import org.labkey.api.query.FilteredTable;
+import org.labkey.api.query.QueryUpdateService;
+import org.labkey.api.security.UserPrincipal;
+import org.labkey.api.security.permissions.Permission;
+import org.labkey.targetedms.TargetedMSSchema;
+
+public class SimpleTargetedMSTable extends FilteredTable<TargetedMSSchema>
+{
+    public SimpleTargetedMSTable(String name, TargetedMSSchema schema, ContainerFilter cf)
+    {
+        super(TargetedMSSchema.getSchema().getTable(name), schema, cf);
+        wrapAllColumns(true);
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class<? extends Permission> perm)
+    {
+        return getContainer().hasPermission(user, perm);
+    }
+
+    @Override
+    @NotNull
+    public QueryUpdateService getUpdateService()
+    {
+        return new DefaultQueryUpdateService(this, getRealTable());
+    }
+}

From d3321c04d97050e36060aaeaa7ff1c454a8e116f Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Thu, 30 Oct 2025 09:30:04 -0700
Subject: [PATCH 02/12] Checkpoint - server-side validation, project-scoped
 permissions

---
 resources/views/scheduleInstrument.html       | 324 ++++++++++--------
 .../labkey/targetedms/TargetedMSSchema.java   |  33 +-
 .../query/AdminSchedulingTable.java           |  37 ++
 .../InstrumentScheduleOverlapTrigger.java     |  92 +++++
 .../query/InstrumentScheduleTable.java        |   7 +-
 .../query/OwnProjectSchedulingTable.java      | 151 ++++++++
 .../targetedms/query/TargetedMSTable.java     |   4 +-
 7 files changed, 492 insertions(+), 156 deletions(-)
 create mode 100644 src/org/labkey/targetedms/query/AdminSchedulingTable.java
 create mode 100644 src/org/labkey/targetedms/query/InstrumentScheduleOverlapTrigger.java
 create mode 100644 src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java

diff --git a/resources/views/scheduleInstrument.html b/resources/views/scheduleInstrument.html
index 9ceacdfce..fad60226e 100644
--- a/resources/views/scheduleInstrument.html
+++ b/resources/views/scheduleInstrument.html
@@ -4,14 +4,14 @@
             <td class="labkey-form-label"><label for="instrumentDropDown">Instrument</label></td>
             <td><select id="instrumentDropDown" name="instrumentDropDown"></select></td>
         </tr>
-        <tr>
-            <td class="labkey-form-label"><label for="instrumentOperatorDropDown">Operator</label></td>
-            <td><select id="instrumentOperatorDropDown" name="instrumentOperatorDropDown"></select></td>
-        </tr>
         <tr>
             <td class="labkey-form-label"><label for="projectDropDown">Project</label></td>
             <td><select id="projectDropDown" name="projectDropDown"></select></td>
         </tr>
+        <tr>
+            <td class="labkey-form-label"><label for="instrumentOperatorDropDown">Operator</label></td>
+            <td><select id="instrumentOperatorDropDown" name="instrumentOperatorDropDown"></select></td>
+        </tr>
         <tr>
             <td class="labkey-form-label" rowspan="10"><label for="paymentMethodDropDown">Payment method</label></td>
             <td><div id="paymentMethodDropDown"></div></td>
@@ -46,14 +46,10 @@ <h5 class="modal-title">Add Instrument Time</h5>
 
                         <div class="form-group row">
                             <label for="min-date" class="col-sm-2 control-label">Dates</label>
-                            <div class="col-sm-5">
-                                <div class="input-group input-daterange" data-provide="datepicker">
-                                    <input id="min-date" name="event-start-date" type="datetime-local" class="form-control">
-                                    <div class="input-group-prepend input-group-append">
-                                        <div class="input-group-text"><label for="event-end-date">to</label></div>
-                                    </div>
-                                    <input name="event-end-date" id="event-end-date" type="datetime-local" class="form-control">
-                                </div>
+                            <div class="col-sm-10">
+                                <input id="min-date" name="event-start-date" type="datetime-local">
+                                <label for="event-end-date">to</label>
+                                <input id="event-end-date" name="event-end-date" type="datetime-local">
                             </div>
                         </div>
                         <div class="form-group row">
@@ -68,76 +64,40 @@ <h5 class="modal-title">Add Instrument Time</h5>
                                 <input id="event-notes" name="event-notes" size="50" type="text" class="form-control">
                             </div>
                         </div>
-                        <div class="form-group row" >
-                            <div class="col-sm-10 offset-sm-2 labkey-error" style="min-height: 2em;" id="schedule-save-error"></div>
-                        </div>
-                    </form>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" id="close-schedule" data-dismiss="modal">Cancel</button>
-                    <button type="button" class="btn btn-primary" id="delete-event">
-                        Delete
-                    </button>
-                    <button type="button" class="btn btn-primary" id="add-event">
-                        Add
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="modal fade" id="cost-modal">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title">Confirm Instrument Time</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <input type="hidden" name="event-index">
-                    <form class="form-horizontal">
-
-                        <div class="form-group row">
-                            <div class="col-sm-8">
-                                <div class="input-group-text">The requested time will incur the following cost:</div>
-                            </div>
-                        </div>
+                        <!-- Live cost preview -->
                         <div class="form-group row">
-                            <label class="col-sm-4 control-label" for="setup-cost">Setup fee</label>
-                            <div class="col-sm-8">
-                                <input id="setup-cost" name="setup-cost" type="text" readonly="readonly" class="form-control"/>
+                            <label class="col-sm-2 control-label" for="preview-setup-cost">Setup fee</label>
+                            <div class="col-sm-2">
+                                <input id="preview-setup-cost" name="preview-setup-cost" type="text" readonly="readonly" class="form-control" />
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label class="col-sm-4 control-label" for="instrument-fee">Instrument fee</label>
-                            <div class="col-sm-8">
-                                <input id="instrument-fee" type="text" readonly="readonly" class="form-control"/>
+                            <label class="col-sm-2 control-label" for="preview-instrument-fee">Instrument fee</label>
+                            <div class="col-sm-2">
+                                <input id="preview-instrument-fee" name="preview-instrument-fee" type="text" readonly="readonly" class="form-control" />
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label class="col-sm-4 control-label" for="total-cost">Total fee</label>
-                            <div class="col-sm-8">
-                                <input id="total-cost" type="text" readonly="readonly" class="form-control"/>
+                            <label class="col-sm-2 control-label" for="preview-total-cost">Total fee</label>
+                            <div class="col-sm-2">
+                                <input id="preview-total-cost" name="preview-total-cost" type="text" readonly="readonly" class="form-control" />
                             </div>
                         </div>
                         <div class="form-group row">
-                            <div class="col-sm-8">
-                                <div class="input-group-text">Are you sure you want to continue?</div>
-                            </div>
+                            <div class="col-sm-12 labkey-error" style="min-height: 2em;" id="schedule-preview-error"></div>
                         </div>
                         <div class="form-group row" >
-                            <div class="col-sm-12 labkey-error" style="min-height: 2em;" id="schedule-cost-error"></div>
+                            <div class="col-sm-10 offset-sm-2 labkey-error" style="min-height: 2em;" id="schedule-save-error"></div>
                         </div>
                     </form>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-primary" id="close-event">
-                        No
+                    <button type="button" class="btn btn-default" id="close-schedule" data-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-primary" id="delete-event">
+                        Delete
                     </button>
-                    <button type="button" class="btn btn-primary" id="save-event">
-                        Yes
+                    <button type="button" class="btn btn-primary" id="add-event">
+                        Add
                     </button>
                 </div>
             </div>
@@ -187,7 +147,7 @@ <h3>Time Scheduled</h3>
 
         LABKEY.Query.selectRows({
             schemaName: 'targetedms',
-            queryName: 'msProject',
+            queryName: 'userProjects',
             sort: 'Title',
             columns: 'Id,Title',
             scope: this,
@@ -269,7 +229,7 @@ <h3>Time Scheduled</h3>
                         eventMouseEnter: function (mouseEnterInfo) {
                             removeEventLog();
                             let instrumentID = instrument ? instrument : $('#instrumentDropDown').val();
-                            fetchInstrumentCosts(instrumentID, mouseEnterInfo.event.start, mouseEnterInfo.event.end, false);
+                            fetchInstrumentCosts(instrumentID, mouseEnterInfo.event.start, mouseEnterInfo.event.end);
                             let content = '';
                             let dateStr = DateFormat.format.date(mouseEnterInfo.event.start, LABKEY.container.formats.dateTimeFormat) + ' - ' + DateFormat.format.date(mouseEnterInfo.event.end, LABKEY.container.formats.dateTimeFormat);
                             content += '<div class="event-tooltip-content">'
@@ -486,7 +446,7 @@ <h3>Time Scheduled</h3>
         LABKEY.Query.selectRows({
             schemaName: 'targetedms',
             queryName: 'projectResearcher',
-            sort: 'name',
+            sort: 'researcher/displayName',
             columns: 'Id,researcher/displayName,researcher/UserId,project',
             filterArray: [
                 LABKEY.Filter.create('project', project, LABKEY.Filter.Types.EQUAL),
@@ -503,7 +463,7 @@ <h3>Time Scheduled</h3>
                     let option = document.createElement('option');
                     option.value = rows[i]['researcher/UserId'];
                     option.text = rows[i]['researcher/displayName'];
-                    if (instrument === rows[i].Id) {
+                    if (LABKEY.user.id === rows[i]['researcher/UserId']) {
                         option.selected = true;
                     }
                     instrumentOperatorDropDown.appendChild(option);
@@ -536,13 +496,13 @@ <h3>Time Scheduled</h3>
             $('#event-modal input[name="event-notes"]').val(event ? event.notes : '');
             $('#delete-event').toggle(!!event.id);
             $('#add-event').text('Save');
+            $('#schedule-save-error').text('');
+            $('#schedule-cost-error').text('');
             $('#event-modal').modal();
         }
 
         function closeEvent() {
             removeEventLog();
-            $('#schedule-cost-error').text('');
-            $('#cost-modal').modal('hide');
         }
 
         function addEvent() {
@@ -560,26 +520,6 @@ <h3>Time Scheduled</h3>
                 return;
             }
 
-            const events = calendar.getEvents();
-            // validate that the events time do not overlap with existing events
-            for (let i = 0; i < events.length; i++) {
-                if (eventToSave.id !== events[i].id) {
-                    let newEvent = {
-                        start: new Date(eventToSave.startTime),
-                        end: new Date(eventToSave.endTime)
-                    };
-                    let existingEvent = {
-                        start: events[i].start,
-                        end: events[i].end
-                    };
-
-                    if (eventsOverlap(newEvent, existingEvent)) {
-                        alert('New schedule overlaps with existing instrument schedule');
-                        return;
-                    }
-                }
-            }
-
             // get the paymentMethod and percentPayment from the html fields
             paymentMethods = [];
             let paymentMethodDropDowns = document.querySelectorAll('#paymentMethodDropDown select');
@@ -617,13 +557,122 @@ <h3>Time Scheduled</h3>
                 scheduleError.textContent = '';
             }
 
-            fetchInstrumentCosts(eventToSave.instrument, eventToSave.startTime, eventToSave.endTime, true);
+            // Live preview is already shown as dates change. Save directly.
+            saveEvent();
+        }
+
+        // Debounce helper for frequent UI events
+        function debounce(fn, wait) {
+            let t;
+            return function() {
+                const ctx = this, args = arguments;
+                clearTimeout(t);
+                t = setTimeout(function(){ fn.apply(ctx, args); }, wait);
+            };
+        }
+
+        // Calculate and render live cost preview inside the event modal without changing logs
+        function calculateAndRenderCostPreview(instrumentId, startDate, endDate) {
+            const previewErrorEl = $('#schedule-preview-error');
+            const setupEl = $('#preview-setup-cost');
+            const instEl = $('#preview-instrument-fee');
+            const totalEl = $('#preview-total-cost');
+
+            // Clear previous values
+            setupEl.val('');
+            instEl.val('');
+            totalEl.val('');
+            previewErrorEl.text('');
+
+            if (!instrumentId || !startDate || !endDate) {
+                return;
+            }
+            const start = new Date(startDate);
+            const end = new Date(endDate);
+            if (isNaN(start.getTime()) || isNaN(end.getTime())) {
+                return;
+            }
+            if (end <= start) {
+                previewErrorEl.text('End date must be after start date.');
+                return;
+            }
+
+            LABKEY.Query.selectRows({
+                schemaName: 'targetedms',
+                queryName: 'instrumentRate',
+                columns: 'Id,fee,rateType',
+                filterArray: [
+                    LABKEY.Filter.create('instrument', instrumentId, LABKEY.Filter.Types.EQUAL)
+                ],
+                success: function (data) {
+                    if (data.rows.length === 0) {
+                        previewErrorEl.text('No rate found for instrument.');
+                        return;
+                    }
+                    let fee = data.rows[0].fee;
+                    let rateType = data.rows[0].rateType;
+                    let cost = fee * (Math.abs(end - start)) / 1000 / 60 / 60;
+
+                    LABKEY.Query.selectRows({
+                        schemaName: 'targetedms',
+                        queryName: 'rateType',
+                        columns: 'Id,name,setupFee',
+                        filterArray: [
+                            LABKEY.Filter.create('Id', rateType, LABKEY.Filter.Types.EQUAL)
+                        ],
+                        success: function (rt) {
+                            let setupFee = rt.rows[0].setupFee;
+                            let instrumentFee = Math.round((cost + Number.EPSILON) * 100) / 100;
+                            setupFee = Math.round((setupFee + Number.EPSILON) * 100) / 100;
+                            let total = Math.round(((setupFee + instrumentFee) + Number.EPSILON) * 100) / 100;
+
+                            setupEl.val('$' + setupFee.toLocaleString('en-US', {
+                                minimumFractionDigits: 2,
+                                maximumFractionDigits: 2
+                            }));
+                            instEl.val('$' + instrumentFee.toLocaleString('en-US', {
+                                minimumFractionDigits: 2,
+                                maximumFractionDigits: 2
+                            }));
+                            totalEl.val('$' + total.toLocaleString('en-US', {
+                                minimumFractionDigits: 2,
+                                maximumFractionDigits: 2
+                            }));
+                        },
+                        failure: function (errorInfo) {
+                            previewErrorEl.text('Error calculating cost ' + (errorInfo.exception ? errorInfo.exception : ''));
+                        }
+                    });
+                },
+                failure: function (errorInfo) {
+                    previewErrorEl.text('Error fetching instrument rate ' + (errorInfo.exception ? errorInfo.exception : ''));
+                }
+            });
+        }
 
-            // TODO: Make sure user has not exceeded instrument time quota
-            // TODO: Email admins
+        // Helper to read current form values and trigger preview
+        function triggerCostPreviewNow() {
+            const currentInstrument = instrument ? instrument : $('#instrumentDropDown').val();
+            const startVal = $('#event-modal input[name="event-start-date"]').val();
+            const endVal = $('#event-modal input[name="event-end-date"]').val();
+            calculateAndRenderCostPreview(currentInstrument, startVal, endVal);
         }
+        const triggerCostPreview = debounce(triggerCostPreviewNow, 300);
 
-        function fetchInstrumentCosts(instrumentId, startDate, endDate, showCostModal) {
+        // Bind listeners for live updates
+        $(document).on('input change', '#event-modal input[name="event-start-date"], #event-modal input[name="event-end-date"]', function(){
+            triggerCostPreview();
+        });
+        $(document).on('change', '#instrumentDropDown', function(){
+            triggerCostPreview();
+        });
+
+        // Kick off preview when the modal opens
+        $('#event-modal').on('shown.bs.modal', function(){
+            triggerCostPreviewNow();
+        });
+
+        function fetchInstrumentCosts(instrumentId, startDate, endDate) {
             LABKEY.Query.selectRows({
                 schemaName: 'targetedms',
                 queryName: 'instrumentRate',
@@ -660,20 +709,30 @@ <h3>Time Scheduled</h3>
                             let totalCost = Math.round(((setupFee + cost) + Number.EPSILON) * 100) / 100;
                             cost = Math.round((cost + Number.EPSILON) * 100) / 100;
                             setupFee = Math.round((setupFee + Number.EPSILON) * 100) / 100;
-                            rowElt.innerHTML = '<td>' + startDateFormatted + '</td><td>' + endDateFormatted + '</td><td id="event-cost">' + '$' + totalCost + '</td>';
+                            rowElt.innerHTML = '<td>' + startDateFormatted + '</td><td>' + endDateFormatted + '</td><td id="event-cost">' + '$' + totalCost.toLocaleString('en-US', {
+                                minimumFractionDigits: 2,
+                                maximumFractionDigits: 2
+                            }) + '</td>';
                             tableElt.appendChild(rowElt);
 
                             const totalEventCostElt = document.getElementById('total-event-cost');
-                            totalEventCostElt.innerHTML = 'Total Cost: $' + totalCost;
-
-                            if (showCostModal) {
-                                $('#setup-cost').val(setupFee);
-                                $('#instrument-fee').val(cost);
-                                $('#total-cost').val(setupFee + cost);
+                            totalEventCostElt.innerHTML = 'Total Cost: $' + totalCost.toLocaleString('en-US', {
+                                minimumFractionDigits: 2,
+                                maximumFractionDigits: 2
+                            });
 
-                                // open the cost modal
-                                $('#cost-modal').modal();
-                            }
+                            $('#setup-cost').val('$' + setupFee.toLocaleString('en-US', {
+                                minimumFractionDigits: 2,
+                                maximumFractionDigits: 2
+                            }));
+                            $('#instrument-fee').val('$' + cost.toLocaleString('en-US', {
+                                minimumFractionDigits: 2,
+                                maximumFractionDigits: 2
+                            }));
+                            $('#total-cost').val('$' + (setupFee + cost).toLocaleString('en-US', {
+                                minimumFractionDigits: 2,
+                                maximumFractionDigits: 2
+                            }));
                         },
                         failure: function (errorInfo) {
                             $('#schedule-cost-error').text('Error calculating cost ' + (errorInfo.exception ? errorInfo.exception : ''));
@@ -713,8 +772,9 @@ <h3>Time Scheduled</h3>
                     loadInstrumentSchedule(function (data) {
                         calendar.getEventSources()[0].remove();
                         calendar.addEventSource(data);
+                        // Update the session events log and totals using the same calculation logic (no modal)
+                        fetchInstrumentCosts(eventToSave.instrument, eventToSave.startTime, eventToSave.endTime);
                         $('#event-modal').modal('hide');
-                        $('#cost-modal').modal('hide');
                     }, true);
 
                     if (instrumentUsagePaymentRows.length > 0 && !eventToSave.id && response?.result[0]?.rows?.length > 0) {
@@ -731,11 +791,6 @@ <h3>Time Scheduled</h3>
             });
         }
 
-        function eventsOverlap(newEvent, existingEvent) {
-            // Check if newEvent starts after existingEvent ends or ends before existingEvent starts
-            return !(newEvent.end <= existingEvent.start || newEvent.start >= existingEvent.end);
-        }
-
         function removeEventLog() {
             let tableElt = document.querySelector('#events-log table');
             // remove the table rows if it exists
@@ -774,24 +829,25 @@ <h3>Time Scheduled</h3>
                         });
                     }
 
-                    let instrumentUsagePaymentCommand = {
-                        command: 'delete',
-                        schemaName: 'targetedms',
-                        queryName: 'instrumentUsagePayment',
-                        rows: instrumentUsagePaymentRows
-                    };
+                    const commands = [];
+                    if (instrumentUsagePaymentRows.length > 0) {
+                        commands.push({
+                            command: 'delete',
+                            schemaName: 'targetedms',
+                            queryName: 'instrumentUsagePayment',
+                            rows: instrumentUsagePaymentRows
+                        });
+                    }
 
-                    let instrumentScheduleCommand = {
+                    commands.push({
                         command: 'delete',
                         schemaName: 'targetedms',
                         queryName: 'instrumentSchedule',
-                        rows: [
-                            event
-                        ]
-                    };
+                        rows: [event]
+                    });
 
                     LABKEY.Query.saveRows({
-                        commands: [instrumentUsagePaymentCommand, instrumentScheduleCommand],
+                        commands: commands,
                         success: function () {
                             loadInstrumentSchedule(function (data) {
                                 calendar.getEventSources()[0].remove()
@@ -840,24 +896,12 @@ <h3>Time Scheduled</h3>
             });
         }
 
-        $('#add-event').click(function() {
-            addEvent();
-        });
-
-        $('#close-event').click(function() {
-            closeEvent();
-        });
-
-        $('#save-event').click(function() {
-            saveEvent();
-        });
-
-        $('#delete-event').click(function () {
-            deleteEvent();
-        });
+        $('#add-event').on('click', addEvent);
+        $('#close-event').on('click', closeEvent);
+        $('#save-event').on('click', saveEvent);
+        $('#delete-event').on('click', deleteEvent);
 
-        $('#close-schedule').click(function () {
-            $('#schedule-save-error').text('');
+        $('#close-schedule').on('click', function () {
             $('#event-modal').modal('hide');
         });
 
diff --git a/src/org/labkey/targetedms/TargetedMSSchema.java b/src/org/labkey/targetedms/TargetedMSSchema.java
index ac0e68e9e..210d124ba 100644
--- a/src/org/labkey/targetedms/TargetedMSSchema.java
+++ b/src/org/labkey/targetedms/TargetedMSSchema.java
@@ -84,6 +84,7 @@
 import org.labkey.targetedms.parser.Chromatogram;
 import org.labkey.targetedms.parser.ChromatogramBinaryFormat;
 import org.labkey.targetedms.parser.SkylineBinaryParser;
+import org.labkey.targetedms.query.AdminSchedulingTable;
 import org.labkey.targetedms.query.InstrumentScheduleTable;
 import org.labkey.targetedms.query.InstrumentUsagePaymentTrigger;
 import org.labkey.targetedms.query.AnnotatedTargetedMSTable;
@@ -96,6 +97,7 @@
 import org.labkey.targetedms.query.MoleculePrecursorTableInfo;
 import org.labkey.targetedms.query.MoleculeTableInfo;
 import org.labkey.targetedms.query.MoleculeTransitionsTableInfo;
+import org.labkey.targetedms.query.OwnProjectSchedulingTable;
 import org.labkey.targetedms.query.PTMPercentsGroupedCustomizer;
 import org.labkey.targetedms.query.PeptideIsotopeModificationTableInfo;
 import org.labkey.targetedms.query.PeptideStructuralModificationTableInfo;
@@ -1598,31 +1600,38 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
             return new SimpleUserSchema.SimpleTable<>(this, getSchema().getTable(TABLE_PEPTIDE_MOLECULE_PRECURSOR_EXCLUSION), cf).init();
         }
 
-        if(TABLE_QC_EMAIL_NOTIFICATIONS.equalsIgnoreCase(name))
+        if (TABLE_QC_EMAIL_NOTIFICATIONS.equalsIgnoreCase(name))
         {
             return new QCEmailNotificationsTable(this, cf);
         }
 
+        if (TABLE_INSTRUMENT_NICKNAME.equalsIgnoreCase(name))
+        {
+            var result = new SimpleTargetedMSTable(name, this, cf);
+            result.setAuditBehavior(AuditBehaviorType.DETAILED);
+            return result;
+        }
+
         if (TABLE_INSTRUMENT_SCHEDULE.equalsIgnoreCase(name))
         {
             return new InstrumentScheduleTable(this, cf);
         }
 
-        if (TABLE_MS_PROJECT.equalsIgnoreCase(name) ||
-                TABLE_PROJECT_RESEARCHER.equalsIgnoreCase(name) ||
-                TABLE_MS_INSTRUMENT.equalsIgnoreCase(name) ||
+        if (TABLE_MS_INSTRUMENT.equalsIgnoreCase(name) ||
                 TABLE_PAYMENT_METHOD.equalsIgnoreCase(name) ||
-                TABLE_PROJECT_PAYMENT_METHOD.equalsIgnoreCase(name) ||
                 TABLE_RATE_TYPE.equalsIgnoreCase(name) ||
                 TABLE_INSTRUMENT_RATE.equalsIgnoreCase(name) ||
-                TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name) ||
-                TABLE_INSTRUMENT_NICKNAME.equalsIgnoreCase(name))
+                // TODO - who can edit this mapping table?
+                TABLE_PROJECT_PAYMENT_METHOD.equalsIgnoreCase(name))
         {
-            var result = new SimpleTargetedMSTable(name, this, cf);
-            if (TABLE_INSTRUMENT_NICKNAME.equalsIgnoreCase(name))
-            {
-                result.setAuditBehavior(AuditBehaviorType.DETAILED);
-            }
+            return new AdminSchedulingTable(name, this, cf);
+        }
+
+        if (TABLE_MS_PROJECT.equalsIgnoreCase(name) ||
+                TABLE_PROJECT_RESEARCHER.equalsIgnoreCase(name) ||
+                TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name))
+        {
+            var result = new OwnProjectSchedulingTable(name, this, cf);
             if (TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name))
             {
                 result.addTriggerFactory((c, table, extraContext) -> List.of(new InstrumentUsagePaymentTrigger("InstrumentScheduleId")));
diff --git a/src/org/labkey/targetedms/query/AdminSchedulingTable.java b/src/org/labkey/targetedms/query/AdminSchedulingTable.java
new file mode 100644
index 000000000..814f2431d
--- /dev/null
+++ b/src/org/labkey/targetedms/query/AdminSchedulingTable.java
@@ -0,0 +1,37 @@
+package org.labkey.targetedms.query;
+
+import org.jetbrains.annotations.NotNull;
+import org.labkey.api.data.ContainerFilter;
+import org.labkey.api.security.UserPrincipal;
+import org.labkey.api.security.permissions.AdminPermission;
+import org.labkey.api.security.permissions.Permission;
+import org.labkey.api.security.permissions.ReadPermission;
+import org.labkey.targetedms.TargetedMSSchema;
+
+/** Tables that only folder admins or higher should be able to modify */
+public class AdminSchedulingTable extends SimpleTargetedMSTable
+{
+    public AdminSchedulingTable(String name, TargetedMSSchema schema, ContainerFilter cf)
+    {
+        super(name, schema, cf);
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class<? extends Permission> perm)
+    {
+        // Admins can do it all
+        if (getUserSchema().getContainer().hasPermission(user, AdminPermission.class))
+        {
+            return true;
+        }
+
+        // Anyone else with folder permissions can read
+        if (perm.equals(ReadPermission.class))
+        {
+            return super.hasPermission(user, perm);
+        }
+
+        // but nothing else
+        return false;
+    }
+}
diff --git a/src/org/labkey/targetedms/query/InstrumentScheduleOverlapTrigger.java b/src/org/labkey/targetedms/query/InstrumentScheduleOverlapTrigger.java
new file mode 100644
index 000000000..159291dcb
--- /dev/null
+++ b/src/org/labkey/targetedms/query/InstrumentScheduleOverlapTrigger.java
@@ -0,0 +1,92 @@
+package org.labkey.targetedms.query;
+
+import org.jetbrains.annotations.Nullable;
+import org.labkey.api.data.Container;
+import org.labkey.api.data.SQLFragment;
+import org.labkey.api.data.SqlSelector;
+import org.labkey.api.data.TableInfo;
+import org.labkey.api.data.triggers.Trigger;
+import org.labkey.api.query.ValidationException;
+import org.labkey.api.security.User;
+import org.labkey.targetedms.TargetedMSManager;
+
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * Prevents overlapping instrument schedule entries for the same instrument.
+ */
+public class InstrumentScheduleOverlapTrigger implements Trigger
+{
+    @Override
+    public void beforeInsert(TableInfo table, Container c, User user, Map<String, Object> newRow, ValidationException errors, Map<String, Object> extraContext)
+    {
+        validateNoOverlap(newRow, null, errors);
+    }
+
+    @Override
+    public void beforeUpdate(TableInfo table, Container c, User user, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow, ValidationException errors, Map<String, Object> extraContext)
+    {
+        // Use the Id from either newRow or oldRow to exclude the current record
+        Integer id = getId(newRow);
+        if (id == null)
+            id = getId(oldRow);
+        validateNoOverlap(newRow, id, errors);
+    }
+
+    private void validateNoOverlap(Map<String, Object> row, @Nullable Integer excludeId, ValidationException errors)
+    {
+        Number instrument = (Number) row.get("Instrument");
+        Date start = (Date) row.get("StartTime");
+        Date end = (Date) row.get("EndTime");
+
+        if (instrument == null)
+        {
+            errors.addGlobalError("Instrument is required");
+            return;
+        }
+        if (start == null || end == null)
+        {
+            errors.addGlobalError("StartTime and EndTime are required");
+            return;
+        }
+        if (!start.before(end))
+        {
+            errors.addGlobalError("StartTime must be before EndTime");
+            return;
+        }
+
+        // Overlap condition: existing.start < new.end AND existing.end > new.start
+        SQLFragment sql = new SQLFragment();
+        sql.append("SELECT s.Id FROM ");
+        sql.append(TargetedMSManager.getTableInfoInstrumentSchedule(), "s");
+        sql.append(" WHERE s.Instrument = ? AND s.StartTime < ? AND s.EndTime > ?");
+        sql.add(instrument.intValue());
+        sql.add(new Timestamp(end.getTime()));
+        sql.add(new Timestamp(start.getTime()));
+
+        if (excludeId != null)
+        {
+            sql.append(" AND s.Id != ?");
+            sql.add(excludeId);
+        }
+
+        boolean overlapExists = new SqlSelector(TargetedMSManager.getSchema(), sql).exists();
+        if (overlapExists)
+        {
+            errors.addGlobalError("Instrument schedule overlaps with an existing reservation for this instrument");
+        }
+    }
+
+    @Nullable
+    private Integer getId(@Nullable Map<String, Object> row)
+    {
+        if (row == null)
+            return null;
+        Object o = row.get("Id");
+        if (o instanceof Number n)
+            return n.intValue();
+        return null;
+    }
+}
diff --git a/src/org/labkey/targetedms/query/InstrumentScheduleTable.java b/src/org/labkey/targetedms/query/InstrumentScheduleTable.java
index 9eb6ef354..795d519e6 100644
--- a/src/org/labkey/targetedms/query/InstrumentScheduleTable.java
+++ b/src/org/labkey/targetedms/query/InstrumentScheduleTable.java
@@ -20,12 +20,15 @@
 import java.util.List;
 import java.util.Map;
 
-public class InstrumentScheduleTable extends SimpleTargetedMSTable
+public class InstrumentScheduleTable extends OwnProjectSchedulingTable
 {
     public InstrumentScheduleTable(TargetedMSSchema schema, ContainerFilter cf)
     {
         super(TargetedMSSchema.TABLE_INSTRUMENT_SCHEDULE, schema, cf);
-        addTriggerFactory((c, table, extraContext) -> List.of(new InstrumentUsagePaymentTrigger("Id")));
+        addTriggerFactory((c, table, extraContext) -> List.of(
+            new InstrumentUsagePaymentTrigger("Id"),
+            new InstrumentScheduleOverlapTrigger()
+        ));
     }
 
     @Override
diff --git a/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java b/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java
new file mode 100644
index 000000000..a4f17ca4d
--- /dev/null
+++ b/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java
@@ -0,0 +1,151 @@
+package org.labkey.targetedms.query;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.labkey.api.data.Container;
+import org.labkey.api.data.ContainerFilter;
+import org.labkey.api.data.SQLFragment;
+import org.labkey.api.data.SqlSelector;
+import org.labkey.api.data.TableInfo;
+import org.labkey.api.data.triggers.Trigger;
+import org.labkey.api.query.ValidationException;
+import org.labkey.api.security.User;
+import org.labkey.api.security.UserPrincipal;
+import org.labkey.api.security.permissions.AdminPermission;
+import org.labkey.api.security.permissions.DeletePermission;
+import org.labkey.api.security.permissions.InsertPermission;
+import org.labkey.api.security.permissions.Permission;
+import org.labkey.api.security.permissions.ReadPermission;
+import org.labkey.api.security.permissions.UpdatePermission;
+import org.labkey.targetedms.TargetedMSManager;
+import org.labkey.targetedms.TargetedMSSchema;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class OwnProjectSchedulingTable extends SimpleTargetedMSTable
+{
+    public OwnProjectSchedulingTable(String name, TargetedMSSchema schema, ContainerFilter cf)
+    {
+        super(name, schema, cf);
+        addTriggerFactory((c, table, extraContext) -> List.of(new OwnProjectTrigger()));
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class<? extends Permission> perm)
+    {
+        if (isAdmin())
+        {
+            return true;
+        }
+
+        // Let lab members and collaborators past the initial check for insert/update/delete permission and enforce
+        // row-level permissions in the UpdateService
+        return (perm.equals(InsertPermission.class) || perm.equals(UpdatePermission.class) ||
+                perm.equals(DeletePermission.class) || perm.equals(ReadPermission.class))
+                && (isLabMember() || isExternalCollaborator());
+    }
+
+    private boolean isAdmin()
+    {
+        return getUserSchema().getContainer().hasPermission(getUserSchema().getUser(), AdminPermission.class);
+    }
+
+    private boolean isLabMember()
+    {
+        // Check for key permissions for editors
+        return getUserSchema().getContainer().hasPermission(getUserSchema().getUser(), InsertPermission.class) &&
+                getUserSchema().getContainer().hasPermission(getUserSchema().getUser(), UpdatePermission.class) &&
+                getUserSchema().getContainer().hasPermission(getUserSchema().getUser(), DeletePermission.class);
+    }
+
+    private boolean isExternalCollaborator()
+    {
+        // Check for key permissions submitters
+        return getUserSchema().getContainer().hasPermission(getUserSchema().getUser(), InsertPermission.class);
+    }
+
+    private class OwnProjectTrigger implements Trigger
+    {
+        private Set<Integer> _projectIds;
+
+        private void validateProject(Integer projectId) throws ValidationException
+        {
+            if (_projectIds == null)
+            {
+                _projectIds = new HashSet<>(new SqlSelector(getSchema(),
+                        new SQLFragment("SELECT Project FROM ").
+                                append(TargetedMSManager.getTableInfoProjectResearcher(), "pr").
+                                append(" WHERE Researcher = ?").
+                                add(getUserSchema().getUser().getUserId())).getArrayList(Integer.class));
+            }
+            if (projectId == null || !_projectIds.contains(projectId))
+            {
+                throw new ValidationException("User is not a member of the project");
+            }
+        }
+
+        @Nullable
+        private Integer getInteger(@Nullable Map<String, Object> row, String key)
+        {
+            if (row == null)
+                return null;
+            Object o = row.get(key);
+            if (o instanceof Number n)
+                return n.intValue();
+            return null;
+        }
+
+
+        @Override
+        public void beforeInsert(TableInfo table, Container c, User user, @Nullable Map<String, Object> newRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
+        {
+            checkRowLevelPermission(newRow, true);
+        }
+
+        private void checkRowLevelPermission(@Nullable Map<String, Object> newRow, boolean insert) throws ValidationException
+        {
+            String tableName = OwnProjectSchedulingTable.this.getName();
+            if (TargetedMSSchema.TABLE_MS_PROJECT.equalsIgnoreCase(tableName))
+            {
+                if (!insert)
+                {
+                    validateProject(getInteger(newRow, "id"));
+                }
+            }
+            if (TargetedMSSchema.TABLE_INSTRUMENT_SCHEDULE.equalsIgnoreCase(tableName) ||
+                    TargetedMSSchema.TABLE_PROJECT_RESEARCHER.equalsIgnoreCase(tableName))
+            {
+                validateProject(getInteger(newRow, "project"));
+
+            }
+            if (TargetedMSSchema.TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(tableName))
+            {
+                Integer scheduleId = getInteger(newRow, "InstrumentScheduleId");
+                if (scheduleId != null)  // A null will violate the non-null constraint, so we don't need to report an error
+                {
+                    Integer project = new SqlSelector(getSchema(),
+                            new SQLFragment("SELECT Project FROM ").
+                                    append(TargetedMSManager.getTableInfoInstrumentSchedule()).
+                                    append(" WHERE Id = ?").add(scheduleId)).getObject(Integer.class);
+                    validateProject(project);
+                }
+            }
+        }
+
+        @Override
+        public void beforeUpdate(TableInfo table, Container c, User user, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
+        {
+            checkRowLevelPermission(oldRow, false);
+            checkRowLevelPermission(newRow, false);
+        }
+
+        @Override
+        public void beforeDelete(TableInfo table, Container c, User user, @Nullable Map<String, Object> oldRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
+        {
+            checkRowLevelPermission(oldRow, false);
+        }
+    }
+}
diff --git a/src/org/labkey/targetedms/query/TargetedMSTable.java b/src/org/labkey/targetedms/query/TargetedMSTable.java
index d1d9845d6..271bed733 100644
--- a/src/org/labkey/targetedms/query/TargetedMSTable.java
+++ b/src/org/labkey/targetedms/query/TargetedMSTable.java
@@ -81,7 +81,7 @@ public static void fixupLookups(FilteredTable<?> table)
         for (var columnInfo : table.getMutableColumns())
         {
             ForeignKey fk = columnInfo.getFk();
-            if (fk != null && TargetedMSSchema.SCHEMA_NAME.equalsIgnoreCase(fk.getLookupSchemaName()))
+            if (fk != null && TargetedMSSchema.SCHEMA_KEY.equals(fk.getLookupSchemaKey()))
             {
                 columnInfo.setFk(new QueryForeignKey(table.getUserSchema(), table.getContainerFilter(), table.getUserSchema(), null, fk.getLookupTableName(), fk.getLookupColumnName(), fk.getLookupDisplayName()));
             }
@@ -144,7 +144,7 @@ public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class<? exten
     }
 
     /*
-    This is an additional filter that is applied to the table that has the container column. This can be used, for example,
+    This is an additional filter applied to the table that has the container column. This can be used, for example,
     to filter the results of the Precursor table to a single run in a container (Id column in the targetedms.runs table).
     Tables in the targetedms schema that have a container column are:
      - runs, autoqcping, irtscale, experimentannotations, guideset, qcannotation, qcannotationtype

From 14f2bbe50a29824df45070741aec5e21cfb193ea Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Mon, 3 Nov 2025 14:59:44 -0800
Subject: [PATCH 03/12] Checkpoint

---
 .../queries/targetedms/userProjects.query.xml | 10 -----
 resources/queries/targetedms/userProjects.sql |  6 ---
 .../views/instrumentSchedulingAdmin.html      |  2 -
 resources/views/msProject.html                |  7 +++-
 resources/views/msProjectDetails.html         | 23 +++++++----
 resources/views/scheduleInstrument.html       |  2 +-
 .../labkey/targetedms/TargetedMSSchema.java   | 38 ++++++++++++++++++-
 .../query/OwnProjectSchedulingTable.java      | 11 +++++-
 8 files changed, 67 insertions(+), 32 deletions(-)
 delete mode 100644 resources/queries/targetedms/userProjects.query.xml
 delete mode 100644 resources/queries/targetedms/userProjects.sql

diff --git a/resources/queries/targetedms/userProjects.query.xml b/resources/queries/targetedms/userProjects.query.xml
deleted file mode 100644
index 04a9b3ec4..000000000
--- a/resources/queries/targetedms/userProjects.query.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<query xmlns="http://labkey.org/data/xml/query">
-    <metadata>
-        <tables xmlns="http://labkey.org/data/xml">
-            <table tableName="userProjects" tableDbType="TABLE">
-                <columns>
-                </columns>
-            </table>
-        </tables>
-    </metadata>
-</query>
\ No newline at end of file
diff --git a/resources/queries/targetedms/userProjects.sql b/resources/queries/targetedms/userProjects.sql
deleted file mode 100644
index 3eacfeda2..000000000
--- a/resources/queries/targetedms/userProjects.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT
-    p.id AS Id,
-    p.title AS Title,
-    p.submitDate AS SubmitDate,
-    p.collaborationStatus AS CollaborationStatus
-FROM msProject p WHERE p.id IN (SELECT project FROM projectresearcher pr WHERE pr.researcher = USERID())
diff --git a/resources/views/instrumentSchedulingAdmin.html b/resources/views/instrumentSchedulingAdmin.html
index af6892462..5ecac796f 100644
--- a/resources/views/instrumentSchedulingAdmin.html
+++ b/resources/views/instrumentSchedulingAdmin.html
@@ -12,6 +12,4 @@
 <div><a href="query-executeQuery.view?schemaName=targetedms&query.queryName=rateType">Edit rate types</a> (setup fee)</div>
 <div><a href="query-executeQuery.view?schemaName=targetedms&query.queryName=instrumentRate">Edit rate list</a> (assigns a setup fee and an hourly rate to instruments)</div>
 <div><a href="query-executeQuery.view?schemaName=targetedms&query.queryName=MSProject">Edit project list</a></div>
-<div><a href="query-executeQuery.view?schemaName=targetedms&query.queryName=projectResearcher">Edit project/researcher mapping</a> (attaches users to projects)</div>
 <div><a href="query-executeQuery.view?schemaName=targetedms&query.queryName=paymentMethod">Edit payment method list</a></div>
-<div><a href="query-executeQuery.view?schemaName=targetedms&query.queryName=projectPaymentMethod">Edit project/payment method mapping</a></div>
\ No newline at end of file
diff --git a/resources/views/msProject.html b/resources/views/msProject.html
index b89ba8ae7..fd66b3447 100644
--- a/resources/views/msProject.html
+++ b/resources/views/msProject.html
@@ -7,8 +7,11 @@
         renderTo: 'ms-project',
         frame: 'none',
         schemaName: 'targetedms',
-        queryName: 'userProjects',
-        containerFilter: LABKEY.Query.containerFilter.currentAndSubfolders
+        queryName: 'msProject',
+        containerFilter: LABKEY.Query.containerFilter.currentAndSubfolders,
+        filters: [
+            LABKEY.Filter.create('ProjectMember', true)
+        ]
     };
     // admins can see all projects, non-admins can only see projects they are a researcher on
     new LABKEY.QueryWebPart(config);
diff --git a/resources/views/msProjectDetails.html b/resources/views/msProjectDetails.html
index 401305d45..cfef9843e 100644
--- a/resources/views/msProjectDetails.html
+++ b/resources/views/msProjectDetails.html
@@ -1,12 +1,9 @@
-<div id="project-details">
-</div>
-<div id="schedule-instrument-time">
-</div>
+<div id="project-details"></div>
+<div id="schedule-instrument-time"></div>
 <br/>
-<div id="payment-methods">
-</div>
-<div id="payment-summary">
-</div>
+<div id="researchers"></div>
+<div id="payment-methods"></div>
+<div id="payment-summary"></div>
 
 <script type="text/javascript" nonce="<%=scriptNonce%>">
     $(function() {
@@ -105,6 +102,16 @@
             containerFilter: LABKEY.Query.containerFilter.currentAndSubfolders
         });
 
+        new LABKEY.QueryWebPart({
+            renderTo: 'researchers',
+            frame: 'portal',
+            title: 'Researchers for this Project',
+            schemaName: 'targetedms',
+            queryName: 'projectResearcher',
+            filterArray: [LABKEY.Filter.create('project', project, LABKEY.Filter.Types.EQUAL)],
+            containerFilter: LABKEY.Query.containerFilter.currentAndSubfolders
+        });
+
         const scheduleInstrumentTimeEl = document.getElementById('schedule-instrument-time');
         const scheduleUrlParams = {
             project: LABKEY.ActionURL.getParameter('project')
diff --git a/resources/views/scheduleInstrument.html b/resources/views/scheduleInstrument.html
index fad60226e..cd49659b6 100644
--- a/resources/views/scheduleInstrument.html
+++ b/resources/views/scheduleInstrument.html
@@ -147,7 +147,7 @@ <h3>Time Scheduled</h3>
 
         LABKEY.Query.selectRows({
             schemaName: 'targetedms',
-            queryName: 'userProjects',
+            queryName: 'msProject',
             sort: 'Title',
             columns: 'Id,Title',
             scope: this,
diff --git a/src/org/labkey/targetedms/TargetedMSSchema.java b/src/org/labkey/targetedms/TargetedMSSchema.java
index 210d124ba..d99ddf2d1 100644
--- a/src/org/labkey/targetedms/TargetedMSSchema.java
+++ b/src/org/labkey/targetedms/TargetedMSSchema.java
@@ -68,6 +68,7 @@
 import org.labkey.api.query.UserIdQueryForeignKey;
 import org.labkey.api.query.UserSchema;
 import org.labkey.api.security.User;
+import org.labkey.api.security.permissions.AdminPermission;
 import org.labkey.api.targetedms.RepresentativeDataState;
 import org.labkey.api.targetedms.RunRepresentativeDataState;
 import org.labkey.api.util.ContainerContext;
@@ -1621,7 +1622,6 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
                 TABLE_PAYMENT_METHOD.equalsIgnoreCase(name) ||
                 TABLE_RATE_TYPE.equalsIgnoreCase(name) ||
                 TABLE_INSTRUMENT_RATE.equalsIgnoreCase(name) ||
-                // TODO - who can edit this mapping table?
                 TABLE_PROJECT_PAYMENT_METHOD.equalsIgnoreCase(name))
         {
             return new AdminSchedulingTable(name, this, cf);
@@ -1631,12 +1631,46 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
                 TABLE_PROJECT_RESEARCHER.equalsIgnoreCase(name) ||
                 TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name))
         {
-            var result = new OwnProjectSchedulingTable(name, this, cf);
+            var result = new OwnProjectSchedulingTable(name, this, cf, TABLE_MS_PROJECT.equalsIgnoreCase(name));
             if (TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name))
             {
                 result.addTriggerFactory((c, table, extraContext) -> List.of(new InstrumentUsagePaymentTrigger("InstrumentScheduleId")));
             }
             TargetedMSTable.fixupLookups(result);
+
+            if (TABLE_MS_PROJECT.equalsIgnoreCase(name))
+            {
+                SQLFragment projectMemberSql = new SQLFragment("EXISTS (SELECT Project FROM ");
+                projectMemberSql.append(TargetedMSManager.getTableInfoProjectResearcher(), "pr");
+                projectMemberSql.append(" WHERE pr.researcher = ? AND pr.project = ");
+                projectMemberSql.add(getUser().getUserId());
+                projectMemberSql.append(ExprColumn.STR_TABLE_ALIAS).append(".Id)");
+
+                ExprColumn projectMemberCol = new ExprColumn(result, "ProjectMember", projectMemberSql, JdbcType.BOOLEAN);
+                result.addColumn(projectMemberCol);
+
+                // For non-admins, completely hide projects they're not associated with
+                if (!getContainer().hasPermission(getUser(), AdminPermission.class))
+                {
+                    result.addCondition(projectMemberSql, FieldKey.fromParts("Id"));
+                }
+            }
+            else if (TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name))
+            {
+                // For non-admins, completely hide payment data for projects they're not associated with
+                if (!getContainer().hasPermission(getUser(), AdminPermission.class))
+                {
+                    SQLFragment projectMemberSql = new SQLFragment("EXISTS (SELECT Project FROM ");
+                    projectMemberSql.append(TargetedMSManager.getTableInfoProjectResearcher(), "pr");
+                    projectMemberSql.append(" WHERE pr.researcher = ? AND pr.project = ");
+                    projectMemberSql.add(getUser().getUserId());
+                    projectMemberSql.append(ExprColumn.STR_TABLE_ALIAS).append(".Project)");
+                    result.addCondition(projectMemberSql, FieldKey.fromParts("Project"));
+                }
+
+            }
+
+
             return result;
         }
 
diff --git a/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java b/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java
index a4f17ca4d..db876daec 100644
--- a/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java
+++ b/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java
@@ -27,9 +27,12 @@
 
 public class OwnProjectSchedulingTable extends SimpleTargetedMSTable
 {
-    public OwnProjectSchedulingTable(String name, TargetedMSSchema schema, ContainerFilter cf)
+    private final boolean _allowCollaboratorsToInsert;
+
+    public OwnProjectSchedulingTable(String name, TargetedMSSchema schema, ContainerFilter cf, boolean allowCollaboratorsToInsert)
     {
         super(name, schema, cf);
+        _allowCollaboratorsToInsert = allowCollaboratorsToInsert;
         addTriggerFactory((c, table, extraContext) -> List.of(new OwnProjectTrigger()));
     }
 
@@ -41,6 +44,12 @@ public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class<? exten
             return true;
         }
 
+        // Collaborators shouldn't be able to insert new projects but should be able to edit ones they're attached to
+        if (perm.equals(InsertPermission.class) && !_allowCollaboratorsToInsert)
+        {
+            return isLabMember();
+        }
+
         // Let lab members and collaborators past the initial check for insert/update/delete permission and enforce
         // row-level permissions in the UpdateService
         return (perm.equals(InsertPermission.class) || perm.equals(UpdatePermission.class) ||

From 09550f0bc23471d368c486e507f44b380055e03b Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Mon, 3 Nov 2025 15:26:26 -0800
Subject: [PATCH 04/12] Support tables with quotes in names, BaseColumnInfo

---
 src/org/labkey/targetedms/query/InstrumentScheduleTable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/labkey/targetedms/query/InstrumentScheduleTable.java b/src/org/labkey/targetedms/query/InstrumentScheduleTable.java
index 795d519e6..34b600c4d 100644
--- a/src/org/labkey/targetedms/query/InstrumentScheduleTable.java
+++ b/src/org/labkey/targetedms/query/InstrumentScheduleTable.java
@@ -24,7 +24,7 @@ public class InstrumentScheduleTable extends OwnProjectSchedulingTable
 {
     public InstrumentScheduleTable(TargetedMSSchema schema, ContainerFilter cf)
     {
-        super(TargetedMSSchema.TABLE_INSTRUMENT_SCHEDULE, schema, cf);
+        super(TargetedMSSchema.TABLE_INSTRUMENT_SCHEDULE, schema, cf, false);
         addTriggerFactory((c, table, extraContext) -> List.of(
             new InstrumentUsagePaymentTrigger("Id"),
             new InstrumentScheduleOverlapTrigger()

From f745acf0d1e1ecaf726341d3acc1ce2787e24313 Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Mon, 3 Nov 2025 16:58:27 -0800
Subject: [PATCH 05/12] Fixup existing test coverage

---
 resources/views/scheduleInstrument.html       |  2 +-
 .../query/OwnProjectSchedulingTable.java      | 24 ++++++++++-------
 .../targetedms/InstrumentSchedulingTest.java  | 27 ++++++++-----------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/resources/views/scheduleInstrument.html b/resources/views/scheduleInstrument.html
index cd49659b6..6b48a3b65 100644
--- a/resources/views/scheduleInstrument.html
+++ b/resources/views/scheduleInstrument.html
@@ -31,7 +31,7 @@
         Loading...
     </div>
 
-    <div class="modal fade" id="event-modal">
+    <div class="modal" id="event-modal">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
diff --git a/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java b/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java
index db876daec..28ba0a57a 100644
--- a/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java
+++ b/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java
@@ -82,17 +82,21 @@ private class OwnProjectTrigger implements Trigger
 
         private void validateProject(Integer projectId) throws ValidationException
         {
-            if (_projectIds == null)
+            // Admins can make changes to any project. Others need to be members
+            if (!getUserSchema().getContainer().hasPermission(getUserSchema().getUser(), AdminPermission.class))
             {
-                _projectIds = new HashSet<>(new SqlSelector(getSchema(),
-                        new SQLFragment("SELECT Project FROM ").
-                                append(TargetedMSManager.getTableInfoProjectResearcher(), "pr").
-                                append(" WHERE Researcher = ?").
-                                add(getUserSchema().getUser().getUserId())).getArrayList(Integer.class));
-            }
-            if (projectId == null || !_projectIds.contains(projectId))
-            {
-                throw new ValidationException("User is not a member of the project");
+                if (_projectIds == null)
+                {
+                    _projectIds = new HashSet<>(new SqlSelector(getSchema(),
+                            new SQLFragment("SELECT Project FROM ").
+                                    append(TargetedMSManager.getTableInfoProjectResearcher(), "pr").
+                                    append(" WHERE Researcher = ?").
+                                    add(getUserSchema().getUser().getUserId())).getArrayList(Integer.class));
+                }
+                if (projectId == null || !_projectIds.contains(projectId))
+                {
+                    throw new ValidationException("User is not a member of the project");
+                }
             }
         }
 
diff --git a/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java b/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
index f173a348d..97b22f976 100644
--- a/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
+++ b/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
@@ -21,7 +21,6 @@
 import org.labkey.remoteapi.CommandException;
 import org.labkey.remoteapi.query.InsertRowsCommand;
 import org.labkey.remoteapi.security.WhoAmICommand;
-import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
 import org.labkey.test.TestTimeoutException;
 import org.labkey.test.util.APIContainerHelper;
@@ -29,7 +28,6 @@
 import org.labkey.test.util.PermissionsHelper;
 import org.labkey.test.util.PortalHelper;
 import org.labkey.test.util.PostgresOnlyTest;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -40,8 +38,8 @@
 @Category({})
 public class InstrumentSchedulingTest extends TargetedMSTest implements PostgresOnlyTest
 {
-    protected static final String SCHEDULER_USER_1 = "scheduler1@targetedms.test";
-    protected static final String SCHEDULER_USER_2 = "scheduler2@targetedms.test";
+    protected static final String LAB_MEMBER_USER = "labmember@targetedms.test";
+    protected static final String EXTERNAL_COLLABORATOR_USER = "collaborator@targetedms.test";
 
     public static final String INSTRUMENT_1 = "Instrument1";
     public static final String INSTRUMENT_2 = "Instrument2";
@@ -63,11 +61,11 @@ private void doInit() throws IOException, CommandException
         setupFolder(FolderType.Experiment);
         new PortalHelper(this).addWebPart("Instrument Scheduling Admin");
 
-        int schedulerUser1Id = _userHelper.createUser(SCHEDULER_USER_1).getUserId();
-        int schedulerUser2Id = _userHelper.createUser(SCHEDULER_USER_2).getUserId();
+        int labMemberUserId = _userHelper.createUser(LAB_MEMBER_USER).getUserId();
+        int collaboratorUserId = _userHelper.createUser(EXTERNAL_COLLABORATOR_USER).getUserId();
         ApiPermissionsHelper apiPermissionsHelper = new ApiPermissionsHelper(this);
-        apiPermissionsHelper.addMemberToRole(SCHEDULER_USER_1, "Editor", PermissionsHelper.MemberType.user);
-        apiPermissionsHelper.addMemberToRole(SCHEDULER_USER_2, "Editor", PermissionsHelper.MemberType.user);
+        apiPermissionsHelper.addMemberToRole(LAB_MEMBER_USER, "Editor", PermissionsHelper.MemberType.user);
+        apiPermissionsHelper.addMemberToRole(EXTERNAL_COLLABORATOR_USER, "Submitter", PermissionsHelper.MemberType.user);
 
         InsertRowsCommand instrumentInsert = new InsertRowsCommand("targetedms", "msInstrument");
         instrumentInsert.setRows(Arrays.asList(
@@ -109,9 +107,9 @@ private void doInit() throws IOException, CommandException
 
         InsertRowsCommand projectResearcherInsert = new InsertRowsCommand("targetedms", "projectResearcher");
         projectResearcherInsert.setRows(Arrays.asList(
-                Map.of("Project", projects.get(0).get("Id"), "Researcher", schedulerUser1Id),
-                Map.of("Project", projects.get(1).get("Id"), "Researcher", schedulerUser1Id),
-                Map.of("Project", projects.get(1).get("Id"), "Researcher", schedulerUser2Id),
+                Map.of("Project", projects.get(0).get("Id"), "Researcher", labMemberUserId),
+                Map.of("Project", projects.get(1).get("Id"), "Researcher", labMemberUserId),
+                Map.of("Project", projects.get(1).get("Id"), "Researcher", collaboratorUserId),
                 Map.of("Project", projects.get(0).get("Id"), "Researcher", currentUserId),
                 Map.of("Project", projects.get(1).get("Id"), "Researcher", currentUserId)
         ));
@@ -149,7 +147,6 @@ public void testSchedule()
 
         assertProjectEventCounts(2, 0);
 
-        sleep(1000);
         doAndWaitForPageToLoad(() -> selectOptionByText(Locator.id("projectDropDown"), PROJECT_2));
 
         scheduleInstrument(yearMonth + "-04");
@@ -158,7 +155,6 @@ public void testSchedule()
         scheduleInstrument(yearMonth + "-05");
         assertProjectEventCounts(2, 2);
 
-        sleep(1000);
         doAndWaitForPageToLoad(() -> selectOptionByText(Locator.id("instrumentDropDown"), INSTRUMENT_2));
         scheduleInstrument(yearMonth + "-06");
         assertProjectEventCounts(1, 0);
@@ -220,7 +216,6 @@ private void scheduleInstrument(String yearMonthDay, boolean delete)
             setFormElement(EVENT_NAME_FIELD.findElement(getDriver()), "A name!");
             setFormElement(EVENT_NOTE_FIELD.findElement(getDriver()), "A note!");
             waitAndClick(Locator.button("Save"));
-            waitAndClick(Locator.button("Yes"));
         }
     }
 
@@ -231,7 +226,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException
         APIContainerHelper apiContainerHelper = new APIContainerHelper(this);
         apiContainerHelper.deleteProject(getProjectName(), afterTest);
         
-        _userHelper.deleteUsers(false, SCHEDULER_USER_1);
-        _userHelper.deleteUsers(false, SCHEDULER_USER_2);
+        _userHelper.deleteUsers(false, LAB_MEMBER_USER);
+        _userHelper.deleteUsers(false, EXTERNAL_COLLABORATOR_USER);
     }
 }

From ed205e4ecfa76c0f6c4a2e658baf36c680c38c79 Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Tue, 4 Nov 2025 14:52:11 -0800
Subject: [PATCH 06/12] Test conflicting instrument reservations

---
 resources/views/scheduleInstrument.html       |  4 +-
 .../targetedms/InstrumentSchedulingTest.java  | 56 +++++++++++--------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/resources/views/scheduleInstrument.html b/resources/views/scheduleInstrument.html
index 6b48a3b65..7c61f7d80 100644
--- a/resources/views/scheduleInstrument.html
+++ b/resources/views/scheduleInstrument.html
@@ -45,9 +45,9 @@ <h5 class="modal-title">Add Instrument Time</h5>
                     <form class="form-horizontal">
 
                         <div class="form-group row">
-                            <label for="min-date" class="col-sm-2 control-label">Dates</label>
+                            <label for="event-start-date" class="col-sm-2 control-label">Dates</label>
                             <div class="col-sm-10">
-                                <input id="min-date" name="event-start-date" type="datetime-local">
+                                <input id="event-start-date" name="event-start-date" type="datetime-local">
                                 <label for="event-end-date">to</label>
                                 <input id="event-end-date" name="event-end-date" type="datetime-local">
                             </div>
diff --git a/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java b/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
index 97b22f976..ee80d581b 100644
--- a/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
+++ b/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
@@ -15,6 +15,7 @@
  */
 package org.labkey.test.tests.targetedms;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -30,6 +31,7 @@
 import org.labkey.test.util.PostgresOnlyTest;
 
 import java.io.IOException;
+import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
@@ -49,6 +51,10 @@ public class InstrumentSchedulingTest extends TargetedMSTest implements Postgres
     public static final Locator.IdLocator EVENT_NAME_FIELD = Locator.id("event-name");
     public static final Locator.IdLocator EVENT_NOTE_FIELD = Locator.id("event-notes");
 
+    public static final Locator.IdLocator START_DATE_TIME_FIELD = Locator.id("event-start-date");
+    public static final Locator.IdLocator END_DATE_TIME_FIELD = Locator.id("event-end-date");
+
+
     @BeforeClass
     public static void initProject() throws IOException, CommandException
     {
@@ -99,6 +105,7 @@ private void doInit() throws IOException, CommandException
         InsertRowsCommand projectPaymentMethodInsert = new InsertRowsCommand("targetedms", "projectPaymentMethod");
         projectPaymentMethodInsert.setRows(Arrays.asList(
                 Map.of("PaymentMethod", paymentMethods.get(0).get("Id"), "Project", projects.get(0).get("Id")),
+                Map.of("PaymentMethod", paymentMethods.get(0).get("Id"), "Project", projects.get(1).get("Id")),
                 Map.of("PaymentMethod", paymentMethods.get(1).get("Id"), "Project", projects.get(1).get("Id"))
         ));
         List<Map<String, Object>> projectPaymentMethods = projectPaymentMethodInsert.execute(createDefaultConnection(), getProjectName()).getRows();
@@ -132,33 +139,42 @@ public void testSchedule()
         clickAndWait(Locator.linkWithText(PROJECT_1));
         waitAndClickAndWait(Locator.linkWithText("Schedule instrument time"));
 
-        String yearMonth = Calendar.getInstance().get(Calendar.YEAR) + "-";
         int month = (Calendar.getInstance().get(Calendar.MONTH) + 1);
-        if (month < 10)
-        {
-            yearMonth += yearMonth;
-        }
-        yearMonth += month;
+        String yearMonth = Calendar.getInstance().get(Calendar.YEAR) + "-" + (month < 10 ? "0" + month : "" + month);
 
-        scheduleInstrument(yearMonth + "-02");
-        scheduleInstrument(yearMonth + "-03");
+        scheduleInstrument(yearMonth + "-02", false);
+        scheduleInstrument(yearMonth + "-03", false, () ->
+        {
+            String originalStart = getFormElement(START_DATE_TIME_FIELD.findElement(getDriver()));
+            String originalEnd = getFormElement(END_DATE_TIME_FIELD.findElement(getDriver()));
+            // Try scheduling over the first reservation and verify it is blocked
+            setFormElement(START_DATE_TIME_FIELD.findElement(getDriver()), originalStart.replace("-03T", "-02T"));
+            setFormElement(END_DATE_TIME_FIELD.findElement(getDriver()), originalEnd.replace("-03T", "-02T"));
+            waitAndClick(Locator.button("Save"));
+            waitForText("Error saving. Instrument schedule overlaps with an existing reservation for this instrument");
+            setFormElement(START_DATE_TIME_FIELD.findElement(getDriver()), originalStart);
+            waitForText("End date must be after start date.");
+            setFormElement(END_DATE_TIME_FIELD.findElement(getDriver()), originalEnd);
+        });
         scheduleInstrument(yearMonth + "-03", true);
-        scheduleInstrument(yearMonth + "-03");
+        scheduleInstrument(yearMonth + "-03", false);
 
         assertProjectEventCounts(2, 0);
 
         doAndWaitForPageToLoad(() -> selectOptionByText(Locator.id("projectDropDown"), PROJECT_2));
 
-        scheduleInstrument(yearMonth + "-04");
+        scheduleInstrument(yearMonth + "-04", false);
         assertProjectEventCounts(1, 2);
 
-        scheduleInstrument(yearMonth + "-05");
+        scheduleInstrument(yearMonth + "-05", false);
         assertProjectEventCounts(2, 2);
 
         doAndWaitForPageToLoad(() -> selectOptionByText(Locator.id("instrumentDropDown"), INSTRUMENT_2));
-        scheduleInstrument(yearMonth + "-06");
+        scheduleInstrument(yearMonth + "-06", false);
         assertProjectEventCounts(1, 0);
 
+        impersonate(LAB_MEMBER_USER);
+
         goToDashboard();
         waitAndClickAndWait(Locator.linkWithText("All instrument calendar view"));
         assertTextPresent(INSTRUMENT_1, INSTRUMENT_2, INACTIVE_INSTRUMENT);
@@ -185,27 +201,21 @@ private void assertProjectEventCounts(int expectedActiveCount, int expectedOther
     {
         Locator activeLocator = Locator.byClass("activeProjectEvent");
         Locator otherLocator = Locator.byClass("otherProjectEvent");
-        if (expectedActiveCount > 0)
-        {
-            waitForElementToBeVisible(activeLocator);
-        }
-        if (expectedOtherCount > 0)
-        {
-            waitForElementToBeVisible(otherLocator);
-        }
+        waitFor(() -> expectedActiveCount == getElementCount(activeLocator) && expectedOtherCount == getElementCount(otherLocator), 5_000);
         assertElementPresent(activeLocator, expectedActiveCount);
         assertElementPresent(otherLocator, expectedOtherCount);
     }
 
-    private void scheduleInstrument(String yearMonthDay)
+    private void scheduleInstrument(String yearMonthDay, boolean delete)
     {
-        scheduleInstrument(yearMonthDay, false);
+        scheduleInstrument(yearMonthDay, delete, () -> {});
     }
 
-    private void scheduleInstrument(String yearMonthDay, boolean delete)
+    private void scheduleInstrument(String yearMonthDay, boolean delete, @NotNull Runnable extraSteps)
     {
         waitAndClick(Locator.tagWithAttribute("td", "data-date", yearMonthDay));
         waitForText("Add Instrument Time");
+        extraSteps.run();
         if (delete)
         {
             waitAndClick(Locator.button("Delete"));

From 4ffbcd682f17ee48b31bc154ebad6714aea38b0f Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Wed, 5 Nov 2025 16:15:19 -0800
Subject: [PATCH 07/12] Checkpoint

---
 resources/views/scheduleInstrument.html       | 842 +---------------
 resources/views/scheduleInstrument.view.xml   |   1 -
 .../targetedms/InstrumentSchedulingTest.java  |  10 +-
 webapp/TargetedMS/instrumentCalendar.lib.xml  |   2 +
 webapp/TargetedMS/js/scheduler.js             | 938 ++++++++++++++++++
 5 files changed, 950 insertions(+), 843 deletions(-)
 create mode 100644 webapp/TargetedMS/js/scheduler.js

diff --git a/resources/views/scheduleInstrument.html b/resources/views/scheduleInstrument.html
index 7c61f7d80..fcfd9e7c0 100644
--- a/resources/views/scheduleInstrument.html
+++ b/resources/views/scheduleInstrument.html
@@ -125,844 +125,4 @@ <h3>Time Scheduled</h3>
 
     </div>
 
-</div>
-
-<script type="text/javascript" nonce="<%=scriptNonce%>">
-    $(function() {
-
-        let project = LABKEY.ActionURL.getParameter('project');
-        let instrument = LABKEY.ActionURL.getParameter('instrument');
-        // Parse as integers, defaulting to null if empty/invalid
-        project = project ? parseInt(project) || null : null;
-        instrument = instrument ? parseInt(instrument) || null : null;
-
-        if (!project) {
-            document.getElementById('calendar').innerText = 'Invalid or no project specified';
-            return;
-        }
-
-        let calendar = null;
-        let eventToSave = {};
-        let paymentMethods = [];
-
-        LABKEY.Query.selectRows({
-            schemaName: 'targetedms',
-            queryName: 'msProject',
-            sort: 'Title',
-            columns: 'Id,Title',
-            scope: this,
-            success: function (result) {
-                let rows = result.rows;
-                let projectDropDown = document.getElementById('projectDropDown');
-                while (projectDropDown.firstChild) {
-                    projectDropDown.removeChild(projectDropDown.firstChild);
-                }
-                for (let i = 0; i < rows.length; i++) {
-                    let option = document.createElement('option');
-                    option.value = rows[i].Id;
-                    option.text = rows[i].Title;
-                    if (project === rows[i].Id) {
-                        option.selected = true;
-                    }
-                    projectDropDown.appendChild(option);
-                }
-            }
-        });
-
-        LABKEY.Query.selectRows({
-            schemaName: 'targetedms',
-            queryName: 'msInstrument',
-            sort: 'name',
-            columns: 'Id,name,active',
-            filterArray: [
-                LABKEY.Filter.create('active', true, LABKEY.Filter.Types.EQUAL)
-            ],
-            scope: this,
-            success: function (result) {
-                let rows = result.rows;
-                let instrumentDropDown = document.getElementById('instrumentDropDown');
-                while (instrumentDropDown.firstChild) {
-                    instrumentDropDown.removeChild(instrumentDropDown.firstChild);
-                }
-
-                for (let i = 0; i < rows.length; i++) {
-                    let option = document.createElement('option');
-                    option.value = rows[i].Id;
-                    option.text = rows[i].name;
-                    if (instrument === rows[i].Id) {
-                        option.selected = true;
-                    }
-                    instrumentDropDown.appendChild(option);
-                }
-
-                loadInstrumentSchedule(function(instrumentSchedule) {
-
-                    var calendarEl = document.getElementById('calendar');
-
-                    calendar = new FullCalendar.Calendar(calendarEl, {
-                        headerToolbar: {
-                            left: 'prev,next today',
-                            center: 'title',
-                            right: 'dayGridMonth,timeGridWeek,timeGridDay'
-                        },
-                        initialDate: new Date(),
-                        navLinks: true, // can click day/week names to navigate views
-                        selectable: true,
-                        selectMirror: true,
-                        eventContent: function(e) {
-
-                            let content = '';
-                            let bgColor = e.event.extendedProps.project === project ? e.backgroundColor : 'gray';
-                            const cl = e.event.extendedProps.project === project ? 'activeProjectEvent' : 'otherProjectEvent';
-                            let textColor = ScheduleUtils.getContrastTextColor(ScheduleUtils.stringToColor(bgColor));
-                            let timeFormatString = LABKEY.container.formats.timeFormat;
-                            // Strip seconds and milliseconds
-                            timeFormatString = timeFormatString.replace(':ss', '').replace('.SSS', '');
-                            let dateStr = DateFormat.format.date(e.event.start, timeFormatString) + ' - ' + DateFormat.format.date(e.event.end, timeFormatString);
-                            let style = 'background-color: ' + LABKEY.Utils.encodeHtml(bgColor) + '; color: ' + LABKEY.Utils.encodeHtml(textColor) + ';' + 'width: 100%';
-                            content += '<div class="' + LABKEY.Utils.encodeHtml(cl) + '" style="' + style + ';">'
-                                        + '<div class="event-date">' + LABKEY.Utils.encodeHtml(dateStr) + '</div>'
-                                        + '<div class="event-id" >' + 'Project : &nbsp' + LABKEY.Utils.encodeHtml(e.event.extendedProps.project) + '</div>'
-                                    + '</div>';
-                            return { html: content };
-                        },
-                        eventMouseEnter: function (mouseEnterInfo) {
-                            removeEventLog();
-                            let instrumentID = instrument ? instrument : $('#instrumentDropDown').val();
-                            fetchInstrumentCosts(instrumentID, mouseEnterInfo.event.start, mouseEnterInfo.event.end);
-                            let content = '';
-                            let dateStr = DateFormat.format.date(mouseEnterInfo.event.start, LABKEY.container.formats.dateTimeFormat) + ' - ' + DateFormat.format.date(mouseEnterInfo.event.end, LABKEY.container.formats.dateTimeFormat);
-                            content += '<div class="event-tooltip-content">'
-                                    + '<div class="event-id" >' + 'Project Id : &nbsp' + LABKEY.Utils.encodeHtml(mouseEnterInfo.event.extendedProps.project) + '</div>'
-                                    + '<div class="event-title">' + 'Title : &nbsp' + LABKEY.Utils.encodeHtml(mouseEnterInfo.event.title) + '</div>'
-                                    + '<div class="event-date">' + LABKEY.Utils.encodeHtml(dateStr) + '</div>'
-                                    + '</div>';
-
-
-                            $(mouseEnterInfo.el).popover({
-                                trigger: 'manual',
-                                container: 'body',
-                                html:true,
-                                content: content,
-
-                            });
-
-                            $(mouseEnterInfo.el).popover('show');
-
-                            const $popover = $('.popover'); // Get the popover element
-                            // Keep the popover open when hovering over it
-                            $popover.on('mouseenter', function () {
-                                $(mouseEnterInfo.el).popover('show');
-                            });
-
-                            // Close the popover when the mouse leaves it
-                            $popover.on('mouseleave', function () {
-                                $(mouseEnterInfo.el).popover('hide');
-                            });
-                        },
-                        eventMouseLeave: function (mouseLeaveInfo) {
-                            setTimeout(() => {
-                                const $popover = $('.popover:hover');
-                                if ($popover.length === 0) {
-                                    $(mouseLeaveInfo.el).popover('hide');
-                                }
-                            }, 200); // Add a delay to allow for hover on the popover
-                        },
-                        select: function(arg) {
-                            editEvent({
-                                startDate: arg.start,
-                                endDate: arg.end,
-                                id: null,
-                                name: '',
-                                notes: ''
-                            });
-                            calendar.unselect()
-                        },
-                        eventClick: function(arg) {
-                            editEvent({
-                                startDate: arg.event.start,
-                                endDate: arg.event.end,
-                                id: arg.event.id,
-                                name: arg.event.extendedProps.name,
-                                notes: arg.event.extendedProps.notes
-                            });
-                        },
-                        editable: true,
-                        events: instrumentSchedule
-                    });
-
-                    // remove loading text
-                    calendarEl.innerHTML = '';
-                    calendar.render();
-
-                });
-            }
-        });
-
-        function validatePaymentMethodPercentsAndShow() {
-            const errorEl = document.getElementById('payment-method-error');
-            const scheduleError = document.getElementById('schedule-save-error');
-            const selects = document.querySelectorAll('#paymentMethodDropDown select');
-            const percents = document.querySelectorAll('.paymentMethodPercent');
-
-            // Default: clear
-            let message = '';
-            let total = 0;
-            let invalid = false;
-
-            // Only validate when there are percent inputs (i.e., multiple methods in use UI-wise)
-            if (percents.length > 0 && selects.length > 0) {
-                for (let i = 0; i < selects.length; i++) {
-                    const val = percents[i] ? percents[i].value : (selects.length === 1 ? '100' : '0');
-                    const num = parseFloat(val);
-                    if (isNaN(num) || num < 0 || num > 100) {
-                        invalid = true;
-                    }
-                    total += isNaN(num) ? 0 : num;
-                }
-
-                if (invalid) {
-                    message = 'Each payment percentage must be a number between 0 and 100.';
-                }
-                else if (percents.length > 1 && total !== 100) {
-                    message = 'When multiple payment methods are used, the percentages must add up to 100% (current total: ' + total + '%).';
-                }
-            }
-
-            if (errorEl) errorEl.textContent = message;
-            if (scheduleError) scheduleError.textContent = message; // mirror below modal as well
-
-            return { valid: !message, total: total };
-        }
-
-        const validationCallback = validatePaymentMethodPercentsAndShow;
-
-        function updatePercentInputsVisibility() {
-            const container = document.getElementById('paymentMethodDropDown');
-            if (!container) return;
-
-            const selects = container.querySelectorAll('select');
-            const groups = container.querySelectorAll('.paymentPercentGroup');
-            const inputs = container.querySelectorAll('.paymentMethodPercent');
-            const rowCount = selects.length;
-
-            // Show when multiple rows, hide when single
-            const show = rowCount > 1;
-
-            // If only one row remains, reset its percent back to 100 before hiding
-            if (!show && inputs.length > 0) {
-                inputs[0].value = '100';
-            }
-
-            groups.forEach(function (grp) {
-                grp.style.display = show ? '' : 'none';
-            });
-
-            // When first transitioning to multi-row, ensure sensible defaults
-            if (show && inputs.length > 0) {
-                // If first value is empty, default to 100
-                if (inputs[0].value === '') inputs[0].value = '100';
-                // For others, if empty, default to 0
-                for (let i = 1; i < inputs.length; i++) {
-                    if (inputs[i].value === '') inputs[i].value = '0';
-                }
-            }
-
-            // Clear the top message when hiding
-            if (!show) {
-                const topErr = document.getElementById('payment-method-error');
-                if (topErr) topErr.textContent = '';
-            }
-        }
-
-        LABKEY.Query.selectRows({
-            schemaName: 'targetedms',
-            queryName: 'projectPaymentMethod',
-            sort: 'paymentMethod/name',
-            columns: 'paymentMethod,paymentMethod/name,paymentMethod/UWBudgetNumber,paymentMethod/worktag,paymentMethod/budgetExpirationDate',
-            filterArray: [
-                LABKEY.Filter.create('project', project, LABKEY.Filter.Types.EQUAL)
-            ],
-            scope: this,
-            success: function (result) {
-                let rows = result.rows || [];
-                // Normalize to the same shape used elsewhere in this file
-                paymentMethodsData = rows.map(function(r) {
-                    return {
-                        Id: r.paymentMethod,
-                        name: r['paymentMethod/name'],
-                        UWBudgetNumber: r['paymentMethod/UWBudgetNumber'],
-                        worktag: r['paymentMethod/worktag'],
-                        budgetExpirationDate: r['paymentMethod/budgetExpirationDate']
-                    };
-                });
-                let paymentMethodDropDown = '<select id="paymentMethodDropDown" name="paymentMethodDropDown">';
-                for (let i = 0; i < paymentMethodsData.length; i++) {
-                    paymentMethodDropDown += '<option value="' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].Id) + '">' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].name) + '</option>';
-                }
-                paymentMethodDropDown += '</select>';
-                // Always render a percent input for the first row; visibility will be toggled based on row count
-                paymentMethodDropDown += '&nbsp;<span class="paymentPercentGroup" style="display:none;"><input type="text" class="paymentMethodPercent" name="paymentMethodPercent" value="100" size="3" maxlength="3"><label>%</label></span>';
-
-                jQuery('#paymentMethodDropDown').html(paymentMethodDropDown);
-
-                // Attach live validation listeners to the first row percent input
-                const firstPercent = document.querySelector('#paymentMethodDropDown .paymentMethodPercent');
-                if (firstPercent) {
-                    firstPercent.addEventListener('input', validationCallback);
-                    firstPercent.addEventListener('change', validationCallback);
-                }
-
-                // Toggle visibility based on how many rows are present
-                updatePercentInputsVisibility();
-                // Run validation once to clear or show any messages
-                validatePaymentMethodPercentsAndShow();
-
-                // Hide or show the Add Payment Method control based on count
-                const addBtn = document.getElementById('addPaymentMethod');
-                if (addBtn) {
-                    if (paymentMethodsData.length <= 1) {
-                        addBtn.style.display = 'none';
-                    } else {
-                        addBtn.style.display = '';
-                    }
-                }
-
-                // If there are no payment methods, disable Save and inform the user
-                const saveBtn = document.getElementById('save-event');
-                const scheduleError = document.getElementById('schedule-save-error');
-                if (paymentMethodsData.length === 0) {
-                    if (saveBtn) saveBtn.setAttribute('disabled', 'disabled');
-                    if (scheduleError) scheduleError.textContent = 'No payment methods are configured for this project. Please contact an administrator.';
-                }
-                else {
-                    if (saveBtn) saveBtn.removeAttribute('disabled');
-                    if (scheduleError) scheduleError.textContent = '';
-                }
-
-            }
-        });
-
-        LABKEY.Query.selectRows({
-            schemaName: 'targetedms',
-            queryName: 'projectResearcher',
-            sort: 'researcher/displayName',
-            columns: 'Id,researcher/displayName,researcher/UserId,project',
-            filterArray: [
-                LABKEY.Filter.create('project', project, LABKEY.Filter.Types.EQUAL),
-                LABKEY.Filter.create('researcher/UserId', project, LABKEY.Filter.Types.NONBLANK)
-            ],
-            scope: this,
-            success: function (result) {
-                let rows = result.rows;
-                let instrumentOperatorDropDown = document.getElementById('instrumentOperatorDropDown');
-                while (instrumentOperatorDropDown.firstChild) {
-                    instrumentOperatorDropDown.removeChild(instrumentOperatorDropDown.firstChild);
-                }
-                for (let i = 0; i < rows.length; i++) {
-                    let option = document.createElement('option');
-                    option.value = rows[i]['researcher/UserId'];
-                    option.text = rows[i]['researcher/displayName'];
-                    if (LABKEY.user.id === rows[i]['researcher/UserId']) {
-                        option.selected = true;
-                    }
-                    instrumentOperatorDropDown.appendChild(option);
-                }
-            }
-        });
-
-
-        function editEvent(event) {
-            let startDate = event.startDate;
-            let endDate = event.endDate;
-
-            if (!event.id && startDate.getHours() === 0 && startDate.getMinutes() === 0 && endDate.getHours() === 0 && endDate.getMinutes() === 0) {
-                // Default to starting at 8AM and ending at 5PM
-                startDate.setHours(8);
-                endDate.setHours(17);
-                endDate.setDate(endDate.getDate() - 1);
-            }
-
-            let startDateFormatted = DateFormat.format.date(startDate, LABKEY.container.formats.dateTimeFormat);
-            let endDateFormatted = DateFormat.format.date(endDate, LABKEY.container.formats.dateTimeFormat);
-
-            // remove the old event log rows
-            removeEventLog();
-
-            $('#event-modal input[name="event-index"]').val(event ? event.id : '');
-            $('#event-modal input[name="event-start-date"]').val(startDateFormatted);
-            $('#event-modal input[name="event-end-date"]').val(endDateFormatted);
-            $('#event-modal input[name="event-name"]').val(event ? event.name : '');
-            $('#event-modal input[name="event-notes"]').val(event ? event.notes : '');
-            $('#delete-event').toggle(!!event.id);
-            $('#add-event').text('Save');
-            $('#schedule-save-error').text('');
-            $('#schedule-cost-error').text('');
-            $('#event-modal').modal();
-        }
-
-        function closeEvent() {
-            removeEventLog();
-        }
-
-        function addEvent() {
-            eventToSave.id = $('#event-modal input[name="event-index"]').val();
-            eventToSave.startTime = $('#event-modal input[name="event-start-date"]').val();
-            eventToSave.endTime = $('#event-modal input[name="event-end-date"]').val();
-            eventToSave.project = project;
-            eventToSave.instrument = instrument ? instrument : $('#instrumentDropDown').val();
-            eventToSave.name = $('#event-modal input[name="event-name"]').val();
-            eventToSave.notes = $('#event-modal input[name="event-notes"]').val();
-            eventToSave.instrumentoperator = $('#instrumentOperatorDropDown').val();
-
-            if (eventToSave.endTime < eventToSave.startTime) {
-                alert('End date must be after start date');
-                return;
-            }
-
-            // get the paymentMethod and percentPayment from the html fields
-            paymentMethods = [];
-            let paymentMethodDropDowns = document.querySelectorAll('#paymentMethodDropDown select');
-            let percentPaymentFields = document.querySelectorAll('.paymentMethodPercent');
-
-            // Validation: ensure numeric values and totals add to 100 when multiple entries
-            let percentTotal = 0;
-            let invalidPercent = false;
-            for (let i = 0; i < paymentMethodDropDowns.length; i++) {
-                let paymentMethodId = paymentMethodDropDowns[i].value;
-                let percentVal = percentPaymentFields[i] ? percentPaymentFields[i].value : (paymentMethodDropDowns.length === 1 ? '100' : '0');
-                let percentNum = parseFloat(percentVal);
-                if (percentPaymentFields.length > 0) {
-                    // only validate when inputs are present (multiple methods)
-                    if (isNaN(percentNum) || percentNum < 0 || percentNum > 100) {
-                        invalidPercent = true;
-                    }
-                    percentTotal += isNaN(percentNum) ? 0 : percentNum;
-                }
-                paymentMethods.push({
-                    paymentMethod: paymentMethodId,
-                    percentPayment: percentVal
-                });
-            }
-
-            const scheduleError = document.getElementById('schedule-save-error');
-            if (invalidPercent) {
-                if (scheduleError) scheduleError.textContent = 'Each payment percentage must be a number between 0 and 100.';
-                return;
-            }
-            if (percentPaymentFields.length > 1 && percentTotal !== 100) {
-                if (scheduleError) scheduleError.textContent = 'When multiple payment methods are used, the percentages must add up to 100% (current total: ' + percentTotal + '%).';
-                return;
-            } else if (scheduleError) {
-                scheduleError.textContent = '';
-            }
-
-            // Live preview is already shown as dates change. Save directly.
-            saveEvent();
-        }
-
-        // Debounce helper for frequent UI events
-        function debounce(fn, wait) {
-            let t;
-            return function() {
-                const ctx = this, args = arguments;
-                clearTimeout(t);
-                t = setTimeout(function(){ fn.apply(ctx, args); }, wait);
-            };
-        }
-
-        // Calculate and render live cost preview inside the event modal without changing logs
-        function calculateAndRenderCostPreview(instrumentId, startDate, endDate) {
-            const previewErrorEl = $('#schedule-preview-error');
-            const setupEl = $('#preview-setup-cost');
-            const instEl = $('#preview-instrument-fee');
-            const totalEl = $('#preview-total-cost');
-
-            // Clear previous values
-            setupEl.val('');
-            instEl.val('');
-            totalEl.val('');
-            previewErrorEl.text('');
-
-            if (!instrumentId || !startDate || !endDate) {
-                return;
-            }
-            const start = new Date(startDate);
-            const end = new Date(endDate);
-            if (isNaN(start.getTime()) || isNaN(end.getTime())) {
-                return;
-            }
-            if (end <= start) {
-                previewErrorEl.text('End date must be after start date.');
-                return;
-            }
-
-            LABKEY.Query.selectRows({
-                schemaName: 'targetedms',
-                queryName: 'instrumentRate',
-                columns: 'Id,fee,rateType',
-                filterArray: [
-                    LABKEY.Filter.create('instrument', instrumentId, LABKEY.Filter.Types.EQUAL)
-                ],
-                success: function (data) {
-                    if (data.rows.length === 0) {
-                        previewErrorEl.text('No rate found for instrument.');
-                        return;
-                    }
-                    let fee = data.rows[0].fee;
-                    let rateType = data.rows[0].rateType;
-                    let cost = fee * (Math.abs(end - start)) / 1000 / 60 / 60;
-
-                    LABKEY.Query.selectRows({
-                        schemaName: 'targetedms',
-                        queryName: 'rateType',
-                        columns: 'Id,name,setupFee',
-                        filterArray: [
-                            LABKEY.Filter.create('Id', rateType, LABKEY.Filter.Types.EQUAL)
-                        ],
-                        success: function (rt) {
-                            let setupFee = rt.rows[0].setupFee;
-                            let instrumentFee = Math.round((cost + Number.EPSILON) * 100) / 100;
-                            setupFee = Math.round((setupFee + Number.EPSILON) * 100) / 100;
-                            let total = Math.round(((setupFee + instrumentFee) + Number.EPSILON) * 100) / 100;
-
-                            setupEl.val('$' + setupFee.toLocaleString('en-US', {
-                                minimumFractionDigits: 2,
-                                maximumFractionDigits: 2
-                            }));
-                            instEl.val('$' + instrumentFee.toLocaleString('en-US', {
-                                minimumFractionDigits: 2,
-                                maximumFractionDigits: 2
-                            }));
-                            totalEl.val('$' + total.toLocaleString('en-US', {
-                                minimumFractionDigits: 2,
-                                maximumFractionDigits: 2
-                            }));
-                        },
-                        failure: function (errorInfo) {
-                            previewErrorEl.text('Error calculating cost ' + (errorInfo.exception ? errorInfo.exception : ''));
-                        }
-                    });
-                },
-                failure: function (errorInfo) {
-                    previewErrorEl.text('Error fetching instrument rate ' + (errorInfo.exception ? errorInfo.exception : ''));
-                }
-            });
-        }
-
-        // Helper to read current form values and trigger preview
-        function triggerCostPreviewNow() {
-            const currentInstrument = instrument ? instrument : $('#instrumentDropDown').val();
-            const startVal = $('#event-modal input[name="event-start-date"]').val();
-            const endVal = $('#event-modal input[name="event-end-date"]').val();
-            calculateAndRenderCostPreview(currentInstrument, startVal, endVal);
-        }
-        const triggerCostPreview = debounce(triggerCostPreviewNow, 300);
-
-        // Bind listeners for live updates
-        $(document).on('input change', '#event-modal input[name="event-start-date"], #event-modal input[name="event-end-date"]', function(){
-            triggerCostPreview();
-        });
-        $(document).on('change', '#instrumentDropDown', function(){
-            triggerCostPreview();
-        });
-
-        // Kick off preview when the modal opens
-        $('#event-modal').on('shown.bs.modal', function(){
-            triggerCostPreviewNow();
-        });
-
-        function fetchInstrumentCosts(instrumentId, startDate, endDate) {
-            LABKEY.Query.selectRows({
-                schemaName: 'targetedms',
-                queryName: 'instrumentRate',
-                columns: 'Id,fee,rateType',
-                filterArray: [
-                    LABKEY.Filter.create('instrument', instrumentId, LABKEY.Filter.Types.EQUAL)
-                ],
-                success: function (data) {
-                    if (data.rows.length === 0) {
-                        $('#schedule-save-error').text('Error calculating cost. No rate found for instrument');
-                        return;
-                    }
-                    let fee = data.rows[0].fee;
-                    let rateType = data.rows[0].rateType;
-                    let cost = fee * (Math.abs(new Date(endDate) - new Date(startDate))) / 1000 / 60 / 60;
-
-                    // query the rateType
-                    LABKEY.Query.selectRows({
-                        schemaName: 'targetedms',
-                        queryName: 'rateType',
-                        columns: 'Id,name,setupFee',
-                        filterArray: [
-                            LABKEY.Filter.create('Id', rateType, LABKEY.Filter.Types.EQUAL)
-                        ],
-                        success: function (data) {
-                            let setupFee = data.rows[0].setupFee;
-
-                            let startDateFormatted = DateFormat.format.date(startDate, LABKEY.container.formats.dateTimeFormat);
-                            let endDateFormatted = DateFormat.format.date(endDate, LABKEY.container.formats.dateTimeFormat);
-
-                            let tableElt = document.getElementById('event-cost-table');
-                            let rowElt = document.createElement('tr');
-                            rowElt.className = 'labkey-row';
-                            let totalCost = Math.round(((setupFee + cost) + Number.EPSILON) * 100) / 100;
-                            cost = Math.round((cost + Number.EPSILON) * 100) / 100;
-                            setupFee = Math.round((setupFee + Number.EPSILON) * 100) / 100;
-                            rowElt.innerHTML = '<td>' + startDateFormatted + '</td><td>' + endDateFormatted + '</td><td id="event-cost">' + '$' + totalCost.toLocaleString('en-US', {
-                                minimumFractionDigits: 2,
-                                maximumFractionDigits: 2
-                            }) + '</td>';
-                            tableElt.appendChild(rowElt);
-
-                            const totalEventCostElt = document.getElementById('total-event-cost');
-                            totalEventCostElt.innerHTML = 'Total Cost: $' + totalCost.toLocaleString('en-US', {
-                                minimumFractionDigits: 2,
-                                maximumFractionDigits: 2
-                            });
-
-                            $('#setup-cost').val('$' + setupFee.toLocaleString('en-US', {
-                                minimumFractionDigits: 2,
-                                maximumFractionDigits: 2
-                            }));
-                            $('#instrument-fee').val('$' + cost.toLocaleString('en-US', {
-                                minimumFractionDigits: 2,
-                                maximumFractionDigits: 2
-                            }));
-                            $('#total-cost').val('$' + (setupFee + cost).toLocaleString('en-US', {
-                                minimumFractionDigits: 2,
-                                maximumFractionDigits: 2
-                            }));
-                        },
-                        failure: function (errorInfo) {
-                            $('#schedule-cost-error').text('Error calculating cost ' + (errorInfo.exception ? errorInfo.exception : ''));
-                        }
-                    });
-                }
-            });
-        }
-
-        function saveEvent() {
-
-            let instrumentUsagePaymentRows = [];
-            if (paymentMethods.length > 0) {
-                for (let i = 0; i < paymentMethods.length; i++) {
-                    instrumentUsagePaymentRows.push({
-                        paymentMethod: paymentMethods[i].paymentMethod,
-                        percentPayment: paymentMethods[i].percentPayment
-                    });
-                }
-            }
-
-            eventToSave.usagePayments = instrumentUsagePaymentRows;
-
-            let instrumentScheduleCommand = {
-                command: eventToSave.id ? 'update' : 'insert',
-                schemaName: 'targetedms',
-                queryName: 'instrumentSchedule',
-                rows: [
-                    eventToSave
-                ]
-            };
-
-            LABKEY.Query.saveRows({
-                commands: [instrumentScheduleCommand],
-                success: function (response) {
-
-                    loadInstrumentSchedule(function (data) {
-                        calendar.getEventSources()[0].remove();
-                        calendar.addEventSource(data);
-                        // Update the session events log and totals using the same calculation logic (no modal)
-                        fetchInstrumentCosts(eventToSave.instrument, eventToSave.startTime, eventToSave.endTime);
-                        $('#event-modal').modal('hide');
-                    }, true);
-
-                    if (instrumentUsagePaymentRows.length > 0 && !eventToSave.id && response?.result[0]?.rows?.length > 0) {
-                        let responseRows = response.result[0].rows;
-                        let instrumentScheduleId = responseRows[0].id;
-                        for (let i = 0; i < instrumentUsagePaymentRows.length; i++) {
-                            instrumentUsagePaymentRows[i].instrumentScheduleId = instrumentScheduleId;
-                        }
-                    }
-                },
-                failure: function (errorInfo) {
-                    $('#schedule-save-error').text('Error saving. ' + (errorInfo.exception ? errorInfo.exception : ''));
-                }
-            });
-        }
-
-        function removeEventLog() {
-            let tableElt = document.querySelector('#events-log table');
-            // remove the table rows if it exists
-            if (tableElt) {
-                let rows = tableElt.querySelectorAll('tr');
-                for (let i = 1; i < rows.length; i++) {
-                    rows[i].remove();
-                }
-            }
-
-            let infoElt = document.querySelector('#total-event-cost');
-            if (infoElt) {
-                infoElt.innerHTML = '';
-            }
-        }
-
-        function deleteEvent() {
-            removeEventLog()
-
-            const event = {
-                id: $('#event-modal input[name="event-index"]').val(),
-            };
-
-            LABKEY.Query.executeSql({
-                schemaName: 'targetedms',
-                sql: 'SELECT paymentMethod FROM targetedms.instrumentUsagePayment WHERE instrumentScheduleId = ' + event.id,
-                scope: this,
-                success: function (data) {
-                    let dataRows = data.rows;
-                    let instrumentUsagePaymentRows = [];
-
-                    for (let i = 0; i < dataRows.length; i++) {
-                        instrumentUsagePaymentRows.push({
-                            instrumentScheduleId: event.id,
-                            paymentMethod: dataRows[i].paymentMethod
-                        });
-                    }
-
-                    const commands = [];
-                    if (instrumentUsagePaymentRows.length > 0) {
-                        commands.push({
-                            command: 'delete',
-                            schemaName: 'targetedms',
-                            queryName: 'instrumentUsagePayment',
-                            rows: instrumentUsagePaymentRows
-                        });
-                    }
-
-                    commands.push({
-                        command: 'delete',
-                        schemaName: 'targetedms',
-                        queryName: 'instrumentSchedule',
-                        rows: [event]
-                    });
-
-                    LABKEY.Query.saveRows({
-                        commands: commands,
-                        success: function () {
-                            loadInstrumentSchedule(function (data) {
-                                calendar.getEventSources()[0].remove()
-                                calendar.addEventSource(data)
-                                $('#event-modal').modal('hide');
-                            }, true);
-                        },
-                        failure: function (errorInfo) {
-                            $('#schedule-save-error').text('Error saving. ' + (errorInfo.exception ? errorInfo.exception : ''));
-                        }
-                    });
-                },
-                failure: function (errorInfo) {
-                    $('#schedule-save-error').text('Error saving. ' + (errorInfo.exception ? errorInfo.exception : ''));
-                }
-            });
-        }
-
-        function loadInstrumentSchedule(callback) {
-            let instrumentSchedule = [];
-            const currentInstrument = instrument ? instrument : parseInt($('#instrumentDropDown').val());
-            LABKEY.Query.selectRows({
-                schemaName: 'targetedms',
-                queryName: 'instrumentSchedule',
-                columns: 'Id,startTime,endTime,name,notes,instrument/color,instrument/Id,project/Id, project/Title',
-                filterArray: [
-                    LABKEY.Filter.create('instrument', currentInstrument),
-                ],
-                success: function (data) {
-                    let rows = data.rows;
-                    for (let i = 0; i < rows.length; i++) {
-                        let row = rows[i];
-                        instrumentSchedule.push({
-                            id: row.Id,
-                            start: new Date(row.startTime),
-                            end: new Date(row.endTime),
-                            name: row.name,
-                            notes: row.notes,
-                            color: row['instrument/color'],
-                            project: row['project/Id'],
-                            title: row['project/Title']
-                        });
-                    }
-                    callback(instrumentSchedule);
-                }
-            });
-        }
-
-        $('#add-event').on('click', addEvent);
-        $('#close-event').on('click', closeEvent);
-        $('#save-event').on('click', saveEvent);
-        $('#delete-event').on('click', deleteEvent);
-
-        $('#close-schedule').on('click', function () {
-            $('#event-modal').modal('hide');
-        });
-
-        let paymentMethodsData;
-        let paymentMethodCount = 1;
-        const addPaymentMethodEl = document.getElementById('addPaymentMethod');
-        addPaymentMethodEl.addEventListener('click', function () {
-            paymentMethodCount++;
-            let id = 'paymentMethodDropDown' + paymentMethodCount;
-            let paymentMethodDropDown = '<select id="' + id + '" name="' + id + '">';
-            for (let i = 0; i < paymentMethodsData.length; i++) {
-                paymentMethodDropDown += '<option value="' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].Id) + '">' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].name) + '</option>';
-            }
-            paymentMethodDropDown += '</select>';
-
-            // Always render a percent input group; visibility toggled by updatePercentInputsVisibility
-            paymentMethodDropDown += '&nbsp;<span class="paymentPercentGroup" style="display:none;"><input type="text" class="paymentMethodPercent" name="paymentMethodPercent" value="0" size="3" maxlength="3"><label>%</label></span>';
-
-            paymentMethodDropDown += '&nbsp' +
-                    '<span id="removePaymentMethod" role="button" style="cursor: pointer;">[Remove]</span>';
-            let logElt = document.createElement('div');
-            logElt.innerHTML = paymentMethodDropDown;
-
-            const container = document.querySelector('#paymentMethodDropDown');
-            container.appendChild(logElt);
-
-            // Attach live validation listeners to the newly added input
-            const newInput = logElt.querySelector('.paymentMethodPercent');
-            if (newInput) {
-                newInput.addEventListener('input', validatePaymentMethodPercentsAndShow);
-                newInput.addEventListener('change', validatePaymentMethodPercentsAndShow);
-            }
-
-            // Ensure percent inputs are shown only when multiple rows are present
-            updatePercentInputsVisibility();
-
-            // Re-run validation after adding a row
-            validatePaymentMethodPercentsAndShow();
-        });
-
-        document.addEventListener('click', function (event) {
-            if (event.target.id === 'removePaymentMethod') {
-                event.preventDefault();
-                event.target.parentElement.remove();
-                // Update visibility after removal
-                updatePercentInputsVisibility();
-                // Re-validate after removal to update the message and totals
-                validatePaymentMethodPercentsAndShow();
-            }
-        });
-
-        // refresh the page on project change
-        document.getElementById('projectDropDown').addEventListener('change', function () {
-            document.location.href = LABKEY.ActionURL.buildURL('targetedms', 'scheduleInstrument', null, {project: document.getElementById('projectDropDown').value});
-        });
-
-        // refresh the page on instrument change
-        document.getElementById('instrumentDropDown').addEventListener('change', function () {
-            document.location.href = LABKEY.ActionURL.buildURL('targetedms', 'scheduleInstrument', null, {project: LABKEY.ActionURL.getParameter('project'), instrument: document.getElementById('instrumentDropDown').value});
-        });
-
-        document.getElementById('instrument-rates').innerHTML = LABKEY.Utils.textLink({text: 'View the current rates for instruments', href: LABKEY.ActionURL.buildURL('query', 'executeQuery', LABKEY.ActionURL.getContainer(), {schemaName: 'targetedms', 'query.queryName': 'InstrumentRate'})});
-    });
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/resources/views/scheduleInstrument.view.xml b/resources/views/scheduleInstrument.view.xml
index 66bbcc043..c45623167 100644
--- a/resources/views/scheduleInstrument.view.xml
+++ b/resources/views/scheduleInstrument.view.xml
@@ -3,6 +3,5 @@
         <dependency path="internal/jQuery"/>
         <dependency path="targetedms/instrumentCalendar"/>
         <dependency path="TargetedMS/css/instrumentScheduler.css"/>
-        <dependency path="TargetedMS/js/scheduleUtils.js"/>
     </dependencies>
 </view>
\ No newline at end of file
diff --git a/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java b/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
index ee80d581b..26c8ee2e1 100644
--- a/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
+++ b/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
@@ -170,7 +170,15 @@ public void testSchedule()
         assertProjectEventCounts(2, 2);
 
         doAndWaitForPageToLoad(() -> selectOptionByText(Locator.id("instrumentDropDown"), INSTRUMENT_2));
-        scheduleInstrument(yearMonth + "-06", false);
+        click(Locator.id("addPaymentMethod"));
+
+        scheduleInstrument(yearMonth + "-06", false, () -> {
+            // Make it a two-day reservation
+            String originalEnd = getFormElement(END_DATE_TIME_FIELD.findElement(getDriver()));
+            setFormElement(END_DATE_TIME_FIELD.findElement(getDriver()), originalEnd.replace("-06T", "-07T"));
+
+
+        });
         assertProjectEventCounts(1, 0);
 
         impersonate(LAB_MEMBER_USER);
diff --git a/webapp/TargetedMS/instrumentCalendar.lib.xml b/webapp/TargetedMS/instrumentCalendar.lib.xml
index 1b217ed90..1648f5004 100644
--- a/webapp/TargetedMS/instrumentCalendar.lib.xml
+++ b/webapp/TargetedMS/instrumentCalendar.lib.xml
@@ -1,5 +1,7 @@
 <libraries xmlns="http://labkey.org/clientLibrary/xml/">
     <library compileInProductionMode="true">
         <script path="TargetedMS/js/fullcalendar.js"/>
+        <script path="TargetedMS/js/scheduleUtils.js"/>
+        <script path="TargetedMS/js/scheduler.js"/>
     </library>
 </libraries>
\ No newline at end of file
diff --git a/webapp/TargetedMS/js/scheduler.js b/webapp/TargetedMS/js/scheduler.js
new file mode 100644
index 000000000..d7d0910a9
--- /dev/null
+++ b/webapp/TargetedMS/js/scheduler.js
@@ -0,0 +1,938 @@
+$(function() {
+
+    let project = LABKEY.ActionURL.getParameter('project');
+    let instrument = LABKEY.ActionURL.getParameter('instrument');
+    // Parse as integers, defaulting to null if empty/invalid
+    project = project ? parseInt(project) || null : null;
+    instrument = instrument ? parseInt(instrument) || null : null;
+
+    if (!project) {
+        document.getElementById('calendar').innerText = 'Invalid or no project specified';
+        return;
+    }
+
+    let calendar = null;
+    let eventToSave = {};
+    let paymentMethods = [];
+
+    LABKEY.Query.selectRows({
+        schemaName: 'targetedms',
+        queryName: 'msProject',
+        sort: 'Title',
+        columns: 'Id,Title',
+        scope: this,
+        success: function (result) {
+            let rows = result.rows;
+            let projectDropDown = document.getElementById('projectDropDown');
+            while (projectDropDown.firstChild) {
+                projectDropDown.removeChild(projectDropDown.firstChild);
+            }
+            for (let i = 0; i < rows.length; i++) {
+                let option = document.createElement('option');
+                option.value = rows[i].Id;
+                option.text = rows[i].Title;
+                if (project === rows[i].Id) {
+                    option.selected = true;
+                }
+                projectDropDown.appendChild(option);
+            }
+        }
+    });
+
+    LABKEY.Query.selectRows({
+        schemaName: 'targetedms',
+        queryName: 'msInstrument',
+        sort: 'name',
+        columns: 'Id,name,active',
+        filterArray: [
+            LABKEY.Filter.create('active', true, LABKEY.Filter.Types.EQUAL)
+        ],
+        scope: this,
+        success: function (result) {
+            let rows = result.rows;
+            let instrumentDropDown = document.getElementById('instrumentDropDown');
+            while (instrumentDropDown.firstChild) {
+                instrumentDropDown.removeChild(instrumentDropDown.firstChild);
+            }
+
+            for (let i = 0; i < rows.length; i++) {
+                let option = document.createElement('option');
+                option.value = rows[i].Id;
+                option.text = rows[i].name;
+                if (instrument === rows[i].Id) {
+                    option.selected = true;
+                }
+                instrumentDropDown.appendChild(option);
+            }
+
+            loadInstrumentSchedule(function(instrumentSchedule) {
+
+                var calendarEl = document.getElementById('calendar');
+
+                calendar = new FullCalendar.Calendar(calendarEl, {
+                    headerToolbar: {
+                        left: 'prev,next today',
+                        center: 'title',
+                        right: 'dayGridMonth,timeGridWeek,timeGridDay'
+                    },
+                    initialDate: new Date(),
+                    navLinks: true, // can click day/week names to navigate views
+                    selectable: true,
+                    selectMirror: true,
+                    eventContent: function(e) {
+
+                        let content = '';
+                        let bgColor = e.event.extendedProps.project === project ? e.backgroundColor : 'gray';
+                        const cl = e.event.extendedProps.project === project ? 'activeProjectEvent' : 'otherProjectEvent';
+                        let textColor = ScheduleUtils.getContrastTextColor(ScheduleUtils.stringToColor(bgColor));
+                        let timeFormatString = LABKEY.container.formats.timeFormat;
+                        // Strip seconds and milliseconds
+                        timeFormatString = timeFormatString.replace(':ss', '').replace('.SSS', '');
+                        let dateStr = DateFormat.format.date(e.event.start, timeFormatString) + ' - ' + DateFormat.format.date(e.event.end, timeFormatString);
+                        let style = 'background-color: ' + LABKEY.Utils.encodeHtml(bgColor) + '; color: ' + LABKEY.Utils.encodeHtml(textColor) + ';' + 'width: 100%';
+                        content += '<div class="' + LABKEY.Utils.encodeHtml(cl) + '" style="' + style + ';">'
+                                + '<div class="event-date">' + LABKEY.Utils.encodeHtml(dateStr) + '</div>'
+                                + '<div class="event-id" >' + 'Project : &nbsp' + LABKEY.Utils.encodeHtml(e.event.extendedProps.project) + '</div>'
+                                + '</div>';
+                        return { html: content };
+                    },
+                    eventMouseEnter: function (mouseEnterInfo) {
+                        removeEventLog();
+                        let instrumentID = instrument ? instrument : $('#instrumentDropDown').val();
+                        fetchInstrumentCosts(instrumentID, mouseEnterInfo.event.start, mouseEnterInfo.event.end);
+                        let content = '';
+                        let dateStr = DateFormat.format.date(mouseEnterInfo.event.start, LABKEY.container.formats.dateTimeFormat) + ' - ' + DateFormat.format.date(mouseEnterInfo.event.end, LABKEY.container.formats.dateTimeFormat);
+                        content += '<div class="event-tooltip-content">'
+                                + '<div class="event-id" >' + 'Project Id : &nbsp' + LABKEY.Utils.encodeHtml(mouseEnterInfo.event.extendedProps.project) + '</div>'
+                                + '<div class="event-title">' + 'Title : &nbsp' + LABKEY.Utils.encodeHtml(mouseEnterInfo.event.title) + '</div>'
+                                + '<div class="event-date">' + LABKEY.Utils.encodeHtml(dateStr) + '</div>'
+                                + '</div>';
+
+
+                        $(mouseEnterInfo.el).popover({
+                            trigger: 'manual',
+                            container: 'body',
+                            html:true,
+                            content: content,
+
+                        });
+
+                        $(mouseEnterInfo.el).popover('show');
+
+                        const $popover = $('.popover'); // Get the popover element
+                        // Keep the popover open when hovering over it
+                        $popover.on('mouseenter', function () {
+                            $(mouseEnterInfo.el).popover('show');
+                        });
+
+                        // Close the popover when the mouse leaves it
+                        $popover.on('mouseleave', function () {
+                            $(mouseEnterInfo.el).popover('hide');
+                        });
+                    },
+                    eventMouseLeave: function (mouseLeaveInfo) {
+                        setTimeout(() => {
+                            const $popover = $('.popover:hover');
+                            if ($popover.length === 0) {
+                                $(mouseLeaveInfo.el).popover('hide');
+                            }
+                        }, 200); // Add a delay to allow for hover on the popover
+                    },
+                    select: function(arg) {
+                        editEvent({
+                            startDate: arg.start,
+                            endDate: arg.end,
+                            id: null,
+                            name: '',
+                            notes: ''
+                        });
+                        calendar.unselect()
+                    },
+                    eventClick: function(arg) {
+                        editEvent({
+                            startDate: arg.event.start,
+                            endDate: arg.event.end,
+                            id: arg.event.id,
+                            name: arg.event.extendedProps.name,
+                            notes: arg.event.extendedProps.notes
+                        });
+                    },
+                    editable: true,
+                    events: instrumentSchedule
+                });
+
+                // remove loading text
+                calendarEl.innerHTML = '';
+                calendar.render();
+
+            });
+        }
+    });
+
+    function validatePaymentMethodPercentsAndShow() {
+        const errorEl = document.getElementById('payment-method-error');
+        const scheduleError = document.getElementById('schedule-save-error');
+        const selects = document.querySelectorAll('#paymentMethodDropDown select');
+        const percents = document.querySelectorAll('.paymentMethodPercent');
+
+        // Default: clear
+        let message = '';
+        let total = 0;
+        let invalid = false;
+        let hasDuplicateMethods = false;
+
+        // Only validate when there are percent inputs (i.e., multiple methods in use UI-wise)
+        if (percents.length > 0 && selects.length > 0) {
+            // Validate percent values and compute total
+            for (let i = 0; i < selects.length; i++) {
+                const val = percents[i] ? percents[i].value : (selects.length === 1 ? '100' : '0');
+                const num = parseFloat(val);
+                if (isNaN(num) || num <= 0 || num > 100) {
+                    invalid = true;
+                }
+                total += isNaN(num) ? 0 : num;
+            }
+
+            // Check for duplicate payment method selections (ignore empty values)
+            if (selects.length > 1) {
+                const seen = new Set();
+                for (let i = 0; i < selects.length; i++) {
+                    const selVal = (selects[i] && typeof selects[i].value !== 'undefined') ? selects[i].value : '';
+                    if (selVal) {
+                        if (seen.has(selVal)) {
+                            hasDuplicateMethods = true;
+                            break;
+                        }
+                        seen.add(selVal);
+                    }
+                }
+            }
+
+            if (invalid) {
+                message = 'Each payment percentage must be a number between 0 and 100.';
+            }
+            else if (hasDuplicateMethods) {
+                message = 'The same payment method cannot be selected more than once.';
+            }
+            else if (percents.length > 1 && total !== 100) {
+                message = 'When multiple payment methods are used, the percentages must add up to 100% (current total: ' + total + '%).';
+            }
+        }
+
+        if (errorEl) errorEl.textContent = message;
+        if (scheduleError) scheduleError.textContent = message; // mirror below modal as well
+
+        return { valid: !message, total: total };
+    }
+
+    const validationCallback = validatePaymentMethodPercentsAndShow;
+
+    function updatePercentInputsVisibility() {
+        const container = document.getElementById('paymentMethodDropDown');
+        if (!container) return;
+
+        const selects = container.querySelectorAll('select');
+        const groups = container.querySelectorAll('.paymentPercentGroup');
+        const inputs = container.querySelectorAll('.paymentMethodPercent');
+        const rowCount = selects.length;
+
+        // Show when multiple rows, hide when single
+        const show = rowCount > 1;
+
+        // If only one row remains, reset its percent back to 100 before hiding
+        if (!show && inputs.length > 0) {
+            inputs[0].value = '100';
+        }
+
+        groups.forEach(function (grp) {
+            grp.style.display = show ? '' : 'none';
+        });
+
+        // When first transitioning to multi-row, ensure sensible defaults
+        if (show && inputs.length > 0) {
+            // If first value is empty, default to 100
+            if (inputs[0].value === '') inputs[0].value = '100';
+            // For others, if empty, default to 0
+            for (let i = 1; i < inputs.length; i++) {
+                if (inputs[i].value === '') inputs[i].value = '0';
+            }
+        }
+
+        // Clear the top message when hiding
+        if (!show) {
+            const topErr = document.getElementById('payment-method-error');
+            if (topErr) topErr.textContent = '';
+        }
+    }
+
+    function updateAddPaymentMethodVisibility() {
+        const addBtn = document.getElementById('addPaymentMethod');
+        const container = document.getElementById('paymentMethodDropDown');
+        if (!addBtn || !container) return;
+
+        const shownCount = container.querySelectorAll('select').length;
+        const availableCount = Array.isArray(paymentMethodsData) ? paymentMethodsData.length : 0;
+
+        // Hide the Add link if there are no available methods, or we've already shown all of them
+        const shouldHide = availableCount === 0 || shownCount >= availableCount;
+
+        addBtn.style.display = shouldHide ? 'none' : '';
+        addBtn.setAttribute('aria-hidden', shouldHide ? 'true' : 'false');
+        if (shouldHide) {
+            addBtn.setAttribute('tabindex', '-1');
+        } else {
+            addBtn.removeAttribute('tabindex');
+        }
+    }
+
+    LABKEY.Query.selectRows({
+        schemaName: 'targetedms',
+        queryName: 'projectPaymentMethod',
+        sort: 'paymentMethod/name',
+        columns: 'paymentMethod,paymentMethod/name,paymentMethod/UWBudgetNumber,paymentMethod/worktag,paymentMethod/budgetExpirationDate',
+        filterArray: [
+            LABKEY.Filter.create('project', project, LABKEY.Filter.Types.EQUAL)
+        ],
+        scope: this,
+        success: function (result) {
+            let rows = result.rows || [];
+            // Normalize to the same shape used elsewhere in this file
+            paymentMethodsData = rows.map(function(r) {
+                return {
+                    Id: r.paymentMethod,
+                    name: r['paymentMethod/name'],
+                    UWBudgetNumber: r['paymentMethod/UWBudgetNumber'],
+                    worktag: r['paymentMethod/worktag'],
+                    budgetExpirationDate: r['paymentMethod/budgetExpirationDate']
+                };
+            });
+            let paymentMethodDropDown = '<select id="paymentMethodDropDown" name="paymentMethodDropDown">';
+            for (let i = 0; i < paymentMethodsData.length; i++) {
+                paymentMethodDropDown += '<option value="' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].Id) + '">' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].name) + '</option>';
+            }
+            paymentMethodDropDown += '</select>';
+            // Always render a percent input for the first row; visibility will be toggled based on row count
+            paymentMethodDropDown += '&nbsp;<span class="paymentPercentGroup" style="display:none;"><input type="text" class="paymentMethodPercent" name="paymentMethodPercent" value="100" size="3" maxlength="3"><label>%</label></span>';
+
+            jQuery('#paymentMethodDropDown').html(paymentMethodDropDown);
+
+            // Attach live validation listeners to the first row percent input
+            const firstPercent = document.querySelector('#paymentMethodDropDown .paymentMethodPercent');
+            if (firstPercent) {
+                firstPercent.addEventListener('input', validationCallback);
+                firstPercent.addEventListener('change', validationCallback);
+            }
+
+            // Also validate when the initial payment method selection changes
+            const firstSelect = document.querySelector('#paymentMethodDropDown select');
+            if (firstSelect) {
+                firstSelect.addEventListener('change', validatePaymentMethodPercentsAndShow);
+            }
+
+            // Toggle visibility based on how many rows are present
+            updatePercentInputsVisibility();
+            // Run validation once to clear or show any messages
+            validatePaymentMethodPercentsAndShow();
+
+            // Update Add Payment Method control visibility based on available vs shown
+            updateAddPaymentMethodVisibility();
+
+            // If there are no payment methods, disable Save and inform the user
+            const saveBtn = document.getElementById('save-event');
+            const scheduleError = document.getElementById('schedule-save-error');
+            if (paymentMethodsData.length === 0) {
+                if (saveBtn) saveBtn.setAttribute('disabled', 'disabled');
+                if (scheduleError) scheduleError.textContent = 'No payment methods are configured for this project. Please contact an administrator.';
+            }
+            else {
+                if (saveBtn) saveBtn.removeAttribute('disabled');
+                if (scheduleError) scheduleError.textContent = '';
+            }
+
+        }
+    });
+
+    LABKEY.Query.selectRows({
+        schemaName: 'targetedms',
+        queryName: 'projectResearcher',
+        sort: 'researcher/displayName',
+        columns: 'Id,researcher/displayName,researcher/UserId,project',
+        filterArray: [
+            LABKEY.Filter.create('project', project, LABKEY.Filter.Types.EQUAL),
+            LABKEY.Filter.create('researcher/UserId', project, LABKEY.Filter.Types.NONBLANK)
+        ],
+        scope: this,
+        success: function (result) {
+            let rows = result.rows;
+            let instrumentOperatorDropDown = document.getElementById('instrumentOperatorDropDown');
+            while (instrumentOperatorDropDown.firstChild) {
+                instrumentOperatorDropDown.removeChild(instrumentOperatorDropDown.firstChild);
+            }
+            for (let i = 0; i < rows.length; i++) {
+                let option = document.createElement('option');
+                option.value = rows[i]['researcher/UserId'];
+                option.text = rows[i]['researcher/displayName'];
+                if (LABKEY.user.id === rows[i]['researcher/UserId']) {
+                    option.selected = true;
+                }
+                instrumentOperatorDropDown.appendChild(option);
+            }
+        }
+    });
+
+
+    function editEvent(event) {
+        let startDate = event.startDate;
+        let endDate = event.endDate;
+
+        if (!event.id && startDate.getHours() === 0 && startDate.getMinutes() === 0 && endDate.getHours() === 0 && endDate.getMinutes() === 0) {
+            // Default to starting at 8AM and ending at 5PM
+            startDate.setHours(8);
+            endDate.setHours(17);
+            endDate.setDate(endDate.getDate() - 1);
+        }
+
+        let startDateFormatted = DateFormat.format.date(startDate, LABKEY.container.formats.dateTimeFormat);
+        let endDateFormatted = DateFormat.format.date(endDate, LABKEY.container.formats.dateTimeFormat);
+
+        // remove the old event log rows
+        removeEventLog();
+
+        $('#event-modal input[name="event-index"]').val(event ? event.id : '');
+        $('#event-modal input[name="event-start-date"]').val(startDateFormatted);
+        $('#event-modal input[name="event-end-date"]').val(endDateFormatted);
+        $('#event-modal input[name="event-name"]').val(event ? event.name : '');
+        $('#event-modal input[name="event-notes"]').val(event ? event.notes : '');
+        $('#delete-event').toggle(!!event.id);
+        $('#add-event').text('Save');
+        $('#schedule-save-error').text('');
+        $('#schedule-cost-error').text('');
+        $('#event-modal').modal();
+    }
+
+    function closeEvent() {
+        removeEventLog();
+    }
+
+    function addEvent() {
+        eventToSave.id = $('#event-modal input[name="event-index"]').val();
+        eventToSave.startTime = $('#event-modal input[name="event-start-date"]').val();
+        eventToSave.endTime = $('#event-modal input[name="event-end-date"]').val();
+        eventToSave.project = project;
+        eventToSave.instrument = instrument ? instrument : $('#instrumentDropDown').val();
+        eventToSave.name = $('#event-modal input[name="event-name"]').val();
+        eventToSave.notes = $('#event-modal input[name="event-notes"]').val();
+        eventToSave.instrumentoperator = $('#instrumentOperatorDropDown').val();
+
+        if (eventToSave.endTime < eventToSave.startTime) {
+            alert('End date must be after start date');
+            return;
+        }
+
+        // get the paymentMethod and percentPayment from the html fields
+        paymentMethods = [];
+        let paymentMethodDropDowns = document.querySelectorAll('#paymentMethodDropDown select');
+        let percentPaymentFields = document.querySelectorAll('.paymentMethodPercent');
+
+        // Validation: ensure numeric values and totals add to 100 when multiple entries
+        let percentTotal = 0;
+        let invalidPercent = false;
+        for (let i = 0; i < paymentMethodDropDowns.length; i++) {
+            let paymentMethodId = paymentMethodDropDowns[i].value;
+            let percentVal = percentPaymentFields[i] ? percentPaymentFields[i].value : (paymentMethodDropDowns.length === 1 ? '100' : '0');
+            let percentNum = parseFloat(percentVal);
+            if (percentPaymentFields.length > 0) {
+                // only validate when inputs are present (multiple methods)
+                if (isNaN(percentNum) || percentNum < 0 || percentNum > 100) {
+                    invalidPercent = true;
+                }
+                percentTotal += isNaN(percentNum) ? 0 : percentNum;
+            }
+            paymentMethods.push({
+                paymentMethod: paymentMethodId,
+                percentPayment: percentVal
+            });
+        }
+
+        const scheduleError = document.getElementById('schedule-save-error');
+        if (invalidPercent) {
+            if (scheduleError) scheduleError.textContent = 'Each payment percentage must be a number between 0 and 100.';
+            return;
+        }
+        if (percentPaymentFields.length > 1 && percentTotal !== 100) {
+            if (scheduleError) scheduleError.textContent = 'When multiple payment methods are used, the percentages must add up to 100% (current total: ' + percentTotal + '%).';
+            return;
+        } else if (scheduleError) {
+            scheduleError.textContent = '';
+        }
+
+        // Live preview is already shown as dates change. Save directly.
+        saveEvent();
+    }
+
+    // Debounce helper for frequent UI events
+    function debounce(fn, wait) {
+        let t;
+        return function() {
+            const ctx = this, args = arguments;
+            clearTimeout(t);
+            t = setTimeout(function(){ fn.apply(ctx, args); }, wait);
+        };
+    }
+
+    // Calculate and render live cost preview inside the event modal without changing logs
+    function calculateAndRenderCostPreview(instrumentId, startDate, endDate) {
+        const previewErrorEl = $('#schedule-preview-error');
+        const setupEl = $('#preview-setup-cost');
+        const instEl = $('#preview-instrument-fee');
+        const totalEl = $('#preview-total-cost');
+
+        // Clear previous values
+        setupEl.val('');
+        instEl.val('');
+        totalEl.val('');
+        previewErrorEl.text('');
+
+        if (!instrumentId || !startDate || !endDate) {
+            return;
+        }
+        const start = new Date(startDate);
+        const end = new Date(endDate);
+        if (isNaN(start.getTime()) || isNaN(end.getTime())) {
+            return;
+        }
+        if (end <= start) {
+            previewErrorEl.text('End date must be after start date.');
+            return;
+        }
+
+        LABKEY.Query.selectRows({
+            schemaName: 'targetedms',
+            queryName: 'instrumentRate',
+            columns: 'Id,fee,rateType',
+            filterArray: [
+                LABKEY.Filter.create('instrument', instrumentId, LABKEY.Filter.Types.EQUAL)
+            ],
+            success: function (data) {
+                if (data.rows.length === 0) {
+                    previewErrorEl.text('No rate found for instrument.');
+                    return;
+                }
+                let fee = data.rows[0].fee;
+                let rateType = data.rows[0].rateType;
+                let cost = fee * (Math.abs(end - start)) / 1000 / 60 / 60;
+
+                LABKEY.Query.selectRows({
+                    schemaName: 'targetedms',
+                    queryName: 'rateType',
+                    columns: 'Id,name,setupFee',
+                    filterArray: [
+                        LABKEY.Filter.create('Id', rateType, LABKEY.Filter.Types.EQUAL)
+                    ],
+                    success: function (rt) {
+                        let setupFee = rt.rows[0].setupFee;
+                        let instrumentFee = Math.round((cost + Number.EPSILON) * 100) / 100;
+                        setupFee = Math.round((setupFee + Number.EPSILON) * 100) / 100;
+                        let total = Math.round(((setupFee + instrumentFee) + Number.EPSILON) * 100) / 100;
+
+                        setupEl.val('$' + setupFee.toLocaleString('en-US', {
+                            minimumFractionDigits: 2,
+                            maximumFractionDigits: 2
+                        }));
+                        instEl.val('$' + instrumentFee.toLocaleString('en-US', {
+                            minimumFractionDigits: 2,
+                            maximumFractionDigits: 2
+                        }));
+                        totalEl.val('$' + total.toLocaleString('en-US', {
+                            minimumFractionDigits: 2,
+                            maximumFractionDigits: 2
+                        }));
+                    },
+                    failure: function (errorInfo) {
+                        previewErrorEl.text('Error calculating cost ' + (errorInfo.exception ? errorInfo.exception : ''));
+                    }
+                });
+            },
+            failure: function (errorInfo) {
+                previewErrorEl.text('Error fetching instrument rate ' + (errorInfo.exception ? errorInfo.exception : ''));
+            }
+        });
+    }
+
+    // Helper to read current form values and trigger preview
+    function triggerCostPreviewNow() {
+        const currentInstrument = instrument ? instrument : $('#instrumentDropDown').val();
+        const startVal = $('#event-modal input[name="event-start-date"]').val();
+        const endVal = $('#event-modal input[name="event-end-date"]').val();
+        calculateAndRenderCostPreview(currentInstrument, startVal, endVal);
+    }
+    const triggerCostPreview = debounce(triggerCostPreviewNow, 300);
+
+    // Bind listeners for live updates
+    $(document).on('input change', '#event-modal input[name="event-start-date"], #event-modal input[name="event-end-date"]', function(){
+        triggerCostPreview();
+    });
+    $(document).on('change', '#instrumentDropDown', function(){
+        triggerCostPreview();
+    });
+
+    // Kick off preview when the modal opens
+    $('#event-modal').on('shown.bs.modal', function(){
+        triggerCostPreviewNow();
+    });
+
+    function fetchInstrumentCosts(instrumentId, startDate, endDate) {
+        LABKEY.Query.selectRows({
+            schemaName: 'targetedms',
+            queryName: 'instrumentRate',
+            columns: 'Id,fee,rateType',
+            filterArray: [
+                LABKEY.Filter.create('instrument', instrumentId, LABKEY.Filter.Types.EQUAL)
+            ],
+            success: function (data) {
+                if (data.rows.length === 0) {
+                    $('#schedule-save-error').text('Error calculating cost. No rate found for instrument');
+                    return;
+                }
+                let fee = data.rows[0].fee;
+                let rateType = data.rows[0].rateType;
+                let cost = fee * (Math.abs(new Date(endDate) - new Date(startDate))) / 1000 / 60 / 60;
+
+                // query the rateType
+                LABKEY.Query.selectRows({
+                    schemaName: 'targetedms',
+                    queryName: 'rateType',
+                    columns: 'Id,name,setupFee',
+                    filterArray: [
+                        LABKEY.Filter.create('Id', rateType, LABKEY.Filter.Types.EQUAL)
+                    ],
+                    success: function (data) {
+                        let setupFee = data.rows[0].setupFee;
+
+                        let startDateFormatted = DateFormat.format.date(startDate, LABKEY.container.formats.dateTimeFormat);
+                        let endDateFormatted = DateFormat.format.date(endDate, LABKEY.container.formats.dateTimeFormat);
+
+                        let tableElt = document.getElementById('event-cost-table');
+                        let rowElt = document.createElement('tr');
+                        rowElt.className = 'labkey-row';
+                        let totalCost = Math.round(((setupFee + cost) + Number.EPSILON) * 100) / 100;
+                        cost = Math.round((cost + Number.EPSILON) * 100) / 100;
+                        setupFee = Math.round((setupFee + Number.EPSILON) * 100) / 100;
+                        rowElt.innerHTML = '<td>' + startDateFormatted + '</td><td>' + endDateFormatted + '</td><td id="event-cost">' + '$' + totalCost.toLocaleString('en-US', {
+                            minimumFractionDigits: 2,
+                            maximumFractionDigits: 2
+                        }) + '</td>';
+                        tableElt.appendChild(rowElt);
+
+                        const totalEventCostElt = document.getElementById('total-event-cost');
+                        totalEventCostElt.innerHTML = 'Total Cost: $' + totalCost.toLocaleString('en-US', {
+                            minimumFractionDigits: 2,
+                            maximumFractionDigits: 2
+                        });
+
+                        $('#setup-cost').val('$' + setupFee.toLocaleString('en-US', {
+                            minimumFractionDigits: 2,
+                            maximumFractionDigits: 2
+                        }));
+                        $('#instrument-fee').val('$' + cost.toLocaleString('en-US', {
+                            minimumFractionDigits: 2,
+                            maximumFractionDigits: 2
+                        }));
+                        $('#total-cost').val('$' + (setupFee + cost).toLocaleString('en-US', {
+                            minimumFractionDigits: 2,
+                            maximumFractionDigits: 2
+                        }));
+                    },
+                    failure: function (errorInfo) {
+                        $('#schedule-cost-error').text('Error calculating cost ' + (errorInfo.exception ? errorInfo.exception : ''));
+                    }
+                });
+            }
+        });
+    }
+
+    function saveEvent() {
+
+        let instrumentUsagePaymentRows = [];
+        if (paymentMethods.length > 0) {
+            for (let i = 0; i < paymentMethods.length; i++) {
+                instrumentUsagePaymentRows.push({
+                    paymentMethod: paymentMethods[i].paymentMethod,
+                    percentPayment: paymentMethods[i].percentPayment
+                });
+            }
+        }
+
+        eventToSave.usagePayments = instrumentUsagePaymentRows;
+
+        let instrumentScheduleCommand = {
+            command: eventToSave.id ? 'update' : 'insert',
+            schemaName: 'targetedms',
+            queryName: 'instrumentSchedule',
+            rows: [
+                eventToSave
+            ]
+        };
+
+        LABKEY.Query.saveRows({
+            commands: [instrumentScheduleCommand],
+            success: function (response) {
+
+                loadInstrumentSchedule(function (data) {
+                    calendar.getEventSources()[0].remove();
+                    calendar.addEventSource(data);
+                    // Update the session events log and totals using the same calculation logic (no modal)
+                    fetchInstrumentCosts(eventToSave.instrument, eventToSave.startTime, eventToSave.endTime);
+                    $('#event-modal').modal('hide');
+                }, true);
+
+                if (instrumentUsagePaymentRows.length > 0 && !eventToSave.id && response?.result[0]?.rows?.length > 0) {
+                    let responseRows = response.result[0].rows;
+                    let instrumentScheduleId = responseRows[0].id;
+                    for (let i = 0; i < instrumentUsagePaymentRows.length; i++) {
+                        instrumentUsagePaymentRows[i].instrumentScheduleId = instrumentScheduleId;
+                    }
+                }
+            },
+            failure: function (errorInfo) {
+                $('#schedule-save-error').text('Error saving. ' + (errorInfo.exception ? errorInfo.exception : ''));
+            }
+        });
+    }
+
+    function removeEventLog() {
+        let tableElt = document.querySelector('#events-log table');
+        // remove the table rows if it exists
+        if (tableElt) {
+            let rows = tableElt.querySelectorAll('tr');
+            for (let i = 1; i < rows.length; i++) {
+                rows[i].remove();
+            }
+        }
+
+        let infoElt = document.querySelector('#total-event-cost');
+        if (infoElt) {
+            infoElt.innerHTML = '';
+        }
+    }
+
+    function deleteEvent() {
+        removeEventLog()
+
+        const event = {
+            id: $('#event-modal input[name="event-index"]').val(),
+        };
+
+        LABKEY.Query.executeSql({
+            schemaName: 'targetedms',
+            sql: 'SELECT paymentMethod FROM targetedms.instrumentUsagePayment WHERE instrumentScheduleId = ' + event.id,
+            scope: this,
+            success: function (data) {
+                let dataRows = data.rows;
+                let instrumentUsagePaymentRows = [];
+
+                for (let i = 0; i < dataRows.length; i++) {
+                    instrumentUsagePaymentRows.push({
+                        instrumentScheduleId: event.id,
+                        paymentMethod: dataRows[i].paymentMethod
+                    });
+                }
+
+                const commands = [];
+                if (instrumentUsagePaymentRows.length > 0) {
+                    commands.push({
+                        command: 'delete',
+                        schemaName: 'targetedms',
+                        queryName: 'instrumentUsagePayment',
+                        rows: instrumentUsagePaymentRows
+                    });
+                }
+
+                commands.push({
+                    command: 'delete',
+                    schemaName: 'targetedms',
+                    queryName: 'instrumentSchedule',
+                    rows: [event]
+                });
+
+                LABKEY.Query.saveRows({
+                    commands: commands,
+                    success: function () {
+                        loadInstrumentSchedule(function (data) {
+                            calendar.getEventSources()[0].remove()
+                            calendar.addEventSource(data)
+                            $('#event-modal').modal('hide');
+                        }, true);
+                    },
+                    failure: function (errorInfo) {
+                        $('#schedule-save-error').text('Error saving. ' + (errorInfo.exception ? errorInfo.exception : ''));
+                    }
+                });
+            },
+            failure: function (errorInfo) {
+                $('#schedule-save-error').text('Error saving. ' + (errorInfo.exception ? errorInfo.exception : ''));
+            }
+        });
+    }
+
+    function loadInstrumentSchedule(callback) {
+        let instrumentSchedule = [];
+        const currentInstrument = instrument ? instrument : parseInt($('#instrumentDropDown').val());
+        LABKEY.Query.selectRows({
+            schemaName: 'targetedms',
+            queryName: 'instrumentSchedule',
+            columns: 'Id,startTime,endTime,name,notes,instrument/color,instrument/Id,project/Id, project/Title',
+            filterArray: [
+                LABKEY.Filter.create('instrument', currentInstrument),
+            ],
+            success: function (data) {
+                let rows = data.rows;
+                for (let i = 0; i < rows.length; i++) {
+                    let row = rows[i];
+                    instrumentSchedule.push({
+                        id: row.Id,
+                        start: new Date(row.startTime),
+                        end: new Date(row.endTime),
+                        name: row.name,
+                        notes: row.notes,
+                        color: row['instrument/color'],
+                        project: row['project/Id'],
+                        title: row['project/Title']
+                    });
+                }
+                callback(instrumentSchedule);
+            }
+        });
+    }
+
+    $('#add-event').on('click', addEvent);
+    $('#close-event').on('click', closeEvent);
+    $('#save-event').on('click', saveEvent);
+    $('#delete-event').on('click', deleteEvent);
+
+    $('#close-schedule').on('click', function () {
+        $('#event-modal').modal('hide');
+    });
+
+    let paymentMethodsData;
+    let paymentMethodCount = 1;
+    const addPaymentMethodEl = document.getElementById('addPaymentMethod');
+    addPaymentMethodEl.addEventListener('click', function () {
+        paymentMethodCount++;
+        let id = 'paymentMethodDropDown' + paymentMethodCount;
+        let paymentMethodDropDown = '<select id="' + id + '" name="' + id + '">';
+        for (let i = 0; i < paymentMethodsData.length; i++) {
+            paymentMethodDropDown += '<option value="' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].Id) + '">' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].name) + '</option>';
+        }
+        paymentMethodDropDown += '</select>';
+
+        // Always render a percent input group; visibility toggled by updatePercentInputsVisibility
+        paymentMethodDropDown += '&nbsp;<span class="paymentPercentGroup" style="display:none;"><input type="text" class="paymentMethodPercent" name="paymentMethodPercent" value="0" size="3" maxlength="3"><label>%</label></span>';
+
+        paymentMethodDropDown += '&nbsp' +
+                '<span id="removePaymentMethod" role="button" style="cursor: pointer;">[Remove]</span>';
+        let logElt = document.createElement('div');
+        logElt.innerHTML = paymentMethodDropDown;
+
+        const container = document.querySelector('#paymentMethodDropDown');
+        container.appendChild(logElt);
+
+        // Attempt to default the new dropdown to a payment method not already selected
+        const newSelect = logElt.querySelector('select');
+        if (newSelect && paymentMethodsData && paymentMethodsData.length > 0) {
+            const existingSelects = container.querySelectorAll('select');
+            const used = new Set();
+            existingSelects.forEach(function (sel) {
+                if (sel !== newSelect && typeof sel.value !== 'undefined' && sel.value !== '') {
+                    used.add(sel.value);
+                }
+            });
+            // Find first available method not yet used
+            let chosen = null;
+            for (let i = 0; i < paymentMethodsData.length; i++) {
+                const candidate = String(paymentMethodsData[i].Id);
+                if (!used.has(candidate)) {
+                    chosen = candidate;
+                    break;
+                }
+            }
+            if (chosen !== null) {
+                newSelect.value = chosen;
+                // Fire change event in case any listeners rely on it
+                if (typeof Event === 'function') {
+                    newSelect.dispatchEvent(new Event('change'));
+                }
+            }
+        }
+
+        // Evenly split the previous payment method's percent with the new one
+        (function () {
+            const inputs = container.querySelectorAll('.paymentMethodPercent');
+            // Only makes sense when there are at least two rows (the previous one and the new one)
+            if (inputs && inputs.length >= 2) {
+                const prevInput = inputs[inputs.length - 2];
+                const newInputEl = inputs[inputs.length - 1];
+
+                // Parse the previous value; if invalid, treat as 0 (validator will flag if needed)
+                let prevVal = parseFloat(prevInput.value);
+                if (isNaN(prevVal) || prevVal < 0) prevVal = 0;
+
+                // Split into two integers that preserve the total.
+                // Use floor for previous and remainder for new to keep sum identical.
+                const prevHalf = Math.floor(prevVal / 2);
+                const newHalf = prevVal - prevHalf;
+
+                prevInput.value = String(prevHalf);
+                newInputEl.value = String(newHalf);
+            }
+        })();
+
+        // Attach live validation listeners to the newly added input
+        const newInput = logElt.querySelector('.paymentMethodPercent');
+        if (newInput) {
+            newInput.addEventListener('input', validatePaymentMethodPercentsAndShow);
+            newInput.addEventListener('change', validatePaymentMethodPercentsAndShow);
+        }
+
+        // Ensure percent inputs are shown only when multiple rows are present
+        updatePercentInputsVisibility();
+
+        // Re-run validation after adding a row
+        validatePaymentMethodPercentsAndShow();
+
+        // Update Add link visibility now that a row was added
+        updateAddPaymentMethodVisibility();
+    });
+
+    document.addEventListener('click', function (event) {
+        if (event.target.id === 'removePaymentMethod') {
+            event.preventDefault();
+            event.target.parentElement.remove();
+            // Update visibility after removal
+            updatePercentInputsVisibility();
+            // Re-validate after removal to update the message and totals
+            validatePaymentMethodPercentsAndShow();
+            // Re-evaluate Add link visibility after a row was removed
+            updateAddPaymentMethodVisibility();
+        }
+    });
+
+    // Validate immediately when a payment method selection changes (duplicate detection, totals, etc.)
+    document.addEventListener('change', function (event) {
+        if (event.target && event.target.matches('#paymentMethodDropDown select')) {
+            validatePaymentMethodPercentsAndShow();
+        }
+    });
+
+    // refresh the page on project change
+    document.getElementById('projectDropDown').addEventListener('change', function () {
+        document.location.href = LABKEY.ActionURL.buildURL('targetedms', 'scheduleInstrument', null, {project: document.getElementById('projectDropDown').value});
+    });
+
+    // refresh the page on instrument change
+    document.getElementById('instrumentDropDown').addEventListener('change', function () {
+        document.location.href = LABKEY.ActionURL.buildURL('targetedms', 'scheduleInstrument', null, {project: LABKEY.ActionURL.getParameter('project'), instrument: document.getElementById('instrumentDropDown').value});
+    });
+
+    document.getElementById('instrument-rates').innerHTML = LABKEY.Utils.textLink({text: 'View the current rates for instruments', href: LABKEY.ActionURL.buildURL('query', 'executeQuery', LABKEY.ActionURL.getContainer(), {schemaName: 'targetedms', 'query.queryName': 'InstrumentRate'})});
+});

From 9c809d96f1e26bb5993abbac4ccca7253baa298c Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Mon, 10 Nov 2025 17:04:33 -0800
Subject: [PATCH 08/12] Improved permission checks and test coverage

---
 .../queries/targetedms/InstrumentBilling.sql  |   7 +-
 .../targetedms/InstrumentBillingByMonth.sql   |   3 +-
 .../targetedms/instrumentBilling.query.xml    |   4 +
 .../instrumentBillingByMonth.query.xml        |   1 +
 .../labkey/targetedms/TargetedMSSchema.java   |  11 +-
 .../InstrumentScheduleOverlapTrigger.java     |  29 ++-
 .../query/InstrumentScheduleTable.java        |   2 +-
 .../query/InstrumentUsagePaymentTrigger.java  |  20 ++
 .../query/ProjectAddUserTrigger.java          |  32 +++
 .../query/SimpleTargetedMSTable.java          |   6 +-
 .../targetedms/InstrumentSchedulingTest.java  | 235 +++++++++++++++---
 webapp/TargetedMS/js/scheduler.js             |  53 ++--
 12 files changed, 314 insertions(+), 89 deletions(-)
 create mode 100644 src/org/labkey/targetedms/query/ProjectAddUserTrigger.java

diff --git a/resources/queries/targetedms/InstrumentBilling.sql b/resources/queries/targetedms/InstrumentBilling.sql
index debe1ba72..d9cb727f5 100644
--- a/resources/queries/targetedms/InstrumentBilling.sql
+++ b/resources/queries/targetedms/InstrumentBilling.sql
@@ -28,8 +28,9 @@ SELECT
     TIMESTAMPDIFF('SQL_TSI_HOUR', StartTime, EndTime) * ir.Fee + ir.rateType.setupFee AS TotalCost,
     iup.PaymentMethod.UWBudgetNumber AS Payment_Method,
     iup.PaymentMethod.Name AS Payment_Method_Name,
-    iup.PercentPayment
+    iup.PercentPayment,
+    ((TIMESTAMPDIFF('SQL_TSI_HOUR', StartTime, EndTime) * Fee + ir.rateType.setupFee) * PercentPayment / 100) AS AmountBilled
 
 FROM targetedms.InstrumentSchedule i
-LEFT OUTER JOIN targetedms.InstrumentRate ir ON i.Instrument = ir.Instrument
-LEFT OUTER JOIN targetedms.InstrumentUsagePayment iup ON i.Id = iup.InstrumentScheduleId
\ No newline at end of file
+INNER JOIN targetedms.InstrumentRate ir ON i.Instrument = ir.Instrument
+INNER JOIN targetedms.InstrumentUsagePayment iup ON i.Id = iup.InstrumentScheduleId
\ No newline at end of file
diff --git a/resources/queries/targetedms/InstrumentBillingByMonth.sql b/resources/queries/targetedms/InstrumentBillingByMonth.sql
index 07021015c..eda019381 100644
--- a/resources/queries/targetedms/InstrumentBillingByMonth.sql
+++ b/resources/queries/targetedms/InstrumentBillingByMonth.sql
@@ -31,7 +31,8 @@ SELECT
     Payment_Method,
     Payment_Method_Name,
     PercentPayment,
-    ((HoursInRange * Fee + Setup_Cost) * PercentPayment / 100) AS AmountBilled
+    -- Only include the setup fee when the beginning of the reservation falls within the report's time window
+    ((HoursInRange * Fee + (CASE WHEN StartDate <= StartBillDate THEN 0 ELSE Setup_Cost END)) * PercentPayment / 100) AS AmountBilled
 
 FROM
     (SELECT
diff --git a/resources/queries/targetedms/instrumentBilling.query.xml b/resources/queries/targetedms/instrumentBilling.query.xml
index 736fbee64..93d083bfc 100644
--- a/resources/queries/targetedms/instrumentBilling.query.xml
+++ b/resources/queries/targetedms/instrumentBilling.query.xml
@@ -2,6 +2,7 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="instrumentBilling" tableDbType="TABLE">
+                <tableTitle>Instrument Billing</tableTitle>
                 <columns>
                     <column columnName="Hours">
                         <formatString>0.0</formatString>
@@ -9,6 +10,9 @@
                     <column columnName="TotalCost">
                         <formatString>$#,##0.00</formatString>
                     </column>
+                    <column columnName="AmountBilled">
+                        <formatString>$#,##0.00</formatString>
+                    </column>
                 </columns>
             </table>
         </tables>
diff --git a/resources/queries/targetedms/instrumentBillingByMonth.query.xml b/resources/queries/targetedms/instrumentBillingByMonth.query.xml
index 78f428b89..d0a052d6b 100644
--- a/resources/queries/targetedms/instrumentBillingByMonth.query.xml
+++ b/resources/queries/targetedms/instrumentBillingByMonth.query.xml
@@ -2,6 +2,7 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="instrumentBillingByMonth" tableDbType="TABLE">
+                <tableTitle>Instrument Billing by Month</tableTitle>
                 <columns>
                     <column columnName="HoursInRange">
                         <formatString>0.0</formatString>
diff --git a/src/org/labkey/targetedms/TargetedMSSchema.java b/src/org/labkey/targetedms/TargetedMSSchema.java
index d99ddf2d1..c8eb463f3 100644
--- a/src/org/labkey/targetedms/TargetedMSSchema.java
+++ b/src/org/labkey/targetedms/TargetedMSSchema.java
@@ -105,6 +105,7 @@
 import org.labkey.targetedms.query.PeptideTableInfo;
 import org.labkey.targetedms.query.PrecursorChromInfoTable;
 import org.labkey.targetedms.query.PrecursorTableInfo;
+import org.labkey.targetedms.query.ProjectAddUserTrigger;
 import org.labkey.targetedms.query.QCAnnotationTable;
 import org.labkey.targetedms.query.QCAnnotationTypeTable;
 import org.labkey.targetedms.query.QCEnabledMetricsTable;
@@ -1631,7 +1632,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
                 TABLE_PROJECT_RESEARCHER.equalsIgnoreCase(name) ||
                 TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name))
         {
-            var result = new OwnProjectSchedulingTable(name, this, cf, TABLE_MS_PROJECT.equalsIgnoreCase(name));
+            var result = new OwnProjectSchedulingTable(name, this, cf, !TABLE_MS_PROJECT.equalsIgnoreCase(name));
             if (TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name))
             {
                 result.addTriggerFactory((c, table, extraContext) -> List.of(new InstrumentUsagePaymentTrigger("InstrumentScheduleId")));
@@ -1654,17 +1655,19 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
                 {
                     result.addCondition(projectMemberSql, FieldKey.fromParts("Id"));
                 }
+                result.addTriggerFactory((c, table, extraContext) -> List.of(new ProjectAddUserTrigger()));
             }
             else if (TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name))
             {
                 // For non-admins, completely hide payment data for projects they're not associated with
                 if (!getContainer().hasPermission(getUser(), AdminPermission.class))
                 {
-                    SQLFragment projectMemberSql = new SQLFragment("EXISTS (SELECT Project FROM ");
+                    SQLFragment projectMemberSql = new SQLFragment("InstrumentScheduleId IN (SELECT i.Id FROM ");
+                    projectMemberSql.append(TargetedMSManager.getTableInfoInstrumentSchedule(), "i");
+                    projectMemberSql.append(" INNER JOIN ");
                     projectMemberSql.append(TargetedMSManager.getTableInfoProjectResearcher(), "pr");
-                    projectMemberSql.append(" WHERE pr.researcher = ? AND pr.project = ");
+                    projectMemberSql.append(" ON i.Project = pr.Project AND pr.researcher = ?)");
                     projectMemberSql.add(getUser().getUserId());
-                    projectMemberSql.append(ExprColumn.STR_TABLE_ALIAS).append(".Project)");
                     result.addCondition(projectMemberSql, FieldKey.fromParts("Project"));
                 }
 
diff --git a/src/org/labkey/targetedms/query/InstrumentScheduleOverlapTrigger.java b/src/org/labkey/targetedms/query/InstrumentScheduleOverlapTrigger.java
index 159291dcb..becfe99d9 100644
--- a/src/org/labkey/targetedms/query/InstrumentScheduleOverlapTrigger.java
+++ b/src/org/labkey/targetedms/query/InstrumentScheduleOverlapTrigger.java
@@ -15,27 +15,33 @@
 import java.util.Map;
 
 /**
- * Prevents overlapping instrument schedule entries for the same instrument.
+ * Prevents overlapping instrument schedule entries for the same instrument and that the instrument is active.
  */
 public class InstrumentScheduleOverlapTrigger implements Trigger
 {
     @Override
-    public void beforeInsert(TableInfo table, Container c, User user, Map<String, Object> newRow, ValidationException errors, Map<String, Object> extraContext)
+    public void beforeInsert(TableInfo table, Container c, User user, Map<String, Object> newRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
     {
-        validateNoOverlap(newRow, null, errors);
+        validateNoOverlap(newRow, null);
+        Number instrument = (Number) newRow.get("Instrument");
+        SqlSelector selector = new SqlSelector(TargetedMSManager.getSchema(), "SELECT Id FROM " + TargetedMSManager.getTableInfoMSInstrument() + " WHERE Id = ? AND Active = ?", instrument, true);
+        if (!selector.exists())
+        {
+            throw new ValidationException("Instrument does not exist or is not active");
+        }
     }
 
     @Override
-    public void beforeUpdate(TableInfo table, Container c, User user, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow, ValidationException errors, Map<String, Object> extraContext)
+    public void beforeUpdate(TableInfo table, Container c, User user, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
     {
         // Use the Id from either newRow or oldRow to exclude the current record
         Integer id = getId(newRow);
         if (id == null)
             id = getId(oldRow);
-        validateNoOverlap(newRow, id, errors);
+        validateNoOverlap(newRow, id);
     }
 
-    private void validateNoOverlap(Map<String, Object> row, @Nullable Integer excludeId, ValidationException errors)
+    private void validateNoOverlap(Map<String, Object> row, @Nullable Integer excludeId) throws ValidationException
     {
         Number instrument = (Number) row.get("Instrument");
         Date start = (Date) row.get("StartTime");
@@ -43,18 +49,15 @@ private void validateNoOverlap(Map<String, Object> row, @Nullable Integer exclud
 
         if (instrument == null)
         {
-            errors.addGlobalError("Instrument is required");
-            return;
+            throw new ValidationException("Instrument is required");
         }
         if (start == null || end == null)
         {
-            errors.addGlobalError("StartTime and EndTime are required");
-            return;
+            throw new ValidationException("StartTime and EndTime are required");
         }
         if (!start.before(end))
         {
-            errors.addGlobalError("StartTime must be before EndTime");
-            return;
+            throw new ValidationException("StartTime must be before EndTime");
         }
 
         // Overlap condition: existing.start < new.end AND existing.end > new.start
@@ -75,7 +78,7 @@ private void validateNoOverlap(Map<String, Object> row, @Nullable Integer exclud
         boolean overlapExists = new SqlSelector(TargetedMSManager.getSchema(), sql).exists();
         if (overlapExists)
         {
-            errors.addGlobalError("Instrument schedule overlaps with an existing reservation for this instrument");
+            throw new ValidationException("Instrument schedule overlaps with an existing reservation for this instrument");
         }
     }
 
diff --git a/src/org/labkey/targetedms/query/InstrumentScheduleTable.java b/src/org/labkey/targetedms/query/InstrumentScheduleTable.java
index 34b600c4d..c55e3a76f 100644
--- a/src/org/labkey/targetedms/query/InstrumentScheduleTable.java
+++ b/src/org/labkey/targetedms/query/InstrumentScheduleTable.java
@@ -24,7 +24,7 @@ public class InstrumentScheduleTable extends OwnProjectSchedulingTable
 {
     public InstrumentScheduleTable(TargetedMSSchema schema, ContainerFilter cf)
     {
-        super(TargetedMSSchema.TABLE_INSTRUMENT_SCHEDULE, schema, cf, false);
+        super(TargetedMSSchema.TABLE_INSTRUMENT_SCHEDULE, schema, cf, true);
         addTriggerFactory((c, table, extraContext) -> List.of(
             new InstrumentUsagePaymentTrigger("Id"),
             new InstrumentScheduleOverlapTrigger()
diff --git a/src/org/labkey/targetedms/query/InstrumentUsagePaymentTrigger.java b/src/org/labkey/targetedms/query/InstrumentUsagePaymentTrigger.java
index 8c08da313..9a58eb81c 100644
--- a/src/org/labkey/targetedms/query/InstrumentUsagePaymentTrigger.java
+++ b/src/org/labkey/targetedms/query/InstrumentUsagePaymentTrigger.java
@@ -81,6 +81,26 @@ public void complete(TableInfo table, Container c, User user, TableInfo.TriggerT
             {
                 throw new ApiUsageException("Instrument usage payments do not add up to 100%");
             }
+
+            for (int scheduleId : _schedulesToCheck)
+            {
+                SQLFragment wrongProjectSql = new SQLFragment("SELECT * FROM ");
+                wrongProjectSql.append(TargetedMSManager.getTableInfoInstrumentUsagePayment(), "iup");
+                wrongProjectSql.append(" INNER JOIN ");
+                wrongProjectSql.append(TargetedMSManager.getTableInfoInstrumentSchedule(), "s");
+                wrongProjectSql.append(" ON iup.InstrumentScheduleId = s.Id\n");
+                wrongProjectSql.append(" WHERE iup.InstrumentScheduleId = ? AND iup.PaymentMethod NOT IN (SELECT PaymentMethod FROM ");
+                wrongProjectSql.add(scheduleId);
+                wrongProjectSql.append(TargetedMSManager.getTableInfoProjectPaymentMethod(), "ppm");
+                wrongProjectSql.append(" WHERE ppm.Project = s.Project)");
+
+                if (new SqlSelector(TargetedMSManager.getSchema(), wrongProjectSql).exists())
+                {
+                    throw new ApiUsageException("Instrument usage payments are not using a payment method that is configured for the project.");
+                }
+            }
+
+
         }, DbScope.CommitTaskOption.PRECOMMIT);
     }
 }
diff --git a/src/org/labkey/targetedms/query/ProjectAddUserTrigger.java b/src/org/labkey/targetedms/query/ProjectAddUserTrigger.java
new file mode 100644
index 000000000..fa5010e0c
--- /dev/null
+++ b/src/org/labkey/targetedms/query/ProjectAddUserTrigger.java
@@ -0,0 +1,32 @@
+package org.labkey.targetedms.query;
+
+import org.jetbrains.annotations.Nullable;
+import org.labkey.api.data.Container;
+import org.labkey.api.data.Table;
+import org.labkey.api.data.TableInfo;
+import org.labkey.api.data.triggers.Trigger;
+import org.labkey.api.query.ValidationException;
+import org.labkey.api.security.User;
+import org.labkey.targetedms.TargetedMSManager;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ProjectAddUserTrigger implements Trigger
+{
+
+    @Override
+    public void afterInsert(TableInfo table, Container c,
+                             User user, @Nullable Map<String, Object> newRow,
+                             ValidationException errors, Map<String, Object> extraContext, @Nullable Map<String, Object> existingRecord) throws ValidationException
+    {
+        // Add the creating user to the membership list
+        Map<String, Object> membership = new HashMap<>();
+        membership.put("Project", newRow.get("Id"));
+        membership.put("Researcher", user.getUserId());
+        membership.put("Container", c.getId());
+
+        Table.insert(user, TargetedMSManager.getTableInfoProjectResearcher(), membership);
+    }
+}
diff --git a/src/org/labkey/targetedms/query/SimpleTargetedMSTable.java b/src/org/labkey/targetedms/query/SimpleTargetedMSTable.java
index 79309419e..50bc9e16f 100644
--- a/src/org/labkey/targetedms/query/SimpleTargetedMSTable.java
+++ b/src/org/labkey/targetedms/query/SimpleTargetedMSTable.java
@@ -3,17 +3,17 @@
 import org.jetbrains.annotations.NotNull;
 import org.labkey.api.data.ContainerFilter;
 import org.labkey.api.query.DefaultQueryUpdateService;
-import org.labkey.api.query.FilteredTable;
 import org.labkey.api.query.QueryUpdateService;
+import org.labkey.api.query.SimpleUserSchema;
 import org.labkey.api.security.UserPrincipal;
 import org.labkey.api.security.permissions.Permission;
 import org.labkey.targetedms.TargetedMSSchema;
 
-public class SimpleTargetedMSTable extends FilteredTable<TargetedMSSchema>
+public class SimpleTargetedMSTable extends SimpleUserSchema.SimpleTable<TargetedMSSchema>
 {
     public SimpleTargetedMSTable(String name, TargetedMSSchema schema, ContainerFilter cf)
     {
-        super(TargetedMSSchema.getSchema().getTable(name), schema, cf);
+        super(schema, TargetedMSSchema.getSchema().getTable(name), cf);
         wrapAllColumns(true);
     }
 
diff --git a/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java b/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
index 26c8ee2e1..365579aea 100644
--- a/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
+++ b/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
@@ -17,10 +17,14 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.runners.MethodSorters;
 import org.labkey.remoteapi.CommandException;
+import org.labkey.remoteapi.query.Filter;
 import org.labkey.remoteapi.query.InsertRowsCommand;
+import org.labkey.remoteapi.query.SelectRowsCommand;
 import org.labkey.remoteapi.security.WhoAmICommand;
 import org.labkey.test.Locator;
 import org.labkey.test.TestTimeoutException;
@@ -29,30 +33,43 @@
 import org.labkey.test.util.PermissionsHelper;
 import org.labkey.test.util.PortalHelper;
 import org.labkey.test.util.PostgresOnlyTest;
+import org.openqa.selenium.WebElement;
 
 import java.io.IOException;
-import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 @Category({})
+@FixMethodOrder(MethodSorters.NAME_ASCENDING) // Don't insert additional projects until after testSchedule() has run
 public class InstrumentSchedulingTest extends TargetedMSTest implements PostgresOnlyTest
 {
-    protected static final String LAB_MEMBER_USER = "labmember@targetedms.test";
-    protected static final String EXTERNAL_COLLABORATOR_USER = "collaborator@targetedms.test";
-
     public static final String INSTRUMENT_1 = "Instrument1";
     public static final String INSTRUMENT_2 = "Instrument2";
     public static final String INACTIVE_INSTRUMENT = "InactiveInstrument";
     public static final String PROJECT_1 = "Project1";
     public static final String PROJECT_2 = "Project2";
+    public static final String PAYMENT_METHOD_1 = "PaymentMethod1";
+    public static final String PAYMENT_METHOD_2 = "PaymentMethod2";
+    public static final String PAYMENT_METHOD_3 = "PaymentMethod3";
+    protected static final String LAB_MEMBER_USER = "labmember@targetedms.test";
+    protected static final String EXTERNAL_COLLABORATOR_USER = "collaborator@targetedms.test";
+
     public static final Locator.IdLocator EVENT_NAME_FIELD = Locator.id("event-name");
     public static final Locator.IdLocator EVENT_NOTE_FIELD = Locator.id("event-notes");
 
     public static final Locator.IdLocator START_DATE_TIME_FIELD = Locator.id("event-start-date");
     public static final Locator.IdLocator END_DATE_TIME_FIELD = Locator.id("event-end-date");
+    public static final Locator.IdLocator INSTRUMENT_DROP_DOWN = Locator.id("instrumentDropDown");
+    public static final Locator.IdLocator PROJECT_DROP_DOWN = Locator.id("projectDropDown");
+    public static final Locator PAYMENT_METHOD_DROP_DOWNS = Locator.tagWithClass("select", "paymentMethodDropDown");
+    public static final Locator PAYMENT_METHOD_PERCENTS = Locator.tagWithClass("input", "paymentMethodPercent");
 
 
     @BeforeClass
@@ -70,8 +87,9 @@ private void doInit() throws IOException, CommandException
         int labMemberUserId = _userHelper.createUser(LAB_MEMBER_USER).getUserId();
         int collaboratorUserId = _userHelper.createUser(EXTERNAL_COLLABORATOR_USER).getUserId();
         ApiPermissionsHelper apiPermissionsHelper = new ApiPermissionsHelper(this);
-        apiPermissionsHelper.addMemberToRole(LAB_MEMBER_USER, "Editor", PermissionsHelper.MemberType.user);
-        apiPermissionsHelper.addMemberToRole(EXTERNAL_COLLABORATOR_USER, "Submitter", PermissionsHelper.MemberType.user);
+        apiPermissionsHelper.addMemberToRole(LAB_MEMBER_USER, PermissionsHelper.EDITOR_ROLE, PermissionsHelper.MemberType.user);
+        apiPermissionsHelper.addMemberToRole(EXTERNAL_COLLABORATOR_USER, PermissionsHelper.SUBMITTER_ROLE, PermissionsHelper.MemberType.user);
+        apiPermissionsHelper.addMemberToRole(EXTERNAL_COLLABORATOR_USER, PermissionsHelper.READER_ROLE, PermissionsHelper.MemberType.user);
 
         InsertRowsCommand instrumentInsert = new InsertRowsCommand("targetedms", "msInstrument");
         instrumentInsert.setRows(Arrays.asList(
@@ -97,8 +115,9 @@ private void doInit() throws IOException, CommandException
 
         InsertRowsCommand paymentMethodInsert = new InsertRowsCommand("targetedms", "paymentMethod");
         paymentMethodInsert.setRows(Arrays.asList(
-                Map.of("UWBudgetNumber", "1111", "Name", "PaymentMethod1"),
-                Map.of("UWBudgetNumber", "2222", "Name", "PaymentMethod2")
+                Map.of("UWBudgetNumber", "1111", "Name", PAYMENT_METHOD_1),
+                Map.of("UWBudgetNumber", "2222", "Name", PAYMENT_METHOD_2),
+                Map.of("UWBudgetNumber", "3333", "Name", PAYMENT_METHOD_3) // Intentionally not associated with a project
         ));
         List<Map<String, Object>> paymentMethods = paymentMethodInsert.execute(createDefaultConnection(), getProjectName()).getRows();
 
@@ -130,8 +149,19 @@ private void doInit() throws IOException, CommandException
         List<Map<String, Object>> instrumentRates = instrumentRateInsert.execute(createDefaultConnection(), getProjectName()).getRows();
     }
 
+    @Override
+    protected void doCleanup(boolean afterTest) throws TestTimeoutException
+    {
+        // these tests use the UIContainerHelper for project creation, but we can use the APIContainerHelper for deletion
+        APIContainerHelper apiContainerHelper = new APIContainerHelper(this);
+        apiContainerHelper.deleteProject(getProjectName(), afterTest);
+
+        _userHelper.deleteUsers(false, LAB_MEMBER_USER);
+        _userHelper.deleteUsers(false, EXTERNAL_COLLABORATOR_USER);
+    }
+
     @Test
-    public void testSchedule()
+    public void testSchedule() throws IOException, CommandException
     {
         goToProjectHome();
         clickAndWait(Locator.linkWithText("Your project list"));
@@ -139,6 +169,9 @@ public void testSchedule()
         clickAndWait(Locator.linkWithText(PROJECT_1));
         waitAndClickAndWait(Locator.linkWithText("Schedule instrument time"));
 
+        assertTrue("Wrong instrument list", waitFor(() -> Arrays.asList(INSTRUMENT_1, INSTRUMENT_2).equals(getSelectOptions(INSTRUMENT_DROP_DOWN)), 5_000));
+        assertTrue("Wrong payment method list", waitFor(() -> Arrays.asList(PAYMENT_METHOD_1).equals(getSelectOptions(PAYMENT_METHOD_DROP_DOWNS)), 5_000));
+
         int month = (Calendar.getInstance().get(Calendar.MONTH) + 1);
         String yearMonth = Calendar.getInstance().get(Calendar.YEAR) + "-" + (month < 10 ? "0" + month : "" + month);
 
@@ -161,7 +194,7 @@ public void testSchedule()
 
         assertProjectEventCounts(2, 0);
 
-        doAndWaitForPageToLoad(() -> selectOptionByText(Locator.id("projectDropDown"), PROJECT_2));
+        doAndWaitForPageToLoad(() -> selectOptionByText(PROJECT_DROP_DOWN, PROJECT_2));
 
         scheduleInstrument(yearMonth + "-04", false);
         assertProjectEventCounts(1, 2);
@@ -169,23 +202,90 @@ public void testSchedule()
         scheduleInstrument(yearMonth + "-05", false);
         assertProjectEventCounts(2, 2);
 
-        doAndWaitForPageToLoad(() -> selectOptionByText(Locator.id("instrumentDropDown"), INSTRUMENT_2));
+        doAndWaitForPageToLoad(() -> selectOptionByText(INSTRUMENT_DROP_DOWN, INSTRUMENT_2));
+        sleep(1000);
         click(Locator.id("addPaymentMethod"));
+        List<WebElement> percentInputs = getDriver().findElements(PAYMENT_METHOD_PERCENTS);
+        assertEquals("Wrong number of payment method percents", 2, percentInputs.size());
+        List<WebElement> methodInputs = getDriver().findElements(PAYMENT_METHOD_DROP_DOWNS);
+        assertEquals("Wrong number of payment method dropdowns", 2, methodInputs.size());
+
+        // Duplicate payment methods
+        selectOptionByText(methodInputs.get(0), PAYMENT_METHOD_2);
+        assertTextPresent("The same payment method cannot be selected more than once.");
+        selectOptionByText(methodInputs.get(0), PAYMENT_METHOD_1);
+
+        // Bogus payment percentages
+        setFormElement(percentInputs.get(1), "0");
+        assertTextPresent("Each payment percentage must be a number between 0 and 100.");
+        setFormElement(percentInputs.get(1), "60");
+        assertTextPresent("When multiple payment methods are used, the percentages must add up to 100% (current total: 110%).");
+        setFormElement(percentInputs.get(0), "40");
 
         scheduleInstrument(yearMonth + "-06", false, () -> {
             // Make it a two-day reservation
             String originalEnd = getFormElement(END_DATE_TIME_FIELD.findElement(getDriver()));
             setFormElement(END_DATE_TIME_FIELD.findElement(getDriver()), originalEnd.replace("-06T", "-07T"));
-
-
         });
         assertProjectEventCounts(1, 0);
 
         impersonate(LAB_MEMBER_USER);
+        assertEquals("Wrong number of projects for " + LAB_MEMBER_USER,
+                2,
+                new SelectRowsCommand("targetedms", "msProject").execute(createDefaultConnection(), getProjectName()).getRows().size());
+
+        stopImpersonating();
+        impersonate(EXTERNAL_COLLABORATOR_USER);
+        List<Map<String, Object>> projects = new SelectRowsCommand("targetedms", "msProject").execute(createDefaultConnection(), getProjectName()).getRows();
+        assertEquals("Wrong number of projects for " + EXTERNAL_COLLABORATOR_USER, 1, projects.size());
+        int project2Id = (Integer) projects.get(0).get("Id");
+        SelectRowsCommand instrumentSelect = new SelectRowsCommand("targetedms", "msInstrument");
+        instrumentSelect.setFilters(Arrays.asList(new Filter("Name", INSTRUMENT_1)));
+        List<Map<String, Object>> instruments = instrumentSelect.execute(createDefaultConnection(), getProjectName()).getRows();
+        assertEquals("Wrong number of instruments", 1, instruments.size());
+        int instrument1Id = (Integer) instruments.get(0).get("Id");
+
+        SelectRowsCommand paymentMethodSelect = new SelectRowsCommand("targetedms", "paymentMethod");
+        paymentMethodSelect.setFilters(Arrays.asList(new Filter("Name", PAYMENT_METHOD_1)));
+        List<Map<String, Object>> paymentMethods = paymentMethodSelect.execute(createDefaultConnection(), getProjectName()).getRows();
+        assertEquals("Wrong number of paymentMethods", 1, paymentMethods.size());
+        int paymentMethod1Id = (Integer) paymentMethods.get(0).get("Id");
+
+        int project1Id = project2Id - 1;  // Assume sequential auto-incrementing ids
+        int inactiveInstrumentId = instrument1Id + 2;
+        int paymentMethod3Id = paymentMethod1Id + 2;
+
+        attemptScheduleInsertExpectingFailure(
+                Map.of("Project", project1Id, "Instrument", instrument1Id),
+                "User is not a member of the project");
+        attemptScheduleInsertExpectingFailure(
+                Map.of("Project", project2Id, "Instrument", instrument1Id),
+                "StartTime and EndTime are required");
+        Calendar start = Calendar.getInstance();
+        start.add(Calendar.MONTH, 1);
+        Calendar end = Calendar.getInstance();
+        end.add(Calendar.MONTH, 1);
+        end.add(Calendar.DATE, 1);
+        Date startDate = new Date(start.getTimeInMillis());
+        Date endDate = new Date(end.getTimeInMillis());
+        attemptScheduleInsertExpectingFailure(
+                Map.of("Project", project2Id, "Instrument", instrument1Id, "StartTime", endDate, "EndTime", startDate),
+                "StartTime must be before EndTime");
+        attemptScheduleInsertExpectingFailure(
+                Map.of("Project", project2Id, "Instrument", instrument1Id, "StartTime", startDate, "EndTime", endDate),
+                "Instrument usage payments do not add up to 100%");
+        attemptScheduleInsertExpectingFailure(
+                Map.of("Project", project2Id, "Instrument", instrument1Id, "StartTime", startDate, "EndTime", endDate, "UsagePayments", Arrays.asList(Map.of("PaymentMethod", paymentMethod3Id, "PercentPayment", 100))),
+                "Instrument usage payments are not using a payment method that is configured for the project.");
+        attemptScheduleInsertExpectingFailure(
+                Map.of("Project", project2Id, "Instrument", inactiveInstrumentId, "StartTime", startDate, "EndTime", endDate, "UsagePayments", Arrays.asList(Map.of("PaymentMethod", paymentMethod1Id, "PercentPayment", 100))),
+                "Instrument does not exist or is not active");
+
+        stopImpersonating();
 
-        goToDashboard();
+        goToProjectHome();
         waitAndClickAndWait(Locator.linkWithText("All instrument calendar view"));
-        assertTextPresent(INSTRUMENT_1, INSTRUMENT_2, INACTIVE_INSTRUMENT);
+        waitForText(INSTRUMENT_1, INSTRUMENT_2, INACTIVE_INSTRUMENT);
 
         assertProjectEventCounts(5, 0);
 
@@ -194,17 +294,94 @@ public void testSchedule()
 
         goToDashboard();
         waitAndClickAndWait(Locator.linkWithText("Instrument billing report"));
-        assertTextPresent("$950.00", 4);
-        assertTextPresent("$1,040.00", 1);
-
-        // Future test cases:
-        // Split payment across multiple methods
-        // Schedule for hours within a day instead of 24-hour periods
-        // Check billing for individual months, including reservations that span month boundaries with start/end dates
-        // Ensure that overlapping reservations are rejected
-        // Ensure that reservations cannot be made for inactive instruments
+        assertTextPresent("$950.00", 8);
+        // Two rows, one for each of the two payment methods
+        assertTextPresent("$3,680.00", 2);
+        assertTextPresent(PAYMENT_METHOD_1, 5);
+        assertTextPresent(PAYMENT_METHOD_2, 1);
+        // Verify the 40/60 split
+        assertTextPresent("$1,472.00", "$2,208.00");
+
+        goToDashboard();
+        clickAndWait(Locator.linkWithText("Monthly instrument billing report"));
+        // Choose a date that splits a reservation into two parts
+        setFormElement(Locator.name("query.param.StartBillDate"), yearMonth + "-07");
+        clickButton("Submit");
+        // Only some hours should be in the range for this billing report
+        assertTextPresent("17.0", 2);
+        assertTextPresent("$748.00", "$1,122.00");
+    }
+
+    private void attemptScheduleInsertExpectingFailure(Map<String, Object> row, String expected) throws IOException
+    {
+        InsertRowsCommand scheduleInsert = new InsertRowsCommand("targetedms", "instrumentSchedule");
+        scheduleInsert.setRows(Arrays.asList(row));
+        failInsert(scheduleInsert, expected);
     }
 
+    @Test
+    public void testSetupInsertPermissions() throws IOException, CommandException
+    {
+        // Validate that a collaborator can't add a project themselves
+        int adminId = getCurrentUserId();
+        impersonate(EXTERNAL_COLLABORATOR_USER);
+        InsertRowsCommand projectInsert = new InsertRowsCommand("targetedms", "msProject");
+        projectInsert.setRows(Arrays.asList(
+                Map.of("Affiliation", "External", "Title", "External", "SubmitDate", "1/1/2025", "CollaborationWith", "Mike", "ScientificQuestion", "Why are collaborators so great?", "abstract", "c")
+        ));
+
+        failInsert(projectInsert, null);
+
+        // Insert as a lab member
+        stopImpersonating();
+        impersonate(LAB_MEMBER_USER);
+        Map<String, Object> project = projectInsert.execute(createDefaultConnection(), getProjectName()).getRows().get(0);
+        int projectId = (Integer) project.get("Id");
+
+        // Collaborator isn't part of the project, so they shouldn't be able to add a researcher
+        stopImpersonating();
+        impersonate(EXTERNAL_COLLABORATOR_USER);
+        int collaboratorId = getCurrentUserId();
+        InsertRowsCommand researcherInsert = new InsertRowsCommand("targetedms", "projectResearcher");
+        researcherInsert.setRows(Arrays.asList(
+                Map.of("Project", projectId, "Researcher", collaboratorId)
+        ));
+        failInsert(researcherInsert, null);
+
+        // Add the collaborator
+        stopImpersonating();
+        impersonate(LAB_MEMBER_USER);
+        researcherInsert.execute(createDefaultConnection(), getProjectName());
+
+        // Now the collaborator should be able to add another researcher
+        stopImpersonating();
+        impersonate(EXTERNAL_COLLABORATOR_USER);
+        researcherInsert.setRows(Arrays.asList(
+                Map.of("Project", projectId, "Researcher", adminId)
+        ));
+        researcherInsert.execute(createDefaultConnection(), getProjectName());
+
+
+    }
+
+    private void failInsert(InsertRowsCommand insert, String expectedMessage) throws IOException
+    {
+        try
+        {
+            insert.execute(createDefaultConnection(), getProjectName());
+            fail("Shouldn't have permissions");
+        }
+        catch (CommandException e)
+        {
+            if (expectedMessage != null)
+            {
+                assertEquals(expectedMessage, e.getMessage());
+            }
+        }
+    }
+
+
+
     private void assertProjectEventCounts(int expectedActiveCount, int expectedOtherCount)
     {
         Locator activeLocator = Locator.byClass("activeProjectEvent");
@@ -237,14 +414,4 @@ private void scheduleInstrument(String yearMonthDay, boolean delete, @NotNull Ru
         }
     }
 
-    @Override
-    protected void doCleanup(boolean afterTest) throws TestTimeoutException
-    {
-        // these tests use the UIContainerHelper for project creation, but we can use the APIContainerHelper for deletion
-        APIContainerHelper apiContainerHelper = new APIContainerHelper(this);
-        apiContainerHelper.deleteProject(getProjectName(), afterTest);
-        
-        _userHelper.deleteUsers(false, LAB_MEMBER_USER);
-        _userHelper.deleteUsers(false, EXTERNAL_COLLABORATOR_USER);
-    }
 }
diff --git a/webapp/TargetedMS/js/scheduler.js b/webapp/TargetedMS/js/scheduler.js
index d7d0910a9..1c8b679f7 100644
--- a/webapp/TargetedMS/js/scheduler.js
+++ b/webapp/TargetedMS/js/scheduler.js
@@ -6,11 +6,6 @@ $(function() {
     project = project ? parseInt(project) || null : null;
     instrument = instrument ? parseInt(instrument) || null : null;
 
-    if (!project) {
-        document.getElementById('calendar').innerText = 'Invalid or no project specified';
-        return;
-    }
-
     let calendar = null;
     let eventToSave = {};
     let paymentMethods = [];
@@ -27,6 +22,9 @@ $(function() {
             while (projectDropDown.firstChild) {
                 projectDropDown.removeChild(projectDropDown.firstChild);
             }
+            if (!project && rows.length > 0) {
+                project = rows[0].Id;
+            }
             for (let i = 0; i < rows.length; i++) {
                 let option = document.createElement('option');
                 option.value = rows[i].Id;
@@ -296,7 +294,6 @@ $(function() {
         scope: this,
         success: function (result) {
             let rows = result.rows || [];
-            // Normalize to the same shape used elsewhere in this file
             paymentMethodsData = rows.map(function(r) {
                 return {
                     Id: r.paymentMethod,
@@ -306,14 +303,8 @@ $(function() {
                     budgetExpirationDate: r['paymentMethod/budgetExpirationDate']
                 };
             });
-            let paymentMethodDropDown = '<select id="paymentMethodDropDown" name="paymentMethodDropDown">';
-            for (let i = 0; i < paymentMethodsData.length; i++) {
-                paymentMethodDropDown += '<option value="' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].Id) + '">' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].name) + '</option>';
-            }
-            paymentMethodDropDown += '</select>';
-            // Always render a percent input for the first row; visibility will be toggled based on row count
-            paymentMethodDropDown += '&nbsp;<span class="paymentPercentGroup" style="display:none;"><input type="text" class="paymentMethodPercent" name="paymentMethodPercent" value="100" size="3" maxlength="3"><label>%</label></span>';
-
+            // Use shared renderer to build the initial row (no remove link; default percent 100)
+            const paymentMethodDropDown = buildPaymentMethodRow(1,  false);
             jQuery('#paymentMethodDropDown').html(paymentMethodDropDown);
 
             // Attach live validation listeners to the first row percent input
@@ -424,11 +415,6 @@ $(function() {
         eventToSave.notes = $('#event-modal input[name="event-notes"]').val();
         eventToSave.instrumentoperator = $('#instrumentOperatorDropDown').val();
 
-        if (eventToSave.endTime < eventToSave.startTime) {
-            alert('End date must be after start date');
-            return;
-        }
-
         // get the paymentMethod and percentPayment from the html fields
         paymentMethods = [];
         let paymentMethodDropDowns = document.querySelectorAll('#paymentMethodDropDown select');
@@ -814,23 +800,30 @@ $(function() {
         $('#event-modal').modal('hide');
     });
 
-    let paymentMethodsData;
-    let paymentMethodCount = 1;
-    const addPaymentMethodEl = document.getElementById('addPaymentMethod');
-    addPaymentMethodEl.addEventListener('click', function () {
-        paymentMethodCount++;
-        let id = 'paymentMethodDropDown' + paymentMethodCount;
-        let paymentMethodDropDown = '<select id="' + id + '" name="' + id + '">';
+    // Helper to render a single payment method row (select + percent input [+ optional remove])
+    function buildPaymentMethodRow(index, includeRemove) {
+        let html = '<select id="paymentMethodDropDown' + id + '" name="paymentMethodDropDown' + id + '" class="paymentMethodDropDown">';
         for (let i = 0; i < paymentMethodsData.length; i++) {
-            paymentMethodDropDown += '<option value="' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].Id) + '">' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].name) + '</option>';
+            html += '<option value="' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].Id) + '">' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].name) + '</option>';
         }
-        paymentMethodDropDown += '</select>';
+        html += '</select>';
 
         // Always render a percent input group; visibility toggled by updatePercentInputsVisibility
-        paymentMethodDropDown += '&nbsp;<span class="paymentPercentGroup" style="display:none;"><input type="text" class="paymentMethodPercent" name="paymentMethodPercent" value="0" size="3" maxlength="3"><label>%</label></span>';
+        html += '&nbsp;<span class="paymentPercentGroup" style="display:none;"><input type="text" class="paymentMethodPercent" name="paymentMethodPercent" value="100" size="3" maxlength="3"><label>%</label></span>';
 
-        paymentMethodDropDown += '&nbsp' +
+        if (includeRemove) {
+            html += '&nbsp' +
                 '<span id="removePaymentMethod" role="button" style="cursor: pointer;">[Remove]</span>';
+        }
+        return html;
+    }
+
+    let paymentMethodsData;
+    let paymentMethodCount = 1;
+    const addPaymentMethodEl = document.getElementById('addPaymentMethod');
+    addPaymentMethodEl.addEventListener('click', function () {
+        paymentMethodCount++;
+        const paymentMethodDropDown = buildPaymentMethodRow(paymentMethodCount, true);
         let logElt = document.createElement('div');
         logElt.innerHTML = paymentMethodDropDown;
 

From cd78ded05217aceb0525face1e447d5c6838a0da Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Mon, 17 Nov 2025 11:46:23 -0800
Subject: [PATCH 09/12] Better title

---
 resources/views/scheduleAllInstruments.view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/scheduleAllInstruments.view.xml b/resources/views/scheduleAllInstruments.view.xml
index 66bbcc043..cd2da03c7 100644
--- a/resources/views/scheduleAllInstruments.view.xml
+++ b/resources/views/scheduleAllInstruments.view.xml
@@ -1,4 +1,4 @@
-<view xmlns="http://labkey.org/data/xml/view" title="Schedule Instrument Time">
+<view xmlns="http://labkey.org/data/xml/view" title="Instrument Schedules">
     <dependencies>
         <dependency path="internal/jQuery"/>
         <dependency path="targetedms/instrumentCalendar"/>

From 98946d60c5291904a211d5e4c87ca8555a17f458 Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Mon, 17 Nov 2025 14:24:45 -0800
Subject: [PATCH 10/12] Use correct variable

---
 webapp/TargetedMS/js/scheduler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/TargetedMS/js/scheduler.js b/webapp/TargetedMS/js/scheduler.js
index 1c8b679f7..acc5761f4 100644
--- a/webapp/TargetedMS/js/scheduler.js
+++ b/webapp/TargetedMS/js/scheduler.js
@@ -802,7 +802,7 @@ $(function() {
 
     // Helper to render a single payment method row (select + percent input [+ optional remove])
     function buildPaymentMethodRow(index, includeRemove) {
-        let html = '<select id="paymentMethodDropDown' + id + '" name="paymentMethodDropDown' + id + '" class="paymentMethodDropDown">';
+        let html = '<select id="paymentMethodDropDown' + index + '" name="paymentMethodDropDown' + index + '" class="paymentMethodDropDown">';
         for (let i = 0; i < paymentMethodsData.length; i++) {
             html += '<option value="' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].Id) + '">' + LABKEY.Utils.encodeHtml(paymentMethodsData[i].name) + '</option>';
         }

From 0474ffd8d23056b83135d0ae64aa32aa62a83d1a Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Tue, 18 Nov 2025 17:46:04 -0800
Subject: [PATCH 11/12] Fix cross-instrument JS loading error Disallow
 duplicate project/researcher mappings Show insert button for project/research
 mapping to collaborators

---
 .../dbscripts/postgresql/targetedms-25.006-25.007.sql      | 7 +++++++
 resources/views/scheduleInstrument.view.xml                | 3 ++-
 src/org/labkey/targetedms/TargetedMSModule.java            | 2 +-
 src/org/labkey/targetedms/TargetedMSSchema.java            | 6 +++---
 webapp/TargetedMS/instrumentCalendar.lib.xml               | 1 -
 5 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 resources/schemas/dbscripts/postgresql/targetedms-25.006-25.007.sql

diff --git a/resources/schemas/dbscripts/postgresql/targetedms-25.006-25.007.sql b/resources/schemas/dbscripts/postgresql/targetedms-25.006-25.007.sql
new file mode 100644
index 000000000..16d453688
--- /dev/null
+++ b/resources/schemas/dbscripts/postgresql/targetedms-25.006-25.007.sql
@@ -0,0 +1,7 @@
+-- Don't allow duplicate project/researcher mapping rows
+DELETE FROM targetedms.projectresearcher WHERE Id NOT IN (SELECT MIN(Id) FROM targetedms.projectresearcher GROUP BY project, researcher);
+
+ALTER TABLE targetedms.projectResearcher
+    ADD CONSTRAINT UQ_projectResearcher_project_researcher UNIQUE (project, researcher);
+
+DROP INDEX targetedms.IDX_projectResearcher_Project;
diff --git a/resources/views/scheduleInstrument.view.xml b/resources/views/scheduleInstrument.view.xml
index c45623167..5cd52d2e0 100644
--- a/resources/views/scheduleInstrument.view.xml
+++ b/resources/views/scheduleInstrument.view.xml
@@ -1,7 +1,8 @@
 <view xmlns="http://labkey.org/data/xml/view" title="Schedule Instrument Time">
     <dependencies>
         <dependency path="internal/jQuery"/>
-        <dependency path="targetedms/instrumentCalendar"/>
+        <dependency path="TargetedMS/instrumentCalendar"/>
+        <dependency path="TargetedMS/js/scheduler.js"/>
         <dependency path="TargetedMS/css/instrumentScheduler.css"/>
     </dependencies>
 </view>
\ No newline at end of file
diff --git a/src/org/labkey/targetedms/TargetedMSModule.java b/src/org/labkey/targetedms/TargetedMSModule.java
index c0b7bd85d..0a087b69c 100644
--- a/src/org/labkey/targetedms/TargetedMSModule.java
+++ b/src/org/labkey/targetedms/TargetedMSModule.java
@@ -231,7 +231,7 @@ public String getName()
     @Override
     public Double getSchemaVersion()
     {
-        return 25.006;
+        return 25.007;
     }
 
     @Override
diff --git a/src/org/labkey/targetedms/TargetedMSSchema.java b/src/org/labkey/targetedms/TargetedMSSchema.java
index c8eb463f3..db2ef2cb7 100644
--- a/src/org/labkey/targetedms/TargetedMSSchema.java
+++ b/src/org/labkey/targetedms/TargetedMSSchema.java
@@ -1622,15 +1622,15 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
         if (TABLE_MS_INSTRUMENT.equalsIgnoreCase(name) ||
                 TABLE_PAYMENT_METHOD.equalsIgnoreCase(name) ||
                 TABLE_RATE_TYPE.equalsIgnoreCase(name) ||
-                TABLE_INSTRUMENT_RATE.equalsIgnoreCase(name) ||
-                TABLE_PROJECT_PAYMENT_METHOD.equalsIgnoreCase(name))
+                TABLE_INSTRUMENT_RATE.equalsIgnoreCase(name))
         {
             return new AdminSchedulingTable(name, this, cf);
         }
 
         if (TABLE_MS_PROJECT.equalsIgnoreCase(name) ||
                 TABLE_PROJECT_RESEARCHER.equalsIgnoreCase(name) ||
-                TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name))
+                TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name) ||
+                TABLE_PROJECT_PAYMENT_METHOD.equalsIgnoreCase(name))
         {
             var result = new OwnProjectSchedulingTable(name, this, cf, !TABLE_MS_PROJECT.equalsIgnoreCase(name));
             if (TABLE_INSTRUMENT_USAGE_PAYMENT.equalsIgnoreCase(name))
diff --git a/webapp/TargetedMS/instrumentCalendar.lib.xml b/webapp/TargetedMS/instrumentCalendar.lib.xml
index 1648f5004..733ad30b2 100644
--- a/webapp/TargetedMS/instrumentCalendar.lib.xml
+++ b/webapp/TargetedMS/instrumentCalendar.lib.xml
@@ -2,6 +2,5 @@
     <library compileInProductionMode="true">
         <script path="TargetedMS/js/fullcalendar.js"/>
         <script path="TargetedMS/js/scheduleUtils.js"/>
-        <script path="TargetedMS/js/scheduler.js"/>
     </library>
 </libraries>
\ No newline at end of file

From 56e126b2692d3f4a72914aaa78b29923005c851e Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Wed, 19 Nov 2025 09:21:20 -0800
Subject: [PATCH 12/12] Update test based on automatically adding researcher to
 project

---
 src/org/labkey/targetedms/query/ProjectAddUserTrigger.java | 3 +--
 .../test/tests/targetedms/InstrumentSchedulingTest.java    | 7 +------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/org/labkey/targetedms/query/ProjectAddUserTrigger.java b/src/org/labkey/targetedms/query/ProjectAddUserTrigger.java
index fa5010e0c..7e0e7c41a 100644
--- a/src/org/labkey/targetedms/query/ProjectAddUserTrigger.java
+++ b/src/org/labkey/targetedms/query/ProjectAddUserTrigger.java
@@ -9,7 +9,6 @@
 import org.labkey.api.security.User;
 import org.labkey.targetedms.TargetedMSManager;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -19,7 +18,7 @@ public class ProjectAddUserTrigger implements Trigger
     @Override
     public void afterInsert(TableInfo table, Container c,
                              User user, @Nullable Map<String, Object> newRow,
-                             ValidationException errors, Map<String, Object> extraContext, @Nullable Map<String, Object> existingRecord) throws ValidationException
+                             ValidationException errors, Map<String, Object> extraContext, @Nullable Map<String, Object> existingRecord)
     {
         // Add the creating user to the membership list
         Map<String, Object> membership = new HashMap<>();
diff --git a/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java b/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
index 365579aea..095055550 100644
--- a/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
+++ b/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
@@ -25,7 +25,6 @@
 import org.labkey.remoteapi.query.Filter;
 import org.labkey.remoteapi.query.InsertRowsCommand;
 import org.labkey.remoteapi.query.SelectRowsCommand;
-import org.labkey.remoteapi.security.WhoAmICommand;
 import org.labkey.test.Locator;
 import org.labkey.test.TestTimeoutException;
 import org.labkey.test.util.APIContainerHelper;
@@ -129,15 +128,11 @@ private void doInit() throws IOException, CommandException
         ));
         List<Map<String, Object>> projectPaymentMethods = projectPaymentMethodInsert.execute(createDefaultConnection(), getProjectName()).getRows();
 
-        int currentUserId = new WhoAmICommand().execute(createDefaultConnection(), getProjectName()).getUserId().intValue();
-
         InsertRowsCommand projectResearcherInsert = new InsertRowsCommand("targetedms", "projectResearcher");
         projectResearcherInsert.setRows(Arrays.asList(
                 Map.of("Project", projects.get(0).get("Id"), "Researcher", labMemberUserId),
                 Map.of("Project", projects.get(1).get("Id"), "Researcher", labMemberUserId),
-                Map.of("Project", projects.get(1).get("Id"), "Researcher", collaboratorUserId),
-                Map.of("Project", projects.get(0).get("Id"), "Researcher", currentUserId),
-                Map.of("Project", projects.get(1).get("Id"), "Researcher", currentUserId)
+                Map.of("Project", projects.get(1).get("Id"), "Researcher", collaboratorUserId)
         ));
         List<Map<String, Object>> projectResearchers = projectResearcherInsert.execute(createDefaultConnection(), getProjectName()).getRows();