Merge pull request #288 from Seshat-Global-History-Databank/instability_data

improved the looks and removed unnecessary print statements

Author: MajidBenam

seshat/apps/core/forms.py

@@ -1,4 +1,4 @@
-from seshat.utils.utils import adder, dic_of_all_vars, list_of_all_Polities, dic_of_all_vars_in_sections
+from seshat.utils.utils import dic_of_all_vars, list_of_all_Polities, dic_of_all_vars_in_sections
 
 from django import forms
 from django.forms import formset_factory

seshat/apps/core/management/commands/check_api_internally.py

@@ -47,9 +47,9 @@ def handle(self, *args, **options):
         else:
             self.stdout.write(self.style.SUCCESS("\n✅ All endpoints are valid."))
 
-        print('####### PASSED ####')
-        print(passed_dic)
-        print('###################')
-        print('####### Failed ####')
-        print(failed_dic)
-        print('###################')
+        # print('####### PASSED ####')
+        # print(passed_dic)
+        # print('###################')
+        # print('####### Failed ####')
+        # print(failed_dic)
+        # print('###################')

seshat/apps/core/templates/core/generic_templates/generic_list_all.html

@@ -51,6 +51,8 @@
     {% endautoescape %}
     {% if var_section != 'Luxury Goods' %}
         {% include "core/partials/_all_tags_inline_obj.html" %}
+    {% else %}
+        {% include "core/partials/_all_tags_inline_obj_lux.html" %}
     {% endif %}
 
 

seshat/apps/core/templates/core/list_base_for_new_approach.html

@@ -639,9 +639,18 @@ <h6 class="fw-bold"><span class="fw-normal"><i class="fa-solid fa-caret-right"><
 
             <thead> 
             <tr  class="sticky-top"  style="background-color:#ffffff;height:40px; top: 95px; z-index:900;">
-                <th scope="col" style="text-align: left;  width:15%; " class="fw-light"> 
+
+              {% if var_name_display != 'Instability Event' %}
+
+                <th scope="col" style="text-align: left;  width:25%; " class="fw-light"> 
                     <a href="?{% query_transform request orderby='-polity__long_name' %}"><i class="fa-solid fa-arrow-up-z-a"></i>&nbsp;</a>Polity <a href="?{% query_transform request orderby='polity__long_name' %}"><i class="fa-solid fa-arrow-up-a-z"></i>&nbsp;</a>
                 </th>
+                {% else %} 
+                <th scope="col" style="text-align: left;  width:15%; " class="fw-light"> 
+                  <a href="?{% query_transform request orderby='-polity__long_name' %}"><i class="fa-solid fa-arrow-up-z-a"></i>&nbsp;</a>Polity <a href="?{% query_transform request orderby='polity__long_name' %}"><i class="fa-solid fa-arrow-up-a-z"></i>&nbsp;</a>
+              </th>
+                {% endif %} 
+
                 {% if user|in_group:"Chief Seshat External Experts" %}   
 <th> </th>              {% endif %}
                 <!-- headings for extra vars -->

seshat/apps/core/templates/core/partials/_all_tags_inline_obj_lux.html

@@ -0,0 +1,27 @@
+<span style="display:inline">
+
+{% if obj.is_disputed %}
+
+<a type="button" class="fs-6 ms-1" data-bs-toggle="tooltip" data-bs-html="true"  title="Scholarly Disagreement (Disputed)">
+    <span class="badge"  style="font-family: 'Roboto Mono', monospace; font-optical-sizing: auto; font-weight: 700; background:#f39b9b11; color:#c53636; border:1px solid #c5363688;"><i class="fa-regular fa-star-half-stroke"></i> Disputed</span>
+</a>
+
+{% endif %}
+
+<!-- Disputred tag (Disputed/or Not etc.) -->
+{% if obj.is_uncertain %}
+<a type="button" class="fs-6 ms-1 badge p-0 m-0" style="font-family: 'Roboto Mono', monospace; font-optical-sizing: auto; font-weight: 700; color:#c9b458;  border:1px solid #c9b45888; background:#c9b45811;" data-bs-toggle="tooltip" data-bs-html="true"  title="Uncertainty has been coded.">
+    <span class="badge" style="color:#c9b458;"><i class="fa-regular fa-circle-question fa-sm"></i> Uncertain</span>
+</a>
+{% endif %}
+
+<!-- Expert Checked Tag -->
+{% if obj.seshat_experts_list %}
+    <a type="button" class="fs-6 ms-1" data-bs-toggle="tooltip" data-bs-html="true"  title="Reviewed By: {{ obj.seshat_experts_list }}">
+        <span class="badge" style="font-family: 'Roboto Mono', monospace; font-optical-sizing: auto; font-weight: 700; background:#c3ddf9; color:#12457b;"><i class="fas fa-check-circle p-0 m-0" style="color:#2978ce"></i> Expert</span>
+    </a>
+{% endif %}
+
+</span>
+
+    

