From 89f9e6afe8c00ace420335aa3bb5692410b9917d Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 13 May 2013 10:59:12 +0100 Subject: [PATCH] Add duplicate recipes/classes page Add page that lists recipes and classes "duplicated" across different layers. Signed-off-by: Paul Eggleton --- TODO | 2 +- layerindex/urls.py | 6 +- layerindex/views.py | 68 +++++++++++++------- templates/base.html | 9 +++ templates/layerindex/duplicates.html | 96 ++++++++++++++++++++++++++++ 5 files changed, 156 insertions(+), 25 deletions(-) create mode 100644 templates/layerindex/duplicates.html diff --git a/TODO b/TODO index fa01663..c69996f 100644 --- a/TODO +++ b/TODO @@ -20,7 +20,7 @@ Later: * Return to last page (review/detail) after editing (with success alert)? * Cancel button on edit form? * Query backend service? i.e. special URL to query information for external apps/scripts -* Tool for finding/comparing duplicate recipes? +* Add comparison to duplicates page * Tool for editing SUMMARY/DESCRIPTION? [Paul working on this] * Dynamic loading/filtering for recipes list * Some way to notify the user when they search for something that has been renamed / replaced / deprecated? diff --git a/layerindex/urls.py b/layerindex/urls.py index 668b7c4..fc67a49 100644 --- a/layerindex/urls.py +++ b/layerindex/urls.py @@ -8,7 +8,7 @@ from django.conf.urls.defaults import * from django.views.generic import TemplateView, DetailView, ListView from django.views.defaults import page_not_found from layerindex.models import LayerItem, Recipe -from layerindex.views import LayerListView, LayerReviewListView, LayerReviewDetailView, RecipeSearchView, MachineSearchView, PlainTextListView, LayerDetailView, edit_layer_view, delete_layer_view, edit_layernote_view, delete_layernote_view, switch_branch_view, HistoryListView, EditProfileFormView +from layerindex.views import LayerListView, LayerReviewListView, LayerReviewDetailView, RecipeSearchView, MachineSearchView, PlainTextListView, LayerDetailView, edit_layer_view, delete_layer_view, edit_layernote_view, delete_layernote_view, switch_branch_view, HistoryListView, EditProfileFormView, DuplicatesView urlpatterns = patterns('', url(r'^$', @@ -71,6 +71,10 @@ urlpatterns = patterns('', HistoryListView.as_view( template_name='layerindex/history.html'), name='history_list'), + url(r'^duplicates/$', + DuplicatesView.as_view( + template_name='layerindex/duplicates.html'), + name='duplicates'), url(r'^profile/$', EditProfileFormView.as_view( template_name='layerindex/profile.html'), diff --git a/layerindex/views.py b/layerindex/views.py index fe22b58..023ffc2 100644 --- a/layerindex/views.py +++ b/layerindex/views.py @@ -9,14 +9,14 @@ from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidde from django.core.urlresolvers import reverse from django.core.exceptions import PermissionDenied from django.template import RequestContext -from layerindex.models import Branch, LayerItem, LayerMaintainer, LayerBranch, LayerDependency, LayerNote, Recipe, Machine +from layerindex.models import Branch, LayerItem, LayerMaintainer, LayerBranch, LayerDependency, LayerNote, Recipe, Machine, BBClass from datetime import datetime -from django.views.generic import DetailView, ListView +from django.views.generic import TemplateView, DetailView, ListView from django.views.generic.edit import UpdateView from layerindex.forms import EditLayerForm, LayerMaintainerFormSet, EditNoteForm, EditProfileForm from django.db import transaction from django.contrib.auth.models import User, Permission -from django.db.models import Q +from django.db.models import Q, Count from django.core.mail import EmailMessage from django.template.loader import get_template from django.template import Context @@ -256,6 +256,28 @@ class LayerReviewDetailView(LayerDetailView): raise PermissionDenied return super(LayerReviewDetailView, self).dispatch(request, *args, **kwargs) +def recipes_preferred_count(qs): + # Add extra column so we can show "duplicate" recipes from other layers de-emphasised + # (it's a bit crude having to do this using SQL but I couldn't find a better way...) + return qs.extra( + select={ + 'preferred_count': """SELECT COUNT(1) +FROM layerindex_recipe AS recipe2 +, layerindex_layerbranch as branch2 +, layerindex_layeritem as layer1 +, layerindex_layeritem as layer2 +WHERE branch2.id = recipe2.layerbranch_id +AND layer2.id = branch2.layer_id +AND layer2.layer_type in ('S', 'A') +AND branch2.branch_id = layerindex_layerbranch.branch_id +AND recipe2.pn = layerindex_recipe.pn +AND recipe2.layerbranch_id <> layerindex_recipe.layerbranch_id +AND layer1.id = layerindex_layerbranch.layer_id +AND layer2.index_preference > layer1.index_preference +""" + }, + ) + class RecipeSearchView(ListView): context_object_name = 'recipe_list' paginate_by = 50 @@ -275,32 +297,32 @@ class RecipeSearchView(ListView): # with no query string) return Recipe.objects.none() - # Add extra column so we can show "duplicate" recipes from other layers de-emphasised - # (it's a bit crude having to do this using SQL but I couldn't find a better way...) - return qs.extra( - select={ - 'preferred_count': """SELECT COUNT(1) -FROM layerindex_recipe AS recipe2 -, layerindex_layerbranch as branch2 -, layerindex_layeritem as layer1 -, layerindex_layeritem as layer2 -WHERE branch2.id = recipe2.layerbranch_id -AND layer2.id = branch2.layer_id -AND layer2.layer_type in ('S', 'A') -AND branch2.branch_id = layerindex_layerbranch.branch_id -AND recipe2.pn = layerindex_recipe.pn -AND recipe2.layerbranch_id <> layerindex_recipe.layerbranch_id -AND layer1.id = layerindex_layerbranch.layer_id -AND layer2.index_preference > layer1.index_preference -""" - }, - ) + return recipes_preferred_count(qs) def get_context_data(self, **kwargs): context = super(RecipeSearchView, self).get_context_data(**kwargs) context['search_keyword'] = self.request.GET.get('q', '') return context +class DuplicatesView(TemplateView): + def get_recipes(self): + init_qs = Recipe.objects.filter(layerbranch__branch__name=self.request.session.get('branch', 'master')) + dupes = init_qs.values('pn').annotate(Count('layerbranch', distinct=True)).filter(layerbranch__count__gt=1) + qs = init_qs.all().filter(pn__in=[item['pn'] for item in dupes]).order_by('pn', 'layerbranch__layer') + return recipes_preferred_count(qs) + + def get_classes(self): + init_qs = BBClass.objects.filter(layerbranch__branch__name=self.request.session.get('branch', 'master')) + dupes = init_qs.values('name').annotate(Count('layerbranch', distinct=True)).filter(layerbranch__count__gt=1) + qs = init_qs.all().filter(name__in=[item['name'] for item in dupes]).order_by('name', 'layerbranch__layer') + return qs + + def get_context_data(self, **kwargs): + context = super(DuplicatesView, self).get_context_data(**kwargs) + context['recipes'] = self.get_recipes() + context['classes'] = self.get_classes() + return context + class MachineSearchView(ListView): context_object_name = 'machine_list' paginate_by = 50 diff --git a/templates/base.html b/templates/base.html index fd591ad..f11674e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -63,6 +63,15 @@ {% endif %} {% endif %} +
  • + + Tools + + + +
  • diff --git a/templates/layerindex/duplicates.html b/templates/layerindex/duplicates.html new file mode 100644 index 0000000..c6d06b2 --- /dev/null +++ b/templates/layerindex/duplicates.html @@ -0,0 +1,96 @@ +{% extends "base.html" %} +{% load i18n %} + +{% comment %} + + layerindex-web - duplicates page template + + Copyright (C) 2013 Intel Corporation + Licensed under the MIT license, see COPYING.MIT for details + +{% endcomment %} + + + + +{% block content %} +{% autoescape on %} + +
    +
    +

    Duplicate recipes

    +{% if recipes %} +

    Recipes with the same name in different layers:

    + + + + + + + + + + + + {% for recipe in recipes %} + 0 %}class="muted"{% endif %}> + + + + + + {% endfor %} + +
    Recipe nameVersionDescriptionLayer
    {{ recipe.name }}{{ recipe.pv }}{{ recipe.short_desc }}{{ recipe.layerbranch.layer.name }}
    +{% else %} +

    No duplicate recipes in database.

    +{% endif %} +
    +
    + + +
    +
    +

    Duplicate classes

    +{% if classes %} +

    Classes with the same name in different layers:

    + + + + + + + + + + {% for class in classes %} + + + + + {% endfor %} + +
    Class nameLayer
    {{ class.name }}{{ class.layerbranch.layer.name }}
    +{% else %} +

    No duplicate classes in database.

    +{% endif %} +
    +
    + + +{% endautoescape %} + +{% endblock %} + + +{% block scripts %} + +{% endblock %}