Skip to content

Removed scheduled #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slominskir merged 2 commits into from
Jan 21, 2026
Merged

Removed scheduled #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b034d70
Removed scheduled
slominskir Jan 21, 2026
a543fc1
Don't italicize
slominskir Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions src/main/webapp/WEB-INF/views/reports/charge.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/resources/css/charge.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
top: 10px;
left: 3em;
z-index: 1;
display: none;
}
.custom-key th {
padding: 0 8px;
Expand Down Expand Up @@ -59,7 +60,6 @@
.quad-table {
width: 100%;
margin-bottom: 100px;
margin-top: 100px;
}
.quad-table h3 {
text-align: center;
Expand Down
30 changes: 13 additions & 17 deletions src/main/webapp/resources/js/charge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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;

Expand All @@ -352,7 +348,7 @@ jlab.fetchMultiple = function (params) {
scale = 1;
}

jlab.scaleHallScheduled(scale);
//jlab.scaleHallScheduled(scale);



Expand Down Expand Up @@ -1020,7 +1016,7 @@ jlab.redrawAll = function() {
jlab.updateKey();
};

$(document).on("change", "#scale", function(){
/*$(document).on("change", "#scale", function(){

var scale = $("#scale").val();

Expand All @@ -1029,7 +1025,7 @@ $(document).on("change", "#scale", function(){
}

jlab.scaleScheduled(scale);
});
});*/

$(document).on("smoothnessready", function(){
let start, end;
Expand Down
Loading