Fields of type "list" for multiselection + cleanups.

Author: evoluteur

README.md

@@ -141,7 +141,7 @@ Models contain the name of the driving table and the list of fields/columns pres
 | lovColumn    | Column name (in the lovTable) for field value (only for fields of type "lov"). |
 | lovIcon      | Set to True to include icon with LOV items (only for fields of type "lov").    |
 | object       | Model id for the object to link to (only for fields of type "lov").    |
-| type         | Field type is not a database column type but more a UI field type. Possible field types: <ul><li>boolean</li><li>date</li><li>datetime</li><li>decimal</li><li>document</li><li>email</li><li>image</li><li>integer</li><li>lov (list of values)</li><li>money</li><li>text</li><li>textmultiline</li><li>time</li><li>url</li></ul> |
+| type         | Field type is not a database column type but more a UI field type. Possible field types: <ul><li>boolean</li><li>date</li><li>datetime</li><li>decimal</li><li>document</li><li>email</li><li>image</li><li>integer</li><li>lov (list of values)</li><li>list (multiselect)</li><li>money</li><li>text</li><li>textmultiline</li><li>time</li><li>url</li></ul> |
 | required     | Determines if the field is required for saving.      |
 | readOnly     | Display field as readOnly (not editable).            |
 | inMany       | Determines if the field is present (by default) in lists of records. |
@@ -533,7 +533,7 @@ Fields of type "lov" (List of values) are represented as 2 fields for Id and val
 	    complete
   }
   # List - contacts w/ firstname starts w/ "A" and search for "ab"
-  	ab_a_contacts:contacts (search: "ab", firstname: "sw.A") { 
+  	ab_a_contacts: contacts (search: "ab", firstname: "sw.A") { 
 	    id
 	    firstname
 	    lastname
@@ -554,11 +554,11 @@ All objects flagged as active are exposed for querying a single record by Id.
 ```
 # contact w/ id = 1
 { 
-	contact (id: 1 ){
-    firstname
-    lastname
-    category_txt
-    email
+    contact (id: 1 ){
+        firstname
+        lastname
+        category_txt
+        email
   }
 }
 

js/graphql-schema.js

@@ -42,7 +42,7 @@ function fieldType(f){
     }else if(f.type===ft.dec){
         gqlType = GraphQLFloat
     }else if(f.type===ft.list){
-        gqlType = GraphQLList
+        gqlType = GraphQLList(GraphQLInt)
     }else{
         gqlType = GraphQLString
     }/*

js/setup/database.js

@@ -36,7 +36,7 @@ const ft_postgreSQL = {
     datetime: 'timestamp'+noTZ,
     time: 'time'+noTZ,
     lov: 'integer',
-    list: 'text[]', // many values for one field (behave like tags - return an array of strings)
+    list: 'integer[]', // many values for one field (array of integer for ids in lovTable)
     html: 'text',
     email: 'text',
     pix: 'text',
@@ -59,7 +59,8 @@ const sysColumns = {
 
 const stringValue = v => v ? ("'"+v.replace(/'/g, "''")+"'") : 'NULL'
 
-const lovTable = f => schema+'."'+(f.lovTable ? f.lovTable : (tableName+'_'+f.id))+'"';
+const lovTable = (f, tableName) => f.lovTable ? f.lovTable : (tableName+'_'+f.id);
+const lovTableWithSchema = (f, tableName) => schema+'."'+lovTable(f, tableName)+'"';
 
 function sqlInsert(tableNameSchema, m, data){
     const { pKey, fieldsH } = m
@@ -130,7 +131,7 @@ function sqlInsert(tableNameSchema, m, data){
 }
 
 function sqlCreatePopulateLOV(f, tableName, lovIncluded){
-    const t = lovTable(f);
+    const t = lovTableWithSchema(f, tableName);
     const icons = f.lovIcon || false;
     let sql = ''
     let maxId = -1
@@ -156,10 +157,11 @@ function sqlCreatePopulateLOV(f, tableName, lovIncluded){
                 txt += icons ? (',\'' + (item.icon || '') + '\')') : ')'
                 return txt
             }).join(',\n')+';\n\n';
+            const t = lovTable(f, tableName);
             if(maxId){
                 maxId++
                 sql += 'ALTER SEQUENCE '+schema+
-                    '."'+f.lovTable+'_id_seq" RESTART WITH '+maxId+';\n\n'
+                    '."'+t+'_id_seq" RESTART WITH '+maxId+';\n\n'
             }
         }
         lovIncluded.push(t)

js/stats.js

@@ -25,10 +25,11 @@ function sqlAggregate(fn, f){
     }else{ // min, max, sum
         switch(f.type){
             case ft.int:
-            case ft.dec:
-                //tcast = '::numeric'+f.type
                 tcast = '::'+f.type
                 break
+            case ft.dec:
+                tcast = '::numeric::float8'
+                break
         }  
     }
     return ', '+fn+'("'+f.column+'"'+num+')'+tcast+' AS "'+f.id+'_'+fn+'"'
@@ -50,7 +51,7 @@ const fnPrep = fields => data => {
     if(config.wComments){
         pStats.nb_comments = data.nb_comments
     }
-    fields.forEach((f)=>{
+    fields.forEach(f => {
         if(dico.fieldIsNumeric(f)){ 
             let item = {
                 min: data[f.id+'_min'],

js/utils/dico.js

@@ -93,7 +93,7 @@ const fieldIsText = f => [ft.text, ft.textml, ft.url, ft.html, ft.email].indexOf
 const fieldIsDateOrTime = f => f.type===ft.date || f.type===ft.datetime || f.type===ft.time
 const fieldIsNumeric = f => fieldIsNumber(f) || fieldIsDateOrTime(f)
 
-const fieldChartable = f => f.type===ft.lov || f.type===ft.list || f.type===ft.bool || fieldIsNumber(f)
+const fieldChartable = f => f.type===ft.lov || f.type===ft.bool || fieldIsNumber(f)
 const fieldInCharts = f => fieldChartable(f) && !f.noCharts
 
 function prepModel(m){

js/utils/query.js

@@ -72,7 +72,7 @@ function runQuery(res, sql, values, singleRecord, format, header, fnPrep){
                     return res.json([]);
                 }
             }
-            errors.badRequest(res, 'Database error.', 500)
+            return errors.badRequest(res, 'Database error - '+err.message, 500)
         })
 }
 

models/tests/test.js

@@ -61,6 +61,17 @@ const fields = [
 		"column": "f_lovlc",
 		"lovTable": "z_test_flavor"
 	},
+	{
+		"id": "list",
+		"type": "list",
+		"label": "Multiselect",
+		//"required": true,
+		"list": flavors,
+		"column": "f_list",
+		"inMany": true,
+		"width": 100,
+		"lovTable": "z_test_flavor"
+	},
 	{
 		"id": "date",
 		"type": "date",