eod, search mod, download mod, more app int

Krocodial · Jun 14, 2019 · 1a57273 · 1a57273
1 parent 71faa55
commit 1a57273
Show file tree

Hide file tree

Showing 18 changed files with 601 additions and 219 deletions.
diff --git a/classy/forms.py b/classy/forms.py
@@ -4,8 +4,13 @@
 from django.utils.translation import gettext_lazy as _
 
 from .models import *
-from .models import classification_choices
+from .models import classification_choices, state_choices, protected_series
 
+size_choices = (
+    (10, '10'),
+    (25, '25'),
+    (50, '50'),
+    (100, '100'),)
 
 class UploadFileForm(forms.ModelForm):
     class Meta:
@@ -21,38 +26,20 @@ def __init__(self, running):
 class BasicSearch(forms.Form):
     #query = forms.CharField(required=False, max_length=150, widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Enter your query'}))
     query = forms.CharField(required=False, max_length=150, widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'What would you like to search for?', 'aria-describedby': 'descript'}))
+    size = forms.ChoiceField(initial=10, required=False, choices=size_choices, widget=forms.Select(attrs={'class': 'custom-select custom-select-sm', 'onchange': 'this.form.submit();'}))
 
-class AdvancedSearch(ModelForm):
-
-    datasource = forms.CharField(required=False, label='Datasource', max_length=100, widget=forms.TextInput(attrs={'class': 'form-control'}))
-    schema = forms.CharField(required=False, label='Schema', max_length=100, widget=forms.TextInput(attrs={'class': 'form-control'}))
-    table = forms.CharField(required=False, label='Table', max_length=100, widget=forms.TextInput(attrs={'class': 'form-control'}))
-    column = forms.CharField(required=False, label='Column', max_length=100, widget=forms.TextInput(attrs={'class': 'form-control'}))
-
-    class Meta:
-        model = Classification
-        exclude = ['created', 'creator', 'masking', 'notes']
-        help_texts = {
-            'classification': _('Help text'),
-        }
-        labels = {
-            'owner': _('Application')
-        }
-        widgets = {
-            'classification': forms.SelectMultiple(attrs={
-                'class': 'form-control',
-            }),
-            'protected_type': forms.SelectMultiple(attrs={
-                'class': 'form-control',
-            }),
-            'owner': forms.SelectMultiple(attrs={
-                'class': 'form-control',
-            }),
-            'state': forms.SelectMultiple(attrs={
-                'class': 'form-control',
-            }),
-        }
-
+class AdvancedSearch(forms.Form):
+
+    datasource = forms.CharField(initial='', required=False, label='Datasource', max_length=100, widget=forms.TextInput(attrs={'class': 'form-control'}))
+    schema = forms.CharField(initial='', required=False, label='Schema', max_length=100, widget=forms.TextInput(attrs={'class': 'form-control'}))
+    table = forms.CharField(initial='', required=False, label='Table', max_length=100, widget=forms.TextInput(attrs={'class': 'form-control'}))
+    column = forms.CharField(initial='', required=False, label='Column', max_length=100, widget=forms.TextInput(attrs={'class': 'form-control'}))
+
+    classification = forms.MultipleChoiceField(initial=[i[0] for i in Classification._meta.get_field('classification').flatchoices], required=False, choices=classification_choices, widget=forms.SelectMultiple(attrs={'class': 'form-control'}))
+    protected_type = forms.MultipleChoiceField(required=False, choices=protected_series, widget=forms.SelectMultiple(attrs={'class': 'form-control'}))
+    state = forms.MultipleChoiceField(initial=['A', 'P'], required=False, choices=state_choices, widget=forms.SelectMultiple(attrs={'class': 'form-control'}))
+    #size for pagination
+    owner = forms.ModelMultipleChoiceField(queryset=Application.objects.all(), required=False, widget=forms.SelectMultiple(attrs={'class': 'form-control'}))
 
 
 '''

diff --git a/classy/migrations/0014_auto_20190612_1353.py b/classy/migrations/0014_auto_20190612_1353.py
@@ -0,0 +1,54 @@
+# Generated by Django 2.1.8 on 2019-06-12 20:53
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classy', '0013_auto_20190611_1330'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classification',
+            name='classification',
+            field=models.CharField(choices=[('UN', 'Unclassified'), ('PU', 'Public'), ('PE', 'Personal'), ('CO', 'Confidential')], default='UN', max_length=2),
+        ),
+        migrations.AlterField(
+            model_name='classification',
+            name='protected_type',
+            field=models.CharField(blank=True, choices=[('PA', 'Protected A'), ('PB', 'Protected B'), ('PC', 'Protected C')], max_length=2),
+        ),
+        migrations.AlterField(
+            model_name='classificationcount',
+            name='classification',
+            field=models.CharField(choices=[('UN', 'Unclassified'), ('PU', 'Public'), ('PE', 'Personal'), ('CO', 'Confidential')], max_length=2),
+        ),
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='classification',
+            field=models.CharField(blank=True, choices=[('UN', 'Unclassified'), ('PU', 'Public'), ('PE', 'Personal'), ('CO', 'Confidential')], max_length=2),
+        ),
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='classy.Classification'),
+        ),
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='protected_type',
+            field=models.CharField(blank=True, choices=[('PA', 'Protected A'), ('PB', 'Protected B'), ('PC', 'Protected C')], max_length=2),
+        ),
+        migrations.AlterField(
+            model_name='classificationreview',
+            name='classification',
+            field=models.CharField(choices=[('UN', 'Unclassified'), ('PU', 'Public'), ('PE', 'Personal'), ('CO', 'Confidential')], max_length=2),
+        ),
+        migrations.AlterField(
+            model_name='classificationreview',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classy.Classification'),
+        ),
+    ]
diff --git a/classy/migrations/0015_auto_20190612_1354.py b/classy/migrations/0015_auto_20190612_1354.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.1.8 on 2019-06-12 20:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classy', '0014_auto_20190612_1353'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='classy.Classification'),
+        ),
+        migrations.AlterField(
+            model_name='classificationreview',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classy.Classification'),
+        ),
+    ]
diff --git a/classy/migrations/0016_auto_20190614_1116.py b/classy/migrations/0016_auto_20190614_1116.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.1.8 on 2019-06-14 18:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classy', '0015_auto_20190612_1354'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='classy.Classification'),
+        ),
+        migrations.AlterField(
+            model_name='classificationreview',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classy.Classification'),
+        ),
+    ]
diff --git a/classy/migrations/0017_auto_20190614_1116.py b/classy/migrations/0017_auto_20190614_1116.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.1.8 on 2019-06-14 18:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classy', '0016_auto_20190614_1116'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='classy.Classification'),
+        ),
+        migrations.AlterField(
+            model_name='classificationreview',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classy.Classification'),
+        ),
+    ]
diff --git a/classy/migrations/0018_auto_20190614_1116.py b/classy/migrations/0018_auto_20190614_1116.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.1.8 on 2019-06-14 18:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classy', '0017_auto_20190614_1116'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='classy.Classification'),
+        ),
+        migrations.AlterField(
+            model_name='classificationreview',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classy.Classification'),
+        ),
+    ]
diff --git a/classy/migrations/0019_auto_20190614_1116.py b/classy/migrations/0019_auto_20190614_1116.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.1.8 on 2019-06-14 18:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classy', '0018_auto_20190614_1116'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='classy.Classification'),
+        ),
+        migrations.AlterField(
+            model_name='classificationreview',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classy.Classification'),
+        ),
+    ]
diff --git a/classy/migrations/0020_auto_20190614_1116.py b/classy/migrations/0020_auto_20190614_1116.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.1.8 on 2019-06-14 18:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classy', '0019_auto_20190614_1116'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='classy.Classification'),
+        ),
+        migrations.AlterField(
+            model_name='classificationreview',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classy.Classification'),
+        ),
+    ]
diff --git a/classy/migrations/0021_auto_20190614_1116.py b/classy/migrations/0021_auto_20190614_1116.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.1.8 on 2019-06-14 18:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classy', '0020_auto_20190614_1116'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='classy.Classification'),
+        ),
+        migrations.AlterField(
+            model_name='classificationreview',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classy.Classification'),
+        ),
+    ]
diff --git a/classy/migrations/0022_auto_20190614_1116.py b/classy/migrations/0022_auto_20190614_1116.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.1.8 on 2019-06-14 18:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classy', '0021_auto_20190614_1116'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='classy.Classification'),
+        ),
+        migrations.AlterField(
+            model_name='classificationreview',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classy.Classification'),
+        ),
+    ]
diff --git a/classy/migrations/0023_auto_20190614_1116.py b/classy/migrations/0023_auto_20190614_1116.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.1.8 on 2019-06-14 18:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classy', '0022_auto_20190614_1116'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='classy.Classification'),
+        ),
+        migrations.AlterField(
+            model_name='classificationreview',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classy.Classification'),
+        ),
+    ]
diff --git a/classy/migrations/0024_auto_20190614_1116.py b/classy/migrations/0024_auto_20190614_1116.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.1.8 on 2019-06-14 18:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classy', '0023_auto_20190614_1116'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='classy.Classification'),
+        ),
+        migrations.AlterField(
+            model_name='classificationreview',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classy.Classification'),
+        ),
+    ]
diff --git a/classy/migrations/0025_auto_20190614_1116.py b/classy/migrations/0025_auto_20190614_1116.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.1.8 on 2019-06-14 18:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classy', '0024_auto_20190614_1116'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='classificationlogs',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='classy.Classification'),
+        ),
+        migrations.AlterField(
+            model_name='classificationreview',
+            name='classy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='classy.Classification'),
+        ),
+    ]