git-svn-id: https://msi/svn/firstRepo/WebClient/branches/Manut_3.0.1@71 0f545695-f87b-41b6-9a03-7f16563b5454

js/manifest.js

@@ -1,7 +1,7 @@
 var myManifest = {
     Debug: (window.location.port !== ""),
     Name: "Il Lievitario",
-    Version: "3.0.2.0",
+    Version: "3.0.3.0",
     Author: "Denis Ironi",
     Settings: {
         DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"),

js/model/authors/authorCollection.js

@@ -1,15 +0,0 @@
-define(['app', 'jquery', 'underscore', 'backbone', 'model/authors/authorModel'],
-        function (app, $, _, Backbone, Author) {
-
-            var Authors = Backbone.Collection.extend({
-                // Book is the model of the collection
-                model: Author,
-                url: function () {
-                    return myManifest.Settings.DefaultURL + "/api/ricette/authors";
-                }                
-            });
-
-            return Authors;
-        });
-
-

js/model/authors/authorModel.js

@@ -1,13 +0,0 @@
-define(['jquery', 'underscore', 'backbone'],
-function ($, _, Backbone){
-
-	var Author=Backbone.Model.extend({
-    //default attributes 
-		defaults:{
-			name:''
-		}
-	});
-
-	return Author;
-});
-

js/model/categoryItem/foundItemCollection.js

@@ -10,7 +10,8 @@ define(['app', 'jquery', 'underscore', 'backbone', 'model/categoryItem/searchIte
                 this.dataFilter = {
                     titolo: options.titolo,
                     difficolta: options.difficolta,
-                    categoryId: options.categoryId
+                    categoryId: options.categoryId,
+                    autore: options.autore
                 };
                 this.numItems = options.nResult;
                 this.indexItems = options.indexItems;
@@ -32,7 +33,7 @@ define(['app', 'jquery', 'underscore', 'backbone', 'model/categoryItem/searchIte
                         this.numItems + 
                         "/" + this.indexItems + 
                         "/" + this.dataFilter.categoryId +
-                        "/"  + this.dataFilter.difficolta;
+                        "/"  + this.dataFilter.difficolta+ "/"  + this.dataFilter.autore;
                 if(this.dataFilter.titolo !== null)                    
                         u += "/" + this.dataFilter.titolo;
                 

js/modules/search/foundItemTemplate.html

@@ -2,7 +2,31 @@
 <h1>Nessuna ricetta trovata</h1>
 <%} 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">
+<li><a href="#ricetta/<%= item.ricetta_id%>" class="ui-btn ui-btn-icon-right ui-icon-carat-r ui-li-has-thumb">
-        <div class='ricettaTitolo'><%= unescape(item.titolo) %> - <%= unescape(item.categoria_name) %></div><div class='ricettaAutore'><%= unescape(item.autore) %></div>
+	<% if(item.firstImage === ""){ %>
-    </a></li>
+		<!--<img class="thmbImg emptyItemList">-->
+	<%}else{%>
+		<!--<img class="thmbImg" src='<%=data.images.getThumb(item.firstImage)%>'>-->
+	<%}%>
+    <div class='ricettaTitolo'><%= unescape(item.titolo) %></div>
+    <div class='ricettaAutore'><%= unescape(item.autore) %></div>
+    <br><div class='ricettaAutore'>Diff.:&nbsp;&nbsp;</div>
+	<div id="valutazione">
+		<div role="text" data-role="none" aria-label="Molto Semplice" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=1){%>star-rating-on<%}%>">
+			<div data-role="none" title="Molto Semplice">1</div>
+		</div>
+		<div data-role="none" role="text" aria-label="Semplice" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=2){%>star-rating-on<%}%>">
+			<div data-role="none" title="Semplice">2</div>
+		</div>
+		<div data-role="none" role="text" aria-label="Normale" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=3){%>star-rating-on<%}%>">
+			<div data-role="none" title="Normale">3</div>
+		</div>
+		<div data-role="none" role="text" aria-label="Difficile" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=4){%>star-rating-on<%}%>">
+			<div data-role="none" title="Difficile">4</div>
+		</div>
+		<div data-role="none" role="text" aria-label="Molto Difficile" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=5){%>star-rating-on<%}%>">
+			<div data-role="none" title="Molto Difficile">5</div>
+		</div>
+	</div>
+</a></li>
 <% }} %>

js/modules/search/search.js