seshat/apps/core/views.py

@@ -4,7 +4,7 @@
 import numpy as np
 
 from collections import defaultdict, OrderedDict
-from seshat.utils.utils import adder, dic_of_all_vars, list_of_all_Polities, dic_of_all_vars_in_sections
+from seshat.utils.utils import dic_of_all_vars, list_of_all_Polities, dic_of_all_vars_in_sections
 
 from seshat.apps.crisisdb.models import Human_sacrifice
 from seshat.apps.stlm.models import Settlement_population
@@ -87,7 +87,7 @@
 import pprint
 import requests
 from requests.structures import CaseInsensitiveDict
-from seshat.utils.utils import adder, dic_of_all_vars, list_of_all_Polities, dic_of_all_vars_in_sections, dic_of_all_vars_with_varhier, get_all_data_for_a_polity, polity_detail_data_collector, get_all_general_data_for_a_polity, get_all_sc_data_for_a_polity, get_all_wf_data_for_a_polity,get_all_ec_data_for_a_polity, get_all_rt_data_for_a_polity, get_all_crisis_cases_data_for_a_polity, get_all_power_transitions_data_for_a_polity, get_all_instability_data_for_a_polity, give_polity_app_data
+from seshat.utils.utils import dic_of_all_vars, list_of_all_Polities, dic_of_all_vars_in_sections, dic_of_all_vars_with_varhier, get_all_data_for_a_polity, polity_detail_data_collector, get_all_general_data_for_a_polity, get_all_sc_data_for_a_polity, get_all_wf_data_for_a_polity,get_all_ec_data_for_a_polity, get_all_rt_data_for_a_polity, get_all_crisis_cases_data_for_a_polity, get_all_power_transitions_data_for_a_polity, get_all_instability_data_for_a_polity, give_polity_app_data
 
 
 from django.shortcuts import HttpResponse
@@ -2238,8 +2238,6 @@ def get_context_data(self, **kwargs):
         all_ngas = Nga.objects.all()
         all_pols = Polity.objects.all().order_by('start_year')
         pol_count = len(all_pols)
-        #import time
-        #start_time = time.time()
 
         all_polities_g_sc_wf = give_polity_app_data()
 
@@ -2294,8 +2292,6 @@ def get_context_data(self, **kwargs):
                 #a_polity.has_pt = None
                 a_polity.has_g_sc_wf = None
 
-        #end_time = time.time()
-        #print('elapsed_time ', end_time-start_time)
 
         for a_world_region, all_its_sub_regions in all_world_regions.items():
             for a_subregion in all_its_sub_regions:
@@ -2391,8 +2387,6 @@ def get_context_data(self, **kwargs):
             dict: The context data of the view.
         """
         context = super().get_context_data(**kwargs)
-        #import time
-        #start_time = time.time()
         all_srs_unsorted = Seshat_region.objects.all()
         #all_mrs_unsorted = Macro_region.objects.all()
         all_mrs_unsorted = Macro_region.objects.exclude(name='World')
@@ -2457,9 +2451,6 @@ def get_context_data(self, **kwargs):
         freq_dic['pol_count'] = pol_count
         context["freq_data"] = freq_dic
 
-        #end_time = time.time()
-        #print('elapsed_time ', end_time-start_time)
-
         return context
 
 class PolityListView(SuccessMessageMixin, generic.ListView):
@@ -2495,10 +2486,7 @@ def get_context_data(self, **kwargs):
         Returns:
             dict: The context data of the view.
         """
