This commit is contained in:
2020-12-04 17:23:03 +00:00
parent 5f033393c8
commit 5e801582fd
2 changed files with 8 additions and 20 deletions

View File

@@ -32,15 +32,13 @@ todo: seeded user names look stupid with the numbers in them, change that so uni
todo: Case 3595 Mass delete extension todo: Case 3595 Mass delete extension
Do this early as it will be copied over and over again Do this early as it will be copied over and over again
todo: View on map bombs if nothing is filled in for the address / geocode
should just do nothing
............................................................ ............................................................
currently doing: Vendor currently doing: MISC
at import stage not coded yet v8migrate
EACH OBJECT DEV CYCLE: EACH OBJECT DEV CYCLE:
FIRST FIRST
@@ -77,16 +75,6 @@ EACH OBJECT DEV CYCLE:
## OBJECT ORDER ## OBJECT ORDER
Preliminary order to get the ball rolling, these are the easiest starting point: Preliminary order to get the ball rolling, these are the easiest starting point:
Vendor
case 3300 popup notes
case 3427 change vendortype to tag
vendortype->tag not coded for tag import yet AFAIK (late addition)
adm-user edit form must be tweaked once the vendor object is coded to do subcontractors
adm-users list form to include vendor name for subcontractors
maybe? Or not? maybe in usertype appended?
confirm / ensure v8migrate properly brings a subcontractor over as that type of user
CustomerNote "ClientNote"
Memo (user memos) Memo (user memos)
Project Project
Note: needs UI location as well, under Customers is still likely the best, however it might be a role related issue as well Note: needs UI location as well, under Customers is still likely the best, however it might be a role related issue as well

View File

@@ -669,10 +669,12 @@ export default {
postCode: m.vm.obj.postCode postCode: m.vm.obj.postCode
} }
*/ */
console.log(obj);
let hasGeo =
let hasGeo = obj.latitude && obj.longitude; obj.latitude != null &&
obj.latitude != 0 &&
obj.longitude != null &&
obj.longitude != 0;
let hasAddress = let hasAddress =
!this.stringIsNullOrEmpty(obj.address) && !this.stringIsNullOrEmpty(obj.address) &&
@@ -682,9 +684,7 @@ export default {
!this.stringIsNullOrEmpty(obj.postCode); !this.stringIsNullOrEmpty(obj.postCode);
if (!hasGeo && !hasAddress) { if (!hasGeo && !hasAddress) {
throw new Error( return;
"View map: missing address and latitude / longitude nothing to view"
);
} }
let mapUrl = window.$gz.store.state.userOptions.mapUrlTemplate; let mapUrl = window.$gz.store.state.userOptions.mapUrlTemplate;