Fixes for designs

This commit is contained in:
David Bomba 2021-11-30 21:50:50 +11:00
parent ca2932862d
commit 185f48a758
10 changed files with 181 additions and 146 deletions

View File

@ -113,7 +113,7 @@
table-layout: fixed; table-layout: fixed;
overflow-wrap: break-word; overflow-wrap: break-word;
margin-top: 3rem; margin-top: 3rem;
margin-bottom: 200px; margin-bottom: 0px;
} }
[data-ref="table"]:last-child{ [data-ref="table"]:last-child{
@ -371,20 +371,24 @@
$entity_images $entity_images
<div id="footer"> <div id="footer">
<div> <div style="width: 100%;">
<p data-ref="total_table-footer">$entity_footer</p> <p data-ref="total_table-footer">$entity_footer</p>
<script> <script>
// Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present. // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
let tables = [ let tables = [
'product-table', 'task-table', 'delivery-note-table', 'statement-invoice-table-totals', 'statement-payment-table-totals','statement-invoice-table-totals', 'product-table', 'task-table', 'delivery-note-table',
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table', 'statement-aging-table-totals', 'statement-payment-table-totals' 'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
'statement-invoice-table-totals', 'statement-payment-table-totals', 'statement-aging-table'
]; ];
tables.forEach((tableIdentifier) => { tables.forEach((tableIdentifier) => {
const el =document.getElementById(tableIdentifier); console.log(document.getElementById(tableIdentifier));
if(el && el.childElementCount === 0)el.remove()
document.getElementById(tableIdentifier)?.childElementCount === 0
? document.getElementById(tableIdentifier).style.setProperty('display', 'none', 'important')
: '';
}); });
}); });
</script> </script>

View File

@ -351,7 +351,7 @@ $entity_images
<div class="repeating-footer" id="footer"> <div class="repeating-footer" id="footer">
<p data-ref="total_table-footer">$entity_footer</p> <p data-ref="total_table-footer">$entity_footer</p>
</div>
<script> <script>
// Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present. // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
@ -368,3 +368,5 @@ $entity_images
}); });
}); });
</script> </script>
</div>

View File

@ -313,20 +313,25 @@ $entity_images
<div class="repeating-footer" id="footer"> <div class="repeating-footer" id="footer">
<p data-ref="total_table-footer">$entity_footer</p> <p data-ref="total_table-footer">$entity_footer</p>
<script>
// Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
document.addEventListener('DOMContentLoaded', () => {
let tables = [
'product-table', 'task-table', 'delivery-note-table',
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
'statement-invoice-table-totals', 'statement-payment-table-totals', 'statement-aging-table'
];
tables.forEach((tableIdentifier) => {
console.log(document.getElementById(tableIdentifier));
document.getElementById(tableIdentifier)?.childElementCount === 0
? document.getElementById(tableIdentifier).style.setProperty('display', 'none', 'important')
: '';
});
});
</script>
</div> </div>
<script>
// Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
document.addEventListener('DOMContentLoaded', () => {
let tables = [
'product-table', 'task-table', 'delivery-note-table',
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
];
tables.forEach((tableIdentifier) => {
document.getElementById(tableIdentifier).childElementCount === 0
? document.getElementById(tableIdentifier).style.display = 'none'
: '';
});
});
</script>

View File

@ -303,24 +303,29 @@
<div class="repeating-header" id="header"></div> <div class="repeating-header" id="header"></div>
<div class="repeating-footer" id="footer">
<p data-ref="total_table-footer">$entity_footer</p>
</div>
$entity_images $entity_images
<script> <div class="repeating-footer" id="footer">
// Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present. <p data-ref="total_table-footer">$entity_footer</p>
document.addEventListener('DOMContentLoaded', () => {
let tables = [
'product-table', 'task-table', 'delivery-note-table',
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
];
tables.forEach((tableIdentifier) => {
document.getElementById(tableIdentifier).childElementCount === 0 <script>
? document.getElementById(tableIdentifier).style.display = 'none' // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
: ''; document.addEventListener('DOMContentLoaded', () => {
}); let tables = [
}); 'product-table', 'task-table', 'delivery-note-table',
</script> 'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
'statement-invoice-table-totals', 'statement-payment-table-totals', 'statement-aging-table'
];
tables.forEach((tableIdentifier) => {
console.log(document.getElementById(tableIdentifier));
document.getElementById(tableIdentifier)?.childElementCount === 0
? document.getElementById(tableIdentifier).style.setProperty('display', 'none', 'important')
: '';
});
});
</script>
</div>

