Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mediatek
Base de données Mediatek
Commits
15221db6
Commit
15221db6
authored
Jul 03, 2017
by
Med
Browse files
Fonction de recherche
parent
0738b143
Changes
3
Hide whitespace changes
Inline
Side-by-side
search/forms.py
View file @
15221db6
...
...
@@ -35,6 +35,7 @@ CHOICES2 = (
(
'0'
,
'Utilisateurs'
),
(
'1'
,
'Media'
),
(
'2'
,
'Emprunts'
),
(
'3'
,
'Jeu'
),
)
...
...
search/templates/search/index.html
View file @
15221db6
...
...
@@ -40,7 +40,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<h2>
Résultats dans les media :
</h2>
{% include "media/aff_medias.html" with medias_list=medias_list %}
{% endif %}
{% if not users_list and not emprunts_list and not medias_list %}
{% if jeux_list %}
<h2>
Résultats dans les jeux :
</h2>
{% include "media/aff_jeux.html" with jeux_list=jeux_list %}
{% endif %}
{% if not users_list and not emprunts_list and not medias_list and not jeux_list %}
<h3>
Aucun résultat
</h3>
{% endif %}
<h6>
(Seulement les {{ max_result }} premiers résultats sont affichés dans chaque catégorie)
</h6>
...
...
search/views.py
View file @
15221db6
...
...
@@ -35,7 +35,7 @@ from search.forms import SearchForm, SearchFormPlus
from
med.settings
import
SEARCH_DISPLAY_PAGE
from
media.models
import
Media
,
Emprunt
from
media.models
import
Media
,
Jeu
,
Emprunt
def
form
(
ctx
,
template
,
request
):
c
=
ctx
...
...
@@ -54,7 +54,7 @@ def search_result(search, type, request):
date_fin
=
search
.
cleaned_data
[
'date_fin'
]
date_query
=
Q
()
if
aff
==
[]:
aff
=
[
'0'
,
'1'
,
'2'
]
aff
=
[
'0'
,
'1'
,
'2'
,
'3'
]
if
date_deb
!=
None
:
date_query
=
date_query
&
Q
(
date_emprunt__gte
=
date_deb
)
if
date_fin
!=
None
:
...
...
@@ -66,7 +66,7 @@ def search_result(search, type, request):
connexion
=
[]
recherche
=
{
'users_list'
:
None
,
'emprunts_list'
:
None
,
'medias_list'
:
None
}
recherche
=
{
'users_list'
:
None
,
'emprunts_list'
:
None
,
'medias_list'
:
None
,
'jeux_list'
:
None
}
if
request
.
user
.
has_perms
((
'perm'
,)):
query
=
Q
(
user__pseudo__icontains
=
search
)
|
Q
(
user__name__icontains
=
search
)
|
Q
(
user__surname__icontains
=
search
)
...
...
@@ -85,6 +85,9 @@ def search_result(search, type, request):
recherche
[
'emprunts_list'
]
=
Emprunt
.
objects
.
filter
(
query
&
date_query
).
order_by
(
'date_emprunt'
).
reverse
()
if
i
==
'2'
:
recherche
[
'medias_list'
]
=
Media
.
objects
.
filter
(
Q
(
auteur__nom__icontains
=
search
)
|
Q
(
titre__icontains
=
search
))
if
i
==
'3'
:
recherche
[
'jeux_list'
]
=
Jeu
.
objects
.
filter
(
Q
(
nom__icontains
=
search
)
|
Q
(
proprietaire__pseudo__icontains
=
search
)
|
Q
(
proprietaire__name__icontains
=
search
)
|
Q
(
proprietaire__surname__icontains
=
search
))
for
r
in
recherche
:
if
recherche
[
r
]
!=
None
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment