Compare commits

...

13 Commits

Author SHA1 Message Date
Jovan Krunić
17dc720df6 0.72.0 2022-12-06 14:44:02 +01:00
Jovan Krunić
be98fd8c4c feat: add dish menu section and service times
Closes #150
2022-12-06 13:35:49 +01:00
Rainer Killinger
8c032209a0 docs: update changelog 2022-11-22 12:48:15 +01:00
Rainer Killinger
82aaefe843 0.71.1 2022-11-22 12:48:12 +01:00
Rainer Killinger
0ad7e48462 refactor: adjust dish additives translations 2022-11-22 12:45:42 +01:00
Rainer Killinger
48218e89da docs: update changelog 2022-10-11 16:57:52 +02:00
Rainer Killinger
02d7208d73 0.71.0 2022-10-11 16:57:50 +02:00
Rainer Killinger
75155a9a86 refactor: remodel app config menu categories 2022-10-11 11:41:21 +00:00
Jovan Krunić
dd138fd0be feat: add new book categories
Closes #147
2022-10-11 12:32:01 +02:00
Rainer Killinger
608429c139 docs: update changelog 2022-09-02 14:24:32 +02:00
Rainer Killinger
27ed3c11f1 0.70.0 2022-09-02 14:24:30 +02:00
Rainer Killinger
b183198029 feat: add auth provider to config menu items 2022-09-02 14:18:24 +02:00
Rainer Killinger
6e50b89b1a docs: update changelog 2022-08-17 16:16:49 +02:00
7 changed files with 87 additions and 17 deletions

View File

