odon
/
free-pmo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #15 from nafiesl/fix/issue#14 

Fix some calendar bug and Notification Improvement
pull/16/head
Nafies Luthfi 7 years ago
committed by GitHub
parent
80b3eec3e6 673372afae
commit
e4d3695c44
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 95 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      app/Http/Controllers/Api/EventsController.php
  2. 8
      resources/lang/de/event.php
  3. 8
      resources/lang/en/event.php
  4. 8
      resources/lang/id/event.php
  5. 53
      resources/views/users/calendar.blade.php
  6. 48
      tests/Feature/Api/ApiEventsTest.php

14
app/Http/Controllers/Api/EventsController.php
View File

@ -150,10 +150,11 @@ class EventsController extends Controller
public function reschedule(Request $request) public function reschedule(Request $request)
{ {
$this->validate($request, [
'id' => 'required|numeric|exists:user_events,id',
'start' => 'required|date|date_format:Y-m-d H:i:s',
'end' => 'date|date_format:Y-m-d H:i:s',
$request->validate([
'id' => 'required|numeric|exists:user_events,id',
'start' => 'required|date|date_format:Y-m-d H:i:s',
'end' => 'nullable|date|date_format:Y-m-d H:i:s',
'is_allday' => 'required|in:true,false',
]); ]);
$event = Event::findOrFail($request->get('id')); $event = Event::findOrFail($request->get('id'));
@ -165,6 +166,11 @@ class EventsController extends Controller
$event->is_allday = false; $event->is_allday = false;
} }
if ($request->get('is_allday') == 'true') {
$event->end = null;
$event->is_allday = true;
}
$event->save(); $event->save();
$response = [ $response = [

8
resources/lang/de/event.php
View File

@ -0,0 +1,8 @@
<?php
return [
'created' => 'Event created.',
'updated' => 'Event updated.',
'deleted' => 'Event deleted.',
'rescheduled' => 'Event has been rescheduled.',
];

8
resources/lang/en/event.php
View File

@ -0,0 +1,8 @@
<?php
return [
'created' => 'Event created.',
'updated' => 'Event updated.',
'deleted' => 'Event deleted.',
'rescheduled' => 'Event has been rescheduled.',
];

8
resources/lang/id/event.php
View File

@ -0,0 +1,8 @@
<?php
return [
'created' => 'Event berhasil diinput.',
'updated' => 'Event berhasil diupdate.',
'deleted' => 'Event berhasil dihapus.',
'rescheduled' => 'Jadwal event berhasil diubah.',
];

53
resources/views/users/calendar.blade.php
View File

@ -17,7 +17,6 @@
</div> </div>
</div> </div>
<!-- calendar modal --> <!-- calendar modal -->
<div id="CalenderModalNew" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div id="CalenderModalNew" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
@ -127,7 +126,6 @@
<div id="fc_create" data-toggle="modal" data-target="#CalenderModalNew"></div> <div id="fc_create" data-toggle="modal" data-target="#CalenderModalNew"></div>
<div id="fc_edit" data-toggle="modal" data-target="#CalenderModalEdit"></div> <div id="fc_edit" data-toggle="modal" data-target="#CalenderModalEdit"></div>
<!-- /calendar modal --> <!-- /calendar modal -->
@endsection @endsection
@section('ext_css') @section('ext_css')
@ -140,6 +138,7 @@
@endsection @endsection
@section('script') @section('script')
<script src="{{ asset('assets/js/plugins/noty.js') }}"></script>
<script> <script>
(function() { (function() {
var date = new Date(), var date = new Date(),
@ -191,20 +190,19 @@
method: "POST", method: "POST",
data: { title: title, body: body, project_id: project_id, start: started.format("YYYY-MM-DD HH:mm:ss"), end: ended.format("YYYY-MM-DD HH:mm:ss"), is_allday: is_allday }, data: { title: title, body: body, project_id: project_id, start: started.format("YYYY-MM-DD HH:mm:ss"), end: ended.format("YYYY-MM-DD HH:mm:ss"), is_allday: is_allday },
success: function(response){ success: function(response){
if(response.message == 'event.created') {
calendar.fullCalendar('renderEvent', {
id: response.data.id,
title: title,
body: body,
start: started.format("YYYY-MM-DD HH:mm"),
end: ended.format("YYYY-MM-DD HH:mm"),
user: "{{ auth()->user()->name }}",
user_id: "{{ auth()->id() }}",
project_id: project_id,
allDay: is_allday,
editable: true
}, true);
}
calendar.fullCalendar('renderEvent', {
id: response.data.id,
title: title,
body: body,
start: started.format("YYYY-MM-DD HH:mm"),
end: ended.format("YYYY-MM-DD HH:mm"),
user: "{{ auth()->user()->name }}",
user_id: "{{ auth()->id() }}",
project_id: project_id,
allDay: is_allday,
editable: true
}, true);
noty({type: 'success', layout: 'bottomRight', text: response.message, timeout: 3000});
}, },
error: function(e){ error: function(e){
alert('Error processing your request: '+e.responseText); alert('Error processing your request: '+e.responseText);
@ -252,9 +250,8 @@
}, },
data: { id: calEvent.id }, data: { id: calEvent.id },
success: function(response){ success: function(response){
if(response.message == 'event.deleted')
calendar.fullCalendar('removeEvents', calEvent.id);
console.log(calEvent);
noty({type: 'warning', layout: 'bottomRight', text: response.message, timeout: 3000});
calendar.fullCalendar('removeEvents', calEvent.id);
}, },
error: function(e){ error: function(e){
alert('Error processing your request: '+e.responseText); alert('Error processing your request: '+e.responseText);
@ -277,9 +274,8 @@
method: "PATCH", method: "PATCH",
data: { id: calEvent.id, title: calEvent.title, body: calEvent.body, project_id: calEvent.project_id, is_allday: calEvent.is_allday }, data: { id: calEvent.id, title: calEvent.title, body: calEvent.body, project_id: calEvent.project_id, is_allday: calEvent.is_allday },
success: function(response){ success: function(response){
if(response.message == 'event.updated')
$('#calendar').fullCalendar('updateEvent',calEvent);
console.log(calEvent);
noty({type: 'success', layout: 'bottomRight', text: response.message, timeout: 3000});
$('#calendar').fullCalendar('updateEvent',calEvent);
}, },
error: function(e){ error: function(e){
alert('Error processing your request: '+e.responseText); alert('Error processing your request: '+e.responseText);
@ -300,10 +296,9 @@
$.ajax({ $.ajax({
url: "{{ route('api.events.reschedule') }}", url: "{{ route('api.events.reschedule') }}",
method: "PATCH", method: "PATCH",
data: { id: calEvent.id, start: start, end: end },
data: { id: calEvent.id, start: start, end: end, is_allday: calEvent.allDay },
success: function(response){ success: function(response){
if(response.message != 'event.rescheduled')
revertFunc();
noty({type: 'success', layout: 'bottomRight', text: response.message, timeout: 3000});
}, },
error: function(e){ error: function(e){
revertFunc(); revertFunc();
@ -317,19 +312,17 @@
$.ajax({ $.ajax({
url: "{{ route('api.events.reschedule') }}", url: "{{ route('api.events.reschedule') }}",
method: "PATCH", method: "PATCH",
data: { id: calEvent.id, start: start, end: end },
data: { id: calEvent.id, start: start, end: end, is_allday: 'false' },
success: function(response){ success: function(response){
if(response.message != 'event.rescheduled')
revertFunc();
noty({type: 'success', layout: 'bottomRight', text: response.message, timeout: 3000});
}, },
error: function(e){ error: function(e){
revertFunc(); revertFunc();
alert('Error processing your request: '+e.responseText); alert('Error processing your request: '+e.responseText);
} }
}); });
} }
}); });
})(); })();
</script> </script>
@endsection
@endsection

48
tests/Feature/Api/ApiEventsTest.php
View File

@ -137,25 +137,53 @@ class ApiEventsTest extends TestCase
$event = factory(Event::class)->create(['user_id' => $user->id, 'start' => '2016-11-17 12:00:00']); $event = factory(Event::class)->create(['user_id' => $user->id, 'start' => '2016-11-17 12:00:00']);
$this->patchJson(route('api.events.reschedule'), [ $this->patchJson(route('api.events.reschedule'), [
'id' => $event->id,
'start' => '2016-11-07 13:00:00',
'end' => '2016-11-07 15:00:00',
'id' => $event->id,
'start' => '2016-11-07 13:00:00',
'end' => '2016-11-07 15:00:00',
'is_allday' => 'false',
], [ ], [
'Authorization' => 'Bearer '.$user->api_token, 'Authorization' => 'Bearer '.$user->api_token,
]); ]);
// $this->dump();
$this->seeStatusCode(200); $this->seeStatusCode(200);
$this->seeJson(['message' => trans('event.rescheduled')]);
$this->seeInDatabase('user_events', [
'id' => $event->id,
'user_id' => $user->id,
'start' => '2016-11-07 13:00:00',
'end' => '2016-11-07 15:00:00',
'is_allday' => 0,
]);
}
$this->seeJson([
'message' => trans('event.rescheduled'),
/** @test */
public function event_can_be_set_as_all_day_event()
{
$user = factory(User::class)->create();
$event = factory(Event::class)->create([
'user_id' => $user->id,
'start' => '2016-11-17 12:00:00',
'end' => '2016-11-17 14:00:00',
'is_allday' => 0,
]); ]);
$this->patchJson(route('api.events.reschedule'), [
'id' => $event->id,
'start' => '2016-11-07 13:00:00',
'end' => '2016-11-07 15:00:00',
'is_allday' => 'true',
], [
'Authorization' => 'Bearer '.$user->api_token,
]);
$this->seeStatusCode(200);
$this->seeJson(['message' => trans('event.rescheduled')]);
$this->seeInDatabase('user_events', [ $this->seeInDatabase('user_events', [
'id' => $event->id,
'user_id' => $user->id,
'start' => '2016-11-07 13:00:00',
'end' => '2016-11-07 15:00:00',
'id' => $event->id,
'user_id' => $user->id,
'start' => '2016-11-07 13:00:00',
'end' => null,
'is_allday' => 1,
]); ]);
} }
} }
Write Preview
Loading…
Cancel
Save