Skip to content

Commit 5f326e7

Browse files
committed
changes
1 parent 4e95973 commit 5f326e7

File tree

1 file changed

+20
-22
lines changed

1 file changed

+20
-22
lines changed

Zenergy/Zenergy/Scripts/Controllers/eventRegistrationPageController.js

+20-22
Original file line numberDiff line numberDiff line change
@@ -15,46 +15,44 @@
1515
//initialize array of events
1616
$scope.events = [];
1717

18-
//DateTime.Now.ToString("dd-MM-yyyy")
19-
20-
//function get ponctual event
18+
//function get event by date
2119
$scope.getEvent = function () {
2220
$scope.events = [];
21+
22+
// var dateselected = new Date($scope.dateSelected).toJSON();
23+
2324
var responseEvent = $http({
25+
// url: '/api/events/bydate',
2426
url: '/api/ponctualEvents',
2527
method: 'GET',
28+
// data: { eventdate: dateselected },
2629
headers: {
2730
'Content-Type': 'application/json'
2831
}
2932
}).then(function successCallback(responseEvent) {
3033
console.log(responseEvent);
34+
//console.log(new Date($scope.dateSelected).toJSON());
3135

3236
//var for displaying or not the join button
33-
if (new Date($scope.dateSelected) < today) {
37+
if (new Date($scope.dateSelected) < today) {
3438
$scope.pastevent = true;
3539
}
3640
else
3741
{
3842
$scope.pastevent = false;
3943
}
40-
for (var e in responseEvent.data) {
41-
42-
var date = new Date(responseEvent.data[e].eventDate);
43-
date = date.getMonth() + 1 + "/" + date.getDate() + "/" + date.getFullYear();
44-
45-
// add this event to the list if it's current date
46-
if (date == $scope.dateSelected) {
47-
$scope.events.push({
48-
Id: responseEvent.data[e].eventId,
49-
roomName: responseEvent.data[e].event.room.roomName,
50-
Description: responseEvent.data[e].event.eventDescription,
51-
timeBegin: responseEvent.data[e].event.timeBegin,
52-
duration: responseEvent.data[e].event.eventDurationHours,
53-
price: responseEvent.data[e].event.eventPrice,
54-
name: responseEvent.data[e].event.eventName,
55-
activity: responseEvent.data[e].event.activity.activityName
56-
});
57-
}
44+
for (var e in responseEvent.data) {
45+
$scope.events.push({
46+
Id: responseEvent.data[e].eventId,
47+
roomName: responseEvent.data[e].event.room.roomName,
48+
Description: responseEvent.data[e].event.eventDescription,
49+
timeBegin: responseEvent.data[e].event.timeBegin,
50+
duration: responseEvent.data[e].event.eventDurationHours,
51+
price: responseEvent.data[e].event.eventPrice,
52+
name: responseEvent.data[e].event.eventName,
53+
activity: responseEvent.data[e].event.activity.activityName
54+
});
55+
5856
}
5957
if ($scope.events.length == 0) {
6058
bootbox.alert("There is no event for this day");

0 commit comments

Comments
 (0)