Skip to content

Commit

Permalink
Merge branch 'master' into frontend-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@viktorcsimma
viktorcsimma authored May 22, 2023
2 parents aaba899 + 4593eaa commit 2cc7c46
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .env.example
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
APP_NAME="Collegium Nostrum"
APP_NAME="Test Collegium Nostrum"
APP_ENV=local
APP_KEY=
APP_DEBUG=true
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/AlumnusController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ public function searchAlumni(Request $request)
$user = Auth::user();
if ($user && $user->can('create', Alumnus::class)) {
$idsHavingDraftPairs = DB::table('alumni')->where('is_draft', false)->whereNotNull('pair_id')->pluck('id');
$alumni = $query->whereNotIn('id', $idsHavingDraftPairs)->get();
$alumni = $query->whereNotIn('id', $idsHavingDraftPairs)->paginate(10);
} else {
$alumni = $query->where('is_draft', false)->get();
$alumni = $query->where('is_draft', false)->paginate(10);
}

return view('alumni.index', [
Expand Down
2 changes: 1 addition & 1 deletion app/Models/Major.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class Major extends Model
'keleti nyelvek és kultúrák (török)',
'keleti nyelvek és kultúrák (újgörög)',
'kereskedelem és marketing',
'kommunikáció-és médiatudomány',
'kommunikáció- és médiatudomány',
'kémia',
'könyvtár/(informatikus)-könyvtáros',
'környezettan',
Expand Down
42 changes: 26 additions & 16 deletions resources/views/alumni/create_or_edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,11 @@ class="form-check-input"
id="faculty-{{ $faculty }}"
name="university_faculties[]"
{{-- TODO: name, checked --}}

@checked(
in_array(strval($faculty), old('university_faculties', $alumnus->university_faculties->pluck('name')->toArray())))
)
@if (isset($alumnus))
@checked (
in_array(strval($faculty), old('university_faculties', $alumnus->university_faculties->pluck('name')->toArray()))
)
@endif
>
{{-- TODO --}}
<label for="faculty-{{ $faculty }}" class="form-check-label">
Expand Down Expand Up @@ -192,9 +193,11 @@ class="form-check-input"
name="majors[]"
{{-- TODO: name, checked --}}

@checked(
in_array(strval($major), old('majors', $alumnus->majors->pluck('name')->toArray())))
)
@if (isset($alumnus))
@checked (
in_array(strval($major), old('majors', $alumnus->majors->pluck('name')->toArray()))
)
@endif
>
{{-- TODO --}}
<label for="major-{{ $major }}" class="form-check-label">
Expand Down Expand Up @@ -249,9 +252,11 @@ class="form-check-input"
name="further_courses[]"
{{-- TODO: name, checked --}}

@checked(
in_array(strval($further_course), old('further_courses', $alumnus->further_courses->pluck('name')->toArray())))
)
@if (isset($alumnus))
@checked (
in_array(strval($further_course), old('further_courses', $alumnus->further_courses->pluck('name')->toArray()))
)
@endif
>
{{-- TODO --}}
<label for="further_course-{{ $further_course }}" class="form-check-label">
Expand Down Expand Up @@ -314,9 +319,11 @@ class="form-check-input"
name="scientific_degrees[]"
{{-- TODO: name, checked --}}

@checked(
in_array(strval($scientific_degree), old('scientific_degrees', $alumnus->scientific_degrees->pluck('name')->toArray())))
)
@if (isset($alumnus))
@checked (
in_array(strval($scientific_degree), old('scientific_degrees', $alumnus->scientific_degrees->pluck('name')->toArray()))
)
@endif
>
{{-- TODO --}}
<label for="scientific_degree-{{ $scientific_degree }}" class="form-check-label">
Expand Down Expand Up @@ -460,9 +467,12 @@ class="form-check-input"
name="research_fields[]"
{{-- TODO: name, checked --}}

@checked(
in_array(strval($research_field), old('research_fields', $alumnus->research_fields->pluck('name')->toArray())))
)

