Skip to content

Commit 399077d

Browse files
committed
reverse "set" and "schedule" in BuildingHoursDetail
1 parent 9d85215 commit 399077d

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

source/views/building-hours/detail/schedule-row.android.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ import {formatBuildingTimes, summarizeDays} from '../building-hours-helpers'
1212

1313
export class ScheduleRow extends React.PureComponent {
1414
props: {
15-
schedule: SingleBuildingScheduleType,
15+
set: SingleBuildingScheduleType,
1616
isActive: boolean,
1717
now: moment,
1818
}
1919

2020
render() {
21-
const {schedule, isActive, now} = this.props
21+
const {set, isActive, now} = this.props
2222
return (
2323
<View style={styles.scheduleRow}>
2424
<StyledText style={[styles.scheduleDays, isActive && styles.bold]}>
25-
{summarizeDays(schedule.days)}
25+
{summarizeDays(set.days)}
2626
</StyledText>
2727

2828
<StyledText style={[styles.scheduleHours, isActive && styles.bold]}>
29-
{formatBuildingTimes(schedule, now)}
29+
{formatBuildingTimes(set, now)}
3030
</StyledText>
3131
</View>
3232
)

source/views/building-hours/detail/schedule-row.ios.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ import {formatBuildingTimes, summarizeDays} from '../building-hours-helpers'
1313

1414
export class ScheduleRow extends React.PureComponent {
1515
props: {
16-
schedule: SingleBuildingScheduleType,
16+
set: SingleBuildingScheduleType,
1717
isActive: boolean,
1818
now: moment,
1919
}
2020

2121
render() {
22-
const {schedule, isActive, now} = this.props
22+
const {set, isActive, now} = this.props
2323
return (
2424
<Cell
2525
cellStyle="RightDetail"
26-
title={summarizeDays(schedule.days)}
26+
title={summarizeDays(set.days)}
2727
titleTextStyle={isActive ? styles.bold : null}
28-
detail={formatBuildingTimes(schedule, now)}
28+
detail={formatBuildingTimes(set, now)}
2929
detailTextStyle={isActive ? styles.bold : null}
3030
/>
3131
)

source/views/building-hours/detail/schedule-table.android.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ export class ScheduleTable extends React.PureComponent {
2424

2525
return (
2626
<View>
27-
{schedules.map(set =>
27+
{schedules.map(schedule =>
2828
<Card
29-
key={set.title}
29+
key={schedule.title}
3030
style={styles.scheduleContainer}
31-
header={set.title}
32-
footer={set.notes}
31+
header={schedule.title}
32+
footer={schedule.notes}
3333
>
34-
{set.hours.map((schedule, i) =>
34+
{schedule.hours.map((set, i) =>
3535
<ScheduleRow
3636
key={i}
3737
now={now}
38-
schedule={schedule}
38+
set={set}
3939
isActive={
40-
set.isPhysicallyOpen !== false &&
41-
schedule.days.includes(dayOfWeek) &&
42-
isBuildingOpenAtMoment(schedule, this.state.now)
40+
schedule.isPhysicallyOpen !== false &&
41+
set.days.includes(dayOfWeek) &&
42+
isBuildingOpenAtMoment(set, this.state.now)
4343
}
4444
/>,
4545
)}

source/views/building-hours/detail/schedule-table.ios.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@ export class ScheduleTable extends React.PureComponent {
2323

2424
return (
2525
<TableView>
26-
{schedules.map(set =>
26+
{schedules.map(schedule =>
2727
<Section
28-
key={set.title}
29-
header={set.title.toUpperCase()}
30-
footer={set.notes}
28+
key={schedule.title}
29+
header={schedule.title.toUpperCase()}
30+
footer={schedule.notes}
3131
>
32-
{set.hours.map((schedule, i) =>
32+
{schedule.hours.map((set, i) =>
3333
<ScheduleRow
3434
key={i}
3535
now={now}
36-
schedule={schedule}
36+
set={set}
3737
isActive={
38-
set.isPhysicallyOpen !== false &&
39-
schedule.days.includes(dayOfWeek) &&
40-
isBuildingOpenAtMoment(schedule, now)
38+
schedule.isPhysicallyOpen !== false &&
39+
set.days.includes(dayOfWeek) &&
40+
isBuildingOpenAtMoment(set, now)
4141
}
4242
/>,
4343
)}

0 commit comments

Comments
 (0)