git-svn-id: https://msi/svn/firstRepo/Management/trunk@26 0f545695-f87b-41b6-9a03-7f16563b5454

.htaccess

@@ -15,15 +15,15 @@ AddOutputFilterByType DEFLATE text/css application/x-javascript text/html text/r
 <ifModule mod_rewrite.c>
     RewriteEngine On
     RewriteRule ^index.html$ index.php [L]
-    RewriteRule ^js/libs/(.*)\.[0-9]+\.js$ /NewManagement/js/libs/$1.js [L]
+    RewriteRule ^js/libs/(.*)\.[0-9]+\.js$ /ManagementClient/js/libs/$1.js [L]
-    RewriteRule ^js/libs/jqwidgets/(.*)\.[0-9]+\.js$ /NewManagement/js/libs/jqwidgets/$1.js [L]
+    RewriteRule ^js/libs/jqwidgets/(.*)\.[0-9]+\.js$ /ManagementClient/js/libs/jqwidgets/$1.js [L]
-    RewriteRule ^js/(.*)\.[0-9]+\.js$ /NewManagement/js/$1.js [L]
+    RewriteRule ^js/(.*)\.[0-9]+\.js$ /ManagementClient/js/$1.js [L]
-    RewriteRule ^js/libs/jqwidgets/styles/images/(.*)\.[0-9]+\.png$ /NewManagement/js/libs/jqwidgets/styles/images/$1.png [L]
+    RewriteRule ^js/libs/jqwidgets/styles/images/(.*)\.[0-9]+\.png$ /ManagementClient/js/libs/jqwidgets/styles/images/$1.png [L]
-    RewriteRule ^js/libs/jqwidgets/styles/(.*)\.[0-9]+\.css$ /NewManagement/js/libs/jqwidgets/styles/$1.css [L]
+    RewriteRule ^js/libs/jqwidgets/styles/(.*)\.[0-9]+\.css$ /ManagementClient/js/libs/jqwidgets/styles/$1.css [L]
-    RewriteRule ^css/(.*)\.[0-9]+\.css$ /NewManagement/css/$1.css [L]
+    RewriteRule ^css/(.*)\.[0-9]+\.css$ /ManagementClient/css/$1.css [L]
-    RewriteRule ^Resources/img/(.*)\.[0-9]+\.png$ /NewManagement/Resources/img/$1.png [L]
+    RewriteRule ^Resources/img/(.*)\.[0-9]+\.png$ /ManagementClient/Resources/img/$1.png [L]
-    RewriteRule ^Resources/img/(.*)\.[0-9]+\.gif$ /NewManagement/Resources/img/$1.gif [L]
+    RewriteRule ^Resources/img/(.*)\.[0-9]+\.gif$ /ManagementClient/Resources/img/$1.gif [L]
-    RewriteRule ^Resources/icons/(.*)\.[0-9]+\.png$ /NewManagement/Resources/icons/$1.png [L]
+    RewriteRule ^Resources/icons/(.*)\.[0-9]+\.png$ /ManagementClient/Resources/icons/$1.png [L]
 </ifModule>
 
 <ifModule mod_headers.c>

js/libs/jqwidgets/jqxdockpanel.js

@@ -1,7 +1,7 @@
 /*
-jQWidgets v3.5.0 (2014-Sep-15)
+jQWidgets v3.6.0 (2014-Nov-25)
 Copyright (c) 2011-2014 jQWidgets.
 License: http://jqwidgets.com/license/
 */
 
