Skip to content

Commit

Permalink
Refactor IconTabFilter content to fragments before implementing #10
Browse files Browse the repository at this point in the history
  • Loading branch information
gregorwolf committed Oct 4, 2016
1 parent d6f18db commit e2e24b1
Show file tree
Hide file tree
Showing 4 changed files with 132 additions and 111 deletions.
38 changes: 38 additions & 0 deletions webapp/view/CoOrganizerForm.fragment.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<core:FragmentDefinition
xmlns:core="sap.ui.core"
xmlns:f="sap.ui.layout.form"
xmlns="sap.m">
<f:SimpleForm id="newCoOrganizerSimpleForm" class="editableForm" columnsL="1" columnsM="1" editable="true" emptySpanL="4" emptySpanM="4"
labelSpanL="3" labelSpanM="3" layout="ResponsiveGridLayout" maxContainerCols="2" minWidth="1024"
visible="{detailView>/hasEditAuthorityCoOrganizer}" title="{i18n>detailAddCoOrganizer}">
<f:content>
<Label text="{i18n>detailUserName}" required="true"/>
<Input id="UserName_id" valueLiveUpdate="true" liveChange="_validateSaveEnablementCoOrganizer" enabled="true" visible="true" maxLength="256"/>
<Button id="saveCoOrganizer" enabled="{detailView>/enableCreateCoOrganizer}" text="Save" press="onSaveCoOrganizer"/>
</f:content>
</f:SimpleForm>
<Table id="idCoOrganizerTable" items="{ path: 'CoOrganizers', sorter: { path: 'UserName' } }">
<headerToolbar>
<Toolbar>
<Title text="{i18n>detailIconTabBarCoOrganizers}" level="H2"/>
</Toolbar>
</headerToolbar>
<columns>
<Column>
<Text text="{i18n>detailUserName}"/>
</Column>
<Column hAlign="Center" minScreenWidth="Tablet" demandPopin="true">
<Text text="Active"/>
</Column>
</columns>
<items>
<ColumnListItem>
<cells>
<ObjectIdentifier title="{UserName}"/>
<Switch state="{= ${Active} === 'Y' ? true : false }" customTextOn="Yes" customTextOff="No"
enabled="{= ${History.CreatedBy} === ${currentUser>/name} ? true : false }"/>
</cells>
</ColumnListItem>
</items>
</Table>
</core:FragmentDefinition>
121 changes: 10 additions & 111 deletions webapp/view/Detail.view.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<mvc:View controllerName="com.sap.sapmentors.sitreg.events.controller.Detail" xmlns="sap.m" xmlns:mvc="sap.ui.core.mvc"
xmlns:semantic="sap.m.semantic" xmlns:f="sap.ui.layout.form" xmlns:footerbar="sap.ushell.ui.footerbar">
<mvc:View controllerName="com.sap.sapmentors.sitreg.events.controller.Detail"
xmlns="sap.m"
xmlns:mvc="sap.ui.core.mvc"
xmlns:core="sap.ui.core"
xmlns:semantic="sap.m.semantic"
xmlns:f="sap.ui.layout.form"
xmlns:footerbar="sap.ushell.ui.footerbar">
<semantic:DetailPage id="page" navButtonPress="onNavBack" showNavButton="{device>/system/phone}" title="{i18n>detailTitle}"
busy="{detailView>/busy}" busyIndicatorDelay="{detailView>/delay}">
<semantic:content>
Expand All @@ -8,120 +13,14 @@
<IconTabBar id="iconTabBar" class="sapUiResponsiveContentPadding">
<items>
<IconTabFilter id="iconTabBarFilter1" icon="sap-icon://hint" tooltip="{i18n>detailIconTabBarInfo}">
<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'} }"/>
<Label text="{i18n>EndTime}"/>
<Text text="{ path: 'EndTime', type: 'sap.ui.model.odata.type.DateTime', formatOptions: { pattern: 'HH:mm'} }"/>
<Label text="{i18n>MaxParticipants}"/>
<Text text="{MaxParticipants}"/>
<Label text="{i18n>HomepageURL}"/>
<Link href="{HomepageURL}" text="{HomepageURL}" target="_blank"/>
<Label text="{i18n>HistoryCreatedBy}"/>
<Text text="{History.CreatedBy}"/>
<Label text="{i18n>EventChangeable}"/>
<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>
<core:Fragment fragmentName="com.sap.sapmentors.sitreg.events.view.EventForm" type="XML" />
</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"
labelSpanL="3" labelSpanM="3" layout="ResponsiveGridLayout" maxContainerCols="2" minWidth="1024"
visible="{detailView>/hasEditAuthorityCoOrganizer}" title="{i18n>detailAddCoOrganizer}">
<f:content>
<Label text="{i18n>detailUserName}" required="true"/>
<Input id="UserName_id" valueLiveUpdate="true" liveChange="_validateSaveEnablementCoOrganizer" enabled="true" visible="true" maxLength="256"/>
<Button id="saveCoOrganizer" enabled="{detailView>/enableCreateCoOrganizer}" text="Save" press="onSaveCoOrganizer"/>
</f:content>
</f:SimpleForm>
<Table id="idCoOrganizerTable" items="{ path: 'CoOrganizers', sorter: { path: 'UserName' } }">
<headerToolbar>
<Toolbar>
<Title text="{i18n>detailIconTabBarCoOrganizers}" level="H2"/>
</Toolbar>
</headerToolbar>
<columns>
<Column>
<Text text="{i18n>detailUserName}"/>
</Column>
<Column hAlign="Center" minScreenWidth="Tablet" demandPopin="true">
<Text text="Active"/>
</Column>
</columns>
<items>
<ColumnListItem>
<cells>
<ObjectIdentifier title="{UserName}"/>
<Switch state="{= ${Active} === 'Y' ? true : false }" customTextOn="Yes" customTextOff="No"
enabled="{= ${History.CreatedBy} === ${currentUser>/name} ? true : false }"/>
</cells>
</ColumnListItem>
</items>
</Table>
<core:Fragment fragmentName="com.sap.sapmentors.sitreg.events.view.CoOrganizerForm" type="XML" />
</IconTabFilter>
<!--Start of chnages from mgulla 03.08.2016-->
<IconTabFilter id="iconTabBarFilter3" icon="sap-icon://group" tooltip="{i18n>deatailIconPartipitants}">
<Table id="idPartipicantsTable" items="{ path: 'Participants', sorter: { path: 'FirstName' } }">
<headerToolbar>
<Toolbar>
<Title text="{i18n>deatailIconPartipitants}" level="H2"/>
<ToolbarSpacer/>
<!--<Link text="Export Partcipants" id='exportXslx' press="onDataExport"/>-->
<Button icon="sap-icon://download" press="onDataExport" id="tableParti"/>
</Toolbar>
</headerToolbar>
<columns>
<Column>
<Text text="{i18n>columnFirstName}"/>
</Column>
<Column>
<Text text="{i18n>columnLastName}"/>
</Column>
<Column minScreenWidth="Small" demandPopin="true">
<Text text="{i18n>columnEMail}"/>
</Column>
<Column minScreenWidth="Tablet" demandPopin="false">
<Text text="{i18n>columnMobilePhone}"/>
</Column>
<Column hAlign="End">
<Text text="{i18n>columnRSVP}"/>
</Column>
</columns>
<items>
<ColumnListItem type="Navigation" press="onPress">
<cells>
<ObjectIdentifier title="{FirstName}"/>
<Text text="{LastName}"/>
<Text text="{EMail}"/>
<Text text="{MobilePhone}"/>
<Text text="{RSVP}"/>
</cells>
</ColumnListItem>
</items>
</Table>
<core:Fragment fragmentName="com.sap.sapmentors.sitreg.events.view.PartipicantsTable" type="XML" />
</IconTabFilter>
<!--End of chnages from mgulla 03.08.2016-->
</items>
</IconTabBar>
</semantic:content>
Expand Down
41 changes: 41 additions & 0 deletions webapp/view/EventForm.fragment.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<core:FragmentDefinition
xmlns:core="sap.ui.core"
xmlns:f="sap.ui.layout.form"
xmlns="sap.m">
<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'} }"/>
<Label text="{i18n>EndTime}"/>
<Text text="{ path: 'EndTime', type: 'sap.ui.model.odata.type.DateTime', formatOptions: { pattern: 'HH:mm'} }"/>
<Label text="{i18n>MaxParticipants}"/>
<Text text="{MaxParticipants}"/>
<Label text="{i18n>HomepageURL}"/>
<Link href="{HomepageURL}" text="{HomepageURL}" target="_blank"/>
<Label text="{i18n>HistoryCreatedBy}"/>
<Text text="{History.CreatedBy}"/>
<Label text="{i18n>EventChangeable}"/>
<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>
</core:FragmentDefinition>
43 changes: 43 additions & 0 deletions webapp/view/PartipicantsTable.fragment.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<core:FragmentDefinition
xmlns:core="sap.ui.core"
xmlns:f="sap.ui.layout.form"
xmlns="sap.m">
<Table id="idPartipicantsTable" items="{ path: 'Participants', sorter: { path: 'FirstName' } }">
<headerToolbar>
<Toolbar>
<Title text="{i18n>deatailIconPartipitants}" level="H2"/>
<ToolbarSpacer/>
<!--<Link text="Export Partcipants" id='exportXslx' press="onDataExport"/>-->
<Button icon="sap-icon://download" press="onDataExport" id="tableParti"/>
</Toolbar>
</headerToolbar>
<columns>
<Column>
<Text text="{i18n>columnFirstName}"/>
</Column>
<Column>
<Text text="{i18n>columnLastName}"/>
</Column>
<Column minScreenWidth="Small" demandPopin="true">
<Text text="{i18n>columnEMail}"/>
</Column>
<Column minScreenWidth="Tablet" demandPopin="false">
<Text text="{i18n>columnMobilePhone}"/>
</Column>
<Column hAlign="End">
<Text text="{i18n>columnRSVP}"/>
</Column>
</columns>
<items>
<ColumnListItem type="Navigation" press="onPress">
<cells>
<ObjectIdentifier title="{FirstName}"/>
<Text text="{LastName}"/>
<Text text="{EMail}"/>
<Text text="{MobilePhone}"/>
<Text text="{RSVP}"/>
</cells>
</ColumnListItem>
</items>
</Table>
</core:FragmentDefinition>

0 comments on commit e2e24b1

Please sign in to comment.