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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Robert Goldmann
BudgetMaster
Commits
dce546ed
Commit
dce546ed
authored
6 years ago
by
Robert Goldmann
Browse files
Options
Downloads
Patches
Plain Diff
#293 - added filter button to report page
parent
ee9fcd96
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#604
passed
6 years ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java
+2
-1
2 additions, 1 deletion
...deadlocker8/budgetmaster/controller/ReportController.java
src/main/resources/templates/reports/reports.ftl
+9
-1
9 additions, 1 deletion
src/main/resources/templates/reports/reports.ftl
with
11 additions
and
2 deletions
src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java
+
2
−
1
View file @
dce546ed
...
@@ -60,12 +60,13 @@ public class ReportController extends BaseController
...
@@ -60,12 +60,13 @@ public class ReportController extends BaseController
private
FilterHelpersService
filterHelpers
;
private
FilterHelpersService
filterHelpers
;
@RequestMapping
(
"/reports"
)
@RequestMapping
(
"/reports"
)
public
String
reports
(
Model
model
,
@CookieValue
(
value
=
"currentDate"
,
required
=
false
)
String
cookieDate
)
public
String
reports
(
HttpServletRequest
request
,
Model
model
,
@CookieValue
(
value
=
"currentDate"
,
required
=
false
)
String
cookieDate
)
{
{
DateTime
date
=
helpers
.
getDateTimeFromCookie
(
cookieDate
);
DateTime
date
=
helpers
.
getDateTimeFromCookie
(
cookieDate
);
model
.
addAttribute
(
"reportSettings"
,
reportSettingsService
.
getReportSettings
());
model
.
addAttribute
(
"reportSettings"
,
reportSettingsService
.
getReportSettings
());
model
.
addAttribute
(
"currentDate"
,
date
);
model
.
addAttribute
(
"currentDate"
,
date
);
model
.
addAttribute
(
"isFilterActive"
,
filterHelpers
.
getFilterConfiguration
(
request
).
isActive
());
return
"reports/reports"
;
return
"reports/reports"
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/templates/reports/reports.ftl
+
9
−
1
View file @
dce546ed
...
@@ -10,6 +10,8 @@
...
@@ -10,6 +10,8 @@
<#import "../helpers/navbar.ftl" as navbar>
<#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar "reports"/>
<@navbar.navbar "reports"/>
<#import "../transactions/transactionsMacros.ftl" as transactionsMacros>
<main>
<main>
<div class="card main-card background-color">
<div class="card main-card background-color">
<#import "../helpers/globalDatePicker.ftl" as datePicker>
<#import "../helpers/globalDatePicker.ftl" as datePicker>
...
@@ -23,6 +25,12 @@
...
@@ -23,6 +25,12 @@
<input type="hidden" name="ID" value="$
{
reportSettings
.getID
()
?
c
}
"/>
<input type="hidden" name="ID" value="$
{
reportSettings
.getID
()
?
c
}
"/>
<input type="hidden" name="date" value="$
{
helpers
.getLongDateString
(
currentDate
)}
"/>
<input type="hidden" name="date" value="$
{
helpers
.getLongDateString
(
currentDate
)}
"/>
<div class="row">
<div class="col s12 center-align">
<@transactionsMacros.buttonFilter isFilterActive/>
</div>
</div>
<#-- settings -->
<#-- settings -->
<div class="row">
<div class="row">
<div class="col s12 center-align">
<div class="col s12 center-align">
...
@@ -83,7 +91,7 @@
...
@@ -83,7 +91,7 @@
</div>
</div>
</div>
</div>
<#-- button
new
-->
<#-- button
generate
-->
<div class="row valign-wrapper">
<div class="row valign-wrapper">
<div class="col s12 center-align">
<div class="col s12 center-align">
<button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="buttonSave">
<button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="buttonSave">
...
...
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