From 3ee5387cb1d223a0ba0a60f0f2217cf99038a3ef Mon Sep 17 00:00:00 2001 From: Qiyun Dai Date: Fri, 16 Aug 2024 15:13:26 -0500 Subject: [PATCH 1/2] switch icon for clearing --- ecc/components/agenda-fieldset-group/agenda-fieldset-group.js | 2 +- ecc/components/partner-selector-group/partner-selector-group.js | 2 +- ecc/components/product-selector-group/product-selector-group.js | 2 +- ecc/components/profile-container/profile-container.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ecc/components/agenda-fieldset-group/agenda-fieldset-group.js b/ecc/components/agenda-fieldset-group/agenda-fieldset-group.js index 7a9ef2ad..598074e2 100644 --- a/ecc/components/agenda-fieldset-group/agenda-fieldset-group.js +++ b/ecc/components/agenda-fieldset-group/agenda-fieldset-group.js @@ -55,7 +55,7 @@ export default class AgendaFieldsetGroup extends LitElement { @update-agenda=${(event) => this.handleAgendaUpdate(event, index)}>
${this.agendaItems.length === 1 && this.hasOnlyEmptyAgendaLeft() ? nothing : html` - remove-repeater this.deleteAgenda(index)}> + remove-repeater this.deleteAgenda(index)}> `}
diff --git a/ecc/components/partner-selector-group/partner-selector-group.js b/ecc/components/partner-selector-group/partner-selector-group.js index a9e3c95e..0af97113 100644 --- a/ecc/components/partner-selector-group/partner-selector-group.js +++ b/ecc/components/partner-selector-group/partner-selector-group.js @@ -108,7 +108,7 @@ export default class PartnerSelectorGroup extends LitElement { @update-partner=${(event) => this.handlePartnerUpdate(event.detail.partner, index)} @select-partner=${(event) => this.handlePartnerSelect(event.detail.partner, index)}>
${this.hasOnlyOneUnsavedPartnerLeft() ? nothing : html` - remove-repeater this.deletePartner(index)}> + remove-repeater this.deletePartner(index)}> `}
${imgTag} diff --git a/ecc/components/product-selector-group/product-selector-group.js b/ecc/components/product-selector-group/product-selector-group.js index 7cc55472..00e2f058 100644 --- a/ecc/components/product-selector-group/product-selector-group.js +++ b/ecc/components/product-selector-group/product-selector-group.js @@ -98,7 +98,7 @@ export default class ProductSelectorGroup extends LitElement { @update-product=${(event) => this.handleProductUpdate(event, index)}>
${this.selectedProducts.length === 1 && this.hasOnlyEmptyProductLeft() ? nothing : html` - remove-repeater this.deleteProduct(index)}> + remove-repeater this.deleteProduct(index)}> `}
diff --git a/ecc/components/profile-container/profile-container.js b/ecc/components/profile-container/profile-container.js index 81ba915b..b0513587 100644 --- a/ecc/components/profile-container/profile-container.js +++ b/ecc/components/profile-container/profile-container.js @@ -97,7 +97,7 @@ export class ProfileContainer extends LitElement { return html`
this.updateProfile(index, event.detail.profile)} @select-profile=${(event) => this.setProfile(index, event.detail.profile)}>${imgTag} - ${this.profiles?.length > 1 || !this.profiles[0].isPlaceholder ? html`remove-repeater { + ${this.profiles?.length > 1 || !this.profiles[0].isPlaceholder ? html`remove-repeater { if (this.profiles.length === 1) { this.profiles = [defaultProfile]; } else { From b062a62175ddc0ba0003b94b44a68f681cad95d9 Mon Sep 17 00:00:00 2001 From: Qiyun Dai Date: Fri, 16 Aug 2024 18:13:56 -0500 Subject: [PATCH 2/2] small fix to allow midnight as event end time --- ecc/scripts/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecc/scripts/utils.js b/ecc/scripts/utils.js index 7dd04936..5ba58ece 100644 --- a/ecc/scripts/utils.js +++ b/ecc/scripts/utils.js @@ -47,7 +47,7 @@ export function convertTo24HourFormat(timeStr) { if (period === 'PM' && hours !== 12) { hours += 12; } else if (period === 'AM' && hours === 12) { - hours = 0; + hours = 24; } const formattedHours = hours.toString().padStart(2, '0');