# HG changeset patch # User cavaliet # Date 1309970043 -7200 # Node ID 03698c739b1da7cf4b69a2cea356efdfef20f72a # Parent 953ee4c9c7c3417f4fb72561777d691688143c5e #8 : Better url management with datasheet id and context in parameter. #13 : Recherche la liste de fiches concernées par un tag. diff -r 953ee4c9c7c3 -r 03698c739b1d web/hdabo/templates/generic_sheet.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/hdabo/templates/generic_sheet.html Wed Jul 06 18:34:03 2011 +0200 @@ -0,0 +1,80 @@ +{% extends "hdabo_base.html" %} + {% block title %}HDA - BO : Fiches pour {{ orga_name }}{% endblock %} + + {% block js_import %} + {{block.super}} + + + + {% endblock %} + + {% block js_declaration %} + {{block.super}} + {% if valid != "2" %} + + {% endif %} + {% endblock %} + + {% block css_import %} + {{block.super}} + + {% endblock %} + + {% block css_declaration %} + {{block.super}} + + {% endblock %} + + + {% block content %} + {{block.super}} +

Fiche(s) {% if valid %}validées{% else %}non validées{% endif %} + pour l'organisation {{ orga_name }} : {{nb_sheets}} fiche(s)

<< + < + {{displayed_index}}/{{nb_sheets}} + > + >>

+ + +

+ {% include "partial/one_sheet.html" %} +

<< + < + {{displayed_index}}/{{nb_sheets}} + > + >>

+ {% endblock %} diff -r 953ee4c9c7c3 -r 03698c739b1d web/hdabo/templates/hdabo_base.html --- a/web/hdabo/templates/hdabo_base.html Tue Jul 05 17:16:58 2011 +0200 +++ b/web/hdabo/templates/hdabo_base.html Wed Jul 06 18:34:03 2011 +0200 @@ -66,7 +66,7 @@

{% block content %} {% endblock %} -

{% block footer %} diff -r 953ee4c9c7c3 -r 03698c739b1d web/hdabo/templates/organisation_list.html --- a/web/hdabo/templates/organisation_list.html Tue Jul 05 17:16:58 2011 +0200 +++ b/web/hdabo/templates/organisation_list.html Wed Jul 06 18:34:03 2011 +0200 @@ -16,11 +16,11 @@ {{ item.organisation.name|default:"_" }} (lien) {% if item.nb_unval > 0 %} - {{item.nb_unval}} + {{item.nb_unval}} {% else %}0{% endif %} {% if item.nb_val > 0 %} - {{item.nb_val}} + {{item.nb_val}} {% else %}0{% endif %} {% if item.nb_all > 0 %} diff -r 953ee4c9c7c3 -r 03698c739b1d web/hdabo/templates/partial/all_tags_table.html --- a/web/hdabo/templates/partial/all_tags_table.html Tue Jul 05 17:16:58 2011 +0200 +++ b/web/hdabo/templates/partial/all_tags_table.html Wed Jul 06 18:34:03 2011 +0200 @@ -32,7 +32,13 @@ {% if tag.category %}{{ tag.category }}{% endif %} {{tag.label}}

{% if tag.alias %}{{tag.alias}}{% endif %} - {{tag.num_ds}} + + {% if tag.num_ds > 0 %} + {{tag.num_ds}} + {% else %} + {{tag.num_ds}} + {% endif %} + {{tag.popularity}} {% endfor %} diff -r 953ee4c9c7c3 -r 03698c739b1d web/hdabo/templates/partial/one_sheet.html --- a/web/hdabo/templates/partial/one_sheet.html Tue Jul 05 17:16:58 2011 +0200 +++ b/web/hdabo/templates/partial/one_sheet.html Wed Jul 06 18:34:03 2011 +0200 @@ -22,7 +22,7 @@