-        start3 = time.time()
         context = super().get_context_data(**kwargs)
-        #import time
-        #start_time = time.time()
         all_srs_unsorted = Seshat_region.objects.all()
         #all_mrs_unsorted = Macro_region.objects.all()
         all_mrs_unsorted = Macro_region.objects.exclude(name='World')
@@ -2543,11 +2531,7 @@ def get_context_data(self, **kwargs):
             all_pols = Polity.objects.all().order_by('start_year')
         pol_count = len(all_pols)
 
-        end3 = time.time()
 
-        print(f"33333333333333333333333 took {end3 - start3:.2f} seconds to run")
-        start2 = time.time()
-        print('HIIIIIIIIIIIIIIIII')
         ultimate_wregion_dic = {}
         ultimate_wregion_dic_top = {}
         for a_mr in all_mrs:
@@ -2563,19 +2547,11 @@ def get_context_data(self, **kwargs):
                         ultimate_wregion_dic_top[a_mr.name][a_sr.name] = [a_sr.subregions_list, 0]
 
 
-        print('---------------------------')
         all_polities_g_sc_wf, freq_dic = give_polity_app_data(user_selected_tag)
         #all_polities_g_sc_wf = give_polity_app_data()
         #freq_dic = {}
         freq_dic["d"] = 0
 
