Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BudgetMaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Robert Goldmann
BudgetMaster
Commits
7164fed4
Commit
7164fed4
authored
3 years ago
by
Robert Goldmann
Browse files
Options
Downloads
Patches
Plain Diff
#585 - isGroupTypeDisabled
parent
a6ffebdc
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/resources/static/js/charts.js
+32
-4
32 additions, 4 deletions
src/main/resources/static/js/charts.js
src/main/resources/templates/charts/charts.ftl
+1
-3
1 addition, 3 deletions
src/main/resources/templates/charts/charts.ftl
with
33 additions
and
7 deletions
src/main/resources/static/js/charts.js
+
32
−
4
View file @
7164fed4
...
@@ -81,6 +81,7 @@ $(document).ready(function()
...
@@ -81,6 +81,7 @@ $(document).ready(function()
{
{
toggleChartTypeButtons
(
'
button-display-type
'
,
this
);
toggleChartTypeButtons
(
'
button-display-type
'
,
this
);
document
.
getElementsByName
(
'
displayType
'
)[
0
].
value
=
this
.
dataset
.
value
;
document
.
getElementsByName
(
'
displayType
'
)[
0
].
value
=
this
.
dataset
.
value
;
hideGroupTypeButtonsIfOnlyOneDistinctGroup
();
filterChartPreviews
();
filterChartPreviews
();
});
});
...
@@ -262,6 +263,21 @@ function toggleChartTypeButtons(styleClassName, item)
...
@@ -262,6 +263,21 @@ function toggleChartTypeButtons(styleClassName, item)
item
.
classList
.
toggle
(
'
active
'
,
true
);
item
.
classList
.
toggle
(
'
active
'
,
true
);
}
}
function
hideGroupTypeButtonsIfOnlyOneDistinctGroup
()
{
let
displayTypeName
=
document
.
querySelector
(
'
.button-display-type.active
'
).
dataset
.
value
;
let
chartsWithCurrentDisplayType
=
document
.
querySelectorAll
(
'
.chart-preview-column[data-display-type="
'
+
displayTypeName
+
'
"]
'
);
let
groupTypes
=
new
Set
();
for
(
let
i
=
0
;
i
<
chartsWithCurrentDisplayType
.
length
;
i
++
)
{
groupTypes
.
add
(
chartsWithCurrentDisplayType
[
i
].
dataset
.
groupType
);
}
let
hasOnlyOneDistinctGroupType
=
groupTypes
.
size
<=
1
;
document
.
getElementById
(
'
chart-group-type-buttons
'
).
classList
.
toggle
(
'
hidden
'
,
hasOnlyOneDistinctGroupType
);
}
function
filterChartPreviews
()
function
filterChartPreviews
()
{
{
let
displayTypeName
=
document
.
querySelector
(
'
.button-display-type.active
'
).
dataset
.
value
;
let
displayTypeName
=
document
.
querySelector
(
'
.button-display-type.active
'
).
dataset
.
value
;
...
@@ -273,14 +289,26 @@ function filterChartPreviews()
...
@@ -273,14 +289,26 @@ function filterChartPreviews()
allChartPreviews
[
i
].
classList
.
toggle
(
'
hidden
'
,
true
);
allChartPreviews
[
i
].
classList
.
toggle
(
'
hidden
'
,
true
);
}
}
let
isGroupTypeDisabled
=
document
.
getElementById
(
'
chart-group-type-buttons
'
).
classList
.
contains
(
'
hidden
'
);
if
(
isGroupTypeDisabled
)
{
let
chartPreviews
=
document
.
querySelectorAll
(
'
.chart-preview-column[data-display-type="
'
+
displayTypeName
+
'
"]
'
);
for
(
let
i
=
0
;
i
<
chartPreviews
.
length
;
i
++
)
{
chartPreviews
[
i
].
classList
.
toggle
(
'
hidden
'
,
false
);
}
}
else
{
let
chartPreviews
=
document
.
querySelectorAll
(
'
.chart-preview-column[data-display-type="
'
+
displayTypeName
+
'
"][data-group-type="
'
+
groupTypeName
+
'
"]
'
);
let
chartPreviews
=
document
.
querySelectorAll
(
'
.chart-preview-column[data-display-type="
'
+
displayTypeName
+
'
"][data-group-type="
'
+
groupTypeName
+
'
"]
'
);
for
(
let
i
=
0
;
i
<
chartPreviews
.
length
;
i
++
)
for
(
let
i
=
0
;
i
<
chartPreviews
.
length
;
i
++
)
{
{
chartPreviews
[
i
].
classList
.
toggle
(
'
hidden
'
,
false
);
chartPreviews
[
i
].
classList
.
toggle
(
'
hidden
'
,
false
);
}
}
}
unsetActiveChartPreview
();
unsetActiveChartPreview
();
toggleCustomChartButton
(
displayTypeName
===
'
CUSTOM
'
);
toggleCustomChartButton
(
displayTypeName
===
'
CUSTOM
'
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/templates/charts/charts.ftl
+
1
−
3
View file @
7164fed4
...
@@ -25,8 +25,6 @@
...
@@ -25,8 +25,6 @@
</div>
</div>
<@header.content>
<@header.content>
<br>
<div class="row">
<div class="row">
<div class="col s12 center-align">
<div class="col s12 center-align">
<@header.buttonLink url='' icon='edit' localizationKey='chart.button.settings' noUrl=true id='buttonShowChartSettings' classes='hidden'/>
<@header.buttonLink url='' icon='edit' localizationKey='chart.button.settings' noUrl=true id='buttonShowChartSettings' classes='hidden'/>
...
@@ -47,7 +45,7 @@
...
@@ -47,7 +45,7 @@
</div>
</div>
<input type="hidden" name="displayType" value="$
{
chartSettings
.getDisplayType
()
.name
()}
">
<input type="hidden" name="displayType" value="$
{
chartSettings
.getDisplayType
()
.name
()}
">
<div class="container">
<div class="container"
id="chart-group-type-buttons"
>
<div class="row">
<div class="row">
<div class="col s12 center-align">
<div class="col s12 center-align">
<#list groupTypes as groupType>
<#list groupTypes as groupType>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment