Skip to content

Commit 4cb6ce9

Browse files
damienmoularddamienmoulard
committed
forms corrigés, update presque ok sauf backend
1 parent c5ebd3c commit 4cb6ce9

File tree

4 files changed

+40
-52
lines changed

4 files changed

+40
-52
lines changed

‎Zenergy/Zenergy/Pages/eventsManagement.html

+10-9
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,40 @@ <h3 class="modal-title">Update {{eventToUpdate.event.eventName}}</h3>
1111
<div class="modal-body">
1212

1313
<div class="form-group">
14-
<div class="input-group">
15-
<div class="input-group-btn">
16-
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Select a room <span class="caret"></span></button>
17-
<ul class="dropdown-menu" ng-repeat="room in filtered = (rooms | filter: query)">
18-
<li><a ng-click="roomSelected(room)">{{room.roomName}}</a></li>
19-
</ul>
20-
</div>
21-
<input type="text" class="form-control" id="selectedRoom" value="{{eventToUpdate.event.room.roomName}}" disabled>
22-
</div>
14+
<label for="roomSelect">Select a room</label>
15+
<select class="form-control" id="roomSelect">
16+
<option ng-repeat="room in filtered = (rooms | filter: query)" value="{{room.roomId}}">{{room.roomName}}</option>
17+
</select>
2318
</div>
2419

2520
<div class="form-group">
21+
<label>Date</label>
2622
<input type="date" format="yyyy-MM-dd" name="eventToUpdate.eventDate" class="form-control" ng-model="eventToUpdate.eventDate" placeholder="Date" value="{{eventToUpdate.eventDate}}" required>
2723
<p class="text-danger" ng-if="dateError">You can't create an event in the past. Unless you are a wizard. Which I doubt.</p>
2824
</div>
2925

3026
<div class="form-group">
27+
<label>Beginning time</label>
3128
<input type="time" format="HH:mm" min="08:00" max="22:00" name="eventToUpdate.event.timeBegin" class="form-control" ng-model="eventToUpdate.event.timeBegin" placeholder="Time of the event beginning" value="{{eventToUpdate.event.timeBegin}}" required>
3229
</div>
3330

3431
<div class="form-group">
32+
<label>Duration</label>
3533
<input type="number" min="0.5" step="0.5" name="eventToUpdate.event.eventDurationHours" class="form-control" ng-model="eventToUpdate.event.eventDurationHours" placeholder="Duration in hours (can be 1.5)" value="{{eventToUpdate.event.eventDurationHours}}" required>
3634
</div>
3735

3836
<div class="form-group">
37+
<label>Description</label>
3938
<input name="eventToUpdate.event.eventDescription" class="form-control" ng-model="eventToUpdate.event.eventDescription" placeholder="Description" value="{{eventToUpdate.event.eventDescription}}" required>
4039
</div>
4140

4241
<div class="form-group">
42+
<label>Price</label>
4343
<input type="number" min="0" step="0.01" name="eventToUpdate.event.eventPrice" class="form-control" ng-model="eventToUpdate.event.eventPrice" placeholder="Price (€)" value="{{eventToUpdate.event.eventPrice}}" required>
4444
</div>
4545

4646
<div class="form-group">
47+
<label>Maximum participants allowed</label>
4748
<input type="number" min="0" name="eventToUpdate.event.eventMaxPeople" class="form-control" ng-model="eventToUpdate.event.eventMaxPeople" placeholder="Maximum number of participants" value="{{eventToUpdate.event.eventMaxPeople}}" required>
4849
</div>
4950

‎Zenergy/Zenergy/Pages/ponctualEventCreation.html

+18-20
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,65 @@
11
<h1>Create a new event</h1>
22
<div class="container " ng-controller="ponctualEventCreationPageController">
33

4+
<br />
45
<div class="row">
56

67
<div name="formPonctualEvent" class="col-md-3 col-lg-offset-4">
78

8-
<form ng-submit="createEvent()">
9+
<form id="createEventForm" ng-submit="createEvent()">
910

1011
<div class="form-group">
12+
<label>Your event name</label>
1113
<input class="form-control" ng-model="ponctualEvent.event.eventName" placeholder="Event name" required>
1214
</div>
1315

1416
<div class="form-group">
15-
<div class="input-group">
16-
<div class="input-group-btn">
17-
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Select an activity <span class="caret"></span></button>
18-
<ul class="dropdown-menu" ng-repeat="activity in filtered = (activities | filter: query)">
19-
<li><a ng-click="activitySelected(activity)">{{activity.activityName}}</a></li>
20-
</ul>
21-
</div>
22-
<input type="text" class="form-control" id="selectedActivity" disabled>
23-
</div>
17+
<label for="actSelect">Select an activity</label>
18+
<select class="form-control" id="actSelect">
19+
<option ng-repeat="activity in filtered = (activities | filter: query)" value="{{activity.activityId}}">{{activity.activityName}}</option>
20+
</select>
2421
</div>
2522

2623
<div class="form-group">
27-
<div class="input-group">
28-
<div class="input-group-btn">
29-
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Select a room <span class="caret"></span></button>
30-
<ul class="dropdown-menu" ng-repeat="room in filtered = (rooms | filter: query)">
31-
<li><a ng-click="roomSelected(room)">{{room.roomName}}</a></li>
32-
</ul>
33-
</div>
34-
<input type="text" class="form-control" id="selectedRoom" disabled>
35-
</div>
24+
<label for="roomSelect">Select a room</label>
25+
<select class="form-control" id="roomSelect">
26+
<option ng-repeat="room in filtered = (rooms | filter: query)" value="{{room.roomId}}">{{room.roomName}}</option>
27+
</select>
3628
</div>
3729

