From 5e702c47de914a209381dcb5b90042f668b8487f Mon Sep 17 00:00:00 2001
From: Okhin <okhin@okhin.fr>
Date: Tue, 1 Mar 2016 17:33:42 +0100
Subject: [PATCH] A hell of work done, need to finish the table and to fix the
 me too button

---
 bt/forms.py                        |  4 +--
 bt/search_indexes.py               |  6 ++--
 bt/templatetags/json_filters.py    |  2 ++
 bt/views.py                        |  3 +-
 nnmon/templates/index.html         | 52 ++++++++++++++++++++++++++----
 nnmon/templates/list.html          |  2 +-
 nnmon/templates/search/lookup.json |  2 +-
 nnmon/templates/search/search.html |  3 --
 8 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/bt/forms.py b/bt/forms.py
index 4a34078..4387f6f 100644
--- a/bt/forms.py
+++ b/bt/forms.py
@@ -54,10 +54,10 @@ class SearchViolation(SearchForm):
            return self.no_query_found()
 
        if self.cleaned_data['operator']:
-           sqs = sqs.filter(operator=self.cleaned_data['operator'])
+           sqs = sqs.filter(operator__icontains=self.cleaned_data['operator'])
 
        if self.cleaned_data['contract']:
-           sqs = sqs.filter(contract=self.cleaned_data['contract'])
+           sqs = sqs.filter(contract__icontains=self.cleaned_data['contract'])
 
        if self.cleaned_data['media']:
            sqs = sqs.filter(media=self.cleaned_data['media'])
diff --git a/bt/search_indexes.py b/bt/search_indexes.py
index 03f65de..eee8ca3 100644
--- a/bt/search_indexes.py
+++ b/bt/search_indexes.py
@@ -5,9 +5,11 @@ class ViolationIndexes(indexes.SearchIndex, indexes.Indexable):
     text = indexes.CharField(document=True, use_template=True)
     operator = indexes.CharField(model_attr="operator_ref")
     country = indexes.CharField(model_attr="country")
-    contract = indexes.CharField(model_attr="contract_excerpt")
-    type = indexes.BooleanField(model_attr="contractual")
+    contract = indexes.CharField(model_attr="contract")
+    type = indexes.CharField(model_attr="contractual")
+    media = indexes.CharField(model_attr="media")
     operator_name = indexes.CharField()
+    state = indexes.NgramField(model_attr="state")
 
     def get_model(self):
         return Violation
diff --git a/bt/templatetags/json_filters.py b/bt/templatetags/json_filters.py
index d79f298..9404c79 100644
--- a/bt/templatetags/json_filters.py
+++ b/bt/templatetags/json_filters.py
@@ -9,6 +9,8 @@ register = Library()
 def jsonify(object):
     if isinstance(object, QuerySet):
         return serialize('json', object)
+    elif object == []:
+        return json.dumps(object)
     elif isinstance(object[0], SearchResult):
         return serialize('json', [x.object for x in object])
     else:
diff --git a/bt/views.py b/bt/views.py
index d759e28..f17a7fa 100644
--- a/bt/views.py
+++ b/bt/views.py
@@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.db.models import Count
 from haystack.generic_views import SearchView
 from haystack.query import SearchQuerySet
-from models import Violation, Attachment, Comment, Confirmation, COUNTRIES, STATUS, Operator
+from models import Violation, Attachment, Comment, Confirmation, COUNTRIES, STATUS, Operator, FeaturedCase
 from tempfile import mkstemp
 from datetime import datetime
 import hashlib, os, re, json
@@ -210,6 +210,7 @@ class AddForm(FormView):
                 (_('Total confirmed reports'), len([i for i,z in reports if i>0])),
                 (_('Countries with some confirmed reports'), len([i for i,z in confirms if i>0])),
                 (_('Operators with some confirmed reports'), len([i for i,z in operators if i>0]))]
+        context['violations'] = [fc.case for fc in FeaturedCase.objects.all()]
         return context
 
 class ViolationsList(ListView):
