Merge branch 'dev' of github.com:yungifez/skuul into dev

yungifez · Dec 12, 2023 · 64251b8 · 64251b8
2 parents f4b6049 + 1038e44
commit 64251b8
Show file tree

Hide file tree

Showing 26 changed files with 1 addition and 25 deletions.
diff --git a/app/Livewire/ApplicationHistory.php b/app/Livewire/ApplicationHistory.php
@@ -11,7 +11,6 @@ class ApplicationHistory extends Component
 
     public function mount()
     {
-
         $this->applicant->loadMissing('accountApplication', 'accountApplication.statuses');
     }
 

diff --git a/app/Livewire/AssignStudentsToParent.php b/app/Livewire/AssignStudentsToParent.php
@@ -27,7 +27,6 @@ class AssignStudentsToParent extends Component
 
     public function mount(SectionService $sectionService, MyClassService $myClassService)
     {
-
         $this->classes = $myClassService->getAllClasses();
         if ($this->classes->isEmpty()) {
             return;

diff --git a/app/Livewire/AssignTeacherToSubjects.php b/app/Livewire/AssignTeacherToSubjects.php
@@ -27,7 +27,6 @@ class AssignTeacherToSubjects extends Component
 
     public function mount(TeacherService $teacherService, MyClassService $myclassService)
     {
-
         $this->classes = $myclassService->getAllClasses();
         $this->class = $this->classes->first()?->id;
         $this->teachers = $teacherService->getAllTeachers();

diff --git a/app/Livewire/ChangeAccountApplicationStatus.php b/app/Livewire/ChangeAccountApplicationStatus.php
@@ -17,7 +17,6 @@ class ChangeAccountApplicationStatus extends Component
 
     public function mount(User $applicant)
     {
-
         $this->applicant = $applicant;
 
         //return null if no applicant record

diff --git a/app/Livewire/CreateCustomTimetableItemForm.php b/app/Livewire/CreateCustomTimetableItemForm.php
@@ -6,7 +6,6 @@
 
 class CreateCustomTimetableItemForm extends Component
 {
-
     public function render()
     {
         return view('livewire.create-custom-timetable-item-form');

diff --git a/app/Livewire/CreateFeeCategoryForm.php b/app/Livewire/CreateFeeCategoryForm.php
@@ -6,7 +6,6 @@
 
 class CreateFeeCategoryForm extends Component
 {
-
     public function render()
     {
         return view('livewire.create-fee-category-form');

diff --git a/app/Livewire/DashboardDataCards.php b/app/Livewire/DashboardDataCards.php
@@ -25,7 +25,6 @@ class DashboardDataCards extends Component
 
     public function mount(SectionService $sectionService)
     {
-
         $this->schools = School::count();
         $this->classGroups = auth()->user()->school->classGroups()->count();
         $this->classes = auth()->user()->school->myClasses()->count();

diff --git a/app/Livewire/EditAcademicYearForm.php b/app/Livewire/EditAcademicYearForm.php
@@ -9,7 +9,6 @@ class EditAcademicYearForm extends Component
 {
     public AcademicYear $academicYear;
 
-
     public function render()
     {
         return view('livewire.edit-academic-year-form');

diff --git a/app/Livewire/EditCustomTimetableItemForm.php b/app/Livewire/EditCustomTimetableItemForm.php
@@ -9,7 +9,6 @@ class EditCustomTimetableItemForm extends Component
 {
     public CustomTimetableItem $customTimetableItem;
 
-
     public function render()
     {
         return view('livewire.edit-custom-timetable-item-form');

diff --git a/app/Livewire/EditExamForm.php b/app/Livewire/EditExamForm.php
@@ -14,7 +14,6 @@ class EditExamForm extends Component
 
     public function mount(SemesterService $semesterService)
     {
-
         $this->semesters = $semesterService->getAllSemestersInAcademicYear(auth()->user()->school->academic_year_id);
     }
 

diff --git a/app/Livewire/EditParentForm.php b/app/Livewire/EditParentForm.php
@@ -9,7 +9,6 @@ class EditParentForm extends Component
 {
     public User $parent;
 
-
     public function render()
     {
         return view('livewire.edit-parent-form');

diff --git a/app/Livewire/ListFeeInvoicesTable.php b/app/Livewire/ListFeeInvoicesTable.php
@@ -14,7 +14,6 @@ class ListFeeInvoicesTable extends Component
 
     public function mount()
     {
-
         $this->year = date('Y');
         $this->queryAddon = [];
         $this->status = $this->status ?? 'due';

diff --git a/app/Livewire/ListGradeSystemsTable.php b/app/Livewire/ListGradeSystemsTable.php
@@ -19,7 +19,6 @@ class ListGradeSystemsTable extends Component
 
     public function mount(MyClassService $myClassService)
     {
-
         // Get all class groups
         $this->classGroups = $myClassService->getAllClassGroups();
 

diff --git a/app/Livewire/ListPromotionsTable.php b/app/Livewire/ListPromotionsTable.php
@@ -11,7 +11,6 @@ class ListPromotionsTable extends Component
 
     public function mount(AcademicYearService $academicYearService)
     {
-
         if (!$this->academicYear) {
             $this->academicYear = auth()->user()->school->load('academicYear')->academicYear->first();
         } else {

diff --git a/app/Livewire/NationalityAndStateInputFields.php b/app/Livewire/NationalityAndStateInputFields.php
@@ -22,7 +22,6 @@ class NationalityAndStateInputFields extends Component
 
     public function mount()
     {
-
         // @phpstan-ignore-next-line
         $this->nationalities = World::countries()->data->pluck('name');
 

diff --git a/app/Livewire/PayInvoiceForm.php b/app/Livewire/PayInvoiceForm.php
@@ -10,7 +10,6 @@ class PayInvoiceForm extends Component
 
     public function mount()
     {
-
         $this->feeInvoice->loadMissing('feeInvoiceRecords', 'feeInvoiceRecords.fee');
     }
 

diff --git a/app/Livewire/PromoteStudents.php b/app/Livewire/PromoteStudents.php
@@ -34,7 +34,6 @@ class PromoteStudents extends Component
 
     public function mount(MyclassService $myClassService)
     {
-
         $this->classes = $myClassService->getAllClasses();
 
         //set default values

diff --git a/app/Livewire/RegistrationForm.php b/app/Livewire/RegistrationForm.php
@@ -14,7 +14,6 @@ class RegistrationForm extends Component
 
     public function mount(SchoolService $schoolService)
     {
-
         $this->schools = $schoolService->getAllSchools();
         $this->roles = Role::whereIn('name', ['teacher', 'student', 'parent'])->get();
     }

diff --git a/app/Livewire/ResultChecker.php b/app/Livewire/ResultChecker.php
@@ -51,7 +51,6 @@ class ResultChecker extends Component
 
     public function mount(MyClassService $myClassService)
     {
-
         $this->academicYears = auth()->user()->school->academicYears;
         $this->academicYear = auth()->user()->school->academicYear->id;
         $this->updatedAcademicYear();

diff --git a/app/Livewire/SemesterResultTabulation.php b/app/Livewire/SemesterResultTabulation.php
@@ -34,7 +34,6 @@ class SemesterResultTabulation extends Component
 
     public function mount(SectionService $sectionService, MyClassService $myClassService)
     {
-
         //get semester and use it to fetch all exams in semester
         $this->semester = auth()->user()->school->semester;
         $this->classes = $myClassService->getAllClasses();

diff --git a/app/Livewire/SetAcademicYear.php b/app/Livewire/SetAcademicYear.php
@@ -11,7 +11,6 @@ class SetAcademicYear extends Component
 
     public function mount(AcademicYearService $academicYearService)
     {
-
         $this->academicYears = $academicYearService->getAllAcademicYears();
     }
 

diff --git a/app/Livewire/SetSchool.php b/app/Livewire/SetSchool.php
@@ -11,7 +11,6 @@ class SetSchool extends Component
 
     public function mount(SchoolService $schoolService)
     {
-
         $this->schools = $schoolService->getAllSchools();
     }
 

diff --git a/app/Livewire/SetSemester.php b/app/Livewire/SetSemester.php
@@ -11,7 +11,6 @@ class SetSemester extends Component
 
     public function mount(SemesterService $semesterService)
     {
-
         $this->semesters = $semesterService->getAllSemestersInAcademicYear(auth()->user()->school->academicYear->id);
     }
 

diff --git a/app/Livewire/ShowAcademicYear.php b/app/Livewire/ShowAcademicYear.php
@@ -11,7 +11,6 @@ class ShowAcademicYear extends Component
 
     public function mount(AcademicYear $academicYear)
     {
-
         $this->academicYear = $academicYear->loadMissing('semesters');
     }
 

diff --git a/app/Livewire/ShowAccountApplication.php b/app/Livewire/ShowAccountApplication.php
@@ -11,7 +11,6 @@ class ShowAccountApplication extends Component
 
     public function mount()
     {
-
         $this->applicant->loadMissing('accountApplication.statuses');
     }
 

diff --git a/app/Models/AccountApplication.php b/app/Models/AccountApplication.php
@@ -16,6 +16,7 @@ class AccountApplication extends Model
 
     protected $fillable = ['role_id', 'user_id'];
     protected $accountStatuses = ['approved', 'rejected', 'under review', 'user action required'];
+
     /**
      * Get the user that owns the AccountApplication.
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ class ApplicationHistory extends Component @@
         public function mount()
         {
             $this->applicant->loadMissing('accountApplication', 'accountApplication.statuses');
         }
@@ Expand Down @@