3830
<div class="form-group">
31+
<label>Date</label>
3932
<input type="date" format="yyyy-MM-dd" name="ponctualEvent.eventDate" class="form-control" ng-model="ponctualEvent.eventDate" placeholder="Date" required>
4033
<p class="text-danger" ng-if="dateError">You can't create an event in the past. Unless you are a wizard. Which I doubt.</p>
4134
</div>
4235

4336
<div class="form-group">
37+
<label>Beginning time</label>
4438
<input type="time" format="HH:mm" min="08:00" max="22:00" name="ponctualEvent.event.timeBegin" class="form-control" ng-model="ponctualEvent.event.timeBegin" placeholder="Time of the event beginning" required>
4539
</div>
4640

4741
<div class="form-group">
42+
<label>Duration</label>
4843
<input type="number" min="0.5" step="0.5" name="ponctualEvent.event.eventDurationHours" class="form-control" ng-model="ponctualEvent.event.eventDurationHours" placeholder="Duration in hours (can be 1.5)" required>
4944
</div>
5045

5146
<div class="form-group">
47+
<label>Description</label>
5248
<input name="ponctualEvent.event.eventDescription" class="form-control" ng-model="ponctualEvent.event.eventDescription" placeholder="Description" required>
5349
</div>
5450

5551
<div class="form-group">
52+
<label>Price</label>
5653
<input type="number" min="0" step="0.01" name="ponctualEvent.event.eventPrice" class="form-control" ng-model="ponctualEvent.event.eventPrice" placeholder="Price (€)" required>
5754
</div>
5855

5956
<div class="form-group">
57+
<label>Maximum participants allowed</label>
6058
<input type="number" min="0" name="ponctualEvent.event.eventMaxPeople" class="form-control" ng-model="ponctualEvent.event.eventMaxPeople" placeholder="Maximum number of participants" required>
6159
</div>
6260

6361
<input type="submit" id="submit" value="Validate" class="btn btn-primary" />
64-
</form>
62+
</form>
6563
</div>
6664
</div>
6765
</div>

‎Zenergy/Zenergy/Scripts/Controllers/eventsManagementPageController.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
var date = new Date(eventToUpdate.event.timeBegin);
4040
eventToUpdate.event.timeBegin = date.getHours().toString() + ":" + date.getMinutes().toString();
4141

42+
eventToUpdate.event.roomId = document.getElementById("roomSelect").value;
43+
44+
console.log(eventToUpdate);
45+
4246
var response = $http({
4347
url: '/api/ponctualEvents/' + eventToUpdate.eventId,
4448
method: 'PUT',
@@ -61,10 +65,11 @@
6165
'Content-Type': 'application/json'
6266
}
6367
}).then(function successCallback(response) {
64-
console.log("update ok");
65-
//window.location.reload(true);
68+
bootbox.alert("Your event is updated!", function () {
69+
window.location.reload(true);
70+
});
6671
}, function errorCallback(response) {
67-
console.log("update error");
72+
bootbox.alert("There has been an error during the update.");
6873
});
6974
}, function () {
7075
});
@@ -93,12 +98,6 @@ zenergyApp.controller('UpdateModalInstanceCtrl', function ($scope, $http, $uibMo
9398
console.log($scope.rooms);
9499
});
95100

96-
// When a room is selected in the form
97-
$scope.roomSelected = function (room) {
98-
$('#selectedRoom').attr("placeholder", room.roomName);
99-
$scope.eventToUpdate.event.roomId = room.roomId;
100-
}
101-
102101
$scope.ok = function () {
103102
$uibModalInstance.close($scope.eventToUpdate);
104103
};

‎Zenergy/Zenergy/Scripts/Controllers/ponctualEventCreationPageController.js

+4-14
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,8 @@
3030

3131
$scope.ponctualEvent = { eventId: 1, eventDate: new Date(), event: { eventId: 1, roomId: '', activityId: '', eventName: '', eventPrice: '', eventDurationHours: '', eventMaxPeople: '', eventDescription: '', timeBegin: '' } };
3232

33-
// When an activity is selected in the form
34-
$scope.activitySelected = function (activity) {
35-
$('#selectedActivity').attr("placeholder", activity.activityName);
36-
$scope.ponctualEvent.event.activityId = activity.activityId;
37-
}
38-
39-
// When a room is selected in the form
40-
$scope.roomSelected = function (room) {
41-
$('#selectedRoom').attr("placeholder", room.roomName);
42-
$scope.ponctualEvent.event.roomId = room.roomId;
43-
}
44-
4533
$scope.createEvent = function () {
46-
console.log($scope.ponctualEvent);
34+
//console.log($scope.ponctualEvent);
4735

4836
$scope.hasError = false;
4937
$scope.dateError = false;
@@ -56,8 +44,10 @@
5644

5745
var date = new Date($scope.ponctualEvent.event.timeBegin);
5846
$scope.ponctualEvent.event.timeBegin = date.getHours().toString() + ":" + date.getMinutes().toString();
59-
console.log($scope.ponctualEvent.event.timeBegin);
6047

48+
$scope.ponctualEvent.event.roomId = document.getElementById("roomSelect").value;
49+
$scope.ponctualEvent.event.activityId = document.getElementById("actSelect").value;
50+
6151
if (!$scope.hasError)
6252
{
6353
var response = $http({

0 commit comments

Comments
 (0)