@if (isset($alumnus))
@checked (
in_array(strval($research_field), old('research_fields', $alumnus->research_fields->pluck('name')->toArray()))
)
@endif
>
{{-- TODO --}}
<label for="research_field-{{ $research_field }}" class="form-check-label">
Expand Down
25 changes: 18 additions & 7 deletions resources/views/alumni/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@
<div class="card-body">
<form method="GET" action="{{ route('alumni.search') }}" enctype="multipart/form-data">
@csrf
<input type="text" class="form-control" name="name" placeholder="Név">
<input type="text" class="form-control" placeholder="Collegiumi tagság kezdete" pattern="\d{4}" maxlength="4" name="start_of_membership">
<input type="text" class="form-control" name="name" placeholder="Név" value="{{ isset($_GET['name']) ? $_GET['name'] : '' }}">
<input type="text" class="form-control" placeholder="Collegiumi tagság kezdete" pattern="\d{4}" maxlength="4" name="start_of_membership" value="{{ isset($_GET['start_of_membership']) ? $_GET['start_of_membership'] : '' }}">
<div class="panel panel-default">
<div class="panel-body">
<div class="form-group">
<select name="major" class="form-control" id="majorDropdown">
<option value="">Szak kiválasztása</option>
@foreach ($majors_enum as $major)
<option value="{{ $major }}">{{ $major }}</option>
<option value="{{ $major }}" {{isset($_GET['major']) && $_GET['major'] == $major ? 'selected ' : ''}}>{{ $major }}</option>
@endforeach
</select>
</div>
Expand All @@ -63,7 +63,7 @@
<select name="further_course" class="form-control" id="furtherCourseDropdown">
<option value="">További pálya kiválasztása</option>
@foreach ($further_courses_enum as $further_course)
<option value="{{ $further_course }}">{{ $further_course }}</option>
<option value="{{ $further_course }}" {{isset($_GET['further_course']) && $_GET['further_course'] == $further_course ? 'selected ' : ''}}>{{ $further_course }}</option>
@endforeach
</select>
</div>
Expand All @@ -75,7 +75,7 @@
<select name="scientific_degree" class="form-control" id="scientificDegreeDropdown">
<option value="">Tudományos fokozat kiválasztása</option>
@foreach ($scientific_degrees_enum as $scientific_degree)
<option value="{{ $scientific_degree }}">{{ $scientific_degree }}</option>
<option value="{{ $scientific_degree }}" {{isset($_GET['scientific_degree']) && $_GET['scientific_degree'] == $scientific_degree ? 'selected ' : ''}}>{{ $scientific_degree }}</option>
@endforeach
</select>
</div>
Expand All @@ -87,7 +87,7 @@
<select name="research_field" class="form-control" id="researchFieldDropdown">
<option value="">Kutatási terület kiválasztása</option>
@foreach ($research_fields_enum as $research_field)
<option value="{{ $research_field }}">{{ $research_field }}</option>
<option value="{{ $research_field }}" {{isset($_GET['research_field']) && $_GET['research_field'] == $research_field ? 'selected ' : ''}}>{{ $research_field }}</option>
@endforeach
</select>
</div>
Expand Down Expand Up @@ -158,7 +158,7 @@
</div>
@endforelse
</div>
@if(isset($alumni) && !empty($alumni) && !isset($search))
@if(isset($alumni) && !empty($alumni))
<div class="d-flex justify-content-center">
{{ $alumni->links('pagination::bootstrap-4') }}
</div>
Expand Down Expand Up @@ -223,6 +223,17 @@
}
});
});
var links = document.getElementsByTagName("a");
const urlParams = new URLSearchParams(window.location.search);
urlParams.delete("_token");
urlParams.delete("page");
for (var i = 0; i < links.length; i++) {
if(links[i].href.includes("alumni/search?page=")){
links[i].href += "&" + urlParams.toString();
}
}
</script>

@endsection

0 comments on commit 2cc7c46

Please sign in to comment.