Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed: Zip codes starting with 0 now generate the latitude and longitude correctly(#320) #331

Merged
merged 5 commits into from
Nov 7, 2024
Merged

Fixed: Zip codes starting with 0 now generate the latitude and longitude correctly(#320) #331

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0def40
Fixed: Zip codes starting with 0 now generate the latitude and longit…
R-Sourabh Nov 5, 2024
b0867d5
Improved: remove unnecessary template literals(#320)
R-Sourabh Nov 6, 2024
80a4a62
Improved: improved the postal code check on facilityDetails page & r…
R-Sourabh Nov 7, 2024
ba8bb4b
Improved: removed the unnecessary changes(#320)
R-Sourabh Nov 7, 2024
e9cd43e
Update FacilityGeoPointModal.vue
R-Sourabh Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/components/FacilityGeoPointModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,12 @@ export default defineComponent({
},
async generateLatLong() {
this.isGeneratingLatLong = true
const postalCode = this.geoPoint.postalCode;
const query = postalCode.startsWith('0') ? `${postalCode} OR ${postalCode.substring(1)}` : `${postalCode}`;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need template literals(backticks) when we only have a variable assignment.

const payload = {
json: {
params: {
q: `postcode: ${this.geoPoint.postalCode}`
q: `postcode: ${query}`
}
}
}
Expand All @@ -113,8 +115,12 @@ export default defineComponent({

if(!hasError(resp) && resp.data.response.docs.length > 0) {
const result = resp.data.response.docs[0]
this.geoPoint.latitude = result.latitude
this.geoPoint.longitude = result.longitude

if (postalCode.startsWith('0') && result.postcode !== postalCode.substring(1)) {
throw new Error();
}
this.geoPoint.latitude = result.latitude;
this.geoPoint.longitude = result.longitude;
} else {
throw resp.data
}
Expand Down
10 changes: 8 additions & 2 deletions src/components/GeoPointPopover.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,24 @@ export default defineComponent({
emitter.emit('presentLoader')

try {
const postalCode = this.postalAddress.postalCode;
const query = postalCode.startsWith('0') ? `${postalCode} OR ${postalCode.substring(1)}` : postalCode;

resp = await UtilService.generateLatLong({
json: {
params: {
q: `postcode: ${this.postalAddress.postalCode}`
q: `postcode: ${query}`
}
}
})

if(!hasError(resp) && resp.data.response.docs.length > 0) {
generatedLatLong = resp.data.response.docs[0]

if(generatedLatLong.latitude && generatedLatLong.longitude) {
if (postalCode.startsWith('0') && generatedLatLong.postcode !== postalCode.substring(1)) {
throw new Error();
}

resp = await FacilityService.updateFacilityPostalAddress({
...this.postalAddress,
facilityId: this.facilityId,
Expand Down
9 changes: 8 additions & 1 deletion src/views/AddFacilityAddress.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,17 +200,24 @@ export default defineComponent({
if(this.contactNumber) this.saveTelecomNumber()
},
async generateLatLong() {
const postalCode = this.formData.postalCode;
const query = postalCode.startsWith('0') ? `${postalCode} OR ${postalCode.substring(1)}` : `${postalCode}`;

const payload = {
json: {
params: {
q: `postcode: ${this.formData.postalCode}`
q: `postcode: ${query}`
}
}
}
try {
const resp = await UtilService.generateLatLong(payload)
if (!hasError(resp)) {
const result = resp.data.response.docs[0]

if (postalCode.startsWith('0') && result.postcode !== postalCode.substring(1)) {
throw new Error();
}
this.formData.latitude = result.latitude
this.formData.longitude = result.longitude
} else {
Expand Down
4 changes: 3 additions & 1 deletion src/views/FacilityDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,9 @@ export default defineComponent({
const resp = await UtilService.generateLatLong(payload)

if(!hasError(resp)) {
this.isRegenerationRequired = !(this.postalAddress.postalCode === resp.data.response.docs[0].postcode)
const postalCode = this.postalAddress.postalCode
const fetchedPostcode = resp.data.response.docs[0].postcode
this.isRegenerationRequired = !(postalCode.startsWith('0') ? postalCode.substring(1) === fetchedPostcode : postalCode === fetchedPostcode);
} else {
throw resp.data
}
Expand Down
Loading