-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
1586 szybsze i wygodniejsze wybieranie studentow do tematu pracy dyplomowej #1704
Open
pumassv1
wants to merge
6
commits into
master-dev
Choose a base branch
from
1586-szybsze-i-wygodniejsze-wybieranie-studentow-do-tematu-pracy-dyplomowej
base: master-dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
de2d624
init
pumassv1 4c33bb2
split students field into selected and unselected, fixed saving thesis
pumassv1 d9ef452
refactor: filter students script moved to separate file, fixes
pumassv1 79ec5ff
fix: students assigned to thesis now shows when editing thesis
pumassv1 afe6600
forgot to run prettier
pumassv1 9cc3807
forgot to run prettier v2
pumassv1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -213,6 +213,23 @@ def edit_thesis(request, id): | |
'old_instance': thesis_dict | ||
}) | ||
|
||
from django.http import JsonResponse | ||
from django.db.models import Q | ||
|
||
def get_data(request): | ||
if request.method == 'GET': | ||
input_value = request.GET.get('input_value', '') | ||
|
||
filtered = Student.objects.filter( | ||
Q(matricula__icontains=input_value) | | ||
Q(user__first_name__icontains=input_value) | | ||
Q(user__last_name__icontains=input_value) | ||
) | ||
students_html = "" | ||
for student in filtered: | ||
students_html += f"<option value='{student.pk}'>{student.user.get_full_name()} ({student.matricula})</option>" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Z wielu powodów dobrze byłoby, gdyby ten widok nie budował od razu fragmentu HTML. Skoro i tak zwracamy JSONa, to niech to będzie kolekcja obiektów z informacjami o studentach, którą odbierający skrypt przetworzy na odpowiednie poddrzewo DOM. |
||
|
||
return JsonResponse({'filtered_students': students_html}) | ||
|
||
@employee_required | ||
def new_thesis(request): | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.