Progress on collections + Cleanups.

Author: evoluteur

js/crud.js

@@ -179,24 +179,23 @@ function collecOne(req, res) {
     const mid = req.params.entity
         m = dico.getModel(mid),
         collecId = req.params.collec,
-        collec = m.collecsH[collecId],
-        pId = parseInt(req.query.id, 10);
+        collec = m.collecsH[collecId]
 
     if(m && collec){
-        const sqlParams = [pId],
-            sql = 'SELECT t1.id, '+sqls.select(collec.fields, null, 't1')+
-                ' FROM '+schema+'."'+collec.table+'" AS t1'+
-                    sqls.sqlFromLOVs(collec.fields, schema)+
-                ' WHERE t1."'+collec.column+'"=$1'+
-                ' ORDER BY t1.'+collecOrderBy(collec)+
-                ' LIMIT '+defaultPageSize+';';
-
-        query.runQuery(res, sql, sqlParams, false);        
+        const sqlParams = [parseInt(req.query.id, 10)];
+        query.runQuery(res, SQLCollecOne(collec), sqlParams, false);        
     }else{
         errors.badRequest(res)
     }
 }
 
+const SQLCollecOne = collec => 'SELECT t1.id, '+sqls.select(collec.fields, null, 't1')+
+    ' FROM '+schema+'."'+collec.table+'" AS t1'+
+        sqls.sqlFromLOVs(collec.fields, schema)+
+    ' WHERE t1."'+collec.column+'"=$1'+
+    ' ORDER BY t1.'+collecOrderBy(collec)+
+    ' LIMIT '+defaultPageSize+';';
+                
 // --------------------------------------------------------------------------------------
 
 module.exports = {

js/designer.js

@@ -39,6 +39,7 @@ const objProps = {
         "icon",
         "description",
         "groups",
+        "collections",
         //"c_date",
         //"u_date",
     ],
@@ -47,6 +48,7 @@ const objProps = {
         "table",
         "pkey",
         "active",
+        "collections",
     ]
 }
 /*

js/setup/database.js

@@ -339,7 +339,6 @@ function createSchema(runSQL = true, logFile = true){
 
         if(logFile) {
             logToFile(sql, false)
-            logToFile(sqlData, true)
         }
         pool.connect(function(err, client, done) {
             // - Create schema and tables

models/data/designer/object-data.js

@@ -244,6 +244,49 @@ module.exports = [
                     "comments"
                 ]
             }
+        ],
+        "collections": [
+            {
+                "id": "wine_tasting",
+                "title": 'Degustations',
+                "table": "wine_tasting",
+                "column": "wine_id",
+                "object": "winetasting",
+                "order": "desc",
+                "fields": [
+                    {
+                        "id": "drink_date",
+                        "column": "drink_date",
+                        "type": "date",
+                        "label": "Date",
+                        "required": true
+                    },
+                    {
+                        "id": "robe",
+                        "column": "robe",
+                        "type": "text",
+                        "label": "Robe"
+                    },
+                    {
+                        "id": "nose",
+                        "column": "nose",
+                        "type": "text",
+                        "label": "Nose"
+                    },
+                    {
+                        "id": "taste",
+                        "column": "taste",
+                        "type": "text",
+                        "label": "Taste"
+                    },
+                    {
+                        "id": "notes",
+                        "column": "notes",
+                        "type": "textmultiline",
+                        "label": "Note"
+                    }
+                ]
+            }
         ]
     },
     {
@@ -315,6 +358,40 @@ module.exports = [
                     "cover"
                 ]
             }
+        ],
+        "collections": [
+            {
+                "id": "music_track",
+                "label": "Tracks",
+                "icon": "music.png",
+                "table": "music_track",
+                "column": "album_id",
+                "orderBy": "name",
+                "object": "track",
+                "fields": [
+                    {
+                        "id": "name",
+                        "type": "text",
+                        "label": "Track",
+                        "column": "name",
+                        "inMany": true, 
+                    },
+                    {
+                        "id": "genre",
+                        "type": "lov",
+                        "label": "Genre",
+                        "column": "genre_id",
+                        "lovTable": "music_genre",
+                    },
+                    {
+                        "id": "length",
+                        "type": "text",
+                        "label": "Length",
+                        "column": "length",
+                        "inMany": true
+                    },
+                ]
+            }
         ]
     },
     {
@@ -349,6 +426,31 @@ module.exports = [
                     "photo"
                 ]
             }
+        ],
+        "collections": [
+            {
+                "id": "music_album",
+                "label": "Albums",
+                "icon": "cd.png",
+                "table": "music_album",
+                "object": "album",
+                "column": "artist_id",
+                "orderBy": "title",
+                "fields": [
+                    {
+                        "id": "title",
+                        "type": "text",
+                        "label": "Title",
+                        "column": "title",
+                    },
+                    {
+                        "id": "cover", 
+                        "column": "cover", 
+                        "type": "image", 
+                        "label": "Cover",
+                    }
+                ]
+            }
         ]
     },
     {

models/designer/object.js

@@ -129,6 +129,12 @@ module.exports = {
 			"type": "json",
 			"label": "Fields groups",
 			"column": "groups"
+		},
+		{
+			"id": "collections",
+			"type": "json",
+			"label": "Collections",
+			"column": "collections"
 		}
 	],
 	"collections": [