Merge pull request #199 from thakurpriya1990/working

resolve bug email_user.addresses.all()
dbca-wa · Dec 6, 2023 · 3f3afe7 · 3f3afe7
2 parents 6448e31 + 4dd973a
commit 3f3afe7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
@@ -406,10 +406,12 @@ def applicant_email(self):
     def applicant_details(self):
         if self.submitter:
             email_user = retrieve_email_user(self.submitter)
-            return "{} {}\n{}".format(
+            print(email_user)
+            return "{} {}".format(
                 email_user.first_name,
-                email_user.last_name,
-                email_user.addresses.all().first())
+                email_user.last_name)
+                # Priya commented the below as gives error on UAT and Dev only on external side
+                # email_user.addresses.all().first())
 
     @property
     def applicant_address(self):

diff --git a/boranga/components/occurrence/models.py b/boranga/components/occurrence/models.py
@@ -196,10 +196,12 @@ def applicant_email(self):
     def applicant_details(self):
         if self.submitter:
             email_user = retrieve_email_user(self.submitter)
-            return "{} {}\n{}".format(
+            print(email_user)
+            return "{} {}".format(
                 email_user.first_name,
-                email_user.last_name,
-                email_user.addresses.all().first())
+                email_user.last_name)
+                # Priya commented the below as gives error on UAT and Dev only on external side
+                # email_user.addresses.all().first())
 
     @property
     def applicant_address(self):

diff --git a/boranga/frontend/boranga/src/components/common/component_map.vue b/boranga/frontend/boranga/src/components/common/component_map.vue
@@ -30,9 +30,7 @@
         >
             <div class="row">
                 <div class="col-md-3">
-                    <label for=""
-                        >Type {{ filterApplicationsMapApplicationType }}</label
-                    >
+                    <label for="">Type</label>
                     <select
                         v-model="filterApplicationsMapApplicationType"
                         class="form-control"
@@ -1074,9 +1072,9 @@ export default {
         // },
         // filterInformation: function () {
         //     if (this.proposals.length === this.filteredProposals.length) {
-        //         return ' (Showing all Applications)';
+        //         return ` (Showing all ${this.proposals.length} Proposals)`;
         //     } else {
-        //         return ` (Showing ${this.filteredProposals.length} of ${this.proposals.length} Applications)`;
+        //         return ` (Showing ${this.filteredProposals.length} of ${this.proposals.length} Proposals)`;
         //     }
         // },
         canUndoAction: function () {
@@ -1364,7 +1362,7 @@ export default {
         //         this.filteredProposals = [
         //             ...this.filteredProposals.filter(
         //                 (proposal) =>
-        //                     new Date(proposal.lodgement_date) >=
+        //                     new Date(proposal.lodgement_date) <=
         //                     new Date(this.filterApplicationsMapLodgedTo)
         //             ),
         //         ];
@@ -2380,11 +2378,12 @@ export default {
                         console.log(
                             'Done loading features and applying filters'
                         );
-                        vm.fetchingProposals = false;
                     });
                 })
                 .catch((error) => {
                     console.error('There was an error!', error);
+                })
+                .finally(() => {
                     vm.fetchingProposals = false;
                 });
         },