moviendo el proyecto un nivel

simasnicaragua · Oct 4, 2010 · a06300e · a06300e
1 parent 0f0760d
commit a06300e
Show file tree

Hide file tree

Showing 101 changed files with 4,616 additions and 0 deletions.
diff --git a/fed/__init__.py → __init__.py b/fed/__init__.py → __init__.py
diff --git a/fed/encuesta/__init__.py → encuesta/__init__.py b/fed/encuesta/__init__.py → encuesta/__init__.py
diff --git a/fed/encuesta/admin.py → encuesta/admin.py b/fed/encuesta/admin.py → encuesta/admin.py
diff --git a/fed/encuesta/decorators.py → encuesta/decorators.py b/fed/encuesta/decorators.py → encuesta/decorators.py
diff --git a/fed/encuesta/forms.py → encuesta/forms.py b/fed/encuesta/forms.py → encuesta/forms.py
diff --git a/fed/encuesta/management/__init__.py → encuesta/management/__init__.py b/fed/encuesta/management/__init__.py → encuesta/management/__init__.py
diff --git a/fed/encuesta/management/commands/__init__.py → encuesta/management/commands/__init__.py b/fed/encuesta/management/commands/__init__.py → encuesta/management/commands/__init__.py
diff --git a/...uesta/management/commands/csv_importer.py → encuesta/management/commands/csv_importer.py b/...uesta/management/commands/csv_importer.py → encuesta/management/commands/csv_importer.py
diff --git a/fed/encuesta/management/commands/csv_utf8.py → encuesta/management/commands/csv_utf8.py b/fed/encuesta/management/commands/csv_utf8.py → encuesta/management/commands/csv_utf8.py
diff --git a/encuesta/migrations/0005_auto__add_field_proyecto_municipio.py b/encuesta/migrations/0005_auto__add_field_proyecto_municipio.py
diff --git a/...sta/migrations/0006_auto__del_field_proyecto_municipio__add_field_proyecto_descripcion.py b/...sta/migrations/0006_auto__del_field_proyecto_municipio__add_field_proyecto_descripcion.py
diff --git a/encuesta/migrations/0007_auto__chg_field_proyecto_descripcion.py b/encuesta/migrations/0007_auto__chg_field_proyecto_descripcion.py
diff --git a/encuesta/migrations/0008_auto__add_indicador.py b/encuesta/migrations/0008_auto__add_indicador.py
diff --git a/encuesta/migrations/0009_auto__chg_field_indicador_slug.py b/encuesta/migrations/0009_auto__chg_field_indicador_slug.py
diff --git a/encuesta/migrations/0010_auto.py b/encuesta/migrations/0010_auto.py
diff --git a/encuesta/migrations/0011_auto.py b/encuesta/migrations/0011_auto.py
diff --git a/encuesta/migrations/0012_auto.py b/encuesta/migrations/0012_auto.py
diff --git a/...migrations/0013_auto__del_field_encuesta_fecha_inicio__del_field_encuesta_fecha_fin__a.py b/...migrations/0013_auto__del_field_encuesta_fecha_inicio__del_field_encuesta_fecha_fin__a.py
diff --git a/...migrations/0014_auto__del_field_encuesta_anio__del_field_encuesta_periodo__add_field_e.py b/...migrations/0014_auto__del_field_encuesta_anio__del_field_encuesta_periodo__add_field_e.py
diff --git a/encuesta/migrations/0015_auto__del_field_encuesta_fecha_fin__add_field_encuesta_anio.py b/encuesta/migrations/0015_auto__del_field_encuesta_fecha_fin__add_field_encuesta_anio.py
diff --git a/...esta/migrations/0016_auto__del_field_encuesta_fecha_inicio__add_field_encuesta_periodo.py b/...esta/migrations/0016_auto__del_field_encuesta_fecha_inicio__add_field_encuesta_periodo.py
diff --git a/encuesta/migrations/0017_auto__chg_field_encuesta_periodo.py b/encuesta/migrations/0017_auto__chg_field_encuesta_periodo.py
diff --git a/encuesta/migrations/0018_auto__add_field_encuesta_user.py b/encuesta/migrations/0018_auto__add_field_encuesta_user.py
diff --git a/encuesta/migrations/0019_auto__chg_field_encuesta_user.py b/encuesta/migrations/0019_auto__chg_field_encuesta_user.py
diff --git a/fed/lugar/__init__.py → encuesta/migrations/__init__.py b/fed/lugar/__init__.py → encuesta/migrations/__init__.py
diff --git a/fed/encuesta/models.py → encuesta/models.py b/fed/encuesta/models.py → encuesta/models.py
diff --git a/fed/encuesta/tests.py → encuesta/tests.py b/fed/encuesta/tests.py → encuesta/tests.py
diff --git a/fed/encuesta/urls.py → encuesta/urls.py b/fed/encuesta/urls.py → encuesta/urls.py
diff --git a/fed/encuesta/views.py → encuesta/views.py b/fed/encuesta/views.py → encuesta/views.py
diff --git a/fed/fed plantillas/back.png → fed plantillas/back.png b/fed/fed plantillas/back.png → fed plantillas/back.png
diff --git a/fed/fed plantillas/back2.png → fed plantillas/back2.png b/fed/fed plantillas/back2.png → fed plantillas/back2.png
diff --git a/fed/fed plantillas/base.html → fed plantillas/base.html b/fed/fed plantillas/base.html → fed plantillas/base.html
diff --git a/fed/fed plantillas/border-body.png → fed plantillas/border-body.png b/fed/fed plantillas/border-body.png → fed plantillas/border-body.png
diff --git a/fed/fed plantillas/border-bottom.png → fed plantillas/border-bottom.png b/fed/fed plantillas/border-bottom.png → fed plantillas/border-bottom.png
diff --git a/fed/fed plantillas/border-top.png → fed plantillas/border-top.png b/fed/fed plantillas/border-top.png → fed plantillas/border-top.png
diff --git a/fed/fed plantillas/border.png → fed plantillas/border.png b/fed/fed plantillas/border.png → fed plantillas/border.png
diff --git a/fed/fed plantillas/botones.png → fed plantillas/botones.png b/fed/fed plantillas/botones.png → fed plantillas/botones.png
diff --git a/fed/fed plantillas/footer.png → fed plantillas/footer.png b/fed/fed plantillas/footer.png → fed plantillas/footer.png
diff --git a/fed/fed plantillas/input-back.png → fed plantillas/input-back.png b/fed/fed plantillas/input-back.png → fed plantillas/input-back.png
diff --git a/fed/fed plantillas/label-back.png → fed plantillas/label-back.png b/fed/fed plantillas/label-back.png → fed plantillas/label-back.png
diff --git a/fed/fed plantillas/logo.png → fed plantillas/logo.png b/fed/fed plantillas/logo.png → fed plantillas/logo.png
diff --git a/fed/fed plantillas/style.css → fed plantillas/style.css b/fed/fed plantillas/style.css → fed plantillas/style.css
diff --git a/fed/fed plantillas/tools.png → fed plantillas/tools.png b/fed/fed plantillas/tools.png → fed plantillas/tools.png
diff --git a/fed/fed plantillas/vline.png → fed plantillas/vline.png b/fed/fed plantillas/vline.png → fed plantillas/vline.png
diff --git a/fed/fed.db → fed.db b/fed/fed.db → fed.db
diff --git a/fed/files/css/django-admin-widgets.css → files/css/django-admin-widgets.css b/fed/files/css/django-admin-widgets.css → files/css/django-admin-widgets.css
diff --git a/fed/files/css/fed.css → files/css/fed.css b/fed/files/css/fed.css → files/css/fed.css
diff --git a/fed/files/images/admin.png → files/images/admin.png b/fed/files/images/admin.png → files/images/admin.png
diff --git a/fed/files/images/avatar.png → files/images/avatar.png b/fed/files/images/avatar.png → files/images/avatar.png
diff --git a/fed/files/images/back.png → files/images/back.png b/fed/files/images/back.png → files/images/back.png
diff --git a/fed/files/images/back2.png → files/images/back2.png b/fed/files/images/back2.png → files/images/back2.png
diff --git a/fed/files/images/bg_header.png → files/images/bg_header.png b/fed/files/images/bg_header.png → files/images/bg_header.png
diff --git a/fed/files/images/border-body.png → files/images/border-body.png b/fed/files/images/border-body.png → files/images/border-body.png
diff --git a/fed/files/images/border-bottom.png → files/images/border-bottom.png b/fed/files/images/border-bottom.png → files/images/border-bottom.png
diff --git a/fed/files/images/border-top.png → files/images/border-top.png b/fed/files/images/border-top.png → files/images/border-top.png
diff --git a/fed/files/images/border.png → files/images/border.png b/fed/files/images/border.png → files/images/border.png
diff --git a/fed/files/images/botones.png → files/images/botones.png b/fed/files/images/botones.png → files/images/botones.png
diff --git a/fed/files/images/footer.png → files/images/footer.png b/fed/files/images/footer.png → files/images/footer.png
diff --git a/fed/files/images/hline.png → files/images/hline.png b/fed/files/images/hline.png → files/images/hline.png
diff --git a/fed/files/images/indicadores.png → files/images/indicadores.png b/fed/files/images/indicadores.png → files/images/indicadores.png
diff --git a/fed/files/images/influencia.png → files/images/influencia.png b/fed/files/images/influencia.png → files/images/influencia.png
diff --git a/fed/files/images/input-back.png → files/images/input-back.png b/fed/files/images/input-back.png → files/images/input-back.png
diff --git a/fed/files/images/label-back.png → files/images/label-back.png b/fed/files/images/label-back.png → files/images/label-back.png
diff --git a/fed/files/images/logo.png → files/images/logo.png b/fed/files/images/logo.png → files/images/logo.png
diff --git a/fed/files/images/logo_fed_hivos.png → files/images/logo_fed_hivos.png b/fed/files/images/logo_fed_hivos.png → files/images/logo_fed_hivos.png
diff --git a/fed/files/images/mas.png → files/images/mas.png b/fed/files/images/mas.png → files/images/mas.png
diff --git a/fed/files/images/salir.png → files/images/salir.png b/fed/files/images/salir.png → files/images/salir.png
diff --git a/fed/files/images/tools.png → files/images/tools.png b/fed/files/images/tools.png → files/images/tools.png
diff --git a/fed/files/images/vline.png → files/images/vline.png b/fed/files/images/vline.png → files/images/vline.png
diff --git a/fed/files/images/vline2.png → files/images/vline2.png b/fed/files/images/vline2.png → files/images/vline2.png
diff --git a/fed/files/images/vline3.png → files/images/vline3.png b/fed/files/images/vline3.png → files/images/vline3.png
diff --git a/fed/files/js/django-admin.multiselect.js → files/js/django-admin.multiselect.js b/fed/files/js/django-admin.multiselect.js → files/js/django-admin.multiselect.js
diff --git a/fed/files/js/jquery.js → files/js/jquery.js b/fed/files/js/jquery.js → files/js/jquery.js
diff --git a/fed/files/js/jquery.min.js → files/js/jquery.min.js b/fed/files/js/jquery.min.js → files/js/jquery.min.js
diff --git a/fed/files/js/jsi18n.js → files/js/jsi18n.js b/fed/files/js/jsi18n.js → files/js/jsi18n.js
diff --git a/lugar/__init__.py b/lugar/__init__.py
diff --git a/fed/lugar/admin.py → lugar/admin.py b/fed/lugar/admin.py → lugar/admin.py
diff --git a/lugar/migrations/0001_initial.py b/lugar/migrations/0001_initial.py
@@ -0,0 +1,54 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'Departamento'
+        db.create_table('lugar_departamento', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('nombre', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=50, unique=True, null=True, db_index=True)),
+        ))
+        db.send_create_signal('lugar', ['Departamento'])
+
+        # Adding model 'Municipio'
+        db.create_table('lugar_municipio', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('departamento', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['lugar.Departamento'])),
+            ('nombre', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=50, unique=True, null=True, db_index=True)),
+        ))
+        db.send_create_signal('lugar', ['Municipio'])
+
+
+    def backwards(self, orm):
+
+        # Deleting model 'Departamento'
+        db.delete_table('lugar_departamento')
+
+        # Deleting model 'Municipio'
+        db.delete_table('lugar_municipio')
+
+
+    models = {
+        'lugar.departamento': {
+            'Meta': {'object_name': 'Departamento'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nombre': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'db_index': 'True'})
+        },
+        'lugar.municipio': {
+            'Meta': {'object_name': 'Municipio'},
+            'departamento': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lugar.Departamento']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nombre': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'db_index': 'True'})
+        }
+    }
+
+    complete_apps = ['lugar']
diff --git a/lugar/migrations/0002_auto__add_field_municipio_latitud__add_field_municipio_longitud.py b/lugar/migrations/0002_auto__add_field_municipio_latitud__add_field_municipio_longitud.py
@@ -0,0 +1,45 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding field 'Municipio.latitud'
+        db.add_column('lugar_municipio', 'latitud', self.gf('django.db.models.fields.DecimalField')(null=True, max_digits=8, decimal_places=5, blank=True), keep_default=False)
+
+        # Adding field 'Municipio.longitud'
+        db.add_column('lugar_municipio', 'longitud', self.gf('django.db.models.fields.DecimalField')(null=True, max_digits=8, decimal_places=5, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+
+        # Deleting field 'Municipio.latitud'
+        db.delete_column('lugar_municipio', 'latitud')
+
+        # Deleting field 'Municipio.longitud'
+        db.delete_column('lugar_municipio', 'longitud')
+
+
+    models = {
+        'lugar.departamento': {
+            'Meta': {'object_name': 'Departamento'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nombre': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'db_index': 'True'})
+        },
+        'lugar.municipio': {
+            'Meta': {'object_name': 'Municipio'},
+            'departamento': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lugar.Departamento']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latitud': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '8', 'decimal_places': '5', 'blank': 'True'}),
+            'longitud': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '8', 'decimal_places': '5', 'blank': 'True'}),
+            'nombre': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'db_index': 'True'})
+        }
+    }
+
+    complete_apps = ['lugar']
diff --git a/...migrations/0003_auto__add_field_municipio_extension__chg_field_municipio_id__add_field.py b/...migrations/0003_auto__add_field_municipio_extension__chg_field_municipio_id__add_field.py
@@ -0,0 +1,59 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding field 'Municipio.extension'
+        db.add_column('lugar_municipio', 'extension', self.gf('django.db.models.fields.DecimalField')(null=True, max_digits=10, decimal_places=2, blank=True), keep_default=False)
+
+        # Changing field 'Municipio.id'
+        db.alter_column('lugar_municipio', 'id', self.gf('django.db.models.fields.IntegerField')(primary_key=True))
+
+        # Adding field 'Departamento.extension'
+        db.add_column('lugar_departamento', 'extension', self.gf('django.db.models.fields.DecimalField')(null=True, max_digits=10, decimal_places=2), keep_default=False)
+
+        # Changing field 'Departamento.id'
+        db.alter_column('lugar_departamento', 'id', self.gf('django.db.models.fields.IntegerField')(primary_key=True))
+
+
+    def backwards(self, orm):
+
+        # Deleting field 'Municipio.extension'
+        db.delete_column('lugar_municipio', 'extension')
+
+        # Changing field 'Municipio.id'
+        db.alter_column('lugar_municipio', 'id', self.gf('django.db.models.fields.AutoField')(primary_key=True))
+
+        # Deleting field 'Departamento.extension'
+        db.delete_column('lugar_departamento', 'extension')
+
+        # Changing field 'Departamento.id'
+        db.alter_column('lugar_departamento', 'id', self.gf('django.db.models.fields.AutoField')(primary_key=True))
+
+
+    models = {
+        'lugar.departamento': {
+            'Meta': {'object_name': 'Departamento'},
+            'extension': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '10', 'decimal_places': '2'}),
+            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+            'nombre': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'db_index': 'True'})
+        },
+        'lugar.municipio': {
+            'Meta': {'object_name': 'Municipio'},
+            'departamento': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lugar.Departamento']"}),
+            'extension': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}),
+            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+            'latitud': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '8', 'decimal_places': '5', 'blank': 'True'}),
+            'longitud': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '8', 'decimal_places': '5', 'blank': 'True'}),
+            'nombre': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'db_index': 'True'})
+        }
+    }
+
+    complete_apps = ['lugar']
diff --git a/lugar/migrations/__init__.py b/lugar/migrations/__init__.py
diff --git a/fed/lugar/models.py → lugar/models.py b/fed/lugar/models.py → lugar/models.py
diff --git a/fed/lugar/views.py → lugar/views.py b/fed/lugar/views.py → lugar/views.py
diff --git a/fed/manage.py → manage.py b/fed/manage.py → manage.py
diff --git a/fed/moco.svg → moco.svg b/fed/moco.svg → moco.svg
diff --git a/fed/settings.py → settings.py b/fed/settings.py → settings.py
diff --git a/fed/settings_local.py → settings_local.py b/fed/settings_local.py → settings_local.py
diff --git a/fed/templates/admin/base_site.html → templates/admin/base_site.html b/fed/templates/admin/base_site.html → templates/admin/base_site.html
diff --git a/fed/templates/base.html → templates/base.html b/fed/templates/base.html → templates/base.html
diff --git a/fed/templates/fed/indicador111.html → templates/fed/indicador111.html b/fed/templates/fed/indicador111.html → templates/fed/indicador111.html
diff --git a/fed/templates/fed/indicador112.html → templates/fed/indicador112.html b/fed/templates/fed/indicador112.html → templates/fed/indicador112.html
diff --git a/fed/templates/fed/indicador113.html → templates/fed/indicador113.html b/fed/templates/fed/indicador113.html → templates/fed/indicador113.html
diff --git a/fed/templates/fed/indicador114.html → templates/fed/indicador114.html b/fed/templates/fed/indicador114.html → templates/fed/indicador114.html
diff --git a/fed/templates/fed/indicador121.html → templates/fed/indicador121.html b/fed/templates/fed/indicador121.html → templates/fed/indicador121.html
diff --git a/fed/templates/fed/indicadores.html → templates/fed/indicadores.html b/fed/templates/fed/indicadores.html → templates/fed/indicadores.html
diff --git a/fed/templates/fed/influencia.html → templates/fed/influencia.html b/fed/templates/fed/influencia.html → templates/fed/influencia.html
diff --git a/fed/templates/fed/res/resultado1.html → templates/fed/res/resultado1.html b/fed/templates/fed/res/resultado1.html → templates/fed/res/resultado1.html
diff --git a/fed/templates/index.html → templates/index.html b/fed/templates/index.html → templates/index.html
diff --git a/fed/templates/login.html → templates/login.html b/fed/templates/login.html → templates/login.html
diff --git a/fed/templates/logout.html → templates/logout.html b/fed/templates/logout.html → templates/logout.html
diff --git a/fed/urls.py → urls.py b/fed/urls.py → urls.py