Small fixes.

Author: evoluteur

README.md

@@ -129,6 +129,8 @@ Models contain the name of the driving table and the list of fields/columns pres
 | fields       | Array of fields.                        |
 | titleField   | Field id for the column value used as record title. |
 | searchFields | Array of field ids for fields used to perform searches.  |  
+| noCharts     | No Charts or Dashboard views.   |
+| noStats      | No Stats on the object.         |
 
 <a name="Field"></a>
 ### Field
@@ -148,7 +150,8 @@ Models contain the name of the driving table and the list of fields/columns pres
 | max, min     | Maximum/Minimum value allowed (only applies to numeric fields).      |
 | maxLength, minLength | Maximum/Minimum length allowed (only applies to text fields).|
 | unique       | Values must be unique (not implemented yet).   |
-| noCharts     | Forbids charts on the field.   |
+| noCharts     | Exclude field from charts.      |
+| noStats     | Exclude field from Stats.      |
 | deleteTrigger | Deleting records in the lovTable will trigger a cascade delete (this property is only used while creating the database). |
 
 

js/charts.js

@@ -43,7 +43,7 @@ let sql,
     if(m && fid){
         let f = m.fieldsH[fid];
         if(f){
-            if(dico.fieldInCharts){
+            if(dico.fieldInCharts(f)){
                 const col = '"'+f.column+'"',
                     sqlFrom = ' FROM '+m.schemaTable+' AS t1';
 

js/stats.js

@@ -52,7 +52,7 @@ const fnPrep = fields => data => {
         pStats.nb_comments = data.nb_comments
     }
     fields.forEach(f => {
-        if(dico.fieldIsNumeric(f)){ 
+        if(dico.fieldIsNumeric(f) && !f.noStats){ 
             let item = {
                 min: data[f.id+'_min'],
                 max: data[f.id+'_max'],
@@ -77,37 +77,43 @@ function numbers(req, res) {
         m = dico.getModel(mid)
 
     if(m){
-        let sql = 'SELECT count(*)::integer AS count';
-        const sqlFROM = ' FROM '+m.schemaTable;  
+        if(!m.noStats){
+            let sql = 'SELECT count(*)::integer AS count';
+            const sqlFROM = ' FROM '+m.schemaTable;  
 
-        m.fields.forEach(function(f){
-            if(dico.fieldIsNumeric(f)){
-                if(!dico.fieldIsDateOrTime(f)){
-                    sql += sqlAggregate('avg', f)
+            m.fields.forEach(function(f){
+                if(dico.fieldIsNumeric(f) && !f.noStats){
+                    if(!dico.fieldIsDateOrTime(f)){
+                        sql += sqlAggregate('avg', f)
+                    }
+                    if(f.type===ft.money || f.type===ft.int){
+                        sql += sqlAggregate('sum', f)
+                    }
+                    sql += sqlAggregate('min', f)
+                    sql += sqlAggregate('max', f)
+                //}else if(f.type===ft.lov){
+                //    sql += ',(select id, count("'+f.column+'")::integer FROM '+m.schemaTable+' GROUP BY id LIMIT 3)'
                 }
-                if(f.type===ft.money || f.type===ft.int){
-                    sql += sqlAggregate('sum', f)
-                }
-                sql += sqlAggregate('min', f)
-                sql += sqlAggregate('max', f)
+            })
+            if(config.wTimestamp){
+                // - last update
+                sql += ', max('+config.updatedDateColumn+') AS u_date_max' +
+                    // - number of insert & updates this week
+                    ', (SELECT count('+m.pKey+')::integer '+sqlFROM+
+                        ' WHERE '+config.updatedDateColumn+' > NOW() - interval \'7 days\')'+
+                        ' AS u_date_week_count' +
+                    // - first insert
+                    ', min('+config.createdDateColumn+') AS c_date_min' 
             }
-        })
-        if(config.wTimestamp){
-            // - last update
-            sql += ', max('+config.updatedDateColumn+') AS u_date_max' +
-                // - number of insert & updates this week
-                ', (SELECT count('+m.pKey+')::integer '+sqlFROM+
-                    ' WHERE '+config.updatedDateColumn+' > NOW() - interval \'7 days\')'+
-                    ' AS u_date_week_count' +
-                // - first insert
-                ', min('+config.createdDateColumn+') AS c_date_min' 
-        }
-        if(config.wComments){
-            // - number of comments
-            sql += ', sum(nb_comments::integer)::integer AS nb_comments'
+            if(config.wComments){
+                // - number of comments
+                sql += ', sum(nb_comments::integer)::integer AS nb_comments'
+            }
+            sql += sqlFROM
+            query.runQuery(res, sql, [], true, null, null, fnPrep(m.fields));
+        }else{
+            errors.badRequest(res, 'noStats set on model "'+mid+'".')
         }
-        sql += sqlFROM
-        query.runQuery(res, sql, [], true, null, null, fnPrep(m.fields));
     }else{
         errors.badRequest(res, 'Invalid model: "'+mid+'".')
     }

js/utils/errors.js

@@ -5,8 +5,8 @@ function badRequest(res, msg, errorCode = 400) {
 
 	logger.logError(msg)
     res.statusMessage = errorMsg
-    res.status(errorCode).end();
-    return res
+    res.status(errorCode)//.end();
+    return res.json({error: errorMsg})
 }
 
 module.exports = {

models/data/music/album-data.js

@@ -24,6 +24,7 @@ module.exports = [
         id: 4, 
         title: "Lovers Rock", 
         artist: 3, 
+        url: "https://smile.amazon.com/Lovers-Rock-Sade/dp/B00JRBGE62",
         cover: "music/sade-loversrock.jpg"
     },
     {
@@ -37,6 +38,7 @@ module.exports = [
         id: 6, 
         title: "18", 
         artist: 4, 
+        url: "https://smile.amazon.com/18-Moby/dp/B000063S6Z",
         cover: "music/moby-18.jpg"
     },
     {