View File

@ -313,24 +313,30 @@
<div class="repeating-header" id="header"></div> <div class="repeating-header" id="header"></div>
<div class="repeating-footer" id="footer">
<p data-ref="total_table-footer">$entity_footer</p>
</div>
$entity_images $entity_images
<script> <div class="repeating-footer" id="footer">
// Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present. <p data-ref="total_table-footer">$entity_footer</p>
document.addEventListener('DOMContentLoaded', () => {
let tables = [ <script>
'product-table', 'task-table', 'delivery-note-table', // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals', document.addEventListener('DOMContentLoaded', () => {
]; let tables = [
'product-table', 'task-table', 'delivery-note-table',
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
'statement-invoice-table-totals', 'statement-payment-table-totals', 'statement-aging-table'
];
tables.forEach((tableIdentifier) => {
console.log(document.getElementById(tableIdentifier));
document.getElementById(tableIdentifier)?.childElementCount === 0
? document.getElementById(tableIdentifier).style.setProperty('display', 'none', 'important')
: '';
});
});
</script>
</div>
tables.forEach((tableIdentifier) => {
document.getElementById(tableIdentifier).childElementCount === 0
? document.getElementById(tableIdentifier).style.display = 'none'
: '';
});
});
</script>

View File

@ -354,30 +354,29 @@
<div class="repeating-header" id="header"></div> <div class="repeating-header" id="header"></div>
<div class="repeating-footer" id="footer">
<p data-ref="total_table-footer">$entity_footer</p>
</div>
$entity_images $entity_images
<script> <div class="repeating-footer" id="footer">
// Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present. <p data-ref="total_table-footer">$entity_footer</p>
document.addEventListener('DOMContentLoaded', () => {
let tables = [
'product-table', 'task-table', 'delivery-note-table',
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
];
tables.forEach((tableIdentifier) => { <script>
document.getElementById(tableIdentifier).childElementCount === 0 // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
? document.getElementById(tableIdentifier).style.display = 'none' document.addEventListener('DOMContentLoaded', () => {
: ''; let tables = [
}); 'product-table', 'task-table', 'delivery-note-table',
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
'statement-invoice-table-totals', 'statement-payment-table-totals', 'statement-aging-table'
];
tables.forEach((tableIdentifier) => {
console.log(document.getElementById(tableIdentifier));
document.getElementById(tableIdentifier)?.childElementCount === 0
? document.getElementById(tableIdentifier).style.setProperty('display', 'none', 'important')
: '';
});
});
</script>
</div>
// If we have elements in these tables, we can change label to "Statement" & hide entity details.
if (document.querySelectorAll('#statement-payment-table > tbody, #statement-payment-table > tbody, #statement-aging-table-totals > tbody').length > 0) {
document.querySelector('.entity-label').innerText = '$statement_label';
document.querySelector('.entity-details-wrapper').style.display = 'none';
}
});
</script>

View File

@ -348,24 +348,28 @@ $entity_images
<div id="footer"> <div id="footer">
<div class="footer-content"> <div class="footer-content">
<div style="width: 70%;"> <div style="width: 90%">
<p data-ref="total_table-footer">$entity_footer</p> <p data-ref="total_table-footer">$entity_footer</p>
<script> <script>
// Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present. // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
let tables = [ let tables = [
'product-table', 'task-table', 'delivery-note-table', 'statement-invoice-table-totals', 'statement-payment-table-totals','statement-invoice-table-totals', 'product-table', 'task-table', 'delivery-note-table',
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table', 'statement-aging-table-totals', 'statement-payment-table-totals' 'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
]; 'statement-invoice-table-totals', 'statement-payment-table-totals', 'statement-aging-table'
];
tables.forEach((tableIdentifier) => { tables.forEach((tableIdentifier) => {
document.getElementById(tableIdentifier).childElementCount === 0 console.log(document.getElementById(tableIdentifier));
? document.getElementById(tableIdentifier).remove()
: ''; document.getElementById(tableIdentifier)?.childElementCount === 0
}); ? document.getElementById(tableIdentifier).style.setProperty('display', 'none', 'important')
: '';
}); });
</script> });
</script>
</div> </div>
<div class="footer-company-details-address-wrapper"> <div class="footer-company-details-address-wrapper">
<div id="company-details"></div> <div id="company-details"></div>