En cours Validé {% if ds.validated %} - par {{ds.validator.username}} le {{ds.validation_date|date:"d/m/Y"}} + par {{ds.validator.username}} le {{ds.validation_date|date:"d/m/Y"}} {% endif %} {% if valid != "2" %} Ajouter un tag : OK diff -r 953ee4c9c7c3 -r 03698c739b1d web/hdabo/urls.py --- a/web/hdabo/urls.py Tue Jul 05 17:16:58 2011 +0200 +++ b/web/hdabo/urls.py Wed Jul 06 18:34:03 2011 +0200 @@ -24,6 +24,8 @@ url(r'^list/(?P[\w-]+)/(?P[\w-]+)/$', 'hdabo.views.list_for_orga', name='list_for_orga'), url(r'^list/(?P[\w-]+)/(?P[\w-]+)/(?P[\w-]+)/$', 'hdabo.views.list_for_orga', name='list_for_orga'), url(r'^list/(?P[\w-]+)/(?P[\w-]+)/(?P[\w-]+)/(?P[\w-]+)/$', 'hdabo.views.list_for_orga', name='list_for_orga'), + url(r'^data$', 'hdabo.views.display_datasheet', name='display_datasheet'), + url(r'^data/(?P[\w-]+)$', 'hdabo.views.display_datasheet', name='display_datasheet'), url(r'^tagupdown$', 'hdabo.views.tag_up_down'), url(r'^removetagfromlist$', 'hdabo.views.remove_tag_from_list'), url(r'^modifytag$', 'hdabo.views.modify_tag'), diff -r 953ee4c9c7c3 -r 03698c739b1d web/hdabo/views.py --- a/web/hdabo/views.py Tue Jul 05 17:16:58 2011 +0200 +++ b/web/hdabo/views.py Wed Jul 06 18:34:03 2011 +0200 @@ -4,7 +4,7 @@ from django.contrib.auth.decorators import login_required #@UnusedImport from django.core.paginator import Paginator from django.db import connection -from django.db.models import Max, Count +from django.db.models import Max, Count, Min from django.http import HttpResponseBadRequest from django.shortcuts import render_to_response, redirect from django.template import RequestContext @@ -28,14 +28,26 @@ org_list = [] all_ds_mapping = dict([(res['organisation'],res['nb_all']) for res in Datasheet.objects.values("organisation").annotate(nb_all=Count("organisation"))]) - validated_ds_mapping = dict([(res['organisation'],res['nb_val']) for res in Datasheet.objects.filter(validated=True).values("organisation").annotate(nb_val=Count("organisation"))]) - unvalidated_ds_mapping = dict([(res['organisation'],res['nb_unval']) for res in Datasheet.objects.filter(validated=False).values("organisation").annotate(nb_unval=Count("organisation"))]) + validated_ds_mapping = dict([(res['organisation'],[res['nb_val'],res['first_id_val']]) for res in Datasheet.objects.filter(validated=True).values("organisation").annotate(nb_val=Count("organisation")).annotate(first_id_val=Min("id"))]) + unvalidated_ds_mapping = dict([(res['organisation'],[res['nb_unval'],res['first_id_unval']]) for res in Datasheet.objects.filter(validated=False).values("organisation").annotate(nb_unval=Count("organisation")).annotate(first_id_unval=Min("id"))]) for orga in orgas : nb_all = all_ds_mapping.get(orga.id,0) - nb_val = validated_ds_mapping.get(orga.id,0) - nb_unval = unvalidated_ds_mapping.get(orga.id,0) - org_list.append({'organisation':orga, 'nb_all':nb_all, 'nb_val':nb_val, 'nb_unval':nb_unval}) + duo_val = validated_ds_mapping.get(orga.id,0) + if duo_val != 0: + nb_val = duo_val[0] + first_id_val = duo_val[1] + else : + nb_val = 0 + first_id_val = None + duo_unval = unvalidated_ds_mapping.get(orga.id,0) + if duo_unval != 0: + nb_unval = duo_unval[0] + first_id_unval = duo_unval[1] + else : + nb_unval = 0 + first_id_unval = None + org_list.append({'organisation':orga, 'nb_all':nb_all, 'nb_val':nb_val, 'first_id_val':first_id_val, 'nb_unval':nb_unval, 'first_id_unval':first_id_unval}) return render_to_response("organisation_list.html", {'organisations':org_list}, @@ -43,6 +55,59 @@ @login_required +def display_datasheet(request, ds_id=None): + + if ds_id : + ds = Datasheet.objects.get(id=ds_id) + start_index = None + + # In this function the context is given by the get parameters. + # If there is searched_tag parameter, it means that we display all the ds tagged by one particular tag + if "searched_tag" in request.GET : + param_str = "?searched_tag=" + request.GET["searched_tag"] + datasheets_qs = Datasheet.objects.filter(tags__in=[Tag.objects.get(id=int(request.GET["searched_tag"]))]).order_by("organisation__name","original_creation_date").select_related("format") + # If searched_tag is set and if ds_id is None, it means that we have to display the first ds + if not ds_id : + start_index = 0 + ds = datasheets_qs[0] + else : + param_str = "" + # The current list depends on the ds's validation state + datasheets_qs = Datasheet.objects.filter(organisation=ds.organisation).filter(validated=ds.validated).order_by("id").select_related("format") + + # Since a QuerySet is not a list, we cannot find easily the current ds's index + if not start_index : + i = 0 + for searched_ds in datasheets_qs : + if searched_ds==ds : + start_index = i + break + i += 1 + + nb_sheets = datasheets_qs.count() + + # We get the ORDERED tags if we display one sheet (case valid = 0 and 1) + ordered_tags = TaggedSheet.objects.filter(datasheet=ds).select_related("tag").order_by('order') + + displayed_index = start_index + 1; + zero_id = datasheets_qs[0].id + prev_index = max(start_index - 1, 0); + prev_id = datasheets_qs[prev_index].id + next_index = min(nb_sheets - 1, start_index + 1); + next_id = datasheets_qs[next_index].id + last_index = max(nb_sheets - 1, 0); + last_id = datasheets_qs[last_index].id + + return render_to_response("generic_sheet.html", + {'ds':ds, 'orga_name':ds.organisation.name, + 'nb_sheets':nb_sheets, 'ordered_tags':ordered_tags, + 'zero_id':zero_id, 'prev_id':prev_id, 'next_id':next_id, 'last_id':last_id, + 'displayed_index':displayed_index, 'valid':ds.validated, + 'param_str':param_str, 'categories':json.dumps(get_categories())}, + context_instance=RequestContext(request)) + + +@login_required def list_for_orga(request, orga_id=None, valid=None, start_index=None): orga = Organisation.objects.get(id=orga_id) @@ -394,16 +459,11 @@ else : ds.unvalidate() ds.save() + # If there are still some unvalidated/validated ds for the ds's orga, we display the first one same_organisation_ds = Datasheet.objects.filter(organisation=ds.organisation).filter(validated=not valid) - if valid : - # We ask to display the unvalidated ds - valid_req = 0 - else : - # We ask to display the validated ds - valid_req = 1 if len(same_organisation_ds) > 0 : - return redirect('list_for_orga', orga_id=ds.organisation.id, valid=valid_req) + return redirect('display_datasheet', ds_id=same_organisation_ds[0].id) else : return redirect('home')