Merge branch 'devel' into US14_LinkRespectiveInstances

Author: Jefersonalves

agents_indicators/templates/agents_indicators/agents-indicators.html

@@ -79,7 +79,6 @@
 
 		<!-- Imports necessários para funcionalidade da navbar e gráficos-->
 		<script src="{% static 'js/indicators/indicators-nav-jquery.js' %}"></script>
-		<script src="{% static 'js/color_manager.js' %}" type="text/javascript"></script>
     <script src="{% static 'js/chart_manager.js' %}" type="text/javascript"></script>
     <script src="{% static 'js/graphics.js' %}" type="text/javascript"></script>
 		<script type="text/javascript">

agents_indicators/views.py

@@ -8,6 +8,7 @@
 from celery.decorators import task
 from quero_cultura.views import build_temporal_indicator
 from quero_cultura.views import build_operation_area_indicator
+from quero_cultura.views import sort_dict
 
 
 def index(request):
@@ -35,6 +36,7 @@ def index(request):
     # Inicializa variaveis com listas vazias
     per_area_keys = []
     per_area_values = []
+    per_area = sort_dict(per_area)
 
     # Prepara visualização do indicador por area de atuação
     for area in per_area:

events_indicators/static/js/events_graphics.js

@@ -10,7 +10,7 @@ function per_age_range_graphic(per_age_range_keys, per_age_range_values){
             datasets: [{
                 label: 'Faixa Etaria',
                 data: value_age_range,
-                backgroundColor: poolColors(value_age_range.length)
+                backgroundColor: 'rgba(17,90,163,1)'
             }]
         },
         options: {

events_indicators/templates/events_indicators/events_indicators.html

@@ -78,7 +78,6 @@
 
 	<!-- Imports necessários para funcionalidade da navbar e gráficos-->
 	<script src="{% static 'js/indicators/indicators-nav-jquery.js' %}"></script>
-	<script src="{% static 'js/color_manager.js' %}" type="text/javascript"></script>
 	<script src="{% static 'js/chart_manager.js' %}" type="text/javascript"></script>
 	<script src="{% static 'js/graphics.js' %}" type="text/javascript"></script>
 	<script src="static/js/events_graphics.js"></script>

events_indicators/views.py

@@ -7,6 +7,7 @@
 from quero_cultura.views import ParserYAML
 from datetime import datetime
 from celery.decorators import task
+from quero_cultura.views import sort_dict
 import yaml
 import json
 
@@ -23,17 +24,21 @@ def index(request):
     per_language = per_language.total_events_per_language
     per_age_range = per_age_range.total_events_per_age_range
     temporal = temporal.total_events_registered_per_mounth_per_year
-
+    
     per_language_keys = []
     per_language_values = []
 
+    per_language = sort_dict(per_language)
+
     for language in per_language:
         per_language_keys.append(language)
         per_language_values.append(per_language[language])
 
     per_age_range_keys = []
     per_age_range_values = []
 
+    per_age_range = sort_dict(per_age_range)
+
     for age_range in per_age_range:
         per_age_range_keys.append(age_range)
         per_age_range_values.append(per_age_range[age_range])
@@ -45,6 +50,7 @@ def index(request):
     temporal_keys = []
     temporal_values = []
     temporal_growth = []
+
     print("\n\n", temporal, "\n\n")
     for year in range(2014, last_year):
         for month in months:

library_indicators/templates/library_indicators/library.html

@@ -98,7 +98,6 @@
 
 	   <!-- Imports necessários para funcionalidade da navbar e gráficos-->
 		<script src="{% static 'js/indicators/indicators-nav-jquery.js' %}"></script>
-    <script src="{% static 'js/color_manager.js' %}" type="text/javascript"></script>
     <script src="{% static 'js/chart_manager.js' %}" type="text/javascript"></script>
     <script src="{% static 'js/graphics.js' %}" type="text/javascript"></script>
     <script type = "text/javascript" src="static/js/library_graphics.js"></script>

library_indicators/views.py

@@ -4,6 +4,7 @@
 from .models import QuantityOfRegisteredlibraries
 from .models import PercentLibrariesTypeSphere
 from django.shortcuts import render
+from quero_cultura.views import sort_dict
 import datetime
 from celery.decorators import task
 
@@ -13,25 +14,29 @@
 def index(request):
 
     last_register_percent_private_library = PercentPublicOrPrivateLibrary.objects.count()
-    percent_public_private = PercentPublicOrPrivateLibrary.objects[last_register_percent_private_library-1]
+    percent_public_private = PercentPublicOrPrivateLibrary.objects[
+        last_register_percent_private_library - 1]
 
     last_register_quantity_libraries = QuantityOfRegisteredlibraries.objects.count()
-    quantity_libraries = QuantityOfRegisteredlibraries.objects[last_register_quantity_libraries -1]
+    quantity_libraries = QuantityOfRegisteredlibraries.objects[
+        last_register_quantity_libraries - 1]
 
     last_register_type_sphere_quantity = PercentLibrariesTypeSphere.objects.count()
-    type_sphere_total = PercentLibrariesTypeSphere.objects[last_register_type_sphere_quantity - 1]
+    type_sphere_total = PercentLibrariesTypeSphere.objects[
+        last_register_type_sphere_quantity - 1]
 
     last_register_ocupation_area_quantity = PercentLibraryPerAreaOfActivity.objects.count()
-    ocupation_area_total = PercentLibraryPerAreaOfActivity.objects[last_register_ocupation_area_quantity - 1]
+    ocupation_area_total = PercentLibraryPerAreaOfActivity.objects[
+        last_register_ocupation_area_quantity - 1]
 
     context = {
         'total_libraries': percent_public_private._total_libraries,
         'amount_public_libraries': percent_public_private._total_public_libraries,
         'amount_private_libraries': percent_public_private._total_private_libraries,
         'quantity_per_mouth': quantity_libraries._libraries_registered_monthly,
         'quantity_per_year': quantity_libraries._libraries_registered_yearly,
-        'type_sphere_total': type_sphere_total._total_libraries_type_sphere,
-        'ocupation_area_total': ocupation_area_total._libraries_per_activity,
+        'type_sphere_total': sort_dict(type_sphere_total._total_libraries_type_sphere),
+        'ocupation_area_total': sort_dict(ocupation_area_total._libraries_per_activity),
         'amount_of_ocupation_area': ocupation_area_total._amount_areas,
     }
 
@@ -54,8 +59,8 @@ def update_library_public_private_indicator():
         public_libraries = 0
         private_libraries = 0
         total_libraries = 0
-        undefined_library, public_libraries, private_libraries, total_libraries =  set_libraries_amount(undefined_library,
-                             public_libraries, private_libraries, total_libraries)
+        undefined_library, public_libraries, private_libraries, total_libraries = set_libraries_amount(undefined_library,
+                                                                                                       public_libraries, private_libraries, total_libraries)
         PercentPublicOrPrivateLibrary(total_libraries,
                                       datetime.datetime.now(),
                                       public_libraries, private_libraries).save()
@@ -71,7 +76,8 @@ def set_libraries_amount(undefined_library, public_libraries, private_libraries,
 
 def update_quantity_libraries():
     if (len(QuantityOfRegisteredlibraries.objects) == 0):
-        QuantityOfRegisteredlibraries(0, DEFAULT_INITIAL_DATE, {'julho':10}, {'2010':2}).save()
+        QuantityOfRegisteredlibraries(0, DEFAULT_INITIAL_DATE, {
+                                      'julho': 10}, {'2010': 2}).save()
     else:
         undefined_library = 0
         public_libraries = 0
@@ -90,22 +96,26 @@ def update_quantity_libraries():
 
 def update_type_sphere_indicator():
     if (len(PercentLibrariesTypeSphere.objects) == 0):
-        PercentLibrariesTypeSphere(0, DEFAULT_INITIAL_DATE,{'Municipal': 1}).save()
+        PercentLibrariesTypeSphere(0, DEFAULT_INITIAL_DATE, {
+                                   'Municipal': 1}).save()
     else:
-        total_libraries = get_public_libraries() + get_private_libraries() + get_undefined_library()
+        total_libraries = get_public_libraries() + get_private_libraries() + \
+            get_undefined_library()
         type_sphere_total = get_all_type_sphere()
         PercentLibrariesTypeSphere(total_libraries,
-                                    datetime.datetime.now(),
-                                    type_sphere_total).save()
+                                   datetime.datetime.now(),
+                                   type_sphere_total).save()
 
 
 def update_ocupation_area_indicator():
     if (len(PercentLibraryPerAreaOfActivity.objects) == 0):
-        PercentLibraryPerAreaOfActivity(0, DEFAULT_INITIAL_DATE,{'Leitura': 1},0).save()
+        PercentLibraryPerAreaOfActivity(
+            0, DEFAULT_INITIAL_DATE, {'Leitura': 1}, 0).save()
     else:
         ocupation_area_total = get_all_occupation_area()
         amount_ocupation_area = len(ocupation_area_total)
-        total_libraries = get_public_libraries() + get_private_libraries() + get_undefined_library()
+        total_libraries = get_public_libraries() + get_private_libraries() + \
+            get_undefined_library()
         PercentLibraryPerAreaOfActivity(total_libraries,
                                         datetime.datetime.now(),
                                         ocupation_area_total,
@@ -138,7 +148,7 @@ def get_private_libraries():
 def get_undefined_library():
     count = 0
     for librarie in get_all_libraries():
-        if( librarie["esfera"] == None ):
+        if(librarie["esfera"] == None):
             count = count + 1
     return count
 
@@ -208,7 +218,7 @@ def get_all_type_sphere():
 
 
 def filter_sphere_type(per_type, library):
-    if(library["esfera_tipo"] != None):
+    if(library["esfera_tipo"] != None or library["esfera_tipo"] != ""):
         if not (library["esfera_tipo"] in per_type):
             per_type[library["esfera_tipo"]] = 1
         else:

museums_indicators/api_connections.py

@@ -9,8 +9,8 @@ def __init__(self, last_update_time):
         self._parser_yaml = ParserYAML()
         self._museum_url = self._parser_yaml.get_museums_urls
         self._url = self._museum_url[0]
-        self._filters = {'@select': 'mus_tipo, mus_tipo_tematica,'
-                                    + 'En_Estado, esfera,'
+        self._filters = {'@select': 'mus_tipo, mus_tipo_tematica, '
+                                    + 'esfera, '
                                     + 'mus_servicos_visitaGuiada, '
                                     + 'mus_arquivo_acessoPublico, '
                                     + 'createTimestamp',