From 2c732a60818c71c3fe91c7f68baae24f1001623f Mon Sep 17 00:00:00 2001
From: hexstudy <denis.ironi@outlook.it>
Date: Mon, 11 Jan 2016 17:05:00 +0000
Subject: [PATCH] git-svn-id:
 https://msi/svn/firstRepo/WebClient/branches/NewRelease@43
 0f545695-f87b-41b6-9a03-7f16563b5454

---
 Resources/img/ricettaND.png                   | Bin 0 -> 3093 bytes
 Resources/img/ricettaND_80.png                | Bin 0 -> 1905 bytes
 index.php                                     |   1 +
 js/classes/profile.js                         |  11 +-
 js/manifest.js                                |   2 +-
 js/modules/category/categoryItemTemplate.html |   2 +-
 js/modules/category/categoryViewTemplate.html |   2 +-
 js/modules/home/homeViewTemplate.html         |  10 +-
 js/modules/maps/infoWindowTemplate.html       |  10 ++
 js/modules/maps/maps.js                       | 101 ++++++++++++++++++
 js/modules/maps/mapsViewTemplate.html         |   5 +
 js/modules/settings/settings.js               |  40 ++++++-
 js/modules/settings/settingsViewTemplate.html |  13 +++
 js/router.js                                  |  10 +-
 14 files changed, 197 insertions(+), 10 deletions(-)
 create mode 100644 Resources/img/ricettaND.png
 create mode 100644 Resources/img/ricettaND_80.png
 create mode 100644 js/modules/maps/infoWindowTemplate.html
 create mode 100644 js/modules/maps/maps.js
 create mode 100644 js/modules/maps/mapsViewTemplate.html

diff --git a/Resources/img/ricettaND.png b/Resources/img/ricettaND.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad434b8dde2b26ade1fdd745cc093d8e72dfbaf0
GIT binary patch
literal 3093
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
GUHvccC&qLD

literal 0
HcmV?d00001

