Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
crx-framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
crx-php
crx-framework
Commits
234f45d9
Commit
234f45d9
authored
Nov 05, 2018
by
f4eyq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update 5/11
parent
71e4aa53
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
6 deletions
+31
-6
classes/class.crx.libs/radioamator/abstractDxClusterSpot.php
classes/class.crx.libs/radioamator/abstractDxClusterSpot.php
+5
-2
classes/class.crx.libs/radioamator/dxClusterSpotHam.php
classes/class.crx.libs/radioamator/dxClusterSpotHam.php
+26
-4
No files found.
classes/class.crx.libs/radioamator/abstractDxClusterSpot.php
View file @
234f45d9
...
...
@@ -112,7 +112,6 @@ class abstractDxClusterSpot{
$this
->
user_us_states_dx_selected
=
$params
[
'user_us_states_dx_selected'
];
//////////////////////////////////////////
//old system :
if
(
isset
(
$params
[
'display_spot_after_timestamp'
]))
$this
->
display_spot_after_timestamp
=
$params
[
'display_spot_after_timestamp'
];
...
...
@@ -120,7 +119,11 @@ class abstractDxClusterSpot{
//New filter date :
if
(
isset
(
$params
[
'use_date_filter'
]))
$this
->
display_spot_after_timestamp_v2
=
$params
[
'use_date_filter'
];
if
(
isset
(
$params
[
'display_only_not_contacted_dx'
]))
$this
->
display_only_not_contacted_dx
=
$params
[
'display_only_not_contacted_dx'
];
if
(
isset
(
$params
[
'spots_comment_filter'
]))
$this
->
display_spots_comment_filter
=
$params
[
'spots_comment_filter'
];
if
(
isset
(
$params
[
'spots_comment_filter'
]))
$this
->
display_spots_comment_filter
=
$params
[
'spots_comment_filter'
];
if
(
isset
(
$params
[
'spots_comment_filter_in_out'
]))
$this
->
display_spots_comment_filter_in_out
=
$params
[
'spots_comment_filter_in_out'
];
if
(
isset
(
$params
[
'band_part_filter'
]))
$this
->
display_band_part_filter
=
$params
[
'band_part_filter'
];
if
(
isset
(
$params
[
'continent_dxspot_filtering_selected'
]))
$this
->
display_continent_dxspot_filtering_selected
=
$params
[
'continent_dxspot_filtering_selected'
];
...
...
classes/class.crx.libs/radioamator/dxClusterSpotHam.php
View file @
234f45d9
...
...
@@ -45,6 +45,8 @@ extends abstractDxClusterSpot{
var
$display_spots_comment_filter
=
0
;
//var $display_spots_comment_filter_in_out = 'IN'; //default include comment filter word.
var
$display_only_not_contacted_dx
=
0
;
var
$display_use_dxnodes_filter
=
0
;
...
...
@@ -761,6 +763,9 @@ extends abstractDxClusterSpot{
$r
=
$this
->
c_db
->
returnLine
();
$val
=
$r
[
'c1'
];
$col
=
NULL
;
$style
=
' style="color: #000000;"'
;
if
(
$val
>
0
&&
$val
<
4
){
$col
=
'#F2FFF2'
;
}
if
(
$val
>=
4
&&
$val
<=
5
){
$col
=
'#CCFFCC'
;
}
...
...
@@ -769,9 +774,9 @@ extends abstractDxClusterSpot{
if
(
$val
>
10
){
$col
=
'#80FF80'
;
}
if
(
$val
==
0
){
$col
=
''
;
}
if
(
$val
==
0
){
$col
=
''
;
$style
=
''
;
}
$html
.
=
'<td bgcolor="'
.
$col
.
'">'
.
$val
.
'</td>'
;
$html
.
=
'<td bgcolor="'
.
$col
.
'"
"'
.
$style
.
'"
>'
.
$val
.
'</td>'
;
}
...
...
@@ -1205,8 +1210,23 @@ extends abstractDxClusterSpot{
if
(
$bands
<
0
){
$join_this_filter
=
""
;
}
$sql_set_filter_columns_settings
.
=
$join_this_filter
.
" ( `comment` LIKE '%"
.
$this
->
display_spots_comment_filter
.
"%' )"
;
$like_cmt
=
'LIKE'
;
if
(
$this
->
display_spots_comment_filter_in_out
<>
'IN'
){
$like_cmt
=
'NOT LIKE'
;
}
//var_dump($this->display_spots_comment_filter_in_out);die();
//$like_cmt='NOT LIKE';
$sql_set_filter_columns_settings
.
=
$join_this_filter
.
" ( `comment` "
.
$like_cmt
.
"'%"
.
$this
->
display_spots_comment_filter
.
"%' )"
;
}
///////////////////////////////////////////////
//13022015:add dxcc contacted filter's :
//$this->display_only_not_contacted_dx=1;
...
...
@@ -1422,6 +1442,9 @@ extends abstractDxClusterSpot{
$this
->
_dsql
=
$final_querie_get_dxcluster_spots
;
//var_dump($this->_dsql);die();
if
(
$exec_final_sql
){
$this
->
c_db
->
query
=
$final_querie_get_dxcluster_spots
;
...
...
@@ -1443,7 +1466,6 @@ extends abstractDxClusterSpot{
.
"
\n
"
.
$var
.
"
\n\n
sql_set_filter:"
.
$sql_set_filter
);
}
//notuse? $var=$this->_final_querie_get_dxcluster_spots;
if
(
isset
(
$spots
)
&&
is_array
(
$spots
)){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment