From 13a350cf9a2820582c7fb808040633efe26ae401 Mon Sep 17 00:00:00 2001 From: hexstudy Date: Mon, 16 May 2016 15:52:37 +0000 Subject: [PATCH] git-svn-id: https://msi/svn/firstRepo/Management/trunk@86 0f545695-f87b-41b6-9a03-7f16563b5454 --- js/manifest.js | 2 +- js/modules/home/home.js | 58 +++++++++++++++++++++++++-- js/modules/home/homeViewTemplate.html | 3 +- js/modules/home/inputWindow.html | 14 +++++++ 4 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 js/modules/home/inputWindow.html diff --git a/js/manifest.js b/js/manifest.js index 2e5cd31..5dfb870 100644 --- a/js/manifest.js +++ b/js/manifest.js @@ -1,7 +1,7 @@ var myManifest = { Debug: (window.location.port !== ""), Name: "Il Management", - Version: "0.3.3.0", + Version: "0.4.0.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/home/home.js b/js/modules/home/home.js index d6560e5..79d74f9 100644 --- a/js/modules/home/home.js +++ b/js/modules/home/home.js @@ -1,13 +1,16 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/home/homeViewTemplate.html', - 'modules/base/baseView', 'modules/ricette/ricette', 'modules/editricetta/editricetta', 'modules/photos/photos', 'modules/statistics/statistics', + 'modules/base/baseView', 'modules/ricette/ricette', 'modules/editricetta/editricetta', 'modules/photos/photos', 'modules/statistics/statistics', + 'modules/editricetta/editricetta', 'text!modules/home/inputWindow.html', 'jqx'], - function($, _, Backbone, homeViewTemplate, BaseView, RicetteView, EditRicettaView, PhotosView, StatisticsView) { + function($, _, Backbone, homeViewTemplate, BaseView, RicetteView, EditRicettaView, PhotosView, StatisticsView, EditRicetta, inputWindowTemplate) { var HomeView = BaseView.extend({ ricetteView: null, statiView: null, + editorRicetta: null, //initialize template template: _.template(homeViewTemplate), + templateInputWindow: _.template(inputWindowTemplate), initialize: function() { HomeView.__super__.initialize.call(this); //this.header.title = "pippo"; @@ -30,6 +33,29 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/home/homeViewTemplate. else this.ricetteView.render(); }, + modifyByIDRicetta: function() { + var self = this; + //e.preventDefault(); + if(this.editorRicetta == null) + { + this.editorRicetta = new EditRicetta(); + this.editorRicetta.render(); + $('body').append(this.editorRicetta.$el); + } + $('#openBtn').off('click'); + $('#openBtn').on('click', function () { + $('#inputWindow').jqxWindow('close'); + self.editorRicetta.openRicetta($('#ricettaId').val()); + }); + $('#cancelButton').off('click'); + $('#cancelButton').on('click', function () { + $('#inputWindow').jqxWindow('close'); + }); + $('#ricettaId').val(""); + $('#inputWindow').jqxWindow('open'); + $('#ricettaId').focus(); + + }, photosView: function(){ var photosView = new PhotosView(); photosView.render(); @@ -58,6 +84,11 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/home/homeViewTemplate. { event.data.scope.modifyRicetta(); } + else if(item[0].id === "modifyByIDRicetta" || + item[0].lastChild.id === "modifyByIDRicetta") + { + event.data.scope.modifyByIDRicetta(); + } else if(item[0].id === "viewPhotos" || item[0].lastChild.id === "viewPhotos") { @@ -73,10 +104,11 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/home/homeViewTemplate. render: function() { //this.header.title = "pippo"; HomeView.__super__.render.call(this); - + var self = this; if ($('#jqxMenu').length === 0) { this.$el.append(this.template()); + this.$el.append(this.templateInputWindow()); this.$el.find("#jqxMenu").jqxMenu({ width: '60%', @@ -84,6 +116,26 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/home/homeViewTemplate. }); this.$el.find('#jqxMenu').on('itemclick', { scope: this }, this.clickMenu); + + var offset = this.$el.offset(); + this.$el.find('#inputWindow').jqxWindow({ width: 400, + height: 110, resizable: false, + cancelButton: $('#cancelButton'), + okButton: $('#openBtn'), + autoOpen: false, + position: { x: offset.left + 50, y: offset.top + 50}, + initContent: function () { + $('#openBtn').jqxButton({ width: '80px' }); + $('#cancelButton').jqxButton({ width: '80px' }); + } + }); + + $('#inputWindow').keypress(function(e){ + if ( e.which == 13 ) { + e.preventDefault(); + $('#openBtn').trigger('click'); + } + }); } //$("#homeBtn").addClass("ui-btn-active"); diff --git a/js/modules/home/homeViewTemplate.html b/js/modules/home/homeViewTemplate.html index 080126f..44ed605 100644 --- a/js/modules/home/homeViewTemplate.html +++ b/js/modules/home/homeViewTemplate.html @@ -3,8 +3,9 @@