@@ -9,9 +9,6 @@ define(['jquery', 'underscore', 'backbone','text!modules/search/searchViewTempla
                 this.id = "SearchView";
                 var self = this;
                 SearchView.__super__.initialize.call(this);
-                this.collection = options.collection;
-                this.collection.fetch({ success: function () { self.render(); } });
-                //this.header.title = "pippo";
             },
 
             events: {
@@ -21,6 +18,7 @@ define(['jquery', 'underscore', 'backbone','text!modules/search/searchViewTempla
             performSearch: function (e) {
                 e.preventDefault();
                 var titolo = $('#titolo').val();
+                var autore = $('#autore').val();
                 var categoria = $('#categoria').val();
                 var nResult = $('#nResult').val();
                 var diffi = $('#difficoltaFrm').serialize();
@@ -28,7 +26,10 @@ define(['jquery', 'underscore', 'backbone','text!modules/search/searchViewTempla
                 if (diffi === "") {
                     diffi = "0";
                 }
-                Backbone.history.navigate('search/' + nResult + "/"+ categoria + "/" + diffi + "/" + titolo, { trigger: true });
+                if (autore === "" || autore == undefined) {
+                    autore = "_";
+                }
+                Backbone.history.navigate('search/' + nResult + "/"+ categoria + "/" + diffi + "/" + autore + "/"+titolo, { trigger: true });
             },
 			
 			onShowed: function(){

js/modules/search/searchViewTemplate.html

@@ -30,15 +30,9 @@
             <option value="25">25</option>
             <option value="50">50</option>
             <option value="100">100</option>
-        </select>
+        </select>        
-        <!--
+        <label for="autore">Autore:</label>
-        <label for="author">Autore:</label>
+        <input type="text" name="autore" id="autore" placeholder="Autore..." value="" data-clear-btn="true" ><br>
-        <select name="author" id="author" >
-            <% for (var i = 0; i < data.length; i++) { %>
-            <% var item = unescape(data[i].autore); %>
-            <option value="<%=item%>"><%=item%></option>
-            <%}%>
-        </select>-->
         <br><br>
         <center><a href="" id="search" button="true" class="ui-btn ui-corner-all">Cerca</a></center>
 </div>

js/router.js

@@ -4,7 +4,7 @@ define(['jquery', 'underscore', 'backbone',
     'modules/sync/sync', 'modules/donation/donation','modules/settings/settings',
     'modules/debug/debug','modules/maps/maps',
     'model/note/noteCollection', 'model/category/categoryCollection', 'model/categoryItem/categoryItemCollection',
-    'model/item/itemCollection', 'model/item/ingredientiCollection', 'model/categoryItem/foundItemCollection','model/authors/authorCollection',
+    'model/item/itemCollection', 'model/item/ingredientiCollection', 'model/categoryItem/foundItemCollection',
     'classes/cache', 'libs/fastclick',
     'jqm', 'jQueryPlugins'],
         function ($, _, Backbone,
@@ -13,7 +13,7 @@ define(['jquery', 'underscore', 'backbone',
              SyncView, DonationView, SettingsView,
                 DebugView, MapsView,
                 NoteCollection, CategoryCollection, CategoryItemCollection,
-                ItemCollection, IngredientiCollection, FoundItemCollection, AuthorCollection,
+                ItemCollection, IngredientiCollection, FoundItemCollection,
                 Cache, FastClick) {
 
             'use strict';
@@ -57,7 +57,7 @@ define(['jquery', 'underscore', 'backbone',
                     'debugView': 'showDebug',
                     'settingsView': 'showSettings',
                     'donationView': 'showDonation',
-                    'search/:nresult/:categoria/:difficolta/*titolo': 'searchFn',
+                    'search/:nresult/:categoria/:difficolta/:autore/*titolo': 'searchFn',
                     'converterView': 'showConverter',
                     'moreView': 'showMore',
                     '*actions': 'defaultAction' //default action        
@@ -172,14 +172,13 @@ define(['jquery', 'underscore', 'backbone',
                     this.changePage(mapsView);
                 },
                 showSearch: function () {
-                    var authors = new AuthorCollection();
                     // will render home view and navigate to homeView
-                    var searchView = new SearchView({collection: authors});
+                    var searchView = new SearchView();
-                    //indexView.render();
+                    indexView.render();
                     searchView.bind('renderCompleted:Search', this.changePage, this);
                 },
-                searchFn: function (nresult, categoria, difficolta, titolo) {
+                searchFn: function (nresult, categoria, difficolta, autore, titolo) {
-                    var foundedItems = new FoundItemCollection({categoryId: categoria, difficolta: difficolta, titolo: titolo, nResult: nresult, indexItems: 0});
+                    var foundedItems = new FoundItemCollection({categoryId: categoria, difficolta: difficolta, titolo: titolo, autore: autore, nResult: nresult, indexItems: 0});
                     var foundView = new FoundView({collection: foundedItems});
 
                     foundView.render();