@@ -177,10 +177,10 @@ discard block |
||
| 177 | 177 | <div class="col-sm-8 col-md-8 col-lg-6"> |
| 178 | 178 | |
| 179 | 179 | <?php |
| 180 | - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 181 | - // ~~~~~~~~ Events this week ~~~~~~~~ |
|
| 182 | - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 183 | - ?> |
|
| 180 | + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 181 | + // ~~~~~~~~ Events this week ~~~~~~~~ |
|
| 182 | + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 183 | + ?> |
|
| 184 | 184 | |
| 185 | 185 | <h2>Events this week:</h2> |
| 186 | 186 | |
@@ -204,17 +204,17 @@ discard block |
||
| 204 | 204 | <div class="timeline-header"> |
| 205 | 205 | <a href="event.php?id=<?php echo $event->getId() ?>"> |
| 206 | 206 | <h4><?php |
| 207 | - echo $event->getDate('jS: '); |
|
| 208 | - $eventPeople = EventPersonQuery::create()->filterByEvent($event)->find(); |
|
| 209 | - $roles = []; |
|
| 210 | - foreach ($eventPeople as $eventPerson) { |
|
| 211 | - if ($eventPerson->getUserRole()->getUserId() == $user->getId()) { |
|
| 212 | - $roles[] = $eventPerson->getUserRole()->getRole()->getName(); |
|
| 213 | - } |
|
| 214 | - } |
|
| 215 | - $roles = implode(', ', $roles); |
|
| 216 | - echo $roles != '' ? $roles : 'No involvement'; |
|
| 217 | - ?> |
|
| 207 | + echo $event->getDate('jS: '); |
|
| 208 | + $eventPeople = EventPersonQuery::create()->filterByEvent($event)->find(); |
|
| 209 | + $roles = []; |
|
| 210 | + foreach ($eventPeople as $eventPerson) { |
|
| 211 | + if ($eventPerson->getUserRole()->getUserId() == $user->getId()) { |
|
| 212 | + $roles[] = $eventPerson->getUserRole()->getRole()->getName(); |
|
| 213 | + } |
|
| 214 | + } |
|
| 215 | + $roles = implode(', ', $roles); |
|
| 216 | + echo $roles != '' ? $roles : 'No involvement'; |
|
| 217 | + ?> |
|
| 218 | 218 | </h4> |
| 219 | 219 | </a> |
| 220 | 220 | <a class="label label-default" href="events.php?view=all&filter=<?php echo $event->getEventTypeId() ?>"><?php echo $event->getEventType()->getName() ?></a> |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | <div class="modal-body"> |
| 270 | 270 | <?php |
| 271 | 271 | |
| 272 | - $sqlPeople = "SELECT |
|
| 272 | + $sqlPeople = "SELECT |
|
| 273 | 273 | CONCAT(u.firstname, ' ', u.lastname) AS `name`, |
| 274 | 274 | r.name AS `rolename`, |
| 275 | 275 | ep.notified AS `notified`, |
@@ -285,13 +285,13 @@ discard block |
||
| 285 | 285 | AND ep.removed = 0 |
| 286 | 286 | ORDER BY g.name, r.name"; |
| 287 | 287 | |
| 288 | - $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db())); |
|
| 289 | - $groupName = ''; |
|
| 290 | - $groupId = 0; |
|
| 291 | - $identifier = '1'; |
|
| 292 | - $firstTime = true; |
|
| 288 | + $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db())); |
|
| 289 | + $groupName = ''; |
|
| 290 | + $groupId = 0; |
|
| 291 | + $identifier = '1'; |
|
| 292 | + $firstTime = true; |
|
| 293 | 293 | |
| 294 | - if (mysqli_num_rows($resultPeople) > 0): |
|
| 294 | + if (mysqli_num_rows($resultPeople) > 0): |
|
| 295 | 295 | |
| 296 | 296 | ?> |
| 297 | 297 | <?php while ($viewPeople = mysqli_fetch_object($resultPeople)) { |
@@ -324,9 +324,9 @@ discard block |
||
| 324 | 324 | echo '</li>'; |
| 325 | 325 | } |
| 326 | 326 | echo '</ul>'; |
| 327 | - else: |
|
| 327 | + else: |
|
| 328 | 328 | echo '<p>No roles assigned to this event.'; |
| 329 | - endif; |
|
| 329 | + endif; |
|
| 330 | 330 | ?> |
| 331 | 331 | </div> |
| 332 | 332 | <div class="modal-footer"> |
@@ -360,10 +360,10 @@ discard block |
||
| 360 | 360 | |
| 361 | 361 | |
| 362 | 362 | <?php |
| 363 | - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 364 | - // ~~~~~~~~~ User's events ~~~~~~~~~~ |
|
| 365 | - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 366 | - ?> |
|
| 363 | + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 364 | + // ~~~~~~~~~ User's events ~~~~~~~~~~ |
|
| 365 | + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 366 | + ?> |
|
| 367 | 367 | |
| 368 | 368 | <h2>My events:</h2> |
| 369 | 369 | |
@@ -388,9 +388,9 @@ discard block |
||
| 388 | 388 | <div class="timeline-header"> |
| 389 | 389 | <a href="event.php?id=<?php echo $event->id ?>"> |
| 390 | 390 | <h4><?php |
| 391 | - echo date('jS: ', strtotime($event->date)); |
|
| 392 | - echo $event->roles; |
|
| 393 | - ?> |
|
| 391 | + echo date('jS: ', strtotime($event->date)); |
|
| 392 | + echo $event->roles; |
|
| 393 | + ?> |
|
| 394 | 394 | </h4> |
| 395 | 395 | </a> |
| 396 | 396 | <a class="label label-default" href="events.php?view=all&filter=<?php echo $event->eventTypeId ?>"><?php echo $event->eventType ?></a> |
@@ -446,7 +446,7 @@ discard block |
||
| 446 | 446 | <div class="modal-body"> |
| 447 | 447 | <?php |
| 448 | 448 | |
| 449 | - $sqlPeople = "SELECT |
|
| 449 | + $sqlPeople = "SELECT |
|
| 450 | 450 | CONCAT(u.firstname, ' ', u.lastname) AS `name`, |
| 451 | 451 | r.name AS `rolename`, |
| 452 | 452 | ep.notified AS `notified`, |
@@ -462,13 +462,13 @@ discard block |
||
| 462 | 462 | AND ep.removed = 0 |
| 463 | 463 | ORDER BY g.name, r.name"; |
| 464 | 464 | |
| 465 | - $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db())); |
|
| 466 | - $groupName = ''; |
|
| 467 | - $groupId = 0; |
|
| 468 | - $identifier = '1'; |
|
| 469 | - $firstTime = true; |
|
| 465 | + $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db())); |
|
| 466 | + $groupName = ''; |
|
| 467 | + $groupId = 0; |
|
| 468 | + $identifier = '1'; |
|
| 469 | + $firstTime = true; |
|
| 470 | 470 | |
| 471 | - if (mysqli_num_rows($resultPeople) > 0): |
|
| 471 | + if (mysqli_num_rows($resultPeople) > 0): |
|
| 472 | 472 | |
| 473 | 473 | ?> |
| 474 | 474 | <?php while ($viewPeople = mysqli_fetch_object($resultPeople)) { |
@@ -501,9 +501,9 @@ discard block |
||
| 501 | 501 | echo '</li>'; |
| 502 | 502 | } |
| 503 | 503 | echo '</ul>'; |
| 504 | - else: |
|
| 504 | + else: |
|
| 505 | 505 | echo '<p>No roles assigned to this event.'; |
| 506 | - endif; |
|
| 506 | + endif; |
|
| 507 | 507 | ?> |
| 508 | 508 | </div> |
| 509 | 509 | <div class="modal-footer"> |
@@ -538,10 +538,10 @@ discard block |
||
| 538 | 538 | <div class="col-sm-4 col-md-4 col-lg-6"> |
| 539 | 539 | |
| 540 | 540 | <?php |
| 541 | - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 542 | - // ~~~~~~~ Remaining events ~~~~~~~~~ |
|
| 543 | - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 544 | - ?> |
|
| 541 | + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 542 | + // ~~~~~~~ Remaining events ~~~~~~~~~ |
|
| 543 | + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 544 | + ?> |
|
| 545 | 545 | <?php if (isset($remainingEventsInGroups)): ?> |
| 546 | 546 | |
| 547 | 547 | <div class="row"> |
@@ -617,10 +617,10 @@ discard block |
||
| 617 | 617 | |
| 618 | 618 | |
| 619 | 619 | <?php |
| 620 | - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 621 | - // ~~~~~~~~~ User details ~~~~~~~~~~~ |
|
| 622 | - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 623 | - ?> |
|
| 620 | + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 621 | + // ~~~~~~~~~ User details ~~~~~~~~~~~ |
|
| 622 | + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
| 623 | + ?> |
|
| 624 | 624 | |
| 625 | 625 | <div class="box box-widget widget-user-2"> |
| 626 | 626 | <div class="widget-user-header bg-yellow"> |