diff --git a/index.php b/index.php index 1bb5e89..0a9ea3f 100644 --- a/index.php +++ b/index.php @@ -33,7 +33,7 @@ - + diff --git a/js/classes/images.js b/js/classes/images.js deleted file mode 100644 index 01bff36..0000000 --- a/js/classes/images.js +++ /dev/null @@ -1,14 +0,0 @@ - /* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ - -define(['jquery', 'backbone'], - function ($, Backbone) { - - var Images = { - }; - - return Images; - }); \ No newline at end of file diff --git a/js/manifest.js b/js/manifest.js index 2f24286..4e08b2e 100644 --- a/js/manifest.js +++ b/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.2", 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/model/authors/authorCollection.js b/js/model/authors/authorCollection.js deleted file mode 100644 index cedf22f..0000000 --- a/js/model/authors/authorCollection.js +++ /dev/null @@ -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; - }); - - diff --git a/js/model/authors/authorModel.js b/js/model/authors/authorModel.js deleted file mode 100644 index ec82911..0000000 --- a/js/model/authors/authorModel.js +++ /dev/null @@ -1,13 +0,0 @@ -define(['jquery', 'underscore', 'backbone'], -function ($, _, Backbone){ - - var Author=Backbone.Model.extend({ - //default attributes - defaults:{ - name:'' - } - }); - - return Author; -}); - diff --git a/js/model/categoryItem/categoryItemModel.js b/js/model/categoryItem/categoryItemModel.js index 8a63cfd..d713af2 100644 --- a/js/model/categoryItem/categoryItemModel.js +++ b/js/model/categoryItem/categoryItemModel.js @@ -7,6 +7,7 @@ function ($, _, Backbone){ ricetta_id: "", titolo: '', autore: '', + firstImage: "", valutazione: 0, difficolta: 0, categoria_name: 0 diff --git a/js/model/categoryItem/foundItemCollection.js b/js/model/categoryItem/foundItemCollection.js index 9fdc836..d8f9a36 100644 --- a/js/model/categoryItem/foundItemCollection.js +++ b/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; diff --git a/js/model/categoryItem/searchItemModel.js b/js/model/categoryItem/searchItemModel.js index f11544d..2279d48 100644 --- a/js/model/categoryItem/searchItemModel.js +++ b/js/model/categoryItem/searchItemModel.js @@ -7,6 +7,7 @@ function ($, _, Backbone){ ricetta_id: "", titolo: '', autore: '', + firstImage: "", valutazione: 0, difficolta: 0, categoria_name: 0 diff --git a/js/modules/category/category.js b/js/modules/category/category.js index 4e6624e..263b17f 100644 --- a/js/modules/category/category.js +++ b/js/modules/category/category.js @@ -1,6 +1,6 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/category/categoryViewTemplate.html', - 'text!modules/category/categoryItemTemplate.html', 'modules/base/baseView', 'libs/fastclick', 'classes/debug', 'classes/images'], - function ($, _, Backbone, categoryViewTemplate, categoryItemTemplate, BaseView, FastClick, Debug, Images) { + 'text!modules/category/categoryItemTemplate.html', 'modules/base/baseView', 'libs/fastclick', 'classes/debug'], + function ($, _, Backbone, categoryViewTemplate, categoryItemTemplate, BaseView, FastClick, Debug) { var CategoryView = BaseView.extend({ collection: null, diff --git a/js/modules/item/item.js b/js/modules/item/item.js index 382e178..96f68a2 100644 --- a/js/modules/item/item.js +++ b/js/modules/item/item.js @@ -1,5 +1,5 @@ -define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.html', 'modules/base/baseView', 'classes/profile', 'classes/images', 'jQueryPlugins'], - function ($, _, Backbone, itemViewTemplate, BaseView, Profile, Images) { +define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.html', 'modules/base/baseView', 'classes/profile', 'jQueryPlugins'], + function ($, _, Backbone, itemViewTemplate, BaseView, Profile) { var ItemView = BaseView.extend({ collRicetta: null, @@ -95,7 +95,6 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate. ricetta: ric, ingredienti: self.collIngredienti.toJSON(), profile: Profile, - images: Images, })); self.scrollPositions = []; diff --git a/js/modules/search/foundItemTemplate.html b/js/modules/search/foundItemTemplate.html index 38d13df..9cca852 100644 --- a/js/modules/search/foundItemTemplate.html +++ b/js/modules/search/foundItemTemplate.html @@ -2,7 +2,31 @@

Nessuna ricetta trovata

<%} else { for (var i = 0; i < data.length; i++) { %> <% var item = data[i]; %> -
  • -
    <%= unescape(item.titolo) %> - <%= unescape(item.categoria_name) %>
    <%= unescape(item.autore) %>
    -
    • +
  • + <% if(item.firstImage === ""){ %> + + <%}else{%> + + <%}%> +
    <%= unescape(item.titolo)%> - <%= unescape(item.categoria_name)%>
    +
    <%= unescape(item.autore) %>
    +
    Diff.:  
    +
    +
    +
    1
    +
    +
    +
    2
    +
    +
    +
    3
    +
    +
    +
    4
    +
    +
    +
    5
    +
    +
    +
    • <% }} %> \ No newline at end of file diff --git a/js/modules/search/search.js b/js/modules/search/search.js index bb53d1d..03e339e 100644 --- a/js/modules/search/search.js +++ b/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(){ @@ -59,7 +60,7 @@ define(['jquery', 'underscore', 'backbone','text!modules/search/searchViewTempla { SearchView.__super__.render.call(this); this.$el.append(this.header.$el); - this.$el.append(this.template({data:this.collection.toJSON()})); + this.$el.append(this.template()); this.$el.append(this.footer.$el); } this.$el.find('#nResult').val(Profile.data.risRic); diff --git a/js/modules/search/searchViewTemplate.html b/js/modules/search/searchViewTemplate.html index ffa1e31..854958e 100644 --- a/js/modules/search/searchViewTemplate.html +++ b/js/modules/search/searchViewTemplate.html @@ -30,15 +30,9 @@ - - + + +


    Cerca
    \ No newline at end of file diff --git a/js/router.js b/js/router.js index 5dff439..95c5034 100644 --- a/js/router.js +++ b/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,12 @@ 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}); - //indexView.render(); - searchView.bind('renderCompleted:Search', this.changePage, this); + var searchView = new SearchView(); + searchView.render(); + this.changePage(searchView); }, - searchFn: function (nresult, categoria, difficolta, titolo) { - var foundedItems = new FoundItemCollection({categoryId: categoria, difficolta: difficolta, titolo: titolo, nResult: nresult, indexItems: 0}); + searchFn: function (nresult, categoria, difficolta, autore, titolo) { + var foundedItems = new FoundItemCollection({categoryId: categoria, difficolta: difficolta, titolo: titolo, autore: autore, nResult: nresult, indexItems: 0}); var foundView = new FoundView({collection: foundedItems}); foundView.render();