Merge pull request #9 from argrecsys/dev

Dev
argrecsys · Nov 27, 2023 · 42d3d5b · 42d3d5b
2 parents b95b623 + a0608b5
commit 42d3d5b
Show file tree

Hide file tree

Showing 146 changed files with 10,491 additions and 1,134 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Digital Government - DM Visual Analytics with ChatGPT
-![version](https://img.shields.io/badge/version-0.2.0-blue)
-![last-update](https://img.shields.io/badge/last_update-11/25/2023-orange)
+![version](https://img.shields.io/badge/version-0.3.0-blue)
+![last-update](https://img.shields.io/badge/last_update-11/27/2023-orange)
 ![license](https://img.shields.io/badge/license-Apache_2.0-brightgreen)
 
 ## Dependencies

diff --git a/code/etls/generate_argument_data.py b/code/etls/generate_argument_data.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 """
     Created by: Andrés Segura-Tinoco
-    Version: 0.2
+    Version: 0.3
     Created on: Nov 23, 2023
-    Updated on: Nov 24, 2023
+    Updated on: Nov 27, 2023
     Description: Generate argument data.
 """
 
 import util_libs as ul
+import datetime
 
 MAX_TEXT_SIZE = 200
 
@@ -67,7 +68,7 @@ def create_argument_data(proposal_id: int, arg_data: dict, comments: dict):
                         arg_item["children"].append(comment_item)
                 else:
                     print(
-                        f"- Comment id icorrect: {comment_id} for proposal: {proposal_id}"
+                        f"- Incorrect comment id: {comment_id} for proposal: {proposal_id}"
                     )
 
             arg_cat_item["children"].append(arg_item)
@@ -169,6 +170,8 @@ def main():
 ### START PROGRAM ###
 #####################
 if __name__ == "__main__":
+    now = datetime.datetime.now()
+    print(f">> Run generate argument data ETL- {now}")
     main()
 #####################
 #### END PROGRAM ####

diff --git a/code/etls/generate_network_data.py b/code/etls/generate_network_data.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 """
     Created by: Andrés Segura-Tinoco
-    Version: 0.2
+    Version: 0.3
     Created on: Nov 24, 2023
-    Updated on: Nov 24, 2023
+    Updated on: Nov 27, 2023
     Description: Generate network data.
 """
 
 import util_libs as ul
+import datetime
 
 
 def create_argument_data(proposal_id: int, arg_data: dict):
@@ -103,6 +104,8 @@ def main():
 ### START PROGRAM ###
 #####################
 if __name__ == "__main__":
+    now = datetime.datetime.now()
+    print(f">> Run generate network data ETL- {now}")
     main()
 #####################
 #### END PROGRAM ####

diff --git a/code/etls/generate_proposal_data.py b/code/etls/generate_proposal_data.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 """
     Created by: Andrés Segura-Tinoco
-    Version: 0.2
+    Version: 0.3
     Created on: Nov 23, 2023
-    Updated on: Nov 24, 2023
+    Updated on: Nov 27, 2023
     Description: Generate proposal data.
 """
 
 import util_libs as ul
+import datetime
 
 MAX_TEXT_SIZE = 200
 
@@ -140,6 +141,8 @@ def main():
 ### START PROGRAM ###
 #####################
 if __name__ == "__main__":
+    now = datetime.datetime.now()
+    print(f">> Run generate proposal data ETL- {now}")
     main()
 #####################
 #### END PROGRAM ####

diff --git a/code/etls/generate_word_cloud.py b/code/etls/generate_word_cloud.py
@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
 """
     Created by: Andrés Segura-Tinoco
-    Version: 0.1
+    Version: 0.3
     Created on: Nov 21, 2023
-    Updated on: Nov 23, 2023
-    Description: Generate word cloud images.
+    Updated on: Nov 27, 2023
+    Description: Generate word cloud resources.
 """
 
 import util_libs as ul
-from wordcloud import WordCloud
+import datetime
 import spacy
+from wordcloud import WordCloud
 
 # Load the spaCy model for Spanish
 nlp = spacy.load("es_core_news_lg")
@@ -70,6 +71,8 @@ def main():
 ### START PROGRAM ###
 #####################
 if __name__ == "__main__":
+    now = datetime.datetime.now()
+    print(f">> Run generate word cloud data ETL- {now}")
     main()
 #####################
 #### END PROGRAM ####

diff --git a/code/etls/run_program.py b/code/etls/run_program.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 """
     Created by: Andrés Segura-Tinoco
-    Version: 0.2
+    Version: 0.3
     Created on: Nov 24, 2023
-    Updated on: Nov 24, 2023
+    Updated on: Nov 27, 2023
     Description: Run all ETL processes.
 """
 

diff --git a/code/website/css/styles.css b/code/website/css/styles.css
@@ -23,7 +23,7 @@ footer {
 h3 {
     /** Page subtitle **/
     margin-top: 20px;
-    margin-bottom: 0px;
+    margin-bottom: 5px;
     font-family: 'Montserrat', Arial, sans-serif;
     color: #003366;
 }
@@ -40,4 +40,10 @@ img {
 .chart {
     width: 100%;
     border-width: 0px;
+}
+
+
+#tb-data.dataTable {
+    font-size: 12px;
+    width: 100%;
 }
diff --git a/code/website/index.html b/code/website/index.html
@@ -22,12 +22,13 @@
 <body>
     <header>
         <h1>Digital Government - DM Visual Analytics with ChatGPT</h1>
+        <h2>Proposal 152: "Instalación de placas solares en tejados"</h2>
     </header>
 
     <main>
         <div class="container">
             <!-- Word cloud -->
-            <h3>Analysis of Decide Madrid Proposal 152</h3>
+            <h3>Proposal word cloud</h3>
             <div style="text-align: center;"><img src="../../result/images/152.png" alt="Proposal word cloud"></div>
 
             <!-- Network chart -->
@@ -54,7 +55,7 @@ <h3>Display a DM debate in the form of a indented tree</h3>
             <!-- ChatGPT extracted arguments table -->
             <h3>ChatGPT Extracted Arguments</h3>
             <div style="width: 100%; padding-top: 10px;">
-                <table id="tb-data" class="display" width="100%"></table>
+                <table id="tb-data" class="display"></table>
                 <div class="divSubTitle">Table 1 - ChatGPT extracted arguments.</div>
             </div>
         </div>

diff --git a/result/images/10195.png b/result/images/10195.png
diff --git a/result/images/10675.png b/result/images/10675.png
diff --git a/result/images/10687.png b/result/images/10687.png
diff --git a/result/images/1085.png b/result/images/1085.png
diff --git a/result/images/109.png b/result/images/109.png
diff --git a/result/images/10996.png b/result/images/10996.png
diff --git a/result/images/11134.png b/result/images/11134.png
diff --git a/result/images/1114.png b/result/images/1114.png
diff --git a/result/images/1121.png b/result/images/1121.png
diff --git a/result/images/12131.png b/result/images/12131.png
diff --git a/result/images/1266.png b/result/images/1266.png
diff --git a/result/images/1284.png b/result/images/1284.png
diff --git a/result/images/1419.png b/result/images/1419.png
diff --git a/result/images/152.png b/result/images/152.png
diff --git a/result/images/15711.png b/result/images/15711.png
diff --git a/result/images/15970.png b/result/images/15970.png
diff --git a/result/images/15978.png b/result/images/15978.png
diff --git a/result/images/15996.png b/result/images/15996.png
diff --git a/result/images/1824.png b/result/images/1824.png
diff --git a/result/images/1863.png b/result/images/1863.png
diff --git a/result/images/19.png b/result/images/19.png
diff --git a/result/images/19024.png b/result/images/19024.png
diff --git a/result/images/19170.png b/result/images/19170.png
diff --git a/result/images/1918.png b/result/images/1918.png
diff --git a/result/images/1937.png b/result/images/1937.png
diff --git a/result/images/19853.png b/result/images/19853.png
diff --git a/result/images/19914.png b/result/images/19914.png
diff --git a/result/images/20389.png b/result/images/20389.png
diff --git a/result/images/20657.png b/result/images/20657.png
diff --git a/result/images/21171.png b/result/images/21171.png
diff --git a/result/images/2121.png b/result/images/2121.png
diff --git a/result/images/2135.png b/result/images/2135.png
diff --git a/result/images/21567.png b/result/images/21567.png
diff --git a/result/images/22742.png b/result/images/22742.png
diff --git a/result/images/23131.png b/result/images/23131.png
diff --git a/result/images/23219.png b/result/images/23219.png
diff --git a/result/images/23704.png b/result/images/23704.png
diff --git a/result/images/2412.png b/result/images/2412.png
diff --git a/result/images/2445.png b/result/images/2445.png
diff --git a/result/images/24954.png b/result/images/24954.png
diff --git a/result/images/25077.png b/result/images/25077.png
diff --git a/result/images/2513.png b/result/images/2513.png
diff --git a/result/images/2524.png b/result/images/2524.png
diff --git a/result/images/2538.png b/result/images/2538.png
diff --git a/result/images/2551.png b/result/images/2551.png
diff --git a/result/images/2576.png b/result/images/2576.png
diff --git a/result/images/26277.png b/result/images/26277.png
diff --git a/result/images/26787.png b/result/images/26787.png
diff --git a/result/images/2944.png b/result/images/2944.png
diff --git a/result/images/3044.png b/result/images/3044.png
diff --git a/result/images/3078.png b/result/images/3078.png
diff --git a/result/images/3165.png b/result/images/3165.png
diff --git a/result/images/3481.png b/result/images/3481.png
diff --git a/result/images/3587.png b/result/images/3587.png
diff --git a/result/images/3905.png b/result/images/3905.png
diff --git a/result/images/417.png b/result/images/417.png
diff --git a/result/images/4293.png b/result/images/4293.png
diff --git a/result/images/4541.png b/result/images/4541.png
diff --git a/result/images/494.png b/result/images/494.png
diff --git a/result/images/50.png b/result/images/50.png
diff --git a/result/images/507.png b/result/images/507.png
diff --git a/result/images/61.png b/result/images/61.png
diff --git a/result/images/615.png b/result/images/615.png
diff --git a/result/images/629.png b/result/images/629.png
diff --git a/result/images/6931.png b/result/images/6931.png
diff --git a/result/images/7.png b/result/images/7.png
diff --git a/result/images/72.png b/result/images/72.png
diff --git a/result/images/7382.png b/result/images/7382.png
diff --git a/result/images/7482.png b/result/images/7482.png
diff --git a/result/images/7488.png b/result/images/7488.png
diff --git a/result/images/7633.png b/result/images/7633.png
diff --git a/result/images/8188.png b/result/images/8188.png
diff --git a/result/images/8253.png b/result/images/8253.png
diff --git a/result/images/86.png b/result/images/86.png
diff --git a/result/images/8640.png b/result/images/8640.png
diff --git a/result/images/878.png b/result/images/878.png
diff --git a/result/images/879.png b/result/images/879.png
diff --git a/result/images/89.png b/result/images/89.png
diff --git a/result/images/900.png b/result/images/900.png
diff --git a/result/images/965.png b/result/images/965.png
diff --git a/result/json_data/arguments/109.json b/result/json_data/arguments/109.json
@@ -255,7 +255,14 @@
       "children": [
         {
           "name": "18",
-          "children": [],
+          "children": [
+            {
+              "name": "51873",
+              "value": 100,
+              "text": "[51873] Buenos d\u00edas a tod@s, la limpieza es una de las partes de una sociedad que tenemos que cuidar tod@s sin excepci\u00f3n, es tan importante como la seguridad de una ciudad o la sanidad para las personas, si tenemos insalubridad en una ciudad corremos mucho riesgo en todos los aspectos, os env\u00edo un enlace para que entr\u00e9is a leerlo si os parece correcto votarlo, los puntos a tratar sobre la limpieza son bastante interesantes, no hace falta hacer inversiones exageradas, es m\u00e1s, todo ello est\u00e1 sobradamente probado y funciona, votar la idea si os parece bien para conseguir el m\u00e1ximo posible de votos para poder reaccionar frente a la limpieza de Madrid.",
+              "short_text": "[51873] Buenos d\u00edas a tod@s, la limpieza es una de las partes de una sociedad que tenemos que cuidar tod@s sin excepci\u00f3n, es tan importante como la seguridad de una ciudad o la sanidad para las person..."
+            }
+          ],
           "text": "[SUPPORT] Algo que creo que beneficiar\u00eda ampliamente a la limpieza de la ciudad es el aumento de m\u00e1quinas limpiadoras de aceras.",
           "short_text": "[SUPPORT] Algo que creo que beneficiar\u00eda ampliamente a la limpieza de la ciudad es el aumento de m\u00e1quinas limpiadoras de aceras."
         },

diff --git a/result/json_data/arguments/1121.json b/result/json_data/arguments/1121.json
@@ -403,7 +403,14 @@
         },
         {
           "name": "25",
-          "children": [],
+          "children": [
+            {
+              "name": "24256",
+              "value": 100,
+              "text": "[24256] Tambi\u00e9n est\u00e1 la propuesta en la secci\u00f3n debates: apoya un museo de metro.",
+              "short_text": "[24256] Tambi\u00e9n est\u00e1 la propuesta en la secci\u00f3n debates: apoya un museo de metro."
+            }
+          ],
           "text": "[ATTACK] Los vecinos de 4 caminos queremos parques, dotaciones, vida en la zona. La poblaci\u00f3n tiene que considerar esas cocheras un bien de patrimonio hist\u00f3rico.",
           "short_text": "[ATTACK] Los vecinos de 4 caminos queremos parques, dotaciones, vida en la zona. La poblaci\u00f3n tiene que considerar esas cocheras un bien de patrimonio hist\u00f3rico."
         },
@@ -562,8 +569,8 @@
               "short_text": "[55070] Que los informes no son m\u00e1s que una mera excusa para justificar la venta de un terreno; Expropiaci\u00f3n forzosa; Nulidad del concurso\u2026 Todo lo que dices son acusaciones muy graves contra actuacio..."
             }
           ],
-          "text": "[SUPPORT] Que los informes no son m\u00e1s que una mera excusa para justificar la venta de un terreno; Expropiaci\u00f3n forzosa; Nulidad del concurso\u0085 Todo lo que dices son acusaciones muy graves contra actuaciones de organismos p\u00fablicos.",
-          "short_text": "[SUPPORT] Que los informes no son m\u00e1s que una mera excusa para justificar la venta de un terreno; Expropiaci\u00f3n forzosa; Nulidad del concurso\u0085 Todo lo que dices son acusaciones muy graves contra actuac..."
+          "text": "[SUPPORT] Que los informes no son m\u00e1s que una mera excusa para justificar la venta de un terreno; Expropiaci\u00f3n forzosa; Nulidad del concurso\u2026 Todo lo que dices son acusaciones muy graves contra actuaciones de organismos p\u00fablicos.",
+          "short_text": "[SUPPORT] Que los informes no son m\u00e1s que una mera excusa para justificar la venta de un terreno; Expropiaci\u00f3n forzosa; Nulidad del concurso\u2026 Todo lo que dices son acusaciones muy graves contra actuac..."
         },
         {
           "name": "36",