Browse Source

DIV-1234 - Added a field to core_documents for storing initial or final (i or f)

pull/172/head
Michael Olund 5 years ago
parent
commit
64d085c14b
7 changed files with 38 additions and 3 deletions
  1. +18
    -0
      edivorce/apps/core/migrations/0027_document_filing_type.py
  2. +5
    -0
      edivorce/apps/core/models.py
  3. +5
    -2
      edivorce/apps/core/serializer.py
  4. +1
    -0
      edivorce/apps/core/templates/dashboard/final_filing.html
  5. +1
    -0
      edivorce/apps/core/templates/dashboard/initial_filing.html
  6. +2
    -0
      vue/src/components/Uploader/Uploader.vue
  7. +6
    -1
      vue/src/pages/filing-uploader/FilingUploader.vue

+ 18
- 0
edivorce/apps/core/migrations/0027_document_filing_type.py View File

@ -0,0 +1,18 @@
# Generated by Django 2.2.15 on 2020-11-04 21:06
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('core', '0026_auto_20201028_1741'),
]
operations = [
migrations.AddField(
model_name='document',
name='filing_type',
field=models.CharField(default='i', max_length=1),
),
]

+ 5
- 0
edivorce/apps/core/models.py View File

@ -126,6 +126,9 @@ class Document(models.Model):
party_code = models.IntegerField(default=0)
""" 1 = You, 2 = Your Spouse, 0 = Shared """
filing_type = models.CharField(max_length=1, default='i')
""" 'i'='initial' / 'f'=final """
sort_order = models.IntegerField(default=1)
""" File order (page number in the PDF) """
@ -174,6 +177,8 @@ class Document(models.Model):
self.sort_order = num_docs + 1
if self.doc_type not in self.form_types:
raise ValueError(f"Invalid doc_type '{self.doc_type}'")
if self.filing_type not in ['i', 'f']:
raise ValueError(f"Invalid filing_type '{self.filing_type}'")
super(Document, self).save(*args, **kwargs)


+ 5
- 2
edivorce/apps/core/serializer.py View File

@ -36,7 +36,8 @@ class CreateDocumentSerializer(serializers.ModelSerializer):
class Meta:
model = Document
fields = ('file', 'doc_type', 'party_code', 'filename', 'size', 'rotation', 'sort_order', 'file_url')
fields = ('file', 'doc_type', 'party_code', 'filename', 'size',
'rotation', 'sort_order', 'file_url', 'filing_type')
def create(self, validated_data):
filename = validated_data['file'].name
@ -61,6 +62,7 @@ class CreateDocumentSerializer(serializers.ModelSerializer):
class DocumentMetadataSerializer(serializers.ModelSerializer):
doc_type = serializers.CharField(read_only=True)
party_code = serializers.IntegerField(read_only=True)
filing_type = serializers.CharField(read_only=True)
filename = serializers.CharField(read_only=True)
size = serializers.IntegerField(read_only=True)
rotation = serializers.IntegerField(min_value=0, max_value=270, validators=[valid_rotation])
@ -69,4 +71,5 @@ class DocumentMetadataSerializer(serializers.ModelSerializer):
class Meta:
model = Document
fields = ('doc_type', 'party_code', 'filename', 'size', 'rotation', 'sort_order', 'file_url')
fields = ('doc_type', 'party_code', 'filename', 'size',
'rotation', 'sort_order', 'file_url', 'filing_type')

+ 1
- 0
edivorce/apps/core/templates/dashboard/final_filing.html View File

@ -114,6 +114,7 @@
<div id="vue-app">
<filing-uploader
:form-types="{{ form_types }}"
filing-type="f"
proxy-root-path="{{ proxy_root_path }}">
</filing-uploader>
</div>


+ 1
- 0
edivorce/apps/core/templates/dashboard/initial_filing.html View File

@ -87,6 +87,7 @@
<div id="vue-app">
<filing-uploader
:form-types="{{ form_types }}"
filing-type="i"
proxy-root-path="{{ proxy_root_path }}">
</filing-uploader>
</div>


+ 2
- 0
vue/src/components/Uploader/Uploader.vue View File

@ -136,6 +136,7 @@
props: {
docType: String,
party: { type: Number, default: 0 },
filingType: String,
},
data: function() {
return {
@ -163,6 +164,7 @@
return {
doc_type: this.docType,
party_code: this.party,
filing_type: this.filingType,
};
},
formDef() {


+ 6
- 1
vue/src/pages/filing-uploader/FilingUploader.vue View File

@ -2,7 +2,11 @@
<div id="app">
<template v-for="(item, index) in formTypes">
<div :key="index">
<Uploader :doc-type="item.doc_type" :party="item.party_code" />
<Uploader
:doc-type="item.doc_type"
:party="item.party_code"
:filing-type="filingType"
/>
</div>
</template>
</div>
@ -18,6 +22,7 @@
},
props: {
formTypes: Array,
filingType: String,
proxyRootPath: String,
},
};


Loading…
Cancel
Save