+
@@ -45,16 +45,24 @@
-
-
-
-
-
- {{ 'data.detail.offers.sold_out' | translate }}
-
-
-
-
+
{{'data.detail.offers.' + offer.availability | translate}}
+
+
+
+
+
+
+ {{ 'data.detail.offers.' + offer.availability | translate }}
+
+
+
+
+
diff --git a/frontend/app/src/app/modules/data/elements/offers-in-list.html b/frontend/app/src/app/modules/data/elements/offers-in-list.html
index 72fe6d1e..8bfc237d 100644
--- a/frontend/app/src/app/modules/data/elements/offers-in-list.html
+++ b/frontend/app/src/app/modules/data/elements/offers-in-list.html
@@ -18,7 +18,7 @@
{{ price | currency : 'EUR' : 'symbol' : undefined : 'de' }}
- {{ 'data.detail.offers.sold_out' | translate }}
+ {{ 'data.detail.offers.out of stock' | translate }}
{{ _offers[0].inPlace.name }} 1"
diff --git a/frontend/app/src/app/modules/data/elements/title-card.component.html b/frontend/app/src/app/modules/data/elements/title-card.component.html
index d4af940a..b2371c88 100644
--- a/frontend/app/src/app/modules/data/elements/title-card.component.html
+++ b/frontend/app/src/app/modules/data/elements/title-card.component.html
@@ -30,20 +30,5 @@
-
-
-
- {{ 'description' | thingTranslate: item }}
-
-
-
-
-
-
diff --git a/frontend/app/src/app/modules/data/elements/title-card.component.scss b/frontend/app/src/app/modules/data/elements/title-card.component.scss
index bef81d40..4328b1fb 100644
--- a/frontend/app/src/app/modules/data/elements/title-card.component.scss
+++ b/frontend/app/src/app/modules/data/elements/title-card.component.scss
@@ -13,14 +13,6 @@
* this program. If not, see .
*/
-.text-accordion {
- overflow: hidden;
- display: -webkit-box;
- text-overflow: ellipsis;
-
- -webkit-box-orient: vertical;
-}
-
ion-card {
--background: var(--ion-color-primary);
@@ -40,10 +32,6 @@ ion-card {
ion-card-content {
padding: 0 0 var(--header-spacing-bottom);
- .description * {
- color: var(--ion-color-primary-contrast);
- }
-
.opening-hours {
color: var(--ion-color-primary-contrast);
}
diff --git a/frontend/app/src/app/modules/data/elements/title-card.component.ts b/frontend/app/src/app/modules/data/elements/title-card.component.ts
index 9c18fc9e..2c88c4a8 100644
--- a/frontend/app/src/app/modules/data/elements/title-card.component.ts
+++ b/frontend/app/src/app/modules/data/elements/title-card.component.ts
@@ -13,81 +13,17 @@
* this program. If not, see .
*/
-import {Component, ElementRef, HostListener, Input, OnChanges, OnInit, ViewChild} from '@angular/core';
+import {Component, Input} from '@angular/core';
import {SCThings} from '@openstapps/core';
-import {SCIcon} from '../../../util/ion-icon/icon';
-
-const AccordionButtonState = {
- collapsed: SCIcon`expand_more`,
- expanded: SCIcon`expand_less`,
-};
@Component({
selector: 'stapps-title-card',
templateUrl: './title-card.component.html',
styleUrls: ['./title-card.component.scss'],
})
-export class TitleCardComponent implements OnInit, OnChanges {
+export class TitleCardComponent {
/**
* The item whose title (and description) to display
*/
@Input() item: SCThings;
-
- @ViewChild('accordionTextArea') accordionTextArea: ElementRef;
-
- buttonState = AccordionButtonState.collapsed;
-
- buttonShown = true;
-
- descriptionLinesShown: number;
-
- descriptionLinesTotal: number;
-
- descriptionPreviewLines = 3;
-
- descriptionLinesToDisplay = 0;
-
- ngOnInit(): void {
- if (this.item.description) {
- this.descriptionLinesToDisplay = this.descriptionPreviewLines;
- setTimeout(() => this.checkTextElipsis(), 100);
- }
- }
-
- ngOnChanges() {
- this.checkTextElipsis();
- }
-
- @HostListener('window:resize', ['$event'])
- checkTextElipsis() {
- if (this.accordionTextArea === undefined) {
- return;
- }
- const element = this.accordionTextArea.nativeElement as HTMLElement;
-
- const lineHeight = Number.parseInt(getComputedStyle(element).getPropertyValue('line-height'));
- this.descriptionLinesTotal = element?.scrollHeight / lineHeight;
- this.descriptionLinesShown = element?.offsetHeight / lineHeight;
- if (this.buttonState === AccordionButtonState.expanded) {
- this.descriptionLinesToDisplay = this.descriptionLinesTotal;
- }
- const isElipsed = element?.offsetHeight < element?.scrollHeight;
- this.buttonShown =
- (isElipsed && this.buttonState === AccordionButtonState.collapsed) ||
- (!isElipsed && this.buttonState === AccordionButtonState.expanded);
- }
-
- toggleDescriptionAccordion() {
- if (this.descriptionLinesToDisplay > 0) {
- this.descriptionLinesToDisplay =
- this.descriptionLinesToDisplay === this.descriptionPreviewLines
- ? this.descriptionLinesTotal
- : this.descriptionPreviewLines;
- }
- this.buttonState =
- this.buttonState === AccordionButtonState.collapsed
- ? AccordionButtonState.expanded
- : AccordionButtonState.collapsed;
- setTimeout(() => this.checkTextElipsis(), 0);
- }
}
diff --git a/frontend/app/src/app/modules/data/list/data-list-item-host.directive.ts b/frontend/app/src/app/modules/data/list/data-list-item-host.directive.ts
index 7b839536..55f38fdd 100644
--- a/frontend/app/src/app/modules/data/list/data-list-item-host.directive.ts
+++ b/frontend/app/src/app/modules/data/list/data-list-item-host.directive.ts
@@ -40,7 +40,7 @@ const DataListItemIndex: Partial>> = {
[SCThingType.Dish]: DishListItemComponent,
[SCThingType.DateSeries]: DateSeriesListItemComponent,
[SCThingType.AcademicEvent]: EventListItemComponent,
- [SCThingType.SportCourse]: DateSeriesListItemComponent,
+ [SCThingType.SportCourse]: EventListItemComponent,
[SCThingType.Favorite]: FavoriteListItemComponent,
[SCThingType.Message]: MessageListItemComponent,
[SCThingType.Organization]: OrganizationListItemComponent,
diff --git a/frontend/app/src/app/modules/data/types/date-series/date-series-detail-content.html b/frontend/app/src/app/modules/data/types/date-series/date-series-detail-content.html
index f2e661e4..e35c12bb 100644
--- a/frontend/app/src/app/modules/data/types/date-series/date-series-detail-content.html
+++ b/frontend/app/src/app/modules/data/types/date-series/date-series-detail-content.html
@@ -50,7 +50,7 @@
[title]="'performers' | propertyNameTranslate : item | titlecase"
[content]="item.performers"
>
-
+
{{ 'event' | propertyNameTranslate : item | titlecase }}
diff --git a/frontend/app/src/app/modules/data/types/date-series/date-series-list-item.html b/frontend/app/src/app/modules/data/types/date-series/date-series-list-item.html
index 6824333e..31d77895 100644
--- a/frontend/app/src/app/modules/data/types/date-series/date-series-list-item.html
+++ b/frontend/app/src/app/modules/data/types/date-series/date-series-list-item.html
@@ -20,7 +20,7 @@
{{ 'event.name' | thingTranslate : item }}
-
+
{{ item.repeatFrequency | durationLocalized : true | sentencecase }}, {{ item.dates[0] |
dateFormat : 'weekday:long' }}
@@ -30,7 +30,7 @@
- {{ 'categories' | thingTranslate : item.event | join : ', ' }}
diff --git a/frontend/app/src/app/modules/data/types/dish/dish-detail-content.html b/frontend/app/src/app/modules/data/types/dish/dish-detail-content.html
index 7228e06f..097e00d0 100644
--- a/frontend/app/src/app/modules/data/types/dish/dish-detail-content.html
+++ b/frontend/app/src/app/modules/data/types/dish/dish-detail-content.html
@@ -14,7 +14,7 @@
-->