Skip to content

Commit 7534b38

Browse files
bcivelbcivel
committed
Fix label creation modal
1 parent 270851d commit 7534b38

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

‎source/src/main/webapp/ReportingExecutionOverTime.jsp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
<%@ include file="include/transversalobject/TestCaseExecutionQueue.html"%>
4747
<%@ include file="include/transversalobject/TestCase.html"%>
4848
<%@ include file="include/pages/testcampaign/viewStatcampaign.html"%>
49-
49+
<jsp:include page="include/templates/datepicker.html"/>
50+
<jsp:include page="include/templates/selectMultipleDropdown.html"/>
51+
<jsp:include page="include/templates/selectDropdown.html"/>
5052
<h1 class="page-title-line" id="title">Execution History</h1>
51-
52-
<div class="row" >
53-
54-
<div class="col-lg-9" id="FiltersPanel">
53+
<div class="crb_card">
54+
<div class="col-lg-9" id="FiltersPanel" x-data="reportingExecutionOverTimeForm()" x-ref="filters" @load-stats.window="loadStatistics()">
5555
<div class="panel panel-default">
5656
<div class="panel-heading card">
5757
<span class="fa fa-tag fa-fw"></span>
@@ -183,7 +183,7 @@
183183
<span class="fa fa-bar-chart fa-fw"></span>
184184
<label id="filters">Availability rates</label>
185185
</div>-->
186-
<div class="panel-body collapse in" id="availabiltyChart">
186+
<div class="panel-body in" id="availabiltyChart">
187187
<div class="row">
188188
<div class="col-xs-8 paddingRight0" id="ChartAvailabilty1" >
189189
<canvas id="canvasAvailability1"></canvas>
@@ -209,12 +209,12 @@
209209
<div class="row" id="ReportByTestFolderPanel">
210210
<div class="col-lg-12">
211211
<div id="panelTestStat" class="panel panel-default" style="display: none">
212-
<div class="panel-heading card" data-toggle="collapse" data-target="#perfChart0a">
212+
<div class="panel-heading card" data-target="#perfChart0a">
213213
<span class="fa fa-bar-chart fa-fw"></span>
214214
<label id="lblTestStat">TestCase Stats</label>
215215
<span class="toggle glyphicon glyphicon-chevron-right pull-right"></span>
216216
</div>
217-
<div class="panel-body collapse in" id="perfChart0a">
217+
<div class="panel-body in" id="perfChart0a">
218218
<div class="row">
219219
<div class="col-xs-12" id="ChartTestStat" style="height: 400px">
220220
<canvas id="canvasTestStat"></canvas>
@@ -223,12 +223,12 @@
223223
</div>
224224
</div>
225225
<div id="panelTestStatBar" class="panel panel-default" style="display: none">
226-
<div class="panel-heading card" data-toggle="collapse" data-target="#perfChart0b">
226+
<div class="panel-heading card" data-target="#perfChart0b">
227227
<span class="fa fa-bar-chart fa-fw"></span>
228228
<label id="lblTestStatBar">TestCase Stats Bar</label>
229229
<span class="toggle glyphicon glyphicon-chevron-right pull-right"></span>
230230
</div>
231-
<div class="panel-body collapse in" id="perfChart0b">
231+
<div class="panel-body in" id="perfChart0b">
232232
<div class="row">
233233
<div class="col-xs-12" id="ChartTestStatBar" style="height: 400px">
234234
<canvas id="canvasTestStatBar"></canvas>
@@ -237,12 +237,12 @@
237237
</div>
238238
</div>
239239
<div id="panelPerfRequests" class="panel panel-default" style="display: none">
240-
<div class="panel-heading card" data-toggle="collapse" data-target="#perfChart1">
240+
<div class="panel-heading card" data-target="#perfChart1">
241241
<span class="fa fa-bar-chart fa-fw"></span>
242242
<label id="lblPerfRequests">Performance Graph - Requests</label>
243243
<span class="toggle glyphicon glyphicon-chevron-right pull-right"></span>
244244
</div>
245-
<div class="panel-body collapse in" id="perfChart1">
245+
<div class="panel-body in" id="perfChart1">
246246
<div class="row">
247247
<div class="col-xs-12" id="ChartRequests" style="height: 400px">
248248
<canvas id="canvasRequests"></canvas>
@@ -251,12 +251,12 @@
251251
</div>
252252
</div>
253253
<div id="panelPerfSize" class="panel panel-default" style="display: none">
254-
<div class="panel-heading card" data-toggle="collapse" data-target="#perfChart2">
254+
<div class="panel-heading card" data-target="#perfChart2">
255255
<span class="fa fa-bar-chart fa-fw"></span>
256256
<label id="lblPerfSize">Performance Graph - Size</label>
257257
<span class="toggle glyphicon glyphicon-chevron-right pull-right"></span>
258258
</div>
259-
<div class="panel-body collapse in" id="perfChart2">
259+
<div class="panel-body in" id="perfChart2">
260260
<div class="row">
261261
<div class="col-xs-12" id="ChartSize" style="height: 400px">
262262
<canvas id="canvasSize"></canvas>
@@ -265,12 +265,12 @@
265265
</div>
266266
</div>
267267
<div id="panelPerfTime" class="panel panel-default" style="display: none">
268-
<div class="panel-heading card" data-toggle="collapse" data-target="#perfChart3">
268+
<div class="panel-heading card" data-target="#perfChart3">
269269
<span class="fa fa-bar-chart fa-fw"></span>
270270
<label id="lblPerfTime">Performance Graph - Time</label>
271271
<span class="toggle glyphicon glyphicon-chevron-right pull-right"></span>
272272
</div>
273-
<div class="panel-body collapse in" id="perfChart3">
273+
<div class="panel-body in" id="perfChart3">
274274
<div class="row">
275275
<div class="col-xs-12" id="ChartTime" style="height: 400px">
276276
<canvas id="canvasTime"></canvas>
@@ -279,12 +279,12 @@
279279
</div>
280280
</div>
281281
<div id="panelPerfParty" class="panel panel-default" style="display: none">
282-
<div class="panel-heading card" data-toggle="collapse" data-target="#perfChart4">
282+
<div class="panel-heading card" data-target="#perfChart4">
283283
<span class="fa fa-bar-chart fa-fw"></span>
284284
<label id="lblPerfParty">Performance Graph - nb Third Parties</label>
285285
<span class="toggle glyphicon glyphicon-chevron-right pull-right"></span>
286286
</div>
287-
<div class="panel-body collapse in" id="perfChart4">
287+
<div class="panel-body in" id="perfChart4">
288288
<div class="row">
289289
<div class="col-xs-12" id="ChartParty" style="height: 400px">
290290
<canvas id="canvasParty"></canvas>

‎source/src/main/webapp/js/pages/Label.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ function renderOptionsForLabel(data) {
200200
$("#labelsTable_wrapper div#labelsTable_length").before("<div id='labelsTable_buttonWrapper'>" + contentToAdd + "</div>");
201201
}
202202

203-
$('#labelList #createLabelButton').off("click").click(addEntryClick);
203+
$('#createLabelButton').off("click").click(addEntryClick);
204204
}
205205
}
206206

0 commit comments

Comments
 (0)