View File

@ -288,24 +288,27 @@
<div class="repeating-header" id="header"></div> <div class="repeating-header" id="header"></div>
<div class="repeating-footer" id="footer">
<p data-ref="total_table-footer">$entity_footer</p>
</div>
$entity_images $entity_images
<script> <div class="repeating-footer" id="footer">
// Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present. <p data-ref="total_table-footer">$entity_footer</p>
document.addEventListener('DOMContentLoaded', () => {
let tables = [
'product-table', 'task-table', 'delivery-note-table',
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
];
tables.forEach((tableIdentifier) => { <script>
document.getElementById(tableIdentifier).childElementCount === 0 // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
? document.getElementById(tableIdentifier).style.display = 'none' document.addEventListener('DOMContentLoaded', () => {
: ''; let tables = [
}); 'product-table', 'task-table', 'delivery-note-table',
}); 'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
</script> 'statement-invoice-table-totals', 'statement-payment-table-totals', 'statement-aging-table'
];
tables.forEach((tableIdentifier) => {
console.log(document.getElementById(tableIdentifier));
document.getElementById(tableIdentifier)?.childElementCount === 0
? document.getElementById(tableIdentifier).style.setProperty('display', 'none', 'important')
: '';
});
});
</script>
</div>

View File

@ -390,21 +390,23 @@ $entity_images
<div style="background-color: #F8B300"><!-- 7 --></div> <div style="background-color: #F8B300"><!-- 7 --></div>
<div style="background-color: #009B8F"><!-- 8 --></div> <div style="background-color: #009B8F"><!-- 8 --></div>
</div> </div>
<script>
// Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
document.addEventListener('DOMContentLoaded', () => {
let tables = [
'product-table', 'task-table', 'delivery-note-table',
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
'statement-invoice-table-totals', 'statement-payment-table-totals', 'statement-aging-table'
];
tables.forEach((tableIdentifier) => {
console.log(document.getElementById(tableIdentifier));
document.getElementById(tableIdentifier)?.childElementCount === 0
? document.getElementById(tableIdentifier).style.setProperty('display', 'none', 'important')
: '';
});
});
</script>
</div> </div>
<script>
// Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
document.addEventListener('DOMContentLoaded', () => {
let tables = [
'product-table', 'task-table', 'delivery-note-table',
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
];
tables.forEach((tableIdentifier) => {
document.getElementById(tableIdentifier).childElementCount === 0
? document.getElementById(tableIdentifier).style.display = 'none'
: '';
});
});
</script>

View File

@ -353,24 +353,29 @@
<div class="repeating-header" id="header"></div> <div class="repeating-header" id="header"></div>
<div class="repeating-footer" id="footer">
<p data-ref="total_table-footer">$entity_footer</p>
</div>
$entity_images $entity_images
<script> <div class="repeating-footer" id="footer">
// Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present. <p data-ref="total_table-footer">$entity_footer</p>
document.addEventListener('DOMContentLoaded', () => {
let tables = [ <script>
'product-table', 'task-table', 'delivery-note-table', // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals', document.addEventListener('DOMContentLoaded', () => {
]; let tables = [
'product-table', 'task-table', 'delivery-note-table',
'statement-invoice-table', 'statement-payment-table', 'statement-aging-table-totals',
'statement-invoice-table-totals', 'statement-payment-table-totals', 'statement-aging-table'
];
tables.forEach((tableIdentifier) => {
console.log(document.getElementById(tableIdentifier));
document.getElementById(tableIdentifier)?.childElementCount === 0
? document.getElementById(tableIdentifier).style.setProperty('display', 'none', 'important')
: '';
});
});
</script>
</div>
tables.forEach((tableIdentifier) => {
document.getElementById(tableIdentifier).childElementCount === 0
? document.getElementById(tableIdentifier).style.display = 'none'
: '';
});
});
</script>