@@ -1,3 +1,29 @@
## [0.71.1](https://gitlab.com/openstapps/core/compare/v0.71.0...v0.71.1) (2022-11-22)
# [0.71.0](https://gitlab.com/openstapps/core/compare/v0.70.0...v0.71.0) (2022-10-11)
### Features
* add new book categories ([dd138fd](https://gitlab.com/openstapps/core/commit/dd138fd0be6d8100fc242816f5eb2549f2672ab3)), closes [#147](https://gitlab.com/openstapps/core/issues/147)
# [0.70.0](https://gitlab.com/openstapps/core/compare/v0.69.0...v0.70.0) (2022-09-02)
### Features
* add auth provider to config menu items ([b183198](https://gitlab.com/openstapps/core/commit/b18319802969d711373e70cca5921730345aa3e8))
# [0.69.0](https://gitlab.com/openstapps/core/compare/v0.68.0...v0.69.0) (2022-08-17)
# [0.68.0](https://gitlab.com/openstapps/core/compare/v0.67.0...v0.68.0) (2022-06-27) # [0.68.0](https://gitlab.com/openstapps/core/compare/v0.67.0...v0.68.0) (2022-06-27)

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "@openstapps/core", "name": "@openstapps/core",
"version": "0.69.0", "version": "0.72.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@@ -1,6 +1,6 @@
{ {
"name": "@openstapps/core", "name": "@openstapps/core",
"version": "0.69.0", "version": "0.72.0",
"description": "StAppsCore - Generalized model of data", "description": "StAppsCore - Generalized model of data",
"keywords": [ "keywords": [
"Model", "Model",

View File

@@ -16,12 +16,19 @@ import {Polygon} from 'geojson';
import {SCTranslations} from '../general/i18n'; import {SCTranslations} from '../general/i18n';
import {SCMap} from '../general/map'; import {SCMap} from '../general/map';
import {SCLanguageSetting, SCSetting, SCUserGroupSetting} from '../things/setting'; import {SCLanguageSetting, SCSetting, SCUserGroupSetting} from '../things/setting';
import {SCAuthorizationProviderType} from './authorization';
import {SCFeatureConfiguration} from './feature'; import {SCFeatureConfiguration} from './feature';
/** /**
* An app configuration menu item * An app configuration menu item
*/ */
export interface SCAppConfigurationMenuItem { export interface SCAppConfigurationMenuItem {
/**
* Key of authorization provider available in SCConfigFile
* Restricting and enabling the usage of this item
*/
authProvider?: SCAuthorizationProviderType;
/** /**
* Icon for the menu item * Icon for the menu item
*/ */
@@ -52,25 +59,25 @@ export interface SCAppConfigurationMenuCategory {
*/ */
icon: string; icon: string;
/**
* ID of the menu category
*/
id: 'main' | 'meta' | 'personal' | 'external';
/** /**
* A list of items that belong to the category * A list of items that belong to the category
*/ */
items: SCAppConfigurationMenuItem[]; items: SCAppConfigurationMenuItem[];
/** /**
* Name of the category * Title of the category
*/ */
name: string; title: string;
/**
* Route inside the app
*/
route: string;
/** /**
* Translations for the menu category * Translations for the menu category
*/ */
translations: SCTranslations<SCAppConfigurationMenuCategoryTranslationName>; translations: SCTranslations<SCAppConfigurationMenuCategoryTranslationTitle>;
} }
/** /**
@@ -162,11 +169,11 @@ export interface SCAppConfigurationMenuItemTranslationTitle {
/** /**
* Translatable property of a menu category * Translatable property of a menu category
*/ */
export interface SCAppConfigurationMenuCategoryTranslationName { export interface SCAppConfigurationMenuCategoryTranslationTitle {
/** /**
* Translation of the name of a menu category * Translation of the name of a menu category
*/ */
name: string; title: string;
} }
export enum SCAboutPageContentType { export enum SCAboutPageContentType {

View File

@@ -39,11 +39,13 @@ import {
*/ */
export type SCBookCategories = export type SCBookCategories =
| 'audio' | 'audio'
| 'audiobook'
| 'book' | 'book'
| 'cd' | 'cd'
| 'dvd' | 'dvd'
| 'ePhoto' | 'eAudiobook'
| 'ebook' | 'ebook'
| 'ePhoto'
| 'hierarchy' | 'hierarchy'
| 'kit' | 'kit'
| 'manuscript' | 'manuscript'
@@ -169,11 +171,13 @@ export class SCBookMeta extends SCThingMeta implements SCMetaTranslations<SCBook
...new SCThingThatCanBeOfferedMeta<SCAcademicPriceGroup>().fieldValueTranslations.de, ...new SCThingThatCanBeOfferedMeta<SCAcademicPriceGroup>().fieldValueTranslations.de,
categories: { categories: {
audio: 'Tonträger', audio: 'Tonträger',
audiobook: 'Hörbuch',
book: 'Buch', book: 'Buch',
cd: 'CD', cd: 'CD',
dvd: 'DVD', dvd: 'DVD',
ePhoto: 'E-Photo', eAudiobook: 'E-Hörbuch',
ebook: 'E-Book', ebook: 'E-Book',
ePhoto: 'E-Photo',
hierarchy: 'mehrteiliges Werk', hierarchy: 'mehrteiliges Werk',
kit: 'Medienkombination', kit: 'Medienkombination',
manuscript: 'Handschrift', manuscript: 'Handschrift',
@@ -199,11 +203,13 @@ export class SCBookMeta extends SCThingMeta implements SCMetaTranslations<SCBook
type: SCThingType.Book, type: SCThingType.Book,
categories: { categories: {
audio: 'audio material', audio: 'audio material',
audiobook: 'audiobook',
book: 'book', book: 'book',
cd: 'CD', cd: 'CD',
dvd: 'DVD', dvd: 'DVD',
ePhoto: 'E-Photo', eAudiobook: 'E-Audiobook',
ebook: 'E-Book', ebook: 'E-Book',
ePhoto: 'E-Photo',
hierarchy: 'multipart item', hierarchy: 'multipart item',
kit: 'media combination', kit: 'media combination',
manuscript: 'manuscript', manuscript: 'manuscript',

View File

@@ -53,6 +53,11 @@ export interface SCDishWithoutReferences
*/ */
nutrition?: SCNutritionInformation; nutrition?: SCNutritionInformation;
/**
* Section of the restaurant menu to which the dish belongs
*/
menuSection?: SCMenuSection;
/** /**
* Translated fields of a dish * Translated fields of a dish
*/ */
@@ -187,6 +192,20 @@ export interface SCNutritionInformation {
sugarContent?: number; sugarContent?: number;
} }
export interface SCMenuSection {
/**
* Name of the menu section (mostly to be used as a section title)
*/
name: 'breakfast' | 'lunch' | 'dinner';
/**
* The time span when the dishes from the sections are available.
*
* @see http://wiki.openstreetmap.org/wiki/Key:opening_hours/specification
*/
servingHours?: string;
}
/** /**
* Meta information about a dish * Meta information about a dish
*/ */
@@ -201,10 +220,11 @@ export class SCDishMeta extends SCThingMeta implements SCMetaTranslations<SCDish
SCThingWithCategoriesSpecificValues SCThingWithCategoriesSpecificValues
>().fieldTranslations.de, >().fieldTranslations.de,
...new SCThingThatCanBeOfferedMeta<SCAcademicPriceGroup>().fieldTranslations.de, ...new SCThingThatCanBeOfferedMeta<SCAcademicPriceGroup>().fieldTranslations.de,
additives: 'Zusatzstoffe', additives: 'Allergene und Zusatzstoffe',
characteristics: 'Merkmale', characteristics: 'Merkmale',
dishAddOns: 'Beilagen', dishAddOns: 'Beilagen',
nutrition: 'Nährwertangaben', nutrition: 'Nährwertangaben',
menuSection: 'Menüabschnitt',
}, },
en: { en: {
...new SCThingWithCategoriesWithoutReferencesMeta< ...new SCThingWithCategoriesWithoutReferencesMeta<
@@ -212,10 +232,11 @@ export class SCDishMeta extends SCThingMeta implements SCMetaTranslations<SCDish
SCThingWithCategoriesSpecificValues SCThingWithCategoriesSpecificValues
>().fieldTranslations.en, >().fieldTranslations.en,
...new SCThingThatCanBeOfferedMeta<SCAcademicPriceGroup>().fieldTranslations.en, ...new SCThingThatCanBeOfferedMeta<SCAcademicPriceGroup>().fieldTranslations.en,
additives: 'additives', additives: 'additives and allergens',
characteristics: 'characteristics', characteristics: 'characteristics',
dishAddOns: 'side dishes', dishAddOns: 'side dishes',
nutrition: 'nutrition information', nutrition: 'nutrition information',
menuSection: 'menu section',
}, },
}; };

View File

@@ -117,6 +117,14 @@ export interface SCRoomSpecificValues extends SCThingWithCategoriesSpecificValue
* @keyword * @keyword
*/ */
openingHours?: string; openingHours?: string;
/**
* Category specific service hours of the room (e.g. cooked food serving hours)
*
* @see http://wiki.openstreetmap.org/wiki/Key:opening_hours/specification
* @keyword
*/
serviceHours?: string;
} }
/** /**
@@ -135,6 +143,7 @@ export class SCRoomMeta extends SCThingMeta implements SCMetaTranslations<SCRoom
...new SCThingInPlaceMeta().fieldTranslations.de, ...new SCThingInPlaceMeta().fieldTranslations.de,
floorName: 'Etagenbezeichnung', floorName: 'Etagenbezeichnung',
inventory: 'Bestand', inventory: 'Bestand',
serviceHours: 'Servicezeiten',
}, },
en: { en: {
...new SCPlaceWithoutReferencesMeta().fieldTranslations.en, ...new SCPlaceWithoutReferencesMeta().fieldTranslations.en,
@@ -144,6 +153,7 @@ export class SCRoomMeta extends SCThingMeta implements SCMetaTranslations<SCRoom
...new SCThingInPlaceMeta().fieldTranslations.en, ...new SCThingInPlaceMeta().fieldTranslations.en,
floorName: 'floor name', floorName: 'floor name',
inventory: 'inventory', inventory: 'inventory',
serviceHours: 'service hours',
}, },
}; };