json-object-editor 0.9.89 → 0.10.0

package/package copy.json

@@ -0,0 +1,62 @@
+{
+  "name": "json-object-editor",
+  "version": "0.9.901",
+  "description": "JOE the Json Object Editor | Platform Edition",
+  "main": "app.js",
+  "scripts": {
+    "prestart": "start grunt --gruntfile grunt/Gruntfile.js",
+    "start": "node app.js ",
+    "stop": "node node_scripts/stop.js .pid",
+    "grunt": "start grunt --gruntfile grunt/Gruntfile.js",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "babel-wc": "babel web-components -d es5-build/web-components",
+    "babel-joe": "babel js/JsonObjectEditor.jquery.craydent.js -d es5-build/js/JsonObjectEditor_es5.jquery.craydent.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://craql@bitbucket.org/craydent/jsonobjecteditor.git"
+  },
+  "keywords": [
+    "joe",
+    "json",
+    "editor"
+  ],
+  "author": "Corey Hadden",
+  "license": "(c) Copyright 2015-2020 corey hadden, all rights reserved",
+  "bugs": {
+    "url": "https://github.com/craql/JsonObjectEditor/issues"
+  },
+  "homepage": "http://craydent.com/JsonObjectEditor/docs.html",
+  "devDependencies": {
+    "@babel/cli": "^7.7.4",
+    "@babel/core": "^7.7.4",
+    "@babel/preset-env": "^7.7.4",
+    "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+    "del": "^2.0.1",
+    "grunt-traceur": "^0.5.5",
+    "gulp": "^3.9.0",
+    "gulp-concat": "^2.6.0",
+    "gulp-notify": "^2.2.0"
+  },
+  "dependencies": {
+    "JsonObjectEditor": "file:grunt",
+    "aws-sdk": "^2.358.0",
+    "basic-auth": "^1.0.3",
+    "body-parser": "^1.18.3",
+    "compression": "^1.7.3",
+    "cookie-parser": "^1.4.1",
+    "craydent": "^0.8.9",
+    "express": "^4.16.4",
+    "jwt-decode": "^2.2.0",
+    "mailgun": "^0.5.0",
+    "mongojs": "^2.3.0",
+    "mysql": "^2.16.0",
+    "nodemailer": "^2.7.2",
+    "nodemailer-ses-transport": "^1.4.0",
+    "opener": "^1.4.3",
+    "pem": "^1.13.2",
+    "plaid": "^3.1.1",
+    "renderizer": "^1.1.0",
+    "socket.io": "^2.2.0"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-object-editor",
-  "version": "0.9.89",
+  "version": "0.10.000",
   "description": "JOE the Json Object Editor | Platform Edition",
   "main": "app.js",
   "scripts": {
@@ -27,19 +27,7 @@
     "url": "https://github.com/craql/JsonObjectEditor/issues"
   },
   "homepage": "http://craydent.com/JsonObjectEditor/docs.html",
-  "devDependencies": {
-    "@babel/cli": "^7.7.4",
-    "@babel/core": "^7.7.4",
-    "@babel/preset-env": "^7.7.4",
-    "babel-plugin-transform-es2015-template-literals": "^6.22.0",
-    "del": "^2.0.1",
-    "grunt-traceur": "^0.5.5",
-    "gulp": "^3.9.0",
-    "gulp-concat": "^2.6.0",
-    "gulp-notify": "^2.2.0"
-  },
   "dependencies": {
-    "JsonObjectEditor": "file:grunt",
     "aws-sdk": "^2.358.0",
     "basic-auth": "^1.0.3",
     "body-parser": "^1.18.3",
@@ -58,5 +46,16 @@
     "plaid": "^3.1.1",
     "renderizer": "^1.1.0",
     "socket.io": "^2.2.0"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.7.4",
+    "@babel/core": "^7.7.4",
+    "@babel/preset-env": "^7.7.4",
+    "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+    "del": "^2.0.1",
+    "grunt-traceur": "^0.5.5",
+    "gulp": "^3.9.0",
+    "gulp-concat": "^2.6.0",
+    "gulp-notify": "^2.2.0"
   }
 }

package/server/schemas/ledger.js

@@ -181,15 +181,18 @@ var schema = {
                 var height = 32;
                 var balance = parseFloat(item.starting_balance);
                 var amount;
-                var html ='<table class="joe-table">'+
-                '<colgroup>'+
-                '<col span="1" style="width: 40px;">'+
+                var html ='<table class="joe-table ledger-table fixed">'+
+                //'<colgroup>'+
+                //00ffbf
+                '<col span="1" style="width: 4px;">'+
+                '<col span="1" style="width: 50px;">'+
+                '<col span="1"  >'+
                 //'<col span="1" style="width: 40px;">'+
-                '<col span="1" >\
-                <col span="1" >\
-                <col span="1" style="width:120px;">\
-                <col span="1"  >\
-                </colgroup>'
+                '<col span="1" style="width:calc(100%-250px);">\
+                <col span="1" style="width:100px;">\
+                <col span="1" style="width:100px;">'
+                
+//                +'</colgroup>'
                     +'<tr>'
                     //+'<th width=40></th><th width=40></th>'
                     +'<th colspan="4" align="left">Starting Balance</th><td  style="width:75px;">'
@@ -275,6 +278,22 @@ var schema = {
                         transaction.tdate = tdate;
                         transactions.push($.extend({str_tdate:$c.format(new Date(tdate),'Y/m/d')},trans,pretrans,transaction));
                         
+                    }else if(tdate.isArray()){
+                        tdate.map((ctd,i)=>{
+                            let transaction = {};
+                            //fix transations missing leading 0
+                            if(ctd.indexOf('/') == 1){
+                                ctd = '0'+ctd;
+                            }
+                            var pretrans = transactionPassthrough(trans,ctd);
+                            transaction.amount = (trans.transaction_type == 'credit') ? pretrans.amount : -pretrans.amount;
+                            // if(pretrans.status == 'paid' || pretrans.status == "autopay"){
+                            //     pending += transaction.amount;
+                            // }
+                            transaction.tdate = ctd;
+                            transactions.push($.extend({str_tdate:$c.format(new Date(ctd),'Y/m/d')},trans,pretrans,transaction));
+                        })
+
                     }
                 }
                 
@@ -375,7 +394,7 @@ var schema = {
 
 
                         budget_html += '<tr data-budgetid="'+bud._id+'" class="row-divider">'
-                            + '<td colspan="4">'+bud.name+remaining_str+'</td>' 
+                            + '<td colspan="5">'+bud.name+remaining_str+'</td>' 
                             //+ '<td>$' + budget_amount + '</td>'
                             +'<td>' + budget_amount + '</td>'
                             +'<td align="right" class="left-border" style="font-weight:500;">' +('$'+balance).replace('$-','-$') + '</td>'
@@ -383,20 +402,23 @@ var schema = {
                         budget_html+= subhtml;
                 });
                 //_bmResponse(bm,'budget loop')
-                budget_html = '<tr><th colspan="3" align="left">Budgeted Spending <br/><small>total</small></th>'
-                        +'<th colspan="2" align="right">'+('$'+bst).replace('$-','-$')+'</th><td></td></tr>'+budget_html;
+                budget_html = '<tr class="budget-header"><th colspan="4" align="left">Budgeted Spending <br/><small>total</small></th>'
+                        +'<th colspan="2" align="right">'+('$'+bst).replace('$-','-$')
+                        +'</th>'
+                        //+'<td></td>'
+                        +'</tr>'+budget_html;
 
                 //var ending =  _joe.getField('transactions').getEndingTotals();
                 var ending = _joe.schemas.ledger.methods.getEndingTotals(ledger);
                 ledger.ending_balance = balance;
                 var remaining_withdrawals = _joe.Utils.toDollars(ending.pending+ending.unspent);
                 html+=budget_html+
-                    '<tr><th colspan="5" align="left">Ending Balance</th><td align="right"><b>$'+balance+'</b></td></tr>'
-                    +'<tr><td colspan="3"></td><th colspan="2" align="left">Unspent</th><td id="unspent">$'
+                    '<tr class="end-bal-header"><th colspan="6" align="left">Ending Balance</th><td align="right"><b>$'+balance+'</b></td></tr>'
+                    +'<tr><td colspan="4"></td><th colspan="2" align="left">Unspent</th><td id="unspent">$'
                         +_joe.Utils.toDollars(ending.unspent)+'</td></tr>'
-                    +'<tr><td colspan="3"></td><th colspan="2" align="left">Pending</th><td id="pending">$'
+                    +'<tr><td colspan="4"></td><th colspan="2" align="left">Pending</th><td id="pending">$'
                         +_joe.Utils.toDollars(ending.pending)+'</td></tr>'
-                    +'<tr><td colspan="3"></td><th colspan="2" align="left">Remaining Withdrawals</th><td id="total_spending">$'+remaining_withdrawals+'</td></tr>'
+                    +'<tr><td colspan="4"></td><th colspan="2" align="left">Remaining Withdrawals</th><td id="total_spending">$'+remaining_withdrawals+'</td></tr>'
 
                    // +'<tr><td colspan="3"></td><th colspan="2" align="left">Total</th><td id="total_spending">$'+ending.total+'</td></tr>'
                     +'</tbody></table>';
@@ -577,6 +599,7 @@ var schema = {
                     }
                 case 'biweekly':
                     var next ='';
+                    var timesInRange = [];
                     var tdate = new Date(t.transaction_date);
                     if(tdate >= startDate && tdate <= endDate){
                         return (tdate.getMonth()+1)+'/'+("0" + tdate.getDate()).slice(-2)+'/'+tdate.getFullYear();
@@ -585,10 +608,16 @@ var schema = {
 
                         while(tdate <= endDate) {
                             tdate.setHours(24 * 14);
+                            // if(tdate >= startDate && tdate <= endDate){
+                            //     return (tdate.getMonth()+1)+'/'+("0" + tdate.getDate()).slice(-2)+'/'+tdate.getFullYear();
+                            // }
                             if(tdate >= startDate && tdate <= endDate){
-                                return (tdate.getMonth()+1)+'/'+("0" + tdate.getDate()).slice(-2)+'/'+tdate.getFullYear();
+                                timesInRange.push( (tdate.getMonth()+1)+'/'+("0" + tdate.getDate()).slice(-2)+'/'+tdate.getFullYear());
                             }
                         }
+                        if(timesInRange.length > 0){
+                            return timesInRange;
+                        }
                         return true;
                     }
                 case 'monthly':
@@ -646,6 +675,12 @@ var schema = {
             var id = (t._id.contains('_'))?(t._id).substr(0,t._id.indexOf('_')):t._id;
             var specs = specs || {};
             var bgcolor = (index%2==0)?'#f4f4f4':'transparent';
+            var stripeColor = 'transparent';
+            if(t.paycheck){
+                stripeColor = "#00ffbf";
+            }else{
+                stripeColor = (t.transaction_type =="credit")?'#00cc0044':'#cc000044';
+            }
             var action = '_joe.getField(\'transactions\').setStatus(\''+t._id+'\')';
             var trans_action = 'goJoe(_joe.search(\''+id+'\')[0],{schema:\'transaction\'})';
             var input_action='_joe.getField(\'transactions\').updateAmount(this.value,\''+t._id+'\')';
@@ -667,6 +702,7 @@ var schema = {
             
             var html = 
             '<tr data-transid="'+t._id+'" class="'+(specs.trcss||'')+'" style="background-color:'+(t.color||'')+';">' 
+                +`<td class="trans-stripe" style="background-color:${stripeColor};"></td>`
                 +'<td onclick="'+trans_action+'" class="joe-table-button joe-view-button" title="view">&nbsp;</td>'
                 //+((t.paycheck)?'': '<td onclick="'+action+'" class="joe-table-button joe-submit-button" title="status">&nbsp;</td>')
             +tname

package/web-components/joe-card.js

@@ -26,6 +26,11 @@ class JoeCard extends HTMLElement {
         padding: 0px 5px 5px 5px;
         background:#fff;
       }
+      joe-card.w50{
+        width: calc(50% - 3px);
+
+        display: inline-block;
+      }
     `;
     _joe.Components.appendStyles(styles);