diff --git a/textMark/.idea/workspace.xml b/textMark/.idea/workspace.xml index 21e988b..3ee9f58 100644 --- a/textMark/.idea/workspace.xml +++ b/textMark/.idea/workspace.xml @@ -18,7 +18,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -38,18 +38,18 @@ - + - + - + @@ -57,6 +57,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -74,10 +96,11 @@ @@ -108,6 +131,7 @@ + @@ -121,6 +145,20 @@ - @@ -426,7 +463,7 @@ - + @@ -434,7 +471,7 @@ - + @@ -462,13 +499,6 @@ - - - - - - - @@ -785,9 +815,6 @@ - - - @@ -795,21 +822,12 @@ - - - - - - - - - - + @@ -817,7 +835,7 @@ - + @@ -825,7 +843,7 @@ - + @@ -834,12 +852,30 @@ - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/textMark/common/migrations/0004_text.py b/textMark/common/migrations/0004_text.py new file mode 100644 index 0000000..cda0a32 --- /dev/null +++ b/textMark/common/migrations/0004_text.py @@ -0,0 +1,23 @@ +# Generated by Django 3.0.5 on 2020-05-26 10:43 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('common', '0003_merge_20200520_1445'), + ] + + operations = [ + migrations.CreateModel( + name='Text', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=200)), + ('text', models.TextField()), + ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='common.Project')), + ], + ), + ] diff --git a/textMark/db.sqlite3 b/textMark/db.sqlite3 index 9b476bb..5e2c6fa 100644 Binary files a/textMark/db.sqlite3 and b/textMark/db.sqlite3 differ