Show facility address and country on claimed facilities page

This additional information helps to identify the facility when there may be more than one claimed facility with the same name.
opensupplyhub · Jun 13, 2019 · e9203bf · e9203bf
1 parent bbbe401
commit e9203bf
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/src/app/src/components/ClaimedFacilitiesListTable.jsx b/src/app/src/components/ClaimedFacilitiesListTable.jsx
@@ -38,11 +38,17 @@ function ClaimedFacilitiesListTable({
             <Table>
                 <TableHead>
                     <TableRow>
-                        <TableCell style={dashboardClaimsListTableStyles.oarIdColumnStyles}>
+                        <TableCell>
+                            Name
+                        </TableCell>
+                        <TableCell>
                             OAR ID
                         </TableCell>
                         <TableCell>
-                            Facility Name
+                            Address
+                        </TableCell>
+                        <TableCell>
+                            Country
                         </TableCell>
                     </TableRow>
                 </TableHead>
@@ -56,11 +62,17 @@ function ClaimedFacilitiesListTable({
                                     onClick={makeRowClickHandler(claim.id)}
                                     style={dashboardClaimsListTableStyles.rowStyles}
                                 >
+                                    <TableCell>
+                                        {claim.facility_name}
+                                    </TableCell>
                                     <TableCell>
                                         {claim.oar_id}
                                     </TableCell>
                                     <TableCell>
-                                        {claim.facility_name}
+                                        {claim.facility_address}
+                                    </TableCell>
+                                    <TableCell>
+                                        {claim.facility_country_name}
                                     </TableCell>
                                 </TableRow>
                             ))

diff --git a/src/django/api/serializers.py b/src/django/api/serializers.py
@@ -432,11 +432,14 @@ class FacilityClaimSerializer(ModelSerializer):
     oar_id = SerializerMethodField()
     contributor_name = SerializerMethodField()
     contributor_id = SerializerMethodField()
+    facility_address = SerializerMethodField()
+    facility_country_name = SerializerMethodField()
 
     class Meta:
         model = FacilityClaim
         fields = ('id', 'created_at', 'updated_at', 'contributor_id', 'oar_id',
-                  'contributor_name', 'facility_name', 'status')
+                  'contributor_name', 'facility_name', 'facility_address',
+                  'facility_country_name', 'status')
 
     def get_facility_name(self, claim):
         return claim.facility.name
@@ -450,6 +453,12 @@ def get_contributor_name(self, claim):
     def get_contributor_id(self, claim):
         return claim.contributor.admin.id
 
+    def get_facility_address(self, claim):
+        return claim.facility.address
+
+    def get_facility_country_name(self, claim):
+        return COUNTRY_NAMES.get(claim.facility.country_code, '')
+
 
 class FacilityClaimDetailsSerializer(ModelSerializer):
     contributor = SerializerMethodField()

diff --git a/src/django/api/views.py b/src/django/api/views.py
@@ -631,6 +631,8 @@ def claimed(self, request):
                     "oar_id": "US2019161ABC123",
                     "contributor_name": "A Contributor",
                     "facility_name": "Clothing, Inc.",
+                    "facility_address": "1234 Main St",
+                    "facility_country": "United States",
                     "status": "APPROVED"
                 }
             ]