Fix sigla in atendimento

Signed-off-by: Luciano Almeida <mdiebr@gmail.com>

Dockerfile

@@ -54,3 +54,13 @@ 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/

docker-compose.yml

@@ -1,20 +1,20 @@
-localhost:
+#localhost:
-  image: postgres
+#  image: postgres
-  environment:
+#  environment:
-    POSTGRES_PASSWORD: sigi
+#    POSTGRES_PASSWORD: sigi
-    POSTGRES_USER: sigi
+#    POSTGRES_USER: sigi
-    POSTGRES_DB: sigi
+#    POSTGRES_DB: sigi
-  ports:
+#  ports:
-    - "5532:5432"
+#    - "5532:5432"
-web:
+#web:
-  build: .
+#  build: .
-  command: bash -c "python manage.py bower install && python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
+#  command: bash -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
-  volumes:
+#  volumes:
-    - .:/sigi
+#    - .:/sigi
-  ports:
+#  ports:
-    - "8000:8000"
+#    - "8000:8000"
-  links:
+#  links:
-    - localhost
+#    - localhost
 
 osticket:
   image: campbellsoftwaresolutions/osticket

sigi/apps/casas/models.py

@@ -243,7 +243,7 @@ class CasaLegislativa(models.Model):
         return codigo
 
     def __unicode__(self):
-        return self.nome
+        return self.nome + ' - ' + self.municipio.uf.sigla
 
     def save(self, *args, **kwargs):
         address_changed = False

sigi/apps/servidores/models.py

@@ -63,7 +63,7 @@ class Servidor(models.Model):
     )
 
     # usuario responsavel pela autenticação do servidor no sistema
-    user = models.ForeignKey(User, unique=True)
+    user = models.OneToOneField(User, unique=True)
     nome_completo = models.CharField(max_length=128)
     apelido = models.CharField(max_length=50, blank=True)
     # caminho no sistema para arquivo com a imagem