Atendimento v2

.gitignore

@@ -47,3 +47,11 @@ db.*
 
 .vagrant
 sigi/settings/prod.py
+bower/
+collected_static/
+eav/
+geraldo/
+
+*.bak
+*~
+

Dockerfile

@@ -0,0 +1,66 @@
+FROM ubuntu:15.04
+
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+RUN mkdir /sigi
+
+RUN	apt-get update && \
+	apt-get install -y -f \
+	build-essential \
+	curl \
+	git \
+	graphviz-dev \
+	graphviz \
+	libz-dev \
+	libffi-dev \
+	libfreetype6-dev \
+	libjpeg62 \
+	libjpeg-dev \
+	libldap2-dev \
+	libpq-dev \
+	libsasl2-dev \
+	libssl-dev \
+	libxft-dev \
+	libxml2-dev \
+	libxslt1-dev \
+	nginx \
+	pkg-config \
+	python-dev \
+	python-setuptools \
+	software-properties-common \
+	npm \
+	nodejs
+
+# install nodejs
+RUN DEBIAN_FRONTEND=noninteractive curl -sL https://deb.nodesource.com/setup_5.x | bash -
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
+
+# install bower
+RUN npm install -g bower
+
+# Bower aceitar root
+RUN touch /root/.bowerrc
+RUN chmod 751 /root/.bowerrc
+RUN echo "{ \"allow_root\": true }" >> /root/.bowerrc
+
+ADD . /sigi
+
+WORKDIR /sigi
+
+RUN easy_install pip
+RUN pip2 install -r requirements/dev-requirements.txt
+RUN pip2 install --upgrade setuptools
+
+RUN mkdir -p /var/log/sigi/
+RUN touch /var/log/sigi/application.log
+RUN chmod -x /var/log/sigi/application.log
+
+RUN git clone https://github.com/marinho/geraldo.git
+WORKDIR /sigi/geraldo/
+RUN python setup.py install
+RUN cp -Rfv reporting geraldo `python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`
+WORKDIR /sigi
+RUN rm -rf geraldo/

check_qa.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Check if there's some debug breakpoint in codebase
+me=`basename "$0"`
+stmts=`grep --exclude=$me -r -l "ipdb.set_trace()" * | wc -l`
+if [ $stmts != '0' ]
+then
+    echo "=================================================================="
+    echo "ERROR: ipdb.set_trace() call in codebase! Remove, please."
+    grep --exclude=$me -r -n "ipdb.set_trace()" *
+    echo "=================================================================="
+fi
+
+# QA checks: run this before every commit
+./manage.py check
+flake8 --exclude='ipython_log.py*,migrations,templates' .
+isort --recursive --check-only --skip='migrations' --skip='templates' --skip='ipython_log.py' .

conftest.py

@@ -2,7 +2,6 @@
 import pytest
 from django_webtest import DjangoTestApp, WebTestMixin
 
-
 DEFAULT_MARK = object()
 
 

docker-compose.yml

@@ -0,0 +1,32 @@
+#localhost:
+#  image: postgres
+#  environment:
+#    POSTGRES_PASSWORD: sigi
+#    POSTGRES_USER: sigi
+#    POSTGRES_DB: sigi
+#  ports:
+#    - "5532:5432"
+#web:
+#  build: .
+#  command: bash -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
+#  volumes:
+#    - .:/sigi
+#  ports:
+#    - "8000:8000"
+#  links:
+#    - localhost
+
+osticket:
+  image: campbellsoftwaresolutions/osticket
+  ports:
+    - "80:80"
+  links:
+    - mysql
+
+mysql:
+  image: mysql
+  environment:
+    - MYSQL_ROOT_PASSWORD=secret
+    - MYSQL_DATABASE=osticket
+    - MYSQL_USER=osticket
+    - MYSQL_PASSWORD=secret

etc/migracao/migra.py

