Merge tag 'v1.3.1' into develop

v1.3.1

README.md

@@ -18,9 +18,9 @@ The Maricopa Association of Governments (MAG) mapping page showing businesses op
 
 ## Version
 
-### version | 1.3.0 ###
+### version | 1.3.1 ###
 
-* #### Updated | 2020-09-02 ####
+* #### Updated | 2020-10-21 ####
 
 * #### Created | 2020-04-09 ####
 
@@ -84,8 +84,4 @@ Please acknowledge the Maricopa Association of Governments (MAG) GIS as the sour
 
 ## Copyright and Licensing
 
-Code released under the MIT license.
-
-A copy of the license is available in the repository's `LICENSE` file.
-
-* [LICENSE](LICENSE)
+Code released under the MIT license. [LICENSE](LICENSE)

package.json

@@ -1,7 +1,7 @@
 {
     "name": "Peoria-Business-Resources-Tool",
-    "version": "1.3.0",
-    "date": "2020-09-02",
+    "version": "1.3.1",
+    "date": "2020-10-21",
     "copyright": "2020",
     "description": "MAG webmap for City of Peoria Businesses",
     "keywords": [

src/humans.txt

@@ -47,8 +47,8 @@
 # SITE
     Site Name: Peoria-Business-Resources-Tool
     Site URL: http://geo.azmag.gov/maps/peoriabiz/
-    Version: 1.3.0
-	Last updated: 2020-09-02
+    Version: 1.3.1
+	Last updated: 2020-10-21
     Creation date: 2020-04-09
 	Language: English
 	Doctype: HTML5

src/index.html

@@ -16,9 +16,9 @@
     <!-- endcomments -->
     <meta name="url" content="https://geo.azmag.gov/maps/peoriabiz/">
     <meta name="creation-date" content="2020-04-09">
-    <meta name="revision-date" content="2020-09-02">
-    <meta name="build-info" content="1.3.0.202009021541">
-    <meta name="version" content="1.3.0">
+    <meta name="revision-date" content="2020-10-21">
+    <meta name="build-info" content="1.3.1.202010211502">
+    <meta name="version" content="1.3.1">
     <!-- Application CSS -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" />
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.6.3/css/all.min.css" />

src/js/config.js

@@ -40,7 +40,7 @@ define([], function () {
     };
 
     return {
-        version: "v1.3.0 | 2020-09-02",
+        version: "v1.3.1 | 2020-10-21",
         copyright: "2020",
 
         peoriaURL: "https://www.peoriaaz.gov/",

src/js/map.js

@@ -13,7 +13,7 @@ define([
     "esri/layers/FeatureLayer",
     "esri/geometry/Extent",
     "mag/card-functions",
-], function (config, Map, MapView, FeatureLayer, Extent, cardsF) {
+], function(config, Map, MapView, FeatureLayer, Extent, cardsF) {
     const maxExtent = new Extent(config.maxExtent);
     const initExtent = new Extent(config.intExtent);
 
@@ -70,7 +70,7 @@ define([
     });
     map.add(peoriaBusinessesLayer);
 
-    view.watch("extent", function (extent) {
+    view.watch("extent", function(extent) {
         let currentCenter = extent.center;
         if (!maxExtent.contains(currentCenter)) {
             let newCenter = extent.center;
@@ -115,8 +115,7 @@ define([
     let $cboxDelivery = $("#cboxDelivery");
     let $cboxApp = $("#cboxApp");
 
-    let filters = [
-        {
+    let filters = [{
             field: "TakeOut",
             getValue: () => {
                 return $cboxTakeOut.prop("checked") ? 1 : 0;
@@ -205,7 +204,7 @@ define([
     }
 
     //sort button
-    $("#sort-biz").on("click", function () {
+    $("#sort-biz").on("click", function() {
         var toggleStatus = $("#sort-biz").attr("data-status");
         if (toggleStatus === "on") {
             $("#sort-biz").attr("data-status", "off");
@@ -222,7 +221,7 @@ define([
     view.whenLayerView(peoriaBusinessesLayer).then((layerView) => {
         lyrView = layerView;
 
-        lyrView.watch("updating", async function (value) {
+        lyrView.watch("updating", async function(value) {
             // once the layer view finishes updating
             if (!value) {
                 let cardData = await getCardListData(lyrView);
@@ -349,7 +348,7 @@ define([
     });
 
     function prePopulateForm(feature) {
-        console.log(feature);
+        // console.log(feature);
         let {
             Restaurant_Name,
             Business_Address,
@@ -390,11 +389,11 @@ define([
         }
     });
 
-    view.popup.on("trigger-action", async function (event) {
+    view.popup.on("trigger-action", async function(event) {
         // If the zoom-out action is clicked, fire the zoomOut() function
         if (event.action.id === "edit") {
             let TableID = view.popup.selectedFeature.attributes["TableID"];
-            console.log(TableID);
+            // console.log(TableID);
 
             if (lyrView) {
                 let { features } = await lyrView.queryFeatures({

src/sass/partials/_addNewLocation.scss

@@ -37,3 +37,11 @@
   font-weight: 600;
 
 }
+
+#commentSubmit {
+  margin-right: 5px;
+}
+
+#commentClose {
+  margin-left: 5px;
+}

src/views/feedback-view.html

@@ -1,2 +1,29 @@
-<div class="modal-dialog modal-lg"role="document"><div class="modal-content"><div class="modal-header"><h5 class="modal-title">Add Missing Business</h5><button type="button"class="close"data-dismiss="modal"aria-label="Close"><span aria-hidden="true">&times;
-</span></button></div><div class="modal-body"><form class="needs-validation"novalidate id="newBusinessForm"><div class="form-group"><label for="BusinessName">Business Name <span class="redAsterisk">*</span></label><input required name="BusinessName"type="BusinessName"class="form-control form-control-sm"/></div><div class="form-group"><label for="BusinessAddress">Business Address</label><input name="BusinessAddress"type="BusinessAddress"class="form-control form-control-sm"/></div><div class="form-group"><label for="Category">Category</label><input name="Category"type="Category"class="form-control form-control-sm"/></div><div class="form-group"><label for="iconFile">Business Icon</label><input type="file"class="form-control-file"id="iconFile"></div><div class="form-group"><label for="BusinessWebsite">Website</label><input name="BusinessWebsite"type="BusinessWebsite"class="form-control form-control-sm"/></div><div class="form-group"><label for="BusinessPhone">Phone</label><input name="BusinessPhone"type="BusinessPhone"class="form-control form-control-sm"maxlength="100"class="form-control form-control-sm"type="text"data-mask="(999) 000-0000"/></div><div class="form-check form-check-inline"><input class="form-check-input"type="checkbox"id="takeOutCbox"value="Take Out"/><label class="form-check-label"for="takeOutCbox">Take Out</label></div><div class="form-check form-check-inline"><input class="form-check-input"type="checkbox"id="deliveryCheckBox"value="option2"/><label class="form-check-label"for="deliveryCheckBox">Delivery</label></div><div class="form-check form-check-inline"><input class="form-check-input"type="checkbox"id="dineInCbox"value="option3"/><label class="form-check-label"for="dineInCbox">Dine In</label></div><div class="form-check form-check-inline"><input class="form-check-input"type="checkbox"id="mobileApp"value="option4"/><label class="form-check-label"for="mobileApp">Mobile App</label></div><div class="form-check form-check-inline"><input class="form-check-input"type="checkbox"id="OptOutCbox"value="option5"/><label class="form-check-label redLable"for="OptOutCbox">Opt Out</label></div><hr /><div class="form-group"><label for="NAME">Name <span class="redAsterisk">*</span></label><input required name="NAME"type="NAME"class="form-control form-control-sm"/></div><div class="form-group"><label for="EMAIL">Email Address <span class="redAsterisk">*</span></label><input required name="EMAIL"type="EMAIL"class="form-control form-control-sm"placeholder="name@example.com"/><div class="invalid-tooltip">Please enter a vaild email address. </div></div><button id="commentSubmit"type="submit"class="btn btn-primary">Submit </button><button id="commentClose"type="button"class="btn btn-secondary"data-dismiss="modal">Close </button></form></div></div></div>
+<div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+        <div class="modal-header">
+            <h5 class="modal-title">Add Missing Business</h5><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;
+                </span></button>
+        </div>
+        <div class="modal-body">
+            <form class="needs-validation" novalidate id="newBusinessForm">
+                <div class="form-group"><label for="BusinessName">Business Name <span class="redAsterisk">*</span></label><input required name="BusinessName" type="BusinessName" class="form-control form-control-sm" /></div>
+                <div class="form-group"><label for="BusinessAddress">Business Address</label><input name="BusinessAddress" type="BusinessAddress" class="form-control form-control-sm" /></div>
+                <div class="form-group"><label for="BusinessLicense">Business License Number <span class="redAsterisk">*</span></label><input required name="BusinessLicense" type="BusinessLicense" class="form-control form-control-sm" /></div>
+                <div class="form-group"><label for="Category">Category</label><input name="Category" type="Category" class="form-control form-control-sm" /></div>
+                <div class="form-group"><label for="iconFile">Business Icon</label><input type="file" class="form-control-file" id="iconFile"></div>
+                <div class="form-group"><label for="BusinessWebsite">Website</label><input name="BusinessWebsite" type="BusinessWebsite" class="form-control form-control-sm" /></div>
+                <div class="form-group"><label for="BusinessPhone">Phone</label><input name="BusinessPhone" type="BusinessPhone" class="form-control form-control-sm" maxlength="100" class="form-control form-control-sm" type="text" data-mask="(999) 000-0000" /></div>
+                <div class="form-check form-check-inline"><input class="form-check-input" type="checkbox" id="takeOutCbox" value="Take Out" /><label class="form-check-label" for="takeOutCbox">Take Out</label></div>
+                <div class="form-check form-check-inline"><input class="form-check-input" type="checkbox" id="deliveryCheckBox" value="option2" /><label class="form-check-label" for="deliveryCheckBox">Delivery</label></div>
+                <div class="form-check form-check-inline"><input class="form-check-input" type="checkbox" id="dineInCbox" value="option3" /><label class="form-check-label" for="dineInCbox">Dine In</label></div>
+                <div class="form-check form-check-inline"><input class="form-check-input" type="checkbox" id="mobileApp" value="option4" /><label class="form-check-label" for="mobileApp">Mobile App</label></div>
+                <div class="form-check form-check-inline"><input class="form-check-input" type="checkbox" id="OptOutCbox" value="option5" /><label class="form-check-label redLable" for="OptOutCbox">Opt Out</label></div>
+                <hr />
+                <div class="form-group"><label for="NAME">Name <span class="redAsterisk">*</span></label><input required name="NAME" type="NAME" class="form-control form-control-sm" /></div>
+                <div class="form-group"><label for="EMAIL">Email Address <span class="redAsterisk">*</span></label><input required name="EMAIL" type="EMAIL" class="form-control form-control-sm" placeholder="name@example.com" />
+                    <div class="invalid-tooltip">Please enter a vaild email address. </div>
+                </div><button id="commentSubmit" type="submit" class="btn btn-primary">Submit </button><button id="commentClose" type="button" class="btn btn-secondary" data-dismiss="modal">Close </button>
+            </form>
+        </div>
+    </div>
+</div>

src/views/modal-help.html

@@ -8,45 +8,45 @@ <h5 class="modal-title">Mapping Tool Help</h5>
         </div>
         <div class="modal-body">
             <p>
-                Peoria is the place provides information about restaurants across the city of Peoria to help you find what restaurants are open, and how they are serving customers during the COVID-19 crisis.
+                Peoria is the place provides information about businesses across the city of Peoria to help you find what businesses are open, and how they are serving customers during the COVID-19 crisis.
             </p>
             <p>
-                Options for finding restaurants:
+                Options for finding businesses:
             </p>
             <p>
-                The blue dots on the map are restaurant locations. Click or tap on a dot to see current information about that restaurant
+                The blue dots on the map are business locations. Click or tap on a dot to see current information about that restaurant
             </p>
             <div class="info-pic-div"><img class="info-pics" src="images/info-pics/info1.png" alt="help info pic 1"></div>
             <p>
-                To find a specific restaurant, use the Select a Business drop down menu to find an alphabetical list of restaurants in the city
+                To find a specific restaurant, use the Select a Business drop down menu to find an alphabetical list of businesses in the city
             </p>
             <div class="info-pic-div"><img class="info-pics" src="images/info-pics/info2.png" alt="help info pic 2"></div>
             <p>
-                Click on a restaurant in the list on the left-hand side to see information about that restaurant and zoom the map to the restaurant’s location.
+                Click on a business in the list on the left-hand side to see information about that business and zoom the map to the restaurant’s location.
             </p>
             <div class="info-pic-div"><img class="info-pics" src="images/info-pics/info3.png" alt="help info pic 3"></div>
             <p>
-                To limit the map and the list to just certain types of restaurants, use the Select a Category dropdown list and choose the category you’re interested in.
+                To limit the map and the list to just certain types of businesses, use the Select a Category dropdown list and choose the category you’re interested in.
             </p>
             <div class="info-pic-div"><img class="info-pics" src="images/info-pics/info4.png" alt="help info pic 4"></div>
             <p>
-                To limit the map and list to just restaurants offering certain types of service, click the checkboxes to select Take Out, Delivery or Mobile App
+                To limit the map and list to just businesses offering certain types of service, click the checkboxes to select Take Out, Delivery or Mobile App
             </p>
             <div class="info-pic-div"><img class="info-pics" src="images/info-pics/info5.png" alt="help info pic 5"></div>
             <p>
-                If you see that a restaurant location is missing from the map, you can add it by clicking on Add Missing Location
+                If you see that a business location is missing from the map, you can add it by clicking on Add Missing Location
             </p>
             <div class="info-pic-div"><img class="info-pics" src="images/info-pics/info6.png" alt="help info pic 6"></div>
             <p>
                 After you click on Add Missing Location, you’ll be asked to click on the missing restaurant’s location on the map
             </p>
             <div class="info-pic-div"><img class="info-pics" src="images/info-pics/info7.png" alt="help info pic 7"></div>
             <p>
-                Once you click on the location, you can input whatever information you know about the restaurant on the Add Missing Business form box
+                Once you click on the location, you can input whatever information you know about the business on the Add Missing Business form box
             </p>
             <div class="info-pic-div"><img class="info-pics" src="images/info-pics/info8.png" alt="help info pic 8"></div>
             <p>
-                You can also edit information about a restaurant if you see something wrong by clicking on the blue edit button on the restaurant’s information box
+                You can also edit information about a business if you see something wrong by clicking on the blue edit button on the restaurant’s information box
             </p>
             <div class="info-pic-div"><img class="info-pics" src="images/info-pics/info9.png" alt="help info pic 9"></div>