v0.10.0b - Fixed Location update AJAX
Added - You are now able to delete a location
This commit is contained in:
parent
773655c294
commit
3bde377caa
|
@ -61,7 +61,7 @@ class LocationController extends Controller
|
||||||
|
|
||||||
// If there already is a washing machine with that name, then don't add it
|
// If there already is a washing machine with that name, then don't add it
|
||||||
if (count($locations) > 0)
|
if (count($locations) > 0)
|
||||||
return redirect()->route("locations.store")->with('NameExists', '<p><b>Der findes allerede en lokation med det navn!</b></p>');
|
return redirect()->route("locations.index");
|
||||||
else { // Else - Add it
|
else { // Else - Add it
|
||||||
$location->save();
|
$location->save();
|
||||||
$locations = Location::query()->paginate($request->input("limit", 20));
|
$locations = Location::query()->paginate($request->input("limit", 20));
|
||||||
|
@ -111,7 +111,7 @@ class LocationController extends Controller
|
||||||
|
|
||||||
// If there already is a washing machine with that name, then don't change it
|
// If there already is a washing machine with that name, then don't change it
|
||||||
if (count($allMachines) > 0)
|
if (count($allMachines) > 0)
|
||||||
return redirect()->route("locations.store")->with('NameExists', '<p><b>Der findes allerede en lokation med det navn!</b></p>');
|
return redirect()->route("locations.index");
|
||||||
else { // Else - Change the name
|
else { // Else - Change the name
|
||||||
$location->update($data);
|
$location->update($data);
|
||||||
$location->save();
|
$location->save();
|
||||||
|
@ -124,12 +124,15 @@ class LocationController extends Controller
|
||||||
/**
|
/**
|
||||||
* Remove the specified resource from storage.
|
* Remove the specified resource from storage.
|
||||||
*
|
*
|
||||||
* @param \App\Location $location
|
* @param int $id
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function destroy(Location $location)
|
public function destroy($id)
|
||||||
{
|
{
|
||||||
|
$locations = Location::find($id);
|
||||||
|
$locations->delete();
|
||||||
|
|
||||||
|
return redirect()->route("locations.index");
|
||||||
}
|
}
|
||||||
|
|
||||||
public function nameCheck(Request $request){
|
public function nameCheck(Request $request){
|
||||||
|
@ -139,4 +142,10 @@ class LocationController extends Controller
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function nameCheckUpdate(Request $request){
|
||||||
|
$locations = Location::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
|
||||||
|
if(count($locations) > 0 && $request->nameCheck !== NULL){
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,8 +30,6 @@
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//Dont delete me, if the user reloads the pages with text in the text-box this code runs.
|
//Dont delete me, if the user reloads the pages with text in the text-box this code runs.
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
$value = $('#name').val();
|
$value = $('#name').val();
|
||||||
|
@ -83,7 +81,5 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
@ -15,8 +15,9 @@
|
||||||
@csrf
|
@csrf
|
||||||
@method("put")
|
@method("put")
|
||||||
<label for="name">Lokationsnavn:</label>
|
<label for="name">Lokationsnavn:</label>
|
||||||
|
<label hidden id="error" for="errormesseages">Lokation findes allerede</label>
|
||||||
<input type="text" name="name" id="name" value="{{ $location->name }}" required>
|
<input type="text" name="name" id="name" value="{{ $location->name }}" required>
|
||||||
<input type="submit" class="btn btn-dark text-white" value="Rediger">
|
<input type="submit" id="disable" class="btn btn-dark text-white" value="Rediger">
|
||||||
</form>
|
</form>
|
||||||
@endsection
|
@endsection
|
||||||
@section("scripts")
|
@section("scripts")
|
||||||
|
@ -29,5 +30,57 @@
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
//Dont delete me, if the user reloads the pages with text in the text-box this code runs.
|
||||||
|
$(document).ready(function () {
|
||||||
|
$value = $('#name').val();
|
||||||
|
$.ajax({
|
||||||
|
type: 'get',
|
||||||
|
url: '{{route('locations.nameCheckUpdate')}}',
|
||||||
|
data: {'nameCheck':$value, 'id':{{$location->id}}},
|
||||||
|
success:function (data) {
|
||||||
|
console.log(data);
|
||||||
|
if(data){
|
||||||
|
$("#error").show(100);
|
||||||
|
$("#error").css('color', 'red');
|
||||||
|
$("#disable").prop('disabled', true);
|
||||||
|
$('#disable').css('cursor','not-allowed');
|
||||||
|
}else{
|
||||||
|
$("#error").hide();
|
||||||
|
$("#disable").prop('disabled', false);
|
||||||
|
$('#disable').css('cursor','pointer');
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
error:function (data) {
|
||||||
|
console.log(data);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
$('#name').on('keyup', function () {
|
||||||
|
$value = $(this).val();
|
||||||
|
$.ajax({
|
||||||
|
type: 'get',
|
||||||
|
url: '{{route('locations.nameCheckUpdate')}}',
|
||||||
|
data: {'nameCheck':$value, 'id':{{$location->id}}},
|
||||||
|
success:function (data) {
|
||||||
|
if(data){
|
||||||
|
$("#error").show(100);
|
||||||
|
$("#error").css('color', 'red');
|
||||||
|
$("#disable").prop('disabled', true);
|
||||||
|
$('#disable').css('cursor','not-allowed');
|
||||||
|
}else{
|
||||||
|
$("#error").hide();
|
||||||
|
$("#disable").prop('disabled', false);
|
||||||
|
$('#disable').css('cursor','pointer');
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
error:function (data) {
|
||||||
|
console.log(data);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
@ -72,6 +72,7 @@ Route::get("/roleCheckUpdate", "RolesController@nameCheckUpdate")->name("roles.n
|
||||||
Route::get("/guidesCheckUpdate", "GuideController@nameCheckUpdate")->name("guides.nameCheckUpdate");
|
Route::get("/guidesCheckUpdate", "GuideController@nameCheckUpdate")->name("guides.nameCheckUpdate");
|
||||||
Route::get("/newsCheckUpdate", "NewsController@nameCheckUpdate")->name("news.nameCheckUpdate");
|
Route::get("/newsCheckUpdate", "NewsController@nameCheckUpdate")->name("news.nameCheckUpdate");
|
||||||
Route::get("/menuplanCheckUpdate", "MenuPlanController@nameCheckUpdate")->name("menuplans.nameCheckUpdate");
|
Route::get("/menuplanCheckUpdate", "MenuPlanController@nameCheckUpdate")->name("menuplans.nameCheckUpdate");
|
||||||
|
Route::get("/locationsCheckUpdate", "LocationController@nameCheckUpdate")->name("locations.nameCheckUpdate");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue