RomanGolienko
/
Roman_applicant-site
forked from aslan/applicant-site
1
1
Fork 0
Code Pull Requests 2 Activity

prodV1 #2

Open
RomanGolienko wants to merge 309 commits from prodV1 into main
pull from: prodV1
merge into: RomanGolienko:main
Conversation 0 Commits 309 Files Changed 373 +38 -2
13 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c1dbcc82b3 - Show all commits

2
app/Http/Controllers/admin/Catalog/Direction/PlaceController.php
View File

@ -43,6 +43,7 @@ class PlaceController extends Controller
$place->position = $validated['position']; $place->position = $validated['position'];
$place->description = $validated['description']; $place->description = $validated['description'];
$place->amount = $validated['amount']; $place->amount = $validated['amount'];
$place->quota = $validated['quota'];
$place->education_form_id = $validated['education_form_id']; $place->education_form_id = $validated['education_form_id'];
$place->place_type_id = $validated['place_type_id']; $place->place_type_id = $validated['place_type_id'];
$place->direction_id = $validated['direction_id']; $place->direction_id = $validated['direction_id'];
@ -79,6 +80,7 @@ class PlaceController extends Controller
$place->position = $validated['position']; $place->position = $validated['position'];
$place->description = $validated['description']; $place->description = $validated['description'];
$place->amount = $validated['amount']; $place->amount = $validated['amount'];
$place->quota = $validated['quota'];
$place->education_form_id = $validated['education_form_id']; $place->education_form_id = $validated['education_form_id'];
$place->place_type_id = $validated['place_type_id']; $place->place_type_id = $validated['place_type_id'];
$place->direction_id = $validated['direction_id']; $place->direction_id = $validated['direction_id'];

2
app/Http/Controllers/admin/Catalog/Direction/PlaceTypeController.php
View File

@ -3,9 +3,7 @@
namespace App\Http\Controllers\admin\Catalog\Direction; namespace App\Http\Controllers\admin\Catalog\Direction;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\admin\Catalog\Direction\StoreExaminationTypeRequest;
use App\Http\Requests\admin\Catalog\Direction\StorePlaceTypeRequest; use App\Http\Requests\admin\Catalog\Direction\StorePlaceTypeRequest;
use App\Http\Requests\admin\Catalog\Direction\UpdateExaminationTypeRequest;
use App\Http\Requests\admin\Catalog\Direction\UpdatePlaceTypeRequest; use App\Http\Requests\admin\Catalog\Direction\UpdatePlaceTypeRequest;
use App\Models\PlaceType; use App\Models\PlaceType;
use Illuminate\Contracts\View\View; use Illuminate\Contracts\View\View;

1
app/Http/Requests/admin/Catalog/Direction/StorePlaceRequest.php
View File

@ -16,6 +16,7 @@ class StorePlaceRequest extends FormRequest
'position' => 'required|int|numeric|max:255', 'position' => 'required|int|numeric|max:255',
'description' => 'string', 'description' => 'string',
'amount' => 'required|int|numeric|max:255', 'amount' => 'required|int|numeric|max:255',
'quota' => 'required|int|numeric|max:255',
'education_form_id' => 'required|int|numeric|max:255', 'education_form_id' => 'required|int|numeric|max:255',
'place_type_id' => 'required|int|numeric|max:255', 'place_type_id' => 'required|int|numeric|max:255',
'direction_id' => 'required|int|numeric|max:255', 'direction_id' => 'required|int|numeric|max:255',

1
app/Http/Requests/admin/Catalog/Direction/UpdatePlaceRequest.php
View File

@ -16,6 +16,7 @@ class UpdatePlaceRequest extends FormRequest
'position' => 'required|int|numeric|max:255', 'position' => 'required|int|numeric|max:255',
'description' => 'string', 'description' => 'string',
'amount' => 'required|int|numeric|max:255', 'amount' => 'required|int|numeric|max:255',
'quota' => 'required|int|numeric|max:255',
'education_form_id' => 'required|int|numeric|max:255', 'education_form_id' => 'required|int|numeric|max:255',
'place_type_id' => 'required|int|numeric|max:255', 'place_type_id' => 'required|int|numeric|max:255',
'direction_id' => 'required|int|numeric|max:255', 'direction_id' => 'required|int|numeric|max:255',

1
app/Models/Place.php
View File

@ -15,6 +15,7 @@ class Place extends Model
'position', 'position',
'description', 'description',
'amount', 'amount',
'quota',
'education_form_id', 'education_form_id',
'place_type_id', 'place_type_id',
'direction_id', 'direction_id',

1
database/factories/PlaceFactory.php
View File

@ -12,6 +12,7 @@ class PlaceFactory extends Factory
'position' => 1, 'position' => 1,
'description' => fake()->text(), 'description' => fake()->text(),
'amount' => fake()->randomDigit(), 'amount' => fake()->randomDigit(),
'quota' => fake()->randomDigit(),
'education_form_id' => 1, 'education_form_id' => 1,
'place_type_id' => 1, 'place_type_id' => 1,
'direction_id' => 1, 'direction_id' => 1,

1
database/migrations/2024_02_19_110021_create_places_table.php
View File

@ -15,6 +15,7 @@ return new class extends Migration
$table->id(); $table->id();
$table->integer('position'); $table->integer('position');
$table->integer('amount'); $table->integer('amount');
$table->integer('quota');
$table->foreignId('education_form_id')->constrained('education_forms'); $table->foreignId('education_form_id')->constrained('education_forms');
$table->foreignId('place_type_id')->constrained('place_types'); $table->foreignId('place_type_id')->constrained('place_types');
$table->foreignId('direction_id')->constrained('directions'); $table->foreignId('direction_id')->constrained('directions');

2
database/seeders/PlaceSeeder.php
View File

@ -14,6 +14,7 @@ class PlaceSeeder extends Seeder
[ [
'position' => 1, 'position' => 1,
'amount' => 25, 'amount' => 25,
'quota' => 4,
'education_form_id' => 1, 'education_form_id' => 1,
'place_type_id' => 1, 'place_type_id' => 1,
'direction_id' => 1, 'direction_id' => 1,
@ -22,6 +23,7 @@ class PlaceSeeder extends Seeder
[ [
'position' => 2, 'position' => 2,
'amount' => 30, 'amount' => 30,
'quota' => 8,
'education_form_id' => 2, 'education_form_id' => 2,
'place_type_id' => 2, 'place_type_id' => 2,
'direction_id' => 1, 'direction_id' => 1,

12
resources/views/admin/catalog/direction/place/create.blade.php
View File

@ -43,6 +43,18 @@
@endif @endif
</div> </div>
<div class="mt-3">
{{ Form::label('quota', 'Квота') }}
</div>
<div class="mt-1">
{{ Form::text('quota', '', ['class' => 'form-control']) }}
</div>
<div>
@if ($errors->any())
{{ $errors->first('quota') }}
@endif
</div>
<div class="mt-3"> <div class="mt-3">
{{ Form::label('direction_id', 'Направление подготовки') }} {{ Form::label('direction_id', 'Направление подготовки') }}
</div> </div>

12
resources/views/admin/catalog/direction/place/edit.blade.php
View File

@ -43,6 +43,18 @@
@endif @endif
</div> </div>
<div class="mt-3">
{{ Form::label('quota', 'Квота') }}
</div>
<div class="mt-1">
{{ Form::text('quota', $place->amount, ['class' => 'form-control']) }}
</div>
<div>
@if ($errors->any())
{{ $errors->first('quota') }}
@endif
</div>
<div class="mt-3"> <div class="mt-3">
{{ Form::label('direction_id', 'Направление подготовки') }} {{ Form::label('direction_id', 'Направление подготовки') }}
</div> </div>

2
resources/views/admin/catalog/direction/place/index.blade.php
View File

@ -15,6 +15,7 @@
<th scope="col">Тип места</th> <th scope="col">Тип места</th>
<th scope="col">направление</th> <th scope="col">направление</th>
<th scope="col">Кол-во</th> <th scope="col">Кол-во</th>
<th scope="col">Квота</th>
<th scope="col">действия</th> <th scope="col">действия</th>
<th scope="col"></th> <th scope="col"></th>
</tr> </tr>
@ -28,6 +29,7 @@
<td><a href="{{ route('place_types.show', $place->placeType) }}">{{ $place->placeType->name }}</a></td> <td><a href="{{ route('place_types.show', $place->placeType) }}">{{ $place->placeType->name }}</a></td>
<td><a href="{{ route('directions.show', $place->direction) }}">{{ $place->direction->name }}</a></td> <td><a href="{{ route('directions.show', $place->direction) }}">{{ $place->direction->name }}</a></td>
<td>{{ $place->amount }}</td> <td>{{ $place->amount }}</td>
<td>{{ $place->quota }}</td>
<td> <td>
<a href="{{ route("places.show", $place) }}" <a href="{{ route("places.show", $place) }}"
class="btn btn-info">посмотреть</a> class="btn btn-info">посмотреть</a>

2
resources/views/admin/catalog/direction/place/show.blade.php
View File

@ -14,6 +14,8 @@
<p>{{ $place->direction->name }}</p> <p>{{ $place->direction->name }}</p>
<h2>Кол-во</h2> <h2>Кол-во</h2>
<p>{{ $place->amount }}</p> <p>{{ $place->amount }}</p>
<h2>Квота</h2>
<p>{{ $place->quota }}</p>
</div> </div>
@endauth @endauth
@endsection @endsection

1
tests/Feature/admin/catalog/direction/PlaceTest.php
View File

@ -36,6 +36,7 @@ class PlaceTest extends TestCase
'position', 'position',
'description', 'description',
'amount', 'amount',
'quota',
'education_form_id', 'education_form_id',
'place_type_id', 'place_type_id',
'direction_id', 'direction_id',