Skip to content

Commit

Permalink
Merge pull request #2005 from phili67/phili67-events-list-new-gui
Browse files Browse the repository at this point in the history 
Phili67 events list new gui
  • Loading branch information
@phili67
phili67 authored Jan 18, 2022
2 parents 28b8e52 + c3c5d2d commit ecb35ed
Show file tree
Hide file tree
Showing 14 changed files with 1,123 additions and 87 deletions.
2 changes: 1 addition & 1 deletion src/Checkin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ class="col-sm-12 control-label"><?= _('Adult Name(Optional)') ?></label>
?>

<div>
<a href="ListEvents.php" class='btn btn-default'>
<a href="<?= SystemURLs::getRootPath() ?>/v2/calendar/events/list" class='btn btn-default'>
<i class='fa fa-chevron-left'></i>
<?= _('Return to Events') ?>
</a>
Expand Down
60 changes: 38 additions & 22 deletions src/EcclesiaCRM/APIControllers/CalendarEventV2Controller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;

use EcclesiaCRM\dto\SystemConfig;
use EcclesiaCRM\Base\EventQuery;
use EcclesiaCRM\Base\EventTypesQuery;
use EcclesiaCRM\EventCountsQuery;
use EcclesiaCRM\EventCounts;
use EcclesiaCRM\Person2group2roleP2g2rQuery;
use EcclesiaCRM\FamilyQuery;
use EcclesiaCRM\dto\MenuEventsCount;
Expand All @@ -28,9 +26,6 @@
use EcclesiaCRM\EventAttend;
use EcclesiaCRM\Utils\GeoUtils;
use EcclesiaCRM\SessionUser;
use EcclesiaCRM\UserQuery;

use EcclesiaCRM\CalendarinstancesQuery;

use Sabre\VObject;

Expand All @@ -47,12 +42,33 @@ public function __construct(ContainerInterface $container)
$this->container = $container;
}

