This commit is contained in:
2020-11-18 17:56:24 +00:00
parent eb59e3de6d
commit 66b017eefa
5 changed files with 60 additions and 135 deletions

View File

@@ -71,15 +71,12 @@ todo: TESTING After customer form is made
OUTSTANDING WITH CUSTOMER
Contact user should default to customer limited role by default
PW / Login generator automatically and sends creds
need code that generates easily enterable urls
if pw starts with "TEMP" or some key token then maybe they need to go to the change password automatically upon login
this way can issue a pw and email it and when user first logs in they must set it to something?
New user useroptions should default to the server default translation automatically
New User should always have useroptions automatically created with sensible defaults
useroptions should not need a POST route at all, only a PUT to update
What happens if new user created, nothing set for langauge etc and then just login??
this way can issue a pw and email it and when user first logs in they must set it to something?
Centralize MAP URLS
contacts
Maybe convert generic customer contacts list to proper data grid source from server
@@ -147,7 +144,8 @@ Preliminary order to get the ball rolling, these are the easiest starting point:
HeadOffice
Vendor
case 3300 popup notes
case 3427 change vendortype to displayfor so it displays in multiple locations
case 3427 change vendortype to displayfor so it displays in multiple locations
adm-user edit form must be tweaked once the vendor object is coded to so subcontractors
CustomerNote "ClientNote"
Memo (user memos)
Project

View File

