Merge pull request #363 from preranaandure/master

Add new field prefill requested.

Author: xzzy

disturbance/components/proposals/models.py

@@ -549,7 +549,8 @@ class Proposal(DirtyFieldsMixin, RevisionedMixin):
     migrated = models.BooleanField(default=False)
     shapefile_json = JSONField('Source/Submitter (multi) polygon geometry', blank=True, null=True)
     shapefile_geom = MultiPolygonField('Source/Submitter gdf.exploded (multi) polygon geometry', srid=4326, blank=True, null=True) # for 'pgsql2shp' from KB
-    reissued = models.BooleanField(default=False)
+    reissued = models.BooleanField(default=False)  
+    prefill_requested = models.BooleanField(default=False)           
 
     class Meta:
         app_label = 'disturbance'
@@ -1574,6 +1575,7 @@ def validate_map_files(self, request):
                         if 'id' in shapefile_json['features'][0]:
                             shapefile_json['features'][0]['id']=self.id
                         self.shapefile_json=shapefile_json
+                        self.prefill_requested=False
                     else:
                         msg = 'no features found in shapefile' if num_features == 0 else f'too many features: {num_features} (max {MAX_NO_POLYGONS})' 
                         raise ValidationError(f'Cannot upload a Shapefile - {msg}')

disturbance/components/proposals/serializers.py

@@ -296,6 +296,7 @@ class Meta:
             'history_add_info_assessor',
             'refresh_timestamp',
             'prefill_timestamp',
+            'prefill_requested',
             'layer_data',
             'region_name',
             'district_name',
@@ -474,6 +475,7 @@ class Meta:
                 'history_add_info_assessor',
                 'refresh_timestamp',
                 'prefill_timestamp',
+                'prefill_requested',
                 'latest_referrals',
                 'allowed_assessors',
                 'proposed_issuance_approval',

disturbance/components/proposals/sqs_utils/api.py

@@ -617,6 +617,7 @@ def prefill_proposal(self, request, *args, **kwargs):
                     start_time = time.time()
 
                     proposal = instance
+                    proposal.prefill_requested=True
                     # current_ts = request.data.get('current_ts') # format required '%Y-%m-%dT%H:%M:%S'
                     if proposal.prefill_timestamp:
                         current_ts= proposal.prefill_timestamp.strftime('%Y-%m-%dT%H:%M:%S')

disturbance/frontend/disturbance/src/components/external/proposal_external.vue

@@ -899,8 +899,8 @@ export default {
             let vm=this;
             let blank_fields = []
             if(vm.proposal.application_type == 'Disturbance'){
-                if(vm.proposal && vm.$refs.mapSection.$refs.map_doc.documents.length == 0 || vm.proposal.shapefile_json==null){
-                    blank_fields.push(' You must upload and validate the shapefile');
+                if(vm.proposal && vm.$refs.mapSection.$refs.map_doc.documents.length == 0 || vm.proposal.shapefile_json==null || vm.proposal.prefill_requested == false){
+                    blank_fields.push(' You must upload and validate the shapefile. Please Prefill the Proposal after validating the shapefile.');
                 }
              }
             if(blank_fields.length==0){

disturbance/migrations/0299_auto_20250113_1022.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2025-01-13 02:22
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('disturbance', '0298_auto_20241021_1132'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='proposal',
+            name='prefill_requested',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='activitymatrix',
+            name='name',
+            field=models.CharField(choices=[('Disturbance', 'Disturbance'), ('Ecological Thinning', 'Ecological Thinning')], default='Disturbance', max_length=24, verbose_name='Activity matrix name'),
+        ),
+    ]