From b034d701e5e3c18e89bc02fa0ad22437a1347ae3 Mon Sep 17 00:00:00 2001
From: ryans <ryans@jlab.org>
Date: Wed, 21 Jan 2026 10:42:19 -0500
Subject: [PATCH 1/2] Removed scheduled

Fixes #43
---
 .../webapp/WEB-INF/views/reports/charge.jsp   | 10 +------
 src/main/webapp/resources/css/charge.css      |  5 +++-
 src/main/webapp/resources/js/charge.js        | 30 ++++++++-----------
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/reports/charge.jsp b/src/main/webapp/WEB-INF/views/reports/charge.jsp
index 57f4b23..040d6c1 100644
--- a/src/main/webapp/WEB-INF/views/reports/charge.jsp
+++ b/src/main/webapp/WEB-INF/views/reports/charge.jsp
@@ -101,14 +101,6 @@
                     <fieldset>
                         <legend>Filter</legend>
                         <s:date-range/>
-                        <ul class="key-value-list">
-                            <li>
-                                <div class="li-key"><label for="scale">Schedule Scale Factor</label></div>
-                                <div class="li-value">
-                                    <input id="scale" name="scale" type="number" value="${fn:escapeXml(param.scale)}" min="0.1" max="2" step="0.1"/>
-                                </div>
-                            </li>
-                        </ul>
                     </fieldset>
                     <input class="filter-form-submit-button" type="submit" value="Apply"/>
                 </form>
@@ -121,7 +113,7 @@
                 <c:otherwise>
                     <div class="message-box"><c:out value="${selectionMessage}"/></div>
                     <div class="error-box"></div>
-                    <c:if test="${period > 0}">
+                    <c:if test="${false}">
                                 <s:chart-widget>
                                     <table class="chart-legend">
                                         <tbody>
diff --git a/src/main/webapp/resources/css/charge.css b/src/main/webapp/resources/css/charge.css
index c3525da..c8d6630 100644
--- a/src/main/webapp/resources/css/charge.css
+++ b/src/main/webapp/resources/css/charge.css
@@ -1,3 +1,6 @@
+.y-axis-label {
+    font-style: italic;
+}
 .chart-legend {
     margin-top: 11px;
 }
@@ -32,6 +35,7 @@
     top: 10px;
     left: 3em;
     z-index: 1;
+    display: none;
 }
 .custom-key th {
     padding: 0 8px;
@@ -59,7 +63,6 @@
 .quad-table {
     width: 100%;
     margin-bottom: 100px;
-    margin-top: 100px;
 }
 .quad-table h3 {
     text-align: center;
diff --git a/src/main/webapp/resources/js/charge.js b/src/main/webapp/resources/js/charge.js
index e9fb230..8196113 100644
--- a/src/main/webapp/resources/js/charge.js
+++ b/src/main/webapp/resources/js/charge.js
@@ -107,7 +107,8 @@ jlab.hallCurrentData = [
         label: 'Scheduled',
         color: 'gray',
         data: [],
-        lines: {show: true, steps: true}
+        lines: {show: false, steps: true},
+        points: {show: false}
     },
     {
         label: 'Delivered',
@@ -146,18 +147,13 @@ jlab.hallChargeData = [
         label: 'Scheduled',
         color: 'gray',
         data: [],
-        lines: {show: true},
+        lines: {show: false},
     },
     {
     label: 'Delivered',
     color: 'black',
     data: [],
-    dashes: {
-        show: true,
-        lineWidth: 4,
-        dashLength: 10
-    },
-    lines: {show: true, lineWidth: 0} /*Without lines or points no plothover possible, so we use 0 width line.  Could use 0 radius point instead*/
+    lines: {show: true, lineWidth: 1}
 }];
 
 /* Create hall charge data by deep copying template */
@@ -187,10 +183,10 @@ jlab.addYAxisLabelExtra = function (placeholder, label) {
 jlab.addAxisLabels = function () {
     /*jlab.addXAxisLabel("Time");*/
     jlab.addYAxisLabel("Percent of Scheduled");
-    jlab.addYAxisLabelExtra($("#charta-charge-placeholder"), "Coulombs");
-    jlab.addYAxisLabelExtra($("#chartb-charge-placeholder"), "MilliCoulombs");
-    jlab.addYAxisLabelExtra($("#chartc-charge-placeholder"), "Coulombs");
-    jlab.addYAxisLabelExtra($("#chartd-charge-placeholder"), "MilliCoulombs");
+    jlab.addYAxisLabelExtra($("#charta-charge-placeholder"), "C");
+    jlab.addYAxisLabelExtra($("#chartb-charge-placeholder"), "mC");
+    jlab.addYAxisLabelExtra($("#chartc-charge-placeholder"), "C");
+    jlab.addYAxisLabelExtra($("#chartd-charge-placeholder"), "mC");
 
     jlab.addYAxisLabelExtra($("#charta-current-placeholder"), "µA");
     jlab.addYAxisLabelExtra($("#chartb-current-placeholder"), "nA");
@@ -333,8 +329,8 @@ jlab.fetchMultiple = function (params) {
         Promise.all(promises).then(values => {
             $("#busy-wait").hide();
 
-            jlab.doLineChart();
-            jlab.updateKey();
+            //jlab.doLineChart();
+            //jlab.updateKey();
 
             var options = jlab.defaultHallChartOptions;
 
@@ -352,7 +348,7 @@ jlab.fetchMultiple = function (params) {
                 scale = 1;
             }
 
-            jlab.scaleHallScheduled(scale);
+            //jlab.scaleHallScheduled(scale);
 
 
 
@@ -1020,7 +1016,7 @@ jlab.redrawAll = function() {
     jlab.updateKey();
 };
 
-$(document).on("change", "#scale", function(){
+/*$(document).on("change", "#scale", function(){
 
     var scale = $("#scale").val();
 
@@ -1029,7 +1025,7 @@ $(document).on("change", "#scale", function(){
     }
 
     jlab.scaleScheduled(scale);
-});
+});*/
 
 $(document).on("smoothnessready", function(){
     let start, end;

From a543fc1d8fe073a701689c3730c1cddbdeb4fbb9 Mon Sep 17 00:00:00 2001
From: ryans <ryans@jlab.org>
Date: Wed, 21 Jan 2026 12:00:58 -0500
Subject: [PATCH 2/2] Don't italicize

---
 src/main/webapp/resources/css/charge.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/webapp/resources/css/charge.css b/src/main/webapp/resources/css/charge.css
index c8d6630..1aa89b1 100644
--- a/src/main/webapp/resources/css/charge.css
+++ b/src/main/webapp/resources/css/charge.css
@@ -1,6 +1,3 @@
-.y-axis-label {
-    font-style: italic;
-}
 .chart-legend {
     margin-top: 11px;
 }