public function getAllEvents (ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface
public function getAllEvents(ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface
{
$Events = EventQuery::create()
->find();

return $response->withJson($Events->toArray());
$return = [];

foreach ($Events as $event) {
$values = [
'Id' => $event->getID(),
'Title' => $event->getTitle(),
'Type' => $event->getType(),
'InActive' => $event->getInActive(),
'Text' => $event->getText(),
'Start' => $event->getStart(),
'End' => $event->getEnd(),
'TypeName' => $event->getTypeName(),
'GroupId' => $event->getGroupId(),
'LastOccurence' => $event->getLastOccurence(),
'Location' => $event->getLocation(),
'Coordinates' => $event->getCoordinates(),
];

$return[] = $values;
}

return $response->withJson($return);
}

public function getNotDoneEvents(ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface
Expand Down Expand Up @@ -84,7 +100,7 @@ public function getNotDoneEvents(ServerRequestInterface $request, ResponseInterf
return $response->write($Events->toJSON());
}*/

return $response->withJson(["Events" =>$return]);
return $response->withJson(["Events" => $return]);
}

public function numbersOfEventOfToday(ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface
Expand Down Expand Up @@ -195,7 +211,7 @@ public function personCheckIn(ServerRequestInterface $request, ResponseInterface

$eventAttent->setEventId($params->EventID);
$eventAttent->setCheckinId(SessionUser::getUser()->getPersonId());
$eventAttent->setCheckinDate( NULL);
$eventAttent->setCheckinDate(NULL);
$eventAttent->setPersonId($params->PersonId);
$eventAttent->save();
} catch (\Exception $ex) {
Expand Down Expand Up @@ -292,8 +308,8 @@ public function eventCount(ServerRequestInterface $request, ResponseInterface $r
$values['countID'] = $eventCountName->getId();
$values['countName'] = $eventCountName->getName();
$values['typeID'] = $params->typeID;
$values['startHour'] = sprintf("%02d",$aEventStartHour);
$values['startMin'] = sprintf("%02d",$aEventStartMins);
$values['startHour'] = sprintf("%02d", $aEventStartHour);
$values['startMin'] = sprintf("%02d", $aEventStartMins);
$values['DefRecurDOW'] = $aDefRecurDOW;// unusefull actually
$values['DefRecurDOM'] = $aDefRecurDOM;// unusefull actually

Expand Down Expand Up @@ -322,18 +338,18 @@ public function manageEvent(ServerRequestInterface $request, ResponseInterface $

$the_event = Null;

if ( isset($input->eventID) ) {
if (isset($input->eventID)) {
$the_event = EventQuery::create()->findOneById($input->eventID);
}

$calendarService = new CalendarService();

if (!strcmp($input->eventAction, 'createEvent')) {

if ( !$calendarService->createEventForCalendar($input->calendarID, $input->start, $input->end,
if (!$calendarService->createEventForCalendar($input->calendarID, $input->start, $input->end,
$input->recurrenceType, $input->endrecurrence, $input->EventDesc, $input->EventTitle, $input->location,
$input->recurrenceValid, $input->addGroupAttendees, $input->alarm, $input->eventTypeID, $input->eventNotes,
$input->eventInActive, $input->Fields, $input->EventCountNotes) ) {
$input->eventInActive, $input->Fields, $input->EventCountNotes)) {
return $response->withJson(["status" => "failed", "message" => _("Two resource reservations cannot be in the same time slot.")]);
}

Expand All @@ -342,7 +358,7 @@ public function manageEvent(ServerRequestInterface $request, ResponseInterface $
} else if (!strcmp($input->eventAction, 'moveEvent')) {

// this part allows to create a resource without being in collision on another one
if ( $the_event->getCreatorUserId() != 0 and SessionUser::getId() != $the_event->getCreatorUserId() and !SessionUser::isManageCalendarResources() ) {
if ($the_event->getCreatorUserId() != 0 and SessionUser::getId() != $the_event->getCreatorUserId() and !SessionUser::isManageCalendarResources()) {
return $response->withJson(["status" => "failed", "message" => _("This resource reservation was not created by you. You cannot edit, move or delete a resource that you do not own.")]);
}

Expand Down Expand Up @@ -429,7 +445,7 @@ public function manageEvent(ServerRequestInterface $request, ResponseInterface $
}

// this part allows to create a resource without being in collision on another one
if ( is_array( $input->calendarID ) ) {
if (is_array($input->calendarID)) {
$calIDs = $input->calendarID;
} else {
$calIDs = explode(",", $input->calendarID);
Expand Down Expand Up @@ -564,7 +580,7 @@ public function manageEvent(ServerRequestInterface $request, ResponseInterface $
} else if (!strcmp($input->eventAction, 'resizeEvent')) {

// this part allows to create a resource without being in collision on another one
if ( $the_event->getCreatorUserId() != 0 and SessionUser::getId() != $the_event->getCreatorUserId() and !SessionUser::isManageCalendarResources() ) {
if ($the_event->getCreatorUserId() != 0 and SessionUser::getId() != $the_event->getCreatorUserId() and !SessionUser::isManageCalendarResources()) {
return $response->withJson(["status" => "failed", "message" => _("This resource reservation was not created by you. You cannot edit, move or delete a resource that you do not own.")]);
}

Expand Down Expand Up @@ -709,7 +725,7 @@ public function manageEvent(ServerRequestInterface $request, ResponseInterface $
$_SESSION['EID'] = $event->getID();
$_SESSION['EName'] = $event->getTitle();
$_SESSION['EDesc'] = $event->getDesc();
$_SESSION['EDate'] = ( !is_null($event->getStart()) )?$event->getStart()->format('Y-m-d H:i:s'):'';
$_SESSION['EDate'] = (!is_null($event->getStart())) ? $event->getStart()->format('Y-m-d H:i:s') : '';

$_SESSION['EventID'] = $event->getID();

Expand All @@ -718,7 +734,7 @@ public function manageEvent(ServerRequestInterface $request, ResponseInterface $
} else if (!strcmp($input->eventAction, 'suppress')) {

// this part allows to create a resource without being in collision on another one
if ( $the_event->getCreatorUserId() != 0 and SessionUser::getId() != $the_event->getCreatorUserId() and !SessionUser::isManageCalendarResources() ) {
if ($the_event->getCreatorUserId() != 0 and SessionUser::getId() != $the_event->getCreatorUserId() and !SessionUser::isManageCalendarResources()) {
return $response->withJson(["status" => "failed", "message" => _("This resource reservation was not created by you. You cannot edit, move or delete a resource that you do not own.")]);
}

Expand All @@ -730,13 +746,13 @@ public function manageEvent(ServerRequestInterface $request, ResponseInterface $

} else if (!strcmp($input->eventAction, 'modifyEvent')) {

if ( $the_event->getCreatorUserId() != 0 and SessionUser::getId() != $the_event->getCreatorUserId() and !SessionUser::isManageCalendarResources() ) {
if ($the_event->getCreatorUserId() != 0 and SessionUser::getId() != $the_event->getCreatorUserId() and !SessionUser::isManageCalendarResources()) {
return $response->withJson(["status" => "failed", "message" => _("This resource reservation was not created by you. You cannot edit, move or delete a resource that you do not own.")]);
}

return $response->withJson( $calendarService->modifyEventFromCalendar($input->calendarID, $input->eventID, $input->reccurenceID, $input->start,
return $response->withJson($calendarService->modifyEventFromCalendar($input->calendarID, $input->eventID, $input->reccurenceID, $input->start,
$input->end, $input->EventTitle, $input->EventDesc, $input->location, $input->addGroupAttendees, $input->alarm, $input->eventTypeID, $input->eventNotes,
$input->eventInActive, $input->Fields, $input->EventCountNotes, $input->recurrenceValid, $input->recurrenceType, $input->endrecurrence) );
$input->eventInActive, $input->Fields, $input->EventCountNotes, $input->recurrenceValid, $input->recurrenceType, $input->endrecurrence));
}

return $response->withJson(["status" => "failed"]);
Expand Down
10 changes: 9 additions & 1 deletion src/EcclesiaCRM/APIControllers/CalendarV2Controller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,15 @@ public function getallCalendarEvents (ServerRequestInterface $request, ResponseI

$CalendarService = $this->container->get('CalendarService');

return $response->withJson($CalendarService->getEvents($params->start, $params->end, $params->isBirthdayActive, $params->isAnniversaryActive));;
return $response->withJson($CalendarService->getEvents($params->start, $params->end, $params->isBirthdayActive, $params->isAnniversaryActive)['EventsListResults']);;
}

public function getallCalendarEventsForEventsList (ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface {
$params = (object)$request->getParsedBody();

$CalendarService = $this->container->get('CalendarService');

return $response->withJson($CalendarService->getEvents($params->start, $params->end, $params->isBirthdayActive, $params->isAnniversaryActive, $params->forEventslist));
}

public function numberOfCalendars (ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface {
Expand Down
2 changes: 1 addition & 1 deletion src/EcclesiaCRM/MenuBar/MenuBar.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function addEventMenu()
$menuItem = new Menu (_("View on Map"), "fa fa-map-o", "v2/map/-2", true, $menu);
}

$menuItem = new Menu (_("List Church Events"), "fa fa-circle-o", "ListEvents.php", true, $menu);
$menuItem = new Menu (_("List Church Events"), "fa fa-circle-o", "v2/calendar/events/list", true, $menu);
$menuItem = new Menu (_("List Event Types"), "fa fa-circle-o", "EventNames.php", SessionUser::getUser()->isAdmin(), $menu);
$menuItem = new Menu (_("Call the Register"), "fa fa-circle-o", "Checkin.php", true, $menu);

Expand Down
Loading

0 comments on commit ecb35ed

Please sign in to comment.