json-object-editor 0.10.120 → 0.10.201

package/js/JsonObjectEditor.jquery.craydent.js

@@ -3385,6 +3385,9 @@ this.renderHTMLContent = function(specs){
                 break;*/
             case 'passthrough':
                 html+= self.renderPassthroughField(prop);
+                break;
+            case 'userfavorite':
+                html+= self.renderUserFavoriteField(prop);
                 break;
 			default:
                 if(self.Fields[proptype] && self.Fields[proptype].render){
@@ -4065,7 +4068,13 @@ this.renderHTMLContent = function(specs){
 		return html;
 	};
     encapsulateFieldType('guid',self.renderGuidField);
-
+/*----------------------------->
+ F.2 | UserFavorite
+ <-----------------------------*/
+ this.renderUserFavoriteField = function(prop){
+    var html= 'user favorite';
+    return html;
+};
 /*----------------------------->
 	G | Guid
 <-----------------------------*/
@@ -10240,6 +10249,7 @@ logit(intent)
  <--------------------------------------------------------------------*/
  this.SVG = {
      icon:{
+        'favorite':'<?xml version="1.0" encoding="UTF-8"?><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="M4 2h16a1 1 0 0 1 1 1v19.276a.5.5 0 0 1-.704.457L12 19.03l-8.296 3.702A.5.5 0 0 1 3 22.276V3a1 1 0 0 1 1-1zm8 11.5l2.939 1.545-.561-3.272 2.377-2.318-3.286-.478L12 6l-1.47 2.977-3.285.478 2.377 2.318-.56 3.272L12 13.5z"/></svg>',
          'left':'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-5 -5 36 36"><path d="M11.3 21C7.1 18.2 3.3 13.8 3.2 13.6 3.1 13.5 3 13.2 3 13 3 12.8 3.1 12.5 3.2 12.3 3.3 12.1 7.2 7.7 11.3 4.9 11.6 4.7 12 4.7 12.4 4.8 12.8 5.1 13 5.4 13 5.8L13 9.5C13 9.5 21.7 10 22.1 10.3 22.7 10.7 23 12 23 13 23 14.1 22.6 15.2 22.1 15.6 21.7 15.9 13 16.5 13 16.5L13 20.2C13 20.6 12.8 20.9 12.4 21.1 12.1 21.3 11.7 21.2 11.3 21Z"/></svg>',
          'cancel':'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-5 -5 36 36"><path d="M13 0.2C5.9 0.2 0.2 5.9 0.2 13 0.2 20.1 5.9 25.8 13 25.8 20.1 25.8 25.8 20.1 25.8 13 25.8 5.9 20.1 0.2 13 0.2ZM18.8 17.4L17.4 18.8C17.1 19 16.7 19 16.5 18.8L13 15.3 9.5 18.8C9.3 19 8.9 19 8.6 18.8L7.2 17.4C7 17.1 7 16.7 7.2 16.5L10.7 13 7.2 9.5C7 9.3 7 8.9 7.2 8.6L8.6 7.2C8.9 7 9.3 7 9.5 7.2L13 10.7 16.5 7.2C16.7 7 17.1 7 17.4 7.2L18.8 8.6C19 8.9 19 9.3 18.8 9.5L15.3 13 18.8 16.5C19 16.7 19 17.1 18.8 17.4Z"/></svg>',
          close:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-6 -6 44 44"><path d="M26 22.3L22.3 26c0 0-5.9-6.3-6.3-6.3C15.6 19.7 9.7 26 9.7 26L6 22.3c0 0 6.3-5.8 6.3-6.3C12.3 15.5 6 9.7 6 9.7l3.7-3.7c0 0 5.9 6.3 6.3 6.3 0.4 0 6.3-6.3 6.3-6.3L26 9.7c0 0-6.3 5.9-6.3 6.3C19.7 16.4 26 22.3 26 22.3z"/></svg>',

package/js/joe-full.js

@@ -14689,6 +14689,9 @@ this.renderHTMLContent = function(specs){
                 break;*/
             case 'passthrough':
                 html+= self.renderPassthroughField(prop);
+                break;
+            case 'userfavorite':
+                html+= self.renderUserFavoriteField(prop);
                 break;
 			default:
                 if(self.Fields[proptype] && self.Fields[proptype].render){
@@ -15369,7 +15372,13 @@ this.renderHTMLContent = function(specs){
 		return html;
 	};
     encapsulateFieldType('guid',self.renderGuidField);
-
+/*----------------------------->
+ F.2 | UserFavorite
+ <-----------------------------*/
+ this.renderUserFavoriteField = function(prop){
+    var html= 'user favorite';
+    return html;
+};
 /*----------------------------->
 	G | Guid
 <-----------------------------*/
@@ -21544,6 +21553,7 @@ logit(intent)
  <--------------------------------------------------------------------*/
  this.SVG = {
      icon:{
+        'favorite':'<?xml version="1.0" encoding="UTF-8"?><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="M4 2h16a1 1 0 0 1 1 1v19.276a.5.5 0 0 1-.704.457L12 19.03l-8.296 3.702A.5.5 0 0 1 3 22.276V3a1 1 0 0 1 1-1zm8 11.5l2.939 1.545-.561-3.272 2.377-2.318-3.286-.478L12 6l-1.47 2.977-3.285.478 2.377 2.318-.56 3.272L12 13.5z"/></svg>',
          'left':'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-5 -5 36 36"><path d="M11.3 21C7.1 18.2 3.3 13.8 3.2 13.6 3.1 13.5 3 13.2 3 13 3 12.8 3.1 12.5 3.2 12.3 3.3 12.1 7.2 7.7 11.3 4.9 11.6 4.7 12 4.7 12.4 4.8 12.8 5.1 13 5.4 13 5.8L13 9.5C13 9.5 21.7 10 22.1 10.3 22.7 10.7 23 12 23 13 23 14.1 22.6 15.2 22.1 15.6 21.7 15.9 13 16.5 13 16.5L13 20.2C13 20.6 12.8 20.9 12.4 21.1 12.1 21.3 11.7 21.2 11.3 21Z"/></svg>',
          'cancel':'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-5 -5 36 36"><path d="M13 0.2C5.9 0.2 0.2 5.9 0.2 13 0.2 20.1 5.9 25.8 13 25.8 20.1 25.8 25.8 20.1 25.8 13 25.8 5.9 20.1 0.2 13 0.2ZM18.8 17.4L17.4 18.8C17.1 19 16.7 19 16.5 18.8L13 15.3 9.5 18.8C9.3 19 8.9 19 8.6 18.8L7.2 17.4C7 17.1 7 16.7 7.2 16.5L10.7 13 7.2 9.5C7 9.3 7 8.9 7.2 8.6L8.6 7.2C8.9 7 9.3 7 9.5 7.2L13 10.7 16.5 7.2C16.7 7 17.1 7 17.4 7.2L18.8 8.6C19 8.9 19 9.3 18.8 9.5L15.3 13 18.8 16.5C19 16.7 19 17.1 18.8 17.4Z"/></svg>',
          close:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-6 -6 44 44"><path d="M26 22.3L22.3 26c0 0-5.9-6.3-6.3-6.3C15.6 19.7 9.7 26 9.7 26L6 22.3c0 0 6.3-5.8 6.3-6.3C12.3 15.5 6 9.7 6 9.7l3.7-3.7c0 0 5.9 6.3 6.3 6.3 0.4 0 6.3-6.3 6.3-6.3L26 9.7c0 0-6.3 5.9-6.3 6.3C19.7 16.4 26 22.3 26 22.3z"/></svg>',

package/js/joe.js

@@ -3391,6 +3391,9 @@ this.renderHTMLContent = function(specs){
                 break;*/
             case 'passthrough':
                 html+= self.renderPassthroughField(prop);
+                break;
+            case 'userfavorite':
+                html+= self.renderUserFavoriteField(prop);
                 break;
 			default:
                 if(self.Fields[proptype] && self.Fields[proptype].render){
@@ -4071,7 +4074,13 @@ this.renderHTMLContent = function(specs){
 		return html;
 	};
     encapsulateFieldType('guid',self.renderGuidField);
-
+/*----------------------------->
+ F.2 | UserFavorite
+ <-----------------------------*/
+ this.renderUserFavoriteField = function(prop){
+    var html= 'user favorite';
+    return html;
+};
 /*----------------------------->
 	G | Guid
 <-----------------------------*/
@@ -10246,6 +10255,7 @@ logit(intent)
  <--------------------------------------------------------------------*/
  this.SVG = {
      icon:{
+        'favorite':'<?xml version="1.0" encoding="UTF-8"?><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="M4 2h16a1 1 0 0 1 1 1v19.276a.5.5 0 0 1-.704.457L12 19.03l-8.296 3.702A.5.5 0 0 1 3 22.276V3a1 1 0 0 1 1-1zm8 11.5l2.939 1.545-.561-3.272 2.377-2.318-3.286-.478L12 6l-1.47 2.977-3.285.478 2.377 2.318-.56 3.272L12 13.5z"/></svg>',
          'left':'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-5 -5 36 36"><path d="M11.3 21C7.1 18.2 3.3 13.8 3.2 13.6 3.1 13.5 3 13.2 3 13 3 12.8 3.1 12.5 3.2 12.3 3.3 12.1 7.2 7.7 11.3 4.9 11.6 4.7 12 4.7 12.4 4.8 12.8 5.1 13 5.4 13 5.8L13 9.5C13 9.5 21.7 10 22.1 10.3 22.7 10.7 23 12 23 13 23 14.1 22.6 15.2 22.1 15.6 21.7 15.9 13 16.5 13 16.5L13 20.2C13 20.6 12.8 20.9 12.4 21.1 12.1 21.3 11.7 21.2 11.3 21Z"/></svg>',
          'cancel':'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-5 -5 36 36"><path d="M13 0.2C5.9 0.2 0.2 5.9 0.2 13 0.2 20.1 5.9 25.8 13 25.8 20.1 25.8 25.8 20.1 25.8 13 25.8 5.9 20.1 0.2 13 0.2ZM18.8 17.4L17.4 18.8C17.1 19 16.7 19 16.5 18.8L13 15.3 9.5 18.8C9.3 19 8.9 19 8.6 18.8L7.2 17.4C7 17.1 7 16.7 7.2 16.5L10.7 13 7.2 9.5C7 9.3 7 8.9 7.2 8.6L8.6 7.2C8.9 7 9.3 7 9.5 7.2L13 10.7 16.5 7.2C16.7 7 17.1 7 17.4 7.2L18.8 8.6C19 8.9 19 9.3 18.8 9.5L15.3 13 18.8 16.5C19 16.7 19 17.1 18.8 17.4Z"/></svg>',
          close:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-6 -6 44 44"><path d="M26 22.3L22.3 26c0 0-5.9-6.3-6.3-6.3C15.6 19.7 9.7 26 9.7 26L6 22.3c0 0 6.3-5.8 6.3-6.3C12.3 15.5 6 9.7 6 9.7l3.7-3.7c0 0 5.9 6.3 6.3 6.3 0.4 0 6.3-6.3 6.3-6.3L26 9.7c0 0-6.3 5.9-6.3 6.3C19.7 16.4 26 22.3 26 22.3z"/></svg>',

package/js/libs/craydent-1.8.1.js

@@ -2533,7 +2533,8 @@ if (__thisIsNewer) {
             error('Queue', e);
         }
     }
-    function Set (records) {
+    /*function Set (records) {*/
+    window.Set = function(records) {
         /*|{
             "info": "Collection class that filters out duplicate values",
             "category": "Global",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-object-editor",
-  "version": "0.10.120",
+  "version": "0.10.201",
   "description": "JOE the Json Object Editor | Platform Edition",
   "main": "app.js",
   "scripts": {

package/server/fields/core.js

@@ -405,6 +405,46 @@ var fields = {
         icon:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-6 -4 36 36"><path d="M12 1C8.7 1 6 3.7 6 7L6 8C4.9 8 4 8.9 4 10L4 20C4 21.1 4.9 22 6 22L18 22C19.1 22 20 21.1 20 20L20 10C20 8.9 19.1 8 18 8L18 7C18 3.7 15.3 1 12 1ZM12 3C14.3 3 16 4.7 16 7L16 8 8 8 8 7C8 4.7 9.7 3 12 3ZM12 13C13.1 13 14 13.9 14 15 14 16.1 13.1 17 12 17 10.9 17 10 16.1 10 15 10 13.9 10.9 13 12 13Z"/></svg>',
         label:'users must be logged in to view this item and reports'
     },
+    favorite:{
+        type:'boolean',
+        byUser:true,
+        display:'favorite',
+        icon:'<?xml version="1.0" encoding="UTF-8"?><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="M4 2h16a1 1 0 0 1 1 1v19.276a.5.5 0 0 1-.704.457L12 19.03l-8.296 3.702A.5.5 0 0 1 3 22.276V3a1 1 0 0 1 1-1zm8 11.5l2.939 1.545-.561-3.272 2.377-2.318-3.286-.478L12 6l-1.47 2.977-3.285.478 2.377 2.318-.56 3.272L12 13.5z"/></svg>',
+        label:'one of your favorites',
+        hidelabel:true
+    },
+    // favorite:{
+    //     type:'userfavorite',
+    //     display:'favorite',
+    //     icon:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-6 -4 36 36"><path d="M12 1C8.7 1 6 3.7 6 7L6 8C4.9 8 4 8.9 4 10L4 20C4 21.1 4.9 22 6 22L18 22C19.1 22 20 21.1 20 20L20 10C20 8.9 19.1 8 18 8L18 7C18 3.7 15.3 1 12 1ZM12 3C14.3 3 16 4.7 16 7L16 8 8 8 8 7C8 4.7 9.7 3 12 3ZM12 13C13.1 13 14 13.9 14 15 14 16.1 13.1 17 12 17 10.9 17 10 16.1 10 15 10 13.9 10.9 13 12 13Z"/></svg>',
+    //     label:'items that have been favorited'
+    // },
+    // favorite:{
+    //     type:'objectReference',values:'user',icon:'user',
+    //     after:function(item){
+    //         var action = `_joe.getField('members').methods.addUser('${_joe.User._id}');`;
+    //         var template = `<joe-button class="joe-button joe-svg-button joe-orangegrey-button joe-svg-button" onclick="${action}">
+    //             favorite this
+    //         </joe-button>`;
+    //         return template;
+    //     },
+    //     disabled:true,
+    //     template:'<joe-subtext>${name}</joe-subtext><joe-title>${fullname}</joe-title><joe-subtext>${info}</joe-subtext>',
+    //     autocomplete_template:'<joe-title>${name}</joe-title><joe-subtitle>${fullname}</joe-subtitle>',
+    //     reference_specs:{stripecolor:'${color}'},
+    //     methods:{
+    //         toggleFavorite:function(userid){
+
+    //         },
+    //         addUser:function(userid,goto){
+    //             var current = _jco(true);
+    //             if(current.favorite.indexOf(userid) == -1){
+    //                 current.favorite.push(userid);
+    //                 _joe.Fields.rerender('members',{members:current.members});
+    //             }
+    //         }
+    //     }
+    // },
     references:{
         display:'related joe items',
         type:'objectReference',

package/server/modules/Cache.js

@@ -68,8 +68,8 @@ function Cache(updateNow) {
         //gets a search query and finds within all items
         //TODO: cache queries
         
-        var results = self.list.where(query);
-        logit(query,results);
+       // var results = self.list.where(query);
+       // logit(query,results);
         return self.list.where(query);
     }
     this.findByID = function(collection,id,specs,returnProp){

package/server/modules/Server.js

@@ -183,8 +183,8 @@ function cleanPayload(results){
     })
     return results;
 }
-//ITEM QUERY
-server.get(['/API/item/:collection/:key/:value','/API/item/:collection','/API/item/:collection/fields/:fields'],auth,function(req,res,next){
+//ITEM QUERY - secured, preferred
+server.get(['/API/item/:collection/fields/:fields','/API/item/:collection/:key/:value','/API/item/:collection'],auth,function(req,res,next){
     var st = new Date().getTime();
     var collection = req.params.collection || req.query.collection;
     var key = req.params.key || req.query.key;
@@ -215,6 +215,7 @@ server.get(['/API/item/:collection/:key/:value','/API/item/:collection','/API/it
         // })
         payload.item = JOE.Utils.ProjectedItemsFromFields(fields,payload.item);
     }
+    payload.item = cleanPayload(payload.item);
     payload.elapsed = new Date().getTime() - st;
     res.jsonp(payload);
 });

package/server/modules/Utils.js

@@ -132,7 +132,7 @@ var utils = function(){
             return m.exports;
         }
 
-        this.ProjectedItemsFromFields = function(fields,data){
+        this.ProjectedItemsFromFields = function(fields,data,makeSet){
             fields = fields.split(',');
             var finalItems = [];
             data.map(item=>{
@@ -162,6 +162,16 @@ var utils = function(){
                 })
                 finalItems.push(copy);
             });
+            if(makeSet){
+                var items = [];
+                let template = (typeof makeSet == "string" && makeSet)||fields.map(f=>{return '${'+f+'}'}).join('_');
+                finalItems.map(fi=>{
+                    //get template or use fields with _
+                    items.push($c.fillTemplate(template,fi).trim().toLowerCase())
+                })
+                items = Array.from(new Set(items));
+                return items;
+            }
             return finalItems;
         }
 

package/server/plugins/memberRegistry.js

@@ -17,6 +17,9 @@ function MemberRegisty(){
     this.search = function(data,req){
         var query = data.query || {};
         var sortby = data.sortby  || 'name';
+        var fields = data.fields || null;
+        var makeSet = data.makeSet || false;
+        if(makeSet === "true"){makeSet = true;}
         try{ 
             if(typeof query != 'object'){
                 query = eval('('+query+')');
@@ -27,14 +30,70 @@ function MemberRegisty(){
                 data:data,
                 //reqQ:req.query,
                 query:query,
+                count:members.length,
                 members:members
             }
+            if(fields){
+                payload.members = JOE.Utils.ProjectedItemsFromFields(fields,payload.members,makeSet);
+                return payload;
+            }
             return payload;
         }catch(e){
-            return {errors:'plugin error: '+e,failedat:'plugin'};
+            return {errors:'plugin error: '+e,failedat:'plugin',e:e};
         }
     };
+    var state_lookups = {
+        'nm':'NM',
+        'new mexico':'NM',
+        
+        'tx':'TX',
+        'texas':'TX',
+        
+        'az':'AZ',
+        'arizona':'AZ',
+        'colorado':'CO'
+        
+        
+    }
+    this.getLocationList = function(data,req){
+        try{ 
+            var llQuery = {
+                "active": {"$in": [true,"true"]},
+                "profession.0": {
+                    "$exists": true
+                },
+                itemtype:'member'
+            };
+            var members = JOE.Cache.list.where(llQuery)
+            var loqs = {}
+            members.map(m=>{
+                if(!m.state){return;}
+                let stname = state_lookups[m.state.trim().toLowerCase()] || m.state;
+                //get state, add to obj
+                loqs[stname] = loqs[stname] ||{cities:[]};
+                loqs[stname].cities.push(m.city.trim().toLowerCase());
+            });
+            Object.keys(loqs).map(ck=>{
+                loqs[ck].cities = Array.from(new Set(loqs[ck].cities)).sort();
+                loqs[ck].count = loqs[ck].cities.length;
+            })
+            //var loqs = JOE.Utils.ProjectedItemsFromFields('city',members,true).sort();
+            //JOE.Data.member.where(query)
+            var payload = {
+                data:data,
+                //reqQ:req.query,
+                query:llQuery,
+                count:loqs.length,
+                //members:members,
+                loqs
+            }
 
+            return payload;
+        }catch(e){
+            return {errors:'plugin error: '+e,failedat:'plugin',e:e};
+        }
+
+    }
     this.update = function(data,req,res){
         try{ 
             var updates = data.updates;

package/server/schemas/recipe.js

@@ -9,7 +9,8 @@ var schema = {
             <joe-subtitle>${(i.info && i.info+' -')|| ''} ${((i.ingredients||[]).length)} ingredient(s) </joe-subtitle>`;},
         listWindowTitle: 'Recipes'
     },
-    sorter:['name','mealtype','created'],
+    checkbox:{prop:'family_favorite'},
+    sorter:['name','mealtype','family_favorite','created'],
     menuicon:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-8 -8 80 80"><rect x="16.2" y="43.3" width="30.1" height="2.3"/><rect x="16.2" y="49.3" width="30.1" height="2.3"/><path d="M9.5 1.9v60.1h45.1V1.9H9.5zM51.5 59.1H12.5V4.9h39.1V59.1z"/><path d="M31 10c-7.7 0-14 6.3-14 14s6.3 14 14 14 14-6.3 14-14S38.7 10 31 10zM29.2 24c0 1.2 0.7 4 0.7 6.7s-1 3.4-1.7 3.4c-0.7 0-1.7-0.5-1.7-3.4s0.7-5.5 0.7-6.7 -2.4-0.8-2.4-3.9c0-2.8 0.4-5.6 0.4-5.6s0.3-0.3 1.2-0.4v5.5c0 0.3 0.2 0.6 0.6 0.6s0.6-0.2 0.6-0.6V14v-0.1c0.1 0 0.3 0 0.4 0 0.2 0 0.4 0 0.7 0 0 0.1 0 0.1 0 0.1v5.5c0 0.3 0.2 0.6 0.6 0.6s0.6-0.2 0.6-0.6v-5.4c0.8 0.2 1.2 0.4 1.2 0.4s0.5 3.8 0.5 5.6C31.6 23.3 29.2 22.8 29.2 24zM36 30.2c0 1.7-0.3 3.9-1.1 3.9 -0.8 0-1.1-1.2-1.1-3.9 0-1.8 0-16.2 0-16.2 2.9 1.4 3.4 4.4 3.4 5.8 0 2.5-1.7 4.5-1.7 6.2C35.5 26.9 36 27.9 36 30.2z"/></svg>',
     subsets:function(){
         var subs = [];
@@ -45,6 +46,9 @@ var schema = {
         'updated',
         'reports',
         'tags',
+        {name:'family_favorite',type:'boolean',display:"FAMILY FAVORITE", label:'will show up as option for tasker'},
+        
+        /*'favorite',*/
         {sidebar_end:'right'},
         
         {section_start:'system',collapsed:true},