-(function(a){a.jqx.jqxWidget("jqxDockPanel","",{});a.extend(a.jqx._jqxDockPanel.prototype,{defineInstance:function(){this.width=null;this.height=null;this.lastchildfill=true;this.disabled=false;this.events=["layout"]},createInstance:function(c){var b=this;this.host.addClass(this.toThemeProperty("jqx-dockpanel"));this.host.addClass(this.toThemeProperty("jqx-rc-all"));this.childrenCount=a(this.host).children().length;this.host.wrapInner('<div style="overflow: hidden; width: 100%; height: 100%;" class="innerContainer"></div>');this.$wrapper=this.host.find(".innerContainer");this.$wrapper.css("position","relative");this.sizeCache=new Array();this.performLayout();a.jqx.utilities.resize(this.host,function(){b.refresh()})},render:function(){if(this.width!=null&&this.width.toString().indexOf("px")!=-1){this.host.width(this.width)}else{if(this.width!=undefined&&!isNaN(this.width)){this.host.width(this.width)}}if(this.height!=null&&this.height.toString().indexOf("px")!=-1){this.host.height(this.height)}else{if(this.height!=undefined&&!isNaN(this.height)){this.host.height(this.height)}}this.sizeCache=new Array();this.performLayout()},resize:function(c,b){this.width=c;this.height=b;this.render()},performLayout:function(){if(this.disabled){return}var e=this.childrenCount;var d=0;var c=0;var b=0;var h=0;var f=this;var g={width:this.host.width(),height:this.host.height()};if(this.sizeCache.length<this.$wrapper.children().length){a.each(this.$wrapper.children(),function(i){var k=a(this);k.css("position","absolute");var j={width:k.css("width"),height:k.css("height")};f.sizeCache[i]=j})}a.each(this.$wrapper.children(),function(j){var l=this.getAttribute("dock");if(l==undefined){l="left"}if(j==e-1&&f.lastchildfill){l="fill"}var k=a(this);k.css("position","absolute");k.css("width",f.sizeCache[j].width);k.css("height",f.sizeCache[j].height);var i={width:k.outerWidth(),height:k.outerHeight()};var m={x:b,y:h,width:Math.max(0,g.width-(b+d)),height:Math.max(0,g.height-(h+c))};if(j<e){switch(l){case"left":b+=i.width;m.width=i.width;break;case"top":h+=i.height;m.height=i.height;break;case"right":d+=i.width;m.x=Math.max(0,(g.width-d));m.width=i.width;break;case"bottom":c+=i.height;m.y=Math.max(0,(g.height-c));m.height=i.height;break}}k.css("left",m.x);k.css("top",m.y);k.css("width",m.width);k.css("height",m.height)});this._raiseevent(0)},destroy:function(){a.jqx.utilities.resize(this.host,null,true);this.host.remove()},_raiseevent:function(g,d,f){if(this.isInitialized!=undefined&&this.isInitialized==true){var c=this.events[g];var e=new a.Event(c);e.previousValue=d;e.currentValue=f;e.owner=this;var b=this.host.trigger(e);return b}},propertyChangedHandler:function(c,d,b,e){if(!this.isInitialized){return}c.render()},refresh:function(){this.render()}})})(jqxBaseFramework);
+(function(a){a.jqx.jqxWidget("jqxDockPanel","",{});a.extend(a.jqx._jqxDockPanel.prototype,{defineInstance:function(){var b={width:null,height:null,lastchildfill:true,disabled:false,events:["layout"]};a.extend(true,this,b);return b},createInstance:function(c){var b=this;this.host.addClass(this.toThemeProperty("jqx-dockpanel"));this.host.addClass(this.toThemeProperty("jqx-rc-all"));this.childrenCount=a(this.host).children().length;this.host.wrapInner('<div style="overflow: hidden; width: 100%; height: 100%;" class="innerContainer"></div>');this.$wrapper=this.host.find(".innerContainer");this.$wrapper.css("position","relative");this.sizeCache=new Array();this.performLayout();a.jqx.utilities.resize(this.host,function(){b.refresh()})},render:function(){if(this.width!=null&&this.width.toString().indexOf("px")!=-1){this.host.width(this.width)}else{if(this.width!=undefined&&!isNaN(this.width)){this.host.width(this.width)}}if(this.height!=null&&this.height.toString().indexOf("px")!=-1){this.host.height(this.height)}else{if(this.height!=undefined&&!isNaN(this.height)){this.host.height(this.height)}}this.sizeCache=new Array();this.performLayout()},resize:function(c,b){this.width=c;this.height=b;this.render()},performLayout:function(){if(this.disabled){return}var e=this.childrenCount;var d=0;var c=0;var b=0;var h=0;var f=this;var g={width:this.host.width(),height:this.host.height()};if(this.sizeCache.length<this.$wrapper.children().length){a.each(this.$wrapper.children(),function(i){var k=a(this);k.css("position","absolute");var j={width:k.css("width"),height:k.css("height")};f.sizeCache[i]=j})}a.each(this.$wrapper.children(),function(j){var l=this.getAttribute("dock");if(l==undefined){l="left"}if(j==e-1&&f.lastchildfill){l="fill"}var k=a(this);k.css("position","absolute");k.css("width",f.sizeCache[j].width);k.css("height",f.sizeCache[j].height);var i={width:k.outerWidth(),height:k.outerHeight()};var m={x:b,y:h,width:Math.max(0,g.width-(b+d)),height:Math.max(0,g.height-(h+c))};if(j<e){switch(l){case"left":b+=i.width;m.width=i.width;break;case"top":h+=i.height;m.height=i.height;break;case"right":d+=i.width;m.x=Math.max(0,(g.width-d));m.width=i.width;break;case"bottom":c+=i.height;m.y=Math.max(0,(g.height-c));m.height=i.height;break}}k.css("left",m.x);k.css("top",m.y);k.css("width",m.width);k.css("height",m.height)});this._raiseevent(0)},destroy:function(){a.jqx.utilities.resize(this.host,null,true);this.host.remove()},_raiseevent:function(g,d,f){if(this.isInitialized!=undefined&&this.isInitialized==true){var c=this.events[g];var e=new a.Event(c);e.previousValue=d;e.currentValue=f;e.owner=this;var b=this.host.trigger(e);return b}},propertyChangedHandler:function(c,d,b,e){if(!this.isInitialized){return}c.render()},refresh:function(){this.render()}})})(jqxBaseFramework);

