1
0
mirror of https://github.com/robonen/education-project.git synced 2026-03-20 02:44:31 +00:00

ответ при создании

This commit is contained in:
nikden13
2020-12-13 16:31:06 +07:00
parent 2e2942e42c
commit c93ffe8b0f
10 changed files with 63 additions and 17 deletions

View File

@@ -69,22 +69,22 @@ class TimetableController extends Controller
public function store(TimetableRequest $request) public function store(TimetableRequest $request)
{ {
try { try {
Timetable::create($request->all()); $timetable = Timetable::create($request->all());
}catch (QueryException $e) { }catch (QueryException $e) {
return response()->json(['message' => 'Not found class, teacher or subject'], 400); return response()->json(['message' => 'Not found class, teacher or subject'], 400);
} }
return response()->json(['message' => 'Timetable was created'], 201); return response()->json($timetable, 201);
} }
//обновление урока //обновление урока
public function update(TimetableRequest $timetable, Request $request) public function update(Timetable $timetable, TimetableRequest $request)
{ {
try { try {
$timetable->update($request->all()); $timetable->update($request->all());
}catch (QueryException $e) { }catch (QueryException $e) {
return response()->json(['message' => 'Not found class, teacher or subject'], 400); return response()->json(['message' => 'Not found class, teacher or subject'], 400);
} }
return response()->json(['message' => 'Timetable was updated'], 200); return response()->json($timetable, 200);
} }
//удаление урока //удаление урока

View File

@@ -45,4 +45,11 @@ class HeadTeacherController extends Controller
return response()->json($headteacher, 200); return response()->json($headteacher, 200);
} }
public function destroy(HeadTeacher $headteacher)
{
$user = $headteacher->user;
$user->delete();
return response()->json(null, 204);
}
} }

View File

@@ -44,4 +44,12 @@ class ParenttController extends Controller
$parent->update($request->all()); $parent->update($request->all());
return response()->json($parent, 200); return response()->json($parent, 200);
} }
public function destroy(Parentt $parent)
{
$user = $parent->user;
$user->delete();
return response()->json(null, 204);
}
} }

View File

@@ -31,18 +31,6 @@ class StudentController extends Controller
return response()->json($student, 200); return response()->json($student, 200);
} }
/**
* Создание ученика
*
* @param StudentRequest $request
* @return JsonResponse
*/
/*public function store(StudentRequest $request)
{
$student = Student::creat($request->all());
return response()->json($student, 200);
}*/
/** /**
* Обновление ученика * Обновление ученика
* *
@@ -65,4 +53,12 @@ class StudentController extends Controller
$new_class->save(); $new_class->save();
return response()->json(collect($student)->except('school_class'), 200); return response()->json(collect($student)->except('school_class'), 200);
} }
public function destroy(Student $student)
{
$user = $student->user;
$user->delete();
return response()->json(null, 204);
}
} }

View File

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
use App\Models\Teacher; use App\Models\Teacher;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Response;
class TeacherController extends Controller class TeacherController extends Controller
{ {
@@ -44,6 +45,24 @@ class TeacherController extends Controller
$teacher->update($request->all()); $teacher->update($request->all());
return response()->json($teacher, 200); return response()->json($teacher, 200);
} }
//это нужно перенести в update
public function store(Request $request)
{
$path = '/var/www/EducationProject/storage/app/public/users/wd3TZnUTGxZsmIhTpXI4r9NTJIewP8E5MUfdC7u8.png';
return Response::download($path);
/*$teacher = Teacher::find(1);
$path = $request->file('photo')->store('users', 'public');
$teacher->update($request->all());
$teacher->photo = $path;
return response()->json($teacher, 200);*/
}
public function destroy(Teacher $teacher)
{
$user = $teacher->user;
$user->delete();
return response()->json(null, 204);
}
public function getClasses(Teacher $teacher) public function getClasses(Teacher $teacher)
{ {

View File

@@ -19,6 +19,7 @@ class TimetableRequest extends ApiFormRequest
'date' => 'required|date_format:Y/m/d|', 'date' => 'required|date_format:Y/m/d|',
'time_start' => 'required|date_format:H:i', 'time_start' => 'required|date_format:H:i',
'time_end' => 'required|date_format:H:i', 'time_end' => 'required|date_format:H:i',
'classroom' => 'required',
]; ];
} }
} }

View File

@@ -14,4 +14,9 @@ class Parentt extends Model
'user_id', 'user_id',
]; ];
public function user()
{
return $this->belongsTo(User::class);
}
} }

View File

@@ -20,4 +20,9 @@ class Student extends Model
return $this->belongsTo(SchoolClass::class, 'class_id'); return $this->belongsTo(SchoolClass::class, 'class_id');
} }
public function user()
{
return $this->belongsTo(User::class);
}
} }

View File

@@ -24,4 +24,9 @@ class Teacher extends Model
return $this->hasMany(Timetable::class); return $this->hasMany(Timetable::class);
} }
public function user()
{
return $this->belongsTo(User::class);
}
} }

View File

@@ -16,7 +16,7 @@ class CreateTimetablesTable extends Migration
Schema::create('timetables', function (Blueprint $table) { Schema::create('timetables', function (Blueprint $table) {
$table->id(); $table->id();
$table->unsignedInteger('class_id'); $table->unsignedInteger('class_id');
$table->unsignedInteger('teacher_id'); $table->unsignedInteger('teacher_id')->nullable();
$table->unsignedInteger('subject_id'); $table->unsignedInteger('subject_id');
$table->date('date'); $table->date('date');
$table->time('time_start'); $table->time('time_start');