Release: 3.1.3

ojonathacardoso · Jul 5, 2022 · 5767bc9 · 5767bc9
1 parent af404e5
commit 5767bc9
Show file tree

Hide file tree

Showing 64 changed files with 2,154 additions and 713 deletions.
diff --git a/config/rest_framework/templates/rest_framework/login_base.html b/config/rest_framework/templates/rest_framework/login_base.html
@@ -3,7 +3,7 @@
 
 {% block body %}
 <body class="container">
-  <div class="container-fluid" style="margin-top: 30px">
+  <div class="container" style="margin-top: 30px">
     <div class="row-fluid">
       <div class="well" style="width: 320px; margin-left: auto; margin-right: auto">
         <div class="row-fluid">

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -22,8 +22,8 @@ ENV BUILD_PACKAGES apt-utils apt-file build-essential dialog graphviz-dev \
 
 # Pacotes usados na execucao da imagem
 ENV RUN_PACKAGES antiword bash curl default-jre fontconfig git graphviz jq \
-                 python python3-lxml python3-magic python3-psycopg2 python3-venv \
-                 nginx nodejs poppler-utils postgresql-client sudo ttf-dejavu tzdata vim
+                 python python3-lxml python3-magic python3-psycopg2 python3-venv nginx \
+                 nodejs poppler-utils postgresql-client sudo ttf-dejavu tzdata vim wkhtmltopdf
 
 # Instalacao dos pacotes
 RUN apt-get update -y &&\

diff --git a/docker/start.sh b/docker/start.sh
@@ -55,9 +55,6 @@ load_db() {
     echo "[LOAD_DB] Creating database structure..."
     yes yes | python3 manage.py migrate
 
-    echo "[LOAD_DB] Creating extension..."
-    psql -h saapdb -U saap -c "CREATE EXTENSION unaccent;"
-
     echo "[LOAD_DB] Done!"
 }
 

diff --git a/docs/docker.rst b/docs/docker.rst
@@ -69,12 +69,13 @@ Se a opção ``BRASAO_PROPRIO`` está com ``True``, é necessário atualizar a i
 ::
 
     sudo docker cp brasao-camara.png saap:/var/interlegis/saap/saap/static/img/brasao-camara.png
+    sudo docker cp brasao-camara.png saap:/var/interlegis/saap/collected_static/img/brasao-camara.png
 
 
-5) Fazer a carga inicial do banco
+5) Preparar o banco de dados
 ----------------------------------------------------------------------------------------
 
-Para que o sistema esteja com os dados iniciais, além das configurações de permissões, deve-se rodar os comandos a seguir, na ordem:
+Para que o sistema pronto, devemos carregar o banco com os dados iniciais, bem como as configurações de permissões. Para isto, deve-se rodar os comandos a seguir, na ordem:
 
 ::
 
@@ -89,6 +90,12 @@ Para que o sistema esteja com os dados iniciais, além das configurações de pe
     ./manage.py loaddata config/initial_data/saap_*.json
     exit
 
+Para concluir, deve-se criar a função ``unaccent``, que será usada em diversas consultas dentro do SAAP:
+
+::
+
+    sudo docker exec -i postgres psql -U saap -c "CREATE EXTENSION unaccent;"
+
 
 Parar imagens
 ----------------------------------------------------------------------------------------

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -1,36 +1,40 @@
 django>=1.9,<1.10
-django-admin-bootstrapped
+django-admin-bootstrapped==2.5.6
 django-bootstrap3==7.0.1
 django-bower==5.1.0
 django-braces==1.8.1
 django-compressor==2.0
 django-crispy-forms==1.6.0
-django-exclusivebooleanfield
+django-exclusivebooleanfield==0.3.0
 django-extensions==1.6.1
 django-extra-views==0.7.1
 django-filter==0.13.0
 django-floppyforms==1.6.1
-django-image-cropping
+django-image-cropping==1.5.0
 django-model-utils==2.4
 django-modelcluster==2.0
 django-sass-processor==0.3.4
-django-smart-selects
-django-taggit==0.21.2
+django-smart-selects==1.5.9
 djangorestframework==3.9.1
 dj-database-url==0.4.1
 easy-thumbnails==2.3
-trml2pdf
+trml2pdf==0.4
 gunicorn==19.5.0
 libsass==0.11.0
+odfpy==1.4.1
+openpyxl==3.0.10
+pandas==1.0.0
+pdfkit==1.0.0
 psycopg2==2.8.6
 psycopg2-binary==2.8.6
-pyjwkest
-python-dateutil
+pyjwkest==1.4.2
+python-dateutil==2.8.1
 python-decouple==3.0
 python-magic==0.4.10
-pytz==2016.3
+pytz==2017.2
 pyyaml==5.1
 rtyaml==0.0.2
 sqlparse==0.2.0
 unipath==1.1
-xlwt
+xlwt==1.3.0
+