Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AB#62856 Print Preview Formatting Issues #291

Merged
merged 19 commits into from
Feb 1, 2024
Merged

AB#62856 Print Preview Formatting Issues #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ef5f4db
Change media at line 49 to all
csmith-he Jan 22, 2024
7666674
SCSS changes to make print display properly
csmith-he Jan 22, 2024
9a45d65
Remove float styling
csmith-he Jan 22, 2024
023f51c
Add float to toolbar elements
csmith-he Jan 22, 2024
38a14a5
Remove inline styling and add new classes
csmith-he Jan 22, 2024
f366699
Add positioning classes & class edits
csmith-he Jan 22, 2024
c535641
Merge branch 'warden/main' into cs_62856_main_merge_printpreviewforma…
csmith-he Jan 24, 2024
74007ec
Increase report load timeout to 30 seconds
csmith-he Jan 31, 2024
5740474
Merge branch 'cs_62856_printpreviewformatissue' into cs_62856_main_me…
csmith-he Jan 31, 2024
34dc93f
Increase timeout value
csmith-he Jan 31, 2024
230ec78
Merge branch 'cs_62856_printpreviewformatissue' into cs_62856_main_me…
csmith-he Jan 31, 2024
397a0b1
Reduce timeout to 1.5 mins
csmith-he Jan 31, 2024
0132c53
Merge branch 'cs_62856_printpreviewformatissue' into cs_62856_main_me…
csmith-he Jan 31, 2024
2cbd987
Reduce timeout to 45 seconds
csmith-he Jan 31, 2024
aeb9cf3
Merge branch 'cs_62856_printpreviewformatissue' into cs_62856_main_me…
csmith-he Jan 31, 2024
846c84c
Reduce timeout to 35 seconds
csmith-he Jan 31, 2024
e6d0f7c
Merge branch 'cs_62856_printpreviewformatissue' into cs_62856_main_me…
csmith-he Jan 31, 2024
2c63222
Reduce timeout to 25 seconds
csmith-he Feb 1, 2024
2f242d7
Merge branch 'cs_62856_printpreviewformatissue' into cs_62856_main_me…
csmith-he Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions arches/app/media/css/arches.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9201,11 +9201,19 @@ a.mega-dropdown-toggle.disabled {
font-size: 17px;
font-weight: 500;
margin-top: 0px;
width: 400px;
width: auto;
padding: 14px 0 5px 25px;
color: #555;
}

.report-toolbar-left-position{
float:left;
}

.report-toolbar-right-position{
float:right;
}

h4.report-toolbar-title {
width: 500px;
}
Expand Down Expand Up @@ -15119,20 +15127,36 @@ a.jstree-anchor.permissions-widget {

@media print {

* {
overflow: visible !important;
}
.page {
page-break-after:always;
}

header,
nav,
footer,
button,
aside,
#skip-link-holder,
.print-btn,
.ep-tools,
.geocode-container,
.geometry-tools-container,
.geometry-editing-notifications,
.resource-component-abstract-container footer,
#map-widget-container>.map-widget-container {
display: none;
}

#menu-toggle,
div.report-print-date,
#mainnav-menu{
display:none !important;
}


#content-container {
padding: 0 !important;
}
Expand Down Expand Up @@ -15176,7 +15200,11 @@ a.jstree-anchor.permissions-widget {
}

.mapboxgl-map {
display: none;
display: block;
}

.workbench-card-sidebar, .mapboxgl-control-container{
display: none
}

.print-map {
Expand Down
2 changes: 1 addition & 1 deletion arches/app/media/js/views/resource/report.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require([
self.viewModel.loading(false);
window.print();
},
7000 // a generous timeout here to allow maps/images to load
25000 // a generous timeout here to allow maps/images to load
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion arches/app/templates/base.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

{% block css %}
{% compress css %}
<link type="text/x-scss" href="{% static 'css/arches.scss' %}" rel="stylesheet" media="screen">
<link type="text/x-scss" href="{% static 'css/arches.scss' %}" rel="stylesheet" media="all">
{% endcompress %}
{% if app_settings.ACCESSIBILITY_MODE %}
<link href="{% static 'css/accessibility.css' %}" rel="stylesheet">
Expand Down
4 changes: 2 additions & 2 deletions arches/app/templates/views/report-templates/default.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

<!-- Title Block -->
<div class="report-toolbar-preview ep-form-toolbar">
<h2 class="report-toolbar-title"><span data-bind="text: report.get('name')"></span> - <span data-bind="text: report.get('displayname') "></span></h2>
<h2 class="report-toolbar-title report-toolbar-left-position"><span data-bind="text: report.get('name')"></span> - <span data-bind="text: report.get('displayname') "></span></h2>

<!-- Tools -->
<div class="ep-form-toolbar-tools mar-no flex" style="position: relative; height: inherit">
<div class="ep-form-toolbar-tools mar-no flex report-toolbar-right-position" style="position: relative; height: inherit;">
<p class="report-print-date">{% trans "Report Date:" %} <span data-bind="text: reportDate"></span></p>
<div class="report-print-date" style="position: absolute; margin-top: 30px; margin-left: -11px; " data-bind="component: { name: 'views/components/simple-switch', params: {value: hideEmptyNodes, config:{ label: '{% trans "Hide Null Values" %}', subtitle: ''}}}"></div>
</div>
Expand Down
Loading