Skip to content

Commit

Permalink
Display pre- and post-eventing event statistics #9
Browse files Browse the repository at this point in the history
  • Loading branch information
gregorwolf committed Sep 29, 2016
1 parent 5be8bf2 commit d6f18db
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 4 deletions.
21 changes: 19 additions & 2 deletions webapp/i18n/i18n.properties
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,29 @@ HistoryCreatedBy=Created by
#XTIT: Label EventChangeable
EventChangeable=Event can be changed

#XTIT: Label EventMasterData
EventMasterData=Event Master Data

#XTIT: Label EventStatistics
EventStatistics=Event Statistics

#XTIT: Label RegistrationNumbersFree
RegistrationNumbersFree=Free

#XTIT: Label RegistrationNumbersParticipants
RegistrationNumbersParticipants=Participants

#XTIT: Label PreEveningEvent
PreEveningEvent=Pre Evening Event

#XTIT: Label PostEveningEvent
PostEveningEvent=Post Evening Event

#XTOL: Icon Tab Bar co-organizers
detailIconTabBarCoOrganizers=Co-Organizers

#XTOL: Icon Tab Bar partipicants
deatailIconPartipitants=Partipicants

deatailIconPartipitants=Partipicants

#XTIT: Title add co-organizer
detailAddCoOrganizer=Add Co-Organizer
Expand Down
22 changes: 21 additions & 1 deletion webapp/view/Detail.view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
<IconTabBar id="iconTabBar" class="sapUiResponsiveContentPadding">
<items>
<IconTabFilter id="iconTabBarFilter1" icon="sap-icon://hint" tooltip="{i18n>detailIconTabBarInfo}">
<f:SimpleForm id="eventForm" editable="false" class="editableForm sapUiSmallMarginTopBottom">
<f:SimpleForm
id="eventForm"
editable="false"
title="{i18n>EventMasterData}"
class="editableForm sapUiSmallMarginTopBottom">
<f:content>
<Label text="{i18n>StartTime}"/>
<Text text="{ path: 'StartTime', type: 'sap.ui.model.odata.type.DateTime', formatOptions: { pattern: 'HH:mm'} }"/>
Expand All @@ -24,6 +28,22 @@
<Text text="{EventChangeable/Changeable}"/>
</f:content>
</f:SimpleForm>
<f:SimpleForm
id="eventStatisticsForm"
editable="false"
title="{i18n>EventStatistics}"
class="editableForm sapUiSmallMarginTopBottom">
<f:content>
<Label text="{i18n>RegistrationNumbersFree}"/>
<Text text="{RegistrationNumbers/Free}"/>
<Label text="{i18n>RegistrationNumbersParticipants}"/>
<Text text="{RegistrationNumbers/Participants}"/>
<Label text="{i18n>PreEveningEvent}"/>
<Text text="{PrePostEveningEventNumbers/PreEveningEvent}"/>
<Label text="{i18n>PostEveningEvent}"/>
<Text text="{PrePostEveningEventNumbers/PostEveningEvent}"/>
</f:content>
</f:SimpleForm>
</IconTabFilter>
<IconTabFilter id="iconTabBarFilter2" icon="sap-icon://employee-approvals" tooltip="{i18n>detailIconTabBarCoOrganizers}">
<f:SimpleForm class="editableForm" columnsL="1" columnsM="1" editable="true" emptySpanL="4" emptySpanM="4" id="newCoOrganizerSimpleForm"
Expand Down
2 changes: 1 addition & 1 deletion webapp/view/Master.view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
path: '/Events',
sorter: { path: 'Location', descending: false },
parameters:{
expand:'EventChangeable'
expand:'EventChangeable,RegistrationNumbers,PrePostEveningEventNumbers'
},
groupHeaderFactory: '.createGroupHeader'
}"
Expand Down

0 comments on commit d6f18db

Please sign in to comment.