ayanova/src/api/gzutil.js

@@ -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"
+      }
+    ];
   }
 
   /**

ayanova/src/views/adm-user.vue

@@ -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,

ayanova/src/views/cust-user.vue

@@ -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
               }
             });

ayanova/src/views/home-user-settings.vue

@@ -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,