js/libs/jqwidgets/jqxgrid.aggregates.js

@@ -1,5 +1,5 @@
 /*
-jQWidgets v3.5.0 (2014-Sep-15)
+jQWidgets v3.6.0 (2014-Nov-25)
 Copyright (c) 2011-2014 jQWidgets.
 License: http://jqwidgets.com/license/
 */

js/libs/jqwidgets/jqxgrid.columnsreorder.js

@@ -1,5 +1,5 @@
 /*
-jQWidgets v3.5.0 (2014-Sep-15)
+jQWidgets v3.6.0 (2014-Nov-25)
 Copyright (c) 2011-2014 jQWidgets.
 License: http://jqwidgets.com/license/
 */

js/libs/jqwidgets/jqxgrid.pager.js

@@ -1,5 +1,5 @@
 /*
-jQWidgets v3.5.0 (2014-Sep-15)
+jQWidgets v3.6.0 (2014-Nov-25)
 Copyright (c) 2011-2014 jQWidgets.
 License: http://jqwidgets.com/license/
 */

js/libs/jqwidgets/jqxgrid.sort.js

@@ -1,5 +1,5 @@
 /*
-jQWidgets v3.5.0 (2014-Sep-15)
+jQWidgets v3.6.0 (2014-Nov-25)
 Copyright (c) 2011-2014 jQWidgets.
 License: http://jqwidgets.com/license/
 */

js/libs/jqwidgets/jqxgrid.storage.js

@@ -1,5 +1,5 @@
 /*
-jQWidgets v3.5.0 (2014-Sep-15)
+jQWidgets v3.6.0 (2014-Nov-25)
 Copyright (c) 2011-2014 jQWidgets.
 License: http://jqwidgets.com/license/
 */

js/libs/jqwidgets/jqxresponse.js

@@ -1,5 +1,5 @@
 /*
-jQWidgets v3.5.0 (2014-Sep-15)
+jQWidgets v3.6.0 (2014-Nov-25)
 Copyright (c) 2011-2014 jQWidgets.
 License: http://jqwidgets.com/license/
 */

js/libs/jqwidgets/jqxtouch.js

@@ -1,5 +1,5 @@
 /*
-jQWidgets v3.5.0 (2014-Sep-15)
+jQWidgets v3.6.0 (2014-Nov-25)
 Copyright (c) 2011-2014 jQWidgets.
 License: http://jqwidgets.com/license/
 */

js/libs/jqwidgets/styles/jqx.base.css

@@ -130,6 +130,7 @@
     user-select: none;
     -ms-user-select:none;
     -webkit-touch-callout:none;
