From f99e16f562b6e6508e41dc770d0071d1f5f6b041 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 5 Aug 2015 19:00:19 +0300
Subject: [PATCH] Renamed app to avoid confusion with django forms

---
 PyRIGS/settings.py                         |  1 +
 forms/views.py                             |  3 --
 {forms => rigForms}/__init__.py            |  0
 {forms => rigForms}/admin.py               |  2 +-
 rigForms/migrations/0001_initial.py        | 59 ++++++++++++++++++++++
 {forms => rigForms}/migrations/__init__.py |  0
 {forms => rigForms}/models.py              |  0
 {forms => rigForms}/test_models.py         |  2 +-
 rigForms/views.py                          | 20 ++++++++
 9 files changed, 82 insertions(+), 5 deletions(-)
 delete mode 100644 forms/views.py
 rename {forms => rigForms}/__init__.py (100%)
 rename {forms => rigForms}/admin.py (90%)
 create mode 100644 rigForms/migrations/0001_initial.py
 rename {forms => rigForms}/migrations/__init__.py (100%)
 rename {forms => rigForms}/models.py (100%)
 rename {forms => rigForms}/test_models.py (97%)
 create mode 100644 rigForms/views.py

diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py
index d85ff887..dc3a2744 100644
--- a/PyRIGS/settings.py
+++ b/PyRIGS/settings.py
@@ -44,6 +44,7 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'RIGS',
+    'rigForms',
 
     'debug_toolbar',
     'registration',
diff --git a/forms/views.py b/forms/views.py
deleted file mode 100644
index 91ea44a2..00000000
--- a/forms/views.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.
diff --git a/forms/__init__.py b/rigForms/__init__.py
similarity index 100%
rename from forms/__init__.py
rename to rigForms/__init__.py
diff --git a/forms/admin.py b/rigForms/admin.py
similarity index 90%
rename from forms/admin.py
rename to rigForms/admin.py
index ab79164c..8949f90d 100644
--- a/forms/admin.py
+++ b/rigForms/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from forms import models
+from rigForms import models
 
 import reversion
 
diff --git a/rigForms/migrations/0001_initial.py b/rigForms/migrations/0001_initial.py
new file mode 100644
index 00000000..a0d076c8
--- /dev/null
+++ b/rigForms/migrations/0001_initial.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import RIGS.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0023_auto_20150529_0048'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Form',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('data', models.TextField(default=b'{}')),
+                ('event', models.ForeignKey(related_name='forms', to='RIGS.Event')),
+            ],
+            bases=(models.Model, RIGS.models.RevisionMixin),
+        ),
+        migrations.CreateModel(
+            name='Schema',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('start_at', models.DateTimeField()),
+                ('schema', models.TextField(default=b'{}')),
+                ('layout', models.TextField(default=b'{}')),
+                ('comment', models.CharField(max_length=255)),
+            ],
+            options={
+                'ordering': ['-start_at'],
+                'get_latest_by': 'start_at',
+            },
+            bases=(models.Model, RIGS.models.RevisionMixin),
+        ),
+        migrations.CreateModel(
+            name='Type',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=255)),
+                ('description', models.CharField(max_length=255, null=True, blank=True)),
+                ('active', models.BooleanField(default=True)),
+            ],
+            bases=(models.Model, RIGS.models.RevisionMixin),
+        ),
+        migrations.AddField(
+            model_name='schema',
+            name='schema_type',
+            field=models.ForeignKey(related_name='schemas', to='forms.Type'),
+        ),
+        migrations.AddField(
+            model_name='form',
+            name='schema',
+            field=models.ForeignKey(related_name='forms', to='forms.Schema'),
+        ),
+    ]
diff --git a/forms/migrations/__init__.py b/rigForms/migrations/__init__.py
similarity index 100%
rename from forms/migrations/__init__.py
rename to rigForms/migrations/__init__.py
diff --git a/forms/models.py b/rigForms/models.py
similarity index 100%
rename from forms/models.py
rename to rigForms/models.py
diff --git a/forms/test_models.py b/rigForms/test_models.py
similarity index 97%
rename from forms/test_models.py
rename to rigForms/test_models.py
index 743171c9..f21ba8ae 100644
--- a/forms/test_models.py
+++ b/rigForms/test_models.py
@@ -1,5 +1,5 @@
 from django.test import TestCase
-from forms import models
+from rigForms import models
 
 class FormModelsTestCase(TestCase):
 	def setUp(self):
diff --git a/rigForms/views.py b/rigForms/views.py
new file mode 100644
index 00000000..5c90fd37
--- /dev/null
+++ b/rigForms/views.py
@@ -0,0 +1,20 @@
+from django.shortcuts import render
+from django.views import generic
+from rigForms import models
+
+class FormCreate(generic.CreateView):
+	model = models.Form
+	fields = ['data']
+
+	"""
+	Expects kwarg "type_pk" to contain PK of required type
+	"""
+	def get_context_data(self, **kwargs):
+		context = super(FormCreate, self).get_context_data(**kwargs)
+		schemaType = get_object_or_404(models.Type,kwargs["type_pk"])
+		currentSchema = models.Schema.objects.current_schema(schemaType)
+
+		context["type"] = schemaType
+		context["schema"] = currentSchema
+
+		return context