json-object-editor 0.10.224 → 0.10.226

package/CHANGELOG.md

@@ -1,6 +1,8 @@
 ## CHANGELOG
 
 ### 0.10.200
+	226 - lists added new default filter
+	225 - fixed list issues, capp toggle 
 	224 - manifest.json & capp menu
 	223 - list custom items updated
 	220 - updated user, added ability for manifest.js

package/capp/capp.css

@@ -1065,10 +1065,10 @@ capp-toggles > capp-button{
 }
 capp-toggles > capp-button > svg {
     float: left;
-    width: 40px;
+    width: 20px;
     fill: #999;
     margin-left: -10px;
-    padding-top:2px;
+    padding-top: 12px;
 }
 capp-toggles > capp-button.active{
     background:#f2f2f2;

package/css/joe-styles.css

@@ -2006,6 +2006,10 @@ joe-list-item.deletable {
     position: relative;
     border-bottom:1px solid #eee;
 }
+.joe-panel-content-option-expander joe-list-item.custom-item {
+    padding: 10px;
+    margin: 10px 0;
+}
 swipe-option{
     position:absolute;
     top:0;

package/css/joe.css

@@ -2492,6 +2492,10 @@ joe-list-item.deletable {
     position: relative;
     border-bottom:1px solid #eee;
 }
+.joe-panel-content-option-expander joe-list-item.custom-item {
+    padding: 10px;
+    margin: 10px 0;
+}
 swipe-option{
     position:absolute;
     top:0;

package/js/joe-full.js

@@ -2560,7 +2560,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/js/joe.js

@@ -9382,7 +9382,7 @@ logit(intent)
                             logit(response);
                             var bucket = response.bucket || (_joe.Data.setting.where({name:'AWS_BUCKETNAME'})[0] || {value:''}).value;
                             var region = (_joe.Utils.Settings('AWS_S3CONFIG') ||{}).region;
-                            var prefix = (_joe.Data.setting.where({name:'AWS_S3PREFIX'})[0] || {value:''}).value || 'https://s3.'+((region && region +'.')||'')+'amazonaws.com/'+bucket+'/';
+                            var prefix = 'https://s3.'+((region && region +'.')||'')+'amazonaws.com/'+bucket+'/';
                             var url = prefix+response.Key;
                             var filename = response.Key.replace(self.current.object._id+'/','');
                             //TODO: change file status in list.
@@ -9421,9 +9421,7 @@ logit(intent)
                             logit(data);
                             var bucket = data.bucket || (_joe.Data.setting.where({name:'AWS_BUCKETNAME'})[0] || {value:''}).value;
                             
-                            //var prefix = 'https://s3.amazonaws.com/'+bucket+'/';
-                            var prefix = (_joe.Data.setting.where({name:'AWS_S3PREFIX'})[0] || {value:''}).value || 'https://s3.'+((region && region +'.')||'')+'amazonaws.com/'+bucket+'/';
-
+                            var prefix = 'https://s3.amazonaws.com/'+bucket+'/';
                             var url = prefix+data.Key;
                             if(field.url_field){
                                 var nprop = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-object-editor",
-  "version": "0.10.224",
+  "version": "0.10.226",
   "description": "JOE the Json Object Editor | Platform Edition",
   "main": "app.js",
   "scripts": {
@@ -19,6 +19,7 @@
   "keywords": [
     "joe",
     "json",
+    "object",
     "editor"
   ],
   "author": "Corey Hadden",

package/server/apps/projectboard.js

@@ -132,9 +132,9 @@ var ProjectBoard = function(){
                     }
                     var togglers = 
                         `<capp-toggles>
-                        <capp-button class="`+active[0]+`" data-toggle="projects" onclick="capp.Toggle.toggle(\'projects\')">`+_joe.schemas.project.menuicon+`<big>Projects</big> (`+pcount+`)</capp-button>
-                        <capp-button class="`+active[1]+`" data-toggle="tasks" onclick="capp.Toggle.toggle(\'tasks\')">`+_joe.schemas.task.menuicon+`<big>Tasks</big> (`+tcount+`)</capp-button>
-                        <capp-button class="`+active[2]+`" data-toggle="pending" onclick="capp.Toggle.toggle(\'pending\')">`+_joe.schemas.instance.menuicon+`<big>Pending</big> (`+pending_count+`)</capp-button>
+                        <capp-button class="`+active[0]+`" data-toggle="projects" onclick="capp.Toggle.toggle(\'projects\')">`+_joe.schemas.project.menuicon+`Projects <small>(`+pcount+`)</small></capp-button>
+                        <capp-button class="`+active[1]+`" data-toggle="tasks" onclick="capp.Toggle.toggle(\'tasks\')">`+_joe.schemas.task.menuicon+`Tasks <small>(`+tcount+`)</small></capp-button>
+                        <capp-button class="`+active[2]+`" data-toggle="pending" onclick="capp.Toggle.toggle(\'pending\')">`+_joe.schemas.instance.menuicon+`Pending <small>(`+pending_count+`)</small></capp-button>
                         </capp-toggles>`;
                     
 

package/server/schemas/list.js

@@ -43,8 +43,20 @@ var schema = {
             let itemObj = $J.get(item);
             return _joe.renderFieldListItem(itemObj,'',itemObj.itemType);
         }).join('')
-        +'</joe-content-section>'
-        +((list.description &&`<joe-content-section>${list.description}</joe-content-section>`) ||'')
+        +'</joe-content-section>';
+        if(list.custom_items && list.custom_items.length){
+            h+=`<joe-content-section class="no-padding">${
+            list.custom_items.map(ci=>{
+                var done = (ci.sub_complete)?'joe-strike':'';
+                return`<joe-list-item class="custom-item"><joe-subtext>${ci.type ||''}</joe-subtext>
+                <joe-title class="${done}">${ci.name}</joe-title></joe-list-item>`;
+            }).join(' ')
+        }</joe-content-section>` ;
+        }
+
+
+        
+        h+=((list.description &&`<joe-content-section>${list.description}</joe-content-section>`) ||'')
         +`<joe-subtext class="fright">created <b>${_joe.Utils.toDateString(list.created)}</b></joe-subtext>`;
 
         return h;
@@ -53,7 +65,24 @@ var schema = {
     //     return [{name:'view',action:'window.open(\'/API/plugin/reportbuilder/standard?itemid=${_id}\')'}];
     // },
     subsets:function(){
-        var filters = [];
+        var filters = [
+            {name:'ACTIVE',default:true,filter:
+                function(){
+
+                    if(!this.status){
+                        return false;
+                    }
+                    else{
+                        var s = _joe.Cache.get(this.status);
+                        //var s = $.get(this.status);
+                        if(s.inactive || s.terminal || s.default){
+                            return false;
+                        }
+                    }
+                    return true;
+                }
+            }
+        ];
         var tags = _joe.Data.tag.filter(function(tag){
             if(tag.datasets.indexOf(_joe.current.schema.__schemaname) != -1){
                 filters.push({name:tag.name,
@@ -61,6 +90,7 @@ var schema = {
                 });
             }
         });
+        
         filters.push({name:'untagged',
             filter:{$or:[{tags:{$size:0}},{tags:{$exists:false}}]}
         })
@@ -157,7 +187,7 @@ var schema = {
     ];
     },
     idprop : "_id",
-    sorter:['date','name','list_type','!joeUpdated','created'],
+    sorter:['!joeUpdated','date','name','list_type','created'],
     report:{
         name:'List',
         info:'basic list view',