evolutility - npm Package Compare versions

Comparing version 1.1.1 to 1.1.2

bower.json

 {
   "name": "evolutility",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "UI which changes form, volume and structure to adapt to your data.",
@@ -5,0 +5,0 @@ "main": [

demo/demo-data.min.js

@@ -1,2 +0,2 @@
-/* evolutility v1.1.1 sample UI-models and data: todo, addressbook, wine cellar. */
+/* evolutility v1.1.2 sample UI-models and data: todo, addressbook, wine cellar. */
  var uiModels=uiModels||{};uiModels.todo_data=[{id:"1",title:"Release Evolutility v1",priority:"3",category:"others",complete:!1,project:["1","2","3"],description:"10 generic views + a ui-modeling language.",notes:""},{id:"2",title:"Fix open bugs",duedate:"2014-07-25",priority:"3",category:"work",project:["1","2"],complete:!1,description:"bla bla"},{id:"3",title:"Testing App",duedate:"2014-06-11",priority:"3",category:"work",complete:!1,project:["1","2","3"],description:"test"},{id:"4",title:"Prepare demo",duedate:"2014-05-12",priority:"1",category:"work",complete:!1,project:["4"],description:"Check this out"},{id:"5",title:"Test latest code",priority:"5",category:"misc",complete:!0,project:["1","2","3"],description:"notes for my test todo task."},{id:"6",title:"Car wash",priority:"4",category:"work",project:["10"],complete:!1},{id:"7",title:"Watch Inception",duedate:"2014-01-10",priority:"5",category:"fun",project:["10"],complete:!0},{id:"8",title:"Test TODO",duedate:"2015-01-01",priority:"1",category:"work",project:["2","3"],complete:!0,description:"Test TODO "},{id:"9",title:"Dentist",priority:"3",category:"home",complete:!0},{id:"10",title:"French translation",priority:"4",category:"work",project:["5"],complete:!0},{id:"11",title:"Italian translation",priority:"4",category:"work",project:["5"]},{id:"12",title:"Chinese translation",priority:"4",category:"work",project:["5"]},{id:"13",title:"Japanese translation",priority:"4",category:"work",project:["5"]},{id:"14",title:"German translation",priority:"4",category:"work",project:["5"]},{id:"15",title:"Russian translation",priority:"4",category:"work",project:["5"]},{id:"16",title:"Polish translation",priority:"4",category:"work",project:["5"]},{id:"17",title:"Klingon translation",priority:"4",category:"work",project:["5"]},{id:"18",title:"Code optimization",duedate:"2015-01-01",priority:"4",category:"work",project:["1","2","4"],complete:!1},{id:"19",title:"Setup demo server",priority:"2",category:"work",complete:!1,project:["4"]},{id:"20",title:"Add sample data",duedate:"2014-04-23",priority:"3",category:"work",project:["1","2","3"],complete:!0},{id:"21",title:"Make proposal",priority:"2",category:"misc",project:["4"],complete:!1},{id:"22",title:"Checkout cool restaurant",priority:"3",category:"fun",project:["4","10"],complete:!1},{id:"23",title:"Kill the vampires",priority:"3",project:["10"],category:"others"}],"object"==typeof module&&"object"==typeof module.exports&&(module.exports=uiModels.todo_data);var uiModels=uiModels||{};uiModels.contact_data=[{id:"1",lastname:"Smallwood",firstname:"Diane",jobtitle:"Director",company:"EasyDoesIt",email:"[e-mail]",phone:"415 234 4323",phonehome:"415 378 3577",phonecell:"415 135 3454",web:"http://EasyDoesIt.com",address1:"12, Liverpool Street",city:"San Francisco",state:"CA",zip:"94123",country:"US",category:"4"},{id:"2",lastname:"Shackleford ",firstname:"Rusty ",email:"[e-mail]",address1:"123 Main Street",city:"Dallas",state:"TX",country:"US",category:"3"},{id:"3",lastname:"Inoue",firstname:"Akemi",jobtitle:"QA Engineer",company:"Testing evol-utility",email:"[e-mail]",phone:"423 233 3523",phonehome:"423 523 4523",address1:"5665 Poplar Street",city:"San Jose",state:"CA",zip:"93112",country:"US",category:"3"},{id:"4",lastname:"Reina Moyano",firstname:"Sergio",jobtitle:"Mr",company:"Innova Creaciones",email:"[e-mail]",phone:"411 444 2222",phonehome:"411 576 4566",phonecell:"411 579 4566",fax:"411 444 2224",address1:"654 Union Street",address2:"#203",city:"San Francisco",state:"CA",zip:"94567",country:"US",category:"3"},{id:"5",lastname:"Paulus",firstname:"Henry",company:"TEST the TEST",phone:"652 491 2345",address1:"1234 That Street",city:"San Mateo",state:"CA",zip:"94401",country:"US",category:"2"},{id:"6",lastname:"Dupond",firstname:"Patrick",jobtitle:"Sales Manager",company:"Au Bon Pain",email:"[e-mail]",phone:"45 456 414 45",web:"http://aubonpain.fr",city:"Paris",state:"",country:"FR",category:"1"},{id:"7",lastname:"Giulieri",firstname:"Olivier",company:"Evolutility",city:"San Mateo",state:"",email:"[e-mail]",web:"http://www.evol-utility.org"},{id:"8",lastname:"Martin",firstname:"Mary",jobtitle:"President",company:"Acme Corp",email:"[e-mail]",phone:"444 580 7007",phonehome:"449 512 0230",phonecell:"589 499 2065",address1:"123 Redville Lane",city:"Musnonville",state:"NH",zip:"03434",category:"1"},{id:"9",lastname:"Munar",firstname:"Roman",jobtitle:"Mr",company:"Informatics",email:"[e-mail]",phone:"322 234 5143",phonehome:"322 784 3453",phonecell:"322 538 2568",fax:"322 234 5345",web:"http://roman.munar.com",address1:"Washington",address2:"Buendia",city:"Makati",state:"",zip:"1300",country:"PH",category:"3"},{id:"10",lastname:"Smith",firstname:"George",company:"Blabla",email:"[e-mail]",web:"http://www.blabla.com",phone:"415 123 1234",phonecell:"415 789 4556",address1:"768 5th Ave",city:"San Francisco",state:"CA",zip:"93123",country:"US",category:"1"},{id:"11",lastname:"Kumar",firstname:"Madhukar",jobtitle:"CEO",company:"CoolWeb",email:"[e-mail]",web:"http://www.coolweb.com",phone:"7225 8252",phonecell:"7325 8245",address1:"434 Cool Place",city:"Bengaluru",state:"",country:"IN",category:"4"},{id:"12",lastname:"Cheng",firstname:"Chris",jobtitle:"CTO",company:"MyGreatCorporation",email:"[e-mail]",phonecell:"650 234 8245",city:"Sunnyvalle",state:"CA",country:"US",category:"4"}],"object"==typeof module&&"object"==typeof module.exports&&(module.exports=uiModels.contact_data);var uiModels=uiModels||{};uiModels.winecellar_data=[{name:"Macrostie",label_img:"wine/macrostie.gif",vintage:2008,winery:"Mc Williams",bsize:"750",type:"red",price:20,grape:"chard",country:"US",region:"Sonoma",buying_date:"2008-05-12",value:24,purchased:24,remaining:16,drink_from:2009,drink_to:2020,peak_from:2014,peak_to:2017,degustations:[{ddate:"2008-05-08",robe:"light",nose:"fruity",taste:"fruity",notes:"too young"},{ddate:"2011-03-10",robe:"light",nose:"light fruit",taste:"",notes:""},{ddate:"2012-12-12",robe:"light",nose:"light fruit",taste:"",notes:"Great"}]},{name:"Château d'Yquem",label_img:"wine/yquem.gif",vintage:2012,winery:"Lur Saluces",bsize:"750",type:"white",grape:"sem",buying_date:"2012-12-12",price:399,value:460,drink_from:2012,drink_to:2017,purchased:3,remaining:1,country:"FR",region:"Bordeaux",area:"Sauternes and Barsac",score_parker:92,score_winespectator:94,degustations:[{ddate:"2013-04-23",robe:"golden",nose:"fruity",taste:"incredible"},{ddate:"2013-05-12",robe:"clear",nose:"strong and sweet",taste:"outstanding"}]},{name:"Château St Jean",label_img:"wine/stjean.gif",vintage:2008,winery:"Ch St Jean",bsize:"750",type:"red",price:34,value:32,purchased:12,remaining:5,drink_from:2009,grape:"shiraz",country:"FR",score_parker:68,score_winespectator:72,degustations:[{ddate:"2013-24-12",robe:"thick",nose:"strong",taste:"good",notes:"Great w/ beef."}]},{name:"Vine Cliff",label_img:"wine/vinecliff.gif",vintage:2013,winery:"Vine Cliff",bsize:"750",type:"red",buying_date:"2013-05-05",price:28,drink_from:2014,grape:"merlo",country:"US",score_parker:67,score_winespectator:62,degustations:[{ddate:"2013-05-05",robe:"light",nose:"strong",taste:"good"},{ddate:"2013-08-05",robe:"light",nose:"strong",taste:"good"},{ddate:"2013-08-18",robe:"light",nose:"strong",taste:"ok"}]},{name:"Château Montelena",label_img:"wine/montelena.gif",vintage:2005,winery:"Château Montelena",bsize:"1500",grape:"merlo",type:"red",drink_from:2005,region:"California",price:62,value:32,purchased:12,remaining:8,country:"US",score_parker:64,score_winespectator:64,degustations:[{ddate:"2012-05-05",nose:"strong+",taste:"excellent"},{ddate:"2013-10-22",robe:"rich",nose:"strong",taste:"very good"}]}],"object"==typeof module&&"object"==typeof module.exports&&(module.exports=uiModels.winecellar_data);var uiModels=uiModels||{};uiModels.comics_data=[{title:"Do Androids Dream Of Electric Sheep?",genre:"sf",authors:"Philip K Dick, Tony Parker",complete:!0,finished:!0,have:"1-6",have_nb:6,serie_nb:6,language:"EN",notes:"",pix:"comics/androitsheep1.jpeg"},{title:"Saga",genre:"sf",authors:"Brian K. Vaughan and Fiona Staples",complete:!1,finished:!1,have:"1-3",have_nb:3,serie_nb:4,language:"EN",notes:"",pix:"comics/saga1.jpeg"},{title:"Alim le Tanneur",genre:"hf",authors:"Wilfrid Lupano, Virginie Augustin",complete:!0,finished:!0,have:"1-4",have_nb:4,serie_nb:4,language:"FR",notes:"",pix:"comics/alim1.jpg"},{title:"La Caste des Meta-Barons",genre:"sf",authors:"Alexandro Jodorowsky et Juan Gimenez",complete:!1,finished:!0,have:"1-5",have_nb:5,serie_nb:8,language:"FR",notes:"",pix:"comics/metabaron1.jpeg"},{title:"Garulfo",genre:"humor",have:"1-6",have_nb:6,serie_nb:6,language:"FR",authors:"Alain Ayroles et Bruno Maïorana",complete:!0,finished:!0,notes:"",pix:"comics/garulfo1.jpeg"},{title:"Lanfeust de Troy",genre:"hf",authors:"Didier Tarquin, Christophe Arleston",complete:!0,finished:!0,have:"1-8",have_nb:8,serie_nb:8,language:"FR",notes:"",pix:"comics/lanfeust1.jpeg"},{title:"Salammbo",genre:"fantasy",authors:"Philippe Druillet et Gustave Flaubert",complete:!0,finished:!0,have:"1-3",have_nb:3,serie_nb:3,language:"FR",notes:"",pix:"comics/salammbo1.jpeg"},{title:"Blacksad",genre:"pol",authors:"Juan Díaz Canales et Juanjo Guarnido",complete:!0,finished:!1,have:"1-4",have_nb:4,serie_nb:4,language:"FR",notes:"",pix:"comics/blacksad1.jpeg"},{title:"Carmen McCallum",genre:"sf",authors:"Fred Duval et Gess",complete:!1,finished:!1,have:"1-5",have_nb:5,serie_nb:12,language:"FR",notes:"",pix:"comics/carmenmc1.jpeg"},{title:"Code McCallum",genre:"sf",authors:"Fred Duval et Didier Cassegrain",complete:!0,finished:!0,have:"5",have_nb:5,serie_nb:5,language:"FR",notes:"",pix:"comics/codemc1.jpeg"},{title:"La Nef des Fous",genre:"nocat",authors:"Turf",complete:!0,finished:!0,have:"1-7",have_nb:7,serie_nb:7,language:"FR",notes:"",pix:"comics/neffous1.jpeg"},{title:"La Quete de l'Oiseau du Temps",genre:"hf",authors:"Serge Le Tendre et Régis Loisel",complete:!0,finished:!0,have:"1-4",have_nb:4,serie_nb:4,language:"FR",notes:"",pix:"comics/quete1.jpeg"},{title:"Le Lama Blanc",genre:"adv",authors:"Alejandro Jodorowsky et Georges Bess",complete:!0,finished:!0,have:"1-6",have_nb:6,serie_nb:6,language:"FR",notes:"",pix:"comics/lama1.jpeg"},{title:"Le Surfer d'Argent",genre:"sh",authors:"Moebius, Stan Lee",complete:!0,finished:!0,have:"1",have_nb:1,serie_nb:1,language:"FR",notes:"",pix:"comics/surfer.jpeg"},{title:"L'Incal",genre:"sf",authors:"Moebius et Alexandro Jodorowsky",complete:!0,finished:!0,have:"1-6",have_nb:6,serie_nb:6,language:"FR",notes:"",pix:"comics/incal1.jpeg"},{title:"Ou le regard ne porte pas",genre:"",authors:"Pont et Abolin",complete:!0,finished:!0,have:"1,2",have_nb:2,serie_nb:2,language:"FR",notes:"",pix:"comics/regard1.jpeg"},{title:"Péma Ling",genre:"hist",authors:"Georges Bess",complete:!0,finished:!0,have:"1-5",have_nb:5,serie_nb:5,language:"FR",notes:"",pix:"comics/pemaling1.jpeg"},{title:"Sky Doll",genre:"fantasy",authors:"Alessandro Barbucci et Barbara Canepa",complete:!0,finished:!0,have:"1-3",have_nb:3,serie_nb:3,language:"FR",notes:"",pix:"comics/skydoll1.jpeg"},{title:"Ronin",genre:"sf",authors:"Franck Miller",complete:!0,finished:!0,have:"1",have_nb:1,serie_nb:1,language:"EN",notes:"",pix:"comics/ronin.jpeg"},{title:"Rising Stars",genre:"sh",authors:"Joe Michael Straczynski, Christian Zanier, Keu Cha et Ken Lashley",complete:!0,finished:!0,have:"1",have_nb:1,serie_nb:1,language:"EN",notes:"",pix:"comics/risingstars.jpeg"},{title:"Le Fleau des Dieux",genre:"sf",authors:"Valérie Mangin et Aleksa Gajic",complete:!0,finished:!0,have:"1-6",have_nb:6,serie_nb:6,language:"FR",notes:"",pix:"comics/fleaudieux1.jpeg"},{title:"The Shaolin Cowboy",genre:"fantasy",authors:"Geof Darrow and Lana and Andy Wachowski",complete:!0,finished:!0,have:"1",have_nb:1,serie_nb:1,language:"EN",notes:"",pix:"comics/shaolin-cowboy.jpeg"},{title:"Tales of an Imperfect Future",genre:"sf",authors:"Alfonso Font",complete:!0,finished:!0,have:"1",have_nb:1,serie_nb:1,language:"EN",notes:"",pix:"comics/imperfect-future.jpeg"},{title:"Ghost in the Shell",genre:"sf",authors:"Masamune Shirow",complete:!1,finished:!0,have:"1",have_nb:1,serie_nb:2,language:"EN",notes:"",pix:"comics/ghost-in-the-shell.jpeg"}],"object"==typeof module&&"object"==typeof module.exports&&(module.exports=uiModels.comics_data);

js/dico/dico.js

@@ -289,2 +289,8 @@ /*! ***************************************************************************
                 break;
+            case fts.date:
+                var d=$f.val();
+                if(d.length===10){
+                    d+='T08:00:00.000Z';
+                }
+                return d;
             default:
@@ -549,3 +555,3 @@ return $f.val();
         'sw': function(fv, cv){
-            return fv.toLocaleLowerCase().indexOf(cv)===0;
+            return fv.substring(0, cv.length).toLocaleLowerCase()===cv;
         },
@@ -552,0 +558,0 @@ // -- contains

js/dico/dom.js

@@ -97,3 +97,3 @@ /*! ***************************************************************************
         date: function (id, value) {
-            return this.myType('date', id, value);
+            return this.myType('date', id, (value||'').substring(0, 10));
             //+'&nbsp;<a href="javascript:ShowDatePicker(\'', id, '\');" class="ico Calendar"></a></nobr>'
@@ -100,0 +100,0 @@ },

js/view-action/action-filter.js

@@ -180,2 +180,3 @@ /*! ***************************************************************************
                 });
+                that._removeEditor();
             }
@@ -182,0 +183,0 @@ });

js/view-action/toolbar.js

@@ -104,12 +104,12 @@ /*! ***************************************************************************
                 // -- views ONE ---
-                {id:'browse', label: i18nTool.bBrowse, icon:'eye-open',n:'1'},// // ReadOnly
-                {id:'edit', label: i18nTool.bEdit, icon:'edit',n:'1', readonly:false},// // All Fields for editing
-                {id:'mini', label: i18nTool.bMini, icon:'th-large',n:'1', readonly:false},// // Important Fields only
+                {id:'browse', label: i18nTool.bBrowse, icon:'eye-open', n:'1'},// // ReadOnly
+                {id:'edit', label: i18nTool.bEdit, icon:'edit', n:'1', readonly:false},// // All Fields for editing
+                {id:'mini', label: i18nTool.bMini, icon:'th-large', n:'1', readonly:false},// // Important Fields only
                 //{id:'wiz',label: i18nTool.bWizard, icon:'arrow-right',n:'1'},
-                {id:'json', label: i18nTool.bJSON, icon:'barcode',n:'1', readonly:false},
+                {id:'json', label: i18nTool.bJSON, icon:'barcode', n:'1', readonly:false},
                 // -- views MANY ---
-                {id:'list', label: i18nTool.bList, icon:'th-list',n:'n'},
-                {id:'cards', label: i18nTool.bCards, icon:'th-large',n:'n'},
-                {id:'bubbles', label: i18nTool.bBubbles, icon:'adjust',n:'n'},
-                {id:'charts', label: i18nTool.bCharts, icon:'stats',n:'n'}
+                {id:'list', label: i18nTool.bList, icon:'th-list', n:'n'},
+                {id:'cards', label: i18nTool.bCards, icon:'th-large', n:'n'},
+                {id:'bubbles', label: i18nTool.bBubbles, icon:'adjust', n:'n'},
+                {id:'charts', label: i18nTool.bCharts, icon:'stats', n:'n'}
             ],
@@ -668,13 +668,12 @@ search: true
             var entityName=this.uiModel.name;
-            if(_.isUndefined(this.model) || (this.model && this.model.isNew())){
-                var collec=this.collection;
-                if(collec){
-                    collec.create(this.getData(true), {
+            if(_.isUndefined(this.model) || (this.model && this.model.isNew())){ // CREATE
+                if(this.collection){
+                    this.collection.create(this.getData(true), {
                         success: function(m){
                             fnSuccess(m);
-                            //that.collection.set(m, {remove:false});
+                            that.setRoute(m.id, false);
                             that.setMessage(i18n.getLabel('saved', Evol.Format.capitalize(entityName)), i18n.getLabel('msg.added', entityName, _.escape(vw.getTitle())), 'success');
                         },
                         error:function(m, err){
-                            alert('error in "saveItem"');
+                            alert('Error in "saveItem"');
                         }
@@ -686,3 +685,3 @@ });
                 }
-            }else{
+            }else{ // UPDATE
                 // TODO fix bug w/ insert when filter applied => dup record
@@ -692,3 +691,3 @@ var updatedModel = this.getData(true);
                 this.model.save(this.model.changedAttributes(), {
-                    patch: !this.model.isNew() && !Evol.Config.localStorage,
+                    patch: !Evol.Config.localStorage,
                     success: function(m){
@@ -733,3 +732,5 @@ fnSuccess(m);
             if(id){
-                this.setModelById(id, true);
+                //this.setModelById(id, true);
+                var mid=Evol.Config.localStorage?''+id:id; // using string or int
+                this.model=this.collection.findWhere({id: mid});
                 var t=this.uiModel.fnTitle;
@@ -736,0 +737,0 @@ if(t && this.model){

js/view-many/many-list.js

@@ -84,9 +84,11 @@ /*! ***************************************************************************
                 if(bf){
-                    v+='<span class="badge badge-list">';
+                    var badgeText;
                     if(_.isFunction(bf)){
-                        v+=bf(model);
+                       badgeText=bf(model)||'';
                     }else if(_.isString(bf)){
-                        v+=model.escape(bf);
+                        badgeText=model.escape(bf)||'';
                     }
-                    v+='</span>';
+                    if(badgeText){
+                        v+='<span class="badge badge-list">'+badgeText+'</span>';
+                    }
                 }
@@ -93,0 +95,0 @@ }

js/view-one/one.js

@@ -292,2 +292,5 @@ /*! ***************************************************************************
                 return obj;
+            }else if(f.type===fts.date){
+                var v=eDico.getFieldVal(f, this.$field(f.id));
+                return v.length===10?v+'T08:00:00.000Z':v;
             }else{
@@ -771,3 +774,3 @@ return eDico.getFieldVal(f, this.$field(f.id));
                     _.each(sc.elements, function(f){
-                        if(that.validateField(f, rowData[f.id])){
+                        if(that.validateField(f, rowData[f.id].substring(0,10))){
                             trs.eq(idx).find('#'+f.id).parent().addClass('has-error');
@@ -774,0 +777,0 @@ scInvalid++;

package.json

 {
   "name": "evolutility",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "copyright": "(c) 2016 Olivier Giulieri",
@@ -5,0 +5,0 @@ "license": "AGPL-3.0",

README.md

@@ -6,4 +6,7 @@ # Evolutility.js
 
+This version of Evolutility uses your browser localstorage to store its data. The server-side for REST is a work in progress at [Evolutility-server](https://github.com/evoluteur/evolutility-server) using Node.js and Postgres. 
+
 ## Demo apps
 
+Sample Single Page Apps made with Evolutility: 
 [To Do list](http://evoluteur.github.io/evolutility/demo/index.html#todo/list),
@@ -14,8 +17,2 @@ [AddressBook](http://evoluteur.github.io/evolutility/demo/index.html#contact/list),
 
-These demos use the browser local storage to store data. 
-
-I'm still working on making Evolutility work with REST. 
-I started [Evolutility-server](https://github.com/evoluteur/evolutility-server) to work with Evolutility UI, but I'm now considering using [PostgREST](http://postgrest.com) instead. 
-
-
 ## Installation
@@ -50,5 +47,5 @@
 Evolutility provides 3 types of view
-* Views for a model: Browse, Edit, Mini (quick edit), JSON.
-* Views for a collection: List, Cards, Bubbles, Charts.
-* Views for actions on a model or collection: Export, Filter.
+* Views for a model: [Browse](#browse), [Edit](#edit), [Mini (quick edit)](#mini), [JSON](#json).
+* Views for a collection: [List](#list), [Cards](#cards), [Bubbles](#bubbles), [Charts](#charts).
+* Views for actions on a model or collection: [Filter](#filter), [Export](#export), [Import](#import).
 
@@ -61,3 +58,3 @@ A large part of the API (methods, options and events) is common to all views. Some views have additional API.
 
-![screenshot 1](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/one-browse.gif)
+![Browse](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/one-browse.gif)
 ```javascript
@@ -75,3 +72,3 @@ var vw = new Evol.ViewOne.Browse({
 
-![screenshot 1](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/one-edit.gif)
+![Edit](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/one-edit.gif)
 ```javascript
@@ -84,6 +81,6 @@ var vw = new Evol.ViewOne.Edit({
 ```
-### Mini (Quick Edit)
-Only shows important fields (required or showing as a column in grids). Fields are grouped in a single panel.
+### Mini
+Used for quick edits. Only shows important fields (required or showing as a column in grids). Fields are grouped in a single panel.
 
-![screenshot 1](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/one-mini.gif)
+![Mini](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/one-mini.gif)
 ```javascript
@@ -99,3 +96,3 @@ var vw = new Evol.ViewOne.Mini({
 
-![screenshot 1](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/one-json.gif)
+![JSON](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/one-json.gif)
 ```javascript
@@ -113,3 +110,3 @@ var vw = new Evol.ViewOne.JSON({
 
-![screenshot 1](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/many-list.gif)
+![List](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/many-list.gif)
 ```javascript
@@ -125,3 +122,3 @@ var vw = new Evol.ViewMany.List({
 
-![screenshot 1](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/many-cards.gif)
+![Cards](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/many-cards.gif)
 ```javascript
@@ -138,3 +135,3 @@ var vw = new Evol.ViewMany.Cards({
 
-![screenshot 1](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/many-bubbles.gif)
+![Bubbles](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/many-bubbles.gif)
 ```javascript
@@ -150,3 +147,3 @@ var vw = new Evol.ViewMany.Bubbles({
 
-![screenshot 1](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/many-charts.gif)
+![Charts](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/many-charts.gif)
 ```javascript
@@ -162,6 +159,16 @@ var vw = new Evol.ViewMany.Charts({
 Backbone Views for actions on a collection or a model.
+### Filter
+View used to build a structured query to filter a collection.
+
+![Filter](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/action-filter.gif)
+```javascript
+var vw = new Evol.ViewAction.Filter({
+            el: myElement,
+            uiModel: myUIModel
+        });
+```
 ### Export
 View to define export options and preview the collection export in different data formats (CSV, TAB, HTML, XML, SQL and JSON).
 
-![screenshot 1](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/action-export.gif)
+![Export](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/action-export.gif)
 ```javascript
@@ -174,10 +181,10 @@ var vw = new Evol.ViewAction.Export({
 ```
-### Filter
-View used to build a structured query to filter a collection.
+### Import
+View to import data from a CSVor JSON file. It is a work in progress.
 
-![screenshot 1](https://raw.githubusercontent.com/evoluteur/evolutility/master/doc/screenshots/action-filter.gif)
 ```javascript
-var vw = new Evol.ViewAction.Filter({
+var vw = new Evol.ViewAction.Import({
             el: myElement,
-            uiModel: myUIModel
+            uiModel: myUIModel,
+            collection: myCollection
         });
@@ -188,5 +195,3 @@ ```
 
-More Views will be added in the future (thinking of Summary, Import, Mass update, Group, Dashboard, Report, PDF, Auto-documentation and specs...).
 
-
 ## UI-model
@@ -198,2 +203,4 @@
 
+Try it now: Download Evolutility.JS, make modification to the demo UI-models by adding and modifying fields and panels and see the demo apps become your apps.
+
 ```javascript
@@ -318,17 +325,13 @@
 
-With Evolutility, a single UI-model defines a full single page applications (SPA) to view, edit, filter and export a Backbone.js model or collection.
-
-Try it now: Download Evolutility.JS, make modification to the demo UI-models by adding and modifying fields and panels and see the demo apps become your apps.
-
 ## Stack and dependencies
 
 Javascript, HTML5, CSS3,
-[Backbone.js] (http://backbonejs.org),
-[Underscore.js] (http://underscorejs.org/),
-[jQuery] (http://jquery.com),
-[D3.js] (http://d3js.org),
-[Bootstrap] (http://getbootstrap.com/),
-[Bootstrap-datepicker] (http://eternicode.github.io/bootstrap-datepicker/),
-[Select2] (http://ivaynberg.github.io/select2/),
-[Toastr] (https://github.com/CodeSeven/toastr).
+[Backbone.js](http://backbonejs.org),
+[Underscore.js](http://underscorejs.org/),
+[jQuery](http://jquery.com),
+[D3.js](http://d3js.org),
+[Bootstrap](http://getbootstrap.com/),
+[Bootstrap-datepicker](http://eternicode.github.io/bootstrap-datepicker/),
+[Select2](http://ivaynberg.github.io/select2/),
+[Toastr](https://github.com/CodeSeven/toastr).
 
@@ -343,3 +346,3 @@ Note: For convenience, all dependencies are minified together in a single file "dependencies.min.js". The dependencies list is specified in "Gruntfile.js".
 
-Evolutility.js is a re-write of [Evolutility] (http://www.evolutility.org) generic CRUD UI for ASP.net.
+Evolutility.js is a re-write of [Evolutility](http://www.evolutility.org) generic CRUD UI for ASP.net.
 
@@ -346,0 +349,0 @@

ui-models/comics.js

@@ -15,3 +15,3 @@ var uiModels = uiModels || {};
                 sNb=m.get('serie_nb');
-            return (hNb==sNb)?hNb:hNb+'/'+sNb;
+            return (hNb==sNb)?hNb:(hNb||'-')+'/'+(sNb||'-');
         }
@@ -18,0 +18,0 @@ return '';

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

2456621

increased by0.07%

Lines of code

20024

increased by0.12%

Number of lines in readme file

339

increased by0.89%

No dependency changes