operation_module_code_clean

.github/workflows/coding-standards.yml

@@ -25,4 +25,4 @@ jobs:
       - name: clear cache
         run: php artisan cache:clear
       - name: ColoredCowLaravelCI
-        run: "php artisan check:ci --with-tty"
+        run: php artisan check:ci --with-tty

.php-cs-fixer.php

@@ -82,6 +82,10 @@
     'normalize_index_brace' => true,
     'not_operator_with_successor_space' => true,
     'object_operator_without_whitespace' => true,
+    'phpdoc_no_alias_tag' => true,
+    'phpdoc_align' => [
+        'tags' => ['param', 'return', 'throws', 'type'],
+    ],
     'phpdoc_indent' => true,
     'phpdoc_no_access' => true,
     'phpdoc_no_package' => true,

Modules/CodeTrek/Entities/CodeTrekApplicant.php

@@ -7,7 +7,6 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Modules\CodeTrek\Database\factories\CodeTrekApplicantFactory;
-use Modules\Operations\Entities\OfficeLocation;
 use Modules\User\Entities\User;
 
 class CodeTrekApplicant extends Model
@@ -25,11 +24,6 @@ public static function factory()
         return new CodeTrekApplicantFactory();
     }
 
-    public function center()
-    {
-        return $this->belongsTo(OfficeLocation::class, 'center_id');
-    }
-
     public function getDaysInCodetrekAttribute()
     {
         $internshipStartDate = Carbon::parse($this->internship_start_date);

Modules/CodeTrek/Http/Controllers/CodeTrekController.php

@@ -8,7 +8,6 @@
 use Modules\CodeTrek\Entities\CodeTrekApplicant;
 use Modules\CodeTrek\Http\Requests\CodeTrekRequest;
 use Modules\CodeTrek\Services\CodeTrekService;
-use Modules\Operations\Entities\OfficeLocation;
 use Modules\User\Entities\User;
 
 class CodeTrekController extends Controller
@@ -28,7 +27,6 @@ public function index(Request $request)
     {
         // $this->authorize('view', $applicant);     There are some issues in the production, which is why these lines are commented out.
 
-        $centres = OfficeLocation::all();
         $mentors = User::all();
         $applicantData = $this->service->getCodeTrekApplicants($request->all());
         $applicants = $applicantData['applicants'];
@@ -41,7 +39,6 @@ public function index(Request $request)
 
         return view('codetrek::index', [
             'applicants' => $applicants,
-            'centres' => $centres,
             'mentors' => $mentors,
             'reportApplicationCounts' => $reportApplicationCounts,
             'statusCounts' => $statusCounts,
@@ -78,12 +75,10 @@ public function edit(CodeTrekApplicant $applicant)
     {
         // $this->authorize('update', $applicant);   There are some issues in the production, which is why these lines are commented out.
 
-        $centres = OfficeLocation::all();
-
         $mentors = User::all();
         $this->service->edit($applicant);
 
-        return view('codetrek::edit', ['applicant' => $applicant, 'centres' => $centres, 'mentors' => $mentors]);
+        return view('codetrek::edit', ['applicant' => $applicant,  'mentors' => $mentors]);
     }
     public function evaluate(CodeTrekApplicant $applicant)
     {

Modules/CodeTrek/Resources/views/edit.blade.php

@@ -2,12 +2,12 @@
 @section('content')
 
 <div class="container" id="update_details">
-    <div  class="card-body">
+    <div class="card-body">
         <form action="{{route('codetrek.update', $applicant)}}" method="POST" id='updateForm' enctype="multipart/form-data">
             @csrf
             <input type="hidden" name="codetrek" value="applicant->id">
             <div class="card-body">
-                <h4 class="mb-3 font-weight-bold">Edit Applicant information</h4>
+                <h4 class="mb-3 font-weight-bold">Edit Applicant Information</h4>
                 @if ($errors->any())
                     <div class="alert alert-danger">
                         <ul>
@@ -71,15 +71,6 @@
                                 @endfor
                             </select>
                         </div>
-                        <div class="form-group offset-md-1 col-md-5">
-                            <label for="centre" class="field-required">Centre Name</label>
-                            <select name="centre" id="centreId" class="form-control" required>
-                                <option value="">Select Centre Name</option>
-                                @foreach($centres as $centre)
-                                    <option value="{{ $centre->id }}" {{ $applicant->centre_id == $centre->id ? 'selected' : '' }}>{{ $centre->centre_name }}</option>
-                                @endforeach
-                            </select>
-                        </div>
                     </div>
                     <div class="form-row">
                         <div class="form-group  col-md-5">

Modules/CodeTrek/Resources/views/index.blade.php

@@ -34,7 +34,7 @@
             <div>
                 <form action="{{ route('codetrek.index') }}" id="centreFilterForm">
                     <div class="form-group ml-25 w-180">
-                        @can('codetrek_applicant.create')     
+                        @can('codetrek_applicant.create')
                             <select class="form-control bg-light" name="centre" id="centre" onchange="document.getElementById('centreFilterForm').submit();">
                                 <option value="" {{ !request()->has('centre') || empty(request()->get('centre')) ? 'selected' : '' }}>
                                     {!! __('All Centres') !!}
@@ -83,7 +83,7 @@
                         <span class="d-inline-block h-18 w-20">{!! file_get_contents(public_path('icons/clipboard-check.svg')) !!}</span>
                         Active({{ $statusCounts['active'] }})
                     </a>
-                </li>                
+                </li>
                 <li class="nav-item mr-3">
                     @php
                         $inactiveParams = array_merge(request()->except(['status']), ['status' => 'inactive']);
@@ -96,7 +96,7 @@
                         <span class="d-inline-block h-18 w-20">{!! file_get_contents(public_path('icons/x-circle.svg')) !!}</span>
                         Inactive({{ $statusCounts['inactive'] }})
                     </a>
-                </li>                
+                </li>
                 <li class="nav-item mr-3">
                     @php
                         $completedParams = ['name' => $name, 'centre' => $centre, 'status' => 'completed'];
@@ -109,7 +109,7 @@
                         <span class="d-inline-block h-18 w-20">{!! file_get_contents(public_path('icons/person-check.svg')) !!}</span>
                         Completed({{ $statusCounts['completed'] }})
                     </a>
-                </li>    
+                </li>
             </div>
             @elseif (request()->tab == 'reports')
             <li class="nav-item mr-3">
@@ -165,7 +165,7 @@
                     <tbody>
                         @forelse ($applicants as $applicant)
                             <tr>
-                                <td>  
+                                <td>
                                     <div class="d-flex align-items-center">
                                         <div class="d-flex align-items-center">
                                             <h4>{{ $applicant->first_name }} {{ $applicant->last_name }}</h4>
@@ -207,15 +207,15 @@ class="btn-sm btn-primary mr-1 text-decoration-none"
                                         <span class="{{ config('codetrek.rounds.' . $applicant->latest_round_name . '.class') }} badge-pill mr-1 mb-1 fz-16">
                                             {{ config('codetrek.rounds.' . $applicant->latest_round_name . '.label') }}
                                         </span>
-                                    </div>                                    
+                                    </div>
                                 </td>
                                 <td>
-                                    <div class="d-flex align-items-center"> 
+                                    <div class="d-flex align-items-center">
                                         @if ($applicant->mentor)
                                             <div class="col">
-                                                <div class="d-flex align-items-center"> 
+                                                <div class="d-flex align-items-center">
                                                     <img src="{{ $applicant->mentor->avatar }}" class="w-35 h-30 rounded-circle ">
-                                                    <h4 class="ml-2 mb-0">{{ $applicant->mentor->name }}</h4> 
+                                                    <h4 class="ml-2 mb-0">{{ $applicant->mentor->name }}</h4>
                                                 </div>
                                             </div>
                                         @else
@@ -249,7 +249,7 @@ class="btn-sm btn-primary mr-1 text-decoration-none"
                 </div>
                 <canvas class="w-full" id="CodeTrekApplicationReport"></canvas>
             </div>
-        </div>     
+        </div>
         @endif
     </div>
 @endsection

Modules/CodeTrek/Resources/views/modals/add-applicant-modal.blade.php

@@ -72,15 +72,6 @@
                                     @endfor
                                 </select>
                             </div>
-                            <div class="form-group offset-md-1 col-md-5">
-                                <label for="centre" class="field-required">Centre Name</label>
-                                <select name="centre" id="centreId" class="form-control" required>
-                                    <option value="">Select Centre Name</option>
-                                    @foreach($centres as $centre)
-                                        <option value="{{ $centre->id }}">{{ $centre->centre_name }}</option>
-                                    @endforeach
-                                </select>
-                            </div>
                         </div>
                         <div class="form-row">
                             <div class="form-group  col-md-5">

Modules/CodeTrek/Services/CodeTrekService.php

@@ -80,7 +80,6 @@ public function store($data)
         $applicant->start_date = $data['start_date'];
         $applicant->graduation_year = $data['graduation_year'] ?? null;
         $applicant->university = $data['university_name'] ?? null;
-        $applicant->centre_id = $data['centre'];
         $applicant->mentor_id = $data['mentorId'];
         $applicant->domain_name = $data['domain'];
         $applicant->latest_round_name = config('codetrek.rounds.introductory-call.slug');

Modules/Expense/Resources/views/create.blade.php

@@ -61,15 +61,6 @@
                             </select>
 
                         </div>
-                        <div class="form-group offset-md-1 col-md-5">
-                            <label for="location" class="field-required">Location</label>
-                            <select class="form-control" name="location">
-                                <option value="">Select Location</option>
-                                @foreach (config('constants.office_locations') as $office => $location)
-                                    <option value="{{ $office }}">{{ $location }}</option>
-                                @endforeach
-                            </select>
-                        </div>
                     </div>
                     <hr> 
                     <div class="parent">

Modules/Expense/Resources/views/edit.blade.php

@@ -62,17 +62,6 @@
                                 @endforeach
                             </select>
                         </div>
-                        <div class="form-group offset-md-1 col-md-5">
-                            <label for="location" class="field-required">Location</label>
-                            <select class="form-control" value="{{ $expense->location }}" name="location">
-                                <option value="disabled">Select Location</option>
-                                @foreach (config('constants.office_locations') as $office => $location)
-                                    <option
-                                        value="{{ $office }}"{{ $expense->location == $office ? 'selected' : '' }}>
-                                        {{ $location }}</option>
-                                @endforeach
-                            </select>
-                        </div>
                     </div>
                     <hr>
                     @foreach ($expenseFile as $document)