diff --git a/Resources/img/ricettaND_80.png b/Resources/img/ricettaND_80.png
new file mode 100644
index 0000000000000000000000000000000000000000..bff4cfafa2b2c39d1ed563c117a7082eed3178ab
GIT binary patch
literal 1905
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
ap*37d?L@MMZVDg%Y{=G{MlH2;4gDWXQ|yoc

literal 0
HcmV?d00001

diff --git a/index.php b/index.php
index 132ef13..c2ac5fa 100644
--- a/index.php
+++ b/index.php
@@ -18,6 +18,7 @@
         <link rel="apple-touch-icon" sizes="144x144" href="https://dl.dropboxusercontent.com/s/pj3fk1lgc4cefwx/Icon~ipad%402x.png" />
         <meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui"/>
         <meta http-equiv="Access-Control-Allow-Origin" content="*"/>
+        <script src="https://maps.googleapis.com/maps/api/js"></script>
         <script type='text/javascript' src="js/common.min.<?php echo filemtime('js/common.min.js'); ?>.js"></script>
         <script type='text/javascript'>
 <?php echo file_get_contents("js/manifest.js"); ?>
diff --git a/js/classes/profile.js b/js/classes/profile.js
index 595f881..9c8bb3a 100644
--- a/js/classes/profile.js
+++ b/js/classes/profile.js
@@ -241,7 +241,16 @@ define(['jquery', 'backbone'],
                             "keyStore": this.getKeySave(),
                             "tema": this.data.tema,
                             "risRic": this.data.risRic,
-                            "type": this.data.type
+                            "type": this.data.type,
+                            "email": this.data.email,
+                            "isSpacc": this.data.isSpacc,
+                            "prov": this.data.dataSpacc.provincia,
+                            "comune": this.data.dataSpacc.comune,
+                            "cap": this.data.dataSpacc.cap,
+                            "tipopm": this.data.dataSpacc.tipopm,
+                            "privacy": this.data.dataSpacc.privacy,
+                            "lng": this.data.dataSpacc.long,
+                            "lat": this.data.dataSpacc.lat
                         };
 
                         $.ajax({
diff --git a/js/manifest.js b/js/manifest.js
index 457a659..4cade9b 100644
--- a/js/manifest.js
+++ b/js/manifest.js
@@ -1,7 +1,7 @@
 var myManifest = {
     Debug: (window.location.port !== ""),
     Name: "Il Lievitario",
-    Version: "2.9.0.2",
+    Version: "2.9.2.0",
     Author: "Denis Ironi",
     Settings: {
         DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"),
diff --git a/js/modules/category/categoryItemTemplate.html b/js/modules/category/categoryItemTemplate.html
index 6dbb838..4fe5b77 100644
--- a/js/modules/category/categoryItemTemplate.html
+++ b/js/modules/category/categoryItemTemplate.html
@@ -3,7 +3,7 @@
 <%} else { for (var i = 0; i < data.length; i++) { %>
   <% var item = data[i]; %>
 <li><a href="#ricetta/<%= item.ricetta_id%>" class="ui-btn ui-btn-icon-right ui-icon-carat-r">
-	<img src="Resources\img\ricettaND_80.png">
+	<!--<img src="Resources\img\ricettaND_80.png">-->
     <div class='ricettaTitolo'><%= unescape(item.titolo) %></div>
     <div class='ricettaAutore'><%= unescape(item.autore) %></div>
     <br><div class='ricettaAutore'>Diff.:&nbsp;&nbsp;</div>
diff --git a/js/modules/category/categoryViewTemplate.html b/js/modules/category/categoryViewTemplate.html
index 5669a86..a31cc61 100644
--- a/js/modules/category/categoryViewTemplate.html
+++ b/js/modules/category/categoryViewTemplate.html
@@ -1,5 +1,5 @@
 <div id="categoryListContent" data-role="content">	
-    <h1>Indice <%= categoryName %></h1>
+	<h1>Indice <%= categoryName %></h1>
     <ul id="allRicette" data-role="listview" data-autodividers="true" data-alpha="true" data-inset="true">    	
     </ul>
 </div>
\ No newline at end of file
diff --git a/js/modules/home/homeViewTemplate.html b/js/modules/home/homeViewTemplate.html
index be81e6d..160f402 100644
--- a/js/modules/home/homeViewTemplate.html
+++ b/js/modules/home/homeViewTemplate.html
@@ -1,8 +1,8 @@
 <div data-role="content">
     <div style="text-align: center;">
         <% if(profile.data.name){ %>
-        <h2 id="benvenuto">Bentornat<% if(profile.data.gender=="male"){%>o<%}else{%>a<%}%><br><%=profile.data.name %></h2><% }else{ %>
-        <h2 id="benvenuto">Benarrivata/o nel nostro ricettario</h2>
+        <h3 id="benvenuto">Bentornat<% if(profile.data.gender=="male"){%>o<%}else{%>a<%}%> <%=profile.data.name %></h3><% }else{ %>
+        <h3 id="benvenuto">Benarrivata/o nel nostro ricettario</h3>
         <% } %>
     </div>
     <div>
@@ -37,6 +37,12 @@
                     <span>Blog</span>
                 </div>
             </div>
+            <div class="itemMenuHomeMetro <%= customClassTheme %> blogClass">
+                <div>
+                    <a href="#mapsView" data-role="none"></a>
+                    <span>Mappa Spacciatori</span>
+                </div>
+            </div>
         </div>
     </div>
 </div>
diff --git a/js/modules/maps/infoWindowTemplate.html b/js/modules/maps/infoWindowTemplate.html
new file mode 100644
index 0000000..1a25363
--- /dev/null
+++ b/js/modules/maps/infoWindowTemplate.html
@@ -0,0 +1,10 @@
+<div id="content">
+<div id="siteNotice">
+</div>
+<h1 id="firstHeading" class="firstHeading"><%= item.Name%></h1>
+<div id="bodyContent">
+<p>Tipo di Lievito: <% if(item.TipoPM==1){%>Pasta Madre Solida<%} else if(item.TipoPM==2){%>Li.Co.Li.<%}else{%>Entrambi<%}%><br>
+Contatta a: <a href="mailto:<%= item.Email%>"><%= item.Email%></a>
+</p>
+</div>
+</div>
\ No newline at end of file
diff --git a/js/modules/maps/maps.js b/js/modules/maps/maps.js
new file mode 100644
index 0000000..39211be
--- /dev/null
+++ b/js/modules/maps/maps.js
@@ -0,0 +1,101 @@
+define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.html', 'text!modules/maps/infoWindowTemplate.html', 'modules/base/baseView', 'classes/profile'],
+        function ($, _, Backbone, mapsViewTemplate, infoWindowTemplate, BaseView, Profile) {
+
+            var MapsView = BaseView.extend({
+
+                map: null,
+                markers: [],
+                //initialize template
+                template: _.template(mapsViewTemplate),
+                infoWindowtemplate: _.template(infoWindowTemplate),
+
+                initialize: function () {
+                    this.id = "MapsView";
+                    MapsView.__super__.initialize.call(this);
+                },
+                onShowed: function(){
+                    var self = this;
+                    var drawMap = function(LatLng){                        
+                        var myOptions = {
+                            zoom: 10,
+                            center: LatLng,
+                            mapTypeId: google.maps.MapTypeId.ROADMAP
+                        };
+                        self.map = new google.maps.Map($("#map-canvas")[0], myOptions);
+
+                        var iconPM = {
+                            url: "http://app.gruppolapastamadre.it/icon.png",
+                            scaledSize: new google.maps.Size(24, 24)
+                        };
+
+                        self.map.addListener('bounds_changed', function() {
+                              var bound = self.map.getBounds();
+                              var latLngFrom = bound.getNorthEast();
+                              var latLngTo = bound.getSouthWest();
+                              $.ajax({
+                                url: myManifest.Settings.DefaultURL + "/api/spacciatori/bound/" + latLngFrom.lat() + "/"+ latLngFrom.lng() + "/" + latLngTo.lat() + "/"+ latLngTo.lng(),
+                                //dataType: "json",
+                                //async: false,
+                                type: 'GET',
+                                success: function (resp) {
+                                    resp.forEach(function(ele, index){
+                                        if(!self.markers["|" + ele.Latitudine+ "|" + ele.Longitudine+ "|"])
+                                        {
+                                            var marker = new google.maps.Marker({
+                                                position: new google.maps.LatLng(ele.Latitudine, ele.Longitudine),
+                                                icon: iconPM,
+                                                //label: ele.Name,
+                                                title: ele.Name,
+                                                map: self.map
+                                              });
+                                            self.markers["|" + ele.Latitudine+ "|" + ele.Longitudine+ "|"] = marker;
+
+                                            var infowindow = new google.maps.InfoWindow({
+                                                content: self.infoWindowtemplate({item: ele})
+                                              });
+
+                                            marker.addListener('click', function() {
+                                                infowindow.open(self.map, marker);
+                                            });
+                                        }
+                                    });
+                                }
+                                });
+                          });
+                    };
+                    var defaultLatLng = new google.maps.LatLng(34.0983425, -118.3267434);  // Default to Hollywood, CA when no geolocation support
+                    if ( navigator.geolocation ) {
+                        function success(pos) {
+                            // Location found, show map with these coordinates
+                            drawMap(new google.maps.LatLng(pos.coords.latitude, pos.coords.longitude));
+                        }
+                        function fail(error) {
+                            drawMap(defaultLatLng);  // Failed to find location, show default map
+                        }
+                        // Find the users current position.  Cache the location for 5 minutes, timeout after 6 seconds
+                        navigator.geolocation.getCurrentPosition(success, fail, {maximumAge: 500000, enableHighAccuracy:true, timeout: 6000});
+                    } else {
+                        drawMap(defaultLatLng);  // No geolocation support, show default map
+                    }
+                },
+                //render the content into div of view 
+                render: function () {
+                    if (this.created === true)
+                    {
+                        //this.header.title = "pippo";
+                        MapsView.__super__.render.call(this);
+                        //this.el is the root element of Backbone.View. By default, it is a div.    
+                        //$el is cached jQuery object for the view's element.
+                        //append the compiled template into view div container
+                        this.$el.append(this.header.$el);
+                        this.$el.append(this.template({app: myManifest, profile: Profile}));
+                        this.$el.append(this.footer.$el);
+                        this.$el.find("#infoBtn").addClass("ui-btn-active");
+                    }
+                    //$("#homeBtn").addClass("ui-btn-active");        
+                    //return to enable chained calls
+                    return this;
+                }
+            });
+            return MapsView;
+        });
\ No newline at end of file
diff --git a/js/modules/maps/mapsViewTemplate.html b/js/modules/maps/mapsViewTemplate.html
new file mode 100644
index 0000000..23f6595
--- /dev/null
+++ b/js/modules/maps/mapsViewTemplate.html
@@ -0,0 +1,5 @@
+<div data-role="content">
+	<div id="map-canvas" style="height: 100%; width: 350px;">
+        <!-- map loads here... -->
+    </div>
+</div>
\ No newline at end of file
diff --git a/js/modules/settings/settings.js b/js/modules/settings/settings.js
index 78e57aa..6580c97 100644
--- a/js/modules/settings/settings.js
+++ b/js/modules/settings/settings.js
@@ -5,6 +5,7 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
 
             //initialize template
             template:_.template(settingsViewTemplate),
+            _flagSave: false,
 
             initialize: function () {
                 var self = this;
@@ -18,6 +19,12 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
             },
 
             saveBtn:function(e){
+                var self = this;
+
+                if(self._flagSave)
+                    return;
+
+                self._flagSave = true;
                 e.preventDefault();
                 Profile.data.risRic = this.$el.find('#nResult').val();
                 Profile.data.tema = this.$el.find('#theme').val();
@@ -33,6 +40,26 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
                         Profile.data.dataSpacc.tipopm = this.$el.find('#tPM').val();
                         Profile.data.dataSpacc.privacy = this.$el.find('#privacyChk').prop('checked')?"1":"0";
 
+                        if(Profile.data.email === "" ||
+                           Profile.data.dataSpacc.provincia === "" ||
+                           Profile.data.dataSpacc.comune === "" ||
+                           Profile.data.dataSpacc.cap === "" ||
+                           Profile.data.dataSpacc.tipopm === "")
+                        {
+                            this.$el.find('#messaggio').html("<center><h1>ATTENZIONE</h1> devono essere settate tutte i campi</center>");
+                            this.$el.find('#popupDialog').popup("open");
+                            self._flagSave = false;
+                            return;
+                        }
+
+                        if(Profile.data.dataSpacc.privacy==="0")
+                        {
+                            this.$el.find('#messaggio').html("<center><h1>ATTENZIONE</h1> per proseguire si DEVE accettare l'informativa privacy</center>");
+                            this.$el.find('#popupDialog').popup("open");
+                            self._flagSave = false;
+                            return;
+                        }
+
                         $.ajax({
                             url: "http://maps.google.com/maps/api/geocode/json?address=" + 
                                         Profile.data.dataSpacc.comune + "+" + 
@@ -40,14 +67,23 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
                                         Profile.data.dataSpacc.provincia + "+italia&sensor=false",
                             Type: "GET"
                         }).then(function ( response ) {
-
+                            if(response.results.length == 1)
+                            {
+                               Profile.data.dataSpacc.lat = response.results[0].geometry.location.lat;
+                               Profile.data.dataSpacc.long = response.results[0].geometry.location.lng;
+                               Profile.updateProfile(function(){
+                                    self._flagSave = false;
+                                    Backbone.history.loadUrl(Backbone.history.getFragment());
+                                });
+                            }
                         });
                     }
                 }
                 else
                 {
                     Profile.updateProfile(function(){
-                        Backbone.history.loadUrl();
+                        self._flagSave = false;
+                        Backbone.history.loadUrl(Backbone.history.getFragment());
                     });
                 }
             },
diff --git a/js/modules/settings/settingsViewTemplate.html b/js/modules/settings/settingsViewTemplate.html
index 8fcaa5d..948758f 100644
--- a/js/modules/settings/settingsViewTemplate.html
+++ b/js/modules/settings/settingsViewTemplate.html
@@ -151,6 +151,7 @@
 			<select name="tPM" id="tPM">
 				<option value="1" selected="true">Solida</option>
 				<option value="2">Liquida/Licoli</option>
+				<option value="3">Entrambe</option>
 			</select>
 			<label>Infomativa privacy, AUTORIZZAZIONE DATI PERSONALI
 ai sensi e per gli effetti degli artt. 13 e 23 del D.Lgs. n. 196/2003, acconsento al trattamento e alla pubblicazione dei dati personali forniti a seguito della
@@ -165,4 +166,16 @@ segnalazione inoltrata.</label>
 		Impostazione di sincronizzazione
 		<a id="syncBtn" href="#syncView" button="true" class="ui-link ui-btn ui-icon-custom ui-btn-icon-left">Sincronizzazione</a>
 	</div>
+</div>
+<div data-role="popup" id="popupDialog">
+    <div data-role="header">
+        <h1>Avvertimento</h1>
+    </div>
+    <div role="main" class="ui-content">
+        <p id="messaggio" style="text-align: center;font-style: italic;">
+        </p>
+        <p style="text-align: center;">
+            <a href="" class="ui-btn ui-corner-all ui-shadow ui-btn-inline ui-icon-check" data-rel="back">Ok</a>
+        </p>
+    </div>
 </div>
\ No newline at end of file
diff --git a/js/router.js b/js/router.js
index 06f40c0..a82913a 100644
--- a/js/router.js
+++ b/js/router.js
@@ -2,7 +2,7 @@ define(['jquery', 'underscore', 'backbone',
     'modules/home/home', 'modules/faq/faq', 'modules/index/index', 'modules/category/category', 'modules/item/item',
     'modules/about/about', 'modules/search/search', 'modules/search/found', 'modules/more/more', 'modules/note/note',
     'modules/sync/sync', 'modules/converter/converter', 'modules/donation/donation', 'modules/settings/settings',
-    'modules/debug/debug',
+    'modules/debug/debug','modules/maps/maps',
     'model/note/noteCollection', 'model/category/categoryCollection', 'model/categoryItem/categoryItemCollection',
     'model/item/itemCollection', 'model/item/ingredientiCollection', 'model/categoryItem/foundItemCollection',
     'classes/cache', 'libs/fastclick',
@@ -11,7 +11,7 @@ define(['jquery', 'underscore', 'backbone',
                 HomeView, FaqView, IndexView, CategoryView, ItemView,
                 AboutView, SearchView, FoundView, MoreView, NoteView,
                 SyncView, ConverterView, DonationView, SettingsView,
-                DebugView,
+                DebugView, MapsView,
                 NoteCollection, CategoryCollection, CategoryItemCollection,
                 ItemCollection, IngredientiCollection, FoundItemCollection,
                 Cache, FastClick) {
@@ -53,6 +53,7 @@ define(['jquery', 'underscore', 'backbone',
                     'syncView(/)*founded': 'showSync',
                     'noteView': 'showNote',
                     'searchView': 'showSearch',
+                    'mapsView': 'showMaps',
                     'debugView': 'showDebug',
                     'settingsView': 'showSettings',
                     'donationView': 'showDonation',
@@ -163,6 +164,11 @@ define(['jquery', 'underscore', 'backbone',
                     debugView.render();
                     this.changePage(debugView);
                 },
+                showMaps: function(){
+                    var mapsView = new MapsView();
+                    mapsView.render();
+                    this.changePage(mapsView);
+                },
                 showSearch: function () {
                     var categories = new CategoryCollection();
                     // will render home view and navigate to homeView