Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CYBELE
data
Query Builder
Commits
19904404
Commit
19904404
authored
Sep 16, 2020
by
Giannis Tsapelas
Browse files
when aggr wihout groupby, exclude dimensions
parent
dd5f506c
Changes
1
Hide whitespace changes
Inline
Side-by-side
query_designer/static/query_designer/js/simplified/toolbox2.js
View file @
19904404
...
...
@@ -302,10 +302,11 @@ $(function () {
};
this
.
create_grouping_list
();
var
hasGroupingOrResolution
=
false
;
if
((
QueryToolbox
.
groupings
.
length
>
0
)
||
(
QueryToolbox
.
temporal_resolution
!=
''
)
||
(
QueryToolbox
.
spatial_resolution
!=
''
))
{
hasGroupingOrResolution
=
true
;
}
var
hasGrouping
=
false
;
// if ((QueryToolbox.groupings.length > 0) || (QueryToolbox.temporal_resolution != '') || (QueryToolbox.spatial_resolution != '')) {
// hasGrouping = true;
// }
if
((
QueryToolbox
.
groupings
.
length
>
0
))
{
hasGrouping
=
true
;
}
...
...
@@ -320,7 +321,6 @@ $(function () {
// "select" in "from" field of the document is the columns that will be selected from the table where the variable is
select
:
[]
};
// push main variable - THE VARIABLES in the query document have as "type" the string "VALUE"
var
groupBy
=
false
;
$
.
each
(
QueryToolbox
.
groupings
,
function
(
_
,
elem
)
{
...
...
@@ -402,6 +402,9 @@ $(function () {
if
(
groupBy
)
exclude
=
false
;
if
(
!
hasGroupingOrResolution
&&
(
variable
.
aggregate
!=
''
))
exclude
=
true
;
var
dimension
=
{
type
:
dim
.
id
,
name
:
'
i
'
+
String
(
idx
)
+
'
_
'
+
name
,
...
...
Write
Preview
Supports
Markdown
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