@@ -3535,7 +3535,6 @@ function getRfdData() {
3535
3535
listInterfaces = data || [ ] ;
3536
3536
if ( [ 'BidCos-RF' , 'HmIP' ] . includes ( config . daemons [ daemon ] . type ) ) {
3537
3537
rpcAlert ( daemon , 'rssiInfo' , [ ] , ( err , data ) => {
3538
- console . log ( 'rssiInfo' , daemon , JSON . stringify ( data ) ) ;
3539
3538
listRssi = data ;
3540
3539
$ ( '#gbox_grid-rssi' ) . show ( ) ;
3541
3540
initGridRssi ( ) ;
@@ -3552,8 +3551,23 @@ function getRfdData() {
3552
3551
} ) ;
3553
3552
}
3554
3553
}
3554
+
3555
+ let sortnameGridRssi ;
3556
+ let sortorderGridRssi ;
3557
+ let filterGridRssi ;
3558
+
3555
3559
function initGridRssi ( ) {
3560
+ console . log ( 'initGridRssi' ) ;
3556
3561
if ( $gridRssi . hasClass ( 'ui-jqgrid-btable' ) && $gridRssi . jqGrid ) {
3562
+
3563
+ sortnameGridRssi = $gridRssi . jqGrid ( 'getGridParam' , 'sortname' ) ;
3564
+ sortorderGridRssi = $gridRssi . jqGrid ( 'getGridParam' , 'sortorder' ) ;
3565
+ filterGridRssi = {
3566
+ Name : $ ( '#gs_grid-rssi_Name' ) . val ( ) ,
3567
+ ADDRESS : $ ( '#gs_grid-rssi_ADDRESS' ) . val ( ) ,
3568
+ TYPE : $ ( '#gs_grid-rssi_TYPE' ) . val ( ) ,
3569
+ INTERFACE : $ ( '#gs_grid-rssi_INTERFACE' ) . val ( )
3570
+ } ;
3557
3571
$gridRssi . jqGrid ( 'GridUnload' ) ;
3558
3572
}
3559
3573
const colNamesRssi = [ 'Name' , 'ADDRESS' , 'TYPE' , 'INTERFACE' , 'RF_ADDRESS' , 'ROAMING' ] ;
@@ -3806,7 +3820,6 @@ function refreshGridRssi() {
3806
3820
'' : listRssi [ listDevices [ i ] . ADDRESS ] [ listInterfaces [ k ] . ADDRESS ] [ 0 ] ) ;
3807
3821
line [ listInterfaces [ k ] . ADDRESS + '_1' ] = ( listRssi [ listDevices [ i ] . ADDRESS ] [ listInterfaces [ k ] . ADDRESS ] [ 1 ] === 65536 ?
3808
3822
'' : listRssi [ listDevices [ i ] . ADDRESS ] [ listInterfaces [ k ] . ADDRESS ] [ 1 ] ) ;
3809
- console . log ( listDevices [ i ] . ADDRESS , 'dev iface, iface addr' , listDevices [ i ] . INTERFACE , listInterfaces [ k ] . ADDRESS )
3810
3823
if ( listDevices [ i ] . INTERFACE === listInterfaces [ k ] . ADDRESS ) {
3811
3824
line [ listInterfaces [ k ] . ADDRESS + '_set' ] = '<input type="radio" class="interface-set" name="iface_' + i + '" data-device-index="' + i + '" data-iface-index="' + k + '" data-device="' + listDevices [ i ] . ADDRESS + '" value="' + listInterfaces [ k ] . ADDRESS + '" checked="checked">' ;
3812
3825
} else {
@@ -3829,7 +3842,20 @@ function refreshGridRssi() {
3829
3842
}
3830
3843
$gridRssi . jqGrid ( 'addRowData' , '_id' , rowData ) ;
3831
3844
}
3845
+
3846
+ $gridRssi . jqGrid ( 'setGridParam' , {
3847
+ sortname : sortnameGridRssi || 'Name' ,
3848
+ sortorder : sortorderGridRssi || 'asc'
3849
+ } ) ;
3832
3850
$gridRssi . trigger ( 'reloadGrid' ) ;
3851
+ /* Todo Trigger filtering
3852
+ if (filterGridRssi) {
3853
+ $('#gs_grid-rssi_Name').val(filterGridRssi.Name).trigger('change');
3854
+ $('#gs_grid-rssi_ADDRESS').val(filterGridRssi.ADDRESS).trigger('change');
3855
+ $('#gs_grid-rssi_TYPE').val(filterGridRssi.TYPE).trigger('change');
3856
+ $('#gs_grid-rssi_INTERFACE').val(filterGridRssi.INTERFACE).trigger('change');
3857
+ }
3858
+ */
3833
3859
if ( daemon === 'HmIP' ) {
3834
3860
$gridRssi . jqGrid ( 'hideCol' , 'roaming' ) ;
3835
3861
$gridRssi . jqGrid ( 'hideCol' , 'INTERFACE' ) ;
0 commit comments