steve
/
sunrise-cms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unneeded else

deepsource-autofix-76c6eb20
Dan Gowans 2023-01-24 13:18:01 -05:00
parent 45fee9bbc8
commit 19232ff1b6
3 changed files with 184 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
public-typescript/adminFees.js
View File

@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
let feeCategories = exports.feeCategories; let feeCategories = exports.feeCategories;
delete exports.feeCategories; delete exports.feeCategories;
function renderFeeCategories() { function renderFeeCategories() {
var _a, _b, _c, _d, _e, _f, _g, _h, _j; var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
if (feeCategories.length === 0) { if (feeCategories.length === 0) {
feeCategoriesContainerElement.innerHTML = `<div class="message is-warning"> feeCategoriesContainerElement.innerHTML = `<div class="message is-warning">
<p class="message-body">There are no available fees.</p> <p class="message-body">There are no available fees.</p>
@ -70,88 +70,92 @@ Object.defineProperty(exports, "__esModule", { value: true });
.querySelector('.button--deleteFeeCategory') .querySelector('.button--deleteFeeCategory')
.addEventListener('click', confirmDeleteFeeCategory); .addEventListener('click', confirmDeleteFeeCategory);
} }
else { for (const fee of feeCategory.fees) {
for (const fee of feeCategory.fees) { const panelBlockElement = document.createElement('div');
const panelBlockElement = document.createElement('div'); panelBlockElement.className = 'panel-block is-block container--fee';
panelBlockElement.className = 'panel-block is-block container--fee'; panelBlockElement.dataset.feeId = fee.feeId.toString();
panelBlockElement.dataset.feeId = fee.feeId.toString(); const hasTagsBlock = ((_c = fee.isRequired) !== null && _c !== void 0 ? _c : false) ||
const hasTagsBlock = ((_c = fee.isRequired) !== null && _c !== void 0 ? _c : false) || fee.occupancyTypeId !== undefined ||
fee.occupancyTypeId !== undefined || fee.lotTypeId !== undefined;
fee.lotTypeId !== undefined; panelBlockElement.innerHTML =
panelBlockElement.innerHTML = '<div class="columns">' +
'<div class="columns">' + ('<div class="column is-half">' +
('<div class="column is-half">' + '<p>' +
'<p>' + '<a class="has-text-weight-bold" href="#">' +
'<a class="has-text-weight-bold" href="#">' + cityssm.escapeHTML((_d = fee.feeName) !== null && _d !== void 0 ? _d : '') +
cityssm.escapeHTML((_d = fee.feeName) !== null && _d !== void 0 ? _d : '') + '</a><br />' +
'</a><br />' + '<small>' +
'<small>' + cityssm
cityssm .escapeHTML((_e = fee.feeDescription) !== null && _e !== void 0 ? _e : '')
.escapeHTML((_e = fee.feeDescription) !== null && _e !== void 0 ? _e : '') .replace(/\n/g, '<br />') +
.replace(/\n/g, '<br />') + '</small>' +
'</small>' + '</p>' +
'</p>' + (hasTagsBlock
(hasTagsBlock ? '<p class="tags">' +
? '<p class="tags">' + (((_f = fee.isRequired) !== null && _f !== void 0 ? _f : false)
(((_f = fee.isRequired) !== null && _f !== void 0 ? _f : false) ? '<span class="tag is-warning">Required</span>'
? '<span class="tag is-warning">Required</span>' : '') +
: '') + (((_g = fee.occupancyTypeId) !== null && _g !== void 0 ? _g : -1) === -1
(fee.occupancyTypeId === undefined ? ''
? '' : ' <span class="tag has-tooltip-bottom" data-tooltip="' +
: ' <span class="tag has-tooltip-bottom" data-tooltip="' + los.escapedAliases.Occupancy +
los.escapedAliases.Occupancy + ' Type Filter">' +
' Type Filter">' + '<span class="icon is-small"><i class="fas fa-filter" aria-hidden="true"></i></span> ' +
cityssm.escapeHTML((_g = fee.occupancyType) !== null && _g !== void 0 ? _g : '') + '<span>' +
'</span>') + cityssm.escapeHTML((_h = fee.occupancyType) !== null && _h !== void 0 ? _h : '') +
(fee.lotTypeId === undefined '</span>' +
? '' '</span>') +
: ' <span class="tag has-tooltip-bottom" data-tooltip="' + (((_j = fee.lotTypeId) !== null && _j !== void 0 ? _j : -1) === -1
los.escapedAliases.Lot + ? ''
' Type Filter">' + : ' <span class="tag has-tooltip-bottom" data-tooltip="' +
cityssm.escapeHTML((_h = fee.lotType) !== null && _h !== void 0 ? _h : '') + los.escapedAliases.Lot +
'</span>') + ' Type Filter">' +
'</p>' '<span class="icon is-small"><i class="fas fa-filter" aria-hidden="true"></i></span> ' +
'<span>' +
cityssm.escapeHTML((_k = fee.lotType) !== null && _k !== void 0 ? _k : '') +
'</span>' +
'</span>') +
'</p>'
: '') +
'</div>') +
('<div class="column">' +
'<div class="columns is-mobile">' +
('<div class="column has-text-centered">' +
(fee.feeFunction
? cityssm.escapeHTML(fee.feeFunction) +
'<br />' +
'<small>Fee Function</small>'
: '$' +
fee.feeAmount.toFixed(2) +
'<br />' +
'<small>Fee</small>') +
'</div>') +
('<div class="column has-text-centered">' +
(fee.taxPercentage
? fee.taxPercentage + '%'
: '$' + fee.taxAmount.toFixed(2)) +
'<br /><small>Tax</small>' +
'</div>') +
('<div class="column has-text-centered">' +
(fee.includeQuantity
? cityssm.escapeHTML((_l = fee.quantityUnit) !== null && _l !== void 0 ? _l : '') +
'<br />' +
'<small>Quantity</small>'
: '') + : '') +
'</div>') + '</div>') +
('<div class="column">' + '</div>' +
'<div class="columns is-mobile">' + '</div>') +
('<div class="column has-text-centered">' + ('<div class="column is-narrow">' +
(fee.feeFunction los.getMoveUpDownButtonFieldHTML('button--moveFeeUp', 'button--moveFeeDown') +
? cityssm.escapeHTML(fee.feeFunction) + '</div>' +
'<br />' + '</div>') +
'<small>Fee Function</small>' '</div>';
: '$' + panelBlockElement
fee.feeAmount.toFixed(2) + .querySelector('a')
'<br />' + .addEventListener('click', openEditFee);
'<small>Fee</small>') + panelBlockElement.querySelector('.button--moveFeeUp').addEventListener('click', moveFee);
'</div>') + panelBlockElement.querySelector('.button--moveFeeDown').addEventListener('click', moveFee);
('<div class="column has-text-centered">' + feeCategoryContainerElement.append(panelBlockElement);
(fee.taxPercentage
? fee.taxPercentage + '%'
: '$' + fee.taxAmount.toFixed(2)) +
'<br /><small>Tax</small>' +
'</div>') +
('<div class="column has-text-centered">' +
(fee.includeQuantity
? cityssm.escapeHTML((_j = fee.quantityUnit) !== null && _j !== void 0 ? _j : '') +
'<br />' +
'<small>Quantity</small>'
: '') +
'</div>') +
'</div>' +
'</div>') +
('<div class="column is-narrow">' +
los.getMoveUpDownButtonFieldHTML('button--moveFeeUp', 'button--moveFeeDown') +
'</div>' +
'</div>') +
'</div>';
panelBlockElement
.querySelector('a')
.addEventListener('click', openEditFee);
panelBlockElement.querySelector('.button--moveFeeUp').addEventListener('click', moveFee);
panelBlockElement.querySelector('.button--moveFeeDown').addEventListener('click', moveFee);
feeCategoryContainerElement.append(panelBlockElement);
}
} }
feeCategoryContainerElement feeCategoryContainerElement
.querySelector('.button--editFeeCategory') .querySelector('.button--editFeeCategory')

190
public-typescript/adminFees.ts
View File

@ -95,105 +95,111 @@ declare const bulmaJS: BulmaJS
feeCategoryContainerElement feeCategoryContainerElement
.querySelector('.button--deleteFeeCategory')! .querySelector('.button--deleteFeeCategory')!
.addEventListener('click', confirmDeleteFeeCategory) .addEventListener('click', confirmDeleteFeeCategory)
} else { }
for (const fee of feeCategory.fees) {
const panelBlockElement = document.createElement('div')
panelBlockElement.className = 'panel-block is-block container--fee' for (const fee of feeCategory.fees) {
panelBlockElement.dataset.feeId = fee.feeId.toString() const panelBlockElement = document.createElement('div')
const hasTagsBlock = panelBlockElement.className = 'panel-block is-block container--fee'
(fee.isRequired ?? false) || panelBlockElement.dataset.feeId = fee.feeId.toString()
fee.occupancyTypeId !== undefined ||
fee.lotTypeId !== undefined
panelBlockElement.innerHTML = const hasTagsBlock =
'<div class="columns">' + (fee.isRequired ?? false) ||
('<div class="column is-half">' + fee.occupancyTypeId !== undefined ||
'<p>' + fee.lotTypeId !== undefined
'<a class="has-text-weight-bold" href="#">' +
cityssm.escapeHTML(fee.feeName ?? '') + panelBlockElement.innerHTML =
'</a><br />' + '<div class="columns">' +
'<small>' + ('<div class="column is-half">' +
cityssm '<p>' +
.escapeHTML(fee.feeDescription ?? '') '<a class="has-text-weight-bold" href="#">' +
.replace(/\n/g, '<br />') + cityssm.escapeHTML(fee.feeName ?? '') +
'</small>' + '</a><br />' +
'</p>' + '<small>' +
(hasTagsBlock cityssm
? '<p class="tags">' + .escapeHTML(fee.feeDescription ?? '')
(fee.isRequired ?? false .replace(/\n/g, '<br />') +
? '<span class="tag is-warning">Required</span>' '</small>' +
: '') + '</p>' +
(fee.occupancyTypeId === undefined (hasTagsBlock
? '' ? '<p class="tags">' +
: ' <span class="tag has-tooltip-bottom" data-tooltip="' + (fee.isRequired ?? false
los.escapedAliases.Occupancy + ? '<span class="tag is-warning">Required</span>'
' Type Filter">' + : '') +
cityssm.escapeHTML(fee.occupancyType ?? '') + ((fee.occupancyTypeId ?? -1) === -1
'</span>') + ? ''
(fee.lotTypeId === undefined : ' <span class="tag has-tooltip-bottom" data-tooltip="' +
? '' los.escapedAliases.Occupancy +
: ' <span class="tag has-tooltip-bottom" data-tooltip="' + ' Type Filter">' +
los.escapedAliases.Lot + '<span class="icon is-small"><i class="fas fa-filter" aria-hidden="true"></i></span> ' +
' Type Filter">' + '<span>' +
cityssm.escapeHTML(fee.lotType ?? '') + cityssm.escapeHTML(fee.occupancyType ?? '') +
'</span>') + '</span>' +
'</p>' '</span>') +
((fee.lotTypeId ?? -1) === -1
? ''
: ' <span class="tag has-tooltip-bottom" data-tooltip="' +
los.escapedAliases.Lot +
' Type Filter">' +
'<span class="icon is-small"><i class="fas fa-filter" aria-hidden="true"></i></span> ' +
'<span>' +
cityssm.escapeHTML(fee.lotType ?? '') +
'</span>' +
'</span>') +
'</p>'
: '') +
'</div>') +
('<div class="column">' +
'<div class="columns is-mobile">' +
('<div class="column has-text-centered">' +
(fee.feeFunction
? cityssm.escapeHTML(fee.feeFunction) +
'<br />' +
'<small>Fee Function</small>'
: '$' +
fee.feeAmount!.toFixed(2) +
'<br />' +
'<small>Fee</small>') +
'</div>') +
('<div class="column has-text-centered">' +
(fee.taxPercentage
? fee.taxPercentage + '%'
: '$' + fee.taxAmount!.toFixed(2)) +
'<br /><small>Tax</small>' +
'</div>') +
('<div class="column has-text-centered">' +
(fee.includeQuantity
? cityssm.escapeHTML(fee.quantityUnit ?? '') +
'<br />' +
'<small>Quantity</small>'
: '') + : '') +
'</div>') + '</div>') +
('<div class="column">' + '</div>' +
'<div class="columns is-mobile">' + '</div>') +
('<div class="column has-text-centered">' + ('<div class="column is-narrow">' +
(fee.feeFunction los.getMoveUpDownButtonFieldHTML(
? cityssm.escapeHTML(fee.feeFunction) + 'button--moveFeeUp',
'<br />' + 'button--moveFeeDown'
'<small>Fee Function</small>' ) +
: '$' + '</div>' +
fee.feeAmount!.toFixed(2) + '</div>') +
'<br />' + '</div>'
'<small>Fee</small>') +
'</div>') +
('<div class="column has-text-centered">' +
(fee.taxPercentage
? fee.taxPercentage + '%'
: '$' + fee.taxAmount!.toFixed(2)) +
'<br /><small>Tax</small>' +
'</div>') +
('<div class="column has-text-centered">' +
(fee.includeQuantity
? cityssm.escapeHTML(fee.quantityUnit ?? '') +
'<br />' +
'<small>Quantity</small>'
: '') +
'</div>') +
'</div>' +
'</div>') +
('<div class="column is-narrow">' +
los.getMoveUpDownButtonFieldHTML(
'button--moveFeeUp',
'button--moveFeeDown'
) +
'</div>' +
'</div>') +
'</div>'
panelBlockElement panelBlockElement
.querySelector('a')! .querySelector('a')!
.addEventListener('click', openEditFee) .addEventListener('click', openEditFee)
;( ;(
panelBlockElement.querySelector( panelBlockElement.querySelector(
'.button--moveFeeUp' '.button--moveFeeUp'
) as HTMLButtonElement ) as HTMLButtonElement
).addEventListener('click', moveFee) ).addEventListener('click', moveFee)
;( ;(
panelBlockElement.querySelector( panelBlockElement.querySelector(
'.button--moveFeeDown' '.button--moveFeeDown'
) as HTMLButtonElement ) as HTMLButtonElement
).addEventListener('click', moveFee) ).addEventListener('click', moveFee)
feeCategoryContainerElement.append(panelBlockElement) feeCategoryContainerElement.append(panelBlockElement)
}
} }
feeCategoryContainerElement feeCategoryContainerElement

2
public/javascripts/adminFees.min.js vendored
View File

File diff suppressed because one or more lines are too long