diff --git a/studio/schemas/objects/activities/Birth.js b/studio/schemas/objects/activities/Birth.js index 359fc13613b7bd369aed00c6dcc6197ffd05a30f..e497c5d9dba1fa0ce24c39a4cc37ab8a0b94e749 100644 --- a/studio/schemas/objects/activities/Birth.js +++ b/studio/schemas/objects/activities/Birth.js @@ -25,8 +25,8 @@ export default { const {type, bb, eb, date, be, ee} = selection const timespan = timespanAsString(bb, eb, date, be, ee, 'nb') return { - title: timespan, - subtitle: `${capitalize(type)}`, + title: `${capitalize(type)}`, + subtitle: timespan, } }, }, diff --git a/studio/schemas/objects/activities/Death.js b/studio/schemas/objects/activities/Death.js index e0f7e7147f8adab80af299aa43ca5ceeef37bc71..0b7ceda899a7383e96119bdbe7768f14e62a9d7b 100644 --- a/studio/schemas/objects/activities/Death.js +++ b/studio/schemas/objects/activities/Death.js @@ -25,8 +25,8 @@ export default { const {type, bb, eb, date, be, ee} = selection const timespan = timespanAsString(bb, eb, date, be, ee, 'nb') return { - title: timespan, - subtitle: `${capitalize(type)}`, + title: `${capitalize(type)}`, + subtitle: timespan, } }, }, diff --git a/studio/schemas/objects/activities/Joining.js b/studio/schemas/objects/activities/Joining.js index 359ad5e13931e6b5d930a01fc80d938630a00ec7..4de945fed6dbde8d4f442c7ab0429bcf70c214ac 100644 --- a/studio/schemas/objects/activities/Joining.js +++ b/studio/schemas/objects/activities/Joining.js @@ -1,3 +1,4 @@ +import { timespanAsString } from '../../helpers/helpers' import {timespan, referredToBy, tookPlaceAt, featured} from '../../props' var capitalize = require('capitalize') @@ -61,12 +62,19 @@ export default { preview: { select: { type: '_type', + joinedWith: 'joinedWith.label', + bb: 'timespan.0.beginOfTheBegin', + eb: 'timespan.0.endOfTheBegin', date: 'timespan.0.date', + be: 'timespan.0.beginOfTheEnd', + ee: 'timespan.0.endOfTheEnd', }, prepare(selection) { - const {type, date} = selection + const {type, joinedWith, bb, eb, date, be, ee} = selection + const timespan = timespanAsString(bb, eb, date, be, ee, 'nb') return { - title: `${capitalize(type)}${date ? ' at ' + date : ''}`, + title: `${capitalize(type)} ${joinedWith ? joinedWith : ''}`, + subtitle: `${timespan ? timespan : ''}`, } }, }, diff --git a/studio/schemas/objects/activities/Leaving.js b/studio/schemas/objects/activities/Leaving.js index f029af4de9c477e841209f0e7fe6d8c95d0f585d..07f42fad9890177a036beac700171f70f9e467eb 100644 --- a/studio/schemas/objects/activities/Leaving.js +++ b/studio/schemas/objects/activities/Leaving.js @@ -1,5 +1,6 @@ import {timespan, tookPlaceAt, referredToBy, featured} from '../../props' import {defaultFieldsets} from '../../fieldsets' +import { timespanAsString } from '../../helpers/helpers' var capitalize = require('capitalize') @@ -56,12 +57,19 @@ export default { preview: { select: { type: '_type', - date: 'date', + joinedWith: 'joinedWith.label', + bb: 'timespan.0.beginOfTheBegin', + eb: 'timespan.0.endOfTheBegin', + date: 'timespan.0.date', + be: 'timespan.0.beginOfTheEnd', + ee: 'timespan.0.endOfTheEnd', }, prepare(selection) { - const {type, date} = selection + const {type, joinedWith, bb, eb, date, be, ee} = selection + const timespan = timespanAsString(bb, eb, date, be, ee, 'nb') return { - title: `${capitalize(type)}${date ? ' at ' + date : ''}`, + title: `${capitalize(type)} ${joinedWith ? joinedWith : ''}`, + subtitle: `${timespan ? timespan : ''}`, } }, },