Skip to content

Commit 089c3b8

Browse files
author
Chris Gårdenberg
committed
Fix: Show time for events with only one course day.
1 parent 2bbdb8d commit 089c3b8

5 files changed

Lines changed: 11 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22

33
## [Unreleased]
44
### Added
5+
6+
## [0.10.11]
7+
### Added
58
- Fixing issues stated by scrutinizer
69
- Added class `EduAdminBookingInfo` that is passed to action `eduadmin-processbooking`
710
- Moved the redirect from when you've completed a booking to `createBooking.php`
811
- Added `NoRedirect`-property to `EduAdminBookingInfo` to skip the redirects after a booking is completed.
912
- Redid the `EduAdminClient` to conform to coding standards
1013
- Added filter `edu-booking-error` so we can show dynamic errors in booking process.
14+
- Fix: Show start/end-time on events with only one course day
1115

1216
## [0.10.10]
1317
### Added
@@ -27,7 +31,7 @@
2731
### Added
2832
- Trying to build everything as classes instead, just like WooCommerce
2933
- Bugfix: While fetching prices, we should use the same date span as everything else.
30-
- Started coding support for plugins (THIS IS NOT WORKING YET)
34+
- Started coding support for plugins
3135

3236
## [0.10.7]
3337
### Added
@@ -298,7 +302,8 @@
298302
### Added
299303
- Added inquiry support in course
300304

301-
[Unreleased]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.10.10...HEAD
305+
[Unreleased]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.10.11...HEAD
306+
[0.10.11]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.10.10...v0.10.11
302307
[0.10.10]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.10.9...v0.10.10
303308
[0.10.9]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.10.8...v0.10.9
304309
[0.10.8]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.10.7...v0.10.8

backend/modules/edu.api.detailinfo.eventlist.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ function edu_api_eventlist( $request ) {
208208
$retStr .= '
209209
<div class="eventDate' . $groupByCityClass . '">
210210
' . ( isset( $eventDates[ $ev->EventID ] ) ? edu_GetLogicalDateGroups( $eventDates[ $ev->EventID ] ) : GetOldStartEndDisplayDate( $ev->PeriodStart, $ev->PeriodEnd ) ) . '
211-
' . ( ! isset( $eventDates[ $ev->EventID ] ) ? '<span class="eventTime">, ' . date( "H:i", strtotime( $ev->PeriodStart ) ) . ' - ' . date( "H:i", strtotime( $ev->PeriodEnd ) ) . '</span>' : '' ) . '
211+
' . ( ! isset( $eventDates[ $ev->EventID ] ) || count( $eventDates[ $ev->EventID ] ) == 1 ? '<span class="eventTime">, ' . date( "H:i", strtotime( $ev->PeriodStart ) ) . ' - ' . date( "H:i", strtotime( $ev->PeriodEnd ) ) . '</span>' : '' ) . '
212212
</div>
213213
' . ( ! $groupByCity ?
214214
'<div class="eventCity">

content/template/detailTemplate/template_A.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
<div class="eventItem">
295295
<div class="eventDate<?php echo $groupByCityClass; ?>">
296296
<?php echo isset( $eventDates[ $ev->EventID ] ) ? GetLogicalDateGroups( $eventDates[ $ev->EventID ] ) : GetOldStartEndDisplayDate( $ev->PeriodStart, $ev->PeriodEnd ); ?>
297-
<?php echo( ! isset( $eventDates[ $ev->EventID ] ) ? "<span class=\"eventTime\">, " . date( "H:i", strtotime( $ev->PeriodStart ) ) . ' - ' . date( "H:i", strtotime( $ev->PeriodEnd ) ) . "</span>" : "" ); ?>
297+
<?php echo( ! isset( $eventDates[ $ev->EventID ] ) || count( $eventDates[ $ev->EventID ] ) == 1 ? "<span class=\"eventTime\">, " . date( "H:i", strtotime( $ev->PeriodStart ) ) . ' - ' . date( "H:i", strtotime( $ev->PeriodEnd ) ) . "</span>" : "" ); ?>
298298
</div>
299299
<?php if ( ! $groupByCity ) { ?>
300300
<div class="eventCity">

content/template/detailTemplate/template_B.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
<div class="eventItem">
253253
<div class="eventDate<?php echo $groupByCityClass; ?>">
254254
<?php echo isset( $eventDates[ $ev->EventID ] ) ? GetLogicalDateGroups( $eventDates[ $ev->EventID ] ) : GetOldStartEndDisplayDate( $ev->PeriodStart, $ev->PeriodEnd ); ?>
255-
<?php echo( ! isset( $eventDates[ $ev->EventID ] ) ? "<span class=\"eventTime\">, " . date( "H:i", strtotime( $ev->PeriodStart ) ) . ' - ' . date( "H:i", strtotime( $ev->PeriodEnd ) ) . "</span>" : "" ); ?>
255+
<?php echo( ! isset( $eventDates[ $ev->EventID ] ) || count( $eventDates[ $ev->EventID ] ) == 1 ? "<span class=\"eventTime\">, " . date( "H:i", strtotime( $ev->PeriodStart ) ) . ' - ' . date( "H:i", strtotime( $ev->PeriodEnd ) ) . "</span>" : "" ); ?>
256256
</div>
257257
<?php if ( ! $groupByCity ) { ?>
258258
<div class="eventCity">

eduadmin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function edu_register_session() {
1616
* Plugin URI: http://www.eduadmin.se
1717
* Description: EduAdmin plugin to allow visitors to book courses at your website
1818
* Tags: booking, participants, courses, events, eduadmin, lega online
19-
* Version: 0.10.10
19+
* Version: 0.10.11
2020
* GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
2121
* GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
2222
* Requires at least: 3.0

0 commit comments

Comments
 (0)