+    -webkit-tap-highlight-color: rgba(0,0,0,0);
 }
 .jqx-enableselect {
     -webkit-user-select: text;
@@ -562,7 +563,7 @@ button.jqx-button, input[type=button].jqx-button,  input[type=submit].jqx-button
 .jqx-widget .jqx-grid-cleared-cell, .jqx-grid-cleared-cell {
     border: transparent !important;
 }
-.jqx-grid-cell-wrap {white-space: normal;}
+.jqx-grid-cell-wrap {white-space: normal !important;}
 
 .jqx-tree-grid-indent {
     width: 14px;

js/libs/jqwidgets/styles/jqx.ui-redmond.css

@@ -143,7 +143,7 @@ font-weight: bold;
 .jqx-expander-header-ui-redmond{font-weight: bold; margin-top:2px}
 .jqx-expander-header-ui-redmond{background: #dfeffc url(images/redmond/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; color: #2e6e9e; border:1px solid #c5dbec; border-radius:5px !important; moz-border-radius:5px !important; webkit-border-radius:5px !important}
 .jqx-expander-header-hover-ui-redmond{background: #d0e5f5 url(images/redmond/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x; color: #1d5987; border:1px solid #79b7e7;}
-.jqx-expander-header-expanded-ui-redmond{color: #e17009; background:#f5f8f9; border:1px solid #a6c9e2; border-bottom-width:0px; border-top-left-radius:5px !important; border-top-right-radius:5px !important; moz-border-radius-topleft:5px !important; moz-border-radius-topright:5px !important; webkit-border-top-left-radius:5px !important; webkit-border-top-right-radius:5px !important; border-bottom-left-radius:0px !important; border-bottom-right-radius:0px !important; moz-border-radius-bottomleft:0px !important; moz-border-radius-bottomright:0px !important; webkit-border-bottom-left-radius:0px !important; webkit-border-bottom-right-radius:0px !important;  margin-bottom:0px}
+.jqx-expander-header-expanded-ui-redmond{color: #e17009; background:#f5f8f9 url(images/redmond/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; border:1px solid #a6c9e2; border-bottom-width:0px; border-top-left-radius:5px !important; border-top-right-radius:5px !important; moz-border-radius-topleft:5px !important; moz-border-radius-topright:5px !important; webkit-border-top-left-radius:5px !important; webkit-border-top-right-radius:5px !important; border-bottom-left-radius:0px !important; border-bottom-right-radius:0px !important; moz-border-radius-bottomleft:0px !important; moz-border-radius-bottomright:0px !important; webkit-border-bottom-left-radius:0px !important; webkit-border-bottom-right-radius:0px !important;  margin-bottom:0px}
 .jqx-expander-content-bottom-ui-redmond{border-color: #a6c9e2; border-bottom-left-radius:5px !important; border-bottom-right-radius:5px !important; moz-border-radius-bottomleft:5px !important; moz-border-radius-bottomright:5px !important; webkit-border-bottom-left-radius:5px !important; webkit-border-bottom-right-radius:5px !important; border-top-width:0px !important}
 .jqx-expander-arrow-top-ui-redmond{position: relative; width: 16px; height: 16px; background-position:-65px -16px; background-image:url(images/redmond/ui-icons_6da8d5_256x240.png)}
 .jqx-expander-arrow-bottom-ui-redmond{position: relative; width: 16px; height: 16px;  background-position:0 -16px; background-image:url(images/redmond/ui-icons_6da8d5_256x240.png)}

js/manifest.js

@@ -1,10 +1,10 @@
 var myManifest = {
     Debug: false,
     Name: "Il Management",
-    Version: "0.1.2",
+    Version: "0.1.7",
     Author: "Denis Ironi",
     Settings: {
-        //DefaultURL: "http://localhost:8081/Service",
+        //DefaultURL: "http://localhost:8081/Service_Manut",
         DefaultURL: "http://management.gruppolapastamadre.it/Service",
         JQueryVersion: "1.11.1",
         Device:{

js/modules/editricetta/editricetta.js

@@ -116,7 +116,36 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/editricetta/editricett
                                                     valueMember: "category_id"
                                                 });                                        
                                         $("#titolo").jqxInput({placeHolder: "Titolo:", width: '350px', height: 25});
-                                        $("#autore").jqxInput({placeHolder: "Autore:", width: '350px', height: 25});
+                                        $("#autore").jqxInput({
+                                            placeHolder: "Autore:", width: '350px', height: 25,
+                                            source: function (query, response) {
+                                                var dataAdapter = new $.jqx.dataAdapter
+                                                (
+                                                    {
+                                                        datatype: "jsonp",
+                                                        datafields: [
+                                                            {name: 'autore'}
+                                                        ],
+                                                        url: myManifest.Settings.DefaultURL + "/api/ricette/authors/" + query,
+                                                        data: {
+                                                        }
+                                                    },
+                                                    {
+                                                        autoBind: true,
+                                                        loadComplete: function (data) {
+                                                            if (data.length > 0) {
+                                                                response($.map(data, function (item) {
+                                                                    return {
+                                                                        label: item.autore,
+                                                                        value: item.autore
+                                                                    };
+                                                                }));
+                                                            }
+                                                        }
+                                                    }
+                                                );
+                                            }
+                                        });
                                         $("#lvlDiff").jqxRating({width: 350, height: 35, theme: 'classic'});
                                         $("#linkFonte").jqxInput({placeHolder: "Link Fonte:", width: '350px', height: 25});
                                         $("#linkYouTube").jqxInput({placeHolder: "Link Youtube:", width: '350px', height: 25});
@@ -194,11 +223,11 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/editricetta/editricett
                                                     var div = '';
                                                     if (datarecord.id_tipo_ingredienti === "22")
                                                     {
-                                                        div = '<div><b>' + datarecord.nome_ingrediente + '</b>: <i>' + datarecord.note + '</i></div>';
+                                                        div = '<div><b>' + datarecord.nome_ingrediente + '</b>: <i>' + unescape(datarecord.note) + '</i></div>';
                                                     }
                                                     else
                                                     {
-                                                        div = '<div><b>' + datarecord.nome_ingrediente + '</b>: ' + datarecord.quantita + ' ' + datarecord.unita + ' <i>' + datarecord.note + '</i></div>';
+                                                        div = '<div><b>' + datarecord.nome_ingrediente + '</b>: ' + datarecord.quantita + ' ' + datarecord.unita + ' <i>' + unescape(datarecord.note) + '</i></div>';
                                                     }
                                                     return div;
                                                 }
@@ -273,7 +302,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/editricetta/editricett
                                             "ingrediente_id": val.id_tipo_ingredienti,
                                             "quantita": val.quantita,
                                             "tipo_quantita_id": val.id_tipo_quantita,
-                                            "note": val.note
+                                            "note": escape(val.note)
                                         };
                                         sendobj.ingredienti.push(newItem);
                                     });

js/modules/ricette/ricette.js

@@ -88,23 +88,38 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/ricette/ricetteViewTem
                                 filterable: true,
                                 autoshowfiltericon: true,
                                 columns: [
-                                    {text: 'Titolo', dataField: 'titolo', width: "58%",
+                                    {text: 'Titolo', dataField: 'titolo', width: "50%",
                                         cellsrenderer: function(row, columnfield, value, defaulthtml, columnproperties) {
                                             return "<div style='overflow: hidden; text-overflow: ellipsis; padding-bottom: 2px; text-align: left; margin-right: 2px; margin-left: 4px; margin-top: 4px;'>" + unescape(value ) + "</div>";
                                         }
                                     },
-                                    {text: 'Autore', dataField: 'autore', width: "34%",
+                                    {text: 'Autore', dataField: 'autore', width: "30%",
                                         cellsrenderer: function(row, columnfield, value, defaulthtml, columnproperties) {
                                             return "<div style='overflow: hidden; text-overflow: ellipsis; padding-bottom: 2px; text-align: left; margin-right: 2px; margin-left: 4px; margin-top: 4px;'>" + unescape(value ) + "</div>";
                                         }
                                     },
-                                    {text: '', datafield: 'Edit', columntype: 'button', width: '7%',
+                                    {text: '', datafield: 'Edit', columntype: 'button', width: '10%',
                                         cellsrenderer: function() {
-                                            return "Edit";
+                                            return "Modifica";
                                         },
                                         buttonclick: function(row) {
                                             self.openRicetta(row);
                                         }
+                                    },
+                                    {text: '', datafield: 'Del', columntype: 'button', width: '10%',
+                                        cellsrenderer: function() {
+                                            return "Elimina";
+                                        },
+                                        buttonclick: function(row) {
+                                            $.ajax({
+                                                url: myManifest.Settings.DefaultURL + "/backend/ricetta/" + row.id,
+                                                //dataType: "json",
+                                                type: 'DELETE'
+                                            }).then(function (response) {
+                                                var msg = response;
+                                                alert(msg.message);
+                                            });
+                                        }
                                     }
                                 ]
                             });

nbproject/private/private.xml

@@ -16,6 +16,8 @@
         </file>
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/E:/Sviluppo/IlLievitario/NewManagment/js/modules/editricetta/editricetta.js</file>
+        </group>
     </open-files>
 </project-private>