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

db/changes/10240-allSaints/00-supplierLog.sql

@@ -0,0 +1,20 @@
+CREATE TABLE `vn`.`supplierLog` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `originFk` int(11) NOT NULL,
+  `userFk` int(10) unsigned NOT NULL,
+  `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `description` text CHARACTER SET utf8 DEFAULT NULL,
+  `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `changedModelId` int(11) DEFAULT NULL,
+  `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `logSupplier_ibfk_1` (`originFk`),
+  KEY `supplierLog_ibfk_2` (`userFk`),
+  CONSTRAINT `supplierLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `supplier` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `supplierLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+

db/dump/fixtures.sql

@@ -1208,11 +1208,11 @@ INSERT INTO `vn`.`annualAverageInvoiced`(`clientFk`, `invoiced`)
         (104, 500),
         (105, 5000);
 
-INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`,`isFarmer`,`retAccount`,`commission`, `created`, `postcodeFk`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`)
+INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`,`isFarmer`,`commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `transactionTypeSageFk`)
     VALUES
-        (1,   'Plants SL',             'Plants nick',   4000000001, 1, '06089160W', 0, NULL, 0, CURDATE(), 1111, 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15),
+        (1,   'Plants SL',             'Plants nick',   4100000001, 1, '06089160W', 0, 0, CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, NULL,   NULL),
-        (2,   'Flower King',           'The king',      4000000002, 1, 'B22222222', 0, NULL, 0, CURDATE(), 2222, 1, 'supplier address 2', 'LONDON',     2, 45671, 1, 2, 10),
+        (2,   'Farmer King',           'The farmer',    4000020002, 1, 'B22222222', 1, 0, CURDATE(), 1, 'supplier address 2', 'SILLA',      2, 43022, 1, 2, 10, 93,     8),
-        (442, 'Verdnatura Levante SL', 'Verdnatura',    4000000442, 1, 'C33333333', 0, NULL, 0, CURDATE(), 3333, 1, 'supplier address 3', 'SILLA',      1, 43022, 1, 2, 15);
+        (442, 'Verdnatura Levante SL', 'Verdnatura',    5115000442, 1, 'C33333333', 0, 0, CURDATE(), 1, 'supplier address 3', 'SILLA',      1, 43022, 1, 2, 15, NULL,   NULL);
 
 INSERT INTO `vn`.`supplierContact`(`id`, `supplierFk`, `phone`, `mobile`, `email`, `observation`, `name`)
     VALUES

e2e/paths/12-entry/01_summary.spec.js

@@ -21,10 +21,10 @@ describe('Entry summary path', () => {
     });
 
     it(`should display details from the entry on the header`, async() => {
-        await page.waitForTextInElement(selectors.entrySummary.header, 'The king');
+        await page.waitForTextInElement(selectors.entrySummary.header, 'The farmer');
         const result = await page.waitToGetProperty(selectors.entrySummary.header, 'innerText');
 
-        expect(result).toContain('The king');
+        expect(result).toContain('The farmer');
     });
 
     it('should display some entry details like the reference', async() => {

modules/supplier/back/model-config.json

@@ -4,5 +4,8 @@
     },
     "PayDem": {
         "dataSource": "vn"
+    },
+    "SupplierLog": {
+        "dataSource": "vn"
     }
 }

modules/supplier/back/models/supplier-log.json

@@ -0,0 +1,58 @@
+{
+	"name": "SupplierLog",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "supplierLog"
+		}
+	},
+	"properties": {
+		"id": {
+			"id": true,
+			"type": "Number",
+			"forceId": false
+		},
+		"originFk": {
+			"type": "Number",
+			"required": true
+		},
+		"userFk": {
+			"type": "Number"
+		},
+		"action": {
+			"type": "String",
+			"required": true
+		},
+		"changedModel": {
+			"type": "String"
+		},
+		"oldInstance": {
+			"type": "Object"
+		},
+		"newInstance": {
+			"type": "Object"
+		},
+		"creationDate": {
+			"type": "Date"
+		},
+		"changedModelId": {
+			"type": "String"
+		},
+		"changedModelValue": {
+			"type": "String"
+		},
+		"description": {
+			"type": "String"
+		}
+	},
+	"relations": {
+		"user": {
+			"type": "belongsTo",
+			"model": "Account",
+			"foreignKey": "userFk"
+		}
+	},
+	"scope": {
+		"order": ["creationDate DESC", "id DESC"]
+	}
+}

modules/supplier/back/models/supplier.json

@@ -1,6 +1,9 @@
 {
     "name": "Supplier",
-    "base": "VnModel",
+    "base": "Loggable",
+    "log": {
+        "model":"SupplierLog"
+	},
     "options": {
         "mysql": {
             "table": "supplier"

modules/supplier/front/index.js

@@ -1,8 +1,9 @@
 export * from './module';
 
 import './main';
-import './index/';
-import './search-panel';
-import './summary';
 import './card';
 import './descriptor';
+import './index/';
+import './search-panel';
+import './log';
+import './summary';

modules/supplier/front/log/index.html

@@ -0,0 +1 @@
+<vn-log url="SupplierLogs" origin-id="$ctrl.$params.id"></vn-log>

modules/supplier/front/log/index.js

@@ -0,0 +1,7 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+ngModule.vnComponent('vnSupplierLog', {
+    template: require('./index.html'),
+    controller: Section,
+});

modules/supplier/front/routes.json

@@ -9,6 +9,7 @@
             {"state": "supplier.index", "icon": "icon-supplier"}
         ],
         "card": [
+            {"state": "supplier.card.log", "icon": "history"}
         ]
     },
     "routes": [
@@ -36,6 +37,11 @@
             "params": {
                 "supplier": "$ctrl.supplier"
             }
+        }, {
+            "url" : "/log",
+            "state": "supplier.card.log",
+            "component": "vn-supplier-log",
+            "description": "Log"
         }
     ]
 }