Skip to content

Commit 64dd6a5

Browse files
committed
add serial chart
1 parent 7054379 commit 64dd6a5

File tree

5 files changed

+26
-25
lines changed

5 files changed

+26
-25
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ APP_DEBUG=true
33
APP_KEY=xCmhjfsN4BKkNwtpOdrmYMLbAHJia1IH
44

55
DB_HOST=localhost
6-
DB_DATABASE=ticketsdw
6+
DB_DATABASE=ticketdb
77
DB_USERNAME=root
88
DB_PASSWORD=
99

public/img/icon.png

22 KB
Loading

resources/views/managerViews/dashboard.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ function draw() {
395395
}],
396396
"chartScrollbar": {
397397
"autoGridCount": true,
398-
"graph": "g1",
398+
"graph": "ticketsChart",
399399
"scrollbarHeight": 40
400400
},
401401
"chartCursor": {

resources/views/managerViews/dashboard3.blade.php

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,16 @@
8181
<hr>
8282
<div class="row">
8383
<h3 class="titles">Number Of Tickets Per Time</h3>
84-
<div class="col-lg-6">
8584
<div class="form-group pull-right" id="select2">
8685
<label for="product">Filter By Product</label>
8786
<select name="product" id="product" class="form-control select2">
8887
<option value="all">All</option>
8988
@foreach ($tickets_all['product'] as $key => $value)
90-
<option value="{{ $key }}">{{ $key }}</option>
89+
<option value="{{ $key }}">{{ $key }} ({{ count($value) }})</option>
9190
@endforeach
9291
</select>
9392
</div>
94-
<div id="ticketsChart2" style="width:100%;height:100px;"></div>
95-
</div>
93+
<div id="ticketsChart2" style="width:100%;height:400px;"></div>
9694
</div>
9795
</div><!-- /.box-body -->
9896
</div><!-- /.box -->
@@ -103,14 +101,14 @@
103101
<h3 class="box-title">Comparing Agents Performance</h3>
104102
</div><!-- /.box-header -->
105103
<div class="box-body" style="min-height:600px">
106-
107104
</div><!-- /.box-body -->
108105
</div><!-- /.box -->
109106
</div><!-- /.col -->
110107
</div>
111108
@endsection
112109
@section('script')
113110
<script src="{{ asset('/js/amcharts.js') }}"></script>
111+
<script src="{{ asset('/js/serial.js') }}" type="text/javascript"></script>
114112
<!-- High Charts -->
115113
<script src="{{ asset('/js/highcharts.js') }}"></script>
116114
<script src="{{ asset('/js/highcharts-more.js') }}"></script>
@@ -286,12 +284,6 @@
286284
<!-- End Percentage Counter -->
287285
<!-- Select2 -->
288286
<script src="{{ asset('/plugins/select2/select2.full.min.js') }}" type="text/javascript"></script>
289-
<script type="text/javascript">
290-
//Applying select2
291-
$(".select2").select2();
292-
//Date range picker
293-
$('#reservation').daterangepicker();
294-
</script>
295287
<!-- Tickets Per Hour Chart -->
296288
<script language="JavaScript">
297289
var data_temp = JSON.parse('<?php echo json_encode($tickets_all); ?>');
@@ -303,25 +295,25 @@
303295
}else{
304296
data=data_temp.product[v];
305297
}
306-
console.log(data);
307298
draw();
308299
});
309300
draw();
310301
function draw() {
311-
var ticketsData = [];
302+
var ticketsData1 = [];
312303
for (var i = 0; i < data.length; i++) {
313-
ticketsData.push({
304+
ticketsData1.push({
314305
date: new Date(data[i].CreatedYear, data[i].CreatedMonth - 1, data[i].CreatedDay, data[i].CreatedHour, data[i].CreatedMinute, data[i].CreatedSecond, 0),
315306
visits: data[i].count
316307
});
317308
};
318-
var chart1 = AmCharts.makeChart("ticketsChart2", {
309+
310+
var chart2 = AmCharts.makeChart("ticketsChart2", {
319311
"type": "serial",
320312
"theme": "light",
321313
"marginRight": 80,
322314
"autoMarginOffset": 20,
323315
"marginTop": 7,
324-
"dataProvider": ticketsData,
316+
"dataProvider": ticketsData1,
325317
"valueAxes": [{
326318
"axisAlpha": 0.2,
327319
"dashLength": 1,
@@ -341,7 +333,7 @@ function draw() {
341333
}],
342334
"chartScrollbar": {
343335
"autoGridCount": true,
344-
"graph": "g1",
336+
"graph": "ticketsChart2",
345337
"scrollbarHeight": 40
346338
},
347339
"chartCursor": {
@@ -360,16 +352,22 @@ function draw() {
360352
"enabled": true
361353
}
362354
});
363-
chart1.pathToImages = '/kpi/public/img/';
364-
chart1.addListener("rendered", zoomChart);
355+
chart2.pathToImages = '/kpi/public/img/';
356+
chart2.addListener("rendered", zoomChart);
365357
zoomChart();
366358
367359
// this method is called when chart is first inited as we listen for "dataUpdated" event
368360
function zoomChart() {
369361
// different zoom methods can be used - zoomToIndexes, zoomToDates, zoomToCategoryValues
370-
chart1.zoomToIndexes(ticketsData.length - 40, ticketsData.length - 1);
362+
chart2.zoomToIndexes(ticketsData1.length - 40, ticketsData1.length - 1);
371363
}
372364
}
373365
</script>
374366
<!-- End Tickets Per Hour Chart -->
367+
<script type="text/javascript">
368+
//Applying select2
369+
$(".select2").select2();
370+
//Date range picker
371+
$('#reservation').daterangepicker();
372+
</script>
375373
@endsection

resources/views/managerViews/layout.blade.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>KPI App</title>
6+
<link rel="icon" type="image/png" href="{{ asset('/img/icon.png') }}">
67
<!-- Select2 -->
78
<link href="{{ asset('/plugins/select2/select2.min.css') }}" rel="stylesheet" type="text/css" />
89
<!-- Tell the browser to be responsive to screen width -->
@@ -17,6 +18,8 @@
1718
<link href="{{ asset('/plugins/select2/select2.min.css') }}" rel="stylesheet" type="text/css" />
1819
<!-- jvectormap -->
1920
<link href="{{ asset('/plugins/jvectormap/jquery-jvectormap-1.2.2.css') }}" rel="stylesheet" type="text/css" />
21+
<!-- Morris -->
22+
<link href="{{ asset('/plugins/morris/morris.css') }}" rel="stylesheet" type="text/css" />
2023
<!-- Theme style -->
2124
<link href="{{ asset('/dist/css/AdminLTE.min.css') }}" rel="stylesheet" type="text/css" />
2225
<!-- AdminLTE Skins. Choose a skin from the css/skins folder instead of downloading all of them to reduce the load. -->
@@ -36,7 +39,7 @@
3639
<header class="main-header">
3740

3841
<!-- Logo -->
39-
<a href="index2.html" class="logo">
42+
<a href="{{ route('dashboard') }}" class="logo">
4043
<!-- mini logo for sidebar mini 50x50 pixels -->
4144
<span class="logo-mini">KPIs</span>
4245
<!-- logo for regular state and mobile devices -->
@@ -430,10 +433,10 @@ function (start, end) {
430433
<script src="{{ asset('/plugins/fastclick/fastclick.min.js') }}" type="text/javascript"></script>
431434
<!-- AdminLTE App -->
432435
<script src="{{ asset('/dist/js/app.min.js') }}" type="text/javascript"></script>
433-
<!-- AdminLTE dashboard demo (This is only for demo purposes) -->
434-
<script src="{{ asset('/dist/js/pages/dashboard.js') }}" type="text/javascript"></script>
435436
<!-- AdminLTE for demo purposes -->
436437
<script src="{{ asset('/dist/js/demo.js') }}" type="text/javascript"></script>
438+
<!-- Morris -->
439+
<script src="{{ asset('/plugins/morris/morris.min.js') }}" type="text/javascript"></script>
437440
@yield('script')
438441
</body>
439442
</html>

0 commit comments

Comments
 (0)