File tree 3 files changed +19
-3
lines changed
3 files changed +19
-3
lines changed Original file line number Diff line number Diff line change 192
192
if ( _activeEvents . map && _activeEvents . map [ event_key ] && _activeEvents . map [ event_key ] [ column ] ) {
193
193
property = _activeEvents . map [ event_key ] [ column ] ;
194
194
}
195
+ if ( _activeEvents . overview [ i ] . is_event_group ) {
196
+ if ( _eventGroups && _eventGroups [ event_key ] && _eventGroups [ event_key ] [ column ] ) {
197
+ property = _eventGroups [ event_key ] [ column ] ;
198
+ }
199
+ }
195
200
var description = "" ;
196
201
if ( _activeEvents . map && _activeEvents . map [ event_key ] && _activeEvents . map [ event_key ] . description ) {
197
202
description = _activeEvents . map [ event_key ] . description ;
839
844
840
845
for ( var i = 0 ; i < events . length ; i ++ ) {
841
846
eventMap [ events [ i ] . key ] = events [ i ] ;
847
+ if ( events [ i ] . is_event_group === true ) {
848
+ if ( _eventGroups && _eventGroups [ events [ i ] . key ] ) {
849
+ var props = [ "count" , "sum" , "dur" ] ;
850
+ for ( var k = 0 ; k < props . length ; k ++ ) {
851
+ if ( _eventGroups [ events [ i ] . key ] [ props [ k ] ] ) {
852
+ events [ i ] [ props [ k ] ] = _eventGroups [ events [ i ] . key ] [ props [ k ] ] ;
853
+ }
854
+ }
855
+ }
856
+ }
842
857
}
843
858
844
859
return eventMap ;
Original file line number Diff line number Diff line change @@ -3114,9 +3114,9 @@ var AppRouter = Backbone.Router.extend({
3114
3114
3115
3115
if ( exportAPIData || exportQueryData ) {
3116
3116
//create export dialog
3117
- var position = 'right middle' ;
3117
+ var position = 'left middle' ;
3118
3118
if ( oSettings . oInstance && oSettings . oInstance . addColumnExportSelector === true ) {
3119
- position = 'right top' ;
3119
+ position = 'left top' ;
3120
3120
}
3121
3121
3122
3122
exportDrop = new CountlyDrop ( {
@@ -3146,7 +3146,7 @@ var AppRouter = Backbone.Router.extend({
3146
3146
exportDrop = new CountlyDrop ( {
3147
3147
target : tableWrapper . find ( '.save-table-data' ) [ 0 ] ,
3148
3148
content : "" ,
3149
- position : 'right middle' ,
3149
+ position : 'left middle' ,
3150
3150
classes : "server-export" ,
3151
3151
constrainToScrollParent : false ,
3152
3152
remove : true ,
Original file line number Diff line number Diff line change @@ -1432,6 +1432,7 @@ margin: 50px 0;}
1432
1432
.export-columns-selector .export-columns-search {
1433
1433
padding : 7px 15px ;
1434
1434
border-top : 1px solid # D0D0D0 ;
1435
+ background-color : # fbfbfb ;
1435
1436
}
1436
1437
1437
1438
.export-columns-selector .export-columns-search table , .data-table-column-selector .export-columns-search table {
You can’t perform that action at this time.
0 commit comments