cosmetics

This commit is contained in:
Daniel
2022-10-04 11:48:01 +02:00
parent 92f7489def
commit ee2fdd0989
6 changed files with 173 additions and 187 deletions

View File

@@ -33,7 +33,7 @@ annotate CatalogService.Books with @(UI : {
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// //
// Books Object Page // Books List Page
// //
annotate CatalogService.Books with @(UI : { annotate CatalogService.Books with @(UI : {
SelectionFields : [ SelectionFields : [

View File

@@ -10,40 +10,31 @@ using { sap.common } from '@capire/common';
// Books Lists // Books Lists
// //
annotate my.Books with @( annotate my.Books with @(
Common.SemanticKey : [ID], Common.SemanticKey : [ID],
UI : { UI : {
Identification : [{Value : title}], Identification : [{ Value: title }],
SelectionFields : [ SelectionFields : [
ID, ID,
author_ID, author_ID,
price, price,
currency_code currency_code
], ],
LineItem : [ LineItem : [
{ { Value: ID, Label: '{i18n>Title}' },
Value : ID, { Value: author.ID, Label: '{i18n>Author}' },
Label : '{i18n>Title}' { Value: genre.name },
}, { Value: stock },
{ { Value: price },
Value : author.ID, { Value: currency.symbol, Label: ' ' },
Label : '{i18n>Author}' ]
}, }
{Value : genre.name},
{Value : stock},
{Value : price},
{
Value : currency.symbol,
Label : ' '
},
]
}
) { ) {
ID @Common: { ID @Common: {
SemanticObject : 'Books', SemanticObject : 'Books',
Text: title, Text: title,
TextArrangement : #TextOnly TextArrangement : #TextOnly
}; };
author @ValueList.entity : 'Authors'; author @ValueList.entity : 'Authors';
}; };
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@@ -51,10 +42,10 @@ annotate my.Books with @(
// Books Details // Books Details
// //
annotate my.Books with @(UI : {HeaderInfo : { annotate my.Books with @(UI : {HeaderInfo : {
TypeName : '{i18n>Book}', TypeName : '{i18n>Book}',
TypeNamePlural : '{i18n>Books}', TypeNamePlural : '{i18n>Books}',
Title : {Value : title}, Title : { Value: title },
Description : {Value : author.name} Description : { Value: author.name }
}, }); }, });
@@ -63,19 +54,13 @@ annotate my.Books with @(UI : {HeaderInfo : {
// Books Elements // Books Elements
// //
annotate my.Books with { annotate my.Books with {
ID @title : '{i18n>ID}'; ID @title: '{i18n>ID}';
title @title : '{i18n>Title}'; title @title: '{i18n>Title}';
genre @title : '{i18n>Genre}' @Common : { genre @title: '{i18n>Genre}' @Common: { Text: genre.name, TextArrangement: #TextOnly };
Text : genre.name, author @title: '{i18n>Author}' @Common: { Text: author.name, TextArrangement: #TextOnly };
TextArrangement : #TextOnly price @title: '{i18n>Price}' @Measures.ISOCurrency : currency_code;
}; stock @title: '{i18n>Stock}';
author @title : '{i18n>Author}' @Common : { descr @UI.MultiLineText;
Text : author.name,
TextArrangement : #TextOnly
};
price @title : '{i18n>Price}' @Measures.ISOCurrency : currency_code;
stock @title : '{i18n>Stock}';
descr @UI.MultiLineText;
} }
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@@ -83,17 +68,17 @@ annotate my.Books with {
// Genres List // Genres List
// //
annotate my.Genres with @( annotate my.Genres with @(
Common.SemanticKey : [name], Common.SemanticKey : [name],
UI : { UI : {
SelectionFields : [name], SelectionFields : [name],
LineItem : [ LineItem : [
{Value : name}, { Value: name },
{ {
Value : parent.name, Value : parent.name,
Label : 'Main Genre' Label: 'Main Genre'
}, },
], ],
} }
); );
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@@ -101,18 +86,18 @@ annotate my.Genres with @(
// Genre Details // Genre Details
// //
annotate my.Genres with @(UI : { annotate my.Genres with @(UI : {
Identification : [{Value : name}], Identification : [{ Value: name}],
HeaderInfo : { HeaderInfo : {
TypeName : '{i18n>Genre}', TypeName : '{i18n>Genre}',
TypeNamePlural : '{i18n>Genres}', TypeNamePlural : '{i18n>Genres}',
Title : {Value : name}, Title : { Value: name },
Description : {Value : ID} Description : { Value: ID }
}, },
Facets : [{ Facets : [{
$Type : 'UI.ReferenceFacet', $Type : 'UI.ReferenceFacet',
Label : '{i18n>SubGenres}', Label : '{i18n>SubGenres}',
Target : 'children/@UI.LineItem' Target : 'children/@UI.LineItem'
}, ], }, ],
}); });
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@@ -120,8 +105,8 @@ annotate my.Genres with @(UI : {
// Genres Elements // Genres Elements
// //
annotate my.Genres with { annotate my.Genres with {
ID @title : '{i18n>ID}'; ID @title: '{i18n>ID}';
name @title : '{i18n>Genre}'; name @title: '{i18n>Genre}';
} }
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@@ -129,24 +114,24 @@ annotate my.Genres with {
// Authors List // Authors List
// //
annotate my.Authors with @( annotate my.Authors with @(
Common.SemanticKey : [ID], Common.SemanticKey : [ID],
UI : { UI : {
Identification : [{Value : name}], Identification : [{ Value: name}],
SelectionFields : [name], SelectionFields : [name],
LineItem : [ LineItem : [
{Value : ID}, { Value: ID },
{Value : dateOfBirth}, { Value: dateOfBirth },
{Value : dateOfDeath}, { Value: dateOfDeath },
{Value : placeOfBirth}, { Value: placeOfBirth },
{Value : placeOfDeath}, { Value: placeOfDeath },
], ],
} }
) { ) {
ID @Common: { ID @Common: {
SemanticObject : 'Authors', SemanticObject : 'Authors',
Text: name, Text: name,
TextArrangement : #TextOnly, TextArrangement : #TextOnly,
}; };
}; };
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@@ -154,16 +139,16 @@ annotate my.Authors with @(
// Author Details // Author Details
// //
annotate my.Authors with @(UI : { annotate my.Authors with @(UI : {
HeaderInfo : { HeaderInfo : {
TypeName : '{i18n>Author}', TypeName : '{i18n>Author}',
TypeNamePlural : '{i18n>Authors}', TypeNamePlural : '{i18n>Authors}',
Title : {Value : name}, Title : { Value: name },
Description : {Value : dateOfBirth} Description : { Value: dateOfBirth }
}, },
Facets : [{ Facets : [{
$Type : 'UI.ReferenceFacet', $Type : 'UI.ReferenceFacet',
Target : 'books/@UI.LineItem' Target : 'books/@UI.LineItem'
}, ], }, ],
}); });
@@ -172,12 +157,12 @@ annotate my.Authors with @(UI : {
// Authors Elements // Authors Elements
// //
annotate my.Authors with { annotate my.Authors with {
ID @title : '{i18n>ID}'; ID @title: '{i18n>ID}';
name @title : '{i18n>Name}'; name @title: '{i18n>Name}';
dateOfBirth @title : '{i18n>DateOfBirth}'; dateOfBirth @title: '{i18n>DateOfBirth}';
dateOfDeath @title : '{i18n>DateOfDeath}'; dateOfDeath @title: '{i18n>DateOfDeath}';
placeOfBirth @title : '{i18n>PlaceOfBirth}'; placeOfBirth @title: '{i18n>PlaceOfBirth}';
placeOfDeath @title : '{i18n>PlaceOfDeath}'; placeOfDeath @title: '{i18n>PlaceOfDeath}';
} }
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@@ -185,18 +170,18 @@ annotate my.Authors with {
// Languages List // Languages List
// //
annotate common.Languages with @( annotate common.Languages with @(
Common.SemanticKey : [code], Common.SemanticKey : [code],
Identification : [{Value : code}], Identification : [{ Value: code}],
UI : { UI : {
SelectionFields : [ SelectionFields : [
name, name,
descr descr
], ],
LineItem : [ LineItem : [
{Value : code}, { Value: code },
{Value : name}, { Value: name },
], ],
} }
); );
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@@ -204,22 +189,22 @@ annotate common.Languages with @(
// Language Details // Language Details
// //
annotate common.Languages with @(UI : { annotate common.Languages with @(UI : {
HeaderInfo : { HeaderInfo : {
TypeName : '{i18n>Language}', TypeName : '{i18n>Language}',
TypeNamePlural : '{i18n>Languages}', TypeNamePlural : '{i18n>Languages}',
Title : {Value : name}, Title : { Value: name },
Description : {Value : descr} Description : { Value: descr }
}, },
Facets : [{ Facets : [{
$Type : 'UI.ReferenceFacet', $Type : 'UI.ReferenceFacet',
Label : '{i18n>Details}', Label : '{i18n>Details}',
Target : '@UI.FieldGroup#Details' Target : '@UI.FieldGroup#Details'
}, ], }, ],
FieldGroup #Details : {Data : [ FieldGroup #Details : {Data : [
{Value : code}, { Value: code },
{Value : name}, { Value: name },
{Value : descr} { Value: descr }
]}, ]},
}); });
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@@ -227,19 +212,19 @@ annotate common.Languages with @(UI : {
// Currencies List // Currencies List
// //
annotate common.Currencies with @( annotate common.Currencies with @(
Common.SemanticKey : [code], Common.SemanticKey : [code],
Identification : [{Value : code}], Identification : [{ Value: code}],
UI : { UI : {
SelectionFields : [ SelectionFields : [
name, name,
descr descr
], ],
LineItem : [ LineItem : [
{Value : descr}, { Value: descr },
{Value : symbol}, { Value: symbol },
{Value : code}, { Value: code },
], ],
} }
); );
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@@ -247,35 +232,35 @@ annotate common.Currencies with @(
// Currency Details // Currency Details
// //
annotate common.Currencies with @(UI : { annotate common.Currencies with @(UI : {
HeaderInfo : { HeaderInfo : {
TypeName : '{i18n>Currency}', TypeName : '{i18n>Currency}',
TypeNamePlural : '{i18n>Currencies}', TypeNamePlural : '{i18n>Currencies}',
Title : {Value : descr}, Title : { Value: descr },
Description : {Value : code} Description : { Value: code }
},
Facets : [
{
$Type : 'UI.ReferenceFacet',
Label : '{i18n>Details}',
Target : '@UI.FieldGroup#Details'
}, },
Facets : [ {
{ $Type : 'UI.ReferenceFacet',
$Type : 'UI.ReferenceFacet', Label : '{i18n>Extended}',
Label : '{i18n>Details}', Target : '@UI.FieldGroup#Extended'
Target : '@UI.FieldGroup#Details' },
}, ],
{ FieldGroup #Details : {Data : [
$Type : 'UI.ReferenceFacet', { Value: name },
Label : '{i18n>Extended}', { Value: symbol },
Target : '@UI.FieldGroup#Extended' { Value: code },
}, { Value: descr }
], ]},
FieldGroup #Details : {Data : [ FieldGroup #Extended : {Data : [
{Value : name}, { Value: numcode },
{Value : symbol}, { Value: minor },
{Value : code}, { Value: exponent }
{Value : descr} ]},
]},
FieldGroup #Extended : {Data : [
{Value : numcode},
{Value : minor},
{Value : exponent}
]},
}); });
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@@ -283,7 +268,7 @@ annotate common.Currencies with @(UI : {
// Currencies Elements // Currencies Elements
// //
annotate common.Currencies with { annotate common.Currencies with {
numcode @title : '{i18n>NumCode}'; numcode @title: '{i18n>NumCode}';
minor @title : '{i18n>MinorUnit}'; minor @title: '{i18n>MinorUnit}';
exponent @title : '{i18n>Exponent}'; exponent @title: '{i18n>Exponent}';
} }

View File

@@ -16,11 +16,12 @@ using { OrdersService } from '../srv/orders-service';
@odata.draft.enabled @odata.draft.enabled
annotate OrdersService.Orders with @( annotate OrdersService.Orders with @(
UI: { UI: {
SelectionFields: [ createdAt, createdBy ], SelectionFields: [ createdBy ],
LineItem: [ LineItem: [
{Value: OrderNo, Label:'OrderNo'}, {Value: OrderNo, Label:'OrderNo'},
{Value: buyer, Label:'Customer'}, {Value: buyer, Label:'Customer'},
{Value: createdAt, Label:'Date'} {Value: currency.symbol, Label:'Currency'},
{Value: createdAt, Label:'Date'},
], ],
HeaderInfo: { HeaderInfo: {
TypeName: 'Order', TypeNamePlural: 'Orders', TypeName: 'Order', TypeNamePlural: 'Orders',

View File

@@ -13,7 +13,7 @@
applications: { applications: {
"manage-orders": { "manage-orders": {
title: "Manage Orders", title: "Manage Orders",
description: "... testing FE v42", description: "CAP Sample App",
additionalInformation: "SAPUI5.Component=orders", additionalInformation: "SAPUI5.Component=orders",
applicationType : "URL", applicationType : "URL",
url: "/orders/webapp", url: "/orders/webapp",

View File

@@ -3,8 +3,8 @@
"sap.app": { "sap.app": {
"id": "orders", "id": "orders",
"type": "application", "type": "application",
"title": "Order Books", "title": "Order Management",
"description": "Sample Application", "description": "CAP Sample Application",
"i18n": "i18n/i18n.properties", "i18n": "i18n/i18n.properties",
"dataSources": { "dataSources": {
"OrdersService": { "OrdersService": {

View File

@@ -2,7 +2,7 @@ using { Currency, User, managed, cuid } from '@sap/cds/common';
namespace sap.capire.orders; namespace sap.capire.orders;
entity Orders : cuid, managed { entity Orders : cuid, managed {
OrderNo : String @title:'Order Number'; //> readable key OrderNo : String(22) @title:'Order Number'; //> readable key
Items : Composition of many { Items : Composition of many {
key ID : UUID; key ID : UUID;
product : Association to Products; product : Association to Products;