Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

back/model-config.json

@@ -43,5 +43,11 @@
     },
     "PersonMedia": {
         "dataSource": "vn"
-    }  
-}
+    },
+    "PersonDepartment": {
+        "dataSource": "vn"
+    }
+}
+
+
+

back/models/person-department.json

@@ -0,0 +1,31 @@
+{
+    "name": "PersonDepartment",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+        "table": "personDepartment"
+        }
+    },
+    "properties": {
+        "name": {
+        "type": "String"
+        },
+        "firstName": {
+        "type": "String"
+        },
+        "workerFk": {
+        "id": true,
+        "type": "Number"
+        },
+        "department": {
+        "type": "Number"
+        }
+    },
+    "relations": {
+        "worker": {
+        "type": "belongsTo",
+        "model": "Worker",
+        "foreignKey": "workerFk"
+        }
+    }
+}

services/db/install/changes/1.2-CHECK/19-personDepartment.sql

@@ -5,7 +5,7 @@ CREATE
     SQL SECURITY DEFINER
 VIEW `vn`.`personDepartment` AS
     SELECT 
-        `p`.`id_trabajador` AS `id_trabajador`,
+        `p`.`id_trabajador` AS `workerFk`,
         `p`.`name` AS `name`,
         `p`.`firstname` AS `firstname`,
         `d`.`name` AS `department`