diff --git a/nnmon/templates/index.html b/nnmon/templates/index.html
index 2cdcc27..c85093d 100644
--- a/nnmon/templates/index.html
+++ b/nnmon/templates/index.html
@@ -11,20 +11,55 @@
 	<script type="text/javascript">
 	$("#lookup_btn").click(function(event) {
 		event.preventDefault();
-		$.getJSON(
-			url="/lookup/",
-			data={
+		$.ajax({
+			dataType: "json",
+			url: "/lookup/",
+			data: {
 				country: $("#id_country").val(),
 				q: $("#id_ressource").val(),
 				operator: $("#id_operator").val(),
 				contract: $("#id_contract").val(),
 				media: $("#id_media").val(),
 			},
-			success=function(data){
-				console.log(data);
+			success: function(data) {
+				var filtered = data.filter(function(data) {
+					return data.fields.state in ["ooscope", "duplicate"]
+				});
+				if (filtered.length == 0) {
+					$("#lookup_btn").hide();
+					$("#collapseField").collapse('show');
+					return;
+				}
+
+				filtered = filtered.slice(0, 10);
+				$.each(filtered, function(key, obj) {
+					if (obj.fields.state in ["ooscope", "duplicate"]) {
+						return;
+					};
+					$("#modal-list").append(
+							"<dt>" + obj.fields.resource + "</dt>" +
+							"<dd><p>" + obj.fields.editorial + "</p>" +
+							"<div class=\"confirm\"><a class=\"btn btn-default\">{% trans "Me Too" %}</a>" +
+							"<div class=\"info-validate float-confirm\">" +
+							"<form method=\"get\" action=\"\" id=\"i" + obj.pk + "\" class=\"confirm_form\">" +
+							"<div>" +
+							"<label>{% trans "In order to <strong>confirm</strong> this report, please enter your email address" %}</label>" +
+							"<input type=\"text\" name=\"email\" />" +
+							"<input type=\"hidden\" value=\"{{obj.pk}}\" />" +
+							"<input type=\"submit\" value=\"{% trans "Ok" %}\" />" +
+							"</div>" +
+							"</form>" +
+							"</div>" +
+							"</dd>"
+							);
+				});
 				$('#similar_modal').modal('show');
+				console.log("Modal displayed");
+			},
+			error: function(xhr, status, err) {
+				console.log(err, xhr);
 			}
-		);
+		});
 	});
 
 	$("#btn_dismiss").click(function(event) {
@@ -65,7 +100,7 @@
 			{% endfor %}
 		</ul>
 		<h2 id="featured-title">{% trans "Featured Cases" %}</h2>
-		<table id="featured_cases">
+		<table class="table table-stripped" id="featured_cases">
 			<thead>
 				<tr>
 					<th style="width: 70%;">{% trans "Infringing offering" %}</th>
@@ -154,6 +189,9 @@
 			</div>
 			<div class="modal-body">
 				<p>{% trans "Those are cases that might be similar to yours, please feel free to add your input on those cases instead of adding yours if they overlap." %}</p>
+				<dl id="modal-list">
+				</dl>
+			</table>
 			</div>
 			<div class="modal-footer">
 				<button type="button" id="btn_dismiss" class="btn btn-default" data-dismiss="modal">{% trans "Dismiss" %}</button>
diff --git a/nnmon/templates/list.html b/nnmon/templates/list.html
index 6b068c6..4aaf09a 100644
--- a/nnmon/templates/list.html
+++ b/nnmon/templates/list.html
@@ -54,7 +54,7 @@ $.tablesorter.addParser({
 				<th filter-type='ddl' class="col-sm-1">{% trans "country" %}</th>
 				<th filter-type='ddl' class="col-sm-1">{% trans "operator" %}</th>
 				<th filter-type='ddl' class="col-sm-2">{% trans "contract" %}</th>
-				<th filter-type='ddl' class="col-sm-3">{% trans "resource" %}</th>
+				<th filter-type='ddl' class="col-sm-2">{% trans "resource" %}</th>
 				<th filter-type='ddl' class="col-sm-1">{% trans "type" %}</th>
 				<th filter-type='ddl' class="col-sm-1">{% trans "fixed / wireless" %}</th>
 				<th filter='false' class="col-sm-1">{% trans "confirmations" %}</th>
diff --git a/nnmon/templates/search/lookup.json b/nnmon/templates/search/lookup.json
index 6c03f4d..560a63c 100644
--- a/nnmon/templates/search/lookup.json
+++ b/nnmon/templates/search/lookup.json
@@ -1,2 +1,2 @@
 {% load json_filters %}
-{{ object_list|jsonify }}
+{{ object_list|jsonify|safe }}
diff --git a/nnmon/templates/search/search.html b/nnmon/templates/search/search.html
index 3ffb446..804a9ab 100644
--- a/nnmon/templates/search/search.html
+++ b/nnmon/templates/search/search.html
@@ -103,9 +103,6 @@ $.tablesorter.addParser({
 	</tbody>
 </table>
 
-{% endif %}
-{% else %}
-</div>
 {% endif %}
 </div>
 {% endblock %}
-- 
GitLab