@@ -19,19 +19,21 @@
 banco de dados em produção.
 """
 
+import csv
+from datetime import datetime
+
 from django.core.management import setup_environ
 
 from sigi import settings
-setup_environ(settings)
-
-import csv
-from datetime import datetime
 from sigi.apps.casas.models import *
 from sigi.apps.contatos.models import *
 from sigi.apps.convenios.models import *
 from sigi.apps.inventario.models import *
 from sigi.apps.parlamentares.models import *
 
+setup_environ(settings)
+
+
 ERROR_MSG_0 = ('<ERRO> %s[%s]: erro desconhecido! Possível erro de integridade '
                'do banco de dados. Favor verificar e inserir manualmente caso '
                'necessário.')

fix_qa.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# QA fix: Use ese script para corrigir automaticamente vários
+#  problemas de estilo e boas práticas no código.
+#
+# Sempre guarde suas mudanças de alguma forma antes de aplicar esse script,
+# de modo que possa revisar cada alteração que ele fez.
+# Uma forma simples de fazer isso é adicionando antes suas mudanças à
+# "staging area" do git, com `git add .` e após usar o script `git diff`.
+
+isort --recursive --skip='migrations' --skip='templates' --skip='ipython_log.py' .

moodlerouter.py

@@ -18,7 +18,7 @@ def allow_relation(self, obj1, obj2, **hints):
             return True
         return None
 
-    def allow_migrate(self, db, model):
-        if model._meta.app_label == 'mdl':
+    def allow_migrate(self, db, app_label, model_name=None, **hints):
+        if app_label == 'mdl':
             return False
         return None

prod.py

@@ -0,0 +1 @@
+dev.py

requirements/dev-requirements.txt

@@ -1,5 +1,7 @@
 -r test-requirements.txt
-django-debug-toolbar==1.2.2
-ipdb==0.8
-ipython==2.3.1
-pygraphviz==1.2
+django-debug-toolbar==1.5
+ipdb==0.10.0
+ipython==4.2.0
+isort==4.2.5
+model_mommy==1.2.6
+pygraphviz==1.3.1

requirements/requirements.txt

@@ -1,23 +1,41 @@
 -e git://github.com/marinho/geraldo.git@868ebdce67176d9b6205cddc92476f642c783fff#egg=geraldo
-django-bootstrap3==6.2.2
-django-admin-bootstrapped==2.4.0
-django-auth-ldap==1.2.7
+git+git://github.com/hellpanderrr/django-admin-bootstrapped-1.9-compatible.git@master#egg=django_admin_bootstrapped
+git+git://github.com/interlegis/eav-django
+django-auth-ldap==1.2.8
 django-autoslug==1.9.3
-django-extensions==1.5.7
-django-image-cropping==1.0.2
-django-localflavor==1.1
-Django==1.7.10
-easy-thumbnails==2.2
-eav-django==1.4.7
-gunicorn==19.3.0
+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
+dj-database-url==0.4.1
+django-dotenv==1.4.1
+django-extensions==1.6.7
+django-extra-views==0.7.1
+django-filter==0.13.0
+django-floppyforms==1.6.1
+django-image-cropping==1.0.3
+django-localflavor==1.3
+django-model-utils==2.4
+django-sass-processor==0.3.4
+django-easy-select2==1.3.2
+django-simple-captcha==0.5.1
+Django==1.10.1
+libsass==0.11.0
+easy-thumbnails==2.3
+gunicorn==19.6.0
 html5lib==0.9999999
-Pillow==2.9.0
+Pillow==3.2.0
 pisa==3.0.33
 psycopg2==2.6.1
-python-memcached==1.53
+python-decouple==3.0
+python-memcached==1.58
+pytz==2016.3
 PyYAML==3.11
 reportlab==2.7
-requests==2.8.1
+requests==2.10.0
+rtyaml==0.0.2
+unipath==1.1
 six==1.10.0
 djangorestframework==2.4.8
 django-ipware==1.1.6

requirements/test-requirements.txt

@@ -1,10 +1,10 @@
 -r requirements.txt
-coverage==3.7.1
-django-dynamic-fixture==1.8.1
-django-webtest==1.7.7
+git+git://github.com/paulocheque/django-dynamic-fixture/@master
+coverage==4.1
+django-webtest==1.7.9
 pyPdf==1.13
-pyquery==1.2.9
-pytest-cov==1.8.1
-pytest-django==2.8.0
-pytest==2.6.4
-WebTest==2.0.17
+pyquery==1.2.13
+pytest-cov==2.2.1
+pytest-django==2.9.1
+pytest==2.9.2
+WebTest==2.0.21

scripts/atendimento/criar_grupos.py

@@ -0,0 +1,15 @@
+from django.contrib.auth.models import Group
+
+
+def criar_grupos():
+    # COPLAF = Atestar usuário
+    if not Group.objects.filter(name='COPLAF').exists():
+        Group.objects.create(name='COPLAF')
+
+    # COADFI = Atestar convênio
+    if not Group.objects.filter(name='COADFI').exists():
+        Group.objects.create(name='COADFI')
+
+    # Já recebeu aprovação dos dois grupos de cima
+    if not Group.objects.filter(name='Usuario_Habilitado').exists():
+        Group.objects.create(name='Usuario_Habilitado')

scripts/casas_com_PM_e_SAPL.py

@@ -1,7 +1,6 @@
 from csv_writer import CsvWriter
 from sigi.apps.servicos.models import Servico
 
-
 ARQUIVO_CSV = '/tmp/casas_que_usam_PM_e_SAPL.csv'
 
 

scripts/casas_que_usam_LEGBR_ou_PM.py

@@ -1,9 +1,8 @@
-import cStringIO
 import codecs
+import cStringIO
 import csv
 
-from sigi.apps.servicos.models import TipoServico, Servico
-
+from sigi.apps.servicos.models import Servico, TipoServico
 
 # cria um CSV com contatos das casas legislativas que possuem portal modelo ativo
 # rodar em um shell:

scripts/contatos_de_casas_que_usam_portalmodelo.py

@@ -1,10 +1,10 @@
-import cStringIO
 import codecs
+import cStringIO
 import csv
 
 from sigi.apps.casas.models import Funcionario
 from sigi.apps.contatos.models import Telefone
-from sigi.apps.servicos.models import TipoServico, Servico
+from sigi.apps.servicos.models import Servico, TipoServico
 
 # cria um CSV com contatos das casas legislativas que possuem portal modelo ativo
 # rodar em um shell:

scripts/csv_writer.py

@@ -1,5 +1,5 @@
-import cStringIO
 import codecs
+import cStringIO
 import csv