このコミットが含まれているのは:
守矢諏訪子 2021-11-05 19:34:36 +09:00
コミット 16271a70ca
2個のファイルの変更11行の追加11行の削除

ファイルの表示

@ -488,21 +488,21 @@ class MeetingsController extends Controller {
$result->approval = [];
}
if (request()->session()->get('children')) {
if (request()->route()->action['as'] == 'mdc') {
if (null === ($result->father = Father::select($father_select)->where('id', (int)$result->father_id)->first())) {
$result->father = new \stdClass();
}
}
$result->children = [];
if (null !== ($rel = FatherRelation::select('child_id')->where('father_id', (int)$result->father_id)->first())) {
if (null === ($result->children = Child::select($all_child_select)->where('id', $rel->child_id)->get()->toArray())) {
$result->children = [];
if (request()->route()->action['as'] != 'mdc') {
$result->children = [];
if (null !== ($rel = FatherRelation::select('child_id')->where('father_id', (int)$result->father_id)->first())) {
if (null === ($result->children = Child::select($all_child_select)->where('id', $rel->child_id)->get()->toArray())) {
$result->children = [];
}
}
}
if (request()->session()->get('fathers') || request()->session()->get('admins')) {
foreach ($result->approval as $i => $a) {
if (null === ($result->approval[$i]['child'] = Child::select($child_select)->where('id', (int)$a->child_id)->first())) {
$result->approval[$i]['child'] = [];

ファイルの表示

@ -49,7 +49,7 @@ Route::group(['prefix' => 'admin'], function () {
Route::group(['prefix' => 'meetings'], function () {
Route::get('/list', '\App\Http\Controllers\Api\MeetingsController@list');
Route::get('/search', '\App\Http\Controllers\Api\MeetingsController@search');
Route::get('/detail/{meeting_id}', '\App\Http\Controllers\Api\MeetingsController@detail');
Route::get('/detail/{meeting_id}', '\App\Http\Controllers\Api\MeetingsController@detail')->name('mda');
Route::put('/update/{meeting_id}', '\App\Http\Controllers\Api\MeetingsController@update');
Route::delete('/delete/{meeting_id}', '\App\Http\Controllers\Api\MeetingsController@delete');
});
@ -104,7 +104,7 @@ Route::group(['prefix' => 'fathers'], function () {
Route::get('/listOfNonFavoriteOfFather', '\App\Http\Controllers\Api\MeetingsController@listOfNonFavoriteOfFather');
Route::get('/searchOfCompleteOfFather', '\App\Http\Controllers\Api\MeetingsController@searchOfCompleteOfFather');
Route::get('/searchOfIncompleteOfFather', '\App\Http\Controllers\Api\MeetingsController@searchOfIncompleteOfFather');
Route::get('/detail/{meeting_id}', '\App\Http\Controllers\Api\MeetingsController@detail');
Route::get('/detail/{meeting_id}', '\App\Http\Controllers\Api\MeetingsController@detail')->name('mdp');
Route::put('/update/{meeting_id}', '\App\Http\Controllers\Api\MeetingsController@update');
Route::delete('/delete/{meeting_id}', '\App\Http\Controllers\Api\MeetingsController@delete');
});
@ -161,7 +161,7 @@ Route::group(['prefix' => 'children'], function () {
Route::get('/listOfNonApprovalOfChild', '\App\Http\Controllers\Api\MeetingsController@listOfNonApprovalOfChild');
Route::get('/searchOfApprovalOfChild', '\App\Http\Controllers\Api\MeetingsController@searchOfApprovalOfChild');
Route::get('/searchOfNonApprovalOfChild', '\App\Http\Controllers\Api\MeetingsController@searchOfNonApprovalOfChild');
Route::get('/detail/{meeting_id}', '\App\Http\Controllers\Api\MeetingsController@detail');
Route::get('/detail/{meeting_id}', '\App\Http\Controllers\Api\MeetingsController@detail')->name('mdc');
});
Route::group(['prefix' => 'meeting'], function () {