-        end2 = time.time()
-
-        print(f"cccccccccccccccccccccccc took {end2 - start2:.2f} seconds to run")
-
-        start = time.time()
-
-        # Pre-fetch related data to reduce DB hits
 
         all_pols = all_pols.select_related(
             'home_seshat_region__mac_region'
@@ -2608,7 +2584,6 @@ def get_context_data(self, **kwargs):
         #     a_polity.d_o_c = Polity_degree_of_centralization.objects.filter(polity_id=a_polity.id)
         #     a_polity.s_p_r = Polity_suprapolity_relations.objects.filter(polity_id=a_polity.id)
 
-        #start = time.time()
 
         for a_polity in all_pols:
             try:
@@ -2674,10 +2649,6 @@ def get_context_data(self, **kwargs):
             # elif all_durations["intr"]:
             #     a_polity.color = "gmm"
 
-        #end = time.time()
-
-        #print(f"hoooooooooooooooy took {end - start:.2f} seconds to run")
-
 
         context["ultimate_wregion_dic"] = ultimate_wregion_dic
         context["ultimate_wregion_dic_top"] = ultimate_wregion_dic_top
@@ -2687,9 +2658,6 @@ def get_context_data(self, **kwargs):
         freq_dic['pol_count'] = pol_count
         context["freq_data"] = freq_dic
 
-        #end_time = time.time()
-        #print('elapsed_time ', end_time-start_time)
-
         return context
 
 
@@ -3859,12 +3827,10 @@ def update_citations_from_inside_zotero_update():
     Returns:
         None
     """
-    from datetime import datetime
     all_refs = Reference.objects.all()
     for ref in all_refs:
         a_citation = Citation.objects.get_or_create(ref=ref, page_from=None, page_to=None)
         a_citation[0].save()
-    print("Halllooooo")
     # Citation.objects.bulk_create(all_citations)
     #return render (request, 'core/references/reference_list.html')
 

seshat/apps/crisisdb/templates/crisisdb/instability_analytics.html

@@ -727,38 +727,30 @@ <h6>
           <div id="myCustomLegendDP" class="chart-legend"></div>
         </div>
       </div>
-
-
-
-         
     </div>
-
- 
-
-      
 
  </div>
 
- <div class="row">
-  <div class="col-md-12 pt-5">
-    <span class=" fs-4">    Comapring LLM Data with Researcher Approved Data: 
-    </span>
-<br>
-    <span class="fs-6 text-secondary">          Only Researcher-Checked Rows Considered (Total: {{total_checked}})
-    </span>
-  </div>
-  <div class="col-md-4 p-1 ">
-    <canvas id="intensityComp" height="8" width="10"></canvas>
-  </div>
+ <div class="row pb-3">
+    <div class="col-md-12 pt-5">
+      <span class=" fs-4">    Comapring LLM Data with Researcher Approved Data: 
+      </span>
+  <br>
+      <span class="fs-6 text-secondary">          Only Researcher-Checked Rows Considered (Total: {{total_checked}})
+      </span>
+    </div>
+    <div class="col-md-4 p-1 ">
+      <canvas id="intensityComp" height="8" width="10"></canvas>
+    </div>
 
-  <div class="col-md-4 p-1 ">
-    <canvas id="extentComp" height="8" width="10"></canvas>
-  </div>
-  
+    <div class="col-md-4 p-1 ">
+      <canvas id="extentComp" height="8" width="10"></canvas>
+    </div>
+    
 
-  <div class="col-md-4 p-1 ">
-    <canvas id="year_rangeComp" height="8" width="10"></canvas>
-  </div>
+    <div class="col-md-4 p-1 ">
+      <canvas id="year_rangeComp" height="8" width="10"></canvas>
+    </div>
  </div>
 </div>
 
@@ -1180,10 +1172,10 @@ <h6>
             },
             anchor: function(context) {
               // If value is tall enough, place inside (center); else outside (end)
-              return context.dataset.data[context.dataIndex] > 9 ? 'center' : 'end';
+              return context.dataset.data[context.dataIndex] > 20 ? 'center' : 'end';
             },
             align: function(context) {
-              return context.dataset.data[context.dataIndex] > 9 ? 'center' : 'top';
+              return context.dataset.data[context.dataIndex] > 20 ? 'center' : 'top';
             }
           },
           tooltip: {
@@ -1570,7 +1562,7 @@ <h6>
 
               },
               datalabels: {
-                color: ['#003366', '#c61a09'],  // 👈 Dark blue
+                color: ['#003366', '#8b0000'], 
                 font: {
                   weight: 'bold',
                   size: 13
@@ -1580,10 +1572,10 @@ <h6>
                 },
                 anchor: function(context) {
                   // If value is tall enough, place inside (center); else outside (end)
-                  return context.dataset.data[context.dataIndex] > 50 ? 'center' : 'end';
+                  return context.dataset.data[context.dataIndex] > 40 ? 'center' : 'end';
                 },
                 align: function(context) {
-                  return context.dataset.data[context.dataIndex] > 50 ? 'center' : 'top';
+                  return context.dataset.data[context.dataIndex] > 40 ? 'center' : 'top';
                 }
               },
           },
@@ -1658,7 +1650,7 @@ <h6>
 
                   },
                   datalabels: {
-                    color: ['#003366', '#c61a09'],  // 👈 Dark blue
+                    color: ['#003366', '#8b0000'],
                     font: {
                       weight: 'bold',
                       size: 13
@@ -1668,10 +1660,10 @@ <h6>
                     },
                     anchor: function(context) {
                       // If value is tall enough, place inside (center); else outside (end)
-                      return context.dataset.data[context.dataIndex] > 50 ? 'center' : 'end';
+                      return context.dataset.data[context.dataIndex] > 40 ? 'center' : 'end';
                     },
                     align: function(context) {
-                      return context.dataset.data[context.dataIndex] > 50 ? 'center' : 'top';
+                      return context.dataset.data[context.dataIndex] > 40 ? 'center' : 'top';
                     }
                   },
               },
@@ -1746,7 +1738,7 @@ <h6>
 
                       },
                       datalabels: {
-                        color: ['#003366', '#c61a09'],  // 👈 Dark blue
+                        color: ['#003366', '#8b0000'],  // 👈 Dark blue
                         font: {
                           weight: 'bold',
                           size: 13
@@ -1756,10 +1748,10 @@ <h6>
                         },
                         anchor: function(context) {
                           // If value is tall enough, place inside (center); else outside (end)
-                          return context.dataset.data[context.dataIndex] > 50 ? 'center' : 'end';
+                          return context.dataset.data[context.dataIndex] > 40 ? 'center' : 'end';
                         },
                         align: function(context) {
-                          return context.dataset.data[context.dataIndex] > 50 ? 'center' : 'top';
+                          return context.dataset.data[context.dataIndex] > 40 ? 'center' : 'top';
                         }
                       },
                   },