@@ -640,6 +640,53 @@ export default {
"Problem displaying map in new window. Browser must allow pop-ups to view maps; check your browser setting"
);
}
},
///////////////////////////////////////////////
// Online mapping service url formats
//
//
mapProviderUrls: function() {
return [
{
name: "Apple",
value:
"http://maps.apple.com/?q={ayaddress}<|>http://maps.apple.com/?ll={aylatitude},{aylongitude}"
},
{
name: "Bing",
value:
"https://bing.com/maps/default.aspx?where1={ayaddress}<|>https://bing.com/maps/default.aspx?cp={aylatitude}~{aylongitude}&lvl=17&style=r&sp=point.{aylatitude}_{aylongitude}"
},
{
name: "Google",
value:
"https://www.google.com/maps/search/?api=1&query={ayaddress}<|>https://www.google.com/maps/search/?api=1&query={aylatitude},{aylongitude}"
},
{
name: "MapQuest",
value:
"https://mapquest.com/?center={ayaddress}&zoom=17<|>https://mapquest.com/?center={aylatitude},{aylongitude}&zoom=17"
},
{
name: "Open Street Map",
value:
"https://www.openstreetmap.org/search?query={ayaddress}<|>https://www.openstreetmap.org/?mlat={aylatitude}&mlon={aylongitude}#map=17/{aylatitude}/{aylongitude}"
},
{
name: "geo URI",
value: "geo:{aylatitude},{aylongitude}"
},
{
name: "Waze",
value:
"https://waze.com/ul?q={ayaddress}<|>https://www.waze.com/ul?ll={aylatitude},{aylongitude}&navigate=yes&zoom=17"
},
{
name: "Yandex",
value:
"https://yandex.ru/maps/?mode=search&text={ayaddress}&z=17<|>https://yandex.ru/maps/?ll={aylatitude},{aylongitude}&z=12&l=map"
}
];
}
/**

View File

@@ -1,10 +1,10 @@
<template>
<v-container fluid>
<gz-report-selector ref="reportSelector"></gz-report-selector>
<h2 class="red--text" v-if="$ay.dev">
<h4 class="red--text" v-if="$ay.dev">
todo: revisit after add vendor to support usertype contractor
</h2>
{{ formState }}
</h4>
<div v-if="formState.ready">
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
@@ -480,47 +480,7 @@ export default {
selectLists: {
usertypes: [],
translations: [],
mapUrls: [
{
name: "Apple",
value:
"http://maps.apple.com/?q={ayaddress}<|>http://maps.apple.com/?ll={aylatitude},{aylongitude}"
},
{
name: "Bing",
value:
"https://bing.com/maps/default.aspx?where1={ayaddress}<|>https://bing.com/maps/default.aspx?cp={aylatitude}~{aylongitude}&lvl=17&style=r&sp=point.{aylatitude}_{aylongitude}"
},
{
name: "Google",
value:
"https://www.google.com/maps/search/?api=1&query={ayaddress}<|>https://www.google.com/maps/search/?api=1&query={aylatitude},{aylongitude}"
},
{
name: "MapQuest",
value:
"https://mapquest.com/?center={ayaddress}&zoom=17<|>https://mapquest.com/?center={aylatitude},{aylongitude}&zoom=17"
},
{
name: "Open Street Map",
value:
"https://www.openstreetmap.org/search?query={ayaddress}<|>https://www.openstreetmap.org/?mlat={aylatitude}&mlon={aylongitude}#map=17/{aylatitude}/{aylongitude}"
},
{
name: "geo URI",
value: "geo:{aylatitude},{aylongitude}"
},
{
name: "Waze",
value:
"https://waze.com/ul?q={ayaddress}<|>https://www.waze.com/ul?ll={aylatitude},{aylongitude}&navigate=yes&zoom=17"
},
{
name: "Yandex",
value:
"https://yandex.ru/maps/?mode=search&text={ayaddress}&z=17<|>https://yandex.ru/maps/?ll={aylatitude},{aylongitude}&z=12&l=map"
}
]
mapUrls: window.$gz.util.mapProviderUrls()
},
obj: {
id: 0,

View File

@@ -484,54 +484,14 @@ export default {
selectLists: {
usertypes: [],
translations: [],
mapUrls: [
{
name: "Apple",
value:
"http://maps.apple.com/?q={ayaddress}<|>http://maps.apple.com/?ll={aylatitude},{aylongitude}"
},
{
name: "Bing",
value:
"https://bing.com/maps/default.aspx?where1={ayaddress}<|>https://bing.com/maps/default.aspx?cp={aylatitude}~{aylongitude}&lvl=17&style=r&sp=point.{aylatitude}_{aylongitude}"
},
{
name: "Google",
value:
"https://www.google.com/maps/search/?api=1&query={ayaddress}<|>https://www.google.com/maps/search/?api=1&query={aylatitude},{aylongitude}"
},
{
name: "MapQuest",
value:
"https://mapquest.com/?center={ayaddress}&zoom=17<|>https://mapquest.com/?center={aylatitude},{aylongitude}&zoom=17"
},
{
name: "Open Street Map",
value:
"https://www.openstreetmap.org/search?query={ayaddress}<|>https://www.openstreetmap.org/?mlat={aylatitude}&mlon={aylongitude}#map=17/{aylatitude}/{aylongitude}"
},
{
name: "geo URI",
value: "geo:{aylatitude},{aylongitude}"
},
{
name: "Waze",
value:
"https://waze.com/ul?q={ayaddress}<|>https://www.waze.com/ul?ll={aylatitude},{aylongitude}&navigate=yes&zoom=17"
},
{
name: "Yandex",
value:
"https://yandex.ru/maps/?mode=search&text={ayaddress}&z=17<|>https://yandex.ru/maps/?ll={aylatitude},{aylongitude}&z=12&l=map"
}
]
mapUrls: window.$gz.util.mapProviderUrls()
},
obj: {
id: 0,
concurrency: 0,
active: false,
name: null,
roles: null,
roles: 2048,
userType: 3,
employeeNumber: null,
notes: null,
@@ -731,7 +691,7 @@ export default {
name: "cust-user",
params: {
recordid: res.data.id,
obj: res.data,
obj: res.data,
optionsObj: vm.optionsObj
}
});

View File

@@ -217,47 +217,7 @@ export default {
formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
selectLists: {
translations: [],
mapUrls: [
{
name: "Apple",
value:
"http://maps.apple.com/?q={ayaddress}<|>http://maps.apple.com/?ll={aylatitude},{aylongitude}"
},
{
name: "Bing",
value:
"https://bing.com/maps/default.aspx?where1={ayaddress}<|>https://bing.com/maps/default.aspx?cp={aylatitude}~{aylongitude}&lvl=17&style=r&sp=point.{aylatitude}_{aylongitude}"
},
{
name: "Google",
value:
"https://www.google.com/maps/search/?api=1&query={ayaddress}<|>https://www.google.com/maps/search/?api=1&query={aylatitude},{aylongitude}"
},
{
name: "MapQuest",
value:
"https://mapquest.com/?center={ayaddress}&zoom=17<|>https://mapquest.com/?center={aylatitude},{aylongitude}&zoom=17"
},
{
name: "Open Street Map",
value:
"https://www.openstreetmap.org/search?query={ayaddress}<|>https://www.openstreetmap.org/?mlat={aylatitude}&mlon={aylongitude}#map=17/{aylatitude}/{aylongitude}"
},
{
name: "geo URI",
value: "geo:{aylatitude},{aylongitude}"
},
{
name: "Waze",
value:
"https://waze.com/ul?q={ayaddress}<|>https://www.waze.com/ul?ll={aylatitude},{aylongitude}&navigate=yes&zoom=17"
},
{
name: "Yandex",
value:
"https://yandex.ru/maps/?mode=search&text={ayaddress}&z=17<|>https://yandex.ru/maps/?ll={aylatitude},{aylongitude}&z=12&l=map"
}
]
mapUrls: window.$gz.util.mapProviderUrls()
},
activeTranslationId: null,
darkMode: this.$store.state.darkMode,