Skip to content

Commit ffa38a1

Browse files
committed
Cleanups.
1 parent 02ac079 commit ffa38a1

6 files changed

Lines changed: 60 additions & 25 deletions

File tree

models/designer/field.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
/*
2-
Evolutility DB Model for Fields
2+
Evolutility DB model for Fields
33
https://github.com/evoluteur/evolutility-server-node
44
*/
55

66
module.exports = {
77
"id": "field",
8+
"title": "Fields",
9+
"pKey": "id",
810
"table": "evol_field",
911
"titleField": "label",
12+
"searchFields": [
13+
"label",
14+
"column",
15+
"help",
16+
"description"
17+
],
1018
"fields": [
1119
{
1220
"id": "label",
@@ -66,7 +74,7 @@ module.exports = {
6674
{
6775
"id": 9,
6876
"text": "Date-time",
69-
"icon": "designer/ft-datehm.gif"
77+
"icon": "designer/ft-datetime.gif"
7078
},
7179
{
7280
"id": 10,
@@ -131,7 +139,7 @@ module.exports = {
131139
"type": "text",
132140
"label": "LOV Table",
133141
"maxLength": 100,
134-
"column": "lovtable"
142+
"column": "lovTable"
135143
},
136144
{
137145
"id": "lovColumn",
@@ -158,6 +166,7 @@ module.exports = {
158166
"id": "position",
159167
"type": "integer",
160168
"label": "Position",
169+
"noCharts": true,
161170
"maxLength": 3,
162171
"column": "position"
163172
},
@@ -194,8 +203,8 @@ module.exports = {
194203
},
195204
{
196205
"id": "labelShort",
197-
"label": "Short label",
198206
"type": "text",
207+
"label": "Label",
199208
"column": "labelshort"
200209
},
201210
{
@@ -229,15 +238,15 @@ module.exports = {
229238
},
230239
{
231240
"id": "minValue",
232-
"type": "decimal",
241+
"type": "integer",
233242
"label": "Min. value",
234243
"noCharts": true,
235244
"maxLength": 4,
236245
"column": "minvalue"
237246
},
238247
{
239248
"id": "maxValue",
240-
"type": "decimal",
249+
"type": "integer",
241250
"label": "Max. value",
242251
"noCharts": true,
243252
"maxLength": 4,

models/designer/object.js

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
/*
2-
Evolutility DB Model for Object
2+
Evolutility DB model for Objects
33
https://github.com/evoluteur/evolutility-server-node
44
*/
55

66
module.exports = {
77
"id": "object",
8+
"title": "Objects",
9+
"pKey": "id",
810
"table": "evol_object",
911
"titleField": "title",
12+
"searchFields": [
13+
"title",
14+
"name",
15+
"table",
16+
"description"
17+
],
1018
"fields": [
1119
{
1220
"id": "title",
@@ -27,7 +35,7 @@ module.exports = {
2735
{
2836
"id": "world",
2937
"type": "lov",
30-
"label": "World",
38+
"label": "App",
3139
"object": "world",
3240
"lovIcon": false,
3341
"inMany": true,
@@ -45,14 +53,14 @@ module.exports = {
4553
},
4654
{
4755
"id": "pKey",
48-
"column": "pkey",
49-
"label": "Primary key column",
5056
"type": "text",
57+
"label": "Primary key column",
58+
"column": "pkey"
5159
},
5260
{
5361
"id": "entity",
5462
"type": "text",
55-
"label": "Entity Id",
63+
"label": "Object Id",
5664
"required": true,
5765
"maxLength": 100,
5866
"inMany": true,
@@ -84,6 +92,18 @@ module.exports = {
8492
"inMany": true,
8593
"column": "icon"
8694
},
95+
{
96+
"id": "titleField",
97+
"type": "text",
98+
"label": "Title field",
99+
"column": "titlefield"
100+
},
101+
{
102+
"id": "searchFields",
103+
"type": "textmultiline",
104+
"label": "Search fields",
105+
"column": "searchfields"
106+
},
87107
{
88108
"id": "description",
89109
"type": "textmultiline",
@@ -97,7 +117,6 @@ module.exports = {
97117
"id": "collec-fields",
98118
"table": "evol_field",
99119
"column": "object_id",
100-
orderby: 'position', // column but should be fieldid
101120
"object": "field",
102121
"fields": [
103122
{
@@ -106,18 +125,19 @@ module.exports = {
106125
"label": "Label",
107126
"column": "label"
108127
},
128+
{
129+
"id": "column",
130+
"label": "Column",
131+
"column": "dbcolumn"
132+
},
109133
{
110134
"id": "type",
111135
"type": "lov",
112136
"label": "Type",
113137
"lovIcon": true,
114138
"column": "type_id",
115139
"lovTable": "evol_field_type",
116-
},
117-
{
118-
"id": "column",
119-
"label": "column",
120-
"column": "dbcolumn"
140+
"lovColumn": "name"
121141
},
122142
{
123143
"id": "inMany",

models/designer/world.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
/*
2-
Evolutility DB Model for Worlds
2+
Evolutility DB model for Applications
33
https://github.com/evoluteur/evolutility-server-node
44
*/
55

66
module.exports = {
77
"id": "world",
8+
"title": "Applications",
9+
"pKey": "id",
810
"table": "evol_world",
911
"titleField": "name",
12+
"searchFields": [
13+
"name",
14+
"description"
15+
],
1016
"fields": [
1117
{
1218
"id": "name",
@@ -53,17 +59,17 @@ module.exports = {
5359
"column": "title"
5460
},
5561
{
56-
"label": "Icon",
57-
"type": "text",
5862
"id": "icon",
59-
"column": "icon",
63+
"type": "image",
64+
"label": "Icon",
65+
"column": "icon"
6066
},
6167
{
6268
"id": "active",
6369
"type": "boolean",
6470
"label": "Active",
6571
"column": "active"
66-
},
72+
}
6773
]
6874
}
6975
]

models/music/album.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Evolutility DB model for Albums
3-
https://github.com/evoluteur/evolutility-server-node
3+
https://github.com/evoluteur/evolutility-server-node
44
*/
55

66
module.exports = {

models/music/artist.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Evolutility DB model for Artists
3-
https://github.com/evoluteur/evolutility-server-node
3+
https://github.com/evoluteur/evolutility-server-node
44
*/
55

66
module.exports = {

models/music/track.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Evolutility DB model for Tracks
3-
https://github.com/evoluteur/evolutility-server-node
3+
https://github.com/evoluteur/evolutility-server-node
44
*/
55

66
module.exports = {

0 commit comments

Comments
 (0)