Feature/related similar bills

server_py/flatgov/bills/models.py

@@ -55,23 +55,53 @@ def get_cosponsor_bill(self, name):
 
     @property
     def get_similar_bills(self):
-      res = list()
-      for billnumber, similarBillItem in self.es_similar_bills_dict.items():
-        qs_bill = Bill.objects.filter(
-            bill_congress_type_number=billnumber)
-        if similarBillItem:
-            maxItem = sorted(similarBillItem, key=lambda k: k['score'], reverse=True)[0]
-        else:
-            maxItem = {}
-        res.append({
-          'score': sum([item.get('score', 0) for item in similarBillItem]),
-          'number_of_sections': len(similarBillItem),
-          'in_db': qs_bill.exists(),
-          'title_list': maxItem.get('title', ''),
-          'bill_congress_type_number': billnumber,
-          'max_item': maxItem 
-        })
-      return sorted(res, key=lambda k: k['score'], reverse=True)
+        res = list()
+        for billnumber, similarBillItem in self.es_similar_bills_dict.items():
+            qs_bill = Bill.objects.filter(
+                bill_congress_type_number=billnumber)
+            if similarBillItem:
+                maxItem = sorted(similarBillItem, key=lambda k: k['score'], reverse=True)[0]
+            else:
+                maxItem = {}
+            res.append({
+                'score': sum([item.get('score', 0) for item in similarBillItem]),
+                'number_of_sections': len(similarBillItem),
+                'in_db': qs_bill.exists(),
+                'title_list': maxItem.get('title', ''),
+                'bill_congress_type_number': billnumber,
+                'max_item': maxItem,
+                'reason': 'section match',
+            })
+
+        similar_bills = sorted(res, key=lambda k: k['score'], reverse=True)
+        similar_bill_numbers = [bill.get('bill_congress_type_number') for bill in similar_bills]
+        related_bills = list()
+
+        for bill_congress_type_number, bill in self.related_dict.items():
+            if bill_congress_type_number in similar_bill_numbers:
+                bill_dict = similar_bills[similar_bill_numbers.index(bill_congress_type_number)]
+                bill_dict['reason'] = f"{bill.get('reason')}, section match"
+                bill_dict['identified_by'] = bill.get('identified_by')
+
+                if bill_congress_type_number == self.bill_congress_type_number:
+                    bill_dict['reason'] = 'identical, section match'
+            else:
+                bill_dict = bill
+                bill_dict['bill_congress_type_number'] = bill_congress_type_number
+                bill_dict['score'] = 0
+                if bill.get('titles'):
+                    bill_dict['title'] = ", ".join(bill.get('titles'))
+            related_bills.append(bill_dict)
+
+        sorted_related_bills = sorted(related_bills, key=lambda k: k['score'], reverse=True)
+        self_index = next((index for (index, d) in enumerate(sorted_related_bills) \
+            if d["bill_congress_type_number"] == self.bill_congress_type_number), None)
+        sorted_related_bills.insert(0, sorted_related_bills.pop(self_index))
+
+        filtered_similar_bills = [bill for bill in similar_bills \
+            if bill.get('bill_congress_type_number') not in self.related_dict.keys()]
+
+        return sorted_related_bills + filtered_similar_bills
 
     def get_second_similar_bills(self, second_bill):
         res = list()

server_py/flatgov/static/js/bill.js

@@ -35,7 +35,16 @@ $(document).ready( function () {
     });
     $('#similar-bills-table').DataTable({
         sDom: "Rlfrtip",
-        order: [[ 3, 'desc' ]],
+        // order: [[ 3, 'desc' ]],
+        columnDefs: [
+            { "width": "10%", "targets": 0 },
+            { "width": "10%", "targets": 1 },
+            { "width": "15%", "targets": 2 },
+            { "width": "30%", "targets": 3 },
+            { "width": "10%", "targets": 4 },
+            { "width": "10%", "targets": 5 },
+        ],
+        bSort: false,
         bFilter: true,
         iDisplayLength: 100,
         scrollY: '50vh',

server_py/flatgov/templates/bills/detail.html

@@ -242,6 +242,7 @@ <h4>Analyze Similar Bills</h4>
                     <tr>
                         <th scope="col">Bill</th>
                         <th scope="col">Detail</th>
+                        <th scope="col">Reason</th>
                         <th scope="col">Titles</th>
                         <th scope="col">Score</th>
                         <th scope="col">Sections matched</th>
@@ -270,7 +271,12 @@ <h4>Analyze Similar Bills</h4>
                                 N/A
                             {% endif %}
                         </td>
-                        <td><span title="{{ bill.max_item.title }}">{{ bill.max_item.title|truncatechars:40 }}</span></td>
+                        <td>{{ bill.reason }}</td>
+                        {% if bill.max_item %}
+                            <td><span title="{{ bill.max_item.title }}">{{ bill.max_item.title|truncatechars:40 }}</span></td>
+                        {% else %}
+                            <td><span title="{{ bill.title }}">{{ bill.title|truncatechars:40 }}</span></td>
+                        {% endif %}
                         <td>{% if bill.score %}{{ bill.score|floatformat:2 }}{% endif %}</td>
                         <td>{{ bill.number_of_sections }}</td>
                         <!--td>{{ bill.info.score|floatformat:2 }}</td-->