|
@@ -81,23 +81,23 @@ discard block |
|
|
block discarded – undo |
|
81
|
81
|
<span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
|
82
|
82
|
<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
83
|
83
|
<?php |
|
84
|
|
- if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
|
84
|
+ if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
85
|
85
|
?> |
|
86
|
86
|
<span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span> |
|
87
|
87
|
<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
88
|
88
|
<?php |
|
89
|
|
- } else { |
|
90
|
|
- ?> |
|
|
89
|
+ } else { |
|
|
90
|
+ ?> |
|
91
|
91
|
<span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span> |
|
92
|
92
|
<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
93
|
93
|
<?php |
|
94
|
|
- } |
|
95
|
|
- ?> |
|
|
94
|
+ } |
|
|
95
|
+ ?> |
|
96
|
96
|
<span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
|
97
|
97
|
<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
98
|
98
|
<?php |
|
99
|
|
- if ($airline_icao == '') { |
|
100
|
|
- ?> |
|
|
99
|
+ if ($airline_icao == '') { |
|
|
100
|
+ ?> |
|
101
|
101
|
<span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span> |
|
102
|
102
|
<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
103
|
103
|
<?php |
|
@@ -136,38 +136,38 @@ discard block |
|
|
block discarded – undo |
|
136
|
136
|
<div class="col-md-6"> |
|
137
|
137
|
<h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2> |
|
138
|
138
|
<?php |
|
139
|
|
- $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
140
|
|
- if (count($aircraft_array) == 0) print _("No data available"); |
|
141
|
|
- else { |
|
142
|
|
- print '<div id="chart1" class="chart" width="100%"></div><script>'; |
|
143
|
|
- $aircraft_data = ''; |
|
144
|
|
- foreach($aircraft_array as $aircraft_item) |
|
145
|
|
- { |
|
146
|
|
- $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
147
|
|
- } |
|
148
|
|
- $aircraft_data = substr($aircraft_data, 0, -1); |
|
149
|
|
- print 'var series = ['.$aircraft_data.'];'; |
|
150
|
|
- print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
151
|
|
- print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);'; |
|
152
|
|
- print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
153
|
|
- print 'var aircraftype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
154
|
|
- print 'dataset'; |
|
155
|
|
- print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
156
|
|
- print '</script>'; |
|
157
|
|
- } |
|
158
|
|
- ?> |
|
|
139
|
+ $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
|
140
|
+ if (count($aircraft_array) == 0) print _("No data available"); |
|
|
141
|
+ else { |
|
|
142
|
+ print '<div id="chart1" class="chart" width="100%"></div><script>'; |
|
|
143
|
+ $aircraft_data = ''; |
|
|
144
|
+ foreach($aircraft_array as $aircraft_item) |
|
|
145
|
+ { |
|
|
146
|
+ $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
|
147
|
+ } |
|
|
148
|
+ $aircraft_data = substr($aircraft_data, 0, -1); |
|
|
149
|
+ print 'var series = ['.$aircraft_data.'];'; |
|
|
150
|
+ print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
|
151
|
+ print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);'; |
|
|
152
|
+ print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
|
153
|
+ print 'var aircraftype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
|
154
|
+ print 'dataset'; |
|
|
155
|
+ print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
|
156
|
+ print '</script>'; |
|
|
157
|
+ } |
|
|
158
|
+ ?> |
|
159
|
159
|
<div class="more"> |
|
160
|
160
|
<?php |
|
161
|
|
- if ($year != '' && $month != '') { |
|
162
|
|
- ?> |
|
|
161
|
+ if ($year != '' && $month != '') { |
|
|
162
|
+ ?> |
|
163
|
163
|
<a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
164
|
164
|
<?php |
|
165
|
|
- } else { |
|
166
|
|
- ?> |
|
|
165
|
+ } else { |
|
|
166
|
+ ?> |
|
167
|
167
|
<a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
168
|
168
|
<?php |
|
169
|
|
- } |
|
170
|
|
- ?> |
|
|
169
|
+ } |
|
|
170
|
+ ?> |
|
171
|
171
|
</div> |
|
172
|
172
|
</div> |
|
173
|
173
|
<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |