From 4028444d0abc9138d0f15c703399d2cd46a338dc Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 23 Nov 2020 10:03:12 +0100 Subject: [PATCH 001/101] front config refactor + package projects --- jest.config.js | 206 ------------------------------------------- jest.front.config.js | 51 +++++++++++ package.json | 9 +- 3 files changed, 59 insertions(+), 207 deletions(-) delete mode 100644 jest.config.js create mode 100644 jest.front.config.js diff --git a/jest.config.js b/jest.config.js deleted file mode 100644 index 874d9ac0b8..0000000000 --- a/jest.config.js +++ /dev/null @@ -1,206 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - - // All imported modules in your tests should be mocked automatically - // automock: false, - - // Stop running tests after `n` failures - // bail: 0, - - // Respect "browser" field in package.json when resolving modules - // browser: false, - - // The directory where Jest should store its cached dependency information - // cacheDirectory: "/private/var/folders/_b/2qg94x6n3kd0h_71bp2426wm0000gn/T/jest_dx", - - // Automatically clear mock calls and instances between every test - // clearMocks: true, - - // Indicates whether the coverage information should be collected while executing the test - // collectCoverage: false, - - // An array of glob patterns indicating a set of files for which coverage information should be collected - // collectCoverageFrom: null, - - // The directory where Jest should output its coverage files - coverageDirectory: 'coverage', - - // An array of regexp pattern strings used to skip coverage collection - coveragePathIgnorePatterns: [ - '/node_modules/', - '.spec.js' - ], - - // A list of reporter names that Jest uses when writing coverage reports - // coverageReporters: [ - // "json", - // "text", - // "lcov", - // "clover" - // ], - - // An object that configures minimum threshold enforcement for coverage results - // coverageThreshold: null, - - // A path to a custom dependency extractor - // dependencyExtractor: null, - - // Make calling deprecated APIs throw helpful error messages - // errorOnDeprecated: false, - - // Force coverage collection from ignored files using an array of glob patterns - // forceCoverageMatch: [], - - // A path to a module which exports an async function that is triggered once before all test suites - // globalSetup: null, - - // A path to a module which exports an async function that is triggered once after all test suites - // globalTeardown: null, - - // A set of global variables that need to be available in all test environments - // globals: {}, - - // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers. - // maxWorkers: "50%", - - // An array of directory names to be searched recursively up from the requiring module's location - moduleDirectories: [ - `front`, - `modules`, - `front/node_modules`, - `node_modules`, - `print` - ], - - // An array of file extensions your modules use - moduleFileExtensions: [ - 'js', - // "json", - // "jsx", - // "ts", - // "tsx", - // "node" - ], - - // A map from regular expressions to module names that allow to stub out resources with a single module - moduleNameMapper: { - '\\.(css|scss)$': 'identity-obj-proxy', - '\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '/fileMock.js', - }, - - // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader - // modulePathIgnorePatterns: [], - - // Activates notifications for test results - // notify: false, - - // An enum that specifies notification mode. Requires { notify: true } - // notifyMode: "failure-change", - - // A preset that is used as a base for Jest's configuration - // preset: null, - - // Run tests from one or more projects - // projects: null, - - // Use this configuration option to add custom reporters to Jest - // reporters: undefined, - - // Automatically reset mock state between every test - // resetMocks: false, - - // Reset the module registry before running each individual test - // resetModules: false, - - // A path to a custom resolver - // resolver: null, - - // Automatically restore mock state between every test - // restoreMocks: false, - - // The root directory that Jest should scan for tests and modules within - // rootDir: null, - - // A list of paths to directories that Jest should use to search for files in - // roots: [ - // "" - // ], - - // Allows you to use a custom runner instead of Jest's default test runner - // runner: "jest-runner", - - // The paths to modules that run some code to configure or set up the testing environment before each test - // setupFiles: [], - - // A list of paths to modules that run some code to configure or set up the testing framework before each test - setupFilesAfterEnv: [ - './jest-front.js' - ], - - // A list of paths to snapshot serializer modules Jest should use for snapshot testing - // snapshotSerializers: [], - - // The test environment that will be used for testing - // testEnvironment: 'node', - - // Options that will be passed to the testEnvironment - // testEnvironmentOptions: {}, - - // Adds a location field to test results - // testLocationInResults: false, - - // The glob patterns Jest uses to detect test files - testMatch: [ - '**/front/**/*.spec.js', - '**/print/**/*.spec.js', - // 'loopback/**/*.spec.js', - // 'modules/*/back/**/*.spec.js' - // "**/__tests__/**/*.[jt]s?(x)", - // "**/?(*.)+(spec|test).[tj]s?(x)" - ], - - // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped - // testPathIgnorePatterns: [ - // "/node_modules/" - // ], - - // The regexp pattern or array of patterns that Jest uses to detect test files - // testRegex: [], - - // This option allows the use of a custom results processor - // testResultsProcessor: null, - - // This option allows use of a custom test runner - // testRunner: "jasmine2", - - // This option sets the URL for the jsdom environment. It is reflected in properties such as location.href - testURL: 'http://localhost', - - // Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout" - // timers: "real", - - // A map from regular expressions to paths to transformers - transform: { - '^.+\\.js?$': 'babel-jest', - '^.+\\.html$': 'html-loader-jest' - }, - - // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation - // transformIgnorePatterns: [ - // '/node_modules/' - // ], - - // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them - // unmockedModulePathPatterns: undefined, - - // Indicates whether each individual test should be reported during the run - verbose: false, - - // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode - // watchPathIgnorePatterns: [], - - // Whether to use watchman for file crawling - // watchman: true, -}; diff --git a/jest.front.config.js b/jest.front.config.js new file mode 100644 index 0000000000..dbea13950e --- /dev/null +++ b/jest.front.config.js @@ -0,0 +1,51 @@ +// For a detailed explanation regarding each configuration property, visit: +// https://jestjs.io/docs/en/configuration.html + +module.exports = { + name: 'front end', + displayName: { + name: 'Front end', + color: 'cyan', + }, + testEnvironment: 'jsdom', + setupFilesAfterEnv: [ + './jest-front.js' + ], + testMatch: [ + '**/front/**/*.spec.js', + '**/print/**/*.spec.js', + 'loopback/**/*.spec.js', + 'modules/*/back/**/*.spec.js' + ], + testPathIgnorePatterns: [ + '/node_modules/' + ], + coveragePathIgnorePatterns: [ + '/node_modules/', + '.spec.js' + ], + moduleDirectories: [ + `front`, + `modules`, + `front/node_modules`, + `node_modules`, + `print` + ], + moduleFileExtensions: [ + 'js', + ], + moduleNameMapper: { + '\\.(css|scss)$': 'identity-obj-proxy', + '\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '/fileMock.js', + }, + testURL: 'http://localhost', + verbose: false, + errorOnDeprecated: true, + restoreMocks: true, + timers: 'real', + transform: { + '^.+\\.js?$': 'babel-jest', + '^.+\\.html$': 'html-loader-jest' + }, +}; + diff --git a/package.json b/package.json index c594514669..a384e59c73 100644 --- a/package.json +++ b/package.json @@ -101,5 +101,12 @@ "back": "nodemon --inspect -w modules ./node_modules/gulp/bin/gulp.js back", "lint": "eslint ./ --cache --ignore-pattern .gitignore", "docker": "docker build -t salix-db ./db" - } + }, + + "jest": { + "projects": [ + "jest.front.config.js", + "jest.back.config.js" + ] + } } From 2e644c4c7dc6ac87b32e612ea730014a260b3f8b Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 23 Nov 2020 10:04:11 +0100 Subject: [PATCH 002/101] back end files --- jest-back.js | 0 jest.back.config.js | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 jest-back.js create mode 100644 jest.back.config.js diff --git a/jest-back.js b/jest-back.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/jest.back.config.js b/jest.back.config.js new file mode 100644 index 0000000000..07d106f97d --- /dev/null +++ b/jest.back.config.js @@ -0,0 +1,43 @@ +// For a detailed explanation regarding each configuration property, visit: +// https://jestjs.io/docs/en/configuration.html + +module.exports = { + name: 'Back end', + displayName: { + name: 'Back end', + color: 'blue', + }, + testEnvironment: 'node', + setupFilesAfterEnv: [ + './jest-back.js' + ], + testMatch: [ + 'loopback/**/*.spec.js', + 'modules/*/back/**/*.spec.js' + ], + testPathIgnorePatterns: [ + '/node_modules/' + ], + coveragePathIgnorePatterns: [ + '/node_modules/', + '.spec.js' + ], + moduleFileExtensions: [ + 'js', + ], + moduleNameMapper: { + '\\.(css|scss)$': 'identity-obj-proxy', + '\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '/fileMock.js', + }, + testURL: 'http://localhost', + verbose: false, + errorOnDeprecated: true, + restoreMocks: true, + timers: 'real', + transform: { + '^.+\\.js?$': 'babel-jest', + '^.+\\.html$': 'html-loader-jest' + }, + +}; + From 561991f18cc44c5d8257d14cdd6edea1a8957ceb Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 24 Nov 2020 13:54:31 +0100 Subject: [PATCH 003/101] 2628 - Remove item name from search on tag removal --- modules/order/front/catalog/index.js | 2 +- modules/order/front/summary/index.html | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/order/front/catalog/index.js b/modules/order/front/catalog/index.js index dbb9cf8ea6..318f5dbcab 100644 --- a/modules/order/front/catalog/index.js +++ b/modules/order/front/catalog/index.js @@ -209,7 +209,7 @@ class Controller extends Section { removeItemName() { this.itemName = null; - this.applyFilters(); + this.$.searchbar.doSearch({}, 'bar'); } applyFilters(filter = {}) { diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html index 8f78ce4604..7165b3ec05 100644 --- a/modules/order/front/summary/index.html +++ b/modules/order/front/summary/index.html @@ -45,6 +45,9 @@ + + From ca4a89199cf2c5c7e6b8eb285e6afcc945ed39c3 Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 24 Nov 2020 14:09:05 +0100 Subject: [PATCH 004/101] Updated selector --- e2e/helpers/selectors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index eeaaf2702c..b37ccd50c4 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -636,7 +636,7 @@ export default { orderSummary: { id: 'vn-order-summary vn-one:nth-child(1) > vn-label-value:nth-child(1) span', alias: 'vn-order-summary vn-one:nth-child(1) > vn-label-value:nth-child(2) span', - consignee: 'vn-order-summary vn-one:nth-child(2) > vn-label-value:nth-child(3) span', + consignee: 'vn-order-summary vn-one:nth-child(2) > vn-label-value:nth-child(4) span', subtotal: 'vn-order-summary vn-one.taxes > p:nth-child(1)', vat: 'vn-order-summary vn-one.taxes > p:nth-child(2)', total: 'vn-order-summary vn-one.taxes > p:nth-child(3)', From 8eb14a8bdc9245145905f2bd808ac9ca8999b72f Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 24 Nov 2020 14:56:10 +0100 Subject: [PATCH 005/101] 2588 - No ellipsize on summary notes or address --- front/core/components/label-value/style.scss | 7 +++++++ modules/client/front/summary/index.html | 14 +++++++------- modules/invoiceOut/front/summary/index.html | 2 +- modules/order/front/basic-data/index.html | 2 +- modules/order/front/summary/index.html | 17 ++++++++++------- modules/supplier/front/summary/index.html | 8 ++++---- modules/ticket/front/summary/index.html | 8 ++++---- modules/worker/front/summary/index.html | 2 +- 8 files changed, 35 insertions(+), 25 deletions(-) diff --git a/front/core/components/label-value/style.scss b/front/core/components/label-value/style.scss index 10f3c016c7..d50feffd08 100644 --- a/front/core/components/label-value/style.scss +++ b/front/core/components/label-value/style.scss @@ -6,4 +6,11 @@ vn-label-value > section { color: $color-font-secondary; font-size: 1.2rem } +} + +vn-label-value[no-ellipsize] > section, +vn-label-value.no-ellipsize > section { + text-overflow: ''; + white-space: normal; + overflow: auto; } \ No newline at end of file diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html index 7759117172..50bdd226cd 100644 --- a/modules/client/front/summary/index.html +++ b/modules/client/front/summary/index.html @@ -28,7 +28,7 @@ - @@ -50,9 +50,6 @@ - - @@ -65,6 +62,9 @@ + +

Fiscal data

@@ -140,12 +140,12 @@ - - + +

Web access

diff --git a/modules/invoiceOut/front/summary/index.html b/modules/invoiceOut/front/summary/index.html index e0fdd8bd23..452ec23db5 100644 --- a/modules/invoiceOut/front/summary/index.html +++ b/modules/invoiceOut/front/summary/index.html @@ -74,7 +74,7 @@ {{ticket.nickname}} - {{ticket.shipped | date: 'dd/MM/yyyy' | dashIfEmpty} + {{ticket.shipped | date: 'dd/MM/yyyy' | dashIfEmpty}} {{ticket.total | currency: 'EUR': 2}} diff --git a/modules/order/front/basic-data/index.html b/modules/order/front/basic-data/index.html index 8945de2b7e..63fb5c1b95 100644 --- a/modules/order/front/basic-data/index.html +++ b/modules/order/front/basic-data/index.html @@ -59,7 +59,7 @@ diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html index 8f78ce4604..6a19b12e34 100644 --- a/modules/order/front/summary/index.html +++ b/modules/order/front/summary/index.html @@ -31,12 +31,12 @@ {{$ctrl.summary.address.nickname}}
- - + + - + + value="{{$ctrl.summary.address.phone}}"> + + - diff --git a/modules/supplier/front/summary/index.html b/modules/supplier/front/summary/index.html index c0731a1c11..14168f253f 100644 --- a/modules/supplier/front/summary/index.html +++ b/modules/supplier/front/summary/index.html @@ -20,6 +20,10 @@ label="Alias" value="{{::$ctrl.summary.nickname}}"> + + - - diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html index 2faefadf24..803734c740 100644 --- a/modules/ticket/front/summary/index.html +++ b/modules/ticket/front/summary/index.html @@ -70,9 +70,6 @@ - - @@ -89,9 +86,12 @@ ng-if="$ctrl.summary.client.mobile != null" value="{{$ctrl.summary.client.mobile}}"> + + - diff --git a/modules/worker/front/summary/index.html b/modules/worker/front/summary/index.html index e44d2a5d10..e816f6cf2a 100644 --- a/modules/worker/front/summary/index.html +++ b/modules/worker/front/summary/index.html @@ -14,7 +14,7 @@ - Date: Wed, 25 Nov 2020 07:50:02 +0100 Subject: [PATCH 006/101] Updated selector --- e2e/helpers/selectors.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index eeaaf2702c..bc013c5f1e 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -636,7 +636,7 @@ export default { orderSummary: { id: 'vn-order-summary vn-one:nth-child(1) > vn-label-value:nth-child(1) span', alias: 'vn-order-summary vn-one:nth-child(1) > vn-label-value:nth-child(2) span', - consignee: 'vn-order-summary vn-one:nth-child(2) > vn-label-value:nth-child(3) span', + consignee: 'vn-order-summary vn-one:nth-child(2) > vn-label-value:nth-child(6) span', subtotal: 'vn-order-summary vn-one.taxes > p:nth-child(1)', vat: 'vn-order-summary vn-one.taxes > p:nth-child(2)', total: 'vn-order-summary vn-one.taxes > p:nth-child(3)', @@ -663,7 +663,7 @@ export default { client: 'vn-autocomplete[label="Client"]', address: 'vn-autocomplete[label="Address"]', agency: 'vn-autocomplete[label="Agency"]', - observation: 'vn-textarea[label="Observation"]', + observation: 'vn-textarea[label="Notes"]', saveButton: `button[type=submit]`, acceptButton: '.vn-confirm.shown button[response="accept"]' }, From 27f0a5cd63e7e1bf7008a60e219fc0548693a4b1 Mon Sep 17 00:00:00 2001 From: joan Date: Wed, 25 Nov 2020 07:54:20 +0100 Subject: [PATCH 007/101] Updated Node version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07cca1b522..2e14b59057 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Salix is also the scientific name of a beautifull tree! :) Required applications. -* Node.js = 12.17.0 LTS +* Node.js = 14.15.1 LTS * Docker You will need to install globally the following items. From 78f25e0b46db3beae3916f721c8a54c2c6a6185d Mon Sep 17 00:00:00 2001 From: bernat Date: Wed, 25 Nov 2020 12:37:44 +0100 Subject: [PATCH 008/101] export production --- db/dump/dumpedFixtures.sql | 64 +- db/dump/fixtures.sql | 14 +- db/dump/structure.sql | 4467 ++++++++++------- db/export-data.sh | 2 + .../specs/activeWorkersWithRole.spec.js | 4 +- .../back/methods/client/specs/getCard.spec.js | 2 +- .../back/methods/client/specs/getDebt.spec.js | 2 +- .../methods/client/specs/listWorkers.spec.js | 2 +- .../back/methods/client/specs/summary.spec.js | 2 +- .../methods/ticket/specs/getTotal.spec.js | 2 +- 10 files changed, 2595 insertions(+), 1966 deletions(-) diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql index 879b1eb427..da9776316f 100644 --- a/db/dump/dumpedFixtures.sql +++ b/db/dump/dumpedFixtures.sql @@ -23,7 +23,7 @@ USE `util`; LOCK TABLES `config` WRITE; /*!40000 ALTER TABLE `config` DISABLE KEYS */; -INSERT INTO `config` VALUES (1,'10230',0,'production',NULL); +INSERT INTO `config` VALUES (1,'10240',0,'production',NULL); /*!40000 ALTER TABLE `config` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -36,7 +36,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-02 10:31:31 +-- Dump completed on 2020-11-25 12:03:51 USE `account`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -61,7 +61,7 @@ USE `account`; LOCK TABLES `role` WRITE; /*!40000 ALTER TABLE `role` DISABLE KEYS */; -INSERT INTO `role` VALUES (0,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2018-04-23 14:33:59'),(1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2017-11-29 10:06:31'),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35'),(13,'teamBoss','Jefe de departamento',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10'),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27'),(20,'manager','Departamento de gerencia',1,'2017-06-01 14:57:02','2017-06-01 14:57:51'),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52'),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12'),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36'),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27'),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20'),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34'),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53'),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42'),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08'),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53'),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09'),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41'),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12'),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26'),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59'),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16'),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12'),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23'),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18'),(48,'coolerBoss','Jefe del departamento de cámara',1,'2018-02-23 13:12:01','2018-02-23 13:12:01'),(49,'production','Empleado de producción',0,'2018-02-26 15:28:23','2019-01-21 12:57:21'),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12'),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39'),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57'),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57'),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17'),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31'),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02'),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19'),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45'),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10'),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01'),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07'),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05'),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08'),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26'),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56'),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23'),(69,'coolerAssist','Empleado cámara con permiso compras',1,'2020-02-05 12:36:09','2020-02-05 12:36:09'),(70,'trainee','Alumno de prácticas',1,'2020-03-04 11:00:25','2020-03-04 11:00:25'),(71,'checker','Rol de revisor con privilegios de itemPicker',1,'2020-10-02 10:50:07','2020-10-02 10:50:07'),(72,'claimManager','Personal de reclamaciones',1,'2020-10-13 10:01:32','2020-10-26 07:29:46'); +INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2017-11-29 10:06:31'),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35'),(13,'teamBoss','Jefe de departamento',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10'),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27'),(20,'manager','Departamento de gerencia',1,'2017-06-01 14:57:02','2017-06-01 14:57:51'),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52'),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12'),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36'),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27'),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20'),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34'),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53'),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42'),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08'),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53'),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09'),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41'),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12'),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26'),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59'),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16'),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12'),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23'),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18'),(48,'coolerBoss','Jefe del departamento de cámara',1,'2018-02-23 13:12:01','2018-02-23 13:12:01'),(49,'production','Empleado de producción',0,'2018-02-26 15:28:23','2019-01-21 12:57:21'),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12'),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39'),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57'),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57'),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17'),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31'),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02'),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19'),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45'),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10'),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01'),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07'),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05'),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08'),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26'),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56'),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23'),(69,'coolerAssist','Empleado cámara con permiso compras',1,'2020-02-05 12:36:09','2020-02-05 12:36:09'),(70,'trainee','Alumno de prácticas',1,'2020-03-04 11:00:25','2020-03-04 11:00:25'),(71,'checker','Rol de revisor con privilegios de itemPicker',1,'2020-10-02 10:50:07','2020-10-02 10:50:07'),(72,'claimManager','Personal de reclamaciones',1,'2020-10-13 10:01:32','2020-10-26 07:29:46'),(73,'financial','Departamento de finanzas',1,'2020-11-16 09:30:27','2020-11-16 09:30:27'),(100,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2020-11-12 06:50:07'); /*!40000 ALTER TABLE `role` ENABLE KEYS */; UNLOCK TABLES; @@ -71,7 +71,7 @@ UNLOCK TABLES; LOCK TABLES `roleInherit` WRITE; /*!40000 ALTER TABLE `roleInherit` DISABLE KEYS */; -INSERT INTO `roleInherit` VALUES (1,1,2),(2,1,3),(3,1,70),(4,2,11),(5,3,11),(6,5,1),(7,5,21),(8,5,33),(9,9,0),(10,11,6),(11,13,1),(12,15,35),(13,15,57),(14,16,13),(15,16,15),(16,17,20),(17,17,37),(18,17,39),(19,17,64),(20,18,1),(21,19,21),(22,20,13),(23,20,16),(24,20,65),(25,21,13),(26,21,18),(27,21,53),(28,22,13),(29,22,21),(30,30,5),(31,30,20),(32,30,22),(33,30,53),(34,30,64),(35,31,1),(36,32,1),(37,34,1),(38,34,13),(39,34,33),(40,35,1),(41,36,44),(42,36,47),(43,37,1),(44,38,37),(45,38,64),(46,39,5),(47,39,21),(48,39,57),(49,40,1),(50,40,49),(51,41,13),(52,41,35),(53,41,40),(54,42,35),(55,42,49),(56,43,13),(57,43,42),(58,44,1),(59,45,13),(60,45,44),(61,47,1),(62,48,13),(63,48,47),(64,49,36),(65,49,58),(66,50,13),(67,50,21),(68,50,35),(69,50,49),(70,50,57),(71,50,59),(72,51,1),(73,52,13),(74,52,19),(75,52,35),(76,52,51),(77,53,1),(78,54,1),(79,55,13),(80,55,54),(81,56,1),(82,57,13),(83,57,56),(84,58,1),(85,59,13),(86,59,49),(87,60,5),(88,60,37),(89,60,50),(90,60,57),(91,61,13),(92,61,36),(93,65,19),(94,65,35),(95,65,50),(96,66,0),(97,67,5),(98,67,37),(99,69,35),(100,69,47),(101,70,11),(102,71,1),(103,71,58),(104,72,13),(105,72,18); +INSERT INTO `roleInherit` VALUES (1,1,2),(2,1,3),(3,1,70),(4,2,11),(5,3,11),(6,5,1),(7,5,21),(8,5,33),(9,9,100),(10,11,6),(11,13,1),(12,15,35),(13,15,57),(14,16,13),(15,16,15),(16,17,20),(17,17,37),(18,17,39),(19,17,64),(20,18,1),(21,19,21),(22,20,13),(23,20,16),(24,20,65),(25,21,13),(26,21,18),(27,21,53),(28,22,13),(29,22,21),(30,30,5),(31,30,20),(32,30,22),(33,30,53),(34,30,64),(35,31,1),(36,32,1),(37,34,1),(38,34,13),(39,34,33),(40,35,1),(41,36,44),(42,36,47),(43,37,1),(44,38,37),(45,38,64),(46,39,5),(47,39,21),(48,39,57),(49,40,1),(50,40,49),(51,41,13),(52,41,35),(53,41,40),(54,42,35),(55,42,49),(56,43,13),(57,43,42),(58,44,1),(59,45,13),(60,45,44),(61,47,1),(62,48,13),(63,48,47),(64,49,36),(65,49,58),(66,50,13),(67,50,21),(68,50,35),(69,50,49),(70,50,57),(71,50,59),(72,51,1),(73,52,13),(74,52,19),(75,52,35),(76,52,51),(77,53,1),(78,54,1),(79,55,13),(80,55,54),(81,56,1),(82,57,13),(83,57,56),(84,58,1),(85,59,13),(109,59,50),(87,60,5),(88,60,37),(89,60,50),(90,60,57),(91,61,13),(92,61,36),(93,65,19),(94,65,35),(95,65,50),(96,66,100),(97,67,5),(98,67,37),(99,69,35),(100,69,47),(101,70,11),(102,71,1),(103,71,58),(104,72,13),(105,72,18),(106,73,5),(108,73,19),(107,73,64); /*!40000 ALTER TABLE `roleInherit` ENABLE KEYS */; UNLOCK TABLES; @@ -81,7 +81,7 @@ UNLOCK TABLES; LOCK TABLES `roleRole` WRITE; /*!40000 ALTER TABLE `roleRole` DISABLE KEYS */; -INSERT INTO `roleRole` VALUES (0,0),(0,1),(0,2),(0,3),(0,5),(0,6),(0,9),(0,11),(0,13),(0,15),(0,16),(0,17),(0,18),(0,19),(0,20),(0,21),(0,22),(0,30),(0,31),(0,32),(0,33),(0,34),(0,35),(0,36),(0,37),(0,38),(0,39),(0,40),(0,41),(0,42),(0,43),(0,44),(0,45),(0,47),(0,48),(0,49),(0,50),(0,51),(0,52),(0,53),(0,54),(0,55),(0,56),(0,57),(0,58),(0,59),(0,60),(0,61),(0,62),(0,64),(0,65),(0,66),(0,67),(0,69),(0,70),(0,71),(0,72),(1,1),(1,2),(1,3),(1,6),(1,11),(1,70),(2,2),(2,6),(2,11),(3,3),(3,6),(3,11),(5,1),(5,2),(5,3),(5,5),(5,6),(5,11),(5,13),(5,18),(5,21),(5,33),(5,53),(5,70),(6,6),(9,0),(9,1),(9,2),(9,3),(9,5),(9,6),(9,9),(9,11),(9,13),(9,15),(9,16),(9,17),(9,18),(9,19),(9,20),(9,21),(9,22),(9,30),(9,31),(9,32),(9,33),(9,34),(9,35),(9,36),(9,37),(9,38),(9,39),(9,40),(9,41),(9,42),(9,43),(9,44),(9,45),(9,47),(9,48),(9,49),(9,50),(9,51),(9,52),(9,53),(9,54),(9,55),(9,56),(9,57),(9,58),(9,59),(9,60),(9,61),(9,62),(9,64),(9,65),(9,66),(9,67),(9,69),(9,70),(9,71),(9,72),(11,6),(11,11),(13,1),(13,2),(13,3),(13,6),(13,11),(13,13),(13,70),(15,1),(15,2),(15,3),(15,6),(15,11),(15,13),(15,15),(15,35),(15,56),(15,57),(15,70),(16,1),(16,2),(16,3),(16,6),(16,11),(16,13),(16,15),(16,16),(16,35),(16,56),(16,57),(16,70),(17,1),(17,2),(17,3),(17,5),(17,6),(17,11),(17,13),(17,15),(17,16),(17,17),(17,18),(17,19),(17,20),(17,21),(17,33),(17,35),(17,36),(17,37),(17,39),(17,44),(17,47),(17,49),(17,50),(17,53),(17,56),(17,57),(17,58),(17,59),(17,64),(17,65),(17,70),(18,1),(18,2),(18,3),(18,6),(18,11),(18,18),(18,70),(19,1),(19,2),(19,3),(19,6),(19,11),(19,13),(19,18),(19,19),(19,21),(19,53),(19,70),(20,1),(20,2),(20,3),(20,6),(20,11),(20,13),(20,15),(20,16),(20,18),(20,19),(20,20),(20,21),(20,35),(20,36),(20,44),(20,47),(20,49),(20,50),(20,53),(20,56),(20,57),(20,58),(20,59),(20,65),(20,70),(21,1),(21,2),(21,3),(21,6),(21,11),(21,13),(21,18),(21,21),(21,53),(21,70),(22,1),(22,2),(22,3),(22,6),(22,11),(22,13),(22,18),(22,21),(22,22),(22,53),(22,70),(30,1),(30,2),(30,3),(30,5),(30,6),(30,11),(30,13),(30,15),(30,16),(30,18),(30,19),(30,20),(30,21),(30,22),(30,30),(30,33),(30,35),(30,36),(30,44),(30,47),(30,49),(30,50),(30,53),(30,56),(30,57),(30,58),(30,59),(30,64),(30,65),(30,70),(31,1),(31,2),(31,3),(31,6),(31,11),(31,31),(31,70),(32,1),(32,2),(32,3),(32,6),(32,11),(32,32),(32,70),(33,33),(34,1),(34,2),(34,3),(34,6),(34,11),(34,13),(34,33),(34,34),(34,70),(35,1),(35,2),(35,3),(35,6),(35,11),(35,35),(35,70),(36,1),(36,2),(36,3),(36,6),(36,11),(36,36),(36,44),(36,47),(36,70),(37,1),(37,2),(37,3),(37,6),(37,11),(37,37),(37,70),(38,1),(38,2),(38,3),(38,6),(38,11),(38,37),(38,38),(38,64),(38,70),(39,1),(39,2),(39,3),(39,5),(39,6),(39,11),(39,13),(39,18),(39,21),(39,33),(39,39),(39,53),(39,56),(39,57),(39,70),(40,1),(40,2),(40,3),(40,6),(40,11),(40,36),(40,40),(40,44),(40,47),(40,49),(40,58),(40,70),(41,1),(41,2),(41,3),(41,6),(41,11),(41,13),(41,35),(41,36),(41,40),(41,41),(41,44),(41,47),(41,49),(41,58),(41,70),(42,1),(42,2),(42,3),(42,6),(42,11),(42,35),(42,36),(42,42),(42,44),(42,47),(42,49),(42,58),(42,70),(43,1),(43,2),(43,3),(43,6),(43,11),(43,13),(43,35),(43,36),(43,42),(43,43),(43,44),(43,47),(43,49),(43,58),(43,70),(44,1),(44,2),(44,3),(44,6),(44,11),(44,44),(44,70),(45,1),(45,2),(45,3),(45,6),(45,11),(45,13),(45,44),(45,45),(45,70),(47,1),(47,2),(47,3),(47,6),(47,11),(47,47),(47,70),(48,1),(48,2),(48,3),(48,6),(48,11),(48,13),(48,47),(48,48),(48,70),(49,1),(49,2),(49,3),(49,6),(49,11),(49,36),(49,44),(49,47),(49,49),(49,58),(49,70),(50,1),(50,2),(50,3),(50,6),(50,11),(50,13),(50,18),(50,21),(50,35),(50,36),(50,44),(50,47),(50,49),(50,50),(50,53),(50,56),(50,57),(50,58),(50,59),(50,70),(51,1),(51,2),(51,3),(51,6),(51,11),(51,51),(51,70),(52,1),(52,2),(52,3),(52,6),(52,11),(52,13),(52,18),(52,19),(52,21),(52,35),(52,51),(52,52),(52,53),(52,70),(53,1),(53,2),(53,3),(53,6),(53,11),(53,53),(53,70),(54,1),(54,2),(54,3),(54,6),(54,11),(54,54),(54,70),(55,1),(55,2),(55,3),(55,6),(55,11),(55,13),(55,54),(55,55),(55,70),(56,1),(56,2),(56,3),(56,6),(56,11),(56,56),(56,70),(57,1),(57,2),(57,3),(57,6),(57,11),(57,13),(57,56),(57,57),(57,70),(58,1),(58,2),(58,3),(58,6),(58,11),(58,58),(58,70),(59,1),(59,2),(59,3),(59,6),(59,11),(59,13),(59,36),(59,44),(59,47),(59,49),(59,58),(59,59),(59,70),(60,1),(60,2),(60,3),(60,5),(60,6),(60,11),(60,13),(60,18),(60,21),(60,33),(60,35),(60,36),(60,37),(60,44),(60,47),(60,49),(60,50),(60,53),(60,56),(60,57),(60,58),(60,59),(60,60),(60,70),(61,1),(61,2),(61,3),(61,6),(61,11),(61,13),(61,36),(61,44),(61,47),(61,61),(61,70),(62,62),(64,64),(65,1),(65,2),(65,3),(65,6),(65,11),(65,13),(65,18),(65,19),(65,21),(65,35),(65,36),(65,44),(65,47),(65,49),(65,50),(65,53),(65,56),(65,57),(65,58),(65,59),(65,65),(65,70),(66,0),(66,1),(66,2),(66,3),(66,5),(66,6),(66,9),(66,11),(66,13),(66,15),(66,16),(66,17),(66,18),(66,19),(66,20),(66,21),(66,22),(66,30),(66,31),(66,32),(66,33),(66,34),(66,35),(66,36),(66,37),(66,38),(66,39),(66,40),(66,41),(66,42),(66,43),(66,44),(66,45),(66,47),(66,48),(66,49),(66,50),(66,51),(66,52),(66,53),(66,54),(66,55),(66,56),(66,57),(66,58),(66,59),(66,60),(66,61),(66,62),(66,64),(66,65),(66,66),(66,67),(66,69),(66,70),(66,71),(66,72),(67,1),(67,2),(67,3),(67,5),(67,6),(67,11),(67,13),(67,18),(67,21),(67,33),(67,37),(67,53),(67,67),(67,70),(69,1),(69,2),(69,3),(69,6),(69,11),(69,35),(69,47),(69,69),(69,70),(70,6),(70,11),(70,70),(71,1),(71,2),(71,3),(71,6),(71,11),(71,58),(71,70),(71,71),(72,1),(72,2),(72,3),(72,6),(72,11),(72,13),(72,18),(72,70),(72,72); +INSERT INTO `roleRole` VALUES (6839,1,1),(6840,1,2),(6841,1,3),(6844,1,6),(6843,1,11),(6842,1,70),(6762,2,2),(6764,2,6),(6763,2,11),(6672,3,3),(6674,3,6),(6673,3,11),(6647,5,1),(6652,5,2),(6651,5,3),(6646,5,5),(6657,5,6),(6656,5,11),(6653,5,13),(6654,5,18),(6648,5,21),(6649,5,33),(6655,5,53),(6650,5,70),(6904,6,6),(6804,9,1),(6801,9,2),(6790,9,3),(6788,9,5),(6809,9,6),(6781,9,9),(6785,9,11),(6836,9,13),(6818,9,15),(6819,9,16),(6787,9,17),(6834,9,18),(6833,9,19),(6820,9,20),(6832,9,21),(6837,9,22),(6807,9,30),(6808,9,31),(6805,9,32),(6815,9,33),(6791,9,34),(6795,9,35),(6830,9,36),(6812,9,37),(6813,9,38),(6786,9,39),(6810,9,40),(6811,9,41),(6792,9,42),(6793,9,43),(6783,9,44),(6784,9,45),(6798,9,47),(6800,9,48),(6827,9,49),(6829,9,50),(6821,9,51),(6822,9,52),(6814,9,53),(6816,9,54),(6817,9,55),(6802,9,56),(6803,9,57),(6825,9,58),(6826,9,59),(6828,9,60),(6831,9,61),(6823,9,62),(6794,9,64),(6824,9,65),(6835,9,66),(6789,9,67),(6799,9,69),(6838,9,70),(6796,9,71),(6797,9,72),(6806,9,73),(6782,9,100),(6599,11,6),(6598,11,11),(7311,13,1),(7312,13,2),(7313,13,3),(7316,13,6),(7315,13,11),(7310,13,13),(7314,13,70),(6976,15,1),(6980,15,2),(6979,15,3),(6982,15,6),(6981,15,11),(6975,15,13),(6972,15,15),(6973,15,35),(6977,15,56),(6974,15,57),(6978,15,70),(6987,16,1),(6991,16,2),(6990,16,3),(6994,16,6),(6993,16,11),(6984,16,13),(6985,16,15),(6983,16,16),(6986,16,35),(6992,16,56),(6988,16,57),(6989,16,70),(6620,17,1),(6629,17,2),(6628,17,3),(6624,17,5),(6641,17,6),(6638,17,11),(6623,17,13),(6633,17,15),(6622,17,16),(6615,17,17),(6635,17,18),(6632,17,19),(6616,17,20),(6625,17,21),(6634,17,33),(6631,17,35),(6643,17,36),(6617,17,37),(6618,17,39),(6645,17,44),(6644,17,47),(6640,17,49),(6630,17,50),(6636,17,53),(6637,17,56),(6626,17,57),(6642,17,58),(6639,17,59),(6619,17,64),(6621,17,65),(6627,17,70),(7246,18,1),(7247,18,2),(7248,18,3),(7251,18,6),(7250,18,11),(7245,18,18),(7249,18,70),(7239,19,1),(7242,19,2),(7241,19,3),(7244,19,6),(7243,19,11),(7236,19,13),(7237,19,18),(7234,19,19),(7235,19,21),(7238,19,53),(7240,19,70),(7001,20,1),(7008,20,2),(7007,20,3),(7019,20,6),(7016,20,11),(6996,20,13),(7000,20,15),(6997,20,16),(7014,20,18),(6999,20,19),(6995,20,20),(7004,20,21),(7002,20,35),(7012,20,36),(7018,20,44),(7017,20,47),(7009,20,49),(7003,20,50),(7013,20,53),(7015,20,56),(7005,20,57),(7011,20,58),(7010,20,59),(6998,20,65),(7006,20,70),(7228,21,1),(7231,21,2),(7230,21,3),(7233,21,6),(7232,21,11),(7225,21,13),(7226,21,18),(7224,21,21),(7227,21,53),(7229,21,70),(7321,22,1),(7325,22,2),(7324,22,3),(7327,22,6),(7326,22,11),(7318,22,13),(7320,22,18),(7319,22,21),(7317,22,22),(7322,22,53),(7323,22,70),(6877,30,1),(6884,30,2),(6883,30,3),(6868,30,5),(6894,30,6),(6890,30,11),(6874,30,13),(6880,30,15),(6873,30,16),(6881,30,18),(6879,30,19),(6869,30,20),(6876,30,21),(6870,30,22),(6867,30,30),(6875,30,33),(6885,30,35),(6892,30,36),(6896,30,44),(6895,30,47),(6888,30,49),(6886,30,50),(6871,30,53),(6893,30,56),(6889,30,57),(6891,30,58),(6887,30,59),(6872,30,64),(6878,30,65),(6882,30,70),(6898,31,1),(6899,31,2),(6900,31,3),(6903,31,6),(6902,31,11),(6897,31,31),(6901,31,70),(6846,32,1),(6847,32,2),(6848,32,3),(6851,32,6),(6850,32,11),(6845,32,32),(6849,32,70),(6955,33,33),(6676,34,1),(6681,34,2),(6680,34,3),(6683,34,6),(6682,34,11),(6677,34,13),(6678,34,33),(6675,34,34),(6679,34,70),(6714,35,1),(6715,35,2),(6716,35,3),(6719,35,6),(6718,35,11),(6713,35,35),(6717,35,70),(7149,36,1),(7151,36,2),(7150,36,3),(7154,36,6),(7153,36,11),(7146,36,36),(7147,36,44),(7148,36,47),(7152,36,70),(6933,37,1),(6934,37,2),(6935,37,3),(6938,37,6),(6937,37,11),(6932,37,37),(6936,37,70),(6942,38,1),(6944,38,2),(6943,38,3),(6947,38,6),(6946,38,11),(6940,38,37),(6939,38,38),(6941,38,64),(6945,38,70),(6606,39,1),(6612,39,2),(6611,39,3),(6601,39,5),(6614,39,6),(6613,39,11),(6604,39,13),(6607,39,18),(6602,39,21),(6605,39,33),(6600,39,39),(6608,39,53),(6609,39,56),(6603,39,57),(6610,39,70),(6906,40,1),(6909,40,2),(6908,40,3),(6916,40,6),(6915,40,11),(6911,40,36),(6905,40,40),(6914,40,44),(6913,40,47),(6907,40,49),(6912,40,58),(6910,40,70),(6922,41,1),(6925,41,2),(6924,41,3),(6931,41,6),(6930,41,11),(6918,41,13),(6919,41,35),(6926,41,36),(6920,41,40),(6917,41,41),(6929,41,44),(6928,41,47),(6921,41,49),(6927,41,58),(6923,41,70),(6688,42,1),(6692,42,2),(6691,42,3),(6696,42,6),(6695,42,11),(6685,42,35),(6687,42,36),(6684,42,42),(6693,42,44),(6694,42,47),(6686,42,49),(6689,42,58),(6690,42,70),(6701,43,1),(6705,43,2),(6704,43,3),(6711,43,6),(6710,43,11),(6698,43,13),(6700,43,35),(6706,43,36),(6699,43,42),(6697,43,43),(6709,43,44),(6708,43,47),(6702,43,49),(6707,43,58),(6703,43,70),(6583,44,1),(6584,44,2),(6585,44,3),(6588,44,6),(6587,44,11),(6582,44,44),(6586,44,70),(6592,45,1),(6594,45,2),(6593,45,3),(6597,45,6),(6596,45,11),(6590,45,13),(6591,45,44),(6589,45,45),(6595,45,70),(6738,47,1),(6739,47,2),(6740,47,3),(6743,47,6),(6742,47,11),(6737,47,47),(6741,47,70),(6756,48,1),(6758,48,2),(6757,48,3),(6761,48,6),(6760,48,11),(6754,48,13),(6755,48,47),(6753,48,48),(6759,48,70),(7096,49,1),(7099,49,2),(7098,49,3),(7101,49,6),(7100,49,11),(7092,49,36),(7095,49,44),(7094,49,47),(7091,49,49),(7093,49,58),(7097,49,70),(7138,50,1),(7143,50,2),(7142,50,3),(7145,50,6),(7144,50,11),(7127,50,13),(7137,50,18),(7128,50,21),(7129,50,35),(7135,50,36),(7140,50,44),(7139,50,47),(7130,50,49),(7126,50,50),(7136,50,53),(7133,50,56),(7131,50,57),(7134,50,58),(7132,50,59),(7141,50,70),(7021,51,1),(7022,51,2),(7023,51,3),(7026,51,6),(7025,51,11),(7020,51,51),(7024,51,70),(7033,52,1),(7037,52,2),(7036,52,3),(7040,52,6),(7039,52,11),(7028,52,13),(7034,52,18),(7029,52,19),(7032,52,21),(7030,52,35),(7031,52,51),(7027,52,52),(7038,52,53),(7035,52,70),(6949,53,1),(6950,53,2),(6951,53,3),(6954,53,6),(6953,53,11),(6948,53,53),(6952,53,70),(6957,54,1),(6958,54,2),(6959,54,3),(6962,54,6),(6961,54,11),(6956,54,54),(6960,54,70),(6966,55,1),(6968,55,2),(6967,55,3),(6971,55,6),(6970,55,11),(6964,55,13),(6965,55,54),(6963,55,55),(6969,55,70),(6766,56,1),(6767,56,2),(6768,56,3),(6771,56,6),(6770,56,11),(6765,56,56),(6769,56,70),(6775,57,1),(6777,57,2),(6776,57,3),(6780,57,6),(6779,57,11),(6773,57,13),(6774,57,56),(6772,57,57),(6778,57,70),(7065,58,1),(7066,58,2),(7067,58,3),(7070,58,6),(7069,58,11),(7064,58,58),(7068,58,70),(7075,59,1),(7083,59,2),(7082,59,3),(7090,59,6),(7089,59,11),(7072,59,13),(7080,59,18),(7074,59,21),(7076,59,35),(7084,59,36),(7088,59,44),(7087,59,47),(7077,59,49),(7073,59,50),(7079,59,53),(7086,59,56),(7078,59,57),(7085,59,58),(7071,59,59),(7081,59,70),(7110,60,1),(7121,60,2),(7120,60,3),(7103,60,5),(7125,60,6),(7124,60,11),(7107,60,13),(7118,60,18),(7109,60,21),(7108,60,33),(7111,60,35),(7116,60,36),(7104,60,37),(7123,60,44),(7122,60,47),(7112,60,49),(7105,60,50),(7117,60,53),(7114,60,56),(7106,60,57),(7115,60,58),(7113,60,59),(7102,60,60),(7119,60,70),(7159,61,1),(7163,61,2),(7162,61,3),(7165,61,6),(7164,61,11),(7156,61,13),(7157,61,36),(7158,61,44),(7160,61,47),(7155,61,61),(7161,61,70),(7041,62,62),(6712,64,64),(7047,65,1),(7055,65,2),(7054,65,3),(7063,65,6),(7062,65,11),(7046,65,13),(7057,65,18),(7043,65,19),(7048,65,21),(7044,65,35),(7052,65,36),(7061,65,44),(7060,65,47),(7049,65,49),(7045,65,50),(7056,65,53),(7059,65,56),(7050,65,57),(7058,65,58),(7051,65,59),(7042,65,65),(7053,65,70),(7276,66,1),(7272,66,2),(7261,66,3),(7259,66,5),(7281,66,6),(7275,66,9),(7256,66,11),(7307,66,13),(7290,66,15),(7291,66,16),(7258,66,17),(7306,66,18),(7305,66,19),(7292,66,20),(7304,66,21),(7308,66,22),(7279,66,30),(7280,66,31),(7277,66,32),(7287,66,33),(7262,66,34),(7266,66,35),(7302,66,36),(7284,66,37),(7285,66,38),(7257,66,39),(7282,66,40),(7283,66,41),(7263,66,42),(7264,66,43),(7254,66,44),(7255,66,45),(7269,66,47),(7271,66,48),(7299,66,49),(7301,66,50),(7293,66,51),(7294,66,52),(7286,66,53),(7288,66,54),(7289,66,55),(7273,66,56),(7274,66,57),(7297,66,58),(7298,66,59),(7300,66,60),(7303,66,61),(7295,66,62),(7265,66,64),(7296,66,65),(7252,66,66),(7260,66,67),(7270,66,69),(7309,66,70),(7267,66,71),(7268,66,72),(7278,66,73),(7253,66,100),(6662,67,1),(6666,67,2),(6665,67,3),(6659,67,5),(6671,67,6),(6670,67,11),(6667,67,13),(6668,67,18),(6661,67,21),(6663,67,33),(6660,67,37),(6669,67,53),(6658,67,67),(6664,67,70),(6747,69,1),(6749,69,2),(6748,69,3),(6752,69,6),(6751,69,11),(6745,69,35),(6746,69,47),(6744,69,69),(6750,69,70),(7330,70,6),(7329,70,11),(7328,70,70),(6721,71,1),(6724,71,2),(6723,71,3),(6727,71,6),(6726,71,11),(6722,71,58),(6725,71,70),(6720,71,71),(6731,72,1),(6733,72,2),(6732,72,3),(6736,72,6),(6735,72,11),(6729,72,13),(6730,72,18),(6734,72,70),(6728,72,72),(6858,73,1),(6861,73,2),(6860,73,3),(6853,73,5),(6866,73,6),(6865,73,11),(6862,73,13),(6863,73,18),(6854,73,19),(6857,73,21),(6856,73,33),(6864,73,53),(6855,73,64),(6859,73,70),(6852,73,73),(7189,100,1),(7185,100,2),(7174,100,3),(7172,100,5),(7194,100,6),(7188,100,9),(7169,100,11),(7221,100,13),(7203,100,15),(7204,100,16),(7171,100,17),(7219,100,18),(7218,100,19),(7205,100,20),(7217,100,21),(7222,100,22),(7192,100,30),(7193,100,31),(7190,100,32),(7200,100,33),(7175,100,34),(7179,100,35),(7215,100,36),(7197,100,37),(7198,100,38),(7170,100,39),(7195,100,40),(7196,100,41),(7176,100,42),(7177,100,43),(7167,100,44),(7168,100,45),(7182,100,47),(7184,100,48),(7212,100,49),(7214,100,50),(7206,100,51),(7207,100,52),(7199,100,53),(7201,100,54),(7202,100,55),(7186,100,56),(7187,100,57),(7210,100,58),(7211,100,59),(7213,100,60),(7216,100,61),(7208,100,62),(7178,100,64),(7209,100,65),(7220,100,66),(7173,100,67),(7183,100,69),(7223,100,70),(7180,100,71),(7181,100,72),(7191,100,73),(7166,100,100); /*!40000 ALTER TABLE `roleRole` ENABLE KEYS */; UNLOCK TABLES; @@ -124,7 +124,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-02 10:31:34 +-- Dump completed on 2020-11-25 12:03:53 USE `salix`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -149,7 +149,7 @@ USE `salix`; LOCK TABLES `ACL` WRITE; /*!40000 ALTER TABLE `ACL` DISABLE KEYS */; -INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','trainee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','trainee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','trainee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','trainee'),(30,'GreugeType','*','READ','ALLOW','ROLE','trainee'),(31,'Mandate','*','READ','ALLOW','ROLE','trainee'),(32,'MandateType','*','READ','ALLOW','ROLE','trainee'),(33,'Company','*','READ','ALLOW','ROLE','trainee'),(34,'Greuge','*','READ','ALLOW','ROLE','trainee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(48,'ItemNiche','*','READ','ALLOW','ROLE','employee'),(49,'ItemNiche','*','WRITE','ALLOW','ROLE','buyer'),(50,'ItemNiche','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','trainee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(62,'Ticket','*','*','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(71,'SaleChecked','*','READ','ALLOW','ROLE','employee'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryBoss'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','deleteSales','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','salesAssistant'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','salesAssistant'),(101,'Claim','*','*','ALLOW','ROLE','employee'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(103,'ClaimEnd','importTicketSales','WRITE','ALLOW','ROLE','salesAssistant'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(107,'ItemNiche','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','trainee'),(111,'ClientLog','*','READ','ALLOW','ROLE','trainee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','trainee'),(114,'Receipt','*','READ','ALLOW','ROLE','trainee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(123,'Worker','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(126,'Client','activeWorkersWithRole','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','trainee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','trainee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','deliveryBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryBoss'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryBoss'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'Calendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'Calendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(164,'InvoiceOut','regenerate','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','READ','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(174,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(175,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','trainee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(188,'TicketDms','removeFile','WRITE','ALLOW','ROLE','employee'),(189,'TicketDms','*','READ','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryBoss'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','employee'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','trainee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','salesAssistant'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee'),(218,'Intrastat','*','*','ALLOW','ROLE','buyer'),(219,'Account','acl','READ','ALLOW','ROLE','account'),(220,'Account','getCurrentUserData','READ','ALLOW','ROLE','account'),(221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account'),(222,'Client','*','READ','ALLOW','ROLE','trainee'),(226,'ClientObservation','*','READ','ALLOW','ROLE','trainee'),(227,'Address','*','READ','ALLOW','ROLE','trainee'),(228,'AddressObservation','*','READ','ALLOW','ROLE','trainee'),(230,'ClientCredit','*','READ','ALLOW','ROLE','trainee'),(231,'ClientContact','*','READ','ALLOW','ROLE','trainee'),(232,'ClientSample','*','READ','ALLOW','ROLE','trainee'),(233,'EntryLog','*','READ','ALLOW','ROLE','buyer'),(234,'WorkerLog','*','READ','ALLOW','ROLE','salesAssistant'),(235,'CustomsAgent','*','*','ALLOW','ROLE','employee'),(236,'Buy','*','*','ALLOW','ROLE','buyer'),(237,'WorkerDms','filter','*','ALLOW','ROLE','employee'); +INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','trainee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','trainee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','trainee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','trainee'),(30,'GreugeType','*','READ','ALLOW','ROLE','trainee'),(31,'Mandate','*','READ','ALLOW','ROLE','trainee'),(32,'MandateType','*','READ','ALLOW','ROLE','trainee'),(33,'Company','*','READ','ALLOW','ROLE','trainee'),(34,'Greuge','*','READ','ALLOW','ROLE','trainee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(48,'ItemNiche','*','READ','ALLOW','ROLE','employee'),(49,'ItemNiche','*','WRITE','ALLOW','ROLE','buyer'),(50,'ItemNiche','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','trainee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(62,'Ticket','*','*','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(71,'SaleChecked','*','READ','ALLOW','ROLE','employee'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryBoss'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','deleteSales','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','claimManager'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','claimManager'),(101,'Claim','*','*','ALLOW','ROLE','employee'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(103,'ClaimEnd','importTicketSales','WRITE','ALLOW','ROLE','claimManager'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(107,'ItemNiche','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','trainee'),(111,'ClientLog','*','READ','ALLOW','ROLE','trainee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','trainee'),(114,'Receipt','*','READ','ALLOW','ROLE','trainee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(123,'Worker','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(126,'Client','activeWorkersWithRole','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','trainee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','trainee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','deliveryBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryBoss'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryBoss'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'Calendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'Calendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(164,'InvoiceOut','regenerate','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','READ','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(174,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(175,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','trainee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(188,'TicketDms','removeFile','WRITE','ALLOW','ROLE','employee'),(189,'TicketDms','*','READ','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryBoss'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','deliveryBoss'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','trainee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','claimManager'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee'),(218,'Intrastat','*','*','ALLOW','ROLE','buyer'),(219,'Account','acl','READ','ALLOW','ROLE','account'),(220,'Account','getCurrentUserData','READ','ALLOW','ROLE','account'),(221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account'),(222,'Client','*','READ','ALLOW','ROLE','trainee'),(226,'ClientObservation','*','READ','ALLOW','ROLE','trainee'),(227,'Address','*','READ','ALLOW','ROLE','trainee'),(228,'AddressObservation','*','READ','ALLOW','ROLE','trainee'),(230,'ClientCredit','*','READ','ALLOW','ROLE','trainee'),(231,'ClientContact','*','READ','ALLOW','ROLE','trainee'),(232,'ClientSample','*','READ','ALLOW','ROLE','trainee'),(233,'EntryLog','*','READ','ALLOW','ROLE','buyer'),(234,'WorkerLog','*','READ','ALLOW','ROLE','salesAssistant'),(235,'CustomsAgent','*','*','ALLOW','ROLE','employee'),(236,'Buy','*','*','ALLOW','ROLE','buyer'),(237,'WorkerDms','filter','*','ALLOW','ROLE','employee'),(238,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(239,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(240,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(241,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'); /*!40000 ALTER TABLE `ACL` ENABLE KEYS */; UNLOCK TABLES; @@ -172,7 +172,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-02 10:31:35 +-- Dump completed on 2020-11-25 12:03:55 USE `vn`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -257,7 +257,7 @@ UNLOCK TABLES; LOCK TABLES `tag` WRITE; /*!40000 ALTER TABLE `tag` DISABLE KEYS */; -INSERT INTO `tag` VALUES (1,'color','Color',0,0,'ink',NULL,NULL,'inkFk'),(2,NULL,'Forma',1,0,NULL,NULL,NULL,NULL),(3,NULL,'Material',1,0,NULL,NULL,NULL,NULL),(4,NULL,'Longitud',1,1,NULL,'mm',NULL,'size'),(5,NULL,'Diámetro',1,1,NULL,'mm',NULL,'diameter'),(6,NULL,'Perímetro',1,1,NULL,'mm',NULL,NULL),(7,NULL,'Ancho de la base',1,1,NULL,'mm',NULL,NULL),(8,NULL,'Altura',1,1,NULL,'mm',NULL,'size'),(9,NULL,'Volumen',1,1,NULL,'ml',NULL,NULL),(10,NULL,'Densidad',1,1,NULL,NULL,NULL,NULL),(11,NULL,'Calidad',1,0,NULL,NULL,NULL,NULL),(12,NULL,'Textura',1,0,NULL,NULL,NULL,NULL),(13,NULL,'Material del mango',1,0,NULL,NULL,NULL,NULL),(14,NULL,'Compra mínima',1,0,NULL,NULL,NULL,NULL),(15,NULL,'Nº pétalos',1,1,NULL,NULL,NULL,NULL),(16,NULL,'Ancho',1,1,NULL,'mm',NULL,NULL),(18,NULL,'Profundidad',1,1,NULL,'mm',NULL,NULL),(19,NULL,'Largo',1,1,NULL,'mm',NULL,'size'),(20,NULL,'Ancho superior',1,1,NULL,'mm',NULL,NULL),(21,NULL,'Ancho inferior',1,1,NULL,'mm',NULL,NULL),(22,NULL,'Gramaje',1,1,NULL,'g',NULL,NULL),(23,'stems','Tallos',1,1,NULL,NULL,NULL,'stems'),(24,NULL,'Estado',1,0,NULL,NULL,NULL,NULL),(25,NULL,'Color principal',0,0,'ink',NULL,NULL,NULL),(26,NULL,'Color secundario',0,0,'ink',NULL,NULL,NULL),(27,NULL,'Longitud(cm)',1,1,NULL,'cm',NULL,NULL),(28,NULL,'Diámetro base',1,1,'','mm',NULL,'diameter'),(29,NULL,'Colección',1,0,NULL,NULL,NULL,NULL),(30,NULL,'Uds / caja',1,1,NULL,NULL,NULL,NULL),(31,NULL,'Contenido',1,0,NULL,NULL,NULL,NULL),(32,NULL,'Peso',1,1,NULL,'g',NULL,NULL),(33,NULL,'Grosor',1,1,NULL,'mm',NULL,NULL),(34,NULL,'Marca',1,0,NULL,NULL,NULL,NULL),(35,'origin','Origen',0,0,'origin',NULL,NULL,'originFk'),(36,NULL,'Proveedor',1,0,NULL,NULL,NULL,NULL),(37,'producer','Productor',0,0,'producer',NULL,NULL,'producerFk'),(38,NULL,'Duración',1,1,NULL,'s',NULL,NULL),(39,NULL,'Flor',1,0,NULL,NULL,NULL,NULL),(40,NULL,'Soporte',1,0,NULL,NULL,NULL,NULL),(41,NULL,'Tamaño flor',1,0,NULL,NULL,NULL,NULL),(42,NULL,'Apertura',1,0,NULL,NULL,NULL,NULL),(43,NULL,'Tallo',1,0,NULL,NULL,NULL,NULL),(44,NULL,'Nº hojas',1,1,NULL,NULL,NULL,NULL),(45,NULL,'Dimensiones',1,0,NULL,NULL,NULL,NULL),(46,NULL,'Diámetro boca',1,1,NULL,'mm',NULL,NULL),(47,NULL,'Nº flores',1,1,NULL,NULL,NULL,NULL),(48,NULL,'Uds / paquete',1,1,NULL,NULL,NULL,NULL),(49,NULL,'Maceta',1,1,NULL,'cm',NULL,'diameter'),(50,NULL,'Textura flor',1,0,NULL,NULL,NULL,NULL),(51,NULL,'Textura hoja',1,0,NULL,NULL,NULL,NULL),(52,NULL,'Tipo de IVA',1,0,NULL,NULL,NULL,NULL),(53,NULL,'Tronco',1,0,NULL,NULL,NULL,NULL),(54,NULL,'Hoja',1,0,NULL,NULL,NULL,NULL),(55,NULL,'Formato',1,0,NULL,NULL,NULL,NULL),(56,NULL,'Genero',1,0,NULL,NULL,NULL,NULL),(57,NULL,'Especie',1,0,NULL,NULL,NULL,NULL),(58,NULL,'Variedad',1,0,NULL,NULL,NULL,NULL),(59,NULL,'Medida grande',1,0,NULL,NULL,NULL,NULL),(60,NULL,'Medida mediano',1,0,NULL,NULL,NULL,NULL),(61,NULL,'Medida pequeño',1,0,NULL,NULL,NULL,NULL),(63,NULL,'Recipiente interior',1,0,NULL,NULL,NULL,NULL),(64,NULL,'Material secundario',1,0,NULL,NULL,NULL,NULL),(65,NULL,'Colores',1,0,NULL,NULL,NULL,NULL),(66,NULL,'Referencia',1,0,NULL,NULL,NULL,NULL),(67,'category','Categoria',1,0,NULL,NULL,NULL,NULL),(68,NULL,'Amb',1,0,NULL,NULL,NULL,NULL),(69,NULL,'Anchura',1,1,NULL,'cm',NULL,NULL),(70,NULL,'Hueco interior',1,0,NULL,NULL,NULL,NULL),(71,NULL,'Tamaño',1,0,NULL,NULL,NULL,NULL),(72,NULL,'Color botón',1,0,NULL,NULL,NULL,NULL),(73,NULL,'Tamaño minimo del botón',1,0,NULL,NULL,NULL,NULL),(74,NULL,'Obtentor',1,0,NULL,NULL,NULL,NULL),(75,NULL,'Longitud del brote',1,0,NULL,NULL,NULL,NULL),(76,NULL,'Tallos / u.v.',1,0,NULL,NULL,NULL,NULL),(77,NULL,'Madera de',1,0,NULL,NULL,NULL,NULL),(78,NULL,'Unidad de venta',1,0,NULL,NULL,NULL,NULL),(79,NULL,'Temporal',1,0,NULL,NULL,NULL,NULL),(80,NULL,'Gramaje/tallo',1,1,NULL,'g',NULL,NULL),(81,NULL,'Peso/paquete',1,1,NULL,'g',NULL,NULL),(82,NULL,'Flexibilidad del tallo',1,0,NULL,NULL,NULL,NULL),(83,NULL,'Nº planchas',1,1,NULL,NULL,NULL,NULL),(84,NULL,'Nº páginas',1,1,NULL,NULL,NULL,NULL),(85,NULL,'Editorial',1,0,NULL,NULL,NULL,NULL),(86,NULL,'Idioma',1,0,NULL,NULL,NULL,NULL),(87,NULL,'Fecha publicación',1,0,NULL,NULL,NULL,NULL),(88,NULL,'Cubierta',1,0,NULL,NULL,NULL,NULL),(89,NULL,'Encuadernación',1,0,NULL,NULL,NULL,NULL),(90,NULL,'Autor',1,0,NULL,NULL,NULL,NULL),(91,NULL,'Envoltorio',1,0,NULL,NULL,NULL,NULL),(92,NULL,'Nombre temporal',1,0,NULL,NULL,NULL,NULL),(93,NULL,'Modelo',1,0,NULL,NULL,NULL,NULL),(94,NULL,'Producto',1,0,NULL,NULL,NULL,NULL),(95,NULL,'Título',1,0,NULL,NULL,NULL,NULL),(96,NULL,'Tomo',1,0,NULL,NULL,NULL,NULL),(97,NULL,'Articulo',1,0,NULL,NULL,NULL,NULL),(98,NULL,'Metodo de cultivo',1,0,NULL,NULL,NULL,NULL),(99,NULL,'Edad',1,0,NULL,NULL,NULL,NULL),(100,NULL,'Agotado',1,0,NULL,NULL,NULL,NULL),(101,NULL,'Altura con asa',1,1,NULL,'cm',NULL,NULL),(102,NULL,'Nº tallos',1,1,NULL,NULL,NULL,NULL),(103,NULL,'Cultivo',1,0,NULL,NULL,NULL,NULL),(104,NULL,'Sabor',1,0,NULL,NULL,NULL,NULL),(105,NULL,'Talla',1,0,NULL,NULL,NULL,NULL),(106,NULL,'Calibre',1,1,NULL,NULL,NULL,NULL),(107,NULL,'Dulzura',1,1,NULL,'bx',NULL,NULL),(108,NULL,'Piezas',1,0,NULL,NULL,NULL,NULL),(109,NULL,'Altura con patas',1,0,NULL,NULL,NULL,NULL),(110,NULL,'Envase',1,0,NULL,NULL,NULL,NULL),(111,NULL,'Nº piezas',1,0,NULL,NULL,NULL,NULL),(112,NULL,'Uso',1,0,NULL,'cm',NULL,NULL),(113,NULL,'Color luz',1,0,NULL,NULL,NULL,NULL),(114,NULL,'Capacidad',1,0,NULL,NULL,NULL,NULL),(184,NULL,'Tallos por paquete',1,0,NULL,NULL,NULL,NULL),(205,NULL,'Apertura',1,0,NULL,NULL,'S05',NULL),(219,NULL,'Altura',1,0,NULL,NULL,'S20','size'),(552,NULL,'fout kenmerk',1,0,NULL,NULL,'081',NULL),(553,NULL,'Potinhoud',1,0,NULL,NULL,'A01',NULL),(554,NULL,'Marketingconcept',1,0,NULL,NULL,'A02',NULL),(555,NULL,'Leeftijd',1,0,NULL,NULL,'A03',NULL),(556,NULL,'Base',1,0,NULL,NULL,'A04',NULL),(557,NULL,'Kleurbehandeld',1,0,NULL,NULL,'A05','inkFk'),(558,NULL,'Verzorging: Standplaats',1,0,NULL,NULL,'A06',NULL),(559,NULL,'Verzorging: Water',1,0,NULL,NULL,'A07',NULL),(560,NULL,'Verzorging: Voeding',1,0,NULL,NULL,'A08',NULL),(561,NULL,'Verzorging: Temperatuur',1,0,NULL,NULL,'A09',NULL),(562,NULL,'Verzorging: Specifieke in',1,0,NULL,NULL,'A10',NULL),(563,NULL,'Verzorging: Consumptie',1,0,NULL,NULL,'A11',NULL),(564,NULL,'Nabehandeling',1,0,NULL,NULL,'A13',NULL),(565,NULL,'Artikel beeld',1,0,NULL,NULL,'A23',NULL),(566,NULL,'Hoofdkleur 1',1,0,NULL,NULL,'B01',NULL),(567,NULL,'Hoofdkleur 2',1,0,NULL,NULL,'B02',NULL),(568,NULL,'RHS hoofdkleur 1',1,0,NULL,NULL,'B03',NULL),(569,NULL,'RHS hoofdkleur 2',1,0,NULL,NULL,'B04',NULL),(570,NULL,'Hoofdkleur 1 blad',1,0,NULL,NULL,'B05',NULL),(571,NULL,'Hoofdkleur 2 blad',1,0,NULL,NULL,'B06',NULL),(572,NULL,'RHS hoofdkleur 1 blad',1,0,NULL,NULL,'B07',NULL),(573,NULL,'RHS hoofdkleur 2 blad',1,0,NULL,NULL,'B08',NULL),(574,NULL,'Botanisch beeld',1,0,NULL,NULL,'B09',NULL),(575,NULL,'Hoofdkleur bes/vrucht',1,0,NULL,NULL,'B10',NULL),(576,NULL,'RHS hoofdkleur bes/vrucht',1,0,NULL,NULL,'B11',NULL),(577,NULL,'UPOV hoofdkleur 1 bloem',1,0,NULL,NULL,'B12',NULL),(578,NULL,'UPOV hoofdkleur 2 bloem',1,0,NULL,NULL,'B13',NULL),(579,NULL,'UPOV hoofdkleur 1 blad',1,0,NULL,NULL,'B14',NULL),(580,NULL,'UPOV hoofdkleur 2 blad',1,0,NULL,NULL,'B15',NULL),(581,NULL,'UPOV hoofdkleur bes/vruch',1,0,NULL,NULL,'B16',NULL),(582,NULL,'Negatieve keurcode 1',1,0,NULL,NULL,'K01',NULL),(583,NULL,'Negatieve keurcode 2',1,0,NULL,NULL,'K02',NULL),(584,NULL,'Bedrijfskenmerk fytosanit',1,0,NULL,NULL,'K03',NULL),(585,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,'K04',NULL),(586,NULL,'Certificaten MPS-TraceCer',1,0,NULL,NULL,'K05',NULL),(587,NULL,'Overige leveranciersinfor',1,0,NULL,NULL,'K07',NULL),(588,NULL,'Certificaten MPS-GAP',1,0,NULL,NULL,'K08',NULL),(589,NULL,'Betrouwbaarheidsindex kla',1,0,NULL,NULL,'K11',NULL),(590,NULL,'Betrouwbaarheidsindex waa',1,0,NULL,NULL,'K12',NULL),(591,NULL,'Productkwaliteitslabel',1,0,NULL,NULL,'K13',NULL),(592,NULL,'Label Fair Flowers Fair P',1,0,NULL,NULL,'K14',NULL),(593,NULL,'Certificaten Socialy Qual',1,0,NULL,NULL,'K15',NULL),(594,NULL,'Certificaten GlobalGAP',1,0,NULL,NULL,'K16',NULL),(595,NULL,'Certificaten MPS Quality',1,0,NULL,NULL,'K17',NULL),(596,NULL,'Certificaten biologisch',1,0,NULL,NULL,'K18',NULL),(597,NULL,'Certificaten eetbare prod',1,0,NULL,NULL,'K19',NULL),(598,NULL,'Certificaten Florimark',1,0,NULL,NULL,'K20',NULL),(599,NULL,'Certificaten Milieukeur',1,0,NULL,NULL,'K21',NULL),(600,NULL,'Certificaten Kenya Flower',1,0,NULL,NULL,'K22',NULL),(601,NULL,'Certificaten Fairtrade',1,0,NULL,NULL,'K23',NULL),(602,NULL,'Keurmerk MPS-ProductProof',1,0,NULL,NULL,'K24',NULL),(603,NULL,'Certificaten ISO',1,0,NULL,NULL,'K25',NULL),(604,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,'K26',NULL),(605,NULL,'Certificaten Florverde',1,0,NULL,NULL,'K27',NULL),(606,NULL,'Certificaten Ethical Trad',1,0,NULL,NULL,'K28',NULL),(607,NULL,'Certificaten Ethiopian EH',1,0,NULL,NULL,'K29',NULL),(608,NULL,'Certificaten gewasbescher',1,0,NULL,NULL,'K30',NULL),(609,NULL,'Certificaten SAN',1,0,NULL,NULL,'K31',NULL),(610,NULL,'Certificaten GRASP',1,0,NULL,NULL,'K32',NULL),(611,NULL,'Label Fair Flora',1,0,NULL,NULL,'K33',NULL),(612,NULL,'GLobalG.A.P. Chain of Cus',1,0,NULL,NULL,'K34',NULL),(613,NULL,'Fust',1,0,NULL,NULL,'L01',NULL),(614,NULL,'Stapelwagen',1,0,NULL,NULL,'L02',NULL),(615,NULL,'Aantal legborden veilings',1,0,NULL,NULL,'L03',NULL),(616,NULL,'Aantal legborden Deense s',1,0,NULL,NULL,'L04',NULL),(617,NULL,'Aantal onderstellen Deens',1,0,NULL,NULL,'L05',NULL),(618,NULL,'Fustsoort',1,0,NULL,NULL,'L06',NULL),(619,NULL,'Envase',1,0,NULL,NULL,'L07',NULL),(620,NULL,'Aantal legborden Eurostap',1,0,NULL,NULL,'L08',NULL),(621,NULL,'Aantal onderstellen Euros',1,0,NULL,NULL,'L09',NULL),(622,NULL,'Tallos/bolsa',1,0,NULL,NULL,'L11',''),(623,NULL,'Aantal bossen per bundel',1,0,NULL,NULL,'L12',NULL),(624,NULL,'Aantal stuks per fust',1,0,NULL,NULL,'L13',NULL),(625,NULL,'Aantal bossen per fust',1,0,NULL,NULL,'L14',NULL),(626,NULL,'Aantal bundels per fust',1,0,NULL,NULL,'L15',NULL),(627,NULL,'Aantal bossen per hoes',1,0,NULL,NULL,'L16',NULL),(628,NULL,'Aantal bundels per hoes',1,0,NULL,NULL,'L17',NULL),(629,NULL,'Fustlabel',1,0,NULL,NULL,'L18',NULL),(630,NULL,'Karlabel',1,0,NULL,NULL,'L19',NULL),(631,NULL,'Service productlabel',1,0,NULL,NULL,'L20',NULL),(632,NULL,'Service fustlabel',1,0,NULL,NULL,'L21',NULL),(633,NULL,'Service karlabel',1,0,NULL,NULL,'L22',NULL),(634,NULL,'Aantal fusten per laag',1,0,NULL,NULL,'L23',NULL),(635,NULL,'Presentatie per schapm2',1,0,NULL,NULL,'L24',NULL),(636,NULL,'Positieve keurcode fytosa',1,0,NULL,NULL,'P01',NULL),(637,NULL,'Positieve keurcode kwalit',1,0,NULL,NULL,'P02',NULL),(638,NULL,'Positieve keurcode veilin',1,0,NULL,NULL,'P03',NULL),(639,NULL,'Maceta',1,1,NULL,'cm','S01','diameter'),(640,NULL,'Altura',1,0,NULL,NULL,'S02','size'),(641,NULL,'nº plantas',1,0,NULL,NULL,'S03',NULL),(642,NULL,'Diámetro',1,0,NULL,NULL,'S04',NULL),(644,NULL,'Combinatiehoogte',1,0,NULL,NULL,'S06',NULL),(645,NULL,'Plantas/Maceta',1,0,NULL,NULL,'S07',NULL),(646,NULL,'Dikte',1,0,NULL,NULL,'S08',NULL),(647,NULL,'nº flores',1,0,NULL,NULL,'S09',NULL),(648,NULL,'Min aantal bloemtrossen p',1,0,NULL,NULL,'S10',NULL),(649,NULL,'nº ramales',1,0,NULL,NULL,'S11',NULL),(650,NULL,'Minimum aantal bollen per',1,0,NULL,NULL,'S12',NULL),(651,NULL,'Minimum aantal bladeren p',1,0,NULL,NULL,'S13',NULL),(652,NULL,'Minimum stamhoogte',1,0,NULL,NULL,'S14',NULL),(653,NULL,'Altura caja',1,0,NULL,NULL,'S15',NULL),(654,NULL,'Lengte scheuten',1,0,NULL,NULL,'S16',NULL),(655,NULL,'Min aant vertakkingen pr ',1,0,NULL,NULL,'S17',NULL),(656,NULL,'Altura del capullo',1,0,NULL,NULL,'S19',NULL),(658,NULL,'Peso tallo',1,0,NULL,NULL,'S21',NULL),(659,NULL,'nº flores',1,0,NULL,NULL,'S22',NULL),(660,NULL,'Diámetro de la flor',1,0,NULL,NULL,'S23',NULL),(661,NULL,'Minimum bloemschedelengte',1,0,NULL,NULL,'S24',NULL),(662,NULL,'Aantal bloemkoppen per tr',1,0,NULL,NULL,'S25',NULL),(663,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S26',NULL),(664,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S27',NULL),(665,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S28',NULL),(666,NULL,'Longitud inflorescencia',1,0,NULL,NULL,'S29',NULL),(667,NULL,'Verpakkingswijze snijbloe',1,0,NULL,NULL,'S30',NULL),(668,NULL,'Minimum aant bloemen per ',1,0,NULL,NULL,'S31',NULL),(669,NULL,'Longitud',1,0,NULL,NULL,'S32',NULL),(670,NULL,'Jaartal sortering hout',1,0,NULL,NULL,'S33',NULL),(671,NULL,'Diámetro de la hoja',1,0,NULL,NULL,'S34',NULL),(672,NULL,'Peso paquete',1,0,NULL,NULL,'S35',NULL),(673,NULL,'Maximum planthoogte',1,0,NULL,NULL,'S36',NULL),(674,NULL,'Maximum plantdiameter',1,0,NULL,NULL,'S37',NULL),(675,NULL,'Max aantal bloemen/bloeiw',1,0,NULL,NULL,'S38',NULL),(676,NULL,'Maximum aantal takken per',1,0,NULL,NULL,'S39',NULL),(677,NULL,'Maximum aantal bollen per',1,0,NULL,NULL,'S40',NULL),(678,NULL,'Maximum stamhoogte',1,0,NULL,NULL,'S41',NULL),(679,NULL,'Longitud mínima',1,0,NULL,NULL,'S42','size'),(680,NULL,'Maximum aantal knoppen sn',1,0,NULL,NULL,'S43',NULL),(681,NULL,'Maximum bloemdiameter',1,0,NULL,NULL,'S44',NULL),(682,NULL,'Maximum bloeiwijzelengte',1,0,NULL,NULL,'S45',NULL),(683,NULL,'Aantal vruchten / trossen',1,0,NULL,NULL,'S46',NULL),(684,NULL,'Verpakkingswijze',1,0,NULL,NULL,'S47',NULL),(685,NULL,'Minimum vruchtdiameter',1,0,NULL,NULL,'S48',NULL),(686,NULL,'Bolomvang',1,0,NULL,NULL,'S49',NULL),(687,NULL,'Bloem/bes/vruchtkleur 1',1,0,NULL,NULL,'S50',NULL),(688,NULL,'Potvorm',1,0,NULL,NULL,'S51',NULL),(689,NULL,'Potkleur',1,0,NULL,NULL,'S52',NULL),(690,NULL,'Material maceta',1,0,NULL,NULL,'S53',NULL),(691,NULL,'Plantvorm',1,0,NULL,NULL,'S54',NULL),(692,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,'S55',NULL),(693,NULL,'Teeltwijze',1,0,NULL,NULL,'S56',NULL),(694,NULL,'Teeltmedium',1,0,NULL,NULL,'S57',NULL),(695,NULL,'Cubierta',1,0,NULL,NULL,'S58',NULL),(696,NULL,'Hoesvorm',1,0,NULL,NULL,'S59',NULL),(697,NULL,'Hoesbedrukking algemeen',1,0,NULL,NULL,'S60',NULL),(698,NULL,'Extra toevoegingen',1,0,NULL,NULL,'S61',NULL),(699,NULL,'Land van herkomst (bedrij',1,0,NULL,NULL,'S62',NULL),(700,NULL,'Verpakte orchidee',1,0,NULL,NULL,'S63',NULL),(701,NULL,'Hoesbedrukking extra',1,0,NULL,NULL,'S64',NULL),(702,NULL,'Voorbehandeling',1,0,NULL,NULL,'S65',NULL),(703,NULL,'Overige niet in pot',1,0,NULL,NULL,'S66',NULL),(704,NULL,'Forma de la flor',1,0,NULL,NULL,'S67',NULL),(705,NULL,'Flexibilidad',1,0,NULL,NULL,'S68',NULL),(706,NULL,'Hoeskleur',1,0,NULL,NULL,'S69',NULL),(707,NULL,'Extra deco',1,0,NULL,NULL,'S70',NULL),(708,NULL,'Color',1,0,NULL,NULL,'S71','inkFk'),(709,NULL,'Producto',1,0,NULL,NULL,'S72',NULL),(710,NULL,'Altura',1,0,NULL,NULL,'S73',NULL),(711,NULL,'Diametro',1,0,NULL,NULL,'S74',NULL),(712,NULL,'Barcode',1,0,NULL,NULL,'S75',NULL),(713,NULL,'Productlabel',1,0,NULL,NULL,'S76',NULL),(714,NULL,'Eetbaar/ niet eetbaar',1,0,NULL,NULL,'S77',NULL),(715,NULL,'Plantmaat zonder pot',1,0,NULL,NULL,'S78',NULL),(716,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,'S79',NULL),(717,NULL,'Maximum percentage oud ho',1,0,NULL,NULL,'S80',NULL),(718,NULL,'Maximum lengte verschil',1,0,NULL,NULL,'S81',NULL),(719,NULL,'Bladkleur',1,0,NULL,NULL,'S82',NULL),(720,NULL,'Plantgewicht',1,0,NULL,NULL,'S83',NULL),(721,NULL,'Diámetro',1,0,NULL,NULL,'S84',NULL),(722,NULL,'Bloem/bes/vruchtkleur 2',1,0,NULL,NULL,'S85',NULL),(723,NULL,'Winterhardheid (USDA zone',1,0,NULL,NULL,'S86',NULL),(724,NULL,'Kleurbehandeld',1,0,NULL,NULL,'S87','inkFk'),(725,NULL,'Bloem-/bladkleurverdeling',1,0,NULL,NULL,'S88',NULL),(726,NULL,'Diámetro del capullo',1,0,NULL,NULL,'S89',NULL),(727,NULL,'Volume inhoud',1,0,NULL,NULL,'S90',NULL),(728,NULL,'Vruchtbenaming',1,0,NULL,NULL,'S91',NULL),(729,NULL,'Vaaslevenindex',1,0,NULL,NULL,'S92',NULL),(730,NULL,'Overige informatie plante',1,0,NULL,NULL,'S93',NULL),(731,NULL,'Overige informatie snijbl',1,0,NULL,NULL,'S94',NULL),(732,NULL,'Toepassingsmogelijkheid',1,0,NULL,NULL,'S95',NULL),(733,NULL,'Productbeeld aanvoerder',1,0,NULL,NULL,'S96',NULL),(734,NULL,'MPS certificering',1,0,NULL,NULL,'S97',NULL),(735,NULL,'Kwaliteitsgroep',1,0,NULL,NULL,'S98',NULL),(736,NULL,'Artikelomschrijving',1,0,NULL,NULL,'S99',NULL),(737,NULL,'BTW-tarief',1,0,NULL,NULL,'T01',NULL),(738,NULL,'Prijseenheid',1,0,NULL,NULL,'T02',NULL),(739,NULL,'Transactievorm',1,0,NULL,NULL,'T03',NULL),(740,NULL,'Handelsverpakking voorwaa',1,0,NULL,NULL,'T10',NULL),(741,NULL,'Consumentenverpakking voo',1,0,NULL,NULL,'T11',NULL),(742,NULL,'Leveringsvoorwaarden',1,0,NULL,NULL,'T12',NULL),(743,NULL,'PT heffing voorwaarden',1,0,NULL,NULL,'T13',NULL),(744,NULL,'Serviceheffing voorwaarde',1,0,NULL,NULL,'T14',NULL),(745,NULL,'Algemene voorwaarden',1,0,NULL,NULL,'T15',NULL),(746,NULL,'Marktvorm',1,0,NULL,NULL,'T16',NULL),(747,NULL,'Themadagen',1,0,NULL,NULL,'T17',NULL),(748,NULL,'Handelscategorie',1,0,NULL,NULL,'T18',NULL),(749,NULL,'Producentengroepen',1,0,NULL,NULL,'T19',NULL),(750,NULL,'Favorieten Id',1,0,NULL,NULL,'T20',NULL),(751,NULL,'Verkoopeenheid',1,0,NULL,NULL,'T21',NULL),(752,NULL,'Veilgroep voorkeur',1,0,NULL,NULL,'V01',NULL),(753,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V02',NULL),(754,NULL,'Keurmeesternummer FloraHo',1,0,NULL,NULL,'V03',NULL),(755,NULL,'Rijnummer Rijnsburg',1,0,NULL,NULL,'V04',NULL),(756,NULL,'Verwerkingslocatie FloraH',1,0,NULL,NULL,'V05',NULL),(757,NULL,'FloraHolland Financial',1,0,NULL,NULL,'V06',NULL),(758,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V07',NULL),(759,NULL,'Benefiet veiling',1,0,NULL,NULL,'V08',NULL),(760,NULL,'Kloksoort',1,0,NULL,NULL,'V09',NULL),(761,NULL,'Minimumprijs aanvoerder',1,0,NULL,NULL,'V10',NULL),(762,NULL,'Rest aantallen',1,0,NULL,NULL,'V11',NULL),(763,NULL,'Veilsoort',1,0,NULL,NULL,'V12',NULL),(764,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V13',NULL),(765,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V14',NULL),(766,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V15',NULL),(767,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V16',NULL),(768,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V17',NULL),(769,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V18',NULL),(770,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V19',NULL),(771,NULL,'Gereserveerd',1,0,NULL,NULL,'V20',NULL),(772,NULL,'Veilgroep Aalsmeer',1,0,NULL,NULL,'V21',NULL),(773,NULL,'Promotie kenmerk FloraHol',1,0,NULL,NULL,'V22',NULL),(774,NULL,'Verrekening snijbloemenvo',1,0,NULL,NULL,'V23',NULL),(775,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V24',NULL),(776,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V25',NULL),(777,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V26',NULL),(778,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V27',NULL),(779,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V28',NULL),(780,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V29',NULL),(781,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V30',NULL),(782,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V31',NULL),(783,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V32',NULL),(784,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V33',NULL),(785,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V34',NULL),(786,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V35',NULL),(787,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V36',NULL),(788,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V37',NULL),(789,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V38',NULL),(790,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V39',NULL),(791,NULL,'Gereserveerd',1,0,NULL,NULL,'V40',NULL),(792,NULL,'Tussenopslag klok Plantio',1,0,NULL,NULL,'V41',NULL),(793,NULL,'Soort ladingsdrager Plant',1,0,NULL,NULL,'V42',NULL),(794,NULL,'Logistiek middel Plantion',1,0,NULL,NULL,'V43',NULL),(795,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V44',NULL),(796,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V45',NULL),(797,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V46',NULL),(798,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V47',NULL),(799,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V48',NULL),(800,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V49',NULL),(801,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V50',NULL),(802,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V51',NULL),(803,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V52',NULL),(804,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V53',NULL),(805,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V54',NULL),(806,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V55',NULL),(807,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V56',NULL),(808,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V57',NULL),(809,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V58',NULL),(810,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V59',NULL),(811,NULL,'Gereserveerd',1,0,NULL,NULL,'V60',NULL),(812,NULL,'Veilgroep Plantion Ede',1,0,NULL,NULL,'V61',NULL),(813,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V62',NULL),(814,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V63',NULL),(815,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V64',NULL),(816,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V65',NULL),(817,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V66',NULL),(818,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V67',NULL),(819,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V68',NULL),(820,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V69',NULL),(821,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V70',NULL),(822,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V71',NULL),(823,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V72',NULL),(824,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V73',NULL),(825,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V74',NULL),(826,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V75',NULL),(827,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V76',NULL),(828,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V77',NULL),(829,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V78',NULL),(830,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V79',NULL),(831,NULL,'Toegevoegde waardes VRM',1,0,NULL,NULL,'V80',NULL),(832,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V81',NULL),(833,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V82',NULL),(834,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V83',NULL),(835,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V84',NULL),(836,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V85',NULL),(837,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V86',NULL),(838,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V87',NULL),(839,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V88',NULL),(840,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V89',NULL),(841,NULL,'Veiling',1,0,NULL,NULL,'V99',NULL),(842,NULL,'kopersaantallen',1,0,NULL,NULL,'Z01',NULL),(843,NULL,'Caducidad',1,0,NULL,NULL,NULL,NULL),(844,NULL,'Lote',1,0,NULL,NULL,NULL,NULL),(845,NULL,'Uds palet',1,0,NULL,NULL,NULL,NULL); +INSERT INTO `tag` VALUES (1,'color','Color',0,0,'ink',NULL,NULL,'inkFk'),(2,NULL,'Forma',1,0,NULL,NULL,NULL,NULL),(3,NULL,'Material',1,0,NULL,NULL,NULL,NULL),(4,NULL,'Longitud',1,1,NULL,'mm',NULL,'size'),(5,NULL,'Diámetro',1,1,NULL,'mm',NULL,'diameter'),(6,NULL,'Perímetro',1,1,NULL,'mm',NULL,NULL),(7,NULL,'Ancho de la base',1,1,NULL,'mm',NULL,NULL),(8,NULL,'Altura',1,1,NULL,'mm',NULL,'size'),(9,NULL,'Volumen',1,1,NULL,'ml',NULL,NULL),(10,NULL,'Densidad',1,1,NULL,NULL,NULL,NULL),(11,NULL,'Calidad',1,0,NULL,NULL,NULL,NULL),(12,NULL,'Textura',1,0,NULL,NULL,NULL,NULL),(13,NULL,'Material del mango',1,0,NULL,NULL,NULL,NULL),(14,NULL,'Compra mínima',1,0,NULL,NULL,NULL,NULL),(15,NULL,'Nº pétalos',1,1,NULL,NULL,NULL,NULL),(16,NULL,'Ancho',1,1,NULL,'mm',NULL,NULL),(18,NULL,'Profundidad',1,1,NULL,'mm',NULL,NULL),(19,NULL,'Largo',1,1,NULL,'mm',NULL,'size'),(20,NULL,'Ancho superior',1,1,NULL,'mm',NULL,NULL),(21,NULL,'Ancho inferior',1,1,NULL,'mm',NULL,NULL),(22,NULL,'Gramaje',1,1,NULL,'g',NULL,NULL),(23,'stems','Tallos',1,1,NULL,NULL,NULL,'stems'),(24,NULL,'Estado',1,0,NULL,NULL,NULL,NULL),(25,NULL,'Color principal',0,0,'ink',NULL,NULL,NULL),(26,NULL,'Color secundario',0,0,'ink',NULL,NULL,NULL),(27,NULL,'Longitud(cm)',1,1,NULL,'cm',NULL,NULL),(28,NULL,'Diámetro base',1,1,NULL,'mm',NULL,'diameter'),(29,NULL,'Colección',1,0,NULL,NULL,NULL,NULL),(30,NULL,'Uds / caja',1,1,NULL,NULL,NULL,NULL),(31,NULL,'Contenido',1,0,NULL,NULL,NULL,NULL),(32,NULL,'Peso',1,1,NULL,'g',NULL,NULL),(33,NULL,'Grosor',1,1,NULL,'mm',NULL,NULL),(34,NULL,'Marca',1,0,NULL,NULL,NULL,NULL),(35,'origin','Origen',0,0,'origin',NULL,NULL,'originFk'),(36,NULL,'Proveedor',1,0,NULL,NULL,NULL,NULL),(37,'producer','Productor',0,0,'producer',NULL,NULL,'producerFk'),(38,NULL,'Duración',1,1,NULL,'s',NULL,NULL),(39,NULL,'Flor',1,0,NULL,NULL,NULL,NULL),(40,NULL,'Soporte',1,0,NULL,NULL,NULL,NULL),(41,NULL,'Tamaño flor',1,0,NULL,NULL,NULL,NULL),(42,NULL,'Apertura',1,0,NULL,NULL,NULL,NULL),(43,NULL,'Tallo',1,0,NULL,NULL,NULL,NULL),(44,NULL,'Nº hojas',1,1,NULL,NULL,NULL,NULL),(45,NULL,'Dimensiones',1,0,NULL,NULL,NULL,NULL),(46,NULL,'Diámetro boca',1,1,NULL,'mm',NULL,NULL),(47,NULL,'Nº flores',1,1,NULL,NULL,NULL,NULL),(48,NULL,'Uds / paquete',1,1,NULL,NULL,NULL,NULL),(49,NULL,'Maceta',1,1,NULL,'cm',NULL,'diameter'),(50,NULL,'Textura flor',1,0,NULL,NULL,NULL,NULL),(51,NULL,'Textura hoja',1,0,NULL,NULL,NULL,NULL),(52,NULL,'Tipo de IVA',1,0,NULL,NULL,NULL,NULL),(53,NULL,'Tronco',1,0,NULL,NULL,NULL,NULL),(54,NULL,'Hoja',1,0,NULL,NULL,NULL,NULL),(55,NULL,'Formato',1,0,NULL,NULL,NULL,NULL),(56,NULL,'Genero',1,0,NULL,NULL,NULL,NULL),(57,NULL,'Especie',1,0,NULL,NULL,NULL,NULL),(58,NULL,'Variedad',1,0,NULL,NULL,NULL,NULL),(59,NULL,'Medida grande',1,0,NULL,NULL,NULL,NULL),(60,NULL,'Medida mediano',1,0,NULL,NULL,NULL,NULL),(61,NULL,'Medida pequeño',1,0,NULL,NULL,NULL,NULL),(63,NULL,'Recipiente interior',1,0,NULL,NULL,NULL,NULL),(64,NULL,'Material secundario',1,0,NULL,NULL,NULL,NULL),(65,NULL,'Colores',1,0,NULL,NULL,NULL,NULL),(66,NULL,'Referencia',1,0,NULL,NULL,NULL,NULL),(67,'category','Categoria',1,0,NULL,NULL,NULL,NULL),(68,NULL,'Amb',1,0,NULL,NULL,NULL,NULL),(69,NULL,'Anchura',1,1,NULL,'cm',NULL,NULL),(70,NULL,'Hueco interior',1,0,NULL,NULL,NULL,NULL),(71,NULL,'Tamaño',1,0,NULL,NULL,NULL,NULL),(72,NULL,'Color botón',1,0,NULL,NULL,NULL,NULL),(73,NULL,'Tamaño minimo del botón',1,0,NULL,NULL,NULL,NULL),(74,NULL,'Obtentor',1,0,NULL,NULL,NULL,NULL),(75,NULL,'Longitud del brote',1,0,NULL,NULL,NULL,NULL),(76,NULL,'Tallos / u.v.',1,0,NULL,NULL,NULL,NULL),(77,NULL,'Madera de',1,0,NULL,NULL,NULL,NULL),(78,NULL,'Unidad de venta',1,0,NULL,NULL,NULL,NULL),(79,NULL,'Temporal',1,0,NULL,NULL,NULL,NULL),(80,NULL,'Gramaje/tallo',1,1,NULL,'g',NULL,NULL),(81,NULL,'Peso/paquete',1,1,NULL,'g',NULL,NULL),(82,NULL,'Flexibilidad del tallo',1,0,NULL,NULL,NULL,NULL),(83,NULL,'Nº planchas',1,1,NULL,NULL,NULL,NULL),(84,NULL,'Nº páginas',1,1,NULL,NULL,NULL,NULL),(85,NULL,'Editorial',1,0,NULL,NULL,NULL,NULL),(86,NULL,'Idioma',1,0,NULL,NULL,NULL,NULL),(87,NULL,'Fecha publicación',1,0,NULL,NULL,NULL,NULL),(88,NULL,'Cubierta',1,0,NULL,NULL,NULL,NULL),(89,NULL,'Encuadernación',1,0,NULL,NULL,NULL,NULL),(90,NULL,'Autor',1,0,NULL,NULL,NULL,NULL),(91,NULL,'Envoltorio',1,0,NULL,NULL,NULL,NULL),(92,NULL,'Nombre temporal',1,0,NULL,NULL,NULL,NULL),(93,NULL,'Modelo',1,0,NULL,NULL,NULL,NULL),(94,NULL,'Producto',1,0,NULL,NULL,NULL,NULL),(95,NULL,'Título',1,0,NULL,NULL,NULL,NULL),(96,NULL,'Tomo',1,0,NULL,NULL,NULL,NULL),(97,NULL,'Articulo',1,0,NULL,NULL,NULL,NULL),(98,NULL,'Metodo de cultivo',1,0,NULL,NULL,NULL,NULL),(99,NULL,'Edad',1,0,NULL,NULL,NULL,NULL),(100,NULL,'Agotado',1,0,NULL,NULL,NULL,NULL),(101,NULL,'Altura con asa',1,1,NULL,'cm',NULL,'size'),(102,NULL,'Nº tallos',1,1,NULL,NULL,NULL,NULL),(103,NULL,'Cultivo',1,0,NULL,NULL,NULL,NULL),(104,NULL,'Sabor',1,0,NULL,NULL,NULL,NULL),(105,NULL,'Talla',1,0,NULL,NULL,NULL,NULL),(106,NULL,'Calibre',1,1,NULL,NULL,NULL,NULL),(107,NULL,'Dulzura',1,1,NULL,'bx',NULL,NULL),(108,NULL,'Piezas',1,0,NULL,NULL,NULL,NULL),(109,NULL,'Altura con patas',1,0,NULL,'cm',NULL,'size'),(110,NULL,'Envase',1,0,NULL,NULL,NULL,NULL),(111,NULL,'Nº piezas',1,0,NULL,NULL,NULL,NULL),(112,NULL,'Uso',1,0,NULL,'cm',NULL,NULL),(113,NULL,'Color luz',1,0,NULL,NULL,NULL,NULL),(114,NULL,'Capacidad',1,0,NULL,NULL,NULL,NULL),(184,NULL,'Tallos por paquete',1,0,NULL,NULL,NULL,NULL),(205,NULL,'Apertura',1,0,NULL,NULL,NULL,NULL),(219,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(552,NULL,'fout kenmerk',1,0,NULL,NULL,NULL,NULL),(553,NULL,'Potinhoud',1,0,NULL,NULL,NULL,NULL),(554,NULL,'Marketingconcept',1,0,NULL,NULL,NULL,NULL),(555,NULL,'Leeftijd',1,0,NULL,NULL,NULL,NULL),(556,NULL,'Base',1,0,NULL,NULL,NULL,NULL),(557,NULL,'Kleurbehandeld',1,0,NULL,NULL,NULL,'inkFk'),(558,NULL,'Verzorging: Standplaats',1,0,NULL,NULL,NULL,NULL),(559,NULL,'Verzorging: Water',1,0,NULL,NULL,NULL,NULL),(560,NULL,'Verzorging: Voeding',1,0,NULL,NULL,NULL,NULL),(561,NULL,'Verzorging: Temperatuur',1,0,NULL,NULL,NULL,NULL),(562,NULL,'Verzorging: Specifieke in',1,0,NULL,NULL,NULL,NULL),(563,NULL,'Verzorging: Consumptie',1,0,NULL,NULL,NULL,NULL),(564,NULL,'Nabehandeling',1,0,NULL,NULL,NULL,NULL),(565,NULL,'Artikel beeld',1,0,NULL,NULL,NULL,NULL),(566,NULL,'Hoofdkleur 1',1,0,NULL,NULL,NULL,NULL),(567,NULL,'Hoofdkleur 2',1,0,NULL,NULL,NULL,NULL),(568,NULL,'RHS hoofdkleur 1',1,0,NULL,NULL,NULL,NULL),(569,NULL,'RHS hoofdkleur 2',1,0,NULL,NULL,NULL,NULL),(570,NULL,'Hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(571,NULL,'Hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(572,NULL,'RHS hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(573,NULL,'RHS hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(574,NULL,'Botanisch beeld',1,0,NULL,NULL,NULL,NULL),(575,NULL,'Hoofdkleur bes/vrucht',1,0,NULL,NULL,NULL,NULL),(576,NULL,'RHS hoofdkleur bes/vrucht',1,0,NULL,NULL,NULL,NULL),(577,NULL,'UPOV hoofdkleur 1 bloem',1,0,NULL,NULL,NULL,NULL),(578,NULL,'UPOV hoofdkleur 2 bloem',1,0,NULL,NULL,NULL,NULL),(579,NULL,'UPOV hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(580,NULL,'UPOV hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(581,NULL,'UPOV hoofdkleur bes/vruch',1,0,NULL,NULL,NULL,NULL),(582,NULL,'Negatieve keurcode 1',1,0,NULL,NULL,NULL,NULL),(583,NULL,'Negatieve keurcode 2',1,0,NULL,NULL,NULL,NULL),(584,NULL,'Bedrijfskenmerk fytosanit',1,0,NULL,NULL,NULL,NULL),(585,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,NULL,NULL),(586,NULL,'Certificaten MPS-TraceCer',1,0,NULL,NULL,NULL,NULL),(587,NULL,'Overige leveranciersinfor',1,0,NULL,NULL,NULL,NULL),(588,NULL,'Certificaten MPS-GAP',1,0,NULL,NULL,NULL,NULL),(589,NULL,'Betrouwbaarheidsindex kla',1,0,NULL,NULL,NULL,NULL),(590,NULL,'Betrouwbaarheidsindex waa',1,0,NULL,NULL,NULL,NULL),(591,NULL,'Productkwaliteitslabel',1,0,NULL,NULL,NULL,NULL),(592,NULL,'Label Fair Flowers Fair P',1,0,NULL,NULL,NULL,NULL),(593,NULL,'Certificaten Socialy Qual',1,0,NULL,NULL,NULL,NULL),(594,NULL,'Certificaten GlobalGAP',1,0,NULL,NULL,NULL,NULL),(595,NULL,'Certificaten MPS Quality',1,0,NULL,NULL,NULL,NULL),(596,NULL,'Certificaten biologisch',1,0,NULL,NULL,NULL,NULL),(597,NULL,'Certificaten eetbare prod',1,0,NULL,NULL,NULL,NULL),(598,NULL,'Certificaten Florimark',1,0,NULL,NULL,NULL,NULL),(599,NULL,'Certificaten Milieukeur',1,0,NULL,NULL,NULL,NULL),(600,NULL,'Certificaten Kenya Flower',1,0,NULL,NULL,NULL,NULL),(601,NULL,'Certificaten Fairtrade',1,0,NULL,NULL,NULL,NULL),(602,NULL,'Keurmerk MPS-ProductProof',1,0,NULL,NULL,NULL,NULL),(603,NULL,'Certificaten ISO',1,0,NULL,NULL,NULL,NULL),(604,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,NULL,NULL),(605,NULL,'Certificaten Florverde',1,0,NULL,NULL,NULL,NULL),(606,NULL,'Certificaten Ethical Trad',1,0,NULL,NULL,NULL,NULL),(607,NULL,'Certificaten Ethiopian EH',1,0,NULL,NULL,NULL,NULL),(608,NULL,'Certificaten gewasbescher',1,0,NULL,NULL,NULL,NULL),(609,NULL,'Certificaten SAN',1,0,NULL,NULL,NULL,NULL),(610,NULL,'Certificaten GRASP',1,0,NULL,NULL,NULL,NULL),(611,NULL,'Label Fair Flora',1,0,NULL,NULL,NULL,NULL),(612,NULL,'GLobalG.A.P. Chain of Cus',1,0,NULL,NULL,NULL,NULL),(613,NULL,'Fust',1,0,NULL,NULL,NULL,NULL),(614,NULL,'Stapelwagen',1,0,NULL,NULL,NULL,NULL),(615,NULL,'Aantal legborden veilings',1,0,NULL,NULL,NULL,NULL),(616,NULL,'Aantal legborden Deense s',1,0,NULL,NULL,NULL,NULL),(617,NULL,'Aantal onderstellen Deens',1,0,NULL,NULL,NULL,NULL),(618,NULL,'Fustsoort',1,0,NULL,NULL,NULL,NULL),(619,NULL,'Envase',1,0,NULL,NULL,NULL,NULL),(620,NULL,'Aantal legborden Eurostap',1,0,NULL,NULL,NULL,NULL),(621,NULL,'Aantal onderstellen Euros',1,0,NULL,NULL,NULL,NULL),(622,NULL,'Tallos/bolsa',1,0,NULL,NULL,NULL,''),(623,NULL,'Aantal bossen per bundel',1,0,NULL,NULL,NULL,NULL),(624,NULL,'Aantal stuks per fust',1,0,NULL,NULL,NULL,NULL),(625,NULL,'Aantal bossen per fust',1,0,NULL,NULL,NULL,NULL),(626,NULL,'Aantal bundels per fust',1,0,NULL,NULL,NULL,NULL),(627,NULL,'Aantal bossen per hoes',1,0,NULL,NULL,NULL,NULL),(628,NULL,'Aantal bundels per hoes',1,0,NULL,NULL,NULL,NULL),(629,NULL,'Fustlabel',1,0,NULL,NULL,NULL,NULL),(630,NULL,'Karlabel',1,0,NULL,NULL,NULL,NULL),(631,NULL,'Service productlabel',1,0,NULL,NULL,NULL,NULL),(632,NULL,'Service fustlabel',1,0,NULL,NULL,NULL,NULL),(633,NULL,'Service karlabel',1,0,NULL,NULL,NULL,NULL),(634,NULL,'Aantal fusten per laag',1,0,NULL,NULL,NULL,NULL),(635,NULL,'Presentatie per schapm2',1,0,NULL,NULL,NULL,NULL),(636,NULL,'Positieve keurcode fytosa',1,0,NULL,NULL,NULL,NULL),(637,NULL,'Positieve keurcode kwalit',1,0,NULL,NULL,NULL,NULL),(638,NULL,'Positieve keurcode veilin',1,0,NULL,NULL,NULL,NULL),(639,NULL,'Maceta',1,1,NULL,'cm',NULL,'diameter'),(640,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(641,NULL,'nº plantas',1,0,NULL,NULL,NULL,NULL),(642,NULL,'Diámetro',1,0,NULL,NULL,NULL,NULL),(644,NULL,'Altura',1,1,NULL,'cm',NULL,'size'),(645,NULL,'Plantas/Maceta',1,0,NULL,NULL,NULL,NULL),(646,NULL,'Dikte',1,0,NULL,NULL,NULL,NULL),(647,NULL,'nº flores',1,0,NULL,NULL,NULL,NULL),(648,NULL,'Min aantal bloemtrossen p',1,0,NULL,NULL,NULL,NULL),(649,NULL,'nº ramales',1,0,NULL,NULL,NULL,NULL),(650,NULL,'Minimum aantal bollen per',1,0,NULL,NULL,NULL,NULL),(651,NULL,'Minimum aantal bladeren p',1,0,NULL,NULL,NULL,NULL),(652,NULL,'Altura tronco',1,1,NULL,'cm',NULL,'size'),(653,NULL,'Altura caja',1,0,NULL,'cm',NULL,'size'),(654,NULL,'Lengte scheuten',1,0,NULL,NULL,NULL,NULL),(655,NULL,'Min aant vertakkingen pr ',1,0,NULL,NULL,NULL,NULL),(656,NULL,'Altura del capullo',1,0,NULL,NULL,NULL,NULL),(658,NULL,'Peso tallo',1,0,NULL,NULL,NULL,NULL),(659,NULL,'nº flores',1,0,NULL,NULL,NULL,NULL),(660,NULL,'Diámetro de la flor',1,0,NULL,NULL,NULL,NULL),(661,NULL,'Minimum bloemschedelengte',1,0,NULL,NULL,NULL,NULL),(662,NULL,'Aantal bloemkoppen per tr',1,0,NULL,NULL,NULL,NULL),(663,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(664,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(665,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(666,NULL,'Longitud inflorescencia',1,0,NULL,NULL,NULL,NULL),(667,NULL,'Verpakkingswijze snijbloe',1,0,NULL,NULL,NULL,NULL),(668,NULL,'Minimum aant bloemen per ',1,0,NULL,NULL,NULL,NULL),(669,NULL,'Longitud',1,0,NULL,NULL,NULL,'size'),(670,NULL,'Jaartal sortering hout',1,0,NULL,NULL,NULL,NULL),(671,NULL,'Diámetro de la hoja',1,0,NULL,NULL,NULL,NULL),(672,NULL,'Peso paquete',1,0,NULL,NULL,NULL,NULL),(673,NULL,'Maximum planthoogte',1,0,NULL,NULL,NULL,NULL),(674,NULL,'Maximum plantdiameter',1,0,NULL,NULL,NULL,NULL),(675,NULL,'Max aantal bloemen/bloeiw',1,0,NULL,NULL,NULL,NULL),(676,NULL,'Maximum aantal takken per',1,0,NULL,NULL,NULL,NULL),(677,NULL,'Maximum aantal bollen per',1,0,NULL,NULL,NULL,NULL),(678,NULL,'Maximum stamhoogte',1,0,NULL,NULL,NULL,NULL),(679,NULL,'Longitud mínima',1,0,NULL,NULL,NULL,'size'),(680,NULL,'Maximum aantal knoppen sn',1,0,NULL,NULL,NULL,NULL),(681,NULL,'Maximum bloemdiameter',1,0,NULL,NULL,NULL,NULL),(682,NULL,'Maximum bloeiwijzelengte',1,0,NULL,NULL,NULL,NULL),(683,NULL,'Aantal vruchten / trossen',1,0,NULL,NULL,NULL,NULL),(684,NULL,'Verpakkingswijze',1,0,NULL,NULL,NULL,NULL),(685,NULL,'Minimum vruchtdiameter',1,0,NULL,NULL,NULL,NULL),(686,NULL,'Medida',1,1,NULL,'cm',NULL,'size'),(687,NULL,'Bloem/bes/vruchtkleur 1',1,0,NULL,NULL,NULL,NULL),(688,NULL,'Potvorm',1,0,NULL,NULL,NULL,NULL),(689,NULL,'Potkleur',1,0,NULL,NULL,NULL,NULL),(690,NULL,'Material maceta',1,0,NULL,NULL,NULL,NULL),(691,NULL,'Plantvorm',1,0,NULL,NULL,NULL,NULL),(692,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,NULL,NULL),(693,NULL,'Teeltwijze',1,0,NULL,NULL,NULL,NULL),(694,NULL,'Teeltmedium',1,0,NULL,NULL,NULL,NULL),(695,NULL,'Cubierta',1,0,NULL,NULL,NULL,NULL),(696,NULL,'Hoesvorm',1,0,NULL,NULL,NULL,NULL),(697,NULL,'Hoesbedrukking algemeen',1,0,NULL,NULL,NULL,NULL),(698,NULL,'Extra toevoegingen',1,0,NULL,NULL,NULL,NULL),(699,NULL,'Land van herkomst (bedrij',1,0,NULL,NULL,NULL,NULL),(700,NULL,'Verpakte orchidee',1,0,NULL,NULL,NULL,NULL),(701,NULL,'Hoesbedrukking extra',1,0,NULL,NULL,NULL,NULL),(702,NULL,'Voorbehandeling',1,0,NULL,NULL,NULL,NULL),(703,NULL,'Overige niet in pot',1,0,NULL,NULL,NULL,NULL),(704,NULL,'Forma de la flor',1,0,NULL,NULL,NULL,NULL),(705,NULL,'Flexibilidad',1,0,NULL,NULL,NULL,NULL),(706,NULL,'Hoeskleur',1,0,NULL,NULL,NULL,NULL),(707,NULL,'Extra deco',1,0,NULL,NULL,NULL,NULL),(708,NULL,'Color',1,0,NULL,NULL,NULL,'inkFk'),(709,NULL,'Producto',1,0,NULL,NULL,NULL,NULL),(710,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(711,NULL,'Diametro',1,0,NULL,NULL,NULL,NULL),(712,NULL,'Barcode',1,0,NULL,NULL,NULL,NULL),(713,NULL,'Productlabel',1,0,NULL,NULL,NULL,NULL),(714,NULL,'Eetbaar/ niet eetbaar',1,0,NULL,NULL,NULL,NULL),(715,NULL,'Plantmaat zonder pot',1,0,NULL,NULL,NULL,NULL),(716,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,NULL,NULL),(717,NULL,'Maximum percentage oud ho',1,0,NULL,NULL,NULL,NULL),(718,NULL,'Maximum lengte verschil',1,0,NULL,NULL,NULL,NULL),(719,NULL,'Bladkleur',1,0,NULL,NULL,NULL,NULL),(720,NULL,'Plantgewicht',1,0,NULL,NULL,NULL,NULL),(721,NULL,'Diámetro',1,0,NULL,NULL,NULL,NULL),(722,NULL,'Bloem/bes/vruchtkleur 2',1,0,NULL,NULL,NULL,NULL),(723,NULL,'Winterhardheid (USDA zone',1,0,NULL,NULL,NULL,NULL),(724,NULL,'Kleurbehandeld',1,0,NULL,NULL,NULL,'inkFk'),(725,NULL,'Bloem-/bladkleurverdeling',1,0,NULL,NULL,NULL,NULL),(726,NULL,'Diámetro del capullo',1,0,NULL,NULL,NULL,NULL),(727,NULL,'Volume inhoud',1,0,NULL,NULL,NULL,NULL),(728,NULL,'Vruchtbenaming',1,0,NULL,NULL,NULL,NULL),(729,NULL,'Vaaslevenindex',1,0,NULL,NULL,NULL,NULL),(730,NULL,'Overige informatie plante',1,0,NULL,NULL,NULL,NULL),(731,NULL,'Overige informatie snijbl',1,0,NULL,NULL,NULL,NULL),(732,NULL,'Toepassingsmogelijkheid',1,0,NULL,NULL,NULL,NULL),(733,NULL,'Productbeeld aanvoerder',1,0,NULL,NULL,NULL,NULL),(734,NULL,'MPS certificering',1,0,NULL,NULL,NULL,NULL),(735,NULL,'Kwaliteitsgroep',1,0,NULL,NULL,NULL,NULL),(736,NULL,'Artikelomschrijving',1,0,NULL,NULL,NULL,NULL),(737,NULL,'BTW-tarief',1,0,NULL,NULL,NULL,NULL),(738,NULL,'Prijseenheid',1,0,NULL,NULL,NULL,NULL),(739,NULL,'Transactievorm',1,0,NULL,NULL,NULL,NULL),(740,NULL,'Handelsverpakking voorwaa',1,0,NULL,NULL,NULL,NULL),(741,NULL,'Consumentenverpakking voo',1,0,NULL,NULL,NULL,NULL),(742,NULL,'Leveringsvoorwaarden',1,0,NULL,NULL,NULL,NULL),(743,NULL,'PT heffing voorwaarden',1,0,NULL,NULL,NULL,NULL),(744,NULL,'Serviceheffing voorwaarde',1,0,NULL,NULL,NULL,NULL),(745,NULL,'Algemene voorwaarden',1,0,NULL,NULL,NULL,NULL),(746,NULL,'Marktvorm',1,0,NULL,NULL,NULL,NULL),(747,NULL,'Themadagen',1,0,NULL,NULL,NULL,NULL),(748,NULL,'Handelscategorie',1,0,NULL,NULL,NULL,NULL),(749,NULL,'Producentengroepen',1,0,NULL,NULL,NULL,NULL),(750,NULL,'Favorieten Id',1,0,NULL,NULL,NULL,NULL),(751,NULL,'Verkoopeenheid',1,0,NULL,NULL,NULL,NULL),(752,NULL,'Veilgroep voorkeur',1,0,NULL,NULL,NULL,NULL),(753,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(754,NULL,'Keurmeesternummer FloraHo',1,0,NULL,NULL,NULL,NULL),(755,NULL,'Rijnummer Rijnsburg',1,0,NULL,NULL,NULL,NULL),(756,NULL,'Verwerkingslocatie FloraH',1,0,NULL,NULL,NULL,NULL),(757,NULL,'FloraHolland Financial',1,0,NULL,NULL,NULL,NULL),(758,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(759,NULL,'Benefiet veiling',1,0,NULL,NULL,NULL,NULL),(760,NULL,'Kloksoort',1,0,NULL,NULL,NULL,NULL),(761,NULL,'Minimumprijs aanvoerder',1,0,NULL,NULL,NULL,NULL),(762,NULL,'Rest aantallen',1,0,NULL,NULL,NULL,NULL),(763,NULL,'Veilsoort',1,0,NULL,NULL,NULL,NULL),(764,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(765,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(766,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(767,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(768,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(769,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(770,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(771,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(772,NULL,'Veilgroep Aalsmeer',1,0,NULL,NULL,NULL,NULL),(773,NULL,'Promotie kenmerk FloraHol',1,0,NULL,NULL,NULL,NULL),(774,NULL,'Verrekening snijbloemenvo',1,0,NULL,NULL,NULL,NULL),(775,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(776,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(777,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(778,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(779,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(780,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(781,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(782,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(783,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(784,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(785,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(786,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(787,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(788,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(789,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(790,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(791,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(792,NULL,'Tussenopslag klok Plantio',1,0,NULL,NULL,NULL,NULL),(793,NULL,'Soort ladingsdrager Plant',1,0,NULL,NULL,NULL,NULL),(794,NULL,'Logistiek middel Plantion',1,0,NULL,NULL,NULL,NULL),(795,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(796,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(797,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(798,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(799,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(800,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(801,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(802,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(803,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(804,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(805,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(806,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(807,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(808,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(809,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(810,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(811,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(812,NULL,'Veilgroep Plantion Ede',1,0,NULL,NULL,NULL,NULL),(813,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(814,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(815,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(816,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(817,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(818,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(819,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(820,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(821,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(822,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(823,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(824,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(825,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(826,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(827,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(828,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(829,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(830,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(831,NULL,'Toegevoegde waardes VRM',1,0,NULL,NULL,NULL,NULL),(832,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(833,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(834,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(835,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(836,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(837,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(838,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(839,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(840,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(841,NULL,'Veiling',1,0,NULL,NULL,NULL,NULL),(842,NULL,'kopersaantallen',1,0,NULL,NULL,NULL,NULL),(843,NULL,'Caducidad',1,0,NULL,NULL,NULL,NULL),(844,NULL,'Lote',1,0,NULL,NULL,NULL,NULL),(845,NULL,'Uds palet',1,0,NULL,NULL,NULL,NULL),(4548,NULL,'fout kenmerk',1,0,NULL,NULL,'081',NULL),(4549,NULL,'Potinhoud',1,0,NULL,NULL,'A01',NULL),(4550,NULL,'Marketingconcept',1,0,NULL,NULL,'A02',NULL),(4551,NULL,'Leeftijd',1,0,NULL,NULL,'A03',NULL),(4552,NULL,'Uitgangsmateriaal',1,0,NULL,NULL,'A04',NULL),(4553,NULL,'Kleurbehandeld',1,0,NULL,NULL,'A05',NULL),(4554,NULL,'Verzorging: Standplaats',1,0,NULL,NULL,'A06',NULL),(4555,NULL,'Verzorging: Water',1,0,NULL,NULL,'A07',NULL),(4556,NULL,'Verzorging: Voeding',1,0,NULL,NULL,'A08',NULL),(4557,NULL,'Verzorging: Temperatuur',1,0,NULL,NULL,'A09',NULL),(4558,NULL,'Verzorging: Specifieke in',1,0,NULL,NULL,'A10',NULL),(4559,NULL,'Verzorging: Consumptie',1,0,NULL,NULL,'A11',NULL),(4560,NULL,'Nabehandeling',1,0,NULL,NULL,'A13',NULL),(4561,NULL,'Artikel beeld',1,0,NULL,NULL,'A23',NULL),(4562,NULL,'Hoofdkleur 1',1,0,NULL,NULL,'B01',NULL),(4563,NULL,'Hoofdkleur 2',1,0,NULL,NULL,'B02',NULL),(4564,NULL,'RHS hoofdkleur 1',1,0,NULL,NULL,'B03',NULL),(4565,NULL,'RHS hoofdkleur 2',1,0,NULL,NULL,'B04',NULL),(4566,NULL,'Hoofdkleur 1 blad',1,0,NULL,NULL,'B05',NULL),(4567,NULL,'Hoofdkleur 2 blad',1,0,NULL,NULL,'B06',NULL),(4568,NULL,'RHS hoofdkleur 1 blad',1,0,NULL,NULL,'B07',NULL),(4569,NULL,'RHS hoofdkleur 2 blad',1,0,NULL,NULL,'B08',NULL),(4570,NULL,'Botanisch beeld',1,0,NULL,NULL,'B09',NULL),(4571,NULL,'Hoofdkleur bes/vrucht',1,0,NULL,NULL,'B10',NULL),(4572,NULL,'RHS hoofdkleur bes/vrucht',1,0,NULL,NULL,'B11',NULL),(4573,NULL,'UPOV hoofdkleur 1 bloem',1,0,NULL,NULL,'B12',NULL),(4574,NULL,'UPOV hoofdkleur 2 bloem',1,0,NULL,NULL,'B13',NULL),(4575,NULL,'UPOV hoofdkleur 1 blad',1,0,NULL,NULL,'B14',NULL),(4576,NULL,'UPOV hoofdkleur 2 blad',1,0,NULL,NULL,'B15',NULL),(4577,NULL,'UPOV hoofdkleur bes/vruch',1,0,NULL,NULL,'B16',NULL),(4578,NULL,'Negatieve keurcode 1',1,0,NULL,NULL,'K01',NULL),(4579,NULL,'Negatieve keurcode 2',1,0,NULL,NULL,'K02',NULL),(4580,NULL,'Bedrijfskenmerk fytosanit',1,0,NULL,NULL,'K03',NULL),(4581,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,'K04',NULL),(4582,NULL,'Certificaten MPS-TraceCer',1,0,NULL,NULL,'K05',NULL),(4583,NULL,'Overige leveranciersinfor',1,0,NULL,NULL,'K07',NULL),(4584,NULL,'Certificaten MPS-GAP',1,0,NULL,NULL,'K08',NULL),(4585,NULL,'Betrouwbaarheidsindex kla',1,0,NULL,NULL,'K11',NULL),(4586,NULL,'Betrouwbaarheidsindex waa',1,0,NULL,NULL,'K12',NULL),(4587,NULL,'Productkwaliteitslabel',1,0,NULL,NULL,'K13',NULL),(4588,NULL,'Label Fair Flowers Fair P',1,0,NULL,NULL,'K14',NULL),(4589,NULL,'Certificaten Socialy Qual',1,0,NULL,NULL,'K15',NULL),(4590,NULL,'Certificaten GlobalGAP',1,0,NULL,NULL,'K16',NULL),(4591,NULL,'Certificaten MPS Quality',1,0,NULL,NULL,'K17',NULL),(4592,NULL,'Certificaten biologisch',1,0,NULL,NULL,'K18',NULL),(4593,NULL,'Certificaten eetbare prod',1,0,NULL,NULL,'K19',NULL),(4594,NULL,'Certificaten Florimark',1,0,NULL,NULL,'K20',NULL),(4595,NULL,'Certificaten Milieukeur',1,0,NULL,NULL,'K21',NULL),(4596,NULL,'Certificaten Kenya Flower',1,0,NULL,NULL,'K22',NULL),(4597,NULL,'Certificaten Fairtrade',1,0,NULL,NULL,'K23',NULL),(4598,NULL,'Keurmerk MPS-ProductProof',1,0,NULL,NULL,'K24',NULL),(4599,NULL,'Certificaten ISO',1,0,NULL,NULL,'K25',NULL),(4600,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,'K26',NULL),(4601,NULL,'Certificaten Florverde',1,0,NULL,NULL,'K27',NULL),(4602,NULL,'Certificaten Ethical Trad',1,0,NULL,NULL,'K28',NULL),(4603,NULL,'Certificaten Ethiopian EH',1,0,NULL,NULL,'K29',NULL),(4604,NULL,'Certificaten gewasbescher',1,0,NULL,NULL,'K30',NULL),(4605,NULL,'Certificaten SAN',1,0,NULL,NULL,'K31',NULL),(4606,NULL,'Certificaten GRASP',1,0,NULL,NULL,'K32',NULL),(4607,NULL,'Label Fair Flora',1,0,NULL,NULL,'K33',NULL),(4608,NULL,'GLobalG.A.P. Chain of Cus',1,0,NULL,NULL,'K34',NULL),(4609,NULL,'Certificaten Vegaplan',1,0,NULL,NULL,'K35',NULL),(4610,NULL,'Floriculture Sustainabili',1,0,NULL,NULL,'K99',NULL),(4611,NULL,'Fust',1,0,NULL,NULL,'L01',NULL),(4612,NULL,'Stapelwagen',1,0,NULL,NULL,'L02',NULL),(4613,NULL,'Aantal legborden veilings',1,0,NULL,NULL,'L03',NULL),(4614,NULL,'Aantal legborden Deense s',1,0,NULL,NULL,'L04',NULL),(4615,NULL,'Aantal onderstellen Deens',1,0,NULL,NULL,'L05',NULL),(4616,NULL,'Fustsoort',1,0,NULL,NULL,'L06',NULL),(4617,NULL,'Fustmateriaal',1,0,NULL,NULL,'L07',NULL),(4618,NULL,'Aantal legborden Eurostap',1,0,NULL,NULL,'L08',NULL),(4619,NULL,'Aantal onderstellen Euros',1,0,NULL,NULL,'L09',NULL),(4620,NULL,'Aantal stelen per bos',1,0,NULL,NULL,'L11',NULL),(4621,NULL,'Aantal bossen per bundel',1,0,NULL,NULL,'L12',NULL),(4622,NULL,'Aantal stuks per fust',1,0,NULL,NULL,'L13',NULL),(4623,NULL,'Aantal bossen per fust',1,0,NULL,NULL,'L14',NULL),(4624,NULL,'Aantal bundels per fust',1,0,NULL,NULL,'L15',NULL),(4625,NULL,'Aantal bossen per hoes',1,0,NULL,NULL,'L16',NULL),(4626,NULL,'Aantal bundels per hoes',1,0,NULL,NULL,'L17',NULL),(4627,NULL,'Fustlabel',1,0,NULL,NULL,'L18',NULL),(4628,NULL,'Karlabel',1,0,NULL,NULL,'L19',NULL),(4629,NULL,'Service productlabel',1,0,NULL,NULL,'L20',NULL),(4630,NULL,'Service fustlabel',1,0,NULL,NULL,'L21',NULL),(4631,NULL,'Service karlabel',1,0,NULL,NULL,'L22',NULL),(4632,NULL,'Aantal fusten per laag',1,0,NULL,NULL,'L23',NULL),(4633,NULL,'Presentatie per schapm2',1,0,NULL,NULL,'L24',NULL),(4634,NULL,'Positieve keurcode fytosa',1,0,NULL,NULL,'P01',NULL),(4635,NULL,'Positieve keurcode kwalit',1,0,NULL,NULL,'P02',NULL),(4636,NULL,'Positieve keurcode veilin',1,0,NULL,NULL,'P03',NULL),(4637,NULL,'Maceta',1,0,NULL,NULL,'S01',NULL),(4638,NULL,'Altura mínima',1,1,NULL,'cm','S02','size'),(4639,NULL,'nº plantas',1,0,NULL,NULL,'S03',NULL),(4640,NULL,'Minimum plantdiameter',1,0,NULL,NULL,'S04',NULL),(4641,NULL,'Madurez',1,0,NULL,NULL,'S05',NULL),(4642,NULL,'Combinatiehoogte',1,0,NULL,NULL,'S06',NULL),(4643,NULL,'Min aantal koppen hoogste',1,0,NULL,NULL,'S07',NULL),(4644,NULL,'Dikte',1,0,NULL,NULL,'S08',NULL),(4645,NULL,'Min aantal bloemen/bloeiw',1,0,NULL,NULL,'S09',NULL),(4646,NULL,'Min aantal bloemtrossen p',1,0,NULL,NULL,'S10',NULL),(4647,NULL,'Minimum aantal takken per',1,0,NULL,NULL,'S11',NULL),(4648,NULL,'Minimum aantal bollen per',1,0,NULL,NULL,'S12',NULL),(4649,NULL,'Minimum aantal bladeren p',1,0,NULL,NULL,'S13',NULL),(4650,NULL,'Altura tronco',1,1,NULL,'cm','S14','size'),(4651,NULL,'Altura transporte',1,0,NULL,'cm','S15','size'),(4652,NULL,'Lengte scheuten',1,0,NULL,NULL,'S16',NULL),(4653,NULL,'Min aant vertakkingen pr ',1,0,NULL,NULL,'S17',NULL),(4654,NULL,'Minimum bloemknophoogte',1,0,NULL,NULL,'S19',NULL),(4655,NULL,'Altura',1,1,NULL,'cm','S20','size'),(4656,NULL,'Gewicht (gemiddeld)',1,0,NULL,NULL,'S21',NULL),(4657,NULL,'Aantal bloemknoppen snijb',1,0,NULL,NULL,'S22',NULL),(4658,NULL,'Minimum bloemdiameter',1,0,NULL,NULL,'S23',NULL),(4659,NULL,'Minimum bloemschedelengte',1,0,NULL,NULL,'S24',NULL),(4660,NULL,'Aantal bloemkoppen per tr',1,0,NULL,NULL,'S25',NULL),(4661,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S26',NULL),(4662,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S27',NULL),(4663,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S28',NULL),(4664,NULL,'Minimum bloeiwijzelengte',1,0,NULL,NULL,'S29',NULL),(4665,NULL,'Verpakkingswijze snijbloe',1,0,NULL,NULL,'S30',NULL),(4666,NULL,'Minimum aant bloemen per ',1,0,NULL,NULL,'S31',NULL),(4667,NULL,'Medida',1,0,NULL,'cm','S32','size'),(4668,NULL,'Jaartal sortering hout',1,0,NULL,NULL,'S33',NULL),(4669,NULL,'Minimum bladdiameter',1,0,NULL,NULL,'S34',NULL),(4670,NULL,'Minimum bundelgewicht',1,0,NULL,NULL,'S35',NULL),(4671,NULL,'Altura máxima',1,0,NULL,NULL,'S36',NULL),(4672,NULL,'Maximum plantdiameter',1,0,NULL,NULL,'S37',NULL),(4673,NULL,'Max aantal bloemen/bloeiw',1,0,NULL,NULL,'S38',NULL),(4674,NULL,'Maximum aantal takken per',1,0,NULL,NULL,'S39',NULL),(4675,NULL,'Maximum aantal bollen per',1,0,NULL,NULL,'S40',NULL),(4676,NULL,'Altura máxima',1,0,NULL,NULL,'S41',NULL),(4677,NULL,'Maximum steellengte',1,0,NULL,NULL,'S42',NULL),(4678,NULL,'Maximum aantal knoppen sn',1,0,NULL,NULL,'S43',NULL),(4679,NULL,'Maximum bloemdiameter',1,0,NULL,NULL,'S44',NULL),(4680,NULL,'Maximum bloeiwijzelengte',1,0,NULL,NULL,'S45',NULL),(4681,NULL,'Aantal vruchten / trossen',1,0,NULL,NULL,'S46',NULL),(4682,NULL,'Verpakkingswijze',1,0,NULL,NULL,'S47',NULL),(4683,NULL,'Minimum vruchtdiameter',1,0,NULL,NULL,'S48',NULL),(4684,NULL,'Medida',1,1,NULL,'cm','S49','size'),(4685,NULL,'Bloem/bes/vruchtkleur 1',1,0,NULL,NULL,'S50',NULL),(4686,NULL,'Potvorm',1,0,NULL,NULL,'S51',NULL),(4687,NULL,'Potkleur',1,0,NULL,NULL,'S52',NULL),(4688,NULL,'Potmateriaal',1,0,NULL,NULL,'S53',NULL),(4689,NULL,'Plantvorm',1,0,NULL,NULL,'S54',NULL),(4690,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,'S55',NULL),(4691,NULL,'Teeltwijze',1,0,NULL,NULL,'S56',NULL),(4692,NULL,'Teeltmedium',1,0,NULL,NULL,'S57',NULL),(4693,NULL,'Hoesmateriaal',1,0,NULL,NULL,'S58',NULL),(4694,NULL,'Hoesvorm',1,0,NULL,NULL,'S59',NULL),(4695,NULL,'Hoesbedrukking algemeen',1,0,NULL,NULL,'S60',NULL),(4696,NULL,'Extra toevoegingen',1,0,NULL,NULL,'S61',NULL),(4697,NULL,'Land van herkomst (bedrij',1,0,NULL,NULL,'S62',NULL),(4698,NULL,'Verpakte orchidee',1,0,NULL,NULL,'S63',NULL),(4699,NULL,'Hoesbedrukking extra',1,0,NULL,NULL,'S64',NULL),(4700,NULL,'Voorbehandeling',1,0,NULL,NULL,'S65',NULL),(4701,NULL,'Overige niet in pot',1,0,NULL,NULL,'S66',NULL),(4702,NULL,'Vorm snijbloemen',1,0,NULL,NULL,'S67',NULL),(4703,NULL,'Buigzaamheid bloemsteel',1,0,NULL,NULL,'S68',NULL),(4704,NULL,'Hoeskleur',1,0,NULL,NULL,'S69',NULL),(4705,NULL,'Extra deco materiaal',1,0,NULL,NULL,'S70',NULL),(4706,NULL,'Productkleur',1,0,NULL,NULL,'S71',NULL),(4707,NULL,'Productmateriaal',1,0,NULL,NULL,'S72',NULL),(4708,NULL,'Altura',1,1,NULL,'cm','S73','size'),(4709,NULL,'Materiaaldiameter',1,0,NULL,NULL,'S74',NULL),(4710,NULL,'Barcode',1,0,NULL,NULL,'S75',NULL),(4711,NULL,'Productlabel',1,0,NULL,NULL,'S76',NULL),(4712,NULL,'Eetbaar/ niet eetbaar',1,0,NULL,NULL,'S77',NULL),(4713,NULL,'Plantmaat zonder pot',1,0,NULL,NULL,'S78',NULL),(4714,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,'S79',NULL),(4715,NULL,'Maximum percentage oud ho',1,0,NULL,NULL,'S80',NULL),(4716,NULL,'Maximum lengte verschil',1,0,NULL,NULL,'S81',NULL),(4717,NULL,'Bladkleur',1,0,NULL,NULL,'S82',NULL),(4718,NULL,'Plantgewicht',1,0,NULL,NULL,'S83',NULL),(4719,NULL,'Gemiddelde bloemdiameter',1,0,NULL,NULL,'S84',NULL),(4720,NULL,'Bloem/bes/vruchtkleur 2',1,0,NULL,NULL,'S85',NULL),(4721,NULL,'Winterhardheid (USDA zone',1,0,NULL,NULL,'S86',NULL),(4722,NULL,'Kleurbehandeld',1,0,NULL,NULL,'S87',NULL),(4723,NULL,'Bloem-/bladkleurverdeling',1,0,NULL,NULL,'S88',NULL),(4724,NULL,'Minimum bloemknopdiameter',1,0,NULL,NULL,'S89',NULL),(4725,NULL,'Volume inhoud',1,0,NULL,NULL,'S90',NULL),(4726,NULL,'Vruchtbenaming',1,0,NULL,NULL,'S91',NULL),(4727,NULL,'Vaaslevenindex',1,0,NULL,NULL,'S92',NULL),(4728,NULL,'Overige informatie plante',1,0,NULL,NULL,'S93',NULL),(4729,NULL,'Overige informatie snijbl',1,0,NULL,NULL,'S94',NULL),(4730,NULL,'Toepassingsmogelijkheid',1,0,NULL,NULL,'S95',NULL),(4731,NULL,'Productbeeld aanvoerder',1,0,NULL,NULL,'S96',NULL),(4732,NULL,'MPS certificering',1,0,NULL,NULL,'S97',NULL),(4733,NULL,'Kwaliteitsgroep',1,0,NULL,NULL,'S98',NULL),(4734,NULL,'Artikelomschrijving',1,0,NULL,NULL,'S99',NULL),(4735,NULL,'BTW-tarief',1,0,NULL,NULL,'T01',NULL),(4736,NULL,'Prijseenheid',1,0,NULL,NULL,'T02',NULL),(4737,NULL,'Transactievorm',1,0,NULL,NULL,'T03',NULL),(4738,NULL,'Handelsverpakking voorwaa',1,0,NULL,NULL,'T10',NULL),(4739,NULL,'Consumentenverpakking voo',1,0,NULL,NULL,'T11',NULL),(4740,NULL,'Leveringsvoorwaarden',1,0,NULL,NULL,'T12',NULL),(4741,NULL,'PT heffing voorwaarden',1,0,NULL,NULL,'T13',NULL),(4742,NULL,'Serviceheffing voorwaarde',1,0,NULL,NULL,'T14',NULL),(4743,NULL,'Algemene voorwaarden',1,0,NULL,NULL,'T15',NULL),(4744,NULL,'Marktvorm',1,0,NULL,NULL,'T16',NULL),(4745,NULL,'Themadagen',1,0,NULL,NULL,'T17',NULL),(4746,NULL,'Handelscategorie',1,0,NULL,NULL,'T18',NULL),(4747,NULL,'Producentengroepen',1,0,NULL,NULL,'T19',NULL),(4748,NULL,'Favorieten Id',1,0,NULL,NULL,'T20',NULL),(4749,NULL,'Verkoopeenheid',1,0,NULL,NULL,'T21',NULL),(4750,NULL,'Veilgroep voorkeur',1,0,NULL,NULL,'V01',NULL),(4751,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V02',NULL),(4752,NULL,'Keurmeesternummer FloraHo',1,0,NULL,NULL,'V03',NULL),(4753,NULL,'Rijnummer Rijnsburg',1,0,NULL,NULL,'V04',NULL),(4754,NULL,'Verwerkingslocatie FloraH',1,0,NULL,NULL,'V05',NULL),(4755,NULL,'FloraHolland Financial',1,0,NULL,NULL,'V06',NULL),(4756,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V07',NULL),(4757,NULL,'Benefiet veiling',1,0,NULL,NULL,'V08',NULL),(4758,NULL,'Kloksoort',1,0,NULL,NULL,'V09',NULL),(4759,NULL,'Minimumprijs aanvoerder',1,0,NULL,NULL,'V10',NULL),(4760,NULL,'Rest aantallen',1,0,NULL,NULL,'V11',NULL),(4761,NULL,'Veilsoort',1,0,NULL,NULL,'V12',NULL),(4762,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V13',NULL),(4763,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V14',NULL),(4764,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V15',NULL),(4765,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V16',NULL),(4766,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V17',NULL),(4767,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V18',NULL),(4768,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V19',NULL),(4769,NULL,'Gereserveerd',1,0,NULL,NULL,'V20',NULL),(4770,NULL,'Veilgroep Aalsmeer',1,0,NULL,NULL,'V21',NULL),(4771,NULL,'Promotie kenmerk FloraHol',1,0,NULL,NULL,'V22',NULL),(4772,NULL,'Verrekening snijbloemenvo',1,0,NULL,NULL,'V23',NULL),(4773,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V24',NULL),(4774,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V25',NULL),(4775,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V26',NULL),(4776,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V27',NULL),(4777,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V28',NULL),(4778,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V29',NULL),(4779,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V30',NULL),(4780,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V31',NULL),(4781,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V32',NULL),(4782,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V33',NULL),(4783,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V34',NULL),(4784,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V35',NULL),(4785,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V36',NULL),(4786,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V37',NULL),(4787,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V38',NULL),(4788,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V39',NULL),(4789,NULL,'Gereserveerd',1,0,NULL,NULL,'V40',NULL),(4790,NULL,'Tussenopslag klok Plantio',1,0,NULL,NULL,'V41',NULL),(4791,NULL,'Soort ladingsdrager Plant',1,0,NULL,NULL,'V42',NULL),(4792,NULL,'Logistiek middel Plantion',1,0,NULL,NULL,'V43',NULL),(4793,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V44',NULL),(4794,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V45',NULL),(4795,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V46',NULL),(4796,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V47',NULL),(4797,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V48',NULL),(4798,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V49',NULL),(4799,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V50',NULL),(4800,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V51',NULL),(4801,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V52',NULL),(4802,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V53',NULL),(4803,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V54',NULL),(4804,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V55',NULL),(4805,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V56',NULL),(4806,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V57',NULL),(4807,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V58',NULL),(4808,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V59',NULL),(4809,NULL,'Gereserveerd',1,0,NULL,NULL,'V60',NULL),(4810,NULL,'Veilgroep Plantion Ede',1,0,NULL,NULL,'V61',NULL),(4811,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V62',NULL),(4812,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V63',NULL),(4813,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V64',NULL),(4814,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V65',NULL),(4815,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V66',NULL),(4816,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V67',NULL),(4817,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V68',NULL),(4818,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V69',NULL),(4819,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V70',NULL),(4820,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V71',NULL),(4821,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V72',NULL),(4822,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V73',NULL),(4823,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V74',NULL),(4824,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V75',NULL),(4825,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V76',NULL),(4826,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V77',NULL),(4827,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V78',NULL),(4828,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V79',NULL),(4829,NULL,'Toegevoegde waardes VRM',1,0,NULL,NULL,'V80',NULL),(4830,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V81',NULL),(4831,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V82',NULL),(4832,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V83',NULL),(4833,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V84',NULL),(4834,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V85',NULL),(4835,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V86',NULL),(4836,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V87',NULL),(4837,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V88',NULL),(4838,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V89',NULL),(4839,NULL,'Veiling',1,0,NULL,NULL,'V99',NULL),(4840,NULL,'kopersaantallen',1,0,NULL,NULL,'Z01',NULL); /*!40000 ALTER TABLE `tag` ENABLE KEYS */; UNLOCK TABLES; @@ -347,7 +347,7 @@ UNLOCK TABLES; LOCK TABLES `department` WRITE; /*!40000 ALTER TABLE `department` DISABLE KEYS */; -INSERT INTO `department` VALUES (1,'VERDNATURA',1,2,763,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL),(22,'COMPRAS',3,4,NULL,72,596,2,5,0,0,0,0,NULL,'/',NULL,1,NULL),(23,'CAMARA',14,19,NULL,72,604,2,6,1,0,1,2,37,'/37/',NULL,0,NULL),(31,'INFORMATICA',5,6,NULL,72,127,3,9,0,0,0,0,NULL,'/',NULL,1,NULL),(34,'CONTABILIDAD',7,8,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL),(35,'FINANZAS',9,10,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL),(36,'LABORAL',11,12,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL),(37,'PRODUCCION',13,52,NULL,72,230,3,11,1,0,0,17,NULL,'/',NULL,0,NULL),(38,'SACADO',20,21,NULL,72,230,4,14,1,0,1,0,37,'/37/',NULL,0,NULL),(39,'ENCAJADO',22,23,NULL,72,230,4,12,1,0,1,0,37,'/37/',NULL,0,NULL),(41,'ADMINISTRACION',53,54,NULL,72,599,3,8,0,0,0,0,NULL,'/',NULL,1,NULL),(43,'VENTAS',55,76,NULL,0,NULL,NULL,NULL,0,0,0,10,NULL,'/',NULL,1,'direccioncomercial@verdnatura.es'),(44,'GERENCIA',77,78,NULL,72,300,2,7,0,0,0,0,NULL,'/',NULL,0,NULL),(45,'LOGISTICA',79,80,NULL,72,596,3,19,0,0,0,0,NULL,'/',NULL,1,NULL),(46,'REPARTO',81,84,NULL,72,659,3,10,0,0,0,1,NULL,'/',NULL,0,NULL),(48,'ALMACENAJE',85,86,NULL,0,NULL,NULL,NULL,1,0,0,0,NULL,'/',NULL,0,NULL),(49,'PROPIEDAD',87,88,NULL,72,1008,1,1,0,0,0,0,NULL,'/',NULL,0,NULL),(52,'CARGA AEREA',89,90,NULL,72,163,4,28,0,0,0,0,NULL,'/',NULL,0,NULL),(53,'MARKETING Y COMUNICACIÓN',91,92,NULL,72,1238,0,0,0,0,0,0,NULL,'/',NULL,1,NULL),(54,'ORNAMENTALES',93,94,NULL,72,433,3,21,0,0,0,0,NULL,'/',NULL,0,NULL),(55,'TALLER NATURAL',95,96,NULL,72,695,2,23,0,0,0,0,NULL,'/',NULL,0,NULL),(56,'TALLER ARTIFICIAL',97,98,NULL,72,1780,2,24,0,0,0,0,NULL,'/',NULL,0,NULL),(58,'CAMPOS',99,100,NULL,72,225,2,2,0,0,0,0,NULL,'/',NULL,0,NULL),(59,'MANTENIMIENTO',101,102,NULL,72,1907,4,16,0,0,0,0,NULL,'/',NULL,0,NULL),(60,'RECLAMACIONES',103,104,NULL,72,563,3,20,0,0,0,0,NULL,'/',NULL,1,NULL),(61,'VNH',105,106,NULL,73,1297,3,17,0,0,0,0,NULL,'/',NULL,0,NULL),(63,'VENTAS FRANCIA',56,57,NULL,72,277,2,27,0,0,1,0,43,'/43/',NULL,0,NULL),(66,'VERDNAMADRID',107,108,NULL,72,163,3,18,0,0,0,0,NULL,'/',NULL,0,NULL),(68,'COMPLEMENTOS',24,25,NULL,72,617,3,26,1,0,1,0,37,'/37/',NULL,0,NULL),(69,'VERDNABARNA',109,110,NULL,74,432,3,22,0,0,0,0,NULL,'/',NULL,0,NULL),(77,'PALETIZADO',82,83,NULL,72,230,4,15,1,0,1,0,46,'/46/',NULL,0,NULL),(80,'EQUIPO J VALLES',58,59,NULL,72,693,3,4,0,0,1,0,43,'/43/','jvp_equipo',1,NULL),(86,'LIMPIEZA',111,112,NULL,72,599,0,0,0,0,0,0,NULL,'/',NULL,0,NULL),(89,'COORDINACION',113,114,NULL,0,NULL,NULL,NULL,1,0,0,0,NULL,'/',NULL,0,NULL),(90,'TRAILER',115,116,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL),(91,'ARTIFICIAL',26,27,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(92,'EQUIPO SILVERIO',60,61,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','sdc_equipo',1,NULL),(93,'CONFECCION',117,118,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL),(94,'EQUIPO J BROCAL',62,63,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','jes_equipo',1,NULL),(95,'EQUIPO C ZAMBRANO',64,65,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','czg_equipo',1,NULL),(96,'EQUIPO C LOPEZ',66,67,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','cla_equipo',1,NULL),(98,'EQUIPO RODRIGO',68,69,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','rhr_equipo',1,NULL),(101,'EQUIPO J IBAÑEZ',70,71,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','jmi_equipo',1,NULL),(102,'EQ ROJO FV RUBEN C',28,29,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(103,'EQ AZUL FV A FOLQUES',30,31,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(104,'EQ AMARILLO FV NORMAN G',32,33,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(105,'EQ MORADO FV MATOU',34,35,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(106,'EQ VERDE PCA KEVIN GIMENEZ',36,37,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(107,'EQ NARANJA PCA RUBEN ZANON',38,39,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(110,'EQ ROSA PCA J BONDIA',40,41,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(111,'EQ REPONEDOR CAJAS',42,43,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(112,'CAMARA EQ EDGAR LLEO',15,16,NULL,0,NULL,NULL,NULL,1,0,2,0,23,'/37/23/',NULL,0,NULL),(113,'CAMARA EQ MARC ROCA',17,18,NULL,0,NULL,NULL,NULL,1,0,2,0,23,'/37/23/',NULL,0,NULL),(114,'EQ MARRON PCA JL NUEVO',44,45,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(115,'EQUIPO CLAUDI',72,73,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','csr_equipo',1,NULL),(120,'PCA PRODUCCION',46,47,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(121,'FV PRODUCCION',48,49,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(122,'PCA ALMACEN',50,51,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(123,'EQUIPO ELENA BASCUÑANA',74,75,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','ebt_equipo',0,NULL),(124,'CONTROL INTERNO',119,120,NULL,72,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL); +INSERT INTO `department` VALUES (1,'VERDNATURA',1,2,763,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL),(22,'COMPRAS',3,4,NULL,72,596,2,5,0,0,0,0,NULL,'/',NULL,1,NULL),(23,'CAMARA',14,19,NULL,72,604,2,6,1,0,1,2,37,'/37/',NULL,0,NULL),(31,'INFORMATICA',5,6,NULL,72,127,3,9,0,0,0,0,NULL,'/',NULL,1,NULL),(34,'CONTABILIDAD',7,8,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL),(35,'FINANZAS',9,10,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL),(36,'LABORAL',11,12,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL),(37,'PRODUCCION',13,52,NULL,72,230,3,11,1,0,0,17,NULL,'/',NULL,0,NULL),(38,'SACADO',20,21,NULL,72,230,4,14,1,0,1,0,37,'/37/',NULL,0,NULL),(39,'ENCAJADO',22,23,NULL,72,230,4,12,1,0,1,0,37,'/37/',NULL,0,NULL),(41,'ADMINISTRACION',53,54,NULL,72,599,3,8,0,0,0,0,NULL,'/',NULL,1,NULL),(43,'VENTAS',55,76,NULL,0,NULL,NULL,NULL,0,0,0,10,NULL,'/',NULL,1,'direccioncomercial@verdnatura.es'),(44,'GERENCIA',77,78,NULL,72,300,2,7,0,0,0,0,NULL,'/',NULL,0,NULL),(45,'LOGISTICA',79,80,NULL,72,596,3,19,0,0,0,0,NULL,'/',NULL,1,NULL),(46,'REPARTO',81,84,NULL,72,659,3,10,0,0,0,1,NULL,'/',NULL,0,NULL),(48,'ALMACENAJE',85,86,NULL,0,NULL,NULL,NULL,1,0,0,0,NULL,'/',NULL,0,NULL),(49,'PROPIEDAD',87,88,NULL,72,1008,1,1,0,0,0,0,NULL,'/',NULL,0,NULL),(52,'CARGA AEREA',89,90,NULL,72,163,4,28,0,0,0,0,NULL,'/',NULL,0,NULL),(53,'MARKETING Y COMUNICACIÓN',91,92,NULL,72,1238,0,0,0,0,0,0,NULL,'/',NULL,1,NULL),(54,'ORNAMENTALES',93,94,NULL,72,433,3,21,0,0,0,0,NULL,'/',NULL,0,NULL),(55,'TALLER NATURAL',95,96,NULL,72,695,2,23,0,0,0,0,NULL,'/',NULL,0,NULL),(56,'TALLER ARTIFICIAL',97,98,NULL,72,1780,2,24,0,0,0,0,NULL,'/',NULL,0,NULL),(58,'CAMPOS',99,100,NULL,72,225,2,2,0,0,0,0,NULL,'/',NULL,0,NULL),(59,'MANTENIMIENTO',101,102,NULL,72,1907,4,16,0,0,0,0,NULL,'/',NULL,0,NULL),(60,'RECLAMACIONES',103,104,NULL,72,563,3,20,0,0,0,0,NULL,'/',NULL,1,NULL),(61,'VNH',105,106,NULL,73,1297,3,17,0,0,0,0,NULL,'/',NULL,0,NULL),(63,'VENTAS FRANCIA',56,57,NULL,72,277,2,27,0,0,1,0,43,'/43/',NULL,0,NULL),(66,'VERDNAMADRID',107,108,NULL,72,163,3,18,0,0,0,0,NULL,'/',NULL,0,NULL),(68,'COMPLEMENTOS',24,25,NULL,72,617,3,26,1,0,1,0,37,'/37/',NULL,0,NULL),(69,'VERDNABARNA',109,110,NULL,74,432,3,22,0,0,0,0,NULL,'/',NULL,0,NULL),(77,'PALETIZADO',82,83,NULL,72,230,4,15,1,0,1,0,46,'/46/',NULL,0,NULL),(80,'EQUIPO J VALLES',58,59,NULL,72,693,3,4,0,0,1,0,43,'/43/','jvp_equipo',1,NULL),(86,'LIMPIEZA',111,112,NULL,72,599,0,0,0,0,0,0,NULL,'/',NULL,0,NULL),(89,'COORDINACION',113,114,NULL,0,NULL,NULL,NULL,1,0,0,0,NULL,'/',NULL,0,NULL),(90,'TRAILER',115,116,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL),(91,'ARTIFICIAL',26,27,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(92,'EQUIPO SILVERIO',60,61,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','sdc_equipo',1,NULL),(93,'CONFECCION',117,118,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL),(94,'EQUIPO J BROCAL',62,63,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','jes_equipo',1,NULL),(95,'EQUIPO C ZAMBRANO',64,65,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','czg_equipo',1,NULL),(96,'EQUIPO C LOPEZ',66,67,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','cla_equipo',1,NULL),(98,'EQUIPO RODRIGO',68,69,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','rhr_equipo',1,NULL),(101,'EQUIPO J IBAÑEZ',70,71,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','jmi_equipo',1,NULL),(102,'EQ ROJO FV RUBEN C',28,29,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(103,'EQ AZUL FV A FOLQUES',30,31,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(104,'EQ AMARILLO FV NORMAN G',32,33,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(105,'EQ MORADO FV MATOU',34,35,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(106,'EQ VERDE PCA KEVIN GIMENEZ',36,37,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(107,'EQ NARANJA PCA RUBEN ZANON',38,39,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(110,'EQ ROSA PCA J BONDIA',40,41,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(111,'EQ REPONEDOR CAJAS',42,43,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(112,'CAMARA EQ EDGAR LLEO',15,16,NULL,0,NULL,NULL,NULL,1,0,2,0,23,'/37/23/',NULL,0,NULL),(113,'CAMARA EQ MARC ROCA',17,18,NULL,0,NULL,NULL,NULL,1,0,2,0,23,'/37/23/',NULL,0,NULL),(114,'EQ MARRON PCA JL NUEVO',44,45,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(115,'EQUIPO CLAUDI',72,73,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','csr_equipo',1,NULL),(120,'PCA PRODUCCION',46,47,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(121,'FV PRODUCCION',48,49,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(122,'PCA ALMACEN',50,51,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(123,'EQUIPO ELENA BASCUÑANA',74,75,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','ebt_equipo',1,NULL),(124,'CONTROL INTERNO',119,120,NULL,72,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL); /*!40000 ALTER TABLE `department` ENABLE KEYS */; UNLOCK TABLES; @@ -357,7 +357,7 @@ UNLOCK TABLES; LOCK TABLES `component` WRITE; /*!40000 ALTER TABLE `component` DISABLE KEYS */; -INSERT INTO `component` VALUES (10,'Precios Especiales',4,NULL,NULL,1,'specialPrices'),(14,'porte extra por dia semana',6,NULL,NULL,1,'extraCostPerWeekDay'),(15,'reparto',6,NULL,NULL,1,'delivery'),(17,'recobro',5,NULL,NULL,1,'debtCollection'),(21,'ajuste',11,NULL,NULL,1,'adjustment'),(22,'venta por paquete',9,1,NULL,0,'salePerPackage'),(23,'venta por caja',9,2,NULL,0,'salePerBox'),(28,'valor de compra',1,NULL,NULL,1,'purchaseValue'),(29,'margen',4,NULL,NULL,1,'margin'),(32,'descuento ultimas unidades',9,3,-0.05,0,'lastUnitsDiscount'),(33,'venta por caja',9,1,NULL,0,'salePerBox'),(34,'descuento comprador',4,NULL,NULL,1,'buyerDiscount'),(35,'cartera comprador',10,NULL,NULL,1,NULL),(36,'descuadre',12,NULL,NULL,1,'imbalance'),(37,'maná',7,4,NULL,0,'mana'),(38,'embolsado',9,NULL,NULL,1,'bagged'),(39,'maná auto',7,NULL,NULL,1,'autoMana'),(40,'cambios Santos 2016',4,NULL,NULL,1,NULL),(41,'bonificacion porte',4,NULL,NULL,1,'freightCharge'); +INSERT INTO `component` VALUES (10,'Precios Especiales',4,NULL,NULL,1,'specialPrices'),(14,'porte extra por dia semana',6,NULL,NULL,1,'extraCostPerWeekDay'),(15,'reparto',6,NULL,NULL,1,'delivery'),(17,'recobro',5,NULL,NULL,1,'debtCollection'),(21,'ajuste',11,NULL,NULL,1,'adjustment'),(22,'venta por paquete',9,1,NULL,0,'salePerPackage'),(23,'venta por caja',9,2,NULL,0,'salePerBox'),(28,'valor de compra',1,NULL,NULL,1,'purchaseValue'),(29,'margen',4,NULL,NULL,1,'margin'),(32,'descuento ultimas unidades',9,3,-0.05,0,'lastUnitsDiscount'),(33,'venta por caja',9,1,NULL,0,'salePerBox'),(34,'descuento comprador',4,NULL,NULL,1,'buyerDiscount'),(35,'cartera comprador',10,NULL,NULL,1,NULL),(36,'descuadre',12,NULL,NULL,1,'imbalance'),(37,'maná',7,4,NULL,0,'mana'),(38,'embolsado',9,NULL,NULL,1,'bagged'),(39,'maná auto',7,NULL,NULL,1,'autoMana'),(40,'cambios Santos 2016',4,NULL,NULL,1,NULL),(41,'bonificacion porte',4,NULL,NULL,1,'freightCharge'),(42,'promocion Francia',4,NULL,NULL,1,'frenchOffer'); /*!40000 ALTER TABLE `component` ENABLE KEYS */; UNLOCK TABLES; @@ -380,7 +380,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-02 10:31:40 +-- Dump completed on 2020-11-25 12:04:00 USE `cache`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -418,7 +418,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-02 10:31:41 +-- Dump completed on 2020-11-25 12:04:01 USE `hedera`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -443,7 +443,7 @@ USE `hedera`; LOCK TABLES `imageCollection` WRITE; /*!40000 ALTER TABLE `imageCollection` DISABLE KEYS */; -INSERT INTO `imageCollection` VALUES (1,'catalog','Artículo',3840,2160,'Item','image','vn','item','image'),(4,'link','Enlace',200,200,'Link','image','hedera','link','image'),(5,'news','Noticias',800,1200,'New','image','hedera','news','image'),('6','user','Usuario','800','1200','Account','image','account','user','image'); +INSERT INTO `imageCollection` VALUES (1,'catalog','Artículo',3840,2160,'Item','image','vn','item','image'),(4,'link','Enlace',200,200,'Link','image','hedera','link','image'),(5,'news','Noticias',800,1200,'New','image','hedera','news','image'),(6,'user','Usuario',800,1200,'Account','image','account','user','image'); /*!40000 ALTER TABLE `imageCollection` ENABLE KEYS */; UNLOCK TABLES; @@ -466,6 +466,16 @@ LOCK TABLES `tpvResponse` WRITE; INSERT INTO `tpvResponse` VALUES (101,'Tarjeta Caducada'),(102,'Tarjeta en excepción transitoria o bajo sospecha de fraude'),(104,'Operación no permitida para esa tarjeta o terminal'),(106,'Intentos de PIN excedidos'),(116,'Disponible Insuficiente'),(118,'Tarjeta no Registrada'),(125,'Tarjeta no efectiva'),(129,'Código de seguridad (CVV2/CVC2) incorrecto'),(180,'Tarjeta ajena al servicio'),(184,'Error en la autenticación del titular'),(190,'Denegación sin especificar motivo'),(191,'Fecha de caducidad errónea'),(202,'Tarjeta en excepción transitoria o bajo sospecha de fraude con retirada de tarjeta'),(904,'Comercio no registrado en FUC'),(909,'Error de sistema'),(912,'Emisor no Disponible'),(913,'Pedido repetido'),(944,'Sesión Incorrecta'),(950,'Operación de devolución no permitida'),(9064,'Número de posiciones de la tarjeta incorrecto'),(9078,'No existe método de pago válido para esa tarjeta'),(9093,'Tarjeta no existente'),(9094,'Rechazo servidores internacionales'),(9104,'A petición del usuario se ha cancelado el pago'),(9218,'El comercio no permite op. seguras por entrada /operaciones'),(9253,'Tarjeta no cumple el check-digit'),(9256,'El comercio no puede realizar preautorizaciones'),(9257,'Esta tarjeta no permite operativa de preautorizaciones'),(9261,'Operación detenida por superar el control de restricciones en la entrada al SIS'),(9912,'Emisor no Disponible'),(9913,'Error en la confirmación que el comercio envía al TPV Virtual (solo aplicable en la opción de sincronización SOAP)'),(9914,'Confirmación “KO” del comercio (solo aplicable en la opción de sincronización SOAP)'),(9915,'A petición del usuario se ha cancelado el pago'),(9928,'Anulación de autorización en diferido realizada por el SIS (proceso batch)'),(9929,'Anulación de autorización en diferido realizada por el comercio'),(9998,'Operación en proceso de solicitud de datos de tarjeta'),(9999,'Operación que ha sido redirigida al emisora autenticar'); /*!40000 ALTER TABLE `tpvResponse` ENABLE KEYS */; UNLOCK TABLES; + +-- +-- Dumping data for table `imageCollectionSize` +-- + +LOCK TABLES `imageCollectionSize` WRITE; +/*!40000 ALTER TABLE `imageCollectionSize` DISABLE KEYS */; +INSERT INTO `imageCollectionSize` VALUES (2,1,50,50,1),(3,1,200,200,1),(5,5,200,200,1),(6,1,70,70,1),(8,5,50,50,1),(9,1,1600,900,0),(13,6,160,160,1),(14,6,520,520,1),(15,6,1600,1600,1); +/*!40000 ALTER TABLE `imageCollectionSize` ENABLE KEYS */; +UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; @@ -476,7 +486,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-02 10:31:42 +-- Dump completed on 2020-11-25 12:04:02 USE `postgresql`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -551,7 +561,7 @@ UNLOCK TABLES; LOCK TABLES `workcenter` WRITE; /*!40000 ALTER TABLE `workcenter` DISABLE KEYS */; -INSERT INTO `workcenter` VALUES (1,'Silla',20,1081,1,'Av espioca 100',552703),(2,'Mercaflor',19,NULL,NULL,NULL,NULL),(3,'Marjales',26,20008,NULL,NULL,NULL),(4,'VNH',NULL,NULL,3,NULL,NULL),(5,'Madrid',28,2853,5,'Av constitución 3',554145),(6,'Vilassar',88,88031,2,'Cami del Crist, 33',556412),(7,'Tenerife',NULL,NULL,10,NULL,NULL); +INSERT INTO `workcenter` VALUES (1,'Silla',20,1082,1,'Av espioca 100',552703),(2,'Mercaflor',19,NULL,NULL,NULL,NULL),(3,'Marjales',26,20008,NULL,NULL,NULL),(4,'VNH',NULL,NULL,3,NULL,NULL),(5,'Madrid',28,2856,5,'Av constitución 3',554145),(6,'Vilassar',88,88031,2,'Cami del Crist, 33',556412),(7,'Tenerife',NULL,NULL,10,NULL,NULL); /*!40000 ALTER TABLE `workcenter` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -564,7 +574,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-02 10:31:44 +-- Dump completed on 2020-11-25 12:04:04 USE `sage`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -614,24 +624,6 @@ INSERT INTO `TiposRetencion` VALUES (1,'RETENCION ESTIMACION OBJETIVA',1.0000000 UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; --- --- Dumping data for table `TiposRetencion` --- - -LOCK TABLES `TiposRetencion` WRITE; -/*!40000 ALTER TABLE `TiposRetencion` DISABLE KEYS */; -INSERT INTO `TiposRetencion` (`CodigoRetencion`, `Retencion`, `PorcentajeRetencion`, `CuentaCargo`, `CuentaAbono`, `ClaveIrpf`, `CuentaCargoANT_`, `CuentaAbonoANT_`, `IdTipoRetencion`) VALUES -(1, 'RETENCION ESTIMACION OBJETIVA', '1.0000000000', '4730000000', '4751000000', NULL, NULL, NULL, '03811652-0F3A-44A1-AE1C-B19624525D7F'), -(2, 'ACTIVIDADES AGRICOLAS O GANADERAS', '2.0000000000', '4730000000', '4751000000', NULL, NULL, NULL, 'F3F91EF3-FED6-444D-B03C-75B639D13FB4'), -(9, 'ACTIVIDADES PROFESIONALES 2 PRIMEROS AÑOS', '9.0000000000', '4730000000', '4751000000', NULL, NULL, NULL, '73F95642-E951-4C91-970A-60C503A4792B'), -(15, 'ACTIVIDADES PROFESIONALES', '15.0000000000', '4730000000', '4751000000', '6', NULL, NULL, 'F6BDE0EE-3B01-4023-8FFF-A73AE9AC50D7'), -(19, 'ARRENDAMIENTO Y SUBARRENDAMIENTO', '19.0000000000', '4730000000', '4751000000', '8', NULL, NULL, '09B033AE-16E5-4057-8D4A-A7710C8A4FB9'); -/*!40000 ALTER TABLE `TiposRetencion` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - - - /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; @@ -640,4 +632,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-02 10:31:45 +-- Dump completed on 2020-11-25 12:04:05 diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index ad8474e38e..cffce3ae72 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -92,6 +92,13 @@ INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossF (109, 'HLK', 'Bruce' , 'Banner', 109, 19, 432978109), (110, 'JJJ', 'Jessica' , 'Jones' , 110, 19, 432978110); +INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`) + VALUES + (1, 'EUR', 'Euro', 1), + (2, 'USD', 'Dollar USA', 1.4), + (3, 'GBP', 'Libra', 1), + (4, 'JPY', 'Yen Japones', 1); + INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`) VALUES (1, 'España', 1, 'ES', 1, 24), @@ -149,13 +156,6 @@ INSERT INTO `vn`.`accountingType`(`id`, `description`, `receiptDescription`) (4, 'Stolen Money', ''), (5, 'Miscellaneous', ''); -INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`) - VALUES - (1, 'EUR', 'Euro', 1), - (2, 'USD', 'Dollar USA', 1.4), - (3, 'GBP', 'Libra', 1), - (4, 'JPY', 'Yen Japones', 1); - INSERT INTO `vn`.`bank`(`id`, `bank`, `account`, `cash`, `entityFk`, `isActive`, `currencyFk`) VALUES (1, 'Pay on receipt', '0000000000', 3, 0, 1, 1), diff --git a/db/dump/structure.sql b/db/dump/structure.sql index 2573e2b1b9..c5303eec23 100644 --- a/db/dump/structure.sql +++ b/db/dump/structure.sql @@ -86,13 +86,13 @@ DROP TABLE IF EXISTS `accountConfig`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `accountConfig` ( `id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT, - `homedir` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The base folder for users home directories', + `homedir` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The base folder for users home directory', `shell` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The default shell', - `idBase` int(11) NOT NULL, + `idBase` int(11) NOT NULL COMMENT 'Base id for Posix users and groups', `min` smallint(6) NOT NULL, - `max` smallint(6) NOT NULL, - `warn` smallint(6) NOT NULL, - `inact` smallint(6) NOT NULL, + `max` smallint(6) NOT NULL COMMENT 'Maximum password age (seconds)', + `warn` smallint(6) NOT NULL COMMENT 'Warn to change password when elapsed (seconds)', + `inact` smallint(6) NOT NULL COMMENT 'Maximum inactivity time (seconds)', PRIMARY KEY (`id`) ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Global configuration parameters for accounts'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -151,12 +151,11 @@ DROP TABLE IF EXISTS `ldapConfig`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `ldapConfig` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `host` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The hostname of LDAP server', + `server` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The LDAP server access url', `rdn` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The LDAP user', - `password` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Base64 encoded password', - `baseDn` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'The base DN to do the query', - `filter` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Filter to apply to the query', - `groupDn` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, + `password` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The LDAP password', + `userDn` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'The base DN for users', + `groupDn` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'The base DN for groups', PRIMARY KEY (`id`) ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='LDAP server configuration parameters'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -357,10 +356,12 @@ DROP TABLE IF EXISTS `roleRole`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `roleRole` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `role` int(10) unsigned NOT NULL, `inheritsFrom` int(10) unsigned NOT NULL, + PRIMARY KEY (`id`), UNIQUE KEY `role` (`role`,`inheritsFrom`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Calculated role inheritance'; +) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Calculated role inheritance'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -372,10 +373,11 @@ DROP TABLE IF EXISTS `sambaConfig`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `sambaConfig` ( `id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT, - `host` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT 'The hosname of Samba server', - `sshUser` varchar(30) CHARACTER SET utf8 DEFAULT NULL COMMENT 'The SSH user to connect to servers', - `sshPass` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'The SSH password base64 encoded', - `uidBase` int(10) unsigned NOT NULL DEFAULT '10000' COMMENT 'The base for Unix uids', + `adDomain` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Active directory domain', + `adController` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The hosname of domain controller', + `adUser` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Active directory user', + `adPassword` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Active directory password', + `verifyCert` tinyint(3) unsigned NOT NULL DEFAULT '1' COMMENT 'Whether to verify server certificate', PRIMARY KEY (`id`) ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Global configuration parameters for accounts'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -389,19 +391,22 @@ DROP TABLE IF EXISTS `user`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `user` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `realm` varchar(512) CHARACTER SET utf8 DEFAULT NULL, `name` varchar(30) CHARACTER SET utf8 NOT NULL, `nickname` varchar(127) COLLATE utf8_unicode_ci NOT NULL, - `bcryptPassword` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, + `bcryptPassword` varchar(512) COLLATE utf8_unicode_ci DEFAULT NULL, `role` int(10) unsigned NOT NULL DEFAULT '2', `active` tinyint(1) NOT NULL DEFAULT '1', `email` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `emailVerified` tinyint(1) DEFAULT NULL, + `verificationToken` varchar(512) CHARACTER SET utf8 DEFAULT NULL, `lang` char(2) CHARACTER SET utf8 DEFAULT NULL, - `sync` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Deprecated', `recoverPass` tinyint(3) unsigned NOT NULL DEFAULT '1', `lastPassChange` datetime DEFAULT NULL, `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `password` char(64) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Deprecated', + `sync` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Deprecated', PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`), KEY `role` (`role`), @@ -556,11 +561,11 @@ DROP TABLE IF EXISTS `userPassword`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `userPassword` ( `id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT, - `length` tinyint(3) unsigned NOT NULL, - `nAlpha` tinyint(3) unsigned NOT NULL, - `nUpper` tinyint(3) unsigned NOT NULL, - `nDigits` tinyint(3) unsigned NOT NULL, - `nPunct` tinyint(3) unsigned NOT NULL, + `length` tinyint(3) unsigned NOT NULL COMMENT 'Minimal length', + `nAlpha` tinyint(3) unsigned NOT NULL COMMENT 'Minimum of alphabetic characters', + `nUpper` tinyint(3) unsigned NOT NULL COMMENT 'Minimum of uppercase letters', + `nDigits` tinyint(3) unsigned NOT NULL COMMENT 'Minimum of digits', + `nPunct` tinyint(3) unsigned NOT NULL COMMENT 'Minimum of symbols', PRIMARY KEY (`id`) ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Restrictions on user passwords'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -573,9 +578,9 @@ DROP TABLE IF EXISTS `userSync`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `userSync` ( - `name` varchar(30) NOT NULL, + `name` varchar(30) NOT NULL COMMENT 'The user name', PRIMARY KEY (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Users pending to be synchronized'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -876,52 +881,52 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`%` FUNCTION `passwordGenerate`() RETURNS text CHARSET utf8 COLLATE utf8_unicode_ci READS SQL DATA -BEGIN -/** - * Generates a random password that meets the minimum requirements. - * - * @return Generated password - */ - DECLARE vMinLength TINYINT; - DECLARE vMinAlpha TINYINT; - DECLARE vMinUpper TINYINT; - DECLARE vMinDigits TINYINT; - DECLARE vMinPunct TINYINT; - DECLARE vAlpha TINYINT DEFAULT 0; - DECLARE vUpper TINYINT DEFAULT 0; - DECLARE vDigits TINYINT DEFAULT 0; - DECLARE vPunct TINYINT DEFAULT 0; - DECLARE vRandIndex INT; - DECLARE vPwd TEXT DEFAULT ''; - - DECLARE vAlphaChars TEXT DEFAULT 'abcdefghijklmnopqrstuvwxyz'; - DECLARE vUpperChars TEXT DEFAULT 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; - DECLARE vDigitChars TEXT DEFAULT '1234567890'; - DECLARE vPunctChars TEXT DEFAULT '!$%&()=.'; - - SELECT length, nAlpha, nUpper, nDigits, nPunct - INTO vMinLength, vMinAlpha, vMinUpper, vMinDigits, vMinPunct FROM userPassword; - - WHILE LENGTH(vPwd) < vMinLength OR vAlpha < vMinAlpha - OR vUpper < vMinUpper OR vDigits < vMinDigits OR vPunct < vMinPunct DO - SET vRandIndex = FLOOR((RAND() * 4) + 1); - - CASE - WHEN vRandIndex = 1 THEN - SET vPwd = CONCAT(vPwd, SUBSTRING(vAlphaChars, FLOOR((RAND() * 26) + 1), 1)); - SET vAlpha = vAlpha + 1; - WHEN vRandIndex = 2 THEN - SET vPwd = CONCAT(vPwd, SUBSTRING(vUpperChars, FLOOR((RAND() * 26) + 1), 1)); - SET vUpper = vUpper + 1; - WHEN vRandIndex = 3 THEN - SET vPwd = CONCAT(vPwd, SUBSTRING(vDigitChars, FLOOR((RAND() * 10) + 1), 1)); - SET vDigits = vDigits + 1; - WHEN vRandIndex = 4 THEN - SET vPwd = CONCAT(vPwd, SUBSTRING(vPunctChars, FLOOR((RAND() * LENGTH(vPunctChars)) + 1), 1)); - SET vPunct = vPunct + 1; - END CASE; - END WHILE; - RETURN vPwd; +BEGIN +/** + * Generates a random password that meets the minimum requirements. + * + * @return Generated password + */ + DECLARE vMinLength TINYINT; + DECLARE vMinAlpha TINYINT; + DECLARE vMinUpper TINYINT; + DECLARE vMinDigits TINYINT; + DECLARE vMinPunct TINYINT; + DECLARE vAlpha TINYINT DEFAULT 0; + DECLARE vUpper TINYINT DEFAULT 0; + DECLARE vDigits TINYINT DEFAULT 0; + DECLARE vPunct TINYINT DEFAULT 0; + DECLARE vRandIndex INT; + DECLARE vPwd TEXT DEFAULT ''; + + DECLARE vAlphaChars TEXT DEFAULT 'abcdefghijklmnopqrstuvwxyz'; + DECLARE vUpperChars TEXT DEFAULT 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; + DECLARE vDigitChars TEXT DEFAULT '1234567890'; + DECLARE vPunctChars TEXT DEFAULT '!$%&()=.'; + + SELECT length, nAlpha, nUpper, nDigits, nPunct + INTO vMinLength, vMinAlpha, vMinUpper, vMinDigits, vMinPunct FROM userPassword; + + WHILE LENGTH(vPwd) < vMinLength OR vAlpha < vMinAlpha + OR vUpper < vMinUpper OR vDigits < vMinDigits OR vPunct < vMinPunct DO + SET vRandIndex = FLOOR((RAND() * 4) + 1); + + CASE + WHEN vRandIndex = 1 THEN + SET vPwd = CONCAT(vPwd, SUBSTRING(vAlphaChars, FLOOR((RAND() * 26) + 1), 1)); + SET vAlpha = vAlpha + 1; + WHEN vRandIndex = 2 THEN + SET vPwd = CONCAT(vPwd, SUBSTRING(vUpperChars, FLOOR((RAND() * 26) + 1), 1)); + SET vUpper = vUpper + 1; + WHEN vRandIndex = 3 THEN + SET vPwd = CONCAT(vPwd, SUBSTRING(vDigitChars, FLOOR((RAND() * 10) + 1), 1)); + SET vDigits = vDigits + 1; + WHEN vRandIndex = 4 THEN + SET vPwd = CONCAT(vPwd, SUBSTRING(vPunctChars, FLOOR((RAND() * LENGTH(vPunctChars)) + 1), 1)); + SET vPunct = vPunct + 1; + END CASE; + END WHILE; + RETURN vPwd; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -1014,11 +1019,11 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`%` FUNCTION `userGetNameFromId__`(vSelf INT) RETURNS varchar(30) CHARSET utf8 COLLATE utf8_unicode_ci DETERMINISTIC -BEGIN -/** - * @deprecated Use user_getNameFromId(); - */ - RETURN user_getNameFromId(vSelf); +BEGIN +/** + * @deprecated Use user_getNameFromId(); + */ + RETURN user_getNameFromId(vSelf); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -1083,22 +1088,22 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`%` FUNCTION `user_getMysqlRole`(vUserName VARCHAR(255)) RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci DETERMINISTIC -BEGIN -/** - * From a username, it returns the associated MySQL wich should be used when - * using external authentication systems. - * - * @param vUserName The user name - * @return The associated MySQL role - */ - DECLARE vRole VARCHAR(255); - - SELECT CONCAT(IF(r.hasLogin, 'z-', ''), r.name) INTO vRole - FROM role r - JOIN user u ON u.role = r.id - WHERE u.name = vUserName; - - RETURN vRole; +BEGIN +/** + * From a username, it returns the associated MySQL wich should be used when + * using external authentication systems. + * + * @param vUserName The user name + * @return The associated MySQL role + */ + DECLARE vRole VARCHAR(255); + + SELECT CONCAT(IF(r.hasLogin, 'z-', ''), r.name) INTO vRole + FROM role r + JOIN user u ON u.role = r.id + WHERE u.name = vUserName; + + RETURN vRole; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -1117,20 +1122,20 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`%` FUNCTION `user_getNameFromId`(vSelf INT) RETURNS varchar(30) CHARSET utf8 COLLATE utf8_unicode_ci DETERMINISTIC -BEGIN -/** - * Gets user name from it's id. - * - * @param vSelf The user id - * @return The user name - */ - DECLARE vName VARCHAR(30); - - SELECT `name` INTO vName - FROM user - WHERE id = vSelf; - - RETURN vName; +BEGIN +/** + * Gets user name from it's id. + * + * @param vSelf The user id + * @return The user name + */ + DECLARE vName VARCHAR(30); + + SELECT `name` INTO vName + FROM user + WHERE id = vSelf; + + RETURN vName; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -1620,8 +1625,13 @@ BEGIN SET vPrefixedLike = CONCAT(vPrefix, '%'); - DELETE FROM mysql.user - WHERE `User` LIKE vPrefixedLike; + IF vIsMysql THEN + DELETE FROM mysql.user + WHERE `User` LIKE vPrefixedLike; + ELSE + DELETE FROM mysql.global_priv + WHERE `User` LIKE vPrefixedLike; + END IF; DELETE FROM mysql.db WHERE `User` LIKE vPrefixedLike; @@ -1789,7 +1799,8 @@ BEGIN JSON_OBJECT( 'mysql_old_password', JSON_VALUE(t.`Priv`, '$.mysql_old_password'), 'mysql_native_password', JSON_VALUE(t.`Priv`, '$.mysql_native_password'), - 'authentication_string', JSON_VALUE(t.`Priv`, '$.authentication_string') + 'authentication_string', JSON_VALUE(t.`Priv`, '$.authentication_string'), + 'ssl_type', JSON_VALUE(t.`Priv`, '$.ssl_type') ) ) FROM tRole r @@ -1800,7 +1811,7 @@ BEGIN ON u.`User` = r.role AND u.`Host` = vRoleHost; END IF; - + INSERT INTO mysql.proxies_priv ( `User`, `Host`, @@ -4741,16 +4752,16 @@ BEGIN * La tabla mana_spellers es una caché * */ - - UPDATE mana_spellers me - JOIN - (SELECT Id_Trabajador, FLOOR(SUM(importe)/12) as pesoCarteraMensual - FROM bs.vendedores - WHERE año * 100 + mes >= (YEAR(CURDATE()) -1) * 100 + MONTH(CURDATE()) - GROUP BY Id_Trabajador - ) lastYearSales USING(Id_Trabajador) - SET me.prices_modifier_rate = GREATEST(me.minRate,LEAST(me.maxRate,ROUND(- me.used/lastYearSales.pesoCarteraMensual,3))) ; - + + UPDATE mana_spellers me + JOIN + (SELECT Id_Trabajador, FLOOR(SUM(importe)/12) as pesoCarteraMensual + FROM bs.vendedores + WHERE año * 100 + mes >= (YEAR(CURDATE()) -1) * 100 + MONTH(CURDATE()) + GROUP BY Id_Trabajador + ) lastYearSales USING(Id_Trabajador) + SET me.prices_modifier_rate = GREATEST(me.minRate,LEAST(me.maxRate,ROUND(- me.used/lastYearSales.pesoCarteraMensual,3))) ; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -5151,6 +5162,62 @@ DO SET vDateStart = DATE_ADD(vDateStart, INTERVAL 1 DAY); END WHILE; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `saleGraphic` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`z-developer`@`%` PROCEDURE `saleGraphic`(vItemFk INT, + vTypeFk INT, + vCategoryFk INT, + vFromDate DATE, + vToDate DATE, + vProducerFk INT) +BEGIN + + DECLARE vFromDateLastYear DATE; + DECLARE vToDateLastYear DATE; + DECLARE vFromDateTwoYearsAgo DATE; + DECLARE vToDateTwoYearsAgo DATE; + + SET vItemFk = IFNULL(vItemFk,0); + SET vTypeFk = IFNULL(vTypeFk, 0); + SET vCategoryFk = IFNULL(vCategoryFk,0); + SET vFromDate = IFNULL(vFromDate,CURDATE()); + SET vToDate = IFNULL(vToDate,CURDATE()); + SET vProducerFk = IFNULL(vProducerFk,0); + + SET vFromDateLastYear = TIMESTAMPADD(YEAR,-1,vFromDate); + SET vToDateLastYear = TIMESTAMPADD(YEAR,-1,vToDate); + SET vFromDateTwoYearsAgo = TIMESTAMPADD(YEAR,-2,vFromDate); + SET vToDateTwoYearsAgo = TIMESTAMPADD(YEAR,-2,vToDate); + + SELECT s.quantity, CAST(v.importe AS DECIMAL(10,0)) importe, v.fecha + FROM bs.ventas v + JOIN vn.sale s ON s.id = v.Id_Movimiento + JOIN vn.item i ON i.id = s.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk + WHERE vItemFk IN (i.id, 0) + AND vTypeFk IN (i.typeFk, 0) + AND vCategoryFk IN (it.categoryFk, 0) + AND vProducerFk IN (i.producerFk, 0) + AND (v.fecha BETWEEN vFromDate AND vToDate + OR v.fecha BETWEEN vFromDateLastYear AND vToDateLastYear + OR v.fecha BETWEEN vFromDateTwoYearsAgo AND vToDateTwoYearsAgo + ); + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -6999,9 +7066,9 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `cacheCalc_clean`() -BEGIN - DECLARE vCleanTime DATETIME DEFAULT TIMESTAMPADD(MINUTE, -5, NOW()); - DELETE FROM cache_calc WHERE expires < vCleanTime; +BEGIN + DECLARE vCleanTime DATETIME DEFAULT TIMESTAMPADD(MINUTE, -5, NOW()); + DELETE FROM cache_calc WHERE expires < vCleanTime; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -7019,27 +7086,27 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `cache_calc_end`(IN `v_calc` INT) -BEGIN - DECLARE v_cache_name VARCHAR(255); - DECLARE v_params VARCHAR(255); - - -- Libera el bloqueo y actualiza la fecha de ultimo refresco. - - UPDATE cache_calc cc JOIN cache c ON c.id = cc.cache_id - SET - cc.last_refresh = NOW(), - cc.expires = ADDTIME(NOW(), c.lifetime), - cc.connection_id = NULL - WHERE cc.id = v_calc; - - SELECT c.name, ca.params INTO v_cache_name, v_params - FROM cache c - JOIN cache_calc ca ON c.id = ca.cache_id - WHERE ca.id = v_calc; - - IF v_cache_name IS NOT NULL THEN - DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, ''))); - END IF; +BEGIN + DECLARE v_cache_name VARCHAR(255); + DECLARE v_params VARCHAR(255); + + -- Libera el bloqueo y actualiza la fecha de ultimo refresco. + + UPDATE cache_calc cc JOIN cache c ON c.id = cc.cache_id + SET + cc.last_refresh = NOW(), + cc.expires = ADDTIME(NOW(), c.lifetime), + cc.connection_id = NULL + WHERE cc.id = v_calc; + + SELECT c.name, ca.params INTO v_cache_name, v_params + FROM cache c + JOIN cache_calc ca ON c.id = ca.cache_id + WHERE ca.id = v_calc; + + IF v_cache_name IS NOT NULL THEN + DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, ''))); + END IF; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -7057,88 +7124,88 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `cache_calc_start`(OUT `v_calc` INT, INOUT `v_refresh` INT, IN `v_cache_name` VARCHAR(50), IN `v_params` VARCHAR(100)) -proc: BEGIN - DECLARE v_valid BOOL; - DECLARE v_lock_id VARCHAR(100); - DECLARE v_cache_id INT; - DECLARE v_expires DATETIME; - DECLARE v_clean_time DATETIME; - - DECLARE EXIT HANDLER FOR SQLEXCEPTION - BEGIN - IF v_lock_id IS NOT NULL THEN - DO RELEASE_LOCK(v_lock_id); - END IF; - - RESIGNAL; - END; - - SET v_params = IFNULL(v_params, ''); - - -- Si el servidor se ha reiniciado invalida todos los calculos. - - SELECT COUNT(*) > 0 INTO v_valid FROM cache_valid; - - IF !v_valid - THEN - DELETE FROM cache_calc; - INSERT INTO cache_valid (valid) VALUES (TRUE); - END IF; - - -- Obtiene un bloqueo exclusivo para que no haya problemas de concurrencia. - - SET v_lock_id = CONCAT_WS('/', v_cache_name, v_params); - - IF !GET_LOCK(v_lock_id, 30) - THEN - SET v_calc = NULL; - SET v_refresh = FALSE; - LEAVE proc; - END IF; - - -- Comprueba si el calculo solicitado existe y esta actualizado. - - SELECT c.id, ca.id, ca.expires - INTO v_cache_id, v_calc, v_expires - FROM cache c - LEFT JOIN cache_calc ca - ON ca.cache_id = c.id AND ca.params = v_params COLLATE 'utf8_general_ci' - WHERE c.name = v_cache_name COLLATE 'utf8_general_ci'; - - -- Si existe una calculo valido libera el bloqueo y devuelve su identificador. - - IF !v_refresh AND NOW() < v_expires - THEN - DO RELEASE_LOCK(v_lock_id); - SET v_refresh = FALSE; - LEAVE proc; - END IF; - - -- Si el calculo no existe le crea una entrada en la tabla de calculos. - - IF v_calc IS NULL - THEN - INSERT INTO cache_calc SET - cache_id = v_cache_id, - cacheName = v_cache_name, - params = v_params, - last_refresh = NULL, - expires = NULL, - connection_id = CONNECTION_ID(); - - SET v_calc = LAST_INSERT_ID(); - ELSE - UPDATE cache_calc - SET - last_refresh = NULL, - expires = NULL, - connection_id = CONNECTION_ID() - WHERE id = v_calc; - END IF; - - -- Si se debe recalcular mantiene el bloqueo y devuelve su identificador. - - SET v_refresh = TRUE; +proc: BEGIN + DECLARE v_valid BOOL; + DECLARE v_lock_id VARCHAR(100); + DECLARE v_cache_id INT; + DECLARE v_expires DATETIME; + DECLARE v_clean_time DATETIME; + + DECLARE EXIT HANDLER FOR SQLEXCEPTION + BEGIN + IF v_lock_id IS NOT NULL THEN + DO RELEASE_LOCK(v_lock_id); + END IF; + + RESIGNAL; + END; + + SET v_params = IFNULL(v_params, ''); + + -- Si el servidor se ha reiniciado invalida todos los calculos. + + SELECT COUNT(*) > 0 INTO v_valid FROM cache_valid; + + IF !v_valid + THEN + DELETE FROM cache_calc; + INSERT INTO cache_valid (valid) VALUES (TRUE); + END IF; + + -- Obtiene un bloqueo exclusivo para que no haya problemas de concurrencia. + + SET v_lock_id = CONCAT_WS('/', v_cache_name, v_params); + + IF !GET_LOCK(v_lock_id, 30) + THEN + SET v_calc = NULL; + SET v_refresh = FALSE; + LEAVE proc; + END IF; + + -- Comprueba si el calculo solicitado existe y esta actualizado. + + SELECT c.id, ca.id, ca.expires + INTO v_cache_id, v_calc, v_expires + FROM cache c + LEFT JOIN cache_calc ca + ON ca.cache_id = c.id AND ca.params = v_params COLLATE 'utf8_general_ci' + WHERE c.name = v_cache_name COLLATE 'utf8_general_ci'; + + -- Si existe una calculo valido libera el bloqueo y devuelve su identificador. + + IF !v_refresh AND NOW() < v_expires + THEN + DO RELEASE_LOCK(v_lock_id); + SET v_refresh = FALSE; + LEAVE proc; + END IF; + + -- Si el calculo no existe le crea una entrada en la tabla de calculos. + + IF v_calc IS NULL + THEN + INSERT INTO cache_calc SET + cache_id = v_cache_id, + cacheName = v_cache_name, + params = v_params, + last_refresh = NULL, + expires = NULL, + connection_id = CONNECTION_ID(); + + SET v_calc = LAST_INSERT_ID(); + ELSE + UPDATE cache_calc + SET + last_refresh = NULL, + expires = NULL, + connection_id = CONNECTION_ID() + WHERE id = v_calc; + END IF; + + -- Si se debe recalcular mantiene el bloqueo y devuelve su identificador. + + SET v_refresh = TRUE; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -7156,24 +7223,24 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `cache_calc_unlock`(IN `v_calc` INT) -proc: BEGIN - DECLARE v_cache_name VARCHAR(50); - DECLARE v_params VARCHAR(100); - - IF v_calc IS NULL THEN - LEAVE proc; - END IF; - - SELECT c.name, ca.params INTO v_cache_name, v_params - FROM cache c - JOIN cache_calc ca ON c.id = ca.cache_id - WHERE ca.id = v_calc; - - DELETE FROM cache_calc WHERE id = v_calc; - - IF v_cache_name IS NOT NULL THEN - DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, ''))); - END IF; +proc: BEGIN + DECLARE v_cache_name VARCHAR(50); + DECLARE v_params VARCHAR(100); + + IF v_calc IS NULL THEN + LEAVE proc; + END IF; + + SELECT c.name, ca.params INTO v_cache_name, v_params + FROM cache c + JOIN cache_calc ca ON c.id = ca.cache_id + WHERE ca.id = v_calc; + + DELETE FROM cache_calc WHERE id = v_calc; + + IF v_cache_name IS NOT NULL THEN + DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, ''))); + END IF; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -7192,9 +7259,9 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `cache_clean`() NO SQL -BEGIN - CALL available_clean; - CALL visible_clean; +BEGIN + CALL available_clean; + CALL visible_clean; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -7212,13 +7279,13 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `clean`() -BEGIN - - DECLARE vDateShort DATETIME; - - SET vDateShort = TIMESTAMPADD(MONTH, -1, CURDATE()); - - DELETE FROM cache.departure_limit WHERE Fecha < vDateShort; +BEGIN + + DECLARE vDateShort DATETIME; + + SET vDateShort = TIMESTAMPADD(MONTH, -1, CURDATE()); + + DELETE FROM cache.departure_limit WHERE Fecha < vDateShort; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -7880,6 +7947,20 @@ DROP TABLE IF EXISTS `VMPSettings`; CREATE TABLE `VMPSettings` ( `VMPID` int(11) NOT NULL, `MessageID` int(11) NOT NULL, + `dateTimeTry` timestamp NULL DEFAULT NULL, + `isVmpBA` tinyint(4) DEFAULT NULL COMMENT 'Basic authentication', + `vmpVersion` int(11) DEFAULT NULL, + `vmpUrl` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, + `loginName` varchar(150) COLLATE utf8_unicode_ci DEFAULT NULL, + `loginPassword` varchar(150) COLLATE utf8_unicode_ci DEFAULT NULL, + `refreshRate` int(11) DEFAULT NULL, + `eanBuyer` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL, + `eanSupplier` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL, + `eanAgent` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL, + `dateTimeLastSync` timestamp NULL DEFAULT NULL, + `closedFrom` int(11) DEFAULT NULL, + `closedTo` int(11) DEFAULT NULL, + `totalRefreshHours` int(11) DEFAULT NULL, PRIMARY KEY (`VMPID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -8276,7 +8357,6 @@ CREATE TABLE `item_groupToOffer` ( KEY `item_groupToOffer_fk2_idx` (`itemTypeFk`), KEY `item_groupToOffer_fk3_idx` (`intrastatFk`), KEY `item_groupToOffer_fk4_idx` (`originFk`), - CONSTRAINT `item_groupToOffer_fk1` FOREIGN KEY (`group_code`) REFERENCES `item_group` (`group_code`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `item_groupToOffer_fk2` FOREIGN KEY (`itemTypeFk`) REFERENCES `vn`.`itemType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `item_groupToOffer_fk3` FOREIGN KEY (`intrastatFk`) REFERENCES `vn`.`intrastat` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `item_groupToOffer_fk4` FOREIGN KEY (`originFk`) REFERENCES `vn`.`origin` (`id`) ON DELETE CASCADE ON UPDATE CASCADE @@ -8455,11 +8535,11 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `edi`.`putOrder_AFTER_UPDATE` AFTER UPDATE ON `putOrder` FOR EACH ROW BEGIN @@ -8484,7 +8564,8 @@ BEGIN CONCAT(account.user_getNameFromId(c.salesPersonFk), '@verdnatura.es') ), 'Producto no disponible en Floramondo', - CONCAT('El artículo ', s.concept, ' del ticket ', t.id , ' ha sido cancelado por Floramondo. ', ' Se ha actualizado la cantidad a 0. ', + CONCAT('El artículo ', s.concept, ' del ticket ', t.id , ' ha sido cancelado por Floramondo. ', + ' Se ha actualizado la cantidad de ', OLD.quantity,' a 0. ', IF (u.id IS NOT NULL AND c.email IS NOT NULL , CONCAT('https://verdnatura.es/#!form=ecomerce%2Fticket&ticket=', t.id ), CONCAT('https://salix.verdnatura.es/#!/ticket/', t.id ,'/summary'))) @@ -8642,13 +8723,16 @@ CREATE TABLE `supplyResponse` ( `MarketPlaceID` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `MarketFormCode` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '"002" Standard Sales\n"005" Catalogue (optional)\n"001" Committed (optional)\n"003" Buffer (optional, Clock Pre Sales) ', `FlowerColor` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, + `vmpID` int(11) DEFAULT NULL, PRIMARY KEY (`ID`), UNIQUE KEY `ID_UNIQUE` (`ID`), KEY `IX_TransNumber` (`TransactionNumber`) COMMENT 'Agregado por Ernesto 11.6.2019\nSe ejecutaba 1 consulta por segundo desde MAIL y consumia un 20% de CPU de todo el servidor !!!!!\nCPU usada es mas estable que Indice en SendererID, cpu vs espacio que ocupa?\n', KEY `supplyResponse_Ix1` (`Item_ArticleCode`), KEY `supplyResponseMarcketIdx` (`MarketPlaceID`), KEY `supplyResponseNumberOfUnitsIdx` (`NumberOfUnits`), - KEY `supplyResponseEmbalageCodeIdx` (`EmbalageCode`) + KEY `supplyResponseEmbalageCodeIdx` (`EmbalageCode`), + KEY `supplyResponseputOrder_FK` (`vmpID`), + CONSTRAINT `supplyResponseputOrder_FK` FOREIGN KEY (`vmpID`) REFERENCES `VMPSettings` (`VMPID`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; @@ -9230,154 +9314,154 @@ CREATE DEFINER=`root`@`%` PROCEDURE `exchange_new`( IN `vAuction` SMALLINT, IN `vPackage` INT, IN `vPutOrderFk` INT) -BEGIN +BEGIN /** * Adds a new exchange, generates it's barcode and * inserts/updates the transaction. When the referenced * transaction exists as provisional, updates it with - * the new values. - */ - DECLARE vEkt INT; - DECLARE vRewriteKop INT DEFAULT NULL; - DECLARE vBarcode CHAR(15) DEFAULT NULL; - DECLARE vIsDuplicated BOOL; + * the new values. + */ + DECLARE vEkt INT; + DECLARE vRewriteKop INT DEFAULT NULL; + DECLARE vBarcode CHAR(15) DEFAULT NULL; + DECLARE vIsDuplicated BOOL; DECLARE vUpdateExistent BOOL DEFAULT FALSE; - DECLARE duplicateKey CONDITION FOR 1062; - - DECLARE CONTINUE HANDLER FOR duplicateKey - SET vIsDuplicated = TRUE; - - -- Generates the barcode - - IF vAgj != 0 AND vAgj IS NOT NULL - THEN - SET vBarcode = CONCAT( - LPAD(vAuction, 2, 0), - LPAD(IFNULL(vClock, 99), 2, 0), - LPAD(DAYOFYEAR(vDate), 3, 0), - IF(vClock IS NULL OR vClock = 99, - LPAD(vAgj, 7, 0), - CONCAT(LPAD(vAgj, 5, 0), '01') - ), - '0' - ); - END IF; - - -- Rewrites the kop parameter - - IF vKop IS NULL THEN - SELECT defaultKop INTO vKop FROM exchangeConfig; - END IF; - - SELECT e.kop INTO vRewriteKop - FROM mailSender e - JOIN mail m ON m.senderFk = e.id - WHERE m.id = vMailFk; - - SET vKop = IFNULL(vRewriteKop, vKop); - - -- Inserts the new transaction + DECLARE duplicateKey CONDITION FOR 1062; - SET vIsDuplicated = FALSE; - INSERT INTO ekt SET - barcode = IFNULL(vBarcode, barcode) - ,deliveryNumber = vDeliveryNumber - ,entryYear = YEAR(vDate) - ,fec = vDate - ,hor = vHour - ,ref = vRef - ,item = vItem - ,agj = vAgj - ,cat = vCat - ,pac = vPac - ,sub = vSub - ,kop = vKop - ,ptd = vPtd - ,pro = vPro - ,ori = vOrigin - ,ptj = vPtj - ,qty = vQuantiy - ,pri = vPrice - ,klo = vClock - ,s1 = vS1 - ,s2 = vS2 - ,s3 = vS3 - ,s4 = vS4 - ,s5 = vS5 - ,s6 = vS6 - ,k1 = vK1 - ,k2 = vK2 - ,k3 = vP1 - ,k4 = vP2 - ,auction = vAuction - ,package = vPackage - ,putOrderFk = vPutOrderFk; - - -- If it exists duplicado updates it - - IF NOT vIsDuplicated - THEN - SET vEkt = LAST_INSERT_ID(); - CALL ekt_load (vEkt); - - ELSEIF vDeliveryNumber != 0 - AND vDeliveryNumber IS NOT NULL - THEN - SELECT id INTO vEkt - FROM ekt - WHERE deliveryNumber = vDeliveryNumber; - - SELECT COUNT(*) = 0 INTO vUpdateExistent - FROM ekt t - JOIN `exchange` b ON b.ektFk = t.id - JOIN exchangeConfig c - WHERE t.deliveryNumber = vDeliveryNumber - AND t.entryYear = YEAR(vDate) - AND b.typeFk != c.presaleFk; - END IF; - - IF vUpdateExistent - THEN - UPDATE ekt SET - barcode = IFNULL(vBarcode, barcode) - ,fec = vDate - ,hor = vHour - ,ref = vRef - ,item = vItem - ,agj = vAgj - ,cat = vCat - ,pac = vPac - ,sub = vSub - ,kop = vKop - ,ptd = vPtd - ,pro = vPro - ,ori = vOrigin - ,ptj = vPtj - ,qty = vQuantiy - ,pri = vPrice - ,klo = vClock - ,s1 = vS1 - ,s2 = vS2 - ,s3 = vS3 - ,s4 = vS4 - ,s5 = vS5 - ,s6 = vS6 - ,k1 = vK1 - ,k2 = vK2 - ,k3 = vP1 - ,k4 = vP2 - ,auction = vAuction - ,package = vPackage - ,putOrderFk = IFNULL(vPutOrderFk, putOrderFk) - WHERE id = vEkt; - END IF; - - -- Registers the exchange - - INSERT INTO `exchange` SET - mailFk = vMailFk - ,typeFk = vType - ,ektFk = vEkt; + DECLARE CONTINUE HANDLER FOR duplicateKey + SET vIsDuplicated = TRUE; + + -- Generates the barcode + + IF vAgj != 0 AND vAgj IS NOT NULL + THEN + SET vBarcode = CONCAT( + LPAD(vAuction, 2, 0), + LPAD(IFNULL(vClock, 99), 2, 0), + LPAD(DAYOFYEAR(vDate), 3, 0), + IF(vClock IS NULL OR vClock = 99, + LPAD(vAgj, 7, 0), + CONCAT(LPAD(vAgj, 5, 0), '01') + ), + '0' + ); + END IF; + + -- Rewrites the kop parameter + + IF vKop IS NULL THEN + SELECT defaultKop INTO vKop FROM exchangeConfig; + END IF; + + SELECT e.kop INTO vRewriteKop + FROM mailSender e + JOIN mail m ON m.senderFk = e.id + WHERE m.id = vMailFk; + + SET vKop = IFNULL(vRewriteKop, vKop); + + -- Inserts the new transaction + + SET vIsDuplicated = FALSE; + INSERT INTO ekt SET + barcode = IFNULL(vBarcode, barcode) + ,deliveryNumber = vDeliveryNumber + ,entryYear = YEAR(vDate) + ,fec = vDate + ,hor = vHour + ,ref = vRef + ,item = vItem + ,agj = vAgj + ,cat = vCat + ,pac = vPac + ,sub = vSub + ,kop = vKop + ,ptd = vPtd + ,pro = vPro + ,ori = vOrigin + ,ptj = vPtj + ,qty = vQuantiy + ,pri = vPrice + ,klo = vClock + ,s1 = vS1 + ,s2 = vS2 + ,s3 = vS3 + ,s4 = vS4 + ,s5 = vS5 + ,s6 = vS6 + ,k1 = vK1 + ,k2 = vK2 + ,k3 = vP1 + ,k4 = vP2 + ,auction = vAuction + ,package = vPackage + ,putOrderFk = vPutOrderFk; + + -- If it exists duplicado updates it + + IF NOT vIsDuplicated + THEN + SET vEkt = LAST_INSERT_ID(); + CALL ekt_load (vEkt); + + ELSEIF vDeliveryNumber != 0 + AND vDeliveryNumber IS NOT NULL + THEN + SELECT id INTO vEkt + FROM ekt + WHERE deliveryNumber = vDeliveryNumber; + + SELECT COUNT(*) = 0 INTO vUpdateExistent + FROM ekt t + JOIN `exchange` b ON b.ektFk = t.id + JOIN exchangeConfig c + WHERE t.deliveryNumber = vDeliveryNumber + AND t.entryYear = YEAR(vDate) + AND b.typeFk != c.presaleFk; + END IF; + + IF vUpdateExistent + THEN + UPDATE ekt SET + barcode = IFNULL(vBarcode, barcode) + ,fec = vDate + ,hor = vHour + ,ref = vRef + ,item = vItem + ,agj = vAgj + ,cat = vCat + ,pac = vPac + ,sub = vSub + ,kop = vKop + ,ptd = vPtd + ,pro = vPro + ,ori = vOrigin + ,ptj = vPtj + ,qty = vQuantiy + ,pri = vPrice + ,klo = vClock + ,s1 = vS1 + ,s2 = vS2 + ,s3 = vS3 + ,s4 = vS4 + ,s5 = vS5 + ,s6 = vS6 + ,k1 = vK1 + ,k2 = vK2 + ,k3 = vP1 + ,k4 = vP2 + ,auction = vAuction + ,package = vPackage + ,putOrderFk = IFNULL(vPutOrderFk, putOrderFk) + WHERE id = vEkt; + END IF; + + -- Registers the exchange + + INSERT INTO `exchange` SET + mailFk = vMailFk + ,typeFk = vType + ,ektFk = vEkt; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -9388,9 +9472,9 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; @@ -9402,6 +9486,8 @@ proc: BEGIN DECLARE vFreeId INT; DECLARE vSupplyResponseFk INT; DECLARE vLastInserted DATETIME; + DECLARE vVNH_WarehouseFk INT; + DECLARE vFloramondo_WarehouseFk INT; DECLARE cur1 CURSOR FOR SELECT id @@ -9419,6 +9505,14 @@ proc: BEGIN END; START TRANSACTION; + + SELECT id INTO vVNH_WarehouseFk + FROM vn.warehouse + WHERE name = 'VNH'; + + SELECT id INTO vFloramondo_WarehouseFk + FROM vn.warehouse + WHERE name = 'Floramondo'; -- select now(),'Antes de borrar'; DELETE itf.* FROM edi.item_free itf @@ -9487,25 +9581,7 @@ proc: BEGIN AND (di.LatestOrderDateTime < NOW() OR di.ID IS NULL) AND it.isInventory ; - -- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos -/* UPDATE IGNORE edi.offer o - LEFT JOIN vn.item iExist ON iExist.supplyResponseFk = o.srID - JOIN vn.item i - ON i.name = o.product_name - AND i.subname <=> o.company_name - AND i.value5 <=> o.s1Value - AND i.value6 <=> o.s2Value - AND i.value7 <=> o.s3Value - AND i.value8 <=> o.s4Value - AND i.value9 <=> o.s5Value - AND i.value10 <=> o.s6Value - AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask - AND i.EmbalageCode <=> o.EmbalageCode - AND i.quality <=> o.Quality - SET i.supplyResponseFk = o.srID - WHERE iExist.id IS NULL - ; - */ -- select now(),'Antes de crear ITO'; + -- select now(),'Antes de crear ITO'; DROP TEMPORARY TABLE IF EXISTS itemToInsert; CREATE TEMPORARY TABLE itemToInsert ENGINE = MEMORY SELECT o.*, CAST(NULL AS DECIMAL(6,0)) as itemFk @@ -9672,9 +9748,12 @@ proc: BEGIN JOIN marketPlace mp ON mp.id = o.MarketPlaceID WHERE mp.isLatestOrderDateTimeRelevant; - SET @myEntry := vn.floramondo_getEntry(vLanded); + SET @myEntry := vn.floramondo_getEntry(vLanded, vVNH_WarehouseFk); + IF @myEntry THEN + SELECT @myEntry; + -- Elimina la oferta obsoleta DELETE b FROM vn.buy b JOIN vn.item i ON i.id = b.itemFk @@ -9734,7 +9813,79 @@ proc: BEGIN SELECT id from vn.buy where entryFk = @myEntry AND created >= vLastInserted; CALL vn.buy_recalcPrices(); + END IF; + /* + -- Ara la entrada per a Floramondo + SET @myFloramondoEntry := vn.floramondo_getEntry(vLanded, vFloramondo_WarehouseFk); + + IF @myFloramondoEntry THEN + + SELECT @myFloramondoEntry; + + -- Elimina la oferta obsoleta + DELETE b FROM vn.buy b + JOIN vn.item i ON i.id = b.itemFk + LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId` + LEFT JOIN putOrder po ON b.deliveryFk = po.deliveryInformationID + WHERE b.entryFk = @myFloramondoEntry + AND o.`srId` IS NULL + AND po.id IS NULL; + + UPDATE vn.buy b + JOIN vn.item i ON i.id = b.itemFk + LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId` + SET b.quantity = 0 + WHERE b.entryFk = @myFloramondoEntry + AND o.`srId` IS NULL; + + -- actualiza la oferta existente + UPDATE vn.buy b + JOIN vn.item i ON i.id = b.itemFk + JOIN edi.offer o ON i.supplyResponseFk = o.`srId` + SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask, + b.buyingValue = o.price + WHERE b.entryFk = @myFloramondoEntry + AND (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask OR b.buyingValue <> o.price); + + SET vLastInserted := NOW(); + -- Inserta la oferta + INSERT INTO vn.buy(entryFk, + itemFk, + quantity, + buyingValue, + stickers, + packing, + `grouping`, + groupingMode, + packageFk, + deliveryFk) + + SELECT @myFloramondoEntry, + i.id, + o.NumberOfUnits * o.NumberOfItemsPerCask as quantity, + o.Price, + o.NumberOfUnits as etiquetas, + o.NumberOfItemsPerCask as packing, + o.MinimumQuantity * o.NumberOfItemsPerCask as `grouping`, + 1, -- Obliga al Packing + o.embalageCode, + o.diId + FROM edi.offer o + JOIN vn.item i ON i.supplyResponseFk = o.srId + LEFT JOIN vn.buy b ON i.id = b.itemFk AND b.entryFk = @myFloramondoEntry + JOIN vn.packaging p ON p.id LIKE o.embalageCode -- llevar esta linea i mirar de crear els packages a temps real + WHERE b.id IS NULL; + + DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc; + CREATE TEMPORARY TABLE tmp.buyRecalc + SELECT id from vn.buy where entryFk = @myFloramondoEntry AND created >= vLastInserted; + + CALL vn.buy_recalcPrices(); + + + END IF; + */ DROP TEMPORARY TABLE edi.offer, itemToInsert; @@ -12156,30 +12307,30 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `item_listAllocation`(IN `vWh` TINYINT, IN `vDate` DATE, IN `vType` INT, IN `vPrefix` VARCHAR(255), IN `vUseIds` BOOLEAN) -BEGIN -/** - * Lists visible items and it's box sizes of the specified - * type at specified date. - * - * @param vWh The warehouse id - * @param vDate The visible date - * @param vType The type id - * @param vPrefix The article prefix to filter or %NULL for all - * @param vUseIds Whether to order the result by item id - * @select List of visible items with it's box sizes - */ - CALL item_getVisible(vWh, vDate, vType, vPrefix); - - IF vUseIds - THEN - SELECT * FROM tmp.itemVisible - ORDER BY Id_Article; - ELSE - SELECT * FROM tmp.itemVisible - ORDER BY Article, packing; - END IF; - - DROP TEMPORARY TABLE tmp.itemVisible; +BEGIN +/** + * Lists visible items and it's box sizes of the specified + * type at specified date. + * + * @param vWh The warehouse id + * @param vDate The visible date + * @param vType The type id + * @param vPrefix The article prefix to filter or %NULL for all + * @param vUseIds Whether to order the result by item id + * @select List of visible items with it's box sizes + */ + CALL item_getVisible(vWh, vDate, vType, vPrefix); + + IF vUseIds + THEN + SELECT * FROM tmp.itemVisible + ORDER BY Id_Article; + ELSE + SELECT * FROM tmp.itemVisible + ORDER BY Article, packing; + END IF; + + DROP TEMPORARY TABLE tmp.itemVisible; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -13677,9 +13828,10 @@ BEGIN END IF; UPDATE order_row SET Id_Movimiento = vSale WHERE id = vRowId; - + SELECT (warehouseInFk = vWarehouse) INTO vIsFloramondoWarehouse FROM vn.floramondoConfig; - IF vIsFloramondoWarehouse THEN + + IF vIsFloramondoWarehouse THEN INSERT INTO edi.putOrder (deliveryInformationID, supplyResponseId, quantity, @@ -13692,13 +13844,13 @@ BEGIN WHERE i.id = vItem -- AND di.LatestDeliveryDateTime > NOW() AND vAmount / sr.NumberOfItemsPerCask LIMIT 1; + END IF; END LOOP; CLOSE cRows; -- Fija el coste - DROP TEMPORARY TABLE IF EXISTS tComponents; CREATE TEMPORARY TABLE tComponents (INDEX (saleFk)) @@ -14113,11 +14265,11 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `order_getTax`() READS SQL DATA @@ -14176,6 +14328,8 @@ BEGIN SUM(CAST(taxableBase * rate / 100 AS DECIMAL(10, 2))) tax FROM tmp.orderTax GROUP BY orderFk, `code`; + + DROP TEMPORARY TABLE tmp.addressTaxArea; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -17690,6 +17844,7 @@ TRUNCATE TABLE clientesProveedores; Nacion, Telefono, Telefono2, + CodigoTransaccion, CodigoRetencion, Email1, iban) @@ -17701,7 +17856,7 @@ TRUNCATE TABLE clientesProveedores; cl.street Domicilio, cl.accountingAccount CodigoCuenta, TRIM(IF(co.code = LEFT(cl.fi,2), MID(cl.fi,3, length(cl.fi)-1), cl.fi)) AS CifDni, - TRIM(CONCAT(co.code, IF(co.code = LEFT(cl.fi,2), MID(cl.fi,3, length(cl.fi)-1), cl.fi))) AS CifEuropeo, + IF(sn.NacionCEE,TRIM(CONCAT(co.code, IF(co.code = LEFT(cl.fi,2), MID(cl.fi,3, length(cl.fi)-1), cl.fi))) , "")AS CifEuropeo, cl.postcode CodigoPostal, cl.city Municipio, sp.CodigoProvincia CodigoProvincia, @@ -17710,12 +17865,14 @@ TRUNCATE TABLE clientesProveedores; IF (sn.SiglaNacion = "XB",IF(sp.CodigoProvincia IN (51,52), "XC",IF (sp.CodigoProvincia IN (35,38), "XB", sn.SiglaNacion)), sn.SiglaNacion) SiglaNacion, IF((cl.fi REGEXP '^([[:blank:]]|[[:digit:]])'), 'J','F') PersonaFisicaJuridica, IF((co.id = 1), 1, IF((co.isUeeMember = 1), 2, 4)) TipoDocumentoPersona, - IF(cl.isEqualizated, 'R', IF ((cl.isVies AND cl.countryFk <> 1) OR (NOT co.isUeeMember),'E','I'))AS CodigoIva, - IF(sn.SiglaNacion = "XB", IF(sp.CodigoProvincia IN (51,52), "CEUTA Y MELILLA", IF (sp.CodigoProvincia IN (35,38), "ISLAS CANARIAS",sn.Nacion)) , sn.Nacion) Nacion, + -- IF(cl.isEqualizated, 'R', IF ((cl.isVies AND cl.countryFk <> 1) OR (NOT co.isUeeMember),'E','I'))AS CodigoIva, + cl.taxTypeSageFk CodigoIva, + IF(sn.SiglaNacion = "XB", IF(sp.CodigoProvincia IN (51,52), "CEUTA Y MELILLA", IF (sp.CodigoProvincia IN (35,38), "ISLAS CANARIAS",sn.Nacion)) , sn.Nacion) Nacion, cl.phone Telefono, cl.mobile Telefono2, - 0 CodigoRetencion, - SUBSTR(cl.email, 1, LOCATE(',', CONCAT(cl.email,','))-1) Email1, + cl.transactionTypeSageFk CodigoTransaccion, + 0 CodigoRetencion, + SUBSTR(cl.email, 1, LOCATE(',', CONCAT(cl.email,','))-1) Email1, cl.iban iban FROM vn.client cl JOIN vn2008.v_xsubclien ON v_xsubclien.Id_Cliente = cl.id @@ -17734,7 +17891,7 @@ TRUNCATE TABLE clientesProveedores; s.street Domicilio, s.account CodigoCuenta, TRIM(IF(co.code = LEFT(s.nif,2), MID(s.nif,3, length(s.nif)-1), s.nif)) CifDni, - TRIM(CONCAT(co.code, IF(co.code = LEFT(s.nif,2), MID(s.nif,3, length(s.nif)-1), s.nif))) AS CifEuropeo, + IF(sn.NacionCEE,TRIM(CONCAT(co.code, IF(co.code = LEFT(s.nif,2), MID(s.nif,3, length(s.nif)-1), s.nif))), "") AS CifEuropeo, s.postCode CodigoPostal, s.city Municipio, sp.CodigoProvincia CodigoProvincia, @@ -17743,16 +17900,14 @@ TRUNCATE TABLE clientesProveedores; sn.SiglaNacion SiglaNacion, IF((s.nif REGEXP '^([[:blank:]]|[[:digit:]])'),'J','F') PersonaFisicaJuridica, IF((co.id = 1),1,IF((co.isUeeMember = 1), 2, 4)) TipoDocumentoPersona, - 'I' CodigoIva, + -- 'I' CodigoIva, + s.taxTypeSageFk CodigoIva, sn.Nacion Nacion, con.Telefono Telefono, con.Movil Telefono2, - CASE - WHEN s.account LIKE '_____4____' THEN 2 - WHEN s.account LIKE '_____3____' THEN 18 - ELSE 0 - END CodigoRetencion, - SUBSTR(con.email,1,(COALESCE(NULLIF(LOCATE(',', con.email), 0), 99) - 1)) Email1, + s.transactionTypeSageFk CodigoTransaccion, + s.withholdingSageFk CodigoRetencion, + SUBSTR(con.email,1,(COALESCE(NULLIF(LOCATE(',', con.email), 0), 99) - 1)) Email1, sa.iban iban FROM vn.supplier s JOIN vn2008.v_xsubprov xsp ON xsp.proveedor_id = s.id -- Proveedores activos los últimos 3 meses @@ -17793,8 +17948,8 @@ BEGIN TRUNCATE XDiario_movConta_IVA; DELETE FROM movConta WHERE enlazadoSage = FALSE ; - -- CALL clientesProveedoresAdd; - -- CALL planCuentasPgcAdd; + CALL clientesProveedoresAdd; + CALL planCuentasPgcAdd; CALL XDiario_movConta_IVA_InvoiceOutAdd_Manager; CALL XDiario_movConta_IVA_InvoiceInAdd_Manager; INSERT INTO movConta( @@ -17890,7 +18045,7 @@ BEGIN YEAR(x.FECHA) AS Ejercicio, IF (@@hostname = 'db', c.companyCode, companyCodeTest) AS CodigoEmpresa, -- ENT(2) c.companyCode AS CodigoEmpresa, x.ASIEN AS Asiento, -- LONG(4), nº ASIENTO - IF(EURODEBE IS NULL,"H","D") AS CargoAbono, -- VARCHAR(1) "D" debe ó "H" haber + IF(EURODEBE<>0 OR (EURODEBE=0 AND EUROHABER IS NULL),'D','H')AS CargoAbono, -- IF(EURODEBE IS NULL,"H","D") AS CargoAbono, VARCHAR(1) "D" debe ó "H" haber x.SUBCTA AS CodigoCuenta, -- VARCHAR(15) partida contable x.CONTRA AS Contrapartida, -- VARCHAR(15) partida contable x.FECHA AS FechaAsiento, -- FECHA(8) @@ -17898,7 +18053,7 @@ BEGIN IF(x.EURODEBE,x.EURODEBE,x.EUROHABER) AS ImporteAsiento, -- DOBLE(19) MONTH(x.FECHA) AS NumeroPeriodo, -- ENT(2) "-1" Al informar este valor se calcula automát. A partir de la fecha de asiento IF( sub2.FECREGCON IS NULL, sub2.FECHA_EX, sub2.FECREGCON) FechaGrabacion, -- FECHA(8) - IFNULL(xmi.CodigoDivisa, cu.code) CodigoDivisa, -- VARCHAR(3) + IFNULL(xmi.CodigoDivisa, sub3.code) CodigoDivisa, -- VARCHAR(3) x.CAMBIO AS ImporteCambio, -- DOBLE(19) IFNULL(x.DEBEME,x.HABERME) AS ImporteDivisa, -- DOBLE(19) IF(x.CAMBIO,1,0) AS FactorCambio, -- DOBLE(19) @@ -17982,8 +18137,10 @@ BEGIN ORDER BY ASIEN, FECREGCON DESC, FECHA_EX DESC ) sub GROUP BY ASIEN )sub2 ON sub2.ASIEN = x.ASIEN - LEFT JOIN vn.bank b ON b.account = x.SUBCTA - LEFT JOIN vn.currency cu ON cu.id = b.currencyFk + LEFT JOIN ( SELECT DISTINCT(account),cu.code + FROM vn.bank b + JOIN vn.currency cu ON cu.id = b.currencyFk + )sub3 ON sub3.account = x.SUBCTA WHERE x.enlazadoSage = 0 AND c.companyCode; @@ -19078,7 +19235,7 @@ BEGIN SET xmi.CodigoRetencion = t.CodigoRetencion, xmi.BaseRetencion = IF (t.CodigoRetencion = 2, sub.taxableBase + sub.taxBase, sub.taxableBase), xmi.PorRetencion = t.PorcentajeRetencion, - xmi.ImporteRetencion = iit.taxableBase + xmi.ImporteRetencion = iit.taxableBase * - 1 WHERE xmi.id = vXDiarioId AND iit.expenceFk= 4751000000 ; END ;; @@ -19353,6 +19510,169 @@ BEGIN DROP TEMPORARY TABLE tmp.invoiceDua; DROP TEMPORARY TABLE tmp.invoiceInList; + + -- ASIENTOS CON IVA SOPORTADO 472. y 477. hay que informar 2 líneas la info de facturas una como tipo de factura emitida y otra como recibida + DROP TEMPORARY TABLE IF EXISTS tmp.XDiario_movConta_IVA; + CREATE TEMPORARY TABLE tmp.XDiario_movConta_IVA + SELECT + sub3.id, + mc.CodigoDivisa, + mc.BaseIva1, + mc.PorBaseCorrectora1, + mc.PorIva1, + mc.CuotaIva1, + mc.PorRecargoEquivalencia1, + mc.RecargoEquivalencia1, + mc.CodigoTransaccion1, + mc.CodigoIva1, + mc.BaseIva2, + mc.PorBaseCorrectora2, + mc.PorIva2, + mc.CuotaIva2, + mc.PorRecargoEquivalencia2, + mc.RecargoEquivalencia2, + mc.CodigoTransaccion2, + mc.CodigoIva2, + mc.BaseIva3, + mc.PorBaseCorrectora3, + mc.PorIva3, + mc.CuotaIva3, + mc.PorRecargoEquivalencia3, + mc.RecargoEquivalencia3, + mc.CodigoTransaccion3, + mc.CodigoIva3, + mc.BaseIva4, + mc.PorBaseCorrectora4, + mc.PorIva4, + mc.CuotaIva4, + mc.PorRecargoEquivalencia4, + mc.RecargoEquivalencia4, + mc.CodigoTransaccion4, + mc.CodigoIva4, + mc.Año, + mc.Serie, + mc.Factura, + mc.SuFacturaNo, + mc.FechaFactura, + mc.ImporteFactura, + 'E', + mc.CodigoCuentaFactura, + mc.CifDni, + mc.Nombre, + mc.CodigoRetencion, + mc.BaseRetencion, + mc.PorRetencion, + mc.ImporteRetencion, + mc.SiglaNacion, + mc.EjercicioFactura, + mc.FechaOperacion, + mc.Exclusion347, + mc.MantenerAsiento, + mc.Metalico347, + mc.ClaveOperacionFactura, + mc.TipoRectificativa, + mc.FechaFacturaOriginal, + mc.CuotaIvaOriginal, + mc.BaseImponibleOriginal, + mc.ClaseAbonoRectificativas, + mc.RecargoEquivalenciaOriginal, + mc.LibreA1, + mc.IvaDeducible1, + mc.IvaDeducible2, + mc.IvaDeducible3, + mc.IvaDeducible4, + mc.FechaGrabacion, + mc.Intracomunitaria, + mc.moveData + FROM sage.XDiario_movConta_IVA mc + JOIN vn.XDiario x ON x.id = mc.id + JOIN (SELECT x.ASIEN, x.id + FROM vn.XDiario x + JOIN(SELECT DISTINCT(x.ASIEN) ASIEN + FROM (SELECT DISTINCT(ASIEN) + FROM vn.XDiario x + WHERE SUBCTA LIKE '472%' AND x.enlazadoSage = FALSE + ) sub JOIN vn.XDiario x ON x.ASIEN = sub.ASIEN + WHERE x.SUBCTA LIKE '477%' + )sub2 ON sub2.ASIEN = x.ASIEN + WHERE x.CONTRA IS NOT NULL AND x.SUBCTA LIKE '477%' + GROUP BY x.ASIEN + )sub3 ON sub3.ASIEN = x.ASIEN; + + INSERT INTO sage.XDiario_movConta_IVA + (`id`, + `CodigoDivisa`, + `BaseIva1`, + `PorBaseCorrectora1`, + `PorIva1`, + `CuotaIva1`, + `PorRecargoEquivalencia1`, + `RecargoEquivalencia1`, + `CodigoTransaccion1`, + `CodigoIva1`, + `BaseIva2`, + `PorBaseCorrectora2`, + `PorIva2`, + `CuotaIva2`, + `PorRecargoEquivalencia2`, + `RecargoEquivalencia2`, + `CodigoTransaccion2`, + `CodigoIva2`, + `BaseIva3`, + `PorBaseCorrectora3`, + `PorIva3`, + `CuotaIva3`, + `PorRecargoEquivalencia3`, + `RecargoEquivalencia3`, + `CodigoTransaccion3`, + `CodigoIva3`, + `BaseIva4`, + `PorBaseCorrectora4`, + `PorIva4`, + `CuotaIva4`, + `PorRecargoEquivalencia4`, + `RecargoEquivalencia4`, + `CodigoTransaccion4`, + `CodigoIva4`, + `Año`, + `Serie`, + `Factura`, + `SuFacturaNo`, + `FechaFactura`, + `ImporteFactura`, + `TipoFactura`, + `CodigoCuentaFactura`, + `CifDni`, + `Nombre`, + `CodigoRetencion`, + `BaseRetencion`, + `PorRetencion`, + `ImporteRetencion`, + `SiglaNacion`, + `EjercicioFactura`, + `FechaOperacion`, + `Exclusion347`, + `MantenerAsiento`, + `Metalico347`, + `ClaveOperacionFactura`, + `TipoRectificativa`, + `FechaFacturaOriginal`, + `CuotaIvaOriginal`, + `BaseImponibleOriginal`, + `ClaseAbonoRectificativas`, + `RecargoEquivalenciaOriginal`, + `LibreA1`, + `IvaDeducible1`, + `IvaDeducible2`, + `IvaDeducible3`, + `IvaDeducible4`, + `FechaGrabacion`, + `Intracomunitaria`, + `moveData`) + SELECT * + FROM tmp.XDiario_movConta_IVA; + DROP TEMPORARY TABLE tmp.XDiario_movConta_IVA; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -20050,6 +20370,24 @@ SET character_set_client = utf8; 1 AS `roleId`*/; SET character_set_client = @saved_cs_client; +-- +-- Temporary table structure for view `User` +-- + +DROP TABLE IF EXISTS `User`; +/*!50001 DROP VIEW IF EXISTS `User`*/; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +/*!50001 CREATE VIEW `User` AS SELECT + 1 AS `id`, + 1 AS `realm`, + 1 AS `username`, + 1 AS `password`, + 1 AS `email`, + 1 AS `emailVerified`, + 1 AS `verificationToken`*/; +SET character_set_client = @saved_cs_client; + -- -- Table structure for table `fieldAcl` -- @@ -20067,25 +20405,6 @@ CREATE TABLE `fieldAcl` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Table structure for table `user` --- - -DROP TABLE IF EXISTS `user`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `user` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `realm` varchar(512) CHARACTER SET utf8 DEFAULT NULL, - `username` varchar(512) CHARACTER SET utf8 DEFAULT NULL, - `password` varchar(512) CHARACTER SET utf8 NOT NULL, - `email` varchar(512) CHARACTER SET utf8 NOT NULL, - `emailVerified` tinyint(1) DEFAULT NULL, - `verificationToken` varchar(512) CHARACTER SET utf8 DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `userConfigView` -- @@ -20728,8 +21047,8 @@ DELIMITER ; /*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `log_add_beta__`(IN `vTableName` VARCHAR(255), IN `vNewId` VARCHAR(255), IN `vOldId` VARCHAR(255)) -proc: BEGIN - -- XXX: Disabled while testing +proc: BEGIN + -- XXX: Disabled while testing DECLARE vLanded DATE; DECLARE vWarehouseFk INT; DECLARE vBuyerFk INT; @@ -20737,20 +21056,20 @@ proc: BEGIN DECLARE vItemFk INT; DECLARE vItemName VARCHAR(50); - -- LEAVE proc; + -- LEAVE proc; - IF vOldId IS NOT NULL AND !(vOldId <=> vNewId) THEN - INSERT IGNORE INTO `log` SET - tableName = vTableName, - tableId = vOldId, - operation = 'delete'; - END IF; - - IF vNewId IS NOT NULL THEN - INSERT IGNORE INTO `log` SET - tableName = vTableName, - tableId = vNewId, - operation = 'insert'; + IF vOldId IS NOT NULL AND !(vOldId <=> vNewId) THEN + INSERT IGNORE INTO `log` SET + tableName = vTableName, + tableId = vOldId, + operation = 'delete'; + END IF; + + IF vNewId IS NOT NULL THEN + INSERT IGNORE INTO `log` SET + tableName = vTableName, + tableId = vNewId, + operation = 'insert'; END IF; IF vTableName = 'buy' THEN @@ -20780,7 +21099,7 @@ proc: BEGIN END IF; END IF; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -21048,29 +21367,29 @@ CREATE DEFINER=`root`@`%` PROCEDURE `log_refreshSale`( BEGIN DROP TEMPORARY TABLE IF EXISTS tValues; CREATE TEMPORARY TABLE tValues - ENGINE = MEMORY - SELECT - m.id saleFk, - m.ticketFk, - m.itemFk, - t.warehouseFk, - t.shipped, + ENGINE = MEMORY + SELECT + m.id saleFk, + m.ticketFk, + m.itemFk, + t.warehouseFk, + t.shipped, ABS(m.quantity) quantity, m.created, TIMESTAMPADD(DAY, tp.life, t.shipped) expired, m.quantity < 0 isIn, - m.isPicked OR s.alertLevel > 1 isPicked - FROM vn.sale m - JOIN vn.ticket t ON t.id = m.ticketFk + m.isPicked OR s.alertLevel > 1 isPicked + FROM vn.sale m + JOIN vn.ticket t ON t.id = m.ticketFk JOIN vn.ticketState s ON s.ticketFk = t.id JOIN vn.item i ON i.id = m.itemFk - JOIN vn.itemType tp ON tp.id = i.typeFk + JOIN vn.itemType tp ON tp.id = i.typeFk WHERE ( - vTableId IS NULL - OR (vTableName = 'ticket' AND t.id = vTableId) - OR (vTableName = 'sale' AND m.id = vTableId) - ) - AND t.shipped >= vn.getInventoryDate() + vTableId IS NULL + OR (vTableName = 'ticket' AND t.id = vTableId) + OR (vTableName = 'sale' AND m.id = vTableId) + ) + AND t.shipped >= vn.getInventoryDate() AND m.quantity != 0; REPLACE INTO inbound ( @@ -21103,7 +21422,7 @@ BEGIN FROM tValues WHERE !isIn; - DROP TEMPORARY TABLE tValues; + DROP TEMPORARY TABLE tValues; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -21530,6 +21849,7 @@ DROP TABLE IF EXISTS `version`; CREATE TABLE `version` ( `code` varchar(255) COLLATE utf8_unicode_ci NOT NULL, `number` char(11) COLLATE utf8_unicode_ci NOT NULL, + `gitCommit` varchar(255) COLLATE utf8_unicode_ci NOT NULL, `updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`code`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; @@ -21546,6 +21866,7 @@ CREATE TABLE `versionUser` ( `code` varchar(255) COLLATE utf8_unicode_ci NOT NULL, `user` varchar(255) COLLATE utf8_unicode_ci NOT NULL, `number` char(11) COLLATE utf8_unicode_ci NOT NULL, + `gitCommit` varchar(255) COLLATE utf8_unicode_ci NOT NULL, `updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`code`,`user`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; @@ -22788,6 +23109,23 @@ SET character_set_client = utf8; 1 AS `holidayEntitlementRate`*/; SET character_set_client = @saved_cs_client; +-- +-- Temporary table structure for view `accounting` +-- + +DROP TABLE IF EXISTS `accounting`; +/*!50001 DROP VIEW IF EXISTS `accounting`*/; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +/*!50001 CREATE VIEW `accounting` AS SELECT + 1 AS `id`, + 1 AS `bank`, + 1 AS `account`, + 1 AS `accountingTypeFk`, + 1 AS `entityFk`, + 1 AS `isActive`*/; +SET character_set_client = @saved_cs_client; + -- -- Table structure for table `accountingType` -- @@ -23380,6 +23718,7 @@ CREATE TABLE `botanicExport` ( `restriction` enum('Sin restriccion','Importacion Prohibida','pasaporte fitosanitario','pasaporte individual','declaracion origen') CHARACTER SET utf8 NOT NULL, `description` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL, `isProtectedZone` tinyint(1) NOT NULL DEFAULT '0', + `code` enum('importProhibited','phytosanitaryPassport','individualPassport') COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`), KEY `Id_Paises` (`countryFk`), KEY `botanicExport_ibfk_2_idx` (`ediGenusFk`), @@ -23725,6 +24064,19 @@ CREATE TABLE `buyMark` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Temporary table structure for view `buyer` +-- + +DROP TABLE IF EXISTS `buyer`; +/*!50001 DROP VIEW IF EXISTS `buyer`*/; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +/*!50001 CREATE VIEW `buyer` AS SELECT + 1 AS `userFk`, + 1 AS `nickname`*/; +SET character_set_client = @saved_cs_client; + -- -- Table structure for table `calendar` -- @@ -24796,6 +25148,26 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +-- +-- Table structure for table `cmr_expeditionPallet` +-- + +DROP TABLE IF EXISTS `cmr_expeditionPallet`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `cmr_expeditionPallet` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `cmrFk` int(11) NOT NULL, + `expeditionPalletFk` int(11) NOT NULL, + `scanned` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `cmr_expeditionPallet_fk1_idx` (`cmrFk`), + KEY `cmr_expeditionPallet_fk2_idx` (`expeditionPalletFk`), + CONSTRAINT `cmr_expeditionPallet_fk1` FOREIGN KEY (`cmrFk`) REFERENCES `cmr` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `cmr_expeditionPallet_fk2` FOREIGN KEY (`expeditionPalletFk`) REFERENCES `expeditionPallet` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='relaciona los cmr con los pallets de expediciones'; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Temporary table structure for view `cmr_list` -- @@ -24828,6 +25200,7 @@ SET character_set_client = utf8; 1 AS `warehouseAddress`, 1 AS `shipped`, 1 AS `clientOficialName`, + 1 AS `supplierFk`, 1 AS `carrierName`, 1 AS `carrierStreet`, 1 AS `carrierPostCode`, @@ -25366,7 +25739,9 @@ CREATE TABLE `country` ( `isUeeMember` tinyint(4) NOT NULL DEFAULT '0', `ibanLength` tinyint(4) DEFAULT NULL, PRIMARY KEY (`id`), - KEY `Id_Paisreal` (`politicalCountryFk`) + KEY `Id_Paisreal` (`politicalCountryFk`), + KEY `currency_id_fk_idx` (`currencyFk`), + CONSTRAINT `currency_id_fk` FOREIGN KEY (`currencyFk`) REFERENCES `currency` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; @@ -26673,13 +27048,13 @@ CREATE TABLE `entryLog` ( /*!40101 SET character_set_client = @saved_cs_client */; -- --- Table structure for table `entryShelving` +-- Table structure for table `entryShelving__` -- -DROP TABLE IF EXISTS `entryShelving`; +DROP TABLE IF EXISTS `entryShelving__`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE `entryShelving` ( +CREATE TABLE `entryShelving__` ( `id` int(11) NOT NULL AUTO_INCREMENT, `entryFk` int(11) NOT NULL DEFAULT '204539', `shelvingFk` varchar(10) CHARACTER SET utf8 NOT NULL, @@ -27405,7 +27780,7 @@ DROP TABLE IF EXISTS `floramondoConfig`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `floramondoConfig` ( - `id` int(11) NOT NULL, + `id` int(11) NOT NULL AUTO_INCREMENT, `entryFk` int(11) DEFAULT NULL COMMENT 'ultima entrada de floramondo', `nextLanded` datetime DEFAULT NULL, `warehouseInFk` smallint(6) unsigned DEFAULT NULL, @@ -27418,8 +27793,26 @@ CREATE TABLE `floramondoConfig` ( CONSTRAINT `floramondoConfigAgencyModeFk` FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `floramondoConfigWarehouseInFk` FOREIGN KEY (`warehouseInFk`) REFERENCES `warehouse` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `floramondoConfigWarehouseOutFk` FOREIGN KEY (`warehouseOutFk`) REFERENCES `warehouse` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`floramondoConfig_AFTER_INSERT` AFTER INSERT ON `floramondoConfig` FOR EACH ROW +BEGIN + CALL util.throw ("Tabla config no permite añadir más registros"); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; -- -- Table structure for table `fuelType` @@ -27786,6 +28179,24 @@ SET character_set_client = utf8; 1 AS `dua`*/; SET character_set_client = @saved_cs_client; +-- +-- Temporary table structure for view `invoiceInDueDay__` +-- + +DROP TABLE IF EXISTS `invoiceInDueDay__`; +/*!50001 DROP VIEW IF EXISTS `invoiceInDueDay__`*/; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +/*!50001 CREATE VIEW `invoiceInDueDay__` AS SELECT + 1 AS `id`, + 1 AS `invoiceInFk`, + 1 AS `dueDated`, + 1 AS `bankFk`, + 1 AS `amount`, + 1 AS `foreignValue`, + 1 AS `created`*/; +SET character_set_client = @saved_cs_client; + -- -- Temporary table structure for view `invoiceInEntry__` -- @@ -27803,6 +28214,20 @@ SET character_set_client = utf8; 1 AS `isBooked`*/; SET character_set_client = @saved_cs_client; +-- +-- Temporary table structure for view `invoiceInIntrastat__` +-- + +DROP TABLE IF EXISTS `invoiceInIntrastat__`; +/*!50001 DROP VIEW IF EXISTS `invoiceInIntrastat__`*/; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +/*!50001 CREATE VIEW `invoiceInIntrastat__` AS SELECT + 1 AS `invoiceInFk`, + 1 AS `intrastatFk`, + 1 AS `amount`*/; +SET character_set_client = @saved_cs_client; + -- -- Table structure for table `invoiceInSerial` -- @@ -27974,12 +28399,12 @@ DELIMITER ; /*!50003 SET character_set_results = utf8 */ ; /*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceOut_beforeUpdate` BEFORE UPDATE ON `vn`.`invoiceOut` FOR EACH ROW BEGIN - CALL clientRisk_update (OLD.clientFk, OLD.companyFk, -OLD.amount); - CALL clientRisk_update (NEW.clientFk, NEW.companyFk, NEW.amount); +CALL clientRisk_update (OLD.clientFk, OLD.companyFk, -OLD.amount); +CALL clientRisk_update (NEW.clientFk, NEW.companyFk, NEW.amount); END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -28084,7 +28509,7 @@ CREATE TABLE `item` ( `stems` int(11) DEFAULT '1', `minPrice` double DEFAULT '0', `isToPrint` tinyint(1) NOT NULL DEFAULT '0', - `isDeliveryNote` tinyint(1) NOT NULL DEFAULT '0', + `isDeliveryNote__` tinyint(1) NOT NULL DEFAULT '0', `taxClassFk` tinyint(4) unsigned NOT NULL DEFAULT '1', `family` varchar(3) COLLATE utf8_unicode_ci DEFAULT 'VT', `box` tinyint(1) NOT NULL DEFAULT '0', @@ -28819,6 +29244,7 @@ CREATE TABLE `itemShelving` ( `packagingFk` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL, `level` varchar(45) COLLATE utf8_unicode_ci NOT NULL DEFAULT '1', `userFk` int(10) unsigned DEFAULT NULL, + `stars` int(11) DEFAULT NULL, PRIMARY KEY (`id`), KEY `itemShelving_fk1_idx` (`itemFk`), KEY `itemShelving_fk2_idx` (`shelvingFk`), @@ -29491,19 +29917,6 @@ SET character_set_client = utf8; 1 AS `newId`*/; SET character_set_client = @saved_cs_client; --- --- Table structure for table `kk` --- - -DROP TABLE IF EXISTS `kk`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `kk` ( - `pasillo` varchar(3) COLLATE utf8_unicode_ci NOT NULL, - PRIMARY KEY (`pasillo`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Temporary table structure for view `labelInfo` -- @@ -31902,6 +32315,7 @@ CREATE TABLE `saleMistake` ( `saleFk` int(11) NOT NULL, `userFk` int(11) NOT NULL, `typeFk` int(11) NOT NULL, + `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `saleMistake_fk1_idx` (`saleFk`), KEY `saleMistake_fk2_idx` (`userFk`), @@ -31912,6 +32326,23 @@ CREATE TABLE `saleMistake` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Temporary table structure for view `saleMistake_list` +-- + +DROP TABLE IF EXISTS `saleMistake_list`; +/*!50001 DROP VIEW IF EXISTS `saleMistake_list`*/; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +/*!50001 CREATE VIEW `saleMistake_list` AS SELECT + 1 AS `saleFk`, + 1 AS `sacador`, + 1 AS `created`, + 1 AS `revisador`, + 1 AS `description`, + 1 AS `controlled`*/; +SET character_set_client = @saved_cs_client; + -- -- Table structure for table `saleState` -- @@ -32709,6 +33140,54 @@ CREATE TABLE `supplierAccount` ( KEY `fk_banco_prov_account_idx` (`bankFk`) ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER supplierAccount_AfterInsert +AFTER INSERT +ON supplierAccount FOR EACH ROW +BEGIN + + INSERT INTO vn.mail(`sender`, subject, `body`) + SELECT 'finanzas@verdnatura.es', + CONCAT('Añadida cuenta bancaria al proveedor: ', NEW.supplierFk), + CONCAT(account.myUserGetName(), ' ha añadido: ', + NEW.iban, ', entidad: ', be.name, ', bic: ', be.bic) + FROM bankEntity be + WHERE be.id = NEW.bankEntityFk; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; + +-- +-- Table structure for table `supplierContact` +-- + +DROP TABLE IF EXISTS `supplierContact`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `supplierContact` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `supplierFk` int(11) DEFAULT NULL, + `phone` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL, + `mobile` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL, + `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, + `observation` text COLLATE utf8_unicode_ci, + `name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `supplier_id` (`supplierFk`), + CONSTRAINT `supplier_id` FOREIGN KEY (`supplierFk`) REFERENCES `supplier` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `supplierExpense` @@ -33103,16 +33582,17 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `ticket_beforeUpdate` BEFORE UPDATE ON `ticket` FOR EACH ROW BEGIN + DECLARE vNewTime TIME; IF !(NEW.shipped <=> OLD.shipped) THEN IF YEAR(NEW.shipped) < 2000 THEN SIGNAL SQLSTATE '46000' @@ -33134,6 +33614,25 @@ BEGIN IF NEW.routeFk AND NEW.isDeleted THEN CALL util.throw ('This ticket is deleted'); END IF; + + IF !(NEW.routeFk <=> OLD.routeFk) AND NEW.routeFk IS NOT NULL THEN + SELECT MAX(TIME(shipped)) INTO vNewTime + FROM vn.ticket + WHERE routeFk = NEW.routeFk + HAVING MAX(TIME(shipped)) > TIME(NEW.shipped); + + IF vNewTime THEN + SET NEW.shipped = TIMESTAMP(DATE(NEW.shipped), vNewTime); + INSERT INTO vn.ticketLog + SET originFk = NEW.id, + userFk = account.myUser_getId(), + `action` = 'update', + description = CONCAT('Cambia la hora por cambio de ruta de ', + TIME(OLD.shipped), + ' a ', + TIME(NEW.shipped)); + END IF; + END IF; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -33143,9 +33642,9 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; @@ -33158,25 +33657,7 @@ BEGIN OR !(NEW.shipped <=> OLD.shipped) THEN CALL stock.log_add('ticket', NEW.id, OLD.id); END IF; - - IF !(NEW.addressFk <=> OLD.addressFk) THEN - DELETE t - FROM ticketObservation t - JOIN observationType ot ON ot.id = t.observationTypeFk - WHERE t.ticketFk = NEW.id AND - ot.description = 'Repartidor'; - IF ROW_COUNT() > 0 THEN - INSERT INTO ticketLog (originFk, userFk, action, description) - VALUES (NEW.id, account.userGetId(), 'delete', CONCAT ('Notas de repartidor por cambio de consignatario')); - END IF; - INSERT INTO ticketObservation(ticketFk, observationTypeFk, description) - SELECT NEW.id, ao.observationTypeFk, ao.description - FROM addressObservation ao - JOIN address a ON a.id = ao.addressFk - JOIN observationType ot ON ot.id = ao.observationTypeFk - WHERE a.id = NEW.addressFk AND - ot.description = 'Repartidor'; - END IF; + IF NEW.clientFk = 2067 AND !(NEW.clientFk <=> OLD.clientFk) THEN -- Fallo que se insertan no se sabe como tickets en este cliente INSERT INTO vn.mail SET @@ -33834,13 +34315,13 @@ CREATE TABLE `ticketWeekly` ( /*!40101 SET character_set_client = @saved_cs_client */; -- --- Table structure for table `ticket_print` +-- Table structure for table `ticket_print__` -- -DROP TABLE IF EXISTS `ticket_print`; +DROP TABLE IF EXISTS `ticket_print__`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE `ticket_print` ( +CREATE TABLE `ticket_print__` ( `ticketFk` int(11) NOT NULL, `isPrinted` tinyint(1) NOT NULL DEFAULT '0', `counter` int(11) NOT NULL DEFAULT '0', @@ -34386,6 +34867,23 @@ CREATE TABLE `travelThermograph` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Registra cada termografo que se ha introducido en cada travel'; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `trolley` +-- + +DROP TABLE IF EXISTS `trolley`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `trolley` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `workerFk` int(11) DEFAULT NULL, + `coupled` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `trolley_FK` (`workerFk`), + CONSTRAINT `trolley_FK` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE SET NULL ON UPDATE CASCADE +) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Temporary table structure for view `user` -- @@ -34510,6 +35008,41 @@ CREATE TABLE `vehicle` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `wagon` +-- + +DROP TABLE IF EXISTS `wagon`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `wagon` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `volume` int(11) NOT NULL DEFAULT '150' COMMENT 'Volumen en litros', + `plate` varchar(10) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Matrícula', + PRIMARY KEY (`id`) +) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `wagonVolumetry` +-- + +DROP TABLE IF EXISTS `wagonVolumetry`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `wagonVolumetry` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `level` int(10) unsigned NOT NULL DEFAULT '0', + `lines` int(10) unsigned NOT NULL DEFAULT '1', + `liters` int(10) unsigned NOT NULL DEFAULT '0', + `height` int(10) unsigned NOT NULL DEFAULT '20', + `wagonFk` int(11) NOT NULL, + PRIMARY KEY (`id`), + KEY `wagonVolumetry_FK` (`wagonFk`), + CONSTRAINT `wagonVolumetry_FK` FOREIGN KEY (`wagonFk`) REFERENCES `wagon` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `warehouse` -- @@ -35864,90 +36397,90 @@ DELIMITER ;; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; /*!50003 SET time_zone = 'SYSTEM' */ ;; -/*!50106 CREATE*/ /*!50117 DEFINER=`z-sysadmin`@`%`*/ /*!50106 EVENT `printQueue_check` ON SCHEDULE EVERY 10 MINUTE STARTS '2019-11-08 00:00:00' ON COMPLETION PRESERVE ENABLE COMMENT 'Notifica en caso de que el servidor de impresión este parado' DO BEGIN - - DECLARE vCurrentCount INT; - DECLARE vCheckSum INT; - DECLARE vIsAlreadyNotified BOOLEAN; - DECLARE vTableQueue TEXT; - DECLARE vLineQueue TEXT; - DECLARE vDone BOOL DEFAULT FALSE; - DECLARE vCur CURSOR FOR - SELECT CONCAT(' - ', IFNULL(pq.id, ''), ' - ', IFNULL(p.path, ''),' - ', IFNULL(i.Informe, ''),' - ', IFNULL(e.Estado, ''),' - ', IFNULL(w.firstname, ''), " ", IFNULL(w.lastName, ''),' - ', IFNULL(pq.`error`, ''),' - ') - FROM vn.printingQueue pq - LEFT JOIN vn.worker w ON w.id = pq.worker - LEFT JOIN vn.printer p ON p.id = pq.printer - LEFT JOIN vn2008.Informes i ON i.Id_Informe = pq.report - JOIN vn2008.Estados e ON e.Id_Estado = pq.state - LIMIT 30; - - DECLARE CONTINUE HANDLER FOR NOT FOUND - SET vDone = TRUE; - - SELECT COUNT(*), IFNULL(SUM(id),0) INTO vCurrentCount, vCheckSum - FROM vn.printingQueue WHERE state = 1; - - SELECT isAlreadyNotified INTO vIsAlreadyNotified - FROM printingQueueCheck; - - IF (SELECT lastCount FROM printingQueueCheck) = vCurrentCount AND - (SELECT lastCheckSum FROM printingQueueCheck) = vCheckSum AND - vIsAlreadyNotified = FALSE AND vCurrentCount > 0 - THEN - - SELECT ' - - - - - - - - ' INTO vTableQueue; - - OPEN vCur; - - l: LOOP - - SET vDone = FALSE; - - FETCH vCur INTO vLineQueue; - - IF vDone THEN - LEAVE l; - END IF; - - SELECT CONCAT(vTableQueue, vLineQueue) INTO vTableQueue; - - END LOOP; - - CLOSE vCur; - - INSERT INTO vn2008.mail (`to`, subject, text) - VALUES ('cau@verdnatura.es, sysadmin@verdnatura.es', - 'servidor de impresion parado', - CONCAT('Hay ', vCurrentCount, ' lineas bloqueadas', vTableQueue, '
Id ColaRuta ImpresoraInformeEstadoTrabajadorError
')); - - UPDATE printingQueueCheck SET isAlreadyNotified = TRUE; - END IF; - - IF (SELECT lastCount FROM printingQueueCheck) > vCurrentCount AND - vIsAlreadyNotified = TRUE - THEN - UPDATE printingQueueCheck SET isAlreadyNotified = FALSE; - END IF; - - UPDATE printingQueueCheck - SET lastCount = vCurrentCount, - lastCheckSum = vCheckSum; - +/*!50106 CREATE*/ /*!50117 DEFINER=`z-sysadmin`@`%`*/ /*!50106 EVENT `printQueue_check` ON SCHEDULE EVERY 10 MINUTE STARTS '2019-11-08 00:00:00' ON COMPLETION PRESERVE ENABLE COMMENT 'Notifica en caso de que el servidor de impresión este parado' DO BEGIN + + DECLARE vCurrentCount INT; + DECLARE vCheckSum INT; + DECLARE vIsAlreadyNotified BOOLEAN; + DECLARE vTableQueue TEXT; + DECLARE vLineQueue TEXT; + DECLARE vDone BOOL DEFAULT FALSE; + DECLARE vCur CURSOR FOR + SELECT CONCAT(' + ', IFNULL(pq.id, ''), ' + ', IFNULL(p.path, ''),' + ', IFNULL(i.Informe, ''),' + ', IFNULL(e.Estado, ''),' + ', IFNULL(w.firstname, ''), " ", IFNULL(w.lastName, ''),' + ', IFNULL(pq.`error`, ''),' + ') + FROM vn.printingQueue pq + LEFT JOIN vn.worker w ON w.id = pq.worker + LEFT JOIN vn.printer p ON p.id = pq.printer + LEFT JOIN vn2008.Informes i ON i.Id_Informe = pq.report + JOIN vn2008.Estados e ON e.Id_Estado = pq.state + LIMIT 30; + + DECLARE CONTINUE HANDLER FOR NOT FOUND + SET vDone = TRUE; + + SELECT COUNT(*), IFNULL(SUM(id),0) INTO vCurrentCount, vCheckSum + FROM vn.printingQueue WHERE state = 1; + + SELECT isAlreadyNotified INTO vIsAlreadyNotified + FROM printingQueueCheck; + + IF (SELECT lastCount FROM printingQueueCheck) = vCurrentCount AND + (SELECT lastCheckSum FROM printingQueueCheck) = vCheckSum AND + vIsAlreadyNotified = FALSE AND vCurrentCount > 0 + THEN + + SELECT ' + + + + + + + + ' INTO vTableQueue; + + OPEN vCur; + + l: LOOP + + SET vDone = FALSE; + + FETCH vCur INTO vLineQueue; + + IF vDone THEN + LEAVE l; + END IF; + + SELECT CONCAT(vTableQueue, vLineQueue) INTO vTableQueue; + + END LOOP; + + CLOSE vCur; + + INSERT INTO vn2008.mail (`to`, subject, text) + VALUES ('cau@verdnatura.es, sysadmin@verdnatura.es', + 'servidor de impresion parado', + CONCAT('Hay ', vCurrentCount, ' lineas bloqueadas', vTableQueue, '
Id ColaRuta ImpresoraInformeEstadoTrabajadorError
')); + + UPDATE printingQueueCheck SET isAlreadyNotified = TRUE; + END IF; + + IF (SELECT lastCount FROM printingQueueCheck) > vCurrentCount AND + vIsAlreadyNotified = TRUE + THEN + UPDATE printingQueueCheck SET isAlreadyNotified = FALSE; + END IF; + + UPDATE printingQueueCheck + SET lastCount = vCurrentCount, + lastCheckSum = vCheckSum; + END */ ;; /*!50003 SET time_zone = @saved_time_zone */ ;; /*!50003 SET sql_mode = @saved_sql_mode */ ;; @@ -36008,6 +36541,45 @@ DELIMITER ;; /*!50003 SET character_set_client = @saved_cs_client */ ;; /*!50003 SET character_set_results = @saved_cs_results */ ;; /*!50003 SET collation_connection = @saved_col_connection */ ;; +/*!50106 DROP EVENT IF EXISTS `workerTimeControl_sendMail` */;; +DELIMITER ;; +/*!50003 SET @saved_cs_client = @@character_set_client */ ;; +/*!50003 SET @saved_cs_results = @@character_set_results */ ;; +/*!50003 SET @saved_col_connection = @@collation_connection */ ;; +/*!50003 SET character_set_client = utf8mb4 */ ;; +/*!50003 SET character_set_results = utf8mb4 */ ;; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ;; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;; +/*!50003 SET @saved_time_zone = @@time_zone */ ;; +/*!50003 SET time_zone = 'SYSTEM' */ ;; +/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `workerTimeControl_sendMail` ON SCHEDULE EVERY 1 WEEK STARTS '2020-11-25 08:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN + DECLARE vDone BOOL; + DECLARE vWeek,vYear INT; + DECLARE rs CURSOR FOR + SELECT week,year + FROM vn.time + WHERE dated IN (DATE_ADD(CURDATE(), INTERVAL -10 DAY), DATE_ADD(CURDATE(), INTERVAL -4 DAY)) + GROUP BY year,week; + DECLARE CONTINUE HANDLER FOR NOT FOUND + SET vDone = TRUE; + + OPEN rs; + myLoop: LOOP + SET vDone = FALSE; + FETCH rs INTO vWeek, vYear; + IF vDone THEN + LEAVE myLoop; + END IF; + CALL vn.workerTimeControl_sendMail(vWeek, vYear, NULL); + END LOOP; + CLOSE rs; +END */ ;; +/*!50003 SET time_zone = @saved_time_zone */ ;; +/*!50003 SET sql_mode = @saved_sql_mode */ ;; +/*!50003 SET character_set_client = @saved_cs_client */ ;; +/*!50003 SET character_set_results = @saved_cs_results */ ;; +/*!50003 SET collation_connection = @saved_col_connection */ ;; /*!50106 DROP EVENT IF EXISTS `zoneGeo_doCalc` */;; DELIMITER ;; /*!50003 SET @saved_cs_client = @@character_set_client */ ;; @@ -36394,7 +36966,7 @@ BEGIN JOIN itemBotanical ib ON be.ediGenusFk = ib.genusFk AND IFNULL(be.ediSpecieFk, ib.specieFk) = ib.specieFk - AND be.restriction = 'pasaporte fitosanitario' + AND be.`code` = 'phytosanitaryPassport' JOIN item i ON i.id = ib.itemFk JOIN itemType it ON it.id = i.typeFk WHERE ib.itemFk = vItemFk @@ -37381,13 +37953,13 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` FUNCTION `floramondo_getEntry`(vLanded DATETIME) RETURNS int(11) +CREATE DEFINER=`root`@`%` FUNCTION `floramondo_getEntry`(vLanded DATETIME, vWarehouseFk INT) RETURNS int(11) READS SQL DATA BEGIN @@ -37395,9 +37967,10 @@ BEGIN DECLARE vEntryFk INT; DECLARE previousEntryFk INT; - SET vTravelFk = floramondo_getTravel(vLanded); + SET vTravelFk = floramondo_getTravel(vLanded, vWarehouseFk); IF vLanded THEN + SELECT IFNULL(MAX(id),0) INTO vEntryFk FROM vn.entry WHERE travelFk = vTravelFk AND isRaid; @@ -37416,18 +37989,32 @@ BEGIN WHERE travelFk = vTravelFk; END IF; + END IF; - SELECT entryFk INTO previousEntryFk FROM floramondoConfig; + SELECT entryFk INTO previousEntryFk + FROM floramondoConfig + WHERE warehouseInFk = vWarehouseFk; + IF NOT (previousEntryFk <=> vEntryFk) THEN + DELETE FROM buy WHERE entryFk = previousEntryFk; + DELETE FROM entry WHERE id = previousEntryFk; - UPDATE floramondoConfig SET entryFk = vEntryFk; - UPDATE floramondoConfig SET nextLanded = vLanded - WHERE vLanded IS NOT NULL; + + UPDATE floramondoConfig + SET entryFk = vEntryFk + WHERE warehouseInFk = vWarehouseFk; + + UPDATE floramondoConfig + SET nextLanded = vLanded + WHERE vLanded IS NOT NULL + AND warehouseInFk = vWarehouseFk; + END IF; RETURN vEntryFk; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -37438,19 +38025,19 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` FUNCTION `floramondo_getTravel`(vLanded DATE) RETURNS int(11) +CREATE DEFINER=`root`@`%` FUNCTION `floramondo_getTravel`(vLanded DATE, vWarehouseFk INT) RETURNS int(11) READS SQL DATA BEGIN DECLARE vTravelFk INT; DECLARE vWarehouseOutName VARCHAR(50) DEFAULT 'Holanda'; - DECLARE vWarehouseInName VARCHAR(50) DEFAULT 'VNH'; + -- DECLARE vWarehouseInName VARCHAR(50) DEFAULT 'VNH'; DECLARE vAgencyModeName VARCHAR(50) DEFAULT 'HOLANDA DIRECTO'; IF vLanded THEN @@ -37459,7 +38046,7 @@ BEGIN JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk JOIN vn.agencyMode am ON am.id = tr.agencyFk - WHERE wIn.name = vWarehouseInName + WHERE wIn.id = vWarehouseFk AND wOut.name = vWarehouseOutName AND am.name = vAgencyModeName AND landed = vLanded; @@ -37467,22 +38054,24 @@ BEGIN IF NOT vTravelFk THEN INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyFk) - SELECT vLanded, curdate(), wIn.id, wOut.id, am.id - FROM vn.warehouse wIn - JOIN vn.warehouse wOut ON wOut.name = vWarehouseOutName + SELECT vLanded, curdate(), vWarehouseFk, wOut.id, am.id + FROM vn.warehouse wOut JOIN vn.agencyMode am ON am.name = vAgencyModeName - WHERE wIn.name = vWarehouseInName; + WHERE wOut.name = vWarehouseOutName; SELECT MAX(tr.id) INTO vTravelFk FROM vn.travel tr JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk - WHERE wIn.name = vWarehouseInName + WHERE wIn.id = vWarehouseFk AND wOut.name = vWarehouseOutName AND landed = vLanded; END IF; + END IF; + RETURN vTravelFk; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -38717,6 +39306,35 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP FUNCTION IF EXISTS `item_getFhImage` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` FUNCTION `item_getFhImage`(itemFk INT) RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci + DETERMINISTIC +BEGIN + DECLARE vImageUrl VARCHAR(255); + SELECT sr.PictureReference INTO vImageUrl + FROM vn.buy b + JOIN edi.ekt e ON b.ektFk = e.id + JOIN edi.supplyResponse sr ON sr.Item_ArticleCode =e.`ref` + JOIN vn.item i ON i.id = b.itemFk + WHERE b.itemFk = itemFk + ORDER BY (sr.EmbalageCode = e.package) DESC + LIMIT 1; + RETURN vImageUrl; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP FUNCTION IF EXISTS `item_getVolume` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -38742,7 +39360,7 @@ BEGIN SELECT SUM(IF(p.volume > 0, p.volume, - p.width * p.depth * IF(p.height, p.height, IFNULL(i.size,60) + 10) + p.width * p.depth * IF(IFNULL(p.height,0), p.height, IFNULL(i.size,60) + 10) )) INTO vVolume FROM packaging p JOIN item i ON i.id = vSelf @@ -38995,13 +39613,14 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` FUNCTION `phytoPassport`(vRef VARCHAR(15)) RETURNS text CHARSET utf8 + DETERMINISTIC BEGIN DECLARE vPhyto TEXT CHARSET utf8 COLLATE utf8_unicode_ci; SELECT @@ -39026,7 +39645,7 @@ FROM JOIN itemBotanicalWithGenus ib ON ib.itemFk = i.id JOIN - botanicExport be ON be.restriction = 'pasaporte fitosanitario' + botanicExport be ON be.`code` = 'phytosanitaryPassport' LEFT JOIN ediGenus eg ON eg.id = be.ediGenusFk LEFT JOIN @@ -40170,11 +40789,11 @@ DELIMITER ; /*!50003 SET character_set_results = utf8 */ ; /*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `addNoteFromDelivery`(idTicket INT,nota TEXT) BEGIN - + DECLARE observationTypeFk INT DEFAULT 3; /*3 = REPARTIDOR*/ INSERT INTO ticketObservation(ticketFk,observationTypeFk,description) @@ -40451,7 +41070,7 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `algemesi_silla` */; +/*!50003 DROP PROCEDURE IF EXISTS `algemesi_silla__` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; @@ -40461,7 +41080,7 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `algemesi_silla`(vDate DATE, vItemFk INT, vQuantity INT) +CREATE DEFINER=`root`@`%` PROCEDURE `algemesi_silla__`(vDate DATE, vItemFk INT, vQuantity INT) BEGIN DECLARE done INT DEFAULT FALSE; @@ -41843,6 +42462,9 @@ proc: BEGIN DECLARE vDiscountLastItemComponent INT DEFAULT 32; DECLARE vExtraBaggedComponent INT DEFAULT 38; DECLARE vManaAutoComponent INT DEFAULT 39; + DECLARE vFrenchOffer INT DEFAULT 42; + DECLARE vIsFrenchVNHBuyer BOOLEAN DEFAULT FALSE; + DECLARE vVNHWarehouseFk INT DEFAULT 7; SELECT volume INTO vBoxVolume FROM vn.packaging @@ -41851,6 +42473,14 @@ proc: BEGIN SELECT clientFk INTO vClientFK FROM address WHERE id = vAddressFk; + + SELECT (c.country = 'FRANCIA' AND vWarehouseFk = vVNHWarehouseFk) + INTO vIsFrenchVNHBuyer + FROM vn.country c + JOIN vn.province p ON p.countryFk = c.id + JOIN vn.address a ON a.provinceFk = p.id + WHERE a.id = vAddressFk; + SET @rate2 := 0; SET @rate3 := 0; @@ -41889,6 +42519,7 @@ proc: BEGIN WHERE b.buyingValue + b.freightValue + b.packageValue + b.comissionValue > 0.01 AND ic.display <> 0 AND tl.zoneFk = vZoneFk AND tl.warehouseFk = vWarehouseFk; + -- Coste INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost) SELECT tcc.warehouseFk, @@ -41897,7 +42528,8 @@ proc: BEGIN b.buyingValue + b.freightValue + b.packageValue + b.comissionValue FROM tmp.ticketComponentCalculate tcc JOIN buy b ON b.id = tcc.buyFk; - + + -- Margen INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost) SELECT tcc.warehouseFk, @@ -41906,6 +42538,19 @@ proc: BEGIN tcc.rate3 - b.buyingValue - b.freightValue - b.packageValue - b.comissionValue FROM tmp.ticketComponentCalculate tcc JOIN buy b ON b.id = tcc.buyFk; + + -- French Offer: revisar a partir de Mayo 2021 + IF vIsFrenchVNHBuyer THEN + + INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost) + SELECT tcc.warehouseFk, + tcc.itemFk, + vFrenchOffer, + - tcc.rate3 + b.buyingValue + b.freightValue + b.packageValue + b.comissionValue + ((b.buyingValue + b.freightValue + b.packageValue + b.comissionValue) * 0.06) + FROM tmp.ticketComponentCalculate tcc + JOIN buy b ON b.id = tcc.buyFk; + + END IF; DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentBase; CREATE TEMPORARY TABLE tmp.ticketComponentBase ENGINE = MEMORY @@ -41951,6 +42596,9 @@ proc: BEGIN LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk WHERE sp.value IS NULL; + + + DROP TEMPORARY TABLE IF EXISTS tmp.zone; CREATE TEMPORARY TABLE IF NOT EXISTS tmp.zone (INDEX (id)) ENGINE = MEMORY @@ -41963,7 +42611,7 @@ proc: BEGIN tcc.itemFk, vDeliveryComponent, vGeneralInflationCoefficient - * ROUND(ic.cm3delivery * IFNULL((zo.price - zo.bonus),50) / vBoxVolume, 4) cost + * ROUND(ic.cm3delivery * (IFNULL(zo.price,5000) - IFNULL(zo.bonus,0)) / vBoxVolume, 4) cost /* * ROUND(( i.compression -- PAK 2020/06/19 @@ -42263,6 +42911,21 @@ BEGIN FROM vn.entry e JOIN tmp.entryToDelete tmp ON tmp.id = e.id; + -- borrar de route registros menores a 4 años + DROP TEMPORARY TABLE IF EXISTS tmp.routeToDelete; + CREATE TEMPORARY TABLE tmp.routeToDelete + SELECT * + FROM vn.route r + WHERE created < TIMESTAMPADD(YEAR,-4,CURDATE()); + + UPDATE tmp.routeToDelete tmp + JOIN vn.dms d ON d.id = tmp.gestdocFk + SET d.dmsTypeFk = vTrashId; + + DELETE r + FROM tmp.routeToDelete tmp + JOIN vn.route r ON r.id = tmp.id; + DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete; DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete; @@ -43207,54 +43870,54 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `clientRemoveWorker__`() -BEGIN - DECLARE done BOOL DEFAULT FALSE; - DECLARE vClientFk INT; - - DECLARE rs CURSOR FOR - SELECT c.clientFk - FROM tmp.clientGetDebt c - LEFT JOIN tmp.risk r ON r.clientFk = c.clientFk - WHERE IFNULL(r.risk,0) = 0; - - DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; - - DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt; - CREATE TEMPORARY TABLE tmp.clientGetDebt - SELECT cd.id as clientFk - FROM bs.clientDied cd - LEFT JOIN vn.clientProtected cp ON cp.clientFk = cd.id - JOIN vn.client c ON c.id = cd.id - JOIN vn.province p ON p.id = c.provinceFk - JOIN vn.country co ON co.id = p.countryFk - WHERE cd.Aviso = 'TERCER AVISO' - AND cp.clientFk IS NULL - AND co.country NOT IN ('Portugal','Francia','España exento') - AND c.salesPersonFk IS NOT NULL; - - CALL vn.clientGetDebt(curdate()); - - DROP TEMPORARY TABLE IF EXISTS tmp.contador; - CREATE TEMPORARY TABLE tmp.contador (id INT) - ENGINE = MEMORY; - - OPEN rs; - FETCH rs INTO vClientFk; - - WHILE NOT done DO - INSERT INTO tmp.contador SET id = vClientFk; - CALL vn.clientGreugeSpray(vClientFk, TRUE, '',TRUE); +BEGIN + DECLARE done BOOL DEFAULT FALSE; + DECLARE vClientFk INT; + + DECLARE rs CURSOR FOR + SELECT c.clientFk + FROM tmp.clientGetDebt c + LEFT JOIN tmp.risk r ON r.clientFk = c.clientFk + WHERE IFNULL(r.risk,0) = 0; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + + DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt; + CREATE TEMPORARY TABLE tmp.clientGetDebt + SELECT cd.id as clientFk + FROM bs.clientDied cd + LEFT JOIN vn.clientProtected cp ON cp.clientFk = cd.id + JOIN vn.client c ON c.id = cd.id + JOIN vn.province p ON p.id = c.provinceFk + JOIN vn.country co ON co.id = p.countryFk + WHERE cd.Aviso = 'TERCER AVISO' + AND cp.clientFk IS NULL + AND co.country NOT IN ('Portugal','Francia','España exento') + AND c.salesPersonFk IS NOT NULL; + + CALL vn.clientGetDebt(curdate()); + + DROP TEMPORARY TABLE IF EXISTS tmp.contador; + CREATE TEMPORARY TABLE tmp.contador (id INT) + ENGINE = MEMORY; + + OPEN rs; + FETCH rs INTO vClientFk; + + WHILE NOT done DO + INSERT INTO tmp.contador SET id = vClientFk; + CALL vn.clientGreugeSpray(vClientFk, TRUE, '',TRUE); UPDATE vn.client SET salesPersonFk = NULL WHERE id = vClientFk; INSERT INTO vn.clientLog (originFk, userFk, `action`, description) VALUES (vClientFk, account.userGetId(), 'update', CONCAT('Se ha desasignado el cliente por que no ha comprado en 3 meses')); - + REPLACE bs.clientNewBorn(clientFk, shipped) - VALUES(vClientFk, CURDATE()); - FETCH rs INTO vClientFk; - END WHILE; - - CLOSE rs; + VALUES(vClientFk, CURDATE()); + FETCH rs INTO vClientFk; + END WHILE; + + CLOSE rs; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -44703,10 +45366,20 @@ BEGIN DECLARE vClientName VARCHAR(50); DECLARE vConsignatario INT; DECLARE vOriginalQuantity INT; + DECLARE vDescription VARCHAR(100); + DECLARE vConcept VARCHAR(100); + DECLARE vOrigin INT; IF vIsTrash THEN SELECT 200 INTO vClientFk; END IF; + + SELECT concept INTO vConcept FROM vn.sale WHERE id = vSaleFk; + SELECT ticketFk INTO vOrigin FROM vn.sale WHERE id = vSaleFk; + SELECT CONCAT("Cambio cantidad ",vConcept," de ", vQuantity ," a ", vNewQuantity) INTO vDescription; + + INSERT INTO vn.ticketLog (originFk, userFk, action , description) + VALUES(vOrigin, vn.getUser(), 'update', vDescription); SELECT t.id INTO vTicketFk FROM vn.ticket t WHERE t.created > DATE_SUB(NOW(), INTERVAL 1 DAY) AND t.clientFk = vClientFk AND t.warehouseFk = vWarehouseFk LIMIT 1; @@ -44725,7 +45398,7 @@ BEGIN END IF; INSERT INTO vn.sale (itemFk, ticketFk, concept, quantity, originalQuantity, price, discount, priceFixed, reserved, isPicked, isPriceFixed, created, isAdded) - SELECT itemFk, vTicketFk, concept, vQuantity, originalQuantity, price, discount, priceFixed, reserved, isPicked, isPriceFixed, created, isAdded + SELECT itemFk, vTicketFk, CONCAT(concept," ",vn.getWorkerCode(), " ",LEFT(CAST(NOW() AS TIME),5)), vQuantity, originalQuantity, price, discount, priceFixed, reserved, isPicked, isPriceFixed, created, isAdded FROM vn.sale s WHERE s.id = vSaleFk; SELECT quantity INTO vOriginalQuantity FROM vn.sale WHERE id = vSaleFk; @@ -44828,7 +45501,7 @@ proc:BEGIN FROM vn.worker w WHERE w.id = account.myUser_getId(); - IF vWorkerCode = 'LOM' THEN + IF vWorkerCode = 'ATM' THEN SET vMaxTickets = 8; @@ -44869,15 +45542,13 @@ proc:BEGIN AND (r.id IS NOT NULL OR a.isOwn = FALSE OR a.name = 'REC_ALGEMESI') AND s.isPrintable AND (pb.m3 > 0.05 OR s.isOK) - ORDER BY IF(pb.ubicacion IS NOT NULL, 1, 2), - (Hora - 1) * 60 + minuto > hour(now()) * 60 + minute(now()) , + ORDER BY (Hora - 1) * 60 + minuto > hour(now()) * 60 + minute(now()) , s.order DESC, Hora, minuto, IFNULL(r.priority,99999), - IFNULL(r.id,999999) - /*, - pb.m3 DESC*/ + IFNULL(r.id,999999), + pb.m3 DESC LIMIT vMaxTicketPrinted; END IF; @@ -45436,341 +46107,6 @@ proc:BEGIN END IF; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `collection_new_Basic__` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `collection_new_Basic__`(vSectorFk INT) -proc:BEGIN - - DECLARE vIsPreviousPrepared BOOLEAN; - DECLARE vCollectionFk INT; - DECLARE vWarehouseFk INT; - DECLARE vMaxTickets INT DEFAULT 4; - DECLARE vStateFk INT; - DECLARE vFirstTicketFk INT; - DECLARE vWorkerCode VARCHAR(3); - DECLARE vShelve INT; - DECLARE vTicket INT; - DECLARE myUserIsSalesPersonRole BOOLEAN; - DECLARE vPrintedTickets INT; - DECLARE vMaxTicketPrinted INT DEFAULT 10; - - -- Se comprueba si existe coleccion pendiente, en cuyo caso se devuelve esa colección - SELECT collectionFk INTO vCollectionFk - FROM - ( - SELECT tc.collectionFk, COUNT(*) as lineas, sum(IF(st.id,0,1)) as libres - FROM vn.collection c - JOIN vn.ticketCollection tc ON tc.collectionFk = c.id - JOIN vn.ticket t ON t.id = tc.ticketFk - JOIN vn.sale s ON s.ticketFk = t.id - LEFT JOIN vn.saleTracking st ON st.saleFk = s.id - WHERE c.workerFk = vn.getUser() - AND s.quantity - AND c.created > CURDATE() - GROUP BY c.id - HAVING libres = lineas) sub - LIMIT 1; - - IF vCollectionFk THEN - - SELECT vCollectionFk; - - LEAVE proc; - - END IF; - - IF /*vSectorFk = 37*/ FALSE THEN - - CALL vn.collectionTrain_new(9,3); - - ELSE - - -- Establecemos el almacén y si es un sector de preparación previa, así como el estado para los tickets que se vayan preparando - SELECT isPreviousPrepared, warehouseFk - INTO vIsPreviousPrepared, vWarehouseFk - FROM vn.sector - WHERE id = vSectorFk; - - IF vIsPreviousPrepared THEN - - SELECT id INTO vStateFk - FROM vn.state - WHERE `code` = 'PREVIOUS_PREPARATION'; - ELSE - - SELECT id INTO vStateFk - FROM vn.state - WHERE `code` = 'ON_PREPARATION'; - - END IF; - - -- Averiguamos si es comercial el usuario - SELECT FALSE -- (r.name = 'salesPerson') - INTO myUserIsSalesPersonRole - FROM account.user u - JOIN account.role r ON r.id = u.role - WHERE u.id = vn.getUser(); - - -- Obtenemos el código del usuario - SELECT w.code - INTO vWorkerCode - FROM vn.worker w - WHERE w.id = account.myUserGetId(); - - -- Se obtiene nº de colección y el buffer con los pedidos preparables - INSERT INTO vn.collection - SET workerFk = account.myUserGetId(); - - SELECT LAST_INSERT_ID() INTO vCollectionFk; - - CALL vn2008.production_control_source(vWarehouseFk, 0); - - SELECT COUNT(*) INTO vPrintedTickets - FROM tmp.production_buffer pb - JOIN vn.state s ON s.id = pb.state - WHERE pb.Fecha = CURDATE() - AND s.isPreparable; - - SET vMaxTicketPrinted = vMaxTicketPrinted - vPrintedTickets; - - -- AutoPRINT - - IF vMaxTicketPrinted > 0 THEN - - INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador) - SELECT s2.id, pb.Id_Ticket, vn.getUser() - FROM tmp.production_buffer pb - JOIN vn.agency a ON a.id = pb.agency_id - JOIN vn.warehouse w ON w.id = pb.warehouse_id - JOIN vn.state s ON s.id = pb.state - JOIN vn.state s2 ON s2.code = 'PRINTED_AUTO' - LEFT JOIN vn.route r ON r.id = pb.Id_Ruta - WHERE pb.Fecha = CURDATE() - AND NOT pb.problems - AND a.name != 'REC_SILLA' - AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE ) - AND s.isPrintable - AND (pb.m3 > 0.05 OR s.isOK) - ORDER BY - (Hora - 1) * 60 + minuto > hour(now()) * 60 + minute(now()) , - s.order DESC, - Hora, - minuto, - IFNULL(r.priority,99999), - IFNULL(r.id,999999), - pb.m3 DESC - LIMIT vMaxTicketPrinted; - - END IF; - - -- SELECT vMaxTicketPrinted; - -- Se seleccionan los primeros tickets, asignando colección para dejarlos bloqueados a otros sacadores. - - INSERT IGNORE INTO vn.ticketCollection(ticketFk, collectionFk) - SELECT pb.Id_Ticket, - vCollectionFk - FROM tmp.production_buffer pb - JOIN vn.ticketStateToday tst ON tst.ticket = pb.Id_Ticket - JOIN vn.state s ON s.id = tst.state - LEFT JOIN vn.route r ON r.id = pb.Id_Ruta - WHERE pb.collectionFk IS NULL - AND ( - (s.isPreparable AND NOT myUserIsSalesPersonRole AND pb.Agencia != 'REC_SILLA') - OR - (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode) - ) - ORDER BY (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode) DESC, - pb.Hora, - pb.Minuto, - IF(IFNULL(r.priority,0) = 0, 999, r.priority), - IFNULL(r.id,99999), - pb.m3 DESC - LIMIT vMaxTickets; - - - -- Creamos una tabla temporal con los datos que necesitamos para depurar la colección - DROP TEMPORARY TABLE IF EXISTS tmp.ticket; - CREATE TEMPORARY TABLE tmp.ticket - SELECT pb.Id_Ticket ticketFk, - pb.lines, - pb.m3 * 1000 liters, - 0 as height, - 0 as shelve - FROM tmp.production_buffer pb - JOIN vn.ticketCollection tc ON tc.ticketFk = pb.Id_Ticket - WHERE tc.collectionFk = vCollectionFk; - - SELECT ticketFk - INTO vFirstTicketFk - FROM tmp.ticket - LIMIT 1; - - IF (SELECT pb.Agencia FROM tmp.production_buffer pb WHERE Id_Ticket = vFirstTicketFk) = 'REC_SILLA' THEN - - DELETE FROM tmp.ticket WHERE ticketFk != vFirstTicketFk; - - UPDATE tmp.ticket SET shelve = 1; - -- Como sólo hay un ticket, se le asigna el nivel 1 y acabamos - - ELSE - - -- Eliminamos los de recogida, puesto que el primero sabemos que no es de rec_silla - DELETE t.* - FROM tmp.ticket t - JOIN tmp.production_buffer pb ON pb.Id_Ticket = t.ticketFk - WHERE pb.Agencia = 'REC_SILLA'; - - -- Establece altura máxima por pedido, porque las plantas no se pueden recostar. - UPDATE tmp.ticket t - JOIN - ( SELECT MAX(i.size) maxHeigth, - tc.ticketFk - FROM vn.ticketCollection tc - JOIN vn.sale s ON s.ticketFk = tc.ticketFk - JOIN vn.item i ON i.id = s.itemFk - JOIN vn.itemType it ON it.id = i.typeFk - JOIN vn.itemCategory ic ON ic.id = it.categoryFk - WHERE ic.isReclining = FALSE - AND tc.collectionFk = vCollectionFk - GROUP BY tc.ticketFk) sub ON sub.ticketFk = t.ticketFk - SET t.height = sub.maxHeigth; - - -- Vamos a generar una tabla con todas las posibilidades de asignacion de pedido - DROP TEMPORARY TABLE IF EXISTS tmp.ticketShelve; - CREATE TEMPORARY TABLE tmp.ticketShelve - SELECT ticketFk, shelve, linesDif, LitersDif, heightDif - FROM ( - SELECT t.ticketFk, - cv.`level` shelve, - CAST(cv.lines AS SIGNED) - t.lines as linesDif, - CAST(cv.liters AS SIGNED) - t.liters as litersDif, - CAST(cv.height AS SIGNED) - t.height as heightDif - FROM vn.collectionVolumetry cv - JOIN tmp.ticket t - ORDER BY (t.ticketFk = vFirstTicketFk) DESC, linesDif - ) sub - WHERE linesDif >= 0 - AND litersDif >= 0 - AND heightDif >= 0 - ORDER BY linesDif; - - -- Asignamos la primera balda util al primer pedido - SELECT IFNULL(shelve,0) INTO vShelve - FROM tmp.ticketShelve - WHERE ticketFk = vFirstTicketFk - ORDER BY heightDif, litersDif, linesDif - LIMIT 1; - - IF vShelve THEN - - UPDATE tmp.ticket - SET shelve = vShelve - WHERE ticketFk = vFirstTicketFk; - - DELETE FROM tmp.ticketShelve - WHERE ticketFk = vFirstTicketFk - OR shelve = vShelve; - - WHILE (SELECT COUNT(*) FROM tmp.ticketShelve) DO - - SELECT ticketFk, shelve - INTO vTicket, vShelve - FROM tmp.ticketShelve - LIMIT 1; - - UPDATE tmp.ticket - SET shelve = vShelve - WHERE ticketFk = vTicket; - - DELETE FROM tmp.ticketShelve - WHERE ticketFk = vTicket - OR shelve = vShelve; - - END WHILE; - - ELSE - - UPDATE tmp.ticket - SET shelve = 1 - WHERE ticketFk = vFirstTicketFk; - - END IF; - - END IF; - - -- Eliminamos los que se han quedado sin balda - DELETE FROM tmp.ticket WHERE shelve = 0 ; - - -- Elimina los tickets bloqueados que no se van a preparar - DELETE tc.* - FROM vn.ticketCollection tc - LEFT JOIN tmp.ticket t ON t.ticketFk = tc.ticketFk - WHERE tc.collectionFk = vCollectionFk - AND t.ticketFk IS NULL; - - -- Actualiza el estado de la colección - UPDATE vn.collection c - JOIN vn.state st ON st.code = 'ON_PREPARATION' - SET c.stateFk = st.id - WHERE c.id = vCollectionFk; - - -- Asigna las bandejas - UPDATE vn.ticketCollection tc - JOIN tmp.ticket t ON t.ticketFk = tc.ticketFk - SET tc.level = t.shelve; - - -- Actualiza el estado de los tickets - INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador) - SELECT vStateFk, ticketFk, account.myUserGetId() - FROM vn.ticketCollection tc - WHERE tc.collectionFk = vCollectionFk - UNION ALL - SELECT vStateFk, sw.id, account.myUserGetId() - FROM vn.stowaway sw - JOIN vn.ticketCollection tc ON tc.ticketFk = sw.shipFk - WHERE tc.collectionFk = vCollectionFk; - - -- Avisa los preparados previos que hay que bajar del altillo imprimiendo etiqueta - INSERT IGNORE INTO vn.ticketDown(ticketFk) - SELECT DISTINCT tc.ticketFk - FROM vn.ticketCollection tc - JOIN vncontrol.inter vi ON vi.Id_Ticket = tc.ticketFk - JOIN vn.state st ON st.id = vi.state_id - JOIN vn.ticket t ON t.id = tc.ticketFk - JOIN vn.warehouse w ON w.id = t.warehouseFk - WHERE tc.collectionFk = vCollectionFk - AND w.name = 'Silla FV' - AND st.code = 'PREVIOUS_PREPARATION'; - - IF (SELECT COUNT(*) FROM vn.ticketCollection WHERE collectionFk = vCollectionFk) THEN - - CALL vn.salesMerge_byCollection(vCollectionFk); - - SELECT vCollectionFk; - - ELSE - - DELETE FROM vn.collection WHERE id = vCollectionFk; - SELECT 0; - - END IF; - - END IF; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -47412,216 +47748,216 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `entryConverter`(IN `vEntry` INT) -BEGIN - - DECLARE vWarehouseIn INT; - DECLARE vWarehouseOut INT; - DECLARE vTravel INT; - - DECLARE done BOOL DEFAULT FALSE; - - DECLARE vId_Entrada INT; - DECLARE vId_Article INT; - DECLARE vEtiquetas INT; - DECLARE vId_Cubo VARCHAR(10); - DECLARE vPacking INT; - DECLARE vGrouping INT; - DECLARE vCantidad INT; - DECLARE vCostefijo DECIMAL(10,3); - DECLARE vPortefijo DECIMAL(10,3); - DECLARE vEmbalajefijo DECIMAL(10); - DECLARE vComisionfija DECIMAL(10,3); - DECLARE vCaja INT; - DECLARE vNicho VARCHAR(5); - DECLARE vTarifa1 DECIMAL(10,2); - DECLARE vTarifa2 DECIMAL(10,2); - DECLARE vTarifa3 DECIMAL(10,2); - DECLARE vPVP DECIMAL(10,2); - DECLARE vCompra INT; - - DECLARE rs CURSOR FOR - SELECT - b.Id_Entrada, - b.Id_Article, - b.Etiquetas, - b.Id_Cubo, - b.Packing, - b.`grouping`, - b.Cantidad, - b.Costefijo, - b.Portefijo, - b.Embalajefijo, - b.Comisionfija, - b.caja, - b.Nicho, - b.Tarifa1, - b.Tarifa2, - b.Tarifa3, - b.PVP - FROM vn2008.Compres b - JOIN vn.itemConversor ic ON ic.espItemFk = b.Id_Article - WHERE Id_Entrada = vEntry; - - DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; - - SELECT warehouseInFk, warehouseOutFk, tr.id - INTO vWarehouseIn, vWarehouseOut, vTravel - FROM travel tr - JOIN entry e ON e.travelFk = tr.id - WHERE e.id = vEntry; - - UPDATE travel - SET warehouseInFk = vWarehouseOut, - warehouseOutFk = vWarehouseIn - WHERE id = vTravel; - - UPDATE vn2008.Compres c - LEFT JOIN vn.itemConversor ic ON ic.espItemFk = c.Id_Article - SET Etiquetas = 0, Cantidad = 0 - WHERE c.Id_Entrada = vEntry - AND ic.espItemFk IS NULL; - - OPEN rs; - - DELETE FROM vn2008.Compres WHERE Id_Entrada = vEntry; - - FETCH rs INTO - vId_Entrada, - vId_Article, - vEtiquetas, - vId_Cubo, - vPacking, - vGrouping, - vCantidad, - vCostefijo, - vPortefijo, - vEmbalajefijo, - vComisionfija, - vCaja, - vNicho, - vTarifa1, - vTarifa2, - vTarifa3, - vPVP; - - WHILE NOT done DO - - -- Primero la linea original con las cantidades invertidas - INSERT INTO vn2008.Compres - ( - Id_Entrada, - Id_Article, - Etiquetas, - Id_Cubo, - Packing, - `grouping`, - Cantidad, - Costefijo, - Portefijo, - Embalajefijo, - Comisionfija, - caja, - Nicho, - Tarifa1, - Tarifa2, - Tarifa3, - PVP - ) - VALUES - ( - vId_Entrada, - vId_Article, - - vEtiquetas, - vId_Cubo, - vPacking, - vGrouping, - - vCantidad, - vCostefijo, - vPortefijo, - vEmbalajefijo, - vComisionfija, - vCaja, - vNicho, - vTarifa1, - vTarifa2, - vTarifa3, - vPVP); - - -- Ahora la linea nueva, con el item genérico - INSERT INTO vn2008.Compres - ( - Id_Entrada, - Id_Article, - Etiquetas, - Id_Cubo, - Packing, - `grouping`, - Cantidad, - Costefijo, - Portefijo, - Embalajefijo, - Comisionfija, - caja, - Nicho, - Tarifa1, - Tarifa2, - Tarifa3, - PVP - ) - SELECT - vId_Entrada, - genItemFk as Id_Article, - vEtiquetas, - vId_Cubo, - vPacking, - vGrouping, - vCantidad, - vCostefijo, - vPortefijo, - vEmbalajefijo, - vComisionfija, - vCaja, - vNicho, - vTarifa1, - vTarifa2, - vTarifa3, - vPVP - FROM itemConversor - WHERE espItemFk = vId_Article; - - SELECT LAST_INSERT_ID() - INTO vCompra; - - REPLACE vn2008.Compres_mark(Id_Compra,`comment`) - SELECT vCompra, vId_Article; - - - FETCH rs INTO - vId_Entrada, - vId_Article, - vEtiquetas, - vId_Cubo, - vPacking, - vGrouping, - vCantidad, - vCostefijo, - vPortefijo, - vEmbalajefijo, - vComisionfija, - vCaja, - vNicho, - vTarifa1, - vTarifa2, - vTarifa3, - vPVP; - - END WHILE; - - - CLOSE rs; - - - +BEGIN + + DECLARE vWarehouseIn INT; + DECLARE vWarehouseOut INT; + DECLARE vTravel INT; + + DECLARE done BOOL DEFAULT FALSE; + + DECLARE vId_Entrada INT; + DECLARE vId_Article INT; + DECLARE vEtiquetas INT; + DECLARE vId_Cubo VARCHAR(10); + DECLARE vPacking INT; + DECLARE vGrouping INT; + DECLARE vCantidad INT; + DECLARE vCostefijo DECIMAL(10,3); + DECLARE vPortefijo DECIMAL(10,3); + DECLARE vEmbalajefijo DECIMAL(10); + DECLARE vComisionfija DECIMAL(10,3); + DECLARE vCaja INT; + DECLARE vNicho VARCHAR(5); + DECLARE vTarifa1 DECIMAL(10,2); + DECLARE vTarifa2 DECIMAL(10,2); + DECLARE vTarifa3 DECIMAL(10,2); + DECLARE vPVP DECIMAL(10,2); + DECLARE vCompra INT; + + DECLARE rs CURSOR FOR + SELECT + b.Id_Entrada, + b.Id_Article, + b.Etiquetas, + b.Id_Cubo, + b.Packing, + b.`grouping`, + b.Cantidad, + b.Costefijo, + b.Portefijo, + b.Embalajefijo, + b.Comisionfija, + b.caja, + b.Nicho, + b.Tarifa1, + b.Tarifa2, + b.Tarifa3, + b.PVP + FROM vn2008.Compres b + JOIN vn.itemConversor ic ON ic.espItemFk = b.Id_Article + WHERE Id_Entrada = vEntry; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + + SELECT warehouseInFk, warehouseOutFk, tr.id + INTO vWarehouseIn, vWarehouseOut, vTravel + FROM travel tr + JOIN entry e ON e.travelFk = tr.id + WHERE e.id = vEntry; + + UPDATE travel + SET warehouseInFk = vWarehouseOut, + warehouseOutFk = vWarehouseIn + WHERE id = vTravel; + + UPDATE vn2008.Compres c + LEFT JOIN vn.itemConversor ic ON ic.espItemFk = c.Id_Article + SET Etiquetas = 0, Cantidad = 0 + WHERE c.Id_Entrada = vEntry + AND ic.espItemFk IS NULL; + + OPEN rs; + + DELETE FROM vn2008.Compres WHERE Id_Entrada = vEntry; + + FETCH rs INTO + vId_Entrada, + vId_Article, + vEtiquetas, + vId_Cubo, + vPacking, + vGrouping, + vCantidad, + vCostefijo, + vPortefijo, + vEmbalajefijo, + vComisionfija, + vCaja, + vNicho, + vTarifa1, + vTarifa2, + vTarifa3, + vPVP; + + WHILE NOT done DO + + -- Primero la linea original con las cantidades invertidas + INSERT INTO vn2008.Compres + ( + Id_Entrada, + Id_Article, + Etiquetas, + Id_Cubo, + Packing, + `grouping`, + Cantidad, + Costefijo, + Portefijo, + Embalajefijo, + Comisionfija, + caja, + Nicho, + Tarifa1, + Tarifa2, + Tarifa3, + PVP + ) + VALUES + ( + vId_Entrada, + vId_Article, + - vEtiquetas, + vId_Cubo, + vPacking, + vGrouping, + - vCantidad, + vCostefijo, + vPortefijo, + vEmbalajefijo, + vComisionfija, + vCaja, + vNicho, + vTarifa1, + vTarifa2, + vTarifa3, + vPVP); + + -- Ahora la linea nueva, con el item genérico + INSERT INTO vn2008.Compres + ( + Id_Entrada, + Id_Article, + Etiquetas, + Id_Cubo, + Packing, + `grouping`, + Cantidad, + Costefijo, + Portefijo, + Embalajefijo, + Comisionfija, + caja, + Nicho, + Tarifa1, + Tarifa2, + Tarifa3, + PVP + ) + SELECT + vId_Entrada, + genItemFk as Id_Article, + vEtiquetas, + vId_Cubo, + vPacking, + vGrouping, + vCantidad, + vCostefijo, + vPortefijo, + vEmbalajefijo, + vComisionfija, + vCaja, + vNicho, + vTarifa1, + vTarifa2, + vTarifa3, + vPVP + FROM itemConversor + WHERE espItemFk = vId_Article; + + SELECT LAST_INSERT_ID() + INTO vCompra; + + REPLACE vn2008.Compres_mark(Id_Compra,`comment`) + SELECT vCompra, vId_Article; + + + FETCH rs INTO + vId_Entrada, + vId_Article, + vEtiquetas, + vId_Cubo, + vPacking, + vGrouping, + vCantidad, + vCostefijo, + vPortefijo, + vEmbalajefijo, + vComisionfija, + vCaja, + vNicho, + vTarifa1, + vTarifa2, + vTarifa3, + vPVP; + + END WHILE; + + + CLOSE rs; + + + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -47683,62 +48019,62 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `entryPrepare`(IN `idE` BIGINT) -BEGIN - SELECT - b.quantity / b.packing AS Paquetes, - b.packing AS `Grouping`, - barcode, - 'ASEGURADO' AS asegurado, - ic.name, - ic.order, - s.name AS Consignatario, - e.supplierFk AS Id_Cliente, - e.isOrdered, - e.isConfirmed, - 10 AS Calidad, - LPAD(IFNULL(cpd.id, ip.code), - 5, - '0') AS path, - b.entryFk AS Id_Ticket, - t.landed AS Fecha, - b.itemFk, - b.quantity, - i.name AS Concepte, - i.size, - i.inkFk, - i.category, - o.code AS Origen, - 0 AS Bultos, - wIn.`name` AS Tipo, - 0 AS OK, - 0 AS Reservado, - i.stems, - b.id AS Id_Movimiento, - ip.code, - 'PEDIDO ASEGURADO' AS MSG, - 0 AS Seguro, - i.image, - pr.name AS producer - FROM vn.buy b - JOIN vn.entry e ON b.entryFk = e.id - JOIN vn.travel t ON t.id = e.travelFk - JOIN vn.warehouse wIn ON wIn.id = t.warehouseInFk - JOIN vn.warehouse wOut ON wOut.id = t.warehouseOutFk - JOIN vn.item i ON i.id = b.itemFk - JOIN vn.itemType it ON it.id =i.typeFk - JOIN vn.itemCategory ic ON ic.id = it.categoryFk - JOIN vn.packaging pkg ON pkg.id = b.packageFk - LEFT JOIN vn.itemPlacement ip ON i.id = ip.itemFk AND ip.warehouseFk = wIn.id AND ip.warehouseFk = t.warehouseOutFk - LEFT JOIN (SELECT itemFk, code AS barcode FROM vn.itemBarcode GROUP BY itemFk) ib ON ib.itemFk = b.itemFk - LEFT JOIN vn.origin o ON o.id = i.originFk - LEFT JOIN vn.supplier s ON s.id = e.supplierFk - LEFT JOIN vn.producer pr on pr.id = i.producerFk - LEFT JOIN vn.coolerPathDetail cpd ON LEFT(ip.code, 3) = cpd.hallway - WHERE - NOT wIn.isFeedStock AND NOT e.isInventory AND NOT e.isRaid - AND e.id = 158772 - AND i.typeFk IS NOT NULL - AND ic.merchandise IS NOT FALSE; +BEGIN + SELECT + b.quantity / b.packing AS Paquetes, + b.packing AS `Grouping`, + barcode, + 'ASEGURADO' AS asegurado, + ic.name, + ic.order, + s.name AS Consignatario, + e.supplierFk AS Id_Cliente, + e.isOrdered, + e.isConfirmed, + 10 AS Calidad, + LPAD(IFNULL(cpd.id, ip.code), + 5, + '0') AS path, + b.entryFk AS Id_Ticket, + t.landed AS Fecha, + b.itemFk, + b.quantity, + i.name AS Concepte, + i.size, + i.inkFk, + i.category, + o.code AS Origen, + 0 AS Bultos, + wIn.`name` AS Tipo, + 0 AS OK, + 0 AS Reservado, + i.stems, + b.id AS Id_Movimiento, + ip.code, + 'PEDIDO ASEGURADO' AS MSG, + 0 AS Seguro, + i.image, + pr.name AS producer + FROM vn.buy b + JOIN vn.entry e ON b.entryFk = e.id + JOIN vn.travel t ON t.id = e.travelFk + JOIN vn.warehouse wIn ON wIn.id = t.warehouseInFk + JOIN vn.warehouse wOut ON wOut.id = t.warehouseOutFk + JOIN vn.item i ON i.id = b.itemFk + JOIN vn.itemType it ON it.id =i.typeFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk + JOIN vn.packaging pkg ON pkg.id = b.packageFk + LEFT JOIN vn.itemPlacement ip ON i.id = ip.itemFk AND ip.warehouseFk = wIn.id AND ip.warehouseFk = t.warehouseOutFk + LEFT JOIN (SELECT itemFk, code AS barcode FROM vn.itemBarcode GROUP BY itemFk) ib ON ib.itemFk = b.itemFk + LEFT JOIN vn.origin o ON o.id = i.originFk + LEFT JOIN vn.supplier s ON s.id = e.supplierFk + LEFT JOIN vn.producer pr on pr.id = i.producerFk + LEFT JOIN vn.coolerPathDetail cpd ON LEFT(ip.code, 3) = cpd.hallway + WHERE + NOT wIn.isFeedStock AND NOT e.isInventory AND NOT e.isRaid + AND e.id = 158772 + AND i.typeFk IS NOT NULL + AND ic.merchandise IS NOT FALSE; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -53554,17 +53890,12 @@ BEGIN FROM vn.worker w JOIN vn.sector s ON s.code = w.code WHERE s.id = vSectorFk; - - IF vWarehouseFk = 1 THEN - - SET vSectorFk = 9; - - ELSEIF vWarehouseFk = 44 THEN - - SET vSectorFk = 6; - - END IF; + SELECT s.id INTO vSectorFk + FROM vn.sector s + WHERE s.warehouseFk = vWarehouseFk + AND s.isMain; + SELECT COUNT(*) INTO hasFatherSector FROM vn.sector WHERE sonFk = vSectorFk; @@ -53572,7 +53903,7 @@ BEGIN SELECT warehouseFk, sonFk INTO vWarehouseFk, vSonSectorFk FROM vn.sector WHERE id = vSectorFk; - + SELECT vSectorFk, vWarehouseFk, hasFatherSector , vSonSectorFk; CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk); CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, CURDATE()); @@ -53588,10 +53919,10 @@ BEGIN i.longName, i.size, i.subName producer, - a.available, - SUM(IF(s.sonFk = vSectorFk, iss.visible, 0)) upstairs, - SUM(IF(iss.sectorFk = vSectorFk, iss.visible, 0)) downstairs, - IF(it.isPackaging, NULL, IFNULL(v.visible,0)) as visible, + IFNULL(a.available,0) available, + SUM(IF(s.sonFk = vSectorFk, IFNULL(iss.visible,0), 0)) upstairs, + SUM(IF(iss.sectorFk = vSectorFk, IFNULL(iss.visible,0), 0)) downstairs, + IF(it.isPackaging, null, IFNULL(v.visible,0)) as visible, vSectorFk as sectorFk FROM vn.itemShelvingStock iss @@ -53601,6 +53932,7 @@ BEGIN LEFT JOIN cache.available a ON a.item_id = iss.itemFk AND a.calc_id = vCalcAvailableFk LEFT JOIN cache.visible v ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk WHERE vSectorFk IN (iss.sectorFk, s.sonFk) + AND it.workerFk != 3366 GROUP BY iss.itemFk @@ -53679,14 +54011,9 @@ BEGIN ) ips ON ips.itemFk = i.id WHERE IFNULL(iss.sectorFk,0) IN (0, vSectorFk) OR iss.sectorFk = vSectorFk; - /* - UPDATE tmp.itemShelvingRadar isr - JOIN vn.itemShelvingStock iss ON iss.itemFk = isr.itemFk - SET isr.dayEndVisible = isr.dayEndVisible + iss.visible, - isr.firstNegative = isr.firstNegative + iss.visible, - isr.itemPlacementVisible = isr.itemPlacementVisible + iss.visible - WHERE iss.sectorFk = vSonSectorFk; - */ + + SELECT * FROM tmp.itemShelvingRadar; + DROP TEMPORARY TABLE IF EXISTS tmp.itemOutTime; CREATE TEMPORARY TABLE tmp.itemOutTime SELECT *,SUM(amount) quantity @@ -53940,6 +54267,89 @@ BEGIN SELECT true; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_BuyerGet` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `itemShelving_BuyerGet`( ) +BEGIN + + SELECT * FROM vn.buyer; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_BuyerTask` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `itemShelving_BuyerTask`(vWorkerFk INT ) +BEGIN + + SELECT ish.id, + ish.itemFk, + i.longName, + i.image, + p.code as parking, + ish.shelvingFk, + ish.visible, + ish.created, + ish.stars + FROM vn.itemShelving ish + JOIN vn.item i ON i.id = ish.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + JOIN vn.shelving sh ON sh.code = ish.shelvingFk + JOIN vn.parking p ON p.id = sh.parkingFk + JOIN vn.sector s ON s.id = p.sectorFk + WHERE s.warehouseFk = 1 + AND it.workerFk = vWorkerFk + AND ish.stars IS NULL + ORDER BY p.pickingOrder; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_StarsUpdate` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`z-developer`@`%` PROCEDURE `itemShelving_StarsUpdate`(vId INT, vStars INT) +BEGIN + + UPDATE vn.itemShelving + SET stars = vStars + WHERE id = vId; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -54187,13 +54597,93 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `itemTagReorder`(itemTypeFk INT) +BEGIN + + SET @isTriggerDisabled = TRUE; + + -- No se puede usar temporary porque da error Error Code: 1137. No puedo reabrir tabla: 'i + DROP TABLE IF EXISTS tmp.item; + CREATE TABLE tmp.item + SELECT DISTINCT i.id + FROM vn.item i + WHERE i.typeFk = itemTypeFk; + + UPDATE itemTag it + JOIN tmp.item i ON i.id = it.itemFk + JOIN vn.item ON item.id = i.id + JOIN itemTypeTag itt ON itt.itemTypeFk = item.typeFk AND itt.tagFk = it.tagFk + SET it.priority = itt.priority + WHERE itt.itemTypeFk = itemTypeFk; + + CALL item_refreshTags(); + + SET @isTriggerDisabled = FALSE; + + DROP TABLE tmp.item; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemTagReorderByName` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `itemTagReorderByName`(vName VARCHAR(255)) +BEGIN + + SET @isTriggerDisabled = TRUE; + + -- No se puede usar temporary porque da error Error Code: 1137. No puedo reabrir tabla: 'i + DROP TABLE IF EXISTS tmp.item; + CREATE TABLE tmp.item + SELECT DISTINCT i.id + FROM vn.item i + WHERE i.`name` LIKE CONCAT(vName,'%'); + + UPDATE itemTag it + JOIN tmp.item i ON i.id = it.itemFk + JOIN vn.item ON item.id = i.id + JOIN itemTypeTag itt ON itt.itemTypeFk = item.typeFk AND itt.tagFk = it.tagFk + SET it.priority = itt.priority + WHERE itt.itemTypeFk = itemTypeFk; + + CALL item_refreshTags(); + + SET @isTriggerDisabled = FALSE; + + DROP TABLE tmp.item; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemTagReorderByName__` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `itemTagReorderByName__`(vName VARCHAR(255)) BEGIN DECLARE vDone BOOL DEFAULT FALSE; @@ -54205,13 +54695,13 @@ DECLARE vDone BOOL DEFAULT FALSE; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - SET @isTriggerDisabled = TRUE; - + SET @isTriggerDisabled = TRUE; + DROP TEMPORARY TABLE IF EXISTS upda; - create temporary table upda + CREATE TEMPORARY TABLE upda SELECT DISTINCT i.id FROM vn.item i - WHERE i.typeFk = itemTypeFk; + WHERE i.name LIKE CONCAT(vName,'%'); UPDATE itemTag it JOIN item i ON i.id = it.itemFk @@ -54236,17 +54726,17 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `itemTagReorderByName` */; +/*!50003 DROP PROCEDURE IF EXISTS `itemTagReorder__` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `itemTagReorderByName`(vName VARCHAR(255)) +CREATE DEFINER=`root`@`%` PROCEDURE `itemTagReorder__`(itemTypeFk INT) BEGIN DECLARE vDone BOOL DEFAULT FALSE; @@ -54258,13 +54748,13 @@ DECLARE vDone BOOL DEFAULT FALSE; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - SET @isTriggerDisabled = TRUE; - + SET @isTriggerDisabled = TRUE; + DROP TEMPORARY TABLE IF EXISTS upda; - CREATE TEMPORARY TABLE upda + create temporary table upda SELECT DISTINCT i.id FROM vn.item i - WHERE i.name LIKE CONCAT(vName,'%'); + WHERE i.typeFk = itemTypeFk; UPDATE itemTag it JOIN item i ON i.id = it.itemFk @@ -54387,6 +54877,67 @@ BEGIN DROP TABLE IF EXISTS topSellerMin; DROP TABLE IF EXISTS tmp.topSeller; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemTrash` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `itemTrash`( + vItemFk INT, + vWarehouseFk INT, + vQuantity INT, + vIsTrash BOOLEAN) +BEGIN + + DECLARE vTicketFk INT; + DECLARE vClientFk INT; + DECLARE vCompanyVnlFk INT DEFAULT 442; + DECLARE vAgencyModeOthersFk INT DEFAULT 2; + DECLARE vCurrentTime VARCHAR(5); + DECLARE vCalc INT; + + SELECT vn.barcodeToItem(vItemFk) INTO vItemFk; + + SELECT IF(vIsTrash,200,400) INTO vClientFk; + + SELECT t.id INTO vTicketFk + FROM vn.ticket t + JOIN vn.address a ON a.id=t.addressFk + WHERE t.warehouseFk = vWarehouseFk + AND t.clientFk = vClientFk + AND DATE(t.shipped) = CURDATE() + AND a.isDefaultAddress + LIMIT 1; + + CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk); + + IF vTicketFk IS NULL THEN + + CALL vn.ticketCreateWithoutZone(vClientFk, CURDATE(), vWarehouseFk, vCompanyVnlFk, NULL, vAgencyModeOthersFk, NULL, CURDATE(), account.userGetId(),vTicketFk); + + END IF; + + INSERT INTO sale(ticketFk, itemFk, concept, quantity, price, discount) + SELECT vTicketFk, vItemFk, CONCAT(longName," ",vn.getWorkerCode(), " ",LEFT(CAST(NOW() AS TIME),5)), vQuantity,0,0 + FROM vn.item + WHERE id = vItemFk; + + UPDATE cache.visible + SET visible = visible - vQuantity + WHERE calc_id = vCalc + AND item_id = vItemFk; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -54726,9 +55277,9 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; @@ -54745,7 +55296,6 @@ BEGIN CREATE TEMPORARY TABLE tmp.itemToRefresh SELECT id from tmp.item; - UPDATE item i JOIN tmp.itemToRefresh tmpI ON tmpI.id = i.id LEFT JOIN itemTag it1 ON it1.priority = 1 AND it1.itemFk = i.id @@ -54763,7 +55313,7 @@ BEGIN LEFT JOIN tagAbbreviation ta3 ON ta3.`value` = it3.`value` SET i.`name` = CONCAT_WS(' ', IFNULL(ta1.abbreviation,it1.`value`), - IF(i.id > 400000,'',IFNULL(ta2.abbreviation,it2.`value`)), + IFNULL(ta2.abbreviation,it2.`value`), IF(i.id > 400000,'',IFNULL(ta3.abbreviation,it3.`value`))); UPDATE item i @@ -55431,7 +55981,7 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `kk_` */; +/*!50003 DROP PROCEDURE IF EXISTS `ledger_doCompensation` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; @@ -55439,71 +55989,7 @@ DELIMITER ; /*!50003 SET character_set_results = utf8 */ ; /*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`z-developer`@`%` PROCEDURE `kk_`() -BEGIN - - DECLARE i INT DEFAULT 1; - DECLARE vPasillos VARCHAR(4) DEFAULT 'ABCD'; - DECLARE vPasilloLetra VARCHAR(1); - DECLARE vPasillo INT DEFAULT 0; - DECLARE vEstanteria INT DEFAULT 0; - DECLARE vEstanteriaMax INT DEFAULT 54; - - WHILE i < 100 DO - - INSERT INTO vn.parking(code, sectorFk, pickingOrder, `column`, `row`) - VALUES(CONCAT('A-',RIGHT(CONCAT('0',i),2)),37,i, 0, i); - - SET i = i + 1; - - END WHILE; - - SET i = 0; - - WHILE vPasillo < LENGTH(vPasillos) DO - - SET vPasillo = vPasillo + 1; - - SET vPasilloLetra = MID(vPasillos,vPasillo,1); - - WHILE vEstanteria < vEstanteriaMax DO - - SET vEstanteria = vEstanteria + 1; - - WHILE i < 4 DO - - SET i = i + 1; - - INSERT INTO vn.parking(code, sectorFk) - VALUES(CONCAT(vPasilloLetra,'-',RIGHT(CONCAT('0',vEstanteria),2),'-',i),37); - - END WHILE; - - SET i = 0; - - END WHILE; - - SET vEstanteria = 0; - - END WHILE; - -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `ledger_doCompensation` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `ledger_doCompensation`(vDated DATE, vCompensationAccount VARCHAR(10) , vBankFk VARCHAR(10), vConcept VARCHAR(255), vAmount DECIMAL(10,2), vCompanyFk INT, vOriginalAccount VARCHAR(10)) BEGIN @@ -55511,40 +55997,155 @@ BEGIN * Compensa un pago o un recibo insertando en contabilidad * * @param vDated fecha en la cual se anota - * @param vCompensationAccount cuenta contablo contra la que se contabiliza + * @param vCompensationAccount cuenta contable contra la que se compensa * @param vBankFk banco de la compensacion * @param vConcept descripcion * @param vAmount cantidad que se compensa * @param vCompany empresa + * @param vOriginalAccount cuenta contable desde la cual se compensa + * */ DECLARE vNewBookEntry INT; - DECLARE vClientCompensation INT; - DECLARE vSupplierCompensation INT; + DECLARE vIsClientCompensation INT; + DECLARE vClientFk INT; + DECLARE vSupplierFk INT; + DECLARE vIsOriginalAClient BOOL; DECLARE vPayMethodCompensation INT; + DECLARE vAmountCompensation DECIMAL(10,2); - CALL vn.ledger_next(vNewBookEntry); - - INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id) - VALUES (vNewBookEntry, vDated, vOriginalAccount, vCompensationAccount, vConcept, vAmount, 0, vCompanyFk), - (vNewBookEntry, vDated, vCompensationAccount, vOriginalAccount, vConcept, 0, vAmount, vCompanyFk); - - SELECT id INTO vClientCompensation FROM vn.`client` WHERE accountingAccount LIKE vCompensationAccount COLLATE utf8_general_ci; - SELECT id INTO vSupplierCompensation FROM vn.supplier WHERE `account` LIKE vCompensationAccount COLLATE utf8_general_ci; + CALL ledger_next(vNewBookEntry); + + SELECT COUNT(id) INTO vIsOriginalAClient FROM client WHERE accountingAccount LIKE vOriginalAccount COLLATE utf8_general_ci; + + SELECT id, COUNT(id) INTO vClientFk, vIsClientCompensation + FROM client + WHERE accountingAccount LIKE vCompensationAccount COLLATE utf8_general_ci; - IF MID(vCompensationAccount, 1, 2) = MID(vOriginalAccount, 1, 2) THEN - SET vAmount = -vAmount; - END IF; + SET @vAmount1:= 0; + SET @vAmount2:= 0; + INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id) + VALUES ( vNewBookEntry, + vDated, + vOriginalAccount, + vCompensationAccount, + vConcept, + @vAmount1:= IF( + (vIsOriginalAClient OR NOT vIsOriginalAClient) + AND vAmount > 0, + 0, + ABS(vAmount) + ), + @vAmount2:= IF(@vAmount1, + 0, + ABS(vAmount) + ), + vCompanyFk + ), + ( vNewBookEntry, + vDated, + vCompensationAccount, + vOriginalAccount, + vConcept, + @vAmount2, + @vAmount1, + vCompanyFk); + + IF vIsClientCompensation THEN - IF vClientCompensation THEN INSERT INTO receipt(invoiceFk, amountPaid, payed, bankFk, companyFk, clientFk, isConciliate) - VALUES (vConcept, vAmount, vDated, vBankFk, vCompanyFk, vClientCompensation, TRUE); - END IF; + VALUES (vConcept, vAmount, vDated, vBankFk, vCompanyFk, vClientFk, TRUE); + ELSE - IF vSupplierCompensation THEN + SELECT id INTO vSupplierFk FROM supplier WHERE `account` LIKE vCompensationAccount COLLATE utf8_general_ci; SELECT id INTO vPayMethodCompensation FROM payMethod WHERE `code` = 'compensation'; + INSERT INTO vn2008.pago (fecha, dueDated, id_proveedor, importe, id_banco, pay_met_id, concepte, empresa_id, conciliado) - VALUES(vDated, vDated, vSupplierCompensation, vAmount, vBankFk, vPayMethodCompensation, vConcept, vCompanyFk, TRUE); + VALUES(vDated, vDated, vSupplierFk, vAmount, vBankFk, vPayMethodCompensation, vConcept, vCompanyFk, TRUE); + END IF; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `ledger_doCompensation__` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `ledger_doCompensation__`(vDated DATE, vCompensationAccount VARCHAR(10) , vBankFk VARCHAR(10), vConcept VARCHAR(255), vAmount DECIMAL(10,2), vCompanyFk INT, vOriginalAccount VARCHAR(10)) +BEGIN +/** + * Compensa un pago o un recibo insertando en contabilidad + * + * @param vDated fecha en la cual se anota + * @param vCompensationAccount cuenta contable contra la que se compensa + * @param vBankFk banco de la compensacion + * @param vConcept descripcion + * @param vAmount cantidad que se compensa + * @param vCompany empresa + * @param vOriginalAccount cuenta contable desde la cual se compensa + * + */ + + DECLARE vNewBookEntry INT; + DECLARE vIsClientCompensation INT; + DECLARE vClientFk INT; + DECLARE vSupplierFk INT; + DECLARE vIsOriginalAClient BOOL; + DECLARE vPayMethodCompensation INT; + DECLARE vAmountCompensation INT; + + CALL ledger_next(vNewBookEntry); + + SELECT COUNT(id) INTO vIsOriginalAClient FROM client WHERE accountingAccount LIKE vOriginalAccount COLLATE utf8_general_ci; + + SELECT id, COUNT(id) INTO vClientFk, vIsClientCompensation + FROM client + WHERE accountingAccount LIKE vCompensationAccount COLLATE utf8_general_ci; + + IF vIsOriginalAClient = vIsClientCompensation THEN + SET vAmountCompensation = -vAmount; + ELSE + SET vAmountCompensation = vAmount; + END IF; + + INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id) + VALUES ( vNewBookEntry, + vDated, + vOriginalAccount, + vCompensationAccount, + vConcept, + IF(vIsOriginalAClient, 0, vAmount), + IF(vIsOriginalAClient, vAmount, 0), + vCompanyFk + ), + ( vNewBookEntry, + vDated, + vCompensationAccount, + vOriginalAccount, + vConcept, + IF(vIsClientCompensation, 0, vAmountCompensation), + IF(vIsClientCompensation, vAmountCompensation, 0), + vCompanyFk); + + IF vIsClientCompensation THEN + + INSERT INTO receipt(invoiceFk, amountPaid, payed, bankFk, companyFk, clientFk, isConciliate) + VALUES (vConcept, vAmount, vDated, vBankFk, vCompanyFk, vClientFk, TRUE); + ELSE + + SELECT id INTO vSupplierFk FROM supplier WHERE `account` LIKE vCompensationAccount COLLATE utf8_general_ci; + SELECT id INTO vPayMethodCompensation FROM payMethod WHERE `code` = 'compensation'; + + INSERT INTO vn2008.pago (fecha, dueDated, id_proveedor, importe, id_banco, pay_met_id, concepte, empresa_id, conciliado) + VALUES(vDated, vDated, vSupplierFk, vAmount, vBankFk, vPayMethodCompensation, vConcept, vCompanyFk, TRUE); END IF; END ;; DELIMITER ; @@ -57269,7 +57870,90 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `rate_getPrices`(vLanded DATE, vWarehouseFk INT) +CREATE DEFINER=`root`@`%` PROCEDURE `rate_getPrices`(vDated DATE, vWarehouseFk INT) +BEGIN +/** + * Prepara una tabla con las tarifas aplicables en funcion de la fecha y el almacén + * + * @param vDated fecha para la cual calcula la tarifa + * @param vWarehouseFk warehouse para el cual calcula la tafia + * @return tmp.rate(rate0, rate1, rate2, rate3) + */ + DROP TEMPORARY TABLE IF EXISTS tRate; + CREATE TEMPORARY TABLE tRate + SELECT rate0, rate1, rate2, rate3 + FROM vn.rate + WHERE dated <= vDated + AND warehouseFk = vWarehouseFk + ORDER BY dated DESC; + + DROP TEMPORARY TABLE IF EXISTS tmp.rate; + CREATE TEMPORARY TABLE tmp.rate + ENGINE = MEMORY + SELECT * FROM + ( + SELECT * FROM tRate + UNION ALL + SELECT rate0, rate1, rate2, rate3 FROM rateConfig + ) sub2 + LIMIT 1; + DROP TEMPORARY TABLE tRate; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `rate_getPrices2` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `rate_getPrices2`(vLanded DATE, vWarehouseFk INT) +BEGIN + + -- Prepara una tabla con las tarifas aplicables en funcion de la fecha y el almacén + DROP TEMPORARY TABLE IF EXISTS tRate; + CREATE TEMPORARY TABLE tRate + SELECT rate0, rate1, rate2, rate3 + FROM vn.rate + WHERE dated <= vLanded + AND warehouseFk = vWarehouseFk + ORDER BY dated DESC; + + DROP TEMPORARY TABLE IF EXISTS tmp.rate; + CREATE TEMPORARY TABLE tmp.rate + ENGINE = MEMORY + SELECT * FROM + ( + SELECT * FROM tRate + UNION ALL + SELECT rate0, rate1, rate2, rate3 FROM rateConfig + ) sub2 + LIMIT 1; + DROP TEMPORARY TABLE tRate; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `rate_getPrices__` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `rate_getPrices__`(vLanded DATE, vWarehouseFk INT) BEGIN -- Prepara una tabla con las tarifas aplicables en funcion de la fecha y el almacén @@ -58130,77 +58814,77 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `saleItemShelvingMake`(IN `vTicketFk` INT, IN `vSectorFk` INT) -BEGIN - - SET @rest:= CAST(0 AS DECIMAL(10,0)); - SET @saleFk := CAST(0 AS DECIMAL(10,0)); - SET @reserved := CAST(0 AS DECIMAL(10,0)); - - UPDATE vn.itemShelving ish - JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id - JOIN sale s ON s.id = sis.saleFk - SET ish.visible = sis.quantity + ish.visible, - ish.available = sis.quantity + ish.visible - WHERE s.ticketFk = vTicketFk; - - DELETE sis.* - FROM saleItemShelving sis - JOIN sale s ON s.id = sis.saleFk - WHERE s.ticketFk = vTicketFk; - - INSERT INTO saleItemShelving( saleFk, - itemShelvingFk, - quantity, - ubication) - SELECT saleFk, - itemShelvingFk, - CAST(Reserved as DECIMAL(10,0)) as Reserved, - ubication - FROM - (SELECT saleFk, - itemShelvingFk, - ubication, - @rest := IF(@saleFk = saleFk, @rest, quantity) as Falta, - @reserved := IF(available < @rest, available, IF(@rest < packing,0,@rest)) as Reserved, - @rest := @rest - @reserved, - @saleFk := saleFk - FROM - ( SELECT s.id as saleFk, - ish.created, - ish.id as itemShelvingFk, - ish.available, - s.quantity, - ish.packing, - CONCAT(p.`column`, '-',p.`row`,': ', sh.code ) as ubication - FROM vn.sale s - JOIN vn.ticket t ON t.id = s.ticketFk - JOIN vn.sector sc ON sc.warehouseFk = t.warehouseFk - JOIN vn.parking p ON p.sectorFk = sc.id - JOIN vn.shelving sh ON sh.parkingFk = p.id - JOIN vn.itemShelving ish ON ish.shelvingFk = sh.code AND ish.itemFk = s.itemFk - WHERE t.id = vTicketFk - AND sc.id = vSectorFk - AND s.quantity MOD ish.packing = 0 - AND s.quantity >= ish.packing - ORDER BY s.id, - sh.priority DESC, - ish.packing DESC, - ish.created - ) sub - ) sub2 - WHERE Reserved > 0; - - UPDATE vn.itemShelving ish - JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id - JOIN vn.sale s ON s.id = sis.saleFk - SET ish.available = ish.visible - sis.quantity, - ish.visible = ish.visible - sis.quantity - WHERE s.ticketFk = vTicketFk - AND s.isPicked = FALSE; - - CALL vn.saleItemShelvingIsPicked(vTicketFk, TRUE); - - +BEGIN + + SET @rest:= CAST(0 AS DECIMAL(10,0)); + SET @saleFk := CAST(0 AS DECIMAL(10,0)); + SET @reserved := CAST(0 AS DECIMAL(10,0)); + + UPDATE vn.itemShelving ish + JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id + JOIN sale s ON s.id = sis.saleFk + SET ish.visible = sis.quantity + ish.visible, + ish.available = sis.quantity + ish.visible + WHERE s.ticketFk = vTicketFk; + + DELETE sis.* + FROM saleItemShelving sis + JOIN sale s ON s.id = sis.saleFk + WHERE s.ticketFk = vTicketFk; + + INSERT INTO saleItemShelving( saleFk, + itemShelvingFk, + quantity, + ubication) + SELECT saleFk, + itemShelvingFk, + CAST(Reserved as DECIMAL(10,0)) as Reserved, + ubication + FROM + (SELECT saleFk, + itemShelvingFk, + ubication, + @rest := IF(@saleFk = saleFk, @rest, quantity) as Falta, + @reserved := IF(available < @rest, available, IF(@rest < packing,0,@rest)) as Reserved, + @rest := @rest - @reserved, + @saleFk := saleFk + FROM + ( SELECT s.id as saleFk, + ish.created, + ish.id as itemShelvingFk, + ish.available, + s.quantity, + ish.packing, + CONCAT(p.`column`, '-',p.`row`,': ', sh.code ) as ubication + FROM vn.sale s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.sector sc ON sc.warehouseFk = t.warehouseFk + JOIN vn.parking p ON p.sectorFk = sc.id + JOIN vn.shelving sh ON sh.parkingFk = p.id + JOIN vn.itemShelving ish ON ish.shelvingFk = sh.code AND ish.itemFk = s.itemFk + WHERE t.id = vTicketFk + AND sc.id = vSectorFk + AND s.quantity MOD ish.packing = 0 + AND s.quantity >= ish.packing + ORDER BY s.id, + sh.priority DESC, + ish.packing DESC, + ish.created + ) sub + ) sub2 + WHERE Reserved > 0; + + UPDATE vn.itemShelving ish + JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id + JOIN vn.sale s ON s.id = sis.saleFk + SET ish.available = ish.visible - sis.quantity, + ish.visible = ish.visible - sis.quantity + WHERE s.ticketFk = vTicketFk + AND s.isPicked = FALSE; + + CALL vn.saleItemShelvingIsPicked(vTicketFk, TRUE); + + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -58811,7 +59495,7 @@ DELIMITER ; /*!50003 SET character_set_results = utf8 */ ; /*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `sale_checkNoComponents`(vCreatedFrom DATETIME, vCreatedTo DATETIME) BEGIN @@ -58823,28 +59507,28 @@ BEGIN */ DECLARE v_done BOOL DEFAULT FALSE; DECLARE vSaleFk INTEGER; - DECLARE vTicketFk INTEGER; - DECLARE vConcept VARCHAR(50); + DECLARE vTicketFk INTEGER; + DECLARE vConcept VARCHAR(50); DECLARE vCur CURSOR FOR - SELECT s.id - FROM sale s - JOIN item i ON i.id = s.itemFk - JOIN itemType tp ON tp.id = i.typeFk - JOIN itemCategory ic ON ic.id = tp.categoryFk - LEFT JOIN tmp.coste c ON c.id = s.id - WHERE s.created >= vCreatedFrom AND s.created <= vCreatedTo - AND c.id IS NULL - AND ic.merchandise != FALSE - GROUP BY s.id; - - DECLARE CONTINUE HANDLER FOR NOT FOUND + SELECT s.id + FROM sale s + JOIN item i ON i.id = s.itemFk + JOIN itemType tp ON tp.id = i.typeFk + JOIN itemCategory ic ON ic.id = tp.categoryFk + LEFT JOIN tmp.coste c ON c.id = s.id + WHERE s.created >= vCreatedFrom AND s.created <= vCreatedTo + AND c.id IS NULL + AND ic.merchandise != FALSE + GROUP BY s.id; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET v_done = TRUE; DROP TEMPORARY TABLE IF EXISTS tmp.coste; DROP TEMPORARY TABLE IF EXISTS tmp.coste; CREATE TEMPORARY TABLE tmp.coste - (primary key (id)) ENGINE = MEMORY + (PRIMARY KEY (id)) ENGINE = MEMORY SELECT s.id FROM sale s JOIN item i ON i.id = s.itemFk @@ -58855,7 +59539,7 @@ BEGIN JOIN componentType ct ON ct.id = c.typeFk AND ct.id = 1 WHERE s.created >= vCreatedFrom AND ic.merchandise != FALSE; - + OPEN vCur; l: LOOP @@ -58865,16 +59549,19 @@ BEGIN IF v_done THEN LEAVE l; END IF; - select ticketFk INTO vTicketFk FROM sale where id = vSaleFk; - select concept INTO vConcept FROM sale where id = vSaleFk; - - CALL util.debug(ticketFk, concept); + + SELECT ticketFk, concept + INTO vTicketFk, vConcept + FROM sale + WHERE id = vSaleFk; + + CALL util.debug(vTicketFk, vConcept); -- CALL sale_calculateComponent(vSaleFk, 1); END LOOP; - CLOSE vCur; + CLOSE vCur; DROP TEMPORARY TABLE tmp.coste; - END ;; +END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; /*!50003 SET character_set_client = @saved_cs_client */ ; @@ -58938,33 +59625,33 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `scanTreeCreate__`() -BEGIN - CALL nestTree( - 'vn2008', - 'scan', - 'vn2008', - 'scanTree' - ); - - UPDATE vn2008.scanTree st - JOIN ( - SELECT sl.scan_id, - MAX(sl.odbc_date) lastScanned, - COUNT(DISTINCT t.routeFk) routeCount, - MIN(t.routeFk) mod 1000 as minRoute, - MAX(t.routeFk) mod 1000 as maxRoute, - COUNT(sl.scan_line_id) as scanned - FROM vn2008.scan_line sl - JOIN expedition e ON e.id = sl.`code` - JOIN ticket t ON t.id = e.ticketFk - WHERE t.routeFk - GROUP BY sl.scan_id - ) rs ON rs.scan_id = st.id - SET st.lastScanned = rs.lastScanned, - st.routeCount = rs.routeCount, - st.minRoute = rs.minRoute, - st.maxRoute = IF(rs.minRoute != rs.maxRoute, rs.maxRoute,NULL), - st.scanned = rs.scanned; +BEGIN + CALL nestTree( + 'vn2008', + 'scan', + 'vn2008', + 'scanTree' + ); + + UPDATE vn2008.scanTree st + JOIN ( + SELECT sl.scan_id, + MAX(sl.odbc_date) lastScanned, + COUNT(DISTINCT t.routeFk) routeCount, + MIN(t.routeFk) mod 1000 as minRoute, + MAX(t.routeFk) mod 1000 as maxRoute, + COUNT(sl.scan_line_id) as scanned + FROM vn2008.scan_line sl + JOIN expedition e ON e.id = sl.`code` + JOIN ticket t ON t.id = e.ticketFk + WHERE t.routeFk + GROUP BY sl.scan_id + ) rs ON rs.scan_id = st.id + SET st.lastScanned = rs.lastScanned, + st.routeCount = rs.routeCount, + st.minRoute = rs.minRoute, + st.maxRoute = IF(rs.minRoute != rs.maxRoute, rs.maxRoute,NULL), + st.scanned = rs.scanned; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -59435,7 +60122,7 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `silla_algemesi` */; +/*!50003 DROP PROCEDURE IF EXISTS `silla_algemesi__` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; @@ -59445,7 +60132,7 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `silla_algemesi`(vDate DATE, vItemFk INT, vQuantity INT) +CREATE DEFINER=`root`@`%` PROCEDURE `silla_algemesi__`(vDate DATE, vItemFk INT, vQuantity INT) BEGIN DECLARE done INT DEFAULT FALSE; @@ -62389,113 +63076,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `ticketGetTax` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetTax`() - READS SQL DATA -BEGIN -/** - * Calcula la base imponible, el IVA y el recargo de equivalencia para - * un conjunto de tickets. - * - * @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular - * @return tmp.ticketAmount - * @return tmp.ticketTax Impuesto desglosado para cada ticket. - - */ - DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany; - CREATE TEMPORARY TABLE tmp.addressCompany - (INDEX (addressFk, companyFk)) - ENGINE = MEMORY - SELECT DISTINCT t.addressFk, t.companyFk - FROM tmp.ticket tmpTicket - JOIN ticket t ON t.id = tmpTicket.ticketFk; - - CALL addressTaxArea (); - - - /** Solo se calcula la base imponible (taxableBase) y el impuesto se calculará posteriormente - * No se debería cambiar el sistema por problemas con los decimales - */ - - DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax; - CREATE TEMPORARY TABLE tmp.ticketTax - (INDEX (ticketFk)) - ENGINE = MEMORY - SELECT tmpTicket.ticketFk, - bp.pgcFk, - SUM(s.quantity * s.price * (100 - s.discount)/100 ) AS taxableBase, - pgc.rate, - tc.code - FROM tmp.ticket tmpTicket - JOIN sale s ON s.ticketFk = tmpTicket.ticketFk - JOIN item i ON i.id = s.itemFk - JOIN ticket t ON t.id = tmpTicket.ticketFk - JOIN supplier su ON su.id = t.companyFk - JOIN tmp.addressTaxArea ata - ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk - JOIN itemTaxCountry itc - ON itc.itemFk = i.id AND itc.countryFk = su.countryFk - JOIN bookingPlanner bp - ON bp.countryFk = su.countryFk - AND bp.taxAreaFk = ata.areaFk - AND bp.taxClassFk = itc.taxClassFk - JOIN pgc ON pgc.code = bp.pgcFk - JOIN taxClass tc ON tc.id = bp.taxClassFk - GROUP BY tmpTicket.ticketFk, pgc.code,pgc.rate - HAVING taxableBase != 0; - - DROP TEMPORARY TABLE IF EXISTS tmp.ticketServiceTax; - CREATE TEMPORARY TABLE tmp.ticketServiceTax - (INDEX (ticketFk)) - ENGINE = MEMORY - SELECT tt.ticketFk, - SUM(ts.quantity * ts.price) AS taxableBase, - pgc.rate, - tc.code - FROM tmp.ticketTax tt - JOIN ticketService ts ON ts.ticketFk = tt.ticketFk - JOIN ticket t ON t.id = tt.ticketFk - JOIN supplier su ON su.id = t.companyFk - JOIN tmp.addressTaxArea ata - ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk - JOIN bookingPlanner bp - ON bp.countryFk = su.countryFk - AND bp.taxAreaFk = ata.areaFk - AND bp.taxClassFk = ts.taxClassFk - JOIN pgc ON pgc.code = bp.pgcFk AND pgc.rate = tt.rate - JOIN taxClass tc ON tc.id = bp.taxClassFk - GROUP BY tt.ticketFk, tt.code,tt.rate - HAVING taxableBase != 0; - - UPDATE tmp.ticketTax tt - JOIN tmp.ticketServiceTax ts ON tt.ticketFk = ts.ticketFk AND tt.code = ts.code AND tt.rate = ts.rate - SET tt.taxableBase = tt.taxableBase + ts.taxableBase; - - DROP TEMPORARY TABLE IF EXISTS tmp.ticketAmount; - CREATE TEMPORARY TABLE tmp.ticketAmount - (INDEX (ticketFk)) - ENGINE = MEMORY - SELECT ticketFk, taxableBase, SUM(CAST(taxableBase * rate / 100 AS DECIMAL(10, 2))) tax,code - FROM tmp.ticketTax - GROUP BY ticketFk, code; - - DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany; - DROP TEMPORARY TABLE IF EXISTS tmp.addressTaxArea; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `ticketGetTaxAdd` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -62726,13 +63306,33 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `ticketGetTax__2` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetTax__2`() + READS SQL DATA +BEGIN + CALL ticket_getTax(NULL); +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `ticketGetTotal` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; @@ -62745,8 +63345,8 @@ BEGIN * @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular * @return tmp.ticketTotal Total para cada ticket */ - CALL vn.ticketGetTax(); - + CALL ticket_getTax(NULL); + DROP TEMPORARY TABLE IF EXISTS tmp.ticketTotal; CREATE TEMPORARY TABLE tmp.ticketTotal (INDEX (ticketFk)) @@ -63615,89 +64215,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `ticket_checkNoComponents__` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `ticket_checkNoComponents__`(vShippedFrom DATETIME, vShippedTo DATETIME) -BEGIN - -/** - * Comprueba que los tickets entre un rango de fechas tienen componentes - * - * @param vShippedFrom inicio del rango - * @param vShippedTo fin del rango - */ - DECLARE v_done BOOL DEFAULT FALSE; - DECLARE vSaleFk INTEGER; - DECLARE vTicketFk INTEGER; - DECLARE vConcept VARCHAR(50); - DECLARE vCur CURSOR FOR - SELECT s.id - FROM ticket t - JOIN client clt ON clt.id = t.clientFk - JOIN sale s ON s.ticketFk = t.id - JOIN item i ON i.id = s.itemFk - JOIN itemType tp ON tp.id = i.typeFk - JOIN itemCategory ic ON ic.id = tp.categoryFk - LEFT JOIN tmp.coste c ON c.id = s.id - WHERE t.shipped >= vShippedFrom AND t.shipped <= vShippedTo - AND c.id IS NULL - AND clt.isActive != 0 - AND ic.merchandise != 0 - GROUP BY s.id; - - DECLARE CONTINUE HANDLER FOR NOT FOUND - SET v_done = TRUE; - - DROP TEMPORARY TABLE IF EXISTS tmp.coste; - - DROP TEMPORARY TABLE IF EXISTS tmp.coste; - CREATE TEMPORARY TABLE tmp.coste - (primary key (id)) ENGINE = MEMORY - SELECT s.id - FROM ticket t - JOIN client clt ON clt.id = t.clientFk - JOIN sale s ON s.ticketFk = t.id - JOIN item i ON i.id = s.itemFk - JOIN itemType tp ON tp.id = i.typeFk - JOIN itemCategory ic ON ic.id = tp.categoryFk - JOIN saleComponent sc ON sc.saleFk = s.id - JOIN component c ON c.id = sc.componentFk - JOIN componentType ct ON ct.id = c.typeFk AND ct.id = 1 - WHERE t.shipped >= vShippedFrom - AND ic.merchandise != 0; - - OPEN vCur; - - l: LOOP - SET v_done = FALSE; - FETCH vCur INTO vSaleFk; - - IF v_done THEN - LEAVE l; - END IF; - select ticketFk INTO vTicketFk FROM sale where id = vSaleFk; - select concept INTO vConcept FROM sale where id = vSaleFk; - - CALL util.debug(ticketFk, concept); - -- CALL sale_calculateComponent(vSaleFk, 1); - END LOOP; - - CLOSE vCur; - DROP TEMPORARY TABLE tmp.coste; - END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `ticket_Clone` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -64667,91 +65184,93 @@ BEGIN * @return tmp.ticketAmount * @return tmp.ticketTax Impuesto desglosado para cada ticket. */ - DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany; - CREATE TEMPORARY TABLE tmp.addressCompany - (INDEX (addressFk, companyFk)) - ENGINE = MEMORY - SELECT DISTINCT t.addressFk, t.companyFk - FROM tmp.ticket tmpTicket - JOIN ticket t ON t.id = tmpTicket.ticketFk; + DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany; + CREATE TEMPORARY TABLE tmp.addressCompany + (INDEX (addressFk, companyFk)) + ENGINE = MEMORY + SELECT DISTINCT t.addressFk, t.companyFk + FROM tmp.ticket tmpTicket + JOIN ticket t ON t.id = tmpTicket.ticketFk; - CALL addressTaxArea (); - - IF vTaxArea > '' THEN + CALL addressTaxArea (); + + IF vTaxArea > '' THEN UPDATE tmp.addressTaxArea SET areaFk = vTaxArea; END IF; - /** Solo se calcula la base imponible (taxableBase) y el impuesto se calculará posteriormente - * No se debería cambiar el sistema por problemas con los decimales - */ - - DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax; - CREATE TEMPORARY TABLE tmp.ticketTax - (INDEX (ticketFk)) - ENGINE = MEMORY + /* Solo se calcula la base imponible (taxableBase) y el impuesto se calculará posteriormente + * No se debería cambiar el sistema por problemas con los decimales + */ + + DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax; + CREATE TEMPORARY TABLE tmp.ticketTax + (INDEX (ticketFk)) + ENGINE = MEMORY SELECT * FROM ( SELECT tmpTicket.ticketFk, - bp.pgcFk, - SUM(s.quantity * s.price * (100 - s.discount)/100 ) AS taxableBase, - pgc.rate, - tc.code, - bp.priority - FROM tmp.ticket tmpTicket - JOIN sale s ON s.ticketFk = tmpTicket.ticketFk - JOIN item i ON i.id = s.itemFk - JOIN ticket t ON t.id = tmpTicket.ticketFk - JOIN supplier su ON su.id = t.companyFk - JOIN tmp.addressTaxArea ata - ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk - JOIN itemTaxCountry itc - ON itc.itemFk = i.id AND itc.countryFk = su.countryFk - JOIN bookingPlanner bp - ON bp.countryFk = su.countryFk - AND bp.taxAreaFk = ata.areaFk - AND bp.taxClassFk = itc.taxClassFk - JOIN pgc ON pgc.code = bp.pgcFk - JOIN taxClass tc ON tc.id = bp.taxClassFk - GROUP BY tmpTicket.ticketFk, pgc.code,pgc.rate - HAVING taxableBase != 0) t + bp.pgcFk, + SUM(s.quantity * s.price * (100 - s.discount)/100 ) AS taxableBase, + pgc.rate, + tc.code, + bp.priority + FROM tmp.ticket tmpTicket + JOIN sale s ON s.ticketFk = tmpTicket.ticketFk + JOIN item i ON i.id = s.itemFk + JOIN ticket t ON t.id = tmpTicket.ticketFk + JOIN supplier su ON su.id = t.companyFk + JOIN tmp.addressTaxArea ata + ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk + JOIN itemTaxCountry itc + ON itc.itemFk = i.id AND itc.countryFk = su.countryFk + JOIN bookingPlanner bp + ON bp.countryFk = su.countryFk + AND bp.taxAreaFk = ata.areaFk + AND bp.taxClassFk = itc.taxClassFk + JOIN pgc ON pgc.code = bp.pgcFk + JOIN taxClass tc ON tc.id = bp.taxClassFk + GROUP BY tmpTicket.ticketFk, pgc.code,pgc.rate + HAVING taxableBase != 0) t ORDER BY priority; - DROP TEMPORARY TABLE IF EXISTS tmp.ticketServiceTax; - CREATE TEMPORARY TABLE tmp.ticketServiceTax - (INDEX (ticketFk)) - ENGINE = MEMORY - SELECT tt.ticketFk, - SUM(ts.quantity * ts.price) AS taxableBase, - pgc.rate, - tc.code - FROM tmp.ticketTax tt - JOIN ticketService ts ON ts.ticketFk = tt.ticketFk - JOIN ticket t ON t.id = tt.ticketFk - JOIN supplier su ON su.id = t.companyFk - JOIN tmp.addressTaxArea ata - ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk - JOIN bookingPlanner bp - ON bp.countryFk = su.countryFk - AND bp.taxAreaFk = ata.areaFk - AND bp.taxClassFk = ts.taxClassFk - JOIN pgc ON pgc.code = bp.pgcFk AND pgc.rate = tt.rate - JOIN taxClass tc ON tc.id = bp.taxClassFk - GROUP BY tt.ticketFk, tt.code,tt.rate - HAVING taxableBase != 0; + DROP TEMPORARY TABLE IF EXISTS tmp.ticketServiceTax; + CREATE TEMPORARY TABLE tmp.ticketServiceTax + (PRIMARY KEY (ticketFk, rate,code)) + ENGINE = MEMORY + SELECT tt.ticketFk, + pgc.code pgcFk, + SUM(ts.quantity * ts.price) AS taxableBase, + pgc.rate, + tc.code + FROM tmp.ticket tt + JOIN ticketService ts ON ts.ticketFk = tt.ticketFk + JOIN ticket t ON t.id = tt.ticketFk + JOIN supplier su ON su.id = t.companyFk + JOIN tmp.addressTaxArea ata + ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk + JOIN bookingPlanner bp + ON bp.countryFk = su.countryFk + AND bp.taxAreaFk = ata.areaFk + AND bp.taxClassFk = ts.taxClassFk + JOIN pgc ON pgc.code = bp.pgcFk + JOIN taxClass tc ON tc.id = bp.taxClassFk + GROUP BY tt.ticketFk, pgc.code + HAVING taxableBase != 0; - UPDATE tmp.ticketTax tt - JOIN tmp.ticketServiceTax ts ON tt.ticketFk = ts.ticketFk AND tt.code = ts.code AND tt.rate = ts.rate - SET tt.taxableBase = tt.taxableBase + ts.taxableBase; + INSERT INTO tmp.ticketTax (ticketFk, pgcFk, taxableBase, rate, code) + SELECT ts.ticketFk, ts.pgcFk, ts.taxableBase, ts.rate, ts.code + FROM tmp.ticketServiceTax ts + ON DUPLICATE KEY UPDATE ticketTax.taxableBase = ticketTax.taxableBase + VALUES (taxableBase); - DROP TEMPORARY TABLE IF EXISTS tmp.ticketAmount; - CREATE TEMPORARY TABLE tmp.ticketAmount - (INDEX (ticketFk)) - ENGINE = MEMORY - SELECT ticketFk, taxableBase, SUM(CAST(taxableBase * rate / 100 AS DECIMAL(10, 2))) tax,code - FROM tmp.ticketTax - GROUP BY ticketFk, code; + DROP TEMPORARY TABLE IF EXISTS tmp.ticketAmount; + CREATE TEMPORARY TABLE tmp.ticketAmount + (INDEX (ticketFk)) + ENGINE = MEMORY + SELECT ticketFk, taxableBase, SUM(CAST(taxableBase * rate / 100 AS DECIMAL(10, 2))) tax,code + FROM tmp.ticketTax + GROUP BY ticketFk, code; - DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany; - DROP TEMPORARY TABLE IF EXISTS tmp.addressTaxArea; + DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany; + DROP TEMPORARY TABLE IF EXISTS tmp.addressTaxArea; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -65684,38 +66203,36 @@ BEGIN SET @vDated := NULL; DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate; - + CREATE TEMPORARY TABLE tmp.timeControlCalculate SELECT userFk, dated, IF( timeWork >= 18000, @timeWork:=timeWork + 1200, @timeWork:=timeWork) timeWorkSeconds, SEC_TO_TIME(@timeWork ) timeWorkSexagesimal, @timeWork / 3600 timeWorkDecimal, - timed + timed FROM (SELECT SUM(timeWork) timeWork, userFk, - dated, - GROUP_CONCAT(DATE_FORMAT(sub.timed,"%H:%i") ORDER BY sub.timed ASC SEPARATOR ' - ') timed + dated, + GROUP_CONCAT(DATE_FORMAT(sub.timed,"%H:%i") ORDER BY sub.timed ASC SEPARATOR ' - ') timed FROM (SELECT IF(@vUser = wtc.userFk, @vUser :=@vUser, @vUser := wtc.userFk ), IF(@vIsOdd, @vIsOdd := FALSE, @vIsOdd := TRUE ), IF(direction='in', @vIsOdd := TRUE, @vIsOdd := @vIsOdd ), IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(timed),@vLastTimed:=@vLastTimed), IF(@vIsOdd, 0, UNIX_TIMESTAMP(timed)-@vLastTimed) timeWork, IF(direction='in', @vDated := DATE(wtc.timed), @vDated :=@vDated) dated, - wtc.userFk, wtc.timed timed, + wtc.userFk, direction - FROM (SELECT wtc.* + FROM (SELECT DISTINCT(wtc.id), wtc.userFk, wtc.timed, wtc.direction FROM workerTimeControl wtc JOIN tmp.`user` w ON w.userFk = wtc.userFk - WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo - ORDER BY userFk, timed ASC + WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo + ORDER BY userFk, timed ASC ) wtc WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo - ORDER BY userFk, timed ASC ) sub GROUP BY userFk, dated - ORDER BY userFk, dated )sub2; END ;; @@ -65900,10 +66417,12 @@ BEGIN dated, IF( timeWork >= 18000, @timeWork:=timeWork + 1200, @timeWork:=timeWork) timeWorkSeconds, SEC_TO_TIME(@timeWork ) timeWorkSexagesimal, - @timeWork / 3600 timeWorkDecimal + @timeWork / 3600 timeWorkDecimal, + timed FROM (SELECT SUM(timeWork) timeWork, userFk, - dated + dated, + GROUP_CONCAT(DATE_FORMAT(sub.timed,"%H:%i") ORDER BY sub.timed ASC SEPARATOR ' - ') timed FROM (SELECT IF(@vUser = wtc.userFk, @vUser :=@vUser, @vUser := wtc.userFk ), IF(@vIsOdd, @vIsOdd := FALSE, @vIsOdd := TRUE ), IF(direction='in', @vIsOdd := TRUE, @vIsOdd := @vIsOdd ), @@ -65913,8 +66432,12 @@ BEGIN wtc.userFk, wtc.timed timed, direction - FROM (SELECT * FROM workerTimeControl ORDER BY userFk, timed ASC) wtc - JOIN tmp.`user` w ON w.userFk = wtc.userFk + FROM (SELECT wtc.* + FROM workerTimeControl wtc + JOIN tmp.`user` w ON w.userFk = wtc.userFk + WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo + ORDER BY userFk, timed ASC + ) wtc WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo ORDER BY userFk, timed ASC ) sub @@ -68163,15 +68686,19 @@ BEGIN DECLARE vWorkerInfo VARCHAR(90); DECLARE vCursor CURSOR FOR - SELECT CONCAT(u.name, "@verdnatura.es"), u.id, tb.dated, tb.timeWorkDecimal, LEFT(tb.timeWorkSexagesimal,5) timeWorkSexagesimal, + SELECT CONCAT(u.name, '@verdnatura.es'), u.id, tb.dated, tb.timeWorkDecimal, LEFT(tb.timeWorkSexagesimal,5) timeWorkSexagesimal, tb.timeTable, tc.timeWorkDecimal timeWorkedDecimal, LEFT(tc.timeWorkSexagesimal,5) timeWorkedSexagesimal, tb.type, tb.businessFk FROM tmp.timeBusinessCalculate tb JOIN user u ON u.id = tb.userFk JOIN department d ON d.id = tb.departmentFk + JOIN postgresql.business b ON b.business_id = tb.businessFk + JOIN company c ON c.id = b.provider_id LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = tb.userFk AND tc.dated = tb.dated WHERE d.isTeleworking AND - IFNULL(vWorkerFk,u.id) = u.id + IFNULL(vWorkerFk,u.id) = u.id AND + c.code = 'VNL' ORDER BY u.id, tb.dated; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; DROP TABLE IF EXISTS tmp.timeControlCalculate; @@ -68179,7 +68706,7 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate; DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate; - SELECT CONCAT (MIN(dated), " 00:00:00"), CONCAT (MAX(dated), " 23:59:59") INTO vStarted, vEnded + SELECT CONCAT (MIN(dated), ' 00:00:00'), CONCAT (MAX(dated), ' 23:59:59') INTO vStarted, vEnded FROM time WHERE year = vYear AND week = vWeek; @@ -68189,7 +68716,7 @@ BEGIN timed BETWEEN vStarted AND vEnded AND isSendMail; UPDATE workerTimeControlMail - SET updated = NOW(), state="SENDED" + SET updated = NOW(), state = 'SENDED' WHERE year = vYear AND week = vWeek AND IFNULL(vWorkerFk, workerFk) = workerFk ; @@ -68203,7 +68730,7 @@ BEGIN END IF; SET vTimeWorkDecimalTotal = 0; - SET vBody= ""; + SET vBody= ''; OPEN vCursor; FETCH vCursor INTO vSender, vWorkerFk, vDated, vTimeWorkDecimal, vTimeWorkSexagesimal, vTimeTable, vTimeWorkedDecimal, vTimeWorkedSexagesimal, vAbsenceType, vBusinessFk ; SET vWorkerFkOld = vWorkerFk ; @@ -68215,47 +68742,47 @@ BEGIN IF vTimeTable IS NULL AND vTimeWorkDecimal>0 AND vTimeWorkedDecimal IS NULL THEN INSERT INTO workerTimeControl (userFk, timed, manual, direction, isSendMail) - SELECT vWorkerFk, CONCAT(vDated," 08:00"), TRUE, "in", TRUE; + SELECT vWorkerFk, CONCAT(vDated,' 08:00'), TRUE, 'in', TRUE; IF vTimeWorkDecimal >= 5 THEN INSERT INTO workerTimeControl (userFk, timed, manual, direction, isSendMail) - SELECT vWorkerFk, CONCAT(vDated," 09:00"), TRUE, "middle", TRUE; + SELECT vWorkerFk, CONCAT(vDated,' 09:00'), TRUE, 'middle', TRUE; INSERT INTO workerTimeControl (userFk, timed, manual, direction, isSendMail) - SELECT vWorkerFk, CONCAT(vDated," 09:20"), TRUE, "middle", TRUE; + SELECT vWorkerFk, CONCAT(vDated,' 09:20'), TRUE, 'middle', TRUE; END IF; INSERT INTO workerTimeControl (userFk, timed, manual, direction, isSendMail) - SELECT vWorkerFk,CONCAT(vDated," ", LEFT (SEC_TO_TIME(28800 + (vTimeWorkDecimal * 3600)), 5)), TRUE, "out", TRUE; + SELECT vWorkerFk,CONCAT(vDated,' ', LEFT (SEC_TO_TIME(28800 + (vTimeWorkDecimal * 3600)), 5)), TRUE, 'out', TRUE; ELSEIF vTimeWorkDecimal>0 AND vTimeWorkedDecimal IS NULL THEN SELECT SUM(TIME_TO_SEC(j.end)-TIME_TO_SEC(j.start))/3600 INTO vTimeTableDecimal FROM postgresql.journey j WHERE j.business_id = vBusinessFk AND j.day_id = WEEKDAY(vDated)+1; IF vTimeWorkDecimal = vTimeTableDecimal THEN INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) - SELECT vWorkerFk, CONCAT(vDated, " ", j.start), TRUE, TRUE + SELECT vWorkerFk, CONCAT(vDated, ' ', j.start), TRUE, TRUE FROM postgresql.journey j WHERE j.business_id = vBusinessFk AND j.day_id = WEEKDAY(vDated)+1; INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) - SELECT vWorkerFk, CONCAT(vDated, " ", j.end), TRUE, TRUE + SELECT vWorkerFk, CONCAT(vDated, ' ', j.end), TRUE, TRUE FROM postgresql.journey j WHERE j.business_id = vBusinessFk AND j.day_id = WEEKDAY(vDated)+1; ELSE INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) - SELECT vWorkerFk, CONCAT(vDated, " ", MIN(j.start)), TRUE, TRUE + SELECT vWorkerFk, CONCAT(vDated, ' ', MIN(j.start)), TRUE, TRUE FROM postgresql.journey j WHERE j.business_id = vBusinessFk AND j.day_id = WEEKDAY(vDated)+1; INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) - SELECT vWorkerFk, CONCAT(vDated, " ", SEC_TO_TIME(TIME_TO_SEC(MIN(j.start)) + (vTimeWorkDecimal * 3600))), TRUE, TRUE + SELECT vWorkerFk, CONCAT(vDated, ' ', SEC_TO_TIME(TIME_TO_SEC(MIN(j.start)) + (vTimeWorkDecimal * 3600))), TRUE, TRUE FROM postgresql.journey j WHERE j.business_id = vBusinessFk AND j.day_id = WEEKDAY(vDated)+1; END IF; IF vTimeWorkDecimal >= 5 THEN INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) - SELECT vWorkerFk, CONCAT(vDated, " ", SEC_TO_TIME(TIME_TO_SEC(MIN(j.start)) + 3600)), TRUE, TRUE + SELECT vWorkerFk, CONCAT(vDated, ' ', SEC_TO_TIME(TIME_TO_SEC(MIN(j.start)) + 3600)), TRUE, TRUE FROM postgresql.journey j WHERE j.business_id = vBusinessFk AND j.day_id = WEEKDAY(vDated)+1; INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) - SELECT vWorkerFk, CONCAT(vDated, " ", SEC_TO_TIME(TIME_TO_SEC(MIN(j.start)) + 4800)), TRUE, TRUE + SELECT vWorkerFk, CONCAT(vDated, ' ', SEC_TO_TIME(TIME_TO_SEC(MIN(j.start)) + 4800)), TRUE, TRUE FROM postgresql.journey j WHERE j.business_id = vBusinessFk AND j.day_id = WEEKDAY(vDated)+1; END IF; @@ -68263,18 +68790,18 @@ BEGIN UPDATE workerTimeControl wtc JOIN (SELECT id FROM workerTimeControl WHERE userFk = vWorkerFk AND - timed BETWEEN vDated AND CONCAT(vDated, " 23:59:59") + timed BETWEEN vDated AND CONCAT(vDated, ' 23:59:59') ORDER BY timed ASC LIMIT 1)sub on sub.id= wtc.id - SET direction = "in" ; + SET direction = 'in' ; UPDATE workerTimeControl wtc JOIN (SELECT id FROM workerTimeControl WHERE userFk = vWorkerFk AND - timed BETWEEN vDated AND CONCAT(vDated, " 23:59:59") + timed BETWEEN vDated AND CONCAT(vDated, ' 23:59:59') ORDER BY timed DESC LIMIT 1)sub on sub.id= wtc.id - SET direction = "out" ; + SET direction = 'out' ; END IF; @@ -68301,7 +68828,7 @@ BEGIN FETCH vCursor INTO vSender, vWorkerFk, vDated, vTimeWorkDecimal, vTimeWorkSexagesimal, vTimeTable, vTimeWorkedDecimal, vTimeWorkedSexagesimal, vAbsenceType, vBusinessFk ; IF vWorkerFk <> vWorkerFkOld OR vDone THEN - SELECT CONCAT( IFNULL(nif, ""), " - ", firstName, " ", name ) INTO vWorkerInfo + SELECT CONCAT( IFNULL(nif, ''), ' - ', firstName, ' ', name ) INTO vWorkerInfo FROM postgresql.person WHERE id_trabajador = vWorkerFkOld; SET vHeader = CONCAT("


@@ -68333,11 +68860,11 @@ BEGIN "); INSERT INTO mail(sender, replyto, subject, body) - VALUES (vSenderOld, "timecontrol@verdnatura.es", CONCAT("Registro de horas semana ", vWeek, " año ", vYear) , CONCAT(vHeader," " , vBody," ", vFooter)); + VALUES (vSenderOld, 'timecontrol@verdnatura.es', CONCAT('Registro de horas semana ', vWeek, ' año ', vYear) , CONCAT(vHeader,' ' , vBody,' ', vFooter)); INSERT IGNORE INTO workerTimeControlMail (workerFk, year,week) VALUES(vWorkerFkOld, vYear, vWeek); - SET vBody = ""; + SET vBody = ''; SET vTimeWorkDecimalTotal = 0; SET vWorkerFkOld = vWorkerFk ; SET vSenderOld = vSender; @@ -72246,6 +72773,24 @@ USE `salix`; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; +-- +-- Final view structure for view `User` +-- + +/*!50001 DROP VIEW IF EXISTS `User`*/; +/*!50001 SET @saved_cs_client = @@character_set_client */; +/*!50001 SET @saved_cs_results = @@character_set_results */; +/*!50001 SET @saved_col_connection = @@collation_connection */; +/*!50001 SET character_set_client = utf8 */; +/*!50001 SET character_set_results = utf8 */; +/*!50001 SET collation_connection = utf8_general_ci */; +/*!50001 CREATE ALGORITHM=UNDEFINED */ +/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ +/*!50001 VIEW `User` AS select `account`.`user`.`id` AS `id`,`account`.`user`.`realm` AS `realm`,`account`.`user`.`name` AS `username`,`account`.`user`.`bcryptPassword` AS `password`,`account`.`user`.`email` AS `email`,`account`.`user`.`emailVerified` AS `emailVerified`,`account`.`user`.`verificationToken` AS `verificationToken` from `account`.`user` */; +/*!50001 SET character_set_client = @saved_cs_client */; +/*!50001 SET character_set_results = @saved_cs_results */; +/*!50001 SET collation_connection = @saved_col_connection */; + -- -- Current Database: `stock` -- @@ -72300,6 +72845,24 @@ USE `vn`; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; +-- +-- Final view structure for view `accounting` +-- + +/*!50001 DROP VIEW IF EXISTS `accounting`*/; +/*!50001 SET @saved_cs_client = @@character_set_client */; +/*!50001 SET @saved_cs_results = @@character_set_results */; +/*!50001 SET @saved_col_connection = @@collation_connection */; +/*!50001 SET character_set_client = utf8mb4 */; +/*!50001 SET character_set_results = utf8mb4 */; +/*!50001 SET collation_connection = utf8mb4_general_ci */; +/*!50001 CREATE ALGORITHM=UNDEFINED */ +/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ +/*!50001 VIEW `accounting` AS select `b`.`Id_Banco` AS `id`,`b`.`Banco` AS `bank`,`b`.`Cuenta` AS `account`,`b`.`cash` AS `accountingTypeFk`,`b`.`entity_id` AS `entityFk`,`b`.`activo` AS `isActive` from `vn2008`.`Bancos` `b` */; +/*!50001 SET character_set_client = @saved_cs_client */; +/*!50001 SET character_set_results = @saved_cs_results */; +/*!50001 SET collation_connection = @saved_col_connection */; + -- -- Final view structure for view `agencyProvince__` -- @@ -72354,6 +72917,24 @@ USE `vn`; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; +-- +-- Final view structure for view `buyer` +-- + +/*!50001 DROP VIEW IF EXISTS `buyer`*/; +/*!50001 SET @saved_cs_client = @@character_set_client */; +/*!50001 SET @saved_cs_results = @@character_set_results */; +/*!50001 SET @saved_col_connection = @@collation_connection */; +/*!50001 SET character_set_client = utf8 */; +/*!50001 SET character_set_results = utf8 */; +/*!50001 SET collation_connection = utf8_general_ci */; +/*!50001 CREATE ALGORITHM=UNDEFINED */ +/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ +/*!50001 VIEW `buyer` AS select distinct `u`.`id` AS `userFk`,`u`.`nickname` AS `nickname` from (`account`.`user` `u` join `vn`.`itemType` `it` on((`it`.`workerFk` = `u`.`id`))) where `u`.`active` order by `u`.`nickname` */; +/*!50001 SET character_set_client = @saved_cs_client */; +/*!50001 SET character_set_results = @saved_cs_results */; +/*!50001 SET collation_connection = @saved_col_connection */; + -- -- Final view structure for view `calendar__` -- @@ -72434,12 +73015,12 @@ USE `vn`; /*!50001 SET @saved_cs_client = @@character_set_client */; /*!50001 SET @saved_cs_results = @@character_set_results */; /*!50001 SET @saved_col_connection = @@collation_connection */; -/*!50001 SET character_set_client = utf8 */; -/*!50001 SET character_set_results = utf8 */; -/*!50001 SET collation_connection = utf8_general_ci */; +/*!50001 SET character_set_client = utf8mb4 */; +/*!50001 SET character_set_results = utf8mb4 */; +/*!50001 SET collation_connection = utf8mb4_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `cmr_list` AS select `cmr`.`id` AS `cmrFk`,`cmr`.`ticketFk` AS `ticketFk`,`cmr`.`truckPlate` AS `truckPlate`,`cmr`.`observations` AS `observations`,`cmr`.`senderInstruccions` AS `senderInstruccions`,`cmr`.`paymentInstruccions` AS `paymentInstruccions`,`cmr`.`specialAgreements` AS `specialAgreements`,`cmr`.`created` AS `created`,`cmr`.`packagesList` AS `packagesList`,`aTo`.`nickname` AS `clientName`,`aTo`.`postalCode` AS `clientPostalCode`,`aTo`.`street` AS `clientStreet`,`aTo`.`city` AS `clientCity`,`pTo`.`name` AS `clientProvince`,`cTo`.`country` AS `clientCountry`,`su`.`name` AS `companyName`,`su`.`street` AS `companyStreet`,`su`.`postCode` AS `companyPostCode`,`su`.`city` AS `companyCity`,`cSu`.`country` AS `companyCountry`,concat(`aFrom`.`street`,' ',`aFrom`.`postalCode`,' ',`aFrom`.`city`,' (',`cFrom`.`country`,')') AS `warehouseAddress`,`cmr`.`created` AS `shipped`,`aTo`.`nickname` AS `clientOficialName`,`aSu`.`name` AS `carrierName`,`aSu`.`street` AS `carrierStreet`,`aSu`.`postCode` AS `carrierPostCode`,`aSu`.`city` AS `carrierCity`,`cAs`.`country` AS `carrierCountry`,ifnull(`aTo`.`phone`,`client`.`phone`) AS `phone`,ifnull(`aTo`.`mobile`,`client`.`mobile`) AS `mobile`,`aTo`.`id` AS `addressFk` from (((((((((((`cmr` left join `address` `aTo` on((`aTo`.`id` = `cmr`.`addressToFk`))) left join `province` `pTo` on((`pTo`.`id` = `aTo`.`provinceFk`))) left join `country` `cTo` on((`cTo`.`id` = `pTo`.`countryFk`))) left join `client` on((`client`.`id` = `aTo`.`clientFk`))) left join `supplier` `su` on((`su`.`id` = `cmr`.`companyFk`))) left join `country` `cSu` on((`cSu`.`id` = `su`.`countryFk`))) left join `address` `aFrom` on((`aFrom`.`id` = `cmr`.`addressFromFk`))) left join `province` `pFrom` on((`pFrom`.`id` = `aFrom`.`provinceFk`))) left join `country` `cFrom` on((`cFrom`.`id` = `pFrom`.`countryFk`))) left join `supplier` `aSu` on((`aSu`.`id` = `cmr`.`supplierFk`))) left join `country` `cAs` on((`cAs`.`id` = `aSu`.`countryFk`))) */; +/*!50001 VIEW `cmr_list` AS select `cmr`.`id` AS `cmrFk`,`cmr`.`ticketFk` AS `ticketFk`,`cmr`.`truckPlate` AS `truckPlate`,`cmr`.`observations` AS `observations`,`cmr`.`senderInstruccions` AS `senderInstruccions`,`cmr`.`paymentInstruccions` AS `paymentInstruccions`,`cmr`.`specialAgreements` AS `specialAgreements`,`cmr`.`created` AS `created`,`cmr`.`packagesList` AS `packagesList`,`aTo`.`nickname` AS `clientName`,`aTo`.`postalCode` AS `clientPostalCode`,`aTo`.`street` AS `clientStreet`,`aTo`.`city` AS `clientCity`,`pTo`.`name` AS `clientProvince`,`cTo`.`country` AS `clientCountry`,`su`.`name` AS `companyName`,`su`.`street` AS `companyStreet`,`su`.`postCode` AS `companyPostCode`,`su`.`city` AS `companyCity`,`cSu`.`country` AS `companyCountry`,concat(`aFrom`.`street`,' ',`aFrom`.`postalCode`,' ',`aFrom`.`city`,' (',`cFrom`.`country`,')') AS `warehouseAddress`,`cmr`.`created` AS `shipped`,`aTo`.`nickname` AS `clientOficialName`,`cmr`.`supplierFk` AS `supplierFk`,`aSu`.`name` AS `carrierName`,`aSu`.`street` AS `carrierStreet`,`aSu`.`postCode` AS `carrierPostCode`,`aSu`.`city` AS `carrierCity`,`cAs`.`country` AS `carrierCountry`,ifnull(`aTo`.`phone`,`client`.`phone`) AS `phone`,ifnull(`aTo`.`mobile`,`client`.`mobile`) AS `mobile`,`aTo`.`id` AS `addressFk` from (((((((((((`cmr` left join `address` `aTo` on((`aTo`.`id` = `cmr`.`addressToFk`))) left join `province` `pTo` on((`pTo`.`id` = `aTo`.`provinceFk`))) left join `country` `cTo` on((`cTo`.`id` = `pTo`.`countryFk`))) left join `client` on((`client`.`id` = `aTo`.`clientFk`))) left join `supplier` `su` on((`su`.`id` = `cmr`.`companyFk`))) left join `country` `cSu` on((`cSu`.`id` = `su`.`countryFk`))) left join `address` `aFrom` on((`aFrom`.`id` = `cmr`.`addressFromFk`))) left join `province` `pFrom` on((`pFrom`.`id` = `aFrom`.`provinceFk`))) left join `country` `cFrom` on((`cFrom`.`id` = `pFrom`.`countryFk`))) left join `supplier` `aSu` on((`aSu`.`id` = `cmr`.`supplierFk`))) left join `country` `cAs` on((`cAs`.`id` = `aSu`.`countryFk`))) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -72727,7 +73308,7 @@ USE `vn`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `expeditionPallet_Print` AS select `et2`.`description` AS `truck`,`t`.`routeFk` AS `routeFk`,`r`.`description` AS `zone`,count(`es`.`id`) AS `eti`,`ep`.`id` AS `palletFk`,(`et`.`id` <=> `rm`.`expeditionTruckFk`) AS `isMatch`,37 AS `warehouseFk` from (((((((`vn`.`expeditionTruck` `et` join `vn`.`expeditionPallet` `ep` on((`ep`.`truckFk` = `et`.`id`))) join `vn`.`expeditionScan` `es` on((`es`.`palletFk` = `ep`.`id`))) join `vn`.`expedition` `e` on((`e`.`id` = `es`.`expeditionFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `vn`.`route` `r` on((`r`.`id` = `t`.`routeFk`))) left join `vn2008`.`Rutas_monitor` `rm` on((`rm`.`Id_Ruta` = `r`.`id`))) left join `vn`.`expeditionTruck` `et2` on((`et2`.`id` = `rm`.`expeditionTruckFk`))) where (`ep`.`isPrint` = 0) group by `ep`.`id`,`t`.`routeFk` */; +/*!50001 VIEW `expeditionPallet_Print` AS select `et2`.`description` AS `truck`,`t`.`routeFk` AS `routeFk`,`r`.`description` AS `zone`,count(`es`.`id`) AS `eti`,`ep`.`id` AS `palletFk`,(`et`.`id` <=> `rm`.`expeditionTruckFk`) AS `isMatch`,`t`.`warehouseFk` AS `warehouseFk` from (((((((`vn`.`expeditionTruck` `et` join `vn`.`expeditionPallet` `ep` on((`ep`.`truckFk` = `et`.`id`))) join `vn`.`expeditionScan` `es` on((`es`.`palletFk` = `ep`.`id`))) join `vn`.`expedition` `e` on((`e`.`id` = `es`.`expeditionFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `vn`.`route` `r` on((`r`.`id` = `t`.`routeFk`))) left join `vn2008`.`Rutas_monitor` `rm` on((`rm`.`Id_Ruta` = `r`.`id`))) left join `vn`.`expeditionTruck` `et2` on((`et2`.`id` = `rm`.`expeditionTruckFk`))) where (`ep`.`isPrint` = 0) group by `ep`.`id`,`t`.`routeFk` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -72745,7 +73326,7 @@ USE `vn`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `expeditionRoute_Monitor` AS select `r`.`id` AS `routeFk`,count(distinct if(isnull(`e`.`id`),`t`.`id`,NULL)) AS `tickets`,count(distinct `e`.`id`) AS `expeditions`,count(distinct `es`.`id`) AS `scanned`,max(`e`.`created`) AS `lastPacked` from (((((`vn`.`route` `r` join `vn`.`routesMonitor` `rm` on((`r`.`id` = `rm`.`routeFk`))) join `vn`.`expeditionTruck` `et` on((`et`.`id` = `rm`.`expeditionTruckFk`))) join `vn`.`ticket` `t` on((`t`.`routeFk` = `r`.`id`))) left join `vn`.`expedition` `e` on((`e`.`ticketFk` = `t`.`id`))) left join `vn`.`expeditionScan` `es` on((`es`.`expeditionFk` = `e`.`id`))) where (`et`.`ETD` >= curdate()) group by `r`.`id` */; +/*!50001 VIEW `expeditionRoute_Monitor` AS select `r`.`id` AS `routeFk`,count(distinct if(isnull(`e`.`id`),`t`.`id`,NULL)) AS `tickets`,count(distinct `e`.`id`) AS `expeditions`,count(distinct `es`.`id`) AS `scanned`,max(`e`.`created`) AS `lastPacked` from ((((((`vn`.`route` `r` join `vn`.`routesMonitor` `rm` on((`r`.`id` = `rm`.`routeFk`))) join `vn`.`expeditionTruck` `et` on((`et`.`id` = `rm`.`expeditionTruckFk`))) join `vn`.`ticket` `t` on((`t`.`routeFk` = `r`.`id`))) left join `vn`.`expedition` `e` on((`e`.`ticketFk` = `t`.`id`))) left join `vn`.`expeditionScan` `es` on((`es`.`expeditionFk` = `e`.`id`))) left join `vn`.`stowaway` `st` on((`st`.`id` = `t`.`id`))) where ((`et`.`ETD` >= curdate()) and isnull(`st`.`id`)) group by `r`.`id` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -72758,12 +73339,12 @@ USE `vn`; /*!50001 SET @saved_cs_client = @@character_set_client */; /*!50001 SET @saved_cs_results = @@character_set_results */; /*!50001 SET @saved_col_connection = @@collation_connection */; -/*!50001 SET character_set_client = utf8mb4 */; -/*!50001 SET character_set_results = utf8mb4 */; -/*!50001 SET collation_connection = utf8mb4_general_ci */; +/*!50001 SET character_set_client = utf8 */; +/*!50001 SET character_set_results = utf8 */; +/*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `expeditionRoute_freeTickets` AS select `t`.`routeFk` AS `routeFk`,`tss`.`ticket` AS `ticket`,`s`.`name` AS `code`,`w`.`name` AS `almacen`,`tss`.`updated` AS `updated` from (((`vn`.`ticketStateToday` `tss` join `vn`.`ticket` `t` on((`t`.`id` = `tss`.`ticket`))) join `vn`.`warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) join `vn`.`state` `s` on((`s`.`id` = `tss`.`state`))) where (ifnull(`t`.`packages`,0) = 0) */; +/*!50001 VIEW `expeditionRoute_freeTickets` AS select `t`.`routeFk` AS `routeFk`,`tss`.`ticket` AS `ticket`,`s`.`name` AS `code`,`w`.`name` AS `almacen`,`tss`.`updated` AS `updated` from ((((`vn`.`ticketStateToday` `tss` join `vn`.`ticket` `t` on((`t`.`id` = `tss`.`ticket`))) join `vn`.`warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) join `vn`.`state` `s` on((`s`.`id` = `tss`.`state`))) left join `vn`.`stowaway` `st` on((`st`.`id` = `t`.`id`))) where ((ifnull(`t`.`packages`,0) = 0) and isnull(`st`.`id`)) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -73020,6 +73601,24 @@ USE `vn`; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; +-- +-- Final view structure for view `invoiceInDueDay__` +-- + +/*!50001 DROP VIEW IF EXISTS `invoiceInDueDay__`*/; +/*!50001 SET @saved_cs_client = @@character_set_client */; +/*!50001 SET @saved_cs_results = @@character_set_results */; +/*!50001 SET @saved_col_connection = @@collation_connection */; +/*!50001 SET character_set_client = utf8 */; +/*!50001 SET character_set_results = utf8 */; +/*!50001 SET collation_connection = utf8_general_ci */; +/*!50001 CREATE ALGORITHM=UNDEFINED */ +/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ +/*!50001 VIEW `invoiceInDueDay__` AS select `r`.`id` AS `id`,`r`.`recibida_id` AS `invoiceInFk`,`r`.`fecha` AS `dueDated`,`r`.`banco_id` AS `bankFk`,`r`.`cantidad` AS `amount`,`r`.`divisa` AS `foreignValue`,`r`.`stamp` AS `created` from `vn2008`.`recibida_vencimiento` `r` */; +/*!50001 SET character_set_client = @saved_cs_client */; +/*!50001 SET character_set_results = @saved_cs_results */; +/*!50001 SET collation_connection = @saved_col_connection */; + -- -- Final view structure for view `invoiceInEntry__` -- @@ -73038,6 +73637,24 @@ USE `vn`; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; +-- +-- Final view structure for view `invoiceInIntrastat__` +-- + +/*!50001 DROP VIEW IF EXISTS `invoiceInIntrastat__`*/; +/*!50001 SET @saved_cs_client = @@character_set_client */; +/*!50001 SET @saved_cs_results = @@character_set_results */; +/*!50001 SET @saved_col_connection = @@collation_connection */; +/*!50001 SET character_set_client = utf8 */; +/*!50001 SET character_set_results = utf8 */; +/*!50001 SET collation_connection = utf8_general_ci */; +/*!50001 CREATE ALGORITHM=UNDEFINED */ +/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ +/*!50001 VIEW `invoiceInIntrastat__` AS select `r`.`recibida_id` AS `invoiceInFk`,`r`.`Codintrastat` AS `intrastatFk`,`r`.`importe` AS `amount` from `vn2008`.`recibida_intrastat` `r` */; +/*!50001 SET character_set_client = @saved_cs_client */; +/*!50001 SET character_set_results = @saved_cs_results */; +/*!50001 SET collation_connection = @saved_col_connection */; + -- -- Final view structure for view `itemBotanicalWithGenus` -- @@ -73668,6 +74285,24 @@ USE `vn`; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; +-- +-- Final view structure for view `saleMistake_list` +-- + +/*!50001 DROP VIEW IF EXISTS `saleMistake_list`*/; +/*!50001 SET @saved_cs_client = @@character_set_client */; +/*!50001 SET @saved_cs_results = @@character_set_results */; +/*!50001 SET @saved_col_connection = @@collation_connection */; +/*!50001 SET character_set_client = utf8 */; +/*!50001 SET character_set_results = utf8 */; +/*!50001 SET collation_connection = utf8_general_ci */; +/*!50001 CREATE ALGORITHM=UNDEFINED */ +/*!50013 DEFINER=`z-developer`@`%` SQL SECURITY DEFINER */ +/*!50001 VIEW `saleMistake_list` AS select `st`.`saleFk` AS `saleFk`,concat(`w2`.`firstName`,' ',`w2`.`lastName`) AS `sacador`,`st`.`created` AS `created`,concat(`w`.`firstName`,' ',`w`.`lastName`) AS `revisador`,`mt`.`description` AS `description`,`sm`.`created` AS `controlled` from (((((`vn`.`saleTracking` `st` join `vn`.`worker` `w2` on((`w2`.`id` = `st`.`workerFk`))) join `vncontrol`.`accion` `a` on(((`a`.`accion_id` = `st`.`actionFk`) and (`a`.`accion` = 'SACAR')))) left join `vn`.`saleMistake` `sm` on((`st`.`saleFk` = `sm`.`saleFk`))) left join `vn`.`mistakeType` `mt` on((`mt`.`id` = `sm`.`typeFk`))) left join `vn`.`worker` `w` on((`w`.`id` = `sm`.`userFk`))) where (`st`.`created` > '2020-10-01') */; +/*!50001 SET character_set_client = @saved_cs_client */; +/*!50001 SET character_set_results = @saved_cs_results */; +/*!50001 SET collation_connection = @saved_col_connection */; + -- -- Final view structure for view `saleValue` -- @@ -74259,4 +74894,4 @@ USE `vncontrol`; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-02 10:31:18 +-- Dump completed on 2020-11-25 9:17:08 diff --git a/db/export-data.sh b/db/export-data.sh index db4e2a0032..b2ba97569a 100755 --- a/db/export-data.sh +++ b/db/export-data.sh @@ -69,6 +69,8 @@ TABLES=( imageCollection tpvError tpvResponse + imageCollectionSize + ) dump_tables ${TABLES[@]} diff --git a/modules/client/back/methods/client/specs/activeWorkersWithRole.spec.js b/modules/client/back/methods/client/specs/activeWorkersWithRole.spec.js index 8dee7e4c64..fcf871d9b0 100644 --- a/modules/client/back/methods/client/specs/activeWorkersWithRole.spec.js +++ b/modules/client/back/methods/client/specs/activeWorkersWithRole.spec.js @@ -7,7 +7,7 @@ describe('Client activeWorkersWithRole', () => { let isSalesPerson = await app.models.Account.hasRole(result[0].id, 'salesPerson'); - expect(result.length).toEqual(17); + expect(result.length).toEqual(19); expect(isSalesPerson).toBeTruthy(); }); @@ -17,7 +17,7 @@ describe('Client activeWorkersWithRole', () => { let isBuyer = await app.models.Account.hasRole(result[0].id, 'buyer'); - expect(result.length).toEqual(16); + expect(result.length).toEqual(17); expect(isBuyer).toBeTruthy(); }); }); diff --git a/modules/client/back/methods/client/specs/getCard.spec.js b/modules/client/back/methods/client/specs/getCard.spec.js index 18519d440b..e8ac7b3bcc 100644 --- a/modules/client/back/methods/client/specs/getCard.spec.js +++ b/modules/client/back/methods/client/specs/getCard.spec.js @@ -7,6 +7,6 @@ describe('Client get', () => { expect(result.id).toEqual(101); expect(result.name).toEqual('Bruce Wayne'); - expect(result.debt).toEqual(889.38); + expect(result.debt).toEqual(887.38); }); }); diff --git a/modules/client/back/methods/client/specs/getDebt.spec.js b/modules/client/back/methods/client/specs/getDebt.spec.js index 9e539c2195..9d3061ebbe 100644 --- a/modules/client/back/methods/client/specs/getDebt.spec.js +++ b/modules/client/back/methods/client/specs/getDebt.spec.js @@ -4,7 +4,7 @@ describe('client getDebt()', () => { it('should return the client debt', async() => { let result = await app.models.Client.getDebt(101); - expect(result.debt).toEqual(889.38); + expect(result.debt).toEqual(887.38); }); }); diff --git a/modules/client/back/methods/client/specs/listWorkers.spec.js b/modules/client/back/methods/client/specs/listWorkers.spec.js index 68eb842739..271347969f 100644 --- a/modules/client/back/methods/client/specs/listWorkers.spec.js +++ b/modules/client/back/methods/client/specs/listWorkers.spec.js @@ -6,7 +6,7 @@ describe('Client listWorkers', () => { .then(result => { let amountOfEmployees = Object.keys(result).length; - expect(amountOfEmployees).toEqual(53); + expect(amountOfEmployees).toEqual(54); done(); }) .catch(done.fail); diff --git a/modules/client/back/methods/client/specs/summary.spec.js b/modules/client/back/methods/client/specs/summary.spec.js index e4ebd9c67c..882abcab23 100644 --- a/modules/client/back/methods/client/specs/summary.spec.js +++ b/modules/client/back/methods/client/specs/summary.spec.js @@ -17,7 +17,7 @@ describe('client summary()', () => { it('should return a summary object containing debt', async() => { let result = await app.models.Client.summary(101); - expect(result.debt.debt).toEqual(889.38); + expect(result.debt.debt).toEqual(887.38); }); it('should return a summary object containing averageInvoiced', async() => { diff --git a/modules/ticket/back/methods/ticket/specs/getTotal.spec.js b/modules/ticket/back/methods/ticket/specs/getTotal.spec.js index c3494bba90..d0191e55ad 100644 --- a/modules/ticket/back/methods/ticket/specs/getTotal.spec.js +++ b/modules/ticket/back/methods/ticket/specs/getTotal.spec.js @@ -4,7 +4,7 @@ describe('ticket getTotal()', () => { it('should return the total of a ticket', async() => { let result = await app.models.Ticket.getTotal(1); - expect(result).toEqual(893.87); + expect(result).toEqual(891.87); }); it(`should return zero if the ticket doesn't have lines`, async() => { From ba156a2e4207fd6e7eb090867d2e1e9773c8881c Mon Sep 17 00:00:00 2001 From: bernat Date: Fri, 27 Nov 2020 11:56:41 +0100 Subject: [PATCH 009/101] log refactor --- loopback/util/log.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/loopback/util/log.js b/loopback/util/log.js index cf12dcb2fb..baba3e8279 100644 --- a/loopback/util/log.js +++ b/loopback/util/log.js @@ -5,7 +5,6 @@ */ exports.translateValues = async(instance, changes) => { const models = instance.app.models; - function getRelation(instance, property) { const relations = instance.definition.settings.relations; for (let relationName in relations) { @@ -38,12 +37,18 @@ exports.translateValues = async(instance, changes) => { for (let property in properties) { const relation = getRelation(instance, property); const value = properties[property]; - let finalValue = value; + if (relation) { + let fieldsToShow = ['alias', 'name', 'code', 'description']; + const log = instance.definition.settings.log; + + if (log && log.showField) + fieldsToShow = log.showField; + const model = relation.model; const row = await models[model].findById(value, { - fields: ['alias', 'name', 'code', 'description'] + fields: fieldsToShow }); const newValue = getValue(row); if (newValue) finalValue = newValue; From 1ba1d27ba0c6c58b976cc98430d962023f9b77d7 Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 27 Nov 2020 13:10:39 +0100 Subject: [PATCH 010/101] 2576 - Photo upload component --- .gitignore | 10 +- back/methods/dms/updateFile.js | 2 +- back/methods/dms/uploadFile.js | 5 +- back/methods/image/download.js | 44 ++++----- back/methods/image/upload.js | 77 ++++++++++++++++ back/model-config.json | 5 +- back/models/dms.js | 2 +- back/models/image-collection.js | 63 +++++++++++++ back/models/image-collection.json | 7 +- back/models/image-container.json | 13 +++ back/models/image.js | 21 ++--- db/changes/10260-holidays/00-ACL.sql | 1 + .../10260-holidays/00-imageCollection.sql | 8 ++ db/dump/dumpedFixtures.sql | 19 ++++ e2e/dms/a87/4.txt | 1 - e2e/dms/c4c/1.txt | 1 - e2e/dms/c81/2.txt | 1 - e2e/dms/ecc/3.jpeg | Bin 13518 -> 0 bytes e2e/dms/ecc/3.txt | 1 - front/core/directives/zoom-image.js | 2 +- front/salix/components/descriptor/style.scss | 18 ++++ front/salix/components/index.js | 1 + .../salix/components/upload-photo/index.html | 23 +++++ front/salix/components/upload-photo/index.js | 87 ++++++++++++++++++ .../components/upload-photo/locale/es.yml | 2 + .../salix/components/upload-photo/style.scss | 31 +++++++ .../salix/components/user-popover/index.html | 2 +- front/salix/components/user-popover/index.js | 4 - front/salix/module.js | 11 ++- loopback/locale/es.json | 3 +- loopback/server/boot/storage.js | 15 ++- loopback/server/datasources.json | 18 +++- .../methods/claim-dms/allowedContentTypes.js | 2 +- .../methods/client-dms/allowedContentTypes.js | 2 +- modules/entry/front/latest-buys/index.html | 4 +- .../item-image-queue/downloadImages.js | 2 +- modules/item/front/card/index.html | 2 +- modules/item/front/descriptor/index.html | 30 +++--- modules/item/front/descriptor/index.js | 21 ++++- modules/item/front/index/index.html | 6 +- modules/item/front/summary/index.html | 4 +- modules/order/front/catalog-view/index.html | 6 +- modules/order/front/line/index.html | 4 +- .../methods/ticket-dms/allowedContentTypes.js | 2 +- modules/ticket/front/picture/index.html | 4 +- modules/ticket/front/sale/index.html | 4 +- .../travel-thermograph/allowedContentTypes.js | 2 +- .../travel/front/thermograph/create/index.js | 2 +- .../travel/front/thermograph/locale/es.yml | 2 +- .../methods/worker-dms/allowedContentTypes.js | 2 +- modules/worker/front/descriptor/index.html | 20 +++- modules/worker/front/descriptor/index.js | 18 ++++ 52 files changed, 527 insertions(+), 110 deletions(-) create mode 100644 back/methods/image/upload.js create mode 100644 back/models/image-collection.js create mode 100644 back/models/image-container.json create mode 100644 db/changes/10260-holidays/00-ACL.sql create mode 100644 db/changes/10260-holidays/00-imageCollection.sql delete mode 100644 e2e/dms/a87/4.txt delete mode 100644 e2e/dms/c4c/1.txt delete mode 100644 e2e/dms/c81/2.txt delete mode 100644 e2e/dms/ecc/3.jpeg delete mode 100644 e2e/dms/ecc/3.txt create mode 100644 front/salix/components/upload-photo/index.html create mode 100644 front/salix/components/upload-photo/index.js create mode 100644 front/salix/components/upload-photo/locale/es.yml create mode 100644 front/salix/components/upload-photo/style.scss diff --git a/.gitignore b/.gitignore index 35172e5d2f..b7064cdbb7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,11 @@ coverage node_modules dist -e2e/dms/*/ -!e2e/dms/c4c -!e2e/dms/c81 -!e2e/dms/ecc -!e2e/dms/a87 +storage +!storage/dms/c4c +!storage/dms/c81 +!storage/dms/ecc +!storage/dms/a87 npm-debug.log .eslintcache datasources.*.json diff --git a/back/methods/dms/updateFile.js b/back/methods/dms/updateFile.js index 7585dd1b08..9f8f4f2938 100644 --- a/back/methods/dms/updateFile.js +++ b/back/methods/dms/updateFile.js @@ -84,7 +84,7 @@ module.exports = Self => { }; async function uploadNewFile(ctx, dms, myOptions) { - const storageConnector = Self.app.dataSources.storage.connector; + const storageConnector = Self.app.dataSources.dmsStorage.connector; const models = Self.app.models; const fileOptions = {}; diff --git a/back/methods/dms/uploadFile.js b/back/methods/dms/uploadFile.js index 27e5169c98..8e5c4eb638 100644 --- a/back/methods/dms/uploadFile.js +++ b/back/methods/dms/uploadFile.js @@ -46,7 +46,7 @@ module.exports = Self => { }); Self.uploadFile = async(ctx, options) => { - const storageConnector = Self.app.dataSources.storage.connector; + const storageConnector = Self.app.dataSources.dmsStorage.connector; const models = Self.app.models; const fileOptions = {}; const args = ctx.args; @@ -98,7 +98,7 @@ module.exports = Self => { async function createDms(ctx, file, myOptions) { const models = Self.app.models; - const storageConnector = Self.app.dataSources.storage.connector; + const storageConnector = Self.app.dataSources.dmsStorage.connector; const myUserId = ctx.req.accessToken.userId; const myWorker = await models.Worker.findOne({where: {userFk: myUserId}}, myOptions); const args = ctx.args; @@ -121,7 +121,6 @@ module.exports = Self => { return newDms.updateAttribute('file', fileName, myOptions); } - /** * Returns a container instance * If doesn't exists creates a new one diff --git a/back/methods/image/download.js b/back/methods/image/download.js index 6f1e0b8e79..ba709aff88 100644 --- a/back/methods/image/download.js +++ b/back/methods/image/download.js @@ -2,7 +2,7 @@ const UserError = require('vn-loopback/util/user-error'); const fs = require('fs-extra'); module.exports = Self => { - Self.remoteMethod('download', { + Self.remoteMethodCtx('download', { description: 'Get the user image', accessType: 'READ', accepts: [ @@ -49,15 +49,9 @@ module.exports = Self => { } }); - Self.download = async function(collection, size, id) { + Self.download = async function(ctx, collection, size, id) { const models = Self.app.models; - const filter = { - where: { - name: collection}, - include: { - relation: 'readRole' - } - }; + const filter = {where: {name: collection}}; const imageCollection = await models.ImageCollection.findOne(filter); const entity = await models[imageCollection.model].findById(id, { fields: ['id', imageCollection.property] @@ -69,28 +63,22 @@ module.exports = Self => { if (!image) return false; - const imageRole = imageCollection.readRole().name; - const hasRole = await models.Account.hasRole(id, imageRole); - if (!hasRole) + const hasReadRole = models.ImageCollection.hasReadRole(ctx, collection); + if (!hasReadRole) throw new UserError(`You don't have enough privileges`); - let file; - let env = process.env.NODE_ENV; - if (env && env != 'development') { - file = { - path: `/var/lib/salix/image/${collection}/${size}/${image.name}.png`, - contentType: 'image/png', - name: `${image.name}.png` - }; - } else { - file = { - path: `${process.cwd()}/storage/image/${collection}/${size}/${image.name}.png`, - contentType: 'image/png', - name: `${image.name}.png` - }; - } + const container = await models.ImageContainer.getContainer(collection); + const rootPath = container.client.root; + const file = { + path: `${rootPath}/${collection}/${size}/${image.name}.png`, + contentType: 'image/png', + name: `${image.name}.png` + }; + + if (!fs.existsSync(file.path)) return []; + await fs.access(file.path); - let stream = fs.createReadStream(file.path); + const stream = fs.createReadStream(file.path); return [stream, file.contentType, `filename="${file.name}"`]; }; }; diff --git a/back/methods/image/upload.js b/back/methods/image/upload.js new file mode 100644 index 0000000000..b50a55b346 --- /dev/null +++ b/back/methods/image/upload.js @@ -0,0 +1,77 @@ +const UserError = require('vn-loopback/util/user-error'); +const fs = require('fs-extra'); + +module.exports = Self => { + Self.remoteMethodCtx('upload', { + description: 'Uploads a file and inserts into dms model', + accessType: 'WRITE', + accepts: [ + { + arg: 'id', + type: 'Number', + description: 'The entity id', + required: true + }, + { + arg: 'collection', + type: 'string', + description: 'The collection name', + required: true + }], + returns: { + type: 'Object', + root: true + }, + http: { + path: `/upload`, + verb: 'POST' + } + }); + + Self.upload = async ctx => { + const models = Self.app.models; + const fileOptions = {}; + const args = ctx.args; + + const hasWriteRole = await models.ImageCollection.hasWriteRole(ctx, args.collection); + if (!hasWriteRole) + throw new UserError(`You don't have enough privileges`); + + if (process.env.NODE_ENV == 'test') + throw new UserError(`You can't upload images on the test instance`); + + // Upload file to temporary path + const container = await getContainer(args.collection); + const uploaded = await models.ImageContainer.upload(container.name, ctx.req, ctx.result, fileOptions); + const [uploadedFile] = Object.values(uploaded.files).map(file => { + return file[0]; + }); + + const file = await models.ImageContainer.getFile(container.name, uploadedFile.name); + const srcFile = `${file.client.root}/${file.container}/${file.name}`; + await models.Image.registerImage(container.name, srcFile, args.id); + }; + + /** + * Returns a container instance + * If doesn't exists creates a new one + * + * @param {String} name Container name + * @return {Object} Container instance + */ + async function getContainer(name) { + const models = Self.app.models; + let container; + try { + container = await models.ImageContainer.getContainer(name); + } catch (err) { + if (err.code === 'ENOENT') { + container = await models.ImageContainer.createContainer({ + name: name + }); + } else throw err; + } + + return container; + } +}; diff --git a/back/model-config.json b/back/model-config.json index adb67eaed4..3db249f0fe 100644 --- a/back/model-config.json +++ b/back/model-config.json @@ -18,7 +18,7 @@ "dataSource": "vn" }, "Container": { - "dataSource": "storage" + "dataSource": "dmsStorage" }, "Continent": { "dataSource": "vn" @@ -44,6 +44,9 @@ "ImageCollectionSize": { "dataSource": "vn" }, + "ImageContainer": { + "dataSource": "imageStorage" + }, "Language": { "dataSource": "vn" }, diff --git a/back/models/dms.js b/back/models/dms.js index 8be539a0ff..9e767904e9 100644 --- a/back/models/dms.js +++ b/back/models/dms.js @@ -14,7 +14,7 @@ module.exports = Self => { }; Self.getFile = async function(id) { - const storageConnector = Self.app.dataSources.storage.connector; + const storageConnector = Self.app.dataSources.dmsStorage.connector; const models = Self.app.models; const dms = await Self.findById(id); const pathHash = storageConnector.getPathHash(dms.id); diff --git a/back/models/image-collection.js b/back/models/image-collection.js new file mode 100644 index 0000000000..2b541dcd6d --- /dev/null +++ b/back/models/image-collection.js @@ -0,0 +1,63 @@ +module.exports = Self => { + /** + * Checks if current user has + * read privileges over a collection + * + * @param {object} ctx - Request context + * @param {interger} name - Collection name + * @param {object} options - Query options + * @return {boolean} True for user with read privileges + */ + Self.hasReadRole = async(ctx, name, options) => { + const collection = await Self.findOne({where: {name}}, { + include: { + relation: 'readRole' + } + }, options); + + return await hasRole(ctx, collection, options); + }; + + /** + * Checks if current user has + * write privileges over a collection + * + * @param {object} ctx - Request context + * @param {string} name - Collection name + * @param {object} options - Query options + * @return {boolean} True for user with write privileges + */ + Self.hasWriteRole = async(ctx, name, options) => { + const collection = await Self.findOne({where: {name}}, { + include: { + relation: 'writeRole' + } + }, options); + + return await hasRole(ctx, collection, options); + }; + + /** + * Checks if current user has + * read or write privileges + * @param {Object} ctx - Context + * @param {Object} collection - Collection [read/write] + * @param {Object} options - Query options + */ + async function hasRole(ctx, collection, options) { + const models = Self.app.models; + const myUserId = ctx.req.accessToken.userId; + + const readRole = collection.readRole() && collection.readRole().name; + const writeRole = collection.writeRole() && collection.writeRole().name; + const requiredRole = readRole || writeRole; + + const hasRequiredRole = await models.Account.hasRole(myUserId, requiredRole, options); + const isRoot = await models.Account.hasRole(myUserId, 'root', options); + + if (isRoot || hasRequiredRole) + return true; + + return false; + } +}; diff --git a/back/models/image-collection.json b/back/models/image-collection.json index 75faaf7220..fd019ecc37 100644 --- a/back/models/image-collection.json +++ b/back/models/image-collection.json @@ -48,7 +48,12 @@ "type": "belongsTo", "model": "Role", "foreignKey": "readRoleFk" - } + }, + "writeRole": { + "type": "belongsTo", + "model": "Role", + "foreignKey": "writeRoleFk" + } }, "acls": [ { diff --git a/back/models/image-container.json b/back/models/image-container.json new file mode 100644 index 0000000000..22cea05f53 --- /dev/null +++ b/back/models/image-container.json @@ -0,0 +1,13 @@ +{ + "name": "ImageContainer", + "base": "VnModel", + "idInjection": true, + "options": { + "validateUpsert": true + }, + "properties": {}, + "validations": [], + "relations": {}, + "acls": [], + "methods": [] + } \ No newline at end of file diff --git a/back/models/image.js b/back/models/image.js index f6f4cf5dbf..cbe2cfdac4 100644 --- a/back/models/image.js +++ b/back/models/image.js @@ -4,12 +4,9 @@ const path = require('path'); module.exports = Self => { require('../methods/image/download')(Self); + require('../methods/image/upload')(Self); - Self.getPath = function() { - return '/var/lib/salix/image'; - }; - - Self.registerImage = async(collectionName, file, srcFilePath) => { + Self.registerImage = async(collectionName, srcFile, entityId) => { const models = Self.app.models; const tx = await Self.beginTransaction({}); const myOptions = {transaction: tx}; @@ -33,8 +30,8 @@ module.exports = Self => { } }, myOptions); + const file = srcFile.split('/').pop(); const fileName = file.split('.')[0]; - const rootPath = Self.getPath(); const data = { name: fileName, collectionFk: collectionName @@ -47,6 +44,8 @@ module.exports = Self => { }, myOptions); // Resizes and saves the image + const container = await models.ImageContainer.getContainer(collectionName); + const rootPath = container.client.root; const collectionDir = path.join(rootPath, collectionName); const dstDir = path.join(collectionDir, 'full'); const dstFile = path.join(dstDir, file); @@ -57,7 +56,7 @@ module.exports = Self => { }; await fs.mkdir(dstDir, {recursive: true}); - await sharp(srcFilePath, {failOnError: false}) + await sharp(srcFile, {failOnError: false}) .resize(collection.maxWidth, collection.maxHeight, resizeOpts) .png() .toFile(dstFile); @@ -72,7 +71,7 @@ module.exports = Self => { }; await fs.mkdir(dstDir, {recursive: true}); - await sharp(srcFilePath, {failOnError: false}) + await sharp(srcFile, {failOnError: false}) .resize(size.width, size.height, resizeOpts) .png() .toFile(dstFile); @@ -83,7 +82,7 @@ module.exports = Self => { if (!model) throw new Error('Matching model not found'); - const item = await model.findById(fileName, null, myOptions); + const item = await model.findById(entityId, null, myOptions); if (item) { await item.updateAttribute( collection.property, @@ -92,8 +91,8 @@ module.exports = Self => { ); } - if (fs.existsSync(srcFilePath)) - await fs.unlink(srcFilePath); + if (fs.existsSync(srcFile)) + await fs.unlink(srcFile); await tx.commit(); return newImage; diff --git a/db/changes/10260-holidays/00-ACL.sql b/db/changes/10260-holidays/00-ACL.sql new file mode 100644 index 0000000000..1f8045bc7c --- /dev/null +++ b/db/changes/10260-holidays/00-ACL.sql @@ -0,0 +1 @@ +INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) VALUES ('Image', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee') \ No newline at end of file diff --git a/db/changes/10260-holidays/00-imageCollection.sql b/db/changes/10260-holidays/00-imageCollection.sql new file mode 100644 index 0000000000..28ffdff9ca --- /dev/null +++ b/db/changes/10260-holidays/00-imageCollection.sql @@ -0,0 +1,8 @@ +ALTER TABLE `hedera`.`imageCollection` + ADD writeRoleFk INT NULL DEFAULT 1; + +ALTER TABLE `hedera`.`imageCollection` + ADD CONSTRAINT role_id___fk + FOREIGN KEY (writeRoleFk) REFERENCES account.role (id) + ON UPDATE CASCADE; + diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql index 879b1eb427..abc6bb8c10 100644 --- a/db/dump/dumpedFixtures.sql +++ b/db/dump/dumpedFixtures.sql @@ -447,6 +447,25 @@ INSERT INTO `imageCollection` VALUES (1,'catalog','Artículo',3840,2160,'Item',' /*!40000 ALTER TABLE `imageCollection` ENABLE KEYS */; UNLOCK TABLES; +-- +-- Dumping data for table `imageCollectionSize` +-- +LOCK TABLES `imageCollectionSize` WRITE; +/*!40000 ALTER TABLE `imageCollectionSize` DISABLE KEYS */; +INSERT INTO `imageCollectionSize` (`id`, `collectionFk`, `width`, `height`, `crop`) + VALUES + (2, 1, 50, 50, 1), + (3, 1, 200, 200, 1), + (5, 5, 200, 200, 1), + (6, 1, 70, 70, 1), + (8, 5, 50, 50, 1), + (9, 1, 1600, 900, 0), + (13, 6, 160, 160, 1), + (14, 6, 520, 520, 1), + (15, 6, 1600, 1600, 1); +/*!40000 ALTER TABLE `imageCollectionSize` ENABLE KEYS */; +UNLOCK TABLES; + -- -- Dumping data for table `tpvError` -- diff --git a/e2e/dms/a87/4.txt b/e2e/dms/a87/4.txt deleted file mode 100644 index a46bfbeda2..0000000000 --- a/e2e/dms/a87/4.txt +++ /dev/null @@ -1 +0,0 @@ -File: 4.txt. It works! \ No newline at end of file diff --git a/e2e/dms/c4c/1.txt b/e2e/dms/c4c/1.txt deleted file mode 100644 index 5ef648a885..0000000000 --- a/e2e/dms/c4c/1.txt +++ /dev/null @@ -1 +0,0 @@ -It works! \ No newline at end of file diff --git a/e2e/dms/c81/2.txt b/e2e/dms/c81/2.txt deleted file mode 100644 index 5ef648a885..0000000000 --- a/e2e/dms/c81/2.txt +++ /dev/null @@ -1 +0,0 @@ -It works! \ No newline at end of file diff --git a/e2e/dms/ecc/3.jpeg b/e2e/dms/ecc/3.jpeg deleted file mode 100644 index fb2483f69669a8f3ac8238a0ec0e135b074609c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13518 zcmYjX1909!)Bne|%{ET@#B5{RYU8xA(b&!t8;xz-R%6??`Stz2d1t=8nVY@cncLsZ z+}`f&-pAs{CV(z2E+q~?KmY*5zX5!#00963EF2aVCJq)B7A_7B9zHoC0X{wfJ~A~JFc5alO224-evatbzXHbyR5CT0c*L_|bX6jUN~bbKZf z5)uZc|ImNt|Kt95`QPcEi0eN**MF5<|G1AX00SPVhrok^padW>AfPZHKKcM+0Dy#q z`VZ9q5)3R9Gyn+)0sl{{hz>wPKte-7!@|HKAi_fZI}jukGzI{JNdb!mq7+gxfWv0B z^Npd(uI|3XVG~xaoucM2w0Cfq&MH2VS!^WufO(@@@kJtm#Mt{V3V}2>r!jJkgmOBempe6XZFEm%#aij7VF^q9o zIS%VsNkK_@@lh&mk1(|ZxhbA0eF6EQr&9TstO7x*o}ck)bWXfsl-t;=QDTPS}gBU;Y1{59^V3x zF>bZAXyZ6z&9u$%VrA+p9Q$@10ml^spAOJ1-0&mYmm&_N@qBsFeJt1AGc#3Bk@_l% z0bqKZhXGzS);Xhi7AcUiY_upd+cGcRrQ|!tXujKch0z6Z{tNsd)|S`@z^CHg^=Ly?Qt6{cJvpsXYZjSLm?}P( zTaZd z2!D;-weYTB1Sv_$h9K!Ih5kj!z*coNE%MngUtQ`){9QfDC*J3@8rH+ui#)m}-f}~H z3=hZS>MEKj`h9lBBnZ&P4cst|C4EM2JGE1 zD$8U}l)8VnZH*fgu$U1+qLkvrGu%v2EJ0Ybne`3ckh+{~&`>y;<^{5Pv#?6!m8MbR z&#wEwLJS4)Bz$SL&}~fJ@`2FS5CZ_tB^@9gFIyw5=|_q0=D{#_DafSFd`E`<7;jeY zoF(i@17&VbWlpu{%B+x)$3(aFP;eI#rNYJ_*jp-;YA^m~q^y!elbW*+E>;xpdRk&G z{A)0^YC$QpWk;R(2QZ>J>-iJ4H>?_?NxsZ2ct+&|K)vTfTWs?ff6+N>SZw@r$zj4m zqb9~iPzVMf1-cXJf&?o3(N@)@tJQX6$ZPT@O86mr1fQ#Fk3Q40jItw>yt&UGiF^Ws z)oa^tm!HcwE_KE4YJUL8dP!4GuAJH>!uL(e zHIRb!f0eE5Vb0b;7Bh~jy2s8jtLpyvp#ZP6gLsa7+K+{c-f@?!cA7issAU!Xs_k}S z?F`dc*W#~Wf>cvK;Rk(iRy1QCR*|pK{+C~u8TP3i#P9-0XVgxnVkdKmRd0*OUz2M4WYdSyYc=fqUv6t)sXu^T9S>VgTj6tw?zuU1F}_(9 z6#^fS=tzI&vG!mcqod!vq9m}9-LIPz#DGy%MDDVaKZ|m0 zbM)<%4(4#L{`V(cc8~^t6}$BiJB;mG!^~`b!%28LTTi{y zRNa(<9APL4ByY2IuUT`g%jN;LcWL|wFfH<;i+ZaeUz*;L0HsD$-T0eLqWPwaUSmo< z*Z*X`f?g~(RXm1ZG|;vhnjXQxUW%)V$Y_FMt0k4T-K5a3Btu8E9G!lOvmDM!6uokZ z&yR0V2mAI1+}`WL+r=`n-o&@L*THAEKNmJW9*Sv2M(Wioq;U8TKL{pVqizO_)UWWz z0LPz^&#_F~rFJ)cXyQ?|Jl_CNIpYOE6V#f6O(FubR|r9Vp*UZLjKNLQ^TlP~p_EP* zlZR4Yc5|dbeP{=cIorN$MK05w8NvQT@%rD8!Q0b4qnFBT%$+qZUw& z$1(bg2UUM-ys3A%IKijf2{yIaow)N7a$>_-MPSLt*5S*eTJ{jfi6n2%{(TqxUyO&qq-5pj`%KGY2Y@Fu}Ttr%_fl_ zB3$9lDE~lHKoe`do#*}mcronV&Lyaf<4_9S(g%)J^t_I%Hza&3vCEz)q{$2WmS|#` zd##@rmtxD4nmhHh=F(8E-k8W_tkoB<@B@WC4l!Sji9irGc?sq2i-0^E=Lj2Zz8?YI z<{aN4SS&t%&eVeIrzWQ!5?K&+aIk}VswU+0NhrqhwUpr}R+#E3_ctQFEuYSdDR-8g z=2&el>YViJVnV!Hv1R8kB*JH>Z$!V(zm!Y=3==B_^GPSL@D2=?vTh`J{XIl2FxLL6^H!$W73pd-8`2J{MW$rc#6Ntv4Yv zTC13Y1!6P7Eiq=hKQl%p=;NmwRUsd^7Nd|kezt+qXGcta9mYq)1k|ipd;mvV`o<}t ze)N&p%b#MXl*VG8^P)u?PaS7nu6w6gGHx*^T#pVi{fxxEuvh#gpTo0IHaop?M;kE zFq+1{U<(#YIsA-Sf+MUgkT4RvU=N86c!;w$-%8S)^E9NNNZ)})w=C*;A?KbC?`85MlDl|ubYAF4B-#4#3_ta#Ld2t#U=sUs z(XHXvcUmTmiEUJHoWvZXEu?*LwuCtb&^-y1ovlKfR=k~YTvdGk#m}N34loa0Sg5io z)s1i1Vv)XB;sacpeuk-@ikLE;d9&M?uo$QoBd?Ygc9UpLo^&WN(ceR=Z@VUwkk?J4 zupn|Sd1SOGfJ;pg$t!U;E-aldJ(chS(EidkG`r70p(w=4pnFVZfvil^OIrG5IL6aj zrUtI+RP5_4EwOkEhJg*0|uvr$jO(F2UP z@(A1mr(cMaE(dfU^|Rk19@JSMXWVzzE(y}~NR38~#z1JMeu|tHF9YPM>5HYu)hiW? zhY1A8OieHfF`Q5OYI>+mYml8uB6n$qw2iP04*bml9?QScetObu%pm4lF|Z_VAUl$> zjI2V?h726-&3Yy)mFF5B_R&Z489Nzzc)U~xB(QZ7KQUZukCxcT(UZ-sU|y!hlpM6; zm>v1`jh7bHSF@m!F6f}XN}G(EMFiJB7oK#ph)J2B_IXqODQvNXwIcn-Xwl;#L8_;r zej~wGHjEksX8i!t_RZT{+(k$v(xPth;<$6s;wQUR6EMZpk+9dh4bzDpiJEY)xh=Ba z*(%@5<=#r#>^!n$5LG5(NR2sQtx!yu^D|Gp_UTvj(B?>E%pg+D-P{UGQrV*trxKu& z#%7A6Oaz%1$kSm*q!QZ6OsnP<^PvYMKZVKke@=s?``omIAIT_$OY63{y#X_$E|D?E zWEsv7rZz=cq&RiMx#&n93;!=4g4)WY4I-p1s>LsWMNpUA4b+;K!$iPZ!h`1Qm)sci zELU+8i7-`G8Ef4;BhoUN(t!Yl!A+EE~&8v>wvZEK>0r4>@l@bo;i= zkyTofS;FHT5UC!D6lg@%%Dhe(1S>@0oGFMH`ZG}snbGpR-c@nn_@-O)xD{eR1kU;8QSFI!w8&r5Yu~-tGug))g~xYVpk%xF?pH_zM!E{RbacW z=dzR+gQf9JwL_^*lZS{cpfzET=i8qlEHbK6BwZ4nqk`=pM43l!$1vQQG5rnp<(X|e z9GKL9kEMd8#dX_f88b8;cDRTfS0jL}4p1IAh>-p^#q;}IZY&35js1o;QN{KOBq~E^ zUY3Kw4@$~(k>h0~+W2BmQ^h|MP_^!h`gPa?W1D)P$1DGNiP{|xH zFIgt=8@RU8iRM&~IH)BI{sw^u$4cFg+^M=F(bS@_$@TYEFXc{MVfk1oeep3RxG-Ar z*Id4#MpT39lIAMW@2#(8Q|(%D%wWxnauHo|s}iTeQq%_9=<4{owtyzx%kektx{ z`CYL`tcM7Sn>JJd98yiF_@IalzSta2aXUj!0HV_+lV|tt^UFrp%K)ld&nB}2N}A^3 zn&$@)d6m8p=Yi!(Sg&Wy;*5N`OCD5TA>oBP3HzYGfg}xe)E;H`5^{MnfH_@T!;)8v#dO3&Ia$>W6AZ9F&JNQn6XR^ z`-{$z@}NW2BC+_m?^0<^b|McU4+Zk!kfqSH(8icm_-6)p{1SWqY4+cwAxC12gBhgV zLNuMd=q6e}4Ae0H!eHSif0r2w8RJ)zT6M*;*t{q}UU$7V|19-g`#TbavXJd0NMFH~ zrh?djV zQfp@CPFW}OK(eIm>(SlD4}jIcJ1nmpn;a+;D*aFO4I^IA)0)#BO(dTFP&XWkW1tsmxPDo$0&O2eVVf$wj8O zsWEpF`sw|y{^YU{N(GgfMJ5*y08 zvAywW=MTNh&+My$juw;WW2&zOO)%x|NV+Qy7oYo{Hh{mV*-T~9e4L1aRW?KqQH&tv zefoCbX$9A!RD^<8u&Vt|?-c56fH?K1wBIkCAy#2(HIsRSMbLUzwEO*fm)_rA4AsfM z6LsI&xcQIgyh4 z!9QUI%m>w-79+zD=Z2GY5{-4s%`QGhV2u|OSJXf23o+y_b6)<)dtAO3u!YEtY1kV< z^Ob-*9Tafoqxwc=^3~%wS2d{1iO8uxj9{nOS`nzVY#`d$@*zM~5A-deQE-%Ymw4(U z9a(8DzP>oR`Dv%DIIbioow_a9!$A~di!ubgh!pDqOE~Zf-688{-iLfZ7n=;loWWG( z#HI6yWni>x+nhE#U=RmJm|3HVOe%ytMSYBHoQMxt=S2O5eqkwHFc0#s8E)%&{+}fmv42ismc)%V=6t5 z`OjZ8`K$felJ&u{;>db?K(XpnBD=HpjL;_ozOtob_fqd;oC7z0*wid4G9wL>@bV`p<1Ke5CaN)-knrTU zZs8Zm1cE#@wYvm#%&Bj*3^-2Bs^q6#BvFZsI_Q(AUHwftjDm_% z0F7S`M(1`Mj1t+MQ7pUm`&BY^oy(nir?MDrRi6)N;ew;U%Z?MSREFc7a_{)y zVAg`z0`Ah!iS%}*$wmt$_ov{VSh3ggaL0?^_#~kp0I`LJ5LDH^U-@d+;!FF&AiuW4 z&zzaqoI7MKvZ=)KGIi$Xp}WX<+`X7zEir|Kb0IZjOQJ$fLkBvG&4&HR0TjHA_f}h> zW;L!|Fy`95MYDy2g{BWj8-6LK;?t~R@-1m{=Y!syrcXB8;`H{)bC_9Mt#HzNEt#(v z5tbkrD=g77qHtCsjK}K@-0kndtt4L}>G{iM_89n)B4$E`ch!DejfTf;Au(O&^?p)Z0w0G>37cylV6#F zacTbcp7vRKK01E&-YlZ0=PTCP9swODmfaQ#UD&-`ju$+RL!tU7w-Qv+kKn?n9}|vo z9tv{RqVAuBRrcOZxD+>DiwxT&$#T*JeE>h0D9>gP{ZD@>_y-;fegHBI=L;`aB7E6J zer&JI%0z})(fA}G0_EMEvW}eKN0seVE?dYbG-6)jpOzw;@BYodA6 z9`!mQ7HE^tM!DU#mSMr@gbN=4L_o}M8W~Zf?%Q@vNrg~{aNEm#@)MG`(}RodFCE-5 zR$K4iIio^Y#g{|rH!S;Jr@mtslsjlJF;Ta)MNTxi>@Rj z$zJ4$q8_Oh3F!{8^}%NP(Q&8g0uiv3P3+hxS+i+a^TI!fXE3As$w@HxQm#y_6lJoCob2^@?}Wgf15k@O&tn|&Q1rj!1Q z?F7$AtvG*4Q}T*3*o%U{r&ec=`e_t}Efkwn?fzXN=K7L*nQkj}`OL#n_J*AG6sCKz zQqiuzgmqVYM-E3&@(%c3F%*zSGN?vYKIwAG5|YTr-k-L30RzK(-^QEK&^w`kTsO%i zY8Uhy^;rD13IX?~^Vh>-WJ5ogVAIXbN%{Cwv`zT~*EQ+TlZUMZZ*&oOg+${~GpZ9B zG{0DwcIu%t!lvEJ|Cg@Oa>F_Uz5W6JH%sCTTw_{-lwr{PVmu(_H39DrW zATG!=sKe8vOrLzVU{6>eSmV`0eK8Y*%mo}`Qx(l0km0i zoo|pH(R3E@H}14zn@SWc#v{8n^}KnLnF1ieR~;T?@PAvcHllN&c12_p3vL?!h9RiRoZ;;%- z-q1Uv6nq9HhIXc-C3$(1m)AH=C%s5O;KJT}b5WA*gWXfR^cLPLuO5oB zUDv2u!jbpIE2O({uT$eS5yJ{ITYPX^jYKr*Gt=+UdHdM!_Q;V?E5UcJx~5hus1IH2rMpp=vaL|<;tZpStG!IB zQ?A8o2HqmKv}Y%&QS<)mmBm{VU$?^%oAQH~7t4P0vl!WUocE(YByBDs=b_Ej$--ZZ zy&K;677AAqPU#Ky&-;&!MOrI{oP6_<`~Em729BG10+L`lVnlLHdEP%~%8!5Add zrZ`=-Fv72Atf?SlbJpdb4lYQehVEm=`F~RYVw()L#P}sAdS|x}V9d+i;|r4SF$@R) zFqt`*0Ta)4v{w96E*;G}92lXW)~rG=g4M@zx&`J4~rq3+Z#>=VfD^STyIu zuh82`xn+xk3_aG$V#s-mD1szG`@2Qo$oao?4~W(?`p%Y;&w_I{(cNGA`}@zVo+BKz zdFR7i_fRY}6KJwks-W()tl@8-s7#%C!|)IAXhb{9pV#rO9_~n8^@{U4oNqY1lv)Y@)*4$M#t44{15i%goexQ#qJ?GK}M?HIUQB{%-d}t$ztS+>cSh?$xQ^ zOq`utsFs;lx`}~xJEGL*SAH%*I0Pu!2nphGgU}Mx(l^FOui!kQFlcGRC|fX=ub{&k ztXYWM)Q4njxBY@r4LQrx4p zNFUM<;LpWCfbRRLWM|Z1CqVk!Xq>D4s@SXDuKDVE<-kY0O#a0xWJw}QZ!n13WTo}s z!1DK+k7>**n#)DcVBRM}{W(w0*!vUf0YXd8lR!O504KO!U)1lQ)p!FTDe4wt2yF_@ zdlfYO=q4O3yw=Bczd}4n^-WaZ1F#*G-D*UW3}0{QtQ)-O8_lgGJLEqrcJ5Q7D^>6} z*Gq1o%62c0O61RvQ~lXbcFH|=h*SGyBZ4mQ*ZRb=0-o!<{++W&Ou$!-%NZj4=9uvc9M0-h zj4h*=t31z?CHG`q_W`P{;|yW>ow8Vd1il@Q$)jJpmlkAT0Ju7x2eUV+|Fp1nsUZWr zwI79w3Jnug^5UB2^i@~9NkX1%f>|U(WN#A%qNzJ}It58Q+zix((TQRj{?mx$B!MzN zs%~mPqNks!ewYf<*XA)x3I9bgnfWIE_p&3S<=l3S)hqf0tkTsCPHh^A#)+Bk(@bL; zSaY6ff303n@{g<<=1;-Rp^5Cjqf_zTgZ%nx2iXU^A;Q24Se@n1s0};|UI9?xDWW4A zFCGP4m4MO=rfO#=D2o$_i8sC>ffpzrqjjYe+#uEy!=ZLGIUlNhrtsN>@rlXt#d~QN zbP4ZFNZZ&@+8h-9lVayihkqBt4nItKPrEC^${ld8Y~1ic_XY)x*H;BA8B{ILOO2UttFKNDfh*DV=xV)kJEe=16sVJF|!Lzg`xaUPq|J*a@haGvIt4 z#4v};?x5`oRUzG01SK2%)Q$WL#^4@NHV41qNX#m11naNkAG|8DTo%K80IJ^8O=4ff znDsc+j8&^=-8!1q?yl!$4ri8XF;;E-2v{KJXQh;bK?uh)_9AX|#>0yevqIJr6P$fK zDB|f8zLoP55q}N_`aDJ=oZO5xKiP{#%89RE!N24*e5%bQR*8}zh@vd#G2chirDE>> z{k0+hMfrN6PW$EMJAai*nCsV^uuQ2x+`^+oE#kA6#qn7k39TDlmS{@;nXz!CCXQ7) z%cWu8;_Cj~8!5#5C@bf1yjX)Z5JE&N3s-60bUX`(DIMWG#sd*=OH zIcK!WRs++}k&(9kh}BE*{kxUwtY4k5{z8cmBo~)#D$If+QdP&I{;dpBfdOmV^q3g2 zGi$Sbu8yI+f!+f7ZA@OAFf>66g{KBXwnnNO!-FH4#CZr zU>hlV*~@-+B00yo+fz-on7|Chc7B$HDOg_~$UnXyZq3Z$Hm6koaO_?^TRWnEX(C;l z>by_GG$-QR{zDK3yb^wH%PC7)ekheUT)JEC(Wq)hZBc$Kye4a9g41MyH7JEmqiOEU+g%ed)uL9!KFs_4ot^6F?aW#o$SgVC+S*z8< zrlX6-HPv(!MR(rWW+_kRFR-Ejq+m7E!YITW<)xD-mXZ+D zPXTjdQ1EVv{qV2ZGzRAesy4^o%A6(+jX5bB!%W)lcL%8ZYbVBTB)86d%?CP$myotigX5}(<5@+71V}|!!6$xEd$WWRF ziVY&3;8G1vH&@R5+&)Ce9z3(*zW!n~K|NAhbDU~!r~Mgc8vdyu124XR${HJlQtS8? zA9QG*8MnZ&pQVo7O{t1fsy1Y}KGmrd?qMXwpt7qxmTxLOViKdE#$u)M0sI#1;?sXU znc}~L?t7|{B8TX+k`J?L3F0+wA`v^a8=Cth6~PE3m?BJ)urdU$4D{*!B~w7#F?y5r znycY8X$Ebhjdg_}_M{%cn)c$Z{>BK*sD%I|VCon`v{15d4~phbld8kjwahf{r)dPc6YXag%OjU zVX|{p&=EsOsCC_sHlvfDouo)oDOp5+xHyL8th_bi5UP8MmM&Io0&@#0mS$_ZYbQgh znl~MD4!mb9$4;4}THIEa;>_iFQm(%ob#{&-D}Dg!xsoNZxy%(94T+H>0fyOAN0)HOX@+_*ww|ihbrz|4n1hUAlZ+Tc8X`wb%eKqf3#%@h61XPUN@@~ryJeo3 zwGf0fbUA=eH~t+>cB3rr?KjEG103720jb=`c_{?yq2J-A)E7;S%C_a{!l(wR^?~zJ z4;LE<3Am?bf9-j1gZ%PqnZ(UvBU!s*(Ts^;&e%Cx6pBZWv?zFkw zwS+k>cJs!gpeBJwf&Op(PZD<}-&)bSjeggA*M;ERK*}*)^Gb{&2Y39<$YwT8FxEdK zYBQ+|To`rMS+r!aPHq+TR~w-FbDR3-1nYgN+ASt13oet1xb`dn+X&PWVM-AF0myN* zFG_5~!j?EJG}=T%A+rJnA!=zOgi(_a{#*99g2^ z5rgTYJjt(!pTcHJl!noR3_uIip6z^^ns=*r-K31$edU3%y4h>DynWZ~aEZDQb{#7| z&X@SvC2t;ARYwa2co=Vgr}P3Gr0k!b*2`{!^1)QulV--$X~&d1YkrRW>Q(dgvOFpS zq?8pnn=q?Qp0Xm=Ry!T^n6Ugb5AXb!kA7p*^gpdgOcY~iJr&vQ%f?+V7^F2EveGgO z4hCUqn?@v$HiL3m+(M5ecZVvn2@<5?xX6pA<@&)7{el}V3z7Exji8c1bF-tZU&&R9 zGiFBFDJTQsD6{GGA`yEuc{1;6bI9Yh(0K*~fd;OGqVruK-uUqH?yD>Ajj!7xYO=Gc zvo>JyL?ofqs4wKF7@uE;}CE znJtk#bB=!8yzDU}HNTpxX0u@H|0)IMqz!+^x-3K=7W$-Cw40WGJTh|S1DU1BIPhi@ zmQqMIQipvxKO;Mx7qb7|ZfT6QG{d*E2IwEF{XAA;h}A7e*teFqKccp)(xjg)sRK?0 z2R8a)RK6E_bvvW5;2`#=c56t-$|Jr95+SAc>Y4+4O znO;oucdgOPEs5T{9wm{zmSv*mL|lu7XIe7~V7&1^xjy7cz}`u6w~$Z=GJN#8@c4er z_s*e8rOYs52W4hN_}*r^1A?s_?@`_50Xj9ZX_4Cncm8q-ZNf5IN?D5ecydE<6{S1U z;4j5)_?T{Vd9er-iBe8|PS?~LhOnipB{4Idz_07)gR;y(y1Bwge@Uk|LO6(S7K?{l z$Vavm<$ZSky39l#=!t5oK{{Ge@oDJPIOWLaMer%*EkV+>58|9fqO<}db1mbK@pIU| zG;@Jo;;3Nmbdi*ZfnQ4#&7X{gVXt9{^qTZY;B8^8j;~d&i|d-mNgbRaxX7|Q(#hv9 zNz9c5EZ_qux9U1Ae$u-0dTY9FF5Wtx)=tNtsW4_1vvnQ%(cbktGL))VdrR-^g;5EV zNJ~pnW+lk6pM1`x<}_BfS6OZ!;Y?TDT1Oez#?GMIfs&+;l_`+GUD3~DdFj&+Qd7~< zn9z1pgH1n5FpU#|s~_>f2A}+R*~ASwd7};-+bJ{WQB%&yrmNsvOXoO8DL05@)00t> zf)Qn(6{n*YvG`45A-^XqaQ*Mz! zqpA8!vb#4n;TUZ-x#Hn)4DYB}Ozq!Z!H6;_f35znrR<1Y@t%uCIyw7twtBYJsE5YS zkdtmxbwFgtI^Q#5-=HVd+jRF*)ymJmK>l7#hC~dqWw9;96W}yb(qlxSQiVm1sfmPBj^C zen@Aa6JrXlm8U4m%nXCcisxXTld69R)!tclMCSN*xMKg1pJ$J~;~lzepP3e;jxNFTvzpN&e|-HB6)I% zh7OVkx*g|gNzQqFt=k_py$2KN!JqSqzkSyI-fnpVgeS15C{DnZ6AJuG)MO(sfAhlX zqzNhg`9`T4FCmnlg8v2OZ%0~W1x)2dKbfS}$Z)BsNr}kFbBgpbiSlYt>yHuV<(CJD zz#kan#rCIt!=T-s*;MQ@YauV|945kyv-Y9BrA9&}sYHz#>arO*#&W{zf-|_-lV%yD zC`{1jqvhJH{WOJm->UhZ^KR1!tp&W8MdF)${@jsdRO(dn9=m$H5`Se1;`K z(TYE2+DA9rx~jR6f5{dsK&~v7Vv3_CdwVqt|C?|pI#DxWHjT334-pwL6v7o1?p8~N zXv4*VSHkBFM(+L2qgm3U&Z?$;U88|!2NUJV$&ouWish@JhB+EgIIbA(F-%)kuf!1z zL(<$qYIas4w3QOOJ(i1NVNUcK=d?m5fOP5l0q`EceE`aT?x~0yesIji^h+GiN$-f2 zNH2d;7wq<5-|-3_MD}1Aj1fszpPkL^l~Y&BjV|TPR6hJ}AjD8)Gh>}x+}9=~YClv{ zf{)fuW;x&Hf+}J0@%Yv%9#!mBdRX{dokcs2Al)k2#8K5!D zJLg&+w9dq3Q{q-~_u;>s6N@gB(N`9wvb|rkl!v~*%6NvUDNZ>R}kZ<1E-r8&!77&Eyeq6N=#8;T*I06hiYK!=ik1< zopv3|7EzfqYHqJfeG(Z^|8;7#p?1%(u`xZbuVB|-4TX-6*T;9h zD}D)rh<^AadFrWq&&4rQbd2JSoyf}j_fu0g0AGI4W?*p<<=N?_I(ZC)&$}~V`A(1ZPyzqWn=L2Lw}ycj=&s5`&7VA<^juVbetIG#i9 z5JYrIV?XAHmN2+mB-wKcM2CI-SA%0zN_cCmf)N}1`*$N^z<^EjiS*H9nH?$%8ZD*w z$9D>7j9JG4qc4B?XbxNDL`;w>^|Re{^aH zW%bOn<)5*cVT?l(*@&stnBO=~OP)EoNe-RIOg=YU9gJ;%i_lfI?`t9}rW)V;PX?RD mv=4ViK7bqs&|=IP?9q&LO}LF$gxf}?GylIcj_LgTSo$B0FZNXc diff --git a/e2e/dms/ecc/3.txt b/e2e/dms/ecc/3.txt deleted file mode 100644 index 5ef648a885..0000000000 --- a/e2e/dms/ecc/3.txt +++ /dev/null @@ -1 +0,0 @@ -It works! \ No newline at end of file diff --git a/front/core/directives/zoom-image.js b/front/core/directives/zoom-image.js index 607dbe3378..a5d57bd14f 100644 --- a/front/core/directives/zoom-image.js +++ b/front/core/directives/zoom-image.js @@ -46,7 +46,7 @@ export function directive($timeout) { $element.on('click', function(event) { if (event.defaultPrevented) return; - let src = $attrs.zoomImage || $attrs.src; + let src = $element[0].getAttribute('zoom-image') || $element[0].src; if (src) createContainers(src); else diff --git a/front/salix/components/descriptor/style.scss b/front/salix/components/descriptor/style.scss index 814df2ca50..bad94a9345 100644 --- a/front/salix/components/descriptor/style.scss +++ b/front/salix/components/descriptor/style.scss @@ -5,6 +5,24 @@ vn-descriptor-content { display: block; + .photo { + position: relative; + + & > img[ng-src] { + min-height: 16em; + display: block; + height: 100%; + width: 100%; + } + + vn-float-button { + position: absolute; + margin: 1em; + bottom: 0; + right: 0 + } + } + & > vn-spinner { display: block; height: 40px; diff --git a/front/salix/components/index.js b/front/salix/components/index.js index 1586272c09..13f8366cd1 100644 --- a/front/salix/components/index.js +++ b/front/salix/components/index.js @@ -13,3 +13,4 @@ import './section'; import './summary'; import './topbar/topbar'; import './user-popover'; +import './upload-photo'; diff --git a/front/salix/components/upload-photo/index.html b/front/salix/components/upload-photo/index.html new file mode 100644 index 0000000000..fc5b6c7352 --- /dev/null +++ b/front/salix/components/upload-photo/index.html @@ -0,0 +1,23 @@ + + + +
+
+ + + + +
+ + + + +
\ No newline at end of file diff --git a/front/salix/components/upload-photo/index.js b/front/salix/components/upload-photo/index.js new file mode 100644 index 0000000000..aa3c1a22a1 --- /dev/null +++ b/front/salix/components/upload-photo/index.js @@ -0,0 +1,87 @@ +import ngModule from '../../module'; +import Component from 'core/lib/component'; +import './style.scss'; + +/** + * Small card with basing entity information and actions. + */ +export default class UploadPhoto extends Component { + /** + * Opens the dialog and sets the default data + * @param {*} collection - Collection name + * @param {*} id - Entity id + */ + show(collection, id) { + this.newPhoto = {id, collection}; + this.$.dialog.show(); + } + + /** + * Updates the image preview + * + * @param {string} value + */ + updatePhotoPreview(value) { + if (value && value[0]) { + const reader = new FileReader(); + reader.onload = e => this.$.photo.src = e.target.result; + reader.readAsDataURL(value[0]); + } + } + + /** + * Dialog response handler + * + * @return {boolean} Response + */ + onUploadAccept() { + try { + if (!this.newPhoto.files) + throw new Error(`Select an image`); + + this.makeRequest(); + } catch (e) { + this.vnApp.showError(this.$t(e.message)); + return false; + } + return true; + } + + /** + * Performs a cancellable request. + * + */ + makeRequest() { + if (this.canceler) this.canceler.resolve(); + this.canceler = this.$q.defer(); + + const options = { + method: 'POST', + url: `Images/upload`, + params: this.newPhoto, + headers: {'Content-Type': undefined}, + timeout: this.canceler.promise, + transformRequest: files => { + const formData = new FormData(); + for (let i = 0; i < files.length; i++) + formData.append(files[i].name, files[i]); + + return formData; + }, + data: this.newPhoto.files + }; + + this.$http(options) + .then(() => this.vnApp.showSuccess(this.$t('Data saved!'))) + .then(() => this.emit('response')) + .finally(() => this.canceler = null); + } +} + +ngModule.vnComponent('vnUploadPhoto', { + controller: UploadPhoto, + template: require('./index.html'), + bindings: { + data: '<' + } +}); diff --git a/front/salix/components/upload-photo/locale/es.yml b/front/salix/components/upload-photo/locale/es.yml new file mode 100644 index 0000000000..10271cf921 --- /dev/null +++ b/front/salix/components/upload-photo/locale/es.yml @@ -0,0 +1,2 @@ +Upload new photo: Subir una nueva foto +Select an image: Selecciona una imagen \ No newline at end of file diff --git a/front/salix/components/upload-photo/style.scss b/front/salix/components/upload-photo/style.scss new file mode 100644 index 0000000000..cdf35341fa --- /dev/null +++ b/front/salix/components/upload-photo/style.scss @@ -0,0 +1,31 @@ +@import "./variables"; + +.upload-photo { + .photo { + position: relative; + margin: 0 auto; + text-align: center; + + & > div { + border: 3px solid $color-primary; + max-width: 256px; + max-height: 256px; + border-radius: 50%; + overflow: hidden + } + + & > div > img[ng-src] { + width: 256px; + height: 256px; + display: block; + height: 100%; + width: 100%; + } + } + + & > vn-spinner { + display: block; + height: 40px; + padding: $spacing-md; + } +} diff --git a/front/salix/components/user-popover/index.html b/front/salix/components/user-popover/index.html index 9bd0f14117..22d86f1aaa 100644 --- a/front/salix/components/user-popover/index.html +++ b/front/salix/components/user-popover/index.html @@ -14,7 +14,7 @@
diff --git a/front/salix/components/user-popover/index.js b/front/salix/components/user-popover/index.js index e4d7b44664..0d35d89950 100644 --- a/front/salix/components/user-popover/index.js +++ b/front/salix/components/user-popover/index.js @@ -78,10 +78,6 @@ class Controller { this.$.companies.refresh(); this.$.popover.show(event.target); } - - getImageUrl(userId) { - return '/api/Images/user/160x160/' + userId + '/download?access_token=' + this.vnToken.token; - } } Controller.$inject = ['$scope', '$translate', 'vnConfig', 'vnAuth', 'vnToken']; diff --git a/front/salix/module.js b/front/salix/module.js index 2c61af4d1d..a8de61ae07 100644 --- a/front/salix/module.js +++ b/front/salix/module.js @@ -7,9 +7,14 @@ export const appName = 'salix'; const ngModule = ng.module('salix', ['vnCore']); export default ngModule; -run.$inject = ['$window', '$rootScope', 'vnAuth', 'vnApp', '$state']; -export function run($window, $rootScope, vnAuth, vnApp, $state) { - $rootScope.imagePath = appConfig.imagePath; +run.$inject = ['$window', '$rootScope', 'vnAuth', 'vnApp', 'vnToken', '$state']; +export function run($window, $rootScope, vnAuth, vnApp, vnToken, $state) { + $rootScope.imagePath = (collection, size, id) => { + if (!collection || !size || !id) return; + + const basePath = `/api/Images/${collection}/${size}/${id}`; + return `${basePath}/download?access_token=${vnToken.token}`; + }; $window.validations = {}; vnApp.name = appName; diff --git a/loopback/locale/es.json b/loopback/locale/es.json index f75b1778eb..0080228aec 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -160,5 +160,6 @@ "The social name cannot be empty": "La razón social no puede quedar en blanco", "The nif cannot be empty": "El NIF no puede quedar en blanco", "You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados", - "ASSIGN_ZONE_FIRST": "Asigna una zona primero" + "ASSIGN_ZONE_FIRST": "Asigna una zona primero", + "You can't upload images on the test environment": "No puedes subir imágenes en el entorno de pruebas" } \ No newline at end of file diff --git a/loopback/server/boot/storage.js b/loopback/server/boot/storage.js index 12662ab73f..7559a7dec5 100644 --- a/loopback/server/boot/storage.js +++ b/loopback/server/boot/storage.js @@ -2,7 +2,7 @@ const uuid = require('uuid/v1'); const md5 = require('md5'); module.exports = app => { - const storageConnector = app.dataSources.storage.connector; + const storageConnector = app.dataSources.dmsStorage.connector; storageConnector.getFilename = function(file) { return `${uuid()}.${storageConnector.getFileExtension(file.name)}`; @@ -15,4 +15,17 @@ module.exports = app => { storageConnector.getPathHash = function(id) { return md5(id.toString()).substring(0, 3); }; + + const imageStorageConnector = app.dataSources.imageStorage.connector; + imageStorageConnector.getFilename = function(file) { + return `${uuid()}.png`; + }; + + /* imageStorageConnector.getFileExtension = function(fileName) { + return fileName.split('.').pop().toLowerCase(); + }; + + imageStorageConnector.getPathHash = function(id) { + return md5(id.toString()).substring(0, 3); + }; */ }; diff --git a/loopback/server/datasources.json b/loopback/server/datasources.json index 0ea6344848..793dcaea8e 100644 --- a/loopback/server/datasources.json +++ b/loopback/server/datasources.json @@ -17,11 +17,11 @@ "connectTimeout": 40000, "acquireTimeout": 20000 }, - "storage": { - "name": "storage", + "dmsStorage": { + "name": "dmsStorage", "connector": "loopback-component-storage", "provider": "filesystem", - "root": "./e2e/dms", + "root": "./storage/dms", "maxFileSize": "262144000", "allowedContentTypes": [ "application/x-7z-compressed", @@ -36,5 +36,17 @@ "image/jpeg", "image/jpg" ] + }, + "imageStorage": { + "name": "imageStorage", + "connector": "loopback-component-storage", + "provider": "filesystem", + "root": "./storage/image", + "maxFileSize": "52428800", + "allowedContentTypes": [ + "image/png", + "image/jpeg", + "image/jpg" + ] } } diff --git a/modules/claim/back/methods/claim-dms/allowedContentTypes.js b/modules/claim/back/methods/claim-dms/allowedContentTypes.js index 2f5183f926..3d4b908767 100644 --- a/modules/claim/back/methods/claim-dms/allowedContentTypes.js +++ b/modules/claim/back/methods/claim-dms/allowedContentTypes.js @@ -13,7 +13,7 @@ module.exports = Self => { }); Self.allowedContentTypes = async() => { - const storageConnector = Self.app.dataSources.storage.connector; + const storageConnector = Self.app.dataSources.dmsStorage.connector; const allowedContentTypes = storageConnector.allowedContentTypes; const modelAllowedContentTypes = Self.definition.settings.allowedContentTypes; diff --git a/modules/client/back/methods/client-dms/allowedContentTypes.js b/modules/client/back/methods/client-dms/allowedContentTypes.js index 2f5183f926..3d4b908767 100644 --- a/modules/client/back/methods/client-dms/allowedContentTypes.js +++ b/modules/client/back/methods/client-dms/allowedContentTypes.js @@ -13,7 +13,7 @@ module.exports = Self => { }); Self.allowedContentTypes = async() => { - const storageConnector = Self.app.dataSources.storage.connector; + const storageConnector = Self.app.dataSources.dmsStorage.connector; const allowedContentTypes = storageConnector.allowedContentTypes; const modelAllowedContentTypes = Self.definition.settings.allowedContentTypes; diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html index 4e0c6ded84..6ab675d76b 100644 --- a/modules/entry/front/latest-buys/index.html +++ b/modules/entry/front/latest-buys/index.html @@ -70,8 +70,8 @@ diff --git a/modules/item/back/methods/item-image-queue/downloadImages.js b/modules/item/back/methods/item-image-queue/downloadImages.js index d953d19383..ec9177505a 100644 --- a/modules/item/back/methods/item-image-queue/downloadImages.js +++ b/modules/item/back/methods/item-image-queue/downloadImages.js @@ -57,7 +57,7 @@ module.exports = Self => { writeStream.on('finish', async function() { try { - await models.Image.registerImage('catalog', fileName, filePath); + await models.Image.registerImage('catalog', filePath, image.itemFk); await image.destroy(); } catch (error) { await errorHandler(image.itemFk, error, filePath); diff --git a/modules/item/front/card/index.html b/modules/item/front/card/index.html index f547a9e7a4..b7513a42a5 100644 --- a/modules/item/front/card/index.html +++ b/modules/item/front/card/index.html @@ -1,5 +1,5 @@ - + diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html index 8363a652f2..168325a103 100644 --- a/modules/item/front/descriptor/index.html +++ b/modules/item/front/descriptor/index.html @@ -16,19 +16,15 @@ -
- - - - - +
+ + +
@@ -102,4 +98,10 @@ - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/modules/item/front/descriptor/index.js b/modules/item/front/descriptor/index.js index 2791e960a6..195a97d13a 100644 --- a/modules/item/front/descriptor/index.js +++ b/modules/item/front/descriptor/index.js @@ -3,6 +3,11 @@ import Descriptor from 'salix/components/descriptor'; import './style.scss'; class Controller extends Descriptor { + constructor($element, $, $rootScope) { + super($element, $); + this.$rootScope = $rootScope; + } + get item() { return this.entity; } @@ -65,13 +70,27 @@ class Controller extends Descriptor { this.$http.post(`Items/${this.item.id}/clone`) .then(res => this.$state.go('item.card.tags', {id: res.data.id})); } + + onUploadResponse() { + const timestamp = new Date().getTime(); + const src = this.$rootScope.imagePath('catalog', '200x200', this.item.id); + const zoomSrc = this.$rootScope.imagePath('catalog', '1600x900', this.item.id); + const newSrc = `${src}&t=${timestamp}`; + const newZoomSrc = `${zoomSrc}&t=${timestamp}`; + + this.$.photo.setAttribute('src', newSrc); + this.$.photo.setAttribute('zoom-image', newZoomSrc); + } } +Controller.$inject = ['$element', '$scope', '$rootScope']; + ngModule.vnComponent('vnItemDescriptor', { template: require('./index.html'), controller: Controller, bindings: { item: '<', - dated: '<' + dated: '<', + cardReload: '&' } }); diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index 0d4ae61f34..8b03bc0d6b 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -35,8 +35,8 @@ ui-sref="item.card.summary({id: item.id})"> @@ -44,7 +44,7 @@ - {{::item.id | zeroFill:6}} + {{::item.id}} {{::item.grouping | dashIfEmpty}} diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html index e9c835dac9..5fb556bd46 100644 --- a/modules/item/front/summary/index.html +++ b/modules/item/front/summary/index.html @@ -11,8 +11,8 @@ + ng-src="{{$root.imagePath('catalog', '200x200', $ctrl.item.id)}}" + zoom-image="{{$root.imagePath('catalog', '1600x900', $ctrl.item.id)}}" on-error-src/>

Visible

diff --git a/modules/order/front/catalog-view/index.html b/modules/order/front/catalog-view/index.html index 2d7492d87d..25d84db759 100644 --- a/modules/order/front/catalog-view/index.html +++ b/modules/order/front/catalog-view/index.html @@ -5,11 +5,11 @@
-
+
diff --git a/modules/order/front/line/index.html b/modules/order/front/line/index.html index 1ba6e3f9c6..51702e16ed 100644 --- a/modules/order/front/line/index.html +++ b/modules/order/front/line/index.html @@ -32,8 +32,8 @@ diff --git a/modules/ticket/back/methods/ticket-dms/allowedContentTypes.js b/modules/ticket/back/methods/ticket-dms/allowedContentTypes.js index 2f5183f926..3d4b908767 100644 --- a/modules/ticket/back/methods/ticket-dms/allowedContentTypes.js +++ b/modules/ticket/back/methods/ticket-dms/allowedContentTypes.js @@ -13,7 +13,7 @@ module.exports = Self => { }); Self.allowedContentTypes = async() => { - const storageConnector = Self.app.dataSources.storage.connector; + const storageConnector = Self.app.dataSources.dmsStorage.connector; const allowedContentTypes = storageConnector.allowedContentTypes; const modelAllowedContentTypes = Self.definition.settings.allowedContentTypes; diff --git a/modules/ticket/front/picture/index.html b/modules/ticket/front/picture/index.html index 52cab5b31b..c95e604dd0 100644 --- a/modules/ticket/front/picture/index.html +++ b/modules/ticket/front/picture/index.html @@ -19,8 +19,8 @@
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index 90cfa39d13..ed3cbc02b9 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -93,8 +93,8 @@ diff --git a/modules/travel/back/methods/travel-thermograph/allowedContentTypes.js b/modules/travel/back/methods/travel-thermograph/allowedContentTypes.js index 2f5183f926..3d4b908767 100644 --- a/modules/travel/back/methods/travel-thermograph/allowedContentTypes.js +++ b/modules/travel/back/methods/travel-thermograph/allowedContentTypes.js @@ -13,7 +13,7 @@ module.exports = Self => { }); Self.allowedContentTypes = async() => { - const storageConnector = Self.app.dataSources.storage.connector; + const storageConnector = Self.app.dataSources.dmsStorage.connector; const allowedContentTypes = storageConnector.allowedContentTypes; const modelAllowedContentTypes = Self.definition.settings.allowedContentTypes; diff --git a/modules/travel/front/thermograph/create/index.js b/modules/travel/front/thermograph/create/index.js index 4b4cebb9f0..df8d0fe687 100644 --- a/modules/travel/front/thermograph/create/index.js +++ b/modules/travel/front/thermograph/create/index.js @@ -46,7 +46,7 @@ class Controller extends Section { warehouseId: warehouseId, companyId: companyId, dmsTypeId: dmsTypeId, - description: this.$t('FileDescription', { + description: this.$t('TravelFileDescription', { travelId: this.travel.id }).toUpperCase() }; diff --git a/modules/travel/front/thermograph/locale/es.yml b/modules/travel/front/thermograph/locale/es.yml index 0e3bc99fc7..1fdb98c8e7 100644 --- a/modules/travel/front/thermograph/locale/es.yml +++ b/modules/travel/front/thermograph/locale/es.yml @@ -8,7 +8,7 @@ Upload file: Subir fichero Edit file: Editar fichero Upload: Subir File: Fichero -FileDescription: Travel id {{travelId}} +TravelFileDescription: Travel id {{travelId}} ContentTypesInfo: 'Tipos de archivo permitidos: {{allowedContentTypes}}' Are you sure you want to continue?: ¿Seguro que quieres continuar? Add thermograph: Añadir termógrafo diff --git a/modules/worker/back/methods/worker-dms/allowedContentTypes.js b/modules/worker/back/methods/worker-dms/allowedContentTypes.js index 2f5183f926..3d4b908767 100644 --- a/modules/worker/back/methods/worker-dms/allowedContentTypes.js +++ b/modules/worker/back/methods/worker-dms/allowedContentTypes.js @@ -13,7 +13,7 @@ module.exports = Self => { }); Self.allowedContentTypes = async() => { - const storageConnector = Self.app.dataSources.storage.connector; + const storageConnector = Self.app.dataSources.dmsStorage.connector; const allowedContentTypes = storageConnector.allowedContentTypes; const modelAllowedContentTypes = Self.definition.settings.allowedContentTypes; diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html index fb22644941..bceadff333 100644 --- a/modules/worker/front/descriptor/index.html +++ b/modules/worker/front/descriptor/index.html @@ -1,6 +1,18 @@ + +
+ + + +
+
- \ No newline at end of file + + + + + \ No newline at end of file diff --git a/modules/worker/front/descriptor/index.js b/modules/worker/front/descriptor/index.js index 98f8f2f723..c5dc1ea2c8 100644 --- a/modules/worker/front/descriptor/index.js +++ b/modules/worker/front/descriptor/index.js @@ -2,6 +2,11 @@ import ngModule from '../module'; import Descriptor from 'salix/components/descriptor'; class Controller extends Descriptor { + constructor($element, $, $rootScope) { + super($element, $); + this.$rootScope = $rootScope; + } + get worker() { return this.entity; } @@ -48,8 +53,21 @@ class Controller extends Descriptor { return this.getData(`Workers/${this.id}`, {filter}) .then(res => this.entity = res.data); } + + onUploadResponse() { + const timestamp = new Date().getTime(); + const src = this.$rootScope.imagePath('user', '520x520', this.worker.id); + const zoomSrc = this.$rootScope.imagePath('user', '1600x900', this.worker.id); + const newSrc = `${src}&t=${timestamp}`; + const newZoomSrc = `${zoomSrc}&t=${timestamp}`; + + this.$.photo.setAttribute('src', newSrc); + this.$.photo.setAttribute('zoom-image', newZoomSrc); + } } +Controller.$inject = ['$element', '$scope', '$rootScope']; + ngModule.vnComponent('vnWorkerDescriptor', { template: require('./index.html'), controller: Controller, From 6605e5ae4cbbde79e568544b710b8b1730765b25 Mon Sep 17 00:00:00 2001 From: bernat Date: Wed, 2 Dec 2020 12:05:47 +0100 Subject: [PATCH 011/101] zoneLog --- db/changes/10260-december/00-zoneLog.sql | 18 ++++++ modules/zone/back/model-config.json | 3 + modules/zone/back/models/zone-log.json | 58 ++++++++++++++++++++ modules/zone/back/models/zone-warehouse.json | 6 +- modules/zone/back/models/zone.json | 6 +- modules/zone/front/index.js | 1 + modules/zone/front/log/index.html | 1 + modules/zone/front/log/index.js | 7 +++ modules/zone/front/routes.json | 6 ++ 9 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 db/changes/10260-december/00-zoneLog.sql create mode 100644 modules/zone/back/models/zone-log.json create mode 100644 modules/zone/front/log/index.html create mode 100644 modules/zone/front/log/index.js diff --git a/db/changes/10260-december/00-zoneLog.sql b/db/changes/10260-december/00-zoneLog.sql new file mode 100644 index 0000000000..13d81bc92a --- /dev/null +++ b/db/changes/10260-december/00-zoneLog.sql @@ -0,0 +1,18 @@ +CREATE TABLE `vn`.`zoneLog` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `originFk` int(10) NOT NULL, + `userFk` int(10) unsigned DEFAULT 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 `originFk` (`originFk`), + KEY `userFk` (`userFk`), + CONSTRAINT `zoneLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `vn`.`zone` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `zoneLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; \ No newline at end of file diff --git a/modules/zone/back/model-config.json b/modules/zone/back/model-config.json index f353be088f..05da8b2c32 100644 --- a/modules/zone/back/model-config.json +++ b/modules/zone/back/model-config.json @@ -31,5 +31,8 @@ }, "ZoneEstimatedDelivery": { "dataSource": "vn" + }, + "ZoneLog": { + "dataSource": "vn" } } diff --git a/modules/zone/back/models/zone-log.json b/modules/zone/back/models/zone-log.json new file mode 100644 index 0000000000..ddca9261b1 --- /dev/null +++ b/modules/zone/back/models/zone-log.json @@ -0,0 +1,58 @@ +{ + "name": "ZoneLog", + "base": "VnModel", + "options": { + "mysql": { + "table": "zoneLog" + } + }, + "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"] + } +} diff --git a/modules/zone/back/models/zone-warehouse.json b/modules/zone/back/models/zone-warehouse.json index 14c4e84a4b..0f0e43f4ab 100644 --- a/modules/zone/back/models/zone-warehouse.json +++ b/modules/zone/back/models/zone-warehouse.json @@ -1,6 +1,10 @@ { "name": "ZoneWarehouse", - "base": "VnModel", + "base": "Loggable", + "log": { + "model":"ZoneLog", + "relation": "zone" + }, "options": { "mysql": { "table": "zoneWarehouse" diff --git a/modules/zone/back/models/zone.json b/modules/zone/back/models/zone.json index e941469467..1d1ccfd90d 100644 --- a/modules/zone/back/models/zone.json +++ b/modules/zone/back/models/zone.json @@ -1,6 +1,10 @@ { "name": "Zone", - "base": "VnModel", + "base": "Loggable", + "log": { + "model":"ZoneLog", + "showField": "name" + }, "options": { "mysql": { "table": "zone" diff --git a/modules/zone/front/index.js b/modules/zone/front/index.js index 26c4917099..dc20eea470 100644 --- a/modules/zone/front/index.js +++ b/modules/zone/front/index.js @@ -16,3 +16,4 @@ import './calendar'; import './location'; import './calendar'; import './upcoming-deliveries'; +import './log'; diff --git a/modules/zone/front/log/index.html b/modules/zone/front/log/index.html new file mode 100644 index 0000000000..539afda820 --- /dev/null +++ b/modules/zone/front/log/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/modules/zone/front/log/index.js b/modules/zone/front/log/index.js new file mode 100644 index 0000000000..8c3be24239 --- /dev/null +++ b/modules/zone/front/log/index.js @@ -0,0 +1,7 @@ +import ngModule from '../module'; +import Section from 'salix/components/section'; + +ngModule.vnComponent('vnZoneLog', { + template: require('./index.html'), + controller: Section, +}); diff --git a/modules/zone/front/routes.json b/modules/zone/front/routes.json index 6c799dcc84..0134c3b782 100644 --- a/modules/zone/front/routes.json +++ b/modules/zone/front/routes.json @@ -14,6 +14,7 @@ {"state": "zone.card.basicData", "icon": "settings"}, {"state": "zone.card.location", "icon": "my_location"}, {"state": "zone.card.warehouses", "icon": "home"}, + {"state": "zone.card.log", "icon": "history"}, {"state": "zone.card.events", "icon": "today"} ] }, @@ -84,6 +85,11 @@ "params": { "zone": "$ctrl.zone" } + }, { + "url" : "/log", + "state": "zone.card.log", + "component": "vn-zone-log", + "description": "Log" } ] } \ No newline at end of file From 6eeecc553ba9fc301104dfa213a14946a419d6d9 Mon Sep 17 00:00:00 2001 From: bernat Date: Wed, 2 Dec 2020 12:49:50 +0100 Subject: [PATCH 012/101] zoneLog calendar --- modules/zone/back/models/zone-event.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/zone/back/models/zone-event.json b/modules/zone/back/models/zone-event.json index 9ac1007b52..54c9c4a7d3 100644 --- a/modules/zone/back/models/zone-event.json +++ b/modules/zone/back/models/zone-event.json @@ -1,6 +1,10 @@ { "name": "ZoneEvent", - "base": "VnModel", + "base": "Loggable", + "log": { + "model":"ZoneLog", + "relation": "zone" + }, "options": { "mysql": { "table": "zoneEvent" From aaee855da3a7c289200bdd784cc80e3b94633f46 Mon Sep 17 00:00:00 2001 From: bernat Date: Thu, 3 Dec 2020 10:26:49 +0100 Subject: [PATCH 013/101] fix ticket component --- modules/ticket/front/component/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/front/component/index.js b/modules/ticket/front/component/index.js index 2a5988719b..307f8af153 100644 --- a/modules/ticket/front/component/index.js +++ b/modules/ticket/front/component/index.js @@ -39,7 +39,7 @@ class Controller extends Section { if (!value) return; this.getTheoricalCost(); this.getComponentsSum(); - if (this.ticket.zone.isVolumetric) + if (this.ticket.zone && this.ticket.zone.isVolumetric) this.getTicketVolume(); } From 96f603a44b0fcb2d36b6dafa85bfca38fc2dbf4c Mon Sep 17 00:00:00 2001 From: bernat Date: Fri, 4 Dec 2020 13:40:58 +0100 Subject: [PATCH 014/101] refactor descriptors --- e2e/paths/04-item/12_descriptor.spec.js | 15 +++------------ .../05-ticket/01-sale/02_edit_sale.spec.js | 1 - e2e/paths/05-ticket/12_descriptor.spec.js | 6 +----- front/core/styles/icons/salixfont.css | 14 ++++++++++---- front/core/styles/icons/salixfont.svg | 6 ++++-- front/core/styles/icons/salixfont.ttf | Bin 32980 -> 34968 bytes front/core/styles/icons/salixfont.woff | Bin 33056 -> 35044 bytes front/salix/components/descriptor/style.scss | 8 ++------ modules/account/front/descriptor/index.html | 4 ++-- modules/client/front/descriptor/index.html | 10 +++++----- modules/entry/front/descriptor/index.html | 4 ++-- modules/item/front/descriptor/index.html | 2 +- modules/route/front/descriptor/index.html | 2 +- modules/supplier/front/descriptor/index.html | 4 ++-- modules/ticket/front/descriptor/index.html | 10 +++++----- 15 files changed, 38 insertions(+), 48 deletions(-) diff --git a/e2e/paths/04-item/12_descriptor.spec.js b/e2e/paths/04-item/12_descriptor.spec.js index 7c6fa074c8..eb9ed25732 100644 --- a/e2e/paths/04-item/12_descriptor.spec.js +++ b/e2e/paths/04-item/12_descriptor.spec.js @@ -16,14 +16,6 @@ describe('Item descriptor path', () => { await browser.close(); }); - it('should check the descriptor inactive icon is dark as the item is active', async() => { - await page.waitForSelector(selectors.itemDescriptor.inactiveIcon); - await page.waitForClassNotPresent(selectors.itemDescriptor.inactiveIcon, 'bright'); - const darkIcon = await page.isVisible(selectors.itemDescriptor.inactiveIcon); - - expect(darkIcon).toBeTruthy(); - }); - it('should set the item to inactive', async() => { await page.waitToClick(selectors.itemBasicData.isActiveCheckbox); await page.waitToClick(selectors.itemBasicData.submitBasicDataButton); @@ -32,12 +24,11 @@ describe('Item descriptor path', () => { expect(message.text).toContain('Data saved!'); }); - it('should reload the section and check the inactive icon is bright', async() => { + it('should reload the section and check the inactive icon is visible', async() => { await page.reloadSection('item.card.basicData'); - await page.waitForClassPresent(selectors.itemDescriptor.inactiveIcon, 'bright'); - const brightIcon = await page.isVisible(selectors.itemDescriptor.inactiveIcon); + const visibleIcon = await page.isVisible(selectors.itemDescriptor.inactiveIcon); - expect(brightIcon).toBeTruthy(); + expect(visibleIcon).toBeTruthy(); }); it('should set the item back to active', async() => { diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js index 248f38927a..d0c0cfeda8 100644 --- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js +++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js @@ -397,6 +397,5 @@ describe('Ticket Edit sale path', () => { it(`should check the ticket is deleted`, async() => { await page.waitForSelector(selectors.ticketDescriptor.isDeletedIcon); - await page.waitForClassPresent(selectors.ticketDescriptor.isDeletedIcon, 'bright'); }); }); diff --git a/e2e/paths/05-ticket/12_descriptor.spec.js b/e2e/paths/05-ticket/12_descriptor.spec.js index c426f7d7f3..1c78953824 100644 --- a/e2e/paths/05-ticket/12_descriptor.spec.js +++ b/e2e/paths/05-ticket/12_descriptor.spec.js @@ -56,7 +56,7 @@ describe('Ticket descriptor path', () => { await page.write(selectors.ticketsIndex.topbarSearch, '18'); await page.waitToClick(selectors.globalItems.searchButton); await page.waitForState('ticket.card.summary'); - await page.waitForClassPresent(selectors.ticketDescriptor.isDeletedIcon, 'bright'); + await page.isVisible(selectors.ticketDescriptor.isDeletedIcon); const result = await page.waitToGetProperty(selectors.ticketsIndex.searchResultDate, 'innerText'); expect(result).toContain(2000); @@ -73,10 +73,6 @@ describe('Ticket descriptor path', () => { expect(message.text).toContain('Data saved!'); }); - - it('should make sure the ticketDeleted icon is no longer bright', async() => { - await page.waitForClassNotPresent(selectors.ticketDescriptor.isDeletedIcon, 'bright'); - }); }); describe('Add stowaway', () => { diff --git a/front/core/styles/icons/salixfont.css b/front/core/styles/icons/salixfont.css index aafc549a12..bdd37b2902 100644 --- a/front/core/styles/icons/salixfont.css +++ b/front/core/styles/icons/salixfont.css @@ -22,10 +22,18 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-invoiceIn:before { + content: "\e960"; + color: #5f5f5f; +} +.icon-invoiceOut:before { + content: "\e961"; + color: #5f5f5f; +} .icon-supplier:before { content: "\e936"; } -.icon-latestBuys:before { +.icon-latestBuy:before { content: "\e95f"; } .icon-zone:before { @@ -99,6 +107,7 @@ } .icon-invoices:before { content: "\e91c"; + color: #5f5f5f; } .icon-pets:before { content: "\e94e"; @@ -295,9 +304,6 @@ .icon-stowaway:before { content: "\e92c"; } -.icon-supplier:before { - content: "\e936"; -} .icon-tags:before { content: "\e937"; } diff --git a/front/core/styles/icons/salixfont.svg b/front/core/styles/icons/salixfont.svg index ee14609a40..ca547518dd 100644 --- a/front/core/styles/icons/salixfont.svg +++ b/front/core/styles/icons/salixfont.svg @@ -35,7 +35,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -103,6 +103,8 @@ + + diff --git a/front/core/styles/icons/salixfont.ttf b/front/core/styles/icons/salixfont.ttf index 6958c0e3dd4cfaa662de976ebb1ce9e38a78daec..2d986be4172f153eeb1f7b6d537fcc0461635e00 100644 GIT binary patch delta 3014 zcmb_eZ){Ul6u+nU?Y_R(*KJ+@&2BAgyS|Q&j;`(ciYr}}MbWSbABMUJWD~{+f3~>A zO~QB+1m_14G9}7~eIUjUKr&(zLLxCl6B8pUDlv$OQKBCdqhB!b&sIJ6b(Mi*K-|lH z@7{avJ?EZ#?)m-hyY#&2^&_Ukem#8d3qqil5VCn|_uv55mDnG{+PrngbG>^9KQ&>0 zoRED_^=;|i?D=WaC?Wg5$MIAj3dHvXm5>*>etqB0p^-OUv@~HqhdOWW=zqHVl_yVM zBIE#{e`#m;$N<@IdX|ubXR%+mt9$2`>WzLf-u@k z#JCgTnA!-jWJ@gB%w<_9$+Dnj0S&r+fCVQvV@Vn+s9z3ZvEXXh;tTko6=II&n8R6; z=|!PofZK?t&?L9721Lj~r>rP);iPP_$aC9cT);o3O*8AGSw)f+)nn?EE#dn-sv^&f zNlG?q8e5j-{hXvI(t0kLK5FVzq?s>0s;O6YSS7p6bcy9Cqh%m4_DC0H0tKKV>!21Y zS4g6T3bH_D0Uw~OT(&mY?M|no4!3)O;Uic? zfr;ogx+j!z_i-<{CKJ&$6Qv*s6d#6@a0`;4$gGM1rJ_+l052*Q)dY|#WXXzV6iGCr zO)3a^n{U9Ye~jrlg(=)dR*}cZW=u}aExPe+%kbDj?lOnVX{1|AGNsWbsDQARa=Gnz zlvGW%K^mGh{-)wQPwWo#O>}D%Q`5*oJaUY<+vUIHmQpl(J9MmrJLQziHt z;c*8s zvzCLJY=aci7H-oS!*Jwo;9tg*yA|{(n#nnJL^-0pKuX+z;@Qc_2m&TUr`5{A$N2+3 z6BUZ7fJG2E8I((vk$Z$XRoE=47@VTdPbzlFg(-U8V6>dzEKC)-4Jm~wbSl@?mBZJw zPGmiz*u%ti%wm?Hx5O7=)ID}HK|rri*r<98Rygr5jkF6o(DqsCpc12sgyd1=nk&c^ zMQ-2~E^MX@=HZ5gr~x^00s5izD$}hZ_ZlO*j#D0^tV+IS><)K$vXPZh4ad^7OpI8V zL>3(_I=^u49xjWH79IY3sVxAP#XyV5kR}j~$Ox^V<97)lt==7679B169d5>3;POAv zqH>%_W(zB#W)>|vCfz;2Wzo^HVeUm>R9j*NjRqaca~&QNMSU{(HsS6&ETQ zUWQNDj@qtQRaf;n9(44&*0^4Ez3cv<`mATS=W5N`n$xxE+JoL|@3{Ar?;+nWOMdnz z{gZ+F1D^y3f@kWh>xV+-&{cJxdP=>hPKQ(Bec^KrhZ`<0-5rTF9&h}7nJ4;8^m@}s x)5Yb7Vq?vhd{?ENv;2%un$IAc! delta 965 zcmXw1U2NM#9KW-jxJ~T%LSnmh0cbX9FHKv>3NrJnlXU{IKzZ!gvVB&{w&&)qnbMK6$0azj)ur*s-Tma{( z=Lp^*SevWOp6-}<{QHLiXhg|{jfMF$X8}zluzY3xlO{aXd=w_=yV9N39Gvg+C@}H& zCd1I1zy!|#fQ`I!2zvjWdR`Zc(8)@2K4%(w(l3UilB1`gfX9tD%mhodW@q+MvDJ(u>->$|w{P&eEM-*ti1uM!ag@5|MC%3iNML8b=iRUD zQtI4Dq1tJ2JXxG6$px*#1X({vS2VX%#)Kr2sZtxBGvP36M!e*f9dTD6*|23*m_gIVF z*F8&svUL~|w9oih(t%DxLVA%96iJF%m#EZ}2)P)iY>d5zfRNx}Y^N}G5gK7bEGJMr z#k56nxWDqyQg0tMyz8K%5sn2e_n9R$k{dKlltSYcJosz77Ck|W+%Rt+7lP@8nxeKD z>d%yky)Z&y51XkTj0=dY0>*m^yPOe;6Amg383mA)@zf5iLCWgflh zcLT0;akVIjG@RiA6!Q4J_c=A3NE=Gg0j=nvU)%aR~kKWPVaeL+3E7!a0?O~7WDNRK~gM27zBal`oC4g;g zV=JL-Qxq`qUsENBrZL3$0Z1TTLW~ka)R-7iQ5%CbF-q`*V)P3p8r#D+dp#*w3dC+^ zc4ywqd-LYa`~7C$7&ToQGua2%wYCx<_#C`MEXMcnn0=KVJoELo&i+0^;2a9gv$b^F z&ZoLjHc80nqrC3z|H9O>wQ~z0Pe*W0f>-x1n}>T)h_W8+FXL7GP*8hz4Gf{|In;lX z*H;f%>UZ`&hV%AwU9?FiUwq`$sB>ORwxk9Y3ciZV0?6TEJE=-d1H zdiw{^?~lf&UxUu^!?2X*oPTHEh2AAPBjoB?fzY$WN-9Z+>?DJLyM*d!qA{-et9{I2 zce<|Y#T+qXuojF#;B(6CPA)8qCt}sbfL-SIsjDDw!2>wTP4MBU(*u4(u?eCH-IxQ7 z)y675wJ}hPqiV1of@m)m;Z6i2YAr% z6-ic9x2avW1n+XIiaawSDe16jq%O_-8A(y34O}vP$keV#GvByXQ@3olN;aA463b9V zi$GxP{tn6n3P45HMlDn>kwgm>WP!>8K0sNqY^|}$0Wy$Gza1OhngAl!72od>Br`El7eQvvLNMibeqe zJgAsg6F@4FB`cayB+-mEsUT!Gdiy;3XPBNR2_?;BHCactU~+0M(S>JQgvSq-vrWlF*>>nuzi|vDwi#(WOyLO(P5O$T8wBryX;o1VTLf zR)A;=P;Zx`>l2Kpp39<#;Be$F3mq+)jWtzMEa;kWOoZEQ-{W2fsVqO+e^69JW~O66 zbMG~oQzc@mG%|Uh@(MT`(3(VjGKdi(M;3<3}+&yVV>l9Emj>@ z8(oDqCJfSsR>%qrkIRplwF1<5GbE6g~a0(b1yc;%2-7F8>29D#wXrwy->EX3?T!(%k`E79A}c=ia2ZhRZ@|Im%I@S{Sp` z;+3!AUkS-h^}l7V{51EoYja8J4`SiJpoDz))AP?1zT>a&(O~=d7%Q6rR~#dlP$YkFj^RcKkD&&Fp5K#7?r#u504f1Y=4#fU6{+s7+%*od_jO zP%ALBirW&>9(t%{kob*&A`S?NN=6(2p+F_nLj`FSA@L&wC88G&NR&gPG%ybEG~YbU z_rCXL=4ocL&b)P&k)C~|SOgGIJA;9{gU`S<`$lyx+S^~SZ~3)Gm)GxR~LH$sO2evcX5V!=2&_DDCMSU;%W<1kA3&x;==J0 z^z@*<{W?6-cm>AUZRt+)6S&Y}GhpiPHI8G~fCiohfT%;}K4||tD?^Hyh323n52ZC# z>2!+zpkyjZs5=_fvQ-n+2o&isMKuQH7*$#}oSZDN?d_F!!r88!-0+@k_BJ{~YJ9?{i8G-}Hdb{#I24!f`duPG-CS^^4mm9^bnFk)G~zZWE>7&7A$W_U^&+7O>27k zV#1S0E9^a9HJ*f)Qb9L*97S&>tsudX`|Y*wywMMpSrc~tHx5|j~?7J+q>2`()U#|mi#gG^?){T hXrMZXhMo#q6ZTSu+skEF@6F^6?*8YQrt94I@E_0--$wud diff --git a/front/salix/components/descriptor/style.scss b/front/salix/components/descriptor/style.scss index 814df2ca50..f7055c0fc1 100644 --- a/front/salix/components/descriptor/style.scss +++ b/front/salix/components/descriptor/style.scss @@ -71,13 +71,9 @@ vn-descriptor-content { & > vn-icon { padding: $spacing-xs $spacing-sm; - color: $color-marginal; font-size: 1.5rem; - - &.bright { - color: $color-main; - opacity: 1; - } + color: $color-main; + opacity: 1; } } & > .quicklinks { diff --git a/modules/account/front/descriptor/index.html b/modules/account/front/descriptor/index.html index 50e4d21773..a1ce252a63 100644 --- a/modules/account/front/descriptor/index.html +++ b/modules/account/front/descriptor/index.html @@ -78,12 +78,12 @@ + ng-if="!$ctrl.user.active"> + ng-if="$ctrl.hasAccount">
diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html index 634436395e..dc79d224b0 100644 --- a/modules/client/front/descriptor/index.html +++ b/modules/client/front/descriptor/index.html @@ -47,27 +47,27 @@ + ng-if="$ctrl.client.isActive == false"> + ng-if="$ctrl.client.isFreezed == true"> + ng-if="$ctrl.client.account.active == false"> + ng-if="$ctrl.client.debt > $ctrl.client.credit"> + ng-if="$ctrl.client.isTaxDataChecked == false">
\ No newline at end of file From eb19bce1ba3084a3ec346ec25427590af87ec9ef Mon Sep 17 00:00:00 2001 From: carlosjr Date: Tue, 15 Dec 2020 16:51:36 +0100 Subject: [PATCH 028/101] client module refactors + dialog css --- front/core/components/dialog/style.scss | 15 ++++++++++++++- modules/client/front/basic-data/index.html | 5 +++-- modules/client/front/billing-data/index.html | 5 +++-- modules/client/front/contact/index.html | 9 ++++++++- modules/client/front/create/index.html | 11 +++++++++-- .../front/credit-insurance/create/index.html | 7 ++++--- modules/client/front/dms/create/index.html | 11 +++++++++-- modules/client/front/fiscal-data/index.html | 5 +++-- modules/client/front/recovery/create/index.html | 9 +++++---- modules/client/front/sample/create/index.html | 9 +++++---- modules/client/front/web-access/index.html | 15 ++++++++------- 11 files changed, 71 insertions(+), 30 deletions(-) diff --git a/front/core/components/dialog/style.scss b/front/core/components/dialog/style.scss index 47837af7e6..998c475e06 100644 --- a/front/core/components/dialog/style.scss +++ b/front/core/components/dialog/style.scss @@ -34,7 +34,6 @@ input[type="button"], input[type="submit"], input[type="reset"] { - @extend %clickable; text-transform: uppercase; background-color: transparent; border: none; @@ -44,6 +43,20 @@ padding: 11px; margin: -11px; margin-left: 11px; + + &:hover, + &:focus { + color: lighten($color-button, 10%); + } + } + button { + background-color: $color-button; + color: white; + &:hover, + &:focus { + background-color: lighten($color-button, 10%); + color: white; + } } } } diff --git a/modules/client/front/basic-data/index.html b/modules/client/front/basic-data/index.html index e47798bbb9..6235ec9238 100644 --- a/modules/client/front/basic-data/index.html +++ b/modules/client/front/basic-data/index.html @@ -72,12 +72,13 @@ diff --git a/modules/client/front/billing-data/index.html b/modules/client/front/billing-data/index.html index 9871c9aa8b..b9c20ec24c 100644 --- a/modules/client/front/billing-data/index.html +++ b/modules/client/front/billing-data/index.html @@ -96,12 +96,13 @@ diff --git a/modules/client/front/contact/index.html b/modules/client/front/contact/index.html index f1d7dbbd9f..eab1f33ce5 100644 --- a/modules/client/front/contact/index.html +++ b/modules/client/front/contact/index.html @@ -47,8 +47,15 @@ + + \ No newline at end of file diff --git a/modules/client/front/create/index.html b/modules/client/front/create/index.html index ce2ddc38be..d9759e3478 100644 --- a/modules/client/front/create/index.html +++ b/modules/client/front/create/index.html @@ -125,8 +125,15 @@ - - + + + + diff --git a/modules/client/front/credit-insurance/create/index.html b/modules/client/front/credit-insurance/create/index.html index 34ded289bd..6812b793ad 100644 --- a/modules/client/front/credit-insurance/create/index.html +++ b/modules/client/front/credit-insurance/create/index.html @@ -32,12 +32,13 @@ + class="cancel" + label="Cancel" + ui-sref="client.card.creditInsurance.index"> diff --git a/modules/client/front/dms/create/index.html b/modules/client/front/dms/create/index.html index e585dc398a..8f270378f0 100644 --- a/modules/client/front/dms/create/index.html +++ b/modules/client/front/dms/create/index.html @@ -94,8 +94,15 @@ - - + + + +
diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html index 782a5d6f2e..2b671c69a4 100644 --- a/modules/client/front/fiscal-data/index.html +++ b/modules/client/front/fiscal-data/index.html @@ -203,12 +203,13 @@ diff --git a/modules/client/front/recovery/create/index.html b/modules/client/front/recovery/create/index.html index 8b4942494c..3d4cc2e1ed 100644 --- a/modules/client/front/recovery/create/index.html +++ b/modules/client/front/recovery/create/index.html @@ -33,12 +33,13 @@ - + diff --git a/modules/client/front/sample/create/index.html b/modules/client/front/sample/create/index.html index fe2edfc523..f941e885ad 100644 --- a/modules/client/front/sample/create/index.html +++ b/modules/client/front/sample/create/index.html @@ -54,17 +54,18 @@ + class="cancel" + label="Cancel" + ui-sref="client.card.sample.index"> diff --git a/modules/client/front/web-access/index.html b/modules/client/front/web-access/index.html index 20060f329d..07a2615dd6 100644 --- a/modules/client/front/web-access/index.html +++ b/modules/client/front/web-access/index.html @@ -27,18 +27,19 @@ + ng-if="$ctrl.canChangePassword" + label="Change password" + vn-dialog="change-pass"> + class="cancel" + label="Undo changes" + disabled="!watcher.dataChanged()" + ng-click="watcher.loadOriginalData()"> From b071bfd22987a776f7dfccc4aaa16692a3b8259d Mon Sep 17 00:00:00 2001 From: carlosjr Date: Tue, 15 Dec 2020 16:53:56 +0100 Subject: [PATCH 029/101] entry module refactors --- modules/entry/front/basic-data/index.html | 5 +++-- modules/entry/front/create/index.html | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/entry/front/basic-data/index.html b/modules/entry/front/basic-data/index.html index b776cb281e..4b7661a8fe 100644 --- a/modules/entry/front/basic-data/index.html +++ b/modules/entry/front/basic-data/index.html @@ -111,12 +111,13 @@ diff --git a/modules/entry/front/create/index.html b/modules/entry/front/create/index.html index aa919fe216..ed08b5c76c 100644 --- a/modules/entry/front/create/index.html +++ b/modules/entry/front/create/index.html @@ -51,12 +51,13 @@ + class="cancel" + label="Cancel" + ui-sref="entry.index"> From 975e5c3b007981af956d2655e2b1d9cda648274c Mon Sep 17 00:00:00 2001 From: carlosjr Date: Tue, 15 Dec 2020 17:05:15 +0100 Subject: [PATCH 030/101] travel module refactors --- modules/travel/front/basic-data/index.html | 12 ++++++++++-- modules/travel/front/create/index.html | 11 +++++++++-- modules/travel/front/thermograph/create/index.html | 11 +++++++++-- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/modules/travel/front/basic-data/index.html b/modules/travel/front/basic-data/index.html index 7e12949fd6..e7143ffc08 100644 --- a/modules/travel/front/basic-data/index.html +++ b/modules/travel/front/basic-data/index.html @@ -72,7 +72,15 @@ - - + + + + diff --git a/modules/travel/front/create/index.html b/modules/travel/front/create/index.html index 652d2fbb97..1400ef6d7a 100644 --- a/modules/travel/front/create/index.html +++ b/modules/travel/front/create/index.html @@ -42,7 +42,14 @@ - - + + + + diff --git a/modules/travel/front/thermograph/create/index.html b/modules/travel/front/thermograph/create/index.html index c965c98673..a183390c0d 100644 --- a/modules/travel/front/thermograph/create/index.html +++ b/modules/travel/front/thermograph/create/index.html @@ -109,8 +109,15 @@ - - + + + +
From 5295d3ed064c9c81b752ce1f58c44cd0acc0c483 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Tue, 15 Dec 2020 17:09:05 +0100 Subject: [PATCH 031/101] supplier module refactors --- modules/supplier/front/basic-data/index.html | 12 ++++++++++-- modules/supplier/front/contact/index.html | 12 +++++++++++- modules/supplier/front/fiscal-data/index.html | 12 ++++++++++-- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/modules/supplier/front/basic-data/index.html b/modules/supplier/front/basic-data/index.html index a39f07da2f..72accfb5f3 100644 --- a/modules/supplier/front/basic-data/index.html +++ b/modules/supplier/front/basic-data/index.html @@ -36,7 +36,15 @@ - - + + + + \ No newline at end of file diff --git a/modules/supplier/front/contact/index.html b/modules/supplier/front/contact/index.html index 1df85cb4af..be0b2b2aad 100644 --- a/modules/supplier/front/contact/index.html +++ b/modules/supplier/front/contact/index.html @@ -69,6 +69,16 @@ - + + + + \ No newline at end of file diff --git a/modules/supplier/front/fiscal-data/index.html b/modules/supplier/front/fiscal-data/index.html index a17a47319c..804be97845 100644 --- a/modules/supplier/front/fiscal-data/index.html +++ b/modules/supplier/front/fiscal-data/index.html @@ -163,8 +163,16 @@ - - + + + + From 116730a3b2942e9b794b8098c79e660a7161498a Mon Sep 17 00:00:00 2001 From: carlosjr Date: Tue, 15 Dec 2020 17:24:13 +0100 Subject: [PATCH 032/101] claim module refactors --- modules/claim/front/basic-data/index.html | 11 ++++++++--- modules/claim/front/development/index.html | 14 +++++++++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html index d2338bcc33..eb3c3b9e32 100644 --- a/modules/claim/front/basic-data/index.html +++ b/modules/claim/front/basic-data/index.html @@ -62,9 +62,14 @@ - - + + diff --git a/modules/claim/front/development/index.html b/modules/claim/front/development/index.html index 3a78e6374d..f274104b08 100644 --- a/modules/claim/front/development/index.html +++ b/modules/claim/front/development/index.html @@ -105,9 +105,17 @@ - + + + \ No newline at end of file From e1ac64a8d96bce68d7a6c7691441de5aa50634aa Mon Sep 17 00:00:00 2001 From: bernat Date: Wed, 16 Dec 2020 08:05:41 +0100 Subject: [PATCH 033/101] supplier consumption --- .../back/methods/supplier/consumption.js | 165 ++++++++++++++++++ .../supplier/specs/consumption.spec.js | 36 ++++ modules/supplier/back/models/supplier.js | 1 + .../front/consumption-search-panel/index.html | 68 ++++++++ .../front/consumption-search-panel/index.js | 15 ++ .../consumption-search-panel/locale/es.yml | 7 + modules/supplier/front/consumption/index.html | 82 +++++++++ modules/supplier/front/consumption/index.js | 65 +++++++ .../supplier/front/consumption/index.spec.js | 72 ++++++++ .../supplier/front/consumption/locale/es.yml | 2 + modules/supplier/front/index.js | 2 + modules/supplier/front/routes.json | 12 +- .../assets/css/import.js | 9 + .../assets/css/style.css | 11 ++ .../supplier-campaign-metrics/locale/es.yml | 13 ++ .../supplier-campaign-metrics/sql/buys.sql | 33 ++++ .../supplier-campaign-metrics/sql/entries.sql | 8 + .../sql/supplier.sql | 12 ++ .../supplier-campaign-metrics.html | 122 +++++++++++++ .../supplier-campaign-metrics.js | 61 +++++++ 20 files changed, 795 insertions(+), 1 deletion(-) create mode 100644 modules/supplier/back/methods/supplier/consumption.js create mode 100644 modules/supplier/back/methods/supplier/specs/consumption.spec.js create mode 100644 modules/supplier/front/consumption-search-panel/index.html create mode 100644 modules/supplier/front/consumption-search-panel/index.js create mode 100644 modules/supplier/front/consumption-search-panel/locale/es.yml create mode 100644 modules/supplier/front/consumption/index.html create mode 100644 modules/supplier/front/consumption/index.js create mode 100644 modules/supplier/front/consumption/index.spec.js create mode 100644 modules/supplier/front/consumption/locale/es.yml create mode 100644 print/templates/reports/supplier-campaign-metrics/assets/css/import.js create mode 100644 print/templates/reports/supplier-campaign-metrics/assets/css/style.css create mode 100644 print/templates/reports/supplier-campaign-metrics/locale/es.yml create mode 100644 print/templates/reports/supplier-campaign-metrics/sql/buys.sql create mode 100644 print/templates/reports/supplier-campaign-metrics/sql/entries.sql create mode 100644 print/templates/reports/supplier-campaign-metrics/sql/supplier.sql create mode 100644 print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html create mode 100755 print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js diff --git a/modules/supplier/back/methods/supplier/consumption.js b/modules/supplier/back/methods/supplier/consumption.js new file mode 100644 index 0000000000..1d7cd04117 --- /dev/null +++ b/modules/supplier/back/methods/supplier/consumption.js @@ -0,0 +1,165 @@ + +const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; +const buildFilter = require('vn-loopback/util/filter').buildFilter; +const mergeFilters = require('vn-loopback/util/filter').mergeFilters; + +module.exports = Self => { + Self.remoteMethodCtx('consumption', { + description: 'Find all instances of the model matched by filter from the data source.', + accessType: 'READ', + accepts: [ + { + arg: 'filter', + type: 'Object', + description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string' + }, { + arg: 'search', + type: 'String', + description: `If it's and integer searchs by id, otherwise it searchs by name` + }, { + arg: 'itemId', + type: 'Number', + description: 'Item id' + }, { + arg: 'categoryId', + type: 'Number', + description: 'Category id' + }, { + arg: 'typeId', + type: 'Number', + description: 'Item type id', + }, { + arg: 'buyerId', + type: 'Number', + description: 'Buyer id' + }, { + arg: 'from', + type: 'Date', + description: `The from date filter` + }, { + arg: 'to', + type: 'Date', + description: `The to date filter` + } + ], + returns: { + type: ['Object'], + root: true + }, + http: { + path: `/consumption`, + verb: 'GET' + } + }); + + Self.consumption = async(ctx, filter) => { + const conn = Self.dataSource.connector; + const where = buildFilter(ctx.args, (param, value) => { + switch (param) { + case 'search': + return /^\d+$/.test(value) + ? {'i.id': value} + : {'i.name': {like: `%${value}%`}}; + case 'itemId': + return {'i.id': value}; + case 'description': + return {'i.description': {like: `%${value}%`}}; + case 'categoryId': + return {'it.categoryFk': value}; + case 'typeId': + return {'it.id': value}; + case 'buyerId': + return {'it.workerFk': value}; + case 'from': + return {'e.shipped': {gte: value}}; + case 'to': + return {'e.shipped': {lte: value}}; + } + }); + + filter = mergeFilters(filter, {where}); + let stmts = []; + let stmt; + + stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.entry'); + + stmt = new ParameterizedSQL( + `CREATE TEMPORARY TABLE tmp.entry + (INDEX (id)) + ENGINE = MEMORY + SELECT + e.id, + e.ref, + e.supplierFk, + t.shipped + FROM vn.entry e + JOIN vn.travel t ON t.id = e.travelFk`); + + stmt.merge(conn.makeGroupBy('e.id')); + stmts.push(stmt); + + const entriesIndex = stmts.push('SELECT * FROM tmp.entry') - 1; + stmt = new ParameterizedSQL( + `SELECT + b.id AS buyId, + b.itemFk, + b.entryFk, + b.quantity, + CAST(b.buyingValue AS DECIMAL(10,2)) AS price, + CAST(SUM(b.buyingValue*b.quantity)AS DECIMAL(10,2)) AS total, + i.id, + i.description, + i.name AS itemName, + i.subName, + i.size AS itemSize, + i.typeFk AS itemTypeFk, + i.tag5, + i.value5, + i.tag6, + i.value6, + i.tag7, + i.value7, + i.tag8, + i.value8, + i.tag9, + i.value9, + i.tag10, + i.value10, + it.id, + it.workerFk, + it.categoryFk, + it.code AS itemTypeCode + FROM buy b + JOIN tmp.entry e ON e.id = b.entryFk + JOIN item i ON i.id = b.itemFk + JOIN itemType it ON it.id = i.typeFk` + ); + stmt.merge(conn.makeWhere(filter.where)); + stmt.merge(conn.makeGroupBy('b.id')); + const buysIndex = stmts.push(stmt) - 1; + stmts.push(`DROP TEMPORARY TABLE tmp.entry`); + const sql = ParameterizedSQL.join(stmts, ';'); + + stmt.merge(conn.makePagination(filter)); + + const result = await conn.executeStmt(sql); + + const entries = result[entriesIndex]; + const buys = result[buysIndex]; + const entriesMap = new Map(); + + for (let entry of entries) + entriesMap.set(entry.id, entry); + + for (let buy of buys) { + const entry = entriesMap.get(buy.entryFk); + + if (entry) { + if (!entry.buys) entry.buys = []; + + entry.buys.push(buy); + } + } + return entries; + }; +}; diff --git a/modules/supplier/back/methods/supplier/specs/consumption.spec.js b/modules/supplier/back/methods/supplier/specs/consumption.spec.js new file mode 100644 index 0000000000..2436f485e8 --- /dev/null +++ b/modules/supplier/back/methods/supplier/specs/consumption.spec.js @@ -0,0 +1,36 @@ +const app = require('vn-loopback/server/server'); + +describe('supplier consumption() filter', () => { + it('should return a list of entries from the supplier 2', async() => { + const ctx = {req: {accessToken: {userId: 9}}, args: {}}; + const filter = { + where: { + supplierFk: 2 + }, + order: 'itemTypeFk, itemName, itemSize' + }; + const result = await app.models.Supplier.consumption(ctx, filter); + + expect(result.length).toEqual(8); + }); + + it('should return a list of entries from the item id 1 and supplier 1', async() => { + const ctx = {req: {accessToken: {userId: 9}}, + args: { + itemId: 1 + } + }; + const filter = { + where: { + supplierFk: 1 + }, + order: 'itemTypeFk, itemName, itemSize' + }; + const result = await app.models.Supplier.consumption(ctx, filter); + + const expectedItemId = 1; + const firstRowBuys = result[0].buys[0]; + + expect(firstRowBuys.itemFk).toEqual(expectedItemId); + }); +}); diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js index 37c94c2666..d214b5fad0 100644 --- a/modules/supplier/back/models/supplier.js +++ b/modules/supplier/back/models/supplier.js @@ -5,6 +5,7 @@ module.exports = Self => { require('../methods/supplier/filter')(Self); require('../methods/supplier/getSummary')(Self); require('../methods/supplier/updateFiscalData')(Self); + require('../methods/supplier/consumption')(Self); Self.validatesPresenceOf('name', { message: 'The social name cannot be empty' diff --git a/modules/supplier/front/consumption-search-panel/index.html b/modules/supplier/front/consumption-search-panel/index.html new file mode 100644 index 0000000000..e957c891b3 --- /dev/null +++ b/modules/supplier/front/consumption-search-panel/index.html @@ -0,0 +1,68 @@ +
+
+ + + + + + + + + {{nickname}} + + + + + +
{{name}}
+
+ {{category.name}} +
+
+
+ + +
+ + + + + + + + + +
+
diff --git a/modules/supplier/front/consumption-search-panel/index.js b/modules/supplier/front/consumption-search-panel/index.js new file mode 100644 index 0000000000..8e636661a0 --- /dev/null +++ b/modules/supplier/front/consumption-search-panel/index.js @@ -0,0 +1,15 @@ +import ngModule from '../module'; +import SearchPanel from 'core/components/searchbar/search-panel'; + +class Controller extends SearchPanel { + constructor($, $element) { + super($, $element); + + this.filter = this.$.filter; + } +} + +ngModule.vnComponent('vnSupplierConsumptionSearchPanel', { + template: require('./index.html'), + controller: Controller +}); diff --git a/modules/supplier/front/consumption-search-panel/locale/es.yml b/modules/supplier/front/consumption-search-panel/locale/es.yml new file mode 100644 index 0000000000..f136283f87 --- /dev/null +++ b/modules/supplier/front/consumption-search-panel/locale/es.yml @@ -0,0 +1,7 @@ +Item id: Id artículo +From: Desde +To: Hasta +Campaign: Campaña +allSaints: Día de todos los Santos +valentinesDay: Día de San Valentín +mothersDay: Día de la madre \ No newline at end of file diff --git a/modules/supplier/front/consumption/index.html b/modules/supplier/front/consumption/index.html new file mode 100644 index 0000000000..4587f60f2a --- /dev/null +++ b/modules/supplier/front/consumption/index.html @@ -0,0 +1,82 @@ + + + + + + + + +
+ + + + + + +
+ + + + Entry + {{::entry.id}} + Date + {{::entry.shipped | date: 'dd/MM/yyyy'}} + Reference + {{::entry.ref}} + + + + + + + {{::buy.itemName}} + + + + + + + {{::buy.quantity | dashIfEmpty}} + {{::buy.price | dashIfEmpty}} + {{::buy.total | dashIfEmpty}} + + + + + + + + + + +
+
+ + diff --git a/modules/supplier/front/consumption/index.js b/modules/supplier/front/consumption/index.js new file mode 100644 index 0000000000..9e1357a9f6 --- /dev/null +++ b/modules/supplier/front/consumption/index.js @@ -0,0 +1,65 @@ +import ngModule from '../module'; +import Section from 'salix/components/section'; + +class Controller extends Section { + constructor($element, $, vnReport, vnEmail) { + super($element, $); + this.vnReport = vnReport; + this.vnEmail = vnEmail; + + this.setDefaultFilter(); + } + + setDefaultFilter() { + const minDate = new Date(); + minDate.setHours(0, 0, 0, 0); + minDate.setMonth(minDate.getMonth() - 2); + + const maxDate = new Date(); + maxDate.setHours(23, 59, 59, 59); + + this.filterParams = { + from: minDate, + to: maxDate + }; + } + + get reportParams() { + const userParams = this.$.model.userParams; + return Object.assign({ + authorization: this.vnToken.token, + recipientId: this.supplier.id + }, userParams); + } + + showReport() { + this.vnReport.show('supplier-campaign-metrics', this.reportParams); + } + + sendEmail() { + this.vnEmail.send('supplier-campaign-metrics', this.reportParams); + } + + getTotal(entry) { + if (entry.buys) { + let total = 0; + for (let buy of entry.buys) + total += buy.total; + + return total; + } + } +} + +Controller.$inject = ['$element', '$scope', 'vnReport', 'vnEmail']; + +ngModule.vnComponent('vnSupplierConsumption', { + template: require('./index.html'), + controller: Controller, + bindings: { + supplier: '<' + }, + require: { + card: '^vnSupplierCard' + } +}); diff --git a/modules/supplier/front/consumption/index.spec.js b/modules/supplier/front/consumption/index.spec.js new file mode 100644 index 0000000000..35eb6935c2 --- /dev/null +++ b/modules/supplier/front/consumption/index.spec.js @@ -0,0 +1,72 @@ +import './index.js'; +import crudModel from 'core/mocks/crud-model'; + +describe('Supplier', () => { + describe('Component vnSupplierConsumption', () => { + let $scope; + let controller; + let $httpParamSerializer; + let $httpBackend; + + beforeEach(ngModule('supplier')); + + beforeEach(inject(($componentController, $rootScope, _$httpParamSerializer_, _$httpBackend_) => { + $scope = $rootScope.$new(); + $httpParamSerializer = _$httpParamSerializer_; + $httpBackend = _$httpBackend_; + const $element = angular.element(' { + it('should call the window.open function', () => { + jest.spyOn(window, 'open').mockReturnThis(); + + const now = new Date(); + controller.$.model.userParams = { + from: now, + to: now + }; + + controller.showReport(); + + const expectedParams = { + recipientId: 2, + from: now, + to: now + }; + const serializedParams = $httpParamSerializer(expectedParams); + const path = `api/report/supplier-campaign-metrics?${serializedParams}`; + + expect(window.open).toHaveBeenCalledWith(path); + }); + }); + + describe('sendEmail()', () => { + it('should make a GET query sending the report', () => { + const now = new Date(); + controller.$.model.userParams = { + from: now, + to: now + }; + const expectedParams = { + recipientId: 2, + from: now, + to: now + }; + + const serializedParams = $httpParamSerializer(expectedParams); + const path = `email/supplier-campaign-metrics?${serializedParams}`; + + $httpBackend.expect('GET', path).respond({}); + controller.sendEmail(); + $httpBackend.flush(); + }); + }); + }); +}); + diff --git a/modules/supplier/front/consumption/locale/es.yml b/modules/supplier/front/consumption/locale/es.yml new file mode 100644 index 0000000000..dd052696cc --- /dev/null +++ b/modules/supplier/front/consumption/locale/es.yml @@ -0,0 +1,2 @@ + +Total entry: Total entrada diff --git a/modules/supplier/front/index.js b/modules/supplier/front/index.js index 8b4ac9ca24..613e02e4aa 100644 --- a/modules/supplier/front/index.js +++ b/modules/supplier/front/index.js @@ -10,3 +10,5 @@ import './basic-data'; import './fiscal-data'; import './contact'; import './log'; +import './consumption'; +import './consumption-search-panel'; diff --git a/modules/supplier/front/routes.json b/modules/supplier/front/routes.json index 10727fecff..7501d329cb 100644 --- a/modules/supplier/front/routes.json +++ b/modules/supplier/front/routes.json @@ -12,7 +12,8 @@ {"state": "supplier.card.basicData", "icon": "settings"}, {"state": "supplier.card.fiscalData", "icon": "account_balance"}, {"state": "supplier.card.contact", "icon": "contact_phone"}, - {"state": "supplier.card.log", "icon": "history"} + {"state": "supplier.card.log", "icon": "history"}, + {"state": "supplier.card.consumption", "icon": "show_chart"} ] }, "routes": [ @@ -75,6 +76,15 @@ "params": { "supplier": "$ctrl.supplier" } + }, + { + "url": "/consumption?q", + "state": "supplier.card.consumption", + "component": "vn-supplier-consumption", + "description": "Consumption", + "params": { + "supplier": "$ctrl.supplier" + } } ] } \ No newline at end of file diff --git a/print/templates/reports/supplier-campaign-metrics/assets/css/import.js b/print/templates/reports/supplier-campaign-metrics/assets/css/import.js new file mode 100644 index 0000000000..fd8796c2bf --- /dev/null +++ b/print/templates/reports/supplier-campaign-metrics/assets/css/import.js @@ -0,0 +1,9 @@ +const Stylesheet = require(`${appPath}/core/stylesheet`); + +module.exports = new Stylesheet([ + `${appPath}/common/css/spacing.css`, + `${appPath}/common/css/misc.css`, + `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, + `${__dirname}/style.css`]) + .mergeStyles(); diff --git a/print/templates/reports/supplier-campaign-metrics/assets/css/style.css b/print/templates/reports/supplier-campaign-metrics/assets/css/style.css new file mode 100644 index 0000000000..6e730869eb --- /dev/null +++ b/print/templates/reports/supplier-campaign-metrics/assets/css/style.css @@ -0,0 +1,11 @@ +.column-oriented { + margin-top: 50px !important; +} + +.bottom-line > tr { + border-bottom: 1px solid #ccc; +} + +.bottom-line tr:nth-last-child() { + border-bottom: none; +} diff --git a/print/templates/reports/supplier-campaign-metrics/locale/es.yml b/print/templates/reports/supplier-campaign-metrics/locale/es.yml new file mode 100644 index 0000000000..31c1e17dd9 --- /dev/null +++ b/print/templates/reports/supplier-campaign-metrics/locale/es.yml @@ -0,0 +1,13 @@ +title: Consumo +Supplier: Proveedor +supplierData: Datos del proveedor +dated: Fecha +From: Desde +To: Hasta +supplier: Proveedor {0} +reference: Referencia +Quantity: Cantidad +entry: Entrada +itemName: Artículo +price: Precio +total: Total \ No newline at end of file diff --git a/print/templates/reports/supplier-campaign-metrics/sql/buys.sql b/print/templates/reports/supplier-campaign-metrics/sql/buys.sql new file mode 100644 index 0000000000..898568c0a9 --- /dev/null +++ b/print/templates/reports/supplier-campaign-metrics/sql/buys.sql @@ -0,0 +1,33 @@ +SELECT + b.id AS buyId, + b.itemFk, + b.entryFk, + CAST(b.buyingValue AS DECIMAL(10,2)) AS price, + b.quantity, + i.id, + i.description, + i.name AS itemName, + i.subName, + i.size AS itemSize, + i.typeFk AS itemTypeFk, + i.tag5, + i.value5, + i.tag6, + i.value6, + i.tag7, + i.value7, + i.tag8, + i.value8, + i.tag9, + i.value9, + i.tag10, + i.value10, + it.id, + it.workerFk, + it.categoryFk, + it.code AS itemTypeCode + FROM buy b + JOIN item i ON i.id = b.itemFk + JOIN itemType it ON it.id = i.typeFk + WHERE b.entryFk IN(:entriesId) AND b.quantity > 0 + ORDER BY i.typeFk , i.name \ No newline at end of file diff --git a/print/templates/reports/supplier-campaign-metrics/sql/entries.sql b/print/templates/reports/supplier-campaign-metrics/sql/entries.sql new file mode 100644 index 0000000000..946c4ab65c --- /dev/null +++ b/print/templates/reports/supplier-campaign-metrics/sql/entries.sql @@ -0,0 +1,8 @@ + SELECT + e.id, + e.ref, + e.supplierFk, + t.shipped + FROM vn.entry e + JOIN vn.travel t ON t.id = e.travelFk + WHERE e.supplierFk = ? AND DATE(t.shipped) BETWEEN ? AND ? diff --git a/print/templates/reports/supplier-campaign-metrics/sql/supplier.sql b/print/templates/reports/supplier-campaign-metrics/sql/supplier.sql new file mode 100644 index 0000000000..0c2fa12edb --- /dev/null +++ b/print/templates/reports/supplier-campaign-metrics/sql/supplier.sql @@ -0,0 +1,12 @@ +SELECT + s.street, + s.city, + s.postcode, + s.id, + s.name AS supplierName, + p.name AS province, + co.country + FROM supplier s + JOIN province p ON s.provinceFk = p.id + JOIN country co ON s.countryFk = co.id + WHERE s.id = ? diff --git a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html new file mode 100644 index 0000000000..f5286df1e6 --- /dev/null +++ b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html @@ -0,0 +1,122 @@ + + + + + + + + + +
+ + + +
+
+
+
+

{{$t('title')}}

+
+ + + + + + + + + + + + + + + +
{{$t('Supplier')}}{{supplier.id}}
{{$t('From')}}{{from | date('%d-%m-%Y')}}
{{$t('To')}}{{to | date('%d-%m-%Y')}}
+
+
+
+
+
{{$t('supplierData')}}
+
+

{{supplier.supplierName}}

+
+ {{supplier.street}} +
+
+ {{supplier.postcode}}, {{supplier.city}} ({{supplier.province}}) +
+
+ {{supplier.country}} +
+
+
+
+
+
+ + + + + + + + + + + +
{{$t('entry')}}{{entry.id}}{{$t('dated')}}{{entry.shipped | date('%d-%m-%Y')}}{{$t('reference')}}{{entry.ref}}
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('itemName')}}{{$t('Quantity')}}{{$t('price')}}{{$t('total')}}
{{buy.itemName}}{{buy.quantity}}{{buy.price | currency('EUR', $i18n.locale)}}{{buy.quantity * buy.price | currency('EUR', $i18n.locale)}}
+
+ {{buy.tag5}} + {{buy.value5}} +
+
+
+ {{buy.tag6}} + {{buy.value6}} +
+
+
+ {{buy.tag7}} + {{buy.value7}} +
+
+
+
+
+
+ + + +
+ + \ No newline at end of file diff --git a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js new file mode 100755 index 0000000000..8a0a378a2e --- /dev/null +++ b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js @@ -0,0 +1,61 @@ +const Component = require(`${appPath}/core/component`); +const reportHeader = new Component('report-header'); +const reportFooter = new Component('report-footer'); + +module.exports = { + name: 'supplier-campaign-metrics', + async serverPrefetch() { + this.supplier = await this.fetchSupplier(this.recipientId); + let entries = await this.fetchEntries(this.recipientId, this.from, this.to); + + const entriesId = []; + + for (let entry of entries) + entriesId.push(entry.id); + + const buys = await this.fetchBuys(entriesId); + + const entriesMap = new Map(); + for (let entry of entries) + entriesMap.set(entry.id, entry); + + for (let buy of buys) { + const entry = entriesMap.get(buy.entryFk); + if (entry) { + if (!entry.buys) entry.buys = []; + + entry.buys.push(buy); + } + } + + this.entries = entries; + if (!this.supplier) + throw new Error('Something went wrong'); + }, + methods: { + fetchSupplier(supplierId) { + return this.findOneFromDef('supplier', [supplierId]); + }, + fetchEntries(supplierId, from, to) { + return this.rawSqlFromDef('entries', [supplierId, from, to]); + }, + fetchBuys(entriesId) { + return this.rawSqlFromDef('buys', {entriesId}); + } + }, + components: { + 'report-header': reportHeader.build(), + 'report-footer': reportFooter.build() + }, + props: { + recipientId: { + required: true + }, + from: { + required: true + }, + to: { + required: true + } + } +}; From 5ecd5891066a7de1475e33d2b89f6259048b0a2c Mon Sep 17 00:00:00 2001 From: joan Date: Wed, 16 Dec 2020 09:24:11 +0100 Subject: [PATCH 034/101] Updated delivery note --- db/dump/fixtures.sql | 12 +- print/common/css/layout.css | 29 +-- print/common/css/report.css | 2 +- print/core/filters/index.js | 1 + print/core/filters/zerofill.js | 11 + .../delivery-note/assets/css/style.css | 25 ++- .../delivery-note/assets/images/europe.png | Bin 0 -> 55634 bytes .../reports/delivery-note/delivery-note.html | 197 +++++++++++------- .../reports/delivery-note/delivery-note.js | 16 ++ .../reports/delivery-note/sql/sales.sql | 23 +- .../reports/delivery-note/sql/services.sql | 2 +- 11 files changed, 199 insertions(+), 119 deletions(-) create mode 100644 print/core/filters/zerofill.js create mode 100644 print/templates/reports/delivery-note/assets/images/europe.png diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 1e4595aa32..879c4c6ee8 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -442,13 +442,13 @@ INSERT INTO `vn`.`supplierAccount`(`id`, `supplierFk`, `iban`, `bankEntityFk`) VALUES (241, 442, 'ES111122333344111122221111', 128); -INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`, `expired`) +INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`, `expired`, `phytosanitary`) VALUES - (69 , 'CCs', NULL, 30, NULL, 0, NULL), - (442 , 'VNL', 241, 30, 2 , 1, NULL), - (567 , 'VNH', NULL, 30, NULL, 4, NULL), - (791 , 'FTH', NULL, 30, NULL, 3, '2015-11-30'), - (1381, 'ORN', NULL, 30, NULL, 7, NULL); + (69 , 'CCs', NULL, 30, NULL, 0, NULL, NULL), + (442 , 'VNL', 241, 30, 2 , 1, NULL, 'VNL Company - Plant passport'), + (567 , 'VNH', NULL, 30, NULL, 4, NULL, 'VNH Company - Plant passport'), + (791 , 'FTH', NULL, 30, NULL, 3, '2015-11-30', NULL), + (1381, 'ORN', NULL, 30, NULL, 7, NULL, 'ORN Company - Plant passport'); INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`) VALUES diff --git a/print/common/css/layout.css b/print/common/css/layout.css index 3b2643dc9c..c709191bbb 100644 --- a/print/common/css/layout.css +++ b/print/common/css/layout.css @@ -4,7 +4,7 @@ */ .grid { - font-family: Arial, sans-serif; + font-family: Arial, Helvetica, sans-serif; font-size: 16px !important; width: 100% } @@ -63,7 +63,6 @@ .panel { position: relative; margin-bottom: 15px; - padding-top: 10px; break-inside: avoid; break-before: always; break-after: always; @@ -72,10 +71,11 @@ .panel .header { background-color: #FFF; padding: 2.5px 10px; - position: absolute; + position: relative; font-weight: bold; - top: 0px; + display: inline-block; left: 17.5px; + top: 10px; } .panel .body { @@ -168,18 +168,22 @@ table { .column-oriented td, .column-oriented th { - padding: 5px 10px + padding: 10px } .column-oriented thead { - display: table-header-group; - background-color: #e5e5e5 + display: table-header-group } .column-oriented thead tr { - border-bottom: 1px solid #808080; - border-top: 1px solid #808080; - background-color: #e5e5e5 + border-top: 1px solid #AFB1B2; + background-color: #BABDBD; + border-bottom: 1px solid #AFB1B2; +} + +.column-oriented thead.light tr { + background-color: #FFF; + color: #AFB1B2 } .column-oriented tfoot { @@ -193,13 +197,10 @@ table { } .column-oriented tfoot tr:first-child td { + border-top: 2px solid #AFB1B2; padding-top: 20px !important; } -.column-oriented tfoot tr:first-child { - border-top: 2px solid #808080; -} - .column-oriented .description { font-size: 0.8em } diff --git a/print/common/css/report.css b/print/common/css/report.css index 796b99c4f2..9331481f47 100644 --- a/print/common/css/report.css +++ b/print/common/css/report.css @@ -9,6 +9,6 @@ body { .title { margin-bottom: 20px; font-weight: 100; - font-size: 2em; + font-size: 3em; margin-top: 0 } \ No newline at end of file diff --git a/print/core/filters/index.js b/print/core/filters/index.js index bfd99c5048..efc398508e 100644 --- a/print/core/filters/index.js +++ b/print/core/filters/index.js @@ -4,4 +4,5 @@ require('./uppercase'); require('./currency'); require('./percentage'); require('./number'); +require('./zerofill'); diff --git a/print/core/filters/zerofill.js b/print/core/filters/zerofill.js new file mode 100644 index 0000000000..c7df519b07 --- /dev/null +++ b/print/core/filters/zerofill.js @@ -0,0 +1,11 @@ +const {KeyValueModel} = require('loopback'); +const Vue = require('vue'); + +const zerofill = function(value, pad) { + const valueStr = String(value); + return pad.substring(0, pad.length - valueStr.length) + valueStr; +}; + +Vue.filter('zerofill', zerofill); + +module.exports = zerofill; diff --git a/print/templates/reports/delivery-note/assets/css/style.css b/print/templates/reports/delivery-note/assets/css/style.css index c6d2ab2bf6..cbe894097e 100644 --- a/print/templates/reports/delivery-note/assets/css/style.css +++ b/print/templates/reports/delivery-note/assets/css/style.css @@ -9,15 +9,32 @@ max-width: 150px } -.description.phytosanitary { - background-color: #e5e5e5 +.description strong { + text-transform: uppercase; } -h3 { +h2 { font-weight: 100; color: #555 } .ticket-info { - font-size: 20px + font-size: 26px +} + +#phytosanitary { + padding-right: 10px +} + +#phytosanitary .flag img { + width: 100% +} + +#phytosanitary .flag .flag-text { + padding-left: 10px; + box-sizing: border-box; +} + +.phytosanitary-info { + margin-top: 10px } \ No newline at end of file diff --git a/print/templates/reports/delivery-note/assets/images/europe.png b/print/templates/reports/delivery-note/assets/images/europe.png new file mode 100644 index 0000000000000000000000000000000000000000..673be92ae2f0647fd1748e12a36bf073aa145d64 GIT binary patch literal 55634 zcmeFZ2UJwa(>Qt&1tW@zWKg1jfP^6m?23SZfRZx{!+lALp#cL&3|`|bbt?f2gM&Uxp&ZJ68L)z#Hi)zy7(SNFZ-Zt~EHpH(~^ z>;OPZ3lIbV;4pBU3IM3V6x9)V@Iv(^O>+@UAJ|V*%95#QzQBP4ApG>#G+2>};cFVi zqGACKQRslbmsG6Z(|J@Ef2b=)p#boJzY;3({q$Kd-5uxv90X%Z-5D_A0r{f*9dmvK z0Q{%E#XsAkZD8kb-bTBkU2dbD&MPaQ7r!hfdH$l7HPit`0SW*h03vr;TJEyc`OC6$ zV$yOD2>>|w1ORA3+6OO-i;F$~DkGT;0M8G6YxjWhbLwwtst6F55@@KXzw%D=qkL4D zKjfqG{!zXIRNrabJ@B3OG3*y|z;!UD$haSqyUDY_@qL-Bl(m2Zm8ojvk|DIC=c|Nd~4fXBf_$VWL02AHGIkGJm~Noj7*v1l@^K zbabcA($UeKrCjLFeyKwLPY95I1LzL}aNs#L6&G-To{E~Dirfzhd6fK)N(toh5Y>JF z8Kwkk&}t4IqM;8>zQ2vGl0OyxYjKDu49L2PHA@K8~)Wm(~-;Rt@dkAI4^sHFSMmlU6gb_Xv#3#5NMg z*Xe-+2S9EQ?(;-Ta|p7}!UeI@2SE;;xy~FCzY}qm!ogeJ&IJh`n<32INM$_+sEgzx zFAaqOT0Tha2at(0Mq3pFDOcF=cNYH79Pt0a0=XABPQBkIJ)i^(>#Fm9sL)X7iPVi$ z=ZSt9sm?3F6Fr%|K4_`n-Qz+sV;vrU(h%?gbMV(Aa#Yy@K$LRs!RWc{6${w8!^Lrx zSnS*Pyy0ZvCE?(mg9jkAH&YKwdJFJGsvP~1q!Rh}zciGN`&}{5jKH^y6lqw=qlJ&n zloZW0B0q+f8I{fB{YQFCYh5^Mse4VY(*ciS%hAx9oHcnDgS`ZzM5Te01W=Yx;9~(B zrLBT1CA`S@yae;v!6f8`R&S)f!CvondY>(m@6i)7K@1z-6W+aC40GUSA5wLF14*_^B#Ar^V9Mh zC@d|JI79~8%hqc){lhb-OtwVF4Yg6%TU)V0c% zqITJ}U<28GBvRtWs)f&`J*)J|EqDL8O+o^G%WYQ`WO$@HV?eDa_Kne-#o|n*?rEh@ z1bxJ%h{th;Mj0e6x^q(4_79)8b5^Bx`J~#yU6gA54i+sn#*Qf@TYauSAjW)0L_lqH zT`6HCx<=db0oy%3OW9B!KdbH;H!_fWZl(N^W+<4bs1-eC)Y1uyGL`l zcYaIY*)R5CHxIsRI>meDq6YuV@}d@IrTX{@&4)h`I(w%5u@b4$r$Z72&7vo^kBK{$ z#OJI4D?LylrSzH)d+?7QzZV8f8gV6_rn-F@f0~v?F)XFI@0rm?0H4nvX)0|zV4KIWl`I)8)ux0LifSHYB1qkHSWeph>^9Xh@yFU zzrh8|j*WVCS)OM+QO}7Mz(X?7c_Yu}&O@2sqPR~{MTcYxa1IPNUwWq0n7}qx&*hjm z1L|GDkum|00rH0*G#_WxS)IS~ru|+*grz|kY};;pq;9cYc6AP&(RyiHb&YdDlni9f znBOfm(wjP4#qe=d@%23=*on)`<#D8$Ez#A)dAxT@`|A}$|HrpB;)LHXGo{g)DfMSE zH(rQQy=vJp?c7K>o-(#LOa`dK`_{?8(`F^nC^nuOLk)+ychDNF4Kk&5%=2XtE0>C1 zgn2CCq$>MU)`nTsl7S_bgE7Bfq_QRIRV)u#%SD-fpLQZHGBtFCWLD?gm@h61tf=%8 z)oL#c*qm^nKFCA^xy$2Qd(fDxsXEPh?A?>w!GsyPaYB3Cz29FI3pW?#KbKAIx+U5q zOSi3M_H|3e4FBpzp#SfWvoGO#GvLzt6+8&}?YBfK2!vv&doo651r zedCKyAhDgEuMEjR>M*|IZpSEk3%RrM{*8Yh4#%%{udr|>z+*3R!fBCCGYVXg_TjA0EoBr5i=`A2QCk^!+_ggMfPE|nSbf>VdEB!jTx+)t3U zlbq?P%rkBxE^r?uMO@H5rfs?|$?{*vPeIm-GFsVpgSy8n3^#mb-}sh?%gc?cHOR6iYJB9AZM(B3@6f?(E7R}lc_NLNz=6V(E^_bruF>mkg5A$$aUX8KGGtn^ z>{iU>ik1M3M^zT*<5KFBl`#t2-M=A@F%~Z;I zNy63CiJ#sw+&Z}?6Eyh8psb7J!fjdDj1)L39TWPDV zTygUf)3}*(a*4Qru`ucV+|}V1T3VyL z%i>=}sDY0eJXOwp{Q)lgvb?fPp_s^KF?cm0p|~w&5~nk+lxXr>#M{RQnHIR=fot)x z7nhm6#Ms7rKl9TuC#v3DD<%Vmp2ez|p_EBz^GRpj=nL^fQ@=_VU>S3_2D}9_65kvZ zYIeUivRhnb4$m8TC|2qXse%@)1SG8bC5P9n6fl=~auFXr*B z^{8zlI7+ZY$)IZ_u)4^5kKkv_6`52 zI}GZI#$2;@wWdh0&*V+}n=apMhmxk?f-!|{;0Da@3z@$(s}C-=|E^g*DB=tJCI~H^AaO_(F$lG^(%7~(#{lWvF3C7^^>RY@&+W7X%=)N`zMoPba9iu1qVU$tKv5(38 z=REcDe*Vb*6}(XGTPf(8poF7e$1P~E`y8z9L$3p(c6MM10=$Cm129m1g}itc{~aQ} z4>tv`-*6!N5Q^o0h3wPZ0P_H4WRd?iP)|^b|F($y|Dn_&Oq>Si2?Ssb*aKGJT;aAqcQ}E0D==jb*nm^d zb#NM@XzIU)A7B((-<>qyF@He#4*O&B08nlS%1lU^m1%6yZYW!qzl>d|s~A|eKao=m z{<~Fyz`s}}aP_l2$@EiEg z=*MjAmC*<^<_G1{f1!U>?Rx=O1<*#LD7rr4igp5T;V!TrXRV_MaC-YM(Bn4y)8T)C z9|ODi_FvKWN909HL*U&PG-suS{q&d7N57v2y}0{WXZLdygQnWgQ}BUfcuF4pJqLeq zF!>1pn!q&Zq+|k}j{iC(|8+|K>y-T0DfzEc@?WRqzfQ@2os$1LCI59w{_B+d|GHE1 z%k%yP@QEG(EWjVQ0swt>z|Vj!=$f+um)hq+N8N2O?F#-}_EVrM0d$@HXN>cJGWd5M z5a0I;N>T`aY3a+_o)$c!0q*is0py{RDz{x-o#aGCQ7$6Zlw%qqP&881)7nW?OysgC za7D?}$r=iWxt_Oyfh$=BuKB7OuJaDI3S34It;ao~oF~!=33IhR?}i2S#ZZfTvS|K7{m~E@j|&;dkUjmxW7@j26KU89QM7F=P49H z&zqa80vE{X7ZH$7-^u>1uD&7KLcilVfy?Rr#%-aZFa!(^K(HR#0D2OXH-dRZNTaC315{T*n`-yH(_p&ktMeZmyDD5rvi zFG~wwmeQx33X+l&lMuQrE_eCz7gQ~@t%IG{-=b0u5d8@iG&@_+pZeb-+d}2+&={mO zs4NGhwLMJK(Ftb1-<+0~oGuJy>p*c}D+la_>8OGrzI3rk5#*b0k@Ny`Y!*hxTzZS7z%*kx;o3=|^sjhZ^j#nl=G zg;A)1Div`6DM6$lGUBqAFAKxOAlAZ?;t*+J8wm*;VLK^1J8=maYe|sGxB6dvP1cAX zxpH#@iAc&wU4~wk78ACyvlbV&fk=u8TT9r1G$kY@B&{Krt;Hq9xX%B<^uD76)Hc{9 z5|jZ0G6QPk8Vuv$4zpFoppobIjZ@Cy2Zr|>fZG{~(a z*q{_tOd2Y|^|dmnsqeb`A8`4l7i~Ie$$d z96&L^F(zjXr5K0;my0#18;Wcc;E#&=){{_(EKD5i0MNiCp~8|j(l)|2PzgI>F)65| zv^7l3Rssh7R^J2k%KyjV@TD0Sw4JMmH3s&xJ!pgfc+`EV3%zZPvWJ0FyC@e$TFM;w zKbPsBS?8Aq|5m0S$L)WR>E^fj=*v7JF81SL!f#6Zi$tOnk-l`8=obV2qc8W%ez*mI z3fKpM_Z3R=`wdO;+l}Yn_+JhDtAT$t@UI5`)xf_R`2Udx{#X)&4~q(19^iuahc^Iz zqO7&|-vIb>zWyIw5Bw3RzlR@cQqH>{_+Ic&6Z>xfP(>Utrltaq%>VHQfF}7JP)}L^ zAEXA`0QvnAjvfS0|5F{HIYfO7g#M-Q2>5EiQ7Z7n{efeYHvlN-?+;NQpr)arIt0r5 z<@Esi!xv7UIU@E!FY4^iTnyajZdo4%-v*H2VO&tg>qqmx9lEM3$+UlXpBj9D06e}= zLwkt!(0*F^t;HFfuW}!~)2VAC!Lv{l`5{XGoU$aZ0pp9e zLl|f@L`909iTTgx@Pj+$UwZ!fO_=}pVp{U=|9hl6|My6L_}?Rq|KB71@qa{`s!@M> zY%0mytI{7Qw=%ugo~a-{IgOtnY6XPFPi~&zh@YImQ2b^8ERYHRv(_to17U;VGwFeI zkjr`6*DU=56iC>Oq5vT>U{gFXK$jV2;`>-`gzL2_+Z2BS9)YRUPV&93L3%TuDKuY? z+sNN_57?EpC^J{A#5Ma5k^zH}nq4Eit6@0BolK!J_mwFWeXa$gdOUV5Xlq9+Gt$3> z6StSW-Kh9V%N4xrVJ`vE%3Q3TQxE9xA{KSKL2N;f(NL`UH@F#lU;{-OKotb zizsPJHzX@3$v``IE|(=FB=2z+lwh8hm|UrPDmd}; ziq<4kCV#3oPkZl0EZ@}PM1K2Z^TqTjlK*2KD-!$5bqhm#;_F^A;Iz=j8P~y<2x&Tj zky7P}z$tBUgoPRRg+ZfoEeR@)If4RVPxoLOE^#-+#om<9hD^p*LYmk76j-$a<}Jg7 zWm-hlnE75tX)$ciGPwgW` zL8a;Nj_DlqmF9wx0r7xw=?-Gy;z(QbGn+xvf&;mIZiLr&iCq zMb4~OvC-)X6%Ne4P8P8wE>&DPK`P(l9Y8}1P3tUESRp%ZTixn{gN*}jXwxIZE~&Bn zrELZ(DoUw}vS+REVFYZ*Lm~MSyeK%r&57)n3oKBktpNve;RvV2+LZ+(uM`#@^h$b-? z?v>FErAL_Y1a&Qd-Pu{B%$kwxz&3MQ{Gw28y>FzfX;XL5xFDBcQru?DP!|L>y@Q>N zh7-V-Dk{ptP1Lg*1TJNa2{dQbifQXb-3r1ua4NV5SL#@ifyRVh&EWw$U3FhGBtBK$ zkrZ$+VT0>8b=IL+V_S5jF)Z?kaZXTPEMuhr)W9*Lrz zT7oNKOoNw#w>G&Qas5hdx2`C?pKENalHle%!w!!?j2tEdn=d~a*3=nI@0|R2LEir8 z^Xdx8xHasHSIMi}qPX5hhBftSE$vyKE4#ntcYB={5?9oJx6~)g&@($66J~J3n+%Y4 zt4^{Q>6|o-?$BXyW>Y-6SzqGi)?cWwK|?oWP>w5~&Gz1psA_K;6)$J0*QX6M!52A!%%^Lw{GnYu`AJq<$w=RJqkE_Go^ZFS+(Aukws zWgVOuWflvSCYVs#Lj|f07{0()we#;b5BWenw(!cnk=0&4%tvyxh-IgTSlA>GU7Ov8osWVg~VE8kNIo5UL z7i-<>+~TFYg7Pg@5qFKtF~{0BYfjD%wEAziV6xKK1!U^8R=YnCvV>WqHgRWS<4cmm zuScxU&#kwy6EmP8&ipXxt)w z*iv8oNK~4K&bFIhTowJ0tCZ#Vx=m7HIfu?w`eNC#k%s=@@cx~Cc{&c2fMwYj1;*9) zQ@ezVtDm6OnRD8_+hb!^+;be-mL2tOq>bu)k^5=L2)G*IV$D6%sVIkxk4X`e&iE}Z zFmT_Zr>D;fb>#A-Ra*pV_4a;jaMGTNn%^aR>5 zZoe4XTi-m*VuUc8-M)9e+jC0rgZgP$g~6uMT&7KDh(1a=lWoexv)>|M8TA_(2$Bpd zl<^(vd80Y6^s8T4d!JzDnF@v9lKGZKQ+LA@SPc8;v7#GFJNC}CRRdZ|=%X6}LJ?0C zUd*1EJ9&0ad-D>UUja*<6UUgjkzI8z*x=(B%cX4ol}v=$>Lg^5EhJv%^JDKuA?8c) zty~^Q1zbQ!OSRJH>x7MU8!La2YpzW>nEP?tohVVAp`4YyL%$~Snva_kiRbWpgo*a? zTbuuR9{VRx%5;(HY&T4JBO+7>k{x(`prJUURIlV!xEaA{Rj)W6)l@7wf|nPGtGyf? zot#{FyE`{J$OlfCgiRjOPF(iJo*U=xs^}gJy{p%=%L$I#(anGjDKgL} zuLO@F12NdWcQqevQ|zyZoy6?o7nEoldCpCsuLK6}P1v4Rv$pOmE%hh7>5Y_09Ot2* zW-_~EBzjj)^=aMb8t-Lay+y{Rl=JfqRjf+k&LJ^(gf7U92oE~pk-c!;Xrr#>;+!Jh zX}o@Na!AE)!jSA0V#O7`U$89ok5T#-h3SP0FY;#9OCl3;q-5X|qmi4Dg!Qx0na+4IapOC zv3_i}k)eNGwlQ>_`!@R=etPZM|-w|Mu`UZeDU;v3Af)^WG; zpu#_`<60NsracVp;44da*TxGq8=HeLv5+94 z;Xd2QJ>rX-p4!g=fXmG?W#p4nuR3-??O=^Ukc`3`w_d)t@1=99tI_3iDm97uJfV@& zZ7&vcOh2sJzeMd8pp@k*d@imy%Feht5KKcQGr)K4M4z0Q(|MMtQzXM2)E`*dXOpPO zRpQ55w%%DeCpKjz=sbq)#1}kCa^Dh=J#+HY{L$CH%$Dg~Xbp)q9CvZn(T_2xxOz-& z!Lh^NLR00U3GLF2-Vxc%N4%e9w>`t7N*>GhmX#$Sb~N6vs-ZeR5eAnT&jpW}r~N_( zvfLp&<_Us=#%`{GTlZy5M#B9kXS6tU%zEj5=H$rh56Dz|az*nT=@JeyX#^=O9@{(m zesVXl_)LSz$qRDtUxZ_1u5EG;-x~Go@V_~=wneP7P?Vc2?9f^BuNmD6RoPy0^6?nx za`i{QFtC5Ww%k-C%`MNep2tEfR8~;*EXI^zSX91SoXlr*J^M49*V|1s=LIBXtZj*A zfNCtxdB>~cy}^v%`;jwi=LeE}YB=3dGEc06t7yz(9EB%7=X%RtoD5QQb$UE+QT=vI zrYLT%Y&tUDbYil!L7b=)f~yZp%js0nw!E*p$3ZjxczUY(pfdFn@b#m)3atVcPD}zv zy&*2Vl-iQWUta)!sRn7@JL>bI6jfGxj!-(Lku9trBPEI7ko;&0-zZeBfQ~i`sIfFM zE;x!ikOAoLQ`iXzLwk)%zN278D+YVb(KDxT)&Fpyt-Hlsvns<(MP#wgHC(Wt*^1_- zB4W%2Ru=6nj0u?2+`UG^C6pU-u+8X&N|+#Awc3~4jilSEAYRa^Y46V+qr{b{e5dJI&K8M3UWQ#NBFRSz$wFcl>K%LNXC!98GJiLh@kOQ5 zL%*r_ONH+SIeZ^BysP3Cja&>dvDc^^w}n<&^JC{$D^!Ku8kNpXHv8%p%N6Ph$k)^^ zd0IJFSaBAzGzM$y<1$hQH*`O^Iex$w_Qqi1ErWD#H!8KKk%8)TGVng14CL5iSNulE zK-3r+_yn#MoyuxTTgX5Qn6$B)5@hDV6!8S9YO+>t+J??XgiYWWTh;_i`x$r6E?Q`H zuW2L(*;{mOG~9BIBog4vJYBg&f-hagRi~(sPb0ib4w;)0MP2?s{f8R@E&0E9Zk)7w zj`openlnDJuKhYJyLehUK%P+qYV{WB>A+D`ePqfGl9c>V&#HZRju_LaV@mMij+7SU zkLhQN4seoTWS9#-HmZR8ydlfXrsta3+w@S;&T=p^GBWW}L&tBGA@6SlWis_>ZLF)_ zOw@C9nz~;-&N^xq&M@G#-j+|?t~7JdK2>~LS6e(JO{PUyrnyjmg=jDpA<+JIdu=AX z683h{L(+Yjq;$lC5qTjkJeU8h^B5ifSYF`lW2M;mKdd-l#dg9b;FJd*f~3uHYK38Er?;%|LWsiysps7v*>q2S)%z`LC9b+nC6a+)OU{h9o#7P9s|?%B5*Y!8h7) zY4;b}GWnA5u#s-bQP=7O!JI5Cv;XP)hS_AmVJ81$=96qR=aWo5?yx3gt#mJKOIqM72vO!wLq5n^F^PUQ`i!PHIg4fZJYdZQXq=UM6m zGLSG_O^`Vjw1IvwQ-<(|MsU{c1l;=^b~CH+n$Lyg42JpPSrK9eu{gUlv-3w&%nbNW}{0G9bt)vM9P_&q5{gJR~HnB(lMCPFcb-Mz6(YeS81U3j0A z@)$U8^y(U`BXook*e(}!U{bk~&3C8KBWC_1%^r>-SVxj`L2G3tJc(#xD2%CgyQSqE z6K91f>`l!X5g@q^9nKgHe^Fws>D(_hbGW^{W%|VlMC5%&{m89x(F}TGXY-btg;lEU z9iJELh<6Je=O+7~Z~NMs(BSI5IcS55ciXFjbv0+Z#7l`zDW_{lxuYrBP;TrQgSwl~ z+4h`~#>Gn-^aYSP6M8am=7_zA^G;gYqebD@rTrOYitQY7seSKC^qhk3#du34L|SNT z8hj)Lu8VN*a@b4LIVW6`o!K!n_v)B?v^MejnIW=hmNRB^uZf2iC^zi9;N?Jihq#m}?_PQ8CDQoAjR)>4ere`4ynF2l znPL5_vx7;T$lc<>X*T&toB5ud6TM@w=wZu(_P{eum8K+1Rl({C1aqtp?wkg$ife3k z_|o_%MV-!ePt;^@`xNQ$n>QwU+KAH0kTFK4mNvzsEZNfwT|(KS1w>AH&*}2uI5B2^ zBX>1=%z)7OE%)a*ZO!gh@lLF;5WzOKv{z5ZqT}K1#EH+3+k6a6NA;kU(!w=fjr9X% zkGjhed*RJ5OpX}XIy4nX8ys_t51A@Em1vFB3$Ztdh;a#uHoYv5srQr*b7xC5%jr>@ zjJD@gCB97UvyH1WE=y@H(Mt+^1Sl$Urfyu+%81{1jwHS6z|biSDSg_=tlT>=Tx~s+ zlNZSTU^J`TNyC*fvBfOjY5BQdOdLjefw;q|?w z?J5pVFV@y_e!tno!seb7?*1arhF!R6i$NA_Wrj69o+m#?=>vu*wJ?oNH(9eatZ9?_ z)ndgEg1u?@Df2eZ1(w{35&WDHLuycz(^hl<Fa7xi4yJQMOmprfF+-!J*3cTT=$qzM(m6{zxvp!WBYUjoC$;z>Ku1i;1y1Pr1 zn~?!T)$0L{Y3JmznF@AhV`kFYx~jpM;H^tx6-iPC3UU)IsqWB0x&(nTC&z0q7n319 z1F%xPD(3;ElF?5+XIDedN|kP^Uv!M$Q1Cz5Imz>(iN$qtBpcrd&HmU3Eg}d(7rXoX zZaaX{*3IJ5Oa6*6c50?EM-9>tPIatiY`02TK3=<~%z!;n=hXjt8H*$-&g2sXC;R=@ zwGI2-x|-Wb1!X9`GLpT3b}PStwhKxZS=L$@8X6uLuFA(NR>)GG)gY!J7GhJP&YKFp zxBvU%vjMJQKazMw((Ax-tVa*3(J*+~OpSHQOuOElC2!@nZj?Z5on>=x&`Yc0!-To( zJ=>;_k`FbEu&>PrQg!EyB=Y0>YHWr-YPVi^dS4<(dokup{rU!j^NEey@Hbp6D3U^2MVdw5OUj>lq;C|omfc<$`%NEr$_ zCzx5N%uVf?7B0FdecG1ZkUt>6PR#Rme;Lv>F=&2v#&+UK(?`uNaGel6xwh@(SLwU8 zR9!7Upu}}0VJ`E)V)9->5pi{QxInond!uktriWQXhSjg;rHPDCX-ctAGEr_o%?BFsOulo;=hyW+~AM8@mjtgEb zQd(kZ{HZH1^5tW~qwbolLaPPiooZYCMaNA2i7b!dRzYUTE6nY(VH%g6y)|Ft< z;}+#-HbSncvoo~YXW14JUt%R-WnDKWNZdB6Mbekafbcx`ENXIu(^pDcq1HW-ZVmA! zqjEjzLwww-0^Y7K%VYL(OLJ^l-jy36zB9LNK2A4Ae-tjO=-q01v0TR(IpiXoyp8n@ zmg%w(uFdGZFC2)MOvTCR^BR5J%hqtwF>VmJ{Zn_yZl)BJ8$Xb2#VG- zFuuK|ZPRC)e(qxw0kWvGc!LkGrKFbvF77zzbneu7mkrkc3T&jNg8!+R6IsCvO)!;b=mE2IS!YzOl9L>D>Fkv8uA3buM;Cm?hCShL4w zV?uFxXdUd`LRV&^>kL{>#SHxTiTxZ~ICiuqq!VSkDE>0qB$>Eq{3f))>;YHV#)z$s zPpW~J?Oym9CR)_n-7T13DWDjnB?d852VK^UQ#ay2*`!T_-2eJ2*F9n~8J!Y6Y6_R!^ zKICO$9`o5qe&g=(%!H<7&;=Bv!=1kJY^z!HWusElK*18k0^bspoq>07lU~p?+Buga zSM$~l!fqLyoi&}S-a?4O>%U+{hQLJcqO}4hH+B@Q&K%xt6k|(!I^$E0b!s0enPirKP?%qyzp^XjZ3Y?Oyoq z+c&lrtKe_|w-MSJ{ml?r{Q@RTo;{nZI;;+T{NV}?mBwa?i--{M3ow@IY$88XsqK~U z+EEjQmt#iG`7JxhI+j3}wdBYcw_SHWB4N_pJ~g;Y*EuXyD)HFx^@KC0X^LLu-dg0j z{iq(1g5wxS;nZvUY_Mn~xN2ZvnYp6VlB~akigg{oRL{>`frAk^(=!X}GPPqkRnAs| z--r4MS6t@aZq%Y%WtClHl(VwB*Acj|!TI8M|Nk^q0o3GwuY2V_VC$JAk~jTqU^zC^0O59V$aMxbeMXD>*;z!WLHo7EOX#SiCDM-l zVrw<~ZbxE(bA9=Mr6B`a3nOi2QzYeUIY7mDXTT{(T%B{BI)u>S+U-aV1caQTs{ zv#DeNiMnP{NSw?N&FQI5u@K7FZp_TNg&w_LRTJPHsuYSBt=$c7yWcC7cLPZjUhWt+ zY;`WXqsdO~98+Yj{9_qKoO+y3J8W+CFGIlH;ieHoLoX2&kJL^WM* z#8xYNu>QIP-#lT~R&lEdTd*}76>Udab&y_!<1O6q*GOSSu_N-6bF_CA+IFkU=&lb< z=38&Zm4=2Nde0huYzA*=sfKrb6C|xQ+UhyqxH3J@7I5N5soCVyMo4FAiQdw1uAtE2 z>)T!%HKU@vK6A>i*067$WIE3imM&fLWokoIg-z=1r56z*=KOpt=jI!dMOXS7 z@-eL`vzJ;jcl1Q6h#lo|5q{6Ad`4iQGGzsAtm?bl4z*TI*iwZ zIVBMMeA%kbx}c{Zt5#;tjgSQl<_Cj5xM
)Mk{*znQc5DDcEYLTAm)1{rw%Dasy- zd+VfBCXKBwYBGNd$?K5xP)})hkxHwrd`}=XZ9h!0V7xgZ^i0}BUFddS0G~9y!fNZN zX^0P6eqp#&aPx$b|EFqEuM_LG+mRSlue-Be8A!PI1olkGoOz0zxR1zSg@VV4r93oz zy5GYsDzeD1|6zZQ@sr*Dr_tcFr5*>{TtB_o`uZ%IEl_<4*Q>p?hzD0?BzQ(9@7}wS zLr51*HP-m8F-B@FzgC}n>ni=U0@FJwC75$oSGASe3ebTo$)fLJrAg4o!bQ7q+tnU; zcR2SmQa=kf^7E2N{MgH7)yE7T-bZ9OF8NjLXe@G;m30p@Jd?+ymwX^%)oHIJ?nk8iP_#X91JDtA1f;8Uy zEe^~rcz)wq-L}b17OCg)5LZm2plpG@Wkv@FWW5HlWY!qg?6HkVl-smot$W{EAO{bx zXgJC0QJ-j(C*06C(VEdR_HyWAsZ8dCTA_7SCET2f&M6| zl(dVT;0_@@OIIo+-;vw2t5gn*xxgR)wQCF46hd2cqsREh`AFbyp?`kat{Iwuof^!& z0;UH*XDyxxK6w~ImrO2cmDD_L8mzZOnymy#uwv?2wO_xsssXK3)`_A9} zNN4cyov7h;BE*~H%5D|1|5YBz!w<_Tfr=^VovJRku)>Agq8e~ln_9$bSSA`~d{Sdd z%oyY{nZ1+W3pdImlgfU9_1u`b|APOB%&Mw-!!2(}jzbBt4HUzn6Wr@$dGsh0d{$bx zc1`=yqm)!GjvfuY=uBB@DH3wW%s;;6hPeD5y*h;TjalJ%pvKEd|+7N4kLQ%DJ6$mM}MJ zB2w>b*HY#C?t2~akiWHx^8Jw6{2|b&}lyBC_6R9~G zX>~9%RUt5B=oTBuvuuG1JbqLS(uM);9Ufu&xq=aViWFpP(7pdcM!mt=0X%;oxvB+8 z(^AsM6O{DNPyh;gR%gk;StE;P+hVv@&y`qZz8!z5hv)7;6DmWuYMyv}M{wAgAsrN^ zE~H-HQQ7pMmG)uN5E}^i=y^$@3PB3+F2lWMJ+~d*kE0BYQ2rKiW=BU3S2Qc;##8__}7efV;IeT-x30l26-s4N_{iHo>_H)^~Kl{qa??@Hwd? zx@+qZc>yCz(`NpD$;;>+wm05;^pE|wvAqKB+d=Mweqjm`$zykjE>Q%Z{9HxOe&+`S z{SRB_xlxw+Pmf<$|K-=es^G^wwY5d^8q}jgdtiHdENjB_bpUpbrxv!+`9xjPA!_tG zre>f@m`3IFCWbCB7?K#GNgd&>>CaetrRlzlSNb>&ewY|R2GEx6usOF*?7Gmiv61<( zTOqilSl9eannrti9jWzwjI;6LiCst&+FKlb}itc*-ww=@j3ltbdZaBxB*4E5$ zjwZb@!Z_ zY$`yVwz?0xyJ~*Ni+#Qo&3jSHL8dHatx(lnuKh+Bgtk%0&HyZF~@o1B|IN;9pys#o0;>a^zcDw2Bd6{Mk{&04F==vN?6!+hy(7rc9j$*?H5qE4!w{ z3ql-Ux;_70yjWvpB6R6@blr>e#_rsjP4=Yiz_sZxbizv_=bRy*6;oT{Xm7H+|1%#0 zJYm;eVT2=Sc%aZcdr#EFe2IizS)ywly@c@epLUq2JRvN3Q_CbH_`^|fM_#Qi=Q2?{ z<|XfkS$=Rw-eG@7KKA*<=Nvc3%vHssLFioJOpp8N$D|Uox|2iY5Cq5se#`&H17c`& zf^I{RdO(%vDtjcsNDxw%Q_-#uHzl2_XvgfZbfpo@$9CyYzAKw;p^qNN+N#oR6CwS@YZ=etIe zs=%XGRTdRPr2GcDueOvWW*hOuJLa-D?65e>N$zQRvrjYfscXn|$&}_eigy+cO}M$M zu{Bi8H|fHehzfINZd;I06_>a@`-w;H%D)U2BnoEQzK?nBC}!DKoe%ojtP*66y&@gO z-jz1v7&}FS$-vJt0k;cI<<}_$I&;~JIgvzUVfh%SD743gE-z+Wz~iZ zltnv0SVkuXn*#z>BoA!&c+o}-bbx-tv_=nyY9-QmaQ#~A1^yL_;^|Ak-c1 z63$pfJ*wURz-?*F*Xks{paD^~fi;QV)2vkFRU0PoEqatZned5UDr_}Hte=oW13 zKzT-Zmpkhx@OUDDU7Yf4P~QL_j_)j-)%iH%miQ;j_?DsmPv;h?yKaM@m=BZMp^=QoU4z~l}j_Y*HTB+HO>vAWTfzMfl>M+%mlx4{LDO=tU{OqD|FcW<{NvD zx&bGl9Ivy@)d|+eF7V(((k`}(2Wt!GyL!WORFY6qzJi-~2}RKwt%RrCl( z5>c!{ELzWLnaFr(SSbs|ls0AMJV+;b2shgGx$lnH_ldq65ECuf5>0I;_%RY7Fe5!A zN+PE>FT{R-i??1wSn`?C*zkxw)GF}VHAHn-q-eD@voMISZ0|VPvjtd#|2xrx2$SdBZttpiqg3ZFJIki>(ez@vB z_T`y;vy<*`2ulfxE|$y0i~XUE+|BEVYDlqhiF2%PjYnsbv>bR~lMK`icVw$FFNdH) ztURi!6P0|EJve6Lj**F~M978e!*36 zDJweb+^4-`RI?7R3*hqdpqY>9(%wl5GLLevACaFeUQI0OZJiw1PAb&mJ+#Zory2&*avoD`kQTw1`XJ%RqirRN+ttAVB*!gs$mQZ_1 zFs0TIYZ9@gsKjmvf+Y5R34&OH{xbL8?|t0+`}Q;U{{4MF9(m;COtTB8R)7Q#h{~Ikm&8S?1mAHOMZ?Ff%Pz^3F&HUPa#Lf@Y@X zA%lXO*A!^?r_`8ato!VM)cTL!P>qw1=|LvC28X%^AJdFZ+gw_H`$w5+OIYCAFIS8L zSKDqo1g_b{y|XSct+<@@BUZXi&@KM{>bNj$9v_smrUrVyrY zNb|XSTfX0o*BowL-3peUP{V0e~Y zQfTta<0mXQH~MNte@~m_LS@#FmCOWtBL%a*Vby4n+1&T=$&KaP@FUs*xS2XQ8m++l zzPIG2|CI4twO0~T)m{B*Vo7Zz)Qd(pItDoFUst42r*dQeBTOzBEXJPWcpp(0MxBD2 zr_7I}7^auzv1|N%4WM_>J(iBaLud2M+o~Rh5J8WrgyUj}DQz9Hd6-#T6>}+gx>fl1 znVOz?x>y_}o1R>34wse=8ojp{c6!McgC63pDh)mIHxi1s8o?+89xOOE4KIG^IjN-N zp$ynLbdtv>r;Z@NkYwR1P@tmSWeJ^TMVy)srSkIMNh2V~*-?1+3|%r2PK)&)_@*7V z?yr_dNi6Lwr=u!pg$_^?1~M0}@99iQOW*A3ZtaDjilhvE3JMM0ZP8*Sr_$doRe|NqU*fB$&?FV$z?3_n8Hp`}$RUWQJXZGBmp zHGmaNT0^zHa#v-gbV)i$PtUXjuEly5e_q4nh)R2o&|SaZf;?!s5=d?Q}etQz8t-_s#FXB~(U zfF@4CpIs9z`HWXAJ?f^(iQY*MjA)SMgesvl#XrzB-ciGkzBRJD_QblZeE*5+Cf7`@e< zl~Uq&dSU~BU!g`fO{$WTXTO{?JKhK00^WCYPBLl|lN3!#cGg|pK4aK+DoKm3eN)(z z9$NQCqK_FaV)+_?(W*-sdZ1pZBd2S#kZT~(P{};uYY@C`%=z9;IF0NCX>!4q-p$^5 zw4}!|>DKKHXk;h*?F_cQr-#4X4AJIH5L5!0occSX1g49erSOgQskFww(;Ev*KHp@M$8aDoljMOQFWGgn&ABjvz4}b9c|c^eN0~tl+jJgGu-yE ze;gzID3WJ+KR5bfR4?RHibDWU2-Y&BkP+0v6&eNK-;805M+-NM?Y6T~QwLjGu@d3X zbq_;kIJ5&h#G9|jujr4RUH0;r8|8pbd;YPC>$&6HVsTIAQ?tBbR(J5pIFs=AdAm^q zhqNdIWnT=w-l*rM zHSpVHl@+U?+}} zisp=X)XA3F{8p49eeCn)oCz1f%HO=w#W5yF&A9-qr&_Pq`J$AA7$rFCD+BM{-JUWD zBLkI4n3Y43UY08ph_{xR^)QF;?`eu%5WKW7b?r{i<~2!T5>(Y~$<1mrAHT9_brZg? zvQ{V%*{$1I#FGP2yZ30E3;DdLsr}X`>~UNr_&GUhfu&N4coghHT&9+tUWUnbZ;wF7idOXc3W2g`bP}93pZXT&1ktZct7pPcPc#spgHk1$lFVPvb)m z!fJ6u?tbq&ovm|;FnRD}Ll0^v^eRUyt~qYOm*>m5&T-sETz~gy!IaW0VE!_n8bgX_ z3z*5V{gDRzZnH#>maD?CY}L?M8~PKZN=)^AG*&Yt7x{VlhZPF0%70+3$!pOhIjzR& zP4?oCCkeUG;P>^W*8Pj{E57N>maYlbL8YN=*1icz;LEw%JRr}zRxV>P|JG>EJHc;` z%-91v=X*u|@NXT4xr}d~*f{z6o|XtQLe3;~c!EXCH5%M3oveK5@Cg%w`zGggsNE6F7&y7k z^xj;pX2t$UuQSLDx10D$sD3lJSJzq0+b=YisU(^dUlU zFVQjWP<)Mcbgvb1a^ol&m^zvY+t_M2yToo}vxneUEg`wd`AzSMIm?LXSJ>{ks+J9n zDG#x+!wyNTON|hg3r_tEt&D+8FUVtu?To98ezH&NUmP_XFuSGog41x?P1q9Lbl%(4 zc>qTW3dVWDDmrBVD5nk6iheetwVdwN#N6`lX%c0t)eaMBHoLWoQme=`C?)t>+~LH8 zlPrTNJ>b<8-Pa+YyQ58575GSV2sCZ@bw&HZmvc9~WyJY^9v<}9J_|OWSIMoP5OFY5 zU*ql-{y3!*UGz?-qg44CT~o3&;c_F`x}vBz^hnIjF<9YU5OU(%wQlQwSiO)0l6>(c zaV}D9uN1h!KiMU|Q*e=ouY{lmxvleVOu<-*qww{&<8s(;2Lqf!P_NjW5(cyx^7EH(K(w>fM<-?av zt6ATaY&MB&YP^n^oE)u2Id>gyFx36<{wQSf8)7Vp<7tEF<|FVq(7&4yYArAiPZ6&2 zqAPD$4>V~uEFTH7cdGmu4VckDRT;GsCl-D)hwjMpSP39lbS8iBBH6<~=W|{YN!GP7 zI{Mp<7!cgC7gCiC0Ulo>Fm5k1EX#R&^_=6XiUEKTn@VrFz?ft%1>;ts+T`xRHBZfm zWf8}jlMNVdi`SQSwZ!Ig?ro)buKuu;UMXG{Q<_shAaWqTl=FlXXJm+PdL_mXiphM(j@l?*F?U@{f> z>)r;K{!-nq3q{548Lsb-(SpXYhFJFpwQ@xj?s+*%Ls@~L*Vk?hv zz%$r{mP*25bLNdrlnKXZbb87RvBY~q<-J+J|FO<=f;==h4i60ELnw{E}-ty)gP-`Qr#)~<(Kx%SR3qQma!L^g*tr&c?3;gX$E}O(aIvfoq zLi%eHN}PUQyr_o1Si-MYKUS0On3%Sg?wDW#NX{9OcT407nzobf=|%q!&q?I;Q9S31~rZr}lG@Zi10XcZ;L1&GZ~?AG~ma z5;eH}zIO)m<(&Ado`q_HXnVJtaQMxz0Ui4L=20nsLWLE@I#qHozHh!HGCU}M>ED5^ zyZO37lK=$gZ;qy?^{&eh(_;lTO#01eMWUlyl>FmouBkEla@&Y;YDe*;Y9X%A1LlG;Gu?IL14H}eb732X>aBwfb&pV`iBBt9R|nQND46vUO>laNq!aI z#*LB$(nD>6XLh<`U?KQ+!EWe3-XIWf6S?BaZT2Z1l4J#F!3*-BSrD$+&)WH?JpD(E zZ2lW>{1crgcnFS>IYEx#B9A1?^pB^ZO)=0#u)<(Z?Rw!4ZR%Xmt6lo1cwc8Rz9PP& z6>d(j6#cNle|&w?iT-c+I$!_k|5SV7e*;VZPk-d=-(UDEknV20-k8K4@674%*gD-`xRhXcTFoH=ew9#lq6_;>34-7g~M)=(@Vm6fy|^ zKsS?MAJqb#NCrtPzUR*dqaM6R-W9JKxA zT(^ieS9z4!Qp7S#g!Ep3E*wr+)Lo+=xbWDBz)gAdWh+(_(hFAJlr^YFut? z{(fL`*O?k`EN_3?{Et~sES{#e+?YYSb1fB?sKQ6!`VN`!BWMqzV7d z9;yuv8srnXIwseh*z|rhl-CFQ-UB`fRl*>OJlF!>53U9X)GPx8Miifymn}rH2^!^r ziot!;_Ya9Nd0H^wKSDk4DOLNaBC>p|1T6gyHW4{6_ovkBu8q5L_cQ3 znk;F}txK%(!zsDc*SS1{Wd>*iff8xT=*RSmC$G}HW?Q^1j}@rE-0j4N?+0g zk1%ah{%|Z)c6z(iZ`0?CSZTe#RL*bWyV*jPl`Wlqb+5#_=FHItWwnOWh=xxtUJ^Sb z8D{Rvh=gRT^Wh{)oaioSgVn>5HKa?Ut`#gO_rEm$zZCxh@w=eSdva9;7}r*-;B9){ zSM^}FI}aI`+%C6nddB zF$jZYy-`npI<2kSk|DY4akfi&W&5Uir`7w-uZUo)6}*|5o$7r+>s5>O8gNJ*G z+9q!k?pgtld9A0_ua0^<51A)tA39(HBK}m`9R{k{aSz+mk+b6SX7P?LFwkW0A`a0>$cP{Injyz z)iY{D_$b z3_jAii!KqBrlwp`8A1cCP(erfWDRQX37~K#@%t6x%x`e?j^g3W!oq(E!v8Gl{%g4C z662Gm>N$|(qIY=aoO4~~Vci{}K-S11CzAL(?E4C|rqgD!RUNOBJlTgY4CmxxFdReC zxEIiNS1hwD^c#{^%%U){x1{rI7b2w46vE1QPla;y1WAMWdk?DdeD?hAPpMKX>-3)r zJ<<({;R44<^D0hw<2IrWUaPhBv`*C4ED$8> zoiwku#ou!xrYgqzJ}x~)8e=KgM-z8Sx+b@Zv&Z%mfdqXmQc)enATTpyd_IipEpnq* z0H-&y+-26ZHRaXmvJ7S9ZLvl9=9_n~2bE*y1>IMA$&gad&54X4Hz*%qwKCKWXYaWG z`dBt`mS16J3J|hLH^~60r#oy^=F@~AoATm6#v z`7mGUla2Y7mbtuNVRA^ZXY=aW_8~zKnuj3RDnT0QJ4&;es&)BFKkFgRui12 zGERG6)7Cp*4%kzbtpIYNcvmuz?CGOqzjlOnFL?veopznlF;;%xW&1Ky=VSCWWqSO9w94CMX%+Xagvi6zHPmwIhL-Xhs1_(>Nf7f` zal6{DA&JMv#d&w{joRT}JDlcrxJOcWg!(vQ2@*W0y3V;shHoHf;Q=JtS^^BkOt&!R zcxIg%Mod0}Xm<6pZ(nV11iI0EyUae#!pt5IsRO4-34!IMD_d8iy`Fb>jfZB8Q+;xQLFlB z#!3=m@Q1`DS+)P1tY0g55j~o0@gv!91Lcnz+@5FM&geq>owhwk#S-V7%cIt{2e&hI^D8AxxS$GesaNYljb>5 zd#6ET46~UK-1lLivVEkrrOv;`&3(`yE<-PW#_^qVE+bqe1u81S3>K=Dhu7E1G%l`6 zZr3*SE0iqEVb8W6W7l4%ZnyTIO@zzeyi&LB6kG#t9OzDZrHI*R+|q>}wS?=&)#g6! zeip#DQNIU!P;?kNA9mzCiqR+BE-POa=PaL&hj`tcR*O|+^3dv8j5>*sqxbgB#?L!@ zKeysPu6B`|uJTaaqx?~p6n(6T>Rp;{ob$`+?fVRXLrK~TS5xIT>~8MPIG*sQdhf89 zT2`%dVa8N?6Pf5o*XF8E5Wt_?+ye+0%FMtCTb0Tym>%% z_CNep2GecY4N~uJPMy&@&(#$t50MTB6tFKY8kyNj8JYB$*{iDqh9hOD!_qP{sj^$J zme=eW#!@euDRlJv5+E|mlnP!8k;PnskMB)nS55X9=fE}Z_I;PL(F15T{apL=QDf_^ z>`k8|=RaDfBqO^|h}&tgEarFfc)x9Ut9UCkgQ;$JdhKyZGu`Q=&&eSoL?1d07Pvd+6RZDsc;bDFgZv0GW;YItMe9=$GEzB!PatEhJ#- z4qdfr;_9W@vJg!KNYVSLifrCNHA{yQ#kZ8wolnPs_sh_jwlGx{QAP3{m$&J z)qGsEdq{G~q3<^|_SES?ckuZ}K(}L71Eqcz+;FR#B*PAOxhiZu$hJ0AH;_~xRF!~C zsLi*vztxY{oC?A0G?i_iX`bqOVdND}du4O;t#VL|)J#NiYkF$DVWgRT&!2Y>KmXqo z_OA?CzT?V22~n_3%Xes&?KcqWKBK$?j}>Zc6+;XvvM?=baI zX<(b6T$izV1Zg%{CWq7#?%)2*s}6MOHBEkYl{Q{I4zjg|PIS7~QjEX7hOEFOJ=on3 zwmkY6paqqB(|43~?L0%Nu0dQ7=ivx7wYuYCYC7$r_pZIG8^g6`i9FoF(ANtD0|_DnSHk|;cBiIcU^ zx}KLJjG2Lnh!MSv5QR6E1y;*?e#!_VjH)ZJi<~|H zhz$!PVL_>xWoNoKoQ4gbXMKqK^!4rAe+JlvE0QbJ4{i7@&$HR^w2|TLD@fzz8=$(PYb>DBwnhprU?3=)a_WwC)wliYnGCxU+*XetQfh~ z4B7F`3yEY5igP+TiJ+;ZJ2*G%+O3AGjjCGBbX0jYn~@LW+JG^UkW6QFBmV1|Hn&wK zJVo@(6VaK^4%6r^b2A5*+~)-4XJv4L%aRZqb)$w~A_G!~PL=#$rvuyi+sw)W_xkcX z_SPwT>pQDEJFCZg4~!*(IZ=`c3rJ3@B!VEQNK)&Q@J+35Aw0eK^xYx`%%~F_+sTfrKJzqpbcku;-q`N=Oy&{o zYh1B%Ai=w6*Fw|#^Ll!Lc^~7KtM*zp29r zam;+SHcVA^eI~sqD^0yyuhdeY+`RJVYdXt9=v?2UrhF;-22qM8cbB#jiyqR~{g(J` zs!QbxGHkMa<UO_hwXe~6K8@K4 zG#U39$pfhLtkiNW73+^9c*j;+g@4=R)Eu2x5Qv%<(FO>tHMhwm%Z>_z5t;(NoO3ecAw6qJCZ^!&t?-#)xzV}oi#vLRLqVFvO0FoJd60PWgl&5 zPHo+>0SEI0Q&OWGihA>tUohPSW2?S9G2R?lHZaJ>g1=MarjlT3C6=Ft8Uzs4tB zwWfCVen`98`qP+QT?zEg;dG$vdU@}SDye&ow^}XCjc3lh73PqzS^$2!Do*ha81>s= z!_rBT=iV87-eaT+BCvm)jR@AQ-l3NGIt{wjg{*>~^!$?lM}QwdsvxB=z`ti?$EU!V z$l44}2y3c2`{giUU^@VC7C^&T;03A!yz2xNZe9ujN=63vc-Enh%Gq=FuT`w{IWBzsk$Xh@aNhO&pGi{x z@_9$D{&G$TB!FzjPr={UzWa5T5uF>P# z_Jgq1`*aFu`Il*hmZ_}<4~cnZ7mMFib+|^IPc(Ho0wYqWej&0Zi6ET$un0sb=PKz1 zu4IF-_fj{MJh%j^ij<5y;RVsdoXE(R;UHRMLDKxuI`$chIq&H@pyF?&RB?u=Yd z%v?ssdDuY1Tl|rJRX4^VoS-#;KArY~-xU_eeWS=LEPW~&w^ z-m9mJXcI|3Z#6UB7NYjt;c^4gVVURPhsNbA!RKm+OJ0v>hU^IG_NhNe1=z%1f$pvI ziZGA(Q?8GLxI$S`m_cCSGogiw@o7%lDWWN59;zU*Wso2fur#Ili#^FyikfHJX>$?d~}v45m6NX zuU@>yq6cRos88cZ$$fW+PXCDyPAqVKc8M~KQP8?7hY36f#48hYc^V{n(U*J zWF#`y2nApDAWc>;2jQufgm%A*5UR$4mcjY3ws9pJt=$iN_F&hRQHQXezvq(_k*fj5 zrkJ-S6=8)kW zcOl34FXtEqE^j|ds!yofyVEPuMsfR)FXwoI&Awa9zop?|@__o`@G#4i_<&`lB^Q8? z!#VQn2qEDln2w}TFR3p>PBn~V+hqYKf3T}r!j_ulkUhXQJ+`GwmR+59HSBC`0FSUo z+F6@!C(TuRPb z9MJ3EvH8$;00^(y5lP7(*c^v^|591>pM*wmrlXroYlN znme;Mcd%FyU3)Yr);sSQeB*St>KO^<(>VMRRU$#J@HgyV{b-pMspzaYWMoL=Vx;1q zxtgHETQ7!xo6k}0x2|7EGoC z=W_Oeu{#bWD}!`Njb%ZZG(<{Raf?87Tb6E0XhJFhR{R2(25*kp@=biO5l2497o zmSYlZ#X&N0qe@NpN(s)fw<~ExP5*>2!{s6uub(G)ct|9NDLUL2r=8!&1lWQ?VgPM% zy{g1@%{&nSHk_mCZSJDNi2+;=B)4_-mzU>-eSTxL=xhZOw}J$uueF-=A6-)*PpmHR zgYMF$ovkPCwUB|9>2B&@&OI1$Dx!=`#jVuGCtBCZdmDaj%r5-D2L*APxp>{${AQ>#vKi_~op3X__1kH_ zu;rkp$G)bosD<_Ms|ih-%(Y6I>$8Tnr(6( z_joWBO6UhZXFeaT!l^t{4QD*$253l9Go(EhqF}WjU)ytPai|S~4RMe8B;ZA{j*M>8 ze|~K|{!iV7#*srBY)WOol%|3*W~qq?jnsq>-eG_dZhj6VFGz>?Eu|l+Ap=$80sDmk zf*jzai7G&<$EM9DK!8X3l*GXc90T#s_} zzI-MiHtU)o@+5x|f$uv&&Hg2eC>$+5Yw$%Yo4P}(QA}L;P z;WC;J6cnv3XX2=PIyR?04O@Skr>Et!PTo^K zH}o^L7h-&6iV1_(!po3eBA`dwj9MP94>j>mj3&JL;p882qOA4$Lyqe6L-}>=Fm_S~ zlOSNCYW3j1?eh1HzjsE~hKZvACiu!kvYjqOP$MQNN4=86$>y$l-BXDphYTb%Tx+f8Px5wH>_}!$OE$OTf&;8qF2FT7?1*b?oDuHRrLG`{`o{`?9Cp;iEU^biT+bXf~oT7fr92{ z&zw>34aRpXXAak^S|M2*w1L(7MXTAg0{u0&9Issybi6Mz3)&FF`;X;Ymee?$2UBtK{y?o;UOCir9G}7cU6*l zAgFuD{#NB#jU_>6O|mdkN5u5ovGONn+PYZTWHX?_;e)xoRDb*6NrhUEBpN4qZXlS> zc|lcwc(aob&e6Lf$xk9gLL)LMA|m_3j(6mNV%3W>4{cp~7?8!}A=}=2mwlu|%3kL^ zk30k9OPn}tT}zH6?lc9?aXnrX+6({27(Qhsj+^6~%c1o9Nh)@HEY$Av5_WFXnl%-I zDDz1PZ8DpMnw?*ERFz>IiQC(arv^MhL~8Wwl}3Q`S=}W6R728}gtuU@>B>Cgc|co|GNe?!yk=C0<6P63WcDj zH#wcr_rhfsYz5mx9kc#Ey|Y`CSivTS#y6G^w82*upy~}a(}^3aIk8P6v-cWZ+=Ip5 zxE@@J@ohGf7=(D3-zPapQnXcG*GDB6`zRe&ExMrR49fCXXBa7o`{C`wxpx&?3uzsK zN-Bf;CAljJ4g2~8hVAEx;^|!#cB9SY%65Jf;;LD(LfRalu&TiK*cNU4$RO*>xm`}A z@9L7(y)&1A#^@{Dt1V}p?{5U>Zg!F)-_7I zTw8L%cg5(k*8IGD(YU3bxO$Q+dcAo|H;j#2K|yd=9U_c2taHM@>Hpv*u$4z4~BiN{Anb(XY8N(Yp^ z)%7(NK5`}S#~$}PmlE?=rx^^vVfpR7;@_6k@1}&fc?LM_`xJ_lGRWmvj1}F?BDSLrFL@IS{BcpPE^zM;Ko0Gg>vTtCE4fDb3Z32Ba*-EBPJuzwfE(6>fi9d(e zBW-{?%0`1?S)f)&uDhYj!{EX$c{9X@uTV#d2h%i(=)$T7h1g`|}5++2-M z_u+DlS3Vl!QL2J3{1~zEZWBy{n<9Tt-=koBWH1h4tE2K|-st_beb4MB4EtdnUDZFL zX21dH7e?iq4K;I3@U1E2nlLNY*mZ0K*VGqGR*ia{YDB*BwsJ9e8SZfm`K%XaMpMA-wJDYNyaPP0t`nCH z4Qb-;-miy~Sru~3{5SSa^SQn#wD$tm&2`D1sb+*Jq29|y5aAjG`%!hnN~hv8Lr|Ph z+=hwS+rS8}_8V3e6=6?qjzs@FvCDxEer}SJwU#t0pR9ih0vySE)Y)IW*=;GxwKt`u znAhkpTB>l&&YrGoZqY?FCzJXkn~tKznL3+pG4j)|x@sV;{n}pcw8_yxH;O3cq#|w< zk?a6>2H!=>Ql+*rt-M(0W|qr>tLw}!K8w;VK(<1(E!Qtif;OyZk!ButpZheJVn=+*VS1hlhG$!g)*1*Ej{+*fDh|Dc@7IQ@7~H0YcO z#Q|Cc#y><|QunM!Zt;Luy~IfLIEQO8LUg8xRAJWbe2+jIn|?RO_eSM=r!0e|xN*di z>Z?|bBkCvr27{=E`o-p_mTH@t>}z;aPHj&ZmZO!eN0z)YxYp#;Z!_z>^ZI#H@d|@E za)8ceX9c1ao(-aK)CU{nG$^6yM8!c{`{rI)q(&)0-_mDOq2WXU&LFO!xX1t1a9vS1 zRqOtdGb&A@1h)A&vo5pdMZd}0-XYd6)jq66AEQatG3jADH{s6df)5G|ztc&1!Fkv8uUG=SRh*;V|ImJF@y7)a8_HaD9#6+T)>SHN9W3h0$-v{6^btpwEbU4|Ls+Pfyx@d+CF zg7@w$0jOK-3a8OWaYIGX=h2{Wjj5_%UF4`mLGc`(*~<+_1;{&TUNdtQ`jsA_8)s~= zDm##4z^>~Z5dU(HW3V8qQU%)tFj^NNd;XBdb?Kh|fi|lN*XiB6AGCxUpR|^Z#=Vlv z&bMmJGZi=7p9#(odF-3p(BJgZAAt*G;-3_=z%IErV9D0Twxc4Y-9akDba7t(N~gPC z)nNWpyl&1UyN?a>nZ!9I9z`a5O(GNRS=!c);Pp%IJ>vOrG`q=Ab z1d)#F4I#5+u-3!3J118P-$K-CNNu0m$W=ElT@n%P)t6UML|Bcr%IO7}nhbQCLb^L8 zcAA;Uv)Po!E%h;XC{M4wDGUZ7&e5Wg+?)_PhWppve>Fb2mEW-UE3@2(*^jR-7K82k zANq~fK3P)9t+MNJYzI4>SrAXqhlyDJyLi)RX|(gulp$X^8QW*=a{@Iat4%AKK6yXp@|X-__w##G|g z)h_OguUo=&S_EejY#5sk-5o-JnhGblO|Z0FSgqt1MRV&mJ7Y68h8}RKJL=Q!+h_1s zA=70vFOsTE1zz*Ku6)zhYxrYQi5waH#>!Dssy{uTS|(AWst@DyBvbcxbNWOMK(wC`?X*xlJH;C*LZt2wN(iF+!-TfSu?hm$?vW)LFW_l)!N=5FBf#!^ZR zOIXfk?80@R?O25kx!X+{>n<4EW;d=3r#%Q;D(*uiCT%Wtcs_5@SGw7FRG2f} zTE3QgB1)FaY7hkS^)SkMyX!PH0FD#{en_^W^w}KsV_on?^NYQL*C!s!`f=?q8-9I^ zjhtgTX%w=TQR6^YTcH|yZfu3FIRZn2nq&Jjt7C~Ay_^AB9M@a5Ww_&EH zKWU!-T%_*;396)q_pcBmre$N2t90cRW7z#DFi+9r1{Diee}FMMZX zJhAyoGU?OP=k3#4)PT^YYS$f=yIx$+d1Ky9(unW+$VxARD>uCWThL0DS33bgI*F>> zYgI8D5n<)-o?5eo4|nXiN6%*o?T&+P-z_i3y&H^jeFodhCWT3-pY2b zlU2OiqKg`k{GRoYnXzOL6nr+gt<`_fAk>?(#5}r!wc(-Q7r0tOV$eX29VhClh;(s= z$FN1+q_rD0Xcz&@t%x#cZ@Msf`s!K~-KQA!Sgq5*sw8mUVJ$V8V}qqCm}q=lEJ&(# z*xE!-%e*8cWCTP+_c?$WjUao}^xO{b-3`IZ_WkfN9W(K;5R4bWr8y{2E?L~`I0aaN z`^oQP*|)6EHD`}feHVd8Vd0w-c>^2TpEpGP?$D<^@SA7LViSsfMRD&j$yS?P^C|64B?x%406`Zc?s$t+t{gClc;QHFB z$30|N|NSz1uL51*``$S%_y&)JN1osP=d25~}K+ zZFGLS)3RekkU$HSE?96?*7nHHOh z1bf^n@6TV4!ar-jEsOkTgMH)lj{(X4g!gyRUa7cowF9Rv=Tre~=?<56PK5)(y}e5VSv3)SWYw}*`?LAtX>IS)?X=2vY;Ye= zemJZS*s#_R4naIci=CSFcziR@dlb^N!x-p=U7b0YZb)ZS8wiKe1DZ7+bH*}v9O&RT z%_X#)Ixlh;+F`A;fL}9Ht0GC?`L;eD;bBZyP*uz4Uwj{~D$*7nGitTh)u`kUCGc>r zsDwOhZbmU|=*0+LCT7iE^UoV1JpAsnBS|u1C^R-1E+;PkX|yPN_#nYCDrl3Wz?soxRq5(QUqpGet zf4Hm3pgpBlop-J})MWj-eqWACZYKTj{Xxe|mpmgQ-ZaRFfgK=LZ<3P-Y5`qG;*%!R zL`FQ*)(xH)DFx+ zMl-0#PYozTJJNwOWXqoI+gsgAwU7Ux#Bj)*Jr)@NE`OH6D@`qovR>n$}x!M;6p=GI{_`1*aPfvV`JlC=C}eO!Vu^>VacTt`Ao@JTF#!dAiG-XSFUs z*-UyCEVmLrKpQKujnRHL6Jc6nJnN4W)KOEEoxkWt#m97@9UGI~Y zq4W>;O>g?w%5k%{73Y-|w^*8us;uRg-+wg86_}V=oq3bo}UddtH8?u0`9K zFXsZa{=TUo#|p;k_`sJ1lEfDdgr?A419U}hwwcsLK?rv6W&jPpA)V`Ary%pU^)m95 z)N1dWJW5}ZvtI({$RBgy8xkQCzDd2GcpxH`ku>ilu7F9nJDP5KWqq%G3%KZs6$@SNP)#j0K9s_^EumfL>$o@2wrKvZ!VzfrqQBWo|Ax zt+`=Q4kv+UlK;&y@4qdC=VL>gF)SJLQ{JvBy@2bdx;`ysb4!J-_w#S*K4BlvZb@kb zIU6Y$s;#dTOcy|W(xT#y-%!fes3kyd(x8aFGYK$jFv2Of34YLdTDY@Y>2C&U_AQ$K zNgbhZF~!zPJpr5=TBqr`+(Wx!S3a0om^0}+fwetOQgMKLMXfja9m0vhTzc}tLuQA6)qBYB^pUY{A?i`rNP8o>@#`MRHJ{98`7f3r#~ z;Myhr`6}URv*L!XYhAxQn_eVk6p$8>2H_%ycr=7)!_BXDj9=^Jqj77%t&z>aQvEGu zFclZ8naH`NEUfx}Cez1KY_>&@D&8-)>?0Zcq zL1=!jj6kh&4lw$iaY)*&nb|-lExujEs|50E!a<6{{Gn={vJ@K(w;{Tk}_PXA{;`vpTL;@Wz1%p1Xs`VvSh8328X%et{ z>9L>yyMy1#7Tq%LW6bF;g6&6=poV0LDK|tHp?EWm%kF6CF;mvO=1UCfDpFa!nkWkb zTV_#YZb_M8x+KjZTDDV@gQhL-;0|BwD(Da_8VJ_|Y-W1!l6G)BGX<81nppcQpZKfcy}0Gut|;AADM zUr?2OP^EmDf3vL#rlZ>dhaBX<=%quQfXA0B$$;($g_j@yDBIfwA)08Hd$vT$t?uez zI&r`jUq=^8f@Pkm$u>q2$Zurv|Fw6fQB7s(-nZIPN-d>I3J{q}P!MEL6v9lG3KSru z5E5o64TBPrkT3@bRnE*Z1!XK`CJ@Gu1PD)i_~h+0~*|}Vu_F743eTI zs>$6+og;un#8Uz0T24Tx|>VdOfLM&kbh>Y*zC;5#;4TDhz2rMW3m09K*s?L!ScH& z)x@K1A=u>5CZvPH?v3o_4a?&f>!r-j=W8`I;7lr z!CHQ<9q{wI)VE3^noc}l@`Ws1YR;f|^XZiU@u=xLcDaRd@i+U?Ehb{%m4Y#qG|K3>Cx(E_v*f#jA72)z6 zZ!&}!hxyH~0_~|yUAW<-L^H2~A*6#4OUu^Z+=~n?>)KO)?z%gwn32?wF>jElF{azR z)8MZm1yr1O+#=6#gL&ex8-3N#qLpk%^q6QnGf*9Ov-*73z3}_ zJrlulmtaDC9RdyXjj@ABYn`k*_Z*ztee|Q9l>CEpD>9iy%T3WVqgDSG+j-o&luH%d zF{&KT$yLss`owZX{Z8iQPw1>{NbUXLR(N?yd4`Uj_&4A1fO{`UQ9gQ;O5B%0O(%IG zay*H?*PI^a=1z8VT!vEfxnHm+Q}FE^eMCiX>@u<@Q~8vNA$_)4%nQ|1pFNovAdtyA zbKdtC3r^*1!J&!h)L`s@MIn~;?%?u5V<^u&dao~PAzMC~z*FmUV*W9(=6tT>85KKP zI#cN|RAF%CO^0*d2}23gki#4_KVZ(83q`AL-&5T*U)^qrNLu%3I{b~Bo*;M{hiVoA zM(Vo)x>#!)9NPO@rA&b8VayHR`d}e4fXc$J39O`R-1PK}m(b*f}XJ@LkP$hQx}uOvQ0a*0;j!Ogopadn@6I zPL&J8pXUg$x4zmv$&-Ac`(6bh9uJ-Kvm8RHzI$yllNc3JDK1D|Nl!A2I_IP}ZvGnL z1H5>XpX06oFBixMnBflR#mN^~aIH9_RuwagTbt%&p*)9Vcnvd??)b+>N$LZ2G25JY zhPr&`P22RYJ}E%;Trqv6GEjgXH2^-3ARbN60)zN-%kN5pdIPKmG%XHKQEiGBb4r6ObSs>rh##Wt zO_#Ex++(MQPkEqyw=gf%|D0=Ixd^;1Zj@%Y1_=u?(iKR7-I&WlYzh8B9Wy!jlIEU? z6beQ&Qd5&d*#2lA1ytQO^cbpVkd4ydLLDKUuF1;*kmVyEHoEI~1VI@GA+NJfbM<9A z7?t-wZwskFy@xR@6CcDDLrBuwvSKb?ty*44zve+u@#LT|Zei$~oB zEyhsasqSvs|59lKDCwf+2 z)K6Szs-l##=MQTqo>W8}EW`C|As zQScp^Xa)fVtHpdEdXES0=i4u+oud$uob6h_-bG4ar@fUzYDJjc*raT|&B_B?A6cH< ztq|i^2XFW-@7k>^9V>ha1~4(UTZp^+-uvHvOgS{nDqoyP3W2tkCv~IDwr6_S&I}yr z!uG~|8t5X9@%}@ZNq5i4E023M5diiE%`P_8;YX$z(mLo0UNj#HT5=EFJ>CJiN=7yL z{BY=ClW}xyuj8W7;pS6l!X)YDD_s+}Y@rK+ZQidz5}vca`zk@NnTgj{t;9OHF3{5< zBjsaF^Vib4odjiNC1t*>xzz|_pOPSY)#J5mikv+!t0l=BZv3g3hhfSs>m#oZZCN5) zTAp91PPVWBmBm*^aNMyO?YF(S32(jvQbUMBRwbeQlfgG854-GrP>VRS1dlz@^~>P+P-Y z)<)W)xzzCQ=Seur5wc=R`1JHyk-rWtUFnHMjOlI$(jHVNQOg|gHI278t6rKNhx&Cm zEhv_4?`cc!^bUav6Kq#n!$RM%dl?eG7y|Mc)b)fxS*)9${> zZ(7TB#yjNAn)tR}+9#<+P2bVwpyJ8UL}*asIE>nQnvjrrDeeUrSPA>KJf?HB+qVUC zVlmNaX7lcf{-(hPQ5nJd6sgI)xyiS4Ph;}#bR9~a;sD;O)$<*C)Qm*-F!v`xOfZ5R z`*3(*9nNV0q|~ui=d%mOm)b{f78;dygumHP2_($r(TjR8h_Z&5;W!-p5}QNA1FpH7*|pc`N_07{8s2DU z5N^qCy0pq!Olu~~tkTXo_3$yKjVo2HWFOeXoG(${Ku#*O`N)VmGwppe(aBDEuIF?R z)^U~PC*wWeSVw7Z;}xHM&wj&%jZ_mlbgj`)DcxnMs4%Dmp&wn85lg?(o-ckTW2+bQ)oy>x~!Wmp7UncdYwUAPbNc4=6Ge z_x)C&PT^tsh@|j|nIFU5d28s~r)2QuSTC-9rHDzHB!b%bjSKE$$$s&8vR-?(aKkjqQg$kAW>Qgf`~*|ir)P$yt&db4o^uf7J~o39D_z(P8R~CJ?=(`@#HTH$KJV; z9MzInIjUup@4q)zEo=Vf)$b}6C9P29HIG=i%6`rJKkaFB%|9K9k|q|Z*a^|IJ*((W zv?gqLNNeC`f>#@^K`r{ehP?BhX}sM#y==SUPYhAtP2w44LCZlU0?d^hTPAgJT`w0) zI;^fUwnHb^ZFjD8f=Dq@vdZ~_Q)j5Pqu;M>WKBe47Iv%xINRHFxv|>8{?-}o;7ZPb zzHmEuDDn5|g|aQ^P~ukgBmsIre_rRamCdwoH&3Gnb6r$?&Q?v;d>?ux z4r7_0sRm2Sc2cw1{9tHVo|gC!2hL?TSw)8&k4D*iHGWQoh!__QYYW{wfKT7ms;X6q z8gGu3v_eLKz^xybywg%gT?dj6q=n3}CS-P(e8|Y=3T<3fh_#hqlnDZ%ppBz8#)leL z4E<=~z$cV!Adv0OxWnw;$7Y5gqEtAcV_REp45yEyc?ra*!1uJvu>O#+in%`^;1thR zws$z?YMGG{;Bn+m)WOedz|+BMq6!D!_vM{yM@X|>5Jx#IjqFVPXl{zz=yy11mvHOL zfvE_R==2~5@h*tBo!*-_^JS}JG{Q8=A(rfxFu76Bou#V*Vc$7__^9#SQf^D}QkM20 zsGK5>w0+9@>Z>;Rg<;l0fb*))_;F&ue19=ang?)heDV=Q*ESz6_2z{?rU=}R?==k% zCF5&xjS3YB^QQfd5yrtqWBccPTz8^{^%are%%c!u@Bzj0qRC#fRPx%^e7bcQOf+Pl2NbOlYT6R*e zMdim?g$dlVe=DBvgd4y=)H;z3eC;5U13<&x7^Q~0M=0q;*$q+N)A?dy(yez*jdy3< z2GJ2f1o~cdFk{s-!xOZbSg&l|1I$T@A08DsNr^o(X#vs8>xHGZl={^OKotcyf($uq zYk1Vs62lo*VLgml&VsDdN0lKKCQcTG1DTG;nTTc)gzIpZRI}b3*X|Ot{Nun%smt4iDb2PKUSD$BjeZu?;k4t7`5OF&}8SpWQ^E(x}w39McQIgAbpBfkX^+ zZNjOuhOfSPin|MTrW*}raF7;{iWgIb?hoY!*akh0_%*f3{ohFzqnPVcnAsbt{roN2 z%uAmRB1??)Ty*lsbQ1EKW9KGt{U_YZbd1;A(C=Cl?RU1kr!ldiLWb_KFZv)U8 zxvKh0K4z?J&Lzl>t|5)>Fd5|qmIytN@XU=ogG-kS#edtjXnps5v+>m|PY@8ha~y`O zZzx(yd;PfdHgYL}YILdp$_6KGOdF>_hc%lD`FfZtv(e%wlE4$*J%-mChKUWTX)d?o z;`aglW_68q@ucP33i;7yy9jHR|WUkWK6N; z$RrvFUyM-~y`~iRX!IM)j*?~N0&u0ZOVo+oTJH<;kIo6|yHAS2hIDu0`P@6+w3c+b z4hxbU+NfQz@+S7wd}Ycgw{fGX?A7pfgbw4(3+8s^r#iJ8;=l)8PV+my@!(TO(@FN_%ORW$9%eCL?5=T{mJ_b^NYr7kKWE1;3t%kEgK7i7iB0B8U- z*gf)=lefgRhE7mmo1kR)lnVsJkYEGesT$?B$Zb*>a2IR`$kBKUJzsOfB`(Oh%QP@^ zaF!!w0%Uu3sxM}kvXmGYU}skWyG@m)6bxd{s-nr^bg!iGkL&pdr+#e; z@z_Dj=*xP%1X=|h$r|VW<)WUbmxuqoU@MjQPwSZCjFwr{TN#Wr;LEXK(thz~sI!Al z<*ROtYpKMi@Z0bqqT2S;8j!bqqeir0oa45-$MC?a zHFVvgU|{QUgeagU{PqsBaQSUdU-0Kp#=Svp^m%r0e2edbyXMDb=Xs5MA^$0R; z=~M2>8-@ej+h%uZ6k8k!DM}G#(nzkw52msyJO{N&GM$?w6CvA(m@(ji;a(d@&d8EV z+0G7XEavqyyX+Jp-d!~yWF64h6m^=_7x}*B6BFm$*`>8^50Sl(ikc-B1ktUPg=TtY z4gG2H2~H5dYMT)@R;llJ*8XNafE;ZULQZP1+*FL{Cp!-Zh)cc;TC{YPDLl>AFLY&J zAf9?ud~yITX3=5h&nQCPPmUXOrfA=&RY*^a9MWqO66xrgjug3!;!X2ATSC)~uS*Yq z(*+)cKi{L0vMRu);VJz6@t|_on#HLE{L5Al3p-X53;)=9!quy%@m6`YTB4urmt#`% z0ZG!s+CtE;mU(2w9E-cY*-Ck-5InOUi4CVmf|dbrZoBeD|Hu64^5P%^xVlYAn+9U1 z_l9-XZ99SZj3ZO|{9M*SK&mhPz+O>r|H|nZCUkIGS|j}vJIXN-EfLlL47%<%psS(S&@^&Iqz@SPY*Xr&Y<8>v4H*haw~PiyDP$M_d|0k z!wa{bDWG7?Lo#cG8a7n;hu*aVXkS2;B0^>)M8*oy+1xhksWz8TiqnyC%^*A%SFItQ zF80*YT30DM*Qk0FHBb9?MnF6R8NEJ%8Fh>H^f;w{{_*nQ;!xcdCOOVMCk2_37Pej6 z)q3^KAMX}X-p3!?K6|U(`I|GxiW5SEyVV%^&R+o*qim>fH+mQEzt|EPWL;0XHTUQWR)*CD1?7U@e zpPJ$?o=h1-^_eR>J3Hx1sLgJq7C)p3c@f58DxQyfq^W@@P~+Ee!qg!+w?B{ddumzt z7-~AHcFy6e1$GqrWpHJzx=iyr$+HuDXGeV`FzKJ>eX6qP=i#MRIl-l8M_O&yIci$v8AZcaYiD+I4qhED_XqX9`ZmNaPF|l87 zfaO612gx6@*KF+d^i(unjpeCS$lKfJmj^9*+#&VOlc|jwrn#wM3&FJ{VRBErDs)l7 z6`Y+vqjs-WgPP}C)hWP`qkXrwWhU>lY09O(VFe)M)H<$pq9rtndC}m`EcGwN52yD( zhJiaR54(apo(%3ZwoPAc8y|nU{!HFXNiC}76RoH&X^|%x5axs0fdXu-NWJaovZdjJ zAetNcAyw3Lm-r5aN*`LemcbBW6rK4-c*qDp{|#SHUoY`b|1iD3`G-mFi)Gv4$BM5q zPpO#M!Ys9bpsR$xd5Bq?{EiqzB2!)N1MM04))5z@l;Y-Q;rn|A$C*A?_#vG@VwX|V z>cz+`aQ2JtiA~tJB579Lp_gNzEWHxq@({s|FzZQtVud~|3^K*nV5FBQpvxc5E$p5h zgIloWeVfL(?#3qHZ6Fd6L341u&@BQHm0iCGlnneZdA-y>adpFAqq!+^R@Q7aoEf(5 z)pjF0WHNrI4^5kvX2A6x=1jM0A=wvaCU;YrvTE;a5gtX7x5>I_r4$RA)Ap}pVGYWe zUGs}M2xWVp%wpb#!frlVpuf9yv%&K8eb9C|nxbE~G{_zn)?!2iZZW1DLy9Vk-E*;2 zS(C(dJ>6qpt*rx3=svzR=>GB~lJCGf(P#A9PnGo-fkB9vH_9SBbgHL}l{&ybb=e(z z^CFA%)~MHrWt*ecF*}yjJ7+fjr28@Z-nq?6Zr^NiuE1rKSHv*NZya&Vp$~WI>`(2u zUJ*Z%(+Prol%~^j3#w|BDvC6K$FE7iwmtB@d&hgi&B=CZY8`Vc&WE9!*lOs)AfBQL zY?&ECrw&2RLyQVT(mt>_k93GR(w%d8)XGLFyVs;m@3Pb#xOR`%r5xwb@q=H@XKLOE z(x-b@FgDL>hA2PSxF`M0_|zjUV6FkE6JLkOpZR^K65876#S-VQG}6!J@J1;!kk0RG z1m+r!X}DO2HWP}AJ==Tm_o@IbxC=e5ZdQ}XG&LIX5YB?I|BU4 z!mHxb)Y_X;_)h{Xcq_irBAM9PQ5c{Q4Bs`F5_v6$2@yd~voe|MH$s~~uP-zs$eaF5 z9oL9xYmnjdvnZ{aN|19^)r|)R8^x|z0!UipdG@LZnpEi%49aeHT_CZf4t}5w_u5+Q zAAL`^9o~=98g$Za`-QyQGV`ir!X@1Ky|Z(MG6!Ly3saI}wFvIXKJVFafxrVA%yxNp=@5bh(gPtS zWQRJKP+p+KdVYB&Ca$(di|b}7Ye1dsg|b*}!Mw2Kd>`N9GEAc<_xKe`h)bwwtUh#0wE5fG=fuCrggzB+;Wp=LqX>EP-# zL(f2yc5O9hC%1*~K7j-VAZ9MS>3{Y|;Wo>&xv@|u*-ghyr7sWddx*}6%YSOY~r&aZ?qv3Clg3R06QHUZfwnQ6(wiVG%;;sV>RpTr@CsbEKMCj353 zNc4@8m~5rac#6Uz`!~}cjmJt}_1EF(;Bt~wKU7U4{<_kf*gR9#odP(~yp-G}tHw7G zda!#sRt}){mioj7OB3B~LQ6+9wG1GLM}nBC*At<2t_v@d?6Jnnb)MFb4=B0*wrOwD zBUXwmyVVFsa_-vIm~>HMWFI@bmbE;-J3oCDe5h7Rl4UN zOC_Q&-hJsQEr*GMcLxIqtW0*+m|=?lOt`&H1_0>oNT279*k!wb-UeC*mu;3Yu{t_F zL{Co5{uP+|?bZvs22b1TCtNyrjLivCRu`K(uKBnieF4@%Zi9mt@Gqgcw>fUtIY4k$ z_8*#;On>{&$NGPE6!{nMlz(jhClmedAqewLZdv8tkK33e>#jMf{FF&GI>nH0Jw;rP z@jF*pS6d|{SJSws=*lGNNY6D>&@J}^!QNLw z)Jd+fo(Q}OpcxR&r+I&x-7Zx3Jt};7l-Ja2vU;?sq>DP@laMbv6nr9XP1pG!4KOJ4 zZQ5*}PA8|=TK!U`DUvZgSYR}wId8+!%z3`^a=fo5T(-ra{tdbKG`B+^0-2Efj5s|q z0iGESk#b<4AP5w9PAVtj`fr@8{&LKc84KO_Hk{-~Z!Sx>J=(KHKx!DGgFENP^b7Xx z>f}PlT~_#Vi7fSMfe^AbIqM-9ufj_2bRHR72fuTjUW;1B?c^lwL>lEZ<8u-y7=6x~ zn~6qcfZ(Rg;TlQ9=I51$ogcxpc5XiL?ChC#StI%Vk*)0P2ZI2TzTSCY>l3vXCO^)Z zZiGF?32gP>8XS25f0Tp@mS|isd?v58F|W$YZ(r}R3(G&1X!H&y&}YM>bdg7!VUhAi zXJGT`XK+}4nc>Tms@*;H!=7FeIfRZaryq_kLa&Yj1Y^JC@4l0k-(B04ZjJim#ruD} zssA+cuecHa*x`h?{&O|FxzIYEo&WyfM%cv*f+CDF9d7!hl|?-3m-BdwL)g(MQi`i_ z{P`iY@GZpbhGFlWo=mcjAIadwCShe@oako=t)#WYO}o}?sNlhnnQQ7uJav5XA}4tC zD#PA;CDS(6_(i|FIV1>r>31Y-}K%wjgw)*{`F)-|79qw1;r z7WBZ=XcxeLEi58~gf(;7=Bf4E!}pttQ7kP0Zo$(8S+(9nGf@ajSI5Vuxa6=+>xEe_ z$L@;Zds8{gcn{0YT9xq1xi&6kWtT;r(gBJ*n;t58mNL+Vd-j8*UBC90M*7iE(9%*| z!=;j_+oI;{ly9P>2e+v51BvU0nlB3%_aZfcf`&jPyPYuTwVf`F$;qJY0}5(KxS>3@ z%)sFexj{Do!urG=%4qo5@-S|RvCf#STxZxJvU3iKU|9iwEEqWPs>u_Nxsa%#n^_({ z>W27k6!ENYrndt9~PHRqAO8^jX{P^+-SFJum zvlZOMyCs*2pSB5WGSEr4sy+nUN`0Wu5rA$AhsMYOBXu)XvhQt{?hQH*Qsz0+V@De& z-p=uDx=DX}(=z)l)UK<=c~F7iY*^^{_JKlLMe^m8&Mk9=6e*j?1H7@uavA}6TvIiJ zN0dN4W5>d(;;}QGL1YI&yl3&9n)9h@{QaqM&p3ziWf~6ITPdahc-S_2wMWI&!gnh< zE;$)ESCBF|lcLhw^6?*s@IQ
-
+

{{$t('title')}}

@@ -66,59 +66,46 @@ -

{{$t('saleLines')}}

+

{{$t('saleLines')}}

- - - - - - - + + + + + + + - - - + + + - + - - - - - - + - @@ -130,52 +117,89 @@
-

{{$t('services')}}

+

{{$t('services')}}

{{$t('reference')}}{{$t('quantity')}}{{$t('concept')}}{{$t('price')}}{{$t('discount')}}{{$t('vat')}}{{$t('amount')}}{{$t('reference')}}{{$t('quantity')}}{{$t('concept')}}{{$t('price')}}{{$t('discount')}}{{$t('vat')}}{{$t('amount')}}
{{sale.itemFk}}
{{sale.itemFk | zerofill('000000')}} {{sale.quantity}} {{sale.concept}} {{sale.price | currency('EUR', $i18n.locale)}}{{(sale.discount / 100) | percentage}}{{(sale.discount / 100) | percentage}} {{sale.vatType}} {{sale.price * sale.quantity * (1 - sale.discount / 100) | currency('EUR', $i18n.locale)}}
-
- {{sale.tag5}} - {{sale.value5}} -
-
-
- {{sale.tag6}} - {{sale.value6}} -
-
-
- {{sale.tag7}} - {{sale.value7}} -
-
- {{sale.ediBotanic}} {{sale.denomination}} {{sale.countryCode}}-{{sale.passportNumber}} - ZP + + {{sale.tag5}} {{sale.value5}} + + + {{sale.tag6}} {{sale.value6}} + + + {{sale.tag7}} {{sale.value7}} +
+ {{$t('subtotal')}} {{getSubTotal() | currency('EUR', $i18n.locale)}}
- - - - + + + + + + + - + - + + + + - - + +
{{$t('concept')}}{{$t('quantity')}}{{$t('vatType')}}{{$t('amount')}}{{$t('quantity')}}{{$t('concept')}}{{$t('price')}}{{$t('vat')}}{{$t('amount')}}
{{service.description}} {{service.quantity}}{{service.taxDescription}}{{service.description}}{{service.price | currency('EUR', $i18n.locale)}}{{service.taxDescription}} {{service.price | currency('EUR', $i18n.locale)}}
{{$t('total')}} {{serviceTotal | currency('EUR', $i18n.locale)}} + {{$t('subtotal')}} + {{serviceTotal | currency('EUR', $i18n.locale)}}
- - -
-

{{$t('taxBreakdown')}}

+
+
+ +
+

{{$t('packagings')}}

- - + + + + + + + + + + + +
{{$t('type')}} + {{$t('reference')}}{{$t('quantity')}}{{$t('concept')}}
{{packaging.itemFk | zerofill('000000')}}{{packaging.quantity}}{{packaging.name}}
+
+ +
+
+ +
+ + + + + + + + + + + - + + + - @@ -199,29 +223,46 @@
{{$t('taxBreakdown')}}
{{$t('type')}} {{$t('taxBase')}} - - {{$t('tax')}}{{$t('fee')}}{{$t('tax')}}{{$t('fee')}}
{{tax.name}} + {{tax.Base | currency('EUR', $i18n.locale)}} {{tax.vatPercent | percentage}}
- - -
-

{{$t('packagings')}}

- - - - - - - - - - - - - - - -
Id{{$t('concept')}}{{$t('quantity')}}
{{packaging.itemFk}}{{packaging.name}}{{packaging.quantity}}
+ + +
+
+
+
+
+
+ +
+
+ Pasaporte fitosanitario
+ Plant passport +
+
+
+
+
+ A + {{getBotanical()}} +
+
+ B + ES17462130 +
+
+ C + {{ticket.id}} +
+
+ D + ES +
+
+
+
- - + +
+
diff --git a/print/templates/reports/delivery-note/delivery-note.js b/print/templates/reports/delivery-note/delivery-note.js index 5bf9824f69..5e5752e36f 100755 --- a/print/templates/reports/delivery-note/delivery-note.js +++ b/print/templates/reports/delivery-note/delivery-note.js @@ -95,6 +95,22 @@ module.exports = { }, getTotal() { return this.getTotalBase() + this.getTotalTax(); + }, + getBotanical() { + let phytosanitary = []; + this.sales.forEach(sale => { + let itemPhytosanitary; + if (sale.latinGenusName || sale.latinSpeciesName) + itemPhytosanitary = [sale.latinGenusName, sale.latinSpeciesName].filter(Boolean).join(' '); + else if (sale.botanical) + itemPhytosanitary = sale.botanical; + + phytosanitary.push(itemPhytosanitary); + }); + + return phytosanitary.filter((item, index) => + phytosanitary.indexOf(item) == index + ).join(', '); } }, components: { diff --git a/print/templates/reports/delivery-note/sql/sales.sql b/print/templates/reports/delivery-note/sql/sales.sql index a563c19f07..08c349f5ae 100644 --- a/print/templates/reports/delivery-note/sql/sales.sql +++ b/print/templates/reports/delivery-note/sql/sales.sql @@ -14,10 +14,9 @@ SELECT i.inkFk, s.ticketFk, tcl.code vatType, - ibwg.ediBotanic, - ppa.denomination, - pp.number passportNumber, - be.isProtectedZone, c.code AS countryCode, + ib.botanical, + eg.latinGenusName, + es.latinSpeciesName, i.tag5, i.value5, i.tag6, @@ -34,20 +33,14 @@ FROM vn.sale s LEFT JOIN country c ON c.id = o.countryFk LEFT JOIN supplier sp ON sp.id = t.companyFk LEFT JOIN itemType it ON it.id = i.typeFk + LEFT JOIN itemCategory ic ON ic.id = it.categoryFk LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id AND itc.countryFk = sp.countryFk LEFT JOIN taxClass tcl ON tcl.id = itc.taxClassFk - LEFT JOIN plantpassport pp ON pp.producerFk = i.producerFk - LEFT JOIN plantpassportAuthority ppa ON ppa.id = pp.plantpassportAuthorityFk - LEFT JOIN itemBotanicalWithGenus ibwg ON ibwg.itemFk = i.id - LEFT JOIN botanicExport be ON be.restriction = 'pasaporte fitosanitario' - LEFT JOIN ediGenus eg ON eg.id = be.ediGenusFk - LEFT JOIN ediSpecie es ON es.id = be.ediSpecieFk - AND ibwg.ediBotanic LIKE CONCAT( - IFNULL(eg.latinGenusName, ''), - IF(es.latinSpeciesName > '', - CONCAT(' ', es.latinSpeciesName), ''), - '%') + LEFT JOIN itemBotanical ib ON ib.itemFk = i.id + AND ic.code = 'plant' + LEFT JOIN ediGenus eg ON eg.id = ib.genusFk + LEFT JOIN ediSpecie es ON es.id = ib.specieFk WHERE s.ticketFk = ? GROUP BY s.id ORDER BY (it.isPackaging), s.concept, s.itemFk \ No newline at end of file diff --git a/print/templates/reports/delivery-note/sql/services.sql b/print/templates/reports/delivery-note/sql/services.sql index fbb4a53c45..d64e8dc26d 100644 --- a/print/templates/reports/delivery-note/sql/services.sql +++ b/print/templates/reports/delivery-note/sql/services.sql @@ -1,5 +1,5 @@ SELECT - tc.description taxDescription, + tc.code taxDescription, ts.description, ts.quantity, ts.price From 0258c4a276c6ed79c060edea4edb8003e262cd32 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 16 Dec 2020 10:21:20 +0100 Subject: [PATCH 035/101] ticket module refactors --- modules/ticket/front/create/index.html | 9 ++++++++- modules/ticket/front/dms/create/index.html | 11 +++++++++-- modules/ticket/front/note/index.html | 12 +++++++++++- modules/ticket/front/package/index.html | 12 +++++++++++- modules/ticket/front/request/create/index.html | 11 +++++++++-- modules/ticket/front/services/index.html | 12 +++++++++++- modules/ticket/front/tracking/edit/index.html | 11 +++++++++-- 7 files changed, 68 insertions(+), 10 deletions(-) diff --git a/modules/ticket/front/create/index.html b/modules/ticket/front/create/index.html index 3ec5627524..b1e73b34aa 100644 --- a/modules/ticket/front/create/index.html +++ b/modules/ticket/front/create/index.html @@ -3,7 +3,14 @@ - + + +
\ No newline at end of file diff --git a/modules/ticket/front/dms/create/index.html b/modules/ticket/front/dms/create/index.html index 54758aa830..a616ddaf8f 100644 --- a/modules/ticket/front/dms/create/index.html +++ b/modules/ticket/front/dms/create/index.html @@ -92,8 +92,15 @@ - - + + + +
diff --git a/modules/ticket/front/note/index.html b/modules/ticket/front/note/index.html index 32d93c6301..790e9581d8 100644 --- a/modules/ticket/front/note/index.html +++ b/modules/ticket/front/note/index.html @@ -57,6 +57,16 @@ - + + + + \ No newline at end of file diff --git a/modules/ticket/front/package/index.html b/modules/ticket/front/package/index.html index 84d79fce39..c5d83edfb1 100644 --- a/modules/ticket/front/package/index.html +++ b/modules/ticket/front/package/index.html @@ -56,6 +56,16 @@ - + + + + \ No newline at end of file diff --git a/modules/ticket/front/request/create/index.html b/modules/ticket/front/request/create/index.html index 7dafbd8015..755e8cb513 100644 --- a/modules/ticket/front/request/create/index.html +++ b/modules/ticket/front/request/create/index.html @@ -41,8 +41,15 @@ - - + + + +
diff --git a/modules/ticket/front/services/index.html b/modules/ticket/front/services/index.html index 8f574a7fe7..9fc9e5a311 100644 --- a/modules/ticket/front/services/index.html +++ b/modules/ticket/front/services/index.html @@ -71,7 +71,17 @@ - + + + + diff --git a/modules/ticket/front/tracking/edit/index.html b/modules/ticket/front/tracking/edit/index.html index 6e9793708e..36362f1eac 100644 --- a/modules/ticket/front/tracking/edit/index.html +++ b/modules/ticket/front/tracking/edit/index.html @@ -33,7 +33,14 @@ - - + + + + \ No newline at end of file From 2e9267a25efd1b123c3c434ade92d521549813a1 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 16 Dec 2020 10:21:35 +0100 Subject: [PATCH 036/101] route module refactors --- modules/route/front/basic-data/index.html | 12 ++++++++++-- modules/route/front/create/index.html | 11 +++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/modules/route/front/basic-data/index.html b/modules/route/front/basic-data/index.html index 4f05680ed6..0a1734ff2a 100644 --- a/modules/route/front/basic-data/index.html +++ b/modules/route/front/basic-data/index.html @@ -80,7 +80,15 @@ - - + + + + diff --git a/modules/route/front/create/index.html b/modules/route/front/create/index.html index 0956297cca..754bed9f42 100644 --- a/modules/route/front/create/index.html +++ b/modules/route/front/create/index.html @@ -43,7 +43,14 @@ - - + + + + From e9f73c329960c4e95da33ff82ac9aafe6ac27e0b Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 16 Dec 2020 10:32:32 +0100 Subject: [PATCH 037/101] worker module refactors --- modules/worker/front/basic-data/index.html | 12 ++++++++++-- modules/worker/front/dms/create/index.html | 10 ++++++++-- modules/worker/front/pbx/index.html | 8 ++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html index bdc309c002..a2cbbc637b 100644 --- a/modules/worker/front/basic-data/index.html +++ b/modules/worker/front/basic-data/index.html @@ -33,7 +33,15 @@ - - + + + + diff --git a/modules/worker/front/dms/create/index.html b/modules/worker/front/dms/create/index.html index dcafa59868..3495bf2606 100644 --- a/modules/worker/front/dms/create/index.html +++ b/modules/worker/front/dms/create/index.html @@ -76,8 +76,14 @@ - - + + + +
diff --git a/modules/worker/front/pbx/index.html b/modules/worker/front/pbx/index.html index 5118d38ede..e1ca61a4a7 100644 --- a/modules/worker/front/pbx/index.html +++ b/modules/worker/front/pbx/index.html @@ -14,10 +14,14 @@ - + + From 2a63a3b0a4b24547b606b634e9e540da9f725b2c Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 16 Dec 2020 11:07:06 +0100 Subject: [PATCH 038/101] account or user module refactors --- modules/account/front/accounts/index.html | 27 +++++++++---------- modules/account/front/acl/create/index.html | 17 +++++++----- modules/account/front/alias/create/index.html | 17 +++++++----- modules/account/front/create/index.html | 16 ++++++----- modules/account/front/ldap/index.html | 13 +++++---- modules/account/front/role/create/index.html | 17 +++++++----- modules/account/front/samba/index.html | 15 +++++------ 7 files changed, 69 insertions(+), 53 deletions(-) diff --git a/modules/account/front/accounts/index.html b/modules/account/front/accounts/index.html index 692624fa5c..195607fd15 100644 --- a/modules/account/front/accounts/index.html +++ b/modules/account/front/accounts/index.html @@ -53,33 +53,32 @@ + + - - + + - - - - + + + + + + diff --git a/modules/account/front/alias/create/index.html b/modules/account/front/alias/create/index.html index dee59d26ea..4dad1b8705 100644 --- a/modules/account/front/alias/create/index.html +++ b/modules/account/front/alias/create/index.html @@ -24,10 +24,15 @@ - - + + + + + + diff --git a/modules/account/front/create/index.html b/modules/account/front/create/index.html index 407ac0e3c4..ca4a2f8407 100644 --- a/modules/account/front/create/index.html +++ b/modules/account/front/create/index.html @@ -44,10 +44,14 @@ - - + + + + + + diff --git a/modules/account/front/ldap/index.html b/modules/account/front/ldap/index.html index 79dc967ff8..5c5aaead48 100644 --- a/modules/account/front/ldap/index.html +++ b/modules/account/front/ldap/index.html @@ -48,21 +48,20 @@ + + - - diff --git a/modules/account/front/role/create/index.html b/modules/account/front/role/create/index.html index f610f6d233..02900d5808 100644 --- a/modules/account/front/role/create/index.html +++ b/modules/account/front/role/create/index.html @@ -24,10 +24,15 @@ - - + + + + + + diff --git a/modules/account/front/samba/index.html b/modules/account/front/samba/index.html index 92e0a86242..4379f10a28 100644 --- a/modules/account/front/samba/index.html +++ b/modules/account/front/samba/index.html @@ -47,21 +47,20 @@ + + - - - + \ No newline at end of file From 57a6df762a1889f01fe67e4e94c750370f133869 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 16 Dec 2020 11:22:13 +0100 Subject: [PATCH 039/101] zone module refactors --- modules/zone/front/basic-data/index.html | 15 +++++++-------- modules/zone/front/create/index.html | 17 +++++++++++------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/modules/zone/front/basic-data/index.html b/modules/zone/front/basic-data/index.html index f0122c4755..c5fef90217 100644 --- a/modules/zone/front/basic-data/index.html +++ b/modules/zone/front/basic-data/index.html @@ -93,17 +93,16 @@ + + - - diff --git a/modules/zone/front/create/index.html b/modules/zone/front/create/index.html index cda13362a5..f8c7df3919 100644 --- a/modules/zone/front/create/index.html +++ b/modules/zone/front/create/index.html @@ -84,10 +84,15 @@ - - + + + + + + From 6261f10576eaec4a11d8246c36c7f6b16e507108 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 16 Dec 2020 11:36:11 +0100 Subject: [PATCH 040/101] last account module refactors --- modules/account/front/acl/create/index.html | 2 +- .../account/front/alias/basic-data/index.html | 13 ++++++------- modules/account/front/basic-data/index.html | 13 ++++++------- .../account/front/mail-forwarding/index.html | 18 ++++++++++++------ .../account/front/role/basic-data/index.html | 13 ++++++------- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/modules/account/front/acl/create/index.html b/modules/account/front/acl/create/index.html index 86a14a6719..7f4fa9e462 100644 --- a/modules/account/front/acl/create/index.html +++ b/modules/account/front/acl/create/index.html @@ -59,7 +59,7 @@ + label="Save"> + + - - \ No newline at end of file diff --git a/modules/account/front/basic-data/index.html b/modules/account/front/basic-data/index.html index d21dda45ad..91df3bffd9 100644 --- a/modules/account/front/basic-data/index.html +++ b/modules/account/front/basic-data/index.html @@ -37,16 +37,15 @@ + + - - diff --git a/modules/account/front/mail-forwarding/index.html b/modules/account/front/mail-forwarding/index.html index a6be2782ae..6c688f504a 100644 --- a/modules/account/front/mail-forwarding/index.html +++ b/modules/account/front/mail-forwarding/index.html @@ -27,12 +27,18 @@ - - + + + + + +
+ + - - \ No newline at end of file From 56ec7714edcb99324cfcbea60c6beb0cb1b69354 Mon Sep 17 00:00:00 2001 From: joan Date: Wed, 16 Dec 2020 11:40:51 +0100 Subject: [PATCH 041/101] Updated reports --- .../report-footer/report-footer.html | 1 - .../components/report-footer/report-footer.js | 16 +--- .../campaign-metrics/assets/css/style.css | 8 ++ .../campaign-metrics/campaign-metrics.html | 35 +++----- .../claim-pickup-order/assets/css/style.css | 4 - .../claim-pickup-order.html | 38 ++++---- .../reports/delivery-note/delivery-note.html | 1 - .../reports/driver-route/driver-route.html | 10 +-- .../reports/driver-route/locale/es.yml | 2 +- .../reports/entry-order/assets/css/style.css | 8 ++ .../reports/entry-order/entry-order.html | 87 +++++++++---------- 11 files changed, 94 insertions(+), 116 deletions(-) diff --git a/print/core/components/report-footer/report-footer.html b/print/core/components/report-footer/report-footer.html index 85395559b1..1af8df4d4d 100644 --- a/print/core/components/report-footer/report-footer.html +++ b/print/core/components/report-footer/report-footer.html @@ -5,7 +5,6 @@
{{centerText}}
-

{{phytosanitary}}

diff --git a/print/core/components/report-footer/report-footer.js b/print/core/components/report-footer/report-footer.js index 749170a0af..1ba36b1d74 100755 --- a/print/core/components/report-footer/report-footer.js +++ b/print/core/components/report-footer/report-footer.js @@ -1,18 +1,4 @@ -const db = require('../../database'); - module.exports = { name: 'report-footer', - async serverPrefetch() { - const companyCode = this.companyCode || 'VNL'; - - this.phytosanitary = await this.getPhytosanitary(companyCode); - }, - methods: { - getPhytosanitary(code) { - return db.findValue(` - SELECT phytosanitary FROM company c - WHERE c.code = :code`, {code}); - } - }, - props: ['companyCode', 'showPhytosanitary', 'leftText', 'centerText'] + props: ['leftText', 'centerText'] }; diff --git a/print/templates/reports/campaign-metrics/assets/css/style.css b/print/templates/reports/campaign-metrics/assets/css/style.css index 6e730869eb..1b6428d3ce 100644 --- a/print/templates/reports/campaign-metrics/assets/css/style.css +++ b/print/templates/reports/campaign-metrics/assets/css/style.css @@ -9,3 +9,11 @@ .bottom-line tr:nth-last-child() { border-bottom: none; } + +.report-info { + font-size: 20px +} + +.description strong { + text-transform: uppercase; +} \ No newline at end of file diff --git a/print/templates/reports/campaign-metrics/campaign-metrics.html b/print/templates/reports/campaign-metrics/campaign-metrics.html index 536c7c5d2b..725c03e4de 100644 --- a/print/templates/reports/campaign-metrics/campaign-metrics.html +++ b/print/templates/reports/campaign-metrics/campaign-metrics.html @@ -14,7 +14,7 @@

{{$t('title')}}

- +
@@ -59,29 +59,22 @@ - - + + - - - - + diff --git a/print/templates/reports/claim-pickup-order/assets/css/style.css b/print/templates/reports/claim-pickup-order/assets/css/style.css index c3b21a257d..fb55cc5cd6 100644 --- a/print/templates/reports/claim-pickup-order/assets/css/style.css +++ b/print/templates/reports/claim-pickup-order/assets/css/style.css @@ -1,7 +1,3 @@ -table.column-oriented { - margin-top: 50px !important -} - .sign { margin: 150px auto; width: 300px diff --git a/print/templates/reports/claim-pickup-order/claim-pickup-order.html b/print/templates/reports/claim-pickup-order/claim-pickup-order.html index 2fdea52913..3cc335887b 100644 --- a/print/templates/reports/claim-pickup-order/claim-pickup-order.html +++ b/print/templates/reports/claim-pickup-order/claim-pickup-order.html @@ -12,25 +12,23 @@
-
-

{{$t('title')}}

-
{{$t('Client')}}
{{sale.itemFk}}
{{sale.itemFk | zerofill('000000')}} {{Math.trunc(sale.subtotal)}} {{sale.concept}}
-
- {{sale.tag5}} - {{sale.value5}} -
-
-
- {{sale.tag6}} - {{sale.value6}} -
-
-
- {{sale.tag7}} - {{sale.value7}} -
+
+ + {{sale.tag5}} {{sale.value5}} + + + {{sale.tag6}} {{sale.value6}} + + + {{sale.tag7}} {{sale.value7}} +
- - - - - - - - - - - - - - -
{{$t('claimId')}}{{claimId}}
{{$t('clientId')}}{{client.id}}
{{$t('date')}}{{dated}}
-
+

{{$t('title')}}

+ + + + + + + + + + + + + + + +
{{$t('claimId')}}{{claimId}}
{{$t('clientId')}}{{client.id}}
{{$t('date')}}{{dated}}
@@ -51,7 +49,7 @@
- +
diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html index 5d3a8ca9d7..5d02a60be3 100644 --- a/print/templates/reports/delivery-note/delivery-note.html +++ b/print/templates/reports/delivery-note/delivery-note.html @@ -280,7 +280,6 @@ diff --git a/print/templates/reports/driver-route/driver-route.html b/print/templates/reports/driver-route/driver-route.html index a3bb0f478a..bad1bf1790 100644 --- a/print/templates/reports/driver-route/driver-route.html +++ b/print/templates/reports/driver-route/driver-route.html @@ -86,11 +86,11 @@
{{$t('reference')}}
- - - - - + + + + + diff --git a/print/templates/reports/driver-route/locale/es.yml b/print/templates/reports/driver-route/locale/es.yml index 25c830e5c9..7b86f527f9 100644 --- a/print/templates/reports/driver-route/locale/es.yml +++ b/print/templates/reports/driver-route/locale/es.yml @@ -21,4 +21,4 @@ import: Importe stowaway: Encajado dentro del ticket route: Ruta routeId: Ruta {0} -ticket: Tiquet \ No newline at end of file +ticket: Ticket \ No newline at end of file diff --git a/print/templates/reports/entry-order/assets/css/style.css b/print/templates/reports/entry-order/assets/css/style.css index 4215e71811..cabdadf9f3 100644 --- a/print/templates/reports/entry-order/assets/css/style.css +++ b/print/templates/reports/entry-order/assets/css/style.css @@ -3,4 +3,12 @@ h3 { font-weight: 100; color: #555 +} + +.report-info { + font-size: 20px +} + +.description strong { + text-transform: uppercase; } \ No newline at end of file diff --git a/print/templates/reports/entry-order/entry-order.html b/print/templates/reports/entry-order/entry-order.html index cb69ecee9c..dcd2f3ed9c 100644 --- a/print/templates/reports/entry-order/entry-order.html +++ b/print/templates/reports/entry-order/entry-order.html @@ -14,26 +14,24 @@
-
-
-

{{$t('title')}}

-
{{$t('order')}}{{$t('ticket')}}{{$t('client')}}{{$t('address')}}{{$t('packages')}}{{$t('order')}}{{$t('ticket')}}{{$t('client')}}{{$t('address')}}{{$t('packages')}}
- - - - - - - - - - - - - - -
{{$t('entryId')}}{{entry.id}}
{{$t('date')}}{{entry.landed | date('%d-%m-%Y')}}
{{$t('ref')}}{{entry.ref}}
-
+
+

{{$t('title')}}

+ + + + + + + + + + + + + + + +
{{$t('entryId')}}{{entry.id}}
{{$t('date')}}{{entry.landed | date('%d-%m-%Y')}}
{{$t('ref')}}{{entry.ref}}
@@ -56,50 +54,43 @@
- +
- - - - - - + + + + + + - + - + - - - - + - From 8ee68d9fae1fdb44682eaa17268c9d79dab998b9 Mon Sep 17 00:00:00 2001 From: joan Date: Wed, 16 Dec 2020 12:21:15 +0100 Subject: [PATCH 042/101] Added unit test & updated translation --- print/core/filters/specs/zerofill.spec.js | 9 +++++++++ print/templates/reports/delivery-note/delivery-note.html | 3 +-- print/templates/reports/delivery-note/locale/en.yml | 3 ++- print/templates/reports/delivery-note/locale/es.yml | 3 ++- print/templates/reports/delivery-note/locale/fr.yml | 3 ++- print/templates/reports/delivery-note/locale/pt.yml | 3 ++- 6 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 print/core/filters/specs/zerofill.spec.js diff --git a/print/core/filters/specs/zerofill.spec.js b/print/core/filters/specs/zerofill.spec.js new file mode 100644 index 0000000000..1c00ff4a7e --- /dev/null +++ b/print/core/filters/specs/zerofill.spec.js @@ -0,0 +1,9 @@ +import zerofill from '../zerofill.js'; + +describe('zerofill filter', () => { + const superDuperNumber = 1984; + + it('should filter the number filling it with zeros up to 6 characters length', () => { + expect(zerofill(superDuperNumber, '000000')).toEqual('001984'); + }); +}); diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html index 5d02a60be3..b6529dbe36 100644 --- a/print/templates/reports/delivery-note/delivery-note.html +++ b/print/templates/reports/delivery-note/delivery-note.html @@ -234,8 +234,7 @@
- Pasaporte fitosanitario
- Plant passport + {{$t('plantPassport')}}
diff --git a/print/templates/reports/delivery-note/locale/en.yml b/print/templates/reports/delivery-note/locale/en.yml index 8810a75951..74caa0eb64 100644 --- a/print/templates/reports/delivery-note/locale/en.yml +++ b/print/templates/reports/delivery-note/locale/en.yml @@ -23,4 +23,5 @@ packagings: Buckets and packaging services: Services vatType: VAT Type digitalSignature: Digital signature -ticket: Delivery note {0} \ No newline at end of file +ticket: Delivery note {0} +plantPassport: Plant passport \ No newline at end of file diff --git a/print/templates/reports/delivery-note/locale/es.yml b/print/templates/reports/delivery-note/locale/es.yml index 4dc7d4ff98..d9890d9247 100644 --- a/print/templates/reports/delivery-note/locale/es.yml +++ b/print/templates/reports/delivery-note/locale/es.yml @@ -23,4 +23,5 @@ packagings: Cubos y embalajes services: Servicios vatType: Tipo de IVA digitalSignature: Firma digital -ticket: Albarán {0} \ No newline at end of file +ticket: Albarán {0} +plantPassport: Pasaporte fitosanitario \ No newline at end of file diff --git a/print/templates/reports/delivery-note/locale/fr.yml b/print/templates/reports/delivery-note/locale/fr.yml index 820a1f589a..22d77012a8 100644 --- a/print/templates/reports/delivery-note/locale/fr.yml +++ b/print/templates/reports/delivery-note/locale/fr.yml @@ -23,4 +23,5 @@ packagings: Bacs et emballages services: Service vatType: Type de TVA digitalSignature: Signature numérique -ticket: BL {0} \ No newline at end of file +ticket: BL {0} +plantPassport: Passeport phytosanitaire \ No newline at end of file diff --git a/print/templates/reports/delivery-note/locale/pt.yml b/print/templates/reports/delivery-note/locale/pt.yml index 29d94c0cdc..a1f93550cd 100644 --- a/print/templates/reports/delivery-note/locale/pt.yml +++ b/print/templates/reports/delivery-note/locale/pt.yml @@ -23,4 +23,5 @@ packagings: Baldes e Embalagens services: Serviços vatType: Tipo de IVA digitalSignature: Assinatura digital -ticket: Nota de Entrega {0} \ No newline at end of file +ticket: Nota de Entrega {0} +plantPassport: Passaporte vegetal \ No newline at end of file From c13e9383ba98e54cf6ef4513caa09275fc042023 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 16 Dec 2020 13:46:04 +0100 Subject: [PATCH 043/101] css refactor + watcher from credit insurance --- front/core/components/confirm/confirm.html | 4 ++-- modules/client/front/credit-insurance/create/index.html | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/front/core/components/confirm/confirm.html b/front/core/components/confirm/confirm.html index 8ae66ccb29..3debb1cfef 100644 --- a/front/core/components/confirm/confirm.html +++ b/front/core/components/confirm/confirm.html @@ -2,6 +2,6 @@ {{::$ctrl.question}} - - + + \ No newline at end of file diff --git a/modules/client/front/credit-insurance/create/index.html b/modules/client/front/credit-insurance/create/index.html index 6812b793ad..c32d0a87b5 100644 --- a/modules/client/front/credit-insurance/create/index.html +++ b/modules/client/front/credit-insurance/create/index.html @@ -1,9 +1,3 @@ - -
@@ -32,7 +26,6 @@ Date: Wed, 16 Dec 2020 14:42:57 +0100 Subject: [PATCH 044/101] supplier consumption email and fix report --- .../assets/css/import.js | 8 ++ .../attachments.json | 6 ++ .../supplier-campaign-metrics/locale/es.yml | 8 ++ .../supplier-campaign-metrics.html | 46 +++++++++++ .../supplier-campaign-metrics.js | 33 ++++++++ .../assets/css/style.css | 11 ++- .../supplier-campaign-metrics.html | 81 ++++++++----------- 7 files changed, 143 insertions(+), 50 deletions(-) create mode 100644 print/templates/email/supplier-campaign-metrics/assets/css/import.js create mode 100644 print/templates/email/supplier-campaign-metrics/attachments.json create mode 100644 print/templates/email/supplier-campaign-metrics/locale/es.yml create mode 100644 print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.html create mode 100755 print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.js diff --git a/print/templates/email/supplier-campaign-metrics/assets/css/import.js b/print/templates/email/supplier-campaign-metrics/assets/css/import.js new file mode 100644 index 0000000000..b44d6bd371 --- /dev/null +++ b/print/templates/email/supplier-campaign-metrics/assets/css/import.js @@ -0,0 +1,8 @@ +const Stylesheet = require(`${appPath}/core/stylesheet`); + +module.exports = new Stylesheet([ + `${appPath}/common/css/spacing.css`, + `${appPath}/common/css/misc.css`, + `${appPath}/common/css/layout.css`, + `${appPath}/common/css/email.css`]) + .mergeStyles(); diff --git a/print/templates/email/supplier-campaign-metrics/attachments.json b/print/templates/email/supplier-campaign-metrics/attachments.json new file mode 100644 index 0000000000..4eacb54db4 --- /dev/null +++ b/print/templates/email/supplier-campaign-metrics/attachments.json @@ -0,0 +1,6 @@ +[ + { + "filename": "supplier-campaign-metrics.pdf", + "component": "supplier-campaign-metrics" + } +] \ No newline at end of file diff --git a/print/templates/email/supplier-campaign-metrics/locale/es.yml b/print/templates/email/supplier-campaign-metrics/locale/es.yml new file mode 100644 index 0000000000..d1c1182a2d --- /dev/null +++ b/print/templates/email/supplier-campaign-metrics/locale/es.yml @@ -0,0 +1,8 @@ +subject: Informe de consumo +title: Informe de consumo +dear: Estimado cliente +description: Tal y como nos ha solicitado nos complace + relacionarle a continuación el consumo que nos consta en su cuenta para las + fechas comprendidas entre {0} y {1}. + Espero le sea de utilidad para preparar su pedido.

+ Al mismo tiempo aprovecho la ocasión para saludarle cordialmente. diff --git a/print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.html b/print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.html new file mode 100644 index 0000000000..9d7014f34e --- /dev/null +++ b/print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.html @@ -0,0 +1,46 @@ + + + + + + {{ $t('subject') }} + + +
{{$t('boxes')}}{{$t('packing')}}{{$t('concept')}}{{$t('quantity')}}{{$t('price')}}{{$t('amount')}}{{$t('boxes')}}{{$t('packing')}}{{$t('concept')}}{{$t('quantity')}}{{$t('price')}}{{$t('amount')}}
{{buy.box}} {{buy.packing}} {{buy.itemName}}{{buy.quantity | number}}{{buy.quantity | number($i18n.locale)}} {{buy.buyingValue | currency('EUR', $i18n.locale)}} {{buy.buyingValue * buy.quantity | currency('EUR', $i18n.locale)}}
-
- {{buy.tag5}} - {{buy.value5}} -
-
-
- {{buy.tag6}} - {{buy.value6}} -
-
-
- {{buy.tag7}} - {{buy.value7}} -
+
+ + {{buy.tag5}} {{buy.value5}} + + + {{buy.tag6}} {{buy.value6}} + + + {{buy.tag7}} {{buy.value7}} +
+ {{$t('total')}} {{getTotal() | currency('EUR', $i18n.locale)}}
+ + + + + +
+ +
+
+
+ +
+
+ +
+
+ +
+
+

{{ $t('title') }}

+

{{$t('dear')}},

+

+
+
+ +
+
+ +
+
+ +
+
+
+
+ + \ No newline at end of file diff --git a/print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.js b/print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.js new file mode 100755 index 0000000000..20113d8eaa --- /dev/null +++ b/print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.js @@ -0,0 +1,33 @@ +const Component = require(`${appPath}/core/component`); +const emailHeader = new Component('email-header'); +const emailFooter = new Component('email-footer'); + +module.exports = { + name: 'supplier-campaign-metrics', + created() { + this.filters = this.$options.filters; + }, + computed: { + minDate: function() { + return this.filters.date(this.from, '%d-%m-%Y'); + }, + maxDate: function() { + return this.filters.date(this.to, '%d-%m-%Y'); + } + }, + components: { + 'email-header': emailHeader.build(), + 'email-footer': emailFooter.build() + }, + props: { + recipientId: { + required: true + }, + from: { + required: true + }, + to: { + required: true + } + } +}; diff --git a/print/templates/reports/supplier-campaign-metrics/assets/css/style.css b/print/templates/reports/supplier-campaign-metrics/assets/css/style.css index 6e730869eb..32caeb43c2 100644 --- a/print/templates/reports/supplier-campaign-metrics/assets/css/style.css +++ b/print/templates/reports/supplier-campaign-metrics/assets/css/style.css @@ -1,5 +1,5 @@ .column-oriented { - margin-top: 50px !important; + margin-top: 0px; } .bottom-line > tr { @@ -9,3 +9,12 @@ .bottom-line tr:nth-last-child() { border-bottom: none; } + +h2 { + font-weight: 100; + color: #555; +} + +.description strong { + text-transform: uppercase; +} \ No newline at end of file diff --git a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html index f5286df1e6..1303f22663 100644 --- a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html +++ b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html @@ -50,61 +50,44 @@ -
+
+

+ {{$t('entry')}} {{entry.id}} + {{$t('dated')}} {{entry.shipped | date('%d-%m-%Y')}} + {{$t('reference')}} {{entry.ref}} +

- - - - - - + + + + + + + + + + + + + + +
{{$t('entry')}}{{entry.id}}{{$t('dated')}}{{entry.shipped | date('%d-%m-%Y')}}{{$t('reference')}}{{entry.ref}}{{$t('itemName')}}{{$t('Quantity')}}{{$t('price')}}{{$t('total')}}
{{buy.itemName}}{{buy.quantity}}{{buy.price | currency('EUR', $i18n.locale)}}{{buy.quantity * buy.price | currency('EUR', $i18n.locale)}}
+ + {{buy.tag5}} {{buy.value5}} + + + {{buy.tag6}} {{buy.value6}} + + + {{buy.tag7}} {{buy.value7}} + +
-
- - - - - - - - - - - - - - - - - - - - - - - - -
{{$t('itemName')}}{{$t('Quantity')}}{{$t('price')}}{{$t('total')}}
{{buy.itemName}}{{buy.quantity}}{{buy.price | currency('EUR', $i18n.locale)}}{{buy.quantity * buy.price | currency('EUR', $i18n.locale)}}
-
- {{buy.tag5}} - {{buy.value5}} -
-
-
- {{buy.tag6}} - {{buy.value6}} -
-
-
- {{buy.tag7}} - {{buy.value7}} -
-
-
+
From 5f74c7434a48f0a099857b142e170e9ae16660ad Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 16 Dec 2020 14:53:14 +0100 Subject: [PATCH 045/101] e2e adapted to html refactors --- e2e/helpers/selectors.js | 2 +- e2e/paths/02-client/01_create_client.spec.js | 7 ---- .../02-client/20_credit_insurance.spec.js | 1 + e2e/paths/04-item/03_tax.spec.js | 3 +- e2e/paths/05-ticket/05_tracking_state.spec.js | 7 ---- .../10-travel/02_basic_data_and_log.spec.js | 41 ++++++++++--------- 6 files changed, 25 insertions(+), 36 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index bc013c5f1e..c23a8cc4d4 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -827,7 +827,7 @@ export default { firstTravelReference: 'vn-travel-extra-community > vn-data-viewer div > vn-tbody > vn-tr > vn-td-editable', removeContinentFilter: 'vn-searchbar > form > vn-textfield > div.container > div.prepend > prepend > div > span:nth-child(3) > vn-icon > i' }, - travelBasicDada: { + travelBasicData: { reference: 'vn-travel-basic-data vn-textfield[ng-model="$ctrl.travel.ref"]', agency: 'vn-travel-basic-data vn-autocomplete[ng-model="$ctrl.travel.agencyModeFk"]', deliveryDate: 'vn-travel-basic-data vn-date-picker[ng-model="$ctrl.travel.landed"]', diff --git a/e2e/paths/02-client/01_create_client.spec.js b/e2e/paths/02-client/01_create_client.spec.js index 9029910a7a..4cb3c67abd 100644 --- a/e2e/paths/02-client/01_create_client.spec.js +++ b/e2e/paths/02-client/01_create_client.spec.js @@ -27,13 +27,6 @@ describe('Client create path', () => { await page.waitForState('client.create'); }); - it('should receive an error when clicking the create button having all the form fields empty', async() => { - await page.waitToClick(selectors.createClientView.createButton); - const message = await page.waitForSnackbar(); - - expect(message.text).toContain('Some fields are invalid'); - }); - it('should receive an error when clicking the create button having name and Business name fields empty', async() => { await page.write(selectors.createClientView.taxNumber, '74451390E'); await page.write(selectors.createClientView.userName, 'CaptainMarvel'); diff --git a/e2e/paths/02-client/20_credit_insurance.spec.js b/e2e/paths/02-client/20_credit_insurance.spec.js index 904a51145e..58cb2737cf 100644 --- a/e2e/paths/02-client/20_credit_insurance.spec.js +++ b/e2e/paths/02-client/20_credit_insurance.spec.js @@ -20,6 +20,7 @@ describe('Client credit insurance path', () => { }); it('should open the create a new credit contract form', async() => { + await page.waitForTimeout(1000); await page.waitToClick(selectors.clientCreditInsurance.addNewContract); await page.waitForState('client.card.creditInsurance.create'); }); diff --git a/e2e/paths/04-item/03_tax.spec.js b/e2e/paths/04-item/03_tax.spec.js index 0f127bdd58..8b3b0f8b11 100644 --- a/e2e/paths/04-item/03_tax.spec.js +++ b/e2e/paths/04-item/03_tax.spec.js @@ -54,7 +54,8 @@ describe('Item edit tax path', () => { expect(firstVatType).toEqual('Reduced VAT'); }); - it(`should now click the undo changes button and see the changes works`, async() => { + // # #2680 Undo changes button bugs + xit(`should now click the undo changes button and see the form is restored`, async() => { await page.waitToClick(selectors.itemTax.undoChangesButton); const firstVatType = await page.waitToGetProperty(selectors.itemTax.firstClass, 'value'); diff --git a/e2e/paths/05-ticket/05_tracking_state.spec.js b/e2e/paths/05-ticket/05_tracking_state.spec.js index 9c8e6d4922..07f0d86bcc 100644 --- a/e2e/paths/05-ticket/05_tracking_state.spec.js +++ b/e2e/paths/05-ticket/05_tracking_state.spec.js @@ -24,13 +24,6 @@ describe('Ticket Create new tracking state path', () => { await page.waitForState('ticket.card.tracking.edit'); }); - it(`should attempt create a new state but receive an error if state is empty`, async() => { - await page.waitToClick(selectors.createStateView.saveStateButton); - const message = await page.waitForSnackbar(); - - expect(message.text).toContain('State cannot be blank'); - }); - it(`should create a new state`, async() => { await page.autocompleteSearch(selectors.createStateView.state, '¿Fecha?'); await page.waitToClick(selectors.createStateView.saveStateButton); diff --git a/e2e/paths/10-travel/02_basic_data_and_log.spec.js b/e2e/paths/10-travel/02_basic_data_and_log.spec.js index 9c81e6f638..50e2e1980a 100644 --- a/e2e/paths/10-travel/02_basic_data_and_log.spec.js +++ b/e2e/paths/10-travel/02_basic_data_and_log.spec.js @@ -25,31 +25,32 @@ describe('Travel basic data path', () => { const lastMonth = new Date(); lastMonth.setMonth(lastMonth.getMonth() - 1); - await page.pickDate(selectors.travelBasicDada.deliveryDate, lastMonth); - await page.waitToClick(selectors.travelBasicDada.save); + await page.pickDate(selectors.travelBasicData.deliveryDate, lastMonth); + await page.waitToClick(selectors.travelBasicData.save); const message = await page.waitForSnackbar(); expect(message.text).toContain('Landing cannot be lesser than shipment'); }); it('should undo the changes', async() => { - await page.waitToClick(selectors.travelBasicDada.undoChanges); - await page.waitToClick(selectors.travelBasicDada.save); - const message = await page.waitForSnackbar(); + await page.clearInput(selectors.travelBasicData.reference); + await page.write(selectors.travelBasicData.reference, 'totally pointless ref'); + await page.waitToClick(selectors.travelBasicData.undoChanges); + const result = await page.waitToGetProperty(selectors.travelBasicData.reference, 'value'); - expect(message.text).toContain('No changes to save'); + expect(result).toEqual('third travel'); }); it('should now edit the whole form then save', async() => { - await page.clearInput(selectors.travelBasicDada.reference); - await page.write(selectors.travelBasicDada.reference, 'new reference!'); + await page.clearInput(selectors.travelBasicData.reference); + await page.write(selectors.travelBasicData.reference, 'new reference!'); await page.waitForTimeout(2000); - await page.autocompleteSearch(selectors.travelBasicDada.agency, 'Entanglement'); - await page.autocompleteSearch(selectors.travelBasicDada.outputWarehouse, 'Warehouse Three'); - await page.autocompleteSearch(selectors.travelBasicDada.inputWarehouse, 'Warehouse Four'); - await page.waitToClick(selectors.travelBasicDada.delivered); - await page.waitToClick(selectors.travelBasicDada.received); - await page.waitToClick(selectors.travelBasicDada.save); + await page.autocompleteSearch(selectors.travelBasicData.agency, 'Entanglement'); + await page.autocompleteSearch(selectors.travelBasicData.outputWarehouse, 'Warehouse Three'); + await page.autocompleteSearch(selectors.travelBasicData.inputWarehouse, 'Warehouse Four'); + await page.waitToClick(selectors.travelBasicData.delivered); + await page.waitToClick(selectors.travelBasicData.received); + await page.waitToClick(selectors.travelBasicData.save); const message = await page.waitForSnackbar(); expect(message.text).toContain('Data saved!'); @@ -57,35 +58,35 @@ describe('Travel basic data path', () => { it('should reload the section and check the reference was saved', async() => { await page.reloadSection('travel.card.basicData'); - const result = await page.waitToGetProperty(selectors.travelBasicDada.reference, 'value'); + const result = await page.waitToGetProperty(selectors.travelBasicData.reference, 'value'); expect(result).toEqual('new reference!'); }); it('should check the agency was saved', async() => { - const result = await page.waitToGetProperty(selectors.travelBasicDada.agency, 'value'); + const result = await page.waitToGetProperty(selectors.travelBasicData.agency, 'value'); expect(result).toEqual('Entanglement'); }); it('should check the output warehouse date was saved', async() => { - const result = await page.waitToGetProperty(selectors.travelBasicDada.outputWarehouse, 'value'); + const result = await page.waitToGetProperty(selectors.travelBasicData.outputWarehouse, 'value'); expect(result).toEqual('Warehouse Three'); }); it('should check the input warehouse date was saved', async() => { - const result = await page.waitToGetProperty(selectors.travelBasicDada.inputWarehouse, 'value'); + const result = await page.waitToGetProperty(selectors.travelBasicData.inputWarehouse, 'value'); expect(result).toEqual('Warehouse Four'); }); it(`should check the delivered checkbox was saved even tho it doesn't make sense`, async() => { - await page.waitForClassPresent(selectors.travelBasicDada.delivered, 'checked'); + await page.waitForClassPresent(selectors.travelBasicData.delivered, 'checked'); }); it(`should check the received checkbox was saved even tho it doesn't make sense`, async() => { - await page.waitForClassPresent(selectors.travelBasicDada.received, 'checked'); + await page.waitForClassPresent(selectors.travelBasicData.received, 'checked'); }); it('should navigate to the travel logs', async() => { From 9df29b8be343133cdeb681b603f1e822b861bfa8 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 16 Dec 2020 15:44:35 +0100 Subject: [PATCH 046/101] supplier.billingData buttons css update --- modules/supplier/front/billing-data/index.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/supplier/front/billing-data/index.html b/modules/supplier/front/billing-data/index.html index 2cb3f7c4b9..0fb7011b89 100644 --- a/modules/supplier/front/billing-data/index.html +++ b/modules/supplier/front/billing-data/index.html @@ -52,12 +52,13 @@ From aae83336a3039afe7e342427422e0287afe3fe56 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 16 Dec 2020 16:16:56 +0100 Subject: [PATCH 047/101] supplier billing data e2e 1st steps --- e2e/paths/13-supplier/05_billing_data.spec.js | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 e2e/paths/13-supplier/05_billing_data.spec.js diff --git a/e2e/paths/13-supplier/05_billing_data.spec.js b/e2e/paths/13-supplier/05_billing_data.spec.js new file mode 100644 index 0000000000..3097773430 --- /dev/null +++ b/e2e/paths/13-supplier/05_billing_data.spec.js @@ -0,0 +1,70 @@ +import selectors from '../../helpers/selectors.js'; +import getBrowser from '../../helpers/puppeteer'; + +describe('Supplier billing data path', () => { + let browser; + let page; + + beforeAll(async() => { + browser = await getBrowser(); + page = browser.page; + await page.loginAndModule('administrative', 'supplier'); + await page.accessToSearchResult('442'); + await page.accessToSection('supplier.card.billingData'); + }); + + afterAll(async() => { + await browser.close(); + }); + + it('should ', async() => { + // await page.clearInput(selectors.supplierBasicData.alias); + // await page.write(selectors.supplierBasicData.alias, 'Plants Nick SL'); + // await page.waitToClick(selectors.supplierBasicData.isSerious); + // await page.waitToClick(selectors.supplierBasicData.isActive); + // await page.write(selectors.supplierBasicData.notes, 'Some notes'); + + // await page.waitToClick(selectors.supplierBasicData.saveButton); + // const message = await page.waitForSnackbar(); + + // expect(message.text).toContain('Data saved!'); + }); + + // it('should reload the section', async() => { + // await page.reloadSection('supplier.card.basicData'); + // }); + + // it('should check the alias was edited', async() => { + // const result = await page.waitToGetProperty(selectors.supplierBasicData.alias, 'value'); + + // expect(result).toEqual('Plants Nick SL'); + // }); + + // it('should check the isSerious checkbox is now unchecked', async() => { + // const result = await page.checkboxState(selectors.supplierBasicData.isSerious); + + // expect(result).toBe('unchecked'); + // }); + + // it('should check the isActive checkbox is now unchecked', async() => { + // const result = await page.checkboxState(selectors.supplierBasicData.isActive); + + // expect(result).toBe('unchecked'); + // }); + + // it('should check the notes were edited', async() => { + // const result = await page.waitToGetProperty(selectors.supplierBasicData.notes, 'value'); + + // expect(result).toEqual('Some notes'); + // }); + + // it('should navigate to the log section', async() => { + // await page.accessToSection('supplier.card.log'); + // }); + + // it('should check the changes have been recorded', async() => { + // const result = await page.waitToGetProperty('#newInstance:nth-child(3)', 'innerText'); + + // expect(result).toEqual('note: Some notes'); + // }); +}); From 7afd738a90a29550b11b93eccd7a3437b3f61696 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 16 Dec 2020 16:37:53 +0100 Subject: [PATCH 048/101] e2e for the supplier billing data path --- e2e/helpers/selectors.js | 6 ++ e2e/paths/13-supplier/05_billing_data.spec.js | 66 +++++++------------ 2 files changed, 30 insertions(+), 42 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index c23a8cc4d4..11087d2d4a 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -960,5 +960,11 @@ export default { province: 'vn-supplier-fiscal-data vn-autocomplete[ng-model="$ctrl.supplier.provinceFk"]', country: 'vn-supplier-fiscal-data vn-autocomplete[ng-model="$ctrl.supplier.countryFk"]', saveButton: 'vn-supplier-fiscal-data button[type="submit"]', + }, + supplierBillingData: { + payMethod: 'vn-supplier-billing-data vn-autocomplete[ng-model="$ctrl.supplier.payMethodFk"]', + payDem: 'vn-supplier-billing-data vn-autocomplete[ng-model="$ctrl.supplier.payDemFk"]', + payDay: 'vn-supplier-billing-data vn-input-number[ng-model="$ctrl.supplier.payDay"]', + saveButton: 'vn-supplier-billing-data button[type=submit]' } }; diff --git a/e2e/paths/13-supplier/05_billing_data.spec.js b/e2e/paths/13-supplier/05_billing_data.spec.js index 3097773430..121e00bbb9 100644 --- a/e2e/paths/13-supplier/05_billing_data.spec.js +++ b/e2e/paths/13-supplier/05_billing_data.spec.js @@ -8,7 +8,7 @@ describe('Supplier billing data path', () => { beforeAll(async() => { browser = await getBrowser(); page = browser.page; - await page.loginAndModule('administrative', 'supplier'); + await page.loginAndModule('developer', 'supplier'); await page.accessToSearchResult('442'); await page.accessToSection('supplier.card.billingData'); }); @@ -17,54 +17,36 @@ describe('Supplier billing data path', () => { await browser.close(); }); - it('should ', async() => { - // await page.clearInput(selectors.supplierBasicData.alias); - // await page.write(selectors.supplierBasicData.alias, 'Plants Nick SL'); - // await page.waitToClick(selectors.supplierBasicData.isSerious); - // await page.waitToClick(selectors.supplierBasicData.isActive); - // await page.write(selectors.supplierBasicData.notes, 'Some notes'); + it('should edit the billing data', async() => { + await page.autocompleteSearch(selectors.supplierBillingData.payMethod, 'PayMethod with IBAN'); + await page.autocompleteSearch(selectors.supplierBillingData.payDem, '10'); + await page.clearInput(selectors.supplierBillingData.payDay); + await page.write(selectors.supplierBillingData.payDay, '19'); + await page.waitToClick(selectors.supplierBillingData.saveButton); + const message = await page.waitForSnackbar(); - // await page.waitToClick(selectors.supplierBasicData.saveButton); - // const message = await page.waitForSnackbar(); - - // expect(message.text).toContain('Data saved!'); + expect(message.text).toContain('Data saved!'); }); - // it('should reload the section', async() => { - // await page.reloadSection('supplier.card.basicData'); - // }); + it('should reload the section', async() => { + await page.reloadSection('supplier.card.billingData'); + }); - // it('should check the alias was edited', async() => { - // const result = await page.waitToGetProperty(selectors.supplierBasicData.alias, 'value'); + it('should check the pay method was edited', async() => { + const result = await page.waitToGetProperty(selectors.supplierBillingData.payMethod, 'value'); - // expect(result).toEqual('Plants Nick SL'); - // }); + expect(result).toEqual('PayMethod with IBAN'); + }); - // it('should check the isSerious checkbox is now unchecked', async() => { - // const result = await page.checkboxState(selectors.supplierBasicData.isSerious); + it('should check the payDem was edited', async() => { + const result = await page.waitToGetProperty(selectors.supplierBillingData.payDem, 'value'); - // expect(result).toBe('unchecked'); - // }); + expect(result).toEqual('10'); + }); - // it('should check the isActive checkbox is now unchecked', async() => { - // const result = await page.checkboxState(selectors.supplierBasicData.isActive); + it('should check the pay day was edited', async() => { + const result = await page.waitToGetProperty(selectors.supplierBillingData.payDay, 'value'); - // expect(result).toBe('unchecked'); - // }); - - // it('should check the notes were edited', async() => { - // const result = await page.waitToGetProperty(selectors.supplierBasicData.notes, 'value'); - - // expect(result).toEqual('Some notes'); - // }); - - // it('should navigate to the log section', async() => { - // await page.accessToSection('supplier.card.log'); - // }); - - // it('should check the changes have been recorded', async() => { - // const result = await page.waitToGetProperty('#newInstance:nth-child(3)', 'innerText'); - - // expect(result).toEqual('note: Some notes'); - // }); + expect(result).toEqual('19'); + }); }); From 7b3128d646c532b21b395634584d5a9616f1435d Mon Sep 17 00:00:00 2001 From: Jorge Benedito Llopis Date: Thu, 17 Dec 2020 10:07:17 +0100 Subject: [PATCH 049/101] Remove manager restriction to edit client credits --- modules/client/back/models/client.js | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js index b894815b82..1e500ab11d 100644 --- a/modules/client/back/models/client.js +++ b/modules/client/back/models/client.js @@ -339,28 +339,5 @@ module.exports = Self => { if (count <= 0) throw new UserError('The role cannot set this credit amount'); - - // Si se puso a 0 por gerencia, solo gerencia puede aumentarlo - - let query = 'SELECT * FROM clientCredit WHERE clientFk = ? ORDER BY created DESC LIMIT 1'; - let instances = await Self.rawSql(query, [finalState.id]); - - if (instances.length !== 1 || instances[0].amount > 0) - return; - - query = ` - SELECT COUNT(*) AS hasRoleManager - FROM worker em - JOIN account.user ac ON ac.id = em.userFk - JOIN salix.RoleMapping rm ON rm.principalId = ac.id - JOIN account.role r on r.id = rm.roleId - WHERE em.id = ? - AND rm.principalType = 'USER' - AND r.name = 'manager'`; - - let instance = await Self.rawSql(query, [instances[0].workerFk]); - - if (instance[0].hasRoleManager) - throw new UserError('Only manager can change the credit'); } }; From 33237dad868f0c27887affbcc19dd9b6a4c35d4b Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Thu, 17 Dec 2020 12:29:37 +0100 Subject: [PATCH 050/101] Add acl to supplier billing data --- db/changes/10260-navidad/00-acl.sql | 2 + e2e/paths/13-supplier/05_billing_data.spec.js | 4 +- modules/supplier/front/routes.json | 3 +- package-lock.json | 58 +++++++++---------- 4 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 db/changes/10260-navidad/00-acl.sql diff --git a/db/changes/10260-navidad/00-acl.sql b/db/changes/10260-navidad/00-acl.sql new file mode 100644 index 0000000000..9fba4786b7 --- /dev/null +++ b/db/changes/10260-navidad/00-acl.sql @@ -0,0 +1,2 @@ + INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES ('PayDem', '*', 'READ', 'ALLOW', 'ROLE', 'employee'); diff --git a/e2e/paths/13-supplier/05_billing_data.spec.js b/e2e/paths/13-supplier/05_billing_data.spec.js index 121e00bbb9..cd6951c7ec 100644 --- a/e2e/paths/13-supplier/05_billing_data.spec.js +++ b/e2e/paths/13-supplier/05_billing_data.spec.js @@ -1,14 +1,14 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -describe('Supplier billing data path', () => { +fdescribe('Supplier billing data path', () => { let browser; let page; beforeAll(async() => { browser = await getBrowser(); page = browser.page; - await page.loginAndModule('developer', 'supplier'); + await page.loginAndModule('administrative', 'supplier'); await page.accessToSearchResult('442'); await page.accessToSection('supplier.card.billingData'); }); diff --git a/modules/supplier/front/routes.json b/modules/supplier/front/routes.json index 31a358ef12..47f742a70b 100644 --- a/modules/supplier/front/routes.json +++ b/modules/supplier/front/routes.json @@ -84,7 +84,8 @@ "description": "Billing data", "params": { "supplier": "$ctrl.supplier" - } + }, + "acl": ["administrative"] } ] } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index ff41351411..99e20a441d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5893,7 +5893,7 @@ }, "util": { "version": "0.10.3", - "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, "requires": { @@ -6864,7 +6864,7 @@ "base": { "version": "0.11.2", "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=", "dev": true, "requires": { "cache-base": "^1.0.1", @@ -7185,7 +7185,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { @@ -7245,7 +7245,7 @@ }, "buffer": { "version": "4.9.1", - "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "requires": { "base64-js": "^1.0.2", @@ -7376,7 +7376,7 @@ "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=", "dev": true, "requires": { "collection-visit": "^1.0.0", @@ -7446,7 +7446,7 @@ }, "camelcase-keys": { "version": "2.1.0", - "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { @@ -7584,7 +7584,7 @@ "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=", "dev": true, "requires": { "arr-union": "^3.1.0", @@ -8726,7 +8726,7 @@ }, "readable-stream": { "version": "1.1.14", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { @@ -10021,7 +10021,7 @@ }, "file-loader": { "version": "1.1.11", - "resolved": "http://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz", "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==", "dev": true, "requires": { @@ -11207,7 +11207,7 @@ "global-modules": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=", "dev": true, "requires": { "global-prefix": "^1.0.1", @@ -11244,7 +11244,7 @@ }, "globby": { "version": "5.0.0", - "resolved": "http://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { @@ -13364,7 +13364,7 @@ }, "is-obj": { "version": "1.0.1", - "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" }, "is-path-cwd": { @@ -13394,7 +13394,7 @@ "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", "dev": true, "requires": { "isobject": "^3.0.1" @@ -18794,7 +18794,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -19737,7 +19737,7 @@ }, "media-typer": { "version": "0.3.0", - "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "mem": { @@ -19762,7 +19762,7 @@ }, "meow": { "version": "3.7.0", - "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { @@ -20211,7 +20211,7 @@ }, "multipipe": { "version": "0.1.2", - "resolved": "http://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", "dev": true, "requires": { @@ -21124,7 +21124,7 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, @@ -21140,7 +21140,7 @@ }, "os-tmpdir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, @@ -22352,7 +22352,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true } @@ -22694,7 +22694,7 @@ }, "safe-regex": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { @@ -22908,7 +22908,7 @@ "dependencies": { "source-map": { "version": "0.4.4", - "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { @@ -23369,7 +23369,7 @@ "snapdragon-node": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=", "dev": true, "requires": { "define-property": "^1.0.0", @@ -23420,7 +23420,7 @@ "snapdragon-util": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=", "dev": true, "requires": { "kind-of": "^3.2.0" @@ -23704,7 +23704,7 @@ "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=", "dev": true, "requires": { "extend-shallow": "^3.0.0" @@ -24809,7 +24809,7 @@ }, "through": { "version": "2.3.8", - "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, "through2": { @@ -25006,7 +25006,7 @@ "touch": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", - "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "integrity": "sha1-/jZfX3XsntTlaCXgu3bSSrdK+Ds=", "dev": true, "requires": { "nopt": "~1.0.10" @@ -25088,7 +25088,7 @@ }, "tty-browserify": { "version": "0.0.0", - "resolved": "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, @@ -26811,7 +26811,7 @@ }, "xmlbuilder": { "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" }, "xmlchars": { From 172a4638cd4e8f71b29917093d7ae53ed5a9025b Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 17 Dec 2020 12:38:50 +0100 Subject: [PATCH 051/101] removed focus on describe --- e2e/paths/13-supplier/05_billing_data.spec.js | 2 +- package-lock.json | 58 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/e2e/paths/13-supplier/05_billing_data.spec.js b/e2e/paths/13-supplier/05_billing_data.spec.js index cd6951c7ec..d3cb6dcab8 100644 --- a/e2e/paths/13-supplier/05_billing_data.spec.js +++ b/e2e/paths/13-supplier/05_billing_data.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -fdescribe('Supplier billing data path', () => { +describe('Supplier billing data path', () => { let browser; let page; diff --git a/package-lock.json b/package-lock.json index 99e20a441d..ff41351411 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5893,7 +5893,7 @@ }, "util": { "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, "requires": { @@ -6864,7 +6864,7 @@ "base": { "version": "0.11.2", "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, "requires": { "cache-base": "^1.0.1", @@ -7185,7 +7185,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { @@ -7245,7 +7245,7 @@ }, "buffer": { "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "requires": { "base64-js": "^1.0.2", @@ -7376,7 +7376,7 @@ "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "dev": true, "requires": { "collection-visit": "^1.0.0", @@ -7446,7 +7446,7 @@ }, "camelcase-keys": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { @@ -7584,7 +7584,7 @@ "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "dev": true, "requires": { "arr-union": "^3.1.0", @@ -8726,7 +8726,7 @@ }, "readable-stream": { "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { @@ -10021,7 +10021,7 @@ }, "file-loader": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz", + "resolved": "http://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz", "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==", "dev": true, "requires": { @@ -11207,7 +11207,7 @@ "global-modules": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "dev": true, "requires": { "global-prefix": "^1.0.1", @@ -11244,7 +11244,7 @@ }, "globby": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "resolved": "http://registry.npmjs.org/globby/-/globby-5.0.0.tgz", "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { @@ -13364,7 +13364,7 @@ }, "is-obj": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" }, "is-path-cwd": { @@ -13394,7 +13394,7 @@ "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "requires": { "isobject": "^3.0.1" @@ -18794,7 +18794,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -19737,7 +19737,7 @@ }, "media-typer": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "mem": { @@ -19762,7 +19762,7 @@ }, "meow": { "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { @@ -20211,7 +20211,7 @@ }, "multipipe": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "resolved": "http://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", "dev": true, "requires": { @@ -21124,7 +21124,7 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, @@ -21140,7 +21140,7 @@ }, "os-tmpdir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, @@ -22352,7 +22352,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true } @@ -22694,7 +22694,7 @@ }, "safe-regex": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { @@ -22908,7 +22908,7 @@ "dependencies": { "source-map": { "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { @@ -23369,7 +23369,7 @@ "snapdragon-node": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=", + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "dev": true, "requires": { "define-property": "^1.0.0", @@ -23420,7 +23420,7 @@ "snapdragon-util": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, "requires": { "kind-of": "^3.2.0" @@ -23704,7 +23704,7 @@ "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "dev": true, "requires": { "extend-shallow": "^3.0.0" @@ -24809,7 +24809,7 @@ }, "through": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, "through2": { @@ -25006,7 +25006,7 @@ "touch": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", - "integrity": "sha1-/jZfX3XsntTlaCXgu3bSSrdK+Ds=", + "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", "dev": true, "requires": { "nopt": "~1.0.10" @@ -25088,7 +25088,7 @@ }, "tty-browserify": { "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "resolved": "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, @@ -26811,7 +26811,7 @@ }, "xmlbuilder": { "version": "9.0.7", - "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" }, "xmlchars": { From 0b5a98c2fe199cc9351c9678acdb604501c5aea3 Mon Sep 17 00:00:00 2001 From: bernat Date: Thu, 17 Dec 2020 15:17:03 +0100 Subject: [PATCH 052/101] export production --- db/dump/dumpedFixtures.sql | 32 +- db/dump/fixtures.sql | 21 +- db/dump/structure.sql | 3692 +++++++++++++++++++++++++++++------- 3 files changed, 3025 insertions(+), 720 deletions(-) diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql index da9776316f..0673a1150d 100644 --- a/db/dump/dumpedFixtures.sql +++ b/db/dump/dumpedFixtures.sql @@ -36,7 +36,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-25 12:03:51 +-- Dump completed on 2020-12-17 8:49:49 USE `account`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -61,7 +61,7 @@ USE `account`; LOCK TABLES `role` WRITE; /*!40000 ALTER TABLE `role` DISABLE KEYS */; -INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2017-11-29 10:06:31'),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35'),(13,'teamBoss','Jefe de departamento',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10'),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27'),(20,'manager','Departamento de gerencia',1,'2017-06-01 14:57:02','2017-06-01 14:57:51'),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52'),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12'),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36'),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27'),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20'),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34'),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53'),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42'),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08'),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53'),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09'),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41'),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12'),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26'),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59'),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16'),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12'),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23'),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18'),(48,'coolerBoss','Jefe del departamento de cámara',1,'2018-02-23 13:12:01','2018-02-23 13:12:01'),(49,'production','Empleado de producción',0,'2018-02-26 15:28:23','2019-01-21 12:57:21'),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12'),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39'),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57'),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57'),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17'),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31'),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02'),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19'),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45'),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10'),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01'),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07'),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05'),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08'),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26'),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56'),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23'),(69,'coolerAssist','Empleado cámara con permiso compras',1,'2020-02-05 12:36:09','2020-02-05 12:36:09'),(70,'trainee','Alumno de prácticas',1,'2020-03-04 11:00:25','2020-03-04 11:00:25'),(71,'checker','Rol de revisor con privilegios de itemPicker',1,'2020-10-02 10:50:07','2020-10-02 10:50:07'),(72,'claimManager','Personal de reclamaciones',1,'2020-10-13 10:01:32','2020-10-26 07:29:46'),(73,'financial','Departamento de finanzas',1,'2020-11-16 09:30:27','2020-11-16 09:30:27'),(100,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2020-11-12 06:50:07'); +INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2017-11-29 10:06:31'),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35'),(13,'teamBoss','Jefe de departamento',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10'),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27'),(20,'manager','Departamento de gerencia',1,'2017-06-01 14:57:02','2017-06-01 14:57:51'),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52'),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12'),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36'),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27'),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20'),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34'),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53'),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42'),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08'),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53'),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09'),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41'),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12'),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26'),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59'),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16'),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12'),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23'),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18'),(48,'coolerBoss','Jefe del departamento de cámara',1,'2018-02-23 13:12:01','2018-02-23 13:12:01'),(49,'production','Empleado de producción',0,'2018-02-26 15:28:23','2019-01-21 12:57:21'),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12'),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39'),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57'),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57'),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17'),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31'),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02'),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19'),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45'),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10'),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01'),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07'),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05'),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08'),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26'),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56'),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23'),(69,'coolerAssist','Empleado cámara con permiso compras',1,'2020-02-05 12:36:09','2020-02-05 12:36:09'),(70,'trainee','Alumno de prácticas',1,'2020-03-04 11:00:25','2020-03-04 11:00:25'),(71,'checker','Rol de revisor con privilegios de itemPicker',1,'2020-10-02 10:50:07','2020-10-02 10:50:07'),(72,'claimManager','Personal de reclamaciones',1,'2020-10-13 10:01:32','2020-10-26 07:29:46'),(73,'financial','Departamento de finanzas',1,'2020-11-16 09:30:27','2020-11-16 09:30:27'),(76,'chat','Rol para utilizar el rocket chat',1,'2020-11-27 13:06:50','2020-12-17 07:49:41'),(100,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2020-11-12 06:50:07'); /*!40000 ALTER TABLE `role` ENABLE KEYS */; UNLOCK TABLES; @@ -71,7 +71,7 @@ UNLOCK TABLES; LOCK TABLES `roleInherit` WRITE; /*!40000 ALTER TABLE `roleInherit` DISABLE KEYS */; -INSERT INTO `roleInherit` VALUES (1,1,2),(2,1,3),(3,1,70),(4,2,11),(5,3,11),(6,5,1),(7,5,21),(8,5,33),(9,9,100),(10,11,6),(11,13,1),(12,15,35),(13,15,57),(14,16,13),(15,16,15),(16,17,20),(17,17,37),(18,17,39),(19,17,64),(20,18,1),(21,19,21),(22,20,13),(23,20,16),(24,20,65),(25,21,13),(26,21,18),(27,21,53),(28,22,13),(29,22,21),(30,30,5),(31,30,20),(32,30,22),(33,30,53),(34,30,64),(35,31,1),(36,32,1),(37,34,1),(38,34,13),(39,34,33),(40,35,1),(41,36,44),(42,36,47),(43,37,1),(44,38,37),(45,38,64),(46,39,5),(47,39,21),(48,39,57),(49,40,1),(50,40,49),(51,41,13),(52,41,35),(53,41,40),(54,42,35),(55,42,49),(56,43,13),(57,43,42),(58,44,1),(59,45,13),(60,45,44),(61,47,1),(62,48,13),(63,48,47),(64,49,36),(65,49,58),(66,50,13),(67,50,21),(68,50,35),(69,50,49),(70,50,57),(71,50,59),(72,51,1),(73,52,13),(74,52,19),(75,52,35),(76,52,51),(77,53,1),(78,54,1),(79,55,13),(80,55,54),(81,56,1),(82,57,13),(83,57,56),(84,58,1),(85,59,13),(109,59,50),(87,60,5),(88,60,37),(89,60,50),(90,60,57),(91,61,13),(92,61,36),(93,65,19),(94,65,35),(95,65,50),(96,66,100),(97,67,5),(98,67,37),(99,69,35),(100,69,47),(101,70,11),(102,71,1),(103,71,58),(104,72,13),(105,72,18),(106,73,5),(108,73,19),(107,73,64); +INSERT INTO `roleInherit` VALUES (1,1,2),(2,1,3),(3,1,70),(4,2,11),(5,3,11),(6,5,1),(7,5,21),(8,5,33),(124,5,76),(123,9,76),(9,9,100),(10,11,6),(11,13,1),(12,15,35),(13,15,57),(114,15,76),(14,16,13),(15,16,15),(127,16,76),(16,17,20),(17,17,37),(18,17,39),(19,17,64),(136,17,76),(20,18,1),(132,18,76),(21,19,21),(22,20,13),(23,20,16),(24,20,65),(134,20,76),(25,21,13),(26,21,18),(27,21,53),(131,21,76),(28,22,13),(29,22,21),(30,30,5),(31,30,20),(32,30,22),(33,30,53),(34,30,64),(118,30,76),(35,31,1),(36,32,1),(37,34,1),(38,34,13),(39,34,33),(40,35,1),(129,35,76),(41,36,44),(42,36,47),(43,37,1),(125,37,76),(44,38,37),(45,38,64),(126,38,76),(46,39,5),(47,39,21),(48,39,57),(115,39,76),(49,40,1),(50,40,49),(51,41,13),(52,41,35),(53,41,40),(135,41,76),(54,42,35),(55,42,49),(128,42,76),(56,43,13),(57,43,42),(58,44,1),(59,45,13),(60,45,44),(61,47,1),(62,48,13),(63,48,47),(64,49,36),(65,49,58),(66,50,13),(67,50,21),(68,50,35),(69,50,49),(70,50,57),(71,50,59),(133,50,76),(72,51,1),(73,52,13),(74,52,19),(75,52,35),(76,52,51),(137,52,76),(77,53,1),(78,54,1),(79,55,13),(80,55,54),(81,56,1),(82,57,13),(83,57,56),(138,57,76),(84,58,1),(85,59,13),(109,59,50),(87,60,5),(88,60,37),(89,60,50),(90,60,57),(130,60,76),(91,61,13),(92,61,36),(93,65,19),(94,65,35),(95,65,50),(117,65,76),(122,66,76),(96,66,100),(97,67,5),(98,67,37),(99,69,35),(100,69,47),(101,70,11),(102,71,1),(103,71,58),(104,72,13),(105,72,18),(106,73,5),(108,73,19),(107,73,64); /*!40000 ALTER TABLE `roleInherit` ENABLE KEYS */; UNLOCK TABLES; @@ -81,7 +81,7 @@ UNLOCK TABLES; LOCK TABLES `roleRole` WRITE; /*!40000 ALTER TABLE `roleRole` DISABLE KEYS */; -INSERT INTO `roleRole` VALUES (6839,1,1),(6840,1,2),(6841,1,3),(6844,1,6),(6843,1,11),(6842,1,70),(6762,2,2),(6764,2,6),(6763,2,11),(6672,3,3),(6674,3,6),(6673,3,11),(6647,5,1),(6652,5,2),(6651,5,3),(6646,5,5),(6657,5,6),(6656,5,11),(6653,5,13),(6654,5,18),(6648,5,21),(6649,5,33),(6655,5,53),(6650,5,70),(6904,6,6),(6804,9,1),(6801,9,2),(6790,9,3),(6788,9,5),(6809,9,6),(6781,9,9),(6785,9,11),(6836,9,13),(6818,9,15),(6819,9,16),(6787,9,17),(6834,9,18),(6833,9,19),(6820,9,20),(6832,9,21),(6837,9,22),(6807,9,30),(6808,9,31),(6805,9,32),(6815,9,33),(6791,9,34),(6795,9,35),(6830,9,36),(6812,9,37),(6813,9,38),(6786,9,39),(6810,9,40),(6811,9,41),(6792,9,42),(6793,9,43),(6783,9,44),(6784,9,45),(6798,9,47),(6800,9,48),(6827,9,49),(6829,9,50),(6821,9,51),(6822,9,52),(6814,9,53),(6816,9,54),(6817,9,55),(6802,9,56),(6803,9,57),(6825,9,58),(6826,9,59),(6828,9,60),(6831,9,61),(6823,9,62),(6794,9,64),(6824,9,65),(6835,9,66),(6789,9,67),(6799,9,69),(6838,9,70),(6796,9,71),(6797,9,72),(6806,9,73),(6782,9,100),(6599,11,6),(6598,11,11),(7311,13,1),(7312,13,2),(7313,13,3),(7316,13,6),(7315,13,11),(7310,13,13),(7314,13,70),(6976,15,1),(6980,15,2),(6979,15,3),(6982,15,6),(6981,15,11),(6975,15,13),(6972,15,15),(6973,15,35),(6977,15,56),(6974,15,57),(6978,15,70),(6987,16,1),(6991,16,2),(6990,16,3),(6994,16,6),(6993,16,11),(6984,16,13),(6985,16,15),(6983,16,16),(6986,16,35),(6992,16,56),(6988,16,57),(6989,16,70),(6620,17,1),(6629,17,2),(6628,17,3),(6624,17,5),(6641,17,6),(6638,17,11),(6623,17,13),(6633,17,15),(6622,17,16),(6615,17,17),(6635,17,18),(6632,17,19),(6616,17,20),(6625,17,21),(6634,17,33),(6631,17,35),(6643,17,36),(6617,17,37),(6618,17,39),(6645,17,44),(6644,17,47),(6640,17,49),(6630,17,50),(6636,17,53),(6637,17,56),(6626,17,57),(6642,17,58),(6639,17,59),(6619,17,64),(6621,17,65),(6627,17,70),(7246,18,1),(7247,18,2),(7248,18,3),(7251,18,6),(7250,18,11),(7245,18,18),(7249,18,70),(7239,19,1),(7242,19,2),(7241,19,3),(7244,19,6),(7243,19,11),(7236,19,13),(7237,19,18),(7234,19,19),(7235,19,21),(7238,19,53),(7240,19,70),(7001,20,1),(7008,20,2),(7007,20,3),(7019,20,6),(7016,20,11),(6996,20,13),(7000,20,15),(6997,20,16),(7014,20,18),(6999,20,19),(6995,20,20),(7004,20,21),(7002,20,35),(7012,20,36),(7018,20,44),(7017,20,47),(7009,20,49),(7003,20,50),(7013,20,53),(7015,20,56),(7005,20,57),(7011,20,58),(7010,20,59),(6998,20,65),(7006,20,70),(7228,21,1),(7231,21,2),(7230,21,3),(7233,21,6),(7232,21,11),(7225,21,13),(7226,21,18),(7224,21,21),(7227,21,53),(7229,21,70),(7321,22,1),(7325,22,2),(7324,22,3),(7327,22,6),(7326,22,11),(7318,22,13),(7320,22,18),(7319,22,21),(7317,22,22),(7322,22,53),(7323,22,70),(6877,30,1),(6884,30,2),(6883,30,3),(6868,30,5),(6894,30,6),(6890,30,11),(6874,30,13),(6880,30,15),(6873,30,16),(6881,30,18),(6879,30,19),(6869,30,20),(6876,30,21),(6870,30,22),(6867,30,30),(6875,30,33),(6885,30,35),(6892,30,36),(6896,30,44),(6895,30,47),(6888,30,49),(6886,30,50),(6871,30,53),(6893,30,56),(6889,30,57),(6891,30,58),(6887,30,59),(6872,30,64),(6878,30,65),(6882,30,70),(6898,31,1),(6899,31,2),(6900,31,3),(6903,31,6),(6902,31,11),(6897,31,31),(6901,31,70),(6846,32,1),(6847,32,2),(6848,32,3),(6851,32,6),(6850,32,11),(6845,32,32),(6849,32,70),(6955,33,33),(6676,34,1),(6681,34,2),(6680,34,3),(6683,34,6),(6682,34,11),(6677,34,13),(6678,34,33),(6675,34,34),(6679,34,70),(6714,35,1),(6715,35,2),(6716,35,3),(6719,35,6),(6718,35,11),(6713,35,35),(6717,35,70),(7149,36,1),(7151,36,2),(7150,36,3),(7154,36,6),(7153,36,11),(7146,36,36),(7147,36,44),(7148,36,47),(7152,36,70),(6933,37,1),(6934,37,2),(6935,37,3),(6938,37,6),(6937,37,11),(6932,37,37),(6936,37,70),(6942,38,1),(6944,38,2),(6943,38,3),(6947,38,6),(6946,38,11),(6940,38,37),(6939,38,38),(6941,38,64),(6945,38,70),(6606,39,1),(6612,39,2),(6611,39,3),(6601,39,5),(6614,39,6),(6613,39,11),(6604,39,13),(6607,39,18),(6602,39,21),(6605,39,33),(6600,39,39),(6608,39,53),(6609,39,56),(6603,39,57),(6610,39,70),(6906,40,1),(6909,40,2),(6908,40,3),(6916,40,6),(6915,40,11),(6911,40,36),(6905,40,40),(6914,40,44),(6913,40,47),(6907,40,49),(6912,40,58),(6910,40,70),(6922,41,1),(6925,41,2),(6924,41,3),(6931,41,6),(6930,41,11),(6918,41,13),(6919,41,35),(6926,41,36),(6920,41,40),(6917,41,41),(6929,41,44),(6928,41,47),(6921,41,49),(6927,41,58),(6923,41,70),(6688,42,1),(6692,42,2),(6691,42,3),(6696,42,6),(6695,42,11),(6685,42,35),(6687,42,36),(6684,42,42),(6693,42,44),(6694,42,47),(6686,42,49),(6689,42,58),(6690,42,70),(6701,43,1),(6705,43,2),(6704,43,3),(6711,43,6),(6710,43,11),(6698,43,13),(6700,43,35),(6706,43,36),(6699,43,42),(6697,43,43),(6709,43,44),(6708,43,47),(6702,43,49),(6707,43,58),(6703,43,70),(6583,44,1),(6584,44,2),(6585,44,3),(6588,44,6),(6587,44,11),(6582,44,44),(6586,44,70),(6592,45,1),(6594,45,2),(6593,45,3),(6597,45,6),(6596,45,11),(6590,45,13),(6591,45,44),(6589,45,45),(6595,45,70),(6738,47,1),(6739,47,2),(6740,47,3),(6743,47,6),(6742,47,11),(6737,47,47),(6741,47,70),(6756,48,1),(6758,48,2),(6757,48,3),(6761,48,6),(6760,48,11),(6754,48,13),(6755,48,47),(6753,48,48),(6759,48,70),(7096,49,1),(7099,49,2),(7098,49,3),(7101,49,6),(7100,49,11),(7092,49,36),(7095,49,44),(7094,49,47),(7091,49,49),(7093,49,58),(7097,49,70),(7138,50,1),(7143,50,2),(7142,50,3),(7145,50,6),(7144,50,11),(7127,50,13),(7137,50,18),(7128,50,21),(7129,50,35),(7135,50,36),(7140,50,44),(7139,50,47),(7130,50,49),(7126,50,50),(7136,50,53),(7133,50,56),(7131,50,57),(7134,50,58),(7132,50,59),(7141,50,70),(7021,51,1),(7022,51,2),(7023,51,3),(7026,51,6),(7025,51,11),(7020,51,51),(7024,51,70),(7033,52,1),(7037,52,2),(7036,52,3),(7040,52,6),(7039,52,11),(7028,52,13),(7034,52,18),(7029,52,19),(7032,52,21),(7030,52,35),(7031,52,51),(7027,52,52),(7038,52,53),(7035,52,70),(6949,53,1),(6950,53,2),(6951,53,3),(6954,53,6),(6953,53,11),(6948,53,53),(6952,53,70),(6957,54,1),(6958,54,2),(6959,54,3),(6962,54,6),(6961,54,11),(6956,54,54),(6960,54,70),(6966,55,1),(6968,55,2),(6967,55,3),(6971,55,6),(6970,55,11),(6964,55,13),(6965,55,54),(6963,55,55),(6969,55,70),(6766,56,1),(6767,56,2),(6768,56,3),(6771,56,6),(6770,56,11),(6765,56,56),(6769,56,70),(6775,57,1),(6777,57,2),(6776,57,3),(6780,57,6),(6779,57,11),(6773,57,13),(6774,57,56),(6772,57,57),(6778,57,70),(7065,58,1),(7066,58,2),(7067,58,3),(7070,58,6),(7069,58,11),(7064,58,58),(7068,58,70),(7075,59,1),(7083,59,2),(7082,59,3),(7090,59,6),(7089,59,11),(7072,59,13),(7080,59,18),(7074,59,21),(7076,59,35),(7084,59,36),(7088,59,44),(7087,59,47),(7077,59,49),(7073,59,50),(7079,59,53),(7086,59,56),(7078,59,57),(7085,59,58),(7071,59,59),(7081,59,70),(7110,60,1),(7121,60,2),(7120,60,3),(7103,60,5),(7125,60,6),(7124,60,11),(7107,60,13),(7118,60,18),(7109,60,21),(7108,60,33),(7111,60,35),(7116,60,36),(7104,60,37),(7123,60,44),(7122,60,47),(7112,60,49),(7105,60,50),(7117,60,53),(7114,60,56),(7106,60,57),(7115,60,58),(7113,60,59),(7102,60,60),(7119,60,70),(7159,61,1),(7163,61,2),(7162,61,3),(7165,61,6),(7164,61,11),(7156,61,13),(7157,61,36),(7158,61,44),(7160,61,47),(7155,61,61),(7161,61,70),(7041,62,62),(6712,64,64),(7047,65,1),(7055,65,2),(7054,65,3),(7063,65,6),(7062,65,11),(7046,65,13),(7057,65,18),(7043,65,19),(7048,65,21),(7044,65,35),(7052,65,36),(7061,65,44),(7060,65,47),(7049,65,49),(7045,65,50),(7056,65,53),(7059,65,56),(7050,65,57),(7058,65,58),(7051,65,59),(7042,65,65),(7053,65,70),(7276,66,1),(7272,66,2),(7261,66,3),(7259,66,5),(7281,66,6),(7275,66,9),(7256,66,11),(7307,66,13),(7290,66,15),(7291,66,16),(7258,66,17),(7306,66,18),(7305,66,19),(7292,66,20),(7304,66,21),(7308,66,22),(7279,66,30),(7280,66,31),(7277,66,32),(7287,66,33),(7262,66,34),(7266,66,35),(7302,66,36),(7284,66,37),(7285,66,38),(7257,66,39),(7282,66,40),(7283,66,41),(7263,66,42),(7264,66,43),(7254,66,44),(7255,66,45),(7269,66,47),(7271,66,48),(7299,66,49),(7301,66,50),(7293,66,51),(7294,66,52),(7286,66,53),(7288,66,54),(7289,66,55),(7273,66,56),(7274,66,57),(7297,66,58),(7298,66,59),(7300,66,60),(7303,66,61),(7295,66,62),(7265,66,64),(7296,66,65),(7252,66,66),(7260,66,67),(7270,66,69),(7309,66,70),(7267,66,71),(7268,66,72),(7278,66,73),(7253,66,100),(6662,67,1),(6666,67,2),(6665,67,3),(6659,67,5),(6671,67,6),(6670,67,11),(6667,67,13),(6668,67,18),(6661,67,21),(6663,67,33),(6660,67,37),(6669,67,53),(6658,67,67),(6664,67,70),(6747,69,1),(6749,69,2),(6748,69,3),(6752,69,6),(6751,69,11),(6745,69,35),(6746,69,47),(6744,69,69),(6750,69,70),(7330,70,6),(7329,70,11),(7328,70,70),(6721,71,1),(6724,71,2),(6723,71,3),(6727,71,6),(6726,71,11),(6722,71,58),(6725,71,70),(6720,71,71),(6731,72,1),(6733,72,2),(6732,72,3),(6736,72,6),(6735,72,11),(6729,72,13),(6730,72,18),(6734,72,70),(6728,72,72),(6858,73,1),(6861,73,2),(6860,73,3),(6853,73,5),(6866,73,6),(6865,73,11),(6862,73,13),(6863,73,18),(6854,73,19),(6857,73,21),(6856,73,33),(6864,73,53),(6855,73,64),(6859,73,70),(6852,73,73),(7189,100,1),(7185,100,2),(7174,100,3),(7172,100,5),(7194,100,6),(7188,100,9),(7169,100,11),(7221,100,13),(7203,100,15),(7204,100,16),(7171,100,17),(7219,100,18),(7218,100,19),(7205,100,20),(7217,100,21),(7222,100,22),(7192,100,30),(7193,100,31),(7190,100,32),(7200,100,33),(7175,100,34),(7179,100,35),(7215,100,36),(7197,100,37),(7198,100,38),(7170,100,39),(7195,100,40),(7196,100,41),(7176,100,42),(7177,100,43),(7167,100,44),(7168,100,45),(7182,100,47),(7184,100,48),(7212,100,49),(7214,100,50),(7206,100,51),(7207,100,52),(7199,100,53),(7201,100,54),(7202,100,55),(7186,100,56),(7187,100,57),(7210,100,58),(7211,100,59),(7213,100,60),(7216,100,61),(7208,100,62),(7178,100,64),(7209,100,65),(7220,100,66),(7173,100,67),(7183,100,69),(7223,100,70),(7180,100,71),(7181,100,72),(7191,100,73),(7166,100,100); +INSERT INTO `roleRole` VALUES (27311,1,1),(27312,1,2),(27313,1,3),(27316,1,6),(27315,1,11),(27314,1,70),(27232,2,2),(27234,2,6),(27233,2,11),(27136,3,3),(27138,3,6),(27137,3,11),(27109,5,1),(27116,5,2),(27115,5,3),(27108,5,5),(27120,5,6),(27119,5,11),(27113,5,13),(27117,5,18),(27110,5,21),(27111,5,33),(27118,5,53),(27114,5,70),(27112,5,102),(27378,6,6),(27276,9,1),(27273,9,2),(27262,9,3),(27260,9,5),(27281,9,6),(27252,9,9),(27257,9,11),(27308,9,13),(27290,9,15),(27291,9,16),(27259,9,17),(27306,9,18),(27305,9,19),(27292,9,20),(27304,9,21),(27309,9,22),(27279,9,30),(27280,9,31),(27277,9,32),(27287,9,33),(27263,9,34),(27267,9,35),(27302,9,36),(27284,9,37),(27285,9,38),(27258,9,39),(27282,9,40),(27283,9,41),(27264,9,42),(27265,9,43),(27255,9,44),(27256,9,45),(27270,9,47),(27272,9,48),(27299,9,49),(27301,9,50),(27293,9,51),(27294,9,52),(27286,9,53),(27288,9,54),(27289,9,55),(27274,9,56),(27275,9,57),(27297,9,58),(27298,9,59),(27300,9,60),(27303,9,61),(27295,9,62),(27266,9,64),(27296,9,65),(27307,9,66),(27261,9,67),(27271,9,69),(27310,9,70),(27268,9,71),(27269,9,72),(27278,9,73),(27253,9,100),(27254,9,102),(27059,11,6),(27058,11,11),(27801,13,1),(27802,13,2),(27803,13,3),(27806,13,6),(27805,13,11),(27800,13,13),(27804,13,70),(27455,15,1),(27458,15,2),(27457,15,3),(27460,15,6),(27459,15,11),(27454,15,13),(27449,15,15),(27450,15,35),(27453,15,56),(27451,15,57),(27456,15,70),(27452,15,102),(27467,16,1),(27470,16,2),(27469,16,3),(27473,16,6),(27472,16,11),(27462,16,13),(27463,16,15),(27461,16,16),(27466,16,35),(27471,16,56),(27465,16,57),(27468,16,70),(27464,16,102),(27083,17,1),(27091,17,2),(27090,17,3),(27082,17,5),(27103,17,6),(27100,17,11),(27086,17,13),(27095,17,15),(27085,17,16),(27076,17,17),(27097,17,18),(27094,17,19),(27077,17,20),(27087,17,21),(27096,17,33),(27093,17,35),(27105,17,36),(27078,17,37),(27079,17,39),(27107,17,44),(27106,17,47),(27102,17,49),(27092,17,50),(27098,17,53),(27099,17,56),(27088,17,57),(27104,17,58),(27101,17,59),(27080,17,64),(27084,17,65),(27089,17,70),(27081,17,102),(27734,18,1),(27737,18,2),(27736,18,3),(27740,18,6),(27739,18,11),(27733,18,18),(27738,18,70),(27735,18,102),(27727,19,1),(27730,19,2),(27729,19,3),(27732,19,6),(27731,19,11),(27723,19,13),(27724,19,18),(27721,19,19),(27722,19,21),(27725,19,53),(27728,19,70),(27726,19,102),(27482,20,1),(27488,20,2),(27487,20,3),(27499,20,6),(27496,20,11),(27475,20,13),(27481,20,15),(27476,20,16),(27494,20,18),(27480,20,19),(27474,20,20),(27484,20,21),(27479,20,35),(27492,20,36),(27498,20,44),(27497,20,47),(27489,20,49),(27483,20,50),(27493,20,53),(27495,20,56),(27485,20,57),(27491,20,58),(27490,20,59),(27477,20,65),(27486,20,70),(27478,20,102),(27715,21,1),(27718,21,2),(27717,21,3),(27720,21,6),(27719,21,11),(27711,21,13),(27712,21,18),(27710,21,21),(27713,21,53),(27716,21,70),(27714,21,102),(27811,22,1),(27816,22,2),(27815,22,3),(27818,22,6),(27817,22,11),(27808,22,13),(27810,22,18),(27809,22,21),(27807,22,22),(27812,22,53),(27814,22,70),(27813,22,102),(27352,30,1),(27358,30,2),(27357,30,3),(27341,30,5),(27368,30,6),(27364,30,11),(27349,30,13),(27354,30,15),(27348,30,16),(27355,30,18),(27353,30,19),(27342,30,20),(27351,30,21),(27343,30,22),(27340,30,30),(27350,30,33),(27359,30,35),(27366,30,36),(27370,30,44),(27369,30,47),(27362,30,49),(27360,30,50),(27344,30,53),(27367,30,56),(27363,30,57),(27365,30,58),(27361,30,59),(27345,30,64),(27347,30,65),(27356,30,70),(27346,30,102),(27372,31,1),(27373,31,2),(27374,31,3),(27377,31,6),(27376,31,11),(27371,31,31),(27375,31,70),(27318,32,1),(27319,32,2),(27320,32,3),(27323,32,6),(27322,32,11),(27317,32,32),(27321,32,70),(27432,33,33),(27140,34,1),(27145,34,2),(27144,34,3),(27147,34,6),(27146,34,11),(27141,34,13),(27142,34,33),(27139,34,34),(27143,34,70),(27180,35,1),(27183,35,2),(27182,35,3),(27186,35,6),(27185,35,11),(27179,35,35),(27184,35,70),(27181,35,102),(27634,36,1),(27636,36,2),(27635,36,3),(27639,36,6),(27638,36,11),(27631,36,36),(27632,36,44),(27633,36,47),(27637,36,70),(27408,37,1),(27411,37,2),(27410,37,3),(27414,37,6),(27413,37,11),(27407,37,37),(27412,37,70),(27409,37,102),(27419,38,1),(27422,38,2),(27421,38,3),(27424,38,6),(27423,38,11),(27416,38,37),(27415,38,38),(27417,38,64),(27420,38,70),(27418,38,102),(27068,39,1),(27073,39,2),(27072,39,3),(27061,39,5),(27075,39,6),(27074,39,11),(27066,39,13),(27065,39,18),(27062,39,21),(27067,39,33),(27060,39,39),(27069,39,53),(27070,39,56),(27063,39,57),(27071,39,70),(27064,39,102),(27380,40,1),(27383,40,2),(27382,40,3),(27390,40,6),(27389,40,11),(27385,40,36),(27379,40,40),(27388,40,44),(27387,40,47),(27381,40,49),(27386,40,58),(27384,40,70),(27397,41,1),(27401,41,2),(27400,41,3),(27406,41,6),(27405,41,11),(27392,41,13),(27393,41,35),(27398,41,36),(27394,41,40),(27391,41,41),(27404,41,44),(27403,41,47),(27396,41,49),(27402,41,58),(27399,41,70),(27395,41,102),(27154,42,1),(27157,42,2),(27156,42,3),(27161,42,6),(27160,42,11),(27149,42,35),(27153,42,36),(27148,42,42),(27158,42,44),(27159,42,47),(27150,42,49),(27152,42,58),(27155,42,70),(27151,42,102),(27166,43,1),(27172,43,2),(27171,43,3),(27177,43,6),(27176,43,11),(27163,43,13),(27165,43,35),(27169,43,36),(27164,43,42),(27162,43,43),(27175,43,44),(27174,43,47),(27167,43,49),(27173,43,58),(27170,43,70),(27168,43,102),(27043,44,1),(27044,44,2),(27045,44,3),(27048,44,6),(27047,44,11),(27042,44,44),(27046,44,70),(27052,45,1),(27054,45,2),(27053,45,3),(27057,45,6),(27056,45,11),(27050,45,13),(27051,45,44),(27049,45,45),(27055,45,70),(27207,47,1),(27208,47,2),(27209,47,3),(27212,47,6),(27211,47,11),(27206,47,47),(27210,47,70),(27226,48,1),(27228,48,2),(27227,48,3),(27231,48,6),(27230,48,11),(27224,48,13),(27225,48,47),(27223,48,48),(27229,48,70),(27579,49,1),(27582,49,2),(27581,49,3),(27584,49,6),(27583,49,11),(27575,49,36),(27578,49,44),(27577,49,47),(27574,49,49),(27576,49,58),(27580,49,70),(27623,50,1),(27628,50,2),(27627,50,3),(27630,50,6),(27629,50,11),(27611,50,13),(27622,50,18),(27612,50,21),(27613,50,35),(27620,50,36),(27625,50,44),(27624,50,47),(27614,50,49),(27610,50,50),(27621,50,53),(27618,50,56),(27615,50,57),(27619,50,58),(27616,50,59),(27626,50,70),(27617,50,102),(27501,51,1),(27502,51,2),(27503,51,3),(27506,51,6),(27505,51,11),(27500,51,51),(27504,51,70),(27514,52,1),(27519,52,2),(27518,52,3),(27521,52,6),(27520,52,11),(27508,52,13),(27516,52,18),(27509,52,19),(27513,52,21),(27510,52,35),(27511,52,51),(27507,52,52),(27515,52,53),(27517,52,70),(27512,52,102),(27426,53,1),(27427,53,2),(27428,53,3),(27431,53,6),(27430,53,11),(27425,53,53),(27429,53,70),(27434,54,1),(27435,54,2),(27436,54,3),(27439,54,6),(27438,54,11),(27433,54,54),(27437,54,70),(27443,55,1),(27445,55,2),(27444,55,3),(27448,55,6),(27447,55,11),(27441,55,13),(27442,55,54),(27440,55,55),(27446,55,70),(27236,56,1),(27237,56,2),(27238,56,3),(27241,56,6),(27240,56,11),(27235,56,56),(27239,56,70),(27246,57,1),(27249,57,2),(27248,57,3),(27251,57,6),(27250,57,11),(27243,57,13),(27244,57,56),(27242,57,57),(27247,57,70),(27245,57,102),(27547,58,1),(27548,58,2),(27549,58,3),(27552,58,6),(27551,58,11),(27546,58,58),(27550,58,70),(27557,59,1),(27567,59,2),(27566,59,3),(27573,59,6),(27572,59,11),(27554,59,13),(27564,59,18),(27556,59,21),(27558,59,35),(27562,59,36),(27571,59,44),(27570,59,47),(27559,59,49),(27555,59,50),(27563,59,53),(27569,59,56),(27560,59,57),(27568,59,58),(27553,59,59),(27565,59,70),(27561,59,102),(27595,60,1),(27605,60,2),(27604,60,3),(27586,60,5),(27609,60,6),(27608,60,11),(27592,60,13),(27602,60,18),(27594,60,21),(27593,60,33),(27591,60,35),(27600,60,36),(27587,60,37),(27607,60,44),(27606,60,47),(27596,60,49),(27588,60,50),(27601,60,53),(27598,60,56),(27589,60,57),(27599,60,58),(27597,60,59),(27585,60,60),(27603,60,70),(27590,60,102),(27644,61,1),(27648,61,2),(27647,61,3),(27650,61,6),(27649,61,11),(27641,61,13),(27642,61,36),(27643,61,44),(27645,61,47),(27640,61,61),(27646,61,70),(27522,62,62),(27178,64,64),(27530,65,1),(27537,65,2),(27536,65,3),(27545,65,6),(27544,65,11),(27529,65,13),(27539,65,18),(27524,65,19),(27531,65,21),(27525,65,35),(27534,65,36),(27543,65,44),(27542,65,47),(27528,65,49),(27526,65,50),(27538,65,53),(27541,65,56),(27532,65,57),(27540,65,58),(27533,65,59),(27523,65,65),(27535,65,70),(27527,65,102),(27766,66,1),(27762,66,2),(27751,66,3),(27749,66,5),(27771,66,6),(27765,66,9),(27746,66,11),(27797,66,13),(27780,66,15),(27781,66,16),(27748,66,17),(27796,66,18),(27795,66,19),(27782,66,20),(27794,66,21),(27798,66,22),(27769,66,30),(27770,66,31),(27767,66,32),(27777,66,33),(27752,66,34),(27756,66,35),(27792,66,36),(27774,66,37),(27775,66,38),(27747,66,39),(27772,66,40),(27773,66,41),(27753,66,42),(27754,66,43),(27744,66,44),(27745,66,45),(27759,66,47),(27761,66,48),(27789,66,49),(27791,66,50),(27783,66,51),(27784,66,52),(27776,66,53),(27778,66,54),(27779,66,55),(27763,66,56),(27764,66,57),(27787,66,58),(27788,66,59),(27790,66,60),(27793,66,61),(27785,66,62),(27755,66,64),(27786,66,65),(27741,66,66),(27750,66,67),(27760,66,69),(27799,66,70),(27757,66,71),(27758,66,72),(27768,66,73),(27742,66,100),(27743,66,102),(27125,67,1),(27131,67,2),(27130,67,3),(27122,67,5),(27135,67,6),(27134,67,11),(27128,67,13),(27132,67,18),(27124,67,21),(27126,67,33),(27123,67,37),(27133,67,53),(27121,67,67),(27129,67,70),(27127,67,102),(27217,69,1),(27219,69,2),(27218,69,3),(27222,69,6),(27221,69,11),(27214,69,35),(27215,69,47),(27213,69,69),(27220,69,70),(27216,69,102),(27821,70,6),(27820,70,11),(27819,70,70),(27189,71,1),(27192,71,2),(27191,71,3),(27195,71,6),(27194,71,11),(27190,71,58),(27193,71,70),(27188,71,71),(27200,72,1),(27202,72,2),(27201,72,3),(27205,72,6),(27204,72,11),(27197,72,13),(27198,72,18),(27203,72,70),(27196,72,72),(27199,72,102),(27330,73,1),(27335,73,2),(27334,73,3),(27325,73,5),(27339,73,6),(27338,73,11),(27332,73,13),(27336,73,18),(27326,73,19),(27329,73,21),(27328,73,33),(27337,73,53),(27327,73,64),(27333,73,70),(27324,73,73),(27331,73,102),(27675,100,1),(27671,100,2),(27659,100,3),(27657,100,5),(27680,100,6),(27674,100,9),(27654,100,11),(27707,100,13),(27689,100,15),(27690,100,16),(27656,100,17),(27705,100,18),(27704,100,19),(27691,100,20),(27703,100,21),(27708,100,22),(27678,100,30),(27679,100,31),(27676,100,32),(27686,100,33),(27660,100,34),(27664,100,35),(27701,100,36),(27683,100,37),(27684,100,38),(27655,100,39),(27681,100,40),(27682,100,41),(27661,100,42),(27662,100,43),(27652,100,44),(27653,100,45),(27668,100,47),(27670,100,48),(27698,100,49),(27700,100,50),(27692,100,51),(27693,100,52),(27685,100,53),(27687,100,54),(27688,100,55),(27672,100,56),(27673,100,57),(27696,100,58),(27697,100,59),(27699,100,60),(27702,100,61),(27694,100,62),(27663,100,64),(27695,100,65),(27706,100,66),(27658,100,67),(27669,100,69),(27709,100,70),(27666,100,71),(27667,100,72),(27677,100,73),(27651,100,100),(27665,100,102),(27187,102,102); /*!40000 ALTER TABLE `roleRole` ENABLE KEYS */; UNLOCK TABLES; @@ -124,7 +124,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-25 12:03:53 +-- Dump completed on 2020-12-17 8:49:50 USE `salix`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -149,7 +149,7 @@ USE `salix`; LOCK TABLES `ACL` WRITE; /*!40000 ALTER TABLE `ACL` DISABLE KEYS */; -INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','trainee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','trainee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','trainee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','trainee'),(30,'GreugeType','*','READ','ALLOW','ROLE','trainee'),(31,'Mandate','*','READ','ALLOW','ROLE','trainee'),(32,'MandateType','*','READ','ALLOW','ROLE','trainee'),(33,'Company','*','READ','ALLOW','ROLE','trainee'),(34,'Greuge','*','READ','ALLOW','ROLE','trainee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(48,'ItemNiche','*','READ','ALLOW','ROLE','employee'),(49,'ItemNiche','*','WRITE','ALLOW','ROLE','buyer'),(50,'ItemNiche','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','trainee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(62,'Ticket','*','*','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(71,'SaleChecked','*','READ','ALLOW','ROLE','employee'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryBoss'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','deleteSales','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','claimManager'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','claimManager'),(101,'Claim','*','*','ALLOW','ROLE','employee'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(103,'ClaimEnd','importTicketSales','WRITE','ALLOW','ROLE','claimManager'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(107,'ItemNiche','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','trainee'),(111,'ClientLog','*','READ','ALLOW','ROLE','trainee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','trainee'),(114,'Receipt','*','READ','ALLOW','ROLE','trainee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(123,'Worker','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(126,'Client','activeWorkersWithRole','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','trainee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','trainee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','deliveryBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryBoss'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryBoss'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'Calendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'Calendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(164,'InvoiceOut','regenerate','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','READ','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(174,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(175,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','trainee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(188,'TicketDms','removeFile','WRITE','ALLOW','ROLE','employee'),(189,'TicketDms','*','READ','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryBoss'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','deliveryBoss'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','trainee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','claimManager'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee'),(218,'Intrastat','*','*','ALLOW','ROLE','buyer'),(219,'Account','acl','READ','ALLOW','ROLE','account'),(220,'Account','getCurrentUserData','READ','ALLOW','ROLE','account'),(221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account'),(222,'Client','*','READ','ALLOW','ROLE','trainee'),(226,'ClientObservation','*','READ','ALLOW','ROLE','trainee'),(227,'Address','*','READ','ALLOW','ROLE','trainee'),(228,'AddressObservation','*','READ','ALLOW','ROLE','trainee'),(230,'ClientCredit','*','READ','ALLOW','ROLE','trainee'),(231,'ClientContact','*','READ','ALLOW','ROLE','trainee'),(232,'ClientSample','*','READ','ALLOW','ROLE','trainee'),(233,'EntryLog','*','READ','ALLOW','ROLE','buyer'),(234,'WorkerLog','*','READ','ALLOW','ROLE','salesAssistant'),(235,'CustomsAgent','*','*','ALLOW','ROLE','employee'),(236,'Buy','*','*','ALLOW','ROLE','buyer'),(237,'WorkerDms','filter','*','ALLOW','ROLE','employee'),(238,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(239,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(240,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(241,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'); +INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','trainee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','trainee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','trainee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','trainee'),(30,'GreugeType','*','READ','ALLOW','ROLE','trainee'),(31,'Mandate','*','READ','ALLOW','ROLE','trainee'),(32,'MandateType','*','READ','ALLOW','ROLE','trainee'),(33,'Company','*','READ','ALLOW','ROLE','trainee'),(34,'Greuge','*','READ','ALLOW','ROLE','trainee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(48,'ItemNiche','*','READ','ALLOW','ROLE','employee'),(49,'ItemNiche','*','WRITE','ALLOW','ROLE','buyer'),(50,'ItemNiche','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','trainee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(62,'Ticket','*','*','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(71,'SaleChecked','*','READ','ALLOW','ROLE','employee'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryBoss'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','deleteSales','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','claimManager'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','claimManager'),(101,'Claim','*','*','ALLOW','ROLE','employee'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(103,'ClaimEnd','importTicketSales','WRITE','ALLOW','ROLE','claimManager'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(107,'ItemNiche','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','trainee'),(111,'ClientLog','*','READ','ALLOW','ROLE','trainee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','trainee'),(114,'Receipt','*','READ','ALLOW','ROLE','trainee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(123,'Worker','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(126,'Client','activeWorkersWithRole','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','trainee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','trainee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','deliveryBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryBoss'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryBoss'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'Calendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'Calendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(164,'InvoiceOut','regenerate','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','READ','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(174,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(175,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','trainee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(188,'TicketDms','removeFile','WRITE','ALLOW','ROLE','employee'),(189,'TicketDms','*','READ','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryBoss'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','deliveryBoss'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','trainee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','claimManager'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee'),(218,'Intrastat','*','*','ALLOW','ROLE','buyer'),(219,'Account','acl','READ','ALLOW','ROLE','account'),(220,'Account','getCurrentUserData','READ','ALLOW','ROLE','account'),(221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account'),(222,'Client','*','READ','ALLOW','ROLE','trainee'),(226,'ClientObservation','*','READ','ALLOW','ROLE','trainee'),(227,'Address','*','READ','ALLOW','ROLE','trainee'),(228,'AddressObservation','*','READ','ALLOW','ROLE','trainee'),(230,'ClientCredit','*','READ','ALLOW','ROLE','trainee'),(231,'ClientContact','*','READ','ALLOW','ROLE','trainee'),(232,'ClientSample','*','READ','ALLOW','ROLE','trainee'),(233,'EntryLog','*','READ','ALLOW','ROLE','buyer'),(234,'WorkerLog','*','READ','ALLOW','ROLE','salesAssistant'),(235,'CustomsAgent','*','*','ALLOW','ROLE','employee'),(236,'Buy','*','*','ALLOW','ROLE','buyer'),(237,'WorkerDms','filter','*','ALLOW','ROLE','employee'),(238,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(239,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(240,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(241,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(242,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(243,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'); /*!40000 ALTER TABLE `ACL` ENABLE KEYS */; UNLOCK TABLES; @@ -172,7 +172,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-25 12:03:55 +-- Dump completed on 2020-12-17 8:49:52 USE `vn`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -257,7 +257,7 @@ UNLOCK TABLES; LOCK TABLES `tag` WRITE; /*!40000 ALTER TABLE `tag` DISABLE KEYS */; -INSERT INTO `tag` VALUES (1,'color','Color',0,0,'ink',NULL,NULL,'inkFk'),(2,NULL,'Forma',1,0,NULL,NULL,NULL,NULL),(3,NULL,'Material',1,0,NULL,NULL,NULL,NULL),(4,NULL,'Longitud',1,1,NULL,'mm',NULL,'size'),(5,NULL,'Diámetro',1,1,NULL,'mm',NULL,'diameter'),(6,NULL,'Perímetro',1,1,NULL,'mm',NULL,NULL),(7,NULL,'Ancho de la base',1,1,NULL,'mm',NULL,NULL),(8,NULL,'Altura',1,1,NULL,'mm',NULL,'size'),(9,NULL,'Volumen',1,1,NULL,'ml',NULL,NULL),(10,NULL,'Densidad',1,1,NULL,NULL,NULL,NULL),(11,NULL,'Calidad',1,0,NULL,NULL,NULL,NULL),(12,NULL,'Textura',1,0,NULL,NULL,NULL,NULL),(13,NULL,'Material del mango',1,0,NULL,NULL,NULL,NULL),(14,NULL,'Compra mínima',1,0,NULL,NULL,NULL,NULL),(15,NULL,'Nº pétalos',1,1,NULL,NULL,NULL,NULL),(16,NULL,'Ancho',1,1,NULL,'mm',NULL,NULL),(18,NULL,'Profundidad',1,1,NULL,'mm',NULL,NULL),(19,NULL,'Largo',1,1,NULL,'mm',NULL,'size'),(20,NULL,'Ancho superior',1,1,NULL,'mm',NULL,NULL),(21,NULL,'Ancho inferior',1,1,NULL,'mm',NULL,NULL),(22,NULL,'Gramaje',1,1,NULL,'g',NULL,NULL),(23,'stems','Tallos',1,1,NULL,NULL,NULL,'stems'),(24,NULL,'Estado',1,0,NULL,NULL,NULL,NULL),(25,NULL,'Color principal',0,0,'ink',NULL,NULL,NULL),(26,NULL,'Color secundario',0,0,'ink',NULL,NULL,NULL),(27,NULL,'Longitud(cm)',1,1,NULL,'cm',NULL,NULL),(28,NULL,'Diámetro base',1,1,NULL,'mm',NULL,'diameter'),(29,NULL,'Colección',1,0,NULL,NULL,NULL,NULL),(30,NULL,'Uds / caja',1,1,NULL,NULL,NULL,NULL),(31,NULL,'Contenido',1,0,NULL,NULL,NULL,NULL),(32,NULL,'Peso',1,1,NULL,'g',NULL,NULL),(33,NULL,'Grosor',1,1,NULL,'mm',NULL,NULL),(34,NULL,'Marca',1,0,NULL,NULL,NULL,NULL),(35,'origin','Origen',0,0,'origin',NULL,NULL,'originFk'),(36,NULL,'Proveedor',1,0,NULL,NULL,NULL,NULL),(37,'producer','Productor',0,0,'producer',NULL,NULL,'producerFk'),(38,NULL,'Duración',1,1,NULL,'s',NULL,NULL),(39,NULL,'Flor',1,0,NULL,NULL,NULL,NULL),(40,NULL,'Soporte',1,0,NULL,NULL,NULL,NULL),(41,NULL,'Tamaño flor',1,0,NULL,NULL,NULL,NULL),(42,NULL,'Apertura',1,0,NULL,NULL,NULL,NULL),(43,NULL,'Tallo',1,0,NULL,NULL,NULL,NULL),(44,NULL,'Nº hojas',1,1,NULL,NULL,NULL,NULL),(45,NULL,'Dimensiones',1,0,NULL,NULL,NULL,NULL),(46,NULL,'Diámetro boca',1,1,NULL,'mm',NULL,NULL),(47,NULL,'Nº flores',1,1,NULL,NULL,NULL,NULL),(48,NULL,'Uds / paquete',1,1,NULL,NULL,NULL,NULL),(49,NULL,'Maceta',1,1,NULL,'cm',NULL,'diameter'),(50,NULL,'Textura flor',1,0,NULL,NULL,NULL,NULL),(51,NULL,'Textura hoja',1,0,NULL,NULL,NULL,NULL),(52,NULL,'Tipo de IVA',1,0,NULL,NULL,NULL,NULL),(53,NULL,'Tronco',1,0,NULL,NULL,NULL,NULL),(54,NULL,'Hoja',1,0,NULL,NULL,NULL,NULL),(55,NULL,'Formato',1,0,NULL,NULL,NULL,NULL),(56,NULL,'Genero',1,0,NULL,NULL,NULL,NULL),(57,NULL,'Especie',1,0,NULL,NULL,NULL,NULL),(58,NULL,'Variedad',1,0,NULL,NULL,NULL,NULL),(59,NULL,'Medida grande',1,0,NULL,NULL,NULL,NULL),(60,NULL,'Medida mediano',1,0,NULL,NULL,NULL,NULL),(61,NULL,'Medida pequeño',1,0,NULL,NULL,NULL,NULL),(63,NULL,'Recipiente interior',1,0,NULL,NULL,NULL,NULL),(64,NULL,'Material secundario',1,0,NULL,NULL,NULL,NULL),(65,NULL,'Colores',1,0,NULL,NULL,NULL,NULL),(66,NULL,'Referencia',1,0,NULL,NULL,NULL,NULL),(67,'category','Categoria',1,0,NULL,NULL,NULL,NULL),(68,NULL,'Amb',1,0,NULL,NULL,NULL,NULL),(69,NULL,'Anchura',1,1,NULL,'cm',NULL,NULL),(70,NULL,'Hueco interior',1,0,NULL,NULL,NULL,NULL),(71,NULL,'Tamaño',1,0,NULL,NULL,NULL,NULL),(72,NULL,'Color botón',1,0,NULL,NULL,NULL,NULL),(73,NULL,'Tamaño minimo del botón',1,0,NULL,NULL,NULL,NULL),(74,NULL,'Obtentor',1,0,NULL,NULL,NULL,NULL),(75,NULL,'Longitud del brote',1,0,NULL,NULL,NULL,NULL),(76,NULL,'Tallos / u.v.',1,0,NULL,NULL,NULL,NULL),(77,NULL,'Madera de',1,0,NULL,NULL,NULL,NULL),(78,NULL,'Unidad de venta',1,0,NULL,NULL,NULL,NULL),(79,NULL,'Temporal',1,0,NULL,NULL,NULL,NULL),(80,NULL,'Gramaje/tallo',1,1,NULL,'g',NULL,NULL),(81,NULL,'Peso/paquete',1,1,NULL,'g',NULL,NULL),(82,NULL,'Flexibilidad del tallo',1,0,NULL,NULL,NULL,NULL),(83,NULL,'Nº planchas',1,1,NULL,NULL,NULL,NULL),(84,NULL,'Nº páginas',1,1,NULL,NULL,NULL,NULL),(85,NULL,'Editorial',1,0,NULL,NULL,NULL,NULL),(86,NULL,'Idioma',1,0,NULL,NULL,NULL,NULL),(87,NULL,'Fecha publicación',1,0,NULL,NULL,NULL,NULL),(88,NULL,'Cubierta',1,0,NULL,NULL,NULL,NULL),(89,NULL,'Encuadernación',1,0,NULL,NULL,NULL,NULL),(90,NULL,'Autor',1,0,NULL,NULL,NULL,NULL),(91,NULL,'Envoltorio',1,0,NULL,NULL,NULL,NULL),(92,NULL,'Nombre temporal',1,0,NULL,NULL,NULL,NULL),(93,NULL,'Modelo',1,0,NULL,NULL,NULL,NULL),(94,NULL,'Producto',1,0,NULL,NULL,NULL,NULL),(95,NULL,'Título',1,0,NULL,NULL,NULL,NULL),(96,NULL,'Tomo',1,0,NULL,NULL,NULL,NULL),(97,NULL,'Articulo',1,0,NULL,NULL,NULL,NULL),(98,NULL,'Metodo de cultivo',1,0,NULL,NULL,NULL,NULL),(99,NULL,'Edad',1,0,NULL,NULL,NULL,NULL),(100,NULL,'Agotado',1,0,NULL,NULL,NULL,NULL),(101,NULL,'Altura con asa',1,1,NULL,'cm',NULL,'size'),(102,NULL,'Nº tallos',1,1,NULL,NULL,NULL,NULL),(103,NULL,'Cultivo',1,0,NULL,NULL,NULL,NULL),(104,NULL,'Sabor',1,0,NULL,NULL,NULL,NULL),(105,NULL,'Talla',1,0,NULL,NULL,NULL,NULL),(106,NULL,'Calibre',1,1,NULL,NULL,NULL,NULL),(107,NULL,'Dulzura',1,1,NULL,'bx',NULL,NULL),(108,NULL,'Piezas',1,0,NULL,NULL,NULL,NULL),(109,NULL,'Altura con patas',1,0,NULL,'cm',NULL,'size'),(110,NULL,'Envase',1,0,NULL,NULL,NULL,NULL),(111,NULL,'Nº piezas',1,0,NULL,NULL,NULL,NULL),(112,NULL,'Uso',1,0,NULL,'cm',NULL,NULL),(113,NULL,'Color luz',1,0,NULL,NULL,NULL,NULL),(114,NULL,'Capacidad',1,0,NULL,NULL,NULL,NULL),(184,NULL,'Tallos por paquete',1,0,NULL,NULL,NULL,NULL),(205,NULL,'Apertura',1,0,NULL,NULL,NULL,NULL),(219,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(552,NULL,'fout kenmerk',1,0,NULL,NULL,NULL,NULL),(553,NULL,'Potinhoud',1,0,NULL,NULL,NULL,NULL),(554,NULL,'Marketingconcept',1,0,NULL,NULL,NULL,NULL),(555,NULL,'Leeftijd',1,0,NULL,NULL,NULL,NULL),(556,NULL,'Base',1,0,NULL,NULL,NULL,NULL),(557,NULL,'Kleurbehandeld',1,0,NULL,NULL,NULL,'inkFk'),(558,NULL,'Verzorging: Standplaats',1,0,NULL,NULL,NULL,NULL),(559,NULL,'Verzorging: Water',1,0,NULL,NULL,NULL,NULL),(560,NULL,'Verzorging: Voeding',1,0,NULL,NULL,NULL,NULL),(561,NULL,'Verzorging: Temperatuur',1,0,NULL,NULL,NULL,NULL),(562,NULL,'Verzorging: Specifieke in',1,0,NULL,NULL,NULL,NULL),(563,NULL,'Verzorging: Consumptie',1,0,NULL,NULL,NULL,NULL),(564,NULL,'Nabehandeling',1,0,NULL,NULL,NULL,NULL),(565,NULL,'Artikel beeld',1,0,NULL,NULL,NULL,NULL),(566,NULL,'Hoofdkleur 1',1,0,NULL,NULL,NULL,NULL),(567,NULL,'Hoofdkleur 2',1,0,NULL,NULL,NULL,NULL),(568,NULL,'RHS hoofdkleur 1',1,0,NULL,NULL,NULL,NULL),(569,NULL,'RHS hoofdkleur 2',1,0,NULL,NULL,NULL,NULL),(570,NULL,'Hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(571,NULL,'Hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(572,NULL,'RHS hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(573,NULL,'RHS hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(574,NULL,'Botanisch beeld',1,0,NULL,NULL,NULL,NULL),(575,NULL,'Hoofdkleur bes/vrucht',1,0,NULL,NULL,NULL,NULL),(576,NULL,'RHS hoofdkleur bes/vrucht',1,0,NULL,NULL,NULL,NULL),(577,NULL,'UPOV hoofdkleur 1 bloem',1,0,NULL,NULL,NULL,NULL),(578,NULL,'UPOV hoofdkleur 2 bloem',1,0,NULL,NULL,NULL,NULL),(579,NULL,'UPOV hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(580,NULL,'UPOV hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(581,NULL,'UPOV hoofdkleur bes/vruch',1,0,NULL,NULL,NULL,NULL),(582,NULL,'Negatieve keurcode 1',1,0,NULL,NULL,NULL,NULL),(583,NULL,'Negatieve keurcode 2',1,0,NULL,NULL,NULL,NULL),(584,NULL,'Bedrijfskenmerk fytosanit',1,0,NULL,NULL,NULL,NULL),(585,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,NULL,NULL),(586,NULL,'Certificaten MPS-TraceCer',1,0,NULL,NULL,NULL,NULL),(587,NULL,'Overige leveranciersinfor',1,0,NULL,NULL,NULL,NULL),(588,NULL,'Certificaten MPS-GAP',1,0,NULL,NULL,NULL,NULL),(589,NULL,'Betrouwbaarheidsindex kla',1,0,NULL,NULL,NULL,NULL),(590,NULL,'Betrouwbaarheidsindex waa',1,0,NULL,NULL,NULL,NULL),(591,NULL,'Productkwaliteitslabel',1,0,NULL,NULL,NULL,NULL),(592,NULL,'Label Fair Flowers Fair P',1,0,NULL,NULL,NULL,NULL),(593,NULL,'Certificaten Socialy Qual',1,0,NULL,NULL,NULL,NULL),(594,NULL,'Certificaten GlobalGAP',1,0,NULL,NULL,NULL,NULL),(595,NULL,'Certificaten MPS Quality',1,0,NULL,NULL,NULL,NULL),(596,NULL,'Certificaten biologisch',1,0,NULL,NULL,NULL,NULL),(597,NULL,'Certificaten eetbare prod',1,0,NULL,NULL,NULL,NULL),(598,NULL,'Certificaten Florimark',1,0,NULL,NULL,NULL,NULL),(599,NULL,'Certificaten Milieukeur',1,0,NULL,NULL,NULL,NULL),(600,NULL,'Certificaten Kenya Flower',1,0,NULL,NULL,NULL,NULL),(601,NULL,'Certificaten Fairtrade',1,0,NULL,NULL,NULL,NULL),(602,NULL,'Keurmerk MPS-ProductProof',1,0,NULL,NULL,NULL,NULL),(603,NULL,'Certificaten ISO',1,0,NULL,NULL,NULL,NULL),(604,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,NULL,NULL),(605,NULL,'Certificaten Florverde',1,0,NULL,NULL,NULL,NULL),(606,NULL,'Certificaten Ethical Trad',1,0,NULL,NULL,NULL,NULL),(607,NULL,'Certificaten Ethiopian EH',1,0,NULL,NULL,NULL,NULL),(608,NULL,'Certificaten gewasbescher',1,0,NULL,NULL,NULL,NULL),(609,NULL,'Certificaten SAN',1,0,NULL,NULL,NULL,NULL),(610,NULL,'Certificaten GRASP',1,0,NULL,NULL,NULL,NULL),(611,NULL,'Label Fair Flora',1,0,NULL,NULL,NULL,NULL),(612,NULL,'GLobalG.A.P. Chain of Cus',1,0,NULL,NULL,NULL,NULL),(613,NULL,'Fust',1,0,NULL,NULL,NULL,NULL),(614,NULL,'Stapelwagen',1,0,NULL,NULL,NULL,NULL),(615,NULL,'Aantal legborden veilings',1,0,NULL,NULL,NULL,NULL),(616,NULL,'Aantal legborden Deense s',1,0,NULL,NULL,NULL,NULL),(617,NULL,'Aantal onderstellen Deens',1,0,NULL,NULL,NULL,NULL),(618,NULL,'Fustsoort',1,0,NULL,NULL,NULL,NULL),(619,NULL,'Envase',1,0,NULL,NULL,NULL,NULL),(620,NULL,'Aantal legborden Eurostap',1,0,NULL,NULL,NULL,NULL),(621,NULL,'Aantal onderstellen Euros',1,0,NULL,NULL,NULL,NULL),(622,NULL,'Tallos/bolsa',1,0,NULL,NULL,NULL,''),(623,NULL,'Aantal bossen per bundel',1,0,NULL,NULL,NULL,NULL),(624,NULL,'Aantal stuks per fust',1,0,NULL,NULL,NULL,NULL),(625,NULL,'Aantal bossen per fust',1,0,NULL,NULL,NULL,NULL),(626,NULL,'Aantal bundels per fust',1,0,NULL,NULL,NULL,NULL),(627,NULL,'Aantal bossen per hoes',1,0,NULL,NULL,NULL,NULL),(628,NULL,'Aantal bundels per hoes',1,0,NULL,NULL,NULL,NULL),(629,NULL,'Fustlabel',1,0,NULL,NULL,NULL,NULL),(630,NULL,'Karlabel',1,0,NULL,NULL,NULL,NULL),(631,NULL,'Service productlabel',1,0,NULL,NULL,NULL,NULL),(632,NULL,'Service fustlabel',1,0,NULL,NULL,NULL,NULL),(633,NULL,'Service karlabel',1,0,NULL,NULL,NULL,NULL),(634,NULL,'Aantal fusten per laag',1,0,NULL,NULL,NULL,NULL),(635,NULL,'Presentatie per schapm2',1,0,NULL,NULL,NULL,NULL),(636,NULL,'Positieve keurcode fytosa',1,0,NULL,NULL,NULL,NULL),(637,NULL,'Positieve keurcode kwalit',1,0,NULL,NULL,NULL,NULL),(638,NULL,'Positieve keurcode veilin',1,0,NULL,NULL,NULL,NULL),(639,NULL,'Maceta',1,1,NULL,'cm',NULL,'diameter'),(640,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(641,NULL,'nº plantas',1,0,NULL,NULL,NULL,NULL),(642,NULL,'Diámetro',1,0,NULL,NULL,NULL,NULL),(644,NULL,'Altura',1,1,NULL,'cm',NULL,'size'),(645,NULL,'Plantas/Maceta',1,0,NULL,NULL,NULL,NULL),(646,NULL,'Dikte',1,0,NULL,NULL,NULL,NULL),(647,NULL,'nº flores',1,0,NULL,NULL,NULL,NULL),(648,NULL,'Min aantal bloemtrossen p',1,0,NULL,NULL,NULL,NULL),(649,NULL,'nº ramales',1,0,NULL,NULL,NULL,NULL),(650,NULL,'Minimum aantal bollen per',1,0,NULL,NULL,NULL,NULL),(651,NULL,'Minimum aantal bladeren p',1,0,NULL,NULL,NULL,NULL),(652,NULL,'Altura tronco',1,1,NULL,'cm',NULL,'size'),(653,NULL,'Altura caja',1,0,NULL,'cm',NULL,'size'),(654,NULL,'Lengte scheuten',1,0,NULL,NULL,NULL,NULL),(655,NULL,'Min aant vertakkingen pr ',1,0,NULL,NULL,NULL,NULL),(656,NULL,'Altura del capullo',1,0,NULL,NULL,NULL,NULL),(658,NULL,'Peso tallo',1,0,NULL,NULL,NULL,NULL),(659,NULL,'nº flores',1,0,NULL,NULL,NULL,NULL),(660,NULL,'Diámetro de la flor',1,0,NULL,NULL,NULL,NULL),(661,NULL,'Minimum bloemschedelengte',1,0,NULL,NULL,NULL,NULL),(662,NULL,'Aantal bloemkoppen per tr',1,0,NULL,NULL,NULL,NULL),(663,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(664,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(665,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(666,NULL,'Longitud inflorescencia',1,0,NULL,NULL,NULL,NULL),(667,NULL,'Verpakkingswijze snijbloe',1,0,NULL,NULL,NULL,NULL),(668,NULL,'Minimum aant bloemen per ',1,0,NULL,NULL,NULL,NULL),(669,NULL,'Longitud',1,0,NULL,NULL,NULL,'size'),(670,NULL,'Jaartal sortering hout',1,0,NULL,NULL,NULL,NULL),(671,NULL,'Diámetro de la hoja',1,0,NULL,NULL,NULL,NULL),(672,NULL,'Peso paquete',1,0,NULL,NULL,NULL,NULL),(673,NULL,'Maximum planthoogte',1,0,NULL,NULL,NULL,NULL),(674,NULL,'Maximum plantdiameter',1,0,NULL,NULL,NULL,NULL),(675,NULL,'Max aantal bloemen/bloeiw',1,0,NULL,NULL,NULL,NULL),(676,NULL,'Maximum aantal takken per',1,0,NULL,NULL,NULL,NULL),(677,NULL,'Maximum aantal bollen per',1,0,NULL,NULL,NULL,NULL),(678,NULL,'Maximum stamhoogte',1,0,NULL,NULL,NULL,NULL),(679,NULL,'Longitud mínima',1,0,NULL,NULL,NULL,'size'),(680,NULL,'Maximum aantal knoppen sn',1,0,NULL,NULL,NULL,NULL),(681,NULL,'Maximum bloemdiameter',1,0,NULL,NULL,NULL,NULL),(682,NULL,'Maximum bloeiwijzelengte',1,0,NULL,NULL,NULL,NULL),(683,NULL,'Aantal vruchten / trossen',1,0,NULL,NULL,NULL,NULL),(684,NULL,'Verpakkingswijze',1,0,NULL,NULL,NULL,NULL),(685,NULL,'Minimum vruchtdiameter',1,0,NULL,NULL,NULL,NULL),(686,NULL,'Medida',1,1,NULL,'cm',NULL,'size'),(687,NULL,'Bloem/bes/vruchtkleur 1',1,0,NULL,NULL,NULL,NULL),(688,NULL,'Potvorm',1,0,NULL,NULL,NULL,NULL),(689,NULL,'Potkleur',1,0,NULL,NULL,NULL,NULL),(690,NULL,'Material maceta',1,0,NULL,NULL,NULL,NULL),(691,NULL,'Plantvorm',1,0,NULL,NULL,NULL,NULL),(692,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,NULL,NULL),(693,NULL,'Teeltwijze',1,0,NULL,NULL,NULL,NULL),(694,NULL,'Teeltmedium',1,0,NULL,NULL,NULL,NULL),(695,NULL,'Cubierta',1,0,NULL,NULL,NULL,NULL),(696,NULL,'Hoesvorm',1,0,NULL,NULL,NULL,NULL),(697,NULL,'Hoesbedrukking algemeen',1,0,NULL,NULL,NULL,NULL),(698,NULL,'Extra toevoegingen',1,0,NULL,NULL,NULL,NULL),(699,NULL,'Land van herkomst (bedrij',1,0,NULL,NULL,NULL,NULL),(700,NULL,'Verpakte orchidee',1,0,NULL,NULL,NULL,NULL),(701,NULL,'Hoesbedrukking extra',1,0,NULL,NULL,NULL,NULL),(702,NULL,'Voorbehandeling',1,0,NULL,NULL,NULL,NULL),(703,NULL,'Overige niet in pot',1,0,NULL,NULL,NULL,NULL),(704,NULL,'Forma de la flor',1,0,NULL,NULL,NULL,NULL),(705,NULL,'Flexibilidad',1,0,NULL,NULL,NULL,NULL),(706,NULL,'Hoeskleur',1,0,NULL,NULL,NULL,NULL),(707,NULL,'Extra deco',1,0,NULL,NULL,NULL,NULL),(708,NULL,'Color',1,0,NULL,NULL,NULL,'inkFk'),(709,NULL,'Producto',1,0,NULL,NULL,NULL,NULL),(710,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(711,NULL,'Diametro',1,0,NULL,NULL,NULL,NULL),(712,NULL,'Barcode',1,0,NULL,NULL,NULL,NULL),(713,NULL,'Productlabel',1,0,NULL,NULL,NULL,NULL),(714,NULL,'Eetbaar/ niet eetbaar',1,0,NULL,NULL,NULL,NULL),(715,NULL,'Plantmaat zonder pot',1,0,NULL,NULL,NULL,NULL),(716,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,NULL,NULL),(717,NULL,'Maximum percentage oud ho',1,0,NULL,NULL,NULL,NULL),(718,NULL,'Maximum lengte verschil',1,0,NULL,NULL,NULL,NULL),(719,NULL,'Bladkleur',1,0,NULL,NULL,NULL,NULL),(720,NULL,'Plantgewicht',1,0,NULL,NULL,NULL,NULL),(721,NULL,'Diámetro',1,0,NULL,NULL,NULL,NULL),(722,NULL,'Bloem/bes/vruchtkleur 2',1,0,NULL,NULL,NULL,NULL),(723,NULL,'Winterhardheid (USDA zone',1,0,NULL,NULL,NULL,NULL),(724,NULL,'Kleurbehandeld',1,0,NULL,NULL,NULL,'inkFk'),(725,NULL,'Bloem-/bladkleurverdeling',1,0,NULL,NULL,NULL,NULL),(726,NULL,'Diámetro del capullo',1,0,NULL,NULL,NULL,NULL),(727,NULL,'Volume inhoud',1,0,NULL,NULL,NULL,NULL),(728,NULL,'Vruchtbenaming',1,0,NULL,NULL,NULL,NULL),(729,NULL,'Vaaslevenindex',1,0,NULL,NULL,NULL,NULL),(730,NULL,'Overige informatie plante',1,0,NULL,NULL,NULL,NULL),(731,NULL,'Overige informatie snijbl',1,0,NULL,NULL,NULL,NULL),(732,NULL,'Toepassingsmogelijkheid',1,0,NULL,NULL,NULL,NULL),(733,NULL,'Productbeeld aanvoerder',1,0,NULL,NULL,NULL,NULL),(734,NULL,'MPS certificering',1,0,NULL,NULL,NULL,NULL),(735,NULL,'Kwaliteitsgroep',1,0,NULL,NULL,NULL,NULL),(736,NULL,'Artikelomschrijving',1,0,NULL,NULL,NULL,NULL),(737,NULL,'BTW-tarief',1,0,NULL,NULL,NULL,NULL),(738,NULL,'Prijseenheid',1,0,NULL,NULL,NULL,NULL),(739,NULL,'Transactievorm',1,0,NULL,NULL,NULL,NULL),(740,NULL,'Handelsverpakking voorwaa',1,0,NULL,NULL,NULL,NULL),(741,NULL,'Consumentenverpakking voo',1,0,NULL,NULL,NULL,NULL),(742,NULL,'Leveringsvoorwaarden',1,0,NULL,NULL,NULL,NULL),(743,NULL,'PT heffing voorwaarden',1,0,NULL,NULL,NULL,NULL),(744,NULL,'Serviceheffing voorwaarde',1,0,NULL,NULL,NULL,NULL),(745,NULL,'Algemene voorwaarden',1,0,NULL,NULL,NULL,NULL),(746,NULL,'Marktvorm',1,0,NULL,NULL,NULL,NULL),(747,NULL,'Themadagen',1,0,NULL,NULL,NULL,NULL),(748,NULL,'Handelscategorie',1,0,NULL,NULL,NULL,NULL),(749,NULL,'Producentengroepen',1,0,NULL,NULL,NULL,NULL),(750,NULL,'Favorieten Id',1,0,NULL,NULL,NULL,NULL),(751,NULL,'Verkoopeenheid',1,0,NULL,NULL,NULL,NULL),(752,NULL,'Veilgroep voorkeur',1,0,NULL,NULL,NULL,NULL),(753,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(754,NULL,'Keurmeesternummer FloraHo',1,0,NULL,NULL,NULL,NULL),(755,NULL,'Rijnummer Rijnsburg',1,0,NULL,NULL,NULL,NULL),(756,NULL,'Verwerkingslocatie FloraH',1,0,NULL,NULL,NULL,NULL),(757,NULL,'FloraHolland Financial',1,0,NULL,NULL,NULL,NULL),(758,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(759,NULL,'Benefiet veiling',1,0,NULL,NULL,NULL,NULL),(760,NULL,'Kloksoort',1,0,NULL,NULL,NULL,NULL),(761,NULL,'Minimumprijs aanvoerder',1,0,NULL,NULL,NULL,NULL),(762,NULL,'Rest aantallen',1,0,NULL,NULL,NULL,NULL),(763,NULL,'Veilsoort',1,0,NULL,NULL,NULL,NULL),(764,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(765,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(766,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(767,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(768,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(769,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(770,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(771,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(772,NULL,'Veilgroep Aalsmeer',1,0,NULL,NULL,NULL,NULL),(773,NULL,'Promotie kenmerk FloraHol',1,0,NULL,NULL,NULL,NULL),(774,NULL,'Verrekening snijbloemenvo',1,0,NULL,NULL,NULL,NULL),(775,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(776,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(777,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(778,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(779,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(780,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(781,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(782,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(783,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(784,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(785,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(786,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(787,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(788,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(789,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(790,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(791,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(792,NULL,'Tussenopslag klok Plantio',1,0,NULL,NULL,NULL,NULL),(793,NULL,'Soort ladingsdrager Plant',1,0,NULL,NULL,NULL,NULL),(794,NULL,'Logistiek middel Plantion',1,0,NULL,NULL,NULL,NULL),(795,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(796,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(797,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(798,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(799,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(800,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(801,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(802,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(803,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(804,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(805,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(806,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(807,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(808,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(809,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(810,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(811,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(812,NULL,'Veilgroep Plantion Ede',1,0,NULL,NULL,NULL,NULL),(813,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(814,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(815,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(816,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(817,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(818,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(819,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(820,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(821,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(822,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(823,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(824,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(825,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(826,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(827,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(828,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(829,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(830,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(831,NULL,'Toegevoegde waardes VRM',1,0,NULL,NULL,NULL,NULL),(832,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(833,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(834,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(835,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(836,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(837,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(838,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(839,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(840,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(841,NULL,'Veiling',1,0,NULL,NULL,NULL,NULL),(842,NULL,'kopersaantallen',1,0,NULL,NULL,NULL,NULL),(843,NULL,'Caducidad',1,0,NULL,NULL,NULL,NULL),(844,NULL,'Lote',1,0,NULL,NULL,NULL,NULL),(845,NULL,'Uds palet',1,0,NULL,NULL,NULL,NULL),(4548,NULL,'fout kenmerk',1,0,NULL,NULL,'081',NULL),(4549,NULL,'Potinhoud',1,0,NULL,NULL,'A01',NULL),(4550,NULL,'Marketingconcept',1,0,NULL,NULL,'A02',NULL),(4551,NULL,'Leeftijd',1,0,NULL,NULL,'A03',NULL),(4552,NULL,'Uitgangsmateriaal',1,0,NULL,NULL,'A04',NULL),(4553,NULL,'Kleurbehandeld',1,0,NULL,NULL,'A05',NULL),(4554,NULL,'Verzorging: Standplaats',1,0,NULL,NULL,'A06',NULL),(4555,NULL,'Verzorging: Water',1,0,NULL,NULL,'A07',NULL),(4556,NULL,'Verzorging: Voeding',1,0,NULL,NULL,'A08',NULL),(4557,NULL,'Verzorging: Temperatuur',1,0,NULL,NULL,'A09',NULL),(4558,NULL,'Verzorging: Specifieke in',1,0,NULL,NULL,'A10',NULL),(4559,NULL,'Verzorging: Consumptie',1,0,NULL,NULL,'A11',NULL),(4560,NULL,'Nabehandeling',1,0,NULL,NULL,'A13',NULL),(4561,NULL,'Artikel beeld',1,0,NULL,NULL,'A23',NULL),(4562,NULL,'Hoofdkleur 1',1,0,NULL,NULL,'B01',NULL),(4563,NULL,'Hoofdkleur 2',1,0,NULL,NULL,'B02',NULL),(4564,NULL,'RHS hoofdkleur 1',1,0,NULL,NULL,'B03',NULL),(4565,NULL,'RHS hoofdkleur 2',1,0,NULL,NULL,'B04',NULL),(4566,NULL,'Hoofdkleur 1 blad',1,0,NULL,NULL,'B05',NULL),(4567,NULL,'Hoofdkleur 2 blad',1,0,NULL,NULL,'B06',NULL),(4568,NULL,'RHS hoofdkleur 1 blad',1,0,NULL,NULL,'B07',NULL),(4569,NULL,'RHS hoofdkleur 2 blad',1,0,NULL,NULL,'B08',NULL),(4570,NULL,'Botanisch beeld',1,0,NULL,NULL,'B09',NULL),(4571,NULL,'Hoofdkleur bes/vrucht',1,0,NULL,NULL,'B10',NULL),(4572,NULL,'RHS hoofdkleur bes/vrucht',1,0,NULL,NULL,'B11',NULL),(4573,NULL,'UPOV hoofdkleur 1 bloem',1,0,NULL,NULL,'B12',NULL),(4574,NULL,'UPOV hoofdkleur 2 bloem',1,0,NULL,NULL,'B13',NULL),(4575,NULL,'UPOV hoofdkleur 1 blad',1,0,NULL,NULL,'B14',NULL),(4576,NULL,'UPOV hoofdkleur 2 blad',1,0,NULL,NULL,'B15',NULL),(4577,NULL,'UPOV hoofdkleur bes/vruch',1,0,NULL,NULL,'B16',NULL),(4578,NULL,'Negatieve keurcode 1',1,0,NULL,NULL,'K01',NULL),(4579,NULL,'Negatieve keurcode 2',1,0,NULL,NULL,'K02',NULL),(4580,NULL,'Bedrijfskenmerk fytosanit',1,0,NULL,NULL,'K03',NULL),(4581,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,'K04',NULL),(4582,NULL,'Certificaten MPS-TraceCer',1,0,NULL,NULL,'K05',NULL),(4583,NULL,'Overige leveranciersinfor',1,0,NULL,NULL,'K07',NULL),(4584,NULL,'Certificaten MPS-GAP',1,0,NULL,NULL,'K08',NULL),(4585,NULL,'Betrouwbaarheidsindex kla',1,0,NULL,NULL,'K11',NULL),(4586,NULL,'Betrouwbaarheidsindex waa',1,0,NULL,NULL,'K12',NULL),(4587,NULL,'Productkwaliteitslabel',1,0,NULL,NULL,'K13',NULL),(4588,NULL,'Label Fair Flowers Fair P',1,0,NULL,NULL,'K14',NULL),(4589,NULL,'Certificaten Socialy Qual',1,0,NULL,NULL,'K15',NULL),(4590,NULL,'Certificaten GlobalGAP',1,0,NULL,NULL,'K16',NULL),(4591,NULL,'Certificaten MPS Quality',1,0,NULL,NULL,'K17',NULL),(4592,NULL,'Certificaten biologisch',1,0,NULL,NULL,'K18',NULL),(4593,NULL,'Certificaten eetbare prod',1,0,NULL,NULL,'K19',NULL),(4594,NULL,'Certificaten Florimark',1,0,NULL,NULL,'K20',NULL),(4595,NULL,'Certificaten Milieukeur',1,0,NULL,NULL,'K21',NULL),(4596,NULL,'Certificaten Kenya Flower',1,0,NULL,NULL,'K22',NULL),(4597,NULL,'Certificaten Fairtrade',1,0,NULL,NULL,'K23',NULL),(4598,NULL,'Keurmerk MPS-ProductProof',1,0,NULL,NULL,'K24',NULL),(4599,NULL,'Certificaten ISO',1,0,NULL,NULL,'K25',NULL),(4600,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,'K26',NULL),(4601,NULL,'Certificaten Florverde',1,0,NULL,NULL,'K27',NULL),(4602,NULL,'Certificaten Ethical Trad',1,0,NULL,NULL,'K28',NULL),(4603,NULL,'Certificaten Ethiopian EH',1,0,NULL,NULL,'K29',NULL),(4604,NULL,'Certificaten gewasbescher',1,0,NULL,NULL,'K30',NULL),(4605,NULL,'Certificaten SAN',1,0,NULL,NULL,'K31',NULL),(4606,NULL,'Certificaten GRASP',1,0,NULL,NULL,'K32',NULL),(4607,NULL,'Label Fair Flora',1,0,NULL,NULL,'K33',NULL),(4608,NULL,'GLobalG.A.P. Chain of Cus',1,0,NULL,NULL,'K34',NULL),(4609,NULL,'Certificaten Vegaplan',1,0,NULL,NULL,'K35',NULL),(4610,NULL,'Floriculture Sustainabili',1,0,NULL,NULL,'K99',NULL),(4611,NULL,'Fust',1,0,NULL,NULL,'L01',NULL),(4612,NULL,'Stapelwagen',1,0,NULL,NULL,'L02',NULL),(4613,NULL,'Aantal legborden veilings',1,0,NULL,NULL,'L03',NULL),(4614,NULL,'Aantal legborden Deense s',1,0,NULL,NULL,'L04',NULL),(4615,NULL,'Aantal onderstellen Deens',1,0,NULL,NULL,'L05',NULL),(4616,NULL,'Fustsoort',1,0,NULL,NULL,'L06',NULL),(4617,NULL,'Fustmateriaal',1,0,NULL,NULL,'L07',NULL),(4618,NULL,'Aantal legborden Eurostap',1,0,NULL,NULL,'L08',NULL),(4619,NULL,'Aantal onderstellen Euros',1,0,NULL,NULL,'L09',NULL),(4620,NULL,'Aantal stelen per bos',1,0,NULL,NULL,'L11',NULL),(4621,NULL,'Aantal bossen per bundel',1,0,NULL,NULL,'L12',NULL),(4622,NULL,'Aantal stuks per fust',1,0,NULL,NULL,'L13',NULL),(4623,NULL,'Aantal bossen per fust',1,0,NULL,NULL,'L14',NULL),(4624,NULL,'Aantal bundels per fust',1,0,NULL,NULL,'L15',NULL),(4625,NULL,'Aantal bossen per hoes',1,0,NULL,NULL,'L16',NULL),(4626,NULL,'Aantal bundels per hoes',1,0,NULL,NULL,'L17',NULL),(4627,NULL,'Fustlabel',1,0,NULL,NULL,'L18',NULL),(4628,NULL,'Karlabel',1,0,NULL,NULL,'L19',NULL),(4629,NULL,'Service productlabel',1,0,NULL,NULL,'L20',NULL),(4630,NULL,'Service fustlabel',1,0,NULL,NULL,'L21',NULL),(4631,NULL,'Service karlabel',1,0,NULL,NULL,'L22',NULL),(4632,NULL,'Aantal fusten per laag',1,0,NULL,NULL,'L23',NULL),(4633,NULL,'Presentatie per schapm2',1,0,NULL,NULL,'L24',NULL),(4634,NULL,'Positieve keurcode fytosa',1,0,NULL,NULL,'P01',NULL),(4635,NULL,'Positieve keurcode kwalit',1,0,NULL,NULL,'P02',NULL),(4636,NULL,'Positieve keurcode veilin',1,0,NULL,NULL,'P03',NULL),(4637,NULL,'Maceta',1,0,NULL,NULL,'S01',NULL),(4638,NULL,'Altura mínima',1,1,NULL,'cm','S02','size'),(4639,NULL,'nº plantas',1,0,NULL,NULL,'S03',NULL),(4640,NULL,'Minimum plantdiameter',1,0,NULL,NULL,'S04',NULL),(4641,NULL,'Madurez',1,0,NULL,NULL,'S05',NULL),(4642,NULL,'Combinatiehoogte',1,0,NULL,NULL,'S06',NULL),(4643,NULL,'Min aantal koppen hoogste',1,0,NULL,NULL,'S07',NULL),(4644,NULL,'Dikte',1,0,NULL,NULL,'S08',NULL),(4645,NULL,'Min aantal bloemen/bloeiw',1,0,NULL,NULL,'S09',NULL),(4646,NULL,'Min aantal bloemtrossen p',1,0,NULL,NULL,'S10',NULL),(4647,NULL,'Minimum aantal takken per',1,0,NULL,NULL,'S11',NULL),(4648,NULL,'Minimum aantal bollen per',1,0,NULL,NULL,'S12',NULL),(4649,NULL,'Minimum aantal bladeren p',1,0,NULL,NULL,'S13',NULL),(4650,NULL,'Altura tronco',1,1,NULL,'cm','S14','size'),(4651,NULL,'Altura transporte',1,0,NULL,'cm','S15','size'),(4652,NULL,'Lengte scheuten',1,0,NULL,NULL,'S16',NULL),(4653,NULL,'Min aant vertakkingen pr ',1,0,NULL,NULL,'S17',NULL),(4654,NULL,'Minimum bloemknophoogte',1,0,NULL,NULL,'S19',NULL),(4655,NULL,'Altura',1,1,NULL,'cm','S20','size'),(4656,NULL,'Gewicht (gemiddeld)',1,0,NULL,NULL,'S21',NULL),(4657,NULL,'Aantal bloemknoppen snijb',1,0,NULL,NULL,'S22',NULL),(4658,NULL,'Minimum bloemdiameter',1,0,NULL,NULL,'S23',NULL),(4659,NULL,'Minimum bloemschedelengte',1,0,NULL,NULL,'S24',NULL),(4660,NULL,'Aantal bloemkoppen per tr',1,0,NULL,NULL,'S25',NULL),(4661,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S26',NULL),(4662,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S27',NULL),(4663,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S28',NULL),(4664,NULL,'Minimum bloeiwijzelengte',1,0,NULL,NULL,'S29',NULL),(4665,NULL,'Verpakkingswijze snijbloe',1,0,NULL,NULL,'S30',NULL),(4666,NULL,'Minimum aant bloemen per ',1,0,NULL,NULL,'S31',NULL),(4667,NULL,'Medida',1,0,NULL,'cm','S32','size'),(4668,NULL,'Jaartal sortering hout',1,0,NULL,NULL,'S33',NULL),(4669,NULL,'Minimum bladdiameter',1,0,NULL,NULL,'S34',NULL),(4670,NULL,'Minimum bundelgewicht',1,0,NULL,NULL,'S35',NULL),(4671,NULL,'Altura máxima',1,0,NULL,NULL,'S36',NULL),(4672,NULL,'Maximum plantdiameter',1,0,NULL,NULL,'S37',NULL),(4673,NULL,'Max aantal bloemen/bloeiw',1,0,NULL,NULL,'S38',NULL),(4674,NULL,'Maximum aantal takken per',1,0,NULL,NULL,'S39',NULL),(4675,NULL,'Maximum aantal bollen per',1,0,NULL,NULL,'S40',NULL),(4676,NULL,'Altura máxima',1,0,NULL,NULL,'S41',NULL),(4677,NULL,'Maximum steellengte',1,0,NULL,NULL,'S42',NULL),(4678,NULL,'Maximum aantal knoppen sn',1,0,NULL,NULL,'S43',NULL),(4679,NULL,'Maximum bloemdiameter',1,0,NULL,NULL,'S44',NULL),(4680,NULL,'Maximum bloeiwijzelengte',1,0,NULL,NULL,'S45',NULL),(4681,NULL,'Aantal vruchten / trossen',1,0,NULL,NULL,'S46',NULL),(4682,NULL,'Verpakkingswijze',1,0,NULL,NULL,'S47',NULL),(4683,NULL,'Minimum vruchtdiameter',1,0,NULL,NULL,'S48',NULL),(4684,NULL,'Medida',1,1,NULL,'cm','S49','size'),(4685,NULL,'Bloem/bes/vruchtkleur 1',1,0,NULL,NULL,'S50',NULL),(4686,NULL,'Potvorm',1,0,NULL,NULL,'S51',NULL),(4687,NULL,'Potkleur',1,0,NULL,NULL,'S52',NULL),(4688,NULL,'Potmateriaal',1,0,NULL,NULL,'S53',NULL),(4689,NULL,'Plantvorm',1,0,NULL,NULL,'S54',NULL),(4690,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,'S55',NULL),(4691,NULL,'Teeltwijze',1,0,NULL,NULL,'S56',NULL),(4692,NULL,'Teeltmedium',1,0,NULL,NULL,'S57',NULL),(4693,NULL,'Hoesmateriaal',1,0,NULL,NULL,'S58',NULL),(4694,NULL,'Hoesvorm',1,0,NULL,NULL,'S59',NULL),(4695,NULL,'Hoesbedrukking algemeen',1,0,NULL,NULL,'S60',NULL),(4696,NULL,'Extra toevoegingen',1,0,NULL,NULL,'S61',NULL),(4697,NULL,'Land van herkomst (bedrij',1,0,NULL,NULL,'S62',NULL),(4698,NULL,'Verpakte orchidee',1,0,NULL,NULL,'S63',NULL),(4699,NULL,'Hoesbedrukking extra',1,0,NULL,NULL,'S64',NULL),(4700,NULL,'Voorbehandeling',1,0,NULL,NULL,'S65',NULL),(4701,NULL,'Overige niet in pot',1,0,NULL,NULL,'S66',NULL),(4702,NULL,'Vorm snijbloemen',1,0,NULL,NULL,'S67',NULL),(4703,NULL,'Buigzaamheid bloemsteel',1,0,NULL,NULL,'S68',NULL),(4704,NULL,'Hoeskleur',1,0,NULL,NULL,'S69',NULL),(4705,NULL,'Extra deco materiaal',1,0,NULL,NULL,'S70',NULL),(4706,NULL,'Productkleur',1,0,NULL,NULL,'S71',NULL),(4707,NULL,'Productmateriaal',1,0,NULL,NULL,'S72',NULL),(4708,NULL,'Altura',1,1,NULL,'cm','S73','size'),(4709,NULL,'Materiaaldiameter',1,0,NULL,NULL,'S74',NULL),(4710,NULL,'Barcode',1,0,NULL,NULL,'S75',NULL),(4711,NULL,'Productlabel',1,0,NULL,NULL,'S76',NULL),(4712,NULL,'Eetbaar/ niet eetbaar',1,0,NULL,NULL,'S77',NULL),(4713,NULL,'Plantmaat zonder pot',1,0,NULL,NULL,'S78',NULL),(4714,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,'S79',NULL),(4715,NULL,'Maximum percentage oud ho',1,0,NULL,NULL,'S80',NULL),(4716,NULL,'Maximum lengte verschil',1,0,NULL,NULL,'S81',NULL),(4717,NULL,'Bladkleur',1,0,NULL,NULL,'S82',NULL),(4718,NULL,'Plantgewicht',1,0,NULL,NULL,'S83',NULL),(4719,NULL,'Gemiddelde bloemdiameter',1,0,NULL,NULL,'S84',NULL),(4720,NULL,'Bloem/bes/vruchtkleur 2',1,0,NULL,NULL,'S85',NULL),(4721,NULL,'Winterhardheid (USDA zone',1,0,NULL,NULL,'S86',NULL),(4722,NULL,'Kleurbehandeld',1,0,NULL,NULL,'S87',NULL),(4723,NULL,'Bloem-/bladkleurverdeling',1,0,NULL,NULL,'S88',NULL),(4724,NULL,'Minimum bloemknopdiameter',1,0,NULL,NULL,'S89',NULL),(4725,NULL,'Volume inhoud',1,0,NULL,NULL,'S90',NULL),(4726,NULL,'Vruchtbenaming',1,0,NULL,NULL,'S91',NULL),(4727,NULL,'Vaaslevenindex',1,0,NULL,NULL,'S92',NULL),(4728,NULL,'Overige informatie plante',1,0,NULL,NULL,'S93',NULL),(4729,NULL,'Overige informatie snijbl',1,0,NULL,NULL,'S94',NULL),(4730,NULL,'Toepassingsmogelijkheid',1,0,NULL,NULL,'S95',NULL),(4731,NULL,'Productbeeld aanvoerder',1,0,NULL,NULL,'S96',NULL),(4732,NULL,'MPS certificering',1,0,NULL,NULL,'S97',NULL),(4733,NULL,'Kwaliteitsgroep',1,0,NULL,NULL,'S98',NULL),(4734,NULL,'Artikelomschrijving',1,0,NULL,NULL,'S99',NULL),(4735,NULL,'BTW-tarief',1,0,NULL,NULL,'T01',NULL),(4736,NULL,'Prijseenheid',1,0,NULL,NULL,'T02',NULL),(4737,NULL,'Transactievorm',1,0,NULL,NULL,'T03',NULL),(4738,NULL,'Handelsverpakking voorwaa',1,0,NULL,NULL,'T10',NULL),(4739,NULL,'Consumentenverpakking voo',1,0,NULL,NULL,'T11',NULL),(4740,NULL,'Leveringsvoorwaarden',1,0,NULL,NULL,'T12',NULL),(4741,NULL,'PT heffing voorwaarden',1,0,NULL,NULL,'T13',NULL),(4742,NULL,'Serviceheffing voorwaarde',1,0,NULL,NULL,'T14',NULL),(4743,NULL,'Algemene voorwaarden',1,0,NULL,NULL,'T15',NULL),(4744,NULL,'Marktvorm',1,0,NULL,NULL,'T16',NULL),(4745,NULL,'Themadagen',1,0,NULL,NULL,'T17',NULL),(4746,NULL,'Handelscategorie',1,0,NULL,NULL,'T18',NULL),(4747,NULL,'Producentengroepen',1,0,NULL,NULL,'T19',NULL),(4748,NULL,'Favorieten Id',1,0,NULL,NULL,'T20',NULL),(4749,NULL,'Verkoopeenheid',1,0,NULL,NULL,'T21',NULL),(4750,NULL,'Veilgroep voorkeur',1,0,NULL,NULL,'V01',NULL),(4751,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V02',NULL),(4752,NULL,'Keurmeesternummer FloraHo',1,0,NULL,NULL,'V03',NULL),(4753,NULL,'Rijnummer Rijnsburg',1,0,NULL,NULL,'V04',NULL),(4754,NULL,'Verwerkingslocatie FloraH',1,0,NULL,NULL,'V05',NULL),(4755,NULL,'FloraHolland Financial',1,0,NULL,NULL,'V06',NULL),(4756,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V07',NULL),(4757,NULL,'Benefiet veiling',1,0,NULL,NULL,'V08',NULL),(4758,NULL,'Kloksoort',1,0,NULL,NULL,'V09',NULL),(4759,NULL,'Minimumprijs aanvoerder',1,0,NULL,NULL,'V10',NULL),(4760,NULL,'Rest aantallen',1,0,NULL,NULL,'V11',NULL),(4761,NULL,'Veilsoort',1,0,NULL,NULL,'V12',NULL),(4762,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V13',NULL),(4763,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V14',NULL),(4764,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V15',NULL),(4765,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V16',NULL),(4766,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V17',NULL),(4767,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V18',NULL),(4768,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V19',NULL),(4769,NULL,'Gereserveerd',1,0,NULL,NULL,'V20',NULL),(4770,NULL,'Veilgroep Aalsmeer',1,0,NULL,NULL,'V21',NULL),(4771,NULL,'Promotie kenmerk FloraHol',1,0,NULL,NULL,'V22',NULL),(4772,NULL,'Verrekening snijbloemenvo',1,0,NULL,NULL,'V23',NULL),(4773,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V24',NULL),(4774,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V25',NULL),(4775,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V26',NULL),(4776,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V27',NULL),(4777,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V28',NULL),(4778,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V29',NULL),(4779,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V30',NULL),(4780,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V31',NULL),(4781,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V32',NULL),(4782,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V33',NULL),(4783,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V34',NULL),(4784,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V35',NULL),(4785,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V36',NULL),(4786,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V37',NULL),(4787,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V38',NULL),(4788,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V39',NULL),(4789,NULL,'Gereserveerd',1,0,NULL,NULL,'V40',NULL),(4790,NULL,'Tussenopslag klok Plantio',1,0,NULL,NULL,'V41',NULL),(4791,NULL,'Soort ladingsdrager Plant',1,0,NULL,NULL,'V42',NULL),(4792,NULL,'Logistiek middel Plantion',1,0,NULL,NULL,'V43',NULL),(4793,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V44',NULL),(4794,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V45',NULL),(4795,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V46',NULL),(4796,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V47',NULL),(4797,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V48',NULL),(4798,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V49',NULL),(4799,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V50',NULL),(4800,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V51',NULL),(4801,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V52',NULL),(4802,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V53',NULL),(4803,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V54',NULL),(4804,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V55',NULL),(4805,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V56',NULL),(4806,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V57',NULL),(4807,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V58',NULL),(4808,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V59',NULL),(4809,NULL,'Gereserveerd',1,0,NULL,NULL,'V60',NULL),(4810,NULL,'Veilgroep Plantion Ede',1,0,NULL,NULL,'V61',NULL),(4811,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V62',NULL),(4812,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V63',NULL),(4813,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V64',NULL),(4814,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V65',NULL),(4815,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V66',NULL),(4816,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V67',NULL),(4817,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V68',NULL),(4818,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V69',NULL),(4819,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V70',NULL),(4820,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V71',NULL),(4821,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V72',NULL),(4822,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V73',NULL),(4823,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V74',NULL),(4824,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V75',NULL),(4825,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V76',NULL),(4826,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V77',NULL),(4827,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V78',NULL),(4828,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V79',NULL),(4829,NULL,'Toegevoegde waardes VRM',1,0,NULL,NULL,'V80',NULL),(4830,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V81',NULL),(4831,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V82',NULL),(4832,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V83',NULL),(4833,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V84',NULL),(4834,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V85',NULL),(4835,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V86',NULL),(4836,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V87',NULL),(4837,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V88',NULL),(4838,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V89',NULL),(4839,NULL,'Veiling',1,0,NULL,NULL,'V99',NULL),(4840,NULL,'kopersaantallen',1,0,NULL,NULL,'Z01',NULL); +INSERT INTO `tag` VALUES (1,'color','Color',0,0,'ink',NULL,NULL,'inkFk'),(2,NULL,'Forma',1,0,NULL,NULL,NULL,NULL),(3,NULL,'Material',1,0,NULL,NULL,NULL,NULL),(4,NULL,'Longitud',1,1,NULL,'mm',NULL,'size'),(5,NULL,'Diámetro',1,1,NULL,'mm',NULL,'diameter'),(6,NULL,'Perímetro',1,1,NULL,'mm',NULL,NULL),(7,NULL,'Ancho de la base',1,1,NULL,'mm',NULL,NULL),(8,NULL,'Altura',1,1,NULL,'mm',NULL,'size'),(9,NULL,'Volumen',1,1,NULL,'ml',NULL,NULL),(10,NULL,'Densidad',1,1,NULL,NULL,NULL,NULL),(11,NULL,'Calidad',1,0,NULL,NULL,NULL,NULL),(12,NULL,'Textura',1,0,NULL,NULL,NULL,NULL),(13,NULL,'Material del mango',1,0,NULL,NULL,NULL,NULL),(14,NULL,'Compra mínima',1,0,NULL,NULL,NULL,NULL),(15,NULL,'Nº pétalos',1,1,NULL,NULL,NULL,NULL),(16,NULL,'Ancho',1,1,NULL,'mm',NULL,NULL),(18,NULL,'Profundidad',1,1,NULL,'mm',NULL,NULL),(19,NULL,'Largo',1,1,NULL,'mm',NULL,'size'),(20,NULL,'Ancho superior',1,1,NULL,'mm',NULL,NULL),(21,NULL,'Ancho inferior',1,1,NULL,'mm',NULL,NULL),(22,NULL,'Gramaje',1,1,NULL,'g',NULL,NULL),(23,'stems','Tallos',1,1,NULL,NULL,NULL,'stems'),(24,NULL,'Estado',1,0,NULL,NULL,NULL,NULL),(25,NULL,'Color principal',0,0,'ink',NULL,NULL,NULL),(26,NULL,'Color secundario',0,0,'ink',NULL,NULL,NULL),(27,NULL,'Longitud(cm)',1,1,NULL,'cm',NULL,NULL),(28,NULL,'Diámetro base',1,1,NULL,'mm',NULL,'diameter'),(29,NULL,'Colección',1,0,NULL,NULL,NULL,NULL),(30,NULL,'Uds / caja',1,1,NULL,NULL,NULL,NULL),(31,NULL,'Contenido',1,0,NULL,NULL,NULL,NULL),(32,NULL,'Peso',1,1,NULL,'g',NULL,NULL),(33,NULL,'Grosor',1,1,NULL,'mm',NULL,NULL),(34,NULL,'Marca',1,0,NULL,NULL,NULL,NULL),(35,'origin','Origen',0,0,'origin',NULL,NULL,'originFk'),(36,NULL,'Proveedor',1,0,NULL,NULL,NULL,NULL),(37,'producer','Productor',0,0,'producer',NULL,NULL,'producerFk'),(38,NULL,'Duración',1,1,NULL,'s',NULL,NULL),(39,NULL,'Flor',1,0,NULL,NULL,NULL,NULL),(40,NULL,'Soporte',1,0,NULL,NULL,NULL,NULL),(41,NULL,'Tamaño flor',1,0,NULL,NULL,NULL,NULL),(42,NULL,'Apertura',1,0,NULL,NULL,NULL,NULL),(43,NULL,'Tallo',1,0,NULL,NULL,NULL,NULL),(44,NULL,'Nº hojas',1,1,NULL,NULL,NULL,NULL),(45,NULL,'Dimensiones',1,0,NULL,NULL,NULL,NULL),(46,NULL,'Diámetro boca',1,1,NULL,'mm',NULL,NULL),(47,NULL,'Nº flores',1,1,NULL,NULL,NULL,NULL),(48,NULL,'Uds / paquete',1,1,NULL,NULL,NULL,NULL),(49,NULL,'Maceta',1,1,NULL,'cm',NULL,'diameter'),(50,NULL,'Textura flor',1,0,NULL,NULL,NULL,NULL),(51,NULL,'Textura hoja',1,0,NULL,NULL,NULL,NULL),(52,NULL,'Tipo de IVA',1,0,NULL,NULL,NULL,NULL),(53,NULL,'Tronco',1,0,NULL,NULL,NULL,NULL),(54,NULL,'Hoja',1,0,NULL,NULL,NULL,NULL),(55,NULL,'Formato',1,0,NULL,NULL,NULL,NULL),(56,NULL,'Genero',1,0,NULL,NULL,NULL,NULL),(57,NULL,'Especie',1,0,NULL,NULL,NULL,NULL),(58,NULL,'Variedad',1,0,NULL,NULL,NULL,NULL),(59,NULL,'Medida grande',1,0,NULL,NULL,NULL,NULL),(60,NULL,'Medida mediano',1,0,NULL,NULL,NULL,NULL),(61,NULL,'Medida pequeño',1,0,NULL,NULL,NULL,NULL),(63,NULL,'Recipiente interior',1,0,NULL,NULL,NULL,NULL),(64,NULL,'Material secundario',1,0,NULL,NULL,NULL,NULL),(65,NULL,'Colores',1,0,NULL,NULL,NULL,NULL),(66,NULL,'Referencia',1,0,NULL,NULL,NULL,NULL),(67,'category','Categoria',1,0,NULL,NULL,NULL,NULL),(68,NULL,'Amb',1,0,NULL,NULL,NULL,NULL),(69,NULL,'Anchura',1,1,NULL,'cm',NULL,NULL),(70,NULL,'Hueco interior',1,0,NULL,NULL,NULL,NULL),(71,NULL,'Tamaño',1,0,NULL,NULL,NULL,NULL),(72,NULL,'Color botón',1,0,NULL,NULL,NULL,NULL),(73,NULL,'Tamaño minimo del botón',1,0,NULL,NULL,NULL,NULL),(74,NULL,'Obtentor',1,0,NULL,NULL,NULL,NULL),(75,NULL,'Longitud del brote',1,0,NULL,NULL,NULL,NULL),(76,NULL,'Tallos / u.v.',1,0,NULL,NULL,NULL,NULL),(77,NULL,'Madera de',1,0,NULL,NULL,NULL,NULL),(78,NULL,'Unidad de venta',1,0,NULL,NULL,NULL,NULL),(79,NULL,'Temporal',1,0,NULL,NULL,NULL,NULL),(80,NULL,'Gramaje/tallo',1,1,NULL,'g',NULL,NULL),(81,NULL,'Peso/paquete',1,1,NULL,'g',NULL,NULL),(82,NULL,'Flexibilidad del tallo',1,0,NULL,NULL,NULL,NULL),(83,NULL,'Nº planchas',1,1,NULL,NULL,NULL,NULL),(84,NULL,'Nº páginas',1,1,NULL,NULL,NULL,NULL),(85,NULL,'Editorial',1,0,NULL,NULL,NULL,NULL),(86,NULL,'Idioma',1,0,NULL,NULL,NULL,NULL),(87,NULL,'Fecha publicación',1,0,NULL,NULL,NULL,NULL),(88,NULL,'Cubierta',1,0,NULL,NULL,NULL,NULL),(89,NULL,'Encuadernación',1,0,NULL,NULL,NULL,NULL),(90,NULL,'Autor',1,0,NULL,NULL,NULL,NULL),(91,NULL,'Envoltorio',1,0,NULL,NULL,NULL,NULL),(92,NULL,'Nombre temporal',1,0,NULL,NULL,NULL,NULL),(93,NULL,'Modelo',1,0,NULL,NULL,NULL,NULL),(94,NULL,'Producto',1,0,NULL,NULL,NULL,NULL),(95,NULL,'Título',1,0,NULL,NULL,NULL,NULL),(96,NULL,'Tomo',1,0,NULL,NULL,NULL,NULL),(97,NULL,'Articulo',1,0,NULL,NULL,NULL,NULL),(98,NULL,'Metodo de cultivo',1,0,NULL,NULL,NULL,NULL),(99,NULL,'Edad',1,0,NULL,NULL,NULL,NULL),(100,NULL,'Agotado',1,0,NULL,NULL,NULL,NULL),(101,NULL,'Altura con asa',1,1,NULL,'cm',NULL,'size'),(102,NULL,'Nº tallos',1,1,NULL,NULL,NULL,NULL),(103,NULL,'Cultivo',1,0,NULL,NULL,NULL,NULL),(104,NULL,'Sabor',1,0,NULL,NULL,NULL,NULL),(105,NULL,'Talla',1,0,NULL,NULL,NULL,NULL),(106,NULL,'Calibre',1,1,NULL,NULL,NULL,NULL),(107,NULL,'Dulzura',1,1,NULL,'bx',NULL,NULL),(108,NULL,'Piezas',1,0,NULL,NULL,NULL,NULL),(109,NULL,'Altura con patas',1,0,NULL,'cm',NULL,'size'),(110,NULL,'Envase',1,0,NULL,NULL,NULL,NULL),(111,NULL,'Nº piezas',1,0,NULL,NULL,NULL,NULL),(112,NULL,'Uso',1,0,NULL,'cm',NULL,NULL),(113,NULL,'Color luz',1,0,NULL,NULL,NULL,NULL),(114,NULL,'Capacidad',1,0,NULL,NULL,NULL,NULL),(184,NULL,'Tallos por paquete',1,0,NULL,NULL,NULL,NULL),(205,NULL,'Apertura',1,0,NULL,NULL,NULL,NULL),(219,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(552,NULL,'fout kenmerk',1,0,NULL,NULL,NULL,NULL),(553,NULL,'Potinhoud',1,0,NULL,NULL,NULL,NULL),(554,NULL,'Marketingconcept',1,0,NULL,NULL,NULL,NULL),(555,NULL,'Leeftijd',1,0,NULL,NULL,NULL,NULL),(556,NULL,'Base',1,0,NULL,NULL,NULL,NULL),(557,NULL,'Kleurbehandeld',1,0,NULL,NULL,NULL,'inkFk'),(558,NULL,'Verzorging: Standplaats',1,0,NULL,NULL,NULL,NULL),(559,NULL,'Verzorging: Water',1,0,NULL,NULL,NULL,NULL),(560,NULL,'Verzorging: Voeding',1,0,NULL,NULL,NULL,NULL),(561,NULL,'Verzorging: Temperatuur',1,0,NULL,NULL,NULL,NULL),(562,NULL,'Verzorging: Specifieke in',1,0,NULL,NULL,NULL,NULL),(563,NULL,'Verzorging: Consumptie',1,0,NULL,NULL,NULL,NULL),(564,NULL,'Nabehandeling',1,0,NULL,NULL,NULL,NULL),(565,NULL,'Artikel beeld',1,0,NULL,NULL,NULL,NULL),(566,NULL,'Hoofdkleur 1',1,0,NULL,NULL,NULL,NULL),(567,NULL,'Hoofdkleur 2',1,0,NULL,NULL,NULL,NULL),(568,NULL,'RHS hoofdkleur 1',1,0,NULL,NULL,NULL,NULL),(569,NULL,'RHS hoofdkleur 2',1,0,NULL,NULL,NULL,NULL),(570,NULL,'Hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(571,NULL,'Hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(572,NULL,'RHS hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(573,NULL,'RHS hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(574,NULL,'Botanisch beeld',1,0,NULL,NULL,NULL,NULL),(575,NULL,'Hoofdkleur bes/vrucht',1,0,NULL,NULL,NULL,NULL),(576,NULL,'RHS hoofdkleur bes/vrucht',1,0,NULL,NULL,NULL,NULL),(577,NULL,'UPOV hoofdkleur 1 bloem',1,0,NULL,NULL,NULL,NULL),(578,NULL,'UPOV hoofdkleur 2 bloem',1,0,NULL,NULL,NULL,NULL),(579,NULL,'UPOV hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(580,NULL,'UPOV hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(581,NULL,'UPOV hoofdkleur bes/vruch',1,0,NULL,NULL,NULL,NULL),(582,NULL,'Negatieve keurcode 1',1,0,NULL,NULL,NULL,NULL),(583,NULL,'Negatieve keurcode 2',1,0,NULL,NULL,NULL,NULL),(584,NULL,'Bedrijfskenmerk fytosanit',1,0,NULL,NULL,NULL,NULL),(585,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,NULL,NULL),(586,NULL,'Certificaten MPS-TraceCer',1,0,NULL,NULL,NULL,NULL),(587,NULL,'Overige leveranciersinfor',1,0,NULL,NULL,NULL,NULL),(588,NULL,'Certificaten MPS-GAP',1,0,NULL,NULL,NULL,NULL),(589,NULL,'Betrouwbaarheidsindex kla',1,0,NULL,NULL,NULL,NULL),(590,NULL,'Betrouwbaarheidsindex waa',1,0,NULL,NULL,NULL,NULL),(591,NULL,'Productkwaliteitslabel',1,0,NULL,NULL,NULL,NULL),(592,NULL,'Label Fair Flowers Fair P',1,0,NULL,NULL,NULL,NULL),(593,NULL,'Certificaten Socialy Qual',1,0,NULL,NULL,NULL,NULL),(594,NULL,'Certificaten GlobalGAP',1,0,NULL,NULL,NULL,NULL),(595,NULL,'Certificaten MPS Quality',1,0,NULL,NULL,NULL,NULL),(596,NULL,'Certificaten biologisch',1,0,NULL,NULL,NULL,NULL),(597,NULL,'Certificaten eetbare prod',1,0,NULL,NULL,NULL,NULL),(598,NULL,'Certificaten Florimark',1,0,NULL,NULL,NULL,NULL),(599,NULL,'Certificaten Milieukeur',1,0,NULL,NULL,NULL,NULL),(600,NULL,'Certificaten Kenya Flower',1,0,NULL,NULL,NULL,NULL),(601,NULL,'Certificaten Fairtrade',1,0,NULL,NULL,NULL,NULL),(602,NULL,'Keurmerk MPS-ProductProof',1,0,NULL,NULL,NULL,NULL),(603,NULL,'Certificaten ISO',1,0,NULL,NULL,NULL,NULL),(604,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,NULL,NULL),(605,NULL,'Certificaten Florverde',1,0,NULL,NULL,NULL,NULL),(606,NULL,'Certificaten Ethical Trad',1,0,NULL,NULL,NULL,NULL),(607,NULL,'Certificaten Ethiopian EH',1,0,NULL,NULL,NULL,NULL),(608,NULL,'Certificaten gewasbescher',1,0,NULL,NULL,NULL,NULL),(609,NULL,'Certificaten SAN',1,0,NULL,NULL,NULL,NULL),(610,NULL,'Certificaten GRASP',1,0,NULL,NULL,NULL,NULL),(611,NULL,'Label Fair Flora',1,0,NULL,NULL,NULL,NULL),(612,NULL,'GLobalG.A.P. Chain of Cus',1,0,NULL,NULL,NULL,NULL),(613,NULL,'Fust',1,0,NULL,NULL,NULL,NULL),(614,NULL,'Stapelwagen',1,0,NULL,NULL,NULL,NULL),(615,NULL,'Aantal legborden veilings',1,0,NULL,NULL,NULL,NULL),(616,NULL,'Aantal legborden Deense s',1,0,NULL,NULL,NULL,NULL),(617,NULL,'Aantal onderstellen Deens',1,0,NULL,NULL,NULL,NULL),(618,NULL,'Fustsoort',1,0,NULL,NULL,NULL,NULL),(619,NULL,'Envase',1,0,NULL,NULL,NULL,NULL),(620,NULL,'Aantal legborden Eurostap',1,0,NULL,NULL,NULL,NULL),(621,NULL,'Aantal onderstellen Euros',1,0,NULL,NULL,NULL,NULL),(622,NULL,'Tallos/bolsa',1,0,NULL,NULL,NULL,''),(623,NULL,'Aantal bossen per bundel',1,0,NULL,NULL,NULL,NULL),(624,NULL,'Aantal stuks per fust',1,0,NULL,NULL,NULL,NULL),(625,NULL,'Aantal bossen per fust',1,0,NULL,NULL,NULL,NULL),(626,NULL,'Aantal bundels per fust',1,0,NULL,NULL,NULL,NULL),(627,NULL,'Aantal bossen per hoes',1,0,NULL,NULL,NULL,NULL),(628,NULL,'Aantal bundels per hoes',1,0,NULL,NULL,NULL,NULL),(629,NULL,'Fustlabel',1,0,NULL,NULL,NULL,NULL),(630,NULL,'Karlabel',1,0,NULL,NULL,NULL,NULL),(631,NULL,'Service productlabel',1,0,NULL,NULL,NULL,NULL),(632,NULL,'Service fustlabel',1,0,NULL,NULL,NULL,NULL),(633,NULL,'Service karlabel',1,0,NULL,NULL,NULL,NULL),(634,NULL,'Aantal fusten per laag',1,0,NULL,NULL,NULL,NULL),(635,NULL,'Presentatie per schapm2',1,0,NULL,NULL,NULL,NULL),(636,NULL,'Positieve keurcode fytosa',1,0,NULL,NULL,NULL,NULL),(637,NULL,'Positieve keurcode kwalit',1,0,NULL,NULL,NULL,NULL),(638,NULL,'Positieve keurcode veilin',1,0,NULL,NULL,NULL,NULL),(639,NULL,'Maceta',1,1,NULL,'cm',NULL,'diameter'),(640,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(641,NULL,'nº plantas',1,0,NULL,NULL,NULL,NULL),(642,NULL,'Diámetro',1,0,NULL,NULL,NULL,NULL),(644,NULL,'Altura',1,1,NULL,'cm',NULL,'size'),(645,NULL,'Plantas/Maceta',1,0,NULL,NULL,NULL,NULL),(646,NULL,'Dikte',1,0,NULL,NULL,NULL,NULL),(647,NULL,'nº flores',1,0,NULL,NULL,NULL,NULL),(648,NULL,'Min aantal bloemtrossen p',1,0,NULL,NULL,NULL,NULL),(649,NULL,'nº ramales',1,0,NULL,NULL,NULL,NULL),(650,NULL,'Minimum aantal bollen per',1,0,NULL,NULL,NULL,NULL),(651,NULL,'Minimum aantal bladeren p',1,0,NULL,NULL,NULL,NULL),(652,NULL,'Altura tronco',1,1,NULL,'cm',NULL,'size'),(653,NULL,'Altura caja',1,0,NULL,'cm',NULL,'size'),(654,NULL,'Lengte scheuten',1,0,NULL,NULL,NULL,NULL),(655,NULL,'Min aant vertakkingen pr ',1,0,NULL,NULL,NULL,NULL),(656,NULL,'Altura del capullo',1,0,NULL,NULL,NULL,NULL),(658,NULL,'Peso tallo',1,0,NULL,NULL,NULL,NULL),(659,NULL,'nº flores',1,0,NULL,NULL,NULL,NULL),(660,NULL,'Diámetro de la flor',1,0,NULL,NULL,NULL,NULL),(661,NULL,'Minimum bloemschedelengte',1,0,NULL,NULL,NULL,NULL),(662,NULL,'Aantal bloemkoppen per tr',1,0,NULL,NULL,NULL,NULL),(663,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(664,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(665,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(666,NULL,'Longitud inflorescencia',1,0,NULL,NULL,NULL,NULL),(667,NULL,'Verpakkingswijze snijbloe',1,0,NULL,NULL,NULL,NULL),(668,NULL,'Minimum aant bloemen per ',1,0,NULL,NULL,NULL,NULL),(669,NULL,'Longitud',1,0,NULL,NULL,NULL,'size'),(670,NULL,'Jaartal sortering hout',1,0,NULL,NULL,NULL,NULL),(671,NULL,'Diámetro de la hoja',1,0,NULL,NULL,NULL,NULL),(672,NULL,'Peso paquete',1,0,NULL,NULL,NULL,NULL),(673,NULL,'Maximum planthoogte',1,0,NULL,NULL,NULL,NULL),(674,NULL,'Maximum plantdiameter',1,0,NULL,NULL,NULL,NULL),(675,NULL,'Max aantal bloemen/bloeiw',1,0,NULL,NULL,NULL,NULL),(676,NULL,'Maximum aantal takken per',1,0,NULL,NULL,NULL,NULL),(677,NULL,'Maximum aantal bollen per',1,0,NULL,NULL,NULL,NULL),(678,NULL,'Maximum stamhoogte',1,0,NULL,NULL,NULL,NULL),(679,NULL,'Longitud mínima',1,0,NULL,NULL,NULL,'size'),(680,NULL,'Maximum aantal knoppen sn',1,0,NULL,NULL,NULL,NULL),(681,NULL,'Maximum bloemdiameter',1,0,NULL,NULL,NULL,NULL),(682,NULL,'Maximum bloeiwijzelengte',1,0,NULL,NULL,NULL,NULL),(683,NULL,'Aantal vruchten / trossen',1,0,NULL,NULL,NULL,NULL),(684,NULL,'Verpakkingswijze',1,0,NULL,NULL,NULL,NULL),(685,NULL,'Minimum vruchtdiameter',1,0,NULL,NULL,NULL,NULL),(686,NULL,'Medida',1,1,NULL,'cm',NULL,'size'),(687,NULL,'Bloem/bes/vruchtkleur 1',1,0,NULL,NULL,NULL,NULL),(688,NULL,'Potvorm',1,0,NULL,NULL,NULL,NULL),(689,NULL,'Potkleur',1,0,NULL,NULL,NULL,NULL),(690,NULL,'Material maceta',1,0,NULL,NULL,NULL,NULL),(691,NULL,'Plantvorm',1,0,NULL,NULL,NULL,NULL),(692,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,NULL,NULL),(693,NULL,'Teeltwijze',1,0,NULL,NULL,NULL,NULL),(694,NULL,'Teeltmedium',1,0,NULL,NULL,NULL,NULL),(695,NULL,'Cubierta',1,0,NULL,NULL,NULL,NULL),(696,NULL,'Hoesvorm',1,0,NULL,NULL,NULL,NULL),(697,NULL,'Hoesbedrukking algemeen',1,0,NULL,NULL,NULL,NULL),(698,NULL,'Extra toevoegingen',1,0,NULL,NULL,NULL,NULL),(699,NULL,'Land van herkomst (bedrij',1,0,NULL,NULL,NULL,NULL),(700,NULL,'Verpakte orchidee',1,0,NULL,NULL,NULL,NULL),(701,NULL,'Hoesbedrukking extra',1,0,NULL,NULL,NULL,NULL),(702,NULL,'Voorbehandeling',1,0,NULL,NULL,NULL,NULL),(703,NULL,'Overige niet in pot',1,0,NULL,NULL,NULL,NULL),(704,NULL,'Forma de la flor',1,0,NULL,NULL,NULL,NULL),(705,NULL,'Flexibilidad',1,0,NULL,NULL,NULL,NULL),(706,NULL,'Hoeskleur',1,0,NULL,NULL,NULL,NULL),(707,NULL,'Extra deco',1,0,NULL,NULL,NULL,NULL),(710,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(711,NULL,'Diametro',1,0,NULL,NULL,NULL,NULL),(712,NULL,'Barcode',1,0,NULL,NULL,NULL,NULL),(713,NULL,'Productlabel',1,0,NULL,NULL,NULL,NULL),(714,NULL,'Eetbaar/ niet eetbaar',1,0,NULL,NULL,NULL,NULL),(715,NULL,'Plantmaat zonder pot',1,0,NULL,NULL,NULL,NULL),(716,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,NULL,NULL),(717,NULL,'Maximum percentage oud ho',1,0,NULL,NULL,NULL,NULL),(718,NULL,'Maximum lengte verschil',1,0,NULL,NULL,NULL,NULL),(719,NULL,'Bladkleur',1,0,NULL,NULL,NULL,NULL),(720,NULL,'Plantgewicht',1,0,NULL,NULL,NULL,NULL),(721,NULL,'Diámetro',1,0,NULL,NULL,NULL,NULL),(722,NULL,'Bloem/bes/vruchtkleur 2',1,0,NULL,NULL,NULL,NULL),(723,NULL,'Winterhardheid (USDA zone',1,0,NULL,NULL,NULL,NULL),(724,NULL,'Kleurbehandeld',1,0,NULL,NULL,NULL,'inkFk'),(725,NULL,'Bloem-/bladkleurverdeling',1,0,NULL,NULL,NULL,NULL),(726,NULL,'Diámetro del capullo',1,0,NULL,NULL,NULL,NULL),(727,NULL,'Volume inhoud',1,0,NULL,NULL,NULL,NULL),(728,NULL,'Vruchtbenaming',1,0,NULL,NULL,NULL,NULL),(729,NULL,'Vaaslevenindex',1,0,NULL,NULL,NULL,NULL),(730,NULL,'Overige informatie plante',1,0,NULL,NULL,NULL,NULL),(731,NULL,'Overige informatie snijbl',1,0,NULL,NULL,NULL,NULL),(732,NULL,'Toepassingsmogelijkheid',1,0,NULL,NULL,NULL,NULL),(733,NULL,'Productbeeld aanvoerder',1,0,NULL,NULL,NULL,NULL),(734,NULL,'MPS certificering',1,0,NULL,NULL,NULL,NULL),(735,NULL,'Kwaliteitsgroep',1,0,NULL,NULL,NULL,NULL),(736,NULL,'Artikelomschrijving',1,0,NULL,NULL,NULL,NULL),(737,NULL,'BTW-tarief',1,0,NULL,NULL,NULL,NULL),(738,NULL,'Prijseenheid',1,0,NULL,NULL,NULL,NULL),(739,NULL,'Transactievorm',1,0,NULL,NULL,NULL,NULL),(740,NULL,'Handelsverpakking voorwaa',1,0,NULL,NULL,NULL,NULL),(741,NULL,'Consumentenverpakking voo',1,0,NULL,NULL,NULL,NULL),(742,NULL,'Leveringsvoorwaarden',1,0,NULL,NULL,NULL,NULL),(743,NULL,'PT heffing voorwaarden',1,0,NULL,NULL,NULL,NULL),(744,NULL,'Serviceheffing voorwaarde',1,0,NULL,NULL,NULL,NULL),(745,NULL,'Algemene voorwaarden',1,0,NULL,NULL,NULL,NULL),(746,NULL,'Marktvorm',1,0,NULL,NULL,NULL,NULL),(747,NULL,'Themadagen',1,0,NULL,NULL,NULL,NULL),(748,NULL,'Handelscategorie',1,0,NULL,NULL,NULL,NULL),(749,NULL,'Producentengroepen',1,0,NULL,NULL,NULL,NULL),(750,NULL,'Favorieten Id',1,0,NULL,NULL,NULL,NULL),(751,NULL,'Verkoopeenheid',1,0,NULL,NULL,NULL,NULL),(752,NULL,'Veilgroep voorkeur',1,0,NULL,NULL,NULL,NULL),(753,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(754,NULL,'Keurmeesternummer FloraHo',1,0,NULL,NULL,NULL,NULL),(755,NULL,'Rijnummer Rijnsburg',1,0,NULL,NULL,NULL,NULL),(756,NULL,'Verwerkingslocatie FloraH',1,0,NULL,NULL,NULL,NULL),(757,NULL,'FloraHolland Financial',1,0,NULL,NULL,NULL,NULL),(758,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(759,NULL,'Benefiet veiling',1,0,NULL,NULL,NULL,NULL),(760,NULL,'Kloksoort',1,0,NULL,NULL,NULL,NULL),(761,NULL,'Minimumprijs aanvoerder',1,0,NULL,NULL,NULL,NULL),(762,NULL,'Rest aantallen',1,0,NULL,NULL,NULL,NULL),(763,NULL,'Veilsoort',1,0,NULL,NULL,NULL,NULL),(764,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(765,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(766,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(767,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(768,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(769,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(770,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(771,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(772,NULL,'Veilgroep Aalsmeer',1,0,NULL,NULL,NULL,NULL),(773,NULL,'Promotie kenmerk FloraHol',1,0,NULL,NULL,NULL,NULL),(774,NULL,'Verrekening snijbloemenvo',1,0,NULL,NULL,NULL,NULL),(775,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(776,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(777,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(778,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(779,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(780,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(781,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(782,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(783,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(784,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(785,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(786,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(787,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(788,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(789,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(790,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(791,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(792,NULL,'Tussenopslag klok Plantio',1,0,NULL,NULL,NULL,NULL),(793,NULL,'Soort ladingsdrager Plant',1,0,NULL,NULL,NULL,NULL),(794,NULL,'Logistiek middel Plantion',1,0,NULL,NULL,NULL,NULL),(795,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(796,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(797,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(798,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(799,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(800,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(801,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(802,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(803,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(804,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(805,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(806,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(807,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(808,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(809,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(810,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(811,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(812,NULL,'Veilgroep Plantion Ede',1,0,NULL,NULL,NULL,NULL),(813,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(814,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(815,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(816,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(817,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(818,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(819,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(820,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(821,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(822,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(823,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(824,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(825,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(826,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(827,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(828,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(829,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(830,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(831,NULL,'Toegevoegde waardes VRM',1,0,NULL,NULL,NULL,NULL),(832,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(833,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(834,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(835,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(836,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(837,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(838,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(839,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(840,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(841,NULL,'Veiling',1,0,NULL,NULL,NULL,NULL),(842,NULL,'kopersaantallen',1,0,NULL,NULL,NULL,NULL),(843,NULL,'Caducidad',1,0,NULL,NULL,NULL,NULL),(844,NULL,'Lote',1,0,NULL,NULL,NULL,NULL),(845,NULL,'Uds palet',1,0,NULL,NULL,NULL,NULL),(4548,NULL,'fout kenmerk',1,0,NULL,NULL,'081',NULL),(4549,NULL,'Potinhoud',1,0,NULL,NULL,'A01',NULL),(4550,NULL,'Marketingconcept',1,0,NULL,NULL,'A02',NULL),(4551,NULL,'Leeftijd',1,0,NULL,NULL,'A03',NULL),(4552,NULL,'Uitgangsmateriaal',1,0,NULL,NULL,'A04',NULL),(4553,NULL,'Kleurbehandeld',1,0,NULL,NULL,'A05',NULL),(4554,NULL,'Verzorging: Standplaats',1,0,NULL,NULL,'A06',NULL),(4555,NULL,'Verzorging: Water',1,0,NULL,NULL,'A07',NULL),(4556,NULL,'Verzorging: Voeding',1,0,NULL,NULL,'A08',NULL),(4557,NULL,'Verzorging: Temperatuur',1,0,NULL,NULL,'A09',NULL),(4558,NULL,'Verzorging: Specifieke in',1,0,NULL,NULL,'A10',NULL),(4559,NULL,'Verzorging: Consumptie',1,0,NULL,NULL,'A11',NULL),(4560,NULL,'Nabehandeling',1,0,NULL,NULL,'A13',NULL),(4561,NULL,'Artikel beeld',1,0,NULL,NULL,'A23',NULL),(4562,NULL,'Hoofdkleur 1',1,0,NULL,NULL,'B01',NULL),(4563,NULL,'Hoofdkleur 2',1,0,NULL,NULL,'B02',NULL),(4564,NULL,'RHS hoofdkleur 1',1,0,NULL,NULL,'B03',NULL),(4565,NULL,'RHS hoofdkleur 2',1,0,NULL,NULL,'B04',NULL),(4566,NULL,'Hoofdkleur 1 blad',1,0,NULL,NULL,'B05',NULL),(4567,NULL,'Hoofdkleur 2 blad',1,0,NULL,NULL,'B06',NULL),(4568,NULL,'RHS hoofdkleur 1 blad',1,0,NULL,NULL,'B07',NULL),(4569,NULL,'RHS hoofdkleur 2 blad',1,0,NULL,NULL,'B08',NULL),(4570,NULL,'Botanisch beeld',1,0,NULL,NULL,'B09',NULL),(4571,NULL,'Hoofdkleur bes/vrucht',1,0,NULL,NULL,'B10',NULL),(4572,NULL,'RHS hoofdkleur bes/vrucht',1,0,NULL,NULL,'B11',NULL),(4573,NULL,'UPOV hoofdkleur 1 bloem',1,0,NULL,NULL,'B12',NULL),(4574,NULL,'UPOV hoofdkleur 2 bloem',1,0,NULL,NULL,'B13',NULL),(4575,NULL,'UPOV hoofdkleur 1 blad',1,0,NULL,NULL,'B14',NULL),(4576,NULL,'UPOV hoofdkleur 2 blad',1,0,NULL,NULL,'B15',NULL),(4577,NULL,'UPOV hoofdkleur bes/vruch',1,0,NULL,NULL,'B16',NULL),(4578,NULL,'Negatieve keurcode 1',1,0,NULL,NULL,'K01',NULL),(4579,NULL,'Negatieve keurcode 2',1,0,NULL,NULL,'K02',NULL),(4580,NULL,'Bedrijfskenmerk fytosanit',1,0,NULL,NULL,'K03',NULL),(4581,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,'K04',NULL),(4582,NULL,'Certificaten MPS-TraceCer',1,0,NULL,NULL,'K05',NULL),(4583,NULL,'Overige leveranciersinfor',1,0,NULL,NULL,'K07',NULL),(4584,NULL,'Certificaten MPS-GAP',1,0,NULL,NULL,'K08',NULL),(4585,NULL,'Betrouwbaarheidsindex kla',1,0,NULL,NULL,'K11',NULL),(4586,NULL,'Betrouwbaarheidsindex waa',1,0,NULL,NULL,'K12',NULL),(4587,NULL,'Productkwaliteitslabel',1,0,NULL,NULL,'K13',NULL),(4588,NULL,'Label Fair Flowers Fair P',1,0,NULL,NULL,'K14',NULL),(4589,NULL,'Certificaten Socialy Qual',1,0,NULL,NULL,'K15',NULL),(4590,NULL,'Certificaten GlobalGAP',1,0,NULL,NULL,'K16',NULL),(4591,NULL,'Certificaten MPS Quality',1,0,NULL,NULL,'K17',NULL),(4592,NULL,'Certificaten biologisch',1,0,NULL,NULL,'K18',NULL),(4593,NULL,'Certificaten eetbare prod',1,0,NULL,NULL,'K19',NULL),(4594,NULL,'Certificaten Florimark',1,0,NULL,NULL,'K20',NULL),(4595,NULL,'Certificaten Milieukeur',1,0,NULL,NULL,'K21',NULL),(4596,NULL,'Certificaten Kenya Flower',1,0,NULL,NULL,'K22',NULL),(4597,NULL,'Certificaten Fairtrade',1,0,NULL,NULL,'K23',NULL),(4598,NULL,'Keurmerk MPS-ProductProof',1,0,NULL,NULL,'K24',NULL),(4599,NULL,'Certificaten ISO',1,0,NULL,NULL,'K25',NULL),(4600,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,'K26',NULL),(4601,NULL,'Certificaten Florverde',1,0,NULL,NULL,'K27',NULL),(4602,NULL,'Certificaten Ethical Trad',1,0,NULL,NULL,'K28',NULL),(4603,NULL,'Certificaten Ethiopian EH',1,0,NULL,NULL,'K29',NULL),(4604,NULL,'Certificaten gewasbescher',1,0,NULL,NULL,'K30',NULL),(4605,NULL,'Certificaten SAN',1,0,NULL,NULL,'K31',NULL),(4606,NULL,'Certificaten GRASP',1,0,NULL,NULL,'K32',NULL),(4607,NULL,'Label Fair Flora',1,0,NULL,NULL,'K33',NULL),(4608,NULL,'GLobalG.A.P. Chain of Cus',1,0,NULL,NULL,'K34',NULL),(4609,NULL,'Certificaten Vegaplan',1,0,NULL,NULL,'K35',NULL),(4610,NULL,'Floriculture Sustainabili',1,0,NULL,NULL,'K99',NULL),(4611,NULL,'Fust',1,0,NULL,NULL,'L01',NULL),(4612,NULL,'Stapelwagen',1,0,NULL,NULL,'L02',NULL),(4613,NULL,'Aantal legborden veilings',1,0,NULL,NULL,'L03',NULL),(4614,NULL,'Aantal legborden Deense s',1,0,NULL,NULL,'L04',NULL),(4615,NULL,'Aantal onderstellen Deens',1,0,NULL,NULL,'L05',NULL),(4616,NULL,'Fustsoort',1,0,NULL,NULL,'L06',NULL),(4617,NULL,'Fustmateriaal',1,0,NULL,NULL,'L07',NULL),(4618,NULL,'Aantal legborden Eurostap',1,0,NULL,NULL,'L08',NULL),(4619,NULL,'Aantal onderstellen Euros',1,0,NULL,NULL,'L09',NULL),(4620,NULL,'Aantal stelen per bos',1,0,NULL,NULL,'L11',NULL),(4621,NULL,'Aantal bossen per bundel',1,0,NULL,NULL,'L12',NULL),(4622,NULL,'Aantal stuks per fust',1,0,NULL,NULL,'L13',NULL),(4623,NULL,'Aantal bossen per fust',1,0,NULL,NULL,'L14',NULL),(4624,NULL,'Aantal bundels per fust',1,0,NULL,NULL,'L15',NULL),(4625,NULL,'Aantal bossen per hoes',1,0,NULL,NULL,'L16',NULL),(4626,NULL,'Aantal bundels per hoes',1,0,NULL,NULL,'L17',NULL),(4627,NULL,'Fustlabel',1,0,NULL,NULL,'L18',NULL),(4628,NULL,'Karlabel',1,0,NULL,NULL,'L19',NULL),(4629,NULL,'Service productlabel',1,0,NULL,NULL,'L20',NULL),(4630,NULL,'Service fustlabel',1,0,NULL,NULL,'L21',NULL),(4631,NULL,'Service karlabel',1,0,NULL,NULL,'L22',NULL),(4632,NULL,'Aantal fusten per laag',1,0,NULL,NULL,'L23',NULL),(4633,NULL,'Presentatie per schapm2',1,0,NULL,NULL,'L24',NULL),(4634,NULL,'Positieve keurcode fytosa',1,0,NULL,NULL,'P01',NULL),(4635,NULL,'Positieve keurcode kwalit',1,0,NULL,NULL,'P02',NULL),(4636,NULL,'Positieve keurcode veilin',1,0,NULL,NULL,'P03',NULL),(4637,NULL,'Maceta',1,0,NULL,NULL,'S01',NULL),(4638,NULL,'Altura mínima',1,1,NULL,'cm','S02','size'),(4639,NULL,'nº plantas',1,0,NULL,NULL,'S03',NULL),(4640,NULL,'Minimum plantdiameter',1,0,NULL,NULL,'S04',NULL),(4641,NULL,'Madurez',1,0,NULL,NULL,'S05',NULL),(4642,NULL,'Combinatiehoogte',1,0,NULL,NULL,'S06',NULL),(4643,NULL,'Min aantal koppen hoogste',1,0,NULL,NULL,'S07',NULL),(4644,NULL,'Dikte',1,0,NULL,NULL,'S08',NULL),(4645,NULL,'Min aantal bloemen/bloeiw',1,0,NULL,NULL,'S09',NULL),(4646,NULL,'Min aantal bloemtrossen p',1,0,NULL,NULL,'S10',NULL),(4647,NULL,'Minimum aantal takken per',1,0,NULL,NULL,'S11',NULL),(4648,NULL,'Minimum aantal bollen per',1,0,NULL,NULL,'S12',NULL),(4649,NULL,'Minimum aantal bladeren p',1,0,NULL,NULL,'S13',NULL),(4650,NULL,'Altura tronco',1,1,NULL,'cm','S14','size'),(4651,NULL,'Altura transporte',1,0,NULL,'cm','S15','size'),(4652,NULL,'Lengte scheuten',1,0,NULL,NULL,'S16',NULL),(4653,NULL,'Min aant vertakkingen pr ',1,0,NULL,NULL,'S17',NULL),(4654,NULL,'Minimum bloemknophoogte',1,0,NULL,NULL,'S19',NULL),(4655,NULL,'Altura',1,1,NULL,'cm','S20','size'),(4656,NULL,'Gewicht (gemiddeld)',1,0,NULL,NULL,'S21',NULL),(4657,NULL,'Aantal bloemknoppen snijb',1,0,NULL,NULL,'S22',NULL),(4658,NULL,'Minimum bloemdiameter',1,0,NULL,NULL,'S23',NULL),(4659,NULL,'Minimum bloemschedelengte',1,0,NULL,NULL,'S24',NULL),(4660,NULL,'Aantal bloemkoppen per tr',1,0,NULL,NULL,'S25',NULL),(4661,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S26',NULL),(4662,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S27',NULL),(4663,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S28',NULL),(4664,NULL,'Minimum bloeiwijzelengte',1,0,NULL,NULL,'S29',NULL),(4665,NULL,'Verpakkingswijze snijbloe',1,0,NULL,NULL,'S30',NULL),(4666,NULL,'Minimum aant bloemen per ',1,0,NULL,NULL,'S31',NULL),(4667,NULL,'Medida',1,0,NULL,'cm','S32',NULL),(4668,NULL,'Jaartal sortering hout',1,0,NULL,NULL,'S33',NULL),(4669,NULL,'Minimum bladdiameter',1,0,NULL,NULL,'S34',NULL),(4670,NULL,'Minimum bundelgewicht',1,0,NULL,NULL,'S35',NULL),(4671,NULL,'Altura máxima',1,0,NULL,NULL,'S36',NULL),(4672,NULL,'Maximum plantdiameter',1,0,NULL,NULL,'S37',NULL),(4673,NULL,'Max aantal bloemen/bloeiw',1,0,NULL,NULL,'S38',NULL),(4674,NULL,'Maximum aantal takken per',1,0,NULL,NULL,'S39',NULL),(4675,NULL,'Maximum aantal bollen per',1,0,NULL,NULL,'S40',NULL),(4676,NULL,'Altura máxima',1,0,NULL,NULL,'S41',NULL),(4677,NULL,'Maximum steellengte',1,0,NULL,NULL,'S42',NULL),(4678,NULL,'Maximum aantal knoppen sn',1,0,NULL,NULL,'S43',NULL),(4679,NULL,'Maximum bloemdiameter',1,0,NULL,NULL,'S44',NULL),(4680,NULL,'Maximum bloeiwijzelengte',1,0,NULL,NULL,'S45',NULL),(4681,NULL,'Aantal vruchten / trossen',1,0,NULL,NULL,'S46',NULL),(4682,NULL,'Verpakkingswijze',1,0,NULL,NULL,'S47',NULL),(4683,NULL,'Minimum vruchtdiameter',1,0,NULL,NULL,'S48',NULL),(4684,NULL,'Medida',1,1,NULL,'cm','S49','size'),(4685,NULL,'Bloem/bes/vruchtkleur 1',1,0,NULL,NULL,'S50',NULL),(4686,NULL,'Potvorm',1,0,NULL,NULL,'S51',NULL),(4687,NULL,'Potkleur',1,0,NULL,NULL,'S52',NULL),(4688,NULL,'Potmateriaal',1,0,NULL,NULL,'S53',NULL),(4689,NULL,'Plantvorm',1,0,NULL,NULL,'S54',NULL),(4690,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,'S55',NULL),(4691,NULL,'Teeltwijze',1,0,NULL,NULL,'S56',NULL),(4692,NULL,'Teeltmedium',1,0,NULL,NULL,'S57',NULL),(4693,NULL,'Hoesmateriaal',1,0,NULL,NULL,'S58',NULL),(4694,NULL,'Hoesvorm',1,0,NULL,NULL,'S59',NULL),(4695,NULL,'Hoesbedrukking algemeen',1,0,NULL,NULL,'S60',NULL),(4696,NULL,'Extra toevoegingen',1,0,NULL,NULL,'S61',NULL),(4697,NULL,'Land van herkomst (bedrij',1,0,NULL,NULL,'S62',NULL),(4698,NULL,'Verpakte orchidee',1,0,NULL,NULL,'S63',NULL),(4699,NULL,'Hoesbedrukking extra',1,0,NULL,NULL,'S64',NULL),(4700,NULL,'Voorbehandeling',1,0,NULL,NULL,'S65',NULL),(4701,NULL,'Overige niet in pot',1,0,NULL,NULL,'S66',NULL),(4702,NULL,'Vorm snijbloemen',1,0,NULL,NULL,'S67',NULL),(4703,NULL,'Buigzaamheid bloemsteel',1,0,NULL,NULL,'S68',NULL),(4704,NULL,'Hoeskleur',1,0,NULL,NULL,'S69',NULL),(4705,NULL,'Extra deco materiaal',1,0,NULL,NULL,'S70',NULL),(4706,NULL,'Productkleur',1,0,NULL,NULL,'S71',NULL),(4707,NULL,'Productmateriaal',1,0,NULL,NULL,'S72',NULL),(4708,NULL,'Altura',1,1,NULL,'cm','S73','size'),(4709,NULL,'Materiaaldiameter',1,0,NULL,NULL,'S74',NULL),(4710,NULL,'Barcode',1,0,NULL,NULL,'S75',NULL),(4711,NULL,'Productlabel',1,0,NULL,NULL,'S76',NULL),(4712,NULL,'Eetbaar/ niet eetbaar',1,0,NULL,NULL,'S77',NULL),(4713,NULL,'Plantmaat zonder pot',1,0,NULL,NULL,'S78',NULL),(4714,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,'S79',NULL),(4715,NULL,'Maximum percentage oud ho',1,0,NULL,NULL,'S80',NULL),(4716,NULL,'Maximum lengte verschil',1,0,NULL,NULL,'S81',NULL),(4717,NULL,'Bladkleur',1,0,NULL,NULL,'S82',NULL),(4718,NULL,'Plantgewicht',1,0,NULL,NULL,'S83',NULL),(4719,NULL,'Gemiddelde bloemdiameter',1,0,NULL,NULL,'S84',NULL),(4720,NULL,'Bloem/bes/vruchtkleur 2',1,0,NULL,NULL,'S85',NULL),(4721,NULL,'Winterhardheid (USDA zone',1,0,NULL,NULL,'S86',NULL),(4722,NULL,'Kleurbehandeld',1,0,NULL,NULL,'S87',NULL),(4723,NULL,'Bloem-/bladkleurverdeling',1,0,NULL,NULL,'S88',NULL),(4724,NULL,'Minimum bloemknopdiameter',1,0,NULL,NULL,'S89',NULL),(4725,NULL,'Volume inhoud',1,0,NULL,NULL,'S90',NULL),(4726,NULL,'Vruchtbenaming',1,0,NULL,NULL,'S91',NULL),(4727,NULL,'Vaaslevenindex',1,0,NULL,NULL,'S92',NULL),(4728,NULL,'Overige informatie plante',1,0,NULL,NULL,'S93',NULL),(4729,NULL,'Overige informatie snijbl',1,0,NULL,NULL,'S94',NULL),(4730,NULL,'Toepassingsmogelijkheid',1,0,NULL,NULL,'S95',NULL),(4731,NULL,'Productbeeld aanvoerder',1,0,NULL,NULL,'S96',NULL),(4732,NULL,'MPS certificering',1,0,NULL,NULL,'S97',NULL),(4733,NULL,'Kwaliteitsgroep',1,0,NULL,NULL,'S98',NULL),(4734,NULL,'Artikelomschrijving',1,0,NULL,NULL,'S99',NULL),(4735,NULL,'BTW-tarief',1,0,NULL,NULL,'T01',NULL),(4736,NULL,'Prijseenheid',1,0,NULL,NULL,'T02',NULL),(4737,NULL,'Transactievorm',1,0,NULL,NULL,'T03',NULL),(4738,NULL,'Handelsverpakking voorwaa',1,0,NULL,NULL,'T10',NULL),(4739,NULL,'Consumentenverpakking voo',1,0,NULL,NULL,'T11',NULL),(4740,NULL,'Leveringsvoorwaarden',1,0,NULL,NULL,'T12',NULL),(4741,NULL,'PT heffing voorwaarden',1,0,NULL,NULL,'T13',NULL),(4742,NULL,'Serviceheffing voorwaarde',1,0,NULL,NULL,'T14',NULL),(4743,NULL,'Algemene voorwaarden',1,0,NULL,NULL,'T15',NULL),(4744,NULL,'Marktvorm',1,0,NULL,NULL,'T16',NULL),(4745,NULL,'Themadagen',1,0,NULL,NULL,'T17',NULL),(4746,NULL,'Handelscategorie',1,0,NULL,NULL,'T18',NULL),(4747,NULL,'Producentengroepen',1,0,NULL,NULL,'T19',NULL),(4748,NULL,'Favorieten Id',1,0,NULL,NULL,'T20',NULL),(4749,NULL,'Verkoopeenheid',1,0,NULL,NULL,'T21',NULL),(4750,NULL,'Veilgroep voorkeur',1,0,NULL,NULL,'V01',NULL),(4751,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V02',NULL),(4752,NULL,'Keurmeesternummer FloraHo',1,0,NULL,NULL,'V03',NULL),(4753,NULL,'Rijnummer Rijnsburg',1,0,NULL,NULL,'V04',NULL),(4754,NULL,'Verwerkingslocatie FloraH',1,0,NULL,NULL,'V05',NULL),(4755,NULL,'FloraHolland Financial',1,0,NULL,NULL,'V06',NULL),(4756,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V07',NULL),(4757,NULL,'Benefiet veiling',1,0,NULL,NULL,'V08',NULL),(4758,NULL,'Kloksoort',1,0,NULL,NULL,'V09',NULL),(4759,NULL,'Minimumprijs aanvoerder',1,0,NULL,NULL,'V10',NULL),(4760,NULL,'Rest aantallen',1,0,NULL,NULL,'V11',NULL),(4761,NULL,'Veilsoort',1,0,NULL,NULL,'V12',NULL),(4762,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V13',NULL),(4763,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V14',NULL),(4764,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V15',NULL),(4765,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V16',NULL),(4766,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V17',NULL),(4767,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V18',NULL),(4768,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V19',NULL),(4769,NULL,'Gereserveerd',1,0,NULL,NULL,'V20',NULL),(4770,NULL,'Veilgroep Aalsmeer',1,0,NULL,NULL,'V21',NULL),(4771,NULL,'Promotie kenmerk FloraHol',1,0,NULL,NULL,'V22',NULL),(4772,NULL,'Verrekening snijbloemenvo',1,0,NULL,NULL,'V23',NULL),(4773,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V24',NULL),(4774,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V25',NULL),(4775,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V26',NULL),(4776,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V27',NULL),(4777,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V28',NULL),(4778,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V29',NULL),(4779,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V30',NULL),(4780,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V31',NULL),(4781,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V32',NULL),(4782,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V33',NULL),(4783,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V34',NULL),(4784,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V35',NULL),(4785,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V36',NULL),(4786,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V37',NULL),(4787,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V38',NULL),(4788,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V39',NULL),(4789,NULL,'Gereserveerd',1,0,NULL,NULL,'V40',NULL),(4790,NULL,'Tussenopslag klok Plantio',1,0,NULL,NULL,'V41',NULL),(4791,NULL,'Soort ladingsdrager Plant',1,0,NULL,NULL,'V42',NULL),(4792,NULL,'Logistiek middel Plantion',1,0,NULL,NULL,'V43',NULL),(4793,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V44',NULL),(4794,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V45',NULL),(4795,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V46',NULL),(4796,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V47',NULL),(4797,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V48',NULL),(4798,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V49',NULL),(4799,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V50',NULL),(4800,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V51',NULL),(4801,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V52',NULL),(4802,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V53',NULL),(4803,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V54',NULL),(4804,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V55',NULL),(4805,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V56',NULL),(4806,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V57',NULL),(4807,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V58',NULL),(4808,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V59',NULL),(4809,NULL,'Gereserveerd',1,0,NULL,NULL,'V60',NULL),(4810,NULL,'Veilgroep Plantion Ede',1,0,NULL,NULL,'V61',NULL),(4811,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V62',NULL),(4812,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V63',NULL),(4813,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V64',NULL),(4814,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V65',NULL),(4815,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V66',NULL),(4816,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V67',NULL),(4817,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V68',NULL),(4818,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V69',NULL),(4819,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V70',NULL),(4820,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V71',NULL),(4821,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V72',NULL),(4822,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V73',NULL),(4823,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V74',NULL),(4824,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V75',NULL),(4825,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V76',NULL),(4826,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V77',NULL),(4827,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V78',NULL),(4828,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V79',NULL),(4829,NULL,'Toegevoegde waardes VRM',1,0,NULL,NULL,'V80',NULL),(4830,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V81',NULL),(4831,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V82',NULL),(4832,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V83',NULL),(4833,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V84',NULL),(4834,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V85',NULL),(4835,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V86',NULL),(4836,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V87',NULL),(4837,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V88',NULL),(4838,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V89',NULL),(4839,NULL,'Veiling',1,0,NULL,NULL,'V99',NULL),(4840,NULL,'kopersaantallen',1,0,NULL,NULL,'Z01',NULL); /*!40000 ALTER TABLE `tag` ENABLE KEYS */; UNLOCK TABLES; @@ -267,7 +267,7 @@ UNLOCK TABLES; LOCK TABLES `time` WRITE; /*!40000 ALTER TABLE `time` DISABLE KEYS */; -INSERT INTO `time` VALUES ('2007-12-31',200801,12,2007,31,1,200712),('2008-01-01',200801,1,2008,1,1,200801),('2008-01-02',200801,1,2008,2,1,200801),('2008-01-03',200801,1,2008,3,1,200801),('2008-01-04',200801,1,2008,4,1,200801),('2008-01-05',200801,1,2008,5,1,200801),('2008-01-06',200802,1,2008,6,2,200801),('2008-01-07',200802,1,2008,7,2,200801),('2008-01-08',200802,1,2008,8,2,200801),('2008-01-09',200802,1,2008,9,2,200801),('2008-01-10',200802,1,2008,10,2,200801),('2008-01-11',200802,1,2008,11,2,200801),('2008-01-12',200802,1,2008,12,2,200801),('2008-01-13',200803,1,2008,13,3,200801),('2008-01-14',200803,1,2008,14,3,200801),('2008-01-15',200803,1,2008,15,3,200801),('2008-01-16',200803,1,2008,16,3,200801),('2008-01-17',200803,1,2008,17,3,200801),('2008-01-18',200803,1,2008,18,3,200801),('2008-01-19',200803,1,2008,19,3,200801),('2008-01-20',200804,1,2008,20,4,200801),('2008-01-21',200804,1,2008,21,4,200801),('2008-01-22',200804,1,2008,22,4,200801),('2008-01-23',200804,1,2008,23,4,200801),('2008-01-24',200804,1,2008,24,4,200801),('2008-01-25',200804,1,2008,25,4,200801),('2008-01-26',200804,1,2008,26,4,200801),('2008-01-27',200805,1,2008,27,5,200801),('2008-01-28',200805,1,2008,28,5,200801),('2008-01-29',200805,1,2008,29,5,200801),('2008-01-30',200805,1,2008,30,5,200801),('2008-01-31',200805,1,2008,31,5,200801),('2008-02-01',200805,2,2008,1,5,200802),('2008-02-02',200805,2,2008,2,5,200802),('2008-02-03',200806,2,2008,3,6,200802),('2008-02-04',200806,2,2008,4,6,200802),('2008-02-05',200806,2,2008,5,6,200802),('2008-02-06',200806,2,2008,6,6,200802),('2008-02-07',200806,2,2008,7,6,200802),('2008-02-08',200806,2,2008,8,6,200802),('2008-02-09',200806,2,2008,9,6,200802),('2008-02-10',200807,2,2008,10,7,200802),('2008-02-11',200807,2,2008,11,7,200802),('2008-02-12',200807,2,2008,12,7,200802),('2008-02-13',200807,2,2008,13,7,200802),('2008-02-14',200807,2,2008,14,7,200802),('2008-02-15',200807,2,2008,15,7,200802),('2008-02-16',200807,2,2008,16,7,200802),('2008-02-17',200808,2,2008,17,8,200802),('2008-02-18',200808,2,2008,18,8,200802),('2008-02-19',200808,2,2008,19,8,200802),('2008-02-20',200808,2,2008,20,8,200802),('2008-02-21',200808,2,2008,21,8,200802),('2008-02-22',200808,2,2008,22,8,200802),('2008-02-23',200808,2,2008,23,8,200802),('2008-02-24',200809,2,2008,24,9,200802),('2008-02-25',200809,2,2008,25,9,200802),('2008-02-26',200809,2,2008,26,9,200802),('2008-02-27',200809,2,2008,27,9,200802),('2008-02-28',200809,2,2008,28,9,200802),('2008-02-29',200809,2,2008,29,9,200802),('2008-03-01',200809,3,2008,1,9,200803),('2008-03-02',200810,3,2008,2,10,200803),('2008-03-03',200810,3,2008,3,10,200803),('2008-03-04',200810,3,2008,4,10,200803),('2008-03-05',200810,3,2008,5,10,200803),('2008-03-06',200810,3,2008,6,10,200803),('2008-03-07',200810,3,2008,7,10,200803),('2008-03-08',200810,3,2008,8,10,200803),('2008-03-09',200811,3,2008,9,11,200803),('2008-03-10',200811,3,2008,10,11,200803),('2008-03-11',200811,3,2008,11,11,200803),('2008-03-12',200811,3,2008,12,11,200803),('2008-03-13',200811,3,2008,13,11,200803),('2008-03-14',200811,3,2008,14,11,200803),('2008-03-15',200811,3,2008,15,11,200803),('2008-03-16',200812,3,2008,16,12,200803),('2008-03-17',200812,3,2008,17,12,200803),('2008-03-18',200812,3,2008,18,12,200803),('2008-03-19',200812,3,2008,19,12,200803),('2008-03-20',200812,3,2008,20,12,200803),('2008-03-21',200812,3,2008,21,12,200803),('2008-03-22',200812,3,2008,22,12,200803),('2008-03-23',200813,3,2008,23,13,200803),('2008-03-24',200813,3,2008,24,13,200803),('2008-03-25',200813,3,2008,25,13,200803),('2008-03-26',200813,3,2008,26,13,200803),('2008-03-27',200813,3,2008,27,13,200803),('2008-03-28',200813,3,2008,28,13,200803),('2008-03-29',200813,3,2008,29,13,200803),('2008-03-30',200814,3,2008,30,14,200803),('2008-03-31',200814,3,2008,31,14,200803),('2008-04-01',200814,4,2008,1,14,200804),('2008-04-02',200814,4,2008,2,14,200804),('2008-04-03',200814,4,2008,3,14,200804),('2008-04-04',200814,4,2008,4,14,200804),('2008-04-05',200814,4,2008,5,14,200804),('2008-04-06',200815,4,2008,6,15,200804),('2008-04-07',200815,4,2008,7,15,200804),('2008-04-08',200815,4,2008,8,15,200804),('2008-04-09',200815,4,2008,9,15,200804),('2008-04-10',200815,4,2008,10,15,200804),('2008-04-11',200815,4,2008,11,15,200804),('2008-04-12',200815,4,2008,12,15,200804),('2008-04-13',200816,4,2008,13,16,200804),('2008-04-14',200816,4,2008,14,16,200804),('2008-04-15',200816,4,2008,15,16,200804),('2008-04-16',200816,4,2008,16,16,200804),('2008-04-17',200816,4,2008,17,16,200804),('2008-04-18',200816,4,2008,18,16,200804),('2008-04-19',200816,4,2008,19,16,200804),('2008-04-20',200817,4,2008,20,17,200804),('2008-04-21',200817,4,2008,21,17,200804),('2008-04-22',200817,4,2008,22,17,200804),('2008-04-23',200817,4,2008,23,17,200804),('2008-04-24',200817,4,2008,24,17,200804),('2008-04-25',200817,4,2008,25,17,200804),('2008-04-26',200817,4,2008,26,17,200804),('2008-04-27',200818,4,2008,27,18,200804),('2008-04-28',200818,4,2008,28,18,200804),('2008-04-29',200818,4,2008,29,18,200804),('2008-04-30',200818,4,2008,30,18,200804),('2008-05-01',200818,5,2008,1,18,200805),('2008-05-02',200818,5,2008,2,18,200805),('2008-05-03',200818,5,2008,3,18,200805),('2008-05-04',200819,5,2008,4,19,200805),('2008-05-05',200819,5,2008,5,19,200805),('2008-05-06',200819,5,2008,6,19,200805),('2008-05-07',200819,5,2008,7,19,200805),('2008-05-08',200819,5,2008,8,19,200805),('2008-05-09',200819,5,2008,9,19,200805),('2008-05-10',200819,5,2008,10,19,200805),('2008-05-11',200820,5,2008,11,20,200805),('2008-05-12',200820,5,2008,12,20,200805),('2008-05-13',200820,5,2008,13,20,200805),('2008-05-14',200820,5,2008,14,20,200805),('2008-05-15',200820,5,2008,15,20,200805),('2008-05-16',200820,5,2008,16,20,200805),('2008-05-17',200820,5,2008,17,20,200805),('2008-05-18',200821,5,2008,18,21,200805),('2008-05-19',200821,5,2008,19,21,200805),('2008-05-20',200821,5,2008,20,21,200805),('2008-05-21',200821,5,2008,21,21,200805),('2008-05-22',200821,5,2008,22,21,200805),('2008-05-23',200821,5,2008,23,21,200805),('2008-05-24',200821,5,2008,24,21,200805),('2008-05-25',200822,5,2008,25,22,200805),('2008-05-26',200822,5,2008,26,22,200805),('2008-05-27',200822,5,2008,27,22,200805),('2008-05-28',200822,5,2008,28,22,200805),('2008-05-29',200822,5,2008,29,22,200805),('2008-05-30',200822,5,2008,30,22,200805),('2008-05-31',200822,5,2008,31,22,200805),('2008-06-01',200823,6,2008,1,23,200806),('2008-06-02',200823,6,2008,2,23,200806),('2008-06-03',200823,6,2008,3,23,200806),('2008-06-04',200823,6,2008,4,23,200806),('2008-06-05',200823,6,2008,5,23,200806),('2008-06-06',200823,6,2008,6,23,200806),('2008-06-07',200823,6,2008,7,23,200806),('2008-06-08',200824,6,2008,8,24,200806),('2008-06-09',200824,6,2008,9,24,200806),('2008-06-10',200824,6,2008,10,24,200806),('2008-06-11',200824,6,2008,11,24,200806),('2008-06-12',200824,6,2008,12,24,200806),('2008-06-13',200824,6,2008,13,24,200806),('2008-06-14',200824,6,2008,14,24,200806),('2008-06-15',200825,6,2008,15,25,200806),('2008-06-16',200825,6,2008,16,25,200806),('2008-06-17',200825,6,2008,17,25,200806),('2008-06-18',200825,6,2008,18,25,200806),('2008-06-19',200825,6,2008,19,25,200806),('2008-06-20',200825,6,2008,20,25,200806),('2008-06-21',200825,6,2008,21,25,200806),('2008-06-22',200826,6,2008,22,26,200806),('2008-06-23',200826,6,2008,23,26,200806),('2008-06-24',200826,6,2008,24,26,200806),('2008-06-25',200826,6,2008,25,26,200806),('2008-06-26',200826,6,2008,26,26,200806),('2008-06-27',200826,6,2008,27,26,200806),('2008-06-28',200826,6,2008,28,26,200806),('2008-06-29',200827,6,2008,29,27,200806),('2008-06-30',200827,6,2008,30,27,200806),('2008-07-01',200827,7,2008,1,27,200807),('2008-07-02',200827,7,2008,2,27,200807),('2008-07-03',200827,7,2008,3,27,200807),('2008-07-04',200827,7,2008,4,27,200807),('2008-07-05',200827,7,2008,5,27,200807),('2008-07-06',200828,7,2008,6,28,200807),('2008-07-07',200828,7,2008,7,28,200807),('2008-07-08',200828,7,2008,8,28,200807),('2008-07-09',200828,7,2008,9,28,200807),('2008-07-10',200828,7,2008,10,28,200807),('2008-07-11',200828,7,2008,11,28,200807),('2008-07-12',200828,7,2008,12,28,200807),('2008-07-13',200829,7,2008,13,29,200807),('2008-07-14',200829,7,2008,14,29,200807),('2008-07-15',200829,7,2008,15,29,200807),('2008-07-16',200829,7,2008,16,29,200807),('2008-07-17',200829,7,2008,17,29,200807),('2008-07-18',200829,7,2008,18,29,200807),('2008-07-19',200829,7,2008,19,29,200807),('2008-07-20',200830,7,2008,20,30,200807),('2008-07-21',200830,7,2008,21,30,200807),('2008-07-22',200830,7,2008,22,30,200807),('2008-07-23',200830,7,2008,23,30,200807),('2008-07-24',200830,7,2008,24,30,200807),('2008-07-25',200830,7,2008,25,30,200807),('2008-07-26',200830,7,2008,26,30,200807),('2008-07-27',200831,7,2008,27,31,200807),('2008-07-28',200831,7,2008,28,31,200807),('2008-07-29',200831,7,2008,29,31,200807),('2008-07-30',200831,7,2008,30,31,200807),('2008-07-31',200831,7,2008,31,31,200807),('2008-08-01',200831,8,2008,1,31,200808),('2008-08-02',200831,8,2008,2,31,200808),('2008-08-03',200832,8,2008,3,32,200808),('2008-08-04',200832,8,2008,4,32,200808),('2008-08-05',200832,8,2008,5,32,200808),('2008-08-06',200832,8,2008,6,32,200808),('2008-08-07',200832,8,2008,7,32,200808),('2008-08-08',200832,8,2008,8,32,200808),('2008-08-09',200832,8,2008,9,32,200808),('2008-08-10',200833,8,2008,10,33,200808),('2008-08-11',200833,8,2008,11,33,200808),('2008-08-12',200833,8,2008,12,33,200808),('2008-08-13',200833,8,2008,13,33,200808),('2008-08-14',200833,8,2008,14,33,200808),('2008-08-15',200833,8,2008,15,33,200808),('2008-08-16',200833,8,2008,16,33,200808),('2008-08-17',200834,8,2008,17,34,200808),('2008-08-18',200834,8,2008,18,34,200808),('2008-08-19',200834,8,2008,19,34,200808),('2008-08-20',200834,8,2008,20,34,200808),('2008-08-21',200834,8,2008,21,34,200808),('2008-08-22',200834,8,2008,22,34,200808),('2008-08-23',200834,8,2008,23,34,200808),('2008-08-24',200835,8,2008,24,35,200808),('2008-08-25',200835,8,2008,25,35,200808),('2008-08-26',200835,8,2008,26,35,200808),('2008-08-27',200835,8,2008,27,35,200808),('2008-08-28',200835,8,2008,28,35,200808),('2008-08-29',200835,8,2008,29,35,200808),('2008-08-30',200835,8,2008,30,35,200808),('2008-08-31',200836,8,2008,31,36,200808),('2008-09-01',200836,9,2008,1,36,200809),('2008-09-02',200836,9,2008,2,36,200809),('2008-09-03',200836,9,2008,3,36,200809),('2008-09-04',200836,9,2008,4,36,200809),('2008-09-05',200836,9,2008,5,36,200809),('2008-09-06',200836,9,2008,6,36,200809),('2008-09-07',200837,9,2008,7,37,200809),('2008-09-08',200837,9,2008,8,37,200809),('2008-09-09',200837,9,2008,9,37,200809),('2008-09-10',200837,9,2008,10,37,200809),('2008-09-11',200837,9,2008,11,37,200809),('2008-09-12',200837,9,2008,12,37,200809),('2008-09-13',200837,9,2008,13,37,200809),('2008-09-14',200838,9,2008,14,38,200809),('2008-09-15',200838,9,2008,15,38,200809),('2008-09-16',200838,9,2008,16,38,200809),('2008-09-17',200838,9,2008,17,38,200809),('2008-09-18',200838,9,2008,18,38,200809),('2008-09-19',200838,9,2008,19,38,200809),('2008-09-20',200838,9,2008,20,38,200809),('2008-09-21',200839,9,2008,21,39,200809),('2008-09-22',200839,9,2008,22,39,200809),('2008-09-23',200839,9,2008,23,39,200809),('2008-09-24',200839,9,2008,24,39,200809),('2008-09-25',200839,9,2008,25,39,200809),('2008-09-26',200839,9,2008,26,39,200809),('2008-09-27',200839,9,2008,27,39,200809),('2008-09-28',200840,9,2008,28,40,200809),('2008-09-29',200840,9,2008,29,40,200809),('2008-09-30',200840,9,2008,30,40,200809),('2008-10-01',200840,10,2008,1,40,200810),('2008-10-02',200840,10,2008,2,40,200810),('2008-10-03',200840,10,2008,3,40,200810),('2008-10-04',200840,10,2008,4,40,200810),('2008-10-05',200841,10,2008,5,41,200810),('2008-10-06',200841,10,2008,6,41,200810),('2008-10-07',200841,10,2008,7,41,200810),('2008-10-08',200841,10,2008,8,41,200810),('2008-10-09',200841,10,2008,9,41,200810),('2008-10-10',200841,10,2008,10,41,200810),('2008-10-11',200841,10,2008,11,41,200810),('2008-10-12',200842,10,2008,12,42,200810),('2008-10-13',200842,10,2008,13,42,200810),('2008-10-14',200842,10,2008,14,42,200810),('2008-10-15',200842,10,2008,15,42,200810),('2008-10-16',200842,10,2008,16,42,200810),('2008-10-17',200842,10,2008,17,42,200810),('2008-10-18',200842,10,2008,18,42,200810),('2008-10-19',200843,10,2008,19,43,200810),('2008-10-20',200843,10,2008,20,43,200810),('2008-10-21',200843,10,2008,21,43,200810),('2008-10-22',200843,10,2008,22,43,200810),('2008-10-23',200843,10,2008,23,43,200810),('2008-10-24',200843,10,2008,24,43,200810),('2008-10-25',200843,10,2008,25,43,200810),('2008-10-26',200844,10,2008,26,44,200810),('2008-10-27',200844,10,2008,27,44,200810),('2008-10-28',200844,10,2008,28,44,200810),('2008-10-29',200844,10,2008,29,44,200810),('2008-10-30',200844,10,2008,30,44,200810),('2008-10-31',200844,10,2008,31,44,200810),('2008-11-01',200844,11,2008,1,44,200811),('2008-11-02',200845,11,2008,2,45,200811),('2008-11-03',200845,11,2008,3,45,200811),('2008-11-04',200845,11,2008,4,45,200811),('2008-11-05',200845,11,2008,5,45,200811),('2008-11-06',200845,11,2008,6,45,200811),('2008-11-07',200845,11,2008,7,45,200811),('2008-11-08',200845,11,2008,8,45,200811),('2008-11-09',200846,11,2008,9,46,200811),('2008-11-10',200846,11,2008,10,46,200811),('2008-11-11',200846,11,2008,11,46,200811),('2008-11-12',200846,11,2008,12,46,200811),('2008-11-13',200846,11,2008,13,46,200811),('2008-11-14',200846,11,2008,14,46,200811),('2008-11-15',200846,11,2008,15,46,200811),('2008-11-16',200847,11,2008,16,47,200811),('2008-11-17',200847,11,2008,17,47,200811),('2008-11-18',200847,11,2008,18,47,200811),('2008-11-19',200847,11,2008,19,47,200811),('2008-11-20',200847,11,2008,20,47,200811),('2008-11-21',200847,11,2008,21,47,200811),('2008-11-22',200847,11,2008,22,47,200811),('2008-11-23',200848,11,2008,23,48,200811),('2008-11-24',200848,11,2008,24,48,200811),('2008-11-25',200848,11,2008,25,48,200811),('2008-11-26',200848,11,2008,26,48,200811),('2008-11-27',200848,11,2008,27,48,200811),('2008-11-28',200848,11,2008,28,48,200811),('2008-11-29',200848,11,2008,29,48,200811),('2008-11-30',200849,11,2008,30,49,200811),('2008-12-01',200849,12,2008,1,49,200812),('2008-12-02',200849,12,2008,2,49,200812),('2008-12-03',200849,12,2008,3,49,200812),('2008-12-04',200849,12,2008,4,49,200812),('2008-12-05',200849,12,2008,5,49,200812),('2008-12-06',200849,12,2008,6,49,200812),('2008-12-07',200850,12,2008,7,50,200812),('2008-12-08',200850,12,2008,8,50,200812),('2008-12-09',200850,12,2008,9,50,200812),('2008-12-10',200850,12,2008,10,50,200812),('2008-12-11',200850,12,2008,11,50,200812),('2008-12-12',200850,12,2008,12,50,200812),('2008-12-13',200850,12,2008,13,50,200812),('2008-12-14',200851,12,2008,14,51,200812),('2008-12-15',200851,12,2008,15,51,200812),('2008-12-16',200851,12,2008,16,51,200812),('2008-12-17',200851,12,2008,17,51,200812),('2008-12-18',200851,12,2008,18,51,200812),('2008-12-19',200851,12,2008,19,51,200812),('2008-12-20',200851,12,2008,20,51,200812),('2008-12-21',200852,12,2008,21,52,200812),('2008-12-22',200852,12,2008,22,52,200812),('2008-12-23',200852,12,2008,23,52,200812),('2008-12-24',200852,12,2008,24,52,200812),('2008-12-25',200852,12,2008,25,52,200812),('2008-12-26',200852,12,2008,26,52,200812),('2008-12-27',200852,12,2008,27,52,200812),('2008-12-28',200853,12,2008,28,53,200812),('2008-12-29',200901,12,2008,29,53,200812),('2008-12-30',200901,12,2008,30,53,200812),('2008-12-31',200901,12,2008,31,53,200812),('2009-01-01',200901,1,2009,1,53,200901),('2009-01-02',200901,1,2009,2,53,200901),('2009-01-03',200901,1,2009,3,53,200901),('2009-01-04',200902,1,2009,4,1,200901),('2009-01-05',200902,1,2009,5,1,200901),('2009-01-06',200902,1,2009,6,1,200901),('2009-01-07',200902,1,2009,7,1,200901),('2009-01-08',200902,1,2009,8,1,200901),('2009-01-09',200902,1,2009,9,1,200901),('2009-01-10',200902,1,2009,10,1,200901),('2009-01-11',200903,1,2009,11,2,200901),('2009-01-12',200903,1,2009,12,2,200901),('2009-01-13',200903,1,2009,13,2,200901),('2009-01-14',200903,1,2009,14,2,200901),('2009-01-15',200903,1,2009,15,2,200901),('2009-01-16',200903,1,2009,16,2,200901),('2009-01-17',200903,1,2009,17,2,200901),('2009-01-18',200904,1,2009,18,3,200901),('2009-01-19',200904,1,2009,19,3,200901),('2009-01-20',200904,1,2009,20,3,200901),('2009-01-21',200904,1,2009,21,3,200901),('2009-01-22',200904,1,2009,22,3,200901),('2009-01-23',200904,1,2009,23,3,200901),('2009-01-24',200904,1,2009,24,3,200901),('2009-01-25',200905,1,2009,25,4,200901),('2009-01-26',200905,1,2009,26,4,200901),('2009-01-27',200905,1,2009,27,4,200901),('2009-01-28',200905,1,2009,28,4,200901),('2009-01-29',200905,1,2009,29,4,200901),('2009-01-30',200905,1,2009,30,4,200901),('2009-01-31',200905,1,2009,31,4,200901),('2009-02-01',200906,2,2009,1,5,200902),('2009-02-02',200906,2,2009,2,5,200902),('2009-02-03',200906,2,2009,3,5,200902),('2009-02-04',200906,2,2009,4,5,200902),('2009-02-05',200906,2,2009,5,5,200902),('2009-02-06',200906,2,2009,6,5,200902),('2009-02-07',200906,2,2009,7,5,200902),('2009-02-08',200907,2,2009,8,6,200902),('2009-02-09',200907,2,2009,9,6,200902),('2009-02-10',200907,2,2009,10,6,200902),('2009-02-11',200907,2,2009,11,6,200902),('2009-02-12',200907,2,2009,12,6,200902),('2009-02-13',200907,2,2009,13,6,200902),('2009-02-14',200907,2,2009,14,6,200902),('2009-02-15',200908,2,2009,15,7,200902),('2009-02-16',200908,2,2009,16,7,200902),('2009-02-17',200908,2,2009,17,7,200902),('2009-02-18',200908,2,2009,18,7,200902),('2009-02-19',200908,2,2009,19,7,200902),('2009-02-20',200908,2,2009,20,7,200902),('2009-02-21',200908,2,2009,21,7,200902),('2009-02-22',200909,2,2009,22,8,200902),('2009-02-23',200909,2,2009,23,8,200902),('2009-02-24',200909,2,2009,24,8,200902),('2009-02-25',200909,2,2009,25,8,200902),('2009-02-26',200909,2,2009,26,8,200902),('2009-02-27',200909,2,2009,27,8,200902),('2009-02-28',200909,2,2009,28,8,200902),('2009-03-01',200910,3,2009,1,9,200903),('2009-03-02',200910,3,2009,2,9,200903),('2009-03-03',200910,3,2009,3,9,200903),('2009-03-04',200910,3,2009,4,9,200903),('2009-03-05',200910,3,2009,5,9,200903),('2009-03-06',200910,3,2009,6,9,200903),('2009-03-07',200910,3,2009,7,9,200903),('2009-03-08',200911,3,2009,8,10,200903),('2009-03-09',200911,3,2009,9,10,200903),('2009-03-10',200911,3,2009,10,10,200903),('2009-03-11',200911,3,2009,11,10,200903),('2009-03-12',200911,3,2009,12,10,200903),('2009-03-13',200911,3,2009,13,10,200903),('2009-03-14',200911,3,2009,14,10,200903),('2009-03-15',200912,3,2009,15,11,200903),('2009-03-16',200912,3,2009,16,11,200903),('2009-03-17',200912,3,2009,17,11,200903),('2009-03-18',200912,3,2009,18,11,200903),('2009-03-19',200912,3,2009,19,11,200903),('2009-03-20',200912,3,2009,20,11,200903),('2009-03-21',200912,3,2009,21,11,200903),('2009-03-22',200913,3,2009,22,12,200903),('2009-03-23',200913,3,2009,23,12,200903),('2009-03-24',200913,3,2009,24,12,200903),('2009-03-25',200913,3,2009,25,12,200903),('2009-03-26',200913,3,2009,26,12,200903),('2009-03-27',200913,3,2009,27,12,200903),('2009-03-28',200913,3,2009,28,12,200903),('2009-03-29',200914,3,2009,29,13,200903),('2009-03-30',200914,3,2009,30,13,200903),('2009-03-31',200914,3,2009,31,13,200903),('2009-04-01',200914,4,2009,1,13,200904),('2009-04-02',200914,4,2009,2,13,200904),('2009-04-03',200914,4,2009,3,13,200904),('2009-04-04',200914,4,2009,4,13,200904),('2009-04-05',200915,4,2009,5,14,200904),('2009-04-06',200915,4,2009,6,14,200904),('2009-04-07',200915,4,2009,7,14,200904),('2009-04-08',200915,4,2009,8,14,200904),('2009-04-09',200915,4,2009,9,14,200904),('2009-04-10',200915,4,2009,10,14,200904),('2009-04-11',200915,4,2009,11,14,200904),('2009-04-12',200916,4,2009,12,15,200904),('2009-04-13',200916,4,2009,13,15,200904),('2009-04-14',200916,4,2009,14,15,200904),('2009-04-15',200916,4,2009,15,15,200904),('2009-04-16',200916,4,2009,16,15,200904),('2009-04-17',200916,4,2009,17,15,200904),('2009-04-18',200916,4,2009,18,15,200904),('2009-04-19',200917,4,2009,19,16,200904),('2009-04-20',200917,4,2009,20,16,200904),('2009-04-21',200917,4,2009,21,16,200904),('2009-04-22',200917,4,2009,22,16,200904),('2009-04-23',200917,4,2009,23,16,200904),('2009-04-24',200917,4,2009,24,16,200904),('2009-04-25',200917,4,2009,25,16,200904),('2009-04-26',200918,4,2009,26,17,200904),('2009-04-27',200918,4,2009,27,17,200904),('2009-04-28',200918,4,2009,28,17,200904),('2009-04-29',200918,4,2009,29,17,200904),('2009-04-30',200918,4,2009,30,17,200904),('2009-05-01',200918,5,2009,1,17,200905),('2009-05-02',200918,5,2009,2,17,200905),('2009-05-03',200919,5,2009,3,18,200905),('2009-05-04',200919,5,2009,4,18,200905),('2009-05-05',200919,5,2009,5,18,200905),('2009-05-06',200919,5,2009,6,18,200905),('2009-05-07',200919,5,2009,7,18,200905),('2009-05-08',200919,5,2009,8,18,200905),('2009-05-09',200919,5,2009,9,18,200905),('2009-05-10',200920,5,2009,10,19,200905),('2009-05-11',200920,5,2009,11,19,200905),('2009-05-12',200920,5,2009,12,19,200905),('2009-05-13',200920,5,2009,13,19,200905),('2009-05-14',200920,5,2009,14,19,200905),('2009-05-15',200920,5,2009,15,19,200905),('2009-05-16',200920,5,2009,16,19,200905),('2009-05-17',200921,5,2009,17,20,200905),('2009-05-18',200921,5,2009,18,20,200905),('2009-05-19',200921,5,2009,19,20,200905),('2009-05-20',200921,5,2009,20,20,200905),('2009-05-21',200921,5,2009,21,20,200905),('2009-05-22',200921,5,2009,22,20,200905),('2009-05-23',200921,5,2009,23,20,200905),('2009-05-24',200922,5,2009,24,21,200905),('2009-05-25',200922,5,2009,25,21,200905),('2009-05-26',200922,5,2009,26,21,200905),('2009-05-27',200922,5,2009,27,21,200905),('2009-05-28',200922,5,2009,28,21,200905),('2009-05-29',200922,5,2009,29,21,200905),('2009-05-30',200922,5,2009,30,21,200905),('2009-05-31',200923,5,2009,31,22,200905),('2009-06-01',200923,6,2009,1,22,200906),('2009-06-02',200923,6,2009,2,22,200906),('2009-06-03',200923,6,2009,3,22,200906),('2009-06-04',200923,6,2009,4,22,200906),('2009-06-05',200923,6,2009,5,22,200906),('2009-06-06',200923,6,2009,6,22,200906),('2009-06-07',200924,6,2009,7,23,200906),('2009-06-08',200924,6,2009,8,23,200906),('2009-06-09',200924,6,2009,9,23,200906),('2009-06-10',200924,6,2009,10,23,200906),('2009-06-11',200924,6,2009,11,23,200906),('2009-06-12',200924,6,2009,12,23,200906),('2009-06-13',200924,6,2009,13,23,200906),('2009-06-14',200925,6,2009,14,24,200906),('2009-06-15',200925,6,2009,15,24,200906),('2009-06-16',200925,6,2009,16,24,200906),('2009-06-17',200925,6,2009,17,24,200906),('2009-06-18',200925,6,2009,18,24,200906),('2009-06-19',200925,6,2009,19,24,200906),('2009-06-20',200925,6,2009,20,24,200906),('2009-06-21',200926,6,2009,21,25,200906),('2009-06-22',200926,6,2009,22,25,200906),('2009-06-23',200926,6,2009,23,25,200906),('2009-06-24',200926,6,2009,24,25,200906),('2009-06-25',200926,6,2009,25,25,200906),('2009-06-26',200926,6,2009,26,25,200906),('2009-06-27',200926,6,2009,27,25,200906),('2009-06-28',200927,6,2009,28,26,200906),('2009-06-29',200927,6,2009,29,26,200906),('2009-06-30',200927,6,2009,30,26,200906),('2009-07-01',200927,7,2009,1,26,200907),('2009-07-02',200927,7,2009,2,26,200907),('2009-07-03',200927,7,2009,3,26,200907),('2009-07-04',200927,7,2009,4,26,200907),('2009-07-05',200928,7,2009,5,27,200907),('2009-07-06',200928,7,2009,6,27,200907),('2009-07-07',200928,7,2009,7,27,200907),('2009-07-08',200928,7,2009,8,27,200907),('2009-07-09',200928,7,2009,9,27,200907),('2009-07-10',200928,7,2009,10,27,200907),('2009-07-11',200928,7,2009,11,27,200907),('2009-07-12',200929,7,2009,12,28,200907),('2009-07-13',200929,7,2009,13,28,200907),('2009-07-14',200929,7,2009,14,28,200907),('2009-07-15',200929,7,2009,15,28,200907),('2009-07-16',200929,7,2009,16,28,200907),('2009-07-17',200929,7,2009,17,28,200907),('2009-07-18',200929,7,2009,18,28,200907),('2009-07-19',200930,7,2009,19,29,200907),('2009-07-20',200930,7,2009,20,29,200907),('2009-07-21',200930,7,2009,21,29,200907),('2009-07-22',200930,7,2009,22,29,200907),('2009-07-23',200930,7,2009,23,29,200907),('2009-07-24',200930,7,2009,24,29,200907),('2009-07-25',200930,7,2009,25,29,200907),('2009-07-26',200931,7,2009,26,30,200907),('2009-07-27',200931,7,2009,27,30,200907),('2009-07-28',200931,7,2009,28,30,200907),('2009-07-29',200931,7,2009,29,30,200907),('2009-07-30',200931,7,2009,30,30,200907),('2009-07-31',200931,7,2009,31,30,200907),('2009-08-01',200931,8,2009,1,30,200908),('2009-08-02',200932,8,2009,2,31,200908),('2009-08-03',200932,8,2009,3,31,200908),('2009-08-04',200932,8,2009,4,31,200908),('2009-08-05',200932,8,2009,5,31,200908),('2009-08-06',200932,8,2009,6,31,200908),('2009-08-07',200932,8,2009,7,31,200908),('2009-08-08',200932,8,2009,8,31,200908),('2009-08-09',200933,8,2009,9,32,200908),('2009-08-10',200933,8,2009,10,32,200908),('2009-08-11',200933,8,2009,11,32,200908),('2009-08-12',200933,8,2009,12,32,200908),('2009-08-13',200933,8,2009,13,32,200908),('2009-08-14',200933,8,2009,14,32,200908),('2009-08-15',200933,8,2009,15,32,200908),('2009-08-16',200934,8,2009,16,33,200908),('2009-08-17',200934,8,2009,17,33,200908),('2009-08-18',200934,8,2009,18,33,200908),('2009-08-19',200934,8,2009,19,33,200908),('2009-08-20',200934,8,2009,20,33,200908),('2009-08-21',200934,8,2009,21,33,200908),('2009-08-22',200934,8,2009,22,33,200908),('2009-08-23',200935,8,2009,23,34,200908),('2009-08-24',200935,8,2009,24,34,200908),('2009-08-25',200935,8,2009,25,34,200908),('2009-08-26',200935,8,2009,26,34,200908),('2009-08-27',200935,8,2009,27,34,200908),('2009-08-28',200935,8,2009,28,34,200908),('2009-08-29',200935,8,2009,29,34,200908),('2009-08-30',200936,8,2009,30,35,200908),('2009-08-31',200936,8,2009,31,35,200908),('2009-09-01',200936,9,2009,1,35,200909),('2009-09-02',200936,9,2009,2,35,200909),('2009-09-03',200936,9,2009,3,35,200909),('2009-09-04',200936,9,2009,4,35,200909),('2009-09-05',200936,9,2009,5,35,200909),('2009-09-06',200937,9,2009,6,36,200909),('2009-09-07',200937,9,2009,7,36,200909),('2009-09-08',200937,9,2009,8,36,200909),('2009-09-09',200937,9,2009,9,36,200909),('2009-09-10',200937,9,2009,10,36,200909),('2009-09-11',200937,9,2009,11,36,200909),('2009-09-12',200937,9,2009,12,36,200909),('2009-09-13',200938,9,2009,13,37,200909),('2009-09-14',200938,9,2009,14,37,200909),('2009-09-15',200938,9,2009,15,37,200909),('2009-09-16',200938,9,2009,16,37,200909),('2009-09-17',200938,9,2009,17,37,200909),('2009-09-18',200938,9,2009,18,37,200909),('2009-09-19',200938,9,2009,19,37,200909),('2009-09-20',200939,9,2009,20,38,200909),('2009-09-21',200939,9,2009,21,38,200909),('2009-09-22',200939,9,2009,22,38,200909),('2009-09-23',200939,9,2009,23,38,200909),('2009-09-24',200939,9,2009,24,38,200909),('2009-09-25',200939,9,2009,25,38,200909),('2009-09-26',200939,9,2009,26,38,200909),('2009-09-27',200940,9,2009,27,39,200909),('2009-09-28',200940,9,2009,28,39,200909),('2009-09-29',200940,9,2009,29,39,200909),('2009-09-30',200940,9,2009,30,39,200909),('2009-10-01',200940,10,2009,1,39,200910),('2009-10-02',200940,10,2009,2,39,200910),('2009-10-03',200940,10,2009,3,39,200910),('2009-10-04',200941,10,2009,4,40,200910),('2009-10-05',200941,10,2009,5,40,200910),('2009-10-06',200941,10,2009,6,40,200910),('2009-10-07',200941,10,2009,7,40,200910),('2009-10-08',200941,10,2009,8,40,200910),('2009-10-09',200941,10,2009,9,40,200910),('2009-10-10',200941,10,2009,10,40,200910),('2009-10-11',200942,10,2009,11,41,200910),('2009-10-12',200942,10,2009,12,41,200910),('2009-10-13',200942,10,2009,13,41,200910),('2009-10-14',200942,10,2009,14,41,200910),('2009-10-15',200942,10,2009,15,41,200910),('2009-10-16',200942,10,2009,16,41,200910),('2009-10-17',200942,10,2009,17,41,200910),('2009-10-18',200943,10,2009,18,42,200910),('2009-10-19',200943,10,2009,19,42,200910),('2009-10-20',200943,10,2009,20,42,200910),('2009-10-21',200943,10,2009,21,42,200910),('2009-10-22',200943,10,2009,22,42,200910),('2009-10-23',200943,10,2009,23,42,200910),('2009-10-24',200943,10,2009,24,42,200910),('2009-10-25',200944,10,2009,25,43,200910),('2009-10-26',200944,10,2009,26,43,200910),('2009-10-27',200944,10,2009,27,43,200910),('2009-10-28',200944,10,2009,28,43,200910),('2009-10-29',200944,10,2009,29,43,200910),('2009-10-30',200944,10,2009,30,43,200910),('2009-10-31',200944,10,2009,31,43,200910),('2009-11-01',200945,11,2009,1,44,200911),('2009-11-02',200945,11,2009,2,44,200911),('2009-11-03',200945,11,2009,3,44,200911),('2009-11-04',200945,11,2009,4,44,200911),('2009-11-05',200945,11,2009,5,44,200911),('2009-11-06',200945,11,2009,6,44,200911),('2009-11-07',200945,11,2009,7,44,200911),('2009-11-08',200946,11,2009,8,45,200911),('2009-11-09',200946,11,2009,9,45,200911),('2009-11-10',200946,11,2009,10,45,200911),('2009-11-11',200946,11,2009,11,45,200911),('2009-11-12',200946,11,2009,12,45,200911),('2009-11-13',200946,11,2009,13,45,200911),('2009-11-14',200946,11,2009,14,45,200911),('2009-11-15',200947,11,2009,15,46,200911),('2009-11-16',200947,11,2009,16,46,200911),('2009-11-17',200947,11,2009,17,46,200911),('2009-11-18',200947,11,2009,18,46,200911),('2009-11-19',200947,11,2009,19,46,200911),('2009-11-20',200947,11,2009,20,46,200911),('2009-11-21',200947,11,2009,21,46,200911),('2009-11-22',200948,11,2009,22,47,200911),('2009-11-23',200948,11,2009,23,47,200911),('2009-11-24',200948,11,2009,24,47,200911),('2009-11-25',200948,11,2009,25,47,200911),('2009-11-26',200948,11,2009,26,47,200911),('2009-11-27',200948,11,2009,27,47,200911),('2009-11-28',200948,11,2009,28,47,200911),('2009-11-29',200949,11,2009,29,48,200911),('2009-11-30',200949,11,2009,30,48,200911),('2009-12-01',200949,12,2009,1,48,200912),('2009-12-02',200949,12,2009,2,48,200912),('2009-12-03',200949,12,2009,3,48,200912),('2009-12-04',200949,12,2009,4,48,200912),('2009-12-05',200949,12,2009,5,48,200912),('2009-12-06',200950,12,2009,6,49,200912),('2009-12-07',200950,12,2009,7,49,200912),('2009-12-08',200950,12,2009,8,49,200912),('2009-12-09',200950,12,2009,9,49,200912),('2009-12-10',200950,12,2009,10,49,200912),('2009-12-11',200950,12,2009,11,49,200912),('2009-12-12',200950,12,2009,12,49,200912),('2009-12-13',200951,12,2009,13,50,200912),('2009-12-14',200951,12,2009,14,50,200912),('2009-12-15',200951,12,2009,15,50,200912),('2009-12-16',200951,12,2009,16,50,200912),('2009-12-17',200951,12,2009,17,50,200912),('2009-12-18',200951,12,2009,18,50,200912),('2009-12-19',200951,12,2009,19,50,200912),('2009-12-20',200952,12,2009,20,51,200912),('2009-12-21',200952,12,2009,21,51,200912),('2009-12-22',200952,12,2009,22,51,200912),('2009-12-23',200952,12,2009,23,51,200912),('2009-12-24',200952,12,2009,24,51,200912),('2009-12-25',200952,12,2009,25,51,200912),('2009-12-26',200952,12,2009,26,51,200912),('2009-12-27',200953,12,2009,27,52,200912),('2009-12-28',200952,12,2009,28,52,200912),('2009-12-29',200952,12,2009,29,52,200912),('2009-12-30',200952,12,2009,30,52,200912),('2009-12-31',200952,12,2009,31,52,200912),('2010-01-01',201001,1,2010,1,52,201001),('2010-01-02',201001,1,2010,2,52,201001),('2010-01-03',201002,1,2010,3,1,201001),('2010-01-04',201001,1,2010,4,1,201001),('2010-01-05',201001,1,2010,5,1,201001),('2010-01-06',201001,1,2010,6,1,201001),('2010-01-07',201001,1,2010,7,1,201001),('2010-01-08',201001,1,2010,8,1,201001),('2010-01-09',201001,1,2010,9,1,201001),('2010-01-10',201002,1,2010,10,2,201001),('2010-01-11',201002,1,2010,11,2,201001),('2010-01-12',201002,1,2010,12,2,201001),('2010-01-13',201002,1,2010,13,2,201001),('2010-01-14',201002,1,2010,14,2,201001),('2010-01-15',201002,1,2010,15,2,201001),('2010-01-16',201002,1,2010,16,2,201001),('2010-01-17',201003,1,2010,17,3,201001),('2010-01-18',201003,1,2010,18,3,201001),('2010-01-19',201003,1,2010,19,3,201001),('2010-01-20',201003,1,2010,20,3,201001),('2010-01-21',201003,1,2010,21,3,201001),('2010-01-22',201003,1,2010,22,3,201001),('2010-01-23',201003,1,2010,23,3,201001),('2010-01-24',201004,1,2010,24,4,201001),('2010-01-25',201004,1,2010,25,4,201001),('2010-01-26',201004,1,2010,26,4,201001),('2010-01-27',201004,1,2010,27,4,201001),('2010-01-28',201004,1,2010,28,4,201001),('2010-01-29',201004,1,2010,29,4,201001),('2010-01-30',201004,1,2010,30,4,201001),('2010-01-31',201005,1,2010,31,5,201001),('2010-02-01',201005,2,2010,1,5,201002),('2010-02-02',201005,2,2010,2,5,201002),('2010-02-03',201005,2,2010,3,5,201002),('2010-02-04',201005,2,2010,4,5,201002),('2010-02-05',201005,2,2010,5,5,201002),('2010-02-06',201005,2,2010,6,5,201002),('2010-02-07',201006,2,2010,7,6,201002),('2010-02-08',201006,2,2010,8,6,201002),('2010-02-09',201006,2,2010,9,6,201002),('2010-02-10',201006,2,2010,10,6,201002),('2010-02-11',201006,2,2010,11,6,201002),('2010-02-12',201006,2,2010,12,6,201002),('2010-02-13',201006,2,2010,13,6,201002),('2010-02-14',201007,2,2010,14,7,201002),('2010-02-15',201007,2,2010,15,7,201002),('2010-02-16',201007,2,2010,16,7,201002),('2010-02-17',201007,2,2010,17,7,201002),('2010-02-18',201007,2,2010,18,7,201002),('2010-02-19',201007,2,2010,19,7,201002),('2010-02-20',201007,2,2010,20,7,201002),('2010-02-21',201008,2,2010,21,8,201002),('2010-02-22',201008,2,2010,22,8,201002),('2010-02-23',201008,2,2010,23,8,201002),('2010-02-24',201008,2,2010,24,8,201002),('2010-02-25',201008,2,2010,25,8,201002),('2010-02-26',201008,2,2010,26,8,201002),('2010-02-27',201008,2,2010,27,8,201002),('2010-02-28',201009,2,2010,28,9,201002),('2010-03-01',201009,3,2010,1,9,201003),('2010-03-02',201009,3,2010,2,9,201003),('2010-03-03',201009,3,2010,3,9,201003),('2010-03-04',201009,3,2010,4,9,201003),('2010-03-05',201009,3,2010,5,9,201003),('2010-03-06',201009,3,2010,6,9,201003),('2010-03-07',201010,3,2010,7,10,201003),('2010-03-08',201010,3,2010,8,10,201003),('2010-03-09',201010,3,2010,9,10,201003),('2010-03-10',201010,3,2010,10,10,201003),('2010-03-11',201010,3,2010,11,10,201003),('2010-03-12',201010,3,2010,12,10,201003),('2010-03-13',201010,3,2010,13,10,201003),('2010-03-14',201011,3,2010,14,11,201003),('2010-03-15',201011,3,2010,15,11,201003),('2010-03-16',201011,3,2010,16,11,201003),('2010-03-17',201011,3,2010,17,11,201003),('2010-03-18',201011,3,2010,18,11,201003),('2010-03-19',201011,3,2010,19,11,201003),('2010-03-20',201011,3,2010,20,11,201003),('2010-03-21',201012,3,2010,21,12,201003),('2010-03-22',201012,3,2010,22,12,201003),('2010-03-23',201012,3,2010,23,12,201003),('2010-03-24',201012,3,2010,24,12,201003),('2010-03-25',201012,3,2010,25,12,201003),('2010-03-26',201012,3,2010,26,12,201003),('2010-03-27',201012,3,2010,27,12,201003),('2010-03-28',201013,3,2010,28,13,201003),('2010-03-29',201013,3,2010,29,13,201003),('2010-03-30',201013,3,2010,30,13,201003),('2010-03-31',201013,3,2010,31,13,201003),('2010-04-01',201013,4,2010,1,13,201004),('2010-04-02',201013,4,2010,2,13,201004),('2010-04-03',201013,4,2010,3,13,201004),('2010-04-04',201014,4,2010,4,14,201004),('2010-04-05',201014,4,2010,5,14,201004),('2010-04-06',201014,4,2010,6,14,201004),('2010-04-07',201014,4,2010,7,14,201004),('2010-04-08',201014,4,2010,8,14,201004),('2010-04-09',201014,4,2010,9,14,201004),('2010-04-10',201014,4,2010,10,14,201004),('2010-04-11',201015,4,2010,11,15,201004),('2010-04-12',201015,4,2010,12,15,201004),('2010-04-13',201015,4,2010,13,15,201004),('2010-04-14',201015,4,2010,14,15,201004),('2010-04-15',201015,4,2010,15,15,201004),('2010-04-16',201015,4,2010,16,15,201004),('2010-04-17',201015,4,2010,17,15,201004),('2010-04-18',201016,4,2010,18,16,201004),('2010-04-19',201016,4,2010,19,16,201004),('2010-04-20',201016,4,2010,20,16,201004),('2010-04-21',201016,4,2010,21,16,201004),('2010-04-22',201016,4,2010,22,16,201004),('2010-04-23',201016,4,2010,23,16,201004),('2010-04-24',201016,4,2010,24,16,201004),('2010-04-25',201017,4,2010,25,17,201004),('2010-04-26',201017,4,2010,26,17,201004),('2010-04-27',201017,4,2010,27,17,201004),('2010-04-28',201017,4,2010,28,17,201004),('2010-04-29',201017,4,2010,29,17,201004),('2010-04-30',201017,4,2010,30,17,201004),('2010-05-01',201017,5,2010,1,17,201005),('2010-05-02',201018,5,2010,2,18,201005),('2010-05-03',201018,5,2010,3,18,201005),('2010-05-04',201018,5,2010,4,18,201005),('2010-05-05',201018,5,2010,5,18,201005),('2010-05-06',201018,5,2010,6,18,201005),('2010-05-07',201018,5,2010,7,18,201005),('2010-05-08',201018,5,2010,8,18,201005),('2010-05-09',201019,5,2010,9,19,201005),('2010-05-10',201019,5,2010,10,19,201005),('2010-05-11',201019,5,2010,11,19,201005),('2010-05-12',201019,5,2010,12,19,201005),('2010-05-13',201019,5,2010,13,19,201005),('2010-05-14',201019,5,2010,14,19,201005),('2010-05-15',201019,5,2010,15,19,201005),('2010-05-16',201020,5,2010,16,20,201005),('2010-05-17',201020,5,2010,17,20,201005),('2010-05-18',201020,5,2010,18,20,201005),('2010-05-19',201020,5,2010,19,20,201005),('2010-05-20',201020,5,2010,20,20,201005),('2010-05-21',201020,5,2010,21,20,201005),('2010-05-22',201020,5,2010,22,20,201005),('2010-05-23',201021,5,2010,23,21,201005),('2010-05-24',201021,5,2010,24,21,201005),('2010-05-25',201021,5,2010,25,21,201005),('2010-05-26',201021,5,2010,26,21,201005),('2010-05-27',201021,5,2010,27,21,201005),('2010-05-28',201021,5,2010,28,21,201005),('2010-05-29',201021,5,2010,29,21,201005),('2010-05-30',201022,5,2010,30,22,201005),('2010-05-31',201022,5,2010,31,22,201005),('2010-06-01',201022,6,2010,1,22,201006),('2010-06-02',201022,6,2010,2,22,201006),('2010-06-03',201022,6,2010,3,22,201006),('2010-06-04',201022,6,2010,4,22,201006),('2010-06-05',201022,6,2010,5,22,201006),('2010-06-06',201023,6,2010,6,23,201006),('2010-06-07',201023,6,2010,7,23,201006),('2010-06-08',201023,6,2010,8,23,201006),('2010-06-09',201023,6,2010,9,23,201006),('2010-06-10',201023,6,2010,10,23,201006),('2010-06-11',201023,6,2010,11,23,201006),('2010-06-12',201023,6,2010,12,23,201006),('2010-06-13',201024,6,2010,13,24,201006),('2010-06-14',201024,6,2010,14,24,201006),('2010-06-15',201024,6,2010,15,24,201006),('2010-06-16',201024,6,2010,16,24,201006),('2010-06-17',201024,6,2010,17,24,201006),('2010-06-18',201024,6,2010,18,24,201006),('2010-06-19',201024,6,2010,19,24,201006),('2010-06-20',201025,6,2010,20,25,201006),('2010-06-21',201025,6,2010,21,25,201006),('2010-06-22',201025,6,2010,22,25,201006),('2010-06-23',201025,6,2010,23,25,201006),('2010-06-24',201025,6,2010,24,25,201006),('2010-06-25',201025,6,2010,25,25,201006),('2010-06-26',201025,6,2010,26,25,201006),('2010-06-27',201026,6,2010,27,26,201006),('2010-06-28',201026,6,2010,28,26,201006),('2010-06-29',201026,6,2010,29,26,201006),('2010-06-30',201026,6,2010,30,26,201006),('2010-07-01',201026,7,2010,1,26,201007),('2010-07-02',201026,7,2010,2,26,201007),('2010-07-03',201026,7,2010,3,26,201007),('2010-07-04',201027,7,2010,4,27,201007),('2010-07-05',201027,7,2010,5,27,201007),('2010-07-06',201027,7,2010,6,27,201007),('2010-07-07',201027,7,2010,7,27,201007),('2010-07-08',201027,7,2010,8,27,201007),('2010-07-09',201027,7,2010,9,27,201007),('2010-07-10',201027,7,2010,10,27,201007),('2010-07-11',201028,7,2010,11,28,201007),('2010-07-12',201028,7,2010,12,28,201007),('2010-07-13',201028,7,2010,13,28,201007),('2010-07-14',201028,7,2010,14,28,201007),('2010-07-15',201028,7,2010,15,28,201007),('2010-07-16',201028,7,2010,16,28,201007),('2010-07-17',201028,7,2010,17,28,201007),('2010-07-18',201029,7,2010,18,29,201007),('2010-07-19',201029,7,2010,19,29,201007),('2010-07-20',201029,7,2010,20,29,201007),('2010-07-21',201029,7,2010,21,29,201007),('2010-07-22',201029,7,2010,22,29,201007),('2010-07-23',201029,7,2010,23,29,201007),('2010-07-24',201029,7,2010,24,29,201007),('2010-07-25',201030,7,2010,25,30,201007),('2010-07-26',201030,7,2010,26,30,201007),('2010-07-27',201030,7,2010,27,30,201007),('2010-07-28',201030,7,2010,28,30,201007),('2010-07-29',201030,7,2010,29,30,201007),('2010-07-30',201030,7,2010,30,30,201007),('2010-07-31',201030,7,2010,31,30,201007),('2010-08-01',201031,8,2010,1,31,201008),('2010-08-02',201031,8,2010,2,31,201008),('2010-08-03',201031,8,2010,3,31,201008),('2010-08-04',201031,8,2010,4,31,201008),('2010-08-05',201031,8,2010,5,31,201008),('2010-08-06',201031,8,2010,6,31,201008),('2010-08-07',201031,8,2010,7,31,201008),('2010-08-08',201032,8,2010,8,32,201008),('2010-08-09',201032,8,2010,9,32,201008),('2010-08-10',201032,8,2010,10,32,201008),('2010-08-11',201032,8,2010,11,32,201008),('2010-08-12',201032,8,2010,12,32,201008),('2010-08-13',201032,8,2010,13,32,201008),('2010-08-14',201032,8,2010,14,32,201008),('2010-08-15',201033,8,2010,15,33,201008),('2010-08-16',201033,8,2010,16,33,201008),('2010-08-17',201033,8,2010,17,33,201008),('2010-08-18',201033,8,2010,18,33,201008),('2010-08-19',201033,8,2010,19,33,201008),('2010-08-20',201033,8,2010,20,33,201008),('2010-08-21',201033,8,2010,21,33,201008),('2010-08-22',201034,8,2010,22,34,201008),('2010-08-23',201034,8,2010,23,34,201008),('2010-08-24',201034,8,2010,24,34,201008),('2010-08-25',201034,8,2010,25,34,201008),('2010-08-26',201034,8,2010,26,34,201008),('2010-08-27',201034,8,2010,27,34,201008),('2010-08-28',201034,8,2010,28,34,201008),('2010-08-29',201035,8,2010,29,35,201008),('2010-08-30',201035,8,2010,30,35,201008),('2010-08-31',201035,8,2010,31,35,201008),('2010-09-01',201035,9,2010,1,35,201009),('2010-09-02',201035,9,2010,2,35,201009),('2010-09-03',201035,9,2010,3,35,201009),('2010-09-04',201035,9,2010,4,35,201009),('2010-09-05',201036,9,2010,5,36,201009),('2010-09-06',201036,9,2010,6,36,201009),('2010-09-07',201036,9,2010,7,36,201009),('2010-09-08',201036,9,2010,8,36,201009),('2010-09-09',201036,9,2010,9,36,201009),('2010-09-10',201036,9,2010,10,36,201009),('2010-09-11',201036,9,2010,11,36,201009),('2010-09-12',201037,9,2010,12,37,201009),('2010-09-13',201037,9,2010,13,37,201009),('2010-09-14',201037,9,2010,14,37,201009),('2010-09-15',201037,9,2010,15,37,201009),('2010-09-16',201037,9,2010,16,37,201009),('2010-09-17',201037,9,2010,17,37,201009),('2010-09-18',201037,9,2010,18,37,201009),('2010-09-19',201038,9,2010,19,38,201009),('2010-09-20',201038,9,2010,20,38,201009),('2010-09-21',201038,9,2010,21,38,201009),('2010-09-22',201038,9,2010,22,38,201009),('2010-09-23',201038,9,2010,23,38,201009),('2010-09-24',201038,9,2010,24,38,201009),('2010-09-25',201038,9,2010,25,38,201009),('2010-09-26',201039,9,2010,26,39,201009),('2010-09-27',201039,9,2010,27,39,201009),('2010-09-28',201039,9,2010,28,39,201009),('2010-09-29',201039,9,2010,29,39,201009),('2010-09-30',201039,9,2010,30,39,201009),('2010-10-01',201039,10,2010,1,39,201010),('2010-10-02',201039,10,2010,2,39,201010),('2010-10-03',201040,10,2010,3,40,201010),('2010-10-04',201040,10,2010,4,40,201010),('2010-10-05',201040,10,2010,5,40,201010),('2010-10-06',201040,10,2010,6,40,201010),('2010-10-07',201040,10,2010,7,40,201010),('2010-10-08',201040,10,2010,8,40,201010),('2010-10-09',201040,10,2010,9,40,201010),('2010-10-10',201041,10,2010,10,41,201010),('2010-10-11',201041,10,2010,11,41,201010),('2010-10-12',201041,10,2010,12,41,201010),('2010-10-13',201041,10,2010,13,41,201010),('2010-10-14',201041,10,2010,14,41,201010),('2010-10-15',201041,10,2010,15,41,201010),('2010-10-16',201041,10,2010,16,41,201010),('2010-10-17',201042,10,2010,17,42,201010),('2010-10-18',201042,10,2010,18,42,201010),('2010-10-19',201042,10,2010,19,42,201010),('2010-10-20',201042,10,2010,20,42,201010),('2010-10-21',201042,10,2010,21,42,201010),('2010-10-22',201042,10,2010,22,42,201010),('2010-10-23',201042,10,2010,23,42,201010),('2010-10-24',201043,10,2010,24,43,201010),('2010-10-25',201043,10,2010,25,43,201010),('2010-10-26',201043,10,2010,26,43,201010),('2010-10-27',201043,10,2010,27,43,201010),('2010-10-28',201043,10,2010,28,43,201010),('2010-10-29',201043,10,2010,29,43,201010),('2010-10-30',201043,10,2010,30,43,201010),('2010-10-31',201044,10,2010,31,44,201010),('2010-11-01',201044,11,2010,1,44,201011),('2010-11-02',201044,11,2010,2,44,201011),('2010-11-03',201044,11,2010,3,44,201011),('2010-11-04',201044,11,2010,4,44,201011),('2010-11-05',201044,11,2010,5,44,201011),('2010-11-06',201044,11,2010,6,44,201011),('2010-11-07',201045,11,2010,7,45,201011),('2010-11-08',201045,11,2010,8,45,201011),('2010-11-09',201045,11,2010,9,45,201011),('2010-11-10',201045,11,2010,10,45,201011),('2010-11-11',201045,11,2010,11,45,201011),('2010-11-12',201045,11,2010,12,45,201011),('2010-11-13',201045,11,2010,13,45,201011),('2010-11-14',201046,11,2010,14,46,201011),('2010-11-15',201046,11,2010,15,46,201011),('2010-11-16',201046,11,2010,16,46,201011),('2010-11-17',201046,11,2010,17,46,201011),('2010-11-18',201046,11,2010,18,46,201011),('2010-11-19',201046,11,2010,19,46,201011),('2010-11-20',201046,11,2010,20,46,201011),('2010-11-21',201047,11,2010,21,47,201011),('2010-11-22',201047,11,2010,22,47,201011),('2010-11-23',201047,11,2010,23,47,201011),('2010-11-24',201047,11,2010,24,47,201011),('2010-11-25',201047,11,2010,25,47,201011),('2010-11-26',201047,11,2010,26,47,201011),('2010-11-27',201047,11,2010,27,47,201011),('2010-11-28',201048,11,2010,28,48,201011),('2010-11-29',201048,11,2010,29,48,201011),('2010-11-30',201048,11,2010,30,48,201011),('2010-12-01',201048,12,2010,1,48,201012),('2010-12-02',201048,12,2010,2,48,201012),('2010-12-03',201048,12,2010,3,48,201012),('2010-12-04',201048,12,2010,4,48,201012),('2010-12-05',201049,12,2010,5,49,201012),('2010-12-06',201049,12,2010,6,49,201012),('2010-12-07',201049,12,2010,7,49,201012),('2010-12-08',201049,12,2010,8,49,201012),('2010-12-09',201049,12,2010,9,49,201012),('2010-12-10',201049,12,2010,10,49,201012),('2010-12-11',201049,12,2010,11,49,201012),('2010-12-12',201050,12,2010,12,50,201012),('2010-12-13',201050,12,2010,13,50,201012),('2010-12-14',201050,12,2010,14,50,201012),('2010-12-15',201050,12,2010,15,50,201012),('2010-12-16',201050,12,2010,16,50,201012),('2010-12-17',201050,12,2010,17,50,201012),('2010-12-18',201050,12,2010,18,50,201012),('2010-12-19',201051,12,2010,19,51,201012),('2010-12-20',201051,12,2010,20,51,201012),('2010-12-21',201051,12,2010,21,51,201012),('2010-12-22',201051,12,2010,22,51,201012),('2010-12-23',201051,12,2010,23,51,201012),('2010-12-24',201051,12,2010,24,51,201012),('2010-12-25',201051,12,2010,25,51,201012),('2010-12-26',201052,12,2010,26,52,201012),('2010-12-27',201052,12,2010,27,52,201012),('2010-12-28',201052,12,2010,28,52,201012),('2010-12-29',201052,12,2010,29,52,201012),('2010-12-30',201052,12,2010,30,52,201012),('2010-12-31',201052,12,2010,31,52,201012),('2011-01-01',201052,1,2011,1,52,201101),('2011-01-02',201053,1,2011,2,1,201101),('2011-01-03',201101,1,2011,3,1,201101),('2011-01-04',201101,1,2011,4,1,201101),('2011-01-05',201101,1,2011,5,1,201101),('2011-01-06',201101,1,2011,6,1,201101),('2011-01-07',201101,1,2011,7,1,201101),('2011-01-08',201101,1,2011,8,1,201101),('2011-01-09',201102,1,2011,9,2,201101),('2011-01-10',201102,1,2011,10,2,201101),('2011-01-11',201102,1,2011,11,2,201101),('2011-01-12',201102,1,2011,12,2,201101),('2011-01-13',201102,1,2011,13,2,201101),('2011-01-14',201102,1,2011,14,2,201101),('2011-01-15',201102,1,2011,15,2,201101),('2011-01-16',201103,1,2011,16,3,201101),('2011-01-17',201103,1,2011,17,3,201101),('2011-01-18',201103,1,2011,18,3,201101),('2011-01-19',201103,1,2011,19,3,201101),('2011-01-20',201103,1,2011,20,3,201101),('2011-01-21',201103,1,2011,21,3,201101),('2011-01-22',201103,1,2011,22,3,201101),('2011-01-23',201104,1,2011,23,4,201101),('2011-01-24',201104,1,2011,24,4,201101),('2011-01-25',201104,1,2011,25,4,201101),('2011-01-26',201104,1,2011,26,4,201101),('2011-01-27',201104,1,2011,27,4,201101),('2011-01-28',201104,1,2011,28,4,201101),('2011-01-29',201104,1,2011,29,4,201101),('2011-01-30',201105,1,2011,30,5,201101),('2011-01-31',201105,1,2011,31,5,201101),('2011-02-01',201105,2,2011,1,5,201102),('2011-02-02',201105,2,2011,2,5,201102),('2011-02-03',201105,2,2011,3,5,201102),('2011-02-04',201105,2,2011,4,5,201102),('2011-02-05',201105,2,2011,5,5,201102),('2011-02-06',201106,2,2011,6,6,201102),('2011-02-07',201106,2,2011,7,6,201102),('2011-02-08',201106,2,2011,8,6,201102),('2011-02-09',201106,2,2011,9,6,201102),('2011-02-10',201106,2,2011,10,6,201102),('2011-02-11',201106,2,2011,11,6,201102),('2011-02-12',201106,2,2011,12,6,201102),('2011-02-13',201107,2,2011,13,7,201102),('2011-02-14',201107,2,2011,14,7,201102),('2011-02-15',201107,2,2011,15,7,201102),('2011-02-16',201107,2,2011,16,7,201102),('2011-02-17',201107,2,2011,17,7,201102),('2011-02-18',201107,2,2011,18,7,201102),('2011-02-19',201107,2,2011,19,7,201102),('2011-02-20',201108,2,2011,20,8,201102),('2011-02-21',201108,2,2011,21,8,201102),('2011-02-22',201108,2,2011,22,8,201102),('2011-02-23',201108,2,2011,23,8,201102),('2011-02-24',201108,2,2011,24,8,201102),('2011-02-25',201108,2,2011,25,8,201102),('2011-02-26',201108,2,2011,26,8,201102),('2011-02-27',201109,2,2011,27,9,201102),('2011-02-28',201109,2,2011,28,9,201102),('2011-03-01',201109,3,2011,1,9,201103),('2011-03-02',201109,3,2011,2,9,201103),('2011-03-03',201109,3,2011,3,9,201103),('2011-03-04',201109,3,2011,4,9,201103),('2011-03-05',201109,3,2011,5,9,201103),('2011-03-06',201110,3,2011,6,10,201103),('2011-03-07',201110,3,2011,7,10,201103),('2011-03-08',201110,3,2011,8,10,201103),('2011-03-09',201110,3,2011,9,10,201103),('2011-03-10',201110,3,2011,10,10,201103),('2011-03-11',201110,3,2011,11,10,201103),('2011-03-12',201110,3,2011,12,10,201103),('2011-03-13',201111,3,2011,13,11,201103),('2011-03-14',201111,3,2011,14,11,201103),('2011-03-15',201111,3,2011,15,11,201103),('2011-03-16',201111,3,2011,16,11,201103),('2011-03-17',201111,3,2011,17,11,201103),('2011-03-18',201111,3,2011,18,11,201103),('2011-03-19',201111,3,2011,19,11,201103),('2011-03-20',201112,3,2011,20,12,201103),('2011-03-21',201112,3,2011,21,12,201103),('2011-03-22',201112,3,2011,22,12,201103),('2011-03-23',201112,3,2011,23,12,201103),('2011-03-24',201112,3,2011,24,12,201103),('2011-03-25',201112,3,2011,25,12,201103),('2011-03-26',201112,3,2011,26,12,201103),('2011-03-27',201113,3,2011,27,13,201103),('2011-03-28',201113,3,2011,28,13,201103),('2011-03-29',201113,3,2011,29,13,201103),('2011-03-30',201113,3,2011,30,13,201103),('2011-03-31',201113,3,2011,31,13,201103),('2011-04-01',201113,4,2011,1,13,201104),('2011-04-02',201113,4,2011,2,13,201104),('2011-04-03',201114,4,2011,3,14,201104),('2011-04-04',201114,4,2011,4,14,201104),('2011-04-05',201114,4,2011,5,14,201104),('2011-04-06',201114,4,2011,6,14,201104),('2011-04-07',201114,4,2011,7,14,201104),('2011-04-08',201114,4,2011,8,14,201104),('2011-04-09',201114,4,2011,9,14,201104),('2011-04-10',201115,4,2011,10,15,201104),('2011-04-11',201115,4,2011,11,15,201104),('2011-04-12',201115,4,2011,12,15,201104),('2011-04-13',201115,4,2011,13,15,201104),('2011-04-14',201115,4,2011,14,15,201104),('2011-04-15',201115,4,2011,15,15,201104),('2011-04-16',201115,4,2011,16,15,201104),('2011-04-17',201116,4,2011,17,16,201104),('2011-04-18',201116,4,2011,18,16,201104),('2011-04-19',201116,4,2011,19,16,201104),('2011-04-20',201116,4,2011,20,16,201104),('2011-04-21',201116,4,2011,21,16,201104),('2011-04-22',201116,4,2011,22,16,201104),('2011-04-23',201116,4,2011,23,16,201104),('2011-04-24',201117,4,2011,24,17,201104),('2011-04-25',201117,4,2011,25,17,201104),('2011-04-26',201117,4,2011,26,17,201104),('2011-04-27',201117,4,2011,27,17,201104),('2011-04-28',201117,4,2011,28,17,201104),('2011-04-29',201117,4,2011,29,17,201104),('2011-04-30',201117,4,2011,30,17,201104),('2011-05-01',201118,5,2011,1,18,201105),('2011-05-02',201118,5,2011,2,18,201105),('2011-05-03',201118,5,2011,3,18,201105),('2011-05-04',201118,5,2011,4,18,201105),('2011-05-05',201118,5,2011,5,18,201105),('2011-05-06',201118,5,2011,6,18,201105),('2011-05-07',201118,5,2011,7,18,201105),('2011-05-08',201119,5,2011,8,19,201105),('2011-05-09',201119,5,2011,9,19,201105),('2011-05-10',201119,5,2011,10,19,201105),('2011-05-11',201119,5,2011,11,19,201105),('2011-05-12',201119,5,2011,12,19,201105),('2011-05-13',201119,5,2011,13,19,201105),('2011-05-14',201119,5,2011,14,19,201105),('2011-05-15',201120,5,2011,15,20,201105),('2011-05-16',201120,5,2011,16,20,201105),('2011-05-17',201120,5,2011,17,20,201105),('2011-05-18',201120,5,2011,18,20,201105),('2011-05-19',201120,5,2011,19,20,201105),('2011-05-20',201120,5,2011,20,20,201105),('2011-05-21',201120,5,2011,21,20,201105),('2011-05-22',201121,5,2011,22,21,201105),('2011-05-23',201121,5,2011,23,21,201105),('2011-05-24',201121,5,2011,24,21,201105),('2011-05-25',201121,5,2011,25,21,201105),('2011-05-26',201121,5,2011,26,21,201105),('2011-05-27',201121,5,2011,27,21,201105),('2011-05-28',201121,5,2011,28,21,201105),('2011-05-29',201122,5,2011,29,22,201105),('2011-05-30',201122,5,2011,30,22,201105),('2011-05-31',201122,5,2011,31,22,201105),('2011-06-01',201122,6,2011,1,22,201106),('2011-06-02',201122,6,2011,2,22,201106),('2011-06-03',201122,6,2011,3,22,201106),('2011-06-04',201122,6,2011,4,22,201106),('2011-06-05',201123,6,2011,5,23,201106),('2011-06-06',201123,6,2011,6,23,201106),('2011-06-07',201123,6,2011,7,23,201106),('2011-06-08',201123,6,2011,8,23,201106),('2011-06-09',201123,6,2011,9,23,201106),('2011-06-10',201123,6,2011,10,23,201106),('2011-06-11',201123,6,2011,11,23,201106),('2011-06-12',201124,6,2011,12,24,201106),('2011-06-13',201124,6,2011,13,24,201106),('2011-06-14',201124,6,2011,14,24,201106),('2011-06-15',201124,6,2011,15,24,201106),('2011-06-16',201124,6,2011,16,24,201106),('2011-06-17',201124,6,2011,17,24,201106),('2011-06-18',201124,6,2011,18,24,201106),('2011-06-19',201125,6,2011,19,25,201106),('2011-06-20',201125,6,2011,20,25,201106),('2011-06-21',201125,6,2011,21,25,201106),('2011-06-22',201125,6,2011,22,25,201106),('2011-06-23',201125,6,2011,23,25,201106),('2011-06-24',201125,6,2011,24,25,201106),('2011-06-25',201125,6,2011,25,25,201106),('2011-06-26',201126,6,2011,26,26,201106),('2011-06-27',201126,6,2011,27,26,201106),('2011-06-28',201126,6,2011,28,26,201106),('2011-06-29',201126,6,2011,29,26,201106),('2011-06-30',201126,6,2011,30,26,201106),('2011-07-01',201126,7,2011,1,26,201107),('2011-07-02',201126,7,2011,2,26,201107),('2011-07-03',201127,7,2011,3,27,201107),('2011-07-04',201127,7,2011,4,27,201107),('2011-07-05',201127,7,2011,5,27,201107),('2011-07-06',201127,7,2011,6,27,201107),('2011-07-07',201127,7,2011,7,27,201107),('2011-07-08',201127,7,2011,8,27,201107),('2011-07-09',201127,7,2011,9,27,201107),('2011-07-10',201128,7,2011,10,28,201107),('2011-07-11',201128,7,2011,11,28,201107),('2011-07-12',201128,7,2011,12,28,201107),('2011-07-13',201128,7,2011,13,28,201107),('2011-07-14',201128,7,2011,14,28,201107),('2011-07-15',201128,7,2011,15,28,201107),('2011-07-16',201128,7,2011,16,28,201107),('2011-07-17',201129,7,2011,17,29,201107),('2011-07-18',201129,7,2011,18,29,201107),('2011-07-19',201129,7,2011,19,29,201107),('2011-07-20',201129,7,2011,20,29,201107),('2011-07-21',201129,7,2011,21,29,201107),('2011-07-22',201129,7,2011,22,29,201107),('2011-07-23',201129,7,2011,23,29,201107),('2011-07-24',201130,7,2011,24,30,201107),('2011-07-25',201130,7,2011,25,30,201107),('2011-07-26',201130,7,2011,26,30,201107),('2011-07-27',201130,7,2011,27,30,201107),('2011-07-28',201130,7,2011,28,30,201107),('2011-07-29',201130,7,2011,29,30,201107),('2011-07-30',201130,7,2011,30,30,201107),('2011-07-31',201131,7,2011,31,31,201107),('2011-08-01',201131,8,2011,1,31,201108),('2011-08-02',201131,8,2011,2,31,201108),('2011-08-03',201131,8,2011,3,31,201108),('2011-08-04',201131,8,2011,4,31,201108),('2011-08-05',201131,8,2011,5,31,201108),('2011-08-06',201131,8,2011,6,31,201108),('2011-08-07',201132,8,2011,7,32,201108),('2011-08-08',201132,8,2011,8,32,201108),('2011-08-09',201132,8,2011,9,32,201108),('2011-08-10',201132,8,2011,10,32,201108),('2011-08-11',201132,8,2011,11,32,201108),('2011-08-12',201132,8,2011,12,32,201108),('2011-08-13',201132,8,2011,13,32,201108),('2011-08-14',201133,8,2011,14,33,201108),('2011-08-15',201133,8,2011,15,33,201108),('2011-08-16',201133,8,2011,16,33,201108),('2011-08-17',201133,8,2011,17,33,201108),('2011-08-18',201133,8,2011,18,33,201108),('2011-08-19',201133,8,2011,19,33,201108),('2011-08-20',201133,8,2011,20,33,201108),('2011-08-21',201134,8,2011,21,34,201108),('2011-08-22',201134,8,2011,22,34,201108),('2011-08-23',201134,8,2011,23,34,201108),('2011-08-24',201134,8,2011,24,34,201108),('2011-08-25',201134,8,2011,25,34,201108),('2011-08-26',201134,8,2011,26,34,201108),('2011-08-27',201134,8,2011,27,34,201108),('2011-08-28',201135,8,2011,28,35,201108),('2011-08-29',201135,8,2011,29,35,201108),('2011-08-30',201135,8,2011,30,35,201108),('2011-08-31',201135,8,2011,31,35,201108),('2011-09-01',201135,9,2011,1,35,201109),('2011-09-02',201135,9,2011,2,35,201109),('2011-09-03',201135,9,2011,3,35,201109),('2011-09-04',201136,9,2011,4,36,201109),('2011-09-05',201136,9,2011,5,36,201109),('2011-09-06',201136,9,2011,6,36,201109),('2011-09-07',201136,9,2011,7,36,201109),('2011-09-08',201136,9,2011,8,36,201109),('2011-09-09',201136,9,2011,9,36,201109),('2011-09-10',201136,9,2011,10,36,201109),('2011-09-11',201137,9,2011,11,37,201109),('2011-09-12',201137,9,2011,12,37,201109),('2011-09-13',201137,9,2011,13,37,201109),('2011-09-14',201137,9,2011,14,37,201109),('2011-09-15',201137,9,2011,15,37,201109),('2011-09-16',201137,9,2011,16,37,201109),('2011-09-17',201137,9,2011,17,37,201109),('2011-09-18',201138,9,2011,18,38,201109),('2011-09-19',201138,9,2011,19,38,201109),('2011-09-20',201138,9,2011,20,38,201109),('2011-09-21',201138,9,2011,21,38,201109),('2011-09-22',201138,9,2011,22,38,201109),('2011-09-23',201138,9,2011,23,38,201109),('2011-09-24',201138,9,2011,24,38,201109),('2011-09-25',201139,9,2011,25,39,201109),('2011-09-26',201139,9,2011,26,39,201109),('2011-09-27',201139,9,2011,27,39,201109),('2011-09-28',201139,9,2011,28,39,201109),('2011-09-29',201139,9,2011,29,39,201109),('2011-09-30',201139,9,2011,30,39,201109),('2011-10-01',201139,10,2011,1,39,201110),('2011-10-02',201140,10,2011,2,40,201110),('2011-10-03',201140,10,2011,3,40,201110),('2011-10-04',201140,10,2011,4,40,201110),('2011-10-05',201140,10,2011,5,40,201110),('2011-10-06',201140,10,2011,6,40,201110),('2011-10-07',201140,10,2011,7,40,201110),('2011-10-08',201140,10,2011,8,40,201110),('2011-10-09',201141,10,2011,9,41,201110),('2011-10-10',201141,10,2011,10,41,201110),('2011-10-11',201141,10,2011,11,41,201110),('2011-10-12',201141,10,2011,12,41,201110),('2011-10-13',201141,10,2011,13,41,201110),('2011-10-14',201141,10,2011,14,41,201110),('2011-10-15',201141,10,2011,15,41,201110),('2011-10-16',201142,10,2011,16,42,201110),('2011-10-17',201142,10,2011,17,42,201110),('2011-10-18',201142,10,2011,18,42,201110),('2011-10-19',201142,10,2011,19,42,201110),('2011-10-20',201142,10,2011,20,42,201110),('2011-10-21',201142,10,2011,21,42,201110),('2011-10-22',201142,10,2011,22,42,201110),('2011-10-23',201143,10,2011,23,43,201110),('2011-10-24',201143,10,2011,24,43,201110),('2011-10-25',201143,10,2011,25,43,201110),('2011-10-26',201143,10,2011,26,43,201110),('2011-10-27',201143,10,2011,27,43,201110),('2011-10-28',201143,10,2011,28,43,201110),('2011-10-29',201143,10,2011,29,43,201110),('2011-10-30',201144,10,2011,30,44,201110),('2011-10-31',201144,10,2011,31,44,201110),('2011-11-01',201144,11,2011,1,44,201111),('2011-11-02',201144,11,2011,2,44,201111),('2011-11-03',201144,11,2011,3,44,201111),('2011-11-04',201144,11,2011,4,44,201111),('2011-11-05',201144,11,2011,5,44,201111),('2011-11-06',201145,11,2011,6,45,201111),('2011-11-07',201145,11,2011,7,45,201111),('2011-11-08',201145,11,2011,8,45,201111),('2011-11-09',201145,11,2011,9,45,201111),('2011-11-10',201145,11,2011,10,45,201111),('2011-11-11',201145,11,2011,11,45,201111),('2011-11-12',201145,11,2011,12,45,201111),('2011-11-13',201146,11,2011,13,46,201111),('2011-11-14',201146,11,2011,14,46,201111),('2011-11-15',201146,11,2011,15,46,201111),('2011-11-16',201146,11,2011,16,46,201111),('2011-11-17',201146,11,2011,17,46,201111),('2011-11-18',201146,11,2011,18,46,201111),('2011-11-19',201146,11,2011,19,46,201111),('2011-11-20',201147,11,2011,20,47,201111),('2011-11-21',201147,11,2011,21,47,201111),('2011-11-22',201147,11,2011,22,47,201111),('2011-11-23',201147,11,2011,23,47,201111),('2011-11-24',201147,11,2011,24,47,201111),('2011-11-25',201147,11,2011,25,47,201111),('2011-11-26',201147,11,2011,26,47,201111),('2011-11-27',201148,11,2011,27,48,201111),('2011-11-28',201148,11,2011,28,48,201111),('2011-11-29',201148,11,2011,29,48,201111),('2011-11-30',201148,11,2011,30,48,201111),('2011-12-01',201148,12,2011,1,48,201112),('2011-12-02',201148,12,2011,2,48,201112),('2011-12-03',201148,12,2011,3,48,201112),('2011-12-04',201149,12,2011,4,49,201112),('2011-12-05',201149,12,2011,5,49,201112),('2011-12-06',201149,12,2011,6,49,201112),('2011-12-07',201149,12,2011,7,49,201112),('2011-12-08',201149,12,2011,8,49,201112),('2011-12-09',201149,12,2011,9,49,201112),('2011-12-10',201149,12,2011,10,49,201112),('2011-12-11',201150,12,2011,11,50,201112),('2011-12-12',201150,12,2011,12,50,201112),('2011-12-13',201150,12,2011,13,50,201112),('2011-12-14',201150,12,2011,14,50,201112),('2011-12-15',201150,12,2011,15,50,201112),('2011-12-16',201150,12,2011,16,50,201112),('2011-12-17',201150,12,2011,17,50,201112),('2011-12-18',201151,12,2011,18,51,201112),('2011-12-19',201151,12,2011,19,51,201112),('2011-12-20',201151,12,2011,20,51,201112),('2011-12-21',201151,12,2011,21,51,201112),('2011-12-22',201151,12,2011,22,51,201112),('2011-12-23',201151,12,2011,23,51,201112),('2011-12-24',201151,12,2011,24,51,201112),('2011-12-25',201152,12,2011,25,52,201112),('2011-12-26',201152,12,2011,26,52,201112),('2011-12-27',201152,12,2011,27,52,201112),('2011-12-28',201152,12,2011,28,52,201112),('2011-12-29',201152,12,2011,29,52,201112),('2011-12-30',201152,12,2011,30,52,201112),('2011-12-31',201152,12,2011,31,52,201112),('2012-01-01',201153,1,2012,1,1,201201),('2012-01-02',201201,1,2012,2,1,201201),('2012-01-03',201201,1,2012,3,1,201201),('2012-01-04',201201,1,2012,4,1,201201),('2012-01-05',201201,1,2012,5,1,201201),('2012-01-06',201201,1,2012,6,1,201201),('2012-01-07',201201,1,2012,7,1,201201),('2012-01-08',201202,1,2012,8,2,201201),('2012-01-09',201202,1,2012,9,2,201201),('2012-01-10',201202,1,2012,10,2,201201),('2012-01-11',201202,1,2012,11,2,201201),('2012-01-12',201202,1,2012,12,2,201201),('2012-01-13',201202,1,2012,13,2,201201),('2012-01-14',201202,1,2012,14,2,201201),('2012-01-15',201203,1,2012,15,3,201201),('2012-01-16',201203,1,2012,16,3,201201),('2012-01-17',201203,1,2012,17,3,201201),('2012-01-18',201203,1,2012,18,3,201201),('2012-01-19',201203,1,2012,19,3,201201),('2012-01-20',201203,1,2012,20,3,201201),('2012-01-21',201203,1,2012,21,3,201201),('2012-01-22',201204,1,2012,22,4,201201),('2012-01-23',201204,1,2012,23,4,201201),('2012-01-24',201204,1,2012,24,4,201201),('2012-01-25',201204,1,2012,25,4,201201),('2012-01-26',201204,1,2012,26,4,201201),('2012-01-27',201204,1,2012,27,4,201201),('2012-01-28',201204,1,2012,28,4,201201),('2012-01-29',201205,1,2012,29,5,201201),('2012-01-30',201205,1,2012,30,5,201201),('2012-01-31',201205,1,2012,31,5,201201),('2012-02-01',201205,2,2012,1,5,201202),('2012-02-02',201205,2,2012,2,5,201202),('2012-02-03',201205,2,2012,3,5,201202),('2012-02-04',201205,2,2012,4,5,201202),('2012-02-05',201206,2,2012,5,6,201202),('2012-02-06',201206,2,2012,6,6,201202),('2012-02-07',201206,2,2012,7,6,201202),('2012-02-08',201206,2,2012,8,6,201202),('2012-02-09',201206,2,2012,9,6,201202),('2012-02-10',201206,2,2012,10,6,201202),('2012-02-11',201206,2,2012,11,6,201202),('2012-02-12',201207,2,2012,12,7,201202),('2012-02-13',201207,2,2012,13,7,201202),('2012-02-14',201207,2,2012,14,7,201202),('2012-02-15',201207,2,2012,15,7,201202),('2012-02-16',201207,2,2012,16,7,201202),('2012-02-17',201207,2,2012,17,7,201202),('2012-02-18',201207,2,2012,18,7,201202),('2012-02-19',201208,2,2012,19,8,201202),('2012-02-20',201208,2,2012,20,8,201202),('2012-02-21',201208,2,2012,21,8,201202),('2012-02-22',201208,2,2012,22,8,201202),('2012-02-23',201208,2,2012,23,8,201202),('2012-02-24',201208,2,2012,24,8,201202),('2012-02-25',201208,2,2012,25,8,201202),('2012-02-26',201209,2,2012,26,9,201202),('2012-02-27',201209,2,2012,27,9,201202),('2012-02-28',201209,2,2012,28,9,201202),('2012-02-29',201209,2,2012,29,9,201202),('2012-03-01',201209,3,2012,1,9,201203),('2012-03-02',201209,3,2012,2,9,201203),('2012-03-03',201209,3,2012,3,9,201203),('2012-03-04',201210,3,2012,4,10,201203),('2012-03-05',201210,3,2012,5,10,201203),('2012-03-06',201210,3,2012,6,10,201203),('2012-03-07',201210,3,2012,7,10,201203),('2012-03-08',201210,3,2012,8,10,201203),('2012-03-09',201210,3,2012,9,10,201203),('2012-03-10',201210,3,2012,10,10,201203),('2012-03-11',201211,3,2012,11,11,201203),('2012-03-12',201211,3,2012,12,11,201203),('2012-03-13',201211,3,2012,13,11,201203),('2012-03-14',201211,3,2012,14,11,201203),('2012-03-15',201211,3,2012,15,11,201203),('2012-03-16',201211,3,2012,16,11,201203),('2012-03-17',201211,3,2012,17,11,201203),('2012-03-18',201212,3,2012,18,12,201203),('2012-03-19',201212,3,2012,19,12,201203),('2012-03-20',201212,3,2012,20,12,201203),('2012-03-21',201212,3,2012,21,12,201203),('2012-03-22',201212,3,2012,22,12,201203),('2012-03-23',201212,3,2012,23,12,201203),('2012-03-24',201212,3,2012,24,12,201203),('2012-03-25',201213,3,2012,25,13,201203),('2012-03-26',201213,3,2012,26,13,201203),('2012-03-27',201213,3,2012,27,13,201203),('2012-03-28',201213,3,2012,28,13,201203),('2012-03-29',201213,3,2012,29,13,201203),('2012-03-30',201213,3,2012,30,13,201203),('2012-03-31',201213,3,2012,31,13,201203),('2012-04-01',201214,4,2012,1,14,201204),('2012-04-02',201214,4,2012,2,14,201204),('2012-04-03',201214,4,2012,3,14,201204),('2012-04-04',201214,4,2012,4,14,201204),('2012-04-05',201214,4,2012,5,14,201204),('2012-04-06',201214,4,2012,6,14,201204),('2012-04-07',201214,4,2012,7,14,201204),('2012-04-08',201215,4,2012,8,15,201204),('2012-04-09',201215,4,2012,9,15,201204),('2012-04-10',201215,4,2012,10,15,201204),('2012-04-11',201215,4,2012,11,15,201204),('2012-04-12',201215,4,2012,12,15,201204),('2012-04-13',201215,4,2012,13,15,201204),('2012-04-14',201215,4,2012,14,15,201204),('2012-04-15',201216,4,2012,15,16,201204),('2012-04-16',201216,4,2012,16,16,201204),('2012-04-17',201216,4,2012,17,16,201204),('2012-04-18',201216,4,2012,18,16,201204),('2012-04-19',201216,4,2012,19,16,201204),('2012-04-20',201216,4,2012,20,16,201204),('2012-04-21',201216,4,2012,21,16,201204),('2012-04-22',201217,4,2012,22,17,201204),('2012-04-23',201217,4,2012,23,17,201204),('2012-04-24',201217,4,2012,24,17,201204),('2012-04-25',201217,4,2012,25,17,201204),('2012-04-26',201217,4,2012,26,17,201204),('2012-04-27',201217,4,2012,27,17,201204),('2012-04-28',201217,4,2012,28,17,201204),('2012-04-29',201218,4,2012,29,18,201204),('2012-04-30',201218,4,2012,30,18,201204),('2012-05-01',201218,5,2012,1,18,201205),('2012-05-02',201218,5,2012,2,18,201205),('2012-05-03',201218,5,2012,3,18,201205),('2012-05-04',201218,5,2012,4,18,201205),('2012-05-05',201218,5,2012,5,18,201205),('2012-05-06',201219,5,2012,6,19,201205),('2012-05-07',201219,5,2012,7,19,201205),('2012-05-08',201219,5,2012,8,19,201205),('2012-05-09',201219,5,2012,9,19,201205),('2012-05-10',201219,5,2012,10,19,201205),('2012-05-11',201219,5,2012,11,19,201205),('2012-05-12',201219,5,2012,12,19,201205),('2012-05-13',201220,5,2012,13,20,201205),('2012-05-14',201220,5,2012,14,20,201205),('2012-05-15',201220,5,2012,15,20,201205),('2012-05-16',201220,5,2012,16,20,201205),('2012-05-17',201220,5,2012,17,20,201205),('2012-05-18',201220,5,2012,18,20,201205),('2012-05-19',201220,5,2012,19,20,201205),('2012-05-20',201221,5,2012,20,21,201205),('2012-05-21',201221,5,2012,21,21,201205),('2012-05-22',201221,5,2012,22,21,201205),('2012-05-23',201221,5,2012,23,21,201205),('2012-05-24',201221,5,2012,24,21,201205),('2012-05-25',201221,5,2012,25,21,201205),('2012-05-26',201221,5,2012,26,21,201205),('2012-05-27',201222,5,2012,27,22,201205),('2012-05-28',201222,5,2012,28,22,201205),('2012-05-29',201222,5,2012,29,22,201205),('2012-05-30',201222,5,2012,30,22,201205),('2012-05-31',201222,5,2012,31,22,201205),('2012-06-01',201222,6,2012,1,22,201206),('2012-06-02',201222,6,2012,2,22,201206),('2012-06-03',201223,6,2012,3,23,201206),('2012-06-04',201223,6,2012,4,23,201206),('2012-06-05',201223,6,2012,5,23,201206),('2012-06-06',201223,6,2012,6,23,201206),('2012-06-07',201223,6,2012,7,23,201206),('2012-06-08',201223,6,2012,8,23,201206),('2012-06-09',201223,6,2012,9,23,201206),('2012-06-10',201224,6,2012,10,24,201206),('2012-06-11',201224,6,2012,11,24,201206),('2012-06-12',201224,6,2012,12,24,201206),('2012-06-13',201224,6,2012,13,24,201206),('2012-06-14',201224,6,2012,14,24,201206),('2012-06-15',201224,6,2012,15,24,201206),('2012-06-16',201224,6,2012,16,24,201206),('2012-06-17',201225,6,2012,17,25,201206),('2012-06-18',201225,6,2012,18,25,201206),('2012-06-19',201225,6,2012,19,25,201206),('2012-06-20',201225,6,2012,20,25,201206),('2012-06-21',201225,6,2012,21,25,201206),('2012-06-22',201225,6,2012,22,25,201206),('2012-06-23',201225,6,2012,23,25,201206),('2012-06-24',201226,6,2012,24,26,201206),('2012-06-25',201226,6,2012,25,26,201206),('2012-06-26',201226,6,2012,26,26,201206),('2012-06-27',201226,6,2012,27,26,201206),('2012-06-28',201226,6,2012,28,26,201206),('2012-06-29',201226,6,2012,29,26,201206),('2012-06-30',201226,6,2012,30,26,201206),('2012-07-01',201227,7,2012,1,27,201207),('2012-07-02',201227,7,2012,2,27,201207),('2012-07-03',201227,7,2012,3,27,201207),('2012-07-04',201227,7,2012,4,27,201207),('2012-07-05',201227,7,2012,5,27,201207),('2012-07-06',201227,7,2012,6,27,201207),('2012-07-07',201227,7,2012,7,27,201207),('2012-07-08',201228,7,2012,8,28,201207),('2012-07-09',201228,7,2012,9,28,201207),('2012-07-10',201228,7,2012,10,28,201207),('2012-07-11',201228,7,2012,11,28,201207),('2012-07-12',201228,7,2012,12,28,201207),('2012-07-13',201228,7,2012,13,28,201207),('2012-07-14',201228,7,2012,14,28,201207),('2012-07-15',201229,7,2012,15,29,201207),('2012-07-16',201229,7,2012,16,29,201207),('2012-07-17',201229,7,2012,17,29,201207),('2012-07-18',201229,7,2012,18,29,201207),('2012-07-19',201229,7,2012,19,29,201207),('2012-07-20',201229,7,2012,20,29,201207),('2012-07-21',201229,7,2012,21,29,201207),('2012-07-22',201230,7,2012,22,30,201207),('2012-07-23',201230,7,2012,23,30,201207),('2012-07-24',201230,7,2012,24,30,201207),('2012-07-25',201230,7,2012,25,30,201207),('2012-07-26',201230,7,2012,26,30,201207),('2012-07-27',201230,7,2012,27,30,201207),('2012-07-28',201230,7,2012,28,30,201207),('2012-07-29',201231,7,2012,29,31,201207),('2012-07-30',201231,7,2012,30,31,201207),('2012-07-31',201231,7,2012,31,31,201207),('2012-08-01',201231,8,2012,1,31,201208),('2012-08-02',201231,8,2012,2,31,201208),('2012-08-03',201231,8,2012,3,31,201208),('2012-08-04',201231,8,2012,4,31,201208),('2012-08-05',201232,8,2012,5,32,201208),('2012-08-06',201232,8,2012,6,32,201208),('2012-08-07',201232,8,2012,7,32,201208),('2012-08-08',201232,8,2012,8,32,201208),('2012-08-09',201232,8,2012,9,32,201208),('2012-08-10',201232,8,2012,10,32,201208),('2012-08-11',201232,8,2012,11,32,201208),('2012-08-12',201233,8,2012,12,33,201208),('2012-08-13',201233,8,2012,13,33,201208),('2012-08-14',201233,8,2012,14,33,201208),('2012-08-15',201233,8,2012,15,33,201208),('2012-08-16',201233,8,2012,16,33,201208),('2012-08-17',201233,8,2012,17,33,201208),('2012-08-18',201233,8,2012,18,33,201208),('2012-08-19',201234,8,2012,19,34,201208),('2012-08-20',201234,8,2012,20,34,201208),('2012-08-21',201234,8,2012,21,34,201208),('2012-08-22',201234,8,2012,22,34,201208),('2012-08-23',201234,8,2012,23,34,201208),('2012-08-24',201234,8,2012,24,34,201208),('2012-08-25',201234,8,2012,25,34,201208),('2012-08-26',201235,8,2012,26,35,201208),('2012-08-27',201235,8,2012,27,35,201208),('2012-08-28',201235,8,2012,28,35,201208),('2012-08-29',201235,8,2012,29,35,201208),('2012-08-30',201235,8,2012,30,35,201208),('2012-08-31',201235,8,2012,31,35,201208),('2012-09-01',201235,9,2012,1,35,201209),('2012-09-02',201236,9,2012,2,36,201209),('2012-09-03',201236,9,2012,3,36,201209),('2012-09-04',201236,9,2012,4,36,201209),('2012-09-05',201236,9,2012,5,36,201209),('2012-09-06',201236,9,2012,6,36,201209),('2012-09-07',201236,9,2012,7,36,201209),('2012-09-08',201236,9,2012,8,36,201209),('2012-09-09',201237,9,2012,9,37,201209),('2012-09-10',201237,9,2012,10,37,201209),('2012-09-11',201237,9,2012,11,37,201209),('2012-09-12',201237,9,2012,12,37,201209),('2012-09-13',201237,9,2012,13,37,201209),('2012-09-14',201237,9,2012,14,37,201209),('2012-09-15',201237,9,2012,15,37,201209),('2012-09-16',201238,9,2012,16,38,201209),('2012-09-17',201238,9,2012,17,38,201209),('2012-09-18',201238,9,2012,18,38,201209),('2012-09-19',201238,9,2012,19,38,201209),('2012-09-20',201238,9,2012,20,38,201209),('2012-09-21',201238,9,2012,21,38,201209),('2012-09-22',201238,9,2012,22,38,201209),('2012-09-23',201239,9,2012,23,39,201209),('2012-09-24',201239,9,2012,24,39,201209),('2012-09-25',201239,9,2012,25,39,201209),('2012-09-26',201239,9,2012,26,39,201209),('2012-09-27',201239,9,2012,27,39,201209),('2012-09-28',201239,9,2012,28,39,201209),('2012-09-29',201239,9,2012,29,39,201209),('2012-09-30',201240,9,2012,30,40,201209),('2012-10-01',201240,10,2012,1,40,201210),('2012-10-02',201240,10,2012,2,40,201210),('2012-10-03',201240,10,2012,3,40,201210),('2012-10-04',201240,10,2012,4,40,201210),('2012-10-05',201240,10,2012,5,40,201210),('2012-10-06',201240,10,2012,6,40,201210),('2012-10-07',201241,10,2012,7,41,201210),('2012-10-08',201241,10,2012,8,41,201210),('2012-10-09',201241,10,2012,9,41,201210),('2012-10-10',201241,10,2012,10,41,201210),('2012-10-11',201241,10,2012,11,41,201210),('2012-10-12',201241,10,2012,12,41,201210),('2012-10-13',201241,10,2012,13,41,201210),('2012-10-14',201242,10,2012,14,42,201210),('2012-10-15',201242,10,2012,15,42,201210),('2012-10-16',201242,10,2012,16,42,201210),('2012-10-17',201242,10,2012,17,42,201210),('2012-10-18',201242,10,2012,18,42,201210),('2012-10-19',201242,10,2012,19,42,201210),('2012-10-20',201242,10,2012,20,42,201210),('2012-10-21',201243,10,2012,21,43,201210),('2012-10-22',201243,10,2012,22,43,201210),('2012-10-23',201243,10,2012,23,43,201210),('2012-10-24',201243,10,2012,24,43,201210),('2012-10-25',201243,10,2012,25,43,201210),('2012-10-26',201243,10,2012,26,43,201210),('2012-10-27',201243,10,2012,27,43,201210),('2012-10-28',201244,10,2012,28,44,201210),('2012-10-29',201244,10,2012,29,44,201210),('2012-10-30',201244,10,2012,30,44,201210),('2012-10-31',201244,10,2012,31,44,201210),('2012-11-01',201244,11,2012,1,44,201211),('2012-11-02',201244,11,2012,2,44,201211),('2012-11-03',201244,11,2012,3,44,201211),('2012-11-04',201245,11,2012,4,45,201211),('2012-11-05',201245,11,2012,5,45,201211),('2012-11-06',201245,11,2012,6,45,201211),('2012-11-07',201245,11,2012,7,45,201211),('2012-11-08',201245,11,2012,8,45,201211),('2012-11-09',201245,11,2012,9,45,201211),('2012-11-10',201245,11,2012,10,45,201211),('2012-11-11',201246,11,2012,11,46,201211),('2012-11-12',201246,11,2012,12,46,201211),('2012-11-13',201246,11,2012,13,46,201211),('2012-11-14',201246,11,2012,14,46,201211),('2012-11-15',201246,11,2012,15,46,201211),('2012-11-16',201246,11,2012,16,46,201211),('2012-11-17',201246,11,2012,17,46,201211),('2012-11-18',201247,11,2012,18,47,201211),('2012-11-19',201247,11,2012,19,47,201211),('2012-11-20',201247,11,2012,20,47,201211),('2012-11-21',201247,11,2012,21,47,201211),('2012-11-22',201247,11,2012,22,47,201211),('2012-11-23',201247,11,2012,23,47,201211),('2012-11-24',201247,11,2012,24,47,201211),('2012-11-25',201248,11,2012,25,48,201211),('2012-11-26',201248,11,2012,26,48,201211),('2012-11-27',201248,11,2012,27,48,201211),('2012-11-28',201248,11,2012,28,48,201211),('2012-11-29',201248,11,2012,29,48,201211),('2012-11-30',201248,11,2012,30,48,201211),('2012-12-01',201248,12,2012,1,48,201212),('2012-12-02',201249,12,2012,2,49,201212),('2012-12-03',201249,12,2012,3,49,201212),('2012-12-04',201249,12,2012,4,49,201212),('2012-12-05',201249,12,2012,5,49,201212),('2012-12-06',201249,12,2012,6,49,201212),('2012-12-07',201249,12,2012,7,49,201212),('2012-12-08',201249,12,2012,8,49,201212),('2012-12-09',201250,12,2012,9,50,201212),('2012-12-10',201250,12,2012,10,50,201212),('2012-12-11',201250,12,2012,11,50,201212),('2012-12-12',201250,12,2012,12,50,201212),('2012-12-13',201250,12,2012,13,50,201212),('2012-12-14',201250,12,2012,14,50,201212),('2012-12-15',201250,12,2012,15,50,201212),('2012-12-16',201251,12,2012,16,51,201212),('2012-12-17',201251,12,2012,17,51,201212),('2012-12-18',201251,12,2012,18,51,201212),('2012-12-19',201251,12,2012,19,51,201212),('2012-12-20',201251,12,2012,20,51,201212),('2012-12-21',201251,12,2012,21,51,201212),('2012-12-22',201251,12,2012,22,51,201212),('2012-12-23',201252,12,2012,23,52,201212),('2012-12-24',201252,12,2012,24,52,201212),('2012-12-25',201252,12,2012,25,52,201212),('2012-12-26',201252,12,2012,26,52,201212),('2012-12-27',201252,12,2012,27,52,201212),('2012-12-28',201252,12,2012,28,52,201212),('2012-12-29',201252,12,2012,29,52,201212),('2012-12-30',201301,12,2012,30,1,201212),('2012-12-31',201301,12,2012,31,1,201212),('2013-01-01',201301,1,2013,1,1,201301),('2013-01-02',201301,1,2013,2,1,201301),('2013-01-03',201301,1,2013,3,1,201301),('2013-01-04',201301,1,2013,4,1,201301),('2013-01-05',201301,1,2013,5,1,201301),('2013-01-06',201302,1,2013,6,2,201301),('2013-01-07',201302,1,2013,7,2,201301),('2013-01-08',201302,1,2013,8,2,201301),('2013-01-09',201302,1,2013,9,2,201301),('2013-01-10',201302,1,2013,10,2,201301),('2013-01-11',201302,1,2013,11,2,201301),('2013-01-12',201302,1,2013,12,2,201301),('2013-01-13',201303,1,2013,13,3,201301),('2013-01-14',201303,1,2013,14,3,201301),('2013-01-15',201303,1,2013,15,3,201301),('2013-01-16',201303,1,2013,16,3,201301),('2013-01-17',201303,1,2013,17,3,201301),('2013-01-18',201303,1,2013,18,3,201301),('2013-01-19',201303,1,2013,19,3,201301),('2013-01-20',201304,1,2013,20,4,201301),('2013-01-21',201304,1,2013,21,4,201301),('2013-01-22',201304,1,2013,22,4,201301),('2013-01-23',201304,1,2013,23,4,201301),('2013-01-24',201304,1,2013,24,4,201301),('2013-01-25',201304,1,2013,25,4,201301),('2013-01-26',201304,1,2013,26,4,201301),('2013-01-27',201305,1,2013,27,5,201301),('2013-01-28',201305,1,2013,28,5,201301),('2013-01-29',201305,1,2013,29,5,201301),('2013-01-30',201305,1,2013,30,5,201301),('2013-01-31',201305,1,2013,31,5,201301),('2013-02-01',201305,2,2013,1,5,201302),('2013-02-02',201305,2,2013,2,5,201302),('2013-02-03',201306,2,2013,3,6,201302),('2013-02-04',201306,2,2013,4,6,201302),('2013-02-05',201306,2,2013,5,6,201302),('2013-02-06',201306,2,2013,6,6,201302),('2013-02-07',201306,2,2013,7,6,201302),('2013-02-08',201306,2,2013,8,6,201302),('2013-02-09',201306,2,2013,9,6,201302),('2013-02-10',201307,2,2013,10,7,201302),('2013-02-11',201307,2,2013,11,7,201302),('2013-02-12',201307,2,2013,12,7,201302),('2013-02-13',201307,2,2013,13,7,201302),('2013-02-14',201307,2,2013,14,7,201302),('2013-02-15',201307,2,2013,15,7,201302),('2013-02-16',201307,2,2013,16,7,201302),('2013-02-17',201308,2,2013,17,8,201302),('2013-02-18',201308,2,2013,18,8,201302),('2013-02-19',201308,2,2013,19,8,201302),('2013-02-20',201308,2,2013,20,8,201302),('2013-02-21',201308,2,2013,21,8,201302),('2013-02-22',201308,2,2013,22,8,201302),('2013-02-23',201308,2,2013,23,8,201302),('2013-02-24',201309,2,2013,24,9,201302),('2013-02-25',201309,2,2013,25,9,201302),('2013-02-26',201309,2,2013,26,9,201302),('2013-02-27',201309,2,2013,27,9,201302),('2013-02-28',201309,2,2013,28,9,201302),('2013-03-01',201309,3,2013,1,9,201303),('2013-03-02',201309,3,2013,2,9,201303),('2013-03-03',201310,3,2013,3,10,201303),('2013-03-04',201310,3,2013,4,10,201303),('2013-03-05',201310,3,2013,5,10,201303),('2013-03-06',201310,3,2013,6,10,201303),('2013-03-07',201310,3,2013,7,10,201303),('2013-03-08',201310,3,2013,8,10,201303),('2013-03-09',201310,3,2013,9,10,201303),('2013-03-10',201311,3,2013,10,11,201303),('2013-03-11',201311,3,2013,11,11,201303),('2013-03-12',201311,3,2013,12,11,201303),('2013-03-13',201311,3,2013,13,11,201303),('2013-03-14',201311,3,2013,14,11,201303),('2013-03-15',201311,3,2013,15,11,201303),('2013-03-16',201311,3,2013,16,11,201303),('2013-03-17',201312,3,2013,17,12,201303),('2013-03-18',201312,3,2013,18,12,201303),('2013-03-19',201312,3,2013,19,12,201303),('2013-03-20',201312,3,2013,20,12,201303),('2013-03-21',201312,3,2013,21,12,201303),('2013-03-22',201312,3,2013,22,12,201303),('2013-03-23',201312,3,2013,23,12,201303),('2013-03-24',201313,3,2013,24,13,201303),('2013-03-25',201313,3,2013,25,13,201303),('2013-03-26',201313,3,2013,26,13,201303),('2013-03-27',201313,3,2013,27,13,201303),('2013-03-28',201313,3,2013,28,13,201303),('2013-03-29',201313,3,2013,29,13,201303),('2013-03-30',201313,3,2013,30,13,201303),('2013-03-31',201314,3,2013,31,14,201303),('2013-04-01',201314,4,2013,1,14,201304),('2013-04-02',201314,4,2013,2,14,201304),('2013-04-03',201314,4,2013,3,14,201304),('2013-04-04',201314,4,2013,4,14,201304),('2013-04-05',201314,4,2013,5,14,201304),('2013-04-06',201314,4,2013,6,14,201304),('2013-04-07',201315,4,2013,7,15,201304),('2013-04-08',201315,4,2013,8,15,201304),('2013-04-09',201315,4,2013,9,15,201304),('2013-04-10',201315,4,2013,10,15,201304),('2013-04-11',201315,4,2013,11,15,201304),('2013-04-12',201315,4,2013,12,15,201304),('2013-04-13',201315,4,2013,13,15,201304),('2013-04-14',201316,4,2013,14,16,201304),('2013-04-15',201316,4,2013,15,16,201304),('2013-04-16',201316,4,2013,16,16,201304),('2013-04-17',201316,4,2013,17,16,201304),('2013-04-18',201316,4,2013,18,16,201304),('2013-04-19',201316,4,2013,19,16,201304),('2013-04-20',201316,4,2013,20,16,201304),('2013-04-21',201317,4,2013,21,17,201304),('2013-04-22',201317,4,2013,22,17,201304),('2013-04-23',201317,4,2013,23,17,201304),('2013-04-24',201317,4,2013,24,17,201304),('2013-04-25',201317,4,2013,25,17,201304),('2013-04-26',201317,4,2013,26,17,201304),('2013-04-27',201317,4,2013,27,17,201304),('2013-04-28',201318,4,2013,28,18,201304),('2013-04-29',201318,4,2013,29,18,201304),('2013-04-30',201318,4,2013,30,18,201304),('2013-05-01',201318,5,2013,1,18,201305),('2013-05-02',201318,5,2013,2,18,201305),('2013-05-03',201318,5,2013,3,18,201305),('2013-05-04',201318,5,2013,4,18,201305),('2013-05-05',201319,5,2013,5,19,201305),('2013-05-06',201319,5,2013,6,19,201305),('2013-05-07',201319,5,2013,7,19,201305),('2013-05-08',201319,5,2013,8,19,201305),('2013-05-09',201319,5,2013,9,19,201305),('2013-05-10',201319,5,2013,10,19,201305),('2013-05-11',201319,5,2013,11,19,201305),('2013-05-12',201320,5,2013,12,20,201305),('2013-05-13',201320,5,2013,13,20,201305),('2013-05-14',201320,5,2013,14,20,201305),('2013-05-15',201320,5,2013,15,20,201305),('2013-05-16',201320,5,2013,16,20,201305),('2013-05-17',201320,5,2013,17,20,201305),('2013-05-18',201320,5,2013,18,20,201305),('2013-05-19',201321,5,2013,19,21,201305),('2013-05-20',201321,5,2013,20,21,201305),('2013-05-21',201321,5,2013,21,21,201305),('2013-05-22',201321,5,2013,22,21,201305),('2013-05-23',201321,5,2013,23,21,201305),('2013-05-24',201321,5,2013,24,21,201305),('2013-05-25',201321,5,2013,25,21,201305),('2013-05-26',201322,5,2013,26,22,201305),('2013-05-27',201322,5,2013,27,22,201305),('2013-05-28',201322,5,2013,28,22,201305),('2013-05-29',201322,5,2013,29,22,201305),('2013-05-30',201322,5,2013,30,22,201305),('2013-05-31',201322,5,2013,31,22,201305),('2013-06-01',201322,6,2013,1,22,201306),('2013-06-02',201323,6,2013,2,23,201306),('2013-06-03',201323,6,2013,3,23,201306),('2013-06-04',201323,6,2013,4,23,201306),('2013-06-05',201323,6,2013,5,23,201306),('2013-06-06',201323,6,2013,6,23,201306),('2013-06-07',201323,6,2013,7,23,201306),('2013-06-08',201323,6,2013,8,23,201306),('2013-06-09',201324,6,2013,9,24,201306),('2013-06-10',201324,6,2013,10,24,201306),('2013-06-11',201324,6,2013,11,24,201306),('2013-06-12',201324,6,2013,12,24,201306),('2013-06-13',201324,6,2013,13,24,201306),('2013-06-14',201324,6,2013,14,24,201306),('2013-06-15',201324,6,2013,15,24,201306),('2013-06-16',201325,6,2013,16,25,201306),('2013-06-17',201325,6,2013,17,25,201306),('2013-06-18',201325,6,2013,18,25,201306),('2013-06-19',201325,6,2013,19,25,201306),('2013-06-20',201325,6,2013,20,25,201306),('2013-06-21',201325,6,2013,21,25,201306),('2013-06-22',201325,6,2013,22,25,201306),('2013-06-23',201326,6,2013,23,26,201306),('2013-06-24',201326,6,2013,24,26,201306),('2013-06-25',201326,6,2013,25,26,201306),('2013-06-26',201326,6,2013,26,26,201306),('2013-06-27',201326,6,2013,27,26,201306),('2013-06-28',201326,6,2013,28,26,201306),('2013-06-29',201326,6,2013,29,26,201306),('2013-06-30',201327,6,2013,30,27,201306),('2013-07-01',201327,7,2013,1,27,201307),('2013-07-02',201327,7,2013,2,27,201307),('2013-07-03',201327,7,2013,3,27,201307),('2013-07-04',201327,7,2013,4,27,201307),('2013-07-05',201327,7,2013,5,27,201307),('2013-07-06',201327,7,2013,6,27,201307),('2013-07-07',201328,7,2013,7,28,201307),('2013-07-08',201328,7,2013,8,28,201307),('2013-07-09',201328,7,2013,9,28,201307),('2013-07-10',201328,7,2013,10,28,201307),('2013-07-11',201328,7,2013,11,28,201307),('2013-07-12',201328,7,2013,12,28,201307),('2013-07-13',201328,7,2013,13,28,201307),('2013-07-14',201329,7,2013,14,29,201307),('2013-07-15',201329,7,2013,15,29,201307),('2013-07-16',201329,7,2013,16,29,201307),('2013-07-17',201329,7,2013,17,29,201307),('2013-07-18',201329,7,2013,18,29,201307),('2013-07-19',201329,7,2013,19,29,201307),('2013-07-20',201329,7,2013,20,29,201307),('2013-07-21',201330,7,2013,21,30,201307),('2013-07-22',201330,7,2013,22,30,201307),('2013-07-23',201330,7,2013,23,30,201307),('2013-07-24',201330,7,2013,24,30,201307),('2013-07-25',201330,7,2013,25,30,201307),('2013-07-26',201330,7,2013,26,30,201307),('2013-07-27',201330,7,2013,27,30,201307),('2013-07-28',201331,7,2013,28,31,201307),('2013-07-29',201331,7,2013,29,31,201307),('2013-07-30',201331,7,2013,30,31,201307),('2013-07-31',201331,7,2013,31,31,201307),('2013-08-01',201331,8,2013,1,31,201308),('2013-08-02',201331,8,2013,2,31,201308),('2013-08-03',201331,8,2013,3,31,201308),('2013-08-04',201332,8,2013,4,32,201308),('2013-08-05',201332,8,2013,5,32,201308),('2013-08-06',201332,8,2013,6,32,201308),('2013-08-07',201332,8,2013,7,32,201308),('2013-08-08',201332,8,2013,8,32,201308),('2013-08-09',201332,8,2013,9,32,201308),('2013-08-10',201332,8,2013,10,32,201308),('2013-08-11',201333,8,2013,11,33,201308),('2013-08-12',201333,8,2013,12,33,201308),('2013-08-13',201333,8,2013,13,33,201308),('2013-08-14',201333,8,2013,14,33,201308),('2013-08-15',201333,8,2013,15,33,201308),('2013-08-16',201333,8,2013,16,33,201308),('2013-08-17',201333,8,2013,17,33,201308),('2013-08-18',201334,8,2013,18,34,201308),('2013-08-19',201334,8,2013,19,34,201308),('2013-08-20',201334,8,2013,20,34,201308),('2013-08-21',201334,8,2013,21,34,201308),('2013-08-22',201334,8,2013,22,34,201308),('2013-08-23',201334,8,2013,23,34,201308),('2013-08-24',201334,8,2013,24,34,201308),('2013-08-25',201335,8,2013,25,35,201308),('2013-08-26',201335,8,2013,26,35,201308),('2013-08-27',201335,8,2013,27,35,201308),('2013-08-28',201335,8,2013,28,35,201308),('2013-08-29',201335,8,2013,29,35,201308),('2013-08-30',201335,8,2013,30,35,201308),('2013-08-31',201335,8,2013,31,35,201308),('2013-09-01',201336,9,2013,1,36,201309),('2013-09-02',201336,9,2013,2,36,201309),('2013-09-03',201336,9,2013,3,36,201309),('2013-09-04',201336,9,2013,4,36,201309),('2013-09-05',201336,9,2013,5,36,201309),('2013-09-06',201336,9,2013,6,36,201309),('2013-09-07',201336,9,2013,7,36,201309),('2013-09-08',201337,9,2013,8,37,201309),('2013-09-09',201337,9,2013,9,37,201309),('2013-09-10',201337,9,2013,10,37,201309),('2013-09-11',201337,9,2013,11,37,201309),('2013-09-12',201337,9,2013,12,37,201309),('2013-09-13',201337,9,2013,13,37,201309),('2013-09-14',201337,9,2013,14,37,201309),('2013-09-15',201338,9,2013,15,38,201309),('2013-09-16',201338,9,2013,16,38,201309),('2013-09-17',201338,9,2013,17,38,201309),('2013-09-18',201338,9,2013,18,38,201309),('2013-09-19',201338,9,2013,19,38,201309),('2013-09-20',201338,9,2013,20,38,201309),('2013-09-21',201338,9,2013,21,38,201309),('2013-09-22',201339,9,2013,22,39,201309),('2013-09-23',201339,9,2013,23,39,201309),('2013-09-24',201339,9,2013,24,39,201309),('2013-09-25',201339,9,2013,25,39,201309),('2013-09-26',201339,9,2013,26,39,201309),('2013-09-27',201339,9,2013,27,39,201309),('2013-09-28',201339,9,2013,28,39,201309),('2013-09-29',201340,9,2013,29,40,201309),('2013-09-30',201340,9,2013,30,40,201309),('2013-10-01',201340,10,2013,1,40,201310),('2013-10-02',201340,10,2013,2,40,201310),('2013-10-03',201340,10,2013,3,40,201310),('2013-10-04',201340,10,2013,4,40,201310),('2013-10-05',201340,10,2013,5,40,201310),('2013-10-06',201341,10,2013,6,41,201310),('2013-10-07',201341,10,2013,7,41,201310),('2013-10-08',201341,10,2013,8,41,201310),('2013-10-09',201341,10,2013,9,41,201310),('2013-10-10',201341,10,2013,10,41,201310),('2013-10-11',201341,10,2013,11,41,201310),('2013-10-12',201341,10,2013,12,41,201310),('2013-10-13',201342,10,2013,13,42,201310),('2013-10-14',201342,10,2013,14,42,201310),('2013-10-15',201342,10,2013,15,42,201310),('2013-10-16',201342,10,2013,16,42,201310),('2013-10-17',201342,10,2013,17,42,201310),('2013-10-18',201342,10,2013,18,42,201310),('2013-10-19',201342,10,2013,19,42,201310),('2013-10-20',201343,10,2013,20,43,201310),('2013-10-21',201343,10,2013,21,43,201310),('2013-10-22',201343,10,2013,22,43,201310),('2013-10-23',201343,10,2013,23,43,201310),('2013-10-24',201343,10,2013,24,43,201310),('2013-10-25',201343,10,2013,25,43,201310),('2013-10-26',201343,10,2013,26,43,201310),('2013-10-27',201344,10,2013,27,44,201310),('2013-10-28',201344,10,2013,28,44,201310),('2013-10-29',201344,10,2013,29,44,201310),('2013-10-30',201344,10,2013,30,44,201310),('2013-10-31',201344,10,2013,31,44,201310),('2013-11-01',201344,11,2013,1,44,201311),('2013-11-02',201344,11,2013,2,44,201311),('2013-11-03',201345,11,2013,3,45,201311),('2013-11-04',201345,11,2013,4,45,201311),('2013-11-05',201345,11,2013,5,45,201311),('2013-11-06',201345,11,2013,6,45,201311),('2013-11-07',201345,11,2013,7,45,201311),('2013-11-08',201345,11,2013,8,45,201311),('2013-11-09',201345,11,2013,9,45,201311),('2013-11-10',201346,11,2013,10,46,201311),('2013-11-11',201346,11,2013,11,46,201311),('2013-11-12',201346,11,2013,12,46,201311),('2013-11-13',201346,11,2013,13,46,201311),('2013-11-14',201346,11,2013,14,46,201311),('2013-11-15',201346,11,2013,15,46,201311),('2013-11-16',201346,11,2013,16,46,201311),('2013-11-17',201347,11,2013,17,47,201311),('2013-11-18',201347,11,2013,18,47,201311),('2013-11-19',201347,11,2013,19,47,201311),('2013-11-20',201347,11,2013,20,47,201311),('2013-11-21',201347,11,2013,21,47,201311),('2013-11-22',201347,11,2013,22,47,201311),('2013-11-23',201347,11,2013,23,47,201311),('2013-11-24',201348,11,2013,24,48,201311),('2013-11-25',201348,11,2013,25,48,201311),('2013-11-26',201348,11,2013,26,48,201311),('2013-11-27',201348,11,2013,27,48,201311),('2013-11-28',201348,11,2013,28,48,201311),('2013-11-29',201348,11,2013,29,48,201311),('2013-11-30',201348,11,2013,30,48,201311),('2013-12-01',201349,12,2013,1,49,201312),('2013-12-02',201349,12,2013,2,49,201312),('2013-12-03',201349,12,2013,3,49,201312),('2013-12-04',201349,12,2013,4,49,201312),('2013-12-05',201349,12,2013,5,49,201312),('2013-12-06',201349,12,2013,6,49,201312),('2013-12-07',201349,12,2013,7,49,201312),('2013-12-08',201350,12,2013,8,50,201312),('2013-12-09',201350,12,2013,9,50,201312),('2013-12-10',201350,12,2013,10,50,201312),('2013-12-11',201350,12,2013,11,50,201312),('2013-12-12',201350,12,2013,12,50,201312),('2013-12-13',201350,12,2013,13,50,201312),('2013-12-14',201350,12,2013,14,50,201312),('2013-12-15',201351,12,2013,15,51,201312),('2013-12-16',201351,12,2013,16,51,201312),('2013-12-17',201351,12,2013,17,51,201312),('2013-12-18',201351,12,2013,18,51,201312),('2013-12-19',201351,12,2013,19,51,201312),('2013-12-20',201351,12,2013,20,51,201312),('2013-12-21',201351,12,2013,21,51,201312),('2013-12-22',201352,12,2013,22,52,201312),('2013-12-23',201352,12,2013,23,52,201312),('2013-12-24',201352,12,2013,24,52,201312),('2013-12-25',201352,12,2013,25,52,201312),('2013-12-26',201352,12,2013,26,52,201312),('2013-12-27',201352,12,2013,27,52,201312),('2013-12-28',201352,12,2013,28,52,201312),('2013-12-29',201401,12,2013,29,1,201312),('2013-12-30',201401,12,2013,30,1,201312),('2013-12-31',201401,12,2013,31,1,201312),('2014-01-01',201401,1,2014,1,1,201401),('2014-01-02',201401,1,2014,2,1,201401),('2014-01-03',201401,1,2014,3,1,201401),('2014-01-04',201401,1,2014,4,1,201401),('2014-01-05',201402,1,2014,5,2,201401),('2014-01-06',201402,1,2014,6,2,201401),('2014-01-07',201402,1,2014,7,2,201401),('2014-01-08',201402,1,2014,8,2,201401),('2014-01-09',201402,1,2014,9,2,201401),('2014-01-10',201402,1,2014,10,2,201401),('2014-01-11',201402,1,2014,11,2,201401),('2014-01-12',201403,1,2014,12,3,201401),('2014-01-13',201403,1,2014,13,3,201401),('2014-01-14',201403,1,2014,14,3,201401),('2014-01-15',201403,1,2014,15,3,201401),('2014-01-16',201403,1,2014,16,3,201401),('2014-01-17',201403,1,2014,17,3,201401),('2014-01-18',201403,1,2014,18,3,201401),('2014-01-19',201404,1,2014,19,4,201401),('2014-01-20',201404,1,2014,20,4,201401),('2014-01-21',201404,1,2014,21,4,201401),('2014-01-22',201404,1,2014,22,4,201401),('2014-01-23',201404,1,2014,23,4,201401),('2014-01-24',201404,1,2014,24,4,201401),('2014-01-25',201404,1,2014,25,4,201401),('2014-01-26',201405,1,2014,26,5,201401),('2014-01-27',201405,1,2014,27,5,201401),('2014-01-28',201405,1,2014,28,5,201401),('2014-01-29',201405,1,2014,29,5,201401),('2014-01-30',201405,1,2014,30,5,201401),('2014-01-31',201405,1,2014,31,5,201401),('2014-02-01',201405,2,2014,1,5,201402),('2014-02-02',201406,2,2014,2,6,201402),('2014-02-03',201406,2,2014,3,6,201402),('2014-02-04',201406,2,2014,4,6,201402),('2014-02-05',201406,2,2014,5,6,201402),('2014-02-06',201406,2,2014,6,6,201402),('2014-02-07',201406,2,2014,7,6,201402),('2014-02-08',201406,2,2014,8,6,201402),('2014-02-09',201407,2,2014,9,7,201402),('2014-02-10',201407,2,2014,10,7,201402),('2014-02-11',201407,2,2014,11,7,201402),('2014-02-12',201407,2,2014,12,7,201402),('2014-02-13',201407,2,2014,13,7,201402),('2014-02-14',201407,2,2014,14,7,201402),('2014-02-15',201407,2,2014,15,7,201402),('2014-02-16',201408,2,2014,16,8,201402),('2014-02-17',201408,2,2014,17,8,201402),('2014-02-18',201408,2,2014,18,8,201402),('2014-02-19',201408,2,2014,19,8,201402),('2014-02-20',201408,2,2014,20,8,201402),('2014-02-21',201408,2,2014,21,8,201402),('2014-02-22',201408,2,2014,22,8,201402),('2014-02-23',201409,2,2014,23,9,201402),('2014-02-24',201409,2,2014,24,9,201402),('2014-02-25',201409,2,2014,25,9,201402),('2014-02-26',201409,2,2014,26,9,201402),('2014-02-27',201409,2,2014,27,9,201402),('2014-02-28',201409,2,2014,28,9,201402),('2014-03-01',201409,3,2014,1,9,201403),('2014-03-02',201410,3,2014,2,10,201403),('2014-03-03',201410,3,2014,3,10,201403),('2014-03-04',201410,3,2014,4,10,201403),('2014-03-05',201410,3,2014,5,10,201403),('2014-03-06',201410,3,2014,6,10,201403),('2014-03-07',201410,3,2014,7,10,201403),('2014-03-08',201410,3,2014,8,10,201403),('2014-03-09',201411,3,2014,9,11,201403),('2014-03-10',201411,3,2014,10,11,201403),('2014-03-11',201411,3,2014,11,11,201403),('2014-03-12',201411,3,2014,12,11,201403),('2014-03-13',201411,3,2014,13,11,201403),('2014-03-14',201411,3,2014,14,11,201403),('2014-03-15',201411,3,2014,15,11,201403),('2014-03-16',201412,3,2014,16,12,201403),('2014-03-17',201412,3,2014,17,12,201403),('2014-03-18',201412,3,2014,18,12,201403),('2014-03-19',201412,3,2014,19,12,201403),('2014-03-20',201412,3,2014,20,12,201403),('2014-03-21',201412,3,2014,21,12,201403),('2014-03-22',201412,3,2014,22,12,201403),('2014-03-23',201413,3,2014,23,13,201403),('2014-03-24',201413,3,2014,24,13,201403),('2014-03-25',201413,3,2014,25,13,201403),('2014-03-26',201413,3,2014,26,13,201403),('2014-03-27',201413,3,2014,27,13,201403),('2014-03-28',201413,3,2014,28,13,201403),('2014-03-29',201413,3,2014,29,13,201403),('2014-03-30',201414,3,2014,30,14,201403),('2014-03-31',201414,3,2014,31,14,201403),('2014-04-01',201414,4,2014,1,14,201404),('2014-04-02',201414,4,2014,2,14,201404),('2014-04-03',201414,4,2014,3,14,201404),('2014-04-04',201414,4,2014,4,14,201404),('2014-04-05',201414,4,2014,5,14,201404),('2014-04-06',201415,4,2014,6,15,201404),('2014-04-07',201415,4,2014,7,15,201404),('2014-04-08',201415,4,2014,8,15,201404),('2014-04-09',201415,4,2014,9,15,201404),('2014-04-10',201415,4,2014,10,15,201404),('2014-04-11',201415,4,2014,11,15,201404),('2014-04-12',201415,4,2014,12,15,201404),('2014-04-13',201416,4,2014,13,16,201404),('2014-04-14',201416,4,2014,14,16,201404),('2014-04-15',201416,4,2014,15,16,201404),('2014-04-16',201416,4,2014,16,16,201404),('2014-04-17',201416,4,2014,17,16,201404),('2014-04-18',201416,4,2014,18,16,201404),('2014-04-19',201416,4,2014,19,16,201404),('2014-04-20',201417,4,2014,20,17,201404),('2014-04-21',201417,4,2014,21,17,201404),('2014-04-22',201417,4,2014,22,17,201404),('2014-04-23',201417,4,2014,23,17,201404),('2014-04-24',201417,4,2014,24,17,201404),('2014-04-25',201417,4,2014,25,17,201404),('2014-04-26',201417,4,2014,26,17,201404),('2014-04-27',201418,4,2014,27,18,201404),('2014-04-28',201418,4,2014,28,18,201404),('2014-04-29',201418,4,2014,29,18,201404),('2014-04-30',201418,4,2014,30,18,201404),('2014-05-01',201418,5,2014,1,18,201405),('2014-05-02',201418,5,2014,2,18,201405),('2014-05-03',201418,5,2014,3,18,201405),('2014-05-04',201419,5,2014,4,19,201405),('2014-05-05',201419,5,2014,5,19,201405),('2014-05-06',201419,5,2014,6,19,201405),('2014-05-07',201419,5,2014,7,19,201405),('2014-05-08',201419,5,2014,8,19,201405),('2014-05-09',201419,5,2014,9,19,201405),('2014-05-10',201419,5,2014,10,19,201405),('2014-05-11',201420,5,2014,11,20,201405),('2014-05-12',201420,5,2014,12,20,201405),('2014-05-13',201420,5,2014,13,20,201405),('2014-05-14',201420,5,2014,14,20,201405),('2014-05-15',201420,5,2014,15,20,201405),('2014-05-16',201420,5,2014,16,20,201405),('2014-05-17',201420,5,2014,17,20,201405),('2014-05-18',201421,5,2014,18,21,201405),('2014-05-19',201421,5,2014,19,21,201405),('2014-05-20',201421,5,2014,20,21,201405),('2014-05-21',201421,5,2014,21,21,201405),('2014-05-22',201421,5,2014,22,21,201405),('2014-05-23',201421,5,2014,23,21,201405),('2014-05-24',201421,5,2014,24,21,201405),('2014-05-25',201422,5,2014,25,22,201405),('2014-05-26',201422,5,2014,26,22,201405),('2014-05-27',201422,5,2014,27,22,201405),('2014-05-28',201422,5,2014,28,22,201405),('2014-05-29',201422,5,2014,29,22,201405),('2014-05-30',201422,5,2014,30,22,201405),('2014-05-31',201422,5,2014,31,22,201405),('2014-06-01',201423,6,2014,1,23,201406),('2014-06-02',201423,6,2014,2,23,201406),('2014-06-03',201423,6,2014,3,23,201406),('2014-06-04',201423,6,2014,4,23,201406),('2014-06-05',201423,6,2014,5,23,201406),('2014-06-06',201423,6,2014,6,23,201406),('2014-06-07',201423,6,2014,7,23,201406),('2014-06-08',201424,6,2014,8,24,201406),('2014-06-09',201424,6,2014,9,24,201406),('2014-06-10',201424,6,2014,10,24,201406),('2014-06-11',201424,6,2014,11,24,201406),('2014-06-12',201424,6,2014,12,24,201406),('2014-06-13',201424,6,2014,13,24,201406),('2014-06-14',201424,6,2014,14,24,201406),('2014-06-15',201425,6,2014,15,25,201406),('2014-06-16',201425,6,2014,16,25,201406),('2014-06-17',201425,6,2014,17,25,201406),('2014-06-18',201425,6,2014,18,25,201406),('2014-06-19',201425,6,2014,19,25,201406),('2014-06-20',201425,6,2014,20,25,201406),('2014-06-21',201425,6,2014,21,25,201406),('2014-06-22',201426,6,2014,22,26,201406),('2014-06-23',201426,6,2014,23,26,201406),('2014-06-24',201426,6,2014,24,26,201406),('2014-06-25',201426,6,2014,25,26,201406),('2014-06-26',201426,6,2014,26,26,201406),('2014-06-27',201426,6,2014,27,26,201406),('2014-06-28',201426,6,2014,28,26,201406),('2014-06-29',201427,6,2014,29,27,201406),('2014-06-30',201427,6,2014,30,27,201406),('2014-07-01',201427,7,2014,1,27,201407),('2014-07-02',201427,7,2014,2,27,201407),('2014-07-03',201427,7,2014,3,27,201407),('2014-07-04',201427,7,2014,4,27,201407),('2014-07-05',201427,7,2014,5,27,201407),('2014-07-06',201428,7,2014,6,28,201407),('2014-07-07',201428,7,2014,7,28,201407),('2014-07-08',201428,7,2014,8,28,201407),('2014-07-09',201428,7,2014,9,28,201407),('2014-07-10',201428,7,2014,10,28,201407),('2014-07-11',201428,7,2014,11,28,201407),('2014-07-12',201428,7,2014,12,28,201407),('2014-07-13',201429,7,2014,13,29,201407),('2014-07-14',201429,7,2014,14,29,201407),('2014-07-15',201429,7,2014,15,29,201407),('2014-07-16',201429,7,2014,16,29,201407),('2014-07-17',201429,7,2014,17,29,201407),('2014-07-18',201429,7,2014,18,29,201407),('2014-07-19',201429,7,2014,19,29,201407),('2014-07-20',201430,7,2014,20,30,201407),('2014-07-21',201430,7,2014,21,30,201407),('2014-07-22',201430,7,2014,22,30,201407),('2014-07-23',201430,7,2014,23,30,201407),('2014-07-24',201430,7,2014,24,30,201407),('2014-07-25',201430,7,2014,25,30,201407),('2014-07-26',201430,7,2014,26,30,201407),('2014-07-27',201431,7,2014,27,31,201407),('2014-07-28',201431,7,2014,28,31,201407),('2014-07-29',201431,7,2014,29,31,201407),('2014-07-30',201431,7,2014,30,31,201407),('2014-07-31',201431,7,2014,31,31,201407),('2014-08-01',201431,8,2014,1,31,201408),('2014-08-02',201431,8,2014,2,31,201408),('2014-08-03',201432,8,2014,3,32,201408),('2014-08-04',201432,8,2014,4,32,201408),('2014-08-05',201432,8,2014,5,32,201408),('2014-08-06',201432,8,2014,6,32,201408),('2014-08-07',201432,8,2014,7,32,201408),('2014-08-08',201432,8,2014,8,32,201408),('2014-08-09',201432,8,2014,9,32,201408),('2014-08-10',201433,8,2014,10,33,201408),('2014-08-11',201433,8,2014,11,33,201408),('2014-08-12',201433,8,2014,12,33,201408),('2014-08-13',201433,8,2014,13,33,201408),('2014-08-14',201433,8,2014,14,33,201408),('2014-08-15',201433,8,2014,15,33,201408),('2014-08-16',201433,8,2014,16,33,201408),('2014-08-17',201434,8,2014,17,34,201408),('2014-08-18',201434,8,2014,18,34,201408),('2014-08-19',201434,8,2014,19,34,201408),('2014-08-20',201434,8,2014,20,34,201408),('2014-08-21',201434,8,2014,21,34,201408),('2014-08-22',201434,8,2014,22,34,201408),('2014-08-23',201434,8,2014,23,34,201408),('2014-08-24',201435,8,2014,24,35,201408),('2014-08-25',201435,8,2014,25,35,201408),('2014-08-26',201435,8,2014,26,35,201408),('2014-08-27',201435,8,2014,27,35,201408),('2014-08-28',201435,8,2014,28,35,201408),('2014-08-29',201435,8,2014,29,35,201408),('2014-08-30',201435,8,2014,30,35,201408),('2014-08-31',201436,8,2014,31,36,201408),('2014-09-01',201436,9,2014,1,36,201409),('2014-09-02',201436,9,2014,2,36,201409),('2014-09-03',201436,9,2014,3,36,201409),('2014-09-04',201436,9,2014,4,36,201409),('2014-09-05',201436,9,2014,5,36,201409),('2014-09-06',201436,9,2014,6,36,201409),('2014-09-07',201437,9,2014,7,37,201409),('2014-09-08',201437,9,2014,8,37,201409),('2014-09-09',201437,9,2014,9,37,201409),('2014-09-10',201437,9,2014,10,37,201409),('2014-09-11',201437,9,2014,11,37,201409),('2014-09-12',201437,9,2014,12,37,201409),('2014-09-13',201437,9,2014,13,37,201409),('2014-09-14',201438,9,2014,14,38,201409),('2014-09-15',201438,9,2014,15,38,201409),('2014-09-16',201438,9,2014,16,38,201409),('2014-09-17',201438,9,2014,17,38,201409),('2014-09-18',201438,9,2014,18,38,201409),('2014-09-19',201438,9,2014,19,38,201409),('2014-09-20',201438,9,2014,20,38,201409),('2014-09-21',201439,9,2014,21,39,201409),('2014-09-22',201439,9,2014,22,39,201409),('2014-09-23',201439,9,2014,23,39,201409),('2014-09-24',201439,9,2014,24,39,201409),('2014-09-25',201439,9,2014,25,39,201409),('2014-09-26',201439,9,2014,26,39,201409),('2014-09-27',201439,9,2014,27,39,201409),('2014-09-28',201440,9,2014,28,40,201409),('2014-09-29',201440,9,2014,29,40,201409),('2014-09-30',201440,9,2014,30,40,201409),('2014-10-01',201440,10,2014,1,40,201410),('2014-10-02',201440,10,2014,2,40,201410),('2014-10-03',201440,10,2014,3,40,201410),('2014-10-04',201440,10,2014,4,40,201410),('2014-10-05',201441,10,2014,5,41,201410),('2014-10-06',201441,10,2014,6,41,201410),('2014-10-07',201441,10,2014,7,41,201410),('2014-10-08',201441,10,2014,8,41,201410),('2014-10-09',201441,10,2014,9,41,201410),('2014-10-10',201441,10,2014,10,41,201410),('2014-10-11',201441,10,2014,11,41,201410),('2014-10-12',201442,10,2014,12,42,201410),('2014-10-13',201442,10,2014,13,42,201410),('2014-10-14',201442,10,2014,14,42,201410),('2014-10-15',201442,10,2014,15,42,201410),('2014-10-16',201442,10,2014,16,42,201410),('2014-10-17',201442,10,2014,17,42,201410),('2014-10-18',201442,10,2014,18,42,201410),('2014-10-19',201443,10,2014,19,43,201410),('2014-10-20',201443,10,2014,20,43,201410),('2014-10-21',201443,10,2014,21,43,201410),('2014-10-22',201443,10,2014,22,43,201410),('2014-10-23',201443,10,2014,23,43,201410),('2014-10-24',201443,10,2014,24,43,201410),('2014-10-25',201443,10,2014,25,43,201410),('2014-10-26',201444,10,2014,26,44,201410),('2014-10-27',201444,10,2014,27,44,201410),('2014-10-28',201444,10,2014,28,44,201410),('2014-10-29',201444,10,2014,29,44,201410),('2014-10-30',201444,10,2014,30,44,201410),('2014-10-31',201444,10,2014,31,44,201410),('2014-11-01',201444,11,2014,1,44,201411),('2014-11-02',201445,11,2014,2,45,201411),('2014-11-03',201445,11,2014,3,45,201411),('2014-11-04',201445,11,2014,4,45,201411),('2014-11-05',201445,11,2014,5,45,201411),('2014-11-06',201445,11,2014,6,45,201411),('2014-11-07',201445,11,2014,7,45,201411),('2014-11-08',201445,11,2014,8,45,201411),('2014-11-09',201446,11,2014,9,46,201411),('2014-11-10',201446,11,2014,10,46,201411),('2014-11-11',201446,11,2014,11,46,201411),('2014-11-12',201446,11,2014,12,46,201411),('2014-11-13',201446,11,2014,13,46,201411),('2014-11-14',201446,11,2014,14,46,201411),('2014-11-15',201446,11,2014,15,46,201411),('2014-11-16',201447,11,2014,16,47,201411),('2014-11-17',201447,11,2014,17,47,201411),('2014-11-18',201447,11,2014,18,47,201411),('2014-11-19',201447,11,2014,19,47,201411),('2014-11-20',201447,11,2014,20,47,201411),('2014-11-21',201447,11,2014,21,47,201411),('2014-11-22',201447,11,2014,22,47,201411),('2014-11-23',201448,11,2014,23,48,201411),('2014-11-24',201448,11,2014,24,48,201411),('2014-11-25',201448,11,2014,25,48,201411),('2014-11-26',201448,11,2014,26,48,201411),('2014-11-27',201448,11,2014,27,48,201411),('2014-11-28',201448,11,2014,28,48,201411),('2014-11-29',201448,11,2014,29,48,201411),('2014-11-30',201449,11,2014,30,49,201411),('2014-12-01',201449,12,2014,1,49,201412),('2014-12-02',201449,12,2014,2,49,201412),('2014-12-03',201449,12,2014,3,49,201412),('2014-12-04',201449,12,2014,4,49,201412),('2014-12-05',201449,12,2014,5,49,201412),('2014-12-06',201449,12,2014,6,49,201412),('2014-12-07',201450,12,2014,7,50,201412),('2014-12-08',201450,12,2014,8,50,201412),('2014-12-09',201450,12,2014,9,50,201412),('2014-12-10',201450,12,2014,10,50,201412),('2014-12-11',201450,12,2014,11,50,201412),('2014-12-12',201450,12,2014,12,50,201412),('2014-12-13',201450,12,2014,13,50,201412),('2014-12-14',201451,12,2014,14,51,201412),('2014-12-15',201451,12,2014,15,51,201412),('2014-12-16',201451,12,2014,16,51,201412),('2014-12-17',201451,12,2014,17,51,201412),('2014-12-18',201451,12,2014,18,51,201412),('2014-12-19',201451,12,2014,19,51,201412),('2014-12-20',201451,12,2014,20,51,201412),('2014-12-21',201452,12,2014,21,52,201412),('2014-12-22',201452,12,2014,22,52,201412),('2014-12-23',201452,12,2014,23,52,201412),('2014-12-24',201452,12,2014,24,52,201412),('2014-12-25',201452,12,2014,25,52,201412),('2014-12-26',201452,12,2014,26,52,201412),('2014-12-27',201452,12,2014,27,52,201412),('2014-12-28',201453,12,2014,28,53,201412),('2014-12-29',201453,12,2014,29,53,201412),('2014-12-30',201453,12,2014,30,53,201412),('2014-12-31',201453,12,2014,31,53,201412),('2015-01-01',201453,1,2015,1,53,201501),('2015-01-02',201453,1,2015,2,53,201501),('2015-01-03',201453,1,2015,3,53,201501),('2015-01-04',201501,1,2015,4,1,201501),('2015-01-05',201501,1,2015,5,1,201501),('2015-01-06',201501,1,2015,6,1,201501),('2015-01-07',201501,1,2015,7,1,201501),('2015-01-08',201501,1,2015,8,1,201501),('2015-01-09',201501,1,2015,9,1,201501),('2015-01-10',201501,1,2015,10,1,201501),('2015-01-11',201502,1,2015,11,2,201501),('2015-01-12',201502,1,2015,12,2,201501),('2015-01-13',201502,1,2015,13,2,201501),('2015-01-14',201502,1,2015,14,2,201501),('2015-01-15',201502,1,2015,15,2,201501),('2015-01-16',201502,1,2015,16,2,201501),('2015-01-17',201502,1,2015,17,2,201501),('2015-01-18',201503,1,2015,18,3,201501),('2015-01-19',201503,1,2015,19,3,201501),('2015-01-20',201503,1,2015,20,3,201501),('2015-01-21',201503,1,2015,21,3,201501),('2015-01-22',201503,1,2015,22,3,201501),('2015-01-23',201503,1,2015,23,3,201501),('2015-01-24',201503,1,2015,24,3,201501),('2015-01-25',201504,1,2015,25,4,201501),('2015-01-26',201504,1,2015,26,4,201501),('2015-01-27',201504,1,2015,27,4,201501),('2015-01-28',201504,1,2015,28,4,201501),('2015-01-29',201504,1,2015,29,4,201501),('2015-01-30',201504,1,2015,30,4,201501),('2015-01-31',201504,1,2015,31,4,201501),('2015-02-01',201505,2,2015,1,5,201502),('2015-02-02',201505,2,2015,2,5,201502),('2015-02-03',201505,2,2015,3,5,201502),('2015-02-04',201505,2,2015,4,5,201502),('2015-02-05',201505,2,2015,5,5,201502),('2015-02-06',201505,2,2015,6,5,201502),('2015-02-07',201505,2,2015,7,5,201502),('2015-02-08',201506,2,2015,8,6,201502),('2015-02-09',201506,2,2015,9,6,201502),('2015-02-10',201506,2,2015,10,6,201502),('2015-02-11',201506,2,2015,11,6,201502),('2015-02-12',201506,2,2015,12,6,201502),('2015-02-13',201506,2,2015,13,6,201502),('2015-02-14',201506,2,2015,14,6,201502),('2015-02-15',201507,2,2015,15,7,201502),('2015-02-16',201507,2,2015,16,7,201502),('2015-02-17',201507,2,2015,17,7,201502),('2015-02-18',201507,2,2015,18,7,201502),('2015-02-19',201507,2,2015,19,7,201502),('2015-02-20',201507,2,2015,20,7,201502),('2015-02-21',201507,2,2015,21,7,201502),('2015-02-22',201508,2,2015,22,8,201502),('2015-02-23',201508,2,2015,23,8,201502),('2015-02-24',201508,2,2015,24,8,201502),('2015-02-25',201508,2,2015,25,8,201502),('2015-02-26',201508,2,2015,26,8,201502),('2015-02-27',201508,2,2015,27,8,201502),('2015-02-28',201508,2,2015,28,8,201502),('2015-03-01',201509,3,2015,1,9,201503),('2015-03-02',201509,3,2015,2,9,201503),('2015-03-03',201509,3,2015,3,9,201503),('2015-03-04',201509,3,2015,4,9,201503),('2015-03-05',201509,3,2015,5,9,201503),('2015-03-06',201509,3,2015,6,9,201503),('2015-03-07',201509,3,2015,7,9,201503),('2015-03-08',201510,3,2015,8,10,201503),('2015-03-09',201510,3,2015,9,10,201503),('2015-03-10',201510,3,2015,10,10,201503),('2015-03-11',201510,3,2015,11,10,201503),('2015-03-12',201510,3,2015,12,10,201503),('2015-03-13',201510,3,2015,13,10,201503),('2015-03-14',201510,3,2015,14,10,201503),('2015-03-15',201511,3,2015,15,11,201503),('2015-03-16',201511,3,2015,16,11,201503),('2015-03-17',201511,3,2015,17,11,201503),('2015-03-18',201511,3,2015,18,11,201503),('2015-03-19',201511,3,2015,19,11,201503),('2015-03-20',201511,3,2015,20,11,201503),('2015-03-21',201511,3,2015,21,11,201503),('2015-03-22',201512,3,2015,22,12,201503),('2015-03-23',201512,3,2015,23,12,201503),('2015-03-24',201512,3,2015,24,12,201503),('2015-03-25',201512,3,2015,25,12,201503),('2015-03-26',201512,3,2015,26,12,201503),('2015-03-27',201512,3,2015,27,12,201503),('2015-03-28',201512,3,2015,28,12,201503),('2015-03-29',201513,3,2015,29,13,201503),('2015-03-30',201513,3,2015,30,13,201503),('2015-03-31',201513,3,2015,31,13,201503),('2015-04-01',201513,4,2015,1,13,201504),('2015-04-02',201513,4,2015,2,13,201504),('2015-04-03',201513,4,2015,3,13,201504),('2015-04-04',201513,4,2015,4,13,201504),('2015-04-05',201514,4,2015,5,14,201504),('2015-04-06',201514,4,2015,6,14,201504),('2015-04-07',201514,4,2015,7,14,201504),('2015-04-08',201514,4,2015,8,14,201504),('2015-04-09',201514,4,2015,9,14,201504),('2015-04-10',201514,4,2015,10,14,201504),('2015-04-11',201514,4,2015,11,14,201504),('2015-04-12',201515,4,2015,12,15,201504),('2015-04-13',201515,4,2015,13,15,201504),('2015-04-14',201515,4,2015,14,15,201504),('2015-04-15',201515,4,2015,15,15,201504),('2015-04-16',201515,4,2015,16,15,201504),('2015-04-17',201515,4,2015,17,15,201504),('2015-04-18',201515,4,2015,18,15,201504),('2015-04-19',201516,4,2015,19,16,201504),('2015-04-20',201516,4,2015,20,16,201504),('2015-04-21',201516,4,2015,21,16,201504),('2015-04-22',201516,4,2015,22,16,201504),('2015-04-23',201516,4,2015,23,16,201504),('2015-04-24',201516,4,2015,24,16,201504),('2015-04-25',201516,4,2015,25,16,201504),('2015-04-26',201517,4,2015,26,17,201504),('2015-04-27',201517,4,2015,27,17,201504),('2015-04-28',201517,4,2015,28,17,201504),('2015-04-29',201517,4,2015,29,17,201504),('2015-04-30',201517,4,2015,30,17,201504),('2015-05-01',201517,5,2015,1,17,201505),('2015-05-02',201517,5,2015,2,17,201505),('2015-05-03',201518,5,2015,3,18,201505),('2015-05-04',201518,5,2015,4,18,201505),('2015-05-05',201518,5,2015,5,18,201505),('2015-05-06',201518,5,2015,6,18,201505),('2015-05-07',201518,5,2015,7,18,201505),('2015-05-08',201518,5,2015,8,18,201505),('2015-05-09',201518,5,2015,9,18,201505),('2015-05-10',201519,5,2015,10,19,201505),('2015-05-11',201519,5,2015,11,19,201505),('2015-05-12',201519,5,2015,12,19,201505),('2015-05-13',201519,5,2015,13,19,201505),('2015-05-14',201519,5,2015,14,19,201505),('2015-05-15',201519,5,2015,15,19,201505),('2015-05-16',201519,5,2015,16,19,201505),('2015-05-17',201520,5,2015,17,20,201505),('2015-05-18',201520,5,2015,18,20,201505),('2015-05-19',201520,5,2015,19,20,201505),('2015-05-20',201520,5,2015,20,20,201505),('2015-05-21',201520,5,2015,21,20,201505),('2015-05-22',201520,5,2015,22,20,201505),('2015-05-23',201520,5,2015,23,20,201505),('2015-05-24',201521,5,2015,24,21,201505),('2015-05-25',201521,5,2015,25,21,201505),('2015-05-26',201521,5,2015,26,21,201505),('2015-05-27',201521,5,2015,27,21,201505),('2015-05-28',201521,5,2015,28,21,201505),('2015-05-29',201521,5,2015,29,21,201505),('2015-05-30',201521,5,2015,30,21,201505),('2015-05-31',201522,5,2015,31,22,201505),('2015-06-01',201522,6,2015,1,22,201506),('2015-06-02',201522,6,2015,2,22,201506),('2015-06-03',201522,6,2015,3,22,201506),('2015-06-04',201522,6,2015,4,22,201506),('2015-06-05',201522,6,2015,5,22,201506),('2015-06-06',201522,6,2015,6,22,201506),('2015-06-07',201523,6,2015,7,23,201506),('2015-06-08',201523,6,2015,8,23,201506),('2015-06-09',201523,6,2015,9,23,201506),('2015-06-10',201523,6,2015,10,23,201506),('2015-06-11',201523,6,2015,11,23,201506),('2015-06-12',201523,6,2015,12,23,201506),('2015-06-13',201523,6,2015,13,23,201506),('2015-06-14',201524,6,2015,14,24,201506),('2015-06-15',201524,6,2015,15,24,201506),('2015-06-16',201524,6,2015,16,24,201506),('2015-06-17',201524,6,2015,17,24,201506),('2015-06-18',201524,6,2015,18,24,201506),('2015-06-19',201524,6,2015,19,24,201506),('2015-06-20',201524,6,2015,20,24,201506),('2015-06-21',201525,6,2015,21,25,201506),('2015-06-22',201525,6,2015,22,25,201506),('2015-06-23',201525,6,2015,23,25,201506),('2015-06-24',201525,6,2015,24,25,201506),('2015-06-25',201525,6,2015,25,25,201506),('2015-06-26',201525,6,2015,26,25,201506),('2015-06-27',201525,6,2015,27,25,201506),('2015-06-28',201526,6,2015,28,26,201506),('2015-06-29',201526,6,2015,29,26,201506),('2015-06-30',201526,6,2015,30,26,201506),('2015-07-01',201526,7,2015,1,26,201507),('2015-07-02',201526,7,2015,2,26,201507),('2015-07-03',201526,7,2015,3,26,201507),('2015-07-04',201526,7,2015,4,26,201507),('2015-07-05',201527,7,2015,5,27,201507),('2015-07-06',201527,7,2015,6,27,201507),('2015-07-07',201527,7,2015,7,27,201507),('2015-07-08',201527,7,2015,8,27,201507),('2015-07-09',201527,7,2015,9,27,201507),('2015-07-10',201527,7,2015,10,27,201507),('2015-07-11',201527,7,2015,11,27,201507),('2015-07-12',201528,7,2015,12,28,201507),('2015-07-13',201528,7,2015,13,28,201507),('2015-07-14',201528,7,2015,14,28,201507),('2015-07-15',201528,7,2015,15,28,201507),('2015-07-16',201528,7,2015,16,28,201507),('2015-07-17',201528,7,2015,17,28,201507),('2015-07-18',201528,7,2015,18,28,201507),('2015-07-19',201529,7,2015,19,29,201507),('2015-07-20',201529,7,2015,20,29,201507),('2015-07-21',201529,7,2015,21,29,201507),('2015-07-22',201529,7,2015,22,29,201507),('2015-07-23',201529,7,2015,23,29,201507),('2015-07-24',201529,7,2015,24,29,201507),('2015-07-25',201529,7,2015,25,29,201507),('2015-07-26',201530,7,2015,26,30,201507),('2015-07-27',201530,7,2015,27,30,201507),('2015-07-28',201530,7,2015,28,30,201507),('2015-07-29',201530,7,2015,29,30,201507),('2015-07-30',201530,7,2015,30,30,201507),('2015-07-31',201530,7,2015,31,30,201507),('2015-08-01',201530,8,2015,1,30,201508),('2015-08-02',201531,8,2015,2,31,201508),('2015-08-03',201531,8,2015,3,31,201508),('2015-08-04',201531,8,2015,4,31,201508),('2015-08-05',201531,8,2015,5,31,201508),('2015-08-06',201531,8,2015,6,31,201508),('2015-08-07',201531,8,2015,7,31,201508),('2015-08-08',201531,8,2015,8,31,201508),('2015-08-09',201532,8,2015,9,32,201508),('2015-08-10',201532,8,2015,10,32,201508),('2015-08-11',201532,8,2015,11,32,201508),('2015-08-12',201532,8,2015,12,32,201508),('2015-08-13',201532,8,2015,13,32,201508),('2015-08-14',201532,8,2015,14,32,201508),('2015-08-15',201532,8,2015,15,32,201508),('2015-08-16',201533,8,2015,16,33,201508),('2015-08-17',201533,8,2015,17,33,201508),('2015-08-18',201533,8,2015,18,33,201508),('2015-08-19',201533,8,2015,19,33,201508),('2015-08-20',201533,8,2015,20,33,201508),('2015-08-21',201533,8,2015,21,33,201508),('2015-08-22',201533,8,2015,22,33,201508),('2015-08-23',201534,8,2015,23,34,201508),('2015-08-24',201534,8,2015,24,34,201508),('2015-08-25',201534,8,2015,25,34,201508),('2015-08-26',201534,8,2015,26,34,201508),('2015-08-27',201534,8,2015,27,34,201508),('2015-08-28',201534,8,2015,28,34,201508),('2015-08-29',201534,8,2015,29,34,201508),('2015-08-30',201535,8,2015,30,35,201508),('2015-08-31',201535,8,2015,31,35,201508),('2015-09-01',201535,9,2015,1,35,201509),('2015-09-02',201535,9,2015,2,35,201509),('2015-09-03',201535,9,2015,3,35,201509),('2015-09-04',201535,9,2015,4,35,201509),('2015-09-05',201535,9,2015,5,35,201509),('2015-09-06',201536,9,2015,6,36,201509),('2015-09-07',201536,9,2015,7,36,201509),('2015-09-08',201536,9,2015,8,36,201509),('2015-09-09',201536,9,2015,9,36,201509),('2015-09-10',201536,9,2015,10,36,201509),('2015-09-11',201536,9,2015,11,36,201509),('2015-09-12',201536,9,2015,12,36,201509),('2015-09-13',201537,9,2015,13,37,201509),('2015-09-14',201537,9,2015,14,37,201509),('2015-09-15',201537,9,2015,15,37,201509),('2015-09-16',201537,9,2015,16,37,201509),('2015-09-17',201537,9,2015,17,37,201509),('2015-09-18',201537,9,2015,18,37,201509),('2015-09-19',201537,9,2015,19,37,201509),('2015-09-20',201538,9,2015,20,38,201509),('2015-09-21',201538,9,2015,21,38,201509),('2015-09-22',201538,9,2015,22,38,201509),('2015-09-23',201538,9,2015,23,38,201509),('2015-09-24',201538,9,2015,24,38,201509),('2015-09-25',201538,9,2015,25,38,201509),('2015-09-26',201538,9,2015,26,38,201509),('2015-09-27',201539,9,2015,27,39,201509),('2015-09-28',201539,9,2015,28,39,201509),('2015-09-29',201539,9,2015,29,39,201509),('2015-09-30',201539,9,2015,30,39,201509),('2015-10-01',201539,10,2015,1,39,201510),('2015-10-02',201539,10,2015,2,39,201510),('2015-10-03',201539,10,2015,3,39,201510),('2015-10-04',201540,10,2015,4,40,201510),('2015-10-05',201540,10,2015,5,40,201510),('2015-10-06',201540,10,2015,6,40,201510),('2015-10-07',201540,10,2015,7,40,201510),('2015-10-08',201540,10,2015,8,40,201510),('2015-10-09',201540,10,2015,9,40,201510),('2015-10-10',201540,10,2015,10,40,201510),('2015-10-11',201541,10,2015,11,41,201510),('2015-10-12',201541,10,2015,12,41,201510),('2015-10-13',201541,10,2015,13,41,201510),('2015-10-14',201541,10,2015,14,41,201510),('2015-10-15',201541,10,2015,15,41,201510),('2015-10-16',201541,10,2015,16,41,201510),('2015-10-17',201541,10,2015,17,41,201510),('2015-10-18',201542,10,2015,18,42,201510),('2015-10-19',201542,10,2015,19,42,201510),('2015-10-20',201542,10,2015,20,42,201510),('2015-10-21',201542,10,2015,21,42,201510),('2015-10-22',201542,10,2015,22,42,201510),('2015-10-23',201542,10,2015,23,42,201510),('2015-10-24',201542,10,2015,24,42,201510),('2015-10-25',201543,10,2015,25,43,201510),('2015-10-26',201543,10,2015,26,43,201510),('2015-10-27',201543,10,2015,27,43,201510),('2015-10-28',201543,10,2015,28,43,201510),('2015-10-29',201543,10,2015,29,43,201510),('2015-10-30',201543,10,2015,30,43,201510),('2015-10-31',201543,10,2015,31,43,201510),('2015-11-01',201544,11,2015,1,44,201511),('2015-11-02',201544,11,2015,2,44,201511),('2015-11-03',201544,11,2015,3,44,201511),('2015-11-04',201544,11,2015,4,44,201511),('2015-11-05',201544,11,2015,5,44,201511),('2015-11-06',201544,11,2015,6,44,201511),('2015-11-07',201544,11,2015,7,44,201511),('2015-11-08',201545,11,2015,8,45,201511),('2015-11-09',201545,11,2015,9,45,201511),('2015-11-10',201545,11,2015,10,45,201511),('2015-11-11',201545,11,2015,11,45,201511),('2015-11-12',201545,11,2015,12,45,201511),('2015-11-13',201545,11,2015,13,45,201511),('2015-11-14',201545,11,2015,14,45,201511),('2015-11-15',201546,11,2015,15,46,201511),('2015-11-16',201546,11,2015,16,46,201511),('2015-11-17',201546,11,2015,17,46,201511),('2015-11-18',201546,11,2015,18,46,201511),('2015-11-19',201546,11,2015,19,46,201511),('2015-11-20',201546,11,2015,20,46,201511),('2015-11-21',201546,11,2015,21,46,201511),('2015-11-22',201547,11,2015,22,47,201511),('2015-11-23',201547,11,2015,23,47,201511),('2015-11-24',201547,11,2015,24,47,201511),('2015-11-25',201547,11,2015,25,47,201511),('2015-11-26',201547,11,2015,26,47,201511),('2015-11-27',201547,11,2015,27,47,201511),('2015-11-28',201547,11,2015,28,47,201511),('2015-11-29',201548,11,2015,29,48,201511),('2015-11-30',201548,11,2015,30,48,201511),('2015-12-01',201548,12,2015,1,48,201512),('2015-12-02',201548,12,2015,2,48,201512),('2015-12-03',201548,12,2015,3,48,201512),('2015-12-04',201548,12,2015,4,48,201512),('2015-12-05',201548,12,2015,5,48,201512),('2015-12-06',201549,12,2015,6,49,201512),('2015-12-07',201549,12,2015,7,49,201512),('2015-12-08',201549,12,2015,8,49,201512),('2015-12-09',201549,12,2015,9,49,201512),('2015-12-10',201549,12,2015,10,49,201512),('2015-12-11',201549,12,2015,11,49,201512),('2015-12-12',201549,12,2015,12,49,201512),('2015-12-13',201550,12,2015,13,50,201512),('2015-12-14',201550,12,2015,14,50,201512),('2015-12-15',201550,12,2015,15,50,201512),('2015-12-16',201550,12,2015,16,50,201512),('2015-12-17',201550,12,2015,17,50,201512),('2015-12-18',201550,12,2015,18,50,201512),('2015-12-19',201550,12,2015,19,50,201512),('2015-12-20',201551,12,2015,20,51,201512),('2015-12-21',201551,12,2015,21,51,201512),('2015-12-22',201551,12,2015,22,51,201512),('2015-12-23',201551,12,2015,23,51,201512),('2015-12-24',201551,12,2015,24,51,201512),('2015-12-25',201551,12,2015,25,51,201512),('2015-12-26',201551,12,2015,26,51,201512),('2015-12-27',201552,12,2015,27,52,201512),('2015-12-28',201552,12,2015,28,52,201512),('2015-12-29',201552,12,2015,29,52,201512),('2015-12-30',201552,12,2015,30,52,201512),('2015-12-31',201552,12,2015,31,52,201512),('2016-01-01',201552,1,2016,1,1,201601),('2016-01-02',201552,1,2016,2,1,201601),('2016-01-03',201601,1,2016,3,1,201601),('2016-01-04',201601,1,2016,4,1,201601),('2016-01-05',201601,1,2016,5,1,201601),('2016-01-06',201601,1,2016,6,1,201601),('2016-01-07',201601,1,2016,7,1,201601),('2016-01-08',201601,1,2016,8,1,201601),('2016-01-09',201601,1,2016,9,1,201601),('2016-01-10',201602,1,2016,10,2,201601),('2016-01-11',201602,1,2016,11,2,201601),('2016-01-12',201602,1,2016,12,2,201601),('2016-01-13',201602,1,2016,13,2,201601),('2016-01-14',201602,1,2016,14,2,201601),('2016-01-15',201602,1,2016,15,2,201601),('2016-01-16',201602,1,2016,16,2,201601),('2016-01-17',201603,1,2016,17,3,201601),('2016-01-18',201603,1,2016,18,3,201601),('2016-01-19',201603,1,2016,19,3,201601),('2016-01-20',201603,1,2016,20,3,201601),('2016-01-21',201603,1,2016,21,3,201601),('2016-01-22',201603,1,2016,22,3,201601),('2016-01-23',201603,1,2016,23,3,201601),('2016-01-24',201604,1,2016,24,4,201601),('2016-01-25',201604,1,2016,25,4,201601),('2016-01-26',201604,1,2016,26,4,201601),('2016-01-27',201604,1,2016,27,4,201601),('2016-01-28',201604,1,2016,28,4,201601),('2016-01-29',201604,1,2016,29,4,201601),('2016-01-30',201604,1,2016,30,4,201601),('2016-01-31',201605,1,2016,31,5,201601),('2016-02-01',201605,2,2016,1,5,201602),('2016-02-02',201605,2,2016,2,5,201602),('2016-02-03',201605,2,2016,3,5,201602),('2016-02-04',201605,2,2016,4,5,201602),('2016-02-05',201605,2,2016,5,5,201602),('2016-02-06',201605,2,2016,6,5,201602),('2016-02-07',201606,2,2016,7,6,201602),('2016-02-08',201606,2,2016,8,6,201602),('2016-02-09',201606,2,2016,9,6,201602),('2016-02-10',201606,2,2016,10,6,201602),('2016-02-11',201606,2,2016,11,6,201602),('2016-02-12',201606,2,2016,12,6,201602),('2016-02-13',201606,2,2016,13,6,201602),('2016-02-14',201607,2,2016,14,7,201602),('2016-02-15',201607,2,2016,15,7,201602),('2016-02-16',201607,2,2016,16,7,201602),('2016-02-17',201607,2,2016,17,7,201602),('2016-02-18',201607,2,2016,18,7,201602),('2016-02-19',201607,2,2016,19,7,201602),('2016-02-20',201607,2,2016,20,7,201602),('2016-02-21',201608,2,2016,21,8,201602),('2016-02-22',201608,2,2016,22,8,201602),('2016-02-23',201608,2,2016,23,8,201602),('2016-02-24',201608,2,2016,24,8,201602),('2016-02-25',201608,2,2016,25,8,201602),('2016-02-26',201608,2,2016,26,8,201602),('2016-02-27',201608,2,2016,27,8,201602),('2016-02-28',201609,2,2016,28,9,201602),('2016-02-29',201609,2,2016,29,9,201602),('2016-03-01',201609,3,2016,1,9,201603),('2016-03-02',201609,3,2016,2,9,201603),('2016-03-03',201609,3,2016,3,9,201603),('2016-03-04',201609,3,2016,4,9,201603),('2016-03-05',201609,3,2016,5,9,201603),('2016-03-06',201610,3,2016,6,10,201603),('2016-03-07',201610,3,2016,7,10,201603),('2016-03-08',201610,3,2016,8,10,201603),('2016-03-09',201610,3,2016,9,10,201603),('2016-03-10',201610,3,2016,10,10,201603),('2016-03-11',201610,3,2016,11,10,201603),('2016-03-12',201610,3,2016,12,10,201603),('2016-03-13',201611,3,2016,13,11,201603),('2016-03-14',201611,3,2016,14,11,201603),('2016-03-15',201611,3,2016,15,11,201603),('2016-03-16',201611,3,2016,16,11,201603),('2016-03-17',201611,3,2016,17,11,201603),('2016-03-18',201611,3,2016,18,11,201603),('2016-03-19',201611,3,2016,19,11,201603),('2016-03-20',201612,3,2016,20,12,201603),('2016-03-21',201612,3,2016,21,12,201603),('2016-03-22',201612,3,2016,22,12,201603),('2016-03-23',201612,3,2016,23,12,201603),('2016-03-24',201612,3,2016,24,12,201603),('2016-03-25',201612,3,2016,25,12,201603),('2016-03-26',201612,3,2016,26,12,201603),('2016-03-27',201613,3,2016,27,13,201603),('2016-03-28',201613,3,2016,28,13,201603),('2016-03-29',201613,3,2016,29,13,201603),('2016-03-30',201613,3,2016,30,13,201603),('2016-03-31',201613,3,2016,31,13,201603),('2016-04-01',201613,4,2016,1,13,201604),('2016-04-02',201613,4,2016,2,13,201604),('2016-04-03',201614,4,2016,3,14,201604),('2016-04-04',201614,4,2016,4,14,201604),('2016-04-05',201614,4,2016,5,14,201604),('2016-04-06',201614,4,2016,6,14,201604),('2016-04-07',201614,4,2016,7,14,201604),('2016-04-08',201614,4,2016,8,14,201604),('2016-04-09',201614,4,2016,9,14,201604),('2016-04-10',201615,4,2016,10,15,201604),('2016-04-11',201615,4,2016,11,15,201604),('2016-04-12',201615,4,2016,12,15,201604),('2016-04-13',201615,4,2016,13,15,201604),('2016-04-14',201615,4,2016,14,15,201604),('2016-04-15',201615,4,2016,15,15,201604),('2016-04-16',201615,4,2016,16,15,201604),('2016-04-17',201616,4,2016,17,16,201604),('2016-04-18',201616,4,2016,18,16,201604),('2016-04-19',201616,4,2016,19,16,201604),('2016-04-20',201616,4,2016,20,16,201604),('2016-04-21',201616,4,2016,21,16,201604),('2016-04-22',201616,4,2016,22,16,201604),('2016-04-23',201616,4,2016,23,16,201604),('2016-04-24',201617,4,2016,24,17,201604),('2016-04-25',201617,4,2016,25,17,201604),('2016-04-26',201617,4,2016,26,17,201604),('2016-04-27',201617,4,2016,27,17,201604),('2016-04-28',201617,4,2016,28,17,201604),('2016-04-29',201617,4,2016,29,17,201604),('2016-04-30',201617,4,2016,30,17,201604),('2016-05-01',201618,5,2016,1,18,201605),('2016-05-02',201618,5,2016,2,18,201605),('2016-05-03',201618,5,2016,3,18,201605),('2016-05-04',201618,5,2016,4,18,201605),('2016-05-05',201618,5,2016,5,18,201605),('2016-05-06',201618,5,2016,6,18,201605),('2016-05-07',201618,5,2016,7,18,201605),('2016-05-08',201619,5,2016,8,19,201605),('2016-05-09',201619,5,2016,9,19,201605),('2016-05-10',201619,5,2016,10,19,201605),('2016-05-11',201619,5,2016,11,19,201605),('2016-05-12',201619,5,2016,12,19,201605),('2016-05-13',201619,5,2016,13,19,201605),('2016-05-14',201619,5,2016,14,19,201605),('2016-05-15',201620,5,2016,15,20,201605),('2016-05-16',201620,5,2016,16,20,201605),('2016-05-17',201620,5,2016,17,20,201605),('2016-05-18',201620,5,2016,18,20,201605),('2016-05-19',201620,5,2016,19,20,201605),('2016-05-20',201620,5,2016,20,20,201605),('2016-05-21',201620,5,2016,21,20,201605),('2016-05-22',201621,5,2016,22,21,201605),('2016-05-23',201621,5,2016,23,21,201605),('2016-05-24',201621,5,2016,24,21,201605),('2016-05-25',201621,5,2016,25,21,201605),('2016-05-26',201621,5,2016,26,21,201605),('2016-05-27',201621,5,2016,27,21,201605),('2016-05-28',201621,5,2016,28,21,201605),('2016-05-29',201622,5,2016,29,22,201605),('2016-05-30',201622,5,2016,30,22,201605),('2016-05-31',201622,5,2016,31,22,201605),('2016-06-01',201622,6,2016,1,22,201606),('2016-06-02',201622,6,2016,2,22,201606),('2016-06-03',201622,6,2016,3,22,201606),('2016-06-04',201622,6,2016,4,22,201606),('2016-06-05',201623,6,2016,5,23,201606),('2016-06-06',201623,6,2016,6,23,201606),('2016-06-07',201623,6,2016,7,23,201606),('2016-06-08',201623,6,2016,8,23,201606),('2016-06-09',201623,6,2016,9,23,201606),('2016-06-10',201623,6,2016,10,23,201606),('2016-06-11',201623,6,2016,11,23,201606),('2016-06-12',201624,6,2016,12,24,201606),('2016-06-13',201624,6,2016,13,24,201606),('2016-06-14',201624,6,2016,14,24,201606),('2016-06-15',201624,6,2016,15,24,201606),('2016-06-16',201624,6,2016,16,24,201606),('2016-06-17',201624,6,2016,17,24,201606),('2016-06-18',201624,6,2016,18,24,201606),('2016-06-19',201625,6,2016,19,25,201606),('2016-06-20',201625,6,2016,20,25,201606),('2016-06-21',201625,6,2016,21,25,201606),('2016-06-22',201625,6,2016,22,25,201606),('2016-06-23',201625,6,2016,23,25,201606),('2016-06-24',201625,6,2016,24,25,201606),('2016-06-25',201625,6,2016,25,25,201606),('2016-06-26',201626,6,2016,26,26,201606),('2016-06-27',201626,6,2016,27,26,201606),('2016-06-28',201626,6,2016,28,26,201606),('2016-06-29',201626,6,2016,29,26,201606),('2016-06-30',201626,6,2016,30,26,201606),('2016-07-01',201626,7,2016,1,26,201607),('2016-07-02',201626,7,2016,2,26,201607),('2016-07-03',201627,7,2016,3,27,201607),('2016-07-04',201627,7,2016,4,27,201607),('2016-07-05',201627,7,2016,5,27,201607),('2016-07-06',201627,7,2016,6,27,201607),('2016-07-07',201627,7,2016,7,27,201607),('2016-07-08',201627,7,2016,8,27,201607),('2016-07-09',201627,7,2016,9,27,201607),('2016-07-10',201628,7,2016,10,28,201607),('2016-07-11',201628,7,2016,11,28,201607),('2016-07-12',201628,7,2016,12,28,201607),('2016-07-13',201628,7,2016,13,28,201607),('2016-07-14',201628,7,2016,14,28,201607),('2016-07-15',201628,7,2016,15,28,201607),('2016-07-16',201628,7,2016,16,28,201607),('2016-07-17',201629,7,2016,17,29,201607),('2016-07-18',201629,7,2016,18,29,201607),('2016-07-19',201629,7,2016,19,29,201607),('2016-07-20',201629,7,2016,20,29,201607),('2016-07-21',201629,7,2016,21,29,201607),('2016-07-22',201629,7,2016,22,29,201607),('2016-07-23',201629,7,2016,23,29,201607),('2016-07-24',201630,7,2016,24,30,201607),('2016-07-25',201630,7,2016,25,30,201607),('2016-07-26',201630,7,2016,26,30,201607),('2016-07-27',201630,7,2016,27,30,201607),('2016-07-28',201630,7,2016,28,30,201607),('2016-07-29',201630,7,2016,29,30,201607),('2016-07-30',201630,7,2016,30,30,201607),('2016-07-31',201631,7,2016,31,31,201607),('2016-08-01',201631,8,2016,1,31,201608),('2016-08-02',201631,8,2016,2,31,201608),('2016-08-03',201631,8,2016,3,31,201608),('2016-08-04',201631,8,2016,4,31,201608),('2016-08-05',201631,8,2016,5,31,201608),('2016-08-06',201631,8,2016,6,31,201608),('2016-08-07',201632,8,2016,7,32,201608),('2016-08-08',201632,8,2016,8,32,201608),('2016-08-09',201632,8,2016,9,32,201608),('2016-08-10',201632,8,2016,10,32,201608),('2016-08-11',201632,8,2016,11,32,201608),('2016-08-12',201632,8,2016,12,32,201608),('2016-08-13',201632,8,2016,13,32,201608),('2016-08-14',201633,8,2016,14,33,201608),('2016-08-15',201633,8,2016,15,33,201608),('2016-08-16',201633,8,2016,16,33,201608),('2016-08-17',201633,8,2016,17,33,201608),('2016-08-18',201633,8,2016,18,33,201608),('2016-08-19',201633,8,2016,19,33,201608),('2016-08-20',201633,8,2016,20,33,201608),('2016-08-21',201634,8,2016,21,34,201608),('2016-08-22',201634,8,2016,22,34,201608),('2016-08-23',201634,8,2016,23,34,201608),('2016-08-24',201634,8,2016,24,34,201608),('2016-08-25',201634,8,2016,25,34,201608),('2016-08-26',201634,8,2016,26,34,201608),('2016-08-27',201634,8,2016,27,34,201608),('2016-08-28',201635,8,2016,28,35,201608),('2016-08-29',201635,8,2016,29,35,201608),('2016-08-30',201635,8,2016,30,35,201608),('2016-08-31',201635,8,2016,31,35,201608),('2016-09-01',201635,9,2016,1,35,201609),('2016-09-02',201635,9,2016,2,35,201609),('2016-09-03',201635,9,2016,3,35,201609),('2016-09-04',201636,9,2016,4,36,201609),('2016-09-05',201636,9,2016,5,36,201609),('2016-09-06',201636,9,2016,6,36,201609),('2016-09-07',201636,9,2016,7,36,201609),('2016-09-08',201636,9,2016,8,36,201609),('2016-09-09',201636,9,2016,9,36,201609),('2016-09-10',201636,9,2016,10,36,201609),('2016-09-11',201637,9,2016,11,37,201609),('2016-09-12',201637,9,2016,12,37,201609),('2016-09-13',201637,9,2016,13,37,201609),('2016-09-14',201637,9,2016,14,37,201609),('2016-09-15',201637,9,2016,15,37,201609),('2016-09-16',201637,9,2016,16,37,201609),('2016-09-17',201637,9,2016,17,37,201609),('2016-09-18',201638,9,2016,18,38,201609),('2016-09-19',201638,9,2016,19,38,201609),('2016-09-20',201638,9,2016,20,38,201609),('2016-09-21',201638,9,2016,21,38,201609),('2016-09-22',201638,9,2016,22,38,201609),('2016-09-23',201638,9,2016,23,38,201609),('2016-09-24',201638,9,2016,24,38,201609),('2016-09-25',201639,9,2016,25,39,201609),('2016-09-26',201639,9,2016,26,39,201609),('2016-09-27',201639,9,2016,27,39,201609),('2016-09-28',201639,9,2016,28,39,201609),('2016-09-29',201639,9,2016,29,39,201609),('2016-09-30',201639,9,2016,30,39,201609),('2016-10-01',201639,10,2016,1,39,201610),('2016-10-02',201640,10,2016,2,40,201610),('2016-10-03',201640,10,2016,3,40,201610),('2016-10-04',201640,10,2016,4,40,201610),('2016-10-05',201640,10,2016,5,40,201610),('2016-10-06',201640,10,2016,6,40,201610),('2016-10-07',201640,10,2016,7,40,201610),('2016-10-08',201640,10,2016,8,40,201610),('2016-10-09',201641,10,2016,9,41,201610),('2016-10-10',201641,10,2016,10,41,201610),('2016-10-11',201641,10,2016,11,41,201610),('2016-10-12',201641,10,2016,12,41,201610),('2016-10-13',201641,10,2016,13,41,201610),('2016-10-14',201641,10,2016,14,41,201610),('2016-10-15',201641,10,2016,15,41,201610),('2016-10-16',201642,10,2016,16,42,201610),('2016-10-17',201642,10,2016,17,42,201610),('2016-10-18',201642,10,2016,18,42,201610),('2016-10-19',201642,10,2016,19,42,201610),('2016-10-20',201642,10,2016,20,42,201610),('2016-10-21',201642,10,2016,21,42,201610),('2016-10-22',201642,10,2016,22,42,201610),('2016-10-23',201643,10,2016,23,43,201610),('2016-10-24',201643,10,2016,24,43,201610),('2016-10-25',201643,10,2016,25,43,201610),('2016-10-26',201643,10,2016,26,43,201610),('2016-10-27',201643,10,2016,27,43,201610),('2016-10-28',201643,10,2016,28,43,201610),('2016-10-29',201643,10,2016,29,43,201610),('2016-10-30',201644,10,2016,30,44,201610),('2016-10-31',201644,10,2016,31,44,201610),('2016-11-01',201644,11,2016,1,44,201611),('2016-11-02',201644,11,2016,2,44,201611),('2016-11-03',201644,11,2016,3,44,201611),('2016-11-04',201644,11,2016,4,44,201611),('2016-11-05',201644,11,2016,5,44,201611),('2016-11-06',201645,11,2016,6,45,201611),('2016-11-07',201645,11,2016,7,45,201611),('2016-11-08',201645,11,2016,8,45,201611),('2016-11-09',201645,11,2016,9,45,201611),('2016-11-10',201645,11,2016,10,45,201611),('2016-11-11',201645,11,2016,11,45,201611),('2016-11-12',201645,11,2016,12,45,201611),('2016-11-13',201646,11,2016,13,46,201611),('2016-11-14',201646,11,2016,14,46,201611),('2016-11-15',201646,11,2016,15,46,201611),('2016-11-16',201646,11,2016,16,46,201611),('2016-11-17',201646,11,2016,17,46,201611),('2016-11-18',201646,11,2016,18,46,201611),('2016-11-19',201646,11,2016,19,46,201611),('2016-11-20',201647,11,2016,20,47,201611),('2016-11-21',201647,11,2016,21,47,201611),('2016-11-22',201647,11,2016,22,47,201611),('2016-11-23',201647,11,2016,23,47,201611),('2016-11-24',201647,11,2016,24,47,201611),('2016-11-25',201647,11,2016,25,47,201611),('2016-11-26',201647,11,2016,26,47,201611),('2016-11-27',201648,11,2016,27,48,201611),('2016-11-28',201648,11,2016,28,48,201611),('2016-11-29',201648,11,2016,29,48,201611),('2016-11-30',201648,11,2016,30,48,201611),('2016-12-01',201648,12,2016,1,48,201612),('2016-12-02',201648,12,2016,2,48,201612),('2016-12-03',201648,12,2016,3,48,201612),('2016-12-04',201649,12,2016,4,49,201612),('2016-12-05',201649,12,2016,5,49,201612),('2016-12-06',201649,12,2016,6,49,201612),('2016-12-07',201649,12,2016,7,49,201612),('2016-12-08',201649,12,2016,8,49,201612),('2016-12-09',201649,12,2016,9,49,201612),('2016-12-10',201649,12,2016,10,49,201612),('2016-12-11',201650,12,2016,11,50,201612),('2016-12-12',201650,12,2016,12,50,201612),('2016-12-13',201650,12,2016,13,50,201612),('2016-12-14',201650,12,2016,14,50,201612),('2016-12-15',201650,12,2016,15,50,201612),('2016-12-16',201650,12,2016,16,50,201612),('2016-12-17',201650,12,2016,17,50,201612),('2016-12-18',201651,12,2016,18,51,201612),('2016-12-19',201651,12,2016,19,51,201612),('2016-12-20',201651,12,2016,20,51,201612),('2016-12-21',201651,12,2016,21,51,201612),('2016-12-22',201651,12,2016,22,51,201612),('2016-12-23',201651,12,2016,23,51,201612),('2016-12-24',201651,12,2016,24,51,201612),('2016-12-25',201652,12,2016,25,52,201612),('2016-12-26',201652,12,2016,26,52,201612),('2016-12-27',201652,12,2016,27,52,201612),('2016-12-28',201652,12,2016,28,52,201612),('2016-12-29',201652,12,2016,29,52,201612),('2016-12-30',201652,12,2016,30,52,201612),('2016-12-31',201652,12,2016,31,52,201612),('2017-01-01',201701,1,2017,1,1,201701),('2017-01-02',201701,1,2017,2,1,201701),('2017-01-03',201701,1,2017,3,1,201701),('2017-01-04',201701,1,2017,4,1,201701),('2017-01-05',201701,1,2017,5,1,201701),('2017-01-06',201701,1,2017,6,1,201701),('2017-01-07',201701,1,2017,7,1,201701),('2017-01-08',201702,1,2017,8,2,201701),('2017-01-09',201702,1,2017,9,2,201701),('2017-01-10',201702,1,2017,10,2,201701),('2017-01-11',201702,1,2017,11,2,201701),('2017-01-12',201702,1,2017,12,2,201701),('2017-01-13',201702,1,2017,13,2,201701),('2017-01-14',201702,1,2017,14,2,201701),('2017-01-15',201703,1,2017,15,3,201701),('2017-01-16',201703,1,2017,16,3,201701),('2017-01-17',201703,1,2017,17,3,201701),('2017-01-18',201703,1,2017,18,3,201701),('2017-01-19',201703,1,2017,19,3,201701),('2017-01-20',201703,1,2017,20,3,201701),('2017-01-21',201703,1,2017,21,3,201701),('2017-01-22',201704,1,2017,22,4,201701),('2017-01-23',201704,1,2017,23,4,201701),('2017-01-24',201704,1,2017,24,4,201701),('2017-01-25',201704,1,2017,25,4,201701),('2017-01-26',201704,1,2017,26,4,201701),('2017-01-27',201704,1,2017,27,4,201701),('2017-01-28',201704,1,2017,28,4,201701),('2017-01-29',201705,1,2017,29,5,201701),('2017-01-30',201705,1,2017,30,5,201701),('2017-01-31',201705,1,2017,31,5,201701),('2017-02-01',201705,2,2017,1,5,201702),('2017-02-02',201705,2,2017,2,5,201702),('2017-02-03',201705,2,2017,3,5,201702),('2017-02-04',201705,2,2017,4,5,201702),('2017-02-05',201706,2,2017,5,6,201702),('2017-02-06',201706,2,2017,6,6,201702),('2017-02-07',201706,2,2017,7,6,201702),('2017-02-08',201706,2,2017,8,6,201702),('2017-02-09',201706,2,2017,9,6,201702),('2017-02-10',201706,2,2017,10,6,201702),('2017-02-11',201706,2,2017,11,6,201702),('2017-02-12',201707,2,2017,12,7,201702),('2017-02-13',201707,2,2017,13,7,201702),('2017-02-14',201707,2,2017,14,7,201702),('2017-02-15',201707,2,2017,15,7,201702),('2017-02-16',201707,2,2017,16,7,201702),('2017-02-17',201707,2,2017,17,7,201702),('2017-02-18',201707,2,2017,18,7,201702),('2017-02-19',201708,2,2017,19,8,201702),('2017-02-20',201708,2,2017,20,8,201702),('2017-02-21',201708,2,2017,21,8,201702),('2017-02-22',201708,2,2017,22,8,201702),('2017-02-23',201708,2,2017,23,8,201702),('2017-02-24',201708,2,2017,24,8,201702),('2017-02-25',201708,2,2017,25,8,201702),('2017-02-26',201709,2,2017,26,9,201702),('2017-02-27',201709,2,2017,27,9,201702),('2017-02-28',201709,2,2017,28,9,201702),('2017-03-01',201709,3,2017,1,9,201703),('2017-03-02',201709,3,2017,2,9,201703),('2017-03-03',201709,3,2017,3,9,201703),('2017-03-04',201709,3,2017,4,9,201703),('2017-03-05',201710,3,2017,5,10,201703),('2017-03-06',201710,3,2017,6,10,201703),('2017-03-07',201710,3,2017,7,10,201703),('2017-03-08',201710,3,2017,8,10,201703),('2017-03-09',201710,3,2017,9,10,201703),('2017-03-10',201710,3,2017,10,10,201703),('2017-03-11',201710,3,2017,11,10,201703),('2017-03-12',201711,3,2017,12,11,201703),('2017-03-13',201711,3,2017,13,11,201703),('2017-03-14',201711,3,2017,14,11,201703),('2017-03-15',201711,3,2017,15,11,201703),('2017-03-16',201711,3,2017,16,11,201703),('2017-03-17',201711,3,2017,17,11,201703),('2017-03-18',201711,3,2017,18,11,201703),('2017-03-19',201712,3,2017,19,12,201703),('2017-03-20',201712,3,2017,20,12,201703),('2017-03-21',201712,3,2017,21,12,201703),('2017-03-22',201712,3,2017,22,12,201703),('2017-03-23',201712,3,2017,23,12,201703),('2017-03-24',201712,3,2017,24,12,201703),('2017-03-25',201712,3,2017,25,12,201703),('2017-03-26',201713,3,2017,26,13,201703),('2017-03-27',201713,3,2017,27,13,201703),('2017-03-28',201713,3,2017,28,13,201703),('2017-03-29',201713,3,2017,29,13,201703),('2017-03-30',201713,3,2017,30,13,201703),('2017-03-31',201713,3,2017,31,13,201703),('2017-04-01',201713,4,2017,1,13,201704),('2017-04-02',201714,4,2017,2,14,201704),('2017-04-03',201714,4,2017,3,14,201704),('2017-04-04',201714,4,2017,4,14,201704),('2017-04-05',201714,4,2017,5,14,201704),('2017-04-06',201714,4,2017,6,14,201704),('2017-04-07',201714,4,2017,7,14,201704),('2017-04-08',201714,4,2017,8,14,201704),('2017-04-09',201715,4,2017,9,15,201704),('2017-04-10',201715,4,2017,10,15,201704),('2017-04-11',201715,4,2017,11,15,201704),('2017-04-12',201715,4,2017,12,15,201704),('2017-04-13',201715,4,2017,13,15,201704),('2017-04-14',201715,4,2017,14,15,201704),('2017-04-15',201715,4,2017,15,15,201704),('2017-04-16',201716,4,2017,16,16,201704),('2017-04-17',201716,4,2017,17,16,201704),('2017-04-18',201716,4,2017,18,16,201704),('2017-04-19',201716,4,2017,19,16,201704),('2017-04-20',201716,4,2017,20,16,201704),('2017-04-21',201716,4,2017,21,16,201704),('2017-04-22',201716,4,2017,22,16,201704),('2017-04-23',201717,4,2017,23,17,201704),('2017-04-24',201717,4,2017,24,17,201704),('2017-04-25',201717,4,2017,25,17,201704),('2017-04-26',201717,4,2017,26,17,201704),('2017-04-27',201717,4,2017,27,17,201704),('2017-04-28',201717,4,2017,28,17,201704),('2017-04-29',201717,4,2017,29,17,201704),('2017-04-30',201718,4,2017,30,18,201704),('2017-05-01',201718,5,2017,1,18,201705),('2017-05-02',201718,5,2017,2,18,201705),('2017-05-03',201718,5,2017,3,18,201705),('2017-05-04',201718,5,2017,4,18,201705),('2017-05-05',201718,5,2017,5,18,201705),('2017-05-06',201718,5,2017,6,18,201705),('2017-05-07',201719,5,2017,7,19,201705),('2017-05-08',201719,5,2017,8,19,201705),('2017-05-09',201719,5,2017,9,19,201705),('2017-05-10',201719,5,2017,10,19,201705),('2017-05-11',201719,5,2017,11,19,201705),('2017-05-12',201719,5,2017,12,19,201705),('2017-05-13',201719,5,2017,13,19,201705),('2017-05-14',201720,5,2017,14,20,201705),('2017-05-15',201720,5,2017,15,20,201705),('2017-05-16',201720,5,2017,16,20,201705),('2017-05-17',201720,5,2017,17,20,201705),('2017-05-18',201720,5,2017,18,20,201705),('2017-05-19',201720,5,2017,19,20,201705),('2017-05-20',201720,5,2017,20,20,201705),('2017-05-21',201721,5,2017,21,21,201705),('2017-05-22',201721,5,2017,22,21,201705),('2017-05-23',201721,5,2017,23,21,201705),('2017-05-24',201721,5,2017,24,21,201705),('2017-05-25',201721,5,2017,25,21,201705),('2017-05-26',201721,5,2017,26,21,201705),('2017-05-27',201721,5,2017,27,21,201705),('2017-05-28',201722,5,2017,28,22,201705),('2017-05-29',201722,5,2017,29,22,201705),('2017-05-30',201722,5,2017,30,22,201705),('2017-05-31',201722,5,2017,31,22,201705),('2017-06-01',201722,6,2017,1,22,201706),('2017-06-02',201722,6,2017,2,22,201706),('2017-06-03',201722,6,2017,3,22,201706),('2017-06-04',201723,6,2017,4,23,201706),('2017-06-05',201723,6,2017,5,23,201706),('2017-06-06',201723,6,2017,6,23,201706),('2017-06-07',201723,6,2017,7,23,201706),('2017-06-08',201723,6,2017,8,23,201706),('2017-06-09',201723,6,2017,9,23,201706),('2017-06-10',201723,6,2017,10,23,201706),('2017-06-11',201724,6,2017,11,24,201706),('2017-06-12',201724,6,2017,12,24,201706),('2017-06-13',201724,6,2017,13,24,201706),('2017-06-14',201724,6,2017,14,24,201706),('2017-06-15',201724,6,2017,15,24,201706),('2017-06-16',201724,6,2017,16,24,201706),('2017-06-17',201724,6,2017,17,24,201706),('2017-06-18',201725,6,2017,18,25,201706),('2017-06-19',201725,6,2017,19,25,201706),('2017-06-20',201725,6,2017,20,25,201706),('2017-06-21',201725,6,2017,21,25,201706),('2017-06-22',201725,6,2017,22,25,201706),('2017-06-23',201725,6,2017,23,25,201706),('2017-06-24',201725,6,2017,24,25,201706),('2017-06-25',201726,6,2017,25,26,201706),('2017-06-26',201726,6,2017,26,26,201706),('2017-06-27',201726,6,2017,27,26,201706),('2017-06-28',201726,6,2017,28,26,201706),('2017-06-29',201726,6,2017,29,26,201706),('2017-06-30',201726,6,2017,30,26,201706),('2017-07-01',201726,7,2017,1,26,201707),('2017-07-02',201727,7,2017,2,27,201707),('2017-07-03',201727,7,2017,3,27,201707),('2017-07-04',201727,7,2017,4,27,201707),('2017-07-05',201727,7,2017,5,27,201707),('2017-07-06',201727,7,2017,6,27,201707),('2017-07-07',201727,7,2017,7,27,201707),('2017-07-08',201727,7,2017,8,27,201707),('2017-07-09',201728,7,2017,9,28,201707),('2017-07-10',201728,7,2017,10,28,201707),('2017-07-11',201728,7,2017,11,28,201707),('2017-07-12',201728,7,2017,12,28,201707),('2017-07-13',201728,7,2017,13,28,201707),('2017-07-14',201728,7,2017,14,28,201707),('2017-07-15',201728,7,2017,15,28,201707),('2017-07-16',201729,7,2017,16,29,201707),('2017-07-17',201729,7,2017,17,29,201707),('2017-07-18',201729,7,2017,18,29,201707),('2017-07-19',201729,7,2017,19,29,201707),('2017-07-20',201729,7,2017,20,29,201707),('2017-07-21',201729,7,2017,21,29,201707),('2017-07-22',201729,7,2017,22,29,201707),('2017-07-23',201730,7,2017,23,30,201707),('2017-07-24',201730,7,2017,24,30,201707),('2017-07-25',201730,7,2017,25,30,201707),('2017-07-26',201730,7,2017,26,30,201707),('2017-07-27',201730,7,2017,27,30,201707),('2017-07-28',201730,7,2017,28,30,201707),('2017-07-29',201730,7,2017,29,30,201707),('2017-07-30',201731,7,2017,30,31,201707),('2017-07-31',201731,7,2017,31,31,201707),('2017-08-01',201731,8,2017,1,31,201708),('2017-08-02',201731,8,2017,2,31,201708),('2017-08-03',201731,8,2017,3,31,201708),('2017-08-04',201731,8,2017,4,31,201708),('2017-08-05',201731,8,2017,5,31,201708),('2017-08-06',201732,8,2017,6,32,201708),('2017-08-07',201732,8,2017,7,32,201708),('2017-08-08',201732,8,2017,8,32,201708),('2017-08-09',201732,8,2017,9,32,201708),('2017-08-10',201732,8,2017,10,32,201708),('2017-08-11',201732,8,2017,11,32,201708),('2017-08-12',201732,8,2017,12,32,201708),('2017-08-13',201733,8,2017,13,33,201708),('2017-08-14',201733,8,2017,14,33,201708),('2017-08-15',201733,8,2017,15,33,201708),('2017-08-16',201733,8,2017,16,33,201708),('2017-08-17',201733,8,2017,17,33,201708),('2017-08-18',201733,8,2017,18,33,201708),('2017-08-19',201733,8,2017,19,33,201708),('2017-08-20',201734,8,2017,20,34,201708),('2017-08-21',201734,8,2017,21,34,201708),('2017-08-22',201734,8,2017,22,34,201708),('2017-08-23',201734,8,2017,23,34,201708),('2017-08-24',201734,8,2017,24,34,201708),('2017-08-25',201734,8,2017,25,34,201708),('2017-08-26',201734,8,2017,26,34,201708),('2017-08-27',201735,8,2017,27,35,201708),('2017-08-28',201735,8,2017,28,35,201708),('2017-08-29',201735,8,2017,29,35,201708),('2017-08-30',201735,8,2017,30,35,201708),('2017-08-31',201735,8,2017,31,35,201708),('2017-09-01',201735,9,2017,1,35,201709),('2017-09-02',201735,9,2017,2,35,201709),('2017-09-03',201736,9,2017,3,36,201709),('2017-09-04',201736,9,2017,4,36,201709),('2017-09-05',201736,9,2017,5,36,201709),('2017-09-06',201736,9,2017,6,36,201709),('2017-09-07',201736,9,2017,7,36,201709),('2017-09-08',201736,9,2017,8,36,201709),('2017-09-09',201736,9,2017,9,36,201709),('2017-09-10',201737,9,2017,10,37,201709),('2017-09-11',201737,9,2017,11,37,201709),('2017-09-12',201737,9,2017,12,37,201709),('2017-09-13',201737,9,2017,13,37,201709),('2017-09-14',201737,9,2017,14,37,201709),('2017-09-15',201737,9,2017,15,37,201709),('2017-09-16',201737,9,2017,16,37,201709),('2017-09-17',201738,9,2017,17,38,201709),('2017-09-18',201738,9,2017,18,38,201709),('2017-09-19',201738,9,2017,19,38,201709),('2017-09-20',201738,9,2017,20,38,201709),('2017-09-21',201738,9,2017,21,38,201709),('2017-09-22',201738,9,2017,22,38,201709),('2017-09-23',201738,9,2017,23,38,201709),('2017-09-24',201739,9,2017,24,39,201709),('2017-09-25',201739,9,2017,25,39,201709),('2017-09-26',201739,9,2017,26,39,201709),('2017-09-27',201739,9,2017,27,39,201709),('2017-09-28',201739,9,2017,28,39,201709),('2017-09-29',201739,9,2017,29,39,201709),('2017-09-30',201739,9,2017,30,39,201709),('2017-10-01',201740,10,2017,1,40,201710),('2017-10-02',201740,10,2017,2,40,201710),('2017-10-03',201740,10,2017,3,40,201710),('2017-10-04',201740,10,2017,4,40,201710),('2017-10-05',201740,10,2017,5,40,201710),('2017-10-06',201740,10,2017,6,40,201710),('2017-10-07',201740,10,2017,7,40,201710),('2017-10-08',201741,10,2017,8,41,201710),('2017-10-09',201741,10,2017,9,41,201710),('2017-10-10',201741,10,2017,10,41,201710),('2017-10-11',201741,10,2017,11,41,201710),('2017-10-12',201741,10,2017,12,41,201710),('2017-10-13',201741,10,2017,13,41,201710),('2017-10-14',201741,10,2017,14,41,201710),('2017-10-15',201742,10,2017,15,42,201710),('2017-10-16',201742,10,2017,16,42,201710),('2017-10-17',201742,10,2017,17,42,201710),('2017-10-18',201742,10,2017,18,42,201710),('2017-10-19',201742,10,2017,19,42,201710),('2017-10-20',201742,10,2017,20,42,201710),('2017-10-21',201742,10,2017,21,42,201710),('2017-10-22',201743,10,2017,22,43,201710),('2017-10-23',201743,10,2017,23,43,201710),('2017-10-24',201743,10,2017,24,43,201710),('2017-10-25',201743,10,2017,25,43,201710),('2017-10-26',201743,10,2017,26,43,201710),('2017-10-27',201743,10,2017,27,43,201710),('2017-10-28',201743,10,2017,28,43,201710),('2017-10-29',201744,10,2017,29,44,201710),('2017-10-30',201744,10,2017,30,44,201710),('2017-10-31',201744,10,2017,31,44,201710),('2017-11-01',201744,11,2017,1,44,201711),('2017-11-02',201744,11,2017,2,44,201711),('2017-11-03',201744,11,2017,3,44,201711),('2017-11-04',201744,11,2017,4,44,201711),('2017-11-05',201745,11,2017,5,45,201711),('2017-11-06',201745,11,2017,6,45,201711),('2017-11-07',201745,11,2017,7,45,201711),('2017-11-08',201745,11,2017,8,45,201711),('2017-11-09',201745,11,2017,9,45,201711),('2017-11-10',201745,11,2017,10,45,201711),('2017-11-11',201745,11,2017,11,45,201711),('2017-11-12',201746,11,2017,12,46,201711),('2017-11-13',201746,11,2017,13,46,201711),('2017-11-14',201746,11,2017,14,46,201711),('2017-11-15',201746,11,2017,15,46,201711),('2017-11-16',201746,11,2017,16,46,201711),('2017-11-17',201746,11,2017,17,46,201711),('2017-11-18',201746,11,2017,18,46,201711),('2017-11-19',201747,11,2017,19,47,201711),('2017-11-20',201747,11,2017,20,47,201711),('2017-11-21',201747,11,2017,21,47,201711),('2017-11-22',201747,11,2017,22,47,201711),('2017-11-23',201747,11,2017,23,47,201711),('2017-11-24',201747,11,2017,24,47,201711),('2017-11-25',201747,11,2017,25,47,201711),('2017-11-26',201748,11,2017,26,48,201711),('2017-11-27',201748,11,2017,27,48,201711),('2017-11-28',201748,11,2017,28,48,201711),('2017-11-29',201748,11,2017,29,48,201711),('2017-11-30',201748,11,2017,30,48,201711),('2017-12-01',201748,12,2017,1,48,201712),('2017-12-02',201748,12,2017,2,48,201712),('2017-12-03',201749,12,2017,3,49,201712),('2017-12-04',201749,12,2017,4,49,201712),('2017-12-05',201749,12,2017,5,49,201712),('2017-12-06',201749,12,2017,6,49,201712),('2017-12-07',201749,12,2017,7,49,201712),('2017-12-08',201749,12,2017,8,49,201712),('2017-12-09',201749,12,2017,9,49,201712),('2017-12-10',201750,12,2017,10,50,201712),('2017-12-11',201750,12,2017,11,50,201712),('2017-12-12',201750,12,2017,12,50,201712),('2017-12-13',201750,12,2017,13,50,201712),('2017-12-14',201750,12,2017,14,50,201712),('2017-12-15',201750,12,2017,15,50,201712),('2017-12-16',201750,12,2017,16,50,201712),('2017-12-17',201751,12,2017,17,51,201712),('2017-12-18',201751,12,2017,18,51,201712),('2017-12-19',201751,12,2017,19,51,201712),('2017-12-20',201751,12,2017,20,51,201712),('2017-12-21',201751,12,2017,21,51,201712),('2017-12-22',201751,12,2017,22,51,201712),('2017-12-23',201751,12,2017,23,51,201712),('2017-12-24',201752,12,2017,24,52,201712),('2017-12-25',201752,12,2017,25,52,201712),('2017-12-26',201752,12,2017,26,52,201712),('2017-12-27',201752,12,2017,27,52,201712),('2017-12-28',201752,12,2017,28,52,201712),('2017-12-29',201752,12,2017,29,52,201712),('2017-12-30',201752,12,2017,30,52,201712),('2017-12-31',201801,12,2017,31,1,201712),('2018-01-01',201801,1,2018,1,1,201801),('2018-01-02',201801,1,2018,2,1,201801),('2018-01-03',201801,1,2018,3,1,201801),('2018-01-04',201801,1,2018,4,1,201801),('2018-01-05',201801,1,2018,5,1,201801),('2018-01-06',201801,1,2018,6,1,201801),('2018-01-07',201802,1,2018,7,2,201801),('2018-01-08',201802,1,2018,8,2,201801),('2018-01-09',201802,1,2018,9,2,201801),('2018-01-10',201802,1,2018,10,2,201801),('2018-01-11',201802,1,2018,11,2,201801),('2018-01-12',201802,1,2018,12,2,201801),('2018-01-13',201802,1,2018,13,2,201801),('2018-01-14',201803,1,2018,14,3,201801),('2018-01-15',201803,1,2018,15,3,201801),('2018-01-16',201803,1,2018,16,3,201801),('2018-01-17',201803,1,2018,17,3,201801),('2018-01-18',201803,1,2018,18,3,201801),('2018-01-19',201803,1,2018,19,3,201801),('2018-01-20',201803,1,2018,20,3,201801),('2018-01-21',201804,1,2018,21,4,201801),('2018-01-22',201804,1,2018,22,4,201801),('2018-01-23',201804,1,2018,23,4,201801),('2018-01-24',201804,1,2018,24,4,201801),('2018-01-25',201804,1,2018,25,4,201801),('2018-01-26',201804,1,2018,26,4,201801),('2018-01-27',201804,1,2018,27,4,201801),('2018-01-28',201805,1,2018,28,5,201801),('2018-01-29',201805,1,2018,29,5,201801),('2018-01-30',201805,1,2018,30,5,201801),('2018-01-31',201805,1,2018,31,5,201801),('2018-02-01',201805,2,2018,1,5,201802),('2018-02-02',201805,2,2018,2,5,201802),('2018-02-03',201805,2,2018,3,5,201802),('2018-02-04',201806,2,2018,4,6,201802),('2018-02-05',201806,2,2018,5,6,201802),('2018-02-06',201806,2,2018,6,6,201802),('2018-02-07',201806,2,2018,7,6,201802),('2018-02-08',201806,2,2018,8,6,201802),('2018-02-09',201806,2,2018,9,6,201802),('2018-02-10',201806,2,2018,10,6,201802),('2018-02-11',201807,2,2018,11,7,201802),('2018-02-12',201807,2,2018,12,7,201802),('2018-02-13',201807,2,2018,13,7,201802),('2018-02-14',201807,2,2018,14,7,201802),('2018-02-15',201807,2,2018,15,7,201802),('2018-02-16',201807,2,2018,16,7,201802),('2018-02-17',201807,2,2018,17,7,201802),('2018-02-18',201808,2,2018,18,8,201802),('2018-02-19',201808,2,2018,19,8,201802),('2018-02-20',201808,2,2018,20,8,201802),('2018-02-21',201808,2,2018,21,8,201802),('2018-02-22',201808,2,2018,22,8,201802),('2018-02-23',201808,2,2018,23,8,201802),('2018-02-24',201808,2,2018,24,8,201802),('2018-02-25',201809,2,2018,25,9,201802),('2018-02-26',201809,2,2018,26,9,201802),('2018-02-27',201809,2,2018,27,9,201802),('2018-02-28',201809,2,2018,28,9,201802),('2018-03-01',201809,3,2018,1,9,201803),('2018-03-02',201809,3,2018,2,9,201803),('2018-03-03',201809,3,2018,3,9,201803),('2018-03-04',201810,3,2018,4,10,201803),('2018-03-05',201810,3,2018,5,10,201803),('2018-03-06',201810,3,2018,6,10,201803),('2018-03-07',201810,3,2018,7,10,201803),('2018-03-08',201810,3,2018,8,10,201803),('2018-03-09',201810,3,2018,9,10,201803),('2018-03-10',201810,3,2018,10,10,201803),('2018-03-11',201811,3,2018,11,11,201803),('2018-03-12',201811,3,2018,12,11,201803),('2018-03-13',201811,3,2018,13,11,201803),('2018-03-14',201811,3,2018,14,11,201803),('2018-03-15',201811,3,2018,15,11,201803),('2018-03-16',201811,3,2018,16,11,201803),('2018-03-17',201811,3,2018,17,11,201803),('2018-03-18',201812,3,2018,18,12,201803),('2018-03-19',201812,3,2018,19,12,201803),('2018-03-20',201812,3,2018,20,12,201803),('2018-03-21',201812,3,2018,21,12,201803),('2018-03-22',201812,3,2018,22,12,201803),('2018-03-23',201812,3,2018,23,12,201803),('2018-03-24',201812,3,2018,24,12,201803),('2018-03-25',201813,3,2018,25,13,201803),('2018-03-26',201813,3,2018,26,13,201803),('2018-03-27',201813,3,2018,27,13,201803),('2018-03-28',201813,3,2018,28,13,201803),('2018-03-29',201813,3,2018,29,13,201803),('2018-03-30',201813,3,2018,30,13,201803),('2018-03-31',201813,3,2018,31,13,201803),('2018-04-01',201814,4,2018,1,14,201804),('2018-04-02',201814,4,2018,2,14,201804),('2018-04-03',201814,4,2018,3,14,201804),('2018-04-04',201814,4,2018,4,14,201804),('2018-04-05',201814,4,2018,5,14,201804),('2018-04-06',201814,4,2018,6,14,201804),('2018-04-07',201814,4,2018,7,14,201804),('2018-04-08',201815,4,2018,8,15,201804),('2018-04-09',201815,4,2018,9,15,201804),('2018-04-10',201815,4,2018,10,15,201804),('2018-04-11',201815,4,2018,11,15,201804),('2018-04-12',201815,4,2018,12,15,201804),('2018-04-13',201815,4,2018,13,15,201804),('2018-04-14',201815,4,2018,14,15,201804),('2018-04-15',201816,4,2018,15,16,201804),('2018-04-16',201816,4,2018,16,16,201804),('2018-04-17',201816,4,2018,17,16,201804),('2018-04-18',201816,4,2018,18,16,201804),('2018-04-19',201816,4,2018,19,16,201804),('2018-04-20',201816,4,2018,20,16,201804),('2018-04-21',201816,4,2018,21,16,201804),('2018-04-22',201817,4,2018,22,17,201804),('2018-04-23',201817,4,2018,23,17,201804),('2018-04-24',201817,4,2018,24,17,201804),('2018-04-25',201817,4,2018,25,17,201804),('2018-04-26',201817,4,2018,26,17,201804),('2018-04-27',201817,4,2018,27,17,201804),('2018-04-28',201817,4,2018,28,17,201804),('2018-04-29',201818,4,2018,29,18,201804),('2018-04-30',201818,4,2018,30,18,201804),('2018-05-01',201818,5,2018,1,18,201805),('2018-05-02',201818,5,2018,2,18,201805),('2018-05-03',201818,5,2018,3,18,201805),('2018-05-04',201818,5,2018,4,18,201805),('2018-05-05',201818,5,2018,5,18,201805),('2018-05-06',201819,5,2018,6,19,201805),('2018-05-07',201819,5,2018,7,19,201805),('2018-05-08',201819,5,2018,8,19,201805),('2018-05-09',201819,5,2018,9,19,201805),('2018-05-10',201819,5,2018,10,19,201805),('2018-05-11',201819,5,2018,11,19,201805),('2018-05-12',201819,5,2018,12,19,201805),('2018-05-13',201820,5,2018,13,20,201805),('2018-05-14',201820,5,2018,14,20,201805),('2018-05-15',201820,5,2018,15,20,201805),('2018-05-16',201820,5,2018,16,20,201805),('2018-05-17',201820,5,2018,17,20,201805),('2018-05-18',201820,5,2018,18,20,201805),('2018-05-19',201820,5,2018,19,20,201805),('2018-05-20',201821,5,2018,20,21,201805),('2018-05-21',201821,5,2018,21,21,201805),('2018-05-22',201821,5,2018,22,21,201805),('2018-05-23',201821,5,2018,23,21,201805),('2018-05-24',201821,5,2018,24,21,201805),('2018-05-25',201821,5,2018,25,21,201805),('2018-05-26',201821,5,2018,26,21,201805),('2018-05-27',201822,5,2018,27,22,201805),('2018-05-28',201822,5,2018,28,22,201805),('2018-05-29',201822,5,2018,29,22,201805),('2018-05-30',201822,5,2018,30,22,201805),('2018-05-31',201822,5,2018,31,22,201805),('2018-06-01',201822,6,2018,1,22,201806),('2018-06-02',201822,6,2018,2,22,201806),('2018-06-03',201823,6,2018,3,23,201806),('2018-06-04',201823,6,2018,4,23,201806),('2018-06-05',201823,6,2018,5,23,201806),('2018-06-06',201823,6,2018,6,23,201806),('2018-06-07',201823,6,2018,7,23,201806),('2018-06-08',201823,6,2018,8,23,201806),('2018-06-09',201823,6,2018,9,23,201806),('2018-06-10',201824,6,2018,10,24,201806),('2018-06-11',201824,6,2018,11,24,201806),('2018-06-12',201824,6,2018,12,24,201806),('2018-06-13',201824,6,2018,13,24,201806),('2018-06-14',201824,6,2018,14,24,201806),('2018-06-15',201824,6,2018,15,24,201806),('2018-06-16',201824,6,2018,16,24,201806),('2018-06-17',201825,6,2018,17,25,201806),('2018-06-18',201825,6,2018,18,25,201806),('2018-06-19',201825,6,2018,19,25,201806),('2018-06-20',201825,6,2018,20,25,201806),('2018-06-21',201825,6,2018,21,25,201806),('2018-06-22',201825,6,2018,22,25,201806),('2018-06-23',201825,6,2018,23,25,201806),('2018-06-24',201826,6,2018,24,26,201806),('2018-06-25',201826,6,2018,25,26,201806),('2018-06-26',201826,6,2018,26,26,201806),('2018-06-27',201826,6,2018,27,26,201806),('2018-06-28',201826,6,2018,28,26,201806),('2018-06-29',201826,6,2018,29,26,201806),('2018-06-30',201826,6,2018,30,26,201806),('2018-07-01',201827,7,2018,1,27,201807),('2018-07-02',201827,7,2018,2,27,201807),('2018-07-03',201827,7,2018,3,27,201807),('2018-07-04',201827,7,2018,4,27,201807),('2018-07-05',201827,7,2018,5,27,201807),('2018-07-06',201827,7,2018,6,27,201807),('2018-07-07',201827,7,2018,7,27,201807),('2018-07-08',201828,7,2018,8,28,201807),('2018-07-09',201828,7,2018,9,28,201807),('2018-07-10',201828,7,2018,10,28,201807),('2018-07-11',201828,7,2018,11,28,201807),('2018-07-12',201828,7,2018,12,28,201807),('2018-07-13',201828,7,2018,13,28,201807),('2018-07-14',201828,7,2018,14,28,201807),('2018-07-15',201829,7,2018,15,29,201807),('2018-07-16',201829,7,2018,16,29,201807),('2018-07-17',201829,7,2018,17,29,201807),('2018-07-18',201829,7,2018,18,29,201807),('2018-07-19',201829,7,2018,19,29,201807),('2018-07-20',201829,7,2018,20,29,201807),('2018-07-21',201829,7,2018,21,29,201807),('2018-07-22',201830,7,2018,22,30,201807),('2018-07-23',201830,7,2018,23,30,201807),('2018-07-24',201830,7,2018,24,30,201807),('2018-07-25',201830,7,2018,25,30,201807),('2018-07-26',201830,7,2018,26,30,201807),('2018-07-27',201830,7,2018,27,30,201807),('2018-07-28',201830,7,2018,28,30,201807),('2018-07-29',201831,7,2018,29,31,201807),('2018-07-30',201831,7,2018,30,31,201807),('2018-07-31',201831,7,2018,31,31,201807),('2018-08-01',201831,8,2018,1,31,201808),('2018-08-02',201831,8,2018,2,31,201808),('2018-08-03',201831,8,2018,3,31,201808),('2018-08-04',201831,8,2018,4,31,201808),('2018-08-05',201832,8,2018,5,32,201808),('2018-08-06',201832,8,2018,6,32,201808),('2018-08-07',201832,8,2018,7,32,201808),('2018-08-08',201832,8,2018,8,32,201808),('2018-08-09',201832,8,2018,9,32,201808),('2018-08-10',201832,8,2018,10,32,201808),('2018-08-11',201832,8,2018,11,32,201808),('2018-08-12',201833,8,2018,12,33,201808),('2018-08-13',201833,8,2018,13,33,201808),('2018-08-14',201833,8,2018,14,33,201808),('2018-08-15',201833,8,2018,15,33,201808),('2018-08-16',201833,8,2018,16,33,201808),('2018-08-17',201833,8,2018,17,33,201808),('2018-08-18',201833,8,2018,18,33,201808),('2018-08-19',201834,8,2018,19,34,201808),('2018-08-20',201834,8,2018,20,34,201808),('2018-08-21',201834,8,2018,21,34,201808),('2018-08-22',201834,8,2018,22,34,201808),('2018-08-23',201834,8,2018,23,34,201808),('2018-08-24',201834,8,2018,24,34,201808),('2018-08-25',201834,8,2018,25,34,201808),('2018-08-26',201835,8,2018,26,35,201808),('2018-08-27',201835,8,2018,27,35,201808),('2018-08-28',201835,8,2018,28,35,201808),('2018-08-29',201835,8,2018,29,35,201808),('2018-08-30',201835,8,2018,30,35,201808),('2018-08-31',201835,8,2018,31,35,201808),('2018-09-01',201835,9,2018,1,35,201809),('2018-09-02',201836,9,2018,2,36,201809),('2018-09-03',201836,9,2018,3,36,201809),('2018-09-04',201836,9,2018,4,36,201809),('2018-09-05',201836,9,2018,5,36,201809),('2018-09-06',201836,9,2018,6,36,201809),('2018-09-07',201836,9,2018,7,36,201809),('2018-09-08',201836,9,2018,8,36,201809),('2018-09-09',201837,9,2018,9,37,201809),('2018-09-10',201837,9,2018,10,37,201809),('2018-09-11',201837,9,2018,11,37,201809),('2018-09-12',201837,9,2018,12,37,201809),('2018-09-13',201837,9,2018,13,37,201809),('2018-09-14',201837,9,2018,14,37,201809),('2018-09-15',201837,9,2018,15,37,201809),('2018-09-16',201838,9,2018,16,38,201809),('2018-09-17',201838,9,2018,17,38,201809),('2018-09-18',201838,9,2018,18,38,201809),('2018-09-19',201838,9,2018,19,38,201809),('2018-09-20',201838,9,2018,20,38,201809),('2018-09-21',201838,9,2018,21,38,201809),('2018-09-22',201838,9,2018,22,38,201809),('2018-09-23',201839,9,2018,23,39,201809),('2018-09-24',201839,9,2018,24,39,201809),('2018-09-25',201839,9,2018,25,39,201809),('2018-09-26',201839,9,2018,26,39,201809),('2018-09-27',201839,9,2018,27,39,201809),('2018-09-28',201839,9,2018,28,39,201809),('2018-09-29',201839,9,2018,29,39,201809),('2018-09-30',201840,9,2018,30,40,201809),('2018-10-01',201840,10,2018,1,40,201810),('2018-10-02',201840,10,2018,2,40,201810),('2018-10-03',201840,10,2018,3,40,201810),('2018-10-04',201840,10,2018,4,40,201810),('2018-10-05',201840,10,2018,5,40,201810),('2018-10-06',201840,10,2018,6,40,201810),('2018-10-07',201841,10,2018,7,41,201810),('2018-10-08',201841,10,2018,8,41,201810),('2018-10-09',201841,10,2018,9,41,201810),('2018-10-10',201841,10,2018,10,41,201810),('2018-10-11',201841,10,2018,11,41,201810),('2018-10-12',201841,10,2018,12,41,201810),('2018-10-13',201841,10,2018,13,41,201810),('2018-10-14',201842,10,2018,14,42,201810),('2018-10-15',201842,10,2018,15,42,201810),('2018-10-16',201842,10,2018,16,42,201810),('2018-10-17',201842,10,2018,17,42,201810),('2018-10-18',201842,10,2018,18,42,201810),('2018-10-19',201842,10,2018,19,42,201810),('2018-10-20',201842,10,2018,20,42,201810),('2018-10-21',201843,10,2018,21,43,201810),('2018-10-22',201843,10,2018,22,43,201810),('2018-10-23',201843,10,2018,23,43,201810),('2018-10-24',201843,10,2018,24,43,201810),('2018-10-25',201843,10,2018,25,43,201810),('2018-10-26',201843,10,2018,26,43,201810),('2018-10-27',201843,10,2018,27,43,201810),('2018-10-28',201844,10,2018,28,44,201810),('2018-10-29',201844,10,2018,29,44,201810),('2018-10-30',201844,10,2018,30,44,201810),('2018-10-31',201844,10,2018,31,44,201810),('2018-11-01',201844,11,2018,1,44,201811),('2018-11-02',201844,11,2018,2,44,201811),('2018-11-03',201844,11,2018,3,44,201811),('2018-11-04',201845,11,2018,4,45,201811),('2018-11-05',201845,11,2018,5,45,201811),('2018-11-06',201845,11,2018,6,45,201811),('2018-11-07',201845,11,2018,7,45,201811),('2018-11-08',201845,11,2018,8,45,201811),('2018-11-09',201845,11,2018,9,45,201811),('2018-11-10',201845,11,2018,10,45,201811),('2018-11-11',201846,11,2018,11,46,201811),('2018-11-12',201846,11,2018,12,46,201811),('2018-11-13',201846,11,2018,13,46,201811),('2018-11-14',201846,11,2018,14,46,201811),('2018-11-15',201846,11,2018,15,46,201811),('2018-11-16',201846,11,2018,16,46,201811),('2018-11-17',201846,11,2018,17,46,201811),('2018-11-18',201847,11,2018,18,47,201811),('2018-11-19',201847,11,2018,19,47,201811),('2018-11-20',201847,11,2018,20,47,201811),('2018-11-21',201847,11,2018,21,47,201811),('2018-11-22',201847,11,2018,22,47,201811),('2018-11-23',201847,11,2018,23,47,201811),('2018-11-24',201847,11,2018,24,47,201811),('2018-11-25',201848,11,2018,25,48,201811),('2018-11-26',201848,11,2018,26,48,201811),('2018-11-27',201848,11,2018,27,48,201811),('2018-11-28',201848,11,2018,28,48,201811),('2018-11-29',201848,11,2018,29,48,201811),('2018-11-30',201848,11,2018,30,48,201811),('2018-12-01',201848,12,2018,1,48,201812),('2018-12-02',201849,12,2018,2,49,201812),('2018-12-03',201849,12,2018,3,49,201812),('2018-12-04',201849,12,2018,4,49,201812),('2018-12-05',201849,12,2018,5,49,201812),('2018-12-06',201849,12,2018,6,49,201812),('2018-12-07',201849,12,2018,7,49,201812),('2018-12-08',201849,12,2018,8,49,201812),('2018-12-09',201850,12,2018,9,50,201812),('2018-12-10',201850,12,2018,10,50,201812),('2018-12-11',201850,12,2018,11,50,201812),('2018-12-12',201850,12,2018,12,50,201812),('2018-12-13',201850,12,2018,13,50,201812),('2018-12-14',201850,12,2018,14,50,201812),('2018-12-15',201850,12,2018,15,50,201812),('2018-12-16',201851,12,2018,16,51,201812),('2018-12-17',201851,12,2018,17,51,201812),('2018-12-18',201851,12,2018,18,51,201812),('2018-12-19',201851,12,2018,19,51,201812),('2018-12-20',201851,12,2018,20,51,201812),('2018-12-21',201851,12,2018,21,51,201812),('2018-12-22',201851,12,2018,22,51,201812),('2018-12-23',201852,12,2018,23,52,201812),('2018-12-24',201852,12,2018,24,52,201812),('2018-12-25',201852,12,2018,25,52,201812),('2018-12-26',201852,12,2018,26,52,201812),('2018-12-27',201852,12,2018,27,52,201812),('2018-12-28',201852,12,2018,28,52,201812),('2018-12-29',201852,12,2018,29,52,201812),('2018-12-30',201901,1,2019,30,1,201812),('2018-12-31',201901,1,2019,31,1,201812),('2019-01-01',201901,1,2019,1,1,201901),('2019-01-02',201901,1,2019,2,1,201901),('2019-01-03',201901,1,2019,3,1,201901),('2019-01-04',201901,1,2019,4,1,201901),('2019-01-05',201901,1,2019,5,1,201901),('2019-01-06',201902,1,2019,6,2,201901),('2019-01-07',201902,1,2019,7,2,201901),('2019-01-08',201902,1,2019,8,2,201901),('2019-01-09',201902,1,2019,9,2,201901),('2019-01-10',201902,1,2019,10,2,201901),('2019-01-11',201902,1,2019,11,2,201901),('2019-01-12',201902,1,2019,12,2,201901),('2019-01-13',201903,1,2019,13,3,201901),('2019-01-14',201903,1,2019,14,3,201901),('2019-01-15',201903,1,2019,15,3,201901),('2019-01-16',201903,1,2019,16,3,201901),('2019-01-17',201903,1,2019,17,3,201901),('2019-01-18',201903,1,2019,18,3,201901),('2019-01-19',201903,1,2019,19,3,201901),('2019-01-20',201904,1,2019,20,4,201901),('2019-01-21',201904,1,2019,21,4,201901),('2019-01-22',201904,1,2019,22,4,201901),('2019-01-23',201904,1,2019,23,4,201901),('2019-01-24',201904,1,2019,24,4,201901),('2019-01-25',201904,1,2019,25,4,201901),('2019-01-26',201904,1,2019,26,4,201901),('2019-01-27',201905,1,2019,27,5,201901),('2019-01-28',201905,1,2019,28,5,201901),('2019-01-29',201905,1,2019,29,5,201901),('2019-01-30',201905,1,2019,30,5,201901),('2019-01-31',201905,1,2019,31,5,201901),('2019-02-01',201905,2,2019,1,5,201902),('2019-02-02',201905,2,2019,2,5,201902),('2019-02-03',201906,2,2019,3,6,201902),('2019-02-04',201906,2,2019,4,6,201902),('2019-02-05',201906,2,2019,5,6,201902),('2019-02-06',201906,2,2019,6,6,201902),('2019-02-07',201906,2,2019,7,6,201902),('2019-02-08',201906,2,2019,8,6,201902),('2019-02-09',201906,2,2019,9,6,201902),('2019-02-10',201907,2,2019,10,7,201902),('2019-02-11',201907,2,2019,11,7,201902),('2019-02-12',201907,2,2019,12,7,201902),('2019-02-13',201907,2,2019,13,7,201902),('2019-02-14',201907,2,2019,14,7,201902),('2019-02-15',201907,2,2019,15,7,201902),('2019-02-16',201907,2,2019,16,7,201902),('2019-02-17',201908,2,2019,17,8,201902),('2019-02-18',201908,2,2019,18,8,201902),('2019-02-19',201908,2,2019,19,8,201902),('2019-02-20',201908,2,2019,20,8,201902),('2019-02-21',201908,2,2019,21,8,201902),('2019-02-22',201908,2,2019,22,8,201902),('2019-02-23',201908,2,2019,23,8,201902),('2019-02-24',201909,2,2019,24,9,201902),('2019-02-25',201909,2,2019,25,9,201902),('2019-02-26',201909,2,2019,26,9,201902),('2019-02-27',201909,2,2019,27,9,201902),('2019-02-28',201909,2,2019,28,9,201902),('2019-03-01',201909,3,2019,1,9,201903),('2019-03-02',201909,3,2019,2,9,201903),('2019-03-03',201910,3,2019,3,10,201903),('2019-03-04',201910,3,2019,4,10,201903),('2019-03-05',201910,3,2019,5,10,201903),('2019-03-06',201910,3,2019,6,10,201903),('2019-03-07',201910,3,2019,7,10,201903),('2019-03-08',201910,3,2019,8,10,201903),('2019-03-09',201910,3,2019,9,10,201903),('2019-03-10',201911,3,2019,10,11,201903),('2019-03-11',201911,3,2019,11,11,201903),('2019-03-12',201911,3,2019,12,11,201903),('2019-03-13',201911,3,2019,13,11,201903),('2019-03-14',201911,3,2019,14,11,201903),('2019-03-15',201911,3,2019,15,11,201903),('2019-03-16',201911,3,2019,16,11,201903),('2019-03-17',201912,3,2019,17,12,201903),('2019-03-18',201912,3,2019,18,12,201903),('2019-03-19',201912,3,2019,19,12,201903),('2019-03-20',201912,3,2019,20,12,201903),('2019-03-21',201912,3,2019,21,12,201903),('2019-03-22',201912,3,2019,22,12,201903),('2019-03-23',201912,3,2019,23,12,201903),('2019-03-24',201913,3,2019,24,13,201903),('2019-03-25',201913,3,2019,25,13,201903),('2019-03-26',201913,3,2019,26,13,201903),('2019-03-27',201913,3,2019,27,13,201903),('2019-03-28',201913,3,2019,28,13,201903),('2019-03-29',201913,3,2019,29,13,201903),('2019-03-30',201913,3,2019,30,13,201903),('2019-03-31',201914,3,2019,31,14,201903),('2019-04-01',201914,4,2019,1,14,201904),('2019-04-02',201914,4,2019,2,14,201904),('2019-04-03',201914,4,2019,3,14,201904),('2019-04-04',201914,4,2019,4,14,201904),('2019-04-05',201914,4,2019,5,14,201904),('2019-04-06',201914,4,2019,6,14,201904),('2019-04-07',201915,4,2019,7,15,201904),('2019-04-08',201915,4,2019,8,15,201904),('2019-04-09',201915,4,2019,9,15,201904),('2019-04-10',201915,4,2019,10,15,201904),('2019-04-11',201915,4,2019,11,15,201904),('2019-04-12',201915,4,2019,12,15,201904),('2019-04-13',201915,4,2019,13,15,201904),('2019-04-14',201916,4,2019,14,16,201904),('2019-04-15',201916,4,2019,15,16,201904),('2019-04-16',201916,4,2019,16,16,201904),('2019-04-17',201916,4,2019,17,16,201904),('2019-04-18',201916,4,2019,18,16,201904),('2019-04-19',201916,4,2019,19,16,201904),('2019-04-20',201916,4,2019,20,16,201904),('2019-04-21',201917,4,2019,21,17,201904),('2019-04-22',201917,4,2019,22,17,201904),('2019-04-23',201917,4,2019,23,17,201904),('2019-04-24',201917,4,2019,24,17,201904),('2019-04-25',201917,4,2019,25,17,201904),('2019-04-26',201917,4,2019,26,17,201904),('2019-04-27',201917,4,2019,27,17,201904),('2019-04-28',201918,4,2019,28,18,201904),('2019-04-29',201918,4,2019,29,18,201904),('2019-04-30',201918,4,2019,30,18,201904),('2019-05-01',201918,5,2019,1,18,201905),('2019-05-02',201918,5,2019,2,18,201905),('2019-05-03',201918,5,2019,3,18,201905),('2019-05-04',201918,5,2019,4,18,201905),('2019-05-05',201919,5,2019,5,19,201905),('2019-05-06',201919,5,2019,6,19,201905),('2019-05-07',201919,5,2019,7,19,201905),('2019-05-08',201919,5,2019,8,19,201905),('2019-05-09',201919,5,2019,9,19,201905),('2019-05-10',201919,5,2019,10,19,201905),('2019-05-11',201919,5,2019,11,19,201905),('2019-05-12',201920,5,2019,12,20,201905),('2019-05-13',201920,5,2019,13,20,201905),('2019-05-14',201920,5,2019,14,20,201905),('2019-05-15',201920,5,2019,15,20,201905),('2019-05-16',201920,5,2019,16,20,201905),('2019-05-17',201920,5,2019,17,20,201905),('2019-05-18',201920,5,2019,18,20,201905),('2019-05-19',201921,5,2019,19,21,201905),('2019-05-20',201921,5,2019,20,21,201905),('2019-05-21',201921,5,2019,21,21,201905),('2019-05-22',201921,5,2019,22,21,201905),('2019-05-23',201921,5,2019,23,21,201905),('2019-05-24',201921,5,2019,24,21,201905),('2019-05-25',201921,5,2019,25,21,201905),('2019-05-26',201922,5,2019,26,22,201905),('2019-05-27',201922,5,2019,27,22,201905),('2019-05-28',201922,5,2019,28,22,201905),('2019-05-29',201922,5,2019,29,22,201905),('2019-05-30',201922,5,2019,30,22,201905),('2019-05-31',201922,5,2019,31,22,201905),('2019-06-01',201922,6,2019,1,22,201906),('2019-06-02',201923,6,2019,2,23,201906),('2019-06-03',201923,6,2019,3,23,201906),('2019-06-04',201923,6,2019,4,23,201906),('2019-06-05',201923,6,2019,5,23,201906),('2019-06-06',201923,6,2019,6,23,201906),('2019-06-07',201923,6,2019,7,23,201906),('2019-06-08',201923,6,2019,8,23,201906),('2019-06-09',201924,6,2019,9,24,201906),('2019-06-10',201924,6,2019,10,24,201906),('2019-06-11',201924,6,2019,11,24,201906),('2019-06-12',201924,6,2019,12,24,201906),('2019-06-13',201924,6,2019,13,24,201906),('2019-06-14',201924,6,2019,14,24,201906),('2019-06-15',201924,6,2019,15,24,201906),('2019-06-16',201925,6,2019,16,25,201906),('2019-06-17',201925,6,2019,17,25,201906),('2019-06-18',201925,6,2019,18,25,201906),('2019-06-19',201925,6,2019,19,25,201906),('2019-06-20',201925,6,2019,20,25,201906),('2019-06-21',201925,6,2019,21,25,201906),('2019-06-22',201925,6,2019,22,25,201906),('2019-06-23',201926,6,2019,23,26,201906),('2019-06-24',201926,6,2019,24,26,201906),('2019-06-25',201926,6,2019,25,26,201906),('2019-06-26',201926,6,2019,26,26,201906),('2019-06-27',201926,6,2019,27,26,201906),('2019-06-28',201926,6,2019,28,26,201906),('2019-06-29',201926,6,2019,29,26,201906),('2019-06-30',201927,6,2019,30,27,201906),('2019-07-01',201927,7,2019,1,27,201907),('2019-07-02',201927,7,2019,2,27,201907),('2019-07-03',201927,7,2019,3,27,201907),('2019-07-04',201927,7,2019,4,27,201907),('2019-07-05',201927,7,2019,5,27,201907),('2019-07-06',201927,7,2019,6,27,201907),('2019-07-07',201928,7,2019,7,28,201907),('2019-07-08',201928,7,2019,8,28,201907),('2019-07-09',201928,7,2019,9,28,201907),('2019-07-10',201928,7,2019,10,28,201907),('2019-07-11',201928,7,2019,11,28,201907),('2019-07-12',201928,7,2019,12,28,201907),('2019-07-13',201928,7,2019,13,28,201907),('2019-07-14',201929,7,2019,14,29,201907),('2019-07-15',201929,7,2019,15,29,201907),('2019-07-16',201929,7,2019,16,29,201907),('2019-07-17',201929,7,2019,17,29,201907),('2019-07-18',201929,7,2019,18,29,201907),('2019-07-19',201929,7,2019,19,29,201907),('2019-07-20',201929,7,2019,20,29,201907),('2019-07-21',201930,7,2019,21,30,201907),('2019-07-22',201930,7,2019,22,30,201907),('2019-07-23',201930,7,2019,23,30,201907),('2019-07-24',201930,7,2019,24,30,201907),('2019-07-25',201930,7,2019,25,30,201907),('2019-07-26',201930,7,2019,26,30,201907),('2019-07-27',201930,7,2019,27,30,201907),('2019-07-28',201931,7,2019,28,31,201907),('2019-07-29',201931,7,2019,29,31,201907),('2019-07-30',201931,7,2019,30,31,201907),('2019-07-31',201931,7,2019,31,31,201907),('2019-08-01',201931,8,2019,1,31,201908),('2019-08-02',201931,8,2019,2,31,201908),('2019-08-03',201931,8,2019,3,31,201908),('2019-08-04',201932,8,2019,4,32,201908),('2019-08-05',201932,8,2019,5,32,201908),('2019-08-06',201932,8,2019,6,32,201908),('2019-08-07',201932,8,2019,7,32,201908),('2019-08-08',201932,8,2019,8,32,201908),('2019-08-09',201932,8,2019,9,32,201908),('2019-08-10',201932,8,2019,10,32,201908),('2019-08-11',201933,8,2019,11,33,201908),('2019-08-12',201933,8,2019,12,33,201908),('2019-08-13',201933,8,2019,13,33,201908),('2019-08-14',201933,8,2019,14,33,201908),('2019-08-15',201933,8,2019,15,33,201908),('2019-08-16',201933,8,2019,16,33,201908),('2019-08-17',201933,8,2019,17,33,201908),('2019-08-18',201934,8,2019,18,34,201908),('2019-08-19',201934,8,2019,19,34,201908),('2019-08-20',201934,8,2019,20,34,201908),('2019-08-21',201934,8,2019,21,34,201908),('2019-08-22',201934,8,2019,22,34,201908),('2019-08-23',201934,8,2019,23,34,201908),('2019-08-24',201934,8,2019,24,34,201908),('2019-08-25',201935,8,2019,25,35,201908),('2019-08-26',201935,8,2019,26,35,201908),('2019-08-27',201935,8,2019,27,35,201908),('2019-08-28',201935,8,2019,28,35,201908),('2019-08-29',201935,8,2019,29,35,201908),('2019-08-30',201935,8,2019,30,35,201908),('2019-08-31',201935,8,2019,31,35,201908),('2019-09-01',201936,9,2019,1,36,201909),('2019-09-02',201936,9,2019,2,36,201909),('2019-09-03',201936,9,2019,3,36,201909),('2019-09-04',201936,9,2019,4,36,201909),('2019-09-05',201936,9,2019,5,36,201909),('2019-09-06',201936,9,2019,6,36,201909),('2019-09-07',201936,9,2019,7,36,201909),('2019-09-08',201937,9,2019,8,37,201909),('2019-09-09',201937,9,2019,9,37,201909),('2019-09-10',201937,9,2019,10,37,201909),('2019-09-11',201937,9,2019,11,37,201909),('2019-09-12',201937,9,2019,12,37,201909),('2019-09-13',201937,9,2019,13,37,201909),('2019-09-14',201937,9,2019,14,37,201909),('2019-09-15',201938,9,2019,15,38,201909),('2019-09-16',201938,9,2019,16,38,201909),('2019-09-17',201938,9,2019,17,38,201909),('2019-09-18',201938,9,2019,18,38,201909),('2019-09-19',201938,9,2019,19,38,201909),('2019-09-20',201938,9,2019,20,38,201909),('2019-09-21',201938,9,2019,21,38,201909),('2019-09-22',201939,9,2019,22,39,201909),('2019-09-23',201939,9,2019,23,39,201909),('2019-09-24',201939,9,2019,24,39,201909),('2019-09-25',201939,9,2019,25,39,201909),('2019-09-26',201939,9,2019,26,39,201909),('2019-09-27',201939,9,2019,27,39,201909),('2019-09-28',201939,9,2019,28,39,201909),('2019-09-29',201940,9,2019,29,40,201909),('2019-09-30',201940,9,2019,30,40,201909),('2019-10-01',201940,10,2019,1,40,201910),('2019-10-02',201940,10,2019,2,40,201910),('2019-10-03',201940,10,2019,3,40,201910),('2019-10-04',201940,10,2019,4,40,201910),('2019-10-05',201940,10,2019,5,40,201910),('2019-10-06',201941,10,2019,6,41,201910),('2019-10-07',201941,10,2019,7,41,201910),('2019-10-08',201941,10,2019,8,41,201910),('2019-10-09',201941,10,2019,9,41,201910),('2019-10-10',201941,10,2019,10,41,201910),('2019-10-11',201941,10,2019,11,41,201910),('2019-10-12',201941,10,2019,12,41,201910),('2019-10-13',201942,10,2019,13,42,201910),('2019-10-14',201942,10,2019,14,42,201910),('2019-10-15',201942,10,2019,15,42,201910),('2019-10-16',201942,10,2019,16,42,201910),('2019-10-17',201942,10,2019,17,42,201910),('2019-10-18',201942,10,2019,18,42,201910),('2019-10-19',201942,10,2019,19,42,201910),('2019-10-20',201943,10,2019,20,43,201910),('2019-10-21',201943,10,2019,21,43,201910),('2019-10-22',201943,10,2019,22,43,201910),('2019-10-23',201943,10,2019,23,43,201910),('2019-10-24',201943,10,2019,24,43,201910),('2019-10-25',201943,10,2019,25,43,201910),('2019-10-26',201943,10,2019,26,43,201910),('2019-10-27',201944,10,2019,27,44,201910),('2019-10-28',201944,10,2019,28,44,201910),('2019-10-29',201944,10,2019,29,44,201910),('2019-10-30',201944,10,2019,30,44,201910),('2019-10-31',201944,10,2019,31,44,201910),('2019-11-01',201944,11,2019,1,44,201911),('2019-11-02',201944,11,2019,2,44,201911),('2019-11-03',201945,11,2019,3,45,201911),('2019-11-04',201945,11,2019,4,45,201911),('2019-11-05',201945,11,2019,5,45,201911),('2019-11-06',201945,11,2019,6,45,201911),('2019-11-07',201945,11,2019,7,45,201911),('2019-11-08',201945,11,2019,8,45,201911),('2019-11-09',201945,11,2019,9,45,201911),('2019-11-10',201946,11,2019,10,46,201911),('2019-11-11',201946,11,2019,11,46,201911),('2019-11-12',201946,11,2019,12,46,201911),('2019-11-13',201946,11,2019,13,46,201911),('2019-11-14',201946,11,2019,14,46,201911),('2019-11-15',201946,11,2019,15,46,201911),('2019-11-16',201946,11,2019,16,46,201911),('2019-11-17',201947,11,2019,17,47,201911),('2019-11-18',201947,11,2019,18,47,201911),('2019-11-19',201947,11,2019,19,47,201911),('2019-11-20',201947,11,2019,20,47,201911),('2019-11-21',201947,11,2019,21,47,201911),('2019-11-22',201947,11,2019,22,47,201911),('2019-11-23',201947,11,2019,23,47,201911),('2019-11-24',201948,11,2019,24,48,201911),('2019-11-25',201948,11,2019,25,48,201911),('2019-11-26',201948,11,2019,26,48,201911),('2019-11-27',201948,11,2019,27,48,201911),('2019-11-28',201948,11,2019,28,48,201911),('2019-11-29',201948,11,2019,29,48,201911),('2019-11-30',201948,11,2019,30,48,201911),('2019-12-01',201949,12,2019,1,49,201912),('2019-12-02',201949,12,2019,2,49,201912),('2019-12-03',201949,12,2019,3,49,201912),('2019-12-04',201949,12,2019,4,49,201912),('2019-12-05',201949,12,2019,5,49,201912),('2019-12-06',201949,12,2019,6,49,201912),('2019-12-07',201949,12,2019,7,49,201912),('2019-12-08',201950,12,2019,8,50,201912),('2019-12-09',201950,12,2019,9,50,201912),('2019-12-10',201950,12,2019,10,50,201912),('2019-12-11',201950,12,2019,11,50,201912),('2019-12-12',201950,12,2019,12,50,201912),('2019-12-13',201950,12,2019,13,50,201912),('2019-12-14',201950,12,2019,14,50,201912),('2019-12-15',201951,12,2019,15,51,201912),('2019-12-16',201951,12,2019,16,51,201912),('2019-12-17',201951,12,2019,17,51,201912),('2019-12-18',201951,12,2019,18,51,201912),('2019-12-19',201951,12,2019,19,51,201912),('2019-12-20',201951,12,2019,20,51,201912),('2019-12-21',201951,12,2019,21,51,201912),('2019-12-22',201952,12,2019,22,52,201912),('2019-12-23',201952,12,2019,23,52,201912),('2019-12-24',201952,12,2019,24,52,201912),('2019-12-25',201952,12,2019,25,52,201912),('2019-12-26',201952,12,2019,26,52,201912),('2019-12-27',201952,12,2019,27,52,201912),('2019-12-28',201952,12,2019,28,52,201912),('2019-12-29',202001,12,2019,29,1,201912),('2019-12-30',202001,12,2019,30,1,201912),('2019-12-31',202001,12,2019,31,1,201912),('2020-01-01',202001,1,2020,1,1,202001),('2020-01-02',202001,1,2020,2,1,202001),('2020-01-03',202001,1,2020,3,1,202001),('2020-01-04',202001,1,2020,4,1,202001),('2020-01-05',202002,1,2020,5,2,202001),('2020-01-06',202002,1,2020,6,2,202001),('2020-01-07',202002,1,2020,7,2,202001),('2020-01-08',202002,1,2020,8,2,202001),('2020-01-09',202002,1,2020,9,2,202001),('2020-01-10',202002,1,2020,10,2,202001),('2020-01-11',202002,1,2020,11,2,202001),('2020-01-12',202003,1,2020,12,3,202001),('2020-01-13',202003,1,2020,13,3,202001),('2020-01-14',202003,1,2020,14,3,202001),('2020-01-15',202003,1,2020,15,3,202001),('2020-01-16',202003,1,2020,16,3,202001),('2020-01-17',202003,1,2020,17,3,202001),('2020-01-18',202003,1,2020,18,3,202001),('2020-01-19',202004,1,2020,19,4,202001),('2020-01-20',202004,1,2020,20,4,202001),('2020-01-21',202004,1,2020,21,4,202001),('2020-01-22',202004,1,2020,22,4,202001),('2020-01-23',202004,1,2020,23,4,202001),('2020-01-24',202004,1,2020,24,4,202001),('2020-01-25',202004,1,2020,25,4,202001),('2020-01-26',202005,1,2020,26,5,202001),('2020-01-27',202005,1,2020,27,5,202001),('2020-01-28',202005,1,2020,28,5,202001),('2020-01-29',202005,1,2020,29,5,202001),('2020-01-30',202005,1,2020,30,5,202001),('2020-01-31',202005,1,2020,31,5,202001),('2020-02-01',202005,2,2020,1,5,202002),('2020-02-02',202006,2,2020,2,6,202002),('2020-02-03',202006,2,2020,3,6,202002),('2020-02-04',202006,2,2020,4,6,202002),('2020-02-05',202006,2,2020,5,6,202002),('2020-02-06',202006,2,2020,6,6,202002),('2020-02-07',202006,2,2020,7,6,202002),('2020-02-08',202006,2,2020,8,6,202002),('2020-02-09',202007,2,2020,9,7,202002),('2020-02-10',202007,2,2020,10,7,202002),('2020-02-11',202007,2,2020,11,7,202002),('2020-02-12',202007,2,2020,12,7,202002),('2020-02-13',202007,2,2020,13,7,202002),('2020-02-14',202007,2,2020,14,7,202002),('2020-02-15',202007,2,2020,15,7,202002),('2020-02-16',202008,2,2020,16,8,202002),('2020-02-17',202008,2,2020,17,8,202002),('2020-02-18',202008,2,2020,18,8,202002),('2020-02-19',202008,2,2020,19,8,202002),('2020-02-20',202008,2,2020,20,8,202002),('2020-02-21',202008,2,2020,21,8,202002),('2020-02-22',202008,2,2020,22,8,202002),('2020-02-23',202009,2,2020,23,9,202002),('2020-02-24',202009,2,2020,24,9,202002),('2020-02-25',202009,2,2020,25,9,202002),('2020-02-26',202009,2,2020,26,9,202002),('2020-02-27',202009,2,2020,27,9,202002),('2020-02-28',202009,2,2020,28,9,202002),('2020-02-29',202009,2,2020,29,9,202002),('2020-03-01',202010,3,2020,1,10,202003),('2020-03-02',202010,3,2020,2,10,202003),('2020-03-03',202010,3,2020,3,10,202003),('2020-03-04',202010,3,2020,4,10,202003),('2020-03-05',202010,3,2020,5,10,202003),('2020-03-06',202010,3,2020,6,10,202003),('2020-03-07',202010,3,2020,7,10,202003),('2020-03-08',202011,3,2020,8,11,202003),('2020-03-09',202011,3,2020,9,11,202003),('2020-03-10',202011,3,2020,10,11,202003),('2020-03-11',202011,3,2020,11,11,202003),('2020-03-12',202011,3,2020,12,11,202003),('2020-03-13',202011,3,2020,13,11,202003),('2020-03-14',202011,3,2020,14,11,202003),('2020-03-15',202012,3,2020,15,12,202003),('2020-03-16',202012,3,2020,16,12,202003),('2020-03-17',202012,3,2020,17,12,202003),('2020-03-18',202012,3,2020,18,12,202003),('2020-03-19',202012,3,2020,19,12,202003),('2020-03-20',202012,3,2020,20,12,202003),('2020-03-21',202012,3,2020,21,12,202003),('2020-03-22',202013,3,2020,22,13,202003),('2020-03-23',202013,3,2020,23,13,202003),('2020-03-24',202013,3,2020,24,13,202003),('2020-03-25',202013,3,2020,25,13,202003),('2020-03-26',202013,3,2020,26,13,202003),('2020-03-27',202013,3,2020,27,13,202003),('2020-03-28',202013,3,2020,28,13,202003),('2020-03-29',202014,3,2020,29,14,202003),('2020-03-30',202014,3,2020,30,14,202003),('2020-03-31',202014,3,2020,31,14,202003),('2020-04-01',202014,4,2020,1,14,202004),('2020-04-02',202014,4,2020,2,14,202004),('2020-04-03',202014,4,2020,3,14,202004),('2020-04-04',202014,4,2020,4,14,202004),('2020-04-05',202015,4,2020,5,15,202004),('2020-04-06',202015,4,2020,6,15,202004),('2020-04-07',202015,4,2020,7,15,202004),('2020-04-08',202015,4,2020,8,15,202004),('2020-04-09',202015,4,2020,9,15,202004),('2020-04-10',202015,4,2020,10,15,202004),('2020-04-11',202015,4,2020,11,15,202004),('2020-04-12',202016,4,2020,12,16,202004),('2020-04-13',202016,4,2020,13,16,202004),('2020-04-14',202016,4,2020,14,16,202004),('2020-04-15',202016,4,2020,15,16,202004),('2020-04-16',202016,4,2020,16,16,202004),('2020-04-17',202016,4,2020,17,16,202004),('2020-04-18',202016,4,2020,18,16,202004),('2020-04-19',202017,4,2020,19,17,202004),('2020-04-20',202017,4,2020,20,17,202004),('2020-04-21',202017,4,2020,21,17,202004),('2020-04-22',202017,4,2020,22,17,202004),('2020-04-23',202017,4,2020,23,17,202004),('2020-04-24',202017,4,2020,24,17,202004),('2020-04-25',202017,4,2020,25,17,202004),('2020-04-26',202018,4,2020,26,18,202004),('2020-04-27',202018,4,2020,27,18,202004),('2020-04-28',202018,4,2020,28,18,202004),('2020-04-29',202018,4,2020,29,18,202004),('2020-04-30',202018,4,2020,30,18,202004),('2020-05-01',202018,5,2020,1,18,202005),('2020-05-02',202018,5,2020,2,18,202005),('2020-05-03',202019,5,2020,3,19,202005),('2020-05-04',202019,5,2020,4,19,202005),('2020-05-05',202019,5,2020,5,19,202005),('2020-05-06',202019,5,2020,6,19,202005),('2020-05-07',202019,5,2020,7,19,202005),('2020-05-08',202019,5,2020,8,19,202005),('2020-05-09',202019,5,2020,9,19,202005),('2020-05-10',202020,5,2020,10,20,202005),('2020-05-11',202020,5,2020,11,20,202005),('2020-05-12',202020,5,2020,12,20,202005),('2020-05-13',202020,5,2020,13,20,202005),('2020-05-14',202020,5,2020,14,20,202005),('2020-05-15',202020,5,2020,15,20,202005),('2020-05-16',202020,5,2020,16,20,202005),('2020-05-17',202021,5,2020,17,21,202005),('2020-05-18',202021,5,2020,18,21,202005),('2020-05-19',202021,5,2020,19,21,202005),('2020-05-20',202021,5,2020,20,21,202005),('2020-05-21',202021,5,2020,21,21,202005),('2020-05-22',202021,5,2020,22,21,202005),('2020-05-23',202021,5,2020,23,21,202005),('2020-05-24',202022,5,2020,24,22,202005),('2020-05-25',202022,5,2020,25,22,202005),('2020-05-26',202022,5,2020,26,22,202005),('2020-05-27',202022,5,2020,27,22,202005),('2020-05-28',202022,5,2020,28,22,202005),('2020-05-29',202022,5,2020,29,22,202005),('2020-05-30',202022,5,2020,30,22,202005),('2020-05-31',202023,5,2020,31,23,202005),('2020-06-01',202023,6,2020,1,23,202006),('2020-06-02',202023,6,2020,2,23,202006),('2020-06-03',202023,6,2020,3,23,202006),('2020-06-04',202023,6,2020,4,23,202006),('2020-06-05',202023,6,2020,5,23,202006),('2020-06-06',202023,6,2020,6,23,202006),('2020-06-07',202024,6,2020,7,24,202006),('2020-06-08',202024,6,2020,8,24,202006),('2020-06-09',202024,6,2020,9,24,202006),('2020-06-10',202024,6,2020,10,24,202006),('2020-06-11',202024,6,2020,11,24,202006),('2020-06-12',202024,6,2020,12,24,202006),('2020-06-13',202024,6,2020,13,24,202006),('2020-06-14',202025,6,2020,14,25,202006),('2020-06-15',202025,6,2020,15,25,202006),('2020-06-16',202025,6,2020,16,25,202006),('2020-06-17',202025,6,2020,17,25,202006),('2020-06-18',202025,6,2020,18,25,202006),('2020-06-19',202025,6,2020,19,25,202006),('2020-06-20',202025,6,2020,20,25,202006),('2020-06-21',202026,6,2020,21,26,202006),('2020-06-22',202026,6,2020,22,26,202006),('2020-06-23',202026,6,2020,23,26,202006),('2020-06-24',202026,6,2020,24,26,202006),('2020-06-25',202026,6,2020,25,26,202006),('2020-06-26',202026,6,2020,26,26,202006),('2020-06-27',202026,6,2020,27,26,202006),('2020-06-28',202027,6,2020,28,27,202006),('2020-06-29',202027,6,2020,29,27,202006),('2020-06-30',202027,6,2020,30,27,202006),('2020-07-01',202027,7,2020,1,27,202007),('2020-07-02',202027,7,2020,2,27,202007),('2020-07-03',202027,7,2020,3,27,202007),('2020-07-04',202027,7,2020,4,27,202007),('2020-07-05',202028,7,2020,5,28,202007),('2020-07-06',202028,7,2020,6,28,202007),('2020-07-07',202028,7,2020,7,28,202007),('2020-07-08',202028,7,2020,8,28,202007),('2020-07-09',202028,7,2020,9,28,202007),('2020-07-10',202028,7,2020,10,28,202007),('2020-07-11',202028,7,2020,11,28,202007),('2020-07-12',202029,7,2020,12,29,202007),('2020-07-13',202029,7,2020,13,29,202007),('2020-07-14',202029,7,2020,14,29,202007),('2020-07-15',202029,7,2020,15,29,202007),('2020-07-16',202029,7,2020,16,29,202007),('2020-07-17',202029,7,2020,17,29,202007),('2020-07-18',202029,7,2020,18,29,202007),('2020-07-19',202030,7,2020,19,30,202007),('2020-07-20',202030,7,2020,20,30,202007),('2020-07-21',202030,7,2020,21,30,202007),('2020-07-22',202030,7,2020,22,30,202007),('2020-07-23',202030,7,2020,23,30,202007),('2020-07-24',202030,7,2020,24,30,202007),('2020-07-25',202030,7,2020,25,30,202007),('2020-07-26',202031,7,2020,26,31,202007),('2020-07-27',202031,7,2020,27,31,202007),('2020-07-28',202031,7,2020,28,31,202007),('2020-07-29',202031,7,2020,29,31,202007),('2020-07-30',202031,7,2020,30,31,202007),('2020-07-31',202031,7,2020,31,31,202007),('2020-08-01',202031,8,2020,1,31,202008),('2020-08-02',202032,8,2020,2,32,202008),('2020-08-03',202032,8,2020,3,32,202008),('2020-08-04',202032,8,2020,4,32,202008),('2020-08-05',202032,8,2020,5,32,202008),('2020-08-06',202032,8,2020,6,32,202008),('2020-08-07',202032,8,2020,7,32,202008),('2020-08-08',202032,8,2020,8,32,202008),('2020-08-09',202033,8,2020,9,33,202008),('2020-08-10',202033,8,2020,10,33,202008),('2020-08-11',202033,8,2020,11,33,202008),('2020-08-12',202033,8,2020,12,33,202008),('2020-08-13',202033,8,2020,13,33,202008),('2020-08-14',202033,8,2020,14,33,202008),('2020-08-15',202033,8,2020,15,33,202008),('2020-08-16',202034,8,2020,16,34,202008),('2020-08-17',202034,8,2020,17,34,202008),('2020-08-18',202034,8,2020,18,34,202008),('2020-08-19',202034,8,2020,19,34,202008),('2020-08-20',202034,8,2020,20,34,202008),('2020-08-21',202034,8,2020,21,34,202008),('2020-08-22',202034,8,2020,22,34,202008),('2020-08-23',202035,8,2020,23,35,202008),('2020-08-24',202035,8,2020,24,35,202008),('2020-08-25',202035,8,2020,25,35,202008),('2020-08-26',202035,8,2020,26,35,202008),('2020-08-27',202035,8,2020,27,35,202008),('2020-08-28',202035,8,2020,28,35,202008),('2020-08-29',202035,8,2020,29,35,202008),('2020-08-30',202036,8,2020,30,36,202008),('2020-08-31',202036,8,2020,31,36,202008),('2020-09-01',202036,9,2020,1,36,202009),('2020-09-02',202036,9,2020,2,36,202009),('2020-09-03',202036,9,2020,3,36,202009),('2020-09-04',202036,9,2020,4,36,202009),('2020-09-05',202036,9,2020,5,36,202009),('2020-09-06',202037,9,2020,6,37,202009),('2020-09-07',202037,9,2020,7,37,202009),('2020-09-08',202037,9,2020,8,37,202009),('2020-09-09',202037,9,2020,9,37,202009),('2020-09-10',202037,9,2020,10,37,202009),('2020-09-11',202037,9,2020,11,37,202009),('2020-09-12',202037,9,2020,12,37,202009),('2020-09-13',202038,9,2020,13,38,202009),('2020-09-14',202038,9,2020,14,38,202009),('2020-09-15',202038,9,2020,15,38,202009),('2020-09-16',202038,9,2020,16,38,202009),('2020-09-17',202038,9,2020,17,38,202009),('2020-09-18',202038,9,2020,18,38,202009),('2020-09-19',202038,9,2020,19,38,202009),('2020-09-20',202039,9,2020,20,39,202009),('2020-09-21',202039,9,2020,21,39,202009),('2020-09-22',202039,9,2020,22,39,202009),('2020-09-23',202039,9,2020,23,39,202009),('2020-09-24',202039,9,2020,24,39,202009),('2020-09-25',202039,9,2020,25,39,202009),('2020-09-26',202039,9,2020,26,39,202009),('2020-09-27',202040,9,2020,27,40,202009),('2020-09-28',202040,9,2020,28,40,202009),('2020-09-29',202040,9,2020,29,40,202009),('2020-09-30',202040,9,2020,30,40,202009),('2020-10-01',202040,10,2020,1,40,202010),('2020-10-02',202040,10,2020,2,40,202010),('2020-10-03',202040,10,2020,3,40,202010),('2020-10-04',202041,10,2020,4,41,202010),('2020-10-05',202041,10,2020,5,41,202010),('2020-10-06',202041,10,2020,6,41,202010),('2020-10-07',202041,10,2020,7,41,202010),('2020-10-08',202041,10,2020,8,41,202010),('2020-10-09',202041,10,2020,9,41,202010),('2020-10-10',202041,10,2020,10,41,202010),('2020-10-11',202042,10,2020,11,42,202010),('2020-10-12',202042,10,2020,12,42,202010),('2020-10-13',202042,10,2020,13,42,202010),('2020-10-14',202042,10,2020,14,42,202010),('2020-10-15',202042,10,2020,15,42,202010),('2020-10-16',202042,10,2020,16,42,202010),('2020-10-17',202042,10,2020,17,42,202010),('2020-10-18',202043,10,2020,18,43,202010),('2020-10-19',202043,10,2020,19,43,202010),('2020-10-20',202043,10,2020,20,43,202010),('2020-10-21',202043,10,2020,21,43,202010),('2020-10-22',202043,10,2020,22,43,202010),('2020-10-23',202043,10,2020,23,43,202010),('2020-10-24',202043,10,2020,24,43,202010),('2020-10-25',202044,10,2020,25,44,202010),('2020-10-26',202044,10,2020,26,44,202010),('2020-10-27',202044,10,2020,27,44,202010),('2020-10-28',202044,10,2020,28,44,202010),('2020-10-29',202044,10,2020,29,44,202010),('2020-10-30',202044,10,2020,30,44,202010),('2020-10-31',202044,10,2020,31,44,202010),('2020-11-01',202045,11,2020,1,45,202011),('2020-11-02',202045,11,2020,2,45,202011),('2020-11-03',202045,11,2020,3,45,202011),('2020-11-04',202045,11,2020,4,45,202011),('2020-11-05',202045,11,2020,5,45,202011),('2020-11-06',202045,11,2020,6,45,202011),('2020-11-07',202045,11,2020,7,45,202011),('2020-11-08',202046,11,2020,8,46,202011),('2020-11-09',202046,11,2020,9,46,202011),('2020-11-10',202046,11,2020,10,46,202011),('2020-11-11',202046,11,2020,11,46,202011),('2020-11-12',202046,11,2020,12,46,202011),('2020-11-13',202046,11,2020,13,46,202011),('2020-11-14',202046,11,2020,14,46,202011),('2020-11-15',202047,11,2020,15,47,202011),('2020-11-16',202047,11,2020,16,47,202011),('2020-11-17',202047,11,2020,17,47,202011),('2020-11-18',202047,11,2020,18,47,202011),('2020-11-19',202047,11,2020,19,47,202011),('2020-11-20',202047,11,2020,20,47,202011),('2020-11-21',202047,11,2020,21,47,202011),('2020-11-22',202048,11,2020,22,48,202011),('2020-11-23',202048,11,2020,23,48,202011),('2020-11-24',202048,11,2020,24,48,202011),('2020-11-25',202048,11,2020,25,48,202011),('2020-11-26',202048,11,2020,26,48,202011),('2020-11-27',202048,11,2020,27,48,202011),('2020-11-28',202048,11,2020,28,48,202011),('2020-11-29',202049,11,2020,29,49,202011),('2020-11-30',202049,11,2020,30,49,202011),('2020-12-01',202049,12,2020,1,49,202012),('2020-12-02',202049,12,2020,2,49,202012),('2020-12-03',202049,12,2020,3,49,202012),('2020-12-04',202049,12,2020,4,49,202012),('2020-12-05',202049,12,2020,5,49,202012),('2020-12-06',202050,12,2020,6,50,202012),('2020-12-07',202050,12,2020,7,50,202012),('2020-12-08',202050,12,2020,8,50,202012),('2020-12-09',202050,12,2020,9,50,202012),('2020-12-10',202050,12,2020,10,50,202012),('2020-12-11',202050,12,2020,11,50,202012),('2020-12-12',202050,12,2020,12,50,202012),('2020-12-13',202051,12,2020,13,51,202012),('2020-12-14',202051,12,2020,14,51,202012),('2020-12-15',202051,12,2020,15,51,202012),('2020-12-16',202051,12,2020,16,51,202012),('2020-12-17',202051,12,2020,17,51,202012),('2020-12-18',202051,12,2020,18,51,202012),('2020-12-19',202051,12,2020,19,51,202012),('2020-12-20',202052,12,2020,20,52,202012),('2020-12-21',202052,12,2020,21,52,202012),('2020-12-22',202052,12,2020,22,52,202012),('2020-12-23',202052,12,2020,23,52,202012),('2020-12-24',202052,12,2020,24,52,202012),('2020-12-25',202052,12,2020,25,52,202012),('2020-12-26',202052,12,2020,26,52,202012),('2020-12-27',202052,12,2020,27,52,202012),('2020-12-28',202052,12,2020,28,52,202012),('2020-12-29',202052,12,2020,29,52,202012),('2020-12-30',202052,12,2020,30,52,202012),('2020-12-31',202052,12,2020,31,52,202012),('2021-01-01',202101,1,2021,1,1,202101),('2021-01-02',202101,1,2021,2,1,202101),('2021-01-03',202101,1,2021,3,1,202101),('2021-01-04',202101,1,2021,4,1,202101),('2021-01-05',202101,1,2021,5,1,202101),('2021-01-06',202101,1,2021,6,1,202101),('2021-01-07',202101,1,2021,7,1,202101),('2021-01-08',202101,1,2021,8,1,202101),('2021-01-09',202101,1,2021,9,1,202101),('2021-01-10',202102,1,2021,10,2,202101),('2021-01-11',202102,1,2021,11,2,202101),('2021-01-12',202102,1,2021,12,2,202101),('2021-01-13',202102,1,2021,13,2,202101),('2021-01-14',202102,1,2021,14,2,202101),('2021-01-15',202102,1,2021,15,2,202101),('2021-01-16',202102,1,2021,16,2,202101),('2021-01-17',202103,1,2021,17,3,202101),('2021-01-18',202103,1,2021,18,3,202101),('2021-01-19',202103,1,2021,19,3,202101),('2021-01-20',202103,1,2021,20,3,202101),('2021-01-21',202103,1,2021,21,3,202101),('2021-01-22',202103,1,2021,22,3,202101),('2021-01-23',202103,1,2021,23,3,202101),('2021-01-24',202104,1,2021,24,4,202101),('2021-01-25',202104,1,2021,25,4,202101),('2021-01-26',202104,1,2021,26,4,202101),('2021-01-27',202104,1,2021,27,4,202101),('2021-01-28',202104,1,2021,28,4,202101),('2021-01-29',202104,1,2021,29,4,202101),('2021-01-30',202104,1,2021,30,4,202101),('2021-01-31',202105,1,2021,31,5,202101),('2021-02-01',202105,2,2021,1,5,202102),('2021-02-02',202105,2,2021,2,5,202102),('2021-02-03',202105,2,2021,3,5,202102),('2021-02-04',202105,2,2021,4,5,202102),('2021-02-05',202105,2,2021,5,5,202102),('2021-02-06',202105,2,2021,6,5,202102),('2021-02-07',202106,2,2021,7,6,202102),('2021-02-08',202106,2,2021,8,6,202102),('2021-02-09',202106,2,2021,9,6,202102),('2021-02-10',202106,2,2021,10,6,202102),('2021-02-11',202106,2,2021,11,6,202102),('2021-02-12',202106,2,2021,12,6,202102),('2021-02-13',202106,2,2021,13,6,202102),('2021-02-14',202107,2,2021,14,7,202102),('2021-02-15',202107,2,2021,15,7,202102),('2021-02-16',202107,2,2021,16,7,202102),('2021-02-17',202107,2,2021,17,7,202102),('2021-02-18',202107,2,2021,18,7,202102),('2021-02-19',202107,2,2021,19,7,202102),('2021-02-20',202107,2,2021,20,7,202102),('2021-02-21',202108,2,2021,21,8,202102),('2021-02-22',202108,2,2021,22,8,202102),('2021-02-23',202108,2,2021,23,8,202102),('2021-02-24',202108,2,2021,24,8,202102),('2021-02-25',202108,2,2021,25,8,202102),('2021-02-26',202108,2,2021,26,8,202102),('2021-02-27',202108,2,2021,27,8,202102),('2021-02-28',202109,2,2021,28,9,202102),('2021-03-01',202109,3,2021,1,9,202103),('2021-03-02',202109,3,2021,2,9,202103),('2021-03-03',202109,3,2021,3,9,202103),('2021-03-04',202109,3,2021,4,9,202103),('2021-03-05',202109,3,2021,5,9,202103),('2021-03-06',202109,3,2021,6,9,202103),('2021-03-07',202110,3,2021,7,10,202103),('2021-03-08',202110,3,2021,8,10,202103),('2021-03-09',202110,3,2021,9,10,202103),('2021-03-10',202110,3,2021,10,10,202103),('2021-03-11',202110,3,2021,11,10,202103),('2021-03-12',202110,3,2021,12,10,202103),('2021-03-13',202110,3,2021,13,10,202103),('2021-03-14',202111,3,2021,14,11,202103),('2021-03-15',202111,3,2021,15,11,202103),('2021-03-16',202111,3,2021,16,11,202103),('2021-03-17',202111,3,2021,17,11,202103),('2021-03-18',202111,3,2021,18,11,202103),('2021-03-19',202111,3,2021,19,11,202103),('2021-03-20',202111,3,2021,20,11,202103),('2021-03-21',202112,3,2021,21,12,202103),('2021-03-22',202112,3,2021,22,12,202103),('2021-03-23',202112,3,2021,23,12,202103),('2021-03-24',202112,3,2021,24,12,202103),('2021-03-25',202112,3,2021,25,12,202103),('2021-03-26',202112,3,2021,26,12,202103),('2021-03-27',202112,3,2021,27,12,202103),('2021-03-28',202113,3,2021,28,13,202103),('2021-03-29',202113,3,2021,29,13,202103),('2021-03-30',202113,3,2021,30,13,202103),('2021-03-31',202113,3,2021,31,13,202103),('2021-04-01',202113,4,2021,1,13,202104),('2021-04-02',202113,4,2021,2,13,202104),('2021-04-03',202113,4,2021,3,13,202104),('2021-04-04',202114,4,2021,4,14,202104),('2021-04-05',202114,4,2021,5,14,202104),('2021-04-06',202114,4,2021,6,14,202104),('2021-04-07',202114,4,2021,7,14,202104),('2021-04-08',202114,4,2021,8,14,202104),('2021-04-09',202114,4,2021,9,14,202104),('2021-04-10',202114,4,2021,10,14,202104),('2021-04-11',202115,4,2021,11,15,202104),('2021-04-12',202115,4,2021,12,15,202104),('2021-04-13',202115,4,2021,13,15,202104),('2021-04-14',202115,4,2021,14,15,202104),('2021-04-15',202115,4,2021,15,15,202104),('2021-04-16',202115,4,2021,16,15,202104),('2021-04-17',202115,4,2021,17,15,202104),('2021-04-18',202116,4,2021,18,16,202104),('2021-04-19',202116,4,2021,19,16,202104),('2021-04-20',202116,4,2021,20,16,202104),('2021-04-21',202116,4,2021,21,16,202104),('2021-04-22',202116,4,2021,22,16,202104),('2021-04-23',202116,4,2021,23,16,202104),('2021-04-24',202116,4,2021,24,16,202104),('2021-04-25',202117,4,2021,25,17,202104),('2021-04-26',202117,4,2021,26,17,202104),('2021-04-27',202117,4,2021,27,17,202104),('2021-04-28',202117,4,2021,28,17,202104),('2021-04-29',202117,4,2021,29,17,202104),('2021-04-30',202117,4,2021,30,17,202104),('2021-05-01',202117,5,2021,1,17,202105),('2021-05-02',202118,5,2021,2,18,202105),('2021-05-03',202118,5,2021,3,18,202105),('2021-05-04',202118,5,2021,4,18,202105),('2021-05-05',202118,5,2021,5,18,202105),('2021-05-06',202118,5,2021,6,18,202105),('2021-05-07',202118,5,2021,7,18,202105),('2021-05-08',202118,5,2021,8,18,202105),('2021-05-09',202119,5,2021,9,19,202105),('2021-05-10',202119,5,2021,10,19,202105),('2021-05-11',202119,5,2021,11,19,202105),('2021-05-12',202119,5,2021,12,19,202105),('2021-05-13',202119,5,2021,13,19,202105),('2021-05-14',202119,5,2021,14,19,202105),('2021-05-15',202119,5,2021,15,19,202105),('2021-05-16',202120,5,2021,16,20,202105),('2021-05-17',202120,5,2021,17,20,202105),('2021-05-18',202120,5,2021,18,20,202105),('2021-05-19',202120,5,2021,19,20,202105),('2021-05-20',202120,5,2021,20,20,202105),('2021-05-21',202120,5,2021,21,20,202105),('2021-05-22',202120,5,2021,22,20,202105),('2021-05-23',202121,5,2021,23,21,202105),('2021-05-24',202121,5,2021,24,21,202105),('2021-05-25',202121,5,2021,25,21,202105),('2021-05-26',202121,5,2021,26,21,202105),('2021-05-27',202121,5,2021,27,21,202105),('2021-05-28',202121,5,2021,28,21,202105),('2021-05-29',202121,5,2021,29,21,202105),('2021-05-30',202122,5,2021,30,22,202105),('2021-05-31',202122,5,2021,31,22,202105),('2021-06-01',202122,6,2021,1,22,202106),('2021-06-02',202122,6,2021,2,22,202106),('2021-06-03',202122,6,2021,3,22,202106),('2021-06-04',202122,6,2021,4,22,202106),('2021-06-05',202122,6,2021,5,22,202106),('2021-06-06',202123,6,2021,6,23,202106),('2021-06-07',202123,6,2021,7,23,202106),('2021-06-08',202123,6,2021,8,23,202106),('2021-06-09',202123,6,2021,9,23,202106),('2021-06-10',202123,6,2021,10,23,202106),('2021-06-11',202123,6,2021,11,23,202106),('2021-06-12',202123,6,2021,12,23,202106),('2021-06-13',202124,6,2021,13,24,202106),('2021-06-14',202124,6,2021,14,24,202106),('2021-06-15',202124,6,2021,15,24,202106),('2021-06-16',202124,6,2021,16,24,202106),('2021-06-17',202124,6,2021,17,24,202106),('2021-06-18',202124,6,2021,18,24,202106),('2021-06-19',202124,6,2021,19,24,202106),('2021-06-20',202125,6,2021,20,25,202106),('2021-06-21',202125,6,2021,21,25,202106),('2021-06-22',202125,6,2021,22,25,202106),('2021-06-23',202125,6,2021,23,25,202106),('2021-06-24',202125,6,2021,24,25,202106),('2021-06-25',202125,6,2021,25,25,202106),('2021-06-26',202125,6,2021,26,25,202106),('2021-06-27',202126,6,2021,27,26,202106),('2021-06-28',202126,6,2021,28,26,202106),('2021-06-29',202126,6,2021,29,26,202106),('2021-06-30',202126,6,2021,30,26,202106),('2021-07-01',202126,7,2021,1,26,202107),('2021-07-02',202126,7,2021,2,26,202107),('2021-07-03',202126,7,2021,3,26,202107),('2021-07-04',202127,7,2021,4,27,202107),('2021-07-05',202127,7,2021,5,27,202107),('2021-07-06',202127,7,2021,6,27,202107),('2021-07-07',202127,7,2021,7,27,202107),('2021-07-08',202127,7,2021,8,27,202107),('2021-07-09',202127,7,2021,9,27,202107),('2021-07-10',202127,7,2021,10,27,202107),('2021-07-11',202128,7,2021,11,28,202107),('2021-07-12',202128,7,2021,12,28,202107),('2021-07-13',202128,7,2021,13,28,202107),('2021-07-14',202128,7,2021,14,28,202107),('2021-07-15',202128,7,2021,15,28,202107),('2021-07-16',202128,7,2021,16,28,202107),('2021-07-17',202128,7,2021,17,28,202107),('2021-07-18',202129,7,2021,18,29,202107),('2021-07-19',202129,7,2021,19,29,202107),('2021-07-20',202129,7,2021,20,29,202107),('2021-07-21',202129,7,2021,21,29,202107),('2021-07-22',202129,7,2021,22,29,202107),('2021-07-23',202129,7,2021,23,29,202107),('2021-07-24',202129,7,2021,24,29,202107),('2021-07-25',202130,7,2021,25,30,202107),('2021-07-26',202130,7,2021,26,30,202107),('2021-07-27',202130,7,2021,27,30,202107),('2021-07-28',202130,7,2021,28,30,202107),('2021-07-29',202130,7,2021,29,30,202107),('2021-07-30',202130,7,2021,30,30,202107),('2021-07-31',202130,7,2021,31,30,202107),('2021-08-01',202131,8,2021,1,31,202108),('2021-08-02',202131,8,2021,2,31,202108),('2021-08-03',202131,8,2021,3,31,202108),('2021-08-04',202131,8,2021,4,31,202108),('2021-08-05',202131,8,2021,5,31,202108),('2021-08-06',202131,8,2021,6,31,202108),('2021-08-07',202131,8,2021,7,31,202108),('2021-08-08',202132,8,2021,8,32,202108),('2021-08-09',202132,8,2021,9,32,202108),('2021-08-10',202132,8,2021,10,32,202108),('2021-08-11',202132,8,2021,11,32,202108),('2021-08-12',202132,8,2021,12,32,202108),('2021-08-13',202132,8,2021,13,32,202108),('2021-08-14',202132,8,2021,14,32,202108),('2021-08-15',202133,8,2021,15,33,202108),('2021-08-16',202133,8,2021,16,33,202108),('2021-08-17',202133,8,2021,17,33,202108),('2021-08-18',202133,8,2021,18,33,202108),('2021-08-19',202133,8,2021,19,33,202108),('2021-08-20',202133,8,2021,20,33,202108),('2021-08-21',202133,8,2021,21,33,202108),('2021-08-22',202134,8,2021,22,34,202108),('2021-08-23',202134,8,2021,23,34,202108),('2021-08-24',202134,8,2021,24,34,202108),('2021-08-25',202134,8,2021,25,34,202108),('2021-08-26',202134,8,2021,26,34,202108),('2021-08-27',202134,8,2021,27,34,202108),('2021-08-28',202134,8,2021,28,34,202108),('2021-08-29',202135,8,2021,29,35,202108),('2021-08-30',202135,8,2021,30,35,202108),('2021-08-31',202135,8,2021,31,35,202108),('2021-09-01',202135,9,2021,1,35,202109),('2021-09-02',202135,9,2021,2,35,202109),('2021-09-03',202135,9,2021,3,35,202109),('2021-09-04',202135,9,2021,4,35,202109),('2021-09-05',202136,9,2021,5,36,202109),('2021-09-06',202136,9,2021,6,36,202109),('2021-09-07',202136,9,2021,7,36,202109),('2021-09-08',202136,9,2021,8,36,202109),('2021-09-09',202136,9,2021,9,36,202109),('2021-09-10',202136,9,2021,10,36,202109),('2021-09-11',202136,9,2021,11,36,202109),('2021-09-12',202137,9,2021,12,37,202109),('2021-09-13',202137,9,2021,13,37,202109),('2021-09-14',202137,9,2021,14,37,202109),('2021-09-15',202137,9,2021,15,37,202109),('2021-09-16',202137,9,2021,16,37,202109),('2021-09-17',202137,9,2021,17,37,202109),('2021-09-18',202137,9,2021,18,37,202109),('2021-09-19',202138,9,2021,19,38,202109),('2021-09-20',202138,9,2021,20,38,202109),('2021-09-21',202138,9,2021,21,38,202109),('2021-09-22',202138,9,2021,22,38,202109),('2021-09-23',202138,9,2021,23,38,202109),('2021-09-24',202138,9,2021,24,38,202109),('2021-09-25',202138,9,2021,25,38,202109),('2021-09-26',202139,9,2021,26,39,202109),('2021-09-27',202139,9,2021,27,39,202109),('2021-09-28',202139,9,2021,28,39,202109),('2021-09-29',202139,9,2021,29,39,202109),('2021-09-30',202139,9,2021,30,39,202109),('2021-10-01',202139,10,2021,1,39,202110),('2021-10-02',202139,10,2021,2,39,202110),('2021-10-03',202140,10,2021,3,40,202110),('2021-10-04',202140,10,2021,4,40,202110),('2021-10-05',202140,10,2021,5,40,202110),('2021-10-06',202140,10,2021,6,40,202110),('2021-10-07',202140,10,2021,7,40,202110),('2021-10-08',202140,10,2021,8,40,202110),('2021-10-09',202140,10,2021,9,40,202110),('2021-10-10',202141,10,2021,10,41,202110),('2021-10-11',202141,10,2021,11,41,202110),('2021-10-12',202141,10,2021,12,41,202110),('2021-10-13',202141,10,2021,13,41,202110),('2021-10-14',202141,10,2021,14,41,202110),('2021-10-15',202141,10,2021,15,41,202110),('2021-10-16',202141,10,2021,16,41,202110),('2021-10-17',202142,10,2021,17,42,202110),('2021-10-18',202142,10,2021,18,42,202110),('2021-10-19',202142,10,2021,19,42,202110),('2021-10-20',202142,10,2021,20,42,202110),('2021-10-21',202142,10,2021,21,42,202110),('2021-10-22',202142,10,2021,22,42,202110),('2021-10-23',202142,10,2021,23,42,202110),('2021-10-24',202143,10,2021,24,43,202110),('2021-10-25',202143,10,2021,25,43,202110),('2021-10-26',202143,10,2021,26,43,202110),('2021-10-27',202143,10,2021,27,43,202110),('2021-10-28',202143,10,2021,28,43,202110),('2021-10-29',202143,10,2021,29,43,202110),('2021-10-30',202143,10,2021,30,43,202110),('2021-10-31',202144,10,2021,31,44,202110),('2021-11-01',202144,11,2021,1,44,202111),('2021-11-02',202144,11,2021,2,44,202111),('2021-11-03',202144,11,2021,3,44,202111),('2021-11-04',202144,11,2021,4,44,202111),('2021-11-05',202144,11,2021,5,44,202111),('2021-11-06',202144,11,2021,6,44,202111),('2021-11-07',202145,11,2021,7,45,202111),('2021-11-08',202145,11,2021,8,45,202111),('2021-11-09',202145,11,2021,9,45,202111),('2021-11-10',202145,11,2021,10,45,202111),('2021-11-11',202145,11,2021,11,45,202111),('2021-11-12',202145,11,2021,12,45,202111),('2021-11-13',202145,11,2021,13,45,202111),('2021-11-14',202146,11,2021,14,46,202111),('2021-11-15',202146,11,2021,15,46,202111),('2021-11-16',202146,11,2021,16,46,202111),('2021-11-17',202146,11,2021,17,46,202111),('2021-11-18',202146,11,2021,18,46,202111),('2021-11-19',202146,11,2021,19,46,202111),('2021-11-20',202146,11,2021,20,46,202111),('2021-11-21',202147,11,2021,21,47,202111),('2021-11-22',202147,11,2021,22,47,202111),('2021-11-23',202147,11,2021,23,47,202111),('2021-11-24',202147,11,2021,24,47,202111),('2021-11-25',202147,11,2021,25,47,202111),('2021-11-26',202147,11,2021,26,47,202111),('2021-11-27',202147,11,2021,27,47,202111),('2021-11-28',202148,11,2021,28,48,202111),('2021-11-29',202148,11,2021,29,48,202111),('2021-11-30',202148,11,2021,30,48,202111),('2021-12-01',202148,12,2021,1,48,202112),('2021-12-02',202148,12,2021,2,48,202112),('2021-12-03',202148,12,2021,3,48,202112),('2021-12-04',202148,12,2021,4,48,202112),('2021-12-05',202149,12,2021,5,49,202112),('2021-12-06',202149,12,2021,6,49,202112),('2021-12-07',202149,12,2021,7,49,202112),('2021-12-08',202149,12,2021,8,49,202112),('2021-12-09',202149,12,2021,9,49,202112),('2021-12-10',202149,12,2021,10,49,202112),('2021-12-11',202149,12,2021,11,49,202112),('2021-12-12',202150,12,2021,12,50,202112),('2021-12-13',202150,12,2021,13,50,202112),('2021-12-14',202150,12,2021,14,50,202112),('2021-12-15',202150,12,2021,15,50,202112),('2021-12-16',202150,12,2021,16,50,202112),('2021-12-17',202150,12,2021,17,50,202112),('2021-12-18',202150,12,2021,18,50,202112),('2021-12-19',202151,12,2021,19,51,202112),('2021-12-20',202151,12,2021,20,51,202112),('2021-12-21',202151,12,2021,21,51,202112),('2021-12-22',202151,12,2021,22,51,202112),('2021-12-23',202151,12,2021,23,51,202112),('2021-12-24',202151,12,2021,24,51,202112),('2021-12-25',202151,12,2021,25,51,202112),('2021-12-26',202152,12,2021,26,52,202112),('2021-12-27',202152,12,2021,27,52,202112),('2021-12-28',202152,12,2021,28,52,202112),('2021-12-29',202152,12,2021,29,52,202112),('2021-12-30',202152,12,2021,30,52,202112),('2021-12-31',202152,12,2021,31,52,202112),('2022-01-01',202252,1,2022,1,52,202201),('2022-01-02',202253,1,2022,2,1,202201),('2022-01-03',202201,1,2022,3,1,202201),('2022-01-04',202201,1,2022,4,1,202201),('2022-01-05',202201,1,2022,5,1,202201),('2022-01-06',202201,1,2022,6,1,202201),('2022-01-07',202201,1,2022,7,1,202201),('2022-01-08',202201,1,2022,8,1,202201),('2022-01-09',202202,1,2022,9,2,202201),('2022-01-10',202202,1,2022,10,2,202201),('2022-01-11',202202,1,2022,11,2,202201),('2022-01-12',202202,1,2022,12,2,202201),('2022-01-13',202202,1,2022,13,2,202201),('2022-01-14',202202,1,2022,14,2,202201),('2022-01-15',202202,1,2022,15,2,202201),('2022-01-16',202203,1,2022,16,3,202201),('2022-01-17',202203,1,2022,17,3,202201),('2022-01-18',202203,1,2022,18,3,202201),('2022-01-19',202203,1,2022,19,3,202201),('2022-01-20',202203,1,2022,20,3,202201),('2022-01-21',202203,1,2022,21,3,202201),('2022-01-22',202203,1,2022,22,3,202201),('2022-01-23',202204,1,2022,23,4,202201),('2022-01-24',202204,1,2022,24,4,202201),('2022-01-25',202204,1,2022,25,4,202201),('2022-01-26',202204,1,2022,26,4,202201),('2022-01-27',202204,1,2022,27,4,202201),('2022-01-28',202204,1,2022,28,4,202201),('2022-01-29',202204,1,2022,29,4,202201),('2022-01-30',202205,1,2022,30,5,202201),('2022-01-31',202205,1,2022,31,5,202201),('2022-02-01',202205,2,2022,1,5,202202),('2022-02-02',202205,2,2022,2,5,202202),('2022-02-03',202205,2,2022,3,5,202202),('2022-02-04',202205,2,2022,4,5,202202),('2022-02-05',202205,2,2022,5,5,202202),('2022-02-06',202206,2,2022,6,6,202202),('2022-02-07',202206,2,2022,7,6,202202),('2022-02-08',202206,2,2022,8,6,202202),('2022-02-09',202206,2,2022,9,6,202202),('2022-02-10',202206,2,2022,10,6,202202),('2022-02-11',202206,2,2022,11,6,202202),('2022-02-12',202206,2,2022,12,6,202202),('2022-02-13',202207,2,2022,13,7,202202),('2022-02-14',202207,2,2022,14,7,202202),('2022-02-15',202207,2,2022,15,7,202202),('2022-02-16',202207,2,2022,16,7,202202),('2022-02-17',202207,2,2022,17,7,202202),('2022-02-18',202207,2,2022,18,7,202202),('2022-02-19',202207,2,2022,19,7,202202),('2022-02-20',202208,2,2022,20,8,202202),('2022-02-21',202208,2,2022,21,8,202202),('2022-02-22',202208,2,2022,22,8,202202),('2022-02-23',202208,2,2022,23,8,202202),('2022-02-24',202208,2,2022,24,8,202202),('2022-02-25',202208,2,2022,25,8,202202),('2022-02-26',202208,2,2022,26,8,202202),('2022-02-27',202209,2,2022,27,9,202202),('2022-02-28',202209,2,2022,28,9,202202),('2022-03-01',202209,3,2022,1,9,202203),('2022-03-02',202209,3,2022,2,9,202203),('2022-03-03',202209,3,2022,3,9,202203),('2022-03-04',202209,3,2022,4,9,202203),('2022-03-05',202209,3,2022,5,9,202203),('2022-03-06',202210,3,2022,6,10,202203),('2022-03-07',202210,3,2022,7,10,202203),('2022-03-08',202210,3,2022,8,10,202203),('2022-03-09',202210,3,2022,9,10,202203),('2022-03-10',202210,3,2022,10,10,202203),('2022-03-11',202210,3,2022,11,10,202203),('2022-03-12',202210,3,2022,12,10,202203),('2022-03-13',202211,3,2022,13,11,202203),('2022-03-14',202211,3,2022,14,11,202203),('2022-03-15',202211,3,2022,15,11,202203),('2022-03-16',202211,3,2022,16,11,202203),('2022-03-17',202211,3,2022,17,11,202203),('2022-03-18',202211,3,2022,18,11,202203),('2022-03-19',202211,3,2022,19,11,202203),('2022-03-20',202212,3,2022,20,12,202203),('2022-03-21',202212,3,2022,21,12,202203),('2022-03-22',202212,3,2022,22,12,202203),('2022-03-23',202212,3,2022,23,12,202203),('2022-03-24',202212,3,2022,24,12,202203),('2022-03-25',202212,3,2022,25,12,202203),('2022-03-26',202212,3,2022,26,12,202203),('2022-03-27',202213,3,2022,27,13,202203),('2022-03-28',202213,3,2022,28,13,202203),('2022-03-29',202213,3,2022,29,13,202203),('2022-03-30',202213,3,2022,30,13,202203),('2022-03-31',202213,3,2022,31,13,202203),('2022-04-01',202213,4,2022,1,13,202204),('2022-04-02',202213,4,2022,2,13,202204),('2022-04-03',202214,4,2022,3,14,202204),('2022-04-04',202214,4,2022,4,14,202204),('2022-04-05',202214,4,2022,5,14,202204),('2022-04-06',202214,4,2022,6,14,202204),('2022-04-07',202214,4,2022,7,14,202204),('2022-04-08',202214,4,2022,8,14,202204),('2022-04-09',202214,4,2022,9,14,202204),('2022-04-10',202215,4,2022,10,15,202204),('2022-04-11',202215,4,2022,11,15,202204),('2022-04-12',202215,4,2022,12,15,202204),('2022-04-13',202215,4,2022,13,15,202204),('2022-04-14',202215,4,2022,14,15,202204),('2022-04-15',202215,4,2022,15,15,202204),('2022-04-16',202215,4,2022,16,15,202204),('2022-04-17',202216,4,2022,17,16,202204),('2022-04-18',202216,4,2022,18,16,202204),('2022-04-19',202216,4,2022,19,16,202204),('2022-04-20',202216,4,2022,20,16,202204),('2022-04-21',202216,4,2022,21,16,202204),('2022-04-22',202216,4,2022,22,16,202204),('2022-04-23',202216,4,2022,23,16,202204),('2022-04-24',202217,4,2022,24,17,202204),('2022-04-25',202217,4,2022,25,17,202204),('2022-04-26',202217,4,2022,26,17,202204),('2022-04-27',202217,4,2022,27,17,202204),('2022-04-28',202217,4,2022,28,17,202204),('2022-04-29',202217,4,2022,29,17,202204),('2022-04-30',202217,4,2022,30,17,202204),('2022-05-01',202218,5,2022,1,18,202205),('2022-05-02',202218,5,2022,2,18,202205),('2022-05-03',202218,5,2022,3,18,202205),('2022-05-04',202218,5,2022,4,18,202205),('2022-05-05',202218,5,2022,5,18,202205),('2022-05-06',202218,5,2022,6,18,202205),('2022-05-07',202218,5,2022,7,18,202205),('2022-05-08',202219,5,2022,8,19,202205),('2022-05-09',202219,5,2022,9,19,202205),('2022-05-10',202219,5,2022,10,19,202205),('2022-05-11',202219,5,2022,11,19,202205),('2022-05-12',202219,5,2022,12,19,202205),('2022-05-13',202219,5,2022,13,19,202205),('2022-05-14',202219,5,2022,14,19,202205),('2022-05-15',202220,5,2022,15,20,202205),('2022-05-16',202220,5,2022,16,20,202205),('2022-05-17',202220,5,2022,17,20,202205),('2022-05-18',202220,5,2022,18,20,202205),('2022-05-19',202220,5,2022,19,20,202205),('2022-05-20',202220,5,2022,20,20,202205),('2022-05-21',202220,5,2022,21,20,202205),('2022-05-22',202221,5,2022,22,21,202205),('2022-05-23',202221,5,2022,23,21,202205),('2022-05-24',202221,5,2022,24,21,202205),('2022-05-25',202221,5,2022,25,21,202205),('2022-05-26',202221,5,2022,26,21,202205),('2022-05-27',202221,5,2022,27,21,202205),('2022-05-28',202221,5,2022,28,21,202205),('2022-05-29',202222,5,2022,29,22,202205),('2022-05-30',202222,5,2022,30,22,202205),('2022-05-31',202222,5,2022,31,22,202205),('2022-06-01',202222,6,2022,1,22,202206),('2022-06-02',202222,6,2022,2,22,202206),('2022-06-03',202222,6,2022,3,22,202206),('2022-06-04',202222,6,2022,4,22,202206),('2022-06-05',202223,6,2022,5,23,202206),('2022-06-06',202223,6,2022,6,23,202206),('2022-06-07',202223,6,2022,7,23,202206),('2022-06-08',202223,6,2022,8,23,202206),('2022-06-09',202223,6,2022,9,23,202206),('2022-06-10',202223,6,2022,10,23,202206),('2022-06-11',202223,6,2022,11,23,202206),('2022-06-12',202224,6,2022,12,24,202206),('2022-06-13',202224,6,2022,13,24,202206),('2022-06-14',202224,6,2022,14,24,202206),('2022-06-15',202224,6,2022,15,24,202206),('2022-06-16',202224,6,2022,16,24,202206),('2022-06-17',202224,6,2022,17,24,202206),('2022-06-18',202224,6,2022,18,24,202206),('2022-06-19',202225,6,2022,19,25,202206),('2022-06-20',202225,6,2022,20,25,202206),('2022-06-21',202225,6,2022,21,25,202206),('2022-06-22',202225,6,2022,22,25,202206),('2022-06-23',202225,6,2022,23,25,202206),('2022-06-24',202225,6,2022,24,25,202206),('2022-06-25',202225,6,2022,25,25,202206),('2022-06-26',202226,6,2022,26,26,202206),('2022-06-27',202226,6,2022,27,26,202206),('2022-06-28',202226,6,2022,28,26,202206),('2022-06-29',202226,6,2022,29,26,202206),('2022-06-30',202226,6,2022,30,26,202206),('2022-07-01',202226,7,2022,1,26,202207),('2022-07-02',202226,7,2022,2,26,202207),('2022-07-03',202227,7,2022,3,27,202207),('2022-07-04',202227,7,2022,4,27,202207),('2022-07-05',202227,7,2022,5,27,202207),('2022-07-06',202227,7,2022,6,27,202207),('2022-07-07',202227,7,2022,7,27,202207),('2022-07-08',202227,7,2022,8,27,202207),('2022-07-09',202227,7,2022,9,27,202207),('2022-07-10',202228,7,2022,10,28,202207),('2022-07-11',202228,7,2022,11,28,202207),('2022-07-12',202228,7,2022,12,28,202207),('2022-07-13',202228,7,2022,13,28,202207),('2022-07-14',202228,7,2022,14,28,202207),('2022-07-15',202228,7,2022,15,28,202207),('2022-07-16',202228,7,2022,16,28,202207),('2022-07-17',202229,7,2022,17,29,202207),('2022-07-18',202229,7,2022,18,29,202207),('2022-07-19',202229,7,2022,19,29,202207),('2022-07-20',202229,7,2022,20,29,202207),('2022-07-21',202229,7,2022,21,29,202207),('2022-07-22',202229,7,2022,22,29,202207),('2022-07-23',202229,7,2022,23,29,202207),('2022-07-24',202230,7,2022,24,30,202207),('2022-07-25',202230,7,2022,25,30,202207),('2022-07-26',202230,7,2022,26,30,202207),('2022-07-27',202230,7,2022,27,30,202207),('2022-07-28',202230,7,2022,28,30,202207),('2022-07-29',202230,7,2022,29,30,202207),('2022-07-30',202230,7,2022,30,30,202207),('2022-07-31',202231,7,2022,31,31,202207),('2022-08-01',202231,8,2022,1,31,202208),('2022-08-02',202231,8,2022,2,31,202208),('2022-08-03',202231,8,2022,3,31,202208),('2022-08-04',202231,8,2022,4,31,202208),('2022-08-05',202231,8,2022,5,31,202208),('2022-08-06',202231,8,2022,6,31,202208),('2022-08-07',202232,8,2022,7,32,202208),('2022-08-08',202232,8,2022,8,32,202208),('2022-08-09',202232,8,2022,9,32,202208),('2022-08-10',202232,8,2022,10,32,202208),('2022-08-11',202232,8,2022,11,32,202208),('2022-08-12',202232,8,2022,12,32,202208),('2022-08-13',202232,8,2022,13,32,202208),('2022-08-14',202233,8,2022,14,33,202208),('2022-08-15',202233,8,2022,15,33,202208),('2022-08-16',202233,8,2022,16,33,202208),('2022-08-17',202233,8,2022,17,33,202208),('2022-08-18',202233,8,2022,18,33,202208),('2022-08-19',202233,8,2022,19,33,202208),('2022-08-20',202233,8,2022,20,33,202208),('2022-08-21',202234,8,2022,21,34,202208),('2022-08-22',202234,8,2022,22,34,202208),('2022-08-23',202234,8,2022,23,34,202208),('2022-08-24',202234,8,2022,24,34,202208),('2022-08-25',202234,8,2022,25,34,202208),('2022-08-26',202234,8,2022,26,34,202208),('2022-08-27',202234,8,2022,27,34,202208),('2022-08-28',202235,8,2022,28,35,202208),('2022-08-29',202235,8,2022,29,35,202208),('2022-08-30',202235,8,2022,30,35,202208),('2022-08-31',202235,8,2022,31,35,202208),('2022-09-01',202235,9,2022,1,35,202209),('2022-09-02',202235,9,2022,2,35,202209),('2022-09-03',202235,9,2022,3,35,202209),('2022-09-04',202236,9,2022,4,36,202209),('2022-09-05',202236,9,2022,5,36,202209),('2022-09-06',202236,9,2022,6,36,202209),('2022-09-07',202236,9,2022,7,36,202209),('2022-09-08',202236,9,2022,8,36,202209),('2022-09-09',202236,9,2022,9,36,202209),('2022-09-10',202236,9,2022,10,36,202209),('2022-09-11',202237,9,2022,11,37,202209),('2022-09-12',202237,9,2022,12,37,202209),('2022-09-13',202237,9,2022,13,37,202209),('2022-09-14',202237,9,2022,14,37,202209),('2022-09-15',202237,9,2022,15,37,202209),('2022-09-16',202237,9,2022,16,37,202209),('2022-09-17',202237,9,2022,17,37,202209),('2022-09-18',202238,9,2022,18,38,202209),('2022-09-19',202238,9,2022,19,38,202209),('2022-09-20',202238,9,2022,20,38,202209),('2022-09-21',202238,9,2022,21,38,202209),('2022-09-22',202238,9,2022,22,38,202209),('2022-09-23',202238,9,2022,23,38,202209),('2022-09-24',202238,9,2022,24,38,202209),('2022-09-25',202239,9,2022,25,39,202209),('2022-09-26',202239,9,2022,26,39,202209),('2022-09-27',202239,9,2022,27,39,202209),('2022-09-28',202239,9,2022,28,39,202209),('2022-09-29',202239,9,2022,29,39,202209),('2022-09-30',202239,9,2022,30,39,202209),('2022-10-01',202239,10,2022,1,39,202210),('2022-10-02',202240,10,2022,2,40,202210),('2022-10-03',202240,10,2022,3,40,202210),('2022-10-04',202240,10,2022,4,40,202210),('2022-10-05',202240,10,2022,5,40,202210),('2022-10-06',202240,10,2022,6,40,202210),('2022-10-07',202240,10,2022,7,40,202210),('2022-10-08',202240,10,2022,8,40,202210),('2022-10-09',202241,10,2022,9,41,202210),('2022-10-10',202241,10,2022,10,41,202210),('2022-10-11',202241,10,2022,11,41,202210),('2022-10-12',202241,10,2022,12,41,202210),('2022-10-13',202241,10,2022,13,41,202210),('2022-10-14',202241,10,2022,14,41,202210),('2022-10-15',202241,10,2022,15,41,202210),('2022-10-16',202242,10,2022,16,42,202210),('2022-10-17',202242,10,2022,17,42,202210),('2022-10-18',202242,10,2022,18,42,202210),('2022-10-19',202242,10,2022,19,42,202210),('2022-10-20',202242,10,2022,20,42,202210),('2022-10-21',202242,10,2022,21,42,202210),('2022-10-22',202242,10,2022,22,42,202210),('2022-10-23',202243,10,2022,23,43,202210),('2022-10-24',202243,10,2022,24,43,202210),('2022-10-25',202243,10,2022,25,43,202210),('2022-10-26',202243,10,2022,26,43,202210),('2022-10-27',202243,10,2022,27,43,202210),('2022-10-28',202243,10,2022,28,43,202210),('2022-10-29',202243,10,2022,29,43,202210),('2022-10-30',202244,10,2022,30,44,202210),('2022-10-31',202244,10,2022,31,44,202210),('2022-11-01',202244,11,2022,1,44,202211),('2022-11-02',202244,11,2022,2,44,202211),('2022-11-03',202244,11,2022,3,44,202211),('2022-11-04',202244,11,2022,4,44,202211),('2022-11-05',202244,11,2022,5,44,202211),('2022-11-06',202245,11,2022,6,45,202211),('2022-11-07',202245,11,2022,7,45,202211),('2022-11-08',202245,11,2022,8,45,202211),('2022-11-09',202245,11,2022,9,45,202211),('2022-11-10',202245,11,2022,10,45,202211),('2022-11-11',202245,11,2022,11,45,202211),('2022-11-12',202245,11,2022,12,45,202211),('2022-11-13',202246,11,2022,13,46,202211),('2022-11-14',202246,11,2022,14,46,202211),('2022-11-15',202246,11,2022,15,46,202211),('2022-11-16',202246,11,2022,16,46,202211),('2022-11-17',202246,11,2022,17,46,202211),('2022-11-18',202246,11,2022,18,46,202211),('2022-11-19',202246,11,2022,19,46,202211),('2022-11-20',202247,11,2022,20,47,202211),('2022-11-21',202247,11,2022,21,47,202211),('2022-11-22',202247,11,2022,22,47,202211),('2022-11-23',202247,11,2022,23,47,202211),('2022-11-24',202247,11,2022,24,47,202211),('2022-11-25',202247,11,2022,25,47,202211),('2022-11-26',202247,11,2022,26,47,202211),('2022-11-27',202248,11,2022,27,48,202211),('2022-11-28',202248,11,2022,28,48,202211),('2022-11-29',202248,11,2022,29,48,202211),('2022-11-30',202248,11,2022,30,48,202211),('2022-12-01',202248,12,2022,1,48,202212),('2022-12-02',202248,12,2022,2,48,202212),('2022-12-03',202248,12,2022,3,48,202212),('2022-12-04',202249,12,2022,4,49,202212),('2022-12-05',202249,12,2022,5,49,202212),('2022-12-06',202249,12,2022,6,49,202212),('2022-12-07',202249,12,2022,7,49,202212),('2022-12-08',202249,12,2022,8,49,202212),('2022-12-09',202249,12,2022,9,49,202212),('2022-12-10',202249,12,2022,10,49,202212),('2022-12-11',202250,12,2022,11,50,202212),('2022-12-12',202250,12,2022,12,50,202212),('2022-12-13',202250,12,2022,13,50,202212),('2022-12-14',202250,12,2022,14,50,202212),('2022-12-15',202250,12,2022,15,50,202212),('2022-12-16',202250,12,2022,16,50,202212),('2022-12-17',202250,12,2022,17,50,202212),('2022-12-18',202251,12,2022,18,51,202212),('2022-12-19',202251,12,2022,19,51,202212),('2022-12-20',202251,12,2022,20,51,202212),('2022-12-21',202251,12,2022,21,51,202212),('2022-12-22',202251,12,2022,22,51,202212),('2022-12-23',202251,12,2022,23,51,202212),('2022-12-24',202251,12,2022,24,51,202212),('2022-12-25',202252,12,2022,25,52,202212),('2022-12-26',202252,12,2022,26,52,202212),('2022-12-27',202252,12,2022,27,52,202212),('2022-12-28',202252,12,2022,28,52,202212),('2022-12-29',202252,12,2022,29,52,202212),('2022-12-30',202252,12,2022,30,52,202212),('2022-12-31',202252,12,2022,31,52,202212),('2023-01-01',202353,1,2023,1,1,202301),('2023-01-02',202301,1,2023,2,1,202301),('2023-01-03',202301,1,2023,3,1,202301),('2023-01-04',202301,1,2023,4,1,202301),('2023-01-05',202301,1,2023,5,1,202301),('2023-01-06',202301,1,2023,6,1,202301),('2023-01-07',202301,1,2023,7,1,202301),('2023-01-08',202302,1,2023,8,2,202301),('2023-01-09',202302,1,2023,9,2,202301),('2023-01-10',202302,1,2023,10,2,202301),('2023-01-11',202302,1,2023,11,2,202301),('2023-01-12',202302,1,2023,12,2,202301),('2023-01-13',202302,1,2023,13,2,202301),('2023-01-14',202302,1,2023,14,2,202301),('2023-01-15',202303,1,2023,15,3,202301),('2023-01-16',202303,1,2023,16,3,202301),('2023-01-17',202303,1,2023,17,3,202301),('2023-01-18',202303,1,2023,18,3,202301),('2023-01-19',202303,1,2023,19,3,202301),('2023-01-20',202303,1,2023,20,3,202301),('2023-01-21',202303,1,2023,21,3,202301),('2023-01-22',202304,1,2023,22,4,202301),('2023-01-23',202304,1,2023,23,4,202301),('2023-01-24',202304,1,2023,24,4,202301),('2023-01-25',202304,1,2023,25,4,202301),('2023-01-26',202304,1,2023,26,4,202301),('2023-01-27',202304,1,2023,27,4,202301),('2023-01-28',202304,1,2023,28,4,202301),('2023-01-29',202305,1,2023,29,5,202301),('2023-01-30',202305,1,2023,30,5,202301),('2023-01-31',202305,1,2023,31,5,202301),('2023-02-01',202305,2,2023,1,5,202302),('2023-02-02',202305,2,2023,2,5,202302),('2023-02-03',202305,2,2023,3,5,202302),('2023-02-04',202305,2,2023,4,5,202302),('2023-02-05',202306,2,2023,5,6,202302),('2023-02-06',202306,2,2023,6,6,202302),('2023-02-07',202306,2,2023,7,6,202302),('2023-02-08',202306,2,2023,8,6,202302),('2023-02-09',202306,2,2023,9,6,202302),('2023-02-10',202306,2,2023,10,6,202302),('2023-02-11',202306,2,2023,11,6,202302),('2023-02-12',202307,2,2023,12,7,202302),('2023-02-13',202307,2,2023,13,7,202302),('2023-02-14',202307,2,2023,14,7,202302),('2023-02-15',202307,2,2023,15,7,202302),('2023-02-16',202307,2,2023,16,7,202302),('2023-02-17',202307,2,2023,17,7,202302),('2023-02-18',202307,2,2023,18,7,202302),('2023-02-19',202308,2,2023,19,8,202302),('2023-02-20',202308,2,2023,20,8,202302),('2023-02-21',202308,2,2023,21,8,202302),('2023-02-22',202308,2,2023,22,8,202302),('2023-02-23',202308,2,2023,23,8,202302),('2023-02-24',202308,2,2023,24,8,202302),('2023-02-25',202308,2,2023,25,8,202302),('2023-02-26',202309,2,2023,26,9,202302),('2023-02-27',202309,2,2023,27,9,202302),('2023-02-28',202309,2,2023,28,9,202302),('2023-03-01',202309,3,2023,1,9,202303),('2023-03-02',202309,3,2023,2,9,202303),('2023-03-03',202309,3,2023,3,9,202303),('2023-03-04',202309,3,2023,4,9,202303),('2023-03-05',202310,3,2023,5,10,202303),('2023-03-06',202310,3,2023,6,10,202303),('2023-03-07',202310,3,2023,7,10,202303),('2023-03-08',202310,3,2023,8,10,202303),('2023-03-09',202310,3,2023,9,10,202303),('2023-03-10',202310,3,2023,10,10,202303),('2023-03-11',202310,3,2023,11,10,202303),('2023-03-12',202311,3,2023,12,11,202303),('2023-03-13',202311,3,2023,13,11,202303),('2023-03-14',202311,3,2023,14,11,202303),('2023-03-15',202311,3,2023,15,11,202303),('2023-03-16',202311,3,2023,16,11,202303),('2023-03-17',202311,3,2023,17,11,202303),('2023-03-18',202311,3,2023,18,11,202303),('2023-03-19',202312,3,2023,19,12,202303),('2023-03-20',202312,3,2023,20,12,202303),('2023-03-21',202312,3,2023,21,12,202303),('2023-03-22',202312,3,2023,22,12,202303),('2023-03-23',202312,3,2023,23,12,202303),('2023-03-24',202312,3,2023,24,12,202303),('2023-03-25',202312,3,2023,25,12,202303),('2023-03-26',202313,3,2023,26,13,202303),('2023-03-27',202313,3,2023,27,13,202303),('2023-03-28',202313,3,2023,28,13,202303),('2023-03-29',202313,3,2023,29,13,202303),('2023-03-30',202313,3,2023,30,13,202303),('2023-03-31',202313,3,2023,31,13,202303),('2023-04-01',202313,4,2023,1,13,202304),('2023-04-02',202314,4,2023,2,14,202304),('2023-04-03',202314,4,2023,3,14,202304),('2023-04-04',202314,4,2023,4,14,202304),('2023-04-05',202314,4,2023,5,14,202304),('2023-04-06',202314,4,2023,6,14,202304),('2023-04-07',202314,4,2023,7,14,202304),('2023-04-08',202314,4,2023,8,14,202304),('2023-04-09',202315,4,2023,9,15,202304),('2023-04-10',202315,4,2023,10,15,202304),('2023-04-11',202315,4,2023,11,15,202304),('2023-04-12',202315,4,2023,12,15,202304),('2023-04-13',202315,4,2023,13,15,202304),('2023-04-14',202315,4,2023,14,15,202304),('2023-04-15',202315,4,2023,15,15,202304),('2023-04-16',202316,4,2023,16,16,202304),('2023-04-17',202316,4,2023,17,16,202304),('2023-04-18',202316,4,2023,18,16,202304),('2023-04-19',202316,4,2023,19,16,202304),('2023-04-20',202316,4,2023,20,16,202304),('2023-04-21',202316,4,2023,21,16,202304),('2023-04-22',202316,4,2023,22,16,202304),('2023-04-23',202317,4,2023,23,17,202304),('2023-04-24',202317,4,2023,24,17,202304),('2023-04-25',202317,4,2023,25,17,202304),('2023-04-26',202317,4,2023,26,17,202304),('2023-04-27',202317,4,2023,27,17,202304),('2023-04-28',202317,4,2023,28,17,202304),('2023-04-29',202317,4,2023,29,17,202304),('2023-04-30',202318,4,2023,30,18,202304),('2023-05-01',202318,5,2023,1,18,202305),('2023-05-02',202318,5,2023,2,18,202305),('2023-05-03',202318,5,2023,3,18,202305),('2023-05-04',202318,5,2023,4,18,202305),('2023-05-05',202318,5,2023,5,18,202305),('2023-05-06',202318,5,2023,6,18,202305),('2023-05-07',202319,5,2023,7,19,202305),('2023-05-08',202319,5,2023,8,19,202305),('2023-05-09',202319,5,2023,9,19,202305),('2023-05-10',202319,5,2023,10,19,202305),('2023-05-11',202319,5,2023,11,19,202305),('2023-05-12',202319,5,2023,12,19,202305),('2023-05-13',202319,5,2023,13,19,202305),('2023-05-14',202320,5,2023,14,20,202305),('2023-05-15',202320,5,2023,15,20,202305),('2023-05-16',202320,5,2023,16,20,202305),('2023-05-17',202320,5,2023,17,20,202305),('2023-05-18',202320,5,2023,18,20,202305),('2023-05-19',202320,5,2023,19,20,202305),('2023-05-20',202320,5,2023,20,20,202305),('2023-05-21',202321,5,2023,21,21,202305),('2023-05-22',202321,5,2023,22,21,202305),('2023-05-23',202321,5,2023,23,21,202305),('2023-05-24',202321,5,2023,24,21,202305),('2023-05-25',202321,5,2023,25,21,202305),('2023-05-26',202321,5,2023,26,21,202305),('2023-05-27',202321,5,2023,27,21,202305),('2023-05-28',202322,5,2023,28,22,202305),('2023-05-29',202322,5,2023,29,22,202305),('2023-05-30',202322,5,2023,30,22,202305),('2023-05-31',202322,5,2023,31,22,202305),('2023-06-01',202322,6,2023,1,22,202306),('2023-06-02',202322,6,2023,2,22,202306),('2023-06-03',202322,6,2023,3,22,202306),('2023-06-04',202323,6,2023,4,23,202306),('2023-06-05',202323,6,2023,5,23,202306),('2023-06-06',202323,6,2023,6,23,202306),('2023-06-07',202323,6,2023,7,23,202306),('2023-06-08',202323,6,2023,8,23,202306),('2023-06-09',202323,6,2023,9,23,202306),('2023-06-10',202323,6,2023,10,23,202306),('2023-06-11',202324,6,2023,11,24,202306),('2023-06-12',202324,6,2023,12,24,202306),('2023-06-13',202324,6,2023,13,24,202306),('2023-06-14',202324,6,2023,14,24,202306),('2023-06-15',202324,6,2023,15,24,202306),('2023-06-16',202324,6,2023,16,24,202306),('2023-06-17',202324,6,2023,17,24,202306),('2023-06-18',202325,6,2023,18,25,202306),('2023-06-19',202325,6,2023,19,25,202306),('2023-06-20',202325,6,2023,20,25,202306),('2023-06-21',202325,6,2023,21,25,202306),('2023-06-22',202325,6,2023,22,25,202306),('2023-06-23',202325,6,2023,23,25,202306),('2023-06-24',202325,6,2023,24,25,202306),('2023-06-25',202326,6,2023,25,26,202306),('2023-06-26',202326,6,2023,26,26,202306),('2023-06-27',202326,6,2023,27,26,202306),('2023-06-28',202326,6,2023,28,26,202306),('2023-06-29',202326,6,2023,29,26,202306),('2023-06-30',202326,6,2023,30,26,202306),('2023-07-01',202326,7,2023,1,26,202307),('2023-07-02',202327,7,2023,2,27,202307),('2023-07-03',202327,7,2023,3,27,202307),('2023-07-04',202327,7,2023,4,27,202307),('2023-07-05',202327,7,2023,5,27,202307),('2023-07-06',202327,7,2023,6,27,202307),('2023-07-07',202327,7,2023,7,27,202307),('2023-07-08',202327,7,2023,8,27,202307),('2023-07-09',202328,7,2023,9,28,202307),('2023-07-10',202328,7,2023,10,28,202307),('2023-07-11',202328,7,2023,11,28,202307),('2023-07-12',202328,7,2023,12,28,202307),('2023-07-13',202328,7,2023,13,28,202307),('2023-07-14',202328,7,2023,14,28,202307),('2023-07-15',202328,7,2023,15,28,202307),('2023-07-16',202329,7,2023,16,29,202307),('2023-07-17',202329,7,2023,17,29,202307),('2023-07-18',202329,7,2023,18,29,202307),('2023-07-19',202329,7,2023,19,29,202307),('2023-07-20',202329,7,2023,20,29,202307),('2023-07-21',202329,7,2023,21,29,202307),('2023-07-22',202329,7,2023,22,29,202307),('2023-07-23',202330,7,2023,23,30,202307),('2023-07-24',202330,7,2023,24,30,202307),('2023-07-25',202330,7,2023,25,30,202307),('2023-07-26',202330,7,2023,26,30,202307),('2023-07-27',202330,7,2023,27,30,202307),('2023-07-28',202330,7,2023,28,30,202307),('2023-07-29',202330,7,2023,29,30,202307),('2023-07-30',202331,7,2023,30,31,202307),('2023-07-31',202331,7,2023,31,31,202307),('2023-08-01',202331,8,2023,1,31,202308),('2023-08-02',202331,8,2023,2,31,202308),('2023-08-03',202331,8,2023,3,31,202308),('2023-08-04',202331,8,2023,4,31,202308),('2023-08-05',202331,8,2023,5,31,202308),('2023-08-06',202332,8,2023,6,32,202308),('2023-08-07',202332,8,2023,7,32,202308),('2023-08-08',202332,8,2023,8,32,202308),('2023-08-09',202332,8,2023,9,32,202308),('2023-08-10',202332,8,2023,10,32,202308),('2023-08-11',202332,8,2023,11,32,202308),('2023-08-12',202332,8,2023,12,32,202308),('2023-08-13',202333,8,2023,13,33,202308),('2023-08-14',202333,8,2023,14,33,202308),('2023-08-15',202333,8,2023,15,33,202308),('2023-08-16',202333,8,2023,16,33,202308),('2023-08-17',202333,8,2023,17,33,202308),('2023-08-18',202333,8,2023,18,33,202308),('2023-08-19',202333,8,2023,19,33,202308),('2023-08-20',202334,8,2023,20,34,202308),('2023-08-21',202334,8,2023,21,34,202308),('2023-08-22',202334,8,2023,22,34,202308),('2023-08-23',202334,8,2023,23,34,202308),('2023-08-24',202334,8,2023,24,34,202308),('2023-08-25',202334,8,2023,25,34,202308),('2023-08-26',202334,8,2023,26,34,202308),('2023-08-27',202335,8,2023,27,35,202308),('2023-08-28',202335,8,2023,28,35,202308),('2023-08-29',202335,8,2023,29,35,202308),('2023-08-30',202335,8,2023,30,35,202308),('2023-08-31',202335,8,2023,31,35,202308),('2023-09-01',202335,9,2023,1,35,202309),('2023-09-02',202335,9,2023,2,35,202309),('2023-09-03',202336,9,2023,3,36,202309),('2023-09-04',202336,9,2023,4,36,202309),('2023-09-05',202336,9,2023,5,36,202309),('2023-09-06',202336,9,2023,6,36,202309),('2023-09-07',202336,9,2023,7,36,202309),('2023-09-08',202336,9,2023,8,36,202309),('2023-09-09',202336,9,2023,9,36,202309),('2023-09-10',202337,9,2023,10,37,202309),('2023-09-11',202337,9,2023,11,37,202309),('2023-09-12',202337,9,2023,12,37,202309),('2023-09-13',202337,9,2023,13,37,202309),('2023-09-14',202337,9,2023,14,37,202309),('2023-09-15',202337,9,2023,15,37,202309),('2023-09-16',202337,9,2023,16,37,202309),('2023-09-17',202338,9,2023,17,38,202309),('2023-09-18',202338,9,2023,18,38,202309),('2023-09-19',202338,9,2023,19,38,202309),('2023-09-20',202338,9,2023,20,38,202309),('2023-09-21',202338,9,2023,21,38,202309),('2023-09-22',202338,9,2023,22,38,202309),('2023-09-23',202338,9,2023,23,38,202309),('2023-09-24',202339,9,2023,24,39,202309),('2023-09-25',202339,9,2023,25,39,202309),('2023-09-26',202339,9,2023,26,39,202309),('2023-09-27',202339,9,2023,27,39,202309),('2023-09-28',202339,9,2023,28,39,202309),('2023-09-29',202339,9,2023,29,39,202309),('2023-09-30',202339,9,2023,30,39,202309),('2023-10-01',202340,10,2023,1,40,202310),('2023-10-02',202340,10,2023,2,40,202310),('2023-10-03',202340,10,2023,3,40,202310),('2023-10-04',202340,10,2023,4,40,202310),('2023-10-05',202340,10,2023,5,40,202310),('2023-10-06',202340,10,2023,6,40,202310),('2023-10-07',202340,10,2023,7,40,202310),('2023-10-08',202341,10,2023,8,41,202310),('2023-10-09',202341,10,2023,9,41,202310),('2023-10-10',202341,10,2023,10,41,202310),('2023-10-11',202341,10,2023,11,41,202310),('2023-10-12',202341,10,2023,12,41,202310),('2023-10-13',202341,10,2023,13,41,202310),('2023-10-14',202341,10,2023,14,41,202310),('2023-10-15',202342,10,2023,15,42,202310),('2023-10-16',202342,10,2023,16,42,202310),('2023-10-17',202342,10,2023,17,42,202310),('2023-10-18',202342,10,2023,18,42,202310),('2023-10-19',202342,10,2023,19,42,202310),('2023-10-20',202342,10,2023,20,42,202310),('2023-10-21',202342,10,2023,21,42,202310),('2023-10-22',202343,10,2023,22,43,202310),('2023-10-23',202343,10,2023,23,43,202310),('2023-10-24',202343,10,2023,24,43,202310),('2023-10-25',202343,10,2023,25,43,202310),('2023-10-26',202343,10,2023,26,43,202310),('2023-10-27',202343,10,2023,27,43,202310),('2023-10-28',202343,10,2023,28,43,202310),('2023-10-29',202344,10,2023,29,44,202310),('2023-10-30',202344,10,2023,30,44,202310),('2023-10-31',202344,10,2023,31,44,202310),('2023-11-01',202344,11,2023,1,44,202311),('2023-11-02',202344,11,2023,2,44,202311),('2023-11-03',202344,11,2023,3,44,202311),('2023-11-04',202344,11,2023,4,44,202311),('2023-11-05',202345,11,2023,5,45,202311),('2023-11-06',202345,11,2023,6,45,202311),('2023-11-07',202345,11,2023,7,45,202311),('2023-11-08',202345,11,2023,8,45,202311),('2023-11-09',202345,11,2023,9,45,202311),('2023-11-10',202345,11,2023,10,45,202311),('2023-11-11',202345,11,2023,11,45,202311),('2023-11-12',202346,11,2023,12,46,202311),('2023-11-13',202346,11,2023,13,46,202311),('2023-11-14',202346,11,2023,14,46,202311),('2023-11-15',202346,11,2023,15,46,202311),('2023-11-16',202346,11,2023,16,46,202311),('2023-11-17',202346,11,2023,17,46,202311),('2023-11-18',202346,11,2023,18,46,202311),('2023-11-19',202347,11,2023,19,47,202311),('2023-11-20',202347,11,2023,20,47,202311),('2023-11-21',202347,11,2023,21,47,202311),('2023-11-22',202347,11,2023,22,47,202311),('2023-11-23',202347,11,2023,23,47,202311),('2023-11-24',202347,11,2023,24,47,202311),('2023-11-25',202347,11,2023,25,47,202311),('2023-11-26',202348,11,2023,26,48,202311),('2023-11-27',202348,11,2023,27,48,202311),('2023-11-28',202348,11,2023,28,48,202311),('2023-11-29',202348,11,2023,29,48,202311),('2023-11-30',202348,11,2023,30,48,202311),('2023-12-01',202348,12,2023,1,48,202312),('2023-12-02',202348,12,2023,2,48,202312),('2023-12-03',202349,12,2023,3,49,202312),('2023-12-04',202349,12,2023,4,49,202312),('2023-12-05',202349,12,2023,5,49,202312),('2023-12-06',202349,12,2023,6,49,202312),('2023-12-07',202349,12,2023,7,49,202312),('2023-12-08',202349,12,2023,8,49,202312),('2023-12-09',202349,12,2023,9,49,202312),('2023-12-10',202350,12,2023,10,50,202312),('2023-12-11',202350,12,2023,11,50,202312),('2023-12-12',202350,12,2023,12,50,202312),('2023-12-13',202350,12,2023,13,50,202312),('2023-12-14',202350,12,2023,14,50,202312),('2023-12-15',202350,12,2023,15,50,202312),('2023-12-16',202350,12,2023,16,50,202312),('2023-12-17',202351,12,2023,17,51,202312),('2023-12-18',202351,12,2023,18,51,202312),('2023-12-19',202351,12,2023,19,51,202312),('2023-12-20',202351,12,2023,20,51,202312),('2023-12-21',202351,12,2023,21,51,202312),('2023-12-22',202351,12,2023,22,51,202312),('2023-12-23',202351,12,2023,23,51,202312),('2023-12-24',202352,12,2023,24,52,202312),('2023-12-25',202352,12,2023,25,52,202312),('2023-12-26',202352,12,2023,26,52,202312),('2023-12-27',202352,12,2023,27,52,202312),('2023-12-28',202352,12,2023,28,52,202312),('2023-12-29',202352,12,2023,29,52,202312),('2023-12-30',202352,12,2023,30,52,202312),('2023-12-31',202353,12,2023,31,1,202312),('2024-01-01',202401,1,2024,1,1,202401),('2024-01-02',202401,1,2024,2,1,202401),('2024-01-03',202401,1,2024,3,1,202401),('2024-01-04',202401,1,2024,4,1,202401),('2024-01-05',202401,1,2024,5,1,202401),('2024-01-06',202401,1,2024,6,1,202401),('2024-01-07',202402,1,2024,7,2,202401),('2024-01-08',202402,1,2024,8,2,202401),('2024-01-09',202402,1,2024,9,2,202401),('2024-01-10',202402,1,2024,10,2,202401),('2024-01-11',202402,1,2024,11,2,202401),('2024-01-12',202402,1,2024,12,2,202401),('2024-01-13',202402,1,2024,13,2,202401),('2024-01-14',202403,1,2024,14,3,202401),('2024-01-15',202403,1,2024,15,3,202401),('2024-01-16',202403,1,2024,16,3,202401),('2024-01-17',202403,1,2024,17,3,202401),('2024-01-18',202403,1,2024,18,3,202401),('2024-01-19',202403,1,2024,19,3,202401),('2024-01-20',202403,1,2024,20,3,202401),('2024-01-21',202404,1,2024,21,4,202401),('2024-01-22',202404,1,2024,22,4,202401),('2024-01-23',202404,1,2024,23,4,202401),('2024-01-24',202404,1,2024,24,4,202401),('2024-01-25',202404,1,2024,25,4,202401),('2024-01-26',202404,1,2024,26,4,202401),('2024-01-27',202404,1,2024,27,4,202401),('2024-01-28',202405,1,2024,28,5,202401),('2024-01-29',202405,1,2024,29,5,202401),('2024-01-30',202405,1,2024,30,5,202401),('2024-01-31',202405,1,2024,31,5,202401),('2024-02-01',202405,2,2024,1,5,202402),('2024-02-02',202405,2,2024,2,5,202402),('2024-02-03',202405,2,2024,3,5,202402),('2024-02-04',202406,2,2024,4,6,202402),('2024-02-05',202406,2,2024,5,6,202402),('2024-02-06',202406,2,2024,6,6,202402),('2024-02-07',202406,2,2024,7,6,202402),('2024-02-08',202406,2,2024,8,6,202402),('2024-02-09',202406,2,2024,9,6,202402),('2024-02-10',202406,2,2024,10,6,202402),('2024-02-11',202407,2,2024,11,7,202402),('2024-02-12',202407,2,2024,12,7,202402),('2024-02-13',202407,2,2024,13,7,202402),('2024-02-14',202407,2,2024,14,7,202402),('2024-02-15',202407,2,2024,15,7,202402),('2024-02-16',202407,2,2024,16,7,202402),('2024-02-17',202407,2,2024,17,7,202402),('2024-02-18',202408,2,2024,18,8,202402),('2024-02-19',202408,2,2024,19,8,202402),('2024-02-20',202408,2,2024,20,8,202402),('2024-02-21',202408,2,2024,21,8,202402),('2024-02-22',202408,2,2024,22,8,202402),('2024-02-23',202408,2,2024,23,8,202402),('2024-02-24',202408,2,2024,24,8,202402),('2024-02-25',202409,2,2024,25,9,202402),('2024-02-26',202409,2,2024,26,9,202402),('2024-02-27',202409,2,2024,27,9,202402),('2024-02-28',202409,2,2024,28,9,202402),('2024-02-29',202409,2,2024,29,9,202402),('2024-03-01',202409,3,2024,1,9,202403),('2024-03-02',202409,3,2024,2,9,202403),('2024-03-03',202410,3,2024,3,10,202403),('2024-03-04',202410,3,2024,4,10,202403),('2024-03-05',202410,3,2024,5,10,202403),('2024-03-06',202410,3,2024,6,10,202403),('2024-03-07',202410,3,2024,7,10,202403),('2024-03-08',202410,3,2024,8,10,202403),('2024-03-09',202410,3,2024,9,10,202403),('2024-03-10',202411,3,2024,10,11,202403),('2024-03-11',202411,3,2024,11,11,202403),('2024-03-12',202411,3,2024,12,11,202403),('2024-03-13',202411,3,2024,13,11,202403),('2024-03-14',202411,3,2024,14,11,202403),('2024-03-15',202411,3,2024,15,11,202403),('2024-03-16',202411,3,2024,16,11,202403),('2024-03-17',202412,3,2024,17,12,202403),('2024-03-18',202412,3,2024,18,12,202403),('2024-03-19',202412,3,2024,19,12,202403),('2024-03-20',202412,3,2024,20,12,202403),('2024-03-21',202412,3,2024,21,12,202403),('2024-03-22',202412,3,2024,22,12,202403),('2024-03-23',202412,3,2024,23,12,202403),('2024-03-24',202413,3,2024,24,13,202403),('2024-03-25',202413,3,2024,25,13,202403),('2024-03-26',202413,3,2024,26,13,202403),('2024-03-27',202413,3,2024,27,13,202403),('2024-03-28',202413,3,2024,28,13,202403),('2024-03-29',202413,3,2024,29,13,202403),('2024-03-30',202413,3,2024,30,13,202403),('2024-03-31',202414,3,2024,31,14,202403),('2024-04-01',202414,4,2024,1,14,202404),('2024-04-02',202414,4,2024,2,14,202404),('2024-04-03',202414,4,2024,3,14,202404),('2024-04-04',202414,4,2024,4,14,202404),('2024-04-05',202414,4,2024,5,14,202404),('2024-04-06',202414,4,2024,6,14,202404),('2024-04-07',202415,4,2024,7,15,202404),('2024-04-08',202415,4,2024,8,15,202404),('2024-04-09',202415,4,2024,9,15,202404),('2024-04-10',202415,4,2024,10,15,202404),('2024-04-11',202415,4,2024,11,15,202404),('2024-04-12',202415,4,2024,12,15,202404),('2024-04-13',202415,4,2024,13,15,202404),('2024-04-14',202416,4,2024,14,16,202404),('2024-04-15',202416,4,2024,15,16,202404),('2024-04-16',202416,4,2024,16,16,202404),('2024-04-17',202416,4,2024,17,16,202404),('2024-04-18',202416,4,2024,18,16,202404),('2024-04-19',202416,4,2024,19,16,202404),('2024-04-20',202416,4,2024,20,16,202404),('2024-04-21',202417,4,2024,21,17,202404),('2024-04-22',202417,4,2024,22,17,202404),('2024-04-23',202417,4,2024,23,17,202404),('2024-04-24',202417,4,2024,24,17,202404),('2024-04-25',202417,4,2024,25,17,202404),('2024-04-26',202417,4,2024,26,17,202404),('2024-04-27',202417,4,2024,27,17,202404),('2024-04-28',202418,4,2024,28,18,202404),('2024-04-29',202418,4,2024,29,18,202404),('2024-04-30',202418,4,2024,30,18,202404),('2024-05-01',202418,5,2024,1,18,202405),('2024-05-02',202418,5,2024,2,18,202405),('2024-05-03',202418,5,2024,3,18,202405),('2024-05-04',202418,5,2024,4,18,202405),('2024-05-05',202419,5,2024,5,19,202405),('2024-05-06',202419,5,2024,6,19,202405),('2024-05-07',202419,5,2024,7,19,202405),('2024-05-08',202419,5,2024,8,19,202405),('2024-05-09',202419,5,2024,9,19,202405),('2024-05-10',202419,5,2024,10,19,202405),('2024-05-11',202419,5,2024,11,19,202405),('2024-05-12',202420,5,2024,12,20,202405),('2024-05-13',202420,5,2024,13,20,202405),('2024-05-14',202420,5,2024,14,20,202405),('2024-05-15',202420,5,2024,15,20,202405),('2024-05-16',202420,5,2024,16,20,202405),('2024-05-17',202420,5,2024,17,20,202405),('2024-05-18',202420,5,2024,18,20,202405),('2024-05-19',202421,5,2024,19,21,202405),('2024-05-20',202421,5,2024,20,21,202405),('2024-05-21',202421,5,2024,21,21,202405),('2024-05-22',202421,5,2024,22,21,202405),('2024-05-23',202421,5,2024,23,21,202405),('2024-05-24',202421,5,2024,24,21,202405),('2024-05-25',202421,5,2024,25,21,202405),('2024-05-26',202422,5,2024,26,22,202405),('2024-05-27',202422,5,2024,27,22,202405),('2024-05-28',202422,5,2024,28,22,202405),('2024-05-29',202422,5,2024,29,22,202405),('2024-05-30',202422,5,2024,30,22,202405),('2024-05-31',202422,5,2024,31,22,202405),('2024-06-01',202422,6,2024,1,22,202406),('2024-06-02',202423,6,2024,2,23,202406),('2024-06-03',202423,6,2024,3,23,202406),('2024-06-04',202423,6,2024,4,23,202406),('2024-06-05',202423,6,2024,5,23,202406),('2024-06-06',202423,6,2024,6,23,202406),('2024-06-07',202423,6,2024,7,23,202406),('2024-06-08',202423,6,2024,8,23,202406),('2024-06-09',202424,6,2024,9,24,202406),('2024-06-10',202424,6,2024,10,24,202406),('2024-06-11',202424,6,2024,11,24,202406),('2024-06-12',202424,6,2024,12,24,202406),('2024-06-13',202424,6,2024,13,24,202406),('2024-06-14',202424,6,2024,14,24,202406),('2024-06-15',202424,6,2024,15,24,202406),('2024-06-16',202425,6,2024,16,25,202406),('2024-06-17',202425,6,2024,17,25,202406),('2024-06-18',202425,6,2024,18,25,202406),('2024-06-19',202425,6,2024,19,25,202406),('2024-06-20',202425,6,2024,20,25,202406),('2024-06-21',202425,6,2024,21,25,202406),('2024-06-22',202425,6,2024,22,25,202406),('2024-06-23',202426,6,2024,23,26,202406),('2024-06-24',202426,6,2024,24,26,202406),('2024-06-25',202426,6,2024,25,26,202406),('2024-06-26',202426,6,2024,26,26,202406),('2024-06-27',202426,6,2024,27,26,202406),('2024-06-28',202426,6,2024,28,26,202406),('2024-06-29',202426,6,2024,29,26,202406),('2024-06-30',202427,6,2024,30,27,202406),('2024-07-01',202427,7,2024,1,27,202407),('2024-07-02',202427,7,2024,2,27,202407),('2024-07-03',202427,7,2024,3,27,202407),('2024-07-04',202427,7,2024,4,27,202407),('2024-07-05',202427,7,2024,5,27,202407),('2024-07-06',202427,7,2024,6,27,202407),('2024-07-07',202428,7,2024,7,28,202407),('2024-07-08',202428,7,2024,8,28,202407),('2024-07-09',202428,7,2024,9,28,202407),('2024-07-10',202428,7,2024,10,28,202407),('2024-07-11',202428,7,2024,11,28,202407),('2024-07-12',202428,7,2024,12,28,202407),('2024-07-13',202428,7,2024,13,28,202407),('2024-07-14',202429,7,2024,14,29,202407),('2024-07-15',202429,7,2024,15,29,202407),('2024-07-16',202429,7,2024,16,29,202407),('2024-07-17',202429,7,2024,17,29,202407),('2024-07-18',202429,7,2024,18,29,202407),('2024-07-19',202429,7,2024,19,29,202407),('2024-07-20',202429,7,2024,20,29,202407),('2024-07-21',202430,7,2024,21,30,202407),('2024-07-22',202430,7,2024,22,30,202407),('2024-07-23',202430,7,2024,23,30,202407),('2024-07-24',202430,7,2024,24,30,202407),('2024-07-25',202430,7,2024,25,30,202407),('2024-07-26',202430,7,2024,26,30,202407),('2024-07-27',202430,7,2024,27,30,202407),('2024-07-28',202431,7,2024,28,31,202407),('2024-07-29',202431,7,2024,29,31,202407),('2024-07-30',202431,7,2024,30,31,202407),('2024-07-31',202431,7,2024,31,31,202407),('2024-08-01',202431,8,2024,1,31,202408),('2024-08-02',202431,8,2024,2,31,202408),('2024-08-03',202431,8,2024,3,31,202408),('2024-08-04',202432,8,2024,4,32,202408),('2024-08-05',202432,8,2024,5,32,202408),('2024-08-06',202432,8,2024,6,32,202408),('2024-08-07',202432,8,2024,7,32,202408),('2024-08-08',202432,8,2024,8,32,202408),('2024-08-09',202432,8,2024,9,32,202408),('2024-08-10',202432,8,2024,10,32,202408),('2024-08-11',202433,8,2024,11,33,202408),('2024-08-12',202433,8,2024,12,33,202408),('2024-08-13',202433,8,2024,13,33,202408),('2024-08-14',202433,8,2024,14,33,202408),('2024-08-15',202433,8,2024,15,33,202408),('2024-08-16',202433,8,2024,16,33,202408),('2024-08-17',202433,8,2024,17,33,202408),('2024-08-18',202434,8,2024,18,34,202408),('2024-08-19',202434,8,2024,19,34,202408),('2024-08-20',202434,8,2024,20,34,202408),('2024-08-21',202434,8,2024,21,34,202408),('2024-08-22',202434,8,2024,22,34,202408),('2024-08-23',202434,8,2024,23,34,202408),('2024-08-24',202434,8,2024,24,34,202408),('2024-08-25',202435,8,2024,25,35,202408),('2024-08-26',202435,8,2024,26,35,202408),('2024-08-27',202435,8,2024,27,35,202408),('2024-08-28',202435,8,2024,28,35,202408),('2024-08-29',202435,8,2024,29,35,202408),('2024-08-30',202435,8,2024,30,35,202408),('2024-08-31',202435,8,2024,31,35,202408),('2024-09-01',202436,9,2024,1,36,202409),('2024-09-02',202436,9,2024,2,36,202409),('2024-09-03',202436,9,2024,3,36,202409),('2024-09-04',202436,9,2024,4,36,202409),('2024-09-05',202436,9,2024,5,36,202409),('2024-09-06',202436,9,2024,6,36,202409),('2024-09-07',202436,9,2024,7,36,202409),('2024-09-08',202437,9,2024,8,37,202409),('2024-09-09',202437,9,2024,9,37,202409),('2024-09-10',202437,9,2024,10,37,202409),('2024-09-11',202437,9,2024,11,37,202409),('2024-09-12',202437,9,2024,12,37,202409),('2024-09-13',202437,9,2024,13,37,202409),('2024-09-14',202437,9,2024,14,37,202409),('2024-09-15',202438,9,2024,15,38,202409),('2024-09-16',202438,9,2024,16,38,202409),('2024-09-17',202438,9,2024,17,38,202409),('2024-09-18',202438,9,2024,18,38,202409),('2024-09-19',202438,9,2024,19,38,202409),('2024-09-20',202438,9,2024,20,38,202409),('2024-09-21',202438,9,2024,21,38,202409),('2024-09-22',202439,9,2024,22,39,202409),('2024-09-23',202439,9,2024,23,39,202409),('2024-09-24',202439,9,2024,24,39,202409),('2024-09-25',202439,9,2024,25,39,202409),('2024-09-26',202439,9,2024,26,39,202409),('2024-09-27',202439,9,2024,27,39,202409),('2024-09-28',202439,9,2024,28,39,202409),('2024-09-29',202440,9,2024,29,40,202409),('2024-09-30',202440,9,2024,30,40,202409),('2024-10-01',202440,10,2024,1,40,202410),('2024-10-02',202440,10,2024,2,40,202410),('2024-10-03',202440,10,2024,3,40,202410),('2024-10-04',202440,10,2024,4,40,202410),('2024-10-05',202440,10,2024,5,40,202410),('2024-10-06',202441,10,2024,6,41,202410),('2024-10-07',202441,10,2024,7,41,202410),('2024-10-08',202441,10,2024,8,41,202410),('2024-10-09',202441,10,2024,9,41,202410),('2024-10-10',202441,10,2024,10,41,202410),('2024-10-11',202441,10,2024,11,41,202410),('2024-10-12',202441,10,2024,12,41,202410),('2024-10-13',202442,10,2024,13,42,202410),('2024-10-14',202442,10,2024,14,42,202410),('2024-10-15',202442,10,2024,15,42,202410),('2024-10-16',202442,10,2024,16,42,202410),('2024-10-17',202442,10,2024,17,42,202410),('2024-10-18',202442,10,2024,18,42,202410),('2024-10-19',202442,10,2024,19,42,202410),('2024-10-20',202443,10,2024,20,43,202410),('2024-10-21',202443,10,2024,21,43,202410),('2024-10-22',202443,10,2024,22,43,202410),('2024-10-23',202443,10,2024,23,43,202410),('2024-10-24',202443,10,2024,24,43,202410),('2024-10-25',202443,10,2024,25,43,202410),('2024-10-26',202443,10,2024,26,43,202410),('2024-10-27',202444,10,2024,27,44,202410),('2024-10-28',202444,10,2024,28,44,202410),('2024-10-29',202444,10,2024,29,44,202410),('2024-10-30',202444,10,2024,30,44,202410),('2024-10-31',202444,10,2024,31,44,202410),('2024-11-01',202444,11,2024,1,44,202411),('2024-11-02',202444,11,2024,2,44,202411),('2024-11-03',202445,11,2024,3,45,202411),('2024-11-04',202445,11,2024,4,45,202411),('2024-11-05',202445,11,2024,5,45,202411),('2024-11-06',202445,11,2024,6,45,202411),('2024-11-07',202445,11,2024,7,45,202411),('2024-11-08',202445,11,2024,8,45,202411),('2024-11-09',202445,11,2024,9,45,202411),('2024-11-10',202446,11,2024,10,46,202411),('2024-11-11',202446,11,2024,11,46,202411),('2024-11-12',202446,11,2024,12,46,202411),('2024-11-13',202446,11,2024,13,46,202411),('2024-11-14',202446,11,2024,14,46,202411),('2024-11-15',202446,11,2024,15,46,202411),('2024-11-16',202446,11,2024,16,46,202411),('2024-11-17',202447,11,2024,17,47,202411),('2024-11-18',202447,11,2024,18,47,202411),('2024-11-19',202447,11,2024,19,47,202411),('2024-11-20',202447,11,2024,20,47,202411),('2024-11-21',202447,11,2024,21,47,202411),('2024-11-22',202447,11,2024,22,47,202411),('2024-11-23',202447,11,2024,23,47,202411),('2024-11-24',202448,11,2024,24,48,202411),('2024-11-25',202448,11,2024,25,48,202411),('2024-11-26',202448,11,2024,26,48,202411),('2024-11-27',202448,11,2024,27,48,202411),('2024-11-28',202448,11,2024,28,48,202411),('2024-11-29',202448,11,2024,29,48,202411),('2024-11-30',202448,11,2024,30,48,202411),('2024-12-01',202449,12,2024,1,49,202412),('2024-12-02',202449,12,2024,2,49,202412),('2024-12-03',202449,12,2024,3,49,202412),('2024-12-04',202449,12,2024,4,49,202412),('2024-12-05',202449,12,2024,5,49,202412),('2024-12-06',202449,12,2024,6,49,202412),('2024-12-07',202449,12,2024,7,49,202412),('2024-12-08',202450,12,2024,8,50,202412),('2024-12-09',202450,12,2024,9,50,202412),('2024-12-10',202450,12,2024,10,50,202412),('2024-12-11',202450,12,2024,11,50,202412),('2024-12-12',202450,12,2024,12,50,202412),('2024-12-13',202450,12,2024,13,50,202412),('2024-12-14',202450,12,2024,14,50,202412),('2024-12-15',202451,12,2024,15,51,202412),('2024-12-16',202451,12,2024,16,51,202412),('2024-12-17',202451,12,2024,17,51,202412),('2024-12-18',202451,12,2024,18,51,202412),('2024-12-19',202451,12,2024,19,51,202412),('2024-12-20',202451,12,2024,20,51,202412),('2024-12-21',202451,12,2024,21,51,202412),('2024-12-22',202452,12,2024,22,52,202412),('2024-12-23',202452,12,2024,23,52,202412),('2024-12-24',202452,12,2024,24,52,202412),('2024-12-25',202452,12,2024,25,52,202412),('2024-12-26',202452,12,2024,26,52,202412),('2024-12-27',202452,12,2024,27,52,202412),('2024-12-28',202452,12,2024,28,52,202412),('2024-12-29',202453,12,2024,29,1,202412),('2024-12-30',202401,12,2024,30,1,202412),('2024-12-31',202401,12,2024,31,1,202412),('2025-01-01',202501,1,2025,1,1,202501),('2025-01-02',202501,1,2025,2,1,202501),('2025-01-03',202501,1,2025,3,1,202501),('2025-01-04',202501,1,2025,4,1,202501),('2025-01-05',202502,1,2025,5,2,202501),('2025-01-06',202502,1,2025,6,2,202501),('2025-01-07',202502,1,2025,7,2,202501),('2025-01-08',202502,1,2025,8,2,202501),('2025-01-09',202502,1,2025,9,2,202501),('2025-01-10',202502,1,2025,10,2,202501),('2025-01-11',202502,1,2025,11,2,202501),('2025-01-12',202503,1,2025,12,3,202501),('2025-01-13',202503,1,2025,13,3,202501),('2025-01-14',202503,1,2025,14,3,202501),('2025-01-15',202503,1,2025,15,3,202501),('2025-01-16',202503,1,2025,16,3,202501),('2025-01-17',202503,1,2025,17,3,202501),('2025-01-18',202503,1,2025,18,3,202501),('2025-01-19',202504,1,2025,19,4,202501),('2025-01-20',202504,1,2025,20,4,202501),('2025-01-21',202504,1,2025,21,4,202501),('2025-01-22',202504,1,2025,22,4,202501),('2025-01-23',202504,1,2025,23,4,202501),('2025-01-24',202504,1,2025,24,4,202501),('2025-01-25',202504,1,2025,25,4,202501),('2025-01-26',202505,1,2025,26,5,202501),('2025-01-27',202505,1,2025,27,5,202501),('2025-01-28',202505,1,2025,28,5,202501),('2025-01-29',202505,1,2025,29,5,202501),('2025-01-30',202505,1,2025,30,5,202501),('2025-01-31',202505,1,2025,31,5,202501),('2025-02-01',202505,2,2025,1,5,202502),('2025-02-02',202506,2,2025,2,6,202502),('2025-02-03',202506,2,2025,3,6,202502),('2025-02-04',202506,2,2025,4,6,202502),('2025-02-05',202506,2,2025,5,6,202502),('2025-02-06',202506,2,2025,6,6,202502),('2025-02-07',202506,2,2025,7,6,202502),('2025-02-08',202506,2,2025,8,6,202502),('2025-02-09',202507,2,2025,9,7,202502),('2025-02-10',202507,2,2025,10,7,202502),('2025-02-11',202507,2,2025,11,7,202502),('2025-02-12',202507,2,2025,12,7,202502),('2025-02-13',202507,2,2025,13,7,202502),('2025-02-14',202507,2,2025,14,7,202502),('2025-02-15',202507,2,2025,15,7,202502),('2025-02-16',202508,2,2025,16,8,202502),('2025-02-17',202508,2,2025,17,8,202502),('2025-02-18',202508,2,2025,18,8,202502),('2025-02-19',202508,2,2025,19,8,202502),('2025-02-20',202508,2,2025,20,8,202502),('2025-02-21',202508,2,2025,21,8,202502),('2025-02-22',202508,2,2025,22,8,202502),('2025-02-23',202509,2,2025,23,9,202502),('2025-02-24',202509,2,2025,24,9,202502),('2025-02-25',202509,2,2025,25,9,202502),('2025-02-26',202509,2,2025,26,9,202502),('2025-02-27',202509,2,2025,27,9,202502),('2025-02-28',202509,2,2025,28,9,202502),('2025-03-01',202509,3,2025,1,9,202503),('2025-03-02',202510,3,2025,2,10,202503),('2025-03-03',202510,3,2025,3,10,202503),('2025-03-04',202510,3,2025,4,10,202503),('2025-03-05',202510,3,2025,5,10,202503),('2025-03-06',202510,3,2025,6,10,202503),('2025-03-07',202510,3,2025,7,10,202503),('2025-03-08',202510,3,2025,8,10,202503),('2025-03-09',202511,3,2025,9,11,202503),('2025-03-10',202511,3,2025,10,11,202503),('2025-03-11',202511,3,2025,11,11,202503),('2025-03-12',202511,3,2025,12,11,202503),('2025-03-13',202511,3,2025,13,11,202503),('2025-03-14',202511,3,2025,14,11,202503),('2025-03-15',202511,3,2025,15,11,202503),('2025-03-16',202512,3,2025,16,12,202503),('2025-03-17',202512,3,2025,17,12,202503),('2025-03-18',202512,3,2025,18,12,202503),('2025-03-19',202512,3,2025,19,12,202503),('2025-03-20',202512,3,2025,20,12,202503),('2025-03-21',202512,3,2025,21,12,202503),('2025-03-22',202512,3,2025,22,12,202503),('2025-03-23',202513,3,2025,23,13,202503),('2025-03-24',202513,3,2025,24,13,202503),('2025-03-25',202513,3,2025,25,13,202503),('2025-03-26',202513,3,2025,26,13,202503),('2025-03-27',202513,3,2025,27,13,202503),('2025-03-28',202513,3,2025,28,13,202503),('2025-03-29',202513,3,2025,29,13,202503),('2025-03-30',202514,3,2025,30,14,202503),('2025-03-31',202514,3,2025,31,14,202503),('2025-04-01',202514,4,2025,1,14,202504),('2025-04-02',202514,4,2025,2,14,202504),('2025-04-03',202514,4,2025,3,14,202504),('2025-04-04',202514,4,2025,4,14,202504),('2025-04-05',202514,4,2025,5,14,202504),('2025-04-06',202515,4,2025,6,15,202504),('2025-04-07',202515,4,2025,7,15,202504),('2025-04-08',202515,4,2025,8,15,202504),('2025-04-09',202515,4,2025,9,15,202504),('2025-04-10',202515,4,2025,10,15,202504),('2025-04-11',202515,4,2025,11,15,202504),('2025-04-12',202515,4,2025,12,15,202504),('2025-04-13',202516,4,2025,13,16,202504),('2025-04-14',202516,4,2025,14,16,202504),('2025-04-15',202516,4,2025,15,16,202504),('2025-04-16',202516,4,2025,16,16,202504),('2025-04-17',202516,4,2025,17,16,202504),('2025-04-18',202516,4,2025,18,16,202504),('2025-04-19',202516,4,2025,19,16,202504),('2025-04-20',202517,4,2025,20,17,202504),('2025-04-21',202517,4,2025,21,17,202504),('2025-04-22',202517,4,2025,22,17,202504),('2025-04-23',202517,4,2025,23,17,202504),('2025-04-24',202517,4,2025,24,17,202504),('2025-04-25',202517,4,2025,25,17,202504),('2025-04-26',202517,4,2025,26,17,202504),('2025-04-27',202518,4,2025,27,18,202504),('2025-04-28',202518,4,2025,28,18,202504),('2025-04-29',202518,4,2025,29,18,202504),('2025-04-30',202518,4,2025,30,18,202504),('2025-05-01',202518,5,2025,1,18,202505),('2025-05-02',202518,5,2025,2,18,202505),('2025-05-03',202518,5,2025,3,18,202505),('2025-05-04',202519,5,2025,4,19,202505),('2025-05-05',202519,5,2025,5,19,202505),('2025-05-06',202519,5,2025,6,19,202505),('2025-05-07',202519,5,2025,7,19,202505),('2025-05-08',202519,5,2025,8,19,202505),('2025-05-09',202519,5,2025,9,19,202505),('2025-05-10',202519,5,2025,10,19,202505),('2025-05-11',202520,5,2025,11,20,202505),('2025-05-12',202520,5,2025,12,20,202505),('2025-05-13',202520,5,2025,13,20,202505),('2025-05-14',202520,5,2025,14,20,202505),('2025-05-15',202520,5,2025,15,20,202505),('2025-05-16',202520,5,2025,16,20,202505),('2025-05-17',202520,5,2025,17,20,202505),('2025-05-18',202521,5,2025,18,21,202505),('2025-05-19',202521,5,2025,19,21,202505),('2025-05-20',202521,5,2025,20,21,202505),('2025-05-21',202521,5,2025,21,21,202505),('2025-05-22',202521,5,2025,22,21,202505),('2025-05-23',202521,5,2025,23,21,202505),('2025-05-24',202521,5,2025,24,21,202505),('2025-05-25',202522,5,2025,25,22,202505),('2025-05-26',202522,5,2025,26,22,202505),('2025-05-27',202522,5,2025,27,22,202505),('2025-05-28',202522,5,2025,28,22,202505),('2025-05-29',202522,5,2025,29,22,202505),('2025-05-30',202522,5,2025,30,22,202505),('2025-05-31',202522,5,2025,31,22,202505),('2025-06-01',202523,6,2025,1,23,202506),('2025-06-02',202523,6,2025,2,23,202506),('2025-06-03',202523,6,2025,3,23,202506),('2025-06-04',202523,6,2025,4,23,202506),('2025-06-05',202523,6,2025,5,23,202506),('2025-06-06',202523,6,2025,6,23,202506),('2025-06-07',202523,6,2025,7,23,202506),('2025-06-08',202524,6,2025,8,24,202506),('2025-06-09',202524,6,2025,9,24,202506),('2025-06-10',202524,6,2025,10,24,202506),('2025-06-11',202524,6,2025,11,24,202506),('2025-06-12',202524,6,2025,12,24,202506),('2025-06-13',202524,6,2025,13,24,202506),('2025-06-14',202524,6,2025,14,24,202506),('2025-06-15',202525,6,2025,15,25,202506),('2025-06-16',202525,6,2025,16,25,202506),('2025-06-17',202525,6,2025,17,25,202506),('2025-06-18',202525,6,2025,18,25,202506),('2025-06-19',202525,6,2025,19,25,202506),('2025-06-20',202525,6,2025,20,25,202506),('2025-06-21',202525,6,2025,21,25,202506),('2025-06-22',202526,6,2025,22,26,202506),('2025-06-23',202526,6,2025,23,26,202506),('2025-06-24',202526,6,2025,24,26,202506),('2025-06-25',202526,6,2025,25,26,202506),('2025-06-26',202526,6,2025,26,26,202506),('2025-06-27',202526,6,2025,27,26,202506),('2025-06-28',202526,6,2025,28,26,202506),('2025-06-29',202527,6,2025,29,27,202506),('2025-06-30',202527,6,2025,30,27,202506),('2025-07-01',202527,7,2025,1,27,202507),('2025-07-02',202527,7,2025,2,27,202507),('2025-07-03',202527,7,2025,3,27,202507),('2025-07-04',202527,7,2025,4,27,202507),('2025-07-05',202527,7,2025,5,27,202507),('2025-07-06',202528,7,2025,6,28,202507),('2025-07-07',202528,7,2025,7,28,202507),('2025-07-08',202528,7,2025,8,28,202507),('2025-07-09',202528,7,2025,9,28,202507),('2025-07-10',202528,7,2025,10,28,202507),('2025-07-11',202528,7,2025,11,28,202507),('2025-07-12',202528,7,2025,12,28,202507),('2025-07-13',202529,7,2025,13,29,202507),('2025-07-14',202529,7,2025,14,29,202507),('2025-07-15',202529,7,2025,15,29,202507),('2025-07-16',202529,7,2025,16,29,202507),('2025-07-17',202529,7,2025,17,29,202507),('2025-07-18',202529,7,2025,18,29,202507),('2025-07-19',202529,7,2025,19,29,202507),('2025-07-20',202530,7,2025,20,30,202507),('2025-07-21',202530,7,2025,21,30,202507),('2025-07-22',202530,7,2025,22,30,202507),('2025-07-23',202530,7,2025,23,30,202507),('2025-07-24',202530,7,2025,24,30,202507),('2025-07-25',202530,7,2025,25,30,202507),('2025-07-26',202530,7,2025,26,30,202507),('2025-07-27',202531,7,2025,27,31,202507),('2025-07-28',202531,7,2025,28,31,202507),('2025-07-29',202531,7,2025,29,31,202507),('2025-07-30',202531,7,2025,30,31,202507),('2025-07-31',202531,7,2025,31,31,202507),('2025-08-01',202531,8,2025,1,31,202508),('2025-08-02',202531,8,2025,2,31,202508),('2025-08-03',202532,8,2025,3,32,202508),('2025-08-04',202532,8,2025,4,32,202508),('2025-08-05',202532,8,2025,5,32,202508),('2025-08-06',202532,8,2025,6,32,202508),('2025-08-07',202532,8,2025,7,32,202508),('2025-08-08',202532,8,2025,8,32,202508),('2025-08-09',202532,8,2025,9,32,202508),('2025-08-10',202533,8,2025,10,33,202508),('2025-08-11',202533,8,2025,11,33,202508),('2025-08-12',202533,8,2025,12,33,202508),('2025-08-13',202533,8,2025,13,33,202508),('2025-08-14',202533,8,2025,14,33,202508),('2025-08-15',202533,8,2025,15,33,202508),('2025-08-16',202533,8,2025,16,33,202508),('2025-08-17',202534,8,2025,17,34,202508),('2025-08-18',202534,8,2025,18,34,202508),('2025-08-19',202534,8,2025,19,34,202508),('2025-08-20',202534,8,2025,20,34,202508),('2025-08-21',202534,8,2025,21,34,202508),('2025-08-22',202534,8,2025,22,34,202508),('2025-08-23',202534,8,2025,23,34,202508),('2025-08-24',202535,8,2025,24,35,202508),('2025-08-25',202535,8,2025,25,35,202508),('2025-08-26',202535,8,2025,26,35,202508),('2025-08-27',202535,8,2025,27,35,202508),('2025-08-28',202535,8,2025,28,35,202508),('2025-08-29',202535,8,2025,29,35,202508),('2025-08-30',202535,8,2025,30,35,202508),('2025-08-31',202536,8,2025,31,36,202508),('2025-09-01',202536,9,2025,1,36,202509),('2025-09-02',202536,9,2025,2,36,202509),('2025-09-03',202536,9,2025,3,36,202509),('2025-09-04',202536,9,2025,4,36,202509),('2025-09-05',202536,9,2025,5,36,202509),('2025-09-06',202536,9,2025,6,36,202509),('2025-09-07',202537,9,2025,7,37,202509),('2025-09-08',202537,9,2025,8,37,202509),('2025-09-09',202537,9,2025,9,37,202509),('2025-09-10',202537,9,2025,10,37,202509),('2025-09-11',202537,9,2025,11,37,202509),('2025-09-12',202537,9,2025,12,37,202509),('2025-09-13',202537,9,2025,13,37,202509),('2025-09-14',202538,9,2025,14,38,202509),('2025-09-15',202538,9,2025,15,38,202509),('2025-09-16',202538,9,2025,16,38,202509),('2025-09-17',202538,9,2025,17,38,202509),('2025-09-18',202538,9,2025,18,38,202509),('2025-09-19',202538,9,2025,19,38,202509),('2025-09-20',202538,9,2025,20,38,202509),('2025-09-21',202539,9,2025,21,39,202509),('2025-09-22',202539,9,2025,22,39,202509),('2025-09-23',202539,9,2025,23,39,202509),('2025-09-24',202539,9,2025,24,39,202509),('2025-09-25',202539,9,2025,25,39,202509),('2025-09-26',202539,9,2025,26,39,202509),('2025-09-27',202539,9,2025,27,39,202509),('2025-09-28',202540,9,2025,28,40,202509),('2025-09-29',202540,9,2025,29,40,202509),('2025-09-30',202540,9,2025,30,40,202509),('2025-10-01',202540,10,2025,1,40,202510),('2025-10-02',202540,10,2025,2,40,202510),('2025-10-03',202540,10,2025,3,40,202510),('2025-10-04',202540,10,2025,4,40,202510),('2025-10-05',202541,10,2025,5,41,202510),('2025-10-06',202541,10,2025,6,41,202510),('2025-10-07',202541,10,2025,7,41,202510),('2025-10-08',202541,10,2025,8,41,202510),('2025-10-09',202541,10,2025,9,41,202510),('2025-10-10',202541,10,2025,10,41,202510),('2025-10-11',202541,10,2025,11,41,202510),('2025-10-12',202542,10,2025,12,42,202510),('2025-10-13',202542,10,2025,13,42,202510),('2025-10-14',202542,10,2025,14,42,202510),('2025-10-15',202542,10,2025,15,42,202510),('2025-10-16',202542,10,2025,16,42,202510),('2025-10-17',202542,10,2025,17,42,202510),('2025-10-18',202542,10,2025,18,42,202510),('2025-10-19',202543,10,2025,19,43,202510),('2025-10-20',202543,10,2025,20,43,202510),('2025-10-21',202543,10,2025,21,43,202510),('2025-10-22',202543,10,2025,22,43,202510),('2025-10-23',202543,10,2025,23,43,202510),('2025-10-24',202543,10,2025,24,43,202510),('2025-10-25',202543,10,2025,25,43,202510),('2025-10-26',202544,10,2025,26,44,202510),('2025-10-27',202544,10,2025,27,44,202510),('2025-10-28',202544,10,2025,28,44,202510),('2025-10-29',202544,10,2025,29,44,202510),('2025-10-30',202544,10,2025,30,44,202510),('2025-10-31',202544,10,2025,31,44,202510),('2025-11-01',202544,11,2025,1,44,202511),('2025-11-02',202545,11,2025,2,45,202511),('2025-11-03',202545,11,2025,3,45,202511),('2025-11-04',202545,11,2025,4,45,202511),('2025-11-05',202545,11,2025,5,45,202511),('2025-11-06',202545,11,2025,6,45,202511),('2025-11-07',202545,11,2025,7,45,202511),('2025-11-08',202545,11,2025,8,45,202511),('2025-11-09',202546,11,2025,9,46,202511),('2025-11-10',202546,11,2025,10,46,202511),('2025-11-11',202546,11,2025,11,46,202511),('2025-11-12',202546,11,2025,12,46,202511),('2025-11-13',202546,11,2025,13,46,202511),('2025-11-14',202546,11,2025,14,46,202511),('2025-11-15',202546,11,2025,15,46,202511),('2025-11-16',202547,11,2025,16,47,202511),('2025-11-17',202547,11,2025,17,47,202511),('2025-11-18',202547,11,2025,18,47,202511),('2025-11-19',202547,11,2025,19,47,202511),('2025-11-20',202547,11,2025,20,47,202511),('2025-11-21',202547,11,2025,21,47,202511),('2025-11-22',202547,11,2025,22,47,202511),('2025-11-23',202548,11,2025,23,48,202511),('2025-11-24',202548,11,2025,24,48,202511),('2025-11-25',202548,11,2025,25,48,202511),('2025-11-26',202548,11,2025,26,48,202511),('2025-11-27',202548,11,2025,27,48,202511),('2025-11-28',202548,11,2025,28,48,202511),('2025-11-29',202548,11,2025,29,48,202511),('2025-11-30',202549,11,2025,30,49,202511),('2025-12-01',202549,12,2025,1,49,202512),('2025-12-02',202549,12,2025,2,49,202512),('2025-12-03',202549,12,2025,3,49,202512),('2025-12-04',202549,12,2025,4,49,202512),('2025-12-05',202549,12,2025,5,49,202512),('2025-12-06',202549,12,2025,6,49,202512),('2025-12-07',202550,12,2025,7,50,202512),('2025-12-08',202550,12,2025,8,50,202512),('2025-12-09',202550,12,2025,9,50,202512),('2025-12-10',202550,12,2025,10,50,202512),('2025-12-11',202550,12,2025,11,50,202512),('2025-12-12',202550,12,2025,12,50,202512),('2025-12-13',202550,12,2025,13,50,202512),('2025-12-14',202551,12,2025,14,51,202512),('2025-12-15',202551,12,2025,15,51,202512),('2025-12-16',202551,12,2025,16,51,202512),('2025-12-17',202551,12,2025,17,51,202512),('2025-12-18',202551,12,2025,18,51,202512),('2025-12-19',202551,12,2025,19,51,202512),('2025-12-20',202551,12,2025,20,51,202512),('2025-12-21',202552,12,2025,21,52,202512),('2025-12-22',202552,12,2025,22,52,202512),('2025-12-23',202552,12,2025,23,52,202512),('2025-12-24',202552,12,2025,24,52,202512),('2025-12-25',202552,12,2025,25,52,202512),('2025-12-26',202552,12,2025,26,52,202512),('2025-12-27',202552,12,2025,27,52,202512),('2025-12-28',202553,12,2025,28,53,202512),('2025-12-29',202501,12,2025,29,53,202512),('2025-12-30',202501,12,2025,30,53,202512),('2025-12-31',202501,12,2025,31,53,202512),('2026-01-01',202601,1,2026,1,53,202601),('2026-01-02',202601,1,2026,2,53,202601),('2026-01-03',202601,1,2026,3,53,202601),('2026-01-04',202602,1,2026,4,1,202601),('2026-01-05',202602,1,2026,5,1,202601),('2026-01-06',202602,1,2026,6,1,202601),('2026-01-07',202602,1,2026,7,1,202601),('2026-01-08',202602,1,2026,8,1,202601),('2026-01-09',202602,1,2026,9,1,202601),('2026-01-10',202602,1,2026,10,1,202601),('2026-01-11',202603,1,2026,11,2,202601),('2026-01-12',202603,1,2026,12,2,202601),('2026-01-13',202603,1,2026,13,2,202601),('2026-01-14',202603,1,2026,14,2,202601),('2026-01-15',202603,1,2026,15,2,202601),('2026-01-16',202603,1,2026,16,2,202601),('2026-01-17',202603,1,2026,17,2,202601),('2026-01-18',202604,1,2026,18,3,202601),('2026-01-19',202604,1,2026,19,3,202601),('2026-01-20',202604,1,2026,20,3,202601),('2026-01-21',202604,1,2026,21,3,202601),('2026-01-22',202604,1,2026,22,3,202601),('2026-01-23',202604,1,2026,23,3,202601),('2026-01-24',202604,1,2026,24,3,202601),('2026-01-25',202605,1,2026,25,4,202601),('2026-01-26',202605,1,2026,26,4,202601),('2026-01-27',202605,1,2026,27,4,202601),('2026-01-28',202605,1,2026,28,4,202601),('2026-01-29',202605,1,2026,29,4,202601),('2026-01-30',202605,1,2026,30,4,202601),('2026-01-31',202605,1,2026,31,4,202601),('2026-02-01',202606,2,2026,1,5,202602),('2026-02-02',202606,2,2026,2,5,202602),('2026-02-03',202606,2,2026,3,5,202602),('2026-02-04',202606,2,2026,4,5,202602),('2026-02-05',202606,2,2026,5,5,202602),('2026-02-06',202606,2,2026,6,5,202602),('2026-02-07',202606,2,2026,7,5,202602),('2026-02-08',202607,2,2026,8,6,202602),('2026-02-09',202607,2,2026,9,6,202602),('2026-02-10',202607,2,2026,10,6,202602),('2026-02-11',202607,2,2026,11,6,202602),('2026-02-12',202607,2,2026,12,6,202602),('2026-02-13',202607,2,2026,13,6,202602),('2026-02-14',202607,2,2026,14,6,202602),('2026-02-15',202608,2,2026,15,7,202602),('2026-02-16',202608,2,2026,16,7,202602),('2026-02-17',202608,2,2026,17,7,202602),('2026-02-18',202608,2,2026,18,7,202602),('2026-02-19',202608,2,2026,19,7,202602),('2026-02-20',202608,2,2026,20,7,202602),('2026-02-21',202608,2,2026,21,7,202602),('2026-02-22',202609,2,2026,22,8,202602),('2026-02-23',202609,2,2026,23,8,202602),('2026-02-24',202609,2,2026,24,8,202602),('2026-02-25',202609,2,2026,25,8,202602),('2026-02-26',202609,2,2026,26,8,202602),('2026-02-27',202609,2,2026,27,8,202602),('2026-02-28',202609,2,2026,28,8,202602),('2026-03-01',202610,3,2026,1,9,202603),('2026-03-02',202610,3,2026,2,9,202603),('2026-03-03',202610,3,2026,3,9,202603),('2026-03-04',202610,3,2026,4,9,202603),('2026-03-05',202610,3,2026,5,9,202603),('2026-03-06',202610,3,2026,6,9,202603),('2026-03-07',202610,3,2026,7,9,202603),('2026-03-08',202611,3,2026,8,10,202603),('2026-03-09',202611,3,2026,9,10,202603),('2026-03-10',202611,3,2026,10,10,202603),('2026-03-11',202611,3,2026,11,10,202603),('2026-03-12',202611,3,2026,12,10,202603),('2026-03-13',202611,3,2026,13,10,202603),('2026-03-14',202611,3,2026,14,10,202603),('2026-03-15',202612,3,2026,15,11,202603),('2026-03-16',202612,3,2026,16,11,202603),('2026-03-17',202612,3,2026,17,11,202603),('2026-03-18',202612,3,2026,18,11,202603),('2026-03-19',202612,3,2026,19,11,202603),('2026-03-20',202612,3,2026,20,11,202603),('2026-03-21',202612,3,2026,21,11,202603),('2026-03-22',202613,3,2026,22,12,202603),('2026-03-23',202613,3,2026,23,12,202603),('2026-03-24',202613,3,2026,24,12,202603),('2026-03-25',202613,3,2026,25,12,202603),('2026-03-26',202613,3,2026,26,12,202603),('2026-03-27',202613,3,2026,27,12,202603),('2026-03-28',202613,3,2026,28,12,202603),('2026-03-29',202614,3,2026,29,13,202603),('2026-03-30',202614,3,2026,30,13,202603),('2026-03-31',202614,3,2026,31,13,202603),('2026-04-01',202614,4,2026,1,13,202604),('2026-04-02',202614,4,2026,2,13,202604),('2026-04-03',202614,4,2026,3,13,202604),('2026-04-04',202614,4,2026,4,13,202604),('2026-04-05',202615,4,2026,5,14,202604),('2026-04-06',202615,4,2026,6,14,202604),('2026-04-07',202615,4,2026,7,14,202604),('2026-04-08',202615,4,2026,8,14,202604),('2026-04-09',202615,4,2026,9,14,202604),('2026-04-10',202615,4,2026,10,14,202604),('2026-04-11',202615,4,2026,11,14,202604),('2026-04-12',202616,4,2026,12,15,202604),('2026-04-13',202616,4,2026,13,15,202604),('2026-04-14',202616,4,2026,14,15,202604),('2026-04-15',202616,4,2026,15,15,202604),('2026-04-16',202616,4,2026,16,15,202604),('2026-04-17',202616,4,2026,17,15,202604),('2026-04-18',202616,4,2026,18,15,202604),('2026-04-19',202617,4,2026,19,16,202604),('2026-04-20',202617,4,2026,20,16,202604),('2026-04-21',202617,4,2026,21,16,202604),('2026-04-22',202617,4,2026,22,16,202604),('2026-04-23',202617,4,2026,23,16,202604),('2026-04-24',202617,4,2026,24,16,202604),('2026-04-25',202617,4,2026,25,16,202604),('2026-04-26',202618,4,2026,26,17,202604),('2026-04-27',202618,4,2026,27,17,202604),('2026-04-28',202618,4,2026,28,17,202604),('2026-04-29',202618,4,2026,29,17,202604),('2026-04-30',202618,4,2026,30,17,202604),('2026-05-01',202618,5,2026,1,17,202605),('2026-05-02',202618,5,2026,2,17,202605),('2026-05-03',202619,5,2026,3,18,202605),('2026-05-04',202619,5,2026,4,18,202605),('2026-05-05',202619,5,2026,5,18,202605),('2026-05-06',202619,5,2026,6,18,202605),('2026-05-07',202619,5,2026,7,18,202605),('2026-05-08',202619,5,2026,8,18,202605),('2026-05-09',202619,5,2026,9,18,202605),('2026-05-10',202620,5,2026,10,19,202605),('2026-05-11',202620,5,2026,11,19,202605),('2026-05-12',202620,5,2026,12,19,202605),('2026-05-13',202620,5,2026,13,19,202605),('2026-05-14',202620,5,2026,14,19,202605),('2026-05-15',202620,5,2026,15,19,202605),('2026-05-16',202620,5,2026,16,19,202605),('2026-05-17',202621,5,2026,17,20,202605),('2026-05-18',202621,5,2026,18,20,202605),('2026-05-19',202621,5,2026,19,20,202605),('2026-05-20',202621,5,2026,20,20,202605),('2026-05-21',202621,5,2026,21,20,202605),('2026-05-22',202621,5,2026,22,20,202605),('2026-05-23',202621,5,2026,23,20,202605),('2026-05-24',202622,5,2026,24,21,202605),('2026-05-25',202622,5,2026,25,21,202605),('2026-05-26',202622,5,2026,26,21,202605),('2026-05-27',202622,5,2026,27,21,202605),('2026-05-28',202622,5,2026,28,21,202605),('2026-05-29',202622,5,2026,29,21,202605),('2026-05-30',202622,5,2026,30,21,202605),('2026-05-31',202623,5,2026,31,22,202605),('2026-06-01',202623,6,2026,1,22,202606),('2026-06-02',202623,6,2026,2,22,202606),('2026-06-03',202623,6,2026,3,22,202606),('2026-06-04',202623,6,2026,4,22,202606),('2026-06-05',202623,6,2026,5,22,202606),('2026-06-06',202623,6,2026,6,22,202606),('2026-06-07',202624,6,2026,7,23,202606),('2026-06-08',202624,6,2026,8,23,202606),('2026-06-09',202624,6,2026,9,23,202606),('2026-06-10',202624,6,2026,10,23,202606),('2026-06-11',202624,6,2026,11,23,202606),('2026-06-12',202624,6,2026,12,23,202606),('2026-06-13',202624,6,2026,13,23,202606),('2026-06-14',202625,6,2026,14,24,202606),('2026-06-15',202625,6,2026,15,24,202606),('2026-06-16',202625,6,2026,16,24,202606),('2026-06-17',202625,6,2026,17,24,202606),('2026-06-18',202625,6,2026,18,24,202606),('2026-06-19',202625,6,2026,19,24,202606),('2026-06-20',202625,6,2026,20,24,202606),('2026-06-21',202626,6,2026,21,25,202606),('2026-06-22',202626,6,2026,22,25,202606),('2026-06-23',202626,6,2026,23,25,202606),('2026-06-24',202626,6,2026,24,25,202606),('2026-06-25',202626,6,2026,25,25,202606),('2026-06-26',202626,6,2026,26,25,202606),('2026-06-27',202626,6,2026,27,25,202606),('2026-06-28',202627,6,2026,28,26,202606),('2026-06-29',202627,6,2026,29,26,202606),('2026-06-30',202627,6,2026,30,26,202606),('2026-07-01',202627,7,2026,1,26,202607),('2026-07-02',202627,7,2026,2,26,202607),('2026-07-03',202627,7,2026,3,26,202607),('2026-07-04',202627,7,2026,4,26,202607),('2026-07-05',202628,7,2026,5,27,202607),('2026-07-06',202628,7,2026,6,27,202607),('2026-07-07',202628,7,2026,7,27,202607),('2026-07-08',202628,7,2026,8,27,202607),('2026-07-09',202628,7,2026,9,27,202607),('2026-07-10',202628,7,2026,10,27,202607),('2026-07-11',202628,7,2026,11,27,202607),('2026-07-12',202629,7,2026,12,28,202607),('2026-07-13',202629,7,2026,13,28,202607),('2026-07-14',202629,7,2026,14,28,202607),('2026-07-15',202629,7,2026,15,28,202607),('2026-07-16',202629,7,2026,16,28,202607),('2026-07-17',202629,7,2026,17,28,202607),('2026-07-18',202629,7,2026,18,28,202607),('2026-07-19',202630,7,2026,19,29,202607),('2026-07-20',202630,7,2026,20,29,202607),('2026-07-21',202630,7,2026,21,29,202607),('2026-07-22',202630,7,2026,22,29,202607),('2026-07-23',202630,7,2026,23,29,202607),('2026-07-24',202630,7,2026,24,29,202607),('2026-07-25',202630,7,2026,25,29,202607),('2026-07-26',202631,7,2026,26,30,202607),('2026-07-27',202631,7,2026,27,30,202607),('2026-07-28',202631,7,2026,28,30,202607),('2026-07-29',202631,7,2026,29,30,202607),('2026-07-30',202631,7,2026,30,30,202607),('2026-07-31',202631,7,2026,31,30,202607),('2026-08-01',202631,8,2026,1,30,202608),('2026-08-02',202632,8,2026,2,31,202608),('2026-08-03',202632,8,2026,3,31,202608),('2026-08-04',202632,8,2026,4,31,202608),('2026-08-05',202632,8,2026,5,31,202608),('2026-08-06',202632,8,2026,6,31,202608),('2026-08-07',202632,8,2026,7,31,202608),('2026-08-08',202632,8,2026,8,31,202608),('2026-08-09',202633,8,2026,9,32,202608),('2026-08-10',202633,8,2026,10,32,202608),('2026-08-11',202633,8,2026,11,32,202608),('2026-08-12',202633,8,2026,12,32,202608),('2026-08-13',202633,8,2026,13,32,202608),('2026-08-14',202633,8,2026,14,32,202608),('2026-08-15',202633,8,2026,15,32,202608),('2026-08-16',202634,8,2026,16,33,202608),('2026-08-17',202634,8,2026,17,33,202608),('2026-08-18',202634,8,2026,18,33,202608),('2026-08-19',202634,8,2026,19,33,202608),('2026-08-20',202634,8,2026,20,33,202608),('2026-08-21',202634,8,2026,21,33,202608),('2026-08-22',202634,8,2026,22,33,202608),('2026-08-23',202635,8,2026,23,34,202608),('2026-08-24',202635,8,2026,24,34,202608),('2026-08-25',202635,8,2026,25,34,202608),('2026-08-26',202635,8,2026,26,34,202608),('2026-08-27',202635,8,2026,27,34,202608),('2026-08-28',202635,8,2026,28,34,202608),('2026-08-29',202635,8,2026,29,34,202608),('2026-08-30',202636,8,2026,30,35,202608),('2026-08-31',202636,8,2026,31,35,202608),('2026-09-01',202636,9,2026,1,35,202609),('2026-09-02',202636,9,2026,2,35,202609),('2026-09-03',202636,9,2026,3,35,202609),('2026-09-04',202636,9,2026,4,35,202609),('2026-09-05',202636,9,2026,5,35,202609),('2026-09-06',202637,9,2026,6,36,202609),('2026-09-07',202637,9,2026,7,36,202609),('2026-09-08',202637,9,2026,8,36,202609),('2026-09-09',202637,9,2026,9,36,202609),('2026-09-10',202637,9,2026,10,36,202609),('2026-09-11',202637,9,2026,11,36,202609),('2026-09-12',202637,9,2026,12,36,202609),('2026-09-13',202638,9,2026,13,37,202609),('2026-09-14',202638,9,2026,14,37,202609),('2026-09-15',202638,9,2026,15,37,202609),('2026-09-16',202638,9,2026,16,37,202609),('2026-09-17',202638,9,2026,17,37,202609),('2026-09-18',202638,9,2026,18,37,202609),('2026-09-19',202638,9,2026,19,37,202609),('2026-09-20',202639,9,2026,20,38,202609),('2026-09-21',202639,9,2026,21,38,202609),('2026-09-22',202639,9,2026,22,38,202609),('2026-09-23',202639,9,2026,23,38,202609),('2026-09-24',202639,9,2026,24,38,202609),('2026-09-25',202639,9,2026,25,38,202609),('2026-09-26',202639,9,2026,26,38,202609),('2026-09-27',202640,9,2026,27,39,202609),('2026-09-28',202640,9,2026,28,39,202609),('2026-09-29',202640,9,2026,29,39,202609),('2026-09-30',202640,9,2026,30,39,202609),('2026-10-01',202640,10,2026,1,39,202610),('2026-10-02',202640,10,2026,2,39,202610),('2026-10-03',202640,10,2026,3,39,202610),('2026-10-04',202641,10,2026,4,40,202610),('2026-10-05',202641,10,2026,5,40,202610),('2026-10-06',202641,10,2026,6,40,202610),('2026-10-07',202641,10,2026,7,40,202610),('2026-10-08',202641,10,2026,8,40,202610),('2026-10-09',202641,10,2026,9,40,202610),('2026-10-10',202641,10,2026,10,40,202610),('2026-10-11',202642,10,2026,11,41,202610),('2026-10-12',202642,10,2026,12,41,202610),('2026-10-13',202642,10,2026,13,41,202610),('2026-10-14',202642,10,2026,14,41,202610),('2026-10-15',202642,10,2026,15,41,202610),('2026-10-16',202642,10,2026,16,41,202610),('2026-10-17',202642,10,2026,17,41,202610),('2026-10-18',202643,10,2026,18,42,202610),('2026-10-19',202643,10,2026,19,42,202610),('2026-10-20',202643,10,2026,20,42,202610),('2026-10-21',202643,10,2026,21,42,202610),('2026-10-22',202643,10,2026,22,42,202610),('2026-10-23',202643,10,2026,23,42,202610),('2026-10-24',202643,10,2026,24,42,202610),('2026-10-25',202644,10,2026,25,43,202610),('2026-10-26',202644,10,2026,26,43,202610),('2026-10-27',202644,10,2026,27,43,202610),('2026-10-28',202644,10,2026,28,43,202610),('2026-10-29',202644,10,2026,29,43,202610),('2026-10-30',202644,10,2026,30,43,202610),('2026-10-31',202644,10,2026,31,43,202610),('2026-11-01',202645,11,2026,1,44,202611),('2026-11-02',202645,11,2026,2,44,202611),('2026-11-03',202645,11,2026,3,44,202611),('2026-11-04',202645,11,2026,4,44,202611),('2026-11-05',202645,11,2026,5,44,202611),('2026-11-06',202645,11,2026,6,44,202611),('2026-11-07',202645,11,2026,7,44,202611),('2026-11-08',202646,11,2026,8,45,202611),('2026-11-09',202646,11,2026,9,45,202611),('2026-11-10',202646,11,2026,10,45,202611),('2026-11-11',202646,11,2026,11,45,202611),('2026-11-12',202646,11,2026,12,45,202611),('2026-11-13',202646,11,2026,13,45,202611),('2026-11-14',202646,11,2026,14,45,202611),('2026-11-15',202647,11,2026,15,46,202611),('2026-11-16',202647,11,2026,16,46,202611),('2026-11-17',202647,11,2026,17,46,202611),('2026-11-18',202647,11,2026,18,46,202611),('2026-11-19',202647,11,2026,19,46,202611),('2026-11-20',202647,11,2026,20,46,202611),('2026-11-21',202647,11,2026,21,46,202611),('2026-11-22',202648,11,2026,22,47,202611),('2026-11-23',202648,11,2026,23,47,202611),('2026-11-24',202648,11,2026,24,47,202611),('2026-11-25',202648,11,2026,25,47,202611),('2026-11-26',202648,11,2026,26,47,202611),('2026-11-27',202648,11,2026,27,47,202611),('2026-11-28',202648,11,2026,28,47,202611),('2026-11-29',202649,11,2026,29,48,202611),('2026-11-30',202649,11,2026,30,48,202611),('2026-12-01',202649,12,2026,1,48,202612),('2026-12-02',202649,12,2026,2,48,202612),('2026-12-03',202649,12,2026,3,48,202612),('2026-12-04',202649,12,2026,4,48,202612),('2026-12-05',202649,12,2026,5,48,202612),('2026-12-06',202650,12,2026,6,49,202612),('2026-12-07',202650,12,2026,7,49,202612),('2026-12-08',202650,12,2026,8,49,202612),('2026-12-09',202650,12,2026,9,49,202612),('2026-12-10',202650,12,2026,10,49,202612),('2026-12-11',202650,12,2026,11,49,202612),('2026-12-12',202650,12,2026,12,49,202612),('2026-12-13',202651,12,2026,13,50,202612),('2026-12-14',202651,12,2026,14,50,202612),('2026-12-15',202651,12,2026,15,50,202612),('2026-12-16',202651,12,2026,16,50,202612),('2026-12-17',202651,12,2026,17,50,202612),('2026-12-18',202651,12,2026,18,50,202612),('2026-12-19',202651,12,2026,19,50,202612),('2026-12-20',202652,12,2026,20,51,202612),('2026-12-21',202652,12,2026,21,51,202612),('2026-12-22',202652,12,2026,22,51,202612),('2026-12-23',202652,12,2026,23,51,202612),('2026-12-24',202652,12,2026,24,51,202612),('2026-12-25',202652,12,2026,25,51,202612),('2026-12-26',202652,12,2026,26,51,202612),('2026-12-27',202653,12,2026,27,52,202612),('2026-12-28',202653,12,2026,28,52,202612),('2026-12-29',202653,12,2026,29,52,202612),('2026-12-30',202653,12,2026,30,52,202612),('2026-12-31',202653,12,2026,31,52,202612),('2027-01-01',202753,1,2027,1,52,202701),('2027-01-02',202753,1,2027,2,52,202701),('2027-01-03',202754,1,2027,3,1,202701),('2027-01-04',202701,1,2027,4,1,202701),('2027-01-05',202701,1,2027,5,1,202701),('2027-01-06',202701,1,2027,6,1,202701),('2027-01-07',202701,1,2027,7,1,202701),('2027-01-08',202701,1,2027,8,1,202701),('2027-01-09',202701,1,2027,9,1,202701),('2027-01-10',202702,1,2027,10,2,202701),('2027-01-11',202702,1,2027,11,2,202701),('2027-01-12',202702,1,2027,12,2,202701),('2027-01-13',202702,1,2027,13,2,202701),('2027-01-14',202702,1,2027,14,2,202701),('2027-01-15',202702,1,2027,15,2,202701),('2027-01-16',202702,1,2027,16,2,202701),('2027-01-17',202703,1,2027,17,3,202701),('2027-01-18',202703,1,2027,18,3,202701),('2027-01-19',202703,1,2027,19,3,202701),('2027-01-20',202703,1,2027,20,3,202701),('2027-01-21',202703,1,2027,21,3,202701),('2027-01-22',202703,1,2027,22,3,202701),('2027-01-23',202703,1,2027,23,3,202701),('2027-01-24',202704,1,2027,24,4,202701),('2027-01-25',202704,1,2027,25,4,202701),('2027-01-26',202704,1,2027,26,4,202701),('2027-01-27',202704,1,2027,27,4,202701),('2027-01-28',202704,1,2027,28,4,202701),('2027-01-29',202704,1,2027,29,4,202701),('2027-01-30',202704,1,2027,30,4,202701),('2027-01-31',202705,1,2027,31,5,202701),('2027-02-01',202705,2,2027,1,5,202702),('2027-02-02',202705,2,2027,2,5,202702),('2027-02-03',202705,2,2027,3,5,202702),('2027-02-04',202705,2,2027,4,5,202702),('2027-02-05',202705,2,2027,5,5,202702),('2027-02-06',202705,2,2027,6,5,202702),('2027-02-07',202706,2,2027,7,6,202702),('2027-02-08',202706,2,2027,8,6,202702),('2027-02-09',202706,2,2027,9,6,202702),('2027-02-10',202706,2,2027,10,6,202702),('2027-02-11',202706,2,2027,11,6,202702),('2027-02-12',202706,2,2027,12,6,202702),('2027-02-13',202706,2,2027,13,6,202702),('2027-02-14',202707,2,2027,14,7,202702),('2027-02-15',202707,2,2027,15,7,202702),('2027-02-16',202707,2,2027,16,7,202702),('2027-02-17',202707,2,2027,17,7,202702),('2027-02-18',202707,2,2027,18,7,202702),('2027-02-19',202707,2,2027,19,7,202702),('2027-02-20',202707,2,2027,20,7,202702),('2027-02-21',202708,2,2027,21,8,202702),('2027-02-22',202708,2,2027,22,8,202702),('2027-02-23',202708,2,2027,23,8,202702),('2027-02-24',202708,2,2027,24,8,202702),('2027-02-25',202708,2,2027,25,8,202702),('2027-02-26',202708,2,2027,26,8,202702),('2027-02-27',202708,2,2027,27,8,202702),('2027-02-28',202709,2,2027,28,9,202702),('2027-03-01',202709,3,2027,1,9,202703),('2027-03-02',202709,3,2027,2,9,202703),('2027-03-03',202709,3,2027,3,9,202703),('2027-03-04',202709,3,2027,4,9,202703),('2027-03-05',202709,3,2027,5,9,202703),('2027-03-06',202709,3,2027,6,9,202703),('2027-03-07',202710,3,2027,7,10,202703),('2027-03-08',202710,3,2027,8,10,202703),('2027-03-09',202710,3,2027,9,10,202703),('2027-03-10',202710,3,2027,10,10,202703),('2027-03-11',202710,3,2027,11,10,202703),('2027-03-12',202710,3,2027,12,10,202703),('2027-03-13',202710,3,2027,13,10,202703),('2027-03-14',202711,3,2027,14,11,202703),('2027-03-15',202711,3,2027,15,11,202703),('2027-03-16',202711,3,2027,16,11,202703),('2027-03-17',202711,3,2027,17,11,202703),('2027-03-18',202711,3,2027,18,11,202703),('2027-03-19',202711,3,2027,19,11,202703),('2027-03-20',202711,3,2027,20,11,202703),('2027-03-21',202712,3,2027,21,12,202703),('2027-03-22',202712,3,2027,22,12,202703),('2027-03-23',202712,3,2027,23,12,202703),('2027-03-24',202712,3,2027,24,12,202703),('2027-03-25',202712,3,2027,25,12,202703),('2027-03-26',202712,3,2027,26,12,202703),('2027-03-27',202712,3,2027,27,12,202703),('2027-03-28',202713,3,2027,28,13,202703),('2027-03-29',202713,3,2027,29,13,202703),('2027-03-30',202713,3,2027,30,13,202703),('2027-03-31',202713,3,2027,31,13,202703),('2027-04-01',202713,4,2027,1,13,202704),('2027-04-02',202713,4,2027,2,13,202704),('2027-04-03',202713,4,2027,3,13,202704),('2027-04-04',202714,4,2027,4,14,202704),('2027-04-05',202714,4,2027,5,14,202704),('2027-04-06',202714,4,2027,6,14,202704),('2027-04-07',202714,4,2027,7,14,202704),('2027-04-08',202714,4,2027,8,14,202704),('2027-04-09',202714,4,2027,9,14,202704),('2027-04-10',202714,4,2027,10,14,202704),('2027-04-11',202715,4,2027,11,15,202704),('2027-04-12',202715,4,2027,12,15,202704),('2027-04-13',202715,4,2027,13,15,202704),('2027-04-14',202715,4,2027,14,15,202704),('2027-04-15',202715,4,2027,15,15,202704),('2027-04-16',202715,4,2027,16,15,202704),('2027-04-17',202715,4,2027,17,15,202704),('2027-04-18',202716,4,2027,18,16,202704),('2027-04-19',202716,4,2027,19,16,202704),('2027-04-20',202716,4,2027,20,16,202704),('2027-04-21',202716,4,2027,21,16,202704),('2027-04-22',202716,4,2027,22,16,202704),('2027-04-23',202716,4,2027,23,16,202704),('2027-04-24',202716,4,2027,24,16,202704),('2027-04-25',202717,4,2027,25,17,202704),('2027-04-26',202717,4,2027,26,17,202704),('2027-04-27',202717,4,2027,27,17,202704),('2027-04-28',202717,4,2027,28,17,202704),('2027-04-29',202717,4,2027,29,17,202704),('2027-04-30',202717,4,2027,30,17,202704),('2027-05-01',202717,5,2027,1,17,202705),('2027-05-02',202718,5,2027,2,18,202705),('2027-05-03',202718,5,2027,3,18,202705),('2027-05-04',202718,5,2027,4,18,202705),('2027-05-05',202718,5,2027,5,18,202705),('2027-05-06',202718,5,2027,6,18,202705),('2027-05-07',202718,5,2027,7,18,202705),('2027-05-08',202718,5,2027,8,18,202705),('2027-05-09',202719,5,2027,9,19,202705),('2027-05-10',202719,5,2027,10,19,202705),('2027-05-11',202719,5,2027,11,19,202705),('2027-05-12',202719,5,2027,12,19,202705),('2027-05-13',202719,5,2027,13,19,202705),('2027-05-14',202719,5,2027,14,19,202705),('2027-05-15',202719,5,2027,15,19,202705),('2027-05-16',202720,5,2027,16,20,202705),('2027-05-17',202720,5,2027,17,20,202705),('2027-05-18',202720,5,2027,18,20,202705),('2027-05-19',202720,5,2027,19,20,202705),('2027-05-20',202720,5,2027,20,20,202705),('2027-05-21',202720,5,2027,21,20,202705),('2027-05-22',202720,5,2027,22,20,202705),('2027-05-23',202721,5,2027,23,21,202705),('2027-05-24',202721,5,2027,24,21,202705),('2027-05-25',202721,5,2027,25,21,202705),('2027-05-26',202721,5,2027,26,21,202705),('2027-05-27',202721,5,2027,27,21,202705),('2027-05-28',202721,5,2027,28,21,202705),('2027-05-29',202721,5,2027,29,21,202705),('2027-05-30',202722,5,2027,30,22,202705),('2027-05-31',202722,5,2027,31,22,202705),('2027-06-01',202722,6,2027,1,22,202706),('2027-06-02',202722,6,2027,2,22,202706),('2027-06-03',202722,6,2027,3,22,202706),('2027-06-04',202722,6,2027,4,22,202706),('2027-06-05',202722,6,2027,5,22,202706),('2027-06-06',202723,6,2027,6,23,202706),('2027-06-07',202723,6,2027,7,23,202706),('2027-06-08',202723,6,2027,8,23,202706),('2027-06-09',202723,6,2027,9,23,202706),('2027-06-10',202723,6,2027,10,23,202706),('2027-06-11',202723,6,2027,11,23,202706),('2027-06-12',202723,6,2027,12,23,202706),('2027-06-13',202724,6,2027,13,24,202706),('2027-06-14',202724,6,2027,14,24,202706),('2027-06-15',202724,6,2027,15,24,202706),('2027-06-16',202724,6,2027,16,24,202706),('2027-06-17',202724,6,2027,17,24,202706),('2027-06-18',202724,6,2027,18,24,202706),('2027-06-19',202724,6,2027,19,24,202706),('2027-06-20',202725,6,2027,20,25,202706),('2027-06-21',202725,6,2027,21,25,202706),('2027-06-22',202725,6,2027,22,25,202706),('2027-06-23',202725,6,2027,23,25,202706),('2027-06-24',202725,6,2027,24,25,202706),('2027-06-25',202725,6,2027,25,25,202706),('2027-06-26',202725,6,2027,26,25,202706),('2027-06-27',202726,6,2027,27,26,202706),('2027-06-28',202726,6,2027,28,26,202706),('2027-06-29',202726,6,2027,29,26,202706),('2027-06-30',202726,6,2027,30,26,202706),('2027-07-01',202726,7,2027,1,26,202707),('2027-07-02',202726,7,2027,2,26,202707),('2027-07-03',202726,7,2027,3,26,202707),('2027-07-04',202727,7,2027,4,27,202707),('2027-07-05',202727,7,2027,5,27,202707),('2027-07-06',202727,7,2027,6,27,202707),('2027-07-07',202727,7,2027,7,27,202707),('2027-07-08',202727,7,2027,8,27,202707),('2027-07-09',202727,7,2027,9,27,202707),('2027-07-10',202727,7,2027,10,27,202707),('2027-07-11',202728,7,2027,11,28,202707),('2027-07-12',202728,7,2027,12,28,202707),('2027-07-13',202728,7,2027,13,28,202707),('2027-07-14',202728,7,2027,14,28,202707),('2027-07-15',202728,7,2027,15,28,202707),('2027-07-16',202728,7,2027,16,28,202707),('2027-07-17',202728,7,2027,17,28,202707),('2027-07-18',202729,7,2027,18,29,202707),('2027-07-19',202729,7,2027,19,29,202707),('2027-07-20',202729,7,2027,20,29,202707),('2027-07-21',202729,7,2027,21,29,202707),('2027-07-22',202729,7,2027,22,29,202707),('2027-07-23',202729,7,2027,23,29,202707),('2027-07-24',202729,7,2027,24,29,202707),('2027-07-25',202730,7,2027,25,30,202707),('2027-07-26',202730,7,2027,26,30,202707),('2027-07-27',202730,7,2027,27,30,202707),('2027-07-28',202730,7,2027,28,30,202707),('2027-07-29',202730,7,2027,29,30,202707),('2027-07-30',202730,7,2027,30,30,202707),('2027-07-31',202730,7,2027,31,30,202707),('2027-08-01',202731,8,2027,1,31,202708),('2027-08-02',202731,8,2027,2,31,202708),('2027-08-03',202731,8,2027,3,31,202708),('2027-08-04',202731,8,2027,4,31,202708),('2027-08-05',202731,8,2027,5,31,202708),('2027-08-06',202731,8,2027,6,31,202708),('2027-08-07',202731,8,2027,7,31,202708),('2027-08-08',202732,8,2027,8,32,202708),('2027-08-09',202732,8,2027,9,32,202708),('2027-08-10',202732,8,2027,10,32,202708),('2027-08-11',202732,8,2027,11,32,202708),('2027-08-12',202732,8,2027,12,32,202708),('2027-08-13',202732,8,2027,13,32,202708),('2027-08-14',202732,8,2027,14,32,202708),('2027-08-15',202733,8,2027,15,33,202708),('2027-08-16',202733,8,2027,16,33,202708),('2027-08-17',202733,8,2027,17,33,202708),('2027-08-18',202733,8,2027,18,33,202708),('2027-08-19',202733,8,2027,19,33,202708),('2027-08-20',202733,8,2027,20,33,202708),('2027-08-21',202733,8,2027,21,33,202708),('2027-08-22',202734,8,2027,22,34,202708),('2027-08-23',202734,8,2027,23,34,202708),('2027-08-24',202734,8,2027,24,34,202708),('2027-08-25',202734,8,2027,25,34,202708),('2027-08-26',202734,8,2027,26,34,202708),('2027-08-27',202734,8,2027,27,34,202708),('2027-08-28',202734,8,2027,28,34,202708),('2027-08-29',202735,8,2027,29,35,202708),('2027-08-30',202735,8,2027,30,35,202708),('2027-08-31',202735,8,2027,31,35,202708),('2027-09-01',202735,9,2027,1,35,202709),('2027-09-02',202735,9,2027,2,35,202709),('2027-09-03',202735,9,2027,3,35,202709),('2027-09-04',202735,9,2027,4,35,202709),('2027-09-05',202736,9,2027,5,36,202709),('2027-09-06',202736,9,2027,6,36,202709),('2027-09-07',202736,9,2027,7,36,202709),('2027-09-08',202736,9,2027,8,36,202709),('2027-09-09',202736,9,2027,9,36,202709),('2027-09-10',202736,9,2027,10,36,202709),('2027-09-11',202736,9,2027,11,36,202709),('2027-09-12',202737,9,2027,12,37,202709),('2027-09-13',202737,9,2027,13,37,202709),('2027-09-14',202737,9,2027,14,37,202709),('2027-09-15',202737,9,2027,15,37,202709),('2027-09-16',202737,9,2027,16,37,202709),('2027-09-17',202737,9,2027,17,37,202709),('2027-09-18',202737,9,2027,18,37,202709),('2027-09-19',202738,9,2027,19,38,202709),('2027-09-20',202738,9,2027,20,38,202709),('2027-09-21',202738,9,2027,21,38,202709),('2027-09-22',202738,9,2027,22,38,202709),('2027-09-23',202738,9,2027,23,38,202709),('2027-09-24',202738,9,2027,24,38,202709),('2027-09-25',202738,9,2027,25,38,202709),('2027-09-26',202739,9,2027,26,39,202709),('2027-09-27',202739,9,2027,27,39,202709),('2027-09-28',202739,9,2027,28,39,202709),('2027-09-29',202739,9,2027,29,39,202709),('2027-09-30',202739,9,2027,30,39,202709),('2027-10-01',202739,10,2027,1,39,202710),('2027-10-02',202739,10,2027,2,39,202710),('2027-10-03',202740,10,2027,3,40,202710),('2027-10-04',202740,10,2027,4,40,202710),('2027-10-05',202740,10,2027,5,40,202710),('2027-10-06',202740,10,2027,6,40,202710),('2027-10-07',202740,10,2027,7,40,202710),('2027-10-08',202740,10,2027,8,40,202710),('2027-10-09',202740,10,2027,9,40,202710),('2027-10-10',202741,10,2027,10,41,202710),('2027-10-11',202741,10,2027,11,41,202710),('2027-10-12',202741,10,2027,12,41,202710),('2027-10-13',202741,10,2027,13,41,202710),('2027-10-14',202741,10,2027,14,41,202710),('2027-10-15',202741,10,2027,15,41,202710),('2027-10-16',202741,10,2027,16,41,202710),('2027-10-17',202742,10,2027,17,42,202710),('2027-10-18',202742,10,2027,18,42,202710),('2027-10-19',202742,10,2027,19,42,202710),('2027-10-20',202742,10,2027,20,42,202710),('2027-10-21',202742,10,2027,21,42,202710),('2027-10-22',202742,10,2027,22,42,202710),('2027-10-23',202742,10,2027,23,42,202710),('2027-10-24',202743,10,2027,24,43,202710),('2027-10-25',202743,10,2027,25,43,202710),('2027-10-26',202743,10,2027,26,43,202710),('2027-10-27',202743,10,2027,27,43,202710),('2027-10-28',202743,10,2027,28,43,202710),('2027-10-29',202743,10,2027,29,43,202710),('2027-10-30',202743,10,2027,30,43,202710),('2027-10-31',202744,10,2027,31,44,202710),('2027-11-01',202744,11,2027,1,44,202711),('2027-11-02',202744,11,2027,2,44,202711),('2027-11-03',202744,11,2027,3,44,202711),('2027-11-04',202744,11,2027,4,44,202711),('2027-11-05',202744,11,2027,5,44,202711),('2027-11-06',202744,11,2027,6,44,202711),('2027-11-07',202745,11,2027,7,45,202711),('2027-11-08',202745,11,2027,8,45,202711),('2027-11-09',202745,11,2027,9,45,202711),('2027-11-10',202745,11,2027,10,45,202711),('2027-11-11',202745,11,2027,11,45,202711),('2027-11-12',202745,11,2027,12,45,202711),('2027-11-13',202745,11,2027,13,45,202711),('2027-11-14',202746,11,2027,14,46,202711),('2027-11-15',202746,11,2027,15,46,202711),('2027-11-16',202746,11,2027,16,46,202711),('2027-11-17',202746,11,2027,17,46,202711),('2027-11-18',202746,11,2027,18,46,202711),('2027-11-19',202746,11,2027,19,46,202711),('2027-11-20',202746,11,2027,20,46,202711),('2027-11-21',202747,11,2027,21,47,202711),('2027-11-22',202747,11,2027,22,47,202711),('2027-11-23',202747,11,2027,23,47,202711),('2027-11-24',202747,11,2027,24,47,202711),('2027-11-25',202747,11,2027,25,47,202711),('2027-11-26',202747,11,2027,26,47,202711),('2027-11-27',202747,11,2027,27,47,202711),('2027-11-28',202748,11,2027,28,48,202711),('2027-11-29',202748,11,2027,29,48,202711),('2027-11-30',202748,11,2027,30,48,202711),('2027-12-01',202748,12,2027,1,48,202712),('2027-12-02',202748,12,2027,2,48,202712),('2027-12-03',202748,12,2027,3,48,202712),('2027-12-04',202748,12,2027,4,48,202712),('2027-12-05',202749,12,2027,5,49,202712),('2027-12-06',202749,12,2027,6,49,202712),('2027-12-07',202749,12,2027,7,49,202712),('2027-12-08',202749,12,2027,8,49,202712),('2027-12-09',202749,12,2027,9,49,202712),('2027-12-10',202749,12,2027,10,49,202712),('2027-12-11',202749,12,2027,11,49,202712),('2027-12-12',202750,12,2027,12,50,202712),('2027-12-13',202750,12,2027,13,50,202712),('2027-12-14',202750,12,2027,14,50,202712),('2027-12-15',202750,12,2027,15,50,202712),('2027-12-16',202750,12,2027,16,50,202712),('2027-12-17',202750,12,2027,17,50,202712),('2027-12-18',202750,12,2027,18,50,202712),('2027-12-19',202751,12,2027,19,51,202712),('2027-12-20',202751,12,2027,20,51,202712),('2027-12-21',202751,12,2027,21,51,202712),('2027-12-22',202751,12,2027,22,51,202712),('2027-12-23',202751,12,2027,23,51,202712),('2027-12-24',202751,12,2027,24,51,202712),('2027-12-25',202751,12,2027,25,51,202712),('2027-12-26',202752,12,2027,26,52,202712),('2027-12-27',202752,12,2027,27,52,202712),('2027-12-28',202752,12,2027,28,52,202712),('2027-12-29',202752,12,2027,29,52,202712),('2027-12-30',202752,12,2027,30,52,202712),('2027-12-31',202752,12,2027,31,52,202712),('2028-01-01',202852,1,2028,1,52,202801),('2028-01-02',202853,1,2028,2,1,202801),('2028-01-03',202801,1,2028,3,1,202801),('2028-01-04',202801,1,2028,4,1,202801),('2028-01-05',202801,1,2028,5,1,202801),('2028-01-06',202801,1,2028,6,1,202801),('2028-01-07',202801,1,2028,7,1,202801),('2028-01-08',202801,1,2028,8,1,202801),('2028-01-09',202802,1,2028,9,2,202801),('2028-01-10',202802,1,2028,10,2,202801),('2028-01-11',202802,1,2028,11,2,202801),('2028-01-12',202802,1,2028,12,2,202801),('2028-01-13',202802,1,2028,13,2,202801),('2028-01-14',202802,1,2028,14,2,202801),('2028-01-15',202802,1,2028,15,2,202801),('2028-01-16',202803,1,2028,16,3,202801),('2028-01-17',202803,1,2028,17,3,202801),('2028-01-18',202803,1,2028,18,3,202801),('2028-01-19',202803,1,2028,19,3,202801),('2028-01-20',202803,1,2028,20,3,202801),('2028-01-21',202803,1,2028,21,3,202801),('2028-01-22',202803,1,2028,22,3,202801),('2028-01-23',202804,1,2028,23,4,202801),('2028-01-24',202804,1,2028,24,4,202801),('2028-01-25',202804,1,2028,25,4,202801),('2028-01-26',202804,1,2028,26,4,202801),('2028-01-27',202804,1,2028,27,4,202801),('2028-01-28',202804,1,2028,28,4,202801),('2028-01-29',202804,1,2028,29,4,202801),('2028-01-30',202805,1,2028,30,5,202801),('2028-01-31',202805,1,2028,31,5,202801),('2028-02-01',202805,2,2028,1,5,202802),('2028-02-02',202805,2,2028,2,5,202802),('2028-02-03',202805,2,2028,3,5,202802),('2028-02-04',202805,2,2028,4,5,202802),('2028-02-05',202805,2,2028,5,5,202802),('2028-02-06',202806,2,2028,6,6,202802),('2028-02-07',202806,2,2028,7,6,202802),('2028-02-08',202806,2,2028,8,6,202802),('2028-02-09',202806,2,2028,9,6,202802),('2028-02-10',202806,2,2028,10,6,202802),('2028-02-11',202806,2,2028,11,6,202802),('2028-02-12',202806,2,2028,12,6,202802),('2028-02-13',202807,2,2028,13,7,202802),('2028-02-14',202807,2,2028,14,7,202802),('2028-02-15',202807,2,2028,15,7,202802),('2028-02-16',202807,2,2028,16,7,202802),('2028-02-17',202807,2,2028,17,7,202802),('2028-02-18',202807,2,2028,18,7,202802),('2028-02-19',202807,2,2028,19,7,202802),('2028-02-20',202808,2,2028,20,8,202802),('2028-02-21',202808,2,2028,21,8,202802),('2028-02-22',202808,2,2028,22,8,202802),('2028-02-23',202808,2,2028,23,8,202802),('2028-02-24',202808,2,2028,24,8,202802),('2028-02-25',202808,2,2028,25,8,202802),('2028-02-26',202808,2,2028,26,8,202802),('2028-02-27',202809,2,2028,27,9,202802),('2028-02-28',202809,2,2028,28,9,202802),('2028-02-29',202809,2,2028,29,9,202802),('2028-03-01',202809,3,2028,1,9,202803),('2028-03-02',202809,3,2028,2,9,202803),('2028-03-03',202809,3,2028,3,9,202803),('2028-03-04',202809,3,2028,4,9,202803),('2028-03-05',202810,3,2028,5,10,202803),('2028-03-06',202810,3,2028,6,10,202803),('2028-03-07',202810,3,2028,7,10,202803),('2028-03-08',202810,3,2028,8,10,202803),('2028-03-09',202810,3,2028,9,10,202803),('2028-03-10',202810,3,2028,10,10,202803),('2028-03-11',202810,3,2028,11,10,202803),('2028-03-12',202811,3,2028,12,11,202803),('2028-03-13',202811,3,2028,13,11,202803),('2028-03-14',202811,3,2028,14,11,202803),('2028-03-15',202811,3,2028,15,11,202803),('2028-03-16',202811,3,2028,16,11,202803),('2028-03-17',202811,3,2028,17,11,202803),('2028-03-18',202811,3,2028,18,11,202803),('2028-03-19',202812,3,2028,19,12,202803),('2028-03-20',202812,3,2028,20,12,202803),('2028-03-21',202812,3,2028,21,12,202803),('2028-03-22',202812,3,2028,22,12,202803),('2028-03-23',202812,3,2028,23,12,202803),('2028-03-24',202812,3,2028,24,12,202803),('2028-03-25',202812,3,2028,25,12,202803),('2028-03-26',202813,3,2028,26,13,202803),('2028-03-27',202813,3,2028,27,13,202803),('2028-03-28',202813,3,2028,28,13,202803),('2028-03-29',202813,3,2028,29,13,202803),('2028-03-30',202813,3,2028,30,13,202803),('2028-03-31',202813,3,2028,31,13,202803),('2028-04-01',202813,4,2028,1,13,202804),('2028-04-02',202814,4,2028,2,14,202804),('2028-04-03',202814,4,2028,3,14,202804),('2028-04-04',202814,4,2028,4,14,202804),('2028-04-05',202814,4,2028,5,14,202804),('2028-04-06',202814,4,2028,6,14,202804),('2028-04-07',202814,4,2028,7,14,202804),('2028-04-08',202814,4,2028,8,14,202804),('2028-04-09',202815,4,2028,9,15,202804),('2028-04-10',202815,4,2028,10,15,202804),('2028-04-11',202815,4,2028,11,15,202804),('2028-04-12',202815,4,2028,12,15,202804),('2028-04-13',202815,4,2028,13,15,202804),('2028-04-14',202815,4,2028,14,15,202804),('2028-04-15',202815,4,2028,15,15,202804),('2028-04-16',202816,4,2028,16,16,202804),('2028-04-17',202816,4,2028,17,16,202804),('2028-04-18',202816,4,2028,18,16,202804),('2028-04-19',202816,4,2028,19,16,202804),('2028-04-20',202816,4,2028,20,16,202804),('2028-04-21',202816,4,2028,21,16,202804),('2028-04-22',202816,4,2028,22,16,202804),('2028-04-23',202817,4,2028,23,17,202804),('2028-04-24',202817,4,2028,24,17,202804),('2028-04-25',202817,4,2028,25,17,202804),('2028-04-26',202817,4,2028,26,17,202804),('2028-04-27',202817,4,2028,27,17,202804),('2028-04-28',202817,4,2028,28,17,202804),('2028-04-29',202817,4,2028,29,17,202804),('2028-04-30',202818,4,2028,30,18,202804),('2028-05-01',202818,5,2028,1,18,202805),('2028-05-02',202818,5,2028,2,18,202805),('2028-05-03',202818,5,2028,3,18,202805),('2028-05-04',202818,5,2028,4,18,202805),('2028-05-05',202818,5,2028,5,18,202805),('2028-05-06',202818,5,2028,6,18,202805),('2028-05-07',202819,5,2028,7,19,202805),('2028-05-08',202819,5,2028,8,19,202805),('2028-05-09',202819,5,2028,9,19,202805),('2028-05-10',202819,5,2028,10,19,202805),('2028-05-11',202819,5,2028,11,19,202805),('2028-05-12',202819,5,2028,12,19,202805),('2028-05-13',202819,5,2028,13,19,202805),('2028-05-14',202820,5,2028,14,20,202805),('2028-05-15',202820,5,2028,15,20,202805),('2028-05-16',202820,5,2028,16,20,202805),('2028-05-17',202820,5,2028,17,20,202805),('2028-05-18',202820,5,2028,18,20,202805),('2028-05-19',202820,5,2028,19,20,202805),('2028-05-20',202820,5,2028,20,20,202805),('2028-05-21',202821,5,2028,21,21,202805),('2028-05-22',202821,5,2028,22,21,202805),('2028-05-23',202821,5,2028,23,21,202805),('2028-05-24',202821,5,2028,24,21,202805),('2028-05-25',202821,5,2028,25,21,202805),('2028-05-26',202821,5,2028,26,21,202805),('2028-05-27',202821,5,2028,27,21,202805),('2028-05-28',202822,5,2028,28,22,202805),('2028-05-29',202822,5,2028,29,22,202805),('2028-05-30',202822,5,2028,30,22,202805),('2028-05-31',202822,5,2028,31,22,202805),('2028-06-01',202822,6,2028,1,22,202806),('2028-06-02',202822,6,2028,2,22,202806),('2028-06-03',202822,6,2028,3,22,202806),('2028-06-04',202823,6,2028,4,23,202806),('2028-06-05',202823,6,2028,5,23,202806),('2028-06-06',202823,6,2028,6,23,202806),('2028-06-07',202823,6,2028,7,23,202806),('2028-06-08',202823,6,2028,8,23,202806),('2028-06-09',202823,6,2028,9,23,202806),('2028-06-10',202823,6,2028,10,23,202806),('2028-06-11',202824,6,2028,11,24,202806),('2028-06-12',202824,6,2028,12,24,202806),('2028-06-13',202824,6,2028,13,24,202806),('2028-06-14',202824,6,2028,14,24,202806),('2028-06-15',202824,6,2028,15,24,202806),('2028-06-16',202824,6,2028,16,24,202806),('2028-06-17',202824,6,2028,17,24,202806),('2028-06-18',202825,6,2028,18,25,202806),('2028-06-19',202825,6,2028,19,25,202806),('2028-06-20',202825,6,2028,20,25,202806),('2028-06-21',202825,6,2028,21,25,202806),('2028-06-22',202825,6,2028,22,25,202806),('2028-06-23',202825,6,2028,23,25,202806),('2028-06-24',202825,6,2028,24,25,202806),('2028-06-25',202826,6,2028,25,26,202806),('2028-06-26',202826,6,2028,26,26,202806),('2028-06-27',202826,6,2028,27,26,202806),('2028-06-28',202826,6,2028,28,26,202806),('2028-06-29',202826,6,2028,29,26,202806),('2028-06-30',202826,6,2028,30,26,202806),('2028-07-01',202826,7,2028,1,26,202807),('2028-07-02',202827,7,2028,2,27,202807),('2028-07-03',202827,7,2028,3,27,202807),('2028-07-04',202827,7,2028,4,27,202807),('2028-07-05',202827,7,2028,5,27,202807),('2028-07-06',202827,7,2028,6,27,202807),('2028-07-07',202827,7,2028,7,27,202807),('2028-07-08',202827,7,2028,8,27,202807),('2028-07-09',202828,7,2028,9,28,202807),('2028-07-10',202828,7,2028,10,28,202807),('2028-07-11',202828,7,2028,11,28,202807),('2028-07-12',202828,7,2028,12,28,202807),('2028-07-13',202828,7,2028,13,28,202807),('2028-07-14',202828,7,2028,14,28,202807),('2028-07-15',202828,7,2028,15,28,202807),('2028-07-16',202829,7,2028,16,29,202807),('2028-07-17',202829,7,2028,17,29,202807),('2028-07-18',202829,7,2028,18,29,202807),('2028-07-19',202829,7,2028,19,29,202807),('2028-07-20',202829,7,2028,20,29,202807),('2028-07-21',202829,7,2028,21,29,202807),('2028-07-22',202829,7,2028,22,29,202807),('2028-07-23',202830,7,2028,23,30,202807),('2028-07-24',202830,7,2028,24,30,202807),('2028-07-25',202830,7,2028,25,30,202807),('2028-07-26',202830,7,2028,26,30,202807),('2028-07-27',202830,7,2028,27,30,202807),('2028-07-28',202830,7,2028,28,30,202807),('2028-07-29',202830,7,2028,29,30,202807),('2028-07-30',202831,7,2028,30,31,202807),('2028-07-31',202831,7,2028,31,31,202807),('2028-08-01',202831,8,2028,1,31,202808),('2028-08-02',202831,8,2028,2,31,202808),('2028-08-03',202831,8,2028,3,31,202808),('2028-08-04',202831,8,2028,4,31,202808),('2028-08-05',202831,8,2028,5,31,202808),('2028-08-06',202832,8,2028,6,32,202808),('2028-08-07',202832,8,2028,7,32,202808),('2028-08-08',202832,8,2028,8,32,202808),('2028-08-09',202832,8,2028,9,32,202808),('2028-08-10',202832,8,2028,10,32,202808),('2028-08-11',202832,8,2028,11,32,202808),('2028-08-12',202832,8,2028,12,32,202808),('2028-08-13',202833,8,2028,13,33,202808),('2028-08-14',202833,8,2028,14,33,202808),('2028-08-15',202833,8,2028,15,33,202808),('2028-08-16',202833,8,2028,16,33,202808),('2028-08-17',202833,8,2028,17,33,202808),('2028-08-18',202833,8,2028,18,33,202808),('2028-08-19',202833,8,2028,19,33,202808),('2028-08-20',202834,8,2028,20,34,202808),('2028-08-21',202834,8,2028,21,34,202808),('2028-08-22',202834,8,2028,22,34,202808),('2028-08-23',202834,8,2028,23,34,202808),('2028-08-24',202834,8,2028,24,34,202808),('2028-08-25',202834,8,2028,25,34,202808),('2028-08-26',202834,8,2028,26,34,202808),('2028-08-27',202835,8,2028,27,35,202808),('2028-08-28',202835,8,2028,28,35,202808),('2028-08-29',202835,8,2028,29,35,202808),('2028-08-30',202835,8,2028,30,35,202808),('2028-08-31',202835,8,2028,31,35,202808),('2028-09-01',202835,9,2028,1,35,202809),('2028-09-02',202835,9,2028,2,35,202809),('2028-09-03',202836,9,2028,3,36,202809),('2028-09-04',202836,9,2028,4,36,202809),('2028-09-05',202836,9,2028,5,36,202809),('2028-09-06',202836,9,2028,6,36,202809),('2028-09-07',202836,9,2028,7,36,202809),('2028-09-08',202836,9,2028,8,36,202809),('2028-09-09',202836,9,2028,9,36,202809),('2028-09-10',202837,9,2028,10,37,202809),('2028-09-11',202837,9,2028,11,37,202809),('2028-09-12',202837,9,2028,12,37,202809),('2028-09-13',202837,9,2028,13,37,202809),('2028-09-14',202837,9,2028,14,37,202809),('2028-09-15',202837,9,2028,15,37,202809),('2028-09-16',202837,9,2028,16,37,202809),('2028-09-17',202838,9,2028,17,38,202809),('2028-09-18',202838,9,2028,18,38,202809),('2028-09-19',202838,9,2028,19,38,202809),('2028-09-20',202838,9,2028,20,38,202809),('2028-09-21',202838,9,2028,21,38,202809),('2028-09-22',202838,9,2028,22,38,202809),('2028-09-23',202838,9,2028,23,38,202809),('2028-09-24',202839,9,2028,24,39,202809),('2028-09-25',202839,9,2028,25,39,202809),('2028-09-26',202839,9,2028,26,39,202809),('2028-09-27',202839,9,2028,27,39,202809),('2028-09-28',202839,9,2028,28,39,202809),('2028-09-29',202839,9,2028,29,39,202809),('2028-09-30',202839,9,2028,30,39,202809),('2028-10-01',202840,10,2028,1,40,202810),('2028-10-02',202840,10,2028,2,40,202810),('2028-10-03',202840,10,2028,3,40,202810),('2028-10-04',202840,10,2028,4,40,202810),('2028-10-05',202840,10,2028,5,40,202810),('2028-10-06',202840,10,2028,6,40,202810),('2028-10-07',202840,10,2028,7,40,202810),('2028-10-08',202841,10,2028,8,41,202810),('2028-10-09',202841,10,2028,9,41,202810),('2028-10-10',202841,10,2028,10,41,202810),('2028-10-11',202841,10,2028,11,41,202810),('2028-10-12',202841,10,2028,12,41,202810),('2028-10-13',202841,10,2028,13,41,202810),('2028-10-14',202841,10,2028,14,41,202810),('2028-10-15',202842,10,2028,15,42,202810),('2028-10-16',202842,10,2028,16,42,202810),('2028-10-17',202842,10,2028,17,42,202810),('2028-10-18',202842,10,2028,18,42,202810),('2028-10-19',202842,10,2028,19,42,202810),('2028-10-20',202842,10,2028,20,42,202810),('2028-10-21',202842,10,2028,21,42,202810),('2028-10-22',202843,10,2028,22,43,202810),('2028-10-23',202843,10,2028,23,43,202810),('2028-10-24',202843,10,2028,24,43,202810),('2028-10-25',202843,10,2028,25,43,202810),('2028-10-26',202843,10,2028,26,43,202810),('2028-10-27',202843,10,2028,27,43,202810),('2028-10-28',202843,10,2028,28,43,202810),('2028-10-29',202844,10,2028,29,44,202810),('2028-10-30',202844,10,2028,30,44,202810),('2028-10-31',202844,10,2028,31,44,202810),('2028-11-01',202844,11,2028,1,44,202811),('2028-11-02',202844,11,2028,2,44,202811),('2028-11-03',202844,11,2028,3,44,202811),('2028-11-04',202844,11,2028,4,44,202811),('2028-11-05',202845,11,2028,5,45,202811),('2028-11-06',202845,11,2028,6,45,202811),('2028-11-07',202845,11,2028,7,45,202811),('2028-11-08',202845,11,2028,8,45,202811),('2028-11-09',202845,11,2028,9,45,202811),('2028-11-10',202845,11,2028,10,45,202811),('2028-11-11',202845,11,2028,11,45,202811),('2028-11-12',202846,11,2028,12,46,202811),('2028-11-13',202846,11,2028,13,46,202811),('2028-11-14',202846,11,2028,14,46,202811),('2028-11-15',202846,11,2028,15,46,202811),('2028-11-16',202846,11,2028,16,46,202811),('2028-11-17',202846,11,2028,17,46,202811),('2028-11-18',202846,11,2028,18,46,202811),('2028-11-19',202847,11,2028,19,47,202811),('2028-11-20',202847,11,2028,20,47,202811),('2028-11-21',202847,11,2028,21,47,202811),('2028-11-22',202847,11,2028,22,47,202811),('2028-11-23',202847,11,2028,23,47,202811),('2028-11-24',202847,11,2028,24,47,202811),('2028-11-25',202847,11,2028,25,47,202811),('2028-11-26',202848,11,2028,26,48,202811),('2028-11-27',202848,11,2028,27,48,202811),('2028-11-28',202848,11,2028,28,48,202811),('2028-11-29',202848,11,2028,29,48,202811),('2028-11-30',202848,11,2028,30,48,202811),('2028-12-01',202848,12,2028,1,48,202812),('2028-12-02',202848,12,2028,2,48,202812),('2028-12-03',202849,12,2028,3,49,202812),('2028-12-04',202849,12,2028,4,49,202812),('2028-12-05',202849,12,2028,5,49,202812),('2028-12-06',202849,12,2028,6,49,202812),('2028-12-07',202849,12,2028,7,49,202812),('2028-12-08',202849,12,2028,8,49,202812),('2028-12-09',202849,12,2028,9,49,202812),('2028-12-10',202850,12,2028,10,50,202812),('2028-12-11',202850,12,2028,11,50,202812),('2028-12-12',202850,12,2028,12,50,202812),('2028-12-13',202850,12,2028,13,50,202812),('2028-12-14',202850,12,2028,14,50,202812),('2028-12-15',202850,12,2028,15,50,202812),('2028-12-16',202850,12,2028,16,50,202812),('2028-12-17',202851,12,2028,17,51,202812),('2028-12-18',202851,12,2028,18,51,202812),('2028-12-19',202851,12,2028,19,51,202812),('2028-12-20',202851,12,2028,20,51,202812),('2028-12-21',202851,12,2028,21,51,202812),('2028-12-22',202851,12,2028,22,51,202812),('2028-12-23',202851,12,2028,23,51,202812),('2028-12-24',202852,12,2028,24,52,202812),('2028-12-25',202852,12,2028,25,52,202812),('2028-12-26',202852,12,2028,26,52,202812),('2028-12-27',202852,12,2028,27,52,202812),('2028-12-28',202852,12,2028,28,52,202812),('2028-12-29',202852,12,2028,29,52,202812),('2028-12-30',202852,12,2028,30,52,202812),('2028-12-31',202853,12,2028,31,1,202812),('2029-01-01',202901,1,2029,1,1,202901),('2029-01-02',202901,1,2029,2,1,202901),('2029-01-03',202901,1,2029,3,1,202901),('2029-01-04',202901,1,2029,4,1,202901),('2029-01-05',202901,1,2029,5,1,202901),('2029-01-06',202901,1,2029,6,1,202901),('2029-01-07',202902,1,2029,7,2,202901),('2029-01-08',202902,1,2029,8,2,202901),('2029-01-09',202902,1,2029,9,2,202901),('2029-01-10',202902,1,2029,10,2,202901),('2029-01-11',202902,1,2029,11,2,202901),('2029-01-12',202902,1,2029,12,2,202901),('2029-01-13',202902,1,2029,13,2,202901),('2029-01-14',202903,1,2029,14,3,202901),('2029-01-15',202903,1,2029,15,3,202901),('2029-01-16',202903,1,2029,16,3,202901),('2029-01-17',202903,1,2029,17,3,202901),('2029-01-18',202903,1,2029,18,3,202901),('2029-01-19',202903,1,2029,19,3,202901),('2029-01-20',202903,1,2029,20,3,202901),('2029-01-21',202904,1,2029,21,4,202901),('2029-01-22',202904,1,2029,22,4,202901),('2029-01-23',202904,1,2029,23,4,202901),('2029-01-24',202904,1,2029,24,4,202901),('2029-01-25',202904,1,2029,25,4,202901),('2029-01-26',202904,1,2029,26,4,202901),('2029-01-27',202904,1,2029,27,4,202901),('2029-01-28',202905,1,2029,28,5,202901),('2029-01-29',202905,1,2029,29,5,202901),('2029-01-30',202905,1,2029,30,5,202901),('2029-01-31',202905,1,2029,31,5,202901),('2029-02-01',202905,2,2029,1,5,202902),('2029-02-02',202905,2,2029,2,5,202902),('2029-02-03',202905,2,2029,3,5,202902),('2029-02-04',202906,2,2029,4,6,202902),('2029-02-05',202906,2,2029,5,6,202902),('2029-02-06',202906,2,2029,6,6,202902),('2029-02-07',202906,2,2029,7,6,202902),('2029-02-08',202906,2,2029,8,6,202902),('2029-02-09',202906,2,2029,9,6,202902),('2029-02-10',202906,2,2029,10,6,202902),('2029-02-11',202907,2,2029,11,7,202902),('2029-02-12',202907,2,2029,12,7,202902),('2029-02-13',202907,2,2029,13,7,202902),('2029-02-14',202907,2,2029,14,7,202902),('2029-02-15',202907,2,2029,15,7,202902),('2029-02-16',202907,2,2029,16,7,202902),('2029-02-17',202907,2,2029,17,7,202902),('2029-02-18',202908,2,2029,18,8,202902),('2029-02-19',202908,2,2029,19,8,202902),('2029-02-20',202908,2,2029,20,8,202902),('2029-02-21',202908,2,2029,21,8,202902),('2029-02-22',202908,2,2029,22,8,202902),('2029-02-23',202908,2,2029,23,8,202902),('2029-02-24',202908,2,2029,24,8,202902),('2029-02-25',202909,2,2029,25,9,202902),('2029-02-26',202909,2,2029,26,9,202902),('2029-02-27',202909,2,2029,27,9,202902),('2029-02-28',202909,2,2029,28,9,202902),('2029-03-01',202909,3,2029,1,9,202903),('2029-03-02',202909,3,2029,2,9,202903),('2029-03-03',202909,3,2029,3,9,202903),('2029-03-04',202910,3,2029,4,10,202903),('2029-03-05',202910,3,2029,5,10,202903),('2029-03-06',202910,3,2029,6,10,202903),('2029-03-07',202910,3,2029,7,10,202903),('2029-03-08',202910,3,2029,8,10,202903),('2029-03-09',202910,3,2029,9,10,202903),('2029-03-10',202910,3,2029,10,10,202903),('2029-03-11',202911,3,2029,11,11,202903),('2029-03-12',202911,3,2029,12,11,202903),('2029-03-13',202911,3,2029,13,11,202903),('2029-03-14',202911,3,2029,14,11,202903),('2029-03-15',202911,3,2029,15,11,202903),('2029-03-16',202911,3,2029,16,11,202903),('2029-03-17',202911,3,2029,17,11,202903),('2029-03-18',202912,3,2029,18,12,202903),('2029-03-19',202912,3,2029,19,12,202903),('2029-03-20',202912,3,2029,20,12,202903),('2029-03-21',202912,3,2029,21,12,202903),('2029-03-22',202912,3,2029,22,12,202903),('2029-03-23',202912,3,2029,23,12,202903),('2029-03-24',202912,3,2029,24,12,202903),('2029-03-25',202913,3,2029,25,13,202903),('2029-03-26',202913,3,2029,26,13,202903),('2029-03-27',202913,3,2029,27,13,202903),('2029-03-28',202913,3,2029,28,13,202903),('2029-03-29',202913,3,2029,29,13,202903),('2029-03-30',202913,3,2029,30,13,202903),('2029-03-31',202913,3,2029,31,13,202903),('2029-04-01',202914,4,2029,1,14,202904),('2029-04-02',202914,4,2029,2,14,202904),('2029-04-03',202914,4,2029,3,14,202904),('2029-04-04',202914,4,2029,4,14,202904),('2029-04-05',202914,4,2029,5,14,202904),('2029-04-06',202914,4,2029,6,14,202904),('2029-04-07',202914,4,2029,7,14,202904),('2029-04-08',202915,4,2029,8,15,202904),('2029-04-09',202915,4,2029,9,15,202904),('2029-04-10',202915,4,2029,10,15,202904),('2029-04-11',202915,4,2029,11,15,202904),('2029-04-12',202915,4,2029,12,15,202904),('2029-04-13',202915,4,2029,13,15,202904),('2029-04-14',202915,4,2029,14,15,202904),('2029-04-15',202916,4,2029,15,16,202904),('2029-04-16',202916,4,2029,16,16,202904),('2029-04-17',202916,4,2029,17,16,202904),('2029-04-18',202916,4,2029,18,16,202904),('2029-04-19',202916,4,2029,19,16,202904),('2029-04-20',202916,4,2029,20,16,202904),('2029-04-21',202916,4,2029,21,16,202904),('2029-04-22',202917,4,2029,22,17,202904),('2029-04-23',202917,4,2029,23,17,202904),('2029-04-24',202917,4,2029,24,17,202904),('2029-04-25',202917,4,2029,25,17,202904),('2029-04-26',202917,4,2029,26,17,202904),('2029-04-27',202917,4,2029,27,17,202904),('2029-04-28',202917,4,2029,28,17,202904),('2029-04-29',202918,4,2029,29,18,202904),('2029-04-30',202918,4,2029,30,18,202904),('2029-05-01',202918,5,2029,1,18,202905),('2029-05-02',202918,5,2029,2,18,202905),('2029-05-03',202918,5,2029,3,18,202905),('2029-05-04',202918,5,2029,4,18,202905),('2029-05-05',202918,5,2029,5,18,202905),('2029-05-06',202919,5,2029,6,19,202905),('2029-05-07',202919,5,2029,7,19,202905),('2029-05-08',202919,5,2029,8,19,202905),('2029-05-09',202919,5,2029,9,19,202905),('2029-05-10',202919,5,2029,10,19,202905),('2029-05-11',202919,5,2029,11,19,202905),('2029-05-12',202919,5,2029,12,19,202905),('2029-05-13',202920,5,2029,13,20,202905),('2029-05-14',202920,5,2029,14,20,202905),('2029-05-15',202920,5,2029,15,20,202905),('2029-05-16',202920,5,2029,16,20,202905),('2029-05-17',202920,5,2029,17,20,202905),('2029-05-18',202920,5,2029,18,20,202905),('2029-05-19',202920,5,2029,19,20,202905),('2029-05-20',202921,5,2029,20,21,202905),('2029-05-21',202921,5,2029,21,21,202905),('2029-05-22',202921,5,2029,22,21,202905),('2029-05-23',202921,5,2029,23,21,202905),('2029-05-24',202921,5,2029,24,21,202905),('2029-05-25',202921,5,2029,25,21,202905),('2029-05-26',202921,5,2029,26,21,202905),('2029-05-27',202922,5,2029,27,22,202905),('2029-05-28',202922,5,2029,28,22,202905),('2029-05-29',202922,5,2029,29,22,202905),('2029-05-30',202922,5,2029,30,22,202905),('2029-05-31',202922,5,2029,31,22,202905),('2029-06-01',202922,6,2029,1,22,202906),('2029-06-02',202922,6,2029,2,22,202906),('2029-06-03',202923,6,2029,3,23,202906),('2029-06-04',202923,6,2029,4,23,202906),('2029-06-05',202923,6,2029,5,23,202906),('2029-06-06',202923,6,2029,6,23,202906),('2029-06-07',202923,6,2029,7,23,202906),('2029-06-08',202923,6,2029,8,23,202906),('2029-06-09',202923,6,2029,9,23,202906),('2029-06-10',202924,6,2029,10,24,202906),('2029-06-11',202924,6,2029,11,24,202906),('2029-06-12',202924,6,2029,12,24,202906),('2029-06-13',202924,6,2029,13,24,202906),('2029-06-14',202924,6,2029,14,24,202906),('2029-06-15',202924,6,2029,15,24,202906),('2029-06-16',202924,6,2029,16,24,202906),('2029-06-17',202925,6,2029,17,25,202906),('2029-06-18',202925,6,2029,18,25,202906),('2029-06-19',202925,6,2029,19,25,202906),('2029-06-20',202925,6,2029,20,25,202906),('2029-06-21',202925,6,2029,21,25,202906),('2029-06-22',202925,6,2029,22,25,202906),('2029-06-23',202925,6,2029,23,25,202906),('2029-06-24',202926,6,2029,24,26,202906),('2029-06-25',202926,6,2029,25,26,202906),('2029-06-26',202926,6,2029,26,26,202906),('2029-06-27',202926,6,2029,27,26,202906),('2029-06-28',202926,6,2029,28,26,202906),('2029-06-29',202926,6,2029,29,26,202906),('2029-06-30',202926,6,2029,30,26,202906),('2029-07-01',202927,7,2029,1,27,202907),('2029-07-02',202927,7,2029,2,27,202907),('2029-07-03',202927,7,2029,3,27,202907),('2029-07-04',202927,7,2029,4,27,202907),('2029-07-05',202927,7,2029,5,27,202907),('2029-07-06',202927,7,2029,6,27,202907),('2029-07-07',202927,7,2029,7,27,202907),('2029-07-08',202928,7,2029,8,28,202907),('2029-07-09',202928,7,2029,9,28,202907),('2029-07-10',202928,7,2029,10,28,202907),('2029-07-11',202928,7,2029,11,28,202907),('2029-07-12',202928,7,2029,12,28,202907),('2029-07-13',202928,7,2029,13,28,202907),('2029-07-14',202928,7,2029,14,28,202907),('2029-07-15',202929,7,2029,15,29,202907),('2029-07-16',202929,7,2029,16,29,202907),('2029-07-17',202929,7,2029,17,29,202907),('2029-07-18',202929,7,2029,18,29,202907),('2029-07-19',202929,7,2029,19,29,202907),('2029-07-20',202929,7,2029,20,29,202907),('2029-07-21',202929,7,2029,21,29,202907),('2029-07-22',202930,7,2029,22,30,202907),('2029-07-23',202930,7,2029,23,30,202907),('2029-07-24',202930,7,2029,24,30,202907),('2029-07-25',202930,7,2029,25,30,202907),('2029-07-26',202930,7,2029,26,30,202907),('2029-07-27',202930,7,2029,27,30,202907),('2029-07-28',202930,7,2029,28,30,202907),('2029-07-29',202931,7,2029,29,31,202907),('2029-07-30',202931,7,2029,30,31,202907),('2029-07-31',202931,7,2029,31,31,202907),('2029-08-01',202931,8,2029,1,31,202908),('2029-08-02',202931,8,2029,2,31,202908),('2029-08-03',202931,8,2029,3,31,202908),('2029-08-04',202931,8,2029,4,31,202908),('2029-08-05',202932,8,2029,5,32,202908),('2029-08-06',202932,8,2029,6,32,202908),('2029-08-07',202932,8,2029,7,32,202908),('2029-08-08',202932,8,2029,8,32,202908),('2029-08-09',202932,8,2029,9,32,202908),('2029-08-10',202932,8,2029,10,32,202908),('2029-08-11',202932,8,2029,11,32,202908),('2029-08-12',202933,8,2029,12,33,202908),('2029-08-13',202933,8,2029,13,33,202908),('2029-08-14',202933,8,2029,14,33,202908),('2029-08-15',202933,8,2029,15,33,202908),('2029-08-16',202933,8,2029,16,33,202908),('2029-08-17',202933,8,2029,17,33,202908),('2029-08-18',202933,8,2029,18,33,202908),('2029-08-19',202934,8,2029,19,34,202908),('2029-08-20',202934,8,2029,20,34,202908),('2029-08-21',202934,8,2029,21,34,202908),('2029-08-22',202934,8,2029,22,34,202908),('2029-08-23',202934,8,2029,23,34,202908),('2029-08-24',202934,8,2029,24,34,202908),('2029-08-25',202934,8,2029,25,34,202908),('2029-08-26',202935,8,2029,26,35,202908),('2029-08-27',202935,8,2029,27,35,202908),('2029-08-28',202935,8,2029,28,35,202908),('2029-08-29',202935,8,2029,29,35,202908),('2029-08-30',202935,8,2029,30,35,202908),('2029-08-31',202935,8,2029,31,35,202908),('2029-09-01',202935,9,2029,1,35,202909),('2029-09-02',202936,9,2029,2,36,202909),('2029-09-03',202936,9,2029,3,36,202909),('2029-09-04',202936,9,2029,4,36,202909),('2029-09-05',202936,9,2029,5,36,202909),('2029-09-06',202936,9,2029,6,36,202909),('2029-09-07',202936,9,2029,7,36,202909),('2029-09-08',202936,9,2029,8,36,202909),('2029-09-09',202937,9,2029,9,37,202909),('2029-09-10',202937,9,2029,10,37,202909),('2029-09-11',202937,9,2029,11,37,202909),('2029-09-12',202937,9,2029,12,37,202909),('2029-09-13',202937,9,2029,13,37,202909),('2029-09-14',202937,9,2029,14,37,202909),('2029-09-15',202937,9,2029,15,37,202909),('2029-09-16',202938,9,2029,16,38,202909),('2029-09-17',202938,9,2029,17,38,202909),('2029-09-18',202938,9,2029,18,38,202909),('2029-09-19',202938,9,2029,19,38,202909),('2029-09-20',202938,9,2029,20,38,202909),('2029-09-21',202938,9,2029,21,38,202909),('2029-09-22',202938,9,2029,22,38,202909),('2029-09-23',202939,9,2029,23,39,202909),('2029-09-24',202939,9,2029,24,39,202909),('2029-09-25',202939,9,2029,25,39,202909),('2029-09-26',202939,9,2029,26,39,202909),('2029-09-27',202939,9,2029,27,39,202909),('2029-09-28',202939,9,2029,28,39,202909),('2029-09-29',202939,9,2029,29,39,202909),('2029-09-30',202940,9,2029,30,40,202909),('2029-10-01',202940,10,2029,1,40,202910),('2029-10-02',202940,10,2029,2,40,202910),('2029-10-03',202940,10,2029,3,40,202910),('2029-10-04',202940,10,2029,4,40,202910),('2029-10-05',202940,10,2029,5,40,202910),('2029-10-06',202940,10,2029,6,40,202910),('2029-10-07',202941,10,2029,7,41,202910),('2029-10-08',202941,10,2029,8,41,202910),('2029-10-09',202941,10,2029,9,41,202910),('2029-10-10',202941,10,2029,10,41,202910),('2029-10-11',202941,10,2029,11,41,202910),('2029-10-12',202941,10,2029,12,41,202910),('2029-10-13',202941,10,2029,13,41,202910),('2029-10-14',202942,10,2029,14,42,202910),('2029-10-15',202942,10,2029,15,42,202910),('2029-10-16',202942,10,2029,16,42,202910),('2029-10-17',202942,10,2029,17,42,202910),('2029-10-18',202942,10,2029,18,42,202910),('2029-10-19',202942,10,2029,19,42,202910),('2029-10-20',202942,10,2029,20,42,202910),('2029-10-21',202943,10,2029,21,43,202910),('2029-10-22',202943,10,2029,22,43,202910),('2029-10-23',202943,10,2029,23,43,202910),('2029-10-24',202943,10,2029,24,43,202910),('2029-10-25',202943,10,2029,25,43,202910),('2029-10-26',202943,10,2029,26,43,202910),('2029-10-27',202943,10,2029,27,43,202910),('2029-10-28',202944,10,2029,28,44,202910),('2029-10-29',202944,10,2029,29,44,202910),('2029-10-30',202944,10,2029,30,44,202910),('2029-10-31',202944,10,2029,31,44,202910),('2029-11-01',202944,11,2029,1,44,202911),('2029-11-02',202944,11,2029,2,44,202911),('2029-11-03',202944,11,2029,3,44,202911),('2029-11-04',202945,11,2029,4,45,202911),('2029-11-05',202945,11,2029,5,45,202911),('2029-11-06',202945,11,2029,6,45,202911),('2029-11-07',202945,11,2029,7,45,202911),('2029-11-08',202945,11,2029,8,45,202911),('2029-11-09',202945,11,2029,9,45,202911),('2029-11-10',202945,11,2029,10,45,202911),('2029-11-11',202946,11,2029,11,46,202911),('2029-11-12',202946,11,2029,12,46,202911),('2029-11-13',202946,11,2029,13,46,202911),('2029-11-14',202946,11,2029,14,46,202911),('2029-11-15',202946,11,2029,15,46,202911),('2029-11-16',202946,11,2029,16,46,202911),('2029-11-17',202946,11,2029,17,46,202911),('2029-11-18',202947,11,2029,18,47,202911),('2029-11-19',202947,11,2029,19,47,202911),('2029-11-20',202947,11,2029,20,47,202911),('2029-11-21',202947,11,2029,21,47,202911),('2029-11-22',202947,11,2029,22,47,202911),('2029-11-23',202947,11,2029,23,47,202911),('2029-11-24',202947,11,2029,24,47,202911),('2029-11-25',202948,11,2029,25,48,202911),('2029-11-26',202948,11,2029,26,48,202911),('2029-11-27',202948,11,2029,27,48,202911),('2029-11-28',202948,11,2029,28,48,202911),('2029-11-29',202948,11,2029,29,48,202911),('2029-11-30',202948,11,2029,30,48,202911),('2029-12-01',202948,12,2029,1,48,202912),('2029-12-02',202949,12,2029,2,49,202912),('2029-12-03',202949,12,2029,3,49,202912),('2029-12-04',202949,12,2029,4,49,202912),('2029-12-05',202949,12,2029,5,49,202912),('2029-12-06',202949,12,2029,6,49,202912),('2029-12-07',202949,12,2029,7,49,202912),('2029-12-08',202949,12,2029,8,49,202912),('2029-12-09',202950,12,2029,9,50,202912),('2029-12-10',202950,12,2029,10,50,202912),('2029-12-11',202950,12,2029,11,50,202912),('2029-12-12',202950,12,2029,12,50,202912),('2029-12-13',202950,12,2029,13,50,202912),('2029-12-14',202950,12,2029,14,50,202912),('2029-12-15',202950,12,2029,15,50,202912),('2029-12-16',202951,12,2029,16,51,202912),('2029-12-17',202951,12,2029,17,51,202912),('2029-12-18',202951,12,2029,18,51,202912),('2029-12-19',202951,12,2029,19,51,202912),('2029-12-20',202951,12,2029,20,51,202912),('2029-12-21',202951,12,2029,21,51,202912),('2029-12-22',202951,12,2029,22,51,202912),('2029-12-23',202952,12,2029,23,52,202912),('2029-12-24',202952,12,2029,24,52,202912),('2029-12-25',202952,12,2029,25,52,202912),('2029-12-26',202952,12,2029,26,52,202912),('2029-12-27',202952,12,2029,27,52,202912),('2029-12-28',202952,12,2029,28,52,202912),('2029-12-29',202952,12,2029,29,52,202912),('2029-12-30',202953,12,2029,30,1,202912),('2029-12-31',202901,12,2029,31,1,202912),('2030-01-01',203001,1,2030,1,1,203001),('2030-01-02',203001,1,2030,2,1,203001),('2030-01-03',203001,1,2030,3,1,203001),('2030-01-04',203001,1,2030,4,1,203001),('2030-01-05',203001,1,2030,5,1,203001),('2030-01-06',203002,1,2030,6,2,203001),('2030-01-07',203002,1,2030,7,2,203001),('2030-01-08',203002,1,2030,8,2,203001),('2030-01-09',203002,1,2030,9,2,203001),('2030-01-10',203002,1,2030,10,2,203001),('2030-01-11',203002,1,2030,11,2,203001),('2030-01-12',203002,1,2030,12,2,203001),('2030-01-13',203003,1,2030,13,3,203001),('2030-01-14',203003,1,2030,14,3,203001),('2030-01-15',203003,1,2030,15,3,203001),('2030-01-16',203003,1,2030,16,3,203001),('2030-01-17',203003,1,2030,17,3,203001),('2030-01-18',203003,1,2030,18,3,203001),('2030-01-19',203003,1,2030,19,3,203001),('2030-01-20',203004,1,2030,20,4,203001),('2030-01-21',203004,1,2030,21,4,203001),('2030-01-22',203004,1,2030,22,4,203001),('2030-01-23',203004,1,2030,23,4,203001),('2030-01-24',203004,1,2030,24,4,203001),('2030-01-25',203004,1,2030,25,4,203001),('2030-01-26',203004,1,2030,26,4,203001),('2030-01-27',203005,1,2030,27,5,203001),('2030-01-28',203005,1,2030,28,5,203001),('2030-01-29',203005,1,2030,29,5,203001),('2030-01-30',203005,1,2030,30,5,203001),('2030-01-31',203005,1,2030,31,5,203001),('2030-02-01',203005,2,2030,1,5,203002),('2030-02-02',203005,2,2030,2,5,203002),('2030-02-03',203006,2,2030,3,6,203002),('2030-02-04',203006,2,2030,4,6,203002),('2030-02-05',203006,2,2030,5,6,203002),('2030-02-06',203006,2,2030,6,6,203002),('2030-02-07',203006,2,2030,7,6,203002),('2030-02-08',203006,2,2030,8,6,203002),('2030-02-09',203006,2,2030,9,6,203002),('2030-02-10',203007,2,2030,10,7,203002),('2030-02-11',203007,2,2030,11,7,203002),('2030-02-12',203007,2,2030,12,7,203002),('2030-02-13',203007,2,2030,13,7,203002),('2030-02-14',203007,2,2030,14,7,203002),('2030-02-15',203007,2,2030,15,7,203002),('2030-02-16',203007,2,2030,16,7,203002),('2030-02-17',203008,2,2030,17,8,203002),('2030-02-18',203008,2,2030,18,8,203002),('2030-02-19',203008,2,2030,19,8,203002),('2030-02-20',203008,2,2030,20,8,203002),('2030-02-21',203008,2,2030,21,8,203002),('2030-02-22',203008,2,2030,22,8,203002),('2030-02-23',203008,2,2030,23,8,203002),('2030-02-24',203009,2,2030,24,9,203002),('2030-02-25',203009,2,2030,25,9,203002),('2030-02-26',203009,2,2030,26,9,203002),('2030-02-27',203009,2,2030,27,9,203002),('2030-02-28',203009,2,2030,28,9,203002),('2030-03-01',203009,3,2030,1,9,203003),('2030-03-02',203009,3,2030,2,9,203003),('2030-03-03',203010,3,2030,3,10,203003),('2030-03-04',203010,3,2030,4,10,203003),('2030-03-05',203010,3,2030,5,10,203003),('2030-03-06',203010,3,2030,6,10,203003),('2030-03-07',203010,3,2030,7,10,203003),('2030-03-08',203010,3,2030,8,10,203003),('2030-03-09',203010,3,2030,9,10,203003),('2030-03-10',203011,3,2030,10,11,203003),('2030-03-11',203011,3,2030,11,11,203003),('2030-03-12',203011,3,2030,12,11,203003),('2030-03-13',203011,3,2030,13,11,203003),('2030-03-14',203011,3,2030,14,11,203003),('2030-03-15',203011,3,2030,15,11,203003),('2030-03-16',203011,3,2030,16,11,203003),('2030-03-17',203012,3,2030,17,12,203003),('2030-03-18',203012,3,2030,18,12,203003),('2030-03-19',203012,3,2030,19,12,203003),('2030-03-20',203012,3,2030,20,12,203003),('2030-03-21',203012,3,2030,21,12,203003),('2030-03-22',203012,3,2030,22,12,203003),('2030-03-23',203012,3,2030,23,12,203003),('2030-03-24',203013,3,2030,24,13,203003),('2030-03-25',203013,3,2030,25,13,203003),('2030-03-26',203013,3,2030,26,13,203003),('2030-03-27',203013,3,2030,27,13,203003),('2030-03-28',203013,3,2030,28,13,203003),('2030-03-29',203013,3,2030,29,13,203003),('2030-03-30',203013,3,2030,30,13,203003),('2030-03-31',203014,3,2030,31,14,203003),('2030-04-01',203014,4,2030,1,14,203004),('2030-04-02',203014,4,2030,2,14,203004),('2030-04-03',203014,4,2030,3,14,203004),('2030-04-04',203014,4,2030,4,14,203004),('2030-04-05',203014,4,2030,5,14,203004),('2030-04-06',203014,4,2030,6,14,203004),('2030-04-07',203015,4,2030,7,15,203004),('2030-04-08',203015,4,2030,8,15,203004),('2030-04-09',203015,4,2030,9,15,203004),('2030-04-10',203015,4,2030,10,15,203004),('2030-04-11',203015,4,2030,11,15,203004),('2030-04-12',203015,4,2030,12,15,203004),('2030-04-13',203015,4,2030,13,15,203004),('2030-04-14',203016,4,2030,14,16,203004),('2030-04-15',203016,4,2030,15,16,203004),('2030-04-16',203016,4,2030,16,16,203004),('2030-04-17',203016,4,2030,17,16,203004),('2030-04-18',203016,4,2030,18,16,203004),('2030-04-19',203016,4,2030,19,16,203004),('2030-04-20',203016,4,2030,20,16,203004),('2030-04-21',203017,4,2030,21,17,203004),('2030-04-22',203017,4,2030,22,17,203004),('2030-04-23',203017,4,2030,23,17,203004),('2030-04-24',203017,4,2030,24,17,203004),('2030-04-25',203017,4,2030,25,17,203004),('2030-04-26',203017,4,2030,26,17,203004),('2030-04-27',203017,4,2030,27,17,203004),('2030-04-28',203018,4,2030,28,18,203004),('2030-04-29',203018,4,2030,29,18,203004),('2030-04-30',203018,4,2030,30,18,203004),('2030-05-01',203018,5,2030,1,18,203005),('2030-05-02',203018,5,2030,2,18,203005),('2030-05-03',203018,5,2030,3,18,203005),('2030-05-04',203018,5,2030,4,18,203005),('2030-05-05',203019,5,2030,5,19,203005),('2030-05-06',203019,5,2030,6,19,203005),('2030-05-07',203019,5,2030,7,19,203005),('2030-05-08',203019,5,2030,8,19,203005),('2030-05-09',203019,5,2030,9,19,203005),('2030-05-10',203019,5,2030,10,19,203005),('2030-05-11',203019,5,2030,11,19,203005),('2030-05-12',203020,5,2030,12,20,203005),('2030-05-13',203020,5,2030,13,20,203005),('2030-05-14',203020,5,2030,14,20,203005),('2030-05-15',203020,5,2030,15,20,203005),('2030-05-16',203020,5,2030,16,20,203005),('2030-05-17',203020,5,2030,17,20,203005),('2030-05-18',203020,5,2030,18,20,203005),('2030-05-19',203021,5,2030,19,21,203005),('2030-05-20',203021,5,2030,20,21,203005),('2030-05-21',203021,5,2030,21,21,203005),('2030-05-22',203021,5,2030,22,21,203005),('2030-05-23',203021,5,2030,23,21,203005),('2030-05-24',203021,5,2030,24,21,203005),('2030-05-25',203021,5,2030,25,21,203005),('2030-05-26',203022,5,2030,26,22,203005),('2030-05-27',203022,5,2030,27,22,203005),('2030-05-28',203022,5,2030,28,22,203005),('2030-05-29',203022,5,2030,29,22,203005),('2030-05-30',203022,5,2030,30,22,203005),('2030-05-31',203022,5,2030,31,22,203005),('2030-06-01',203022,6,2030,1,22,203006),('2030-06-02',203023,6,2030,2,23,203006),('2030-06-03',203023,6,2030,3,23,203006),('2030-06-04',203023,6,2030,4,23,203006),('2030-06-05',203023,6,2030,5,23,203006),('2030-06-06',203023,6,2030,6,23,203006),('2030-06-07',203023,6,2030,7,23,203006),('2030-06-08',203023,6,2030,8,23,203006),('2030-06-09',203024,6,2030,9,24,203006),('2030-06-10',203024,6,2030,10,24,203006),('2030-06-11',203024,6,2030,11,24,203006),('2030-06-12',203024,6,2030,12,24,203006),('2030-06-13',203024,6,2030,13,24,203006),('2030-06-14',203024,6,2030,14,24,203006),('2030-06-15',203024,6,2030,15,24,203006),('2030-06-16',203025,6,2030,16,25,203006),('2030-06-17',203025,6,2030,17,25,203006),('2030-06-18',203025,6,2030,18,25,203006),('2030-06-19',203025,6,2030,19,25,203006),('2030-06-20',203025,6,2030,20,25,203006),('2030-06-21',203025,6,2030,21,25,203006),('2030-06-22',203025,6,2030,22,25,203006),('2030-06-23',203026,6,2030,23,26,203006),('2030-06-24',203026,6,2030,24,26,203006),('2030-06-25',203026,6,2030,25,26,203006),('2030-06-26',203026,6,2030,26,26,203006),('2030-06-27',203026,6,2030,27,26,203006),('2030-06-28',203026,6,2030,28,26,203006),('2030-06-29',203026,6,2030,29,26,203006),('2030-06-30',203027,6,2030,30,27,203006),('2030-07-01',203027,7,2030,1,27,203007),('2030-07-02',203027,7,2030,2,27,203007),('2030-07-03',203027,7,2030,3,27,203007),('2030-07-04',203027,7,2030,4,27,203007),('2030-07-05',203027,7,2030,5,27,203007),('2030-07-06',203027,7,2030,6,27,203007),('2030-07-07',203028,7,2030,7,28,203007),('2030-07-08',203028,7,2030,8,28,203007),('2030-07-09',203028,7,2030,9,28,203007),('2030-07-10',203028,7,2030,10,28,203007),('2030-07-11',203028,7,2030,11,28,203007),('2030-07-12',203028,7,2030,12,28,203007),('2030-07-13',203028,7,2030,13,28,203007),('2030-07-14',203029,7,2030,14,29,203007),('2030-07-15',203029,7,2030,15,29,203007),('2030-07-16',203029,7,2030,16,29,203007),('2030-07-17',203029,7,2030,17,29,203007),('2030-07-18',203029,7,2030,18,29,203007),('2030-07-19',203029,7,2030,19,29,203007),('2030-07-20',203029,7,2030,20,29,203007),('2030-07-21',203030,7,2030,21,30,203007),('2030-07-22',203030,7,2030,22,30,203007),('2030-07-23',203030,7,2030,23,30,203007),('2030-07-24',203030,7,2030,24,30,203007),('2030-07-25',203030,7,2030,25,30,203007),('2030-07-26',203030,7,2030,26,30,203007),('2030-07-27',203030,7,2030,27,30,203007),('2030-07-28',203031,7,2030,28,31,203007),('2030-07-29',203031,7,2030,29,31,203007),('2030-07-30',203031,7,2030,30,31,203007),('2030-07-31',203031,7,2030,31,31,203007),('2030-08-01',203031,8,2030,1,31,203008),('2030-08-02',203031,8,2030,2,31,203008),('2030-08-03',203031,8,2030,3,31,203008),('2030-08-04',203032,8,2030,4,32,203008),('2030-08-05',203032,8,2030,5,32,203008),('2030-08-06',203032,8,2030,6,32,203008),('2030-08-07',203032,8,2030,7,32,203008),('2030-08-08',203032,8,2030,8,32,203008),('2030-08-09',203032,8,2030,9,32,203008),('2030-08-10',203032,8,2030,10,32,203008),('2030-08-11',203033,8,2030,11,33,203008),('2030-08-12',203033,8,2030,12,33,203008),('2030-08-13',203033,8,2030,13,33,203008),('2030-08-14',203033,8,2030,14,33,203008),('2030-08-15',203033,8,2030,15,33,203008),('2030-08-16',203033,8,2030,16,33,203008),('2030-08-17',203033,8,2030,17,33,203008),('2030-08-18',203034,8,2030,18,34,203008),('2030-08-19',203034,8,2030,19,34,203008),('2030-08-20',203034,8,2030,20,34,203008),('2030-08-21',203034,8,2030,21,34,203008),('2030-08-22',203034,8,2030,22,34,203008),('2030-08-23',203034,8,2030,23,34,203008),('2030-08-24',203034,8,2030,24,34,203008),('2030-08-25',203035,8,2030,25,35,203008),('2030-08-26',203035,8,2030,26,35,203008),('2030-08-27',203035,8,2030,27,35,203008),('2030-08-28',203035,8,2030,28,35,203008),('2030-08-29',203035,8,2030,29,35,203008),('2030-08-30',203035,8,2030,30,35,203008),('2030-08-31',203035,8,2030,31,35,203008),('2030-09-01',203036,9,2030,1,36,203009),('2030-09-02',203036,9,2030,2,36,203009),('2030-09-03',203036,9,2030,3,36,203009),('2030-09-04',203036,9,2030,4,36,203009),('2030-09-05',203036,9,2030,5,36,203009),('2030-09-06',203036,9,2030,6,36,203009),('2030-09-07',203036,9,2030,7,36,203009),('2030-09-08',203037,9,2030,8,37,203009),('2030-09-09',203037,9,2030,9,37,203009),('2030-09-10',203037,9,2030,10,37,203009),('2030-09-11',203037,9,2030,11,37,203009),('2030-09-12',203037,9,2030,12,37,203009),('2030-09-13',203037,9,2030,13,37,203009),('2030-09-14',203037,9,2030,14,37,203009),('2030-09-15',203038,9,2030,15,38,203009),('2030-09-16',203038,9,2030,16,38,203009),('2030-09-17',203038,9,2030,17,38,203009),('2030-09-18',203038,9,2030,18,38,203009),('2030-09-19',203038,9,2030,19,38,203009),('2030-09-20',203038,9,2030,20,38,203009),('2030-09-21',203038,9,2030,21,38,203009),('2030-09-22',203039,9,2030,22,39,203009),('2030-09-23',203039,9,2030,23,39,203009),('2030-09-24',203039,9,2030,24,39,203009),('2030-09-25',203039,9,2030,25,39,203009),('2030-09-26',203039,9,2030,26,39,203009),('2030-09-27',203039,9,2030,27,39,203009),('2030-09-28',203039,9,2030,28,39,203009),('2030-09-29',203040,9,2030,29,40,203009),('2030-09-30',203040,9,2030,30,40,203009),('2030-10-01',203040,10,2030,1,40,203010),('2030-10-02',203040,10,2030,2,40,203010),('2030-10-03',203040,10,2030,3,40,203010),('2030-10-04',203040,10,2030,4,40,203010),('2030-10-05',203040,10,2030,5,40,203010),('2030-10-06',203041,10,2030,6,41,203010),('2030-10-07',203041,10,2030,7,41,203010),('2030-10-08',203041,10,2030,8,41,203010),('2030-10-09',203041,10,2030,9,41,203010),('2030-10-10',203041,10,2030,10,41,203010),('2030-10-11',203041,10,2030,11,41,203010),('2030-10-12',203041,10,2030,12,41,203010),('2030-10-13',203042,10,2030,13,42,203010),('2030-10-14',203042,10,2030,14,42,203010),('2030-10-15',203042,10,2030,15,42,203010),('2030-10-16',203042,10,2030,16,42,203010),('2030-10-17',203042,10,2030,17,42,203010),('2030-10-18',203042,10,2030,18,42,203010),('2030-10-19',203042,10,2030,19,42,203010),('2030-10-20',203043,10,2030,20,43,203010),('2030-10-21',203043,10,2030,21,43,203010),('2030-10-22',203043,10,2030,22,43,203010),('2030-10-23',203043,10,2030,23,43,203010),('2030-10-24',203043,10,2030,24,43,203010),('2030-10-25',203043,10,2030,25,43,203010),('2030-10-26',203043,10,2030,26,43,203010),('2030-10-27',203044,10,2030,27,44,203010),('2030-10-28',203044,10,2030,28,44,203010),('2030-10-29',203044,10,2030,29,44,203010),('2030-10-30',203044,10,2030,30,44,203010),('2030-10-31',203044,10,2030,31,44,203010),('2030-11-01',203044,11,2030,1,44,203011),('2030-11-02',203044,11,2030,2,44,203011),('2030-11-03',203045,11,2030,3,45,203011),('2030-11-04',203045,11,2030,4,45,203011),('2030-11-05',203045,11,2030,5,45,203011),('2030-11-06',203045,11,2030,6,45,203011),('2030-11-07',203045,11,2030,7,45,203011),('2030-11-08',203045,11,2030,8,45,203011),('2030-11-09',203045,11,2030,9,45,203011),('2030-11-10',203046,11,2030,10,46,203011),('2030-11-11',203046,11,2030,11,46,203011),('2030-11-12',203046,11,2030,12,46,203011),('2030-11-13',203046,11,2030,13,46,203011),('2030-11-14',203046,11,2030,14,46,203011),('2030-11-15',203046,11,2030,15,46,203011),('2030-11-16',203046,11,2030,16,46,203011),('2030-11-17',203047,11,2030,17,47,203011),('2030-11-18',203047,11,2030,18,47,203011),('2030-11-19',203047,11,2030,19,47,203011),('2030-11-20',203047,11,2030,20,47,203011),('2030-11-21',203047,11,2030,21,47,203011),('2030-11-22',203047,11,2030,22,47,203011),('2030-11-23',203047,11,2030,23,47,203011),('2030-11-24',203048,11,2030,24,48,203011),('2030-11-25',203048,11,2030,25,48,203011),('2030-11-26',203048,11,2030,26,48,203011),('2030-11-27',203048,11,2030,27,48,203011),('2030-11-28',203048,11,2030,28,48,203011),('2030-11-29',203048,11,2030,29,48,203011),('2030-11-30',203048,11,2030,30,48,203011),('2030-12-01',203049,12,2030,1,49,203012),('2030-12-02',203049,12,2030,2,49,203012),('2030-12-03',203049,12,2030,3,49,203012),('2030-12-04',203049,12,2030,4,49,203012),('2030-12-05',203049,12,2030,5,49,203012),('2030-12-06',203049,12,2030,6,49,203012),('2030-12-07',203049,12,2030,7,49,203012),('2030-12-08',203050,12,2030,8,50,203012),('2030-12-09',203050,12,2030,9,50,203012),('2030-12-10',203050,12,2030,10,50,203012),('2030-12-11',203050,12,2030,11,50,203012),('2030-12-12',203050,12,2030,12,50,203012),('2030-12-13',203050,12,2030,13,50,203012),('2030-12-14',203050,12,2030,14,50,203012),('2030-12-15',203051,12,2030,15,51,203012),('2030-12-16',203051,12,2030,16,51,203012),('2030-12-17',203051,12,2030,17,51,203012),('2030-12-18',203051,12,2030,18,51,203012),('2030-12-19',203051,12,2030,19,51,203012),('2030-12-20',203051,12,2030,20,51,203012),('2030-12-21',203051,12,2030,21,51,203012),('2030-12-22',203052,12,2030,22,52,203012),('2030-12-23',203052,12,2030,23,52,203012),('2030-12-24',203052,12,2030,24,52,203012),('2030-12-25',203052,12,2030,25,52,203012),('2030-12-26',203052,12,2030,26,52,203012),('2030-12-27',203052,12,2030,27,52,203012),('2030-12-28',203052,12,2030,28,52,203012),('2030-12-29',203053,12,2030,29,1,203012),('2030-12-30',203001,12,2030,30,1,203012),('2030-12-31',203001,12,2030,31,1,203012),('2031-01-01',203101,1,2031,1,1,203101),('2031-01-02',203101,1,2031,2,1,203101),('2031-01-03',203101,1,2031,3,1,203101),('2031-01-04',203101,1,2031,4,1,203101),('2031-01-05',203102,1,2031,5,2,203101),('2031-01-06',203102,1,2031,6,2,203101),('2031-01-07',203102,1,2031,7,2,203101),('2031-01-08',203102,1,2031,8,2,203101),('2031-01-09',203102,1,2031,9,2,203101),('2031-01-10',203102,1,2031,10,2,203101),('2031-01-11',203102,1,2031,11,2,203101),('2031-01-12',203103,1,2031,12,3,203101),('2031-01-13',203103,1,2031,13,3,203101),('2031-01-14',203103,1,2031,14,3,203101),('2031-01-15',203103,1,2031,15,3,203101),('2031-01-16',203103,1,2031,16,3,203101),('2031-01-17',203103,1,2031,17,3,203101),('2031-01-18',203103,1,2031,18,3,203101),('2031-01-19',203104,1,2031,19,4,203101),('2031-01-20',203104,1,2031,20,4,203101),('2031-01-21',203104,1,2031,21,4,203101),('2031-01-22',203104,1,2031,22,4,203101),('2031-01-23',203104,1,2031,23,4,203101),('2031-01-24',203104,1,2031,24,4,203101),('2031-01-25',203104,1,2031,25,4,203101),('2031-01-26',203105,1,2031,26,5,203101),('2031-01-27',203105,1,2031,27,5,203101),('2031-01-28',203105,1,2031,28,5,203101),('2031-01-29',203105,1,2031,29,5,203101),('2031-01-30',203105,1,2031,30,5,203101),('2031-01-31',203105,1,2031,31,5,203101),('2031-02-01',203105,2,2031,1,5,203102),('2031-02-02',203106,2,2031,2,6,203102),('2031-02-03',203106,2,2031,3,6,203102),('2031-02-04',203106,2,2031,4,6,203102),('2031-02-05',203106,2,2031,5,6,203102),('2031-02-06',203106,2,2031,6,6,203102),('2031-02-07',203106,2,2031,7,6,203102),('2031-02-08',203106,2,2031,8,6,203102),('2031-02-09',203107,2,2031,9,7,203102),('2031-02-10',203107,2,2031,10,7,203102),('2031-02-11',203107,2,2031,11,7,203102),('2031-02-12',203107,2,2031,12,7,203102),('2031-02-13',203107,2,2031,13,7,203102),('2031-02-14',203107,2,2031,14,7,203102),('2031-02-15',203107,2,2031,15,7,203102),('2031-02-16',203108,2,2031,16,8,203102),('2031-02-17',203108,2,2031,17,8,203102),('2031-02-18',203108,2,2031,18,8,203102),('2031-02-19',203108,2,2031,19,8,203102),('2031-02-20',203108,2,2031,20,8,203102),('2031-02-21',203108,2,2031,21,8,203102),('2031-02-22',203108,2,2031,22,8,203102),('2031-02-23',203109,2,2031,23,9,203102),('2031-02-24',203109,2,2031,24,9,203102),('2031-02-25',203109,2,2031,25,9,203102),('2031-02-26',203109,2,2031,26,9,203102),('2031-02-27',203109,2,2031,27,9,203102),('2031-02-28',203109,2,2031,28,9,203102),('2031-03-01',203109,3,2031,1,9,203103),('2031-03-02',203110,3,2031,2,10,203103),('2031-03-03',203110,3,2031,3,10,203103),('2031-03-04',203110,3,2031,4,10,203103),('2031-03-05',203110,3,2031,5,10,203103),('2031-03-06',203110,3,2031,6,10,203103),('2031-03-07',203110,3,2031,7,10,203103),('2031-03-08',203110,3,2031,8,10,203103),('2031-03-09',203111,3,2031,9,11,203103),('2031-03-10',203111,3,2031,10,11,203103),('2031-03-11',203111,3,2031,11,11,203103),('2031-03-12',203111,3,2031,12,11,203103),('2031-03-13',203111,3,2031,13,11,203103),('2031-03-14',203111,3,2031,14,11,203103),('2031-03-15',203111,3,2031,15,11,203103),('2031-03-16',203112,3,2031,16,12,203103),('2031-03-17',203112,3,2031,17,12,203103),('2031-03-18',203112,3,2031,18,12,203103),('2031-03-19',203112,3,2031,19,12,203103),('2031-03-20',203112,3,2031,20,12,203103),('2031-03-21',203112,3,2031,21,12,203103),('2031-03-22',203112,3,2031,22,12,203103),('2031-03-23',203113,3,2031,23,13,203103),('2031-03-24',203113,3,2031,24,13,203103),('2031-03-25',203113,3,2031,25,13,203103),('2031-03-26',203113,3,2031,26,13,203103),('2031-03-27',203113,3,2031,27,13,203103),('2031-03-28',203113,3,2031,28,13,203103),('2031-03-29',203113,3,2031,29,13,203103),('2031-03-30',203114,3,2031,30,14,203103),('2031-03-31',203114,3,2031,31,14,203103),('2031-04-01',203114,4,2031,1,14,203104),('2031-04-02',203114,4,2031,2,14,203104),('2031-04-03',203114,4,2031,3,14,203104),('2031-04-04',203114,4,2031,4,14,203104),('2031-04-05',203114,4,2031,5,14,203104),('2031-04-06',203115,4,2031,6,15,203104),('2031-04-07',203115,4,2031,7,15,203104),('2031-04-08',203115,4,2031,8,15,203104),('2031-04-09',203115,4,2031,9,15,203104),('2031-04-10',203115,4,2031,10,15,203104),('2031-04-11',203115,4,2031,11,15,203104),('2031-04-12',203115,4,2031,12,15,203104),('2031-04-13',203116,4,2031,13,16,203104),('2031-04-14',203116,4,2031,14,16,203104),('2031-04-15',203116,4,2031,15,16,203104),('2031-04-16',203116,4,2031,16,16,203104),('2031-04-17',203116,4,2031,17,16,203104),('2031-04-18',203116,4,2031,18,16,203104),('2031-04-19',203116,4,2031,19,16,203104),('2031-04-20',203117,4,2031,20,17,203104),('2031-04-21',203117,4,2031,21,17,203104),('2031-04-22',203117,4,2031,22,17,203104),('2031-04-23',203117,4,2031,23,17,203104),('2031-04-24',203117,4,2031,24,17,203104),('2031-04-25',203117,4,2031,25,17,203104),('2031-04-26',203117,4,2031,26,17,203104),('2031-04-27',203118,4,2031,27,18,203104),('2031-04-28',203118,4,2031,28,18,203104),('2031-04-29',203118,4,2031,29,18,203104),('2031-04-30',203118,4,2031,30,18,203104),('2031-05-01',203118,5,2031,1,18,203105),('2031-05-02',203118,5,2031,2,18,203105),('2031-05-03',203118,5,2031,3,18,203105),('2031-05-04',203119,5,2031,4,19,203105),('2031-05-05',203119,5,2031,5,19,203105),('2031-05-06',203119,5,2031,6,19,203105),('2031-05-07',203119,5,2031,7,19,203105),('2031-05-08',203119,5,2031,8,19,203105),('2031-05-09',203119,5,2031,9,19,203105),('2031-05-10',203119,5,2031,10,19,203105),('2031-05-11',203120,5,2031,11,20,203105),('2031-05-12',203120,5,2031,12,20,203105),('2031-05-13',203120,5,2031,13,20,203105),('2031-05-14',203120,5,2031,14,20,203105),('2031-05-15',203120,5,2031,15,20,203105),('2031-05-16',203120,5,2031,16,20,203105),('2031-05-17',203120,5,2031,17,20,203105),('2031-05-18',203121,5,2031,18,21,203105),('2031-05-19',203121,5,2031,19,21,203105),('2031-05-20',203121,5,2031,20,21,203105),('2031-05-21',203121,5,2031,21,21,203105),('2031-05-22',203121,5,2031,22,21,203105),('2031-05-23',203121,5,2031,23,21,203105),('2031-05-24',203121,5,2031,24,21,203105),('2031-05-25',203122,5,2031,25,22,203105),('2031-05-26',203122,5,2031,26,22,203105),('2031-05-27',203122,5,2031,27,22,203105),('2031-05-28',203122,5,2031,28,22,203105),('2031-05-29',203122,5,2031,29,22,203105),('2031-05-30',203122,5,2031,30,22,203105),('2031-05-31',203122,5,2031,31,22,203105),('2031-06-01',203123,6,2031,1,23,203106),('2031-06-02',203123,6,2031,2,23,203106),('2031-06-03',203123,6,2031,3,23,203106),('2031-06-04',203123,6,2031,4,23,203106),('2031-06-05',203123,6,2031,5,23,203106),('2031-06-06',203123,6,2031,6,23,203106),('2031-06-07',203123,6,2031,7,23,203106),('2031-06-08',203124,6,2031,8,24,203106),('2031-06-09',203124,6,2031,9,24,203106),('2031-06-10',203124,6,2031,10,24,203106),('2031-06-11',203124,6,2031,11,24,203106),('2031-06-12',203124,6,2031,12,24,203106),('2031-06-13',203124,6,2031,13,24,203106),('2031-06-14',203124,6,2031,14,24,203106),('2031-06-15',203125,6,2031,15,25,203106),('2031-06-16',203125,6,2031,16,25,203106),('2031-06-17',203125,6,2031,17,25,203106),('2031-06-18',203125,6,2031,18,25,203106),('2031-06-19',203125,6,2031,19,25,203106),('2031-06-20',203125,6,2031,20,25,203106),('2031-06-21',203125,6,2031,21,25,203106),('2031-06-22',203126,6,2031,22,26,203106),('2031-06-23',203126,6,2031,23,26,203106),('2031-06-24',203126,6,2031,24,26,203106),('2031-06-25',203126,6,2031,25,26,203106),('2031-06-26',203126,6,2031,26,26,203106),('2031-06-27',203126,6,2031,27,26,203106),('2031-06-28',203126,6,2031,28,26,203106),('2031-06-29',203127,6,2031,29,27,203106),('2031-06-30',203127,6,2031,30,27,203106),('2031-07-01',203127,7,2031,1,27,203107),('2031-07-02',203127,7,2031,2,27,203107),('2031-07-03',203127,7,2031,3,27,203107),('2031-07-04',203127,7,2031,4,27,203107),('2031-07-05',203127,7,2031,5,27,203107),('2031-07-06',203128,7,2031,6,28,203107),('2031-07-07',203128,7,2031,7,28,203107),('2031-07-08',203128,7,2031,8,28,203107),('2031-07-09',203128,7,2031,9,28,203107),('2031-07-10',203128,7,2031,10,28,203107),('2031-07-11',203128,7,2031,11,28,203107),('2031-07-12',203128,7,2031,12,28,203107),('2031-07-13',203129,7,2031,13,29,203107),('2031-07-14',203129,7,2031,14,29,203107),('2031-07-15',203129,7,2031,15,29,203107),('2031-07-16',203129,7,2031,16,29,203107),('2031-07-17',203129,7,2031,17,29,203107),('2031-07-18',203129,7,2031,18,29,203107),('2031-07-19',203129,7,2031,19,29,203107),('2031-07-20',203130,7,2031,20,30,203107),('2031-07-21',203130,7,2031,21,30,203107),('2031-07-22',203130,7,2031,22,30,203107),('2031-07-23',203130,7,2031,23,30,203107),('2031-07-24',203130,7,2031,24,30,203107),('2031-07-25',203130,7,2031,25,30,203107),('2031-07-26',203130,7,2031,26,30,203107),('2031-07-27',203131,7,2031,27,31,203107),('2031-07-28',203131,7,2031,28,31,203107),('2031-07-29',203131,7,2031,29,31,203107),('2031-07-30',203131,7,2031,30,31,203107),('2031-07-31',203131,7,2031,31,31,203107),('2031-08-01',203131,8,2031,1,31,203108),('2031-08-02',203131,8,2031,2,31,203108),('2031-08-03',203132,8,2031,3,32,203108),('2031-08-04',203132,8,2031,4,32,203108),('2031-08-05',203132,8,2031,5,32,203108),('2031-08-06',203132,8,2031,6,32,203108),('2031-08-07',203132,8,2031,7,32,203108),('2031-08-08',203132,8,2031,8,32,203108),('2031-08-09',203132,8,2031,9,32,203108),('2031-08-10',203133,8,2031,10,33,203108),('2031-08-11',203133,8,2031,11,33,203108),('2031-08-12',203133,8,2031,12,33,203108),('2031-08-13',203133,8,2031,13,33,203108),('2031-08-14',203133,8,2031,14,33,203108),('2031-08-15',203133,8,2031,15,33,203108),('2031-08-16',203133,8,2031,16,33,203108),('2031-08-17',203134,8,2031,17,34,203108),('2031-08-18',203134,8,2031,18,34,203108),('2031-08-19',203134,8,2031,19,34,203108),('2031-08-20',203134,8,2031,20,34,203108),('2031-08-21',203134,8,2031,21,34,203108),('2031-08-22',203134,8,2031,22,34,203108),('2031-08-23',203134,8,2031,23,34,203108),('2031-08-24',203135,8,2031,24,35,203108),('2031-08-25',203135,8,2031,25,35,203108),('2031-08-26',203135,8,2031,26,35,203108),('2031-08-27',203135,8,2031,27,35,203108),('2031-08-28',203135,8,2031,28,35,203108),('2031-08-29',203135,8,2031,29,35,203108),('2031-08-30',203135,8,2031,30,35,203108),('2031-08-31',203136,8,2031,31,36,203108),('2031-09-01',203136,9,2031,1,36,203109),('2031-09-02',203136,9,2031,2,36,203109),('2031-09-03',203136,9,2031,3,36,203109),('2031-09-04',203136,9,2031,4,36,203109),('2031-09-05',203136,9,2031,5,36,203109),('2031-09-06',203136,9,2031,6,36,203109),('2031-09-07',203137,9,2031,7,37,203109),('2031-09-08',203137,9,2031,8,37,203109),('2031-09-09',203137,9,2031,9,37,203109),('2031-09-10',203137,9,2031,10,37,203109),('2031-09-11',203137,9,2031,11,37,203109),('2031-09-12',203137,9,2031,12,37,203109),('2031-09-13',203137,9,2031,13,37,203109),('2031-09-14',203138,9,2031,14,38,203109),('2031-09-15',203138,9,2031,15,38,203109),('2031-09-16',203138,9,2031,16,38,203109),('2031-09-17',203138,9,2031,17,38,203109),('2031-09-18',203138,9,2031,18,38,203109),('2031-09-19',203138,9,2031,19,38,203109),('2031-09-20',203138,9,2031,20,38,203109),('2031-09-21',203139,9,2031,21,39,203109),('2031-09-22',203139,9,2031,22,39,203109),('2031-09-23',203139,9,2031,23,39,203109),('2031-09-24',203139,9,2031,24,39,203109),('2031-09-25',203139,9,2031,25,39,203109),('2031-09-26',203139,9,2031,26,39,203109),('2031-09-27',203139,9,2031,27,39,203109),('2031-09-28',203140,9,2031,28,40,203109),('2031-09-29',203140,9,2031,29,40,203109),('2031-09-30',203140,9,2031,30,40,203109),('2031-10-01',203140,10,2031,1,40,203110),('2031-10-02',203140,10,2031,2,40,203110),('2031-10-03',203140,10,2031,3,40,203110),('2031-10-04',203140,10,2031,4,40,203110),('2031-10-05',203141,10,2031,5,41,203110),('2031-10-06',203141,10,2031,6,41,203110),('2031-10-07',203141,10,2031,7,41,203110),('2031-10-08',203141,10,2031,8,41,203110),('2031-10-09',203141,10,2031,9,41,203110),('2031-10-10',203141,10,2031,10,41,203110),('2031-10-11',203141,10,2031,11,41,203110),('2031-10-12',203142,10,2031,12,42,203110),('2031-10-13',203142,10,2031,13,42,203110),('2031-10-14',203142,10,2031,14,42,203110),('2031-10-15',203142,10,2031,15,42,203110),('2031-10-16',203142,10,2031,16,42,203110),('2031-10-17',203142,10,2031,17,42,203110),('2031-10-18',203142,10,2031,18,42,203110),('2031-10-19',203143,10,2031,19,43,203110),('2031-10-20',203143,10,2031,20,43,203110),('2031-10-21',203143,10,2031,21,43,203110),('2031-10-22',203143,10,2031,22,43,203110),('2031-10-23',203143,10,2031,23,43,203110),('2031-10-24',203143,10,2031,24,43,203110),('2031-10-25',203143,10,2031,25,43,203110),('2031-10-26',203144,10,2031,26,44,203110),('2031-10-27',203144,10,2031,27,44,203110),('2031-10-28',203144,10,2031,28,44,203110),('2031-10-29',203144,10,2031,29,44,203110),('2031-10-30',203144,10,2031,30,44,203110),('2031-10-31',203144,10,2031,31,44,203110),('2031-11-01',203144,11,2031,1,44,203111),('2031-11-02',203145,11,2031,2,45,203111),('2031-11-03',203145,11,2031,3,45,203111),('2031-11-04',203145,11,2031,4,45,203111),('2031-11-05',203145,11,2031,5,45,203111),('2031-11-06',203145,11,2031,6,45,203111),('2031-11-07',203145,11,2031,7,45,203111),('2031-11-08',203145,11,2031,8,45,203111),('2031-11-09',203146,11,2031,9,46,203111),('2031-11-10',203146,11,2031,10,46,203111),('2031-11-11',203146,11,2031,11,46,203111),('2031-11-12',203146,11,2031,12,46,203111),('2031-11-13',203146,11,2031,13,46,203111),('2031-11-14',203146,11,2031,14,46,203111),('2031-11-15',203146,11,2031,15,46,203111),('2031-11-16',203147,11,2031,16,47,203111),('2031-11-17',203147,11,2031,17,47,203111),('2031-11-18',203147,11,2031,18,47,203111),('2031-11-19',203147,11,2031,19,47,203111),('2031-11-20',203147,11,2031,20,47,203111),('2031-11-21',203147,11,2031,21,47,203111),('2031-11-22',203147,11,2031,22,47,203111),('2031-11-23',203148,11,2031,23,48,203111),('2031-11-24',203148,11,2031,24,48,203111),('2031-11-25',203148,11,2031,25,48,203111),('2031-11-26',203148,11,2031,26,48,203111),('2031-11-27',203148,11,2031,27,48,203111),('2031-11-28',203148,11,2031,28,48,203111),('2031-11-29',203148,11,2031,29,48,203111),('2031-11-30',203149,11,2031,30,49,203111),('2031-12-01',203149,12,2031,1,49,203112),('2031-12-02',203149,12,2031,2,49,203112),('2031-12-03',203149,12,2031,3,49,203112),('2031-12-04',203149,12,2031,4,49,203112),('2031-12-05',203149,12,2031,5,49,203112),('2031-12-06',203149,12,2031,6,49,203112),('2031-12-07',203150,12,2031,7,50,203112),('2031-12-08',203150,12,2031,8,50,203112),('2031-12-09',203150,12,2031,9,50,203112),('2031-12-10',203150,12,2031,10,50,203112),('2031-12-11',203150,12,2031,11,50,203112),('2031-12-12',203150,12,2031,12,50,203112),('2031-12-13',203150,12,2031,13,50,203112),('2031-12-14',203151,12,2031,14,51,203112),('2031-12-15',203151,12,2031,15,51,203112),('2031-12-16',203151,12,2031,16,51,203112),('2031-12-17',203151,12,2031,17,51,203112),('2031-12-18',203151,12,2031,18,51,203112),('2031-12-19',203151,12,2031,19,51,203112),('2031-12-20',203151,12,2031,20,51,203112),('2031-12-21',203152,12,2031,21,52,203112),('2031-12-22',203152,12,2031,22,52,203112),('2031-12-23',203152,12,2031,23,52,203112),('2031-12-24',203152,12,2031,24,52,203112),('2031-12-25',203152,12,2031,25,52,203112),('2031-12-26',203152,12,2031,26,52,203112),('2031-12-27',203152,12,2031,27,52,203112),('2031-12-28',203153,12,2031,28,53,203112),('2031-12-29',203101,12,2031,29,53,203112),('2031-12-30',203101,12,2031,30,53,203112),('2031-12-31',203101,12,2031,31,53,203112),('2032-01-01',203201,1,2032,1,53,203201),('2032-01-02',203201,1,2032,2,53,203201),('2032-01-03',203201,1,2032,3,53,203201),('2032-01-04',203202,1,2032,4,1,203201),('2032-01-05',203202,1,2032,5,1,203201),('2032-01-06',203202,1,2032,6,1,203201),('2032-01-07',203202,1,2032,7,1,203201),('2032-01-08',203202,1,2032,8,1,203201),('2032-01-09',203202,1,2032,9,1,203201),('2032-01-10',203202,1,2032,10,1,203201),('2032-01-11',203203,1,2032,11,2,203201),('2032-01-12',203203,1,2032,12,2,203201),('2032-01-13',203203,1,2032,13,2,203201),('2032-01-14',203203,1,2032,14,2,203201),('2032-01-15',203203,1,2032,15,2,203201),('2032-01-16',203203,1,2032,16,2,203201),('2032-01-17',203203,1,2032,17,2,203201),('2032-01-18',203204,1,2032,18,3,203201),('2032-01-19',203204,1,2032,19,3,203201),('2032-01-20',203204,1,2032,20,3,203201),('2032-01-21',203204,1,2032,21,3,203201),('2032-01-22',203204,1,2032,22,3,203201),('2032-01-23',203204,1,2032,23,3,203201),('2032-01-24',203204,1,2032,24,3,203201),('2032-01-25',203205,1,2032,25,4,203201),('2032-01-26',203205,1,2032,26,4,203201),('2032-01-27',203205,1,2032,27,4,203201),('2032-01-28',203205,1,2032,28,4,203201),('2032-01-29',203205,1,2032,29,4,203201),('2032-01-30',203205,1,2032,30,4,203201),('2032-01-31',203205,1,2032,31,4,203201),('2032-02-01',203206,2,2032,1,5,203202),('2032-02-02',203206,2,2032,2,5,203202),('2032-02-03',203206,2,2032,3,5,203202),('2032-02-04',203206,2,2032,4,5,203202),('2032-02-05',203206,2,2032,5,5,203202),('2032-02-06',203206,2,2032,6,5,203202),('2032-02-07',203206,2,2032,7,5,203202),('2032-02-08',203207,2,2032,8,6,203202),('2032-02-09',203207,2,2032,9,6,203202),('2032-02-10',203207,2,2032,10,6,203202),('2032-02-11',203207,2,2032,11,6,203202),('2032-02-12',203207,2,2032,12,6,203202),('2032-02-13',203207,2,2032,13,6,203202),('2032-02-14',203207,2,2032,14,6,203202),('2032-02-15',203208,2,2032,15,7,203202),('2032-02-16',203208,2,2032,16,7,203202),('2032-02-17',203208,2,2032,17,7,203202),('2032-02-18',203208,2,2032,18,7,203202),('2032-02-19',203208,2,2032,19,7,203202),('2032-02-20',203208,2,2032,20,7,203202),('2032-02-21',203208,2,2032,21,7,203202),('2032-02-22',203209,2,2032,22,8,203202),('2032-02-23',203209,2,2032,23,8,203202),('2032-02-24',203209,2,2032,24,8,203202),('2032-02-25',203209,2,2032,25,8,203202),('2032-02-26',203209,2,2032,26,8,203202),('2032-02-27',203209,2,2032,27,8,203202),('2032-02-28',203209,2,2032,28,8,203202),('2032-02-29',203210,2,2032,29,9,203202),('2032-03-01',203210,3,2032,1,9,203203),('2032-03-02',203210,3,2032,2,9,203203),('2032-03-03',203210,3,2032,3,9,203203),('2032-03-04',203210,3,2032,4,9,203203),('2032-03-05',203210,3,2032,5,9,203203),('2032-03-06',203210,3,2032,6,9,203203),('2032-03-07',203211,3,2032,7,10,203203),('2032-03-08',203211,3,2032,8,10,203203),('2032-03-09',203211,3,2032,9,10,203203),('2032-03-10',203211,3,2032,10,10,203203),('2032-03-11',203211,3,2032,11,10,203203),('2032-03-12',203211,3,2032,12,10,203203),('2032-03-13',203211,3,2032,13,10,203203),('2032-03-14',203212,3,2032,14,11,203203),('2032-03-15',203212,3,2032,15,11,203203),('2032-03-16',203212,3,2032,16,11,203203),('2032-03-17',203212,3,2032,17,11,203203),('2032-03-18',203212,3,2032,18,11,203203),('2032-03-19',203212,3,2032,19,11,203203),('2032-03-20',203212,3,2032,20,11,203203),('2032-03-21',203213,3,2032,21,12,203203),('2032-03-22',203213,3,2032,22,12,203203),('2032-03-23',203213,3,2032,23,12,203203),('2032-03-24',203213,3,2032,24,12,203203),('2032-03-25',203213,3,2032,25,12,203203),('2032-03-26',203213,3,2032,26,12,203203),('2032-03-27',203213,3,2032,27,12,203203),('2032-03-28',203214,3,2032,28,13,203203),('2032-03-29',203214,3,2032,29,13,203203),('2032-03-30',203214,3,2032,30,13,203203),('2032-03-31',203214,3,2032,31,13,203203),('2032-04-01',203214,4,2032,1,13,203204),('2032-04-02',203214,4,2032,2,13,203204),('2032-04-03',203214,4,2032,3,13,203204),('2032-04-04',203215,4,2032,4,14,203204),('2032-04-05',203215,4,2032,5,14,203204),('2032-04-06',203215,4,2032,6,14,203204),('2032-04-07',203215,4,2032,7,14,203204),('2032-04-08',203215,4,2032,8,14,203204),('2032-04-09',203215,4,2032,9,14,203204),('2032-04-10',203215,4,2032,10,14,203204),('2032-04-11',203216,4,2032,11,15,203204),('2032-04-12',203216,4,2032,12,15,203204),('2032-04-13',203216,4,2032,13,15,203204),('2032-04-14',203216,4,2032,14,15,203204),('2032-04-15',203216,4,2032,15,15,203204),('2032-04-16',203216,4,2032,16,15,203204),('2032-04-17',203216,4,2032,17,15,203204),('2032-04-18',203217,4,2032,18,16,203204),('2032-04-19',203217,4,2032,19,16,203204),('2032-04-20',203217,4,2032,20,16,203204),('2032-04-21',203217,4,2032,21,16,203204),('2032-04-22',203217,4,2032,22,16,203204),('2032-04-23',203217,4,2032,23,16,203204),('2032-04-24',203217,4,2032,24,16,203204),('2032-04-25',203218,4,2032,25,17,203204),('2032-04-26',203218,4,2032,26,17,203204),('2032-04-27',203218,4,2032,27,17,203204),('2032-04-28',203218,4,2032,28,17,203204),('2032-04-29',203218,4,2032,29,17,203204),('2032-04-30',203218,4,2032,30,17,203204),('2032-05-01',203218,5,2032,1,17,203205),('2032-05-02',203219,5,2032,2,18,203205),('2032-05-03',203219,5,2032,3,18,203205),('2032-05-04',203219,5,2032,4,18,203205),('2032-05-05',203219,5,2032,5,18,203205),('2032-05-06',203219,5,2032,6,18,203205),('2032-05-07',203219,5,2032,7,18,203205),('2032-05-08',203219,5,2032,8,18,203205),('2032-05-09',203220,5,2032,9,19,203205),('2032-05-10',203220,5,2032,10,19,203205),('2032-05-11',203220,5,2032,11,19,203205),('2032-05-12',203220,5,2032,12,19,203205),('2032-05-13',203220,5,2032,13,19,203205),('2032-05-14',203220,5,2032,14,19,203205),('2032-05-15',203220,5,2032,15,19,203205),('2032-05-16',203221,5,2032,16,20,203205),('2032-05-17',203221,5,2032,17,20,203205),('2032-05-18',203221,5,2032,18,20,203205),('2032-05-19',203221,5,2032,19,20,203205),('2032-05-20',203221,5,2032,20,20,203205),('2032-05-21',203221,5,2032,21,20,203205),('2032-05-22',203221,5,2032,22,20,203205),('2032-05-23',203222,5,2032,23,21,203205),('2032-05-24',203222,5,2032,24,21,203205),('2032-05-25',203222,5,2032,25,21,203205),('2032-05-26',203222,5,2032,26,21,203205),('2032-05-27',203222,5,2032,27,21,203205),('2032-05-28',203222,5,2032,28,21,203205),('2032-05-29',203222,5,2032,29,21,203205),('2032-05-30',203223,5,2032,30,22,203205),('2032-05-31',203223,5,2032,31,22,203205),('2032-06-01',203223,6,2032,1,22,203206),('2032-06-02',203223,6,2032,2,22,203206),('2032-06-03',203223,6,2032,3,22,203206),('2032-06-04',203223,6,2032,4,22,203206),('2032-06-05',203223,6,2032,5,22,203206),('2032-06-06',203224,6,2032,6,23,203206),('2032-06-07',203224,6,2032,7,23,203206),('2032-06-08',203224,6,2032,8,23,203206),('2032-06-09',203224,6,2032,9,23,203206),('2032-06-10',203224,6,2032,10,23,203206),('2032-06-11',203224,6,2032,11,23,203206),('2032-06-12',203224,6,2032,12,23,203206),('2032-06-13',203225,6,2032,13,24,203206),('2032-06-14',203225,6,2032,14,24,203206),('2032-06-15',203225,6,2032,15,24,203206),('2032-06-16',203225,6,2032,16,24,203206),('2032-06-17',203225,6,2032,17,24,203206),('2032-06-18',203225,6,2032,18,24,203206),('2032-06-19',203225,6,2032,19,24,203206),('2032-06-20',203226,6,2032,20,25,203206),('2032-06-21',203226,6,2032,21,25,203206),('2032-06-22',203226,6,2032,22,25,203206),('2032-06-23',203226,6,2032,23,25,203206),('2032-06-24',203226,6,2032,24,25,203206),('2032-06-25',203226,6,2032,25,25,203206),('2032-06-26',203226,6,2032,26,25,203206),('2032-06-27',203227,6,2032,27,26,203206),('2032-06-28',203227,6,2032,28,26,203206),('2032-06-29',203227,6,2032,29,26,203206),('2032-06-30',203227,6,2032,30,26,203206),('2032-07-01',203227,7,2032,1,26,203207),('2032-07-02',203227,7,2032,2,26,203207),('2032-07-03',203227,7,2032,3,26,203207),('2032-07-04',203228,7,2032,4,27,203207),('2032-07-05',203228,7,2032,5,27,203207),('2032-07-06',203228,7,2032,6,27,203207),('2032-07-07',203228,7,2032,7,27,203207),('2032-07-08',203228,7,2032,8,27,203207),('2032-07-09',203228,7,2032,9,27,203207),('2032-07-10',203228,7,2032,10,27,203207),('2032-07-11',203229,7,2032,11,28,203207),('2032-07-12',203229,7,2032,12,28,203207),('2032-07-13',203229,7,2032,13,28,203207),('2032-07-14',203229,7,2032,14,28,203207),('2032-07-15',203229,7,2032,15,28,203207),('2032-07-16',203229,7,2032,16,28,203207),('2032-07-17',203229,7,2032,17,28,203207),('2032-07-18',203230,7,2032,18,29,203207),('2032-07-19',203230,7,2032,19,29,203207),('2032-07-20',203230,7,2032,20,29,203207),('2032-07-21',203230,7,2032,21,29,203207),('2032-07-22',203230,7,2032,22,29,203207),('2032-07-23',203230,7,2032,23,29,203207),('2032-07-24',203230,7,2032,24,29,203207),('2032-07-25',203231,7,2032,25,30,203207),('2032-07-26',203231,7,2032,26,30,203207),('2032-07-27',203231,7,2032,27,30,203207),('2032-07-28',203231,7,2032,28,30,203207),('2032-07-29',203231,7,2032,29,30,203207),('2032-07-30',203231,7,2032,30,30,203207),('2032-07-31',203231,7,2032,31,30,203207),('2032-08-01',203232,8,2032,1,31,203208),('2032-08-02',203232,8,2032,2,31,203208),('2032-08-03',203232,8,2032,3,31,203208),('2032-08-04',203232,8,2032,4,31,203208),('2032-08-05',203232,8,2032,5,31,203208),('2032-08-06',203232,8,2032,6,31,203208),('2032-08-07',203232,8,2032,7,31,203208),('2032-08-08',203233,8,2032,8,32,203208),('2032-08-09',203233,8,2032,9,32,203208),('2032-08-10',203233,8,2032,10,32,203208),('2032-08-11',203233,8,2032,11,32,203208),('2032-08-12',203233,8,2032,12,32,203208),('2032-08-13',203233,8,2032,13,32,203208),('2032-08-14',203233,8,2032,14,32,203208),('2032-08-15',203234,8,2032,15,33,203208),('2032-08-16',203234,8,2032,16,33,203208),('2032-08-17',203234,8,2032,17,33,203208),('2032-08-18',203234,8,2032,18,33,203208),('2032-08-19',203234,8,2032,19,33,203208),('2032-08-20',203234,8,2032,20,33,203208),('2032-08-21',203234,8,2032,21,33,203208),('2032-08-22',203235,8,2032,22,34,203208),('2032-08-23',203235,8,2032,23,34,203208),('2032-08-24',203235,8,2032,24,34,203208),('2032-08-25',203235,8,2032,25,34,203208),('2032-08-26',203235,8,2032,26,34,203208),('2032-08-27',203235,8,2032,27,34,203208),('2032-08-28',203235,8,2032,28,34,203208),('2032-08-29',203236,8,2032,29,35,203208),('2032-08-30',203236,8,2032,30,35,203208),('2032-08-31',203236,8,2032,31,35,203208),('2032-09-01',203236,9,2032,1,35,203209),('2032-09-02',203236,9,2032,2,35,203209),('2032-09-03',203236,9,2032,3,35,203209),('2032-09-04',203236,9,2032,4,35,203209),('2032-09-05',203237,9,2032,5,36,203209),('2032-09-06',203237,9,2032,6,36,203209),('2032-09-07',203237,9,2032,7,36,203209),('2032-09-08',203237,9,2032,8,36,203209),('2032-09-09',203237,9,2032,9,36,203209),('2032-09-10',203237,9,2032,10,36,203209),('2032-09-11',203237,9,2032,11,36,203209),('2032-09-12',203238,9,2032,12,37,203209),('2032-09-13',203238,9,2032,13,37,203209),('2032-09-14',203238,9,2032,14,37,203209),('2032-09-15',203238,9,2032,15,37,203209),('2032-09-16',203238,9,2032,16,37,203209),('2032-09-17',203238,9,2032,17,37,203209),('2032-09-18',203238,9,2032,18,37,203209),('2032-09-19',203239,9,2032,19,38,203209),('2032-09-20',203239,9,2032,20,38,203209),('2032-09-21',203239,9,2032,21,38,203209),('2032-09-22',203239,9,2032,22,38,203209),('2032-09-23',203239,9,2032,23,38,203209),('2032-09-24',203239,9,2032,24,38,203209),('2032-09-25',203239,9,2032,25,38,203209),('2032-09-26',203240,9,2032,26,39,203209),('2032-09-27',203240,9,2032,27,39,203209),('2032-09-28',203240,9,2032,28,39,203209),('2032-09-29',203240,9,2032,29,39,203209),('2032-09-30',203240,9,2032,30,39,203209),('2032-10-01',203240,10,2032,1,39,203210),('2032-10-02',203240,10,2032,2,39,203210),('2032-10-03',203241,10,2032,3,40,203210),('2032-10-04',203241,10,2032,4,40,203210),('2032-10-05',203241,10,2032,5,40,203210),('2032-10-06',203241,10,2032,6,40,203210),('2032-10-07',203241,10,2032,7,40,203210),('2032-10-08',203241,10,2032,8,40,203210),('2032-10-09',203241,10,2032,9,40,203210),('2032-10-10',203242,10,2032,10,41,203210),('2032-10-11',203242,10,2032,11,41,203210),('2032-10-12',203242,10,2032,12,41,203210),('2032-10-13',203242,10,2032,13,41,203210),('2032-10-14',203242,10,2032,14,41,203210),('2032-10-15',203242,10,2032,15,41,203210),('2032-10-16',203242,10,2032,16,41,203210),('2032-10-17',203243,10,2032,17,42,203210),('2032-10-18',203243,10,2032,18,42,203210),('2032-10-19',203243,10,2032,19,42,203210),('2032-10-20',203243,10,2032,20,42,203210),('2032-10-21',203243,10,2032,21,42,203210),('2032-10-22',203243,10,2032,22,42,203210),('2032-10-23',203243,10,2032,23,42,203210),('2032-10-24',203244,10,2032,24,43,203210),('2032-10-25',203244,10,2032,25,43,203210),('2032-10-26',203244,10,2032,26,43,203210),('2032-10-27',203244,10,2032,27,43,203210),('2032-10-28',203244,10,2032,28,43,203210),('2032-10-29',203244,10,2032,29,43,203210),('2032-10-30',203244,10,2032,30,43,203210),('2032-10-31',203245,10,2032,31,44,203210),('2032-11-01',203245,11,2032,1,44,203211),('2032-11-02',203245,11,2032,2,44,203211),('2032-11-03',203245,11,2032,3,44,203211),('2032-11-04',203245,11,2032,4,44,203211),('2032-11-05',203245,11,2032,5,44,203211),('2032-11-06',203245,11,2032,6,44,203211),('2032-11-07',203246,11,2032,7,45,203211),('2032-11-08',203246,11,2032,8,45,203211),('2032-11-09',203246,11,2032,9,45,203211),('2032-11-10',203246,11,2032,10,45,203211),('2032-11-11',203246,11,2032,11,45,203211),('2032-11-12',203246,11,2032,12,45,203211),('2032-11-13',203246,11,2032,13,45,203211),('2032-11-14',203247,11,2032,14,46,203211),('2032-11-15',203247,11,2032,15,46,203211),('2032-11-16',203247,11,2032,16,46,203211),('2032-11-17',203247,11,2032,17,46,203211),('2032-11-18',203247,11,2032,18,46,203211),('2032-11-19',203247,11,2032,19,46,203211),('2032-11-20',203247,11,2032,20,46,203211),('2032-11-21',203248,11,2032,21,47,203211),('2032-11-22',203248,11,2032,22,47,203211),('2032-11-23',203248,11,2032,23,47,203211),('2032-11-24',203248,11,2032,24,47,203211),('2032-11-25',203248,11,2032,25,47,203211),('2032-11-26',203248,11,2032,26,47,203211),('2032-11-27',203248,11,2032,27,47,203211),('2032-11-28',203249,11,2032,28,48,203211),('2032-11-29',203249,11,2032,29,48,203211),('2032-11-30',203249,11,2032,30,48,203211),('2032-12-01',203249,12,2032,1,48,203212),('2032-12-02',203249,12,2032,2,48,203212),('2032-12-03',203249,12,2032,3,48,203212),('2032-12-04',203249,12,2032,4,48,203212),('2032-12-05',203250,12,2032,5,49,203212),('2032-12-06',203250,12,2032,6,49,203212),('2032-12-07',203250,12,2032,7,49,203212),('2032-12-08',203250,12,2032,8,49,203212),('2032-12-09',203250,12,2032,9,49,203212),('2032-12-10',203250,12,2032,10,49,203212),('2032-12-11',203250,12,2032,11,49,203212),('2032-12-12',203251,12,2032,12,50,203212),('2032-12-13',203251,12,2032,13,50,203212),('2032-12-14',203251,12,2032,14,50,203212),('2032-12-15',203251,12,2032,15,50,203212),('2032-12-16',203251,12,2032,16,50,203212),('2032-12-17',203251,12,2032,17,50,203212),('2032-12-18',203251,12,2032,18,50,203212),('2032-12-19',203252,12,2032,19,51,203212),('2032-12-20',203252,12,2032,20,51,203212),('2032-12-21',203252,12,2032,21,51,203212),('2032-12-22',203252,12,2032,22,51,203212),('2032-12-23',203252,12,2032,23,51,203212),('2032-12-24',203252,12,2032,24,51,203212),('2032-12-25',203252,12,2032,25,51,203212),('2032-12-26',203253,12,2032,26,52,203212),('2032-12-27',203253,12,2032,27,52,203212),('2032-12-28',203253,12,2032,28,52,203212),('2032-12-29',203253,12,2032,29,52,203212),('2032-12-30',203253,12,2032,30,52,203212),('2032-12-31',203253,12,2032,31,52,203212),('2033-01-01',203353,1,2033,1,52,203301),('2033-01-02',203354,1,2033,2,1,203301),('2033-01-03',203301,1,2033,3,1,203301),('2033-01-04',203301,1,2033,4,1,203301),('2033-01-05',203301,1,2033,5,1,203301),('2033-01-06',203301,1,2033,6,1,203301),('2033-01-07',203301,1,2033,7,1,203301),('2033-01-08',203301,1,2033,8,1,203301),('2033-01-09',203302,1,2033,9,2,203301),('2033-01-10',203302,1,2033,10,2,203301),('2033-01-11',203302,1,2033,11,2,203301),('2033-01-12',203302,1,2033,12,2,203301),('2033-01-13',203302,1,2033,13,2,203301),('2033-01-14',203302,1,2033,14,2,203301),('2033-01-15',203302,1,2033,15,2,203301),('2033-01-16',203303,1,2033,16,3,203301),('2033-01-17',203303,1,2033,17,3,203301),('2033-01-18',203303,1,2033,18,3,203301),('2033-01-19',203303,1,2033,19,3,203301),('2033-01-20',203303,1,2033,20,3,203301),('2033-01-21',203303,1,2033,21,3,203301),('2033-01-22',203303,1,2033,22,3,203301),('2033-01-23',203304,1,2033,23,4,203301),('2033-01-24',203304,1,2033,24,4,203301),('2033-01-25',203304,1,2033,25,4,203301),('2033-01-26',203304,1,2033,26,4,203301),('2033-01-27',203304,1,2033,27,4,203301),('2033-01-28',203304,1,2033,28,4,203301),('2033-01-29',203304,1,2033,29,4,203301),('2033-01-30',203305,1,2033,30,5,203301),('2033-01-31',203305,1,2033,31,5,203301),('2033-02-01',203305,2,2033,1,5,203302),('2033-02-02',203305,2,2033,2,5,203302),('2033-02-03',203305,2,2033,3,5,203302),('2033-02-04',203305,2,2033,4,5,203302),('2033-02-05',203305,2,2033,5,5,203302),('2033-02-06',203306,2,2033,6,6,203302),('2033-02-07',203306,2,2033,7,6,203302),('2033-02-08',203306,2,2033,8,6,203302),('2033-02-09',203306,2,2033,9,6,203302),('2033-02-10',203306,2,2033,10,6,203302),('2033-02-11',203306,2,2033,11,6,203302),('2033-02-12',203306,2,2033,12,6,203302),('2033-02-13',203307,2,2033,13,7,203302),('2033-02-14',203307,2,2033,14,7,203302),('2033-02-15',203307,2,2033,15,7,203302),('2033-02-16',203307,2,2033,16,7,203302),('2033-02-17',203307,2,2033,17,7,203302),('2033-02-18',203307,2,2033,18,7,203302),('2033-02-19',203307,2,2033,19,7,203302),('2033-02-20',203308,2,2033,20,8,203302),('2033-02-21',203308,2,2033,21,8,203302),('2033-02-22',203308,2,2033,22,8,203302),('2033-02-23',203308,2,2033,23,8,203302),('2033-02-24',203308,2,2033,24,8,203302),('2033-02-25',203308,2,2033,25,8,203302),('2033-02-26',203308,2,2033,26,8,203302),('2033-02-27',203309,2,2033,27,9,203302),('2033-02-28',203309,2,2033,28,9,203302),('2033-03-01',203309,3,2033,1,9,203303),('2033-03-02',203309,3,2033,2,9,203303),('2033-03-03',203309,3,2033,3,9,203303),('2033-03-04',203309,3,2033,4,9,203303),('2033-03-05',203309,3,2033,5,9,203303),('2033-03-06',203310,3,2033,6,10,203303),('2033-03-07',203310,3,2033,7,10,203303),('2033-03-08',203310,3,2033,8,10,203303),('2033-03-09',203310,3,2033,9,10,203303),('2033-03-10',203310,3,2033,10,10,203303),('2033-03-11',203310,3,2033,11,10,203303),('2033-03-12',203310,3,2033,12,10,203303),('2033-03-13',203311,3,2033,13,11,203303),('2033-03-14',203311,3,2033,14,11,203303),('2033-03-15',203311,3,2033,15,11,203303),('2033-03-16',203311,3,2033,16,11,203303),('2033-03-17',203311,3,2033,17,11,203303),('2033-03-18',203311,3,2033,18,11,203303),('2033-03-19',203311,3,2033,19,11,203303),('2033-03-20',203312,3,2033,20,12,203303),('2033-03-21',203312,3,2033,21,12,203303),('2033-03-22',203312,3,2033,22,12,203303),('2033-03-23',203312,3,2033,23,12,203303),('2033-03-24',203312,3,2033,24,12,203303),('2033-03-25',203312,3,2033,25,12,203303),('2033-03-26',203312,3,2033,26,12,203303),('2033-03-27',203313,3,2033,27,13,203303),('2033-03-28',203313,3,2033,28,13,203303),('2033-03-29',203313,3,2033,29,13,203303),('2033-03-30',203313,3,2033,30,13,203303),('2033-03-31',203313,3,2033,31,13,203303),('2033-04-01',203313,4,2033,1,13,203304),('2033-04-02',203313,4,2033,2,13,203304),('2033-04-03',203314,4,2033,3,14,203304),('2033-04-04',203314,4,2033,4,14,203304),('2033-04-05',203314,4,2033,5,14,203304),('2033-04-06',203314,4,2033,6,14,203304),('2033-04-07',203314,4,2033,7,14,203304),('2033-04-08',203314,4,2033,8,14,203304),('2033-04-09',203314,4,2033,9,14,203304),('2033-04-10',203315,4,2033,10,15,203304),('2033-04-11',203315,4,2033,11,15,203304),('2033-04-12',203315,4,2033,12,15,203304),('2033-04-13',203315,4,2033,13,15,203304),('2033-04-14',203315,4,2033,14,15,203304),('2033-04-15',203315,4,2033,15,15,203304),('2033-04-16',203315,4,2033,16,15,203304),('2033-04-17',203316,4,2033,17,16,203304),('2033-04-18',203316,4,2033,18,16,203304),('2033-04-19',203316,4,2033,19,16,203304),('2033-04-20',203316,4,2033,20,16,203304),('2033-04-21',203316,4,2033,21,16,203304),('2033-04-22',203316,4,2033,22,16,203304),('2033-04-23',203316,4,2033,23,16,203304),('2033-04-24',203317,4,2033,24,17,203304),('2033-04-25',203317,4,2033,25,17,203304),('2033-04-26',203317,4,2033,26,17,203304),('2033-04-27',203317,4,2033,27,17,203304),('2033-04-28',203317,4,2033,28,17,203304),('2033-04-29',203317,4,2033,29,17,203304),('2033-04-30',203317,4,2033,30,17,203304),('2033-05-01',203318,5,2033,1,18,203305),('2033-05-02',203318,5,2033,2,18,203305),('2033-05-03',203318,5,2033,3,18,203305),('2033-05-04',203318,5,2033,4,18,203305),('2033-05-05',203318,5,2033,5,18,203305),('2033-05-06',203318,5,2033,6,18,203305),('2033-05-07',203318,5,2033,7,18,203305),('2033-05-08',203319,5,2033,8,19,203305),('2033-05-09',203319,5,2033,9,19,203305),('2033-05-10',203319,5,2033,10,19,203305),('2033-05-11',203319,5,2033,11,19,203305),('2033-05-12',203319,5,2033,12,19,203305),('2033-05-13',203319,5,2033,13,19,203305),('2033-05-14',203319,5,2033,14,19,203305),('2033-05-15',203320,5,2033,15,20,203305),('2033-05-16',203320,5,2033,16,20,203305),('2033-05-17',203320,5,2033,17,20,203305),('2033-05-18',203320,5,2033,18,20,203305),('2033-05-19',203320,5,2033,19,20,203305),('2033-05-20',203320,5,2033,20,20,203305),('2033-05-21',203320,5,2033,21,20,203305),('2033-05-22',203321,5,2033,22,21,203305),('2033-05-23',203321,5,2033,23,21,203305),('2033-05-24',203321,5,2033,24,21,203305),('2033-05-25',203321,5,2033,25,21,203305),('2033-05-26',203321,5,2033,26,21,203305),('2033-05-27',203321,5,2033,27,21,203305),('2033-05-28',203321,5,2033,28,21,203305),('2033-05-29',203322,5,2033,29,22,203305),('2033-05-30',203322,5,2033,30,22,203305),('2033-05-31',203322,5,2033,31,22,203305),('2033-06-01',203322,6,2033,1,22,203306),('2033-06-02',203322,6,2033,2,22,203306),('2033-06-03',203322,6,2033,3,22,203306),('2033-06-04',203322,6,2033,4,22,203306),('2033-06-05',203323,6,2033,5,23,203306),('2033-06-06',203323,6,2033,6,23,203306),('2033-06-07',203323,6,2033,7,23,203306),('2033-06-08',203323,6,2033,8,23,203306),('2033-06-09',203323,6,2033,9,23,203306),('2033-06-10',203323,6,2033,10,23,203306),('2033-06-11',203323,6,2033,11,23,203306),('2033-06-12',203324,6,2033,12,24,203306),('2033-06-13',203324,6,2033,13,24,203306),('2033-06-14',203324,6,2033,14,24,203306),('2033-06-15',203324,6,2033,15,24,203306),('2033-06-16',203324,6,2033,16,24,203306),('2033-06-17',203324,6,2033,17,24,203306),('2033-06-18',203324,6,2033,18,24,203306),('2033-06-19',203325,6,2033,19,25,203306),('2033-06-20',203325,6,2033,20,25,203306),('2033-06-21',203325,6,2033,21,25,203306),('2033-06-22',203325,6,2033,22,25,203306),('2033-06-23',203325,6,2033,23,25,203306),('2033-06-24',203325,6,2033,24,25,203306),('2033-06-25',203325,6,2033,25,25,203306),('2033-06-26',203326,6,2033,26,26,203306),('2033-06-27',203326,6,2033,27,26,203306),('2033-06-28',203326,6,2033,28,26,203306),('2033-06-29',203326,6,2033,29,26,203306),('2033-06-30',203326,6,2033,30,26,203306),('2033-07-01',203326,7,2033,1,26,203307),('2033-07-02',203326,7,2033,2,26,203307),('2033-07-03',203327,7,2033,3,27,203307),('2033-07-04',203327,7,2033,4,27,203307),('2033-07-05',203327,7,2033,5,27,203307),('2033-07-06',203327,7,2033,6,27,203307),('2033-07-07',203327,7,2033,7,27,203307),('2033-07-08',203327,7,2033,8,27,203307),('2033-07-09',203327,7,2033,9,27,203307),('2033-07-10',203328,7,2033,10,28,203307),('2033-07-11',203328,7,2033,11,28,203307),('2033-07-12',203328,7,2033,12,28,203307),('2033-07-13',203328,7,2033,13,28,203307),('2033-07-14',203328,7,2033,14,28,203307),('2033-07-15',203328,7,2033,15,28,203307),('2033-07-16',203328,7,2033,16,28,203307),('2033-07-17',203329,7,2033,17,29,203307),('2033-07-18',203329,7,2033,18,29,203307),('2033-07-19',203329,7,2033,19,29,203307),('2033-07-20',203329,7,2033,20,29,203307),('2033-07-21',203329,7,2033,21,29,203307),('2033-07-22',203329,7,2033,22,29,203307),('2033-07-23',203329,7,2033,23,29,203307),('2033-07-24',203330,7,2033,24,30,203307),('2033-07-25',203330,7,2033,25,30,203307),('2033-07-26',203330,7,2033,26,30,203307),('2033-07-27',203330,7,2033,27,30,203307),('2033-07-28',203330,7,2033,28,30,203307),('2033-07-29',203330,7,2033,29,30,203307),('2033-07-30',203330,7,2033,30,30,203307),('2033-07-31',203331,7,2033,31,31,203307),('2033-08-01',203331,8,2033,1,31,203308),('2033-08-02',203331,8,2033,2,31,203308),('2033-08-03',203331,8,2033,3,31,203308),('2033-08-04',203331,8,2033,4,31,203308),('2033-08-05',203331,8,2033,5,31,203308),('2033-08-06',203331,8,2033,6,31,203308),('2033-08-07',203332,8,2033,7,32,203308),('2033-08-08',203332,8,2033,8,32,203308),('2033-08-09',203332,8,2033,9,32,203308),('2033-08-10',203332,8,2033,10,32,203308),('2033-08-11',203332,8,2033,11,32,203308),('2033-08-12',203332,8,2033,12,32,203308),('2033-08-13',203332,8,2033,13,32,203308),('2033-08-14',203333,8,2033,14,33,203308),('2033-08-15',203333,8,2033,15,33,203308),('2033-08-16',203333,8,2033,16,33,203308),('2033-08-17',203333,8,2033,17,33,203308),('2033-08-18',203333,8,2033,18,33,203308),('2033-08-19',203333,8,2033,19,33,203308),('2033-08-20',203333,8,2033,20,33,203308),('2033-08-21',203334,8,2033,21,34,203308),('2033-08-22',203334,8,2033,22,34,203308),('2033-08-23',203334,8,2033,23,34,203308),('2033-08-24',203334,8,2033,24,34,203308),('2033-08-25',203334,8,2033,25,34,203308),('2033-08-26',203334,8,2033,26,34,203308),('2033-08-27',203334,8,2033,27,34,203308),('2033-08-28',203335,8,2033,28,35,203308),('2033-08-29',203335,8,2033,29,35,203308),('2033-08-30',203335,8,2033,30,35,203308),('2033-08-31',203335,8,2033,31,35,203308),('2033-09-01',203335,9,2033,1,35,203309),('2033-09-02',203335,9,2033,2,35,203309),('2033-09-03',203335,9,2033,3,35,203309),('2033-09-04',203336,9,2033,4,36,203309),('2033-09-05',203336,9,2033,5,36,203309),('2033-09-06',203336,9,2033,6,36,203309),('2033-09-07',203336,9,2033,7,36,203309),('2033-09-08',203336,9,2033,8,36,203309),('2033-09-09',203336,9,2033,9,36,203309),('2033-09-10',203336,9,2033,10,36,203309),('2033-09-11',203337,9,2033,11,37,203309),('2033-09-12',203337,9,2033,12,37,203309),('2033-09-13',203337,9,2033,13,37,203309),('2033-09-14',203337,9,2033,14,37,203309),('2033-09-15',203337,9,2033,15,37,203309),('2033-09-16',203337,9,2033,16,37,203309),('2033-09-17',203337,9,2033,17,37,203309),('2033-09-18',203338,9,2033,18,38,203309),('2033-09-19',203338,9,2033,19,38,203309),('2033-09-20',203338,9,2033,20,38,203309),('2033-09-21',203338,9,2033,21,38,203309),('2033-09-22',203338,9,2033,22,38,203309),('2033-09-23',203338,9,2033,23,38,203309),('2033-09-24',203338,9,2033,24,38,203309),('2033-09-25',203339,9,2033,25,39,203309),('2033-09-26',203339,9,2033,26,39,203309),('2033-09-27',203339,9,2033,27,39,203309),('2033-09-28',203339,9,2033,28,39,203309),('2033-09-29',203339,9,2033,29,39,203309),('2033-09-30',203339,9,2033,30,39,203309),('2033-10-01',203339,10,2033,1,39,203310),('2033-10-02',203340,10,2033,2,40,203310),('2033-10-03',203340,10,2033,3,40,203310),('2033-10-04',203340,10,2033,4,40,203310),('2033-10-05',203340,10,2033,5,40,203310),('2033-10-06',203340,10,2033,6,40,203310),('2033-10-07',203340,10,2033,7,40,203310),('2033-10-08',203340,10,2033,8,40,203310),('2033-10-09',203341,10,2033,9,41,203310),('2033-10-10',203341,10,2033,10,41,203310),('2033-10-11',203341,10,2033,11,41,203310),('2033-10-12',203341,10,2033,12,41,203310),('2033-10-13',203341,10,2033,13,41,203310),('2033-10-14',203341,10,2033,14,41,203310),('2033-10-15',203341,10,2033,15,41,203310),('2033-10-16',203342,10,2033,16,42,203310),('2033-10-17',203342,10,2033,17,42,203310),('2033-10-18',203342,10,2033,18,42,203310),('2033-10-19',203342,10,2033,19,42,203310),('2033-10-20',203342,10,2033,20,42,203310),('2033-10-21',203342,10,2033,21,42,203310),('2033-10-22',203342,10,2033,22,42,203310),('2033-10-23',203343,10,2033,23,43,203310),('2033-10-24',203343,10,2033,24,43,203310),('2033-10-25',203343,10,2033,25,43,203310),('2033-10-26',203343,10,2033,26,43,203310),('2033-10-27',203343,10,2033,27,43,203310),('2033-10-28',203343,10,2033,28,43,203310),('2033-10-29',203343,10,2033,29,43,203310),('2033-10-30',203344,10,2033,30,44,203310),('2033-10-31',203344,10,2033,31,44,203310),('2033-11-01',203344,11,2033,1,44,203311),('2033-11-02',203344,11,2033,2,44,203311),('2033-11-03',203344,11,2033,3,44,203311),('2033-11-04',203344,11,2033,4,44,203311),('2033-11-05',203344,11,2033,5,44,203311),('2033-11-06',203345,11,2033,6,45,203311),('2033-11-07',203345,11,2033,7,45,203311),('2033-11-08',203345,11,2033,8,45,203311),('2033-11-09',203345,11,2033,9,45,203311),('2033-11-10',203345,11,2033,10,45,203311),('2033-11-11',203345,11,2033,11,45,203311),('2033-11-12',203345,11,2033,12,45,203311),('2033-11-13',203346,11,2033,13,46,203311),('2033-11-14',203346,11,2033,14,46,203311),('2033-11-15',203346,11,2033,15,46,203311),('2033-11-16',203346,11,2033,16,46,203311),('2033-11-17',203346,11,2033,17,46,203311),('2033-11-18',203346,11,2033,18,46,203311),('2033-11-19',203346,11,2033,19,46,203311),('2033-11-20',203347,11,2033,20,47,203311),('2033-11-21',203347,11,2033,21,47,203311),('2033-11-22',203347,11,2033,22,47,203311),('2033-11-23',203347,11,2033,23,47,203311),('2033-11-24',203347,11,2033,24,47,203311),('2033-11-25',203347,11,2033,25,47,203311),('2033-11-26',203347,11,2033,26,47,203311),('2033-11-27',203348,11,2033,27,48,203311),('2033-11-28',203348,11,2033,28,48,203311),('2033-11-29',203348,11,2033,29,48,203311),('2033-11-30',203348,11,2033,30,48,203311),('2033-12-01',203348,12,2033,1,48,203312),('2033-12-02',203348,12,2033,2,48,203312),('2033-12-03',203348,12,2033,3,48,203312),('2033-12-04',203349,12,2033,4,49,203312),('2033-12-05',203349,12,2033,5,49,203312),('2033-12-06',203349,12,2033,6,49,203312),('2033-12-07',203349,12,2033,7,49,203312),('2033-12-08',203349,12,2033,8,49,203312),('2033-12-09',203349,12,2033,9,49,203312),('2033-12-10',203349,12,2033,10,49,203312),('2033-12-11',203350,12,2033,11,50,203312),('2033-12-12',203350,12,2033,12,50,203312),('2033-12-13',203350,12,2033,13,50,203312),('2033-12-14',203350,12,2033,14,50,203312),('2033-12-15',203350,12,2033,15,50,203312),('2033-12-16',203350,12,2033,16,50,203312),('2033-12-17',203350,12,2033,17,50,203312),('2033-12-18',203351,12,2033,18,51,203312),('2033-12-19',203351,12,2033,19,51,203312),('2033-12-20',203351,12,2033,20,51,203312),('2033-12-21',203351,12,2033,21,51,203312),('2033-12-22',203351,12,2033,22,51,203312),('2033-12-23',203351,12,2033,23,51,203312),('2033-12-24',203351,12,2033,24,51,203312),('2033-12-25',203352,12,2033,25,52,203312),('2033-12-26',203352,12,2033,26,52,203312),('2033-12-27',203352,12,2033,27,52,203312),('2033-12-28',203352,12,2033,28,52,203312),('2033-12-29',203352,12,2033,29,52,203312),('2033-12-30',203352,12,2033,30,52,203312),('2033-12-31',203352,12,2033,31,52,203312),('2034-01-01',203453,1,2034,1,1,203401),('2034-01-02',203401,1,2034,2,1,203401),('2034-01-03',203401,1,2034,3,1,203401),('2034-01-04',203401,1,2034,4,1,203401),('2034-01-05',203401,1,2034,5,1,203401),('2034-01-06',203401,1,2034,6,1,203401),('2034-01-07',203401,1,2034,7,1,203401),('2034-01-08',203402,1,2034,8,2,203401),('2034-01-09',203402,1,2034,9,2,203401),('2034-01-10',203402,1,2034,10,2,203401),('2034-01-11',203402,1,2034,11,2,203401),('2034-01-12',203402,1,2034,12,2,203401),('2034-01-13',203402,1,2034,13,2,203401),('2034-01-14',203402,1,2034,14,2,203401),('2034-01-15',203403,1,2034,15,3,203401),('2034-01-16',203403,1,2034,16,3,203401),('2034-01-17',203403,1,2034,17,3,203401),('2034-01-18',203403,1,2034,18,3,203401),('2034-01-19',203403,1,2034,19,3,203401),('2034-01-20',203403,1,2034,20,3,203401),('2034-01-21',203403,1,2034,21,3,203401),('2034-01-22',203404,1,2034,22,4,203401),('2034-01-23',203404,1,2034,23,4,203401),('2034-01-24',203404,1,2034,24,4,203401),('2034-01-25',203404,1,2034,25,4,203401),('2034-01-26',203404,1,2034,26,4,203401),('2034-01-27',203404,1,2034,27,4,203401),('2034-01-28',203404,1,2034,28,4,203401),('2034-01-29',203405,1,2034,29,5,203401),('2034-01-30',203405,1,2034,30,5,203401),('2034-01-31',203405,1,2034,31,5,203401),('2034-02-01',203405,2,2034,1,5,203402),('2034-02-02',203405,2,2034,2,5,203402),('2034-02-03',203405,2,2034,3,5,203402),('2034-02-04',203405,2,2034,4,5,203402),('2034-02-05',203406,2,2034,5,6,203402),('2034-02-06',203406,2,2034,6,6,203402),('2034-02-07',203406,2,2034,7,6,203402),('2034-02-08',203406,2,2034,8,6,203402),('2034-02-09',203406,2,2034,9,6,203402),('2034-02-10',203406,2,2034,10,6,203402),('2034-02-11',203406,2,2034,11,6,203402),('2034-02-12',203407,2,2034,12,7,203402),('2034-02-13',203407,2,2034,13,7,203402),('2034-02-14',203407,2,2034,14,7,203402),('2034-02-15',203407,2,2034,15,7,203402),('2034-02-16',203407,2,2034,16,7,203402),('2034-02-17',203407,2,2034,17,7,203402),('2034-02-18',203407,2,2034,18,7,203402),('2034-02-19',203408,2,2034,19,8,203402),('2034-02-20',203408,2,2034,20,8,203402),('2034-02-21',203408,2,2034,21,8,203402),('2034-02-22',203408,2,2034,22,8,203402),('2034-02-23',203408,2,2034,23,8,203402),('2034-02-24',203408,2,2034,24,8,203402),('2034-02-25',203408,2,2034,25,8,203402),('2034-02-26',203409,2,2034,26,9,203402),('2034-02-27',203409,2,2034,27,9,203402),('2034-02-28',203409,2,2034,28,9,203402),('2034-03-01',203409,3,2034,1,9,203403),('2034-03-02',203409,3,2034,2,9,203403),('2034-03-03',203409,3,2034,3,9,203403),('2034-03-04',203409,3,2034,4,9,203403),('2034-03-05',203410,3,2034,5,10,203403),('2034-03-06',203410,3,2034,6,10,203403),('2034-03-07',203410,3,2034,7,10,203403),('2034-03-08',203410,3,2034,8,10,203403),('2034-03-09',203410,3,2034,9,10,203403),('2034-03-10',203410,3,2034,10,10,203403),('2034-03-11',203410,3,2034,11,10,203403),('2034-03-12',203411,3,2034,12,11,203403),('2034-03-13',203411,3,2034,13,11,203403),('2034-03-14',203411,3,2034,14,11,203403),('2034-03-15',203411,3,2034,15,11,203403),('2034-03-16',203411,3,2034,16,11,203403),('2034-03-17',203411,3,2034,17,11,203403),('2034-03-18',203411,3,2034,18,11,203403),('2034-03-19',203412,3,2034,19,12,203403),('2034-03-20',203412,3,2034,20,12,203403),('2034-03-21',203412,3,2034,21,12,203403),('2034-03-22',203412,3,2034,22,12,203403),('2034-03-23',203412,3,2034,23,12,203403),('2034-03-24',203412,3,2034,24,12,203403),('2034-03-25',203412,3,2034,25,12,203403),('2034-03-26',203413,3,2034,26,13,203403),('2034-03-27',203413,3,2034,27,13,203403),('2034-03-28',203413,3,2034,28,13,203403),('2034-03-29',203413,3,2034,29,13,203403),('2034-03-30',203413,3,2034,30,13,203403),('2034-03-31',203413,3,2034,31,13,203403),('2034-04-01',203413,4,2034,1,13,203404),('2034-04-02',203414,4,2034,2,14,203404),('2034-04-03',203414,4,2034,3,14,203404),('2034-04-04',203414,4,2034,4,14,203404),('2034-04-05',203414,4,2034,5,14,203404),('2034-04-06',203414,4,2034,6,14,203404),('2034-04-07',203414,4,2034,7,14,203404),('2034-04-08',203414,4,2034,8,14,203404),('2034-04-09',203415,4,2034,9,15,203404),('2034-04-10',203415,4,2034,10,15,203404),('2034-04-11',203415,4,2034,11,15,203404),('2034-04-12',203415,4,2034,12,15,203404),('2034-04-13',203415,4,2034,13,15,203404),('2034-04-14',203415,4,2034,14,15,203404),('2034-04-15',203415,4,2034,15,15,203404),('2034-04-16',203416,4,2034,16,16,203404),('2034-04-17',203416,4,2034,17,16,203404),('2034-04-18',203416,4,2034,18,16,203404),('2034-04-19',203416,4,2034,19,16,203404),('2034-04-20',203416,4,2034,20,16,203404),('2034-04-21',203416,4,2034,21,16,203404),('2034-04-22',203416,4,2034,22,16,203404),('2034-04-23',203417,4,2034,23,17,203404),('2034-04-24',203417,4,2034,24,17,203404),('2034-04-25',203417,4,2034,25,17,203404),('2034-04-26',203417,4,2034,26,17,203404),('2034-04-27',203417,4,2034,27,17,203404),('2034-04-28',203417,4,2034,28,17,203404),('2034-04-29',203417,4,2034,29,17,203404),('2034-04-30',203418,4,2034,30,18,203404),('2034-05-01',203418,5,2034,1,18,203405),('2034-05-02',203418,5,2034,2,18,203405),('2034-05-03',203418,5,2034,3,18,203405),('2034-05-04',203418,5,2034,4,18,203405),('2034-05-05',203418,5,2034,5,18,203405),('2034-05-06',203418,5,2034,6,18,203405),('2034-05-07',203419,5,2034,7,19,203405),('2034-05-08',203419,5,2034,8,19,203405),('2034-05-09',203419,5,2034,9,19,203405),('2034-05-10',203419,5,2034,10,19,203405),('2034-05-11',203419,5,2034,11,19,203405),('2034-05-12',203419,5,2034,12,19,203405),('2034-05-13',203419,5,2034,13,19,203405),('2034-05-14',203420,5,2034,14,20,203405),('2034-05-15',203420,5,2034,15,20,203405),('2034-05-16',203420,5,2034,16,20,203405),('2034-05-17',203420,5,2034,17,20,203405),('2034-05-18',203420,5,2034,18,20,203405),('2034-05-19',203420,5,2034,19,20,203405),('2034-05-20',203420,5,2034,20,20,203405),('2034-05-21',203421,5,2034,21,21,203405),('2034-05-22',203421,5,2034,22,21,203405),('2034-05-23',203421,5,2034,23,21,203405),('2034-05-24',203421,5,2034,24,21,203405),('2034-05-25',203421,5,2034,25,21,203405),('2034-05-26',203421,5,2034,26,21,203405),('2034-05-27',203421,5,2034,27,21,203405),('2034-05-28',203422,5,2034,28,22,203405),('2034-05-29',203422,5,2034,29,22,203405),('2034-05-30',203422,5,2034,30,22,203405),('2034-05-31',203422,5,2034,31,22,203405),('2034-06-01',203422,6,2034,1,22,203406),('2034-06-02',203422,6,2034,2,22,203406),('2034-06-03',203422,6,2034,3,22,203406),('2034-06-04',203423,6,2034,4,23,203406),('2034-06-05',203423,6,2034,5,23,203406),('2034-06-06',203423,6,2034,6,23,203406),('2034-06-07',203423,6,2034,7,23,203406),('2034-06-08',203423,6,2034,8,23,203406),('2034-06-09',203423,6,2034,9,23,203406),('2034-06-10',203423,6,2034,10,23,203406),('2034-06-11',203424,6,2034,11,24,203406),('2034-06-12',203424,6,2034,12,24,203406),('2034-06-13',203424,6,2034,13,24,203406),('2034-06-14',203424,6,2034,14,24,203406),('2034-06-15',203424,6,2034,15,24,203406),('2034-06-16',203424,6,2034,16,24,203406),('2034-06-17',203424,6,2034,17,24,203406),('2034-06-18',203425,6,2034,18,25,203406),('2034-06-19',203425,6,2034,19,25,203406),('2034-06-20',203425,6,2034,20,25,203406),('2034-06-21',203425,6,2034,21,25,203406),('2034-06-22',203425,6,2034,22,25,203406),('2034-06-23',203425,6,2034,23,25,203406),('2034-06-24',203425,6,2034,24,25,203406),('2034-06-25',203426,6,2034,25,26,203406),('2034-06-26',203426,6,2034,26,26,203406),('2034-06-27',203426,6,2034,27,26,203406),('2034-06-28',203426,6,2034,28,26,203406),('2034-06-29',203426,6,2034,29,26,203406),('2034-06-30',203426,6,2034,30,26,203406),('2034-07-01',203426,7,2034,1,26,203407),('2034-07-02',203427,7,2034,2,27,203407),('2034-07-03',203427,7,2034,3,27,203407),('2034-07-04',203427,7,2034,4,27,203407),('2034-07-05',203427,7,2034,5,27,203407),('2034-07-06',203427,7,2034,6,27,203407),('2034-07-07',203427,7,2034,7,27,203407),('2034-07-08',203427,7,2034,8,27,203407),('2034-07-09',203428,7,2034,9,28,203407),('2034-07-10',203428,7,2034,10,28,203407),('2034-07-11',203428,7,2034,11,28,203407),('2034-07-12',203428,7,2034,12,28,203407),('2034-07-13',203428,7,2034,13,28,203407),('2034-07-14',203428,7,2034,14,28,203407),('2034-07-15',203428,7,2034,15,28,203407),('2034-07-16',203429,7,2034,16,29,203407),('2034-07-17',203429,7,2034,17,29,203407),('2034-07-18',203429,7,2034,18,29,203407),('2034-07-19',203429,7,2034,19,29,203407),('2034-07-20',203429,7,2034,20,29,203407),('2034-07-21',203429,7,2034,21,29,203407),('2034-07-22',203429,7,2034,22,29,203407),('2034-07-23',203430,7,2034,23,30,203407),('2034-07-24',203430,7,2034,24,30,203407),('2034-07-25',203430,7,2034,25,30,203407),('2034-07-26',203430,7,2034,26,30,203407),('2034-07-27',203430,7,2034,27,30,203407),('2034-07-28',203430,7,2034,28,30,203407),('2034-07-29',203430,7,2034,29,30,203407),('2034-07-30',203431,7,2034,30,31,203407),('2034-07-31',203431,7,2034,31,31,203407),('2034-08-01',203431,8,2034,1,31,203408),('2034-08-02',203431,8,2034,2,31,203408),('2034-08-03',203431,8,2034,3,31,203408),('2034-08-04',203431,8,2034,4,31,203408),('2034-08-05',203431,8,2034,5,31,203408),('2034-08-06',203432,8,2034,6,32,203408),('2034-08-07',203432,8,2034,7,32,203408),('2034-08-08',203432,8,2034,8,32,203408),('2034-08-09',203432,8,2034,9,32,203408),('2034-08-10',203432,8,2034,10,32,203408),('2034-08-11',203432,8,2034,11,32,203408),('2034-08-12',203432,8,2034,12,32,203408),('2034-08-13',203433,8,2034,13,33,203408),('2034-08-14',203433,8,2034,14,33,203408),('2034-08-15',203433,8,2034,15,33,203408),('2034-08-16',203433,8,2034,16,33,203408),('2034-08-17',203433,8,2034,17,33,203408),('2034-08-18',203433,8,2034,18,33,203408),('2034-08-19',203433,8,2034,19,33,203408),('2034-08-20',203434,8,2034,20,34,203408),('2034-08-21',203434,8,2034,21,34,203408),('2034-08-22',203434,8,2034,22,34,203408),('2034-08-23',203434,8,2034,23,34,203408),('2034-08-24',203434,8,2034,24,34,203408),('2034-08-25',203434,8,2034,25,34,203408),('2034-08-26',203434,8,2034,26,34,203408),('2034-08-27',203435,8,2034,27,35,203408),('2034-08-28',203435,8,2034,28,35,203408),('2034-08-29',203435,8,2034,29,35,203408),('2034-08-30',203435,8,2034,30,35,203408),('2034-08-31',203435,8,2034,31,35,203408),('2034-09-01',203435,9,2034,1,35,203409),('2034-09-02',203435,9,2034,2,35,203409),('2034-09-03',203436,9,2034,3,36,203409),('2034-09-04',203436,9,2034,4,36,203409),('2034-09-05',203436,9,2034,5,36,203409),('2034-09-06',203436,9,2034,6,36,203409),('2034-09-07',203436,9,2034,7,36,203409),('2034-09-08',203436,9,2034,8,36,203409),('2034-09-09',203436,9,2034,9,36,203409),('2034-09-10',203437,9,2034,10,37,203409),('2034-09-11',203437,9,2034,11,37,203409),('2034-09-12',203437,9,2034,12,37,203409),('2034-09-13',203437,9,2034,13,37,203409),('2034-09-14',203437,9,2034,14,37,203409),('2034-09-15',203437,9,2034,15,37,203409),('2034-09-16',203437,9,2034,16,37,203409),('2034-09-17',203438,9,2034,17,38,203409),('2034-09-18',203438,9,2034,18,38,203409),('2034-09-19',203438,9,2034,19,38,203409),('2034-09-20',203438,9,2034,20,38,203409),('2034-09-21',203438,9,2034,21,38,203409),('2034-09-22',203438,9,2034,22,38,203409),('2034-09-23',203438,9,2034,23,38,203409),('2034-09-24',203439,9,2034,24,39,203409),('2034-09-25',203439,9,2034,25,39,203409),('2034-09-26',203439,9,2034,26,39,203409),('2034-09-27',203439,9,2034,27,39,203409),('2034-09-28',203439,9,2034,28,39,203409),('2034-09-29',203439,9,2034,29,39,203409),('2034-09-30',203439,9,2034,30,39,203409),('2034-10-01',203440,10,2034,1,40,203410),('2034-10-02',203440,10,2034,2,40,203410),('2034-10-03',203440,10,2034,3,40,203410),('2034-10-04',203440,10,2034,4,40,203410),('2034-10-05',203440,10,2034,5,40,203410),('2034-10-06',203440,10,2034,6,40,203410),('2034-10-07',203440,10,2034,7,40,203410),('2034-10-08',203441,10,2034,8,41,203410),('2034-10-09',203441,10,2034,9,41,203410),('2034-10-10',203441,10,2034,10,41,203410),('2034-10-11',203441,10,2034,11,41,203410),('2034-10-12',203441,10,2034,12,41,203410),('2034-10-13',203441,10,2034,13,41,203410),('2034-10-14',203441,10,2034,14,41,203410),('2034-10-15',203442,10,2034,15,42,203410),('2034-10-16',203442,10,2034,16,42,203410),('2034-10-17',203442,10,2034,17,42,203410),('2034-10-18',203442,10,2034,18,42,203410),('2034-10-19',203442,10,2034,19,42,203410),('2034-10-20',203442,10,2034,20,42,203410),('2034-10-21',203442,10,2034,21,42,203410),('2034-10-22',203443,10,2034,22,43,203410),('2034-10-23',203443,10,2034,23,43,203410),('2034-10-24',203443,10,2034,24,43,203410),('2034-10-25',203443,10,2034,25,43,203410),('2034-10-26',203443,10,2034,26,43,203410),('2034-10-27',203443,10,2034,27,43,203410),('2034-10-28',203443,10,2034,28,43,203410),('2034-10-29',203444,10,2034,29,44,203410),('2034-10-30',203444,10,2034,30,44,203410),('2034-10-31',203444,10,2034,31,44,203410),('2034-11-01',203444,11,2034,1,44,203411),('2034-11-02',203444,11,2034,2,44,203411),('2034-11-03',203444,11,2034,3,44,203411),('2034-11-04',203444,11,2034,4,44,203411),('2034-11-05',203445,11,2034,5,45,203411),('2034-11-06',203445,11,2034,6,45,203411),('2034-11-07',203445,11,2034,7,45,203411),('2034-11-08',203445,11,2034,8,45,203411),('2034-11-09',203445,11,2034,9,45,203411),('2034-11-10',203445,11,2034,10,45,203411),('2034-11-11',203445,11,2034,11,45,203411),('2034-11-12',203446,11,2034,12,46,203411),('2034-11-13',203446,11,2034,13,46,203411),('2034-11-14',203446,11,2034,14,46,203411),('2034-11-15',203446,11,2034,15,46,203411),('2034-11-16',203446,11,2034,16,46,203411),('2034-11-17',203446,11,2034,17,46,203411),('2034-11-18',203446,11,2034,18,46,203411),('2034-11-19',203447,11,2034,19,47,203411),('2034-11-20',203447,11,2034,20,47,203411),('2034-11-21',203447,11,2034,21,47,203411),('2034-11-22',203447,11,2034,22,47,203411),('2034-11-23',203447,11,2034,23,47,203411),('2034-11-24',203447,11,2034,24,47,203411),('2034-11-25',203447,11,2034,25,47,203411),('2034-11-26',203448,11,2034,26,48,203411),('2034-11-27',203448,11,2034,27,48,203411),('2034-11-28',203448,11,2034,28,48,203411),('2034-11-29',203448,11,2034,29,48,203411),('2034-11-30',203448,11,2034,30,48,203411),('2034-12-01',203448,12,2034,1,48,203412),('2034-12-02',203448,12,2034,2,48,203412),('2034-12-03',203449,12,2034,3,49,203412),('2034-12-04',203449,12,2034,4,49,203412),('2034-12-05',203449,12,2034,5,49,203412),('2034-12-06',203449,12,2034,6,49,203412),('2034-12-07',203449,12,2034,7,49,203412),('2034-12-08',203449,12,2034,8,49,203412),('2034-12-09',203449,12,2034,9,49,203412),('2034-12-10',203450,12,2034,10,50,203412),('2034-12-11',203450,12,2034,11,50,203412),('2034-12-12',203450,12,2034,12,50,203412),('2034-12-13',203450,12,2034,13,50,203412),('2034-12-14',203450,12,2034,14,50,203412),('2034-12-15',203450,12,2034,15,50,203412),('2034-12-16',203450,12,2034,16,50,203412),('2034-12-17',203451,12,2034,17,51,203412),('2034-12-18',203451,12,2034,18,51,203412),('2034-12-19',203451,12,2034,19,51,203412),('2034-12-20',203451,12,2034,20,51,203412),('2034-12-21',203451,12,2034,21,51,203412),('2034-12-22',203451,12,2034,22,51,203412),('2034-12-23',203451,12,2034,23,51,203412),('2034-12-24',203452,12,2034,24,52,203412),('2034-12-25',203452,12,2034,25,52,203412),('2034-12-26',203452,12,2034,26,52,203412),('2034-12-27',203452,12,2034,27,52,203412),('2034-12-28',203452,12,2034,28,52,203412),('2034-12-29',203452,12,2034,29,52,203412),('2034-12-30',203452,12,2034,30,52,203412),('2034-12-31',203453,12,2034,31,1,203412),('2035-01-01',203501,1,2035,1,1,203501),('2035-01-02',203501,1,2035,2,1,203501),('2035-01-03',203501,1,2035,3,1,203501),('2035-01-04',203501,1,2035,4,1,203501),('2035-01-05',203501,1,2035,5,1,203501),('2035-01-06',203501,1,2035,6,1,203501),('2035-01-07',203502,1,2035,7,2,203501),('2035-01-08',203502,1,2035,8,2,203501),('2035-01-09',203502,1,2035,9,2,203501),('2035-01-10',203502,1,2035,10,2,203501),('2035-01-11',203502,1,2035,11,2,203501),('2035-01-12',203502,1,2035,12,2,203501),('2035-01-13',203502,1,2035,13,2,203501),('2035-01-14',203503,1,2035,14,3,203501),('2035-01-15',203503,1,2035,15,3,203501),('2035-01-16',203503,1,2035,16,3,203501),('2035-01-17',203503,1,2035,17,3,203501),('2035-01-18',203503,1,2035,18,3,203501),('2035-01-19',203503,1,2035,19,3,203501),('2035-01-20',203503,1,2035,20,3,203501),('2035-01-21',203504,1,2035,21,4,203501),('2035-01-22',203504,1,2035,22,4,203501),('2035-01-23',203504,1,2035,23,4,203501),('2035-01-24',203504,1,2035,24,4,203501),('2035-01-25',203504,1,2035,25,4,203501),('2035-01-26',203504,1,2035,26,4,203501),('2035-01-27',203504,1,2035,27,4,203501),('2035-01-28',203505,1,2035,28,5,203501),('2035-01-29',203505,1,2035,29,5,203501),('2035-01-30',203505,1,2035,30,5,203501),('2035-01-31',203505,1,2035,31,5,203501),('2035-02-01',203505,2,2035,1,5,203502),('2035-02-02',203505,2,2035,2,5,203502),('2035-02-03',203505,2,2035,3,5,203502),('2035-02-04',203506,2,2035,4,6,203502),('2035-02-05',203506,2,2035,5,6,203502),('2035-02-06',203506,2,2035,6,6,203502),('2035-02-07',203506,2,2035,7,6,203502),('2035-02-08',203506,2,2035,8,6,203502),('2035-02-09',203506,2,2035,9,6,203502),('2035-02-10',203506,2,2035,10,6,203502),('2035-02-11',203507,2,2035,11,7,203502),('2035-02-12',203507,2,2035,12,7,203502),('2035-02-13',203507,2,2035,13,7,203502),('2035-02-14',203507,2,2035,14,7,203502),('2035-02-15',203507,2,2035,15,7,203502),('2035-02-16',203507,2,2035,16,7,203502),('2035-02-17',203507,2,2035,17,7,203502),('2035-02-18',203508,2,2035,18,8,203502),('2035-02-19',203508,2,2035,19,8,203502),('2035-02-20',203508,2,2035,20,8,203502),('2035-02-21',203508,2,2035,21,8,203502),('2035-02-22',203508,2,2035,22,8,203502),('2035-02-23',203508,2,2035,23,8,203502),('2035-02-24',203508,2,2035,24,8,203502),('2035-02-25',203509,2,2035,25,9,203502),('2035-02-26',203509,2,2035,26,9,203502),('2035-02-27',203509,2,2035,27,9,203502),('2035-02-28',203509,2,2035,28,9,203502),('2035-03-01',203509,3,2035,1,9,203503),('2035-03-02',203509,3,2035,2,9,203503),('2035-03-03',203509,3,2035,3,9,203503),('2035-03-04',203510,3,2035,4,10,203503),('2035-03-05',203510,3,2035,5,10,203503),('2035-03-06',203510,3,2035,6,10,203503),('2035-03-07',203510,3,2035,7,10,203503),('2035-03-08',203510,3,2035,8,10,203503),('2035-03-09',203510,3,2035,9,10,203503),('2035-03-10',203510,3,2035,10,10,203503),('2035-03-11',203511,3,2035,11,11,203503),('2035-03-12',203511,3,2035,12,11,203503),('2035-03-13',203511,3,2035,13,11,203503),('2035-03-14',203511,3,2035,14,11,203503),('2035-03-15',203511,3,2035,15,11,203503),('2035-03-16',203511,3,2035,16,11,203503),('2035-03-17',203511,3,2035,17,11,203503),('2035-03-18',203512,3,2035,18,12,203503),('2035-03-19',203512,3,2035,19,12,203503),('2035-03-20',203512,3,2035,20,12,203503),('2035-03-21',203512,3,2035,21,12,203503),('2035-03-22',203512,3,2035,22,12,203503),('2035-03-23',203512,3,2035,23,12,203503),('2035-03-24',203512,3,2035,24,12,203503),('2035-03-25',203513,3,2035,25,13,203503),('2035-03-26',203513,3,2035,26,13,203503),('2035-03-27',203513,3,2035,27,13,203503),('2035-03-28',203513,3,2035,28,13,203503),('2035-03-29',203513,3,2035,29,13,203503),('2035-03-30',203513,3,2035,30,13,203503),('2035-03-31',203513,3,2035,31,13,203503),('2035-04-01',203514,4,2035,1,14,203504),('2035-04-02',203514,4,2035,2,14,203504),('2035-04-03',203514,4,2035,3,14,203504),('2035-04-04',203514,4,2035,4,14,203504),('2035-04-05',203514,4,2035,5,14,203504),('2035-04-06',203514,4,2035,6,14,203504),('2035-04-07',203514,4,2035,7,14,203504),('2035-04-08',203515,4,2035,8,15,203504),('2035-04-09',203515,4,2035,9,15,203504),('2035-04-10',203515,4,2035,10,15,203504),('2035-04-11',203515,4,2035,11,15,203504),('2035-04-12',203515,4,2035,12,15,203504),('2035-04-13',203515,4,2035,13,15,203504),('2035-04-14',203515,4,2035,14,15,203504),('2035-04-15',203516,4,2035,15,16,203504),('2035-04-16',203516,4,2035,16,16,203504),('2035-04-17',203516,4,2035,17,16,203504),('2035-04-18',203516,4,2035,18,16,203504),('2035-04-19',203516,4,2035,19,16,203504),('2035-04-20',203516,4,2035,20,16,203504),('2035-04-21',203516,4,2035,21,16,203504),('2035-04-22',203517,4,2035,22,17,203504),('2035-04-23',203517,4,2035,23,17,203504),('2035-04-24',203517,4,2035,24,17,203504),('2035-04-25',203517,4,2035,25,17,203504),('2035-04-26',203517,4,2035,26,17,203504),('2035-04-27',203517,4,2035,27,17,203504),('2035-04-28',203517,4,2035,28,17,203504),('2035-04-29',203518,4,2035,29,18,203504),('2035-04-30',203518,4,2035,30,18,203504),('2035-05-01',203518,5,2035,1,18,203505),('2035-05-02',203518,5,2035,2,18,203505),('2035-05-03',203518,5,2035,3,18,203505),('2035-05-04',203518,5,2035,4,18,203505),('2035-05-05',203518,5,2035,5,18,203505),('2035-05-06',203519,5,2035,6,19,203505),('2035-05-07',203519,5,2035,7,19,203505),('2035-05-08',203519,5,2035,8,19,203505),('2035-05-09',203519,5,2035,9,19,203505),('2035-05-10',203519,5,2035,10,19,203505),('2035-05-11',203519,5,2035,11,19,203505),('2035-05-12',203519,5,2035,12,19,203505),('2035-05-13',203520,5,2035,13,20,203505),('2035-05-14',203520,5,2035,14,20,203505),('2035-05-15',203520,5,2035,15,20,203505),('2035-05-16',203520,5,2035,16,20,203505),('2035-05-17',203520,5,2035,17,20,203505),('2035-05-18',203520,5,2035,18,20,203505),('2035-05-19',203520,5,2035,19,20,203505),('2035-05-20',203521,5,2035,20,21,203505),('2035-05-21',203521,5,2035,21,21,203505),('2035-05-22',203521,5,2035,22,21,203505),('2035-05-23',203521,5,2035,23,21,203505),('2035-05-24',203521,5,2035,24,21,203505),('2035-05-25',203521,5,2035,25,21,203505),('2035-05-26',203521,5,2035,26,21,203505),('2035-05-27',203522,5,2035,27,22,203505),('2035-05-28',203522,5,2035,28,22,203505),('2035-05-29',203522,5,2035,29,22,203505),('2035-05-30',203522,5,2035,30,22,203505),('2035-05-31',203522,5,2035,31,22,203505),('2035-06-01',203522,6,2035,1,22,203506),('2035-06-02',203522,6,2035,2,22,203506),('2035-06-03',203523,6,2035,3,23,203506),('2035-06-04',203523,6,2035,4,23,203506),('2035-06-05',203523,6,2035,5,23,203506),('2035-06-06',203523,6,2035,6,23,203506),('2035-06-07',203523,6,2035,7,23,203506),('2035-06-08',203523,6,2035,8,23,203506),('2035-06-09',203523,6,2035,9,23,203506),('2035-06-10',203524,6,2035,10,24,203506),('2035-06-11',203524,6,2035,11,24,203506),('2035-06-12',203524,6,2035,12,24,203506),('2035-06-13',203524,6,2035,13,24,203506),('2035-06-14',203524,6,2035,14,24,203506),('2035-06-15',203524,6,2035,15,24,203506),('2035-06-16',203524,6,2035,16,24,203506),('2035-06-17',203525,6,2035,17,25,203506),('2035-06-18',203525,6,2035,18,25,203506),('2035-06-19',203525,6,2035,19,25,203506),('2035-06-20',203525,6,2035,20,25,203506),('2035-06-21',203525,6,2035,21,25,203506),('2035-06-22',203525,6,2035,22,25,203506),('2035-06-23',203525,6,2035,23,25,203506),('2035-06-24',203526,6,2035,24,26,203506),('2035-06-25',203526,6,2035,25,26,203506),('2035-06-26',203526,6,2035,26,26,203506),('2035-06-27',203526,6,2035,27,26,203506),('2035-06-28',203526,6,2035,28,26,203506),('2035-06-29',203526,6,2035,29,26,203506),('2035-06-30',203526,6,2035,30,26,203506),('2035-07-01',203527,7,2035,1,27,203507),('2035-07-02',203527,7,2035,2,27,203507),('2035-07-03',203527,7,2035,3,27,203507),('2035-07-04',203527,7,2035,4,27,203507),('2035-07-05',203527,7,2035,5,27,203507),('2035-07-06',203527,7,2035,6,27,203507),('2035-07-07',203527,7,2035,7,27,203507),('2035-07-08',203528,7,2035,8,28,203507),('2035-07-09',203528,7,2035,9,28,203507),('2035-07-10',203528,7,2035,10,28,203507),('2035-07-11',203528,7,2035,11,28,203507),('2035-07-12',203528,7,2035,12,28,203507),('2035-07-13',203528,7,2035,13,28,203507),('2035-07-14',203528,7,2035,14,28,203507),('2035-07-15',203529,7,2035,15,29,203507),('2035-07-16',203529,7,2035,16,29,203507),('2035-07-17',203529,7,2035,17,29,203507),('2035-07-18',203529,7,2035,18,29,203507),('2035-07-19',203529,7,2035,19,29,203507),('2035-07-20',203529,7,2035,20,29,203507),('2035-07-21',203529,7,2035,21,29,203507),('2035-07-22',203530,7,2035,22,30,203507),('2035-07-23',203530,7,2035,23,30,203507),('2035-07-24',203530,7,2035,24,30,203507),('2035-07-25',203530,7,2035,25,30,203507),('2035-07-26',203530,7,2035,26,30,203507),('2035-07-27',203530,7,2035,27,30,203507),('2035-07-28',203530,7,2035,28,30,203507),('2035-07-29',203531,7,2035,29,31,203507),('2035-07-30',203531,7,2035,30,31,203507),('2035-07-31',203531,7,2035,31,31,203507),('2035-08-01',203531,8,2035,1,31,203508),('2035-08-02',203531,8,2035,2,31,203508),('2035-08-03',203531,8,2035,3,31,203508),('2035-08-04',203531,8,2035,4,31,203508),('2035-08-05',203532,8,2035,5,32,203508),('2035-08-06',203532,8,2035,6,32,203508),('2035-08-07',203532,8,2035,7,32,203508),('2035-08-08',203532,8,2035,8,32,203508),('2035-08-09',203532,8,2035,9,32,203508),('2035-08-10',203532,8,2035,10,32,203508),('2035-08-11',203532,8,2035,11,32,203508),('2035-08-12',203533,8,2035,12,33,203508),('2035-08-13',203533,8,2035,13,33,203508),('2035-08-14',203533,8,2035,14,33,203508),('2035-08-15',203533,8,2035,15,33,203508),('2035-08-16',203533,8,2035,16,33,203508),('2035-08-17',203533,8,2035,17,33,203508),('2035-08-18',203533,8,2035,18,33,203508),('2035-08-19',203534,8,2035,19,34,203508),('2035-08-20',203534,8,2035,20,34,203508),('2035-08-21',203534,8,2035,21,34,203508),('2035-08-22',203534,8,2035,22,34,203508),('2035-08-23',203534,8,2035,23,34,203508),('2035-08-24',203534,8,2035,24,34,203508),('2035-08-25',203534,8,2035,25,34,203508),('2035-08-26',203535,8,2035,26,35,203508),('2035-08-27',203535,8,2035,27,35,203508),('2035-08-28',203535,8,2035,28,35,203508),('2035-08-29',203535,8,2035,29,35,203508),('2035-08-30',203535,8,2035,30,35,203508),('2035-08-31',203535,8,2035,31,35,203508),('2035-09-01',203535,9,2035,1,35,203509),('2035-09-02',203536,9,2035,2,36,203509),('2035-09-03',203536,9,2035,3,36,203509),('2035-09-04',203536,9,2035,4,36,203509),('2035-09-05',203536,9,2035,5,36,203509),('2035-09-06',203536,9,2035,6,36,203509),('2035-09-07',203536,9,2035,7,36,203509),('2035-09-08',203536,9,2035,8,36,203509),('2035-09-09',203537,9,2035,9,37,203509),('2035-09-10',203537,9,2035,10,37,203509),('2035-09-11',203537,9,2035,11,37,203509),('2035-09-12',203537,9,2035,12,37,203509),('2035-09-13',203537,9,2035,13,37,203509),('2035-09-14',203537,9,2035,14,37,203509),('2035-09-15',203537,9,2035,15,37,203509),('2035-09-16',203538,9,2035,16,38,203509),('2035-09-17',203538,9,2035,17,38,203509),('2035-09-18',203538,9,2035,18,38,203509),('2035-09-19',203538,9,2035,19,38,203509),('2035-09-20',203538,9,2035,20,38,203509),('2035-09-21',203538,9,2035,21,38,203509),('2035-09-22',203538,9,2035,22,38,203509),('2035-09-23',203539,9,2035,23,39,203509),('2035-09-24',203539,9,2035,24,39,203509),('2035-09-25',203539,9,2035,25,39,203509),('2035-09-26',203539,9,2035,26,39,203509),('2035-09-27',203539,9,2035,27,39,203509),('2035-09-28',203539,9,2035,28,39,203509),('2035-09-29',203539,9,2035,29,39,203509),('2035-09-30',203540,9,2035,30,40,203509),('2035-10-01',203540,10,2035,1,40,203510),('2035-10-02',203540,10,2035,2,40,203510),('2035-10-03',203540,10,2035,3,40,203510),('2035-10-04',203540,10,2035,4,40,203510),('2035-10-05',203540,10,2035,5,40,203510),('2035-10-06',203540,10,2035,6,40,203510),('2035-10-07',203541,10,2035,7,41,203510),('2035-10-08',203541,10,2035,8,41,203510),('2035-10-09',203541,10,2035,9,41,203510),('2035-10-10',203541,10,2035,10,41,203510),('2035-10-11',203541,10,2035,11,41,203510),('2035-10-12',203541,10,2035,12,41,203510),('2035-10-13',203541,10,2035,13,41,203510),('2035-10-14',203542,10,2035,14,42,203510),('2035-10-15',203542,10,2035,15,42,203510),('2035-10-16',203542,10,2035,16,42,203510),('2035-10-17',203542,10,2035,17,42,203510),('2035-10-18',203542,10,2035,18,42,203510),('2035-10-19',203542,10,2035,19,42,203510),('2035-10-20',203542,10,2035,20,42,203510),('2035-10-21',203543,10,2035,21,43,203510),('2035-10-22',203543,10,2035,22,43,203510),('2035-10-23',203543,10,2035,23,43,203510),('2035-10-24',203543,10,2035,24,43,203510),('2035-10-25',203543,10,2035,25,43,203510),('2035-10-26',203543,10,2035,26,43,203510),('2035-10-27',203543,10,2035,27,43,203510),('2035-10-28',203544,10,2035,28,44,203510),('2035-10-29',203544,10,2035,29,44,203510),('2035-10-30',203544,10,2035,30,44,203510),('2035-10-31',203544,10,2035,31,44,203510),('2035-11-01',203544,11,2035,1,44,203511),('2035-11-02',203544,11,2035,2,44,203511),('2035-11-03',203544,11,2035,3,44,203511),('2035-11-04',203545,11,2035,4,45,203511),('2035-11-05',203545,11,2035,5,45,203511),('2035-11-06',203545,11,2035,6,45,203511),('2035-11-07',203545,11,2035,7,45,203511),('2035-11-08',203545,11,2035,8,45,203511),('2035-11-09',203545,11,2035,9,45,203511),('2035-11-10',203545,11,2035,10,45,203511),('2035-11-11',203546,11,2035,11,46,203511),('2035-11-12',203546,11,2035,12,46,203511),('2035-11-13',203546,11,2035,13,46,203511),('2035-11-14',203546,11,2035,14,46,203511),('2035-11-15',203546,11,2035,15,46,203511),('2035-11-16',203546,11,2035,16,46,203511),('2035-11-17',203546,11,2035,17,46,203511),('2035-11-18',203547,11,2035,18,47,203511),('2035-11-19',203547,11,2035,19,47,203511),('2035-11-20',203547,11,2035,20,47,203511),('2035-11-21',203547,11,2035,21,47,203511),('2035-11-22',203547,11,2035,22,47,203511),('2035-11-23',203547,11,2035,23,47,203511),('2035-11-24',203547,11,2035,24,47,203511),('2035-11-25',203548,11,2035,25,48,203511),('2035-11-26',203548,11,2035,26,48,203511),('2035-11-27',203548,11,2035,27,48,203511),('2035-11-28',203548,11,2035,28,48,203511),('2035-11-29',203548,11,2035,29,48,203511),('2035-11-30',203548,11,2035,30,48,203511),('2035-12-01',203548,12,2035,1,48,203512),('2035-12-02',203549,12,2035,2,49,203512),('2035-12-03',203549,12,2035,3,49,203512),('2035-12-04',203549,12,2035,4,49,203512),('2035-12-05',203549,12,2035,5,49,203512),('2035-12-06',203549,12,2035,6,49,203512),('2035-12-07',203549,12,2035,7,49,203512),('2035-12-08',203549,12,2035,8,49,203512),('2035-12-09',203550,12,2035,9,50,203512),('2035-12-10',203550,12,2035,10,50,203512),('2035-12-11',203550,12,2035,11,50,203512),('2035-12-12',203550,12,2035,12,50,203512),('2035-12-13',203550,12,2035,13,50,203512),('2035-12-14',203550,12,2035,14,50,203512),('2035-12-15',203550,12,2035,15,50,203512),('2035-12-16',203551,12,2035,16,51,203512),('2035-12-17',203551,12,2035,17,51,203512),('2035-12-18',203551,12,2035,18,51,203512),('2035-12-19',203551,12,2035,19,51,203512),('2035-12-20',203551,12,2035,20,51,203512),('2035-12-21',203551,12,2035,21,51,203512),('2035-12-22',203551,12,2035,22,51,203512),('2035-12-23',203552,12,2035,23,52,203512),('2035-12-24',203552,12,2035,24,52,203512),('2035-12-25',203552,12,2035,25,52,203512),('2035-12-26',203552,12,2035,26,52,203512),('2035-12-27',203552,12,2035,27,52,203512),('2035-12-28',203552,12,2035,28,52,203512),('2035-12-29',203552,12,2035,29,52,203512),('2035-12-30',203553,12,2035,30,1,203512),('2035-12-31',203501,12,2035,31,1,203512),('2036-01-01',203601,1,2036,1,1,203601),('2036-01-02',203601,1,2036,2,1,203601),('2036-01-03',203601,1,2036,3,1,203601),('2036-01-04',203601,1,2036,4,1,203601),('2036-01-05',203601,1,2036,5,1,203601),('2036-01-06',203602,1,2036,6,2,203601),('2036-01-07',203602,1,2036,7,2,203601),('2036-01-08',203602,1,2036,8,2,203601),('2036-01-09',203602,1,2036,9,2,203601),('2036-01-10',203602,1,2036,10,2,203601),('2036-01-11',203602,1,2036,11,2,203601),('2036-01-12',203602,1,2036,12,2,203601),('2036-01-13',203603,1,2036,13,3,203601),('2036-01-14',203603,1,2036,14,3,203601),('2036-01-15',203603,1,2036,15,3,203601),('2036-01-16',203603,1,2036,16,3,203601),('2036-01-17',203603,1,2036,17,3,203601),('2036-01-18',203603,1,2036,18,3,203601),('2036-01-19',203603,1,2036,19,3,203601),('2036-01-20',203604,1,2036,20,4,203601),('2036-01-21',203604,1,2036,21,4,203601),('2036-01-22',203604,1,2036,22,4,203601),('2036-01-23',203604,1,2036,23,4,203601),('2036-01-24',203604,1,2036,24,4,203601),('2036-01-25',203604,1,2036,25,4,203601),('2036-01-26',203604,1,2036,26,4,203601),('2036-01-27',203605,1,2036,27,5,203601),('2036-01-28',203605,1,2036,28,5,203601),('2036-01-29',203605,1,2036,29,5,203601),('2036-01-30',203605,1,2036,30,5,203601),('2036-01-31',203605,1,2036,31,5,203601),('2036-02-01',203605,2,2036,1,5,203602),('2036-02-02',203605,2,2036,2,5,203602),('2036-02-03',203606,2,2036,3,6,203602),('2036-02-04',203606,2,2036,4,6,203602),('2036-02-05',203606,2,2036,5,6,203602),('2036-02-06',203606,2,2036,6,6,203602),('2036-02-07',203606,2,2036,7,6,203602),('2036-02-08',203606,2,2036,8,6,203602),('2036-02-09',203606,2,2036,9,6,203602),('2036-02-10',203607,2,2036,10,7,203602),('2036-02-11',203607,2,2036,11,7,203602),('2036-02-12',203607,2,2036,12,7,203602),('2036-02-13',203607,2,2036,13,7,203602),('2036-02-14',203607,2,2036,14,7,203602),('2036-02-15',203607,2,2036,15,7,203602),('2036-02-16',203607,2,2036,16,7,203602),('2036-02-17',203608,2,2036,17,8,203602),('2036-02-18',203608,2,2036,18,8,203602),('2036-02-19',203608,2,2036,19,8,203602),('2036-02-20',203608,2,2036,20,8,203602),('2036-02-21',203608,2,2036,21,8,203602),('2036-02-22',203608,2,2036,22,8,203602),('2036-02-23',203608,2,2036,23,8,203602),('2036-02-24',203609,2,2036,24,9,203602),('2036-02-25',203609,2,2036,25,9,203602),('2036-02-26',203609,2,2036,26,9,203602),('2036-02-27',203609,2,2036,27,9,203602),('2036-02-28',203609,2,2036,28,9,203602),('2036-02-29',203609,2,2036,29,9,203602),('2036-03-01',203609,3,2036,1,9,203603),('2036-03-02',203610,3,2036,2,10,203603),('2036-03-03',203610,3,2036,3,10,203603),('2036-03-04',203610,3,2036,4,10,203603),('2036-03-05',203610,3,2036,5,10,203603),('2036-03-06',203610,3,2036,6,10,203603),('2036-03-07',203610,3,2036,7,10,203603),('2036-03-08',203610,3,2036,8,10,203603),('2036-03-09',203611,3,2036,9,11,203603),('2036-03-10',203611,3,2036,10,11,203603),('2036-03-11',203611,3,2036,11,11,203603),('2036-03-12',203611,3,2036,12,11,203603),('2036-03-13',203611,3,2036,13,11,203603),('2036-03-14',203611,3,2036,14,11,203603),('2036-03-15',203611,3,2036,15,11,203603),('2036-03-16',203612,3,2036,16,12,203603),('2036-03-17',203612,3,2036,17,12,203603),('2036-03-18',203612,3,2036,18,12,203603),('2036-03-19',203612,3,2036,19,12,203603),('2036-03-20',203612,3,2036,20,12,203603),('2036-03-21',203612,3,2036,21,12,203603),('2036-03-22',203612,3,2036,22,12,203603),('2036-03-23',203613,3,2036,23,13,203603),('2036-03-24',203613,3,2036,24,13,203603),('2036-03-25',203613,3,2036,25,13,203603),('2036-03-26',203613,3,2036,26,13,203603),('2036-03-27',203613,3,2036,27,13,203603),('2036-03-28',203613,3,2036,28,13,203603),('2036-03-29',203613,3,2036,29,13,203603),('2036-03-30',203614,3,2036,30,14,203603),('2036-03-31',203614,3,2036,31,14,203603),('2036-04-01',203614,4,2036,1,14,203604),('2036-04-02',203614,4,2036,2,14,203604),('2036-04-03',203614,4,2036,3,14,203604),('2036-04-04',203614,4,2036,4,14,203604),('2036-04-05',203614,4,2036,5,14,203604),('2036-04-06',203615,4,2036,6,15,203604),('2036-04-07',203615,4,2036,7,15,203604),('2036-04-08',203615,4,2036,8,15,203604),('2036-04-09',203615,4,2036,9,15,203604),('2036-04-10',203615,4,2036,10,15,203604),('2036-04-11',203615,4,2036,11,15,203604),('2036-04-12',203615,4,2036,12,15,203604),('2036-04-13',203616,4,2036,13,16,203604),('2036-04-14',203616,4,2036,14,16,203604),('2036-04-15',203616,4,2036,15,16,203604),('2036-04-16',203616,4,2036,16,16,203604),('2036-04-17',203616,4,2036,17,16,203604),('2036-04-18',203616,4,2036,18,16,203604),('2036-04-19',203616,4,2036,19,16,203604),('2036-04-20',203617,4,2036,20,17,203604),('2036-04-21',203617,4,2036,21,17,203604),('2036-04-22',203617,4,2036,22,17,203604),('2036-04-23',203617,4,2036,23,17,203604),('2036-04-24',203617,4,2036,24,17,203604),('2036-04-25',203617,4,2036,25,17,203604),('2036-04-26',203617,4,2036,26,17,203604),('2036-04-27',203618,4,2036,27,18,203604),('2036-04-28',203618,4,2036,28,18,203604),('2036-04-29',203618,4,2036,29,18,203604),('2036-04-30',203618,4,2036,30,18,203604),('2036-05-01',203618,5,2036,1,18,203605),('2036-05-02',203618,5,2036,2,18,203605),('2036-05-03',203618,5,2036,3,18,203605),('2036-05-04',203619,5,2036,4,19,203605),('2036-05-05',203619,5,2036,5,19,203605),('2036-05-06',203619,5,2036,6,19,203605),('2036-05-07',203619,5,2036,7,19,203605),('2036-05-08',203619,5,2036,8,19,203605),('2036-05-09',203619,5,2036,9,19,203605),('2036-05-10',203619,5,2036,10,19,203605),('2036-05-11',203620,5,2036,11,20,203605),('2036-05-12',203620,5,2036,12,20,203605),('2036-05-13',203620,5,2036,13,20,203605),('2036-05-14',203620,5,2036,14,20,203605),('2036-05-15',203620,5,2036,15,20,203605),('2036-05-16',203620,5,2036,16,20,203605),('2036-05-17',203620,5,2036,17,20,203605),('2036-05-18',203621,5,2036,18,21,203605),('2036-05-19',203621,5,2036,19,21,203605),('2036-05-20',203621,5,2036,20,21,203605),('2036-05-21',203621,5,2036,21,21,203605),('2036-05-22',203621,5,2036,22,21,203605),('2036-05-23',203621,5,2036,23,21,203605),('2036-05-24',203621,5,2036,24,21,203605),('2036-05-25',203622,5,2036,25,22,203605),('2036-05-26',203622,5,2036,26,22,203605),('2036-05-27',203622,5,2036,27,22,203605),('2036-05-28',203622,5,2036,28,22,203605),('2036-05-29',203622,5,2036,29,22,203605),('2036-05-30',203622,5,2036,30,22,203605),('2036-05-31',203622,5,2036,31,22,203605),('2036-06-01',203623,6,2036,1,23,203606),('2036-06-02',203623,6,2036,2,23,203606),('2036-06-03',203623,6,2036,3,23,203606),('2036-06-04',203623,6,2036,4,23,203606),('2036-06-05',203623,6,2036,5,23,203606),('2036-06-06',203623,6,2036,6,23,203606),('2036-06-07',203623,6,2036,7,23,203606),('2036-06-08',203624,6,2036,8,24,203606),('2036-06-09',203624,6,2036,9,24,203606),('2036-06-10',203624,6,2036,10,24,203606),('2036-06-11',203624,6,2036,11,24,203606),('2036-06-12',203624,6,2036,12,24,203606),('2036-06-13',203624,6,2036,13,24,203606),('2036-06-14',203624,6,2036,14,24,203606),('2036-06-15',203625,6,2036,15,25,203606),('2036-06-16',203625,6,2036,16,25,203606),('2036-06-17',203625,6,2036,17,25,203606),('2036-06-18',203625,6,2036,18,25,203606),('2036-06-19',203625,6,2036,19,25,203606),('2036-06-20',203625,6,2036,20,25,203606),('2036-06-21',203625,6,2036,21,25,203606),('2036-06-22',203626,6,2036,22,26,203606),('2036-06-23',203626,6,2036,23,26,203606),('2036-06-24',203626,6,2036,24,26,203606),('2036-06-25',203626,6,2036,25,26,203606),('2036-06-26',203626,6,2036,26,26,203606),('2036-06-27',203626,6,2036,27,26,203606),('2036-06-28',203626,6,2036,28,26,203606),('2036-06-29',203627,6,2036,29,27,203606),('2036-06-30',203627,6,2036,30,27,203606),('2036-07-01',203627,7,2036,1,27,203607),('2036-07-02',203627,7,2036,2,27,203607),('2036-07-03',203627,7,2036,3,27,203607),('2036-07-04',203627,7,2036,4,27,203607),('2036-07-05',203627,7,2036,5,27,203607),('2036-07-06',203628,7,2036,6,28,203607),('2036-07-07',203628,7,2036,7,28,203607),('2036-07-08',203628,7,2036,8,28,203607),('2036-07-09',203628,7,2036,9,28,203607),('2036-07-10',203628,7,2036,10,28,203607),('2036-07-11',203628,7,2036,11,28,203607),('2036-07-12',203628,7,2036,12,28,203607),('2036-07-13',203629,7,2036,13,29,203607),('2036-07-14',203629,7,2036,14,29,203607),('2036-07-15',203629,7,2036,15,29,203607),('2036-07-16',203629,7,2036,16,29,203607),('2036-07-17',203629,7,2036,17,29,203607),('2036-07-18',203629,7,2036,18,29,203607),('2036-07-19',203629,7,2036,19,29,203607),('2036-07-20',203630,7,2036,20,30,203607),('2036-07-21',203630,7,2036,21,30,203607),('2036-07-22',203630,7,2036,22,30,203607),('2036-07-23',203630,7,2036,23,30,203607),('2036-07-24',203630,7,2036,24,30,203607),('2036-07-25',203630,7,2036,25,30,203607),('2036-07-26',203630,7,2036,26,30,203607),('2036-07-27',203631,7,2036,27,31,203607),('2036-07-28',203631,7,2036,28,31,203607),('2036-07-29',203631,7,2036,29,31,203607),('2036-07-30',203631,7,2036,30,31,203607),('2036-07-31',203631,7,2036,31,31,203607),('2036-08-01',203631,8,2036,1,31,203608),('2036-08-02',203631,8,2036,2,31,203608),('2036-08-03',203632,8,2036,3,32,203608),('2036-08-04',203632,8,2036,4,32,203608),('2036-08-05',203632,8,2036,5,32,203608),('2036-08-06',203632,8,2036,6,32,203608),('2036-08-07',203632,8,2036,7,32,203608),('2036-08-08',203632,8,2036,8,32,203608),('2036-08-09',203632,8,2036,9,32,203608),('2036-08-10',203633,8,2036,10,33,203608),('2036-08-11',203633,8,2036,11,33,203608),('2036-08-12',203633,8,2036,12,33,203608),('2036-08-13',203633,8,2036,13,33,203608),('2036-08-14',203633,8,2036,14,33,203608),('2036-08-15',203633,8,2036,15,33,203608),('2036-08-16',203633,8,2036,16,33,203608),('2036-08-17',203634,8,2036,17,34,203608),('2036-08-18',203634,8,2036,18,34,203608),('2036-08-19',203634,8,2036,19,34,203608),('2036-08-20',203634,8,2036,20,34,203608),('2036-08-21',203634,8,2036,21,34,203608),('2036-08-22',203634,8,2036,22,34,203608),('2036-08-23',203634,8,2036,23,34,203608),('2036-08-24',203635,8,2036,24,35,203608),('2036-08-25',203635,8,2036,25,35,203608),('2036-08-26',203635,8,2036,26,35,203608),('2036-08-27',203635,8,2036,27,35,203608),('2036-08-28',203635,8,2036,28,35,203608),('2036-08-29',203635,8,2036,29,35,203608),('2036-08-30',203635,8,2036,30,35,203608),('2036-08-31',203636,8,2036,31,36,203608),('2036-09-01',203636,9,2036,1,36,203609),('2036-09-02',203636,9,2036,2,36,203609),('2036-09-03',203636,9,2036,3,36,203609),('2036-09-04',203636,9,2036,4,36,203609),('2036-09-05',203636,9,2036,5,36,203609),('2036-09-06',203636,9,2036,6,36,203609),('2036-09-07',203637,9,2036,7,37,203609),('2036-09-08',203637,9,2036,8,37,203609),('2036-09-09',203637,9,2036,9,37,203609),('2036-09-10',203637,9,2036,10,37,203609),('2036-09-11',203637,9,2036,11,37,203609),('2036-09-12',203637,9,2036,12,37,203609),('2036-09-13',203637,9,2036,13,37,203609),('2036-09-14',203638,9,2036,14,38,203609),('2036-09-15',203638,9,2036,15,38,203609),('2036-09-16',203638,9,2036,16,38,203609),('2036-09-17',203638,9,2036,17,38,203609),('2036-09-18',203638,9,2036,18,38,203609),('2036-09-19',203638,9,2036,19,38,203609),('2036-09-20',203638,9,2036,20,38,203609),('2036-09-21',203639,9,2036,21,39,203609),('2036-09-22',203639,9,2036,22,39,203609),('2036-09-23',203639,9,2036,23,39,203609),('2036-09-24',203639,9,2036,24,39,203609),('2036-09-25',203639,9,2036,25,39,203609),('2036-09-26',203639,9,2036,26,39,203609),('2036-09-27',203639,9,2036,27,39,203609),('2036-09-28',203640,9,2036,28,40,203609),('2036-09-29',203640,9,2036,29,40,203609),('2036-09-30',203640,9,2036,30,40,203609),('2036-10-01',203640,10,2036,1,40,203610),('2036-10-02',203640,10,2036,2,40,203610),('2036-10-03',203640,10,2036,3,40,203610),('2036-10-04',203640,10,2036,4,40,203610),('2036-10-05',203641,10,2036,5,41,203610),('2036-10-06',203641,10,2036,6,41,203610),('2036-10-07',203641,10,2036,7,41,203610),('2036-10-08',203641,10,2036,8,41,203610),('2036-10-09',203641,10,2036,9,41,203610),('2036-10-10',203641,10,2036,10,41,203610),('2036-10-11',203641,10,2036,11,41,203610),('2036-10-12',203642,10,2036,12,42,203610),('2036-10-13',203642,10,2036,13,42,203610),('2036-10-14',203642,10,2036,14,42,203610),('2036-10-15',203642,10,2036,15,42,203610),('2036-10-16',203642,10,2036,16,42,203610),('2036-10-17',203642,10,2036,17,42,203610),('2036-10-18',203642,10,2036,18,42,203610),('2036-10-19',203643,10,2036,19,43,203610),('2036-10-20',203643,10,2036,20,43,203610),('2036-10-21',203643,10,2036,21,43,203610),('2036-10-22',203643,10,2036,22,43,203610),('2036-10-23',203643,10,2036,23,43,203610),('2036-10-24',203643,10,2036,24,43,203610),('2036-10-25',203643,10,2036,25,43,203610),('2036-10-26',203644,10,2036,26,44,203610),('2036-10-27',203644,10,2036,27,44,203610),('2036-10-28',203644,10,2036,28,44,203610),('2036-10-29',203644,10,2036,29,44,203610),('2036-10-30',203644,10,2036,30,44,203610),('2036-10-31',203644,10,2036,31,44,203610),('2036-11-01',203644,11,2036,1,44,203611),('2036-11-02',203645,11,2036,2,45,203611),('2036-11-03',203645,11,2036,3,45,203611),('2036-11-04',203645,11,2036,4,45,203611),('2036-11-05',203645,11,2036,5,45,203611),('2036-11-06',203645,11,2036,6,45,203611),('2036-11-07',203645,11,2036,7,45,203611),('2036-11-08',203645,11,2036,8,45,203611),('2036-11-09',203646,11,2036,9,46,203611),('2036-11-10',203646,11,2036,10,46,203611),('2036-11-11',203646,11,2036,11,46,203611),('2036-11-12',203646,11,2036,12,46,203611),('2036-11-13',203646,11,2036,13,46,203611),('2036-11-14',203646,11,2036,14,46,203611),('2036-11-15',203646,11,2036,15,46,203611),('2036-11-16',203647,11,2036,16,47,203611),('2036-11-17',203647,11,2036,17,47,203611),('2036-11-18',203647,11,2036,18,47,203611),('2036-11-19',203647,11,2036,19,47,203611),('2036-11-20',203647,11,2036,20,47,203611),('2036-11-21',203647,11,2036,21,47,203611),('2036-11-22',203647,11,2036,22,47,203611),('2036-11-23',203648,11,2036,23,48,203611),('2036-11-24',203648,11,2036,24,48,203611),('2036-11-25',203648,11,2036,25,48,203611),('2036-11-26',203648,11,2036,26,48,203611),('2036-11-27',203648,11,2036,27,48,203611),('2036-11-28',203648,11,2036,28,48,203611),('2036-11-29',203648,11,2036,29,48,203611),('2036-11-30',203649,11,2036,30,49,203611),('2036-12-01',203649,12,2036,1,49,203612),('2036-12-02',203649,12,2036,2,49,203612),('2036-12-03',203649,12,2036,3,49,203612),('2036-12-04',203649,12,2036,4,49,203612),('2036-12-05',203649,12,2036,5,49,203612),('2036-12-06',203649,12,2036,6,49,203612),('2036-12-07',203650,12,2036,7,50,203612),('2036-12-08',203650,12,2036,8,50,203612),('2036-12-09',203650,12,2036,9,50,203612),('2036-12-10',203650,12,2036,10,50,203612),('2036-12-11',203650,12,2036,11,50,203612),('2036-12-12',203650,12,2036,12,50,203612),('2036-12-13',203650,12,2036,13,50,203612),('2036-12-14',203651,12,2036,14,51,203612),('2036-12-15',203651,12,2036,15,51,203612),('2036-12-16',203651,12,2036,16,51,203612),('2036-12-17',203651,12,2036,17,51,203612),('2036-12-18',203651,12,2036,18,51,203612),('2036-12-19',203651,12,2036,19,51,203612),('2036-12-20',203651,12,2036,20,51,203612),('2036-12-21',203652,12,2036,21,52,203612),('2036-12-22',203652,12,2036,22,52,203612),('2036-12-23',203652,12,2036,23,52,203612),('2036-12-24',203652,12,2036,24,52,203612),('2036-12-25',203652,12,2036,25,52,203612),('2036-12-26',203652,12,2036,26,52,203612),('2036-12-27',203652,12,2036,27,52,203612),('2036-12-28',203653,12,2036,28,53,203612),('2036-12-29',203601,12,2036,29,53,203612),('2036-12-30',203601,12,2036,30,53,203612); +INSERT INTO `time` VALUES ('2007-12-31',200801,12,2007,31,1,200712,2008),('2008-01-01',200801,1,2008,1,1,200801,2008),('2008-01-02',200801,1,2008,2,1,200801,2008),('2008-01-03',200801,1,2008,3,1,200801,2008),('2008-01-04',200801,1,2008,4,1,200801,2008),('2008-01-05',200801,1,2008,5,1,200801,2008),('2008-01-06',200802,1,2008,6,2,200801,2008),('2008-01-07',200802,1,2008,7,2,200801,2008),('2008-01-08',200802,1,2008,8,2,200801,2008),('2008-01-09',200802,1,2008,9,2,200801,2008),('2008-01-10',200802,1,2008,10,2,200801,2008),('2008-01-11',200802,1,2008,11,2,200801,2008),('2008-01-12',200802,1,2008,12,2,200801,2008),('2008-01-13',200803,1,2008,13,3,200801,2008),('2008-01-14',200803,1,2008,14,3,200801,2008),('2008-01-15',200803,1,2008,15,3,200801,2008),('2008-01-16',200803,1,2008,16,3,200801,2008),('2008-01-17',200803,1,2008,17,3,200801,2008),('2008-01-18',200803,1,2008,18,3,200801,2008),('2008-01-19',200803,1,2008,19,3,200801,2008),('2008-01-20',200804,1,2008,20,4,200801,2008),('2008-01-21',200804,1,2008,21,4,200801,2008),('2008-01-22',200804,1,2008,22,4,200801,2008),('2008-01-23',200804,1,2008,23,4,200801,2008),('2008-01-24',200804,1,2008,24,4,200801,2008),('2008-01-25',200804,1,2008,25,4,200801,2008),('2008-01-26',200804,1,2008,26,4,200801,2008),('2008-01-27',200805,1,2008,27,5,200801,2008),('2008-01-28',200805,1,2008,28,5,200801,2008),('2008-01-29',200805,1,2008,29,5,200801,2008),('2008-01-30',200805,1,2008,30,5,200801,2008),('2008-01-31',200805,1,2008,31,5,200801,2008),('2008-02-01',200805,2,2008,1,5,200802,2008),('2008-02-02',200805,2,2008,2,5,200802,2008),('2008-02-03',200806,2,2008,3,6,200802,2008),('2008-02-04',200806,2,2008,4,6,200802,2008),('2008-02-05',200806,2,2008,5,6,200802,2008),('2008-02-06',200806,2,2008,6,6,200802,2008),('2008-02-07',200806,2,2008,7,6,200802,2008),('2008-02-08',200806,2,2008,8,6,200802,2008),('2008-02-09',200806,2,2008,9,6,200802,2008),('2008-02-10',200807,2,2008,10,7,200802,2008),('2008-02-11',200807,2,2008,11,7,200802,2008),('2008-02-12',200807,2,2008,12,7,200802,2008),('2008-02-13',200807,2,2008,13,7,200802,2008),('2008-02-14',200807,2,2008,14,7,200802,2008),('2008-02-15',200807,2,2008,15,7,200802,2008),('2008-02-16',200807,2,2008,16,7,200802,2008),('2008-02-17',200808,2,2008,17,8,200802,2008),('2008-02-18',200808,2,2008,18,8,200802,2008),('2008-02-19',200808,2,2008,19,8,200802,2008),('2008-02-20',200808,2,2008,20,8,200802,2008),('2008-02-21',200808,2,2008,21,8,200802,2008),('2008-02-22',200808,2,2008,22,8,200802,2008),('2008-02-23',200808,2,2008,23,8,200802,2008),('2008-02-24',200809,2,2008,24,9,200802,2008),('2008-02-25',200809,2,2008,25,9,200802,2008),('2008-02-26',200809,2,2008,26,9,200802,2008),('2008-02-27',200809,2,2008,27,9,200802,2008),('2008-02-28',200809,2,2008,28,9,200802,2008),('2008-02-29',200809,2,2008,29,9,200802,2008),('2008-03-01',200809,3,2008,1,9,200803,2008),('2008-03-02',200810,3,2008,2,10,200803,2008),('2008-03-03',200810,3,2008,3,10,200803,2008),('2008-03-04',200810,3,2008,4,10,200803,2008),('2008-03-05',200810,3,2008,5,10,200803,2008),('2008-03-06',200810,3,2008,6,10,200803,2008),('2008-03-07',200810,3,2008,7,10,200803,2008),('2008-03-08',200810,3,2008,8,10,200803,2008),('2008-03-09',200811,3,2008,9,11,200803,2008),('2008-03-10',200811,3,2008,10,11,200803,2008),('2008-03-11',200811,3,2008,11,11,200803,2008),('2008-03-12',200811,3,2008,12,11,200803,2008),('2008-03-13',200811,3,2008,13,11,200803,2008),('2008-03-14',200811,3,2008,14,11,200803,2008),('2008-03-15',200811,3,2008,15,11,200803,2008),('2008-03-16',200812,3,2008,16,12,200803,2008),('2008-03-17',200812,3,2008,17,12,200803,2008),('2008-03-18',200812,3,2008,18,12,200803,2008),('2008-03-19',200812,3,2008,19,12,200803,2008),('2008-03-20',200812,3,2008,20,12,200803,2008),('2008-03-21',200812,3,2008,21,12,200803,2008),('2008-03-22',200812,3,2008,22,12,200803,2008),('2008-03-23',200813,3,2008,23,13,200803,2008),('2008-03-24',200813,3,2008,24,13,200803,2008),('2008-03-25',200813,3,2008,25,13,200803,2008),('2008-03-26',200813,3,2008,26,13,200803,2008),('2008-03-27',200813,3,2008,27,13,200803,2008),('2008-03-28',200813,3,2008,28,13,200803,2008),('2008-03-29',200813,3,2008,29,13,200803,2008),('2008-03-30',200814,3,2008,30,14,200803,2008),('2008-03-31',200814,3,2008,31,14,200803,2008),('2008-04-01',200814,4,2008,1,14,200804,2008),('2008-04-02',200814,4,2008,2,14,200804,2008),('2008-04-03',200814,4,2008,3,14,200804,2008),('2008-04-04',200814,4,2008,4,14,200804,2008),('2008-04-05',200814,4,2008,5,14,200804,2008),('2008-04-06',200815,4,2008,6,15,200804,2008),('2008-04-07',200815,4,2008,7,15,200804,2008),('2008-04-08',200815,4,2008,8,15,200804,2008),('2008-04-09',200815,4,2008,9,15,200804,2008),('2008-04-10',200815,4,2008,10,15,200804,2008),('2008-04-11',200815,4,2008,11,15,200804,2008),('2008-04-12',200815,4,2008,12,15,200804,2008),('2008-04-13',200816,4,2008,13,16,200804,2008),('2008-04-14',200816,4,2008,14,16,200804,2008),('2008-04-15',200816,4,2008,15,16,200804,2008),('2008-04-16',200816,4,2008,16,16,200804,2008),('2008-04-17',200816,4,2008,17,16,200804,2008),('2008-04-18',200816,4,2008,18,16,200804,2008),('2008-04-19',200816,4,2008,19,16,200804,2008),('2008-04-20',200817,4,2008,20,17,200804,2008),('2008-04-21',200817,4,2008,21,17,200804,2008),('2008-04-22',200817,4,2008,22,17,200804,2008),('2008-04-23',200817,4,2008,23,17,200804,2008),('2008-04-24',200817,4,2008,24,17,200804,2008),('2008-04-25',200817,4,2008,25,17,200804,2008),('2008-04-26',200817,4,2008,26,17,200804,2008),('2008-04-27',200818,4,2008,27,18,200804,2008),('2008-04-28',200818,4,2008,28,18,200804,2008),('2008-04-29',200818,4,2008,29,18,200804,2008),('2008-04-30',200818,4,2008,30,18,200804,2008),('2008-05-01',200818,5,2008,1,18,200805,2008),('2008-05-02',200818,5,2008,2,18,200805,2008),('2008-05-03',200818,5,2008,3,18,200805,2008),('2008-05-04',200819,5,2008,4,19,200805,2008),('2008-05-05',200819,5,2008,5,19,200805,2008),('2008-05-06',200819,5,2008,6,19,200805,2008),('2008-05-07',200819,5,2008,7,19,200805,2008),('2008-05-08',200819,5,2008,8,19,200805,2008),('2008-05-09',200819,5,2008,9,19,200805,2008),('2008-05-10',200819,5,2008,10,19,200805,2008),('2008-05-11',200820,5,2008,11,20,200805,2008),('2008-05-12',200820,5,2008,12,20,200805,2008),('2008-05-13',200820,5,2008,13,20,200805,2008),('2008-05-14',200820,5,2008,14,20,200805,2008),('2008-05-15',200820,5,2008,15,20,200805,2008),('2008-05-16',200820,5,2008,16,20,200805,2008),('2008-05-17',200820,5,2008,17,20,200805,2008),('2008-05-18',200821,5,2008,18,21,200805,2008),('2008-05-19',200821,5,2008,19,21,200805,2008),('2008-05-20',200821,5,2008,20,21,200805,2008),('2008-05-21',200821,5,2008,21,21,200805,2008),('2008-05-22',200821,5,2008,22,21,200805,2008),('2008-05-23',200821,5,2008,23,21,200805,2008),('2008-05-24',200821,5,2008,24,21,200805,2008),('2008-05-25',200822,5,2008,25,22,200805,2008),('2008-05-26',200822,5,2008,26,22,200805,2008),('2008-05-27',200822,5,2008,27,22,200805,2008),('2008-05-28',200822,5,2008,28,22,200805,2008),('2008-05-29',200822,5,2008,29,22,200805,2008),('2008-05-30',200822,5,2008,30,22,200805,2008),('2008-05-31',200822,5,2008,31,22,200805,2008),('2008-06-01',200823,6,2008,1,23,200806,2008),('2008-06-02',200823,6,2008,2,23,200806,2008),('2008-06-03',200823,6,2008,3,23,200806,2008),('2008-06-04',200823,6,2008,4,23,200806,2008),('2008-06-05',200823,6,2008,5,23,200806,2008),('2008-06-06',200823,6,2008,6,23,200806,2008),('2008-06-07',200823,6,2008,7,23,200806,2008),('2008-06-08',200824,6,2008,8,24,200806,2008),('2008-06-09',200824,6,2008,9,24,200806,2008),('2008-06-10',200824,6,2008,10,24,200806,2008),('2008-06-11',200824,6,2008,11,24,200806,2008),('2008-06-12',200824,6,2008,12,24,200806,2008),('2008-06-13',200824,6,2008,13,24,200806,2008),('2008-06-14',200824,6,2008,14,24,200806,2008),('2008-06-15',200825,6,2008,15,25,200806,2008),('2008-06-16',200825,6,2008,16,25,200806,2008),('2008-06-17',200825,6,2008,17,25,200806,2008),('2008-06-18',200825,6,2008,18,25,200806,2008),('2008-06-19',200825,6,2008,19,25,200806,2008),('2008-06-20',200825,6,2008,20,25,200806,2008),('2008-06-21',200825,6,2008,21,25,200806,2008),('2008-06-22',200826,6,2008,22,26,200806,2008),('2008-06-23',200826,6,2008,23,26,200806,2008),('2008-06-24',200826,6,2008,24,26,200806,2008),('2008-06-25',200826,6,2008,25,26,200806,2008),('2008-06-26',200826,6,2008,26,26,200806,2008),('2008-06-27',200826,6,2008,27,26,200806,2008),('2008-06-28',200826,6,2008,28,26,200806,2008),('2008-06-29',200827,6,2008,29,27,200806,2008),('2008-06-30',200827,6,2008,30,27,200806,2008),('2008-07-01',200827,7,2008,1,27,200807,2008),('2008-07-02',200827,7,2008,2,27,200807,2008),('2008-07-03',200827,7,2008,3,27,200807,2008),('2008-07-04',200827,7,2008,4,27,200807,2008),('2008-07-05',200827,7,2008,5,27,200807,2008),('2008-07-06',200828,7,2008,6,28,200807,2008),('2008-07-07',200828,7,2008,7,28,200807,2008),('2008-07-08',200828,7,2008,8,28,200807,2008),('2008-07-09',200828,7,2008,9,28,200807,2008),('2008-07-10',200828,7,2008,10,28,200807,2008),('2008-07-11',200828,7,2008,11,28,200807,2008),('2008-07-12',200828,7,2008,12,28,200807,2008),('2008-07-13',200829,7,2008,13,29,200807,2008),('2008-07-14',200829,7,2008,14,29,200807,2008),('2008-07-15',200829,7,2008,15,29,200807,2008),('2008-07-16',200829,7,2008,16,29,200807,2008),('2008-07-17',200829,7,2008,17,29,200807,2008),('2008-07-18',200829,7,2008,18,29,200807,2008),('2008-07-19',200829,7,2008,19,29,200807,2008),('2008-07-20',200830,7,2008,20,30,200807,2008),('2008-07-21',200830,7,2008,21,30,200807,2008),('2008-07-22',200830,7,2008,22,30,200807,2008),('2008-07-23',200830,7,2008,23,30,200807,2008),('2008-07-24',200830,7,2008,24,30,200807,2008),('2008-07-25',200830,7,2008,25,30,200807,2008),('2008-07-26',200830,7,2008,26,30,200807,2008),('2008-07-27',200831,7,2008,27,31,200807,2008),('2008-07-28',200831,7,2008,28,31,200807,2008),('2008-07-29',200831,7,2008,29,31,200807,2008),('2008-07-30',200831,7,2008,30,31,200807,2008),('2008-07-31',200831,7,2008,31,31,200807,2008),('2008-08-01',200831,8,2008,1,31,200808,2008),('2008-08-02',200831,8,2008,2,31,200808,2008),('2008-08-03',200832,8,2008,3,32,200808,2008),('2008-08-04',200832,8,2008,4,32,200808,2008),('2008-08-05',200832,8,2008,5,32,200808,2008),('2008-08-06',200832,8,2008,6,32,200808,2008),('2008-08-07',200832,8,2008,7,32,200808,2008),('2008-08-08',200832,8,2008,8,32,200808,2008),('2008-08-09',200832,8,2008,9,32,200808,2008),('2008-08-10',200833,8,2008,10,33,200808,2008),('2008-08-11',200833,8,2008,11,33,200808,2008),('2008-08-12',200833,8,2008,12,33,200808,2008),('2008-08-13',200833,8,2008,13,33,200808,2008),('2008-08-14',200833,8,2008,14,33,200808,2008),('2008-08-15',200833,8,2008,15,33,200808,2008),('2008-08-16',200833,8,2008,16,33,200808,2008),('2008-08-17',200834,8,2008,17,34,200808,2008),('2008-08-18',200834,8,2008,18,34,200808,2008),('2008-08-19',200834,8,2008,19,34,200808,2008),('2008-08-20',200834,8,2008,20,34,200808,2008),('2008-08-21',200834,8,2008,21,34,200808,2008),('2008-08-22',200834,8,2008,22,34,200808,2008),('2008-08-23',200834,8,2008,23,34,200808,2008),('2008-08-24',200835,8,2008,24,35,200808,2008),('2008-08-25',200835,8,2008,25,35,200808,2008),('2008-08-26',200835,8,2008,26,35,200808,2008),('2008-08-27',200835,8,2008,27,35,200808,2008),('2008-08-28',200835,8,2008,28,35,200808,2008),('2008-08-29',200835,8,2008,29,35,200808,2008),('2008-08-30',200835,8,2008,30,35,200808,2008),('2008-08-31',200836,8,2008,31,36,200808,2008),('2008-09-01',200836,9,2008,1,36,200809,2008),('2008-09-02',200836,9,2008,2,36,200809,2008),('2008-09-03',200836,9,2008,3,36,200809,2008),('2008-09-04',200836,9,2008,4,36,200809,2008),('2008-09-05',200836,9,2008,5,36,200809,2008),('2008-09-06',200836,9,2008,6,36,200809,2008),('2008-09-07',200837,9,2008,7,37,200809,2008),('2008-09-08',200837,9,2008,8,37,200809,2008),('2008-09-09',200837,9,2008,9,37,200809,2008),('2008-09-10',200837,9,2008,10,37,200809,2008),('2008-09-11',200837,9,2008,11,37,200809,2008),('2008-09-12',200837,9,2008,12,37,200809,2008),('2008-09-13',200837,9,2008,13,37,200809,2008),('2008-09-14',200838,9,2008,14,38,200809,2008),('2008-09-15',200838,9,2008,15,38,200809,2008),('2008-09-16',200838,9,2008,16,38,200809,2008),('2008-09-17',200838,9,2008,17,38,200809,2008),('2008-09-18',200838,9,2008,18,38,200809,2008),('2008-09-19',200838,9,2008,19,38,200809,2008),('2008-09-20',200838,9,2008,20,38,200809,2008),('2008-09-21',200839,9,2008,21,39,200809,2008),('2008-09-22',200839,9,2008,22,39,200809,2008),('2008-09-23',200839,9,2008,23,39,200809,2008),('2008-09-24',200839,9,2008,24,39,200809,2008),('2008-09-25',200839,9,2008,25,39,200809,2008),('2008-09-26',200839,9,2008,26,39,200809,2008),('2008-09-27',200839,9,2008,27,39,200809,2008),('2008-09-28',200840,9,2008,28,40,200809,2008),('2008-09-29',200840,9,2008,29,40,200809,2008),('2008-09-30',200840,9,2008,30,40,200809,2008),('2008-10-01',200840,10,2008,1,40,200810,2008),('2008-10-02',200840,10,2008,2,40,200810,2008),('2008-10-03',200840,10,2008,3,40,200810,2008),('2008-10-04',200840,10,2008,4,40,200810,2008),('2008-10-05',200841,10,2008,5,41,200810,2008),('2008-10-06',200841,10,2008,6,41,200810,2008),('2008-10-07',200841,10,2008,7,41,200810,2008),('2008-10-08',200841,10,2008,8,41,200810,2008),('2008-10-09',200841,10,2008,9,41,200810,2008),('2008-10-10',200841,10,2008,10,41,200810,2008),('2008-10-11',200841,10,2008,11,41,200810,2008),('2008-10-12',200842,10,2008,12,42,200810,2008),('2008-10-13',200842,10,2008,13,42,200810,2008),('2008-10-14',200842,10,2008,14,42,200810,2008),('2008-10-15',200842,10,2008,15,42,200810,2008),('2008-10-16',200842,10,2008,16,42,200810,2008),('2008-10-17',200842,10,2008,17,42,200810,2008),('2008-10-18',200842,10,2008,18,42,200810,2008),('2008-10-19',200843,10,2008,19,43,200810,2008),('2008-10-20',200843,10,2008,20,43,200810,2008),('2008-10-21',200843,10,2008,21,43,200810,2008),('2008-10-22',200843,10,2008,22,43,200810,2008),('2008-10-23',200843,10,2008,23,43,200810,2008),('2008-10-24',200843,10,2008,24,43,200810,2008),('2008-10-25',200843,10,2008,25,43,200810,2008),('2008-10-26',200844,10,2008,26,44,200810,2008),('2008-10-27',200844,10,2008,27,44,200810,2008),('2008-10-28',200844,10,2008,28,44,200810,2008),('2008-10-29',200844,10,2008,29,44,200810,2008),('2008-10-30',200844,10,2008,30,44,200810,2008),('2008-10-31',200844,10,2008,31,44,200810,2008),('2008-11-01',200844,11,2008,1,44,200811,2008),('2008-11-02',200845,11,2008,2,45,200811,2008),('2008-11-03',200845,11,2008,3,45,200811,2008),('2008-11-04',200845,11,2008,4,45,200811,2008),('2008-11-05',200845,11,2008,5,45,200811,2008),('2008-11-06',200845,11,2008,6,45,200811,2008),('2008-11-07',200845,11,2008,7,45,200811,2008),('2008-11-08',200845,11,2008,8,45,200811,2008),('2008-11-09',200846,11,2008,9,46,200811,2008),('2008-11-10',200846,11,2008,10,46,200811,2008),('2008-11-11',200846,11,2008,11,46,200811,2008),('2008-11-12',200846,11,2008,12,46,200811,2008),('2008-11-13',200846,11,2008,13,46,200811,2008),('2008-11-14',200846,11,2008,14,46,200811,2008),('2008-11-15',200846,11,2008,15,46,200811,2008),('2008-11-16',200847,11,2008,16,47,200811,2008),('2008-11-17',200847,11,2008,17,47,200811,2008),('2008-11-18',200847,11,2008,18,47,200811,2008),('2008-11-19',200847,11,2008,19,47,200811,2008),('2008-11-20',200847,11,2008,20,47,200811,2008),('2008-11-21',200847,11,2008,21,47,200811,2008),('2008-11-22',200847,11,2008,22,47,200811,2008),('2008-11-23',200848,11,2008,23,48,200811,2008),('2008-11-24',200848,11,2008,24,48,200811,2008),('2008-11-25',200848,11,2008,25,48,200811,2008),('2008-11-26',200848,11,2008,26,48,200811,2008),('2008-11-27',200848,11,2008,27,48,200811,2008),('2008-11-28',200848,11,2008,28,48,200811,2008),('2008-11-29',200848,11,2008,29,48,200811,2008),('2008-11-30',200849,11,2008,30,49,200811,2008),('2008-12-01',200849,12,2008,1,49,200812,2009),('2008-12-02',200849,12,2008,2,49,200812,2009),('2008-12-03',200849,12,2008,3,49,200812,2009),('2008-12-04',200849,12,2008,4,49,200812,2009),('2008-12-05',200849,12,2008,5,49,200812,2009),('2008-12-06',200849,12,2008,6,49,200812,2009),('2008-12-07',200850,12,2008,7,50,200812,2009),('2008-12-08',200850,12,2008,8,50,200812,2009),('2008-12-09',200850,12,2008,9,50,200812,2009),('2008-12-10',200850,12,2008,10,50,200812,2009),('2008-12-11',200850,12,2008,11,50,200812,2009),('2008-12-12',200850,12,2008,12,50,200812,2009),('2008-12-13',200850,12,2008,13,50,200812,2009),('2008-12-14',200851,12,2008,14,51,200812,2009),('2008-12-15',200851,12,2008,15,51,200812,2009),('2008-12-16',200851,12,2008,16,51,200812,2009),('2008-12-17',200851,12,2008,17,51,200812,2009),('2008-12-18',200851,12,2008,18,51,200812,2009),('2008-12-19',200851,12,2008,19,51,200812,2009),('2008-12-20',200851,12,2008,20,51,200812,2009),('2008-12-21',200852,12,2008,21,52,200812,2009),('2008-12-22',200852,12,2008,22,52,200812,2009),('2008-12-23',200852,12,2008,23,52,200812,2009),('2008-12-24',200852,12,2008,24,52,200812,2009),('2008-12-25',200852,12,2008,25,52,200812,2009),('2008-12-26',200852,12,2008,26,52,200812,2009),('2008-12-27',200852,12,2008,27,52,200812,2009),('2008-12-28',200853,12,2008,28,53,200812,2009),('2008-12-29',200901,12,2008,29,53,200812,2009),('2008-12-30',200901,12,2008,30,53,200812,2009),('2008-12-31',200901,12,2008,31,53,200812,2009),('2009-01-01',200901,1,2009,1,53,200901,2009),('2009-01-02',200901,1,2009,2,53,200901,2009),('2009-01-03',200901,1,2009,3,53,200901,2009),('2009-01-04',200902,1,2009,4,1,200901,2009),('2009-01-05',200902,1,2009,5,1,200901,2009),('2009-01-06',200902,1,2009,6,1,200901,2009),('2009-01-07',200902,1,2009,7,1,200901,2009),('2009-01-08',200902,1,2009,8,1,200901,2009),('2009-01-09',200902,1,2009,9,1,200901,2009),('2009-01-10',200902,1,2009,10,1,200901,2009),('2009-01-11',200903,1,2009,11,2,200901,2009),('2009-01-12',200903,1,2009,12,2,200901,2009),('2009-01-13',200903,1,2009,13,2,200901,2009),('2009-01-14',200903,1,2009,14,2,200901,2009),('2009-01-15',200903,1,2009,15,2,200901,2009),('2009-01-16',200903,1,2009,16,2,200901,2009),('2009-01-17',200903,1,2009,17,2,200901,2009),('2009-01-18',200904,1,2009,18,3,200901,2009),('2009-01-19',200904,1,2009,19,3,200901,2009),('2009-01-20',200904,1,2009,20,3,200901,2009),('2009-01-21',200904,1,2009,21,3,200901,2009),('2009-01-22',200904,1,2009,22,3,200901,2009),('2009-01-23',200904,1,2009,23,3,200901,2009),('2009-01-24',200904,1,2009,24,3,200901,2009),('2009-01-25',200905,1,2009,25,4,200901,2009),('2009-01-26',200905,1,2009,26,4,200901,2009),('2009-01-27',200905,1,2009,27,4,200901,2009),('2009-01-28',200905,1,2009,28,4,200901,2009),('2009-01-29',200905,1,2009,29,4,200901,2009),('2009-01-30',200905,1,2009,30,4,200901,2009),('2009-01-31',200905,1,2009,31,4,200901,2009),('2009-02-01',200906,2,2009,1,5,200902,2009),('2009-02-02',200906,2,2009,2,5,200902,2009),('2009-02-03',200906,2,2009,3,5,200902,2009),('2009-02-04',200906,2,2009,4,5,200902,2009),('2009-02-05',200906,2,2009,5,5,200902,2009),('2009-02-06',200906,2,2009,6,5,200902,2009),('2009-02-07',200906,2,2009,7,5,200902,2009),('2009-02-08',200907,2,2009,8,6,200902,2009),('2009-02-09',200907,2,2009,9,6,200902,2009),('2009-02-10',200907,2,2009,10,6,200902,2009),('2009-02-11',200907,2,2009,11,6,200902,2009),('2009-02-12',200907,2,2009,12,6,200902,2009),('2009-02-13',200907,2,2009,13,6,200902,2009),('2009-02-14',200907,2,2009,14,6,200902,2009),('2009-02-15',200908,2,2009,15,7,200902,2009),('2009-02-16',200908,2,2009,16,7,200902,2009),('2009-02-17',200908,2,2009,17,7,200902,2009),('2009-02-18',200908,2,2009,18,7,200902,2009),('2009-02-19',200908,2,2009,19,7,200902,2009),('2009-02-20',200908,2,2009,20,7,200902,2009),('2009-02-21',200908,2,2009,21,7,200902,2009),('2009-02-22',200909,2,2009,22,8,200902,2009),('2009-02-23',200909,2,2009,23,8,200902,2009),('2009-02-24',200909,2,2009,24,8,200902,2009),('2009-02-25',200909,2,2009,25,8,200902,2009),('2009-02-26',200909,2,2009,26,8,200902,2009),('2009-02-27',200909,2,2009,27,8,200902,2009),('2009-02-28',200909,2,2009,28,8,200902,2009),('2009-03-01',200910,3,2009,1,9,200903,2009),('2009-03-02',200910,3,2009,2,9,200903,2009),('2009-03-03',200910,3,2009,3,9,200903,2009),('2009-03-04',200910,3,2009,4,9,200903,2009),('2009-03-05',200910,3,2009,5,9,200903,2009),('2009-03-06',200910,3,2009,6,9,200903,2009),('2009-03-07',200910,3,2009,7,9,200903,2009),('2009-03-08',200911,3,2009,8,10,200903,2009),('2009-03-09',200911,3,2009,9,10,200903,2009),('2009-03-10',200911,3,2009,10,10,200903,2009),('2009-03-11',200911,3,2009,11,10,200903,2009),('2009-03-12',200911,3,2009,12,10,200903,2009),('2009-03-13',200911,3,2009,13,10,200903,2009),('2009-03-14',200911,3,2009,14,10,200903,2009),('2009-03-15',200912,3,2009,15,11,200903,2009),('2009-03-16',200912,3,2009,16,11,200903,2009),('2009-03-17',200912,3,2009,17,11,200903,2009),('2009-03-18',200912,3,2009,18,11,200903,2009),('2009-03-19',200912,3,2009,19,11,200903,2009),('2009-03-20',200912,3,2009,20,11,200903,2009),('2009-03-21',200912,3,2009,21,11,200903,2009),('2009-03-22',200913,3,2009,22,12,200903,2009),('2009-03-23',200913,3,2009,23,12,200903,2009),('2009-03-24',200913,3,2009,24,12,200903,2009),('2009-03-25',200913,3,2009,25,12,200903,2009),('2009-03-26',200913,3,2009,26,12,200903,2009),('2009-03-27',200913,3,2009,27,12,200903,2009),('2009-03-28',200913,3,2009,28,12,200903,2009),('2009-03-29',200914,3,2009,29,13,200903,2009),('2009-03-30',200914,3,2009,30,13,200903,2009),('2009-03-31',200914,3,2009,31,13,200903,2009),('2009-04-01',200914,4,2009,1,13,200904,2009),('2009-04-02',200914,4,2009,2,13,200904,2009),('2009-04-03',200914,4,2009,3,13,200904,2009),('2009-04-04',200914,4,2009,4,13,200904,2009),('2009-04-05',200915,4,2009,5,14,200904,2009),('2009-04-06',200915,4,2009,6,14,200904,2009),('2009-04-07',200915,4,2009,7,14,200904,2009),('2009-04-08',200915,4,2009,8,14,200904,2009),('2009-04-09',200915,4,2009,9,14,200904,2009),('2009-04-10',200915,4,2009,10,14,200904,2009),('2009-04-11',200915,4,2009,11,14,200904,2009),('2009-04-12',200916,4,2009,12,15,200904,2009),('2009-04-13',200916,4,2009,13,15,200904,2009),('2009-04-14',200916,4,2009,14,15,200904,2009),('2009-04-15',200916,4,2009,15,15,200904,2009),('2009-04-16',200916,4,2009,16,15,200904,2009),('2009-04-17',200916,4,2009,17,15,200904,2009),('2009-04-18',200916,4,2009,18,15,200904,2009),('2009-04-19',200917,4,2009,19,16,200904,2009),('2009-04-20',200917,4,2009,20,16,200904,2009),('2009-04-21',200917,4,2009,21,16,200904,2009),('2009-04-22',200917,4,2009,22,16,200904,2009),('2009-04-23',200917,4,2009,23,16,200904,2009),('2009-04-24',200917,4,2009,24,16,200904,2009),('2009-04-25',200917,4,2009,25,16,200904,2009),('2009-04-26',200918,4,2009,26,17,200904,2009),('2009-04-27',200918,4,2009,27,17,200904,2009),('2009-04-28',200918,4,2009,28,17,200904,2009),('2009-04-29',200918,4,2009,29,17,200904,2009),('2009-04-30',200918,4,2009,30,17,200904,2009),('2009-05-01',200918,5,2009,1,17,200905,2009),('2009-05-02',200918,5,2009,2,17,200905,2009),('2009-05-03',200919,5,2009,3,18,200905,2009),('2009-05-04',200919,5,2009,4,18,200905,2009),('2009-05-05',200919,5,2009,5,18,200905,2009),('2009-05-06',200919,5,2009,6,18,200905,2009),('2009-05-07',200919,5,2009,7,18,200905,2009),('2009-05-08',200919,5,2009,8,18,200905,2009),('2009-05-09',200919,5,2009,9,18,200905,2009),('2009-05-10',200920,5,2009,10,19,200905,2009),('2009-05-11',200920,5,2009,11,19,200905,2009),('2009-05-12',200920,5,2009,12,19,200905,2009),('2009-05-13',200920,5,2009,13,19,200905,2009),('2009-05-14',200920,5,2009,14,19,200905,2009),('2009-05-15',200920,5,2009,15,19,200905,2009),('2009-05-16',200920,5,2009,16,19,200905,2009),('2009-05-17',200921,5,2009,17,20,200905,2009),('2009-05-18',200921,5,2009,18,20,200905,2009),('2009-05-19',200921,5,2009,19,20,200905,2009),('2009-05-20',200921,5,2009,20,20,200905,2009),('2009-05-21',200921,5,2009,21,20,200905,2009),('2009-05-22',200921,5,2009,22,20,200905,2009),('2009-05-23',200921,5,2009,23,20,200905,2009),('2009-05-24',200922,5,2009,24,21,200905,2009),('2009-05-25',200922,5,2009,25,21,200905,2009),('2009-05-26',200922,5,2009,26,21,200905,2009),('2009-05-27',200922,5,2009,27,21,200905,2009),('2009-05-28',200922,5,2009,28,21,200905,2009),('2009-05-29',200922,5,2009,29,21,200905,2009),('2009-05-30',200922,5,2009,30,21,200905,2009),('2009-05-31',200923,5,2009,31,22,200905,2009),('2009-06-01',200923,6,2009,1,22,200906,2009),('2009-06-02',200923,6,2009,2,22,200906,2009),('2009-06-03',200923,6,2009,3,22,200906,2009),('2009-06-04',200923,6,2009,4,22,200906,2009),('2009-06-05',200923,6,2009,5,22,200906,2009),('2009-06-06',200923,6,2009,6,22,200906,2009),('2009-06-07',200924,6,2009,7,23,200906,2009),('2009-06-08',200924,6,2009,8,23,200906,2009),('2009-06-09',200924,6,2009,9,23,200906,2009),('2009-06-10',200924,6,2009,10,23,200906,2009),('2009-06-11',200924,6,2009,11,23,200906,2009),('2009-06-12',200924,6,2009,12,23,200906,2009),('2009-06-13',200924,6,2009,13,23,200906,2009),('2009-06-14',200925,6,2009,14,24,200906,2009),('2009-06-15',200925,6,2009,15,24,200906,2009),('2009-06-16',200925,6,2009,16,24,200906,2009),('2009-06-17',200925,6,2009,17,24,200906,2009),('2009-06-18',200925,6,2009,18,24,200906,2009),('2009-06-19',200925,6,2009,19,24,200906,2009),('2009-06-20',200925,6,2009,20,24,200906,2009),('2009-06-21',200926,6,2009,21,25,200906,2009),('2009-06-22',200926,6,2009,22,25,200906,2009),('2009-06-23',200926,6,2009,23,25,200906,2009),('2009-06-24',200926,6,2009,24,25,200906,2009),('2009-06-25',200926,6,2009,25,25,200906,2009),('2009-06-26',200926,6,2009,26,25,200906,2009),('2009-06-27',200926,6,2009,27,25,200906,2009),('2009-06-28',200927,6,2009,28,26,200906,2009),('2009-06-29',200927,6,2009,29,26,200906,2009),('2009-06-30',200927,6,2009,30,26,200906,2009),('2009-07-01',200927,7,2009,1,26,200907,2009),('2009-07-02',200927,7,2009,2,26,200907,2009),('2009-07-03',200927,7,2009,3,26,200907,2009),('2009-07-04',200927,7,2009,4,26,200907,2009),('2009-07-05',200928,7,2009,5,27,200907,2009),('2009-07-06',200928,7,2009,6,27,200907,2009),('2009-07-07',200928,7,2009,7,27,200907,2009),('2009-07-08',200928,7,2009,8,27,200907,2009),('2009-07-09',200928,7,2009,9,27,200907,2009),('2009-07-10',200928,7,2009,10,27,200907,2009),('2009-07-11',200928,7,2009,11,27,200907,2009),('2009-07-12',200929,7,2009,12,28,200907,2009),('2009-07-13',200929,7,2009,13,28,200907,2009),('2009-07-14',200929,7,2009,14,28,200907,2009),('2009-07-15',200929,7,2009,15,28,200907,2009),('2009-07-16',200929,7,2009,16,28,200907,2009),('2009-07-17',200929,7,2009,17,28,200907,2009),('2009-07-18',200929,7,2009,18,28,200907,2009),('2009-07-19',200930,7,2009,19,29,200907,2009),('2009-07-20',200930,7,2009,20,29,200907,2009),('2009-07-21',200930,7,2009,21,29,200907,2009),('2009-07-22',200930,7,2009,22,29,200907,2009),('2009-07-23',200930,7,2009,23,29,200907,2009),('2009-07-24',200930,7,2009,24,29,200907,2009),('2009-07-25',200930,7,2009,25,29,200907,2009),('2009-07-26',200931,7,2009,26,30,200907,2009),('2009-07-27',200931,7,2009,27,30,200907,2009),('2009-07-28',200931,7,2009,28,30,200907,2009),('2009-07-29',200931,7,2009,29,30,200907,2009),('2009-07-30',200931,7,2009,30,30,200907,2009),('2009-07-31',200931,7,2009,31,30,200907,2009),('2009-08-01',200931,8,2009,1,30,200908,2009),('2009-08-02',200932,8,2009,2,31,200908,2009),('2009-08-03',200932,8,2009,3,31,200908,2009),('2009-08-04',200932,8,2009,4,31,200908,2009),('2009-08-05',200932,8,2009,5,31,200908,2009),('2009-08-06',200932,8,2009,6,31,200908,2009),('2009-08-07',200932,8,2009,7,31,200908,2009),('2009-08-08',200932,8,2009,8,31,200908,2009),('2009-08-09',200933,8,2009,9,32,200908,2009),('2009-08-10',200933,8,2009,10,32,200908,2009),('2009-08-11',200933,8,2009,11,32,200908,2009),('2009-08-12',200933,8,2009,12,32,200908,2009),('2009-08-13',200933,8,2009,13,32,200908,2009),('2009-08-14',200933,8,2009,14,32,200908,2009),('2009-08-15',200933,8,2009,15,32,200908,2009),('2009-08-16',200934,8,2009,16,33,200908,2009),('2009-08-17',200934,8,2009,17,33,200908,2009),('2009-08-18',200934,8,2009,18,33,200908,2009),('2009-08-19',200934,8,2009,19,33,200908,2009),('2009-08-20',200934,8,2009,20,33,200908,2009),('2009-08-21',200934,8,2009,21,33,200908,2009),('2009-08-22',200934,8,2009,22,33,200908,2009),('2009-08-23',200935,8,2009,23,34,200908,2009),('2009-08-24',200935,8,2009,24,34,200908,2009),('2009-08-25',200935,8,2009,25,34,200908,2009),('2009-08-26',200935,8,2009,26,34,200908,2009),('2009-08-27',200935,8,2009,27,34,200908,2009),('2009-08-28',200935,8,2009,28,34,200908,2009),('2009-08-29',200935,8,2009,29,34,200908,2009),('2009-08-30',200936,8,2009,30,35,200908,2009),('2009-08-31',200936,8,2009,31,35,200908,2009),('2009-09-01',200936,9,2009,1,35,200909,2009),('2009-09-02',200936,9,2009,2,35,200909,2009),('2009-09-03',200936,9,2009,3,35,200909,2009),('2009-09-04',200936,9,2009,4,35,200909,2009),('2009-09-05',200936,9,2009,5,35,200909,2009),('2009-09-06',200937,9,2009,6,36,200909,2009),('2009-09-07',200937,9,2009,7,36,200909,2009),('2009-09-08',200937,9,2009,8,36,200909,2009),('2009-09-09',200937,9,2009,9,36,200909,2009),('2009-09-10',200937,9,2009,10,36,200909,2009),('2009-09-11',200937,9,2009,11,36,200909,2009),('2009-09-12',200937,9,2009,12,36,200909,2009),('2009-09-13',200938,9,2009,13,37,200909,2009),('2009-09-14',200938,9,2009,14,37,200909,2009),('2009-09-15',200938,9,2009,15,37,200909,2009),('2009-09-16',200938,9,2009,16,37,200909,2009),('2009-09-17',200938,9,2009,17,37,200909,2009),('2009-09-18',200938,9,2009,18,37,200909,2009),('2009-09-19',200938,9,2009,19,37,200909,2009),('2009-09-20',200939,9,2009,20,38,200909,2009),('2009-09-21',200939,9,2009,21,38,200909,2009),('2009-09-22',200939,9,2009,22,38,200909,2009),('2009-09-23',200939,9,2009,23,38,200909,2009),('2009-09-24',200939,9,2009,24,38,200909,2009),('2009-09-25',200939,9,2009,25,38,200909,2009),('2009-09-26',200939,9,2009,26,38,200909,2009),('2009-09-27',200940,9,2009,27,39,200909,2009),('2009-09-28',200940,9,2009,28,39,200909,2009),('2009-09-29',200940,9,2009,29,39,200909,2009),('2009-09-30',200940,9,2009,30,39,200909,2009),('2009-10-01',200940,10,2009,1,39,200910,2009),('2009-10-02',200940,10,2009,2,39,200910,2009),('2009-10-03',200940,10,2009,3,39,200910,2009),('2009-10-04',200941,10,2009,4,40,200910,2009),('2009-10-05',200941,10,2009,5,40,200910,2009),('2009-10-06',200941,10,2009,6,40,200910,2009),('2009-10-07',200941,10,2009,7,40,200910,2009),('2009-10-08',200941,10,2009,8,40,200910,2009),('2009-10-09',200941,10,2009,9,40,200910,2009),('2009-10-10',200941,10,2009,10,40,200910,2009),('2009-10-11',200942,10,2009,11,41,200910,2009),('2009-10-12',200942,10,2009,12,41,200910,2009),('2009-10-13',200942,10,2009,13,41,200910,2009),('2009-10-14',200942,10,2009,14,41,200910,2009),('2009-10-15',200942,10,2009,15,41,200910,2009),('2009-10-16',200942,10,2009,16,41,200910,2009),('2009-10-17',200942,10,2009,17,41,200910,2009),('2009-10-18',200943,10,2009,18,42,200910,2009),('2009-10-19',200943,10,2009,19,42,200910,2009),('2009-10-20',200943,10,2009,20,42,200910,2009),('2009-10-21',200943,10,2009,21,42,200910,2009),('2009-10-22',200943,10,2009,22,42,200910,2009),('2009-10-23',200943,10,2009,23,42,200910,2009),('2009-10-24',200943,10,2009,24,42,200910,2009),('2009-10-25',200944,10,2009,25,43,200910,2009),('2009-10-26',200944,10,2009,26,43,200910,2009),('2009-10-27',200944,10,2009,27,43,200910,2009),('2009-10-28',200944,10,2009,28,43,200910,2009),('2009-10-29',200944,10,2009,29,43,200910,2009),('2009-10-30',200944,10,2009,30,43,200910,2009),('2009-10-31',200944,10,2009,31,43,200910,2009),('2009-11-01',200945,11,2009,1,44,200911,2009),('2009-11-02',200945,11,2009,2,44,200911,2009),('2009-11-03',200945,11,2009,3,44,200911,2009),('2009-11-04',200945,11,2009,4,44,200911,2009),('2009-11-05',200945,11,2009,5,44,200911,2009),('2009-11-06',200945,11,2009,6,44,200911,2009),('2009-11-07',200945,11,2009,7,44,200911,2009),('2009-11-08',200946,11,2009,8,45,200911,2009),('2009-11-09',200946,11,2009,9,45,200911,2009),('2009-11-10',200946,11,2009,10,45,200911,2009),('2009-11-11',200946,11,2009,11,45,200911,2009),('2009-11-12',200946,11,2009,12,45,200911,2009),('2009-11-13',200946,11,2009,13,45,200911,2009),('2009-11-14',200946,11,2009,14,45,200911,2009),('2009-11-15',200947,11,2009,15,46,200911,2009),('2009-11-16',200947,11,2009,16,46,200911,2009),('2009-11-17',200947,11,2009,17,46,200911,2009),('2009-11-18',200947,11,2009,18,46,200911,2009),('2009-11-19',200947,11,2009,19,46,200911,2009),('2009-11-20',200947,11,2009,20,46,200911,2009),('2009-11-21',200947,11,2009,21,46,200911,2009),('2009-11-22',200948,11,2009,22,47,200911,2009),('2009-11-23',200948,11,2009,23,47,200911,2009),('2009-11-24',200948,11,2009,24,47,200911,2009),('2009-11-25',200948,11,2009,25,47,200911,2009),('2009-11-26',200948,11,2009,26,47,200911,2009),('2009-11-27',200948,11,2009,27,47,200911,2009),('2009-11-28',200948,11,2009,28,47,200911,2009),('2009-11-29',200949,11,2009,29,48,200911,2009),('2009-11-30',200949,11,2009,30,48,200911,2009),('2009-12-01',200949,12,2009,1,48,200912,2010),('2009-12-02',200949,12,2009,2,48,200912,2010),('2009-12-03',200949,12,2009,3,48,200912,2010),('2009-12-04',200949,12,2009,4,48,200912,2010),('2009-12-05',200949,12,2009,5,48,200912,2010),('2009-12-06',200950,12,2009,6,49,200912,2010),('2009-12-07',200950,12,2009,7,49,200912,2010),('2009-12-08',200950,12,2009,8,49,200912,2010),('2009-12-09',200950,12,2009,9,49,200912,2010),('2009-12-10',200950,12,2009,10,49,200912,2010),('2009-12-11',200950,12,2009,11,49,200912,2010),('2009-12-12',200950,12,2009,12,49,200912,2010),('2009-12-13',200951,12,2009,13,50,200912,2010),('2009-12-14',200951,12,2009,14,50,200912,2010),('2009-12-15',200951,12,2009,15,50,200912,2010),('2009-12-16',200951,12,2009,16,50,200912,2010),('2009-12-17',200951,12,2009,17,50,200912,2010),('2009-12-18',200951,12,2009,18,50,200912,2010),('2009-12-19',200951,12,2009,19,50,200912,2010),('2009-12-20',200952,12,2009,20,51,200912,2010),('2009-12-21',200952,12,2009,21,51,200912,2010),('2009-12-22',200952,12,2009,22,51,200912,2010),('2009-12-23',200952,12,2009,23,51,200912,2010),('2009-12-24',200952,12,2009,24,51,200912,2010),('2009-12-25',200952,12,2009,25,51,200912,2010),('2009-12-26',200952,12,2009,26,51,200912,2010),('2009-12-27',200953,12,2009,27,52,200912,2010),('2009-12-28',200952,12,2009,28,52,200912,2010),('2009-12-29',200952,12,2009,29,52,200912,2010),('2009-12-30',200952,12,2009,30,52,200912,2010),('2009-12-31',200952,12,2009,31,52,200912,2010),('2010-01-01',201001,1,2010,1,52,201001,2010),('2010-01-02',201001,1,2010,2,52,201001,2010),('2010-01-03',201002,1,2010,3,1,201001,2010),('2010-01-04',201001,1,2010,4,1,201001,2010),('2010-01-05',201001,1,2010,5,1,201001,2010),('2010-01-06',201001,1,2010,6,1,201001,2010),('2010-01-07',201001,1,2010,7,1,201001,2010),('2010-01-08',201001,1,2010,8,1,201001,2010),('2010-01-09',201001,1,2010,9,1,201001,2010),('2010-01-10',201002,1,2010,10,2,201001,2010),('2010-01-11',201002,1,2010,11,2,201001,2010),('2010-01-12',201002,1,2010,12,2,201001,2010),('2010-01-13',201002,1,2010,13,2,201001,2010),('2010-01-14',201002,1,2010,14,2,201001,2010),('2010-01-15',201002,1,2010,15,2,201001,2010),('2010-01-16',201002,1,2010,16,2,201001,2010),('2010-01-17',201003,1,2010,17,3,201001,2010),('2010-01-18',201003,1,2010,18,3,201001,2010),('2010-01-19',201003,1,2010,19,3,201001,2010),('2010-01-20',201003,1,2010,20,3,201001,2010),('2010-01-21',201003,1,2010,21,3,201001,2010),('2010-01-22',201003,1,2010,22,3,201001,2010),('2010-01-23',201003,1,2010,23,3,201001,2010),('2010-01-24',201004,1,2010,24,4,201001,2010),('2010-01-25',201004,1,2010,25,4,201001,2010),('2010-01-26',201004,1,2010,26,4,201001,2010),('2010-01-27',201004,1,2010,27,4,201001,2010),('2010-01-28',201004,1,2010,28,4,201001,2010),('2010-01-29',201004,1,2010,29,4,201001,2010),('2010-01-30',201004,1,2010,30,4,201001,2010),('2010-01-31',201005,1,2010,31,5,201001,2010),('2010-02-01',201005,2,2010,1,5,201002,2010),('2010-02-02',201005,2,2010,2,5,201002,2010),('2010-02-03',201005,2,2010,3,5,201002,2010),('2010-02-04',201005,2,2010,4,5,201002,2010),('2010-02-05',201005,2,2010,5,5,201002,2010),('2010-02-06',201005,2,2010,6,5,201002,2010),('2010-02-07',201006,2,2010,7,6,201002,2010),('2010-02-08',201006,2,2010,8,6,201002,2010),('2010-02-09',201006,2,2010,9,6,201002,2010),('2010-02-10',201006,2,2010,10,6,201002,2010),('2010-02-11',201006,2,2010,11,6,201002,2010),('2010-02-12',201006,2,2010,12,6,201002,2010),('2010-02-13',201006,2,2010,13,6,201002,2010),('2010-02-14',201007,2,2010,14,7,201002,2010),('2010-02-15',201007,2,2010,15,7,201002,2010),('2010-02-16',201007,2,2010,16,7,201002,2010),('2010-02-17',201007,2,2010,17,7,201002,2010),('2010-02-18',201007,2,2010,18,7,201002,2010),('2010-02-19',201007,2,2010,19,7,201002,2010),('2010-02-20',201007,2,2010,20,7,201002,2010),('2010-02-21',201008,2,2010,21,8,201002,2010),('2010-02-22',201008,2,2010,22,8,201002,2010),('2010-02-23',201008,2,2010,23,8,201002,2010),('2010-02-24',201008,2,2010,24,8,201002,2010),('2010-02-25',201008,2,2010,25,8,201002,2010),('2010-02-26',201008,2,2010,26,8,201002,2010),('2010-02-27',201008,2,2010,27,8,201002,2010),('2010-02-28',201009,2,2010,28,9,201002,2010),('2010-03-01',201009,3,2010,1,9,201003,2010),('2010-03-02',201009,3,2010,2,9,201003,2010),('2010-03-03',201009,3,2010,3,9,201003,2010),('2010-03-04',201009,3,2010,4,9,201003,2010),('2010-03-05',201009,3,2010,5,9,201003,2010),('2010-03-06',201009,3,2010,6,9,201003,2010),('2010-03-07',201010,3,2010,7,10,201003,2010),('2010-03-08',201010,3,2010,8,10,201003,2010),('2010-03-09',201010,3,2010,9,10,201003,2010),('2010-03-10',201010,3,2010,10,10,201003,2010),('2010-03-11',201010,3,2010,11,10,201003,2010),('2010-03-12',201010,3,2010,12,10,201003,2010),('2010-03-13',201010,3,2010,13,10,201003,2010),('2010-03-14',201011,3,2010,14,11,201003,2010),('2010-03-15',201011,3,2010,15,11,201003,2010),('2010-03-16',201011,3,2010,16,11,201003,2010),('2010-03-17',201011,3,2010,17,11,201003,2010),('2010-03-18',201011,3,2010,18,11,201003,2010),('2010-03-19',201011,3,2010,19,11,201003,2010),('2010-03-20',201011,3,2010,20,11,201003,2010),('2010-03-21',201012,3,2010,21,12,201003,2010),('2010-03-22',201012,3,2010,22,12,201003,2010),('2010-03-23',201012,3,2010,23,12,201003,2010),('2010-03-24',201012,3,2010,24,12,201003,2010),('2010-03-25',201012,3,2010,25,12,201003,2010),('2010-03-26',201012,3,2010,26,12,201003,2010),('2010-03-27',201012,3,2010,27,12,201003,2010),('2010-03-28',201013,3,2010,28,13,201003,2010),('2010-03-29',201013,3,2010,29,13,201003,2010),('2010-03-30',201013,3,2010,30,13,201003,2010),('2010-03-31',201013,3,2010,31,13,201003,2010),('2010-04-01',201013,4,2010,1,13,201004,2010),('2010-04-02',201013,4,2010,2,13,201004,2010),('2010-04-03',201013,4,2010,3,13,201004,2010),('2010-04-04',201014,4,2010,4,14,201004,2010),('2010-04-05',201014,4,2010,5,14,201004,2010),('2010-04-06',201014,4,2010,6,14,201004,2010),('2010-04-07',201014,4,2010,7,14,201004,2010),('2010-04-08',201014,4,2010,8,14,201004,2010),('2010-04-09',201014,4,2010,9,14,201004,2010),('2010-04-10',201014,4,2010,10,14,201004,2010),('2010-04-11',201015,4,2010,11,15,201004,2010),('2010-04-12',201015,4,2010,12,15,201004,2010),('2010-04-13',201015,4,2010,13,15,201004,2010),('2010-04-14',201015,4,2010,14,15,201004,2010),('2010-04-15',201015,4,2010,15,15,201004,2010),('2010-04-16',201015,4,2010,16,15,201004,2010),('2010-04-17',201015,4,2010,17,15,201004,2010),('2010-04-18',201016,4,2010,18,16,201004,2010),('2010-04-19',201016,4,2010,19,16,201004,2010),('2010-04-20',201016,4,2010,20,16,201004,2010),('2010-04-21',201016,4,2010,21,16,201004,2010),('2010-04-22',201016,4,2010,22,16,201004,2010),('2010-04-23',201016,4,2010,23,16,201004,2010),('2010-04-24',201016,4,2010,24,16,201004,2010),('2010-04-25',201017,4,2010,25,17,201004,2010),('2010-04-26',201017,4,2010,26,17,201004,2010),('2010-04-27',201017,4,2010,27,17,201004,2010),('2010-04-28',201017,4,2010,28,17,201004,2010),('2010-04-29',201017,4,2010,29,17,201004,2010),('2010-04-30',201017,4,2010,30,17,201004,2010),('2010-05-01',201017,5,2010,1,17,201005,2010),('2010-05-02',201018,5,2010,2,18,201005,2010),('2010-05-03',201018,5,2010,3,18,201005,2010),('2010-05-04',201018,5,2010,4,18,201005,2010),('2010-05-05',201018,5,2010,5,18,201005,2010),('2010-05-06',201018,5,2010,6,18,201005,2010),('2010-05-07',201018,5,2010,7,18,201005,2010),('2010-05-08',201018,5,2010,8,18,201005,2010),('2010-05-09',201019,5,2010,9,19,201005,2010),('2010-05-10',201019,5,2010,10,19,201005,2010),('2010-05-11',201019,5,2010,11,19,201005,2010),('2010-05-12',201019,5,2010,12,19,201005,2010),('2010-05-13',201019,5,2010,13,19,201005,2010),('2010-05-14',201019,5,2010,14,19,201005,2010),('2010-05-15',201019,5,2010,15,19,201005,2010),('2010-05-16',201020,5,2010,16,20,201005,2010),('2010-05-17',201020,5,2010,17,20,201005,2010),('2010-05-18',201020,5,2010,18,20,201005,2010),('2010-05-19',201020,5,2010,19,20,201005,2010),('2010-05-20',201020,5,2010,20,20,201005,2010),('2010-05-21',201020,5,2010,21,20,201005,2010),('2010-05-22',201020,5,2010,22,20,201005,2010),('2010-05-23',201021,5,2010,23,21,201005,2010),('2010-05-24',201021,5,2010,24,21,201005,2010),('2010-05-25',201021,5,2010,25,21,201005,2010),('2010-05-26',201021,5,2010,26,21,201005,2010),('2010-05-27',201021,5,2010,27,21,201005,2010),('2010-05-28',201021,5,2010,28,21,201005,2010),('2010-05-29',201021,5,2010,29,21,201005,2010),('2010-05-30',201022,5,2010,30,22,201005,2010),('2010-05-31',201022,5,2010,31,22,201005,2010),('2010-06-01',201022,6,2010,1,22,201006,2010),('2010-06-02',201022,6,2010,2,22,201006,2010),('2010-06-03',201022,6,2010,3,22,201006,2010),('2010-06-04',201022,6,2010,4,22,201006,2010),('2010-06-05',201022,6,2010,5,22,201006,2010),('2010-06-06',201023,6,2010,6,23,201006,2010),('2010-06-07',201023,6,2010,7,23,201006,2010),('2010-06-08',201023,6,2010,8,23,201006,2010),('2010-06-09',201023,6,2010,9,23,201006,2010),('2010-06-10',201023,6,2010,10,23,201006,2010),('2010-06-11',201023,6,2010,11,23,201006,2010),('2010-06-12',201023,6,2010,12,23,201006,2010),('2010-06-13',201024,6,2010,13,24,201006,2010),('2010-06-14',201024,6,2010,14,24,201006,2010),('2010-06-15',201024,6,2010,15,24,201006,2010),('2010-06-16',201024,6,2010,16,24,201006,2010),('2010-06-17',201024,6,2010,17,24,201006,2010),('2010-06-18',201024,6,2010,18,24,201006,2010),('2010-06-19',201024,6,2010,19,24,201006,2010),('2010-06-20',201025,6,2010,20,25,201006,2010),('2010-06-21',201025,6,2010,21,25,201006,2010),('2010-06-22',201025,6,2010,22,25,201006,2010),('2010-06-23',201025,6,2010,23,25,201006,2010),('2010-06-24',201025,6,2010,24,25,201006,2010),('2010-06-25',201025,6,2010,25,25,201006,2010),('2010-06-26',201025,6,2010,26,25,201006,2010),('2010-06-27',201026,6,2010,27,26,201006,2010),('2010-06-28',201026,6,2010,28,26,201006,2010),('2010-06-29',201026,6,2010,29,26,201006,2010),('2010-06-30',201026,6,2010,30,26,201006,2010),('2010-07-01',201026,7,2010,1,26,201007,2010),('2010-07-02',201026,7,2010,2,26,201007,2010),('2010-07-03',201026,7,2010,3,26,201007,2010),('2010-07-04',201027,7,2010,4,27,201007,2010),('2010-07-05',201027,7,2010,5,27,201007,2010),('2010-07-06',201027,7,2010,6,27,201007,2010),('2010-07-07',201027,7,2010,7,27,201007,2010),('2010-07-08',201027,7,2010,8,27,201007,2010),('2010-07-09',201027,7,2010,9,27,201007,2010),('2010-07-10',201027,7,2010,10,27,201007,2010),('2010-07-11',201028,7,2010,11,28,201007,2010),('2010-07-12',201028,7,2010,12,28,201007,2010),('2010-07-13',201028,7,2010,13,28,201007,2010),('2010-07-14',201028,7,2010,14,28,201007,2010),('2010-07-15',201028,7,2010,15,28,201007,2010),('2010-07-16',201028,7,2010,16,28,201007,2010),('2010-07-17',201028,7,2010,17,28,201007,2010),('2010-07-18',201029,7,2010,18,29,201007,2010),('2010-07-19',201029,7,2010,19,29,201007,2010),('2010-07-20',201029,7,2010,20,29,201007,2010),('2010-07-21',201029,7,2010,21,29,201007,2010),('2010-07-22',201029,7,2010,22,29,201007,2010),('2010-07-23',201029,7,2010,23,29,201007,2010),('2010-07-24',201029,7,2010,24,29,201007,2010),('2010-07-25',201030,7,2010,25,30,201007,2010),('2010-07-26',201030,7,2010,26,30,201007,2010),('2010-07-27',201030,7,2010,27,30,201007,2010),('2010-07-28',201030,7,2010,28,30,201007,2010),('2010-07-29',201030,7,2010,29,30,201007,2010),('2010-07-30',201030,7,2010,30,30,201007,2010),('2010-07-31',201030,7,2010,31,30,201007,2010),('2010-08-01',201031,8,2010,1,31,201008,2010),('2010-08-02',201031,8,2010,2,31,201008,2010),('2010-08-03',201031,8,2010,3,31,201008,2010),('2010-08-04',201031,8,2010,4,31,201008,2010),('2010-08-05',201031,8,2010,5,31,201008,2010),('2010-08-06',201031,8,2010,6,31,201008,2010),('2010-08-07',201031,8,2010,7,31,201008,2010),('2010-08-08',201032,8,2010,8,32,201008,2010),('2010-08-09',201032,8,2010,9,32,201008,2010),('2010-08-10',201032,8,2010,10,32,201008,2010),('2010-08-11',201032,8,2010,11,32,201008,2010),('2010-08-12',201032,8,2010,12,32,201008,2010),('2010-08-13',201032,8,2010,13,32,201008,2010),('2010-08-14',201032,8,2010,14,32,201008,2010),('2010-08-15',201033,8,2010,15,33,201008,2010),('2010-08-16',201033,8,2010,16,33,201008,2010),('2010-08-17',201033,8,2010,17,33,201008,2010),('2010-08-18',201033,8,2010,18,33,201008,2010),('2010-08-19',201033,8,2010,19,33,201008,2010),('2010-08-20',201033,8,2010,20,33,201008,2010),('2010-08-21',201033,8,2010,21,33,201008,2010),('2010-08-22',201034,8,2010,22,34,201008,2010),('2010-08-23',201034,8,2010,23,34,201008,2010),('2010-08-24',201034,8,2010,24,34,201008,2010),('2010-08-25',201034,8,2010,25,34,201008,2010),('2010-08-26',201034,8,2010,26,34,201008,2010),('2010-08-27',201034,8,2010,27,34,201008,2010),('2010-08-28',201034,8,2010,28,34,201008,2010),('2010-08-29',201035,8,2010,29,35,201008,2010),('2010-08-30',201035,8,2010,30,35,201008,2010),('2010-08-31',201035,8,2010,31,35,201008,2010),('2010-09-01',201035,9,2010,1,35,201009,2010),('2010-09-02',201035,9,2010,2,35,201009,2010),('2010-09-03',201035,9,2010,3,35,201009,2010),('2010-09-04',201035,9,2010,4,35,201009,2010),('2010-09-05',201036,9,2010,5,36,201009,2010),('2010-09-06',201036,9,2010,6,36,201009,2010),('2010-09-07',201036,9,2010,7,36,201009,2010),('2010-09-08',201036,9,2010,8,36,201009,2010),('2010-09-09',201036,9,2010,9,36,201009,2010),('2010-09-10',201036,9,2010,10,36,201009,2010),('2010-09-11',201036,9,2010,11,36,201009,2010),('2010-09-12',201037,9,2010,12,37,201009,2010),('2010-09-13',201037,9,2010,13,37,201009,2010),('2010-09-14',201037,9,2010,14,37,201009,2010),('2010-09-15',201037,9,2010,15,37,201009,2010),('2010-09-16',201037,9,2010,16,37,201009,2010),('2010-09-17',201037,9,2010,17,37,201009,2010),('2010-09-18',201037,9,2010,18,37,201009,2010),('2010-09-19',201038,9,2010,19,38,201009,2010),('2010-09-20',201038,9,2010,20,38,201009,2010),('2010-09-21',201038,9,2010,21,38,201009,2010),('2010-09-22',201038,9,2010,22,38,201009,2010),('2010-09-23',201038,9,2010,23,38,201009,2010),('2010-09-24',201038,9,2010,24,38,201009,2010),('2010-09-25',201038,9,2010,25,38,201009,2010),('2010-09-26',201039,9,2010,26,39,201009,2010),('2010-09-27',201039,9,2010,27,39,201009,2010),('2010-09-28',201039,9,2010,28,39,201009,2010),('2010-09-29',201039,9,2010,29,39,201009,2010),('2010-09-30',201039,9,2010,30,39,201009,2010),('2010-10-01',201039,10,2010,1,39,201010,2010),('2010-10-02',201039,10,2010,2,39,201010,2010),('2010-10-03',201040,10,2010,3,40,201010,2010),('2010-10-04',201040,10,2010,4,40,201010,2010),('2010-10-05',201040,10,2010,5,40,201010,2010),('2010-10-06',201040,10,2010,6,40,201010,2010),('2010-10-07',201040,10,2010,7,40,201010,2010),('2010-10-08',201040,10,2010,8,40,201010,2010),('2010-10-09',201040,10,2010,9,40,201010,2010),('2010-10-10',201041,10,2010,10,41,201010,2010),('2010-10-11',201041,10,2010,11,41,201010,2010),('2010-10-12',201041,10,2010,12,41,201010,2010),('2010-10-13',201041,10,2010,13,41,201010,2010),('2010-10-14',201041,10,2010,14,41,201010,2010),('2010-10-15',201041,10,2010,15,41,201010,2010),('2010-10-16',201041,10,2010,16,41,201010,2010),('2010-10-17',201042,10,2010,17,42,201010,2010),('2010-10-18',201042,10,2010,18,42,201010,2010),('2010-10-19',201042,10,2010,19,42,201010,2010),('2010-10-20',201042,10,2010,20,42,201010,2010),('2010-10-21',201042,10,2010,21,42,201010,2010),('2010-10-22',201042,10,2010,22,42,201010,2010),('2010-10-23',201042,10,2010,23,42,201010,2010),('2010-10-24',201043,10,2010,24,43,201010,2010),('2010-10-25',201043,10,2010,25,43,201010,2010),('2010-10-26',201043,10,2010,26,43,201010,2010),('2010-10-27',201043,10,2010,27,43,201010,2010),('2010-10-28',201043,10,2010,28,43,201010,2010),('2010-10-29',201043,10,2010,29,43,201010,2010),('2010-10-30',201043,10,2010,30,43,201010,2010),('2010-10-31',201044,10,2010,31,44,201010,2010),('2010-11-01',201044,11,2010,1,44,201011,2010),('2010-11-02',201044,11,2010,2,44,201011,2010),('2010-11-03',201044,11,2010,3,44,201011,2010),('2010-11-04',201044,11,2010,4,44,201011,2010),('2010-11-05',201044,11,2010,5,44,201011,2010),('2010-11-06',201044,11,2010,6,44,201011,2010),('2010-11-07',201045,11,2010,7,45,201011,2010),('2010-11-08',201045,11,2010,8,45,201011,2010),('2010-11-09',201045,11,2010,9,45,201011,2010),('2010-11-10',201045,11,2010,10,45,201011,2010),('2010-11-11',201045,11,2010,11,45,201011,2010),('2010-11-12',201045,11,2010,12,45,201011,2010),('2010-11-13',201045,11,2010,13,45,201011,2010),('2010-11-14',201046,11,2010,14,46,201011,2010),('2010-11-15',201046,11,2010,15,46,201011,2010),('2010-11-16',201046,11,2010,16,46,201011,2010),('2010-11-17',201046,11,2010,17,46,201011,2010),('2010-11-18',201046,11,2010,18,46,201011,2010),('2010-11-19',201046,11,2010,19,46,201011,2010),('2010-11-20',201046,11,2010,20,46,201011,2010),('2010-11-21',201047,11,2010,21,47,201011,2010),('2010-11-22',201047,11,2010,22,47,201011,2010),('2010-11-23',201047,11,2010,23,47,201011,2010),('2010-11-24',201047,11,2010,24,47,201011,2010),('2010-11-25',201047,11,2010,25,47,201011,2010),('2010-11-26',201047,11,2010,26,47,201011,2010),('2010-11-27',201047,11,2010,27,47,201011,2010),('2010-11-28',201048,11,2010,28,48,201011,2010),('2010-11-29',201048,11,2010,29,48,201011,2010),('2010-11-30',201048,11,2010,30,48,201011,2010),('2010-12-01',201048,12,2010,1,48,201012,2011),('2010-12-02',201048,12,2010,2,48,201012,2011),('2010-12-03',201048,12,2010,3,48,201012,2011),('2010-12-04',201048,12,2010,4,48,201012,2011),('2010-12-05',201049,12,2010,5,49,201012,2011),('2010-12-06',201049,12,2010,6,49,201012,2011),('2010-12-07',201049,12,2010,7,49,201012,2011),('2010-12-08',201049,12,2010,8,49,201012,2011),('2010-12-09',201049,12,2010,9,49,201012,2011),('2010-12-10',201049,12,2010,10,49,201012,2011),('2010-12-11',201049,12,2010,11,49,201012,2011),('2010-12-12',201050,12,2010,12,50,201012,2011),('2010-12-13',201050,12,2010,13,50,201012,2011),('2010-12-14',201050,12,2010,14,50,201012,2011),('2010-12-15',201050,12,2010,15,50,201012,2011),('2010-12-16',201050,12,2010,16,50,201012,2011),('2010-12-17',201050,12,2010,17,50,201012,2011),('2010-12-18',201050,12,2010,18,50,201012,2011),('2010-12-19',201051,12,2010,19,51,201012,2011),('2010-12-20',201051,12,2010,20,51,201012,2011),('2010-12-21',201051,12,2010,21,51,201012,2011),('2010-12-22',201051,12,2010,22,51,201012,2011),('2010-12-23',201051,12,2010,23,51,201012,2011),('2010-12-24',201051,12,2010,24,51,201012,2011),('2010-12-25',201051,12,2010,25,51,201012,2011),('2010-12-26',201052,12,2010,26,52,201012,2011),('2010-12-27',201052,12,2010,27,52,201012,2011),('2010-12-28',201052,12,2010,28,52,201012,2011),('2010-12-29',201052,12,2010,29,52,201012,2011),('2010-12-30',201052,12,2010,30,52,201012,2011),('2010-12-31',201052,12,2010,31,52,201012,2011),('2011-01-01',201052,1,2011,1,52,201101,2011),('2011-01-02',201053,1,2011,2,1,201101,2011),('2011-01-03',201101,1,2011,3,1,201101,2011),('2011-01-04',201101,1,2011,4,1,201101,2011),('2011-01-05',201101,1,2011,5,1,201101,2011),('2011-01-06',201101,1,2011,6,1,201101,2011),('2011-01-07',201101,1,2011,7,1,201101,2011),('2011-01-08',201101,1,2011,8,1,201101,2011),('2011-01-09',201102,1,2011,9,2,201101,2011),('2011-01-10',201102,1,2011,10,2,201101,2011),('2011-01-11',201102,1,2011,11,2,201101,2011),('2011-01-12',201102,1,2011,12,2,201101,2011),('2011-01-13',201102,1,2011,13,2,201101,2011),('2011-01-14',201102,1,2011,14,2,201101,2011),('2011-01-15',201102,1,2011,15,2,201101,2011),('2011-01-16',201103,1,2011,16,3,201101,2011),('2011-01-17',201103,1,2011,17,3,201101,2011),('2011-01-18',201103,1,2011,18,3,201101,2011),('2011-01-19',201103,1,2011,19,3,201101,2011),('2011-01-20',201103,1,2011,20,3,201101,2011),('2011-01-21',201103,1,2011,21,3,201101,2011),('2011-01-22',201103,1,2011,22,3,201101,2011),('2011-01-23',201104,1,2011,23,4,201101,2011),('2011-01-24',201104,1,2011,24,4,201101,2011),('2011-01-25',201104,1,2011,25,4,201101,2011),('2011-01-26',201104,1,2011,26,4,201101,2011),('2011-01-27',201104,1,2011,27,4,201101,2011),('2011-01-28',201104,1,2011,28,4,201101,2011),('2011-01-29',201104,1,2011,29,4,201101,2011),('2011-01-30',201105,1,2011,30,5,201101,2011),('2011-01-31',201105,1,2011,31,5,201101,2011),('2011-02-01',201105,2,2011,1,5,201102,2011),('2011-02-02',201105,2,2011,2,5,201102,2011),('2011-02-03',201105,2,2011,3,5,201102,2011),('2011-02-04',201105,2,2011,4,5,201102,2011),('2011-02-05',201105,2,2011,5,5,201102,2011),('2011-02-06',201106,2,2011,6,6,201102,2011),('2011-02-07',201106,2,2011,7,6,201102,2011),('2011-02-08',201106,2,2011,8,6,201102,2011),('2011-02-09',201106,2,2011,9,6,201102,2011),('2011-02-10',201106,2,2011,10,6,201102,2011),('2011-02-11',201106,2,2011,11,6,201102,2011),('2011-02-12',201106,2,2011,12,6,201102,2011),('2011-02-13',201107,2,2011,13,7,201102,2011),('2011-02-14',201107,2,2011,14,7,201102,2011),('2011-02-15',201107,2,2011,15,7,201102,2011),('2011-02-16',201107,2,2011,16,7,201102,2011),('2011-02-17',201107,2,2011,17,7,201102,2011),('2011-02-18',201107,2,2011,18,7,201102,2011),('2011-02-19',201107,2,2011,19,7,201102,2011),('2011-02-20',201108,2,2011,20,8,201102,2011),('2011-02-21',201108,2,2011,21,8,201102,2011),('2011-02-22',201108,2,2011,22,8,201102,2011),('2011-02-23',201108,2,2011,23,8,201102,2011),('2011-02-24',201108,2,2011,24,8,201102,2011),('2011-02-25',201108,2,2011,25,8,201102,2011),('2011-02-26',201108,2,2011,26,8,201102,2011),('2011-02-27',201109,2,2011,27,9,201102,2011),('2011-02-28',201109,2,2011,28,9,201102,2011),('2011-03-01',201109,3,2011,1,9,201103,2011),('2011-03-02',201109,3,2011,2,9,201103,2011),('2011-03-03',201109,3,2011,3,9,201103,2011),('2011-03-04',201109,3,2011,4,9,201103,2011),('2011-03-05',201109,3,2011,5,9,201103,2011),('2011-03-06',201110,3,2011,6,10,201103,2011),('2011-03-07',201110,3,2011,7,10,201103,2011),('2011-03-08',201110,3,2011,8,10,201103,2011),('2011-03-09',201110,3,2011,9,10,201103,2011),('2011-03-10',201110,3,2011,10,10,201103,2011),('2011-03-11',201110,3,2011,11,10,201103,2011),('2011-03-12',201110,3,2011,12,10,201103,2011),('2011-03-13',201111,3,2011,13,11,201103,2011),('2011-03-14',201111,3,2011,14,11,201103,2011),('2011-03-15',201111,3,2011,15,11,201103,2011),('2011-03-16',201111,3,2011,16,11,201103,2011),('2011-03-17',201111,3,2011,17,11,201103,2011),('2011-03-18',201111,3,2011,18,11,201103,2011),('2011-03-19',201111,3,2011,19,11,201103,2011),('2011-03-20',201112,3,2011,20,12,201103,2011),('2011-03-21',201112,3,2011,21,12,201103,2011),('2011-03-22',201112,3,2011,22,12,201103,2011),('2011-03-23',201112,3,2011,23,12,201103,2011),('2011-03-24',201112,3,2011,24,12,201103,2011),('2011-03-25',201112,3,2011,25,12,201103,2011),('2011-03-26',201112,3,2011,26,12,201103,2011),('2011-03-27',201113,3,2011,27,13,201103,2011),('2011-03-28',201113,3,2011,28,13,201103,2011),('2011-03-29',201113,3,2011,29,13,201103,2011),('2011-03-30',201113,3,2011,30,13,201103,2011),('2011-03-31',201113,3,2011,31,13,201103,2011),('2011-04-01',201113,4,2011,1,13,201104,2011),('2011-04-02',201113,4,2011,2,13,201104,2011),('2011-04-03',201114,4,2011,3,14,201104,2011),('2011-04-04',201114,4,2011,4,14,201104,2011),('2011-04-05',201114,4,2011,5,14,201104,2011),('2011-04-06',201114,4,2011,6,14,201104,2011),('2011-04-07',201114,4,2011,7,14,201104,2011),('2011-04-08',201114,4,2011,8,14,201104,2011),('2011-04-09',201114,4,2011,9,14,201104,2011),('2011-04-10',201115,4,2011,10,15,201104,2011),('2011-04-11',201115,4,2011,11,15,201104,2011),('2011-04-12',201115,4,2011,12,15,201104,2011),('2011-04-13',201115,4,2011,13,15,201104,2011),('2011-04-14',201115,4,2011,14,15,201104,2011),('2011-04-15',201115,4,2011,15,15,201104,2011),('2011-04-16',201115,4,2011,16,15,201104,2011),('2011-04-17',201116,4,2011,17,16,201104,2011),('2011-04-18',201116,4,2011,18,16,201104,2011),('2011-04-19',201116,4,2011,19,16,201104,2011),('2011-04-20',201116,4,2011,20,16,201104,2011),('2011-04-21',201116,4,2011,21,16,201104,2011),('2011-04-22',201116,4,2011,22,16,201104,2011),('2011-04-23',201116,4,2011,23,16,201104,2011),('2011-04-24',201117,4,2011,24,17,201104,2011),('2011-04-25',201117,4,2011,25,17,201104,2011),('2011-04-26',201117,4,2011,26,17,201104,2011),('2011-04-27',201117,4,2011,27,17,201104,2011),('2011-04-28',201117,4,2011,28,17,201104,2011),('2011-04-29',201117,4,2011,29,17,201104,2011),('2011-04-30',201117,4,2011,30,17,201104,2011),('2011-05-01',201118,5,2011,1,18,201105,2011),('2011-05-02',201118,5,2011,2,18,201105,2011),('2011-05-03',201118,5,2011,3,18,201105,2011),('2011-05-04',201118,5,2011,4,18,201105,2011),('2011-05-05',201118,5,2011,5,18,201105,2011),('2011-05-06',201118,5,2011,6,18,201105,2011),('2011-05-07',201118,5,2011,7,18,201105,2011),('2011-05-08',201119,5,2011,8,19,201105,2011),('2011-05-09',201119,5,2011,9,19,201105,2011),('2011-05-10',201119,5,2011,10,19,201105,2011),('2011-05-11',201119,5,2011,11,19,201105,2011),('2011-05-12',201119,5,2011,12,19,201105,2011),('2011-05-13',201119,5,2011,13,19,201105,2011),('2011-05-14',201119,5,2011,14,19,201105,2011),('2011-05-15',201120,5,2011,15,20,201105,2011),('2011-05-16',201120,5,2011,16,20,201105,2011),('2011-05-17',201120,5,2011,17,20,201105,2011),('2011-05-18',201120,5,2011,18,20,201105,2011),('2011-05-19',201120,5,2011,19,20,201105,2011),('2011-05-20',201120,5,2011,20,20,201105,2011),('2011-05-21',201120,5,2011,21,20,201105,2011),('2011-05-22',201121,5,2011,22,21,201105,2011),('2011-05-23',201121,5,2011,23,21,201105,2011),('2011-05-24',201121,5,2011,24,21,201105,2011),('2011-05-25',201121,5,2011,25,21,201105,2011),('2011-05-26',201121,5,2011,26,21,201105,2011),('2011-05-27',201121,5,2011,27,21,201105,2011),('2011-05-28',201121,5,2011,28,21,201105,2011),('2011-05-29',201122,5,2011,29,22,201105,2011),('2011-05-30',201122,5,2011,30,22,201105,2011),('2011-05-31',201122,5,2011,31,22,201105,2011),('2011-06-01',201122,6,2011,1,22,201106,2011),('2011-06-02',201122,6,2011,2,22,201106,2011),('2011-06-03',201122,6,2011,3,22,201106,2011),('2011-06-04',201122,6,2011,4,22,201106,2011),('2011-06-05',201123,6,2011,5,23,201106,2011),('2011-06-06',201123,6,2011,6,23,201106,2011),('2011-06-07',201123,6,2011,7,23,201106,2011),('2011-06-08',201123,6,2011,8,23,201106,2011),('2011-06-09',201123,6,2011,9,23,201106,2011),('2011-06-10',201123,6,2011,10,23,201106,2011),('2011-06-11',201123,6,2011,11,23,201106,2011),('2011-06-12',201124,6,2011,12,24,201106,2011),('2011-06-13',201124,6,2011,13,24,201106,2011),('2011-06-14',201124,6,2011,14,24,201106,2011),('2011-06-15',201124,6,2011,15,24,201106,2011),('2011-06-16',201124,6,2011,16,24,201106,2011),('2011-06-17',201124,6,2011,17,24,201106,2011),('2011-06-18',201124,6,2011,18,24,201106,2011),('2011-06-19',201125,6,2011,19,25,201106,2011),('2011-06-20',201125,6,2011,20,25,201106,2011),('2011-06-21',201125,6,2011,21,25,201106,2011),('2011-06-22',201125,6,2011,22,25,201106,2011),('2011-06-23',201125,6,2011,23,25,201106,2011),('2011-06-24',201125,6,2011,24,25,201106,2011),('2011-06-25',201125,6,2011,25,25,201106,2011),('2011-06-26',201126,6,2011,26,26,201106,2011),('2011-06-27',201126,6,2011,27,26,201106,2011),('2011-06-28',201126,6,2011,28,26,201106,2011),('2011-06-29',201126,6,2011,29,26,201106,2011),('2011-06-30',201126,6,2011,30,26,201106,2011),('2011-07-01',201126,7,2011,1,26,201107,2011),('2011-07-02',201126,7,2011,2,26,201107,2011),('2011-07-03',201127,7,2011,3,27,201107,2011),('2011-07-04',201127,7,2011,4,27,201107,2011),('2011-07-05',201127,7,2011,5,27,201107,2011),('2011-07-06',201127,7,2011,6,27,201107,2011),('2011-07-07',201127,7,2011,7,27,201107,2011),('2011-07-08',201127,7,2011,8,27,201107,2011),('2011-07-09',201127,7,2011,9,27,201107,2011),('2011-07-10',201128,7,2011,10,28,201107,2011),('2011-07-11',201128,7,2011,11,28,201107,2011),('2011-07-12',201128,7,2011,12,28,201107,2011),('2011-07-13',201128,7,2011,13,28,201107,2011),('2011-07-14',201128,7,2011,14,28,201107,2011),('2011-07-15',201128,7,2011,15,28,201107,2011),('2011-07-16',201128,7,2011,16,28,201107,2011),('2011-07-17',201129,7,2011,17,29,201107,2011),('2011-07-18',201129,7,2011,18,29,201107,2011),('2011-07-19',201129,7,2011,19,29,201107,2011),('2011-07-20',201129,7,2011,20,29,201107,2011),('2011-07-21',201129,7,2011,21,29,201107,2011),('2011-07-22',201129,7,2011,22,29,201107,2011),('2011-07-23',201129,7,2011,23,29,201107,2011),('2011-07-24',201130,7,2011,24,30,201107,2011),('2011-07-25',201130,7,2011,25,30,201107,2011),('2011-07-26',201130,7,2011,26,30,201107,2011),('2011-07-27',201130,7,2011,27,30,201107,2011),('2011-07-28',201130,7,2011,28,30,201107,2011),('2011-07-29',201130,7,2011,29,30,201107,2011),('2011-07-30',201130,7,2011,30,30,201107,2011),('2011-07-31',201131,7,2011,31,31,201107,2011),('2011-08-01',201131,8,2011,1,31,201108,2011),('2011-08-02',201131,8,2011,2,31,201108,2011),('2011-08-03',201131,8,2011,3,31,201108,2011),('2011-08-04',201131,8,2011,4,31,201108,2011),('2011-08-05',201131,8,2011,5,31,201108,2011),('2011-08-06',201131,8,2011,6,31,201108,2011),('2011-08-07',201132,8,2011,7,32,201108,2011),('2011-08-08',201132,8,2011,8,32,201108,2011),('2011-08-09',201132,8,2011,9,32,201108,2011),('2011-08-10',201132,8,2011,10,32,201108,2011),('2011-08-11',201132,8,2011,11,32,201108,2011),('2011-08-12',201132,8,2011,12,32,201108,2011),('2011-08-13',201132,8,2011,13,32,201108,2011),('2011-08-14',201133,8,2011,14,33,201108,2011),('2011-08-15',201133,8,2011,15,33,201108,2011),('2011-08-16',201133,8,2011,16,33,201108,2011),('2011-08-17',201133,8,2011,17,33,201108,2011),('2011-08-18',201133,8,2011,18,33,201108,2011),('2011-08-19',201133,8,2011,19,33,201108,2011),('2011-08-20',201133,8,2011,20,33,201108,2011),('2011-08-21',201134,8,2011,21,34,201108,2011),('2011-08-22',201134,8,2011,22,34,201108,2011),('2011-08-23',201134,8,2011,23,34,201108,2011),('2011-08-24',201134,8,2011,24,34,201108,2011),('2011-08-25',201134,8,2011,25,34,201108,2011),('2011-08-26',201134,8,2011,26,34,201108,2011),('2011-08-27',201134,8,2011,27,34,201108,2011),('2011-08-28',201135,8,2011,28,35,201108,2011),('2011-08-29',201135,8,2011,29,35,201108,2011),('2011-08-30',201135,8,2011,30,35,201108,2011),('2011-08-31',201135,8,2011,31,35,201108,2011),('2011-09-01',201135,9,2011,1,35,201109,2011),('2011-09-02',201135,9,2011,2,35,201109,2011),('2011-09-03',201135,9,2011,3,35,201109,2011),('2011-09-04',201136,9,2011,4,36,201109,2011),('2011-09-05',201136,9,2011,5,36,201109,2011),('2011-09-06',201136,9,2011,6,36,201109,2011),('2011-09-07',201136,9,2011,7,36,201109,2011),('2011-09-08',201136,9,2011,8,36,201109,2011),('2011-09-09',201136,9,2011,9,36,201109,2011),('2011-09-10',201136,9,2011,10,36,201109,2011),('2011-09-11',201137,9,2011,11,37,201109,2011),('2011-09-12',201137,9,2011,12,37,201109,2011),('2011-09-13',201137,9,2011,13,37,201109,2011),('2011-09-14',201137,9,2011,14,37,201109,2011),('2011-09-15',201137,9,2011,15,37,201109,2011),('2011-09-16',201137,9,2011,16,37,201109,2011),('2011-09-17',201137,9,2011,17,37,201109,2011),('2011-09-18',201138,9,2011,18,38,201109,2011),('2011-09-19',201138,9,2011,19,38,201109,2011),('2011-09-20',201138,9,2011,20,38,201109,2011),('2011-09-21',201138,9,2011,21,38,201109,2011),('2011-09-22',201138,9,2011,22,38,201109,2011),('2011-09-23',201138,9,2011,23,38,201109,2011),('2011-09-24',201138,9,2011,24,38,201109,2011),('2011-09-25',201139,9,2011,25,39,201109,2011),('2011-09-26',201139,9,2011,26,39,201109,2011),('2011-09-27',201139,9,2011,27,39,201109,2011),('2011-09-28',201139,9,2011,28,39,201109,2011),('2011-09-29',201139,9,2011,29,39,201109,2011),('2011-09-30',201139,9,2011,30,39,201109,2011),('2011-10-01',201139,10,2011,1,39,201110,2011),('2011-10-02',201140,10,2011,2,40,201110,2011),('2011-10-03',201140,10,2011,3,40,201110,2011),('2011-10-04',201140,10,2011,4,40,201110,2011),('2011-10-05',201140,10,2011,5,40,201110,2011),('2011-10-06',201140,10,2011,6,40,201110,2011),('2011-10-07',201140,10,2011,7,40,201110,2011),('2011-10-08',201140,10,2011,8,40,201110,2011),('2011-10-09',201141,10,2011,9,41,201110,2011),('2011-10-10',201141,10,2011,10,41,201110,2011),('2011-10-11',201141,10,2011,11,41,201110,2011),('2011-10-12',201141,10,2011,12,41,201110,2011),('2011-10-13',201141,10,2011,13,41,201110,2011),('2011-10-14',201141,10,2011,14,41,201110,2011),('2011-10-15',201141,10,2011,15,41,201110,2011),('2011-10-16',201142,10,2011,16,42,201110,2011),('2011-10-17',201142,10,2011,17,42,201110,2011),('2011-10-18',201142,10,2011,18,42,201110,2011),('2011-10-19',201142,10,2011,19,42,201110,2011),('2011-10-20',201142,10,2011,20,42,201110,2011),('2011-10-21',201142,10,2011,21,42,201110,2011),('2011-10-22',201142,10,2011,22,42,201110,2011),('2011-10-23',201143,10,2011,23,43,201110,2011),('2011-10-24',201143,10,2011,24,43,201110,2011),('2011-10-25',201143,10,2011,25,43,201110,2011),('2011-10-26',201143,10,2011,26,43,201110,2011),('2011-10-27',201143,10,2011,27,43,201110,2011),('2011-10-28',201143,10,2011,28,43,201110,2011),('2011-10-29',201143,10,2011,29,43,201110,2011),('2011-10-30',201144,10,2011,30,44,201110,2011),('2011-10-31',201144,10,2011,31,44,201110,2011),('2011-11-01',201144,11,2011,1,44,201111,2011),('2011-11-02',201144,11,2011,2,44,201111,2011),('2011-11-03',201144,11,2011,3,44,201111,2011),('2011-11-04',201144,11,2011,4,44,201111,2011),('2011-11-05',201144,11,2011,5,44,201111,2011),('2011-11-06',201145,11,2011,6,45,201111,2011),('2011-11-07',201145,11,2011,7,45,201111,2011),('2011-11-08',201145,11,2011,8,45,201111,2011),('2011-11-09',201145,11,2011,9,45,201111,2011),('2011-11-10',201145,11,2011,10,45,201111,2011),('2011-11-11',201145,11,2011,11,45,201111,2011),('2011-11-12',201145,11,2011,12,45,201111,2011),('2011-11-13',201146,11,2011,13,46,201111,2011),('2011-11-14',201146,11,2011,14,46,201111,2011),('2011-11-15',201146,11,2011,15,46,201111,2011),('2011-11-16',201146,11,2011,16,46,201111,2011),('2011-11-17',201146,11,2011,17,46,201111,2011),('2011-11-18',201146,11,2011,18,46,201111,2011),('2011-11-19',201146,11,2011,19,46,201111,2011),('2011-11-20',201147,11,2011,20,47,201111,2011),('2011-11-21',201147,11,2011,21,47,201111,2011),('2011-11-22',201147,11,2011,22,47,201111,2011),('2011-11-23',201147,11,2011,23,47,201111,2011),('2011-11-24',201147,11,2011,24,47,201111,2011),('2011-11-25',201147,11,2011,25,47,201111,2011),('2011-11-26',201147,11,2011,26,47,201111,2011),('2011-11-27',201148,11,2011,27,48,201111,2011),('2011-11-28',201148,11,2011,28,48,201111,2011),('2011-11-29',201148,11,2011,29,48,201111,2011),('2011-11-30',201148,11,2011,30,48,201111,2011),('2011-12-01',201148,12,2011,1,48,201112,2012),('2011-12-02',201148,12,2011,2,48,201112,2012),('2011-12-03',201148,12,2011,3,48,201112,2012),('2011-12-04',201149,12,2011,4,49,201112,2012),('2011-12-05',201149,12,2011,5,49,201112,2012),('2011-12-06',201149,12,2011,6,49,201112,2012),('2011-12-07',201149,12,2011,7,49,201112,2012),('2011-12-08',201149,12,2011,8,49,201112,2012),('2011-12-09',201149,12,2011,9,49,201112,2012),('2011-12-10',201149,12,2011,10,49,201112,2012),('2011-12-11',201150,12,2011,11,50,201112,2012),('2011-12-12',201150,12,2011,12,50,201112,2012),('2011-12-13',201150,12,2011,13,50,201112,2012),('2011-12-14',201150,12,2011,14,50,201112,2012),('2011-12-15',201150,12,2011,15,50,201112,2012),('2011-12-16',201150,12,2011,16,50,201112,2012),('2011-12-17',201150,12,2011,17,50,201112,2012),('2011-12-18',201151,12,2011,18,51,201112,2012),('2011-12-19',201151,12,2011,19,51,201112,2012),('2011-12-20',201151,12,2011,20,51,201112,2012),('2011-12-21',201151,12,2011,21,51,201112,2012),('2011-12-22',201151,12,2011,22,51,201112,2012),('2011-12-23',201151,12,2011,23,51,201112,2012),('2011-12-24',201151,12,2011,24,51,201112,2012),('2011-12-25',201152,12,2011,25,52,201112,2012),('2011-12-26',201152,12,2011,26,52,201112,2012),('2011-12-27',201152,12,2011,27,52,201112,2012),('2011-12-28',201152,12,2011,28,52,201112,2012),('2011-12-29',201152,12,2011,29,52,201112,2012),('2011-12-30',201152,12,2011,30,52,201112,2012),('2011-12-31',201152,12,2011,31,52,201112,2012),('2012-01-01',201153,1,2012,1,1,201201,2012),('2012-01-02',201201,1,2012,2,1,201201,2012),('2012-01-03',201201,1,2012,3,1,201201,2012),('2012-01-04',201201,1,2012,4,1,201201,2012),('2012-01-05',201201,1,2012,5,1,201201,2012),('2012-01-06',201201,1,2012,6,1,201201,2012),('2012-01-07',201201,1,2012,7,1,201201,2012),('2012-01-08',201202,1,2012,8,2,201201,2012),('2012-01-09',201202,1,2012,9,2,201201,2012),('2012-01-10',201202,1,2012,10,2,201201,2012),('2012-01-11',201202,1,2012,11,2,201201,2012),('2012-01-12',201202,1,2012,12,2,201201,2012),('2012-01-13',201202,1,2012,13,2,201201,2012),('2012-01-14',201202,1,2012,14,2,201201,2012),('2012-01-15',201203,1,2012,15,3,201201,2012),('2012-01-16',201203,1,2012,16,3,201201,2012),('2012-01-17',201203,1,2012,17,3,201201,2012),('2012-01-18',201203,1,2012,18,3,201201,2012),('2012-01-19',201203,1,2012,19,3,201201,2012),('2012-01-20',201203,1,2012,20,3,201201,2012),('2012-01-21',201203,1,2012,21,3,201201,2012),('2012-01-22',201204,1,2012,22,4,201201,2012),('2012-01-23',201204,1,2012,23,4,201201,2012),('2012-01-24',201204,1,2012,24,4,201201,2012),('2012-01-25',201204,1,2012,25,4,201201,2012),('2012-01-26',201204,1,2012,26,4,201201,2012),('2012-01-27',201204,1,2012,27,4,201201,2012),('2012-01-28',201204,1,2012,28,4,201201,2012),('2012-01-29',201205,1,2012,29,5,201201,2012),('2012-01-30',201205,1,2012,30,5,201201,2012),('2012-01-31',201205,1,2012,31,5,201201,2012),('2012-02-01',201205,2,2012,1,5,201202,2012),('2012-02-02',201205,2,2012,2,5,201202,2012),('2012-02-03',201205,2,2012,3,5,201202,2012),('2012-02-04',201205,2,2012,4,5,201202,2012),('2012-02-05',201206,2,2012,5,6,201202,2012),('2012-02-06',201206,2,2012,6,6,201202,2012),('2012-02-07',201206,2,2012,7,6,201202,2012),('2012-02-08',201206,2,2012,8,6,201202,2012),('2012-02-09',201206,2,2012,9,6,201202,2012),('2012-02-10',201206,2,2012,10,6,201202,2012),('2012-02-11',201206,2,2012,11,6,201202,2012),('2012-02-12',201207,2,2012,12,7,201202,2012),('2012-02-13',201207,2,2012,13,7,201202,2012),('2012-02-14',201207,2,2012,14,7,201202,2012),('2012-02-15',201207,2,2012,15,7,201202,2012),('2012-02-16',201207,2,2012,16,7,201202,2012),('2012-02-17',201207,2,2012,17,7,201202,2012),('2012-02-18',201207,2,2012,18,7,201202,2012),('2012-02-19',201208,2,2012,19,8,201202,2012),('2012-02-20',201208,2,2012,20,8,201202,2012),('2012-02-21',201208,2,2012,21,8,201202,2012),('2012-02-22',201208,2,2012,22,8,201202,2012),('2012-02-23',201208,2,2012,23,8,201202,2012),('2012-02-24',201208,2,2012,24,8,201202,2012),('2012-02-25',201208,2,2012,25,8,201202,2012),('2012-02-26',201209,2,2012,26,9,201202,2012),('2012-02-27',201209,2,2012,27,9,201202,2012),('2012-02-28',201209,2,2012,28,9,201202,2012),('2012-02-29',201209,2,2012,29,9,201202,2012),('2012-03-01',201209,3,2012,1,9,201203,2012),('2012-03-02',201209,3,2012,2,9,201203,2012),('2012-03-03',201209,3,2012,3,9,201203,2012),('2012-03-04',201210,3,2012,4,10,201203,2012),('2012-03-05',201210,3,2012,5,10,201203,2012),('2012-03-06',201210,3,2012,6,10,201203,2012),('2012-03-07',201210,3,2012,7,10,201203,2012),('2012-03-08',201210,3,2012,8,10,201203,2012),('2012-03-09',201210,3,2012,9,10,201203,2012),('2012-03-10',201210,3,2012,10,10,201203,2012),('2012-03-11',201211,3,2012,11,11,201203,2012),('2012-03-12',201211,3,2012,12,11,201203,2012),('2012-03-13',201211,3,2012,13,11,201203,2012),('2012-03-14',201211,3,2012,14,11,201203,2012),('2012-03-15',201211,3,2012,15,11,201203,2012),('2012-03-16',201211,3,2012,16,11,201203,2012),('2012-03-17',201211,3,2012,17,11,201203,2012),('2012-03-18',201212,3,2012,18,12,201203,2012),('2012-03-19',201212,3,2012,19,12,201203,2012),('2012-03-20',201212,3,2012,20,12,201203,2012),('2012-03-21',201212,3,2012,21,12,201203,2012),('2012-03-22',201212,3,2012,22,12,201203,2012),('2012-03-23',201212,3,2012,23,12,201203,2012),('2012-03-24',201212,3,2012,24,12,201203,2012),('2012-03-25',201213,3,2012,25,13,201203,2012),('2012-03-26',201213,3,2012,26,13,201203,2012),('2012-03-27',201213,3,2012,27,13,201203,2012),('2012-03-28',201213,3,2012,28,13,201203,2012),('2012-03-29',201213,3,2012,29,13,201203,2012),('2012-03-30',201213,3,2012,30,13,201203,2012),('2012-03-31',201213,3,2012,31,13,201203,2012),('2012-04-01',201214,4,2012,1,14,201204,2012),('2012-04-02',201214,4,2012,2,14,201204,2012),('2012-04-03',201214,4,2012,3,14,201204,2012),('2012-04-04',201214,4,2012,4,14,201204,2012),('2012-04-05',201214,4,2012,5,14,201204,2012),('2012-04-06',201214,4,2012,6,14,201204,2012),('2012-04-07',201214,4,2012,7,14,201204,2012),('2012-04-08',201215,4,2012,8,15,201204,2012),('2012-04-09',201215,4,2012,9,15,201204,2012),('2012-04-10',201215,4,2012,10,15,201204,2012),('2012-04-11',201215,4,2012,11,15,201204,2012),('2012-04-12',201215,4,2012,12,15,201204,2012),('2012-04-13',201215,4,2012,13,15,201204,2012),('2012-04-14',201215,4,2012,14,15,201204,2012),('2012-04-15',201216,4,2012,15,16,201204,2012),('2012-04-16',201216,4,2012,16,16,201204,2012),('2012-04-17',201216,4,2012,17,16,201204,2012),('2012-04-18',201216,4,2012,18,16,201204,2012),('2012-04-19',201216,4,2012,19,16,201204,2012),('2012-04-20',201216,4,2012,20,16,201204,2012),('2012-04-21',201216,4,2012,21,16,201204,2012),('2012-04-22',201217,4,2012,22,17,201204,2012),('2012-04-23',201217,4,2012,23,17,201204,2012),('2012-04-24',201217,4,2012,24,17,201204,2012),('2012-04-25',201217,4,2012,25,17,201204,2012),('2012-04-26',201217,4,2012,26,17,201204,2012),('2012-04-27',201217,4,2012,27,17,201204,2012),('2012-04-28',201217,4,2012,28,17,201204,2012),('2012-04-29',201218,4,2012,29,18,201204,2012),('2012-04-30',201218,4,2012,30,18,201204,2012),('2012-05-01',201218,5,2012,1,18,201205,2012),('2012-05-02',201218,5,2012,2,18,201205,2012),('2012-05-03',201218,5,2012,3,18,201205,2012),('2012-05-04',201218,5,2012,4,18,201205,2012),('2012-05-05',201218,5,2012,5,18,201205,2012),('2012-05-06',201219,5,2012,6,19,201205,2012),('2012-05-07',201219,5,2012,7,19,201205,2012),('2012-05-08',201219,5,2012,8,19,201205,2012),('2012-05-09',201219,5,2012,9,19,201205,2012),('2012-05-10',201219,5,2012,10,19,201205,2012),('2012-05-11',201219,5,2012,11,19,201205,2012),('2012-05-12',201219,5,2012,12,19,201205,2012),('2012-05-13',201220,5,2012,13,20,201205,2012),('2012-05-14',201220,5,2012,14,20,201205,2012),('2012-05-15',201220,5,2012,15,20,201205,2012),('2012-05-16',201220,5,2012,16,20,201205,2012),('2012-05-17',201220,5,2012,17,20,201205,2012),('2012-05-18',201220,5,2012,18,20,201205,2012),('2012-05-19',201220,5,2012,19,20,201205,2012),('2012-05-20',201221,5,2012,20,21,201205,2012),('2012-05-21',201221,5,2012,21,21,201205,2012),('2012-05-22',201221,5,2012,22,21,201205,2012),('2012-05-23',201221,5,2012,23,21,201205,2012),('2012-05-24',201221,5,2012,24,21,201205,2012),('2012-05-25',201221,5,2012,25,21,201205,2012),('2012-05-26',201221,5,2012,26,21,201205,2012),('2012-05-27',201222,5,2012,27,22,201205,2012),('2012-05-28',201222,5,2012,28,22,201205,2012),('2012-05-29',201222,5,2012,29,22,201205,2012),('2012-05-30',201222,5,2012,30,22,201205,2012),('2012-05-31',201222,5,2012,31,22,201205,2012),('2012-06-01',201222,6,2012,1,22,201206,2012),('2012-06-02',201222,6,2012,2,22,201206,2012),('2012-06-03',201223,6,2012,3,23,201206,2012),('2012-06-04',201223,6,2012,4,23,201206,2012),('2012-06-05',201223,6,2012,5,23,201206,2012),('2012-06-06',201223,6,2012,6,23,201206,2012),('2012-06-07',201223,6,2012,7,23,201206,2012),('2012-06-08',201223,6,2012,8,23,201206,2012),('2012-06-09',201223,6,2012,9,23,201206,2012),('2012-06-10',201224,6,2012,10,24,201206,2012),('2012-06-11',201224,6,2012,11,24,201206,2012),('2012-06-12',201224,6,2012,12,24,201206,2012),('2012-06-13',201224,6,2012,13,24,201206,2012),('2012-06-14',201224,6,2012,14,24,201206,2012),('2012-06-15',201224,6,2012,15,24,201206,2012),('2012-06-16',201224,6,2012,16,24,201206,2012),('2012-06-17',201225,6,2012,17,25,201206,2012),('2012-06-18',201225,6,2012,18,25,201206,2012),('2012-06-19',201225,6,2012,19,25,201206,2012),('2012-06-20',201225,6,2012,20,25,201206,2012),('2012-06-21',201225,6,2012,21,25,201206,2012),('2012-06-22',201225,6,2012,22,25,201206,2012),('2012-06-23',201225,6,2012,23,25,201206,2012),('2012-06-24',201226,6,2012,24,26,201206,2012),('2012-06-25',201226,6,2012,25,26,201206,2012),('2012-06-26',201226,6,2012,26,26,201206,2012),('2012-06-27',201226,6,2012,27,26,201206,2012),('2012-06-28',201226,6,2012,28,26,201206,2012),('2012-06-29',201226,6,2012,29,26,201206,2012),('2012-06-30',201226,6,2012,30,26,201206,2012),('2012-07-01',201227,7,2012,1,27,201207,2012),('2012-07-02',201227,7,2012,2,27,201207,2012),('2012-07-03',201227,7,2012,3,27,201207,2012),('2012-07-04',201227,7,2012,4,27,201207,2012),('2012-07-05',201227,7,2012,5,27,201207,2012),('2012-07-06',201227,7,2012,6,27,201207,2012),('2012-07-07',201227,7,2012,7,27,201207,2012),('2012-07-08',201228,7,2012,8,28,201207,2012),('2012-07-09',201228,7,2012,9,28,201207,2012),('2012-07-10',201228,7,2012,10,28,201207,2012),('2012-07-11',201228,7,2012,11,28,201207,2012),('2012-07-12',201228,7,2012,12,28,201207,2012),('2012-07-13',201228,7,2012,13,28,201207,2012),('2012-07-14',201228,7,2012,14,28,201207,2012),('2012-07-15',201229,7,2012,15,29,201207,2012),('2012-07-16',201229,7,2012,16,29,201207,2012),('2012-07-17',201229,7,2012,17,29,201207,2012),('2012-07-18',201229,7,2012,18,29,201207,2012),('2012-07-19',201229,7,2012,19,29,201207,2012),('2012-07-20',201229,7,2012,20,29,201207,2012),('2012-07-21',201229,7,2012,21,29,201207,2012),('2012-07-22',201230,7,2012,22,30,201207,2012),('2012-07-23',201230,7,2012,23,30,201207,2012),('2012-07-24',201230,7,2012,24,30,201207,2012),('2012-07-25',201230,7,2012,25,30,201207,2012),('2012-07-26',201230,7,2012,26,30,201207,2012),('2012-07-27',201230,7,2012,27,30,201207,2012),('2012-07-28',201230,7,2012,28,30,201207,2012),('2012-07-29',201231,7,2012,29,31,201207,2012),('2012-07-30',201231,7,2012,30,31,201207,2012),('2012-07-31',201231,7,2012,31,31,201207,2012),('2012-08-01',201231,8,2012,1,31,201208,2012),('2012-08-02',201231,8,2012,2,31,201208,2012),('2012-08-03',201231,8,2012,3,31,201208,2012),('2012-08-04',201231,8,2012,4,31,201208,2012),('2012-08-05',201232,8,2012,5,32,201208,2012),('2012-08-06',201232,8,2012,6,32,201208,2012),('2012-08-07',201232,8,2012,7,32,201208,2012),('2012-08-08',201232,8,2012,8,32,201208,2012),('2012-08-09',201232,8,2012,9,32,201208,2012),('2012-08-10',201232,8,2012,10,32,201208,2012),('2012-08-11',201232,8,2012,11,32,201208,2012),('2012-08-12',201233,8,2012,12,33,201208,2012),('2012-08-13',201233,8,2012,13,33,201208,2012),('2012-08-14',201233,8,2012,14,33,201208,2012),('2012-08-15',201233,8,2012,15,33,201208,2012),('2012-08-16',201233,8,2012,16,33,201208,2012),('2012-08-17',201233,8,2012,17,33,201208,2012),('2012-08-18',201233,8,2012,18,33,201208,2012),('2012-08-19',201234,8,2012,19,34,201208,2012),('2012-08-20',201234,8,2012,20,34,201208,2012),('2012-08-21',201234,8,2012,21,34,201208,2012),('2012-08-22',201234,8,2012,22,34,201208,2012),('2012-08-23',201234,8,2012,23,34,201208,2012),('2012-08-24',201234,8,2012,24,34,201208,2012),('2012-08-25',201234,8,2012,25,34,201208,2012),('2012-08-26',201235,8,2012,26,35,201208,2012),('2012-08-27',201235,8,2012,27,35,201208,2012),('2012-08-28',201235,8,2012,28,35,201208,2012),('2012-08-29',201235,8,2012,29,35,201208,2012),('2012-08-30',201235,8,2012,30,35,201208,2012),('2012-08-31',201235,8,2012,31,35,201208,2012),('2012-09-01',201235,9,2012,1,35,201209,2012),('2012-09-02',201236,9,2012,2,36,201209,2012),('2012-09-03',201236,9,2012,3,36,201209,2012),('2012-09-04',201236,9,2012,4,36,201209,2012),('2012-09-05',201236,9,2012,5,36,201209,2012),('2012-09-06',201236,9,2012,6,36,201209,2012),('2012-09-07',201236,9,2012,7,36,201209,2012),('2012-09-08',201236,9,2012,8,36,201209,2012),('2012-09-09',201237,9,2012,9,37,201209,2012),('2012-09-10',201237,9,2012,10,37,201209,2012),('2012-09-11',201237,9,2012,11,37,201209,2012),('2012-09-12',201237,9,2012,12,37,201209,2012),('2012-09-13',201237,9,2012,13,37,201209,2012),('2012-09-14',201237,9,2012,14,37,201209,2012),('2012-09-15',201237,9,2012,15,37,201209,2012),('2012-09-16',201238,9,2012,16,38,201209,2012),('2012-09-17',201238,9,2012,17,38,201209,2012),('2012-09-18',201238,9,2012,18,38,201209,2012),('2012-09-19',201238,9,2012,19,38,201209,2012),('2012-09-20',201238,9,2012,20,38,201209,2012),('2012-09-21',201238,9,2012,21,38,201209,2012),('2012-09-22',201238,9,2012,22,38,201209,2012),('2012-09-23',201239,9,2012,23,39,201209,2012),('2012-09-24',201239,9,2012,24,39,201209,2012),('2012-09-25',201239,9,2012,25,39,201209,2012),('2012-09-26',201239,9,2012,26,39,201209,2012),('2012-09-27',201239,9,2012,27,39,201209,2012),('2012-09-28',201239,9,2012,28,39,201209,2012),('2012-09-29',201239,9,2012,29,39,201209,2012),('2012-09-30',201240,9,2012,30,40,201209,2012),('2012-10-01',201240,10,2012,1,40,201210,2012),('2012-10-02',201240,10,2012,2,40,201210,2012),('2012-10-03',201240,10,2012,3,40,201210,2012),('2012-10-04',201240,10,2012,4,40,201210,2012),('2012-10-05',201240,10,2012,5,40,201210,2012),('2012-10-06',201240,10,2012,6,40,201210,2012),('2012-10-07',201241,10,2012,7,41,201210,2012),('2012-10-08',201241,10,2012,8,41,201210,2012),('2012-10-09',201241,10,2012,9,41,201210,2012),('2012-10-10',201241,10,2012,10,41,201210,2012),('2012-10-11',201241,10,2012,11,41,201210,2012),('2012-10-12',201241,10,2012,12,41,201210,2012),('2012-10-13',201241,10,2012,13,41,201210,2012),('2012-10-14',201242,10,2012,14,42,201210,2012),('2012-10-15',201242,10,2012,15,42,201210,2012),('2012-10-16',201242,10,2012,16,42,201210,2012),('2012-10-17',201242,10,2012,17,42,201210,2012),('2012-10-18',201242,10,2012,18,42,201210,2012),('2012-10-19',201242,10,2012,19,42,201210,2012),('2012-10-20',201242,10,2012,20,42,201210,2012),('2012-10-21',201243,10,2012,21,43,201210,2012),('2012-10-22',201243,10,2012,22,43,201210,2012),('2012-10-23',201243,10,2012,23,43,201210,2012),('2012-10-24',201243,10,2012,24,43,201210,2012),('2012-10-25',201243,10,2012,25,43,201210,2012),('2012-10-26',201243,10,2012,26,43,201210,2012),('2012-10-27',201243,10,2012,27,43,201210,2012),('2012-10-28',201244,10,2012,28,44,201210,2012),('2012-10-29',201244,10,2012,29,44,201210,2012),('2012-10-30',201244,10,2012,30,44,201210,2012),('2012-10-31',201244,10,2012,31,44,201210,2012),('2012-11-01',201244,11,2012,1,44,201211,2012),('2012-11-02',201244,11,2012,2,44,201211,2012),('2012-11-03',201244,11,2012,3,44,201211,2012),('2012-11-04',201245,11,2012,4,45,201211,2012),('2012-11-05',201245,11,2012,5,45,201211,2012),('2012-11-06',201245,11,2012,6,45,201211,2012),('2012-11-07',201245,11,2012,7,45,201211,2012),('2012-11-08',201245,11,2012,8,45,201211,2012),('2012-11-09',201245,11,2012,9,45,201211,2012),('2012-11-10',201245,11,2012,10,45,201211,2012),('2012-11-11',201246,11,2012,11,46,201211,2012),('2012-11-12',201246,11,2012,12,46,201211,2012),('2012-11-13',201246,11,2012,13,46,201211,2012),('2012-11-14',201246,11,2012,14,46,201211,2012),('2012-11-15',201246,11,2012,15,46,201211,2012),('2012-11-16',201246,11,2012,16,46,201211,2012),('2012-11-17',201246,11,2012,17,46,201211,2012),('2012-11-18',201247,11,2012,18,47,201211,2012),('2012-11-19',201247,11,2012,19,47,201211,2012),('2012-11-20',201247,11,2012,20,47,201211,2012),('2012-11-21',201247,11,2012,21,47,201211,2012),('2012-11-22',201247,11,2012,22,47,201211,2012),('2012-11-23',201247,11,2012,23,47,201211,2012),('2012-11-24',201247,11,2012,24,47,201211,2012),('2012-11-25',201248,11,2012,25,48,201211,2012),('2012-11-26',201248,11,2012,26,48,201211,2012),('2012-11-27',201248,11,2012,27,48,201211,2012),('2012-11-28',201248,11,2012,28,48,201211,2012),('2012-11-29',201248,11,2012,29,48,201211,2012),('2012-11-30',201248,11,2012,30,48,201211,2012),('2012-12-01',201248,12,2012,1,48,201212,2013),('2012-12-02',201249,12,2012,2,49,201212,2013),('2012-12-03',201249,12,2012,3,49,201212,2013),('2012-12-04',201249,12,2012,4,49,201212,2013),('2012-12-05',201249,12,2012,5,49,201212,2013),('2012-12-06',201249,12,2012,6,49,201212,2013),('2012-12-07',201249,12,2012,7,49,201212,2013),('2012-12-08',201249,12,2012,8,49,201212,2013),('2012-12-09',201250,12,2012,9,50,201212,2013),('2012-12-10',201250,12,2012,10,50,201212,2013),('2012-12-11',201250,12,2012,11,50,201212,2013),('2012-12-12',201250,12,2012,12,50,201212,2013),('2012-12-13',201250,12,2012,13,50,201212,2013),('2012-12-14',201250,12,2012,14,50,201212,2013),('2012-12-15',201250,12,2012,15,50,201212,2013),('2012-12-16',201251,12,2012,16,51,201212,2013),('2012-12-17',201251,12,2012,17,51,201212,2013),('2012-12-18',201251,12,2012,18,51,201212,2013),('2012-12-19',201251,12,2012,19,51,201212,2013),('2012-12-20',201251,12,2012,20,51,201212,2013),('2012-12-21',201251,12,2012,21,51,201212,2013),('2012-12-22',201251,12,2012,22,51,201212,2013),('2012-12-23',201252,12,2012,23,52,201212,2013),('2012-12-24',201252,12,2012,24,52,201212,2013),('2012-12-25',201252,12,2012,25,52,201212,2013),('2012-12-26',201252,12,2012,26,52,201212,2013),('2012-12-27',201252,12,2012,27,52,201212,2013),('2012-12-28',201252,12,2012,28,52,201212,2013),('2012-12-29',201252,12,2012,29,52,201212,2013),('2012-12-30',201301,12,2012,30,1,201212,2013),('2012-12-31',201301,12,2012,31,1,201212,2013),('2013-01-01',201301,1,2013,1,1,201301,2013),('2013-01-02',201301,1,2013,2,1,201301,2013),('2013-01-03',201301,1,2013,3,1,201301,2013),('2013-01-04',201301,1,2013,4,1,201301,2013),('2013-01-05',201301,1,2013,5,1,201301,2013),('2013-01-06',201302,1,2013,6,2,201301,2013),('2013-01-07',201302,1,2013,7,2,201301,2013),('2013-01-08',201302,1,2013,8,2,201301,2013),('2013-01-09',201302,1,2013,9,2,201301,2013),('2013-01-10',201302,1,2013,10,2,201301,2013),('2013-01-11',201302,1,2013,11,2,201301,2013),('2013-01-12',201302,1,2013,12,2,201301,2013),('2013-01-13',201303,1,2013,13,3,201301,2013),('2013-01-14',201303,1,2013,14,3,201301,2013),('2013-01-15',201303,1,2013,15,3,201301,2013),('2013-01-16',201303,1,2013,16,3,201301,2013),('2013-01-17',201303,1,2013,17,3,201301,2013),('2013-01-18',201303,1,2013,18,3,201301,2013),('2013-01-19',201303,1,2013,19,3,201301,2013),('2013-01-20',201304,1,2013,20,4,201301,2013),('2013-01-21',201304,1,2013,21,4,201301,2013),('2013-01-22',201304,1,2013,22,4,201301,2013),('2013-01-23',201304,1,2013,23,4,201301,2013),('2013-01-24',201304,1,2013,24,4,201301,2013),('2013-01-25',201304,1,2013,25,4,201301,2013),('2013-01-26',201304,1,2013,26,4,201301,2013),('2013-01-27',201305,1,2013,27,5,201301,2013),('2013-01-28',201305,1,2013,28,5,201301,2013),('2013-01-29',201305,1,2013,29,5,201301,2013),('2013-01-30',201305,1,2013,30,5,201301,2013),('2013-01-31',201305,1,2013,31,5,201301,2013),('2013-02-01',201305,2,2013,1,5,201302,2013),('2013-02-02',201305,2,2013,2,5,201302,2013),('2013-02-03',201306,2,2013,3,6,201302,2013),('2013-02-04',201306,2,2013,4,6,201302,2013),('2013-02-05',201306,2,2013,5,6,201302,2013),('2013-02-06',201306,2,2013,6,6,201302,2013),('2013-02-07',201306,2,2013,7,6,201302,2013),('2013-02-08',201306,2,2013,8,6,201302,2013),('2013-02-09',201306,2,2013,9,6,201302,2013),('2013-02-10',201307,2,2013,10,7,201302,2013),('2013-02-11',201307,2,2013,11,7,201302,2013),('2013-02-12',201307,2,2013,12,7,201302,2013),('2013-02-13',201307,2,2013,13,7,201302,2013),('2013-02-14',201307,2,2013,14,7,201302,2013),('2013-02-15',201307,2,2013,15,7,201302,2013),('2013-02-16',201307,2,2013,16,7,201302,2013),('2013-02-17',201308,2,2013,17,8,201302,2013),('2013-02-18',201308,2,2013,18,8,201302,2013),('2013-02-19',201308,2,2013,19,8,201302,2013),('2013-02-20',201308,2,2013,20,8,201302,2013),('2013-02-21',201308,2,2013,21,8,201302,2013),('2013-02-22',201308,2,2013,22,8,201302,2013),('2013-02-23',201308,2,2013,23,8,201302,2013),('2013-02-24',201309,2,2013,24,9,201302,2013),('2013-02-25',201309,2,2013,25,9,201302,2013),('2013-02-26',201309,2,2013,26,9,201302,2013),('2013-02-27',201309,2,2013,27,9,201302,2013),('2013-02-28',201309,2,2013,28,9,201302,2013),('2013-03-01',201309,3,2013,1,9,201303,2013),('2013-03-02',201309,3,2013,2,9,201303,2013),('2013-03-03',201310,3,2013,3,10,201303,2013),('2013-03-04',201310,3,2013,4,10,201303,2013),('2013-03-05',201310,3,2013,5,10,201303,2013),('2013-03-06',201310,3,2013,6,10,201303,2013),('2013-03-07',201310,3,2013,7,10,201303,2013),('2013-03-08',201310,3,2013,8,10,201303,2013),('2013-03-09',201310,3,2013,9,10,201303,2013),('2013-03-10',201311,3,2013,10,11,201303,2013),('2013-03-11',201311,3,2013,11,11,201303,2013),('2013-03-12',201311,3,2013,12,11,201303,2013),('2013-03-13',201311,3,2013,13,11,201303,2013),('2013-03-14',201311,3,2013,14,11,201303,2013),('2013-03-15',201311,3,2013,15,11,201303,2013),('2013-03-16',201311,3,2013,16,11,201303,2013),('2013-03-17',201312,3,2013,17,12,201303,2013),('2013-03-18',201312,3,2013,18,12,201303,2013),('2013-03-19',201312,3,2013,19,12,201303,2013),('2013-03-20',201312,3,2013,20,12,201303,2013),('2013-03-21',201312,3,2013,21,12,201303,2013),('2013-03-22',201312,3,2013,22,12,201303,2013),('2013-03-23',201312,3,2013,23,12,201303,2013),('2013-03-24',201313,3,2013,24,13,201303,2013),('2013-03-25',201313,3,2013,25,13,201303,2013),('2013-03-26',201313,3,2013,26,13,201303,2013),('2013-03-27',201313,3,2013,27,13,201303,2013),('2013-03-28',201313,3,2013,28,13,201303,2013),('2013-03-29',201313,3,2013,29,13,201303,2013),('2013-03-30',201313,3,2013,30,13,201303,2013),('2013-03-31',201314,3,2013,31,14,201303,2013),('2013-04-01',201314,4,2013,1,14,201304,2013),('2013-04-02',201314,4,2013,2,14,201304,2013),('2013-04-03',201314,4,2013,3,14,201304,2013),('2013-04-04',201314,4,2013,4,14,201304,2013),('2013-04-05',201314,4,2013,5,14,201304,2013),('2013-04-06',201314,4,2013,6,14,201304,2013),('2013-04-07',201315,4,2013,7,15,201304,2013),('2013-04-08',201315,4,2013,8,15,201304,2013),('2013-04-09',201315,4,2013,9,15,201304,2013),('2013-04-10',201315,4,2013,10,15,201304,2013),('2013-04-11',201315,4,2013,11,15,201304,2013),('2013-04-12',201315,4,2013,12,15,201304,2013),('2013-04-13',201315,4,2013,13,15,201304,2013),('2013-04-14',201316,4,2013,14,16,201304,2013),('2013-04-15',201316,4,2013,15,16,201304,2013),('2013-04-16',201316,4,2013,16,16,201304,2013),('2013-04-17',201316,4,2013,17,16,201304,2013),('2013-04-18',201316,4,2013,18,16,201304,2013),('2013-04-19',201316,4,2013,19,16,201304,2013),('2013-04-20',201316,4,2013,20,16,201304,2013),('2013-04-21',201317,4,2013,21,17,201304,2013),('2013-04-22',201317,4,2013,22,17,201304,2013),('2013-04-23',201317,4,2013,23,17,201304,2013),('2013-04-24',201317,4,2013,24,17,201304,2013),('2013-04-25',201317,4,2013,25,17,201304,2013),('2013-04-26',201317,4,2013,26,17,201304,2013),('2013-04-27',201317,4,2013,27,17,201304,2013),('2013-04-28',201318,4,2013,28,18,201304,2013),('2013-04-29',201318,4,2013,29,18,201304,2013),('2013-04-30',201318,4,2013,30,18,201304,2013),('2013-05-01',201318,5,2013,1,18,201305,2013),('2013-05-02',201318,5,2013,2,18,201305,2013),('2013-05-03',201318,5,2013,3,18,201305,2013),('2013-05-04',201318,5,2013,4,18,201305,2013),('2013-05-05',201319,5,2013,5,19,201305,2013),('2013-05-06',201319,5,2013,6,19,201305,2013),('2013-05-07',201319,5,2013,7,19,201305,2013),('2013-05-08',201319,5,2013,8,19,201305,2013),('2013-05-09',201319,5,2013,9,19,201305,2013),('2013-05-10',201319,5,2013,10,19,201305,2013),('2013-05-11',201319,5,2013,11,19,201305,2013),('2013-05-12',201320,5,2013,12,20,201305,2013),('2013-05-13',201320,5,2013,13,20,201305,2013),('2013-05-14',201320,5,2013,14,20,201305,2013),('2013-05-15',201320,5,2013,15,20,201305,2013),('2013-05-16',201320,5,2013,16,20,201305,2013),('2013-05-17',201320,5,2013,17,20,201305,2013),('2013-05-18',201320,5,2013,18,20,201305,2013),('2013-05-19',201321,5,2013,19,21,201305,2013),('2013-05-20',201321,5,2013,20,21,201305,2013),('2013-05-21',201321,5,2013,21,21,201305,2013),('2013-05-22',201321,5,2013,22,21,201305,2013),('2013-05-23',201321,5,2013,23,21,201305,2013),('2013-05-24',201321,5,2013,24,21,201305,2013),('2013-05-25',201321,5,2013,25,21,201305,2013),('2013-05-26',201322,5,2013,26,22,201305,2013),('2013-05-27',201322,5,2013,27,22,201305,2013),('2013-05-28',201322,5,2013,28,22,201305,2013),('2013-05-29',201322,5,2013,29,22,201305,2013),('2013-05-30',201322,5,2013,30,22,201305,2013),('2013-05-31',201322,5,2013,31,22,201305,2013),('2013-06-01',201322,6,2013,1,22,201306,2013),('2013-06-02',201323,6,2013,2,23,201306,2013),('2013-06-03',201323,6,2013,3,23,201306,2013),('2013-06-04',201323,6,2013,4,23,201306,2013),('2013-06-05',201323,6,2013,5,23,201306,2013),('2013-06-06',201323,6,2013,6,23,201306,2013),('2013-06-07',201323,6,2013,7,23,201306,2013),('2013-06-08',201323,6,2013,8,23,201306,2013),('2013-06-09',201324,6,2013,9,24,201306,2013),('2013-06-10',201324,6,2013,10,24,201306,2013),('2013-06-11',201324,6,2013,11,24,201306,2013),('2013-06-12',201324,6,2013,12,24,201306,2013),('2013-06-13',201324,6,2013,13,24,201306,2013),('2013-06-14',201324,6,2013,14,24,201306,2013),('2013-06-15',201324,6,2013,15,24,201306,2013),('2013-06-16',201325,6,2013,16,25,201306,2013),('2013-06-17',201325,6,2013,17,25,201306,2013),('2013-06-18',201325,6,2013,18,25,201306,2013),('2013-06-19',201325,6,2013,19,25,201306,2013),('2013-06-20',201325,6,2013,20,25,201306,2013),('2013-06-21',201325,6,2013,21,25,201306,2013),('2013-06-22',201325,6,2013,22,25,201306,2013),('2013-06-23',201326,6,2013,23,26,201306,2013),('2013-06-24',201326,6,2013,24,26,201306,2013),('2013-06-25',201326,6,2013,25,26,201306,2013),('2013-06-26',201326,6,2013,26,26,201306,2013),('2013-06-27',201326,6,2013,27,26,201306,2013),('2013-06-28',201326,6,2013,28,26,201306,2013),('2013-06-29',201326,6,2013,29,26,201306,2013),('2013-06-30',201327,6,2013,30,27,201306,2013),('2013-07-01',201327,7,2013,1,27,201307,2013),('2013-07-02',201327,7,2013,2,27,201307,2013),('2013-07-03',201327,7,2013,3,27,201307,2013),('2013-07-04',201327,7,2013,4,27,201307,2013),('2013-07-05',201327,7,2013,5,27,201307,2013),('2013-07-06',201327,7,2013,6,27,201307,2013),('2013-07-07',201328,7,2013,7,28,201307,2013),('2013-07-08',201328,7,2013,8,28,201307,2013),('2013-07-09',201328,7,2013,9,28,201307,2013),('2013-07-10',201328,7,2013,10,28,201307,2013),('2013-07-11',201328,7,2013,11,28,201307,2013),('2013-07-12',201328,7,2013,12,28,201307,2013),('2013-07-13',201328,7,2013,13,28,201307,2013),('2013-07-14',201329,7,2013,14,29,201307,2013),('2013-07-15',201329,7,2013,15,29,201307,2013),('2013-07-16',201329,7,2013,16,29,201307,2013),('2013-07-17',201329,7,2013,17,29,201307,2013),('2013-07-18',201329,7,2013,18,29,201307,2013),('2013-07-19',201329,7,2013,19,29,201307,2013),('2013-07-20',201329,7,2013,20,29,201307,2013),('2013-07-21',201330,7,2013,21,30,201307,2013),('2013-07-22',201330,7,2013,22,30,201307,2013),('2013-07-23',201330,7,2013,23,30,201307,2013),('2013-07-24',201330,7,2013,24,30,201307,2013),('2013-07-25',201330,7,2013,25,30,201307,2013),('2013-07-26',201330,7,2013,26,30,201307,2013),('2013-07-27',201330,7,2013,27,30,201307,2013),('2013-07-28',201331,7,2013,28,31,201307,2013),('2013-07-29',201331,7,2013,29,31,201307,2013),('2013-07-30',201331,7,2013,30,31,201307,2013),('2013-07-31',201331,7,2013,31,31,201307,2013),('2013-08-01',201331,8,2013,1,31,201308,2013),('2013-08-02',201331,8,2013,2,31,201308,2013),('2013-08-03',201331,8,2013,3,31,201308,2013),('2013-08-04',201332,8,2013,4,32,201308,2013),('2013-08-05',201332,8,2013,5,32,201308,2013),('2013-08-06',201332,8,2013,6,32,201308,2013),('2013-08-07',201332,8,2013,7,32,201308,2013),('2013-08-08',201332,8,2013,8,32,201308,2013),('2013-08-09',201332,8,2013,9,32,201308,2013),('2013-08-10',201332,8,2013,10,32,201308,2013),('2013-08-11',201333,8,2013,11,33,201308,2013),('2013-08-12',201333,8,2013,12,33,201308,2013),('2013-08-13',201333,8,2013,13,33,201308,2013),('2013-08-14',201333,8,2013,14,33,201308,2013),('2013-08-15',201333,8,2013,15,33,201308,2013),('2013-08-16',201333,8,2013,16,33,201308,2013),('2013-08-17',201333,8,2013,17,33,201308,2013),('2013-08-18',201334,8,2013,18,34,201308,2013),('2013-08-19',201334,8,2013,19,34,201308,2013),('2013-08-20',201334,8,2013,20,34,201308,2013),('2013-08-21',201334,8,2013,21,34,201308,2013),('2013-08-22',201334,8,2013,22,34,201308,2013),('2013-08-23',201334,8,2013,23,34,201308,2013),('2013-08-24',201334,8,2013,24,34,201308,2013),('2013-08-25',201335,8,2013,25,35,201308,2013),('2013-08-26',201335,8,2013,26,35,201308,2013),('2013-08-27',201335,8,2013,27,35,201308,2013),('2013-08-28',201335,8,2013,28,35,201308,2013),('2013-08-29',201335,8,2013,29,35,201308,2013),('2013-08-30',201335,8,2013,30,35,201308,2013),('2013-08-31',201335,8,2013,31,35,201308,2013),('2013-09-01',201336,9,2013,1,36,201309,2013),('2013-09-02',201336,9,2013,2,36,201309,2013),('2013-09-03',201336,9,2013,3,36,201309,2013),('2013-09-04',201336,9,2013,4,36,201309,2013),('2013-09-05',201336,9,2013,5,36,201309,2013),('2013-09-06',201336,9,2013,6,36,201309,2013),('2013-09-07',201336,9,2013,7,36,201309,2013),('2013-09-08',201337,9,2013,8,37,201309,2013),('2013-09-09',201337,9,2013,9,37,201309,2013),('2013-09-10',201337,9,2013,10,37,201309,2013),('2013-09-11',201337,9,2013,11,37,201309,2013),('2013-09-12',201337,9,2013,12,37,201309,2013),('2013-09-13',201337,9,2013,13,37,201309,2013),('2013-09-14',201337,9,2013,14,37,201309,2013),('2013-09-15',201338,9,2013,15,38,201309,2013),('2013-09-16',201338,9,2013,16,38,201309,2013),('2013-09-17',201338,9,2013,17,38,201309,2013),('2013-09-18',201338,9,2013,18,38,201309,2013),('2013-09-19',201338,9,2013,19,38,201309,2013),('2013-09-20',201338,9,2013,20,38,201309,2013),('2013-09-21',201338,9,2013,21,38,201309,2013),('2013-09-22',201339,9,2013,22,39,201309,2013),('2013-09-23',201339,9,2013,23,39,201309,2013),('2013-09-24',201339,9,2013,24,39,201309,2013),('2013-09-25',201339,9,2013,25,39,201309,2013),('2013-09-26',201339,9,2013,26,39,201309,2013),('2013-09-27',201339,9,2013,27,39,201309,2013),('2013-09-28',201339,9,2013,28,39,201309,2013),('2013-09-29',201340,9,2013,29,40,201309,2013),('2013-09-30',201340,9,2013,30,40,201309,2013),('2013-10-01',201340,10,2013,1,40,201310,2013),('2013-10-02',201340,10,2013,2,40,201310,2013),('2013-10-03',201340,10,2013,3,40,201310,2013),('2013-10-04',201340,10,2013,4,40,201310,2013),('2013-10-05',201340,10,2013,5,40,201310,2013),('2013-10-06',201341,10,2013,6,41,201310,2013),('2013-10-07',201341,10,2013,7,41,201310,2013),('2013-10-08',201341,10,2013,8,41,201310,2013),('2013-10-09',201341,10,2013,9,41,201310,2013),('2013-10-10',201341,10,2013,10,41,201310,2013),('2013-10-11',201341,10,2013,11,41,201310,2013),('2013-10-12',201341,10,2013,12,41,201310,2013),('2013-10-13',201342,10,2013,13,42,201310,2013),('2013-10-14',201342,10,2013,14,42,201310,2013),('2013-10-15',201342,10,2013,15,42,201310,2013),('2013-10-16',201342,10,2013,16,42,201310,2013),('2013-10-17',201342,10,2013,17,42,201310,2013),('2013-10-18',201342,10,2013,18,42,201310,2013),('2013-10-19',201342,10,2013,19,42,201310,2013),('2013-10-20',201343,10,2013,20,43,201310,2013),('2013-10-21',201343,10,2013,21,43,201310,2013),('2013-10-22',201343,10,2013,22,43,201310,2013),('2013-10-23',201343,10,2013,23,43,201310,2013),('2013-10-24',201343,10,2013,24,43,201310,2013),('2013-10-25',201343,10,2013,25,43,201310,2013),('2013-10-26',201343,10,2013,26,43,201310,2013),('2013-10-27',201344,10,2013,27,44,201310,2013),('2013-10-28',201344,10,2013,28,44,201310,2013),('2013-10-29',201344,10,2013,29,44,201310,2013),('2013-10-30',201344,10,2013,30,44,201310,2013),('2013-10-31',201344,10,2013,31,44,201310,2013),('2013-11-01',201344,11,2013,1,44,201311,2013),('2013-11-02',201344,11,2013,2,44,201311,2013),('2013-11-03',201345,11,2013,3,45,201311,2013),('2013-11-04',201345,11,2013,4,45,201311,2013),('2013-11-05',201345,11,2013,5,45,201311,2013),('2013-11-06',201345,11,2013,6,45,201311,2013),('2013-11-07',201345,11,2013,7,45,201311,2013),('2013-11-08',201345,11,2013,8,45,201311,2013),('2013-11-09',201345,11,2013,9,45,201311,2013),('2013-11-10',201346,11,2013,10,46,201311,2013),('2013-11-11',201346,11,2013,11,46,201311,2013),('2013-11-12',201346,11,2013,12,46,201311,2013),('2013-11-13',201346,11,2013,13,46,201311,2013),('2013-11-14',201346,11,2013,14,46,201311,2013),('2013-11-15',201346,11,2013,15,46,201311,2013),('2013-11-16',201346,11,2013,16,46,201311,2013),('2013-11-17',201347,11,2013,17,47,201311,2013),('2013-11-18',201347,11,2013,18,47,201311,2013),('2013-11-19',201347,11,2013,19,47,201311,2013),('2013-11-20',201347,11,2013,20,47,201311,2013),('2013-11-21',201347,11,2013,21,47,201311,2013),('2013-11-22',201347,11,2013,22,47,201311,2013),('2013-11-23',201347,11,2013,23,47,201311,2013),('2013-11-24',201348,11,2013,24,48,201311,2013),('2013-11-25',201348,11,2013,25,48,201311,2013),('2013-11-26',201348,11,2013,26,48,201311,2013),('2013-11-27',201348,11,2013,27,48,201311,2013),('2013-11-28',201348,11,2013,28,48,201311,2013),('2013-11-29',201348,11,2013,29,48,201311,2013),('2013-11-30',201348,11,2013,30,48,201311,2013),('2013-12-01',201349,12,2013,1,49,201312,2014),('2013-12-02',201349,12,2013,2,49,201312,2014),('2013-12-03',201349,12,2013,3,49,201312,2014),('2013-12-04',201349,12,2013,4,49,201312,2014),('2013-12-05',201349,12,2013,5,49,201312,2014),('2013-12-06',201349,12,2013,6,49,201312,2014),('2013-12-07',201349,12,2013,7,49,201312,2014),('2013-12-08',201350,12,2013,8,50,201312,2014),('2013-12-09',201350,12,2013,9,50,201312,2014),('2013-12-10',201350,12,2013,10,50,201312,2014),('2013-12-11',201350,12,2013,11,50,201312,2014),('2013-12-12',201350,12,2013,12,50,201312,2014),('2013-12-13',201350,12,2013,13,50,201312,2014),('2013-12-14',201350,12,2013,14,50,201312,2014),('2013-12-15',201351,12,2013,15,51,201312,2014),('2013-12-16',201351,12,2013,16,51,201312,2014),('2013-12-17',201351,12,2013,17,51,201312,2014),('2013-12-18',201351,12,2013,18,51,201312,2014),('2013-12-19',201351,12,2013,19,51,201312,2014),('2013-12-20',201351,12,2013,20,51,201312,2014),('2013-12-21',201351,12,2013,21,51,201312,2014),('2013-12-22',201352,12,2013,22,52,201312,2014),('2013-12-23',201352,12,2013,23,52,201312,2014),('2013-12-24',201352,12,2013,24,52,201312,2014),('2013-12-25',201352,12,2013,25,52,201312,2014),('2013-12-26',201352,12,2013,26,52,201312,2014),('2013-12-27',201352,12,2013,27,52,201312,2014),('2013-12-28',201352,12,2013,28,52,201312,2014),('2013-12-29',201401,12,2013,29,1,201312,2014),('2013-12-30',201401,12,2013,30,1,201312,2014),('2013-12-31',201401,12,2013,31,1,201312,2014),('2014-01-01',201401,1,2014,1,1,201401,2014),('2014-01-02',201401,1,2014,2,1,201401,2014),('2014-01-03',201401,1,2014,3,1,201401,2014),('2014-01-04',201401,1,2014,4,1,201401,2014),('2014-01-05',201402,1,2014,5,2,201401,2014),('2014-01-06',201402,1,2014,6,2,201401,2014),('2014-01-07',201402,1,2014,7,2,201401,2014),('2014-01-08',201402,1,2014,8,2,201401,2014),('2014-01-09',201402,1,2014,9,2,201401,2014),('2014-01-10',201402,1,2014,10,2,201401,2014),('2014-01-11',201402,1,2014,11,2,201401,2014),('2014-01-12',201403,1,2014,12,3,201401,2014),('2014-01-13',201403,1,2014,13,3,201401,2014),('2014-01-14',201403,1,2014,14,3,201401,2014),('2014-01-15',201403,1,2014,15,3,201401,2014),('2014-01-16',201403,1,2014,16,3,201401,2014),('2014-01-17',201403,1,2014,17,3,201401,2014),('2014-01-18',201403,1,2014,18,3,201401,2014),('2014-01-19',201404,1,2014,19,4,201401,2014),('2014-01-20',201404,1,2014,20,4,201401,2014),('2014-01-21',201404,1,2014,21,4,201401,2014),('2014-01-22',201404,1,2014,22,4,201401,2014),('2014-01-23',201404,1,2014,23,4,201401,2014),('2014-01-24',201404,1,2014,24,4,201401,2014),('2014-01-25',201404,1,2014,25,4,201401,2014),('2014-01-26',201405,1,2014,26,5,201401,2014),('2014-01-27',201405,1,2014,27,5,201401,2014),('2014-01-28',201405,1,2014,28,5,201401,2014),('2014-01-29',201405,1,2014,29,5,201401,2014),('2014-01-30',201405,1,2014,30,5,201401,2014),('2014-01-31',201405,1,2014,31,5,201401,2014),('2014-02-01',201405,2,2014,1,5,201402,2014),('2014-02-02',201406,2,2014,2,6,201402,2014),('2014-02-03',201406,2,2014,3,6,201402,2014),('2014-02-04',201406,2,2014,4,6,201402,2014),('2014-02-05',201406,2,2014,5,6,201402,2014),('2014-02-06',201406,2,2014,6,6,201402,2014),('2014-02-07',201406,2,2014,7,6,201402,2014),('2014-02-08',201406,2,2014,8,6,201402,2014),('2014-02-09',201407,2,2014,9,7,201402,2014),('2014-02-10',201407,2,2014,10,7,201402,2014),('2014-02-11',201407,2,2014,11,7,201402,2014),('2014-02-12',201407,2,2014,12,7,201402,2014),('2014-02-13',201407,2,2014,13,7,201402,2014),('2014-02-14',201407,2,2014,14,7,201402,2014),('2014-02-15',201407,2,2014,15,7,201402,2014),('2014-02-16',201408,2,2014,16,8,201402,2014),('2014-02-17',201408,2,2014,17,8,201402,2014),('2014-02-18',201408,2,2014,18,8,201402,2014),('2014-02-19',201408,2,2014,19,8,201402,2014),('2014-02-20',201408,2,2014,20,8,201402,2014),('2014-02-21',201408,2,2014,21,8,201402,2014),('2014-02-22',201408,2,2014,22,8,201402,2014),('2014-02-23',201409,2,2014,23,9,201402,2014),('2014-02-24',201409,2,2014,24,9,201402,2014),('2014-02-25',201409,2,2014,25,9,201402,2014),('2014-02-26',201409,2,2014,26,9,201402,2014),('2014-02-27',201409,2,2014,27,9,201402,2014),('2014-02-28',201409,2,2014,28,9,201402,2014),('2014-03-01',201409,3,2014,1,9,201403,2014),('2014-03-02',201410,3,2014,2,10,201403,2014),('2014-03-03',201410,3,2014,3,10,201403,2014),('2014-03-04',201410,3,2014,4,10,201403,2014),('2014-03-05',201410,3,2014,5,10,201403,2014),('2014-03-06',201410,3,2014,6,10,201403,2014),('2014-03-07',201410,3,2014,7,10,201403,2014),('2014-03-08',201410,3,2014,8,10,201403,2014),('2014-03-09',201411,3,2014,9,11,201403,2014),('2014-03-10',201411,3,2014,10,11,201403,2014),('2014-03-11',201411,3,2014,11,11,201403,2014),('2014-03-12',201411,3,2014,12,11,201403,2014),('2014-03-13',201411,3,2014,13,11,201403,2014),('2014-03-14',201411,3,2014,14,11,201403,2014),('2014-03-15',201411,3,2014,15,11,201403,2014),('2014-03-16',201412,3,2014,16,12,201403,2014),('2014-03-17',201412,3,2014,17,12,201403,2014),('2014-03-18',201412,3,2014,18,12,201403,2014),('2014-03-19',201412,3,2014,19,12,201403,2014),('2014-03-20',201412,3,2014,20,12,201403,2014),('2014-03-21',201412,3,2014,21,12,201403,2014),('2014-03-22',201412,3,2014,22,12,201403,2014),('2014-03-23',201413,3,2014,23,13,201403,2014),('2014-03-24',201413,3,2014,24,13,201403,2014),('2014-03-25',201413,3,2014,25,13,201403,2014),('2014-03-26',201413,3,2014,26,13,201403,2014),('2014-03-27',201413,3,2014,27,13,201403,2014),('2014-03-28',201413,3,2014,28,13,201403,2014),('2014-03-29',201413,3,2014,29,13,201403,2014),('2014-03-30',201414,3,2014,30,14,201403,2014),('2014-03-31',201414,3,2014,31,14,201403,2014),('2014-04-01',201414,4,2014,1,14,201404,2014),('2014-04-02',201414,4,2014,2,14,201404,2014),('2014-04-03',201414,4,2014,3,14,201404,2014),('2014-04-04',201414,4,2014,4,14,201404,2014),('2014-04-05',201414,4,2014,5,14,201404,2014),('2014-04-06',201415,4,2014,6,15,201404,2014),('2014-04-07',201415,4,2014,7,15,201404,2014),('2014-04-08',201415,4,2014,8,15,201404,2014),('2014-04-09',201415,4,2014,9,15,201404,2014),('2014-04-10',201415,4,2014,10,15,201404,2014),('2014-04-11',201415,4,2014,11,15,201404,2014),('2014-04-12',201415,4,2014,12,15,201404,2014),('2014-04-13',201416,4,2014,13,16,201404,2014),('2014-04-14',201416,4,2014,14,16,201404,2014),('2014-04-15',201416,4,2014,15,16,201404,2014),('2014-04-16',201416,4,2014,16,16,201404,2014),('2014-04-17',201416,4,2014,17,16,201404,2014),('2014-04-18',201416,4,2014,18,16,201404,2014),('2014-04-19',201416,4,2014,19,16,201404,2014),('2014-04-20',201417,4,2014,20,17,201404,2014),('2014-04-21',201417,4,2014,21,17,201404,2014),('2014-04-22',201417,4,2014,22,17,201404,2014),('2014-04-23',201417,4,2014,23,17,201404,2014),('2014-04-24',201417,4,2014,24,17,201404,2014),('2014-04-25',201417,4,2014,25,17,201404,2014),('2014-04-26',201417,4,2014,26,17,201404,2014),('2014-04-27',201418,4,2014,27,18,201404,2014),('2014-04-28',201418,4,2014,28,18,201404,2014),('2014-04-29',201418,4,2014,29,18,201404,2014),('2014-04-30',201418,4,2014,30,18,201404,2014),('2014-05-01',201418,5,2014,1,18,201405,2014),('2014-05-02',201418,5,2014,2,18,201405,2014),('2014-05-03',201418,5,2014,3,18,201405,2014),('2014-05-04',201419,5,2014,4,19,201405,2014),('2014-05-05',201419,5,2014,5,19,201405,2014),('2014-05-06',201419,5,2014,6,19,201405,2014),('2014-05-07',201419,5,2014,7,19,201405,2014),('2014-05-08',201419,5,2014,8,19,201405,2014),('2014-05-09',201419,5,2014,9,19,201405,2014),('2014-05-10',201419,5,2014,10,19,201405,2014),('2014-05-11',201420,5,2014,11,20,201405,2014),('2014-05-12',201420,5,2014,12,20,201405,2014),('2014-05-13',201420,5,2014,13,20,201405,2014),('2014-05-14',201420,5,2014,14,20,201405,2014),('2014-05-15',201420,5,2014,15,20,201405,2014),('2014-05-16',201420,5,2014,16,20,201405,2014),('2014-05-17',201420,5,2014,17,20,201405,2014),('2014-05-18',201421,5,2014,18,21,201405,2014),('2014-05-19',201421,5,2014,19,21,201405,2014),('2014-05-20',201421,5,2014,20,21,201405,2014),('2014-05-21',201421,5,2014,21,21,201405,2014),('2014-05-22',201421,5,2014,22,21,201405,2014),('2014-05-23',201421,5,2014,23,21,201405,2014),('2014-05-24',201421,5,2014,24,21,201405,2014),('2014-05-25',201422,5,2014,25,22,201405,2014),('2014-05-26',201422,5,2014,26,22,201405,2014),('2014-05-27',201422,5,2014,27,22,201405,2014),('2014-05-28',201422,5,2014,28,22,201405,2014),('2014-05-29',201422,5,2014,29,22,201405,2014),('2014-05-30',201422,5,2014,30,22,201405,2014),('2014-05-31',201422,5,2014,31,22,201405,2014),('2014-06-01',201423,6,2014,1,23,201406,2014),('2014-06-02',201423,6,2014,2,23,201406,2014),('2014-06-03',201423,6,2014,3,23,201406,2014),('2014-06-04',201423,6,2014,4,23,201406,2014),('2014-06-05',201423,6,2014,5,23,201406,2014),('2014-06-06',201423,6,2014,6,23,201406,2014),('2014-06-07',201423,6,2014,7,23,201406,2014),('2014-06-08',201424,6,2014,8,24,201406,2014),('2014-06-09',201424,6,2014,9,24,201406,2014),('2014-06-10',201424,6,2014,10,24,201406,2014),('2014-06-11',201424,6,2014,11,24,201406,2014),('2014-06-12',201424,6,2014,12,24,201406,2014),('2014-06-13',201424,6,2014,13,24,201406,2014),('2014-06-14',201424,6,2014,14,24,201406,2014),('2014-06-15',201425,6,2014,15,25,201406,2014),('2014-06-16',201425,6,2014,16,25,201406,2014),('2014-06-17',201425,6,2014,17,25,201406,2014),('2014-06-18',201425,6,2014,18,25,201406,2014),('2014-06-19',201425,6,2014,19,25,201406,2014),('2014-06-20',201425,6,2014,20,25,201406,2014),('2014-06-21',201425,6,2014,21,25,201406,2014),('2014-06-22',201426,6,2014,22,26,201406,2014),('2014-06-23',201426,6,2014,23,26,201406,2014),('2014-06-24',201426,6,2014,24,26,201406,2014),('2014-06-25',201426,6,2014,25,26,201406,2014),('2014-06-26',201426,6,2014,26,26,201406,2014),('2014-06-27',201426,6,2014,27,26,201406,2014),('2014-06-28',201426,6,2014,28,26,201406,2014),('2014-06-29',201427,6,2014,29,27,201406,2014),('2014-06-30',201427,6,2014,30,27,201406,2014),('2014-07-01',201427,7,2014,1,27,201407,2014),('2014-07-02',201427,7,2014,2,27,201407,2014),('2014-07-03',201427,7,2014,3,27,201407,2014),('2014-07-04',201427,7,2014,4,27,201407,2014),('2014-07-05',201427,7,2014,5,27,201407,2014),('2014-07-06',201428,7,2014,6,28,201407,2014),('2014-07-07',201428,7,2014,7,28,201407,2014),('2014-07-08',201428,7,2014,8,28,201407,2014),('2014-07-09',201428,7,2014,9,28,201407,2014),('2014-07-10',201428,7,2014,10,28,201407,2014),('2014-07-11',201428,7,2014,11,28,201407,2014),('2014-07-12',201428,7,2014,12,28,201407,2014),('2014-07-13',201429,7,2014,13,29,201407,2014),('2014-07-14',201429,7,2014,14,29,201407,2014),('2014-07-15',201429,7,2014,15,29,201407,2014),('2014-07-16',201429,7,2014,16,29,201407,2014),('2014-07-17',201429,7,2014,17,29,201407,2014),('2014-07-18',201429,7,2014,18,29,201407,2014),('2014-07-19',201429,7,2014,19,29,201407,2014),('2014-07-20',201430,7,2014,20,30,201407,2014),('2014-07-21',201430,7,2014,21,30,201407,2014),('2014-07-22',201430,7,2014,22,30,201407,2014),('2014-07-23',201430,7,2014,23,30,201407,2014),('2014-07-24',201430,7,2014,24,30,201407,2014),('2014-07-25',201430,7,2014,25,30,201407,2014),('2014-07-26',201430,7,2014,26,30,201407,2014),('2014-07-27',201431,7,2014,27,31,201407,2014),('2014-07-28',201431,7,2014,28,31,201407,2014),('2014-07-29',201431,7,2014,29,31,201407,2014),('2014-07-30',201431,7,2014,30,31,201407,2014),('2014-07-31',201431,7,2014,31,31,201407,2014),('2014-08-01',201431,8,2014,1,31,201408,2014),('2014-08-02',201431,8,2014,2,31,201408,2014),('2014-08-03',201432,8,2014,3,32,201408,2014),('2014-08-04',201432,8,2014,4,32,201408,2014),('2014-08-05',201432,8,2014,5,32,201408,2014),('2014-08-06',201432,8,2014,6,32,201408,2014),('2014-08-07',201432,8,2014,7,32,201408,2014),('2014-08-08',201432,8,2014,8,32,201408,2014),('2014-08-09',201432,8,2014,9,32,201408,2014),('2014-08-10',201433,8,2014,10,33,201408,2014),('2014-08-11',201433,8,2014,11,33,201408,2014),('2014-08-12',201433,8,2014,12,33,201408,2014),('2014-08-13',201433,8,2014,13,33,201408,2014),('2014-08-14',201433,8,2014,14,33,201408,2014),('2014-08-15',201433,8,2014,15,33,201408,2014),('2014-08-16',201433,8,2014,16,33,201408,2014),('2014-08-17',201434,8,2014,17,34,201408,2014),('2014-08-18',201434,8,2014,18,34,201408,2014),('2014-08-19',201434,8,2014,19,34,201408,2014),('2014-08-20',201434,8,2014,20,34,201408,2014),('2014-08-21',201434,8,2014,21,34,201408,2014),('2014-08-22',201434,8,2014,22,34,201408,2014),('2014-08-23',201434,8,2014,23,34,201408,2014),('2014-08-24',201435,8,2014,24,35,201408,2014),('2014-08-25',201435,8,2014,25,35,201408,2014),('2014-08-26',201435,8,2014,26,35,201408,2014),('2014-08-27',201435,8,2014,27,35,201408,2014),('2014-08-28',201435,8,2014,28,35,201408,2014),('2014-08-29',201435,8,2014,29,35,201408,2014),('2014-08-30',201435,8,2014,30,35,201408,2014),('2014-08-31',201436,8,2014,31,36,201408,2014),('2014-09-01',201436,9,2014,1,36,201409,2014),('2014-09-02',201436,9,2014,2,36,201409,2014),('2014-09-03',201436,9,2014,3,36,201409,2014),('2014-09-04',201436,9,2014,4,36,201409,2014),('2014-09-05',201436,9,2014,5,36,201409,2014),('2014-09-06',201436,9,2014,6,36,201409,2014),('2014-09-07',201437,9,2014,7,37,201409,2014),('2014-09-08',201437,9,2014,8,37,201409,2014),('2014-09-09',201437,9,2014,9,37,201409,2014),('2014-09-10',201437,9,2014,10,37,201409,2014),('2014-09-11',201437,9,2014,11,37,201409,2014),('2014-09-12',201437,9,2014,12,37,201409,2014),('2014-09-13',201437,9,2014,13,37,201409,2014),('2014-09-14',201438,9,2014,14,38,201409,2014),('2014-09-15',201438,9,2014,15,38,201409,2014),('2014-09-16',201438,9,2014,16,38,201409,2014),('2014-09-17',201438,9,2014,17,38,201409,2014),('2014-09-18',201438,9,2014,18,38,201409,2014),('2014-09-19',201438,9,2014,19,38,201409,2014),('2014-09-20',201438,9,2014,20,38,201409,2014),('2014-09-21',201439,9,2014,21,39,201409,2014),('2014-09-22',201439,9,2014,22,39,201409,2014),('2014-09-23',201439,9,2014,23,39,201409,2014),('2014-09-24',201439,9,2014,24,39,201409,2014),('2014-09-25',201439,9,2014,25,39,201409,2014),('2014-09-26',201439,9,2014,26,39,201409,2014),('2014-09-27',201439,9,2014,27,39,201409,2014),('2014-09-28',201440,9,2014,28,40,201409,2014),('2014-09-29',201440,9,2014,29,40,201409,2014),('2014-09-30',201440,9,2014,30,40,201409,2014),('2014-10-01',201440,10,2014,1,40,201410,2014),('2014-10-02',201440,10,2014,2,40,201410,2014),('2014-10-03',201440,10,2014,3,40,201410,2014),('2014-10-04',201440,10,2014,4,40,201410,2014),('2014-10-05',201441,10,2014,5,41,201410,2014),('2014-10-06',201441,10,2014,6,41,201410,2014),('2014-10-07',201441,10,2014,7,41,201410,2014),('2014-10-08',201441,10,2014,8,41,201410,2014),('2014-10-09',201441,10,2014,9,41,201410,2014),('2014-10-10',201441,10,2014,10,41,201410,2014),('2014-10-11',201441,10,2014,11,41,201410,2014),('2014-10-12',201442,10,2014,12,42,201410,2014),('2014-10-13',201442,10,2014,13,42,201410,2014),('2014-10-14',201442,10,2014,14,42,201410,2014),('2014-10-15',201442,10,2014,15,42,201410,2014),('2014-10-16',201442,10,2014,16,42,201410,2014),('2014-10-17',201442,10,2014,17,42,201410,2014),('2014-10-18',201442,10,2014,18,42,201410,2014),('2014-10-19',201443,10,2014,19,43,201410,2014),('2014-10-20',201443,10,2014,20,43,201410,2014),('2014-10-21',201443,10,2014,21,43,201410,2014),('2014-10-22',201443,10,2014,22,43,201410,2014),('2014-10-23',201443,10,2014,23,43,201410,2014),('2014-10-24',201443,10,2014,24,43,201410,2014),('2014-10-25',201443,10,2014,25,43,201410,2014),('2014-10-26',201444,10,2014,26,44,201410,2014),('2014-10-27',201444,10,2014,27,44,201410,2014),('2014-10-28',201444,10,2014,28,44,201410,2014),('2014-10-29',201444,10,2014,29,44,201410,2014),('2014-10-30',201444,10,2014,30,44,201410,2014),('2014-10-31',201444,10,2014,31,44,201410,2014),('2014-11-01',201444,11,2014,1,44,201411,2014),('2014-11-02',201445,11,2014,2,45,201411,2014),('2014-11-03',201445,11,2014,3,45,201411,2014),('2014-11-04',201445,11,2014,4,45,201411,2014),('2014-11-05',201445,11,2014,5,45,201411,2014),('2014-11-06',201445,11,2014,6,45,201411,2014),('2014-11-07',201445,11,2014,7,45,201411,2014),('2014-11-08',201445,11,2014,8,45,201411,2014),('2014-11-09',201446,11,2014,9,46,201411,2014),('2014-11-10',201446,11,2014,10,46,201411,2014),('2014-11-11',201446,11,2014,11,46,201411,2014),('2014-11-12',201446,11,2014,12,46,201411,2014),('2014-11-13',201446,11,2014,13,46,201411,2014),('2014-11-14',201446,11,2014,14,46,201411,2014),('2014-11-15',201446,11,2014,15,46,201411,2014),('2014-11-16',201447,11,2014,16,47,201411,2014),('2014-11-17',201447,11,2014,17,47,201411,2014),('2014-11-18',201447,11,2014,18,47,201411,2014),('2014-11-19',201447,11,2014,19,47,201411,2014),('2014-11-20',201447,11,2014,20,47,201411,2014),('2014-11-21',201447,11,2014,21,47,201411,2014),('2014-11-22',201447,11,2014,22,47,201411,2014),('2014-11-23',201448,11,2014,23,48,201411,2014),('2014-11-24',201448,11,2014,24,48,201411,2014),('2014-11-25',201448,11,2014,25,48,201411,2014),('2014-11-26',201448,11,2014,26,48,201411,2014),('2014-11-27',201448,11,2014,27,48,201411,2014),('2014-11-28',201448,11,2014,28,48,201411,2014),('2014-11-29',201448,11,2014,29,48,201411,2014),('2014-11-30',201449,11,2014,30,49,201411,2014),('2014-12-01',201449,12,2014,1,49,201412,2015),('2014-12-02',201449,12,2014,2,49,201412,2015),('2014-12-03',201449,12,2014,3,49,201412,2015),('2014-12-04',201449,12,2014,4,49,201412,2015),('2014-12-05',201449,12,2014,5,49,201412,2015),('2014-12-06',201449,12,2014,6,49,201412,2015),('2014-12-07',201450,12,2014,7,50,201412,2015),('2014-12-08',201450,12,2014,8,50,201412,2015),('2014-12-09',201450,12,2014,9,50,201412,2015),('2014-12-10',201450,12,2014,10,50,201412,2015),('2014-12-11',201450,12,2014,11,50,201412,2015),('2014-12-12',201450,12,2014,12,50,201412,2015),('2014-12-13',201450,12,2014,13,50,201412,2015),('2014-12-14',201451,12,2014,14,51,201412,2015),('2014-12-15',201451,12,2014,15,51,201412,2015),('2014-12-16',201451,12,2014,16,51,201412,2015),('2014-12-17',201451,12,2014,17,51,201412,2015),('2014-12-18',201451,12,2014,18,51,201412,2015),('2014-12-19',201451,12,2014,19,51,201412,2015),('2014-12-20',201451,12,2014,20,51,201412,2015),('2014-12-21',201452,12,2014,21,52,201412,2015),('2014-12-22',201452,12,2014,22,52,201412,2015),('2014-12-23',201452,12,2014,23,52,201412,2015),('2014-12-24',201452,12,2014,24,52,201412,2015),('2014-12-25',201452,12,2014,25,52,201412,2015),('2014-12-26',201452,12,2014,26,52,201412,2015),('2014-12-27',201452,12,2014,27,52,201412,2015),('2014-12-28',201453,12,2014,28,53,201412,2015),('2014-12-29',201453,12,2014,29,53,201412,2015),('2014-12-30',201453,12,2014,30,53,201412,2015),('2014-12-31',201453,12,2014,31,53,201412,2015),('2015-01-01',201453,1,2015,1,53,201501,2015),('2015-01-02',201453,1,2015,2,53,201501,2015),('2015-01-03',201453,1,2015,3,53,201501,2015),('2015-01-04',201501,1,2015,4,1,201501,2015),('2015-01-05',201501,1,2015,5,1,201501,2015),('2015-01-06',201501,1,2015,6,1,201501,2015),('2015-01-07',201501,1,2015,7,1,201501,2015),('2015-01-08',201501,1,2015,8,1,201501,2015),('2015-01-09',201501,1,2015,9,1,201501,2015),('2015-01-10',201501,1,2015,10,1,201501,2015),('2015-01-11',201502,1,2015,11,2,201501,2015),('2015-01-12',201502,1,2015,12,2,201501,2015),('2015-01-13',201502,1,2015,13,2,201501,2015),('2015-01-14',201502,1,2015,14,2,201501,2015),('2015-01-15',201502,1,2015,15,2,201501,2015),('2015-01-16',201502,1,2015,16,2,201501,2015),('2015-01-17',201502,1,2015,17,2,201501,2015),('2015-01-18',201503,1,2015,18,3,201501,2015),('2015-01-19',201503,1,2015,19,3,201501,2015),('2015-01-20',201503,1,2015,20,3,201501,2015),('2015-01-21',201503,1,2015,21,3,201501,2015),('2015-01-22',201503,1,2015,22,3,201501,2015),('2015-01-23',201503,1,2015,23,3,201501,2015),('2015-01-24',201503,1,2015,24,3,201501,2015),('2015-01-25',201504,1,2015,25,4,201501,2015),('2015-01-26',201504,1,2015,26,4,201501,2015),('2015-01-27',201504,1,2015,27,4,201501,2015),('2015-01-28',201504,1,2015,28,4,201501,2015),('2015-01-29',201504,1,2015,29,4,201501,2015),('2015-01-30',201504,1,2015,30,4,201501,2015),('2015-01-31',201504,1,2015,31,4,201501,2015),('2015-02-01',201505,2,2015,1,5,201502,2015),('2015-02-02',201505,2,2015,2,5,201502,2015),('2015-02-03',201505,2,2015,3,5,201502,2015),('2015-02-04',201505,2,2015,4,5,201502,2015),('2015-02-05',201505,2,2015,5,5,201502,2015),('2015-02-06',201505,2,2015,6,5,201502,2015),('2015-02-07',201505,2,2015,7,5,201502,2015),('2015-02-08',201506,2,2015,8,6,201502,2015),('2015-02-09',201506,2,2015,9,6,201502,2015),('2015-02-10',201506,2,2015,10,6,201502,2015),('2015-02-11',201506,2,2015,11,6,201502,2015),('2015-02-12',201506,2,2015,12,6,201502,2015),('2015-02-13',201506,2,2015,13,6,201502,2015),('2015-02-14',201506,2,2015,14,6,201502,2015),('2015-02-15',201507,2,2015,15,7,201502,2015),('2015-02-16',201507,2,2015,16,7,201502,2015),('2015-02-17',201507,2,2015,17,7,201502,2015),('2015-02-18',201507,2,2015,18,7,201502,2015),('2015-02-19',201507,2,2015,19,7,201502,2015),('2015-02-20',201507,2,2015,20,7,201502,2015),('2015-02-21',201507,2,2015,21,7,201502,2015),('2015-02-22',201508,2,2015,22,8,201502,2015),('2015-02-23',201508,2,2015,23,8,201502,2015),('2015-02-24',201508,2,2015,24,8,201502,2015),('2015-02-25',201508,2,2015,25,8,201502,2015),('2015-02-26',201508,2,2015,26,8,201502,2015),('2015-02-27',201508,2,2015,27,8,201502,2015),('2015-02-28',201508,2,2015,28,8,201502,2015),('2015-03-01',201509,3,2015,1,9,201503,2015),('2015-03-02',201509,3,2015,2,9,201503,2015),('2015-03-03',201509,3,2015,3,9,201503,2015),('2015-03-04',201509,3,2015,4,9,201503,2015),('2015-03-05',201509,3,2015,5,9,201503,2015),('2015-03-06',201509,3,2015,6,9,201503,2015),('2015-03-07',201509,3,2015,7,9,201503,2015),('2015-03-08',201510,3,2015,8,10,201503,2015),('2015-03-09',201510,3,2015,9,10,201503,2015),('2015-03-10',201510,3,2015,10,10,201503,2015),('2015-03-11',201510,3,2015,11,10,201503,2015),('2015-03-12',201510,3,2015,12,10,201503,2015),('2015-03-13',201510,3,2015,13,10,201503,2015),('2015-03-14',201510,3,2015,14,10,201503,2015),('2015-03-15',201511,3,2015,15,11,201503,2015),('2015-03-16',201511,3,2015,16,11,201503,2015),('2015-03-17',201511,3,2015,17,11,201503,2015),('2015-03-18',201511,3,2015,18,11,201503,2015),('2015-03-19',201511,3,2015,19,11,201503,2015),('2015-03-20',201511,3,2015,20,11,201503,2015),('2015-03-21',201511,3,2015,21,11,201503,2015),('2015-03-22',201512,3,2015,22,12,201503,2015),('2015-03-23',201512,3,2015,23,12,201503,2015),('2015-03-24',201512,3,2015,24,12,201503,2015),('2015-03-25',201512,3,2015,25,12,201503,2015),('2015-03-26',201512,3,2015,26,12,201503,2015),('2015-03-27',201512,3,2015,27,12,201503,2015),('2015-03-28',201512,3,2015,28,12,201503,2015),('2015-03-29',201513,3,2015,29,13,201503,2015),('2015-03-30',201513,3,2015,30,13,201503,2015),('2015-03-31',201513,3,2015,31,13,201503,2015),('2015-04-01',201513,4,2015,1,13,201504,2015),('2015-04-02',201513,4,2015,2,13,201504,2015),('2015-04-03',201513,4,2015,3,13,201504,2015),('2015-04-04',201513,4,2015,4,13,201504,2015),('2015-04-05',201514,4,2015,5,14,201504,2015),('2015-04-06',201514,4,2015,6,14,201504,2015),('2015-04-07',201514,4,2015,7,14,201504,2015),('2015-04-08',201514,4,2015,8,14,201504,2015),('2015-04-09',201514,4,2015,9,14,201504,2015),('2015-04-10',201514,4,2015,10,14,201504,2015),('2015-04-11',201514,4,2015,11,14,201504,2015),('2015-04-12',201515,4,2015,12,15,201504,2015),('2015-04-13',201515,4,2015,13,15,201504,2015),('2015-04-14',201515,4,2015,14,15,201504,2015),('2015-04-15',201515,4,2015,15,15,201504,2015),('2015-04-16',201515,4,2015,16,15,201504,2015),('2015-04-17',201515,4,2015,17,15,201504,2015),('2015-04-18',201515,4,2015,18,15,201504,2015),('2015-04-19',201516,4,2015,19,16,201504,2015),('2015-04-20',201516,4,2015,20,16,201504,2015),('2015-04-21',201516,4,2015,21,16,201504,2015),('2015-04-22',201516,4,2015,22,16,201504,2015),('2015-04-23',201516,4,2015,23,16,201504,2015),('2015-04-24',201516,4,2015,24,16,201504,2015),('2015-04-25',201516,4,2015,25,16,201504,2015),('2015-04-26',201517,4,2015,26,17,201504,2015),('2015-04-27',201517,4,2015,27,17,201504,2015),('2015-04-28',201517,4,2015,28,17,201504,2015),('2015-04-29',201517,4,2015,29,17,201504,2015),('2015-04-30',201517,4,2015,30,17,201504,2015),('2015-05-01',201517,5,2015,1,17,201505,2015),('2015-05-02',201517,5,2015,2,17,201505,2015),('2015-05-03',201518,5,2015,3,18,201505,2015),('2015-05-04',201518,5,2015,4,18,201505,2015),('2015-05-05',201518,5,2015,5,18,201505,2015),('2015-05-06',201518,5,2015,6,18,201505,2015),('2015-05-07',201518,5,2015,7,18,201505,2015),('2015-05-08',201518,5,2015,8,18,201505,2015),('2015-05-09',201518,5,2015,9,18,201505,2015),('2015-05-10',201519,5,2015,10,19,201505,2015),('2015-05-11',201519,5,2015,11,19,201505,2015),('2015-05-12',201519,5,2015,12,19,201505,2015),('2015-05-13',201519,5,2015,13,19,201505,2015),('2015-05-14',201519,5,2015,14,19,201505,2015),('2015-05-15',201519,5,2015,15,19,201505,2015),('2015-05-16',201519,5,2015,16,19,201505,2015),('2015-05-17',201520,5,2015,17,20,201505,2015),('2015-05-18',201520,5,2015,18,20,201505,2015),('2015-05-19',201520,5,2015,19,20,201505,2015),('2015-05-20',201520,5,2015,20,20,201505,2015),('2015-05-21',201520,5,2015,21,20,201505,2015),('2015-05-22',201520,5,2015,22,20,201505,2015),('2015-05-23',201520,5,2015,23,20,201505,2015),('2015-05-24',201521,5,2015,24,21,201505,2015),('2015-05-25',201521,5,2015,25,21,201505,2015),('2015-05-26',201521,5,2015,26,21,201505,2015),('2015-05-27',201521,5,2015,27,21,201505,2015),('2015-05-28',201521,5,2015,28,21,201505,2015),('2015-05-29',201521,5,2015,29,21,201505,2015),('2015-05-30',201521,5,2015,30,21,201505,2015),('2015-05-31',201522,5,2015,31,22,201505,2015),('2015-06-01',201522,6,2015,1,22,201506,2015),('2015-06-02',201522,6,2015,2,22,201506,2015),('2015-06-03',201522,6,2015,3,22,201506,2015),('2015-06-04',201522,6,2015,4,22,201506,2015),('2015-06-05',201522,6,2015,5,22,201506,2015),('2015-06-06',201522,6,2015,6,22,201506,2015),('2015-06-07',201523,6,2015,7,23,201506,2015),('2015-06-08',201523,6,2015,8,23,201506,2015),('2015-06-09',201523,6,2015,9,23,201506,2015),('2015-06-10',201523,6,2015,10,23,201506,2015),('2015-06-11',201523,6,2015,11,23,201506,2015),('2015-06-12',201523,6,2015,12,23,201506,2015),('2015-06-13',201523,6,2015,13,23,201506,2015),('2015-06-14',201524,6,2015,14,24,201506,2015),('2015-06-15',201524,6,2015,15,24,201506,2015),('2015-06-16',201524,6,2015,16,24,201506,2015),('2015-06-17',201524,6,2015,17,24,201506,2015),('2015-06-18',201524,6,2015,18,24,201506,2015),('2015-06-19',201524,6,2015,19,24,201506,2015),('2015-06-20',201524,6,2015,20,24,201506,2015),('2015-06-21',201525,6,2015,21,25,201506,2015),('2015-06-22',201525,6,2015,22,25,201506,2015),('2015-06-23',201525,6,2015,23,25,201506,2015),('2015-06-24',201525,6,2015,24,25,201506,2015),('2015-06-25',201525,6,2015,25,25,201506,2015),('2015-06-26',201525,6,2015,26,25,201506,2015),('2015-06-27',201525,6,2015,27,25,201506,2015),('2015-06-28',201526,6,2015,28,26,201506,2015),('2015-06-29',201526,6,2015,29,26,201506,2015),('2015-06-30',201526,6,2015,30,26,201506,2015),('2015-07-01',201526,7,2015,1,26,201507,2015),('2015-07-02',201526,7,2015,2,26,201507,2015),('2015-07-03',201526,7,2015,3,26,201507,2015),('2015-07-04',201526,7,2015,4,26,201507,2015),('2015-07-05',201527,7,2015,5,27,201507,2015),('2015-07-06',201527,7,2015,6,27,201507,2015),('2015-07-07',201527,7,2015,7,27,201507,2015),('2015-07-08',201527,7,2015,8,27,201507,2015),('2015-07-09',201527,7,2015,9,27,201507,2015),('2015-07-10',201527,7,2015,10,27,201507,2015),('2015-07-11',201527,7,2015,11,27,201507,2015),('2015-07-12',201528,7,2015,12,28,201507,2015),('2015-07-13',201528,7,2015,13,28,201507,2015),('2015-07-14',201528,7,2015,14,28,201507,2015),('2015-07-15',201528,7,2015,15,28,201507,2015),('2015-07-16',201528,7,2015,16,28,201507,2015),('2015-07-17',201528,7,2015,17,28,201507,2015),('2015-07-18',201528,7,2015,18,28,201507,2015),('2015-07-19',201529,7,2015,19,29,201507,2015),('2015-07-20',201529,7,2015,20,29,201507,2015),('2015-07-21',201529,7,2015,21,29,201507,2015),('2015-07-22',201529,7,2015,22,29,201507,2015),('2015-07-23',201529,7,2015,23,29,201507,2015),('2015-07-24',201529,7,2015,24,29,201507,2015),('2015-07-25',201529,7,2015,25,29,201507,2015),('2015-07-26',201530,7,2015,26,30,201507,2015),('2015-07-27',201530,7,2015,27,30,201507,2015),('2015-07-28',201530,7,2015,28,30,201507,2015),('2015-07-29',201530,7,2015,29,30,201507,2015),('2015-07-30',201530,7,2015,30,30,201507,2015),('2015-07-31',201530,7,2015,31,30,201507,2015),('2015-08-01',201530,8,2015,1,30,201508,2015),('2015-08-02',201531,8,2015,2,31,201508,2015),('2015-08-03',201531,8,2015,3,31,201508,2015),('2015-08-04',201531,8,2015,4,31,201508,2015),('2015-08-05',201531,8,2015,5,31,201508,2015),('2015-08-06',201531,8,2015,6,31,201508,2015),('2015-08-07',201531,8,2015,7,31,201508,2015),('2015-08-08',201531,8,2015,8,31,201508,2015),('2015-08-09',201532,8,2015,9,32,201508,2015),('2015-08-10',201532,8,2015,10,32,201508,2015),('2015-08-11',201532,8,2015,11,32,201508,2015),('2015-08-12',201532,8,2015,12,32,201508,2015),('2015-08-13',201532,8,2015,13,32,201508,2015),('2015-08-14',201532,8,2015,14,32,201508,2015),('2015-08-15',201532,8,2015,15,32,201508,2015),('2015-08-16',201533,8,2015,16,33,201508,2015),('2015-08-17',201533,8,2015,17,33,201508,2015),('2015-08-18',201533,8,2015,18,33,201508,2015),('2015-08-19',201533,8,2015,19,33,201508,2015),('2015-08-20',201533,8,2015,20,33,201508,2015),('2015-08-21',201533,8,2015,21,33,201508,2015),('2015-08-22',201533,8,2015,22,33,201508,2015),('2015-08-23',201534,8,2015,23,34,201508,2015),('2015-08-24',201534,8,2015,24,34,201508,2015),('2015-08-25',201534,8,2015,25,34,201508,2015),('2015-08-26',201534,8,2015,26,34,201508,2015),('2015-08-27',201534,8,2015,27,34,201508,2015),('2015-08-28',201534,8,2015,28,34,201508,2015),('2015-08-29',201534,8,2015,29,34,201508,2015),('2015-08-30',201535,8,2015,30,35,201508,2015),('2015-08-31',201535,8,2015,31,35,201508,2015),('2015-09-01',201535,9,2015,1,35,201509,2015),('2015-09-02',201535,9,2015,2,35,201509,2015),('2015-09-03',201535,9,2015,3,35,201509,2015),('2015-09-04',201535,9,2015,4,35,201509,2015),('2015-09-05',201535,9,2015,5,35,201509,2015),('2015-09-06',201536,9,2015,6,36,201509,2015),('2015-09-07',201536,9,2015,7,36,201509,2015),('2015-09-08',201536,9,2015,8,36,201509,2015),('2015-09-09',201536,9,2015,9,36,201509,2015),('2015-09-10',201536,9,2015,10,36,201509,2015),('2015-09-11',201536,9,2015,11,36,201509,2015),('2015-09-12',201536,9,2015,12,36,201509,2015),('2015-09-13',201537,9,2015,13,37,201509,2015),('2015-09-14',201537,9,2015,14,37,201509,2015),('2015-09-15',201537,9,2015,15,37,201509,2015),('2015-09-16',201537,9,2015,16,37,201509,2015),('2015-09-17',201537,9,2015,17,37,201509,2015),('2015-09-18',201537,9,2015,18,37,201509,2015),('2015-09-19',201537,9,2015,19,37,201509,2015),('2015-09-20',201538,9,2015,20,38,201509,2015),('2015-09-21',201538,9,2015,21,38,201509,2015),('2015-09-22',201538,9,2015,22,38,201509,2015),('2015-09-23',201538,9,2015,23,38,201509,2015),('2015-09-24',201538,9,2015,24,38,201509,2015),('2015-09-25',201538,9,2015,25,38,201509,2015),('2015-09-26',201538,9,2015,26,38,201509,2015),('2015-09-27',201539,9,2015,27,39,201509,2015),('2015-09-28',201539,9,2015,28,39,201509,2015),('2015-09-29',201539,9,2015,29,39,201509,2015),('2015-09-30',201539,9,2015,30,39,201509,2015),('2015-10-01',201539,10,2015,1,39,201510,2015),('2015-10-02',201539,10,2015,2,39,201510,2015),('2015-10-03',201539,10,2015,3,39,201510,2015),('2015-10-04',201540,10,2015,4,40,201510,2015),('2015-10-05',201540,10,2015,5,40,201510,2015),('2015-10-06',201540,10,2015,6,40,201510,2015),('2015-10-07',201540,10,2015,7,40,201510,2015),('2015-10-08',201540,10,2015,8,40,201510,2015),('2015-10-09',201540,10,2015,9,40,201510,2015),('2015-10-10',201540,10,2015,10,40,201510,2015),('2015-10-11',201541,10,2015,11,41,201510,2015),('2015-10-12',201541,10,2015,12,41,201510,2015),('2015-10-13',201541,10,2015,13,41,201510,2015),('2015-10-14',201541,10,2015,14,41,201510,2015),('2015-10-15',201541,10,2015,15,41,201510,2015),('2015-10-16',201541,10,2015,16,41,201510,2015),('2015-10-17',201541,10,2015,17,41,201510,2015),('2015-10-18',201542,10,2015,18,42,201510,2015),('2015-10-19',201542,10,2015,19,42,201510,2015),('2015-10-20',201542,10,2015,20,42,201510,2015),('2015-10-21',201542,10,2015,21,42,201510,2015),('2015-10-22',201542,10,2015,22,42,201510,2015),('2015-10-23',201542,10,2015,23,42,201510,2015),('2015-10-24',201542,10,2015,24,42,201510,2015),('2015-10-25',201543,10,2015,25,43,201510,2015),('2015-10-26',201543,10,2015,26,43,201510,2015),('2015-10-27',201543,10,2015,27,43,201510,2015),('2015-10-28',201543,10,2015,28,43,201510,2015),('2015-10-29',201543,10,2015,29,43,201510,2015),('2015-10-30',201543,10,2015,30,43,201510,2015),('2015-10-31',201543,10,2015,31,43,201510,2015),('2015-11-01',201544,11,2015,1,44,201511,2015),('2015-11-02',201544,11,2015,2,44,201511,2015),('2015-11-03',201544,11,2015,3,44,201511,2015),('2015-11-04',201544,11,2015,4,44,201511,2015),('2015-11-05',201544,11,2015,5,44,201511,2015),('2015-11-06',201544,11,2015,6,44,201511,2015),('2015-11-07',201544,11,2015,7,44,201511,2015),('2015-11-08',201545,11,2015,8,45,201511,2015),('2015-11-09',201545,11,2015,9,45,201511,2015),('2015-11-10',201545,11,2015,10,45,201511,2015),('2015-11-11',201545,11,2015,11,45,201511,2015),('2015-11-12',201545,11,2015,12,45,201511,2015),('2015-11-13',201545,11,2015,13,45,201511,2015),('2015-11-14',201545,11,2015,14,45,201511,2015),('2015-11-15',201546,11,2015,15,46,201511,2015),('2015-11-16',201546,11,2015,16,46,201511,2015),('2015-11-17',201546,11,2015,17,46,201511,2015),('2015-11-18',201546,11,2015,18,46,201511,2015),('2015-11-19',201546,11,2015,19,46,201511,2015),('2015-11-20',201546,11,2015,20,46,201511,2015),('2015-11-21',201546,11,2015,21,46,201511,2015),('2015-11-22',201547,11,2015,22,47,201511,2015),('2015-11-23',201547,11,2015,23,47,201511,2015),('2015-11-24',201547,11,2015,24,47,201511,2015),('2015-11-25',201547,11,2015,25,47,201511,2015),('2015-11-26',201547,11,2015,26,47,201511,2015),('2015-11-27',201547,11,2015,27,47,201511,2015),('2015-11-28',201547,11,2015,28,47,201511,2015),('2015-11-29',201548,11,2015,29,48,201511,2015),('2015-11-30',201548,11,2015,30,48,201511,2015),('2015-12-01',201548,12,2015,1,48,201512,2016),('2015-12-02',201548,12,2015,2,48,201512,2016),('2015-12-03',201548,12,2015,3,48,201512,2016),('2015-12-04',201548,12,2015,4,48,201512,2016),('2015-12-05',201548,12,2015,5,48,201512,2016),('2015-12-06',201549,12,2015,6,49,201512,2016),('2015-12-07',201549,12,2015,7,49,201512,2016),('2015-12-08',201549,12,2015,8,49,201512,2016),('2015-12-09',201549,12,2015,9,49,201512,2016),('2015-12-10',201549,12,2015,10,49,201512,2016),('2015-12-11',201549,12,2015,11,49,201512,2016),('2015-12-12',201549,12,2015,12,49,201512,2016),('2015-12-13',201550,12,2015,13,50,201512,2016),('2015-12-14',201550,12,2015,14,50,201512,2016),('2015-12-15',201550,12,2015,15,50,201512,2016),('2015-12-16',201550,12,2015,16,50,201512,2016),('2015-12-17',201550,12,2015,17,50,201512,2016),('2015-12-18',201550,12,2015,18,50,201512,2016),('2015-12-19',201550,12,2015,19,50,201512,2016),('2015-12-20',201551,12,2015,20,51,201512,2016),('2015-12-21',201551,12,2015,21,51,201512,2016),('2015-12-22',201551,12,2015,22,51,201512,2016),('2015-12-23',201551,12,2015,23,51,201512,2016),('2015-12-24',201551,12,2015,24,51,201512,2016),('2015-12-25',201551,12,2015,25,51,201512,2016),('2015-12-26',201551,12,2015,26,51,201512,2016),('2015-12-27',201552,12,2015,27,52,201512,2016),('2015-12-28',201552,12,2015,28,52,201512,2016),('2015-12-29',201552,12,2015,29,52,201512,2016),('2015-12-30',201552,12,2015,30,52,201512,2016),('2015-12-31',201552,12,2015,31,52,201512,2016),('2016-01-01',201552,1,2016,1,1,201601,2016),('2016-01-02',201552,1,2016,2,1,201601,2016),('2016-01-03',201601,1,2016,3,1,201601,2016),('2016-01-04',201601,1,2016,4,1,201601,2016),('2016-01-05',201601,1,2016,5,1,201601,2016),('2016-01-06',201601,1,2016,6,1,201601,2016),('2016-01-07',201601,1,2016,7,1,201601,2016),('2016-01-08',201601,1,2016,8,1,201601,2016),('2016-01-09',201601,1,2016,9,1,201601,2016),('2016-01-10',201602,1,2016,10,2,201601,2016),('2016-01-11',201602,1,2016,11,2,201601,2016),('2016-01-12',201602,1,2016,12,2,201601,2016),('2016-01-13',201602,1,2016,13,2,201601,2016),('2016-01-14',201602,1,2016,14,2,201601,2016),('2016-01-15',201602,1,2016,15,2,201601,2016),('2016-01-16',201602,1,2016,16,2,201601,2016),('2016-01-17',201603,1,2016,17,3,201601,2016),('2016-01-18',201603,1,2016,18,3,201601,2016),('2016-01-19',201603,1,2016,19,3,201601,2016),('2016-01-20',201603,1,2016,20,3,201601,2016),('2016-01-21',201603,1,2016,21,3,201601,2016),('2016-01-22',201603,1,2016,22,3,201601,2016),('2016-01-23',201603,1,2016,23,3,201601,2016),('2016-01-24',201604,1,2016,24,4,201601,2016),('2016-01-25',201604,1,2016,25,4,201601,2016),('2016-01-26',201604,1,2016,26,4,201601,2016),('2016-01-27',201604,1,2016,27,4,201601,2016),('2016-01-28',201604,1,2016,28,4,201601,2016),('2016-01-29',201604,1,2016,29,4,201601,2016),('2016-01-30',201604,1,2016,30,4,201601,2016),('2016-01-31',201605,1,2016,31,5,201601,2016),('2016-02-01',201605,2,2016,1,5,201602,2016),('2016-02-02',201605,2,2016,2,5,201602,2016),('2016-02-03',201605,2,2016,3,5,201602,2016),('2016-02-04',201605,2,2016,4,5,201602,2016),('2016-02-05',201605,2,2016,5,5,201602,2016),('2016-02-06',201605,2,2016,6,5,201602,2016),('2016-02-07',201606,2,2016,7,6,201602,2016),('2016-02-08',201606,2,2016,8,6,201602,2016),('2016-02-09',201606,2,2016,9,6,201602,2016),('2016-02-10',201606,2,2016,10,6,201602,2016),('2016-02-11',201606,2,2016,11,6,201602,2016),('2016-02-12',201606,2,2016,12,6,201602,2016),('2016-02-13',201606,2,2016,13,6,201602,2016),('2016-02-14',201607,2,2016,14,7,201602,2016),('2016-02-15',201607,2,2016,15,7,201602,2016),('2016-02-16',201607,2,2016,16,7,201602,2016),('2016-02-17',201607,2,2016,17,7,201602,2016),('2016-02-18',201607,2,2016,18,7,201602,2016),('2016-02-19',201607,2,2016,19,7,201602,2016),('2016-02-20',201607,2,2016,20,7,201602,2016),('2016-02-21',201608,2,2016,21,8,201602,2016),('2016-02-22',201608,2,2016,22,8,201602,2016),('2016-02-23',201608,2,2016,23,8,201602,2016),('2016-02-24',201608,2,2016,24,8,201602,2016),('2016-02-25',201608,2,2016,25,8,201602,2016),('2016-02-26',201608,2,2016,26,8,201602,2016),('2016-02-27',201608,2,2016,27,8,201602,2016),('2016-02-28',201609,2,2016,28,9,201602,2016),('2016-02-29',201609,2,2016,29,9,201602,2016),('2016-03-01',201609,3,2016,1,9,201603,2016),('2016-03-02',201609,3,2016,2,9,201603,2016),('2016-03-03',201609,3,2016,3,9,201603,2016),('2016-03-04',201609,3,2016,4,9,201603,2016),('2016-03-05',201609,3,2016,5,9,201603,2016),('2016-03-06',201610,3,2016,6,10,201603,2016),('2016-03-07',201610,3,2016,7,10,201603,2016),('2016-03-08',201610,3,2016,8,10,201603,2016),('2016-03-09',201610,3,2016,9,10,201603,2016),('2016-03-10',201610,3,2016,10,10,201603,2016),('2016-03-11',201610,3,2016,11,10,201603,2016),('2016-03-12',201610,3,2016,12,10,201603,2016),('2016-03-13',201611,3,2016,13,11,201603,2016),('2016-03-14',201611,3,2016,14,11,201603,2016),('2016-03-15',201611,3,2016,15,11,201603,2016),('2016-03-16',201611,3,2016,16,11,201603,2016),('2016-03-17',201611,3,2016,17,11,201603,2016),('2016-03-18',201611,3,2016,18,11,201603,2016),('2016-03-19',201611,3,2016,19,11,201603,2016),('2016-03-20',201612,3,2016,20,12,201603,2016),('2016-03-21',201612,3,2016,21,12,201603,2016),('2016-03-22',201612,3,2016,22,12,201603,2016),('2016-03-23',201612,3,2016,23,12,201603,2016),('2016-03-24',201612,3,2016,24,12,201603,2016),('2016-03-25',201612,3,2016,25,12,201603,2016),('2016-03-26',201612,3,2016,26,12,201603,2016),('2016-03-27',201613,3,2016,27,13,201603,2016),('2016-03-28',201613,3,2016,28,13,201603,2016),('2016-03-29',201613,3,2016,29,13,201603,2016),('2016-03-30',201613,3,2016,30,13,201603,2016),('2016-03-31',201613,3,2016,31,13,201603,2016),('2016-04-01',201613,4,2016,1,13,201604,2016),('2016-04-02',201613,4,2016,2,13,201604,2016),('2016-04-03',201614,4,2016,3,14,201604,2016),('2016-04-04',201614,4,2016,4,14,201604,2016),('2016-04-05',201614,4,2016,5,14,201604,2016),('2016-04-06',201614,4,2016,6,14,201604,2016),('2016-04-07',201614,4,2016,7,14,201604,2016),('2016-04-08',201614,4,2016,8,14,201604,2016),('2016-04-09',201614,4,2016,9,14,201604,2016),('2016-04-10',201615,4,2016,10,15,201604,2016),('2016-04-11',201615,4,2016,11,15,201604,2016),('2016-04-12',201615,4,2016,12,15,201604,2016),('2016-04-13',201615,4,2016,13,15,201604,2016),('2016-04-14',201615,4,2016,14,15,201604,2016),('2016-04-15',201615,4,2016,15,15,201604,2016),('2016-04-16',201615,4,2016,16,15,201604,2016),('2016-04-17',201616,4,2016,17,16,201604,2016),('2016-04-18',201616,4,2016,18,16,201604,2016),('2016-04-19',201616,4,2016,19,16,201604,2016),('2016-04-20',201616,4,2016,20,16,201604,2016),('2016-04-21',201616,4,2016,21,16,201604,2016),('2016-04-22',201616,4,2016,22,16,201604,2016),('2016-04-23',201616,4,2016,23,16,201604,2016),('2016-04-24',201617,4,2016,24,17,201604,2016),('2016-04-25',201617,4,2016,25,17,201604,2016),('2016-04-26',201617,4,2016,26,17,201604,2016),('2016-04-27',201617,4,2016,27,17,201604,2016),('2016-04-28',201617,4,2016,28,17,201604,2016),('2016-04-29',201617,4,2016,29,17,201604,2016),('2016-04-30',201617,4,2016,30,17,201604,2016),('2016-05-01',201618,5,2016,1,18,201605,2016),('2016-05-02',201618,5,2016,2,18,201605,2016),('2016-05-03',201618,5,2016,3,18,201605,2016),('2016-05-04',201618,5,2016,4,18,201605,2016),('2016-05-05',201618,5,2016,5,18,201605,2016),('2016-05-06',201618,5,2016,6,18,201605,2016),('2016-05-07',201618,5,2016,7,18,201605,2016),('2016-05-08',201619,5,2016,8,19,201605,2016),('2016-05-09',201619,5,2016,9,19,201605,2016),('2016-05-10',201619,5,2016,10,19,201605,2016),('2016-05-11',201619,5,2016,11,19,201605,2016),('2016-05-12',201619,5,2016,12,19,201605,2016),('2016-05-13',201619,5,2016,13,19,201605,2016),('2016-05-14',201619,5,2016,14,19,201605,2016),('2016-05-15',201620,5,2016,15,20,201605,2016),('2016-05-16',201620,5,2016,16,20,201605,2016),('2016-05-17',201620,5,2016,17,20,201605,2016),('2016-05-18',201620,5,2016,18,20,201605,2016),('2016-05-19',201620,5,2016,19,20,201605,2016),('2016-05-20',201620,5,2016,20,20,201605,2016),('2016-05-21',201620,5,2016,21,20,201605,2016),('2016-05-22',201621,5,2016,22,21,201605,2016),('2016-05-23',201621,5,2016,23,21,201605,2016),('2016-05-24',201621,5,2016,24,21,201605,2016),('2016-05-25',201621,5,2016,25,21,201605,2016),('2016-05-26',201621,5,2016,26,21,201605,2016),('2016-05-27',201621,5,2016,27,21,201605,2016),('2016-05-28',201621,5,2016,28,21,201605,2016),('2016-05-29',201622,5,2016,29,22,201605,2016),('2016-05-30',201622,5,2016,30,22,201605,2016),('2016-05-31',201622,5,2016,31,22,201605,2016),('2016-06-01',201622,6,2016,1,22,201606,2016),('2016-06-02',201622,6,2016,2,22,201606,2016),('2016-06-03',201622,6,2016,3,22,201606,2016),('2016-06-04',201622,6,2016,4,22,201606,2016),('2016-06-05',201623,6,2016,5,23,201606,2016),('2016-06-06',201623,6,2016,6,23,201606,2016),('2016-06-07',201623,6,2016,7,23,201606,2016),('2016-06-08',201623,6,2016,8,23,201606,2016),('2016-06-09',201623,6,2016,9,23,201606,2016),('2016-06-10',201623,6,2016,10,23,201606,2016),('2016-06-11',201623,6,2016,11,23,201606,2016),('2016-06-12',201624,6,2016,12,24,201606,2016),('2016-06-13',201624,6,2016,13,24,201606,2016),('2016-06-14',201624,6,2016,14,24,201606,2016),('2016-06-15',201624,6,2016,15,24,201606,2016),('2016-06-16',201624,6,2016,16,24,201606,2016),('2016-06-17',201624,6,2016,17,24,201606,2016),('2016-06-18',201624,6,2016,18,24,201606,2016),('2016-06-19',201625,6,2016,19,25,201606,2016),('2016-06-20',201625,6,2016,20,25,201606,2016),('2016-06-21',201625,6,2016,21,25,201606,2016),('2016-06-22',201625,6,2016,22,25,201606,2016),('2016-06-23',201625,6,2016,23,25,201606,2016),('2016-06-24',201625,6,2016,24,25,201606,2016),('2016-06-25',201625,6,2016,25,25,201606,2016),('2016-06-26',201626,6,2016,26,26,201606,2016),('2016-06-27',201626,6,2016,27,26,201606,2016),('2016-06-28',201626,6,2016,28,26,201606,2016),('2016-06-29',201626,6,2016,29,26,201606,2016),('2016-06-30',201626,6,2016,30,26,201606,2016),('2016-07-01',201626,7,2016,1,26,201607,2016),('2016-07-02',201626,7,2016,2,26,201607,2016),('2016-07-03',201627,7,2016,3,27,201607,2016),('2016-07-04',201627,7,2016,4,27,201607,2016),('2016-07-05',201627,7,2016,5,27,201607,2016),('2016-07-06',201627,7,2016,6,27,201607,2016),('2016-07-07',201627,7,2016,7,27,201607,2016),('2016-07-08',201627,7,2016,8,27,201607,2016),('2016-07-09',201627,7,2016,9,27,201607,2016),('2016-07-10',201628,7,2016,10,28,201607,2016),('2016-07-11',201628,7,2016,11,28,201607,2016),('2016-07-12',201628,7,2016,12,28,201607,2016),('2016-07-13',201628,7,2016,13,28,201607,2016),('2016-07-14',201628,7,2016,14,28,201607,2016),('2016-07-15',201628,7,2016,15,28,201607,2016),('2016-07-16',201628,7,2016,16,28,201607,2016),('2016-07-17',201629,7,2016,17,29,201607,2016),('2016-07-18',201629,7,2016,18,29,201607,2016),('2016-07-19',201629,7,2016,19,29,201607,2016),('2016-07-20',201629,7,2016,20,29,201607,2016),('2016-07-21',201629,7,2016,21,29,201607,2016),('2016-07-22',201629,7,2016,22,29,201607,2016),('2016-07-23',201629,7,2016,23,29,201607,2016),('2016-07-24',201630,7,2016,24,30,201607,2016),('2016-07-25',201630,7,2016,25,30,201607,2016),('2016-07-26',201630,7,2016,26,30,201607,2016),('2016-07-27',201630,7,2016,27,30,201607,2016),('2016-07-28',201630,7,2016,28,30,201607,2016),('2016-07-29',201630,7,2016,29,30,201607,2016),('2016-07-30',201630,7,2016,30,30,201607,2016),('2016-07-31',201631,7,2016,31,31,201607,2016),('2016-08-01',201631,8,2016,1,31,201608,2016),('2016-08-02',201631,8,2016,2,31,201608,2016),('2016-08-03',201631,8,2016,3,31,201608,2016),('2016-08-04',201631,8,2016,4,31,201608,2016),('2016-08-05',201631,8,2016,5,31,201608,2016),('2016-08-06',201631,8,2016,6,31,201608,2016),('2016-08-07',201632,8,2016,7,32,201608,2016),('2016-08-08',201632,8,2016,8,32,201608,2016),('2016-08-09',201632,8,2016,9,32,201608,2016),('2016-08-10',201632,8,2016,10,32,201608,2016),('2016-08-11',201632,8,2016,11,32,201608,2016),('2016-08-12',201632,8,2016,12,32,201608,2016),('2016-08-13',201632,8,2016,13,32,201608,2016),('2016-08-14',201633,8,2016,14,33,201608,2016),('2016-08-15',201633,8,2016,15,33,201608,2016),('2016-08-16',201633,8,2016,16,33,201608,2016),('2016-08-17',201633,8,2016,17,33,201608,2016),('2016-08-18',201633,8,2016,18,33,201608,2016),('2016-08-19',201633,8,2016,19,33,201608,2016),('2016-08-20',201633,8,2016,20,33,201608,2016),('2016-08-21',201634,8,2016,21,34,201608,2016),('2016-08-22',201634,8,2016,22,34,201608,2016),('2016-08-23',201634,8,2016,23,34,201608,2016),('2016-08-24',201634,8,2016,24,34,201608,2016),('2016-08-25',201634,8,2016,25,34,201608,2016),('2016-08-26',201634,8,2016,26,34,201608,2016),('2016-08-27',201634,8,2016,27,34,201608,2016),('2016-08-28',201635,8,2016,28,35,201608,2016),('2016-08-29',201635,8,2016,29,35,201608,2016),('2016-08-30',201635,8,2016,30,35,201608,2016),('2016-08-31',201635,8,2016,31,35,201608,2016),('2016-09-01',201635,9,2016,1,35,201609,2016),('2016-09-02',201635,9,2016,2,35,201609,2016),('2016-09-03',201635,9,2016,3,35,201609,2016),('2016-09-04',201636,9,2016,4,36,201609,2016),('2016-09-05',201636,9,2016,5,36,201609,2016),('2016-09-06',201636,9,2016,6,36,201609,2016),('2016-09-07',201636,9,2016,7,36,201609,2016),('2016-09-08',201636,9,2016,8,36,201609,2016),('2016-09-09',201636,9,2016,9,36,201609,2016),('2016-09-10',201636,9,2016,10,36,201609,2016),('2016-09-11',201637,9,2016,11,37,201609,2016),('2016-09-12',201637,9,2016,12,37,201609,2016),('2016-09-13',201637,9,2016,13,37,201609,2016),('2016-09-14',201637,9,2016,14,37,201609,2016),('2016-09-15',201637,9,2016,15,37,201609,2016),('2016-09-16',201637,9,2016,16,37,201609,2016),('2016-09-17',201637,9,2016,17,37,201609,2016),('2016-09-18',201638,9,2016,18,38,201609,2016),('2016-09-19',201638,9,2016,19,38,201609,2016),('2016-09-20',201638,9,2016,20,38,201609,2016),('2016-09-21',201638,9,2016,21,38,201609,2016),('2016-09-22',201638,9,2016,22,38,201609,2016),('2016-09-23',201638,9,2016,23,38,201609,2016),('2016-09-24',201638,9,2016,24,38,201609,2016),('2016-09-25',201639,9,2016,25,39,201609,2016),('2016-09-26',201639,9,2016,26,39,201609,2016),('2016-09-27',201639,9,2016,27,39,201609,2016),('2016-09-28',201639,9,2016,28,39,201609,2016),('2016-09-29',201639,9,2016,29,39,201609,2016),('2016-09-30',201639,9,2016,30,39,201609,2016),('2016-10-01',201639,10,2016,1,39,201610,2016),('2016-10-02',201640,10,2016,2,40,201610,2016),('2016-10-03',201640,10,2016,3,40,201610,2016),('2016-10-04',201640,10,2016,4,40,201610,2016),('2016-10-05',201640,10,2016,5,40,201610,2016),('2016-10-06',201640,10,2016,6,40,201610,2016),('2016-10-07',201640,10,2016,7,40,201610,2016),('2016-10-08',201640,10,2016,8,40,201610,2016),('2016-10-09',201641,10,2016,9,41,201610,2016),('2016-10-10',201641,10,2016,10,41,201610,2016),('2016-10-11',201641,10,2016,11,41,201610,2016),('2016-10-12',201641,10,2016,12,41,201610,2016),('2016-10-13',201641,10,2016,13,41,201610,2016),('2016-10-14',201641,10,2016,14,41,201610,2016),('2016-10-15',201641,10,2016,15,41,201610,2016),('2016-10-16',201642,10,2016,16,42,201610,2016),('2016-10-17',201642,10,2016,17,42,201610,2016),('2016-10-18',201642,10,2016,18,42,201610,2016),('2016-10-19',201642,10,2016,19,42,201610,2016),('2016-10-20',201642,10,2016,20,42,201610,2016),('2016-10-21',201642,10,2016,21,42,201610,2016),('2016-10-22',201642,10,2016,22,42,201610,2016),('2016-10-23',201643,10,2016,23,43,201610,2016),('2016-10-24',201643,10,2016,24,43,201610,2016),('2016-10-25',201643,10,2016,25,43,201610,2016),('2016-10-26',201643,10,2016,26,43,201610,2016),('2016-10-27',201643,10,2016,27,43,201610,2016),('2016-10-28',201643,10,2016,28,43,201610,2016),('2016-10-29',201643,10,2016,29,43,201610,2016),('2016-10-30',201644,10,2016,30,44,201610,2016),('2016-10-31',201644,10,2016,31,44,201610,2016),('2016-11-01',201644,11,2016,1,44,201611,2016),('2016-11-02',201644,11,2016,2,44,201611,2016),('2016-11-03',201644,11,2016,3,44,201611,2016),('2016-11-04',201644,11,2016,4,44,201611,2016),('2016-11-05',201644,11,2016,5,44,201611,2016),('2016-11-06',201645,11,2016,6,45,201611,2016),('2016-11-07',201645,11,2016,7,45,201611,2016),('2016-11-08',201645,11,2016,8,45,201611,2016),('2016-11-09',201645,11,2016,9,45,201611,2016),('2016-11-10',201645,11,2016,10,45,201611,2016),('2016-11-11',201645,11,2016,11,45,201611,2016),('2016-11-12',201645,11,2016,12,45,201611,2016),('2016-11-13',201646,11,2016,13,46,201611,2016),('2016-11-14',201646,11,2016,14,46,201611,2016),('2016-11-15',201646,11,2016,15,46,201611,2016),('2016-11-16',201646,11,2016,16,46,201611,2016),('2016-11-17',201646,11,2016,17,46,201611,2016),('2016-11-18',201646,11,2016,18,46,201611,2016),('2016-11-19',201646,11,2016,19,46,201611,2016),('2016-11-20',201647,11,2016,20,47,201611,2016),('2016-11-21',201647,11,2016,21,47,201611,2016),('2016-11-22',201647,11,2016,22,47,201611,2016),('2016-11-23',201647,11,2016,23,47,201611,2016),('2016-11-24',201647,11,2016,24,47,201611,2016),('2016-11-25',201647,11,2016,25,47,201611,2016),('2016-11-26',201647,11,2016,26,47,201611,2016),('2016-11-27',201648,11,2016,27,48,201611,2016),('2016-11-28',201648,11,2016,28,48,201611,2016),('2016-11-29',201648,11,2016,29,48,201611,2016),('2016-11-30',201648,11,2016,30,48,201611,2016),('2016-12-01',201648,12,2016,1,48,201612,2017),('2016-12-02',201648,12,2016,2,48,201612,2017),('2016-12-03',201648,12,2016,3,48,201612,2017),('2016-12-04',201649,12,2016,4,49,201612,2017),('2016-12-05',201649,12,2016,5,49,201612,2017),('2016-12-06',201649,12,2016,6,49,201612,2017),('2016-12-07',201649,12,2016,7,49,201612,2017),('2016-12-08',201649,12,2016,8,49,201612,2017),('2016-12-09',201649,12,2016,9,49,201612,2017),('2016-12-10',201649,12,2016,10,49,201612,2017),('2016-12-11',201650,12,2016,11,50,201612,2017),('2016-12-12',201650,12,2016,12,50,201612,2017),('2016-12-13',201650,12,2016,13,50,201612,2017),('2016-12-14',201650,12,2016,14,50,201612,2017),('2016-12-15',201650,12,2016,15,50,201612,2017),('2016-12-16',201650,12,2016,16,50,201612,2017),('2016-12-17',201650,12,2016,17,50,201612,2017),('2016-12-18',201651,12,2016,18,51,201612,2017),('2016-12-19',201651,12,2016,19,51,201612,2017),('2016-12-20',201651,12,2016,20,51,201612,2017),('2016-12-21',201651,12,2016,21,51,201612,2017),('2016-12-22',201651,12,2016,22,51,201612,2017),('2016-12-23',201651,12,2016,23,51,201612,2017),('2016-12-24',201651,12,2016,24,51,201612,2017),('2016-12-25',201652,12,2016,25,52,201612,2017),('2016-12-26',201652,12,2016,26,52,201612,2017),('2016-12-27',201652,12,2016,27,52,201612,2017),('2016-12-28',201652,12,2016,28,52,201612,2017),('2016-12-29',201652,12,2016,29,52,201612,2017),('2016-12-30',201652,12,2016,30,52,201612,2017),('2016-12-31',201652,12,2016,31,52,201612,2017),('2017-01-01',201701,1,2017,1,1,201701,2017),('2017-01-02',201701,1,2017,2,1,201701,2017),('2017-01-03',201701,1,2017,3,1,201701,2017),('2017-01-04',201701,1,2017,4,1,201701,2017),('2017-01-05',201701,1,2017,5,1,201701,2017),('2017-01-06',201701,1,2017,6,1,201701,2017),('2017-01-07',201701,1,2017,7,1,201701,2017),('2017-01-08',201702,1,2017,8,2,201701,2017),('2017-01-09',201702,1,2017,9,2,201701,2017),('2017-01-10',201702,1,2017,10,2,201701,2017),('2017-01-11',201702,1,2017,11,2,201701,2017),('2017-01-12',201702,1,2017,12,2,201701,2017),('2017-01-13',201702,1,2017,13,2,201701,2017),('2017-01-14',201702,1,2017,14,2,201701,2017),('2017-01-15',201703,1,2017,15,3,201701,2017),('2017-01-16',201703,1,2017,16,3,201701,2017),('2017-01-17',201703,1,2017,17,3,201701,2017),('2017-01-18',201703,1,2017,18,3,201701,2017),('2017-01-19',201703,1,2017,19,3,201701,2017),('2017-01-20',201703,1,2017,20,3,201701,2017),('2017-01-21',201703,1,2017,21,3,201701,2017),('2017-01-22',201704,1,2017,22,4,201701,2017),('2017-01-23',201704,1,2017,23,4,201701,2017),('2017-01-24',201704,1,2017,24,4,201701,2017),('2017-01-25',201704,1,2017,25,4,201701,2017),('2017-01-26',201704,1,2017,26,4,201701,2017),('2017-01-27',201704,1,2017,27,4,201701,2017),('2017-01-28',201704,1,2017,28,4,201701,2017),('2017-01-29',201705,1,2017,29,5,201701,2017),('2017-01-30',201705,1,2017,30,5,201701,2017),('2017-01-31',201705,1,2017,31,5,201701,2017),('2017-02-01',201705,2,2017,1,5,201702,2017),('2017-02-02',201705,2,2017,2,5,201702,2017),('2017-02-03',201705,2,2017,3,5,201702,2017),('2017-02-04',201705,2,2017,4,5,201702,2017),('2017-02-05',201706,2,2017,5,6,201702,2017),('2017-02-06',201706,2,2017,6,6,201702,2017),('2017-02-07',201706,2,2017,7,6,201702,2017),('2017-02-08',201706,2,2017,8,6,201702,2017),('2017-02-09',201706,2,2017,9,6,201702,2017),('2017-02-10',201706,2,2017,10,6,201702,2017),('2017-02-11',201706,2,2017,11,6,201702,2017),('2017-02-12',201707,2,2017,12,7,201702,2017),('2017-02-13',201707,2,2017,13,7,201702,2017),('2017-02-14',201707,2,2017,14,7,201702,2017),('2017-02-15',201707,2,2017,15,7,201702,2017),('2017-02-16',201707,2,2017,16,7,201702,2017),('2017-02-17',201707,2,2017,17,7,201702,2017),('2017-02-18',201707,2,2017,18,7,201702,2017),('2017-02-19',201708,2,2017,19,8,201702,2017),('2017-02-20',201708,2,2017,20,8,201702,2017),('2017-02-21',201708,2,2017,21,8,201702,2017),('2017-02-22',201708,2,2017,22,8,201702,2017),('2017-02-23',201708,2,2017,23,8,201702,2017),('2017-02-24',201708,2,2017,24,8,201702,2017),('2017-02-25',201708,2,2017,25,8,201702,2017),('2017-02-26',201709,2,2017,26,9,201702,2017),('2017-02-27',201709,2,2017,27,9,201702,2017),('2017-02-28',201709,2,2017,28,9,201702,2017),('2017-03-01',201709,3,2017,1,9,201703,2017),('2017-03-02',201709,3,2017,2,9,201703,2017),('2017-03-03',201709,3,2017,3,9,201703,2017),('2017-03-04',201709,3,2017,4,9,201703,2017),('2017-03-05',201710,3,2017,5,10,201703,2017),('2017-03-06',201710,3,2017,6,10,201703,2017),('2017-03-07',201710,3,2017,7,10,201703,2017),('2017-03-08',201710,3,2017,8,10,201703,2017),('2017-03-09',201710,3,2017,9,10,201703,2017),('2017-03-10',201710,3,2017,10,10,201703,2017),('2017-03-11',201710,3,2017,11,10,201703,2017),('2017-03-12',201711,3,2017,12,11,201703,2017),('2017-03-13',201711,3,2017,13,11,201703,2017),('2017-03-14',201711,3,2017,14,11,201703,2017),('2017-03-15',201711,3,2017,15,11,201703,2017),('2017-03-16',201711,3,2017,16,11,201703,2017),('2017-03-17',201711,3,2017,17,11,201703,2017),('2017-03-18',201711,3,2017,18,11,201703,2017),('2017-03-19',201712,3,2017,19,12,201703,2017),('2017-03-20',201712,3,2017,20,12,201703,2017),('2017-03-21',201712,3,2017,21,12,201703,2017),('2017-03-22',201712,3,2017,22,12,201703,2017),('2017-03-23',201712,3,2017,23,12,201703,2017),('2017-03-24',201712,3,2017,24,12,201703,2017),('2017-03-25',201712,3,2017,25,12,201703,2017),('2017-03-26',201713,3,2017,26,13,201703,2017),('2017-03-27',201713,3,2017,27,13,201703,2017),('2017-03-28',201713,3,2017,28,13,201703,2017),('2017-03-29',201713,3,2017,29,13,201703,2017),('2017-03-30',201713,3,2017,30,13,201703,2017),('2017-03-31',201713,3,2017,31,13,201703,2017),('2017-04-01',201713,4,2017,1,13,201704,2017),('2017-04-02',201714,4,2017,2,14,201704,2017),('2017-04-03',201714,4,2017,3,14,201704,2017),('2017-04-04',201714,4,2017,4,14,201704,2017),('2017-04-05',201714,4,2017,5,14,201704,2017),('2017-04-06',201714,4,2017,6,14,201704,2017),('2017-04-07',201714,4,2017,7,14,201704,2017),('2017-04-08',201714,4,2017,8,14,201704,2017),('2017-04-09',201715,4,2017,9,15,201704,2017),('2017-04-10',201715,4,2017,10,15,201704,2017),('2017-04-11',201715,4,2017,11,15,201704,2017),('2017-04-12',201715,4,2017,12,15,201704,2017),('2017-04-13',201715,4,2017,13,15,201704,2017),('2017-04-14',201715,4,2017,14,15,201704,2017),('2017-04-15',201715,4,2017,15,15,201704,2017),('2017-04-16',201716,4,2017,16,16,201704,2017),('2017-04-17',201716,4,2017,17,16,201704,2017),('2017-04-18',201716,4,2017,18,16,201704,2017),('2017-04-19',201716,4,2017,19,16,201704,2017),('2017-04-20',201716,4,2017,20,16,201704,2017),('2017-04-21',201716,4,2017,21,16,201704,2017),('2017-04-22',201716,4,2017,22,16,201704,2017),('2017-04-23',201717,4,2017,23,17,201704,2017),('2017-04-24',201717,4,2017,24,17,201704,2017),('2017-04-25',201717,4,2017,25,17,201704,2017),('2017-04-26',201717,4,2017,26,17,201704,2017),('2017-04-27',201717,4,2017,27,17,201704,2017),('2017-04-28',201717,4,2017,28,17,201704,2017),('2017-04-29',201717,4,2017,29,17,201704,2017),('2017-04-30',201718,4,2017,30,18,201704,2017),('2017-05-01',201718,5,2017,1,18,201705,2017),('2017-05-02',201718,5,2017,2,18,201705,2017),('2017-05-03',201718,5,2017,3,18,201705,2017),('2017-05-04',201718,5,2017,4,18,201705,2017),('2017-05-05',201718,5,2017,5,18,201705,2017),('2017-05-06',201718,5,2017,6,18,201705,2017),('2017-05-07',201719,5,2017,7,19,201705,2017),('2017-05-08',201719,5,2017,8,19,201705,2017),('2017-05-09',201719,5,2017,9,19,201705,2017),('2017-05-10',201719,5,2017,10,19,201705,2017),('2017-05-11',201719,5,2017,11,19,201705,2017),('2017-05-12',201719,5,2017,12,19,201705,2017),('2017-05-13',201719,5,2017,13,19,201705,2017),('2017-05-14',201720,5,2017,14,20,201705,2017),('2017-05-15',201720,5,2017,15,20,201705,2017),('2017-05-16',201720,5,2017,16,20,201705,2017),('2017-05-17',201720,5,2017,17,20,201705,2017),('2017-05-18',201720,5,2017,18,20,201705,2017),('2017-05-19',201720,5,2017,19,20,201705,2017),('2017-05-20',201720,5,2017,20,20,201705,2017),('2017-05-21',201721,5,2017,21,21,201705,2017),('2017-05-22',201721,5,2017,22,21,201705,2017),('2017-05-23',201721,5,2017,23,21,201705,2017),('2017-05-24',201721,5,2017,24,21,201705,2017),('2017-05-25',201721,5,2017,25,21,201705,2017),('2017-05-26',201721,5,2017,26,21,201705,2017),('2017-05-27',201721,5,2017,27,21,201705,2017),('2017-05-28',201722,5,2017,28,22,201705,2017),('2017-05-29',201722,5,2017,29,22,201705,2017),('2017-05-30',201722,5,2017,30,22,201705,2017),('2017-05-31',201722,5,2017,31,22,201705,2017),('2017-06-01',201722,6,2017,1,22,201706,2017),('2017-06-02',201722,6,2017,2,22,201706,2017),('2017-06-03',201722,6,2017,3,22,201706,2017),('2017-06-04',201723,6,2017,4,23,201706,2017),('2017-06-05',201723,6,2017,5,23,201706,2017),('2017-06-06',201723,6,2017,6,23,201706,2017),('2017-06-07',201723,6,2017,7,23,201706,2017),('2017-06-08',201723,6,2017,8,23,201706,2017),('2017-06-09',201723,6,2017,9,23,201706,2017),('2017-06-10',201723,6,2017,10,23,201706,2017),('2017-06-11',201724,6,2017,11,24,201706,2017),('2017-06-12',201724,6,2017,12,24,201706,2017),('2017-06-13',201724,6,2017,13,24,201706,2017),('2017-06-14',201724,6,2017,14,24,201706,2017),('2017-06-15',201724,6,2017,15,24,201706,2017),('2017-06-16',201724,6,2017,16,24,201706,2017),('2017-06-17',201724,6,2017,17,24,201706,2017),('2017-06-18',201725,6,2017,18,25,201706,2017),('2017-06-19',201725,6,2017,19,25,201706,2017),('2017-06-20',201725,6,2017,20,25,201706,2017),('2017-06-21',201725,6,2017,21,25,201706,2017),('2017-06-22',201725,6,2017,22,25,201706,2017),('2017-06-23',201725,6,2017,23,25,201706,2017),('2017-06-24',201725,6,2017,24,25,201706,2017),('2017-06-25',201726,6,2017,25,26,201706,2017),('2017-06-26',201726,6,2017,26,26,201706,2017),('2017-06-27',201726,6,2017,27,26,201706,2017),('2017-06-28',201726,6,2017,28,26,201706,2017),('2017-06-29',201726,6,2017,29,26,201706,2017),('2017-06-30',201726,6,2017,30,26,201706,2017),('2017-07-01',201726,7,2017,1,26,201707,2017),('2017-07-02',201727,7,2017,2,27,201707,2017),('2017-07-03',201727,7,2017,3,27,201707,2017),('2017-07-04',201727,7,2017,4,27,201707,2017),('2017-07-05',201727,7,2017,5,27,201707,2017),('2017-07-06',201727,7,2017,6,27,201707,2017),('2017-07-07',201727,7,2017,7,27,201707,2017),('2017-07-08',201727,7,2017,8,27,201707,2017),('2017-07-09',201728,7,2017,9,28,201707,2017),('2017-07-10',201728,7,2017,10,28,201707,2017),('2017-07-11',201728,7,2017,11,28,201707,2017),('2017-07-12',201728,7,2017,12,28,201707,2017),('2017-07-13',201728,7,2017,13,28,201707,2017),('2017-07-14',201728,7,2017,14,28,201707,2017),('2017-07-15',201728,7,2017,15,28,201707,2017),('2017-07-16',201729,7,2017,16,29,201707,2017),('2017-07-17',201729,7,2017,17,29,201707,2017),('2017-07-18',201729,7,2017,18,29,201707,2017),('2017-07-19',201729,7,2017,19,29,201707,2017),('2017-07-20',201729,7,2017,20,29,201707,2017),('2017-07-21',201729,7,2017,21,29,201707,2017),('2017-07-22',201729,7,2017,22,29,201707,2017),('2017-07-23',201730,7,2017,23,30,201707,2017),('2017-07-24',201730,7,2017,24,30,201707,2017),('2017-07-25',201730,7,2017,25,30,201707,2017),('2017-07-26',201730,7,2017,26,30,201707,2017),('2017-07-27',201730,7,2017,27,30,201707,2017),('2017-07-28',201730,7,2017,28,30,201707,2017),('2017-07-29',201730,7,2017,29,30,201707,2017),('2017-07-30',201731,7,2017,30,31,201707,2017),('2017-07-31',201731,7,2017,31,31,201707,2017),('2017-08-01',201731,8,2017,1,31,201708,2017),('2017-08-02',201731,8,2017,2,31,201708,2017),('2017-08-03',201731,8,2017,3,31,201708,2017),('2017-08-04',201731,8,2017,4,31,201708,2017),('2017-08-05',201731,8,2017,5,31,201708,2017),('2017-08-06',201732,8,2017,6,32,201708,2017),('2017-08-07',201732,8,2017,7,32,201708,2017),('2017-08-08',201732,8,2017,8,32,201708,2017),('2017-08-09',201732,8,2017,9,32,201708,2017),('2017-08-10',201732,8,2017,10,32,201708,2017),('2017-08-11',201732,8,2017,11,32,201708,2017),('2017-08-12',201732,8,2017,12,32,201708,2017),('2017-08-13',201733,8,2017,13,33,201708,2017),('2017-08-14',201733,8,2017,14,33,201708,2017),('2017-08-15',201733,8,2017,15,33,201708,2017),('2017-08-16',201733,8,2017,16,33,201708,2017),('2017-08-17',201733,8,2017,17,33,201708,2017),('2017-08-18',201733,8,2017,18,33,201708,2017),('2017-08-19',201733,8,2017,19,33,201708,2017),('2017-08-20',201734,8,2017,20,34,201708,2017),('2017-08-21',201734,8,2017,21,34,201708,2017),('2017-08-22',201734,8,2017,22,34,201708,2017),('2017-08-23',201734,8,2017,23,34,201708,2017),('2017-08-24',201734,8,2017,24,34,201708,2017),('2017-08-25',201734,8,2017,25,34,201708,2017),('2017-08-26',201734,8,2017,26,34,201708,2017),('2017-08-27',201735,8,2017,27,35,201708,2017),('2017-08-28',201735,8,2017,28,35,201708,2017),('2017-08-29',201735,8,2017,29,35,201708,2017),('2017-08-30',201735,8,2017,30,35,201708,2017),('2017-08-31',201735,8,2017,31,35,201708,2017),('2017-09-01',201735,9,2017,1,35,201709,2017),('2017-09-02',201735,9,2017,2,35,201709,2017),('2017-09-03',201736,9,2017,3,36,201709,2017),('2017-09-04',201736,9,2017,4,36,201709,2017),('2017-09-05',201736,9,2017,5,36,201709,2017),('2017-09-06',201736,9,2017,6,36,201709,2017),('2017-09-07',201736,9,2017,7,36,201709,2017),('2017-09-08',201736,9,2017,8,36,201709,2017),('2017-09-09',201736,9,2017,9,36,201709,2017),('2017-09-10',201737,9,2017,10,37,201709,2017),('2017-09-11',201737,9,2017,11,37,201709,2017),('2017-09-12',201737,9,2017,12,37,201709,2017),('2017-09-13',201737,9,2017,13,37,201709,2017),('2017-09-14',201737,9,2017,14,37,201709,2017),('2017-09-15',201737,9,2017,15,37,201709,2017),('2017-09-16',201737,9,2017,16,37,201709,2017),('2017-09-17',201738,9,2017,17,38,201709,2017),('2017-09-18',201738,9,2017,18,38,201709,2017),('2017-09-19',201738,9,2017,19,38,201709,2017),('2017-09-20',201738,9,2017,20,38,201709,2017),('2017-09-21',201738,9,2017,21,38,201709,2017),('2017-09-22',201738,9,2017,22,38,201709,2017),('2017-09-23',201738,9,2017,23,38,201709,2017),('2017-09-24',201739,9,2017,24,39,201709,2017),('2017-09-25',201739,9,2017,25,39,201709,2017),('2017-09-26',201739,9,2017,26,39,201709,2017),('2017-09-27',201739,9,2017,27,39,201709,2017),('2017-09-28',201739,9,2017,28,39,201709,2017),('2017-09-29',201739,9,2017,29,39,201709,2017),('2017-09-30',201739,9,2017,30,39,201709,2017),('2017-10-01',201740,10,2017,1,40,201710,2017),('2017-10-02',201740,10,2017,2,40,201710,2017),('2017-10-03',201740,10,2017,3,40,201710,2017),('2017-10-04',201740,10,2017,4,40,201710,2017),('2017-10-05',201740,10,2017,5,40,201710,2017),('2017-10-06',201740,10,2017,6,40,201710,2017),('2017-10-07',201740,10,2017,7,40,201710,2017),('2017-10-08',201741,10,2017,8,41,201710,2017),('2017-10-09',201741,10,2017,9,41,201710,2017),('2017-10-10',201741,10,2017,10,41,201710,2017),('2017-10-11',201741,10,2017,11,41,201710,2017),('2017-10-12',201741,10,2017,12,41,201710,2017),('2017-10-13',201741,10,2017,13,41,201710,2017),('2017-10-14',201741,10,2017,14,41,201710,2017),('2017-10-15',201742,10,2017,15,42,201710,2017),('2017-10-16',201742,10,2017,16,42,201710,2017),('2017-10-17',201742,10,2017,17,42,201710,2017),('2017-10-18',201742,10,2017,18,42,201710,2017),('2017-10-19',201742,10,2017,19,42,201710,2017),('2017-10-20',201742,10,2017,20,42,201710,2017),('2017-10-21',201742,10,2017,21,42,201710,2017),('2017-10-22',201743,10,2017,22,43,201710,2017),('2017-10-23',201743,10,2017,23,43,201710,2017),('2017-10-24',201743,10,2017,24,43,201710,2017),('2017-10-25',201743,10,2017,25,43,201710,2017),('2017-10-26',201743,10,2017,26,43,201710,2017),('2017-10-27',201743,10,2017,27,43,201710,2017),('2017-10-28',201743,10,2017,28,43,201710,2017),('2017-10-29',201744,10,2017,29,44,201710,2017),('2017-10-30',201744,10,2017,30,44,201710,2017),('2017-10-31',201744,10,2017,31,44,201710,2017),('2017-11-01',201744,11,2017,1,44,201711,2017),('2017-11-02',201744,11,2017,2,44,201711,2017),('2017-11-03',201744,11,2017,3,44,201711,2017),('2017-11-04',201744,11,2017,4,44,201711,2017),('2017-11-05',201745,11,2017,5,45,201711,2017),('2017-11-06',201745,11,2017,6,45,201711,2017),('2017-11-07',201745,11,2017,7,45,201711,2017),('2017-11-08',201745,11,2017,8,45,201711,2017),('2017-11-09',201745,11,2017,9,45,201711,2017),('2017-11-10',201745,11,2017,10,45,201711,2017),('2017-11-11',201745,11,2017,11,45,201711,2017),('2017-11-12',201746,11,2017,12,46,201711,2017),('2017-11-13',201746,11,2017,13,46,201711,2017),('2017-11-14',201746,11,2017,14,46,201711,2017),('2017-11-15',201746,11,2017,15,46,201711,2017),('2017-11-16',201746,11,2017,16,46,201711,2017),('2017-11-17',201746,11,2017,17,46,201711,2017),('2017-11-18',201746,11,2017,18,46,201711,2017),('2017-11-19',201747,11,2017,19,47,201711,2017),('2017-11-20',201747,11,2017,20,47,201711,2017),('2017-11-21',201747,11,2017,21,47,201711,2017),('2017-11-22',201747,11,2017,22,47,201711,2017),('2017-11-23',201747,11,2017,23,47,201711,2017),('2017-11-24',201747,11,2017,24,47,201711,2017),('2017-11-25',201747,11,2017,25,47,201711,2017),('2017-11-26',201748,11,2017,26,48,201711,2017),('2017-11-27',201748,11,2017,27,48,201711,2017),('2017-11-28',201748,11,2017,28,48,201711,2017),('2017-11-29',201748,11,2017,29,48,201711,2017),('2017-11-30',201748,11,2017,30,48,201711,2017),('2017-12-01',201748,12,2017,1,48,201712,2018),('2017-12-02',201748,12,2017,2,48,201712,2018),('2017-12-03',201749,12,2017,3,49,201712,2018),('2017-12-04',201749,12,2017,4,49,201712,2018),('2017-12-05',201749,12,2017,5,49,201712,2018),('2017-12-06',201749,12,2017,6,49,201712,2018),('2017-12-07',201749,12,2017,7,49,201712,2018),('2017-12-08',201749,12,2017,8,49,201712,2018),('2017-12-09',201749,12,2017,9,49,201712,2018),('2017-12-10',201750,12,2017,10,50,201712,2018),('2017-12-11',201750,12,2017,11,50,201712,2018),('2017-12-12',201750,12,2017,12,50,201712,2018),('2017-12-13',201750,12,2017,13,50,201712,2018),('2017-12-14',201750,12,2017,14,50,201712,2018),('2017-12-15',201750,12,2017,15,50,201712,2018),('2017-12-16',201750,12,2017,16,50,201712,2018),('2017-12-17',201751,12,2017,17,51,201712,2018),('2017-12-18',201751,12,2017,18,51,201712,2018),('2017-12-19',201751,12,2017,19,51,201712,2018),('2017-12-20',201751,12,2017,20,51,201712,2018),('2017-12-21',201751,12,2017,21,51,201712,2018),('2017-12-22',201751,12,2017,22,51,201712,2018),('2017-12-23',201751,12,2017,23,51,201712,2018),('2017-12-24',201752,12,2017,24,52,201712,2018),('2017-12-25',201752,12,2017,25,52,201712,2018),('2017-12-26',201752,12,2017,26,52,201712,2018),('2017-12-27',201752,12,2017,27,52,201712,2018),('2017-12-28',201752,12,2017,28,52,201712,2018),('2017-12-29',201752,12,2017,29,52,201712,2018),('2017-12-30',201752,12,2017,30,52,201712,2018),('2017-12-31',201801,12,2017,31,1,201712,2018),('2018-01-01',201801,1,2018,1,1,201801,2018),('2018-01-02',201801,1,2018,2,1,201801,2018),('2018-01-03',201801,1,2018,3,1,201801,2018),('2018-01-04',201801,1,2018,4,1,201801,2018),('2018-01-05',201801,1,2018,5,1,201801,2018),('2018-01-06',201801,1,2018,6,1,201801,2018),('2018-01-07',201802,1,2018,7,2,201801,2018),('2018-01-08',201802,1,2018,8,2,201801,2018),('2018-01-09',201802,1,2018,9,2,201801,2018),('2018-01-10',201802,1,2018,10,2,201801,2018),('2018-01-11',201802,1,2018,11,2,201801,2018),('2018-01-12',201802,1,2018,12,2,201801,2018),('2018-01-13',201802,1,2018,13,2,201801,2018),('2018-01-14',201803,1,2018,14,3,201801,2018),('2018-01-15',201803,1,2018,15,3,201801,2018),('2018-01-16',201803,1,2018,16,3,201801,2018),('2018-01-17',201803,1,2018,17,3,201801,2018),('2018-01-18',201803,1,2018,18,3,201801,2018),('2018-01-19',201803,1,2018,19,3,201801,2018),('2018-01-20',201803,1,2018,20,3,201801,2018),('2018-01-21',201804,1,2018,21,4,201801,2018),('2018-01-22',201804,1,2018,22,4,201801,2018),('2018-01-23',201804,1,2018,23,4,201801,2018),('2018-01-24',201804,1,2018,24,4,201801,2018),('2018-01-25',201804,1,2018,25,4,201801,2018),('2018-01-26',201804,1,2018,26,4,201801,2018),('2018-01-27',201804,1,2018,27,4,201801,2018),('2018-01-28',201805,1,2018,28,5,201801,2018),('2018-01-29',201805,1,2018,29,5,201801,2018),('2018-01-30',201805,1,2018,30,5,201801,2018),('2018-01-31',201805,1,2018,31,5,201801,2018),('2018-02-01',201805,2,2018,1,5,201802,2018),('2018-02-02',201805,2,2018,2,5,201802,2018),('2018-02-03',201805,2,2018,3,5,201802,2018),('2018-02-04',201806,2,2018,4,6,201802,2018),('2018-02-05',201806,2,2018,5,6,201802,2018),('2018-02-06',201806,2,2018,6,6,201802,2018),('2018-02-07',201806,2,2018,7,6,201802,2018),('2018-02-08',201806,2,2018,8,6,201802,2018),('2018-02-09',201806,2,2018,9,6,201802,2018),('2018-02-10',201806,2,2018,10,6,201802,2018),('2018-02-11',201807,2,2018,11,7,201802,2018),('2018-02-12',201807,2,2018,12,7,201802,2018),('2018-02-13',201807,2,2018,13,7,201802,2018),('2018-02-14',201807,2,2018,14,7,201802,2018),('2018-02-15',201807,2,2018,15,7,201802,2018),('2018-02-16',201807,2,2018,16,7,201802,2018),('2018-02-17',201807,2,2018,17,7,201802,2018),('2018-02-18',201808,2,2018,18,8,201802,2018),('2018-02-19',201808,2,2018,19,8,201802,2018),('2018-02-20',201808,2,2018,20,8,201802,2018),('2018-02-21',201808,2,2018,21,8,201802,2018),('2018-02-22',201808,2,2018,22,8,201802,2018),('2018-02-23',201808,2,2018,23,8,201802,2018),('2018-02-24',201808,2,2018,24,8,201802,2018),('2018-02-25',201809,2,2018,25,9,201802,2018),('2018-02-26',201809,2,2018,26,9,201802,2018),('2018-02-27',201809,2,2018,27,9,201802,2018),('2018-02-28',201809,2,2018,28,9,201802,2018),('2018-03-01',201809,3,2018,1,9,201803,2018),('2018-03-02',201809,3,2018,2,9,201803,2018),('2018-03-03',201809,3,2018,3,9,201803,2018),('2018-03-04',201810,3,2018,4,10,201803,2018),('2018-03-05',201810,3,2018,5,10,201803,2018),('2018-03-06',201810,3,2018,6,10,201803,2018),('2018-03-07',201810,3,2018,7,10,201803,2018),('2018-03-08',201810,3,2018,8,10,201803,2018),('2018-03-09',201810,3,2018,9,10,201803,2018),('2018-03-10',201810,3,2018,10,10,201803,2018),('2018-03-11',201811,3,2018,11,11,201803,2018),('2018-03-12',201811,3,2018,12,11,201803,2018),('2018-03-13',201811,3,2018,13,11,201803,2018),('2018-03-14',201811,3,2018,14,11,201803,2018),('2018-03-15',201811,3,2018,15,11,201803,2018),('2018-03-16',201811,3,2018,16,11,201803,2018),('2018-03-17',201811,3,2018,17,11,201803,2018),('2018-03-18',201812,3,2018,18,12,201803,2018),('2018-03-19',201812,3,2018,19,12,201803,2018),('2018-03-20',201812,3,2018,20,12,201803,2018),('2018-03-21',201812,3,2018,21,12,201803,2018),('2018-03-22',201812,3,2018,22,12,201803,2018),('2018-03-23',201812,3,2018,23,12,201803,2018),('2018-03-24',201812,3,2018,24,12,201803,2018),('2018-03-25',201813,3,2018,25,13,201803,2018),('2018-03-26',201813,3,2018,26,13,201803,2018),('2018-03-27',201813,3,2018,27,13,201803,2018),('2018-03-28',201813,3,2018,28,13,201803,2018),('2018-03-29',201813,3,2018,29,13,201803,2018),('2018-03-30',201813,3,2018,30,13,201803,2018),('2018-03-31',201813,3,2018,31,13,201803,2018),('2018-04-01',201814,4,2018,1,14,201804,2018),('2018-04-02',201814,4,2018,2,14,201804,2018),('2018-04-03',201814,4,2018,3,14,201804,2018),('2018-04-04',201814,4,2018,4,14,201804,2018),('2018-04-05',201814,4,2018,5,14,201804,2018),('2018-04-06',201814,4,2018,6,14,201804,2018),('2018-04-07',201814,4,2018,7,14,201804,2018),('2018-04-08',201815,4,2018,8,15,201804,2018),('2018-04-09',201815,4,2018,9,15,201804,2018),('2018-04-10',201815,4,2018,10,15,201804,2018),('2018-04-11',201815,4,2018,11,15,201804,2018),('2018-04-12',201815,4,2018,12,15,201804,2018),('2018-04-13',201815,4,2018,13,15,201804,2018),('2018-04-14',201815,4,2018,14,15,201804,2018),('2018-04-15',201816,4,2018,15,16,201804,2018),('2018-04-16',201816,4,2018,16,16,201804,2018),('2018-04-17',201816,4,2018,17,16,201804,2018),('2018-04-18',201816,4,2018,18,16,201804,2018),('2018-04-19',201816,4,2018,19,16,201804,2018),('2018-04-20',201816,4,2018,20,16,201804,2018),('2018-04-21',201816,4,2018,21,16,201804,2018),('2018-04-22',201817,4,2018,22,17,201804,2018),('2018-04-23',201817,4,2018,23,17,201804,2018),('2018-04-24',201817,4,2018,24,17,201804,2018),('2018-04-25',201817,4,2018,25,17,201804,2018),('2018-04-26',201817,4,2018,26,17,201804,2018),('2018-04-27',201817,4,2018,27,17,201804,2018),('2018-04-28',201817,4,2018,28,17,201804,2018),('2018-04-29',201818,4,2018,29,18,201804,2018),('2018-04-30',201818,4,2018,30,18,201804,2018),('2018-05-01',201818,5,2018,1,18,201805,2018),('2018-05-02',201818,5,2018,2,18,201805,2018),('2018-05-03',201818,5,2018,3,18,201805,2018),('2018-05-04',201818,5,2018,4,18,201805,2018),('2018-05-05',201818,5,2018,5,18,201805,2018),('2018-05-06',201819,5,2018,6,19,201805,2018),('2018-05-07',201819,5,2018,7,19,201805,2018),('2018-05-08',201819,5,2018,8,19,201805,2018),('2018-05-09',201819,5,2018,9,19,201805,2018),('2018-05-10',201819,5,2018,10,19,201805,2018),('2018-05-11',201819,5,2018,11,19,201805,2018),('2018-05-12',201819,5,2018,12,19,201805,2018),('2018-05-13',201820,5,2018,13,20,201805,2018),('2018-05-14',201820,5,2018,14,20,201805,2018),('2018-05-15',201820,5,2018,15,20,201805,2018),('2018-05-16',201820,5,2018,16,20,201805,2018),('2018-05-17',201820,5,2018,17,20,201805,2018),('2018-05-18',201820,5,2018,18,20,201805,2018),('2018-05-19',201820,5,2018,19,20,201805,2018),('2018-05-20',201821,5,2018,20,21,201805,2018),('2018-05-21',201821,5,2018,21,21,201805,2018),('2018-05-22',201821,5,2018,22,21,201805,2018),('2018-05-23',201821,5,2018,23,21,201805,2018),('2018-05-24',201821,5,2018,24,21,201805,2018),('2018-05-25',201821,5,2018,25,21,201805,2018),('2018-05-26',201821,5,2018,26,21,201805,2018),('2018-05-27',201822,5,2018,27,22,201805,2018),('2018-05-28',201822,5,2018,28,22,201805,2018),('2018-05-29',201822,5,2018,29,22,201805,2018),('2018-05-30',201822,5,2018,30,22,201805,2018),('2018-05-31',201822,5,2018,31,22,201805,2018),('2018-06-01',201822,6,2018,1,22,201806,2018),('2018-06-02',201822,6,2018,2,22,201806,2018),('2018-06-03',201823,6,2018,3,23,201806,2018),('2018-06-04',201823,6,2018,4,23,201806,2018),('2018-06-05',201823,6,2018,5,23,201806,2018),('2018-06-06',201823,6,2018,6,23,201806,2018),('2018-06-07',201823,6,2018,7,23,201806,2018),('2018-06-08',201823,6,2018,8,23,201806,2018),('2018-06-09',201823,6,2018,9,23,201806,2018),('2018-06-10',201824,6,2018,10,24,201806,2018),('2018-06-11',201824,6,2018,11,24,201806,2018),('2018-06-12',201824,6,2018,12,24,201806,2018),('2018-06-13',201824,6,2018,13,24,201806,2018),('2018-06-14',201824,6,2018,14,24,201806,2018),('2018-06-15',201824,6,2018,15,24,201806,2018),('2018-06-16',201824,6,2018,16,24,201806,2018),('2018-06-17',201825,6,2018,17,25,201806,2018),('2018-06-18',201825,6,2018,18,25,201806,2018),('2018-06-19',201825,6,2018,19,25,201806,2018),('2018-06-20',201825,6,2018,20,25,201806,2018),('2018-06-21',201825,6,2018,21,25,201806,2018),('2018-06-22',201825,6,2018,22,25,201806,2018),('2018-06-23',201825,6,2018,23,25,201806,2018),('2018-06-24',201826,6,2018,24,26,201806,2018),('2018-06-25',201826,6,2018,25,26,201806,2018),('2018-06-26',201826,6,2018,26,26,201806,2018),('2018-06-27',201826,6,2018,27,26,201806,2018),('2018-06-28',201826,6,2018,28,26,201806,2018),('2018-06-29',201826,6,2018,29,26,201806,2018),('2018-06-30',201826,6,2018,30,26,201806,2018),('2018-07-01',201827,7,2018,1,27,201807,2018),('2018-07-02',201827,7,2018,2,27,201807,2018),('2018-07-03',201827,7,2018,3,27,201807,2018),('2018-07-04',201827,7,2018,4,27,201807,2018),('2018-07-05',201827,7,2018,5,27,201807,2018),('2018-07-06',201827,7,2018,6,27,201807,2018),('2018-07-07',201827,7,2018,7,27,201807,2018),('2018-07-08',201828,7,2018,8,28,201807,2018),('2018-07-09',201828,7,2018,9,28,201807,2018),('2018-07-10',201828,7,2018,10,28,201807,2018),('2018-07-11',201828,7,2018,11,28,201807,2018),('2018-07-12',201828,7,2018,12,28,201807,2018),('2018-07-13',201828,7,2018,13,28,201807,2018),('2018-07-14',201828,7,2018,14,28,201807,2018),('2018-07-15',201829,7,2018,15,29,201807,2018),('2018-07-16',201829,7,2018,16,29,201807,2018),('2018-07-17',201829,7,2018,17,29,201807,2018),('2018-07-18',201829,7,2018,18,29,201807,2018),('2018-07-19',201829,7,2018,19,29,201807,2018),('2018-07-20',201829,7,2018,20,29,201807,2018),('2018-07-21',201829,7,2018,21,29,201807,2018),('2018-07-22',201830,7,2018,22,30,201807,2018),('2018-07-23',201830,7,2018,23,30,201807,2018),('2018-07-24',201830,7,2018,24,30,201807,2018),('2018-07-25',201830,7,2018,25,30,201807,2018),('2018-07-26',201830,7,2018,26,30,201807,2018),('2018-07-27',201830,7,2018,27,30,201807,2018),('2018-07-28',201830,7,2018,28,30,201807,2018),('2018-07-29',201831,7,2018,29,31,201807,2018),('2018-07-30',201831,7,2018,30,31,201807,2018),('2018-07-31',201831,7,2018,31,31,201807,2018),('2018-08-01',201831,8,2018,1,31,201808,2018),('2018-08-02',201831,8,2018,2,31,201808,2018),('2018-08-03',201831,8,2018,3,31,201808,2018),('2018-08-04',201831,8,2018,4,31,201808,2018),('2018-08-05',201832,8,2018,5,32,201808,2018),('2018-08-06',201832,8,2018,6,32,201808,2018),('2018-08-07',201832,8,2018,7,32,201808,2018),('2018-08-08',201832,8,2018,8,32,201808,2018),('2018-08-09',201832,8,2018,9,32,201808,2018),('2018-08-10',201832,8,2018,10,32,201808,2018),('2018-08-11',201832,8,2018,11,32,201808,2018),('2018-08-12',201833,8,2018,12,33,201808,2018),('2018-08-13',201833,8,2018,13,33,201808,2018),('2018-08-14',201833,8,2018,14,33,201808,2018),('2018-08-15',201833,8,2018,15,33,201808,2018),('2018-08-16',201833,8,2018,16,33,201808,2018),('2018-08-17',201833,8,2018,17,33,201808,2018),('2018-08-18',201833,8,2018,18,33,201808,2018),('2018-08-19',201834,8,2018,19,34,201808,2018),('2018-08-20',201834,8,2018,20,34,201808,2018),('2018-08-21',201834,8,2018,21,34,201808,2018),('2018-08-22',201834,8,2018,22,34,201808,2018),('2018-08-23',201834,8,2018,23,34,201808,2018),('2018-08-24',201834,8,2018,24,34,201808,2018),('2018-08-25',201834,8,2018,25,34,201808,2018),('2018-08-26',201835,8,2018,26,35,201808,2018),('2018-08-27',201835,8,2018,27,35,201808,2018),('2018-08-28',201835,8,2018,28,35,201808,2018),('2018-08-29',201835,8,2018,29,35,201808,2018),('2018-08-30',201835,8,2018,30,35,201808,2018),('2018-08-31',201835,8,2018,31,35,201808,2018),('2018-09-01',201835,9,2018,1,35,201809,2018),('2018-09-02',201836,9,2018,2,36,201809,2018),('2018-09-03',201836,9,2018,3,36,201809,2018),('2018-09-04',201836,9,2018,4,36,201809,2018),('2018-09-05',201836,9,2018,5,36,201809,2018),('2018-09-06',201836,9,2018,6,36,201809,2018),('2018-09-07',201836,9,2018,7,36,201809,2018),('2018-09-08',201836,9,2018,8,36,201809,2018),('2018-09-09',201837,9,2018,9,37,201809,2018),('2018-09-10',201837,9,2018,10,37,201809,2018),('2018-09-11',201837,9,2018,11,37,201809,2018),('2018-09-12',201837,9,2018,12,37,201809,2018),('2018-09-13',201837,9,2018,13,37,201809,2018),('2018-09-14',201837,9,2018,14,37,201809,2018),('2018-09-15',201837,9,2018,15,37,201809,2018),('2018-09-16',201838,9,2018,16,38,201809,2018),('2018-09-17',201838,9,2018,17,38,201809,2018),('2018-09-18',201838,9,2018,18,38,201809,2018),('2018-09-19',201838,9,2018,19,38,201809,2018),('2018-09-20',201838,9,2018,20,38,201809,2018),('2018-09-21',201838,9,2018,21,38,201809,2018),('2018-09-22',201838,9,2018,22,38,201809,2018),('2018-09-23',201839,9,2018,23,39,201809,2018),('2018-09-24',201839,9,2018,24,39,201809,2018),('2018-09-25',201839,9,2018,25,39,201809,2018),('2018-09-26',201839,9,2018,26,39,201809,2018),('2018-09-27',201839,9,2018,27,39,201809,2018),('2018-09-28',201839,9,2018,28,39,201809,2018),('2018-09-29',201839,9,2018,29,39,201809,2018),('2018-09-30',201840,9,2018,30,40,201809,2018),('2018-10-01',201840,10,2018,1,40,201810,2018),('2018-10-02',201840,10,2018,2,40,201810,2018),('2018-10-03',201840,10,2018,3,40,201810,2018),('2018-10-04',201840,10,2018,4,40,201810,2018),('2018-10-05',201840,10,2018,5,40,201810,2018),('2018-10-06',201840,10,2018,6,40,201810,2018),('2018-10-07',201841,10,2018,7,41,201810,2018),('2018-10-08',201841,10,2018,8,41,201810,2018),('2018-10-09',201841,10,2018,9,41,201810,2018),('2018-10-10',201841,10,2018,10,41,201810,2018),('2018-10-11',201841,10,2018,11,41,201810,2018),('2018-10-12',201841,10,2018,12,41,201810,2018),('2018-10-13',201841,10,2018,13,41,201810,2018),('2018-10-14',201842,10,2018,14,42,201810,2018),('2018-10-15',201842,10,2018,15,42,201810,2018),('2018-10-16',201842,10,2018,16,42,201810,2018),('2018-10-17',201842,10,2018,17,42,201810,2018),('2018-10-18',201842,10,2018,18,42,201810,2018),('2018-10-19',201842,10,2018,19,42,201810,2018),('2018-10-20',201842,10,2018,20,42,201810,2018),('2018-10-21',201843,10,2018,21,43,201810,2018),('2018-10-22',201843,10,2018,22,43,201810,2018),('2018-10-23',201843,10,2018,23,43,201810,2018),('2018-10-24',201843,10,2018,24,43,201810,2018),('2018-10-25',201843,10,2018,25,43,201810,2018),('2018-10-26',201843,10,2018,26,43,201810,2018),('2018-10-27',201843,10,2018,27,43,201810,2018),('2018-10-28',201844,10,2018,28,44,201810,2018),('2018-10-29',201844,10,2018,29,44,201810,2018),('2018-10-30',201844,10,2018,30,44,201810,2018),('2018-10-31',201844,10,2018,31,44,201810,2018),('2018-11-01',201844,11,2018,1,44,201811,2018),('2018-11-02',201844,11,2018,2,44,201811,2018),('2018-11-03',201844,11,2018,3,44,201811,2018),('2018-11-04',201845,11,2018,4,45,201811,2018),('2018-11-05',201845,11,2018,5,45,201811,2018),('2018-11-06',201845,11,2018,6,45,201811,2018),('2018-11-07',201845,11,2018,7,45,201811,2018),('2018-11-08',201845,11,2018,8,45,201811,2018),('2018-11-09',201845,11,2018,9,45,201811,2018),('2018-11-10',201845,11,2018,10,45,201811,2018),('2018-11-11',201846,11,2018,11,46,201811,2018),('2018-11-12',201846,11,2018,12,46,201811,2018),('2018-11-13',201846,11,2018,13,46,201811,2018),('2018-11-14',201846,11,2018,14,46,201811,2018),('2018-11-15',201846,11,2018,15,46,201811,2018),('2018-11-16',201846,11,2018,16,46,201811,2018),('2018-11-17',201846,11,2018,17,46,201811,2018),('2018-11-18',201847,11,2018,18,47,201811,2018),('2018-11-19',201847,11,2018,19,47,201811,2018),('2018-11-20',201847,11,2018,20,47,201811,2018),('2018-11-21',201847,11,2018,21,47,201811,2018),('2018-11-22',201847,11,2018,22,47,201811,2018),('2018-11-23',201847,11,2018,23,47,201811,2018),('2018-11-24',201847,11,2018,24,47,201811,2018),('2018-11-25',201848,11,2018,25,48,201811,2018),('2018-11-26',201848,11,2018,26,48,201811,2018),('2018-11-27',201848,11,2018,27,48,201811,2018),('2018-11-28',201848,11,2018,28,48,201811,2018),('2018-11-29',201848,11,2018,29,48,201811,2018),('2018-11-30',201848,11,2018,30,48,201811,2018),('2018-12-01',201848,12,2018,1,48,201812,2019),('2018-12-02',201849,12,2018,2,49,201812,2019),('2018-12-03',201849,12,2018,3,49,201812,2019),('2018-12-04',201849,12,2018,4,49,201812,2019),('2018-12-05',201849,12,2018,5,49,201812,2019),('2018-12-06',201849,12,2018,6,49,201812,2019),('2018-12-07',201849,12,2018,7,49,201812,2019),('2018-12-08',201849,12,2018,8,49,201812,2019),('2018-12-09',201850,12,2018,9,50,201812,2019),('2018-12-10',201850,12,2018,10,50,201812,2019),('2018-12-11',201850,12,2018,11,50,201812,2019),('2018-12-12',201850,12,2018,12,50,201812,2019),('2018-12-13',201850,12,2018,13,50,201812,2019),('2018-12-14',201850,12,2018,14,50,201812,2019),('2018-12-15',201850,12,2018,15,50,201812,2019),('2018-12-16',201851,12,2018,16,51,201812,2019),('2018-12-17',201851,12,2018,17,51,201812,2019),('2018-12-18',201851,12,2018,18,51,201812,2019),('2018-12-19',201851,12,2018,19,51,201812,2019),('2018-12-20',201851,12,2018,20,51,201812,2019),('2018-12-21',201851,12,2018,21,51,201812,2019),('2018-12-22',201851,12,2018,22,51,201812,2019),('2018-12-23',201852,12,2018,23,52,201812,2019),('2018-12-24',201852,12,2018,24,52,201812,2019),('2018-12-25',201852,12,2018,25,52,201812,2019),('2018-12-26',201852,12,2018,26,52,201812,2019),('2018-12-27',201852,12,2018,27,52,201812,2019),('2018-12-28',201852,12,2018,28,52,201812,2019),('2018-12-29',201852,12,2018,29,52,201812,2019),('2018-12-30',201901,1,2019,30,1,201812,2019),('2018-12-31',201901,1,2019,31,1,201812,2019),('2019-01-01',201901,1,2019,1,1,201901,2019),('2019-01-02',201901,1,2019,2,1,201901,2019),('2019-01-03',201901,1,2019,3,1,201901,2019),('2019-01-04',201901,1,2019,4,1,201901,2019),('2019-01-05',201901,1,2019,5,1,201901,2019),('2019-01-06',201902,1,2019,6,2,201901,2019),('2019-01-07',201902,1,2019,7,2,201901,2019),('2019-01-08',201902,1,2019,8,2,201901,2019),('2019-01-09',201902,1,2019,9,2,201901,2019),('2019-01-10',201902,1,2019,10,2,201901,2019),('2019-01-11',201902,1,2019,11,2,201901,2019),('2019-01-12',201902,1,2019,12,2,201901,2019),('2019-01-13',201903,1,2019,13,3,201901,2019),('2019-01-14',201903,1,2019,14,3,201901,2019),('2019-01-15',201903,1,2019,15,3,201901,2019),('2019-01-16',201903,1,2019,16,3,201901,2019),('2019-01-17',201903,1,2019,17,3,201901,2019),('2019-01-18',201903,1,2019,18,3,201901,2019),('2019-01-19',201903,1,2019,19,3,201901,2019),('2019-01-20',201904,1,2019,20,4,201901,2019),('2019-01-21',201904,1,2019,21,4,201901,2019),('2019-01-22',201904,1,2019,22,4,201901,2019),('2019-01-23',201904,1,2019,23,4,201901,2019),('2019-01-24',201904,1,2019,24,4,201901,2019),('2019-01-25',201904,1,2019,25,4,201901,2019),('2019-01-26',201904,1,2019,26,4,201901,2019),('2019-01-27',201905,1,2019,27,5,201901,2019),('2019-01-28',201905,1,2019,28,5,201901,2019),('2019-01-29',201905,1,2019,29,5,201901,2019),('2019-01-30',201905,1,2019,30,5,201901,2019),('2019-01-31',201905,1,2019,31,5,201901,2019),('2019-02-01',201905,2,2019,1,5,201902,2019),('2019-02-02',201905,2,2019,2,5,201902,2019),('2019-02-03',201906,2,2019,3,6,201902,2019),('2019-02-04',201906,2,2019,4,6,201902,2019),('2019-02-05',201906,2,2019,5,6,201902,2019),('2019-02-06',201906,2,2019,6,6,201902,2019),('2019-02-07',201906,2,2019,7,6,201902,2019),('2019-02-08',201906,2,2019,8,6,201902,2019),('2019-02-09',201906,2,2019,9,6,201902,2019),('2019-02-10',201907,2,2019,10,7,201902,2019),('2019-02-11',201907,2,2019,11,7,201902,2019),('2019-02-12',201907,2,2019,12,7,201902,2019),('2019-02-13',201907,2,2019,13,7,201902,2019),('2019-02-14',201907,2,2019,14,7,201902,2019),('2019-02-15',201907,2,2019,15,7,201902,2019),('2019-02-16',201907,2,2019,16,7,201902,2019),('2019-02-17',201908,2,2019,17,8,201902,2019),('2019-02-18',201908,2,2019,18,8,201902,2019),('2019-02-19',201908,2,2019,19,8,201902,2019),('2019-02-20',201908,2,2019,20,8,201902,2019),('2019-02-21',201908,2,2019,21,8,201902,2019),('2019-02-22',201908,2,2019,22,8,201902,2019),('2019-02-23',201908,2,2019,23,8,201902,2019),('2019-02-24',201909,2,2019,24,9,201902,2019),('2019-02-25',201909,2,2019,25,9,201902,2019),('2019-02-26',201909,2,2019,26,9,201902,2019),('2019-02-27',201909,2,2019,27,9,201902,2019),('2019-02-28',201909,2,2019,28,9,201902,2019),('2019-03-01',201909,3,2019,1,9,201903,2019),('2019-03-02',201909,3,2019,2,9,201903,2019),('2019-03-03',201910,3,2019,3,10,201903,2019),('2019-03-04',201910,3,2019,4,10,201903,2019),('2019-03-05',201910,3,2019,5,10,201903,2019),('2019-03-06',201910,3,2019,6,10,201903,2019),('2019-03-07',201910,3,2019,7,10,201903,2019),('2019-03-08',201910,3,2019,8,10,201903,2019),('2019-03-09',201910,3,2019,9,10,201903,2019),('2019-03-10',201911,3,2019,10,11,201903,2019),('2019-03-11',201911,3,2019,11,11,201903,2019),('2019-03-12',201911,3,2019,12,11,201903,2019),('2019-03-13',201911,3,2019,13,11,201903,2019),('2019-03-14',201911,3,2019,14,11,201903,2019),('2019-03-15',201911,3,2019,15,11,201903,2019),('2019-03-16',201911,3,2019,16,11,201903,2019),('2019-03-17',201912,3,2019,17,12,201903,2019),('2019-03-18',201912,3,2019,18,12,201903,2019),('2019-03-19',201912,3,2019,19,12,201903,2019),('2019-03-20',201912,3,2019,20,12,201903,2019),('2019-03-21',201912,3,2019,21,12,201903,2019),('2019-03-22',201912,3,2019,22,12,201903,2019),('2019-03-23',201912,3,2019,23,12,201903,2019),('2019-03-24',201913,3,2019,24,13,201903,2019),('2019-03-25',201913,3,2019,25,13,201903,2019),('2019-03-26',201913,3,2019,26,13,201903,2019),('2019-03-27',201913,3,2019,27,13,201903,2019),('2019-03-28',201913,3,2019,28,13,201903,2019),('2019-03-29',201913,3,2019,29,13,201903,2019),('2019-03-30',201913,3,2019,30,13,201903,2019),('2019-03-31',201914,3,2019,31,14,201903,2019),('2019-04-01',201914,4,2019,1,14,201904,2019),('2019-04-02',201914,4,2019,2,14,201904,2019),('2019-04-03',201914,4,2019,3,14,201904,2019),('2019-04-04',201914,4,2019,4,14,201904,2019),('2019-04-05',201914,4,2019,5,14,201904,2019),('2019-04-06',201914,4,2019,6,14,201904,2019),('2019-04-07',201915,4,2019,7,15,201904,2019),('2019-04-08',201915,4,2019,8,15,201904,2019),('2019-04-09',201915,4,2019,9,15,201904,2019),('2019-04-10',201915,4,2019,10,15,201904,2019),('2019-04-11',201915,4,2019,11,15,201904,2019),('2019-04-12',201915,4,2019,12,15,201904,2019),('2019-04-13',201915,4,2019,13,15,201904,2019),('2019-04-14',201916,4,2019,14,16,201904,2019),('2019-04-15',201916,4,2019,15,16,201904,2019),('2019-04-16',201916,4,2019,16,16,201904,2019),('2019-04-17',201916,4,2019,17,16,201904,2019),('2019-04-18',201916,4,2019,18,16,201904,2019),('2019-04-19',201916,4,2019,19,16,201904,2019),('2019-04-20',201916,4,2019,20,16,201904,2019),('2019-04-21',201917,4,2019,21,17,201904,2019),('2019-04-22',201917,4,2019,22,17,201904,2019),('2019-04-23',201917,4,2019,23,17,201904,2019),('2019-04-24',201917,4,2019,24,17,201904,2019),('2019-04-25',201917,4,2019,25,17,201904,2019),('2019-04-26',201917,4,2019,26,17,201904,2019),('2019-04-27',201917,4,2019,27,17,201904,2019),('2019-04-28',201918,4,2019,28,18,201904,2019),('2019-04-29',201918,4,2019,29,18,201904,2019),('2019-04-30',201918,4,2019,30,18,201904,2019),('2019-05-01',201918,5,2019,1,18,201905,2019),('2019-05-02',201918,5,2019,2,18,201905,2019),('2019-05-03',201918,5,2019,3,18,201905,2019),('2019-05-04',201918,5,2019,4,18,201905,2019),('2019-05-05',201919,5,2019,5,19,201905,2019),('2019-05-06',201919,5,2019,6,19,201905,2019),('2019-05-07',201919,5,2019,7,19,201905,2019),('2019-05-08',201919,5,2019,8,19,201905,2019),('2019-05-09',201919,5,2019,9,19,201905,2019),('2019-05-10',201919,5,2019,10,19,201905,2019),('2019-05-11',201919,5,2019,11,19,201905,2019),('2019-05-12',201920,5,2019,12,20,201905,2019),('2019-05-13',201920,5,2019,13,20,201905,2019),('2019-05-14',201920,5,2019,14,20,201905,2019),('2019-05-15',201920,5,2019,15,20,201905,2019),('2019-05-16',201920,5,2019,16,20,201905,2019),('2019-05-17',201920,5,2019,17,20,201905,2019),('2019-05-18',201920,5,2019,18,20,201905,2019),('2019-05-19',201921,5,2019,19,21,201905,2019),('2019-05-20',201921,5,2019,20,21,201905,2019),('2019-05-21',201921,5,2019,21,21,201905,2019),('2019-05-22',201921,5,2019,22,21,201905,2019),('2019-05-23',201921,5,2019,23,21,201905,2019),('2019-05-24',201921,5,2019,24,21,201905,2019),('2019-05-25',201921,5,2019,25,21,201905,2019),('2019-05-26',201922,5,2019,26,22,201905,2019),('2019-05-27',201922,5,2019,27,22,201905,2019),('2019-05-28',201922,5,2019,28,22,201905,2019),('2019-05-29',201922,5,2019,29,22,201905,2019),('2019-05-30',201922,5,2019,30,22,201905,2019),('2019-05-31',201922,5,2019,31,22,201905,2019),('2019-06-01',201922,6,2019,1,22,201906,2019),('2019-06-02',201923,6,2019,2,23,201906,2019),('2019-06-03',201923,6,2019,3,23,201906,2019),('2019-06-04',201923,6,2019,4,23,201906,2019),('2019-06-05',201923,6,2019,5,23,201906,2019),('2019-06-06',201923,6,2019,6,23,201906,2019),('2019-06-07',201923,6,2019,7,23,201906,2019),('2019-06-08',201923,6,2019,8,23,201906,2019),('2019-06-09',201924,6,2019,9,24,201906,2019),('2019-06-10',201924,6,2019,10,24,201906,2019),('2019-06-11',201924,6,2019,11,24,201906,2019),('2019-06-12',201924,6,2019,12,24,201906,2019),('2019-06-13',201924,6,2019,13,24,201906,2019),('2019-06-14',201924,6,2019,14,24,201906,2019),('2019-06-15',201924,6,2019,15,24,201906,2019),('2019-06-16',201925,6,2019,16,25,201906,2019),('2019-06-17',201925,6,2019,17,25,201906,2019),('2019-06-18',201925,6,2019,18,25,201906,2019),('2019-06-19',201925,6,2019,19,25,201906,2019),('2019-06-20',201925,6,2019,20,25,201906,2019),('2019-06-21',201925,6,2019,21,25,201906,2019),('2019-06-22',201925,6,2019,22,25,201906,2019),('2019-06-23',201926,6,2019,23,26,201906,2019),('2019-06-24',201926,6,2019,24,26,201906,2019),('2019-06-25',201926,6,2019,25,26,201906,2019),('2019-06-26',201926,6,2019,26,26,201906,2019),('2019-06-27',201926,6,2019,27,26,201906,2019),('2019-06-28',201926,6,2019,28,26,201906,2019),('2019-06-29',201926,6,2019,29,26,201906,2019),('2019-06-30',201927,6,2019,30,27,201906,2019),('2019-07-01',201927,7,2019,1,27,201907,2019),('2019-07-02',201927,7,2019,2,27,201907,2019),('2019-07-03',201927,7,2019,3,27,201907,2019),('2019-07-04',201927,7,2019,4,27,201907,2019),('2019-07-05',201927,7,2019,5,27,201907,2019),('2019-07-06',201927,7,2019,6,27,201907,2019),('2019-07-07',201928,7,2019,7,28,201907,2019),('2019-07-08',201928,7,2019,8,28,201907,2019),('2019-07-09',201928,7,2019,9,28,201907,2019),('2019-07-10',201928,7,2019,10,28,201907,2019),('2019-07-11',201928,7,2019,11,28,201907,2019),('2019-07-12',201928,7,2019,12,28,201907,2019),('2019-07-13',201928,7,2019,13,28,201907,2019),('2019-07-14',201929,7,2019,14,29,201907,2019),('2019-07-15',201929,7,2019,15,29,201907,2019),('2019-07-16',201929,7,2019,16,29,201907,2019),('2019-07-17',201929,7,2019,17,29,201907,2019),('2019-07-18',201929,7,2019,18,29,201907,2019),('2019-07-19',201929,7,2019,19,29,201907,2019),('2019-07-20',201929,7,2019,20,29,201907,2019),('2019-07-21',201930,7,2019,21,30,201907,2019),('2019-07-22',201930,7,2019,22,30,201907,2019),('2019-07-23',201930,7,2019,23,30,201907,2019),('2019-07-24',201930,7,2019,24,30,201907,2019),('2019-07-25',201930,7,2019,25,30,201907,2019),('2019-07-26',201930,7,2019,26,30,201907,2019),('2019-07-27',201930,7,2019,27,30,201907,2019),('2019-07-28',201931,7,2019,28,31,201907,2019),('2019-07-29',201931,7,2019,29,31,201907,2019),('2019-07-30',201931,7,2019,30,31,201907,2019),('2019-07-31',201931,7,2019,31,31,201907,2019),('2019-08-01',201931,8,2019,1,31,201908,2019),('2019-08-02',201931,8,2019,2,31,201908,2019),('2019-08-03',201931,8,2019,3,31,201908,2019),('2019-08-04',201932,8,2019,4,32,201908,2019),('2019-08-05',201932,8,2019,5,32,201908,2019),('2019-08-06',201932,8,2019,6,32,201908,2019),('2019-08-07',201932,8,2019,7,32,201908,2019),('2019-08-08',201932,8,2019,8,32,201908,2019),('2019-08-09',201932,8,2019,9,32,201908,2019),('2019-08-10',201932,8,2019,10,32,201908,2019),('2019-08-11',201933,8,2019,11,33,201908,2019),('2019-08-12',201933,8,2019,12,33,201908,2019),('2019-08-13',201933,8,2019,13,33,201908,2019),('2019-08-14',201933,8,2019,14,33,201908,2019),('2019-08-15',201933,8,2019,15,33,201908,2019),('2019-08-16',201933,8,2019,16,33,201908,2019),('2019-08-17',201933,8,2019,17,33,201908,2019),('2019-08-18',201934,8,2019,18,34,201908,2019),('2019-08-19',201934,8,2019,19,34,201908,2019),('2019-08-20',201934,8,2019,20,34,201908,2019),('2019-08-21',201934,8,2019,21,34,201908,2019),('2019-08-22',201934,8,2019,22,34,201908,2019),('2019-08-23',201934,8,2019,23,34,201908,2019),('2019-08-24',201934,8,2019,24,34,201908,2019),('2019-08-25',201935,8,2019,25,35,201908,2019),('2019-08-26',201935,8,2019,26,35,201908,2019),('2019-08-27',201935,8,2019,27,35,201908,2019),('2019-08-28',201935,8,2019,28,35,201908,2019),('2019-08-29',201935,8,2019,29,35,201908,2019),('2019-08-30',201935,8,2019,30,35,201908,2019),('2019-08-31',201935,8,2019,31,35,201908,2019),('2019-09-01',201936,9,2019,1,36,201909,2019),('2019-09-02',201936,9,2019,2,36,201909,2019),('2019-09-03',201936,9,2019,3,36,201909,2019),('2019-09-04',201936,9,2019,4,36,201909,2019),('2019-09-05',201936,9,2019,5,36,201909,2019),('2019-09-06',201936,9,2019,6,36,201909,2019),('2019-09-07',201936,9,2019,7,36,201909,2019),('2019-09-08',201937,9,2019,8,37,201909,2019),('2019-09-09',201937,9,2019,9,37,201909,2019),('2019-09-10',201937,9,2019,10,37,201909,2019),('2019-09-11',201937,9,2019,11,37,201909,2019),('2019-09-12',201937,9,2019,12,37,201909,2019),('2019-09-13',201937,9,2019,13,37,201909,2019),('2019-09-14',201937,9,2019,14,37,201909,2019),('2019-09-15',201938,9,2019,15,38,201909,2019),('2019-09-16',201938,9,2019,16,38,201909,2019),('2019-09-17',201938,9,2019,17,38,201909,2019),('2019-09-18',201938,9,2019,18,38,201909,2019),('2019-09-19',201938,9,2019,19,38,201909,2019),('2019-09-20',201938,9,2019,20,38,201909,2019),('2019-09-21',201938,9,2019,21,38,201909,2019),('2019-09-22',201939,9,2019,22,39,201909,2019),('2019-09-23',201939,9,2019,23,39,201909,2019),('2019-09-24',201939,9,2019,24,39,201909,2019),('2019-09-25',201939,9,2019,25,39,201909,2019),('2019-09-26',201939,9,2019,26,39,201909,2019),('2019-09-27',201939,9,2019,27,39,201909,2019),('2019-09-28',201939,9,2019,28,39,201909,2019),('2019-09-29',201940,9,2019,29,40,201909,2019),('2019-09-30',201940,9,2019,30,40,201909,2019),('2019-10-01',201940,10,2019,1,40,201910,2019),('2019-10-02',201940,10,2019,2,40,201910,2019),('2019-10-03',201940,10,2019,3,40,201910,2019),('2019-10-04',201940,10,2019,4,40,201910,2019),('2019-10-05',201940,10,2019,5,40,201910,2019),('2019-10-06',201941,10,2019,6,41,201910,2019),('2019-10-07',201941,10,2019,7,41,201910,2019),('2019-10-08',201941,10,2019,8,41,201910,2019),('2019-10-09',201941,10,2019,9,41,201910,2019),('2019-10-10',201941,10,2019,10,41,201910,2019),('2019-10-11',201941,10,2019,11,41,201910,2019),('2019-10-12',201941,10,2019,12,41,201910,2019),('2019-10-13',201942,10,2019,13,42,201910,2019),('2019-10-14',201942,10,2019,14,42,201910,2019),('2019-10-15',201942,10,2019,15,42,201910,2019),('2019-10-16',201942,10,2019,16,42,201910,2019),('2019-10-17',201942,10,2019,17,42,201910,2019),('2019-10-18',201942,10,2019,18,42,201910,2019),('2019-10-19',201942,10,2019,19,42,201910,2019),('2019-10-20',201943,10,2019,20,43,201910,2019),('2019-10-21',201943,10,2019,21,43,201910,2019),('2019-10-22',201943,10,2019,22,43,201910,2019),('2019-10-23',201943,10,2019,23,43,201910,2019),('2019-10-24',201943,10,2019,24,43,201910,2019),('2019-10-25',201943,10,2019,25,43,201910,2019),('2019-10-26',201943,10,2019,26,43,201910,2019),('2019-10-27',201944,10,2019,27,44,201910,2019),('2019-10-28',201944,10,2019,28,44,201910,2019),('2019-10-29',201944,10,2019,29,44,201910,2019),('2019-10-30',201944,10,2019,30,44,201910,2019),('2019-10-31',201944,10,2019,31,44,201910,2019),('2019-11-01',201944,11,2019,1,44,201911,2019),('2019-11-02',201944,11,2019,2,44,201911,2019),('2019-11-03',201945,11,2019,3,45,201911,2019),('2019-11-04',201945,11,2019,4,45,201911,2019),('2019-11-05',201945,11,2019,5,45,201911,2019),('2019-11-06',201945,11,2019,6,45,201911,2019),('2019-11-07',201945,11,2019,7,45,201911,2019),('2019-11-08',201945,11,2019,8,45,201911,2019),('2019-11-09',201945,11,2019,9,45,201911,2019),('2019-11-10',201946,11,2019,10,46,201911,2019),('2019-11-11',201946,11,2019,11,46,201911,2019),('2019-11-12',201946,11,2019,12,46,201911,2019),('2019-11-13',201946,11,2019,13,46,201911,2019),('2019-11-14',201946,11,2019,14,46,201911,2019),('2019-11-15',201946,11,2019,15,46,201911,2019),('2019-11-16',201946,11,2019,16,46,201911,2019),('2019-11-17',201947,11,2019,17,47,201911,2019),('2019-11-18',201947,11,2019,18,47,201911,2019),('2019-11-19',201947,11,2019,19,47,201911,2019),('2019-11-20',201947,11,2019,20,47,201911,2019),('2019-11-21',201947,11,2019,21,47,201911,2019),('2019-11-22',201947,11,2019,22,47,201911,2019),('2019-11-23',201947,11,2019,23,47,201911,2019),('2019-11-24',201948,11,2019,24,48,201911,2019),('2019-11-25',201948,11,2019,25,48,201911,2019),('2019-11-26',201948,11,2019,26,48,201911,2019),('2019-11-27',201948,11,2019,27,48,201911,2019),('2019-11-28',201948,11,2019,28,48,201911,2019),('2019-11-29',201948,11,2019,29,48,201911,2019),('2019-11-30',201948,11,2019,30,48,201911,2019),('2019-12-01',201949,12,2019,1,49,201912,2020),('2019-12-02',201949,12,2019,2,49,201912,2020),('2019-12-03',201949,12,2019,3,49,201912,2020),('2019-12-04',201949,12,2019,4,49,201912,2020),('2019-12-05',201949,12,2019,5,49,201912,2020),('2019-12-06',201949,12,2019,6,49,201912,2020),('2019-12-07',201949,12,2019,7,49,201912,2020),('2019-12-08',201950,12,2019,8,50,201912,2020),('2019-12-09',201950,12,2019,9,50,201912,2020),('2019-12-10',201950,12,2019,10,50,201912,2020),('2019-12-11',201950,12,2019,11,50,201912,2020),('2019-12-12',201950,12,2019,12,50,201912,2020),('2019-12-13',201950,12,2019,13,50,201912,2020),('2019-12-14',201950,12,2019,14,50,201912,2020),('2019-12-15',201951,12,2019,15,51,201912,2020),('2019-12-16',201951,12,2019,16,51,201912,2020),('2019-12-17',201951,12,2019,17,51,201912,2020),('2019-12-18',201951,12,2019,18,51,201912,2020),('2019-12-19',201951,12,2019,19,51,201912,2020),('2019-12-20',201951,12,2019,20,51,201912,2020),('2019-12-21',201951,12,2019,21,51,201912,2020),('2019-12-22',201952,12,2019,22,52,201912,2020),('2019-12-23',201952,12,2019,23,52,201912,2020),('2019-12-24',201952,12,2019,24,52,201912,2020),('2019-12-25',201952,12,2019,25,52,201912,2020),('2019-12-26',201952,12,2019,26,52,201912,2020),('2019-12-27',201952,12,2019,27,52,201912,2020),('2019-12-28',201952,12,2019,28,52,201912,2020),('2019-12-29',202001,12,2019,29,1,201912,2020),('2019-12-30',202001,12,2019,30,1,201912,2020),('2019-12-31',202001,12,2019,31,1,201912,2020),('2020-01-01',202001,1,2020,1,1,202001,2020),('2020-01-02',202001,1,2020,2,1,202001,2020),('2020-01-03',202001,1,2020,3,1,202001,2020),('2020-01-04',202001,1,2020,4,1,202001,2020),('2020-01-05',202002,1,2020,5,2,202001,2020),('2020-01-06',202002,1,2020,6,2,202001,2020),('2020-01-07',202002,1,2020,7,2,202001,2020),('2020-01-08',202002,1,2020,8,2,202001,2020),('2020-01-09',202002,1,2020,9,2,202001,2020),('2020-01-10',202002,1,2020,10,2,202001,2020),('2020-01-11',202002,1,2020,11,2,202001,2020),('2020-01-12',202003,1,2020,12,3,202001,2020),('2020-01-13',202003,1,2020,13,3,202001,2020),('2020-01-14',202003,1,2020,14,3,202001,2020),('2020-01-15',202003,1,2020,15,3,202001,2020),('2020-01-16',202003,1,2020,16,3,202001,2020),('2020-01-17',202003,1,2020,17,3,202001,2020),('2020-01-18',202003,1,2020,18,3,202001,2020),('2020-01-19',202004,1,2020,19,4,202001,2020),('2020-01-20',202004,1,2020,20,4,202001,2020),('2020-01-21',202004,1,2020,21,4,202001,2020),('2020-01-22',202004,1,2020,22,4,202001,2020),('2020-01-23',202004,1,2020,23,4,202001,2020),('2020-01-24',202004,1,2020,24,4,202001,2020),('2020-01-25',202004,1,2020,25,4,202001,2020),('2020-01-26',202005,1,2020,26,5,202001,2020),('2020-01-27',202005,1,2020,27,5,202001,2020),('2020-01-28',202005,1,2020,28,5,202001,2020),('2020-01-29',202005,1,2020,29,5,202001,2020),('2020-01-30',202005,1,2020,30,5,202001,2020),('2020-01-31',202005,1,2020,31,5,202001,2020),('2020-02-01',202005,2,2020,1,5,202002,2020),('2020-02-02',202006,2,2020,2,6,202002,2020),('2020-02-03',202006,2,2020,3,6,202002,2020),('2020-02-04',202006,2,2020,4,6,202002,2020),('2020-02-05',202006,2,2020,5,6,202002,2020),('2020-02-06',202006,2,2020,6,6,202002,2020),('2020-02-07',202006,2,2020,7,6,202002,2020),('2020-02-08',202006,2,2020,8,6,202002,2020),('2020-02-09',202007,2,2020,9,7,202002,2020),('2020-02-10',202007,2,2020,10,7,202002,2020),('2020-02-11',202007,2,2020,11,7,202002,2020),('2020-02-12',202007,2,2020,12,7,202002,2020),('2020-02-13',202007,2,2020,13,7,202002,2020),('2020-02-14',202007,2,2020,14,7,202002,2020),('2020-02-15',202007,2,2020,15,7,202002,2020),('2020-02-16',202008,2,2020,16,8,202002,2020),('2020-02-17',202008,2,2020,17,8,202002,2020),('2020-02-18',202008,2,2020,18,8,202002,2020),('2020-02-19',202008,2,2020,19,8,202002,2020),('2020-02-20',202008,2,2020,20,8,202002,2020),('2020-02-21',202008,2,2020,21,8,202002,2020),('2020-02-22',202008,2,2020,22,8,202002,2020),('2020-02-23',202009,2,2020,23,9,202002,2020),('2020-02-24',202009,2,2020,24,9,202002,2020),('2020-02-25',202009,2,2020,25,9,202002,2020),('2020-02-26',202009,2,2020,26,9,202002,2020),('2020-02-27',202009,2,2020,27,9,202002,2020),('2020-02-28',202009,2,2020,28,9,202002,2020),('2020-02-29',202009,2,2020,29,9,202002,2020),('2020-03-01',202010,3,2020,1,10,202003,2020),('2020-03-02',202010,3,2020,2,10,202003,2020),('2020-03-03',202010,3,2020,3,10,202003,2020),('2020-03-04',202010,3,2020,4,10,202003,2020),('2020-03-05',202010,3,2020,5,10,202003,2020),('2020-03-06',202010,3,2020,6,10,202003,2020),('2020-03-07',202010,3,2020,7,10,202003,2020),('2020-03-08',202011,3,2020,8,11,202003,2020),('2020-03-09',202011,3,2020,9,11,202003,2020),('2020-03-10',202011,3,2020,10,11,202003,2020),('2020-03-11',202011,3,2020,11,11,202003,2020),('2020-03-12',202011,3,2020,12,11,202003,2020),('2020-03-13',202011,3,2020,13,11,202003,2020),('2020-03-14',202011,3,2020,14,11,202003,2020),('2020-03-15',202012,3,2020,15,12,202003,2020),('2020-03-16',202012,3,2020,16,12,202003,2020),('2020-03-17',202012,3,2020,17,12,202003,2020),('2020-03-18',202012,3,2020,18,12,202003,2020),('2020-03-19',202012,3,2020,19,12,202003,2020),('2020-03-20',202012,3,2020,20,12,202003,2020),('2020-03-21',202012,3,2020,21,12,202003,2020),('2020-03-22',202013,3,2020,22,13,202003,2020),('2020-03-23',202013,3,2020,23,13,202003,2020),('2020-03-24',202013,3,2020,24,13,202003,2020),('2020-03-25',202013,3,2020,25,13,202003,2020),('2020-03-26',202013,3,2020,26,13,202003,2020),('2020-03-27',202013,3,2020,27,13,202003,2020),('2020-03-28',202013,3,2020,28,13,202003,2020),('2020-03-29',202014,3,2020,29,14,202003,2020),('2020-03-30',202014,3,2020,30,14,202003,2020),('2020-03-31',202014,3,2020,31,14,202003,2020),('2020-04-01',202014,4,2020,1,14,202004,2020),('2020-04-02',202014,4,2020,2,14,202004,2020),('2020-04-03',202014,4,2020,3,14,202004,2020),('2020-04-04',202014,4,2020,4,14,202004,2020),('2020-04-05',202015,4,2020,5,15,202004,2020),('2020-04-06',202015,4,2020,6,15,202004,2020),('2020-04-07',202015,4,2020,7,15,202004,2020),('2020-04-08',202015,4,2020,8,15,202004,2020),('2020-04-09',202015,4,2020,9,15,202004,2020),('2020-04-10',202015,4,2020,10,15,202004,2020),('2020-04-11',202015,4,2020,11,15,202004,2020),('2020-04-12',202016,4,2020,12,16,202004,2020),('2020-04-13',202016,4,2020,13,16,202004,2020),('2020-04-14',202016,4,2020,14,16,202004,2020),('2020-04-15',202016,4,2020,15,16,202004,2020),('2020-04-16',202016,4,2020,16,16,202004,2020),('2020-04-17',202016,4,2020,17,16,202004,2020),('2020-04-18',202016,4,2020,18,16,202004,2020),('2020-04-19',202017,4,2020,19,17,202004,2020),('2020-04-20',202017,4,2020,20,17,202004,2020),('2020-04-21',202017,4,2020,21,17,202004,2020),('2020-04-22',202017,4,2020,22,17,202004,2020),('2020-04-23',202017,4,2020,23,17,202004,2020),('2020-04-24',202017,4,2020,24,17,202004,2020),('2020-04-25',202017,4,2020,25,17,202004,2020),('2020-04-26',202018,4,2020,26,18,202004,2020),('2020-04-27',202018,4,2020,27,18,202004,2020),('2020-04-28',202018,4,2020,28,18,202004,2020),('2020-04-29',202018,4,2020,29,18,202004,2020),('2020-04-30',202018,4,2020,30,18,202004,2020),('2020-05-01',202018,5,2020,1,18,202005,2020),('2020-05-02',202018,5,2020,2,18,202005,2020),('2020-05-03',202019,5,2020,3,19,202005,2020),('2020-05-04',202019,5,2020,4,19,202005,2020),('2020-05-05',202019,5,2020,5,19,202005,2020),('2020-05-06',202019,5,2020,6,19,202005,2020),('2020-05-07',202019,5,2020,7,19,202005,2020),('2020-05-08',202019,5,2020,8,19,202005,2020),('2020-05-09',202019,5,2020,9,19,202005,2020),('2020-05-10',202020,5,2020,10,20,202005,2020),('2020-05-11',202020,5,2020,11,20,202005,2020),('2020-05-12',202020,5,2020,12,20,202005,2020),('2020-05-13',202020,5,2020,13,20,202005,2020),('2020-05-14',202020,5,2020,14,20,202005,2020),('2020-05-15',202020,5,2020,15,20,202005,2020),('2020-05-16',202020,5,2020,16,20,202005,2020),('2020-05-17',202021,5,2020,17,21,202005,2020),('2020-05-18',202021,5,2020,18,21,202005,2020),('2020-05-19',202021,5,2020,19,21,202005,2020),('2020-05-20',202021,5,2020,20,21,202005,2020),('2020-05-21',202021,5,2020,21,21,202005,2020),('2020-05-22',202021,5,2020,22,21,202005,2020),('2020-05-23',202021,5,2020,23,21,202005,2020),('2020-05-24',202022,5,2020,24,22,202005,2020),('2020-05-25',202022,5,2020,25,22,202005,2020),('2020-05-26',202022,5,2020,26,22,202005,2020),('2020-05-27',202022,5,2020,27,22,202005,2020),('2020-05-28',202022,5,2020,28,22,202005,2020),('2020-05-29',202022,5,2020,29,22,202005,2020),('2020-05-30',202022,5,2020,30,22,202005,2020),('2020-05-31',202023,5,2020,31,23,202005,2020),('2020-06-01',202023,6,2020,1,23,202006,2020),('2020-06-02',202023,6,2020,2,23,202006,2020),('2020-06-03',202023,6,2020,3,23,202006,2020),('2020-06-04',202023,6,2020,4,23,202006,2020),('2020-06-05',202023,6,2020,5,23,202006,2020),('2020-06-06',202023,6,2020,6,23,202006,2020),('2020-06-07',202024,6,2020,7,24,202006,2020),('2020-06-08',202024,6,2020,8,24,202006,2020),('2020-06-09',202024,6,2020,9,24,202006,2020),('2020-06-10',202024,6,2020,10,24,202006,2020),('2020-06-11',202024,6,2020,11,24,202006,2020),('2020-06-12',202024,6,2020,12,24,202006,2020),('2020-06-13',202024,6,2020,13,24,202006,2020),('2020-06-14',202025,6,2020,14,25,202006,2020),('2020-06-15',202025,6,2020,15,25,202006,2020),('2020-06-16',202025,6,2020,16,25,202006,2020),('2020-06-17',202025,6,2020,17,25,202006,2020),('2020-06-18',202025,6,2020,18,25,202006,2020),('2020-06-19',202025,6,2020,19,25,202006,2020),('2020-06-20',202025,6,2020,20,25,202006,2020),('2020-06-21',202026,6,2020,21,26,202006,2020),('2020-06-22',202026,6,2020,22,26,202006,2020),('2020-06-23',202026,6,2020,23,26,202006,2020),('2020-06-24',202026,6,2020,24,26,202006,2020),('2020-06-25',202026,6,2020,25,26,202006,2020),('2020-06-26',202026,6,2020,26,26,202006,2020),('2020-06-27',202026,6,2020,27,26,202006,2020),('2020-06-28',202027,6,2020,28,27,202006,2020),('2020-06-29',202027,6,2020,29,27,202006,2020),('2020-06-30',202027,6,2020,30,27,202006,2020),('2020-07-01',202027,7,2020,1,27,202007,2020),('2020-07-02',202027,7,2020,2,27,202007,2020),('2020-07-03',202027,7,2020,3,27,202007,2020),('2020-07-04',202027,7,2020,4,27,202007,2020),('2020-07-05',202028,7,2020,5,28,202007,2020),('2020-07-06',202028,7,2020,6,28,202007,2020),('2020-07-07',202028,7,2020,7,28,202007,2020),('2020-07-08',202028,7,2020,8,28,202007,2020),('2020-07-09',202028,7,2020,9,28,202007,2020),('2020-07-10',202028,7,2020,10,28,202007,2020),('2020-07-11',202028,7,2020,11,28,202007,2020),('2020-07-12',202029,7,2020,12,29,202007,2020),('2020-07-13',202029,7,2020,13,29,202007,2020),('2020-07-14',202029,7,2020,14,29,202007,2020),('2020-07-15',202029,7,2020,15,29,202007,2020),('2020-07-16',202029,7,2020,16,29,202007,2020),('2020-07-17',202029,7,2020,17,29,202007,2020),('2020-07-18',202029,7,2020,18,29,202007,2020),('2020-07-19',202030,7,2020,19,30,202007,2020),('2020-07-20',202030,7,2020,20,30,202007,2020),('2020-07-21',202030,7,2020,21,30,202007,2020),('2020-07-22',202030,7,2020,22,30,202007,2020),('2020-07-23',202030,7,2020,23,30,202007,2020),('2020-07-24',202030,7,2020,24,30,202007,2020),('2020-07-25',202030,7,2020,25,30,202007,2020),('2020-07-26',202031,7,2020,26,31,202007,2020),('2020-07-27',202031,7,2020,27,31,202007,2020),('2020-07-28',202031,7,2020,28,31,202007,2020),('2020-07-29',202031,7,2020,29,31,202007,2020),('2020-07-30',202031,7,2020,30,31,202007,2020),('2020-07-31',202031,7,2020,31,31,202007,2020),('2020-08-01',202031,8,2020,1,31,202008,2020),('2020-08-02',202032,8,2020,2,32,202008,2020),('2020-08-03',202032,8,2020,3,32,202008,2020),('2020-08-04',202032,8,2020,4,32,202008,2020),('2020-08-05',202032,8,2020,5,32,202008,2020),('2020-08-06',202032,8,2020,6,32,202008,2020),('2020-08-07',202032,8,2020,7,32,202008,2020),('2020-08-08',202032,8,2020,8,32,202008,2020),('2020-08-09',202033,8,2020,9,33,202008,2020),('2020-08-10',202033,8,2020,10,33,202008,2020),('2020-08-11',202033,8,2020,11,33,202008,2020),('2020-08-12',202033,8,2020,12,33,202008,2020),('2020-08-13',202033,8,2020,13,33,202008,2020),('2020-08-14',202033,8,2020,14,33,202008,2020),('2020-08-15',202033,8,2020,15,33,202008,2020),('2020-08-16',202034,8,2020,16,34,202008,2020),('2020-08-17',202034,8,2020,17,34,202008,2020),('2020-08-18',202034,8,2020,18,34,202008,2020),('2020-08-19',202034,8,2020,19,34,202008,2020),('2020-08-20',202034,8,2020,20,34,202008,2020),('2020-08-21',202034,8,2020,21,34,202008,2020),('2020-08-22',202034,8,2020,22,34,202008,2020),('2020-08-23',202035,8,2020,23,35,202008,2020),('2020-08-24',202035,8,2020,24,35,202008,2020),('2020-08-25',202035,8,2020,25,35,202008,2020),('2020-08-26',202035,8,2020,26,35,202008,2020),('2020-08-27',202035,8,2020,27,35,202008,2020),('2020-08-28',202035,8,2020,28,35,202008,2020),('2020-08-29',202035,8,2020,29,35,202008,2020),('2020-08-30',202036,8,2020,30,36,202008,2020),('2020-08-31',202036,8,2020,31,36,202008,2020),('2020-09-01',202036,9,2020,1,36,202009,2020),('2020-09-02',202036,9,2020,2,36,202009,2020),('2020-09-03',202036,9,2020,3,36,202009,2020),('2020-09-04',202036,9,2020,4,36,202009,2020),('2020-09-05',202036,9,2020,5,36,202009,2020),('2020-09-06',202037,9,2020,6,37,202009,2020),('2020-09-07',202037,9,2020,7,37,202009,2020),('2020-09-08',202037,9,2020,8,37,202009,2020),('2020-09-09',202037,9,2020,9,37,202009,2020),('2020-09-10',202037,9,2020,10,37,202009,2020),('2020-09-11',202037,9,2020,11,37,202009,2020),('2020-09-12',202037,9,2020,12,37,202009,2020),('2020-09-13',202038,9,2020,13,38,202009,2020),('2020-09-14',202038,9,2020,14,38,202009,2020),('2020-09-15',202038,9,2020,15,38,202009,2020),('2020-09-16',202038,9,2020,16,38,202009,2020),('2020-09-17',202038,9,2020,17,38,202009,2020),('2020-09-18',202038,9,2020,18,38,202009,2020),('2020-09-19',202038,9,2020,19,38,202009,2020),('2020-09-20',202039,9,2020,20,39,202009,2020),('2020-09-21',202039,9,2020,21,39,202009,2020),('2020-09-22',202039,9,2020,22,39,202009,2020),('2020-09-23',202039,9,2020,23,39,202009,2020),('2020-09-24',202039,9,2020,24,39,202009,2020),('2020-09-25',202039,9,2020,25,39,202009,2020),('2020-09-26',202039,9,2020,26,39,202009,2020),('2020-09-27',202040,9,2020,27,40,202009,2020),('2020-09-28',202040,9,2020,28,40,202009,2020),('2020-09-29',202040,9,2020,29,40,202009,2020),('2020-09-30',202040,9,2020,30,40,202009,2020),('2020-10-01',202040,10,2020,1,40,202010,2020),('2020-10-02',202040,10,2020,2,40,202010,2020),('2020-10-03',202040,10,2020,3,40,202010,2020),('2020-10-04',202041,10,2020,4,41,202010,2020),('2020-10-05',202041,10,2020,5,41,202010,2020),('2020-10-06',202041,10,2020,6,41,202010,2020),('2020-10-07',202041,10,2020,7,41,202010,2020),('2020-10-08',202041,10,2020,8,41,202010,2020),('2020-10-09',202041,10,2020,9,41,202010,2020),('2020-10-10',202041,10,2020,10,41,202010,2020),('2020-10-11',202042,10,2020,11,42,202010,2020),('2020-10-12',202042,10,2020,12,42,202010,2020),('2020-10-13',202042,10,2020,13,42,202010,2020),('2020-10-14',202042,10,2020,14,42,202010,2020),('2020-10-15',202042,10,2020,15,42,202010,2020),('2020-10-16',202042,10,2020,16,42,202010,2020),('2020-10-17',202042,10,2020,17,42,202010,2020),('2020-10-18',202043,10,2020,18,43,202010,2020),('2020-10-19',202043,10,2020,19,43,202010,2020),('2020-10-20',202043,10,2020,20,43,202010,2020),('2020-10-21',202043,10,2020,21,43,202010,2020),('2020-10-22',202043,10,2020,22,43,202010,2020),('2020-10-23',202043,10,2020,23,43,202010,2020),('2020-10-24',202043,10,2020,24,43,202010,2020),('2020-10-25',202044,10,2020,25,44,202010,2020),('2020-10-26',202044,10,2020,26,44,202010,2020),('2020-10-27',202044,10,2020,27,44,202010,2020),('2020-10-28',202044,10,2020,28,44,202010,2020),('2020-10-29',202044,10,2020,29,44,202010,2020),('2020-10-30',202044,10,2020,30,44,202010,2020),('2020-10-31',202044,10,2020,31,44,202010,2020),('2020-11-01',202045,11,2020,1,45,202011,2020),('2020-11-02',202045,11,2020,2,45,202011,2020),('2020-11-03',202045,11,2020,3,45,202011,2020),('2020-11-04',202045,11,2020,4,45,202011,2020),('2020-11-05',202045,11,2020,5,45,202011,2020),('2020-11-06',202045,11,2020,6,45,202011,2020),('2020-11-07',202045,11,2020,7,45,202011,2020),('2020-11-08',202046,11,2020,8,46,202011,2020),('2020-11-09',202046,11,2020,9,46,202011,2020),('2020-11-10',202046,11,2020,10,46,202011,2020),('2020-11-11',202046,11,2020,11,46,202011,2020),('2020-11-12',202046,11,2020,12,46,202011,2020),('2020-11-13',202046,11,2020,13,46,202011,2020),('2020-11-14',202046,11,2020,14,46,202011,2020),('2020-11-15',202047,11,2020,15,47,202011,2020),('2020-11-16',202047,11,2020,16,47,202011,2020),('2020-11-17',202047,11,2020,17,47,202011,2020),('2020-11-18',202047,11,2020,18,47,202011,2020),('2020-11-19',202047,11,2020,19,47,202011,2020),('2020-11-20',202047,11,2020,20,47,202011,2020),('2020-11-21',202047,11,2020,21,47,202011,2020),('2020-11-22',202048,11,2020,22,48,202011,2020),('2020-11-23',202048,11,2020,23,48,202011,2020),('2020-11-24',202048,11,2020,24,48,202011,2020),('2020-11-25',202048,11,2020,25,48,202011,2020),('2020-11-26',202048,11,2020,26,48,202011,2020),('2020-11-27',202048,11,2020,27,48,202011,2020),('2020-11-28',202048,11,2020,28,48,202011,2020),('2020-11-29',202049,11,2020,29,49,202011,2020),('2020-11-30',202049,11,2020,30,49,202011,2020),('2020-12-01',202049,12,2020,1,49,202012,2021),('2020-12-02',202049,12,2020,2,49,202012,2021),('2020-12-03',202049,12,2020,3,49,202012,2021),('2020-12-04',202049,12,2020,4,49,202012,2021),('2020-12-05',202049,12,2020,5,49,202012,2021),('2020-12-06',202050,12,2020,6,50,202012,2021),('2020-12-07',202050,12,2020,7,50,202012,2021),('2020-12-08',202050,12,2020,8,50,202012,2021),('2020-12-09',202050,12,2020,9,50,202012,2021),('2020-12-10',202050,12,2020,10,50,202012,2021),('2020-12-11',202050,12,2020,11,50,202012,2021),('2020-12-12',202050,12,2020,12,50,202012,2021),('2020-12-13',202051,12,2020,13,51,202012,2021),('2020-12-14',202051,12,2020,14,51,202012,2021),('2020-12-15',202051,12,2020,15,51,202012,2021),('2020-12-16',202051,12,2020,16,51,202012,2021),('2020-12-17',202051,12,2020,17,51,202012,2021),('2020-12-18',202051,12,2020,18,51,202012,2021),('2020-12-19',202051,12,2020,19,51,202012,2021),('2020-12-20',202052,12,2020,20,52,202012,2021),('2020-12-21',202052,12,2020,21,52,202012,2021),('2020-12-22',202052,12,2020,22,52,202012,2021),('2020-12-23',202052,12,2020,23,52,202012,2021),('2020-12-24',202052,12,2020,24,52,202012,2021),('2020-12-25',202052,12,2020,25,52,202012,2021),('2020-12-26',202052,12,2020,26,52,202012,2021),('2020-12-27',202053,12,2020,27,53,202012,2021),('2020-12-28',202053,12,2020,28,53,202012,2021),('2020-12-29',202053,12,2020,29,53,202012,2021),('2020-12-30',202053,12,2020,30,53,202012,2021),('2020-12-31',202053,12,2020,31,53,202012,2021),('2021-01-01',202101,1,2021,1,1,202101,2021),('2021-01-02',202101,1,2021,2,1,202101,2021),('2021-01-03',202101,1,2021,3,1,202101,2021),('2021-01-04',202101,1,2021,4,1,202101,2021),('2021-01-05',202101,1,2021,5,1,202101,2021),('2021-01-06',202101,1,2021,6,1,202101,2021),('2021-01-07',202101,1,2021,7,1,202101,2021),('2021-01-08',202101,1,2021,8,1,202101,2021),('2021-01-09',202101,1,2021,9,1,202101,2021),('2021-01-10',202102,1,2021,10,2,202101,2021),('2021-01-11',202102,1,2021,11,2,202101,2021),('2021-01-12',202102,1,2021,12,2,202101,2021),('2021-01-13',202102,1,2021,13,2,202101,2021),('2021-01-14',202102,1,2021,14,2,202101,2021),('2021-01-15',202102,1,2021,15,2,202101,2021),('2021-01-16',202102,1,2021,16,2,202101,2021),('2021-01-17',202103,1,2021,17,3,202101,2021),('2021-01-18',202103,1,2021,18,3,202101,2021),('2021-01-19',202103,1,2021,19,3,202101,2021),('2021-01-20',202103,1,2021,20,3,202101,2021),('2021-01-21',202103,1,2021,21,3,202101,2021),('2021-01-22',202103,1,2021,22,3,202101,2021),('2021-01-23',202103,1,2021,23,3,202101,2021),('2021-01-24',202104,1,2021,24,4,202101,2021),('2021-01-25',202104,1,2021,25,4,202101,2021),('2021-01-26',202104,1,2021,26,4,202101,2021),('2021-01-27',202104,1,2021,27,4,202101,2021),('2021-01-28',202104,1,2021,28,4,202101,2021),('2021-01-29',202104,1,2021,29,4,202101,2021),('2021-01-30',202104,1,2021,30,4,202101,2021),('2021-01-31',202105,1,2021,31,5,202101,2021),('2021-02-01',202105,2,2021,1,5,202102,2021),('2021-02-02',202105,2,2021,2,5,202102,2021),('2021-02-03',202105,2,2021,3,5,202102,2021),('2021-02-04',202105,2,2021,4,5,202102,2021),('2021-02-05',202105,2,2021,5,5,202102,2021),('2021-02-06',202105,2,2021,6,5,202102,2021),('2021-02-07',202106,2,2021,7,6,202102,2021),('2021-02-08',202106,2,2021,8,6,202102,2021),('2021-02-09',202106,2,2021,9,6,202102,2021),('2021-02-10',202106,2,2021,10,6,202102,2021),('2021-02-11',202106,2,2021,11,6,202102,2021),('2021-02-12',202106,2,2021,12,6,202102,2021),('2021-02-13',202106,2,2021,13,6,202102,2021),('2021-02-14',202107,2,2021,14,7,202102,2021),('2021-02-15',202107,2,2021,15,7,202102,2021),('2021-02-16',202107,2,2021,16,7,202102,2021),('2021-02-17',202107,2,2021,17,7,202102,2021),('2021-02-18',202107,2,2021,18,7,202102,2021),('2021-02-19',202107,2,2021,19,7,202102,2021),('2021-02-20',202107,2,2021,20,7,202102,2021),('2021-02-21',202108,2,2021,21,8,202102,2021),('2021-02-22',202108,2,2021,22,8,202102,2021),('2021-02-23',202108,2,2021,23,8,202102,2021),('2021-02-24',202108,2,2021,24,8,202102,2021),('2021-02-25',202108,2,2021,25,8,202102,2021),('2021-02-26',202108,2,2021,26,8,202102,2021),('2021-02-27',202108,2,2021,27,8,202102,2021),('2021-02-28',202109,2,2021,28,9,202102,2021),('2021-03-01',202109,3,2021,1,9,202103,2021),('2021-03-02',202109,3,2021,2,9,202103,2021),('2021-03-03',202109,3,2021,3,9,202103,2021),('2021-03-04',202109,3,2021,4,9,202103,2021),('2021-03-05',202109,3,2021,5,9,202103,2021),('2021-03-06',202109,3,2021,6,9,202103,2021),('2021-03-07',202110,3,2021,7,10,202103,2021),('2021-03-08',202110,3,2021,8,10,202103,2021),('2021-03-09',202110,3,2021,9,10,202103,2021),('2021-03-10',202110,3,2021,10,10,202103,2021),('2021-03-11',202110,3,2021,11,10,202103,2021),('2021-03-12',202110,3,2021,12,10,202103,2021),('2021-03-13',202110,3,2021,13,10,202103,2021),('2021-03-14',202111,3,2021,14,11,202103,2021),('2021-03-15',202111,3,2021,15,11,202103,2021),('2021-03-16',202111,3,2021,16,11,202103,2021),('2021-03-17',202111,3,2021,17,11,202103,2021),('2021-03-18',202111,3,2021,18,11,202103,2021),('2021-03-19',202111,3,2021,19,11,202103,2021),('2021-03-20',202111,3,2021,20,11,202103,2021),('2021-03-21',202112,3,2021,21,12,202103,2021),('2021-03-22',202112,3,2021,22,12,202103,2021),('2021-03-23',202112,3,2021,23,12,202103,2021),('2021-03-24',202112,3,2021,24,12,202103,2021),('2021-03-25',202112,3,2021,25,12,202103,2021),('2021-03-26',202112,3,2021,26,12,202103,2021),('2021-03-27',202112,3,2021,27,12,202103,2021),('2021-03-28',202113,3,2021,28,13,202103,2021),('2021-03-29',202113,3,2021,29,13,202103,2021),('2021-03-30',202113,3,2021,30,13,202103,2021),('2021-03-31',202113,3,2021,31,13,202103,2021),('2021-04-01',202113,4,2021,1,13,202104,2021),('2021-04-02',202113,4,2021,2,13,202104,2021),('2021-04-03',202113,4,2021,3,13,202104,2021),('2021-04-04',202114,4,2021,4,14,202104,2021),('2021-04-05',202114,4,2021,5,14,202104,2021),('2021-04-06',202114,4,2021,6,14,202104,2021),('2021-04-07',202114,4,2021,7,14,202104,2021),('2021-04-08',202114,4,2021,8,14,202104,2021),('2021-04-09',202114,4,2021,9,14,202104,2021),('2021-04-10',202114,4,2021,10,14,202104,2021),('2021-04-11',202115,4,2021,11,15,202104,2021),('2021-04-12',202115,4,2021,12,15,202104,2021),('2021-04-13',202115,4,2021,13,15,202104,2021),('2021-04-14',202115,4,2021,14,15,202104,2021),('2021-04-15',202115,4,2021,15,15,202104,2021),('2021-04-16',202115,4,2021,16,15,202104,2021),('2021-04-17',202115,4,2021,17,15,202104,2021),('2021-04-18',202116,4,2021,18,16,202104,2021),('2021-04-19',202116,4,2021,19,16,202104,2021),('2021-04-20',202116,4,2021,20,16,202104,2021),('2021-04-21',202116,4,2021,21,16,202104,2021),('2021-04-22',202116,4,2021,22,16,202104,2021),('2021-04-23',202116,4,2021,23,16,202104,2021),('2021-04-24',202116,4,2021,24,16,202104,2021),('2021-04-25',202117,4,2021,25,17,202104,2021),('2021-04-26',202117,4,2021,26,17,202104,2021),('2021-04-27',202117,4,2021,27,17,202104,2021),('2021-04-28',202117,4,2021,28,17,202104,2021),('2021-04-29',202117,4,2021,29,17,202104,2021),('2021-04-30',202117,4,2021,30,17,202104,2021),('2021-05-01',202117,5,2021,1,17,202105,2021),('2021-05-02',202118,5,2021,2,18,202105,2021),('2021-05-03',202118,5,2021,3,18,202105,2021),('2021-05-04',202118,5,2021,4,18,202105,2021),('2021-05-05',202118,5,2021,5,18,202105,2021),('2021-05-06',202118,5,2021,6,18,202105,2021),('2021-05-07',202118,5,2021,7,18,202105,2021),('2021-05-08',202118,5,2021,8,18,202105,2021),('2021-05-09',202119,5,2021,9,19,202105,2021),('2021-05-10',202119,5,2021,10,19,202105,2021),('2021-05-11',202119,5,2021,11,19,202105,2021),('2021-05-12',202119,5,2021,12,19,202105,2021),('2021-05-13',202119,5,2021,13,19,202105,2021),('2021-05-14',202119,5,2021,14,19,202105,2021),('2021-05-15',202119,5,2021,15,19,202105,2021),('2021-05-16',202120,5,2021,16,20,202105,2021),('2021-05-17',202120,5,2021,17,20,202105,2021),('2021-05-18',202120,5,2021,18,20,202105,2021),('2021-05-19',202120,5,2021,19,20,202105,2021),('2021-05-20',202120,5,2021,20,20,202105,2021),('2021-05-21',202120,5,2021,21,20,202105,2021),('2021-05-22',202120,5,2021,22,20,202105,2021),('2021-05-23',202121,5,2021,23,21,202105,2021),('2021-05-24',202121,5,2021,24,21,202105,2021),('2021-05-25',202121,5,2021,25,21,202105,2021),('2021-05-26',202121,5,2021,26,21,202105,2021),('2021-05-27',202121,5,2021,27,21,202105,2021),('2021-05-28',202121,5,2021,28,21,202105,2021),('2021-05-29',202121,5,2021,29,21,202105,2021),('2021-05-30',202122,5,2021,30,22,202105,2021),('2021-05-31',202122,5,2021,31,22,202105,2021),('2021-06-01',202122,6,2021,1,22,202106,2021),('2021-06-02',202122,6,2021,2,22,202106,2021),('2021-06-03',202122,6,2021,3,22,202106,2021),('2021-06-04',202122,6,2021,4,22,202106,2021),('2021-06-05',202122,6,2021,5,22,202106,2021),('2021-06-06',202123,6,2021,6,23,202106,2021),('2021-06-07',202123,6,2021,7,23,202106,2021),('2021-06-08',202123,6,2021,8,23,202106,2021),('2021-06-09',202123,6,2021,9,23,202106,2021),('2021-06-10',202123,6,2021,10,23,202106,2021),('2021-06-11',202123,6,2021,11,23,202106,2021),('2021-06-12',202123,6,2021,12,23,202106,2021),('2021-06-13',202124,6,2021,13,24,202106,2021),('2021-06-14',202124,6,2021,14,24,202106,2021),('2021-06-15',202124,6,2021,15,24,202106,2021),('2021-06-16',202124,6,2021,16,24,202106,2021),('2021-06-17',202124,6,2021,17,24,202106,2021),('2021-06-18',202124,6,2021,18,24,202106,2021),('2021-06-19',202124,6,2021,19,24,202106,2021),('2021-06-20',202125,6,2021,20,25,202106,2021),('2021-06-21',202125,6,2021,21,25,202106,2021),('2021-06-22',202125,6,2021,22,25,202106,2021),('2021-06-23',202125,6,2021,23,25,202106,2021),('2021-06-24',202125,6,2021,24,25,202106,2021),('2021-06-25',202125,6,2021,25,25,202106,2021),('2021-06-26',202125,6,2021,26,25,202106,2021),('2021-06-27',202126,6,2021,27,26,202106,2021),('2021-06-28',202126,6,2021,28,26,202106,2021),('2021-06-29',202126,6,2021,29,26,202106,2021),('2021-06-30',202126,6,2021,30,26,202106,2021),('2021-07-01',202126,7,2021,1,26,202107,2021),('2021-07-02',202126,7,2021,2,26,202107,2021),('2021-07-03',202126,7,2021,3,26,202107,2021),('2021-07-04',202127,7,2021,4,27,202107,2021),('2021-07-05',202127,7,2021,5,27,202107,2021),('2021-07-06',202127,7,2021,6,27,202107,2021),('2021-07-07',202127,7,2021,7,27,202107,2021),('2021-07-08',202127,7,2021,8,27,202107,2021),('2021-07-09',202127,7,2021,9,27,202107,2021),('2021-07-10',202127,7,2021,10,27,202107,2021),('2021-07-11',202128,7,2021,11,28,202107,2021),('2021-07-12',202128,7,2021,12,28,202107,2021),('2021-07-13',202128,7,2021,13,28,202107,2021),('2021-07-14',202128,7,2021,14,28,202107,2021),('2021-07-15',202128,7,2021,15,28,202107,2021),('2021-07-16',202128,7,2021,16,28,202107,2021),('2021-07-17',202128,7,2021,17,28,202107,2021),('2021-07-18',202129,7,2021,18,29,202107,2021),('2021-07-19',202129,7,2021,19,29,202107,2021),('2021-07-20',202129,7,2021,20,29,202107,2021),('2021-07-21',202129,7,2021,21,29,202107,2021),('2021-07-22',202129,7,2021,22,29,202107,2021),('2021-07-23',202129,7,2021,23,29,202107,2021),('2021-07-24',202129,7,2021,24,29,202107,2021),('2021-07-25',202130,7,2021,25,30,202107,2021),('2021-07-26',202130,7,2021,26,30,202107,2021),('2021-07-27',202130,7,2021,27,30,202107,2021),('2021-07-28',202130,7,2021,28,30,202107,2021),('2021-07-29',202130,7,2021,29,30,202107,2021),('2021-07-30',202130,7,2021,30,30,202107,2021),('2021-07-31',202130,7,2021,31,30,202107,2021),('2021-08-01',202131,8,2021,1,31,202108,2021),('2021-08-02',202131,8,2021,2,31,202108,2021),('2021-08-03',202131,8,2021,3,31,202108,2021),('2021-08-04',202131,8,2021,4,31,202108,2021),('2021-08-05',202131,8,2021,5,31,202108,2021),('2021-08-06',202131,8,2021,6,31,202108,2021),('2021-08-07',202131,8,2021,7,31,202108,2021),('2021-08-08',202132,8,2021,8,32,202108,2021),('2021-08-09',202132,8,2021,9,32,202108,2021),('2021-08-10',202132,8,2021,10,32,202108,2021),('2021-08-11',202132,8,2021,11,32,202108,2021),('2021-08-12',202132,8,2021,12,32,202108,2021),('2021-08-13',202132,8,2021,13,32,202108,2021),('2021-08-14',202132,8,2021,14,32,202108,2021),('2021-08-15',202133,8,2021,15,33,202108,2021),('2021-08-16',202133,8,2021,16,33,202108,2021),('2021-08-17',202133,8,2021,17,33,202108,2021),('2021-08-18',202133,8,2021,18,33,202108,2021),('2021-08-19',202133,8,2021,19,33,202108,2021),('2021-08-20',202133,8,2021,20,33,202108,2021),('2021-08-21',202133,8,2021,21,33,202108,2021),('2021-08-22',202134,8,2021,22,34,202108,2021),('2021-08-23',202134,8,2021,23,34,202108,2021),('2021-08-24',202134,8,2021,24,34,202108,2021),('2021-08-25',202134,8,2021,25,34,202108,2021),('2021-08-26',202134,8,2021,26,34,202108,2021),('2021-08-27',202134,8,2021,27,34,202108,2021),('2021-08-28',202134,8,2021,28,34,202108,2021),('2021-08-29',202135,8,2021,29,35,202108,2021),('2021-08-30',202135,8,2021,30,35,202108,2021),('2021-08-31',202135,8,2021,31,35,202108,2021),('2021-09-01',202135,9,2021,1,35,202109,2021),('2021-09-02',202135,9,2021,2,35,202109,2021),('2021-09-03',202135,9,2021,3,35,202109,2021),('2021-09-04',202135,9,2021,4,35,202109,2021),('2021-09-05',202136,9,2021,5,36,202109,2021),('2021-09-06',202136,9,2021,6,36,202109,2021),('2021-09-07',202136,9,2021,7,36,202109,2021),('2021-09-08',202136,9,2021,8,36,202109,2021),('2021-09-09',202136,9,2021,9,36,202109,2021),('2021-09-10',202136,9,2021,10,36,202109,2021),('2021-09-11',202136,9,2021,11,36,202109,2021),('2021-09-12',202137,9,2021,12,37,202109,2021),('2021-09-13',202137,9,2021,13,37,202109,2021),('2021-09-14',202137,9,2021,14,37,202109,2021),('2021-09-15',202137,9,2021,15,37,202109,2021),('2021-09-16',202137,9,2021,16,37,202109,2021),('2021-09-17',202137,9,2021,17,37,202109,2021),('2021-09-18',202137,9,2021,18,37,202109,2021),('2021-09-19',202138,9,2021,19,38,202109,2021),('2021-09-20',202138,9,2021,20,38,202109,2021),('2021-09-21',202138,9,2021,21,38,202109,2021),('2021-09-22',202138,9,2021,22,38,202109,2021),('2021-09-23',202138,9,2021,23,38,202109,2021),('2021-09-24',202138,9,2021,24,38,202109,2021),('2021-09-25',202138,9,2021,25,38,202109,2021),('2021-09-26',202139,9,2021,26,39,202109,2021),('2021-09-27',202139,9,2021,27,39,202109,2021),('2021-09-28',202139,9,2021,28,39,202109,2021),('2021-09-29',202139,9,2021,29,39,202109,2021),('2021-09-30',202139,9,2021,30,39,202109,2021),('2021-10-01',202139,10,2021,1,39,202110,2021),('2021-10-02',202139,10,2021,2,39,202110,2021),('2021-10-03',202140,10,2021,3,40,202110,2021),('2021-10-04',202140,10,2021,4,40,202110,2021),('2021-10-05',202140,10,2021,5,40,202110,2021),('2021-10-06',202140,10,2021,6,40,202110,2021),('2021-10-07',202140,10,2021,7,40,202110,2021),('2021-10-08',202140,10,2021,8,40,202110,2021),('2021-10-09',202140,10,2021,9,40,202110,2021),('2021-10-10',202141,10,2021,10,41,202110,2021),('2021-10-11',202141,10,2021,11,41,202110,2021),('2021-10-12',202141,10,2021,12,41,202110,2021),('2021-10-13',202141,10,2021,13,41,202110,2021),('2021-10-14',202141,10,2021,14,41,202110,2021),('2021-10-15',202141,10,2021,15,41,202110,2021),('2021-10-16',202141,10,2021,16,41,202110,2021),('2021-10-17',202142,10,2021,17,42,202110,2021),('2021-10-18',202142,10,2021,18,42,202110,2021),('2021-10-19',202142,10,2021,19,42,202110,2021),('2021-10-20',202142,10,2021,20,42,202110,2021),('2021-10-21',202142,10,2021,21,42,202110,2021),('2021-10-22',202142,10,2021,22,42,202110,2021),('2021-10-23',202142,10,2021,23,42,202110,2021),('2021-10-24',202143,10,2021,24,43,202110,2021),('2021-10-25',202143,10,2021,25,43,202110,2021),('2021-10-26',202143,10,2021,26,43,202110,2021),('2021-10-27',202143,10,2021,27,43,202110,2021),('2021-10-28',202143,10,2021,28,43,202110,2021),('2021-10-29',202143,10,2021,29,43,202110,2021),('2021-10-30',202143,10,2021,30,43,202110,2021),('2021-10-31',202144,10,2021,31,44,202110,2021),('2021-11-01',202144,11,2021,1,44,202111,2021),('2021-11-02',202144,11,2021,2,44,202111,2021),('2021-11-03',202144,11,2021,3,44,202111,2021),('2021-11-04',202144,11,2021,4,44,202111,2021),('2021-11-05',202144,11,2021,5,44,202111,2021),('2021-11-06',202144,11,2021,6,44,202111,2021),('2021-11-07',202145,11,2021,7,45,202111,2021),('2021-11-08',202145,11,2021,8,45,202111,2021),('2021-11-09',202145,11,2021,9,45,202111,2021),('2021-11-10',202145,11,2021,10,45,202111,2021),('2021-11-11',202145,11,2021,11,45,202111,2021),('2021-11-12',202145,11,2021,12,45,202111,2021),('2021-11-13',202145,11,2021,13,45,202111,2021),('2021-11-14',202146,11,2021,14,46,202111,2021),('2021-11-15',202146,11,2021,15,46,202111,2021),('2021-11-16',202146,11,2021,16,46,202111,2021),('2021-11-17',202146,11,2021,17,46,202111,2021),('2021-11-18',202146,11,2021,18,46,202111,2021),('2021-11-19',202146,11,2021,19,46,202111,2021),('2021-11-20',202146,11,2021,20,46,202111,2021),('2021-11-21',202147,11,2021,21,47,202111,2021),('2021-11-22',202147,11,2021,22,47,202111,2021),('2021-11-23',202147,11,2021,23,47,202111,2021),('2021-11-24',202147,11,2021,24,47,202111,2021),('2021-11-25',202147,11,2021,25,47,202111,2021),('2021-11-26',202147,11,2021,26,47,202111,2021),('2021-11-27',202147,11,2021,27,47,202111,2021),('2021-11-28',202148,11,2021,28,48,202111,2021),('2021-11-29',202148,11,2021,29,48,202111,2021),('2021-11-30',202148,11,2021,30,48,202111,2021),('2021-12-01',202148,12,2021,1,48,202112,2022),('2021-12-02',202148,12,2021,2,48,202112,2022),('2021-12-03',202148,12,2021,3,48,202112,2022),('2021-12-04',202148,12,2021,4,48,202112,2022),('2021-12-05',202149,12,2021,5,49,202112,2022),('2021-12-06',202149,12,2021,6,49,202112,2022),('2021-12-07',202149,12,2021,7,49,202112,2022),('2021-12-08',202149,12,2021,8,49,202112,2022),('2021-12-09',202149,12,2021,9,49,202112,2022),('2021-12-10',202149,12,2021,10,49,202112,2022),('2021-12-11',202149,12,2021,11,49,202112,2022),('2021-12-12',202150,12,2021,12,50,202112,2022),('2021-12-13',202150,12,2021,13,50,202112,2022),('2021-12-14',202150,12,2021,14,50,202112,2022),('2021-12-15',202150,12,2021,15,50,202112,2022),('2021-12-16',202150,12,2021,16,50,202112,2022),('2021-12-17',202150,12,2021,17,50,202112,2022),('2021-12-18',202150,12,2021,18,50,202112,2022),('2021-12-19',202151,12,2021,19,51,202112,2022),('2021-12-20',202151,12,2021,20,51,202112,2022),('2021-12-21',202151,12,2021,21,51,202112,2022),('2021-12-22',202151,12,2021,22,51,202112,2022),('2021-12-23',202151,12,2021,23,51,202112,2022),('2021-12-24',202151,12,2021,24,51,202112,2022),('2021-12-25',202151,12,2021,25,51,202112,2022),('2021-12-26',202152,12,2021,26,52,202112,2022),('2021-12-27',202152,12,2021,27,52,202112,2022),('2021-12-28',202152,12,2021,28,52,202112,2022),('2021-12-29',202152,12,2021,29,52,202112,2022),('2021-12-30',202152,12,2021,30,52,202112,2022),('2021-12-31',202152,12,2021,31,52,202112,2022),('2022-01-01',202252,1,2022,1,52,202201,2022),('2022-01-02',202253,1,2022,2,1,202201,2022),('2022-01-03',202201,1,2022,3,1,202201,2022),('2022-01-04',202201,1,2022,4,1,202201,2022),('2022-01-05',202201,1,2022,5,1,202201,2022),('2022-01-06',202201,1,2022,6,1,202201,2022),('2022-01-07',202201,1,2022,7,1,202201,2022),('2022-01-08',202201,1,2022,8,1,202201,2022),('2022-01-09',202202,1,2022,9,2,202201,2022),('2022-01-10',202202,1,2022,10,2,202201,2022),('2022-01-11',202202,1,2022,11,2,202201,2022),('2022-01-12',202202,1,2022,12,2,202201,2022),('2022-01-13',202202,1,2022,13,2,202201,2022),('2022-01-14',202202,1,2022,14,2,202201,2022),('2022-01-15',202202,1,2022,15,2,202201,2022),('2022-01-16',202203,1,2022,16,3,202201,2022),('2022-01-17',202203,1,2022,17,3,202201,2022),('2022-01-18',202203,1,2022,18,3,202201,2022),('2022-01-19',202203,1,2022,19,3,202201,2022),('2022-01-20',202203,1,2022,20,3,202201,2022),('2022-01-21',202203,1,2022,21,3,202201,2022),('2022-01-22',202203,1,2022,22,3,202201,2022),('2022-01-23',202204,1,2022,23,4,202201,2022),('2022-01-24',202204,1,2022,24,4,202201,2022),('2022-01-25',202204,1,2022,25,4,202201,2022),('2022-01-26',202204,1,2022,26,4,202201,2022),('2022-01-27',202204,1,2022,27,4,202201,2022),('2022-01-28',202204,1,2022,28,4,202201,2022),('2022-01-29',202204,1,2022,29,4,202201,2022),('2022-01-30',202205,1,2022,30,5,202201,2022),('2022-01-31',202205,1,2022,31,5,202201,2022),('2022-02-01',202205,2,2022,1,5,202202,2022),('2022-02-02',202205,2,2022,2,5,202202,2022),('2022-02-03',202205,2,2022,3,5,202202,2022),('2022-02-04',202205,2,2022,4,5,202202,2022),('2022-02-05',202205,2,2022,5,5,202202,2022),('2022-02-06',202206,2,2022,6,6,202202,2022),('2022-02-07',202206,2,2022,7,6,202202,2022),('2022-02-08',202206,2,2022,8,6,202202,2022),('2022-02-09',202206,2,2022,9,6,202202,2022),('2022-02-10',202206,2,2022,10,6,202202,2022),('2022-02-11',202206,2,2022,11,6,202202,2022),('2022-02-12',202206,2,2022,12,6,202202,2022),('2022-02-13',202207,2,2022,13,7,202202,2022),('2022-02-14',202207,2,2022,14,7,202202,2022),('2022-02-15',202207,2,2022,15,7,202202,2022),('2022-02-16',202207,2,2022,16,7,202202,2022),('2022-02-17',202207,2,2022,17,7,202202,2022),('2022-02-18',202207,2,2022,18,7,202202,2022),('2022-02-19',202207,2,2022,19,7,202202,2022),('2022-02-20',202208,2,2022,20,8,202202,2022),('2022-02-21',202208,2,2022,21,8,202202,2022),('2022-02-22',202208,2,2022,22,8,202202,2022),('2022-02-23',202208,2,2022,23,8,202202,2022),('2022-02-24',202208,2,2022,24,8,202202,2022),('2022-02-25',202208,2,2022,25,8,202202,2022),('2022-02-26',202208,2,2022,26,8,202202,2022),('2022-02-27',202209,2,2022,27,9,202202,2022),('2022-02-28',202209,2,2022,28,9,202202,2022),('2022-03-01',202209,3,2022,1,9,202203,2022),('2022-03-02',202209,3,2022,2,9,202203,2022),('2022-03-03',202209,3,2022,3,9,202203,2022),('2022-03-04',202209,3,2022,4,9,202203,2022),('2022-03-05',202209,3,2022,5,9,202203,2022),('2022-03-06',202210,3,2022,6,10,202203,2022),('2022-03-07',202210,3,2022,7,10,202203,2022),('2022-03-08',202210,3,2022,8,10,202203,2022),('2022-03-09',202210,3,2022,9,10,202203,2022),('2022-03-10',202210,3,2022,10,10,202203,2022),('2022-03-11',202210,3,2022,11,10,202203,2022),('2022-03-12',202210,3,2022,12,10,202203,2022),('2022-03-13',202211,3,2022,13,11,202203,2022),('2022-03-14',202211,3,2022,14,11,202203,2022),('2022-03-15',202211,3,2022,15,11,202203,2022),('2022-03-16',202211,3,2022,16,11,202203,2022),('2022-03-17',202211,3,2022,17,11,202203,2022),('2022-03-18',202211,3,2022,18,11,202203,2022),('2022-03-19',202211,3,2022,19,11,202203,2022),('2022-03-20',202212,3,2022,20,12,202203,2022),('2022-03-21',202212,3,2022,21,12,202203,2022),('2022-03-22',202212,3,2022,22,12,202203,2022),('2022-03-23',202212,3,2022,23,12,202203,2022),('2022-03-24',202212,3,2022,24,12,202203,2022),('2022-03-25',202212,3,2022,25,12,202203,2022),('2022-03-26',202212,3,2022,26,12,202203,2022),('2022-03-27',202213,3,2022,27,13,202203,2022),('2022-03-28',202213,3,2022,28,13,202203,2022),('2022-03-29',202213,3,2022,29,13,202203,2022),('2022-03-30',202213,3,2022,30,13,202203,2022),('2022-03-31',202213,3,2022,31,13,202203,2022),('2022-04-01',202213,4,2022,1,13,202204,2022),('2022-04-02',202213,4,2022,2,13,202204,2022),('2022-04-03',202214,4,2022,3,14,202204,2022),('2022-04-04',202214,4,2022,4,14,202204,2022),('2022-04-05',202214,4,2022,5,14,202204,2022),('2022-04-06',202214,4,2022,6,14,202204,2022),('2022-04-07',202214,4,2022,7,14,202204,2022),('2022-04-08',202214,4,2022,8,14,202204,2022),('2022-04-09',202214,4,2022,9,14,202204,2022),('2022-04-10',202215,4,2022,10,15,202204,2022),('2022-04-11',202215,4,2022,11,15,202204,2022),('2022-04-12',202215,4,2022,12,15,202204,2022),('2022-04-13',202215,4,2022,13,15,202204,2022),('2022-04-14',202215,4,2022,14,15,202204,2022),('2022-04-15',202215,4,2022,15,15,202204,2022),('2022-04-16',202215,4,2022,16,15,202204,2022),('2022-04-17',202216,4,2022,17,16,202204,2022),('2022-04-18',202216,4,2022,18,16,202204,2022),('2022-04-19',202216,4,2022,19,16,202204,2022),('2022-04-20',202216,4,2022,20,16,202204,2022),('2022-04-21',202216,4,2022,21,16,202204,2022),('2022-04-22',202216,4,2022,22,16,202204,2022),('2022-04-23',202216,4,2022,23,16,202204,2022),('2022-04-24',202217,4,2022,24,17,202204,2022),('2022-04-25',202217,4,2022,25,17,202204,2022),('2022-04-26',202217,4,2022,26,17,202204,2022),('2022-04-27',202217,4,2022,27,17,202204,2022),('2022-04-28',202217,4,2022,28,17,202204,2022),('2022-04-29',202217,4,2022,29,17,202204,2022),('2022-04-30',202217,4,2022,30,17,202204,2022),('2022-05-01',202218,5,2022,1,18,202205,2022),('2022-05-02',202218,5,2022,2,18,202205,2022),('2022-05-03',202218,5,2022,3,18,202205,2022),('2022-05-04',202218,5,2022,4,18,202205,2022),('2022-05-05',202218,5,2022,5,18,202205,2022),('2022-05-06',202218,5,2022,6,18,202205,2022),('2022-05-07',202218,5,2022,7,18,202205,2022),('2022-05-08',202219,5,2022,8,19,202205,2022),('2022-05-09',202219,5,2022,9,19,202205,2022),('2022-05-10',202219,5,2022,10,19,202205,2022),('2022-05-11',202219,5,2022,11,19,202205,2022),('2022-05-12',202219,5,2022,12,19,202205,2022),('2022-05-13',202219,5,2022,13,19,202205,2022),('2022-05-14',202219,5,2022,14,19,202205,2022),('2022-05-15',202220,5,2022,15,20,202205,2022),('2022-05-16',202220,5,2022,16,20,202205,2022),('2022-05-17',202220,5,2022,17,20,202205,2022),('2022-05-18',202220,5,2022,18,20,202205,2022),('2022-05-19',202220,5,2022,19,20,202205,2022),('2022-05-20',202220,5,2022,20,20,202205,2022),('2022-05-21',202220,5,2022,21,20,202205,2022),('2022-05-22',202221,5,2022,22,21,202205,2022),('2022-05-23',202221,5,2022,23,21,202205,2022),('2022-05-24',202221,5,2022,24,21,202205,2022),('2022-05-25',202221,5,2022,25,21,202205,2022),('2022-05-26',202221,5,2022,26,21,202205,2022),('2022-05-27',202221,5,2022,27,21,202205,2022),('2022-05-28',202221,5,2022,28,21,202205,2022),('2022-05-29',202222,5,2022,29,22,202205,2022),('2022-05-30',202222,5,2022,30,22,202205,2022),('2022-05-31',202222,5,2022,31,22,202205,2022),('2022-06-01',202222,6,2022,1,22,202206,2022),('2022-06-02',202222,6,2022,2,22,202206,2022),('2022-06-03',202222,6,2022,3,22,202206,2022),('2022-06-04',202222,6,2022,4,22,202206,2022),('2022-06-05',202223,6,2022,5,23,202206,2022),('2022-06-06',202223,6,2022,6,23,202206,2022),('2022-06-07',202223,6,2022,7,23,202206,2022),('2022-06-08',202223,6,2022,8,23,202206,2022),('2022-06-09',202223,6,2022,9,23,202206,2022),('2022-06-10',202223,6,2022,10,23,202206,2022),('2022-06-11',202223,6,2022,11,23,202206,2022),('2022-06-12',202224,6,2022,12,24,202206,2022),('2022-06-13',202224,6,2022,13,24,202206,2022),('2022-06-14',202224,6,2022,14,24,202206,2022),('2022-06-15',202224,6,2022,15,24,202206,2022),('2022-06-16',202224,6,2022,16,24,202206,2022),('2022-06-17',202224,6,2022,17,24,202206,2022),('2022-06-18',202224,6,2022,18,24,202206,2022),('2022-06-19',202225,6,2022,19,25,202206,2022),('2022-06-20',202225,6,2022,20,25,202206,2022),('2022-06-21',202225,6,2022,21,25,202206,2022),('2022-06-22',202225,6,2022,22,25,202206,2022),('2022-06-23',202225,6,2022,23,25,202206,2022),('2022-06-24',202225,6,2022,24,25,202206,2022),('2022-06-25',202225,6,2022,25,25,202206,2022),('2022-06-26',202226,6,2022,26,26,202206,2022),('2022-06-27',202226,6,2022,27,26,202206,2022),('2022-06-28',202226,6,2022,28,26,202206,2022),('2022-06-29',202226,6,2022,29,26,202206,2022),('2022-06-30',202226,6,2022,30,26,202206,2022),('2022-07-01',202226,7,2022,1,26,202207,2022),('2022-07-02',202226,7,2022,2,26,202207,2022),('2022-07-03',202227,7,2022,3,27,202207,2022),('2022-07-04',202227,7,2022,4,27,202207,2022),('2022-07-05',202227,7,2022,5,27,202207,2022),('2022-07-06',202227,7,2022,6,27,202207,2022),('2022-07-07',202227,7,2022,7,27,202207,2022),('2022-07-08',202227,7,2022,8,27,202207,2022),('2022-07-09',202227,7,2022,9,27,202207,2022),('2022-07-10',202228,7,2022,10,28,202207,2022),('2022-07-11',202228,7,2022,11,28,202207,2022),('2022-07-12',202228,7,2022,12,28,202207,2022),('2022-07-13',202228,7,2022,13,28,202207,2022),('2022-07-14',202228,7,2022,14,28,202207,2022),('2022-07-15',202228,7,2022,15,28,202207,2022),('2022-07-16',202228,7,2022,16,28,202207,2022),('2022-07-17',202229,7,2022,17,29,202207,2022),('2022-07-18',202229,7,2022,18,29,202207,2022),('2022-07-19',202229,7,2022,19,29,202207,2022),('2022-07-20',202229,7,2022,20,29,202207,2022),('2022-07-21',202229,7,2022,21,29,202207,2022),('2022-07-22',202229,7,2022,22,29,202207,2022),('2022-07-23',202229,7,2022,23,29,202207,2022),('2022-07-24',202230,7,2022,24,30,202207,2022),('2022-07-25',202230,7,2022,25,30,202207,2022),('2022-07-26',202230,7,2022,26,30,202207,2022),('2022-07-27',202230,7,2022,27,30,202207,2022),('2022-07-28',202230,7,2022,28,30,202207,2022),('2022-07-29',202230,7,2022,29,30,202207,2022),('2022-07-30',202230,7,2022,30,30,202207,2022),('2022-07-31',202231,7,2022,31,31,202207,2022),('2022-08-01',202231,8,2022,1,31,202208,2022),('2022-08-02',202231,8,2022,2,31,202208,2022),('2022-08-03',202231,8,2022,3,31,202208,2022),('2022-08-04',202231,8,2022,4,31,202208,2022),('2022-08-05',202231,8,2022,5,31,202208,2022),('2022-08-06',202231,8,2022,6,31,202208,2022),('2022-08-07',202232,8,2022,7,32,202208,2022),('2022-08-08',202232,8,2022,8,32,202208,2022),('2022-08-09',202232,8,2022,9,32,202208,2022),('2022-08-10',202232,8,2022,10,32,202208,2022),('2022-08-11',202232,8,2022,11,32,202208,2022),('2022-08-12',202232,8,2022,12,32,202208,2022),('2022-08-13',202232,8,2022,13,32,202208,2022),('2022-08-14',202233,8,2022,14,33,202208,2022),('2022-08-15',202233,8,2022,15,33,202208,2022),('2022-08-16',202233,8,2022,16,33,202208,2022),('2022-08-17',202233,8,2022,17,33,202208,2022),('2022-08-18',202233,8,2022,18,33,202208,2022),('2022-08-19',202233,8,2022,19,33,202208,2022),('2022-08-20',202233,8,2022,20,33,202208,2022),('2022-08-21',202234,8,2022,21,34,202208,2022),('2022-08-22',202234,8,2022,22,34,202208,2022),('2022-08-23',202234,8,2022,23,34,202208,2022),('2022-08-24',202234,8,2022,24,34,202208,2022),('2022-08-25',202234,8,2022,25,34,202208,2022),('2022-08-26',202234,8,2022,26,34,202208,2022),('2022-08-27',202234,8,2022,27,34,202208,2022),('2022-08-28',202235,8,2022,28,35,202208,2022),('2022-08-29',202235,8,2022,29,35,202208,2022),('2022-08-30',202235,8,2022,30,35,202208,2022),('2022-08-31',202235,8,2022,31,35,202208,2022),('2022-09-01',202235,9,2022,1,35,202209,2022),('2022-09-02',202235,9,2022,2,35,202209,2022),('2022-09-03',202235,9,2022,3,35,202209,2022),('2022-09-04',202236,9,2022,4,36,202209,2022),('2022-09-05',202236,9,2022,5,36,202209,2022),('2022-09-06',202236,9,2022,6,36,202209,2022),('2022-09-07',202236,9,2022,7,36,202209,2022),('2022-09-08',202236,9,2022,8,36,202209,2022),('2022-09-09',202236,9,2022,9,36,202209,2022),('2022-09-10',202236,9,2022,10,36,202209,2022),('2022-09-11',202237,9,2022,11,37,202209,2022),('2022-09-12',202237,9,2022,12,37,202209,2022),('2022-09-13',202237,9,2022,13,37,202209,2022),('2022-09-14',202237,9,2022,14,37,202209,2022),('2022-09-15',202237,9,2022,15,37,202209,2022),('2022-09-16',202237,9,2022,16,37,202209,2022),('2022-09-17',202237,9,2022,17,37,202209,2022),('2022-09-18',202238,9,2022,18,38,202209,2022),('2022-09-19',202238,9,2022,19,38,202209,2022),('2022-09-20',202238,9,2022,20,38,202209,2022),('2022-09-21',202238,9,2022,21,38,202209,2022),('2022-09-22',202238,9,2022,22,38,202209,2022),('2022-09-23',202238,9,2022,23,38,202209,2022),('2022-09-24',202238,9,2022,24,38,202209,2022),('2022-09-25',202239,9,2022,25,39,202209,2022),('2022-09-26',202239,9,2022,26,39,202209,2022),('2022-09-27',202239,9,2022,27,39,202209,2022),('2022-09-28',202239,9,2022,28,39,202209,2022),('2022-09-29',202239,9,2022,29,39,202209,2022),('2022-09-30',202239,9,2022,30,39,202209,2022),('2022-10-01',202239,10,2022,1,39,202210,2022),('2022-10-02',202240,10,2022,2,40,202210,2022),('2022-10-03',202240,10,2022,3,40,202210,2022),('2022-10-04',202240,10,2022,4,40,202210,2022),('2022-10-05',202240,10,2022,5,40,202210,2022),('2022-10-06',202240,10,2022,6,40,202210,2022),('2022-10-07',202240,10,2022,7,40,202210,2022),('2022-10-08',202240,10,2022,8,40,202210,2022),('2022-10-09',202241,10,2022,9,41,202210,2022),('2022-10-10',202241,10,2022,10,41,202210,2022),('2022-10-11',202241,10,2022,11,41,202210,2022),('2022-10-12',202241,10,2022,12,41,202210,2022),('2022-10-13',202241,10,2022,13,41,202210,2022),('2022-10-14',202241,10,2022,14,41,202210,2022),('2022-10-15',202241,10,2022,15,41,202210,2022),('2022-10-16',202242,10,2022,16,42,202210,2022),('2022-10-17',202242,10,2022,17,42,202210,2022),('2022-10-18',202242,10,2022,18,42,202210,2022),('2022-10-19',202242,10,2022,19,42,202210,2022),('2022-10-20',202242,10,2022,20,42,202210,2022),('2022-10-21',202242,10,2022,21,42,202210,2022),('2022-10-22',202242,10,2022,22,42,202210,2022),('2022-10-23',202243,10,2022,23,43,202210,2022),('2022-10-24',202243,10,2022,24,43,202210,2022),('2022-10-25',202243,10,2022,25,43,202210,2022),('2022-10-26',202243,10,2022,26,43,202210,2022),('2022-10-27',202243,10,2022,27,43,202210,2022),('2022-10-28',202243,10,2022,28,43,202210,2022),('2022-10-29',202243,10,2022,29,43,202210,2022),('2022-10-30',202244,10,2022,30,44,202210,2022),('2022-10-31',202244,10,2022,31,44,202210,2022),('2022-11-01',202244,11,2022,1,44,202211,2022),('2022-11-02',202244,11,2022,2,44,202211,2022),('2022-11-03',202244,11,2022,3,44,202211,2022),('2022-11-04',202244,11,2022,4,44,202211,2022),('2022-11-05',202244,11,2022,5,44,202211,2022),('2022-11-06',202245,11,2022,6,45,202211,2022),('2022-11-07',202245,11,2022,7,45,202211,2022),('2022-11-08',202245,11,2022,8,45,202211,2022),('2022-11-09',202245,11,2022,9,45,202211,2022),('2022-11-10',202245,11,2022,10,45,202211,2022),('2022-11-11',202245,11,2022,11,45,202211,2022),('2022-11-12',202245,11,2022,12,45,202211,2022),('2022-11-13',202246,11,2022,13,46,202211,2022),('2022-11-14',202246,11,2022,14,46,202211,2022),('2022-11-15',202246,11,2022,15,46,202211,2022),('2022-11-16',202246,11,2022,16,46,202211,2022),('2022-11-17',202246,11,2022,17,46,202211,2022),('2022-11-18',202246,11,2022,18,46,202211,2022),('2022-11-19',202246,11,2022,19,46,202211,2022),('2022-11-20',202247,11,2022,20,47,202211,2022),('2022-11-21',202247,11,2022,21,47,202211,2022),('2022-11-22',202247,11,2022,22,47,202211,2022),('2022-11-23',202247,11,2022,23,47,202211,2022),('2022-11-24',202247,11,2022,24,47,202211,2022),('2022-11-25',202247,11,2022,25,47,202211,2022),('2022-11-26',202247,11,2022,26,47,202211,2022),('2022-11-27',202248,11,2022,27,48,202211,2022),('2022-11-28',202248,11,2022,28,48,202211,2022),('2022-11-29',202248,11,2022,29,48,202211,2022),('2022-11-30',202248,11,2022,30,48,202211,2022),('2022-12-01',202248,12,2022,1,48,202212,2023),('2022-12-02',202248,12,2022,2,48,202212,2023),('2022-12-03',202248,12,2022,3,48,202212,2023),('2022-12-04',202249,12,2022,4,49,202212,2023),('2022-12-05',202249,12,2022,5,49,202212,2023),('2022-12-06',202249,12,2022,6,49,202212,2023),('2022-12-07',202249,12,2022,7,49,202212,2023),('2022-12-08',202249,12,2022,8,49,202212,2023),('2022-12-09',202249,12,2022,9,49,202212,2023),('2022-12-10',202249,12,2022,10,49,202212,2023),('2022-12-11',202250,12,2022,11,50,202212,2023),('2022-12-12',202250,12,2022,12,50,202212,2023),('2022-12-13',202250,12,2022,13,50,202212,2023),('2022-12-14',202250,12,2022,14,50,202212,2023),('2022-12-15',202250,12,2022,15,50,202212,2023),('2022-12-16',202250,12,2022,16,50,202212,2023),('2022-12-17',202250,12,2022,17,50,202212,2023),('2022-12-18',202251,12,2022,18,51,202212,2023),('2022-12-19',202251,12,2022,19,51,202212,2023),('2022-12-20',202251,12,2022,20,51,202212,2023),('2022-12-21',202251,12,2022,21,51,202212,2023),('2022-12-22',202251,12,2022,22,51,202212,2023),('2022-12-23',202251,12,2022,23,51,202212,2023),('2022-12-24',202251,12,2022,24,51,202212,2023),('2022-12-25',202252,12,2022,25,52,202212,2023),('2022-12-26',202252,12,2022,26,52,202212,2023),('2022-12-27',202252,12,2022,27,52,202212,2023),('2022-12-28',202252,12,2022,28,52,202212,2023),('2022-12-29',202252,12,2022,29,52,202212,2023),('2022-12-30',202252,12,2022,30,52,202212,2023),('2022-12-31',202252,12,2022,31,52,202212,2023),('2023-01-01',202353,1,2023,1,1,202301,2023),('2023-01-02',202301,1,2023,2,1,202301,2023),('2023-01-03',202301,1,2023,3,1,202301,2023),('2023-01-04',202301,1,2023,4,1,202301,2023),('2023-01-05',202301,1,2023,5,1,202301,2023),('2023-01-06',202301,1,2023,6,1,202301,2023),('2023-01-07',202301,1,2023,7,1,202301,2023),('2023-01-08',202302,1,2023,8,2,202301,2023),('2023-01-09',202302,1,2023,9,2,202301,2023),('2023-01-10',202302,1,2023,10,2,202301,2023),('2023-01-11',202302,1,2023,11,2,202301,2023),('2023-01-12',202302,1,2023,12,2,202301,2023),('2023-01-13',202302,1,2023,13,2,202301,2023),('2023-01-14',202302,1,2023,14,2,202301,2023),('2023-01-15',202303,1,2023,15,3,202301,2023),('2023-01-16',202303,1,2023,16,3,202301,2023),('2023-01-17',202303,1,2023,17,3,202301,2023),('2023-01-18',202303,1,2023,18,3,202301,2023),('2023-01-19',202303,1,2023,19,3,202301,2023),('2023-01-20',202303,1,2023,20,3,202301,2023),('2023-01-21',202303,1,2023,21,3,202301,2023),('2023-01-22',202304,1,2023,22,4,202301,2023),('2023-01-23',202304,1,2023,23,4,202301,2023),('2023-01-24',202304,1,2023,24,4,202301,2023),('2023-01-25',202304,1,2023,25,4,202301,2023),('2023-01-26',202304,1,2023,26,4,202301,2023),('2023-01-27',202304,1,2023,27,4,202301,2023),('2023-01-28',202304,1,2023,28,4,202301,2023),('2023-01-29',202305,1,2023,29,5,202301,2023),('2023-01-30',202305,1,2023,30,5,202301,2023),('2023-01-31',202305,1,2023,31,5,202301,2023),('2023-02-01',202305,2,2023,1,5,202302,2023),('2023-02-02',202305,2,2023,2,5,202302,2023),('2023-02-03',202305,2,2023,3,5,202302,2023),('2023-02-04',202305,2,2023,4,5,202302,2023),('2023-02-05',202306,2,2023,5,6,202302,2023),('2023-02-06',202306,2,2023,6,6,202302,2023),('2023-02-07',202306,2,2023,7,6,202302,2023),('2023-02-08',202306,2,2023,8,6,202302,2023),('2023-02-09',202306,2,2023,9,6,202302,2023),('2023-02-10',202306,2,2023,10,6,202302,2023),('2023-02-11',202306,2,2023,11,6,202302,2023),('2023-02-12',202307,2,2023,12,7,202302,2023),('2023-02-13',202307,2,2023,13,7,202302,2023),('2023-02-14',202307,2,2023,14,7,202302,2023),('2023-02-15',202307,2,2023,15,7,202302,2023),('2023-02-16',202307,2,2023,16,7,202302,2023),('2023-02-17',202307,2,2023,17,7,202302,2023),('2023-02-18',202307,2,2023,18,7,202302,2023),('2023-02-19',202308,2,2023,19,8,202302,2023),('2023-02-20',202308,2,2023,20,8,202302,2023),('2023-02-21',202308,2,2023,21,8,202302,2023),('2023-02-22',202308,2,2023,22,8,202302,2023),('2023-02-23',202308,2,2023,23,8,202302,2023),('2023-02-24',202308,2,2023,24,8,202302,2023),('2023-02-25',202308,2,2023,25,8,202302,2023),('2023-02-26',202309,2,2023,26,9,202302,2023),('2023-02-27',202309,2,2023,27,9,202302,2023),('2023-02-28',202309,2,2023,28,9,202302,2023),('2023-03-01',202309,3,2023,1,9,202303,2023),('2023-03-02',202309,3,2023,2,9,202303,2023),('2023-03-03',202309,3,2023,3,9,202303,2023),('2023-03-04',202309,3,2023,4,9,202303,2023),('2023-03-05',202310,3,2023,5,10,202303,2023),('2023-03-06',202310,3,2023,6,10,202303,2023),('2023-03-07',202310,3,2023,7,10,202303,2023),('2023-03-08',202310,3,2023,8,10,202303,2023),('2023-03-09',202310,3,2023,9,10,202303,2023),('2023-03-10',202310,3,2023,10,10,202303,2023),('2023-03-11',202310,3,2023,11,10,202303,2023),('2023-03-12',202311,3,2023,12,11,202303,2023),('2023-03-13',202311,3,2023,13,11,202303,2023),('2023-03-14',202311,3,2023,14,11,202303,2023),('2023-03-15',202311,3,2023,15,11,202303,2023),('2023-03-16',202311,3,2023,16,11,202303,2023),('2023-03-17',202311,3,2023,17,11,202303,2023),('2023-03-18',202311,3,2023,18,11,202303,2023),('2023-03-19',202312,3,2023,19,12,202303,2023),('2023-03-20',202312,3,2023,20,12,202303,2023),('2023-03-21',202312,3,2023,21,12,202303,2023),('2023-03-22',202312,3,2023,22,12,202303,2023),('2023-03-23',202312,3,2023,23,12,202303,2023),('2023-03-24',202312,3,2023,24,12,202303,2023),('2023-03-25',202312,3,2023,25,12,202303,2023),('2023-03-26',202313,3,2023,26,13,202303,2023),('2023-03-27',202313,3,2023,27,13,202303,2023),('2023-03-28',202313,3,2023,28,13,202303,2023),('2023-03-29',202313,3,2023,29,13,202303,2023),('2023-03-30',202313,3,2023,30,13,202303,2023),('2023-03-31',202313,3,2023,31,13,202303,2023),('2023-04-01',202313,4,2023,1,13,202304,2023),('2023-04-02',202314,4,2023,2,14,202304,2023),('2023-04-03',202314,4,2023,3,14,202304,2023),('2023-04-04',202314,4,2023,4,14,202304,2023),('2023-04-05',202314,4,2023,5,14,202304,2023),('2023-04-06',202314,4,2023,6,14,202304,2023),('2023-04-07',202314,4,2023,7,14,202304,2023),('2023-04-08',202314,4,2023,8,14,202304,2023),('2023-04-09',202315,4,2023,9,15,202304,2023),('2023-04-10',202315,4,2023,10,15,202304,2023),('2023-04-11',202315,4,2023,11,15,202304,2023),('2023-04-12',202315,4,2023,12,15,202304,2023),('2023-04-13',202315,4,2023,13,15,202304,2023),('2023-04-14',202315,4,2023,14,15,202304,2023),('2023-04-15',202315,4,2023,15,15,202304,2023),('2023-04-16',202316,4,2023,16,16,202304,2023),('2023-04-17',202316,4,2023,17,16,202304,2023),('2023-04-18',202316,4,2023,18,16,202304,2023),('2023-04-19',202316,4,2023,19,16,202304,2023),('2023-04-20',202316,4,2023,20,16,202304,2023),('2023-04-21',202316,4,2023,21,16,202304,2023),('2023-04-22',202316,4,2023,22,16,202304,2023),('2023-04-23',202317,4,2023,23,17,202304,2023),('2023-04-24',202317,4,2023,24,17,202304,2023),('2023-04-25',202317,4,2023,25,17,202304,2023),('2023-04-26',202317,4,2023,26,17,202304,2023),('2023-04-27',202317,4,2023,27,17,202304,2023),('2023-04-28',202317,4,2023,28,17,202304,2023),('2023-04-29',202317,4,2023,29,17,202304,2023),('2023-04-30',202318,4,2023,30,18,202304,2023),('2023-05-01',202318,5,2023,1,18,202305,2023),('2023-05-02',202318,5,2023,2,18,202305,2023),('2023-05-03',202318,5,2023,3,18,202305,2023),('2023-05-04',202318,5,2023,4,18,202305,2023),('2023-05-05',202318,5,2023,5,18,202305,2023),('2023-05-06',202318,5,2023,6,18,202305,2023),('2023-05-07',202319,5,2023,7,19,202305,2023),('2023-05-08',202319,5,2023,8,19,202305,2023),('2023-05-09',202319,5,2023,9,19,202305,2023),('2023-05-10',202319,5,2023,10,19,202305,2023),('2023-05-11',202319,5,2023,11,19,202305,2023),('2023-05-12',202319,5,2023,12,19,202305,2023),('2023-05-13',202319,5,2023,13,19,202305,2023),('2023-05-14',202320,5,2023,14,20,202305,2023),('2023-05-15',202320,5,2023,15,20,202305,2023),('2023-05-16',202320,5,2023,16,20,202305,2023),('2023-05-17',202320,5,2023,17,20,202305,2023),('2023-05-18',202320,5,2023,18,20,202305,2023),('2023-05-19',202320,5,2023,19,20,202305,2023),('2023-05-20',202320,5,2023,20,20,202305,2023),('2023-05-21',202321,5,2023,21,21,202305,2023),('2023-05-22',202321,5,2023,22,21,202305,2023),('2023-05-23',202321,5,2023,23,21,202305,2023),('2023-05-24',202321,5,2023,24,21,202305,2023),('2023-05-25',202321,5,2023,25,21,202305,2023),('2023-05-26',202321,5,2023,26,21,202305,2023),('2023-05-27',202321,5,2023,27,21,202305,2023),('2023-05-28',202322,5,2023,28,22,202305,2023),('2023-05-29',202322,5,2023,29,22,202305,2023),('2023-05-30',202322,5,2023,30,22,202305,2023),('2023-05-31',202322,5,2023,31,22,202305,2023),('2023-06-01',202322,6,2023,1,22,202306,2023),('2023-06-02',202322,6,2023,2,22,202306,2023),('2023-06-03',202322,6,2023,3,22,202306,2023),('2023-06-04',202323,6,2023,4,23,202306,2023),('2023-06-05',202323,6,2023,5,23,202306,2023),('2023-06-06',202323,6,2023,6,23,202306,2023),('2023-06-07',202323,6,2023,7,23,202306,2023),('2023-06-08',202323,6,2023,8,23,202306,2023),('2023-06-09',202323,6,2023,9,23,202306,2023),('2023-06-10',202323,6,2023,10,23,202306,2023),('2023-06-11',202324,6,2023,11,24,202306,2023),('2023-06-12',202324,6,2023,12,24,202306,2023),('2023-06-13',202324,6,2023,13,24,202306,2023),('2023-06-14',202324,6,2023,14,24,202306,2023),('2023-06-15',202324,6,2023,15,24,202306,2023),('2023-06-16',202324,6,2023,16,24,202306,2023),('2023-06-17',202324,6,2023,17,24,202306,2023),('2023-06-18',202325,6,2023,18,25,202306,2023),('2023-06-19',202325,6,2023,19,25,202306,2023),('2023-06-20',202325,6,2023,20,25,202306,2023),('2023-06-21',202325,6,2023,21,25,202306,2023),('2023-06-22',202325,6,2023,22,25,202306,2023),('2023-06-23',202325,6,2023,23,25,202306,2023),('2023-06-24',202325,6,2023,24,25,202306,2023),('2023-06-25',202326,6,2023,25,26,202306,2023),('2023-06-26',202326,6,2023,26,26,202306,2023),('2023-06-27',202326,6,2023,27,26,202306,2023),('2023-06-28',202326,6,2023,28,26,202306,2023),('2023-06-29',202326,6,2023,29,26,202306,2023),('2023-06-30',202326,6,2023,30,26,202306,2023),('2023-07-01',202326,7,2023,1,26,202307,2023),('2023-07-02',202327,7,2023,2,27,202307,2023),('2023-07-03',202327,7,2023,3,27,202307,2023),('2023-07-04',202327,7,2023,4,27,202307,2023),('2023-07-05',202327,7,2023,5,27,202307,2023),('2023-07-06',202327,7,2023,6,27,202307,2023),('2023-07-07',202327,7,2023,7,27,202307,2023),('2023-07-08',202327,7,2023,8,27,202307,2023),('2023-07-09',202328,7,2023,9,28,202307,2023),('2023-07-10',202328,7,2023,10,28,202307,2023),('2023-07-11',202328,7,2023,11,28,202307,2023),('2023-07-12',202328,7,2023,12,28,202307,2023),('2023-07-13',202328,7,2023,13,28,202307,2023),('2023-07-14',202328,7,2023,14,28,202307,2023),('2023-07-15',202328,7,2023,15,28,202307,2023),('2023-07-16',202329,7,2023,16,29,202307,2023),('2023-07-17',202329,7,2023,17,29,202307,2023),('2023-07-18',202329,7,2023,18,29,202307,2023),('2023-07-19',202329,7,2023,19,29,202307,2023),('2023-07-20',202329,7,2023,20,29,202307,2023),('2023-07-21',202329,7,2023,21,29,202307,2023),('2023-07-22',202329,7,2023,22,29,202307,2023),('2023-07-23',202330,7,2023,23,30,202307,2023),('2023-07-24',202330,7,2023,24,30,202307,2023),('2023-07-25',202330,7,2023,25,30,202307,2023),('2023-07-26',202330,7,2023,26,30,202307,2023),('2023-07-27',202330,7,2023,27,30,202307,2023),('2023-07-28',202330,7,2023,28,30,202307,2023),('2023-07-29',202330,7,2023,29,30,202307,2023),('2023-07-30',202331,7,2023,30,31,202307,2023),('2023-07-31',202331,7,2023,31,31,202307,2023),('2023-08-01',202331,8,2023,1,31,202308,2023),('2023-08-02',202331,8,2023,2,31,202308,2023),('2023-08-03',202331,8,2023,3,31,202308,2023),('2023-08-04',202331,8,2023,4,31,202308,2023),('2023-08-05',202331,8,2023,5,31,202308,2023),('2023-08-06',202332,8,2023,6,32,202308,2023),('2023-08-07',202332,8,2023,7,32,202308,2023),('2023-08-08',202332,8,2023,8,32,202308,2023),('2023-08-09',202332,8,2023,9,32,202308,2023),('2023-08-10',202332,8,2023,10,32,202308,2023),('2023-08-11',202332,8,2023,11,32,202308,2023),('2023-08-12',202332,8,2023,12,32,202308,2023),('2023-08-13',202333,8,2023,13,33,202308,2023),('2023-08-14',202333,8,2023,14,33,202308,2023),('2023-08-15',202333,8,2023,15,33,202308,2023),('2023-08-16',202333,8,2023,16,33,202308,2023),('2023-08-17',202333,8,2023,17,33,202308,2023),('2023-08-18',202333,8,2023,18,33,202308,2023),('2023-08-19',202333,8,2023,19,33,202308,2023),('2023-08-20',202334,8,2023,20,34,202308,2023),('2023-08-21',202334,8,2023,21,34,202308,2023),('2023-08-22',202334,8,2023,22,34,202308,2023),('2023-08-23',202334,8,2023,23,34,202308,2023),('2023-08-24',202334,8,2023,24,34,202308,2023),('2023-08-25',202334,8,2023,25,34,202308,2023),('2023-08-26',202334,8,2023,26,34,202308,2023),('2023-08-27',202335,8,2023,27,35,202308,2023),('2023-08-28',202335,8,2023,28,35,202308,2023),('2023-08-29',202335,8,2023,29,35,202308,2023),('2023-08-30',202335,8,2023,30,35,202308,2023),('2023-08-31',202335,8,2023,31,35,202308,2023),('2023-09-01',202335,9,2023,1,35,202309,2023),('2023-09-02',202335,9,2023,2,35,202309,2023),('2023-09-03',202336,9,2023,3,36,202309,2023),('2023-09-04',202336,9,2023,4,36,202309,2023),('2023-09-05',202336,9,2023,5,36,202309,2023),('2023-09-06',202336,9,2023,6,36,202309,2023),('2023-09-07',202336,9,2023,7,36,202309,2023),('2023-09-08',202336,9,2023,8,36,202309,2023),('2023-09-09',202336,9,2023,9,36,202309,2023),('2023-09-10',202337,9,2023,10,37,202309,2023),('2023-09-11',202337,9,2023,11,37,202309,2023),('2023-09-12',202337,9,2023,12,37,202309,2023),('2023-09-13',202337,9,2023,13,37,202309,2023),('2023-09-14',202337,9,2023,14,37,202309,2023),('2023-09-15',202337,9,2023,15,37,202309,2023),('2023-09-16',202337,9,2023,16,37,202309,2023),('2023-09-17',202338,9,2023,17,38,202309,2023),('2023-09-18',202338,9,2023,18,38,202309,2023),('2023-09-19',202338,9,2023,19,38,202309,2023),('2023-09-20',202338,9,2023,20,38,202309,2023),('2023-09-21',202338,9,2023,21,38,202309,2023),('2023-09-22',202338,9,2023,22,38,202309,2023),('2023-09-23',202338,9,2023,23,38,202309,2023),('2023-09-24',202339,9,2023,24,39,202309,2023),('2023-09-25',202339,9,2023,25,39,202309,2023),('2023-09-26',202339,9,2023,26,39,202309,2023),('2023-09-27',202339,9,2023,27,39,202309,2023),('2023-09-28',202339,9,2023,28,39,202309,2023),('2023-09-29',202339,9,2023,29,39,202309,2023),('2023-09-30',202339,9,2023,30,39,202309,2023),('2023-10-01',202340,10,2023,1,40,202310,2023),('2023-10-02',202340,10,2023,2,40,202310,2023),('2023-10-03',202340,10,2023,3,40,202310,2023),('2023-10-04',202340,10,2023,4,40,202310,2023),('2023-10-05',202340,10,2023,5,40,202310,2023),('2023-10-06',202340,10,2023,6,40,202310,2023),('2023-10-07',202340,10,2023,7,40,202310,2023),('2023-10-08',202341,10,2023,8,41,202310,2023),('2023-10-09',202341,10,2023,9,41,202310,2023),('2023-10-10',202341,10,2023,10,41,202310,2023),('2023-10-11',202341,10,2023,11,41,202310,2023),('2023-10-12',202341,10,2023,12,41,202310,2023),('2023-10-13',202341,10,2023,13,41,202310,2023),('2023-10-14',202341,10,2023,14,41,202310,2023),('2023-10-15',202342,10,2023,15,42,202310,2023),('2023-10-16',202342,10,2023,16,42,202310,2023),('2023-10-17',202342,10,2023,17,42,202310,2023),('2023-10-18',202342,10,2023,18,42,202310,2023),('2023-10-19',202342,10,2023,19,42,202310,2023),('2023-10-20',202342,10,2023,20,42,202310,2023),('2023-10-21',202342,10,2023,21,42,202310,2023),('2023-10-22',202343,10,2023,22,43,202310,2023),('2023-10-23',202343,10,2023,23,43,202310,2023),('2023-10-24',202343,10,2023,24,43,202310,2023),('2023-10-25',202343,10,2023,25,43,202310,2023),('2023-10-26',202343,10,2023,26,43,202310,2023),('2023-10-27',202343,10,2023,27,43,202310,2023),('2023-10-28',202343,10,2023,28,43,202310,2023),('2023-10-29',202344,10,2023,29,44,202310,2023),('2023-10-30',202344,10,2023,30,44,202310,2023),('2023-10-31',202344,10,2023,31,44,202310,2023),('2023-11-01',202344,11,2023,1,44,202311,2023),('2023-11-02',202344,11,2023,2,44,202311,2023),('2023-11-03',202344,11,2023,3,44,202311,2023),('2023-11-04',202344,11,2023,4,44,202311,2023),('2023-11-05',202345,11,2023,5,45,202311,2023),('2023-11-06',202345,11,2023,6,45,202311,2023),('2023-11-07',202345,11,2023,7,45,202311,2023),('2023-11-08',202345,11,2023,8,45,202311,2023),('2023-11-09',202345,11,2023,9,45,202311,2023),('2023-11-10',202345,11,2023,10,45,202311,2023),('2023-11-11',202345,11,2023,11,45,202311,2023),('2023-11-12',202346,11,2023,12,46,202311,2023),('2023-11-13',202346,11,2023,13,46,202311,2023),('2023-11-14',202346,11,2023,14,46,202311,2023),('2023-11-15',202346,11,2023,15,46,202311,2023),('2023-11-16',202346,11,2023,16,46,202311,2023),('2023-11-17',202346,11,2023,17,46,202311,2023),('2023-11-18',202346,11,2023,18,46,202311,2023),('2023-11-19',202347,11,2023,19,47,202311,2023),('2023-11-20',202347,11,2023,20,47,202311,2023),('2023-11-21',202347,11,2023,21,47,202311,2023),('2023-11-22',202347,11,2023,22,47,202311,2023),('2023-11-23',202347,11,2023,23,47,202311,2023),('2023-11-24',202347,11,2023,24,47,202311,2023),('2023-11-25',202347,11,2023,25,47,202311,2023),('2023-11-26',202348,11,2023,26,48,202311,2023),('2023-11-27',202348,11,2023,27,48,202311,2023),('2023-11-28',202348,11,2023,28,48,202311,2023),('2023-11-29',202348,11,2023,29,48,202311,2023),('2023-11-30',202348,11,2023,30,48,202311,2023),('2023-12-01',202348,12,2023,1,48,202312,2024),('2023-12-02',202348,12,2023,2,48,202312,2024),('2023-12-03',202349,12,2023,3,49,202312,2024),('2023-12-04',202349,12,2023,4,49,202312,2024),('2023-12-05',202349,12,2023,5,49,202312,2024),('2023-12-06',202349,12,2023,6,49,202312,2024),('2023-12-07',202349,12,2023,7,49,202312,2024),('2023-12-08',202349,12,2023,8,49,202312,2024),('2023-12-09',202349,12,2023,9,49,202312,2024),('2023-12-10',202350,12,2023,10,50,202312,2024),('2023-12-11',202350,12,2023,11,50,202312,2024),('2023-12-12',202350,12,2023,12,50,202312,2024),('2023-12-13',202350,12,2023,13,50,202312,2024),('2023-12-14',202350,12,2023,14,50,202312,2024),('2023-12-15',202350,12,2023,15,50,202312,2024),('2023-12-16',202350,12,2023,16,50,202312,2024),('2023-12-17',202351,12,2023,17,51,202312,2024),('2023-12-18',202351,12,2023,18,51,202312,2024),('2023-12-19',202351,12,2023,19,51,202312,2024),('2023-12-20',202351,12,2023,20,51,202312,2024),('2023-12-21',202351,12,2023,21,51,202312,2024),('2023-12-22',202351,12,2023,22,51,202312,2024),('2023-12-23',202351,12,2023,23,51,202312,2024),('2023-12-24',202352,12,2023,24,52,202312,2024),('2023-12-25',202352,12,2023,25,52,202312,2024),('2023-12-26',202352,12,2023,26,52,202312,2024),('2023-12-27',202352,12,2023,27,52,202312,2024),('2023-12-28',202352,12,2023,28,52,202312,2024),('2023-12-29',202352,12,2023,29,52,202312,2024),('2023-12-30',202352,12,2023,30,52,202312,2024),('2023-12-31',202353,12,2023,31,1,202312,2024),('2024-01-01',202401,1,2024,1,1,202401,2024),('2024-01-02',202401,1,2024,2,1,202401,2024),('2024-01-03',202401,1,2024,3,1,202401,2024),('2024-01-04',202401,1,2024,4,1,202401,2024),('2024-01-05',202401,1,2024,5,1,202401,2024),('2024-01-06',202401,1,2024,6,1,202401,2024),('2024-01-07',202402,1,2024,7,2,202401,2024),('2024-01-08',202402,1,2024,8,2,202401,2024),('2024-01-09',202402,1,2024,9,2,202401,2024),('2024-01-10',202402,1,2024,10,2,202401,2024),('2024-01-11',202402,1,2024,11,2,202401,2024),('2024-01-12',202402,1,2024,12,2,202401,2024),('2024-01-13',202402,1,2024,13,2,202401,2024),('2024-01-14',202403,1,2024,14,3,202401,2024),('2024-01-15',202403,1,2024,15,3,202401,2024),('2024-01-16',202403,1,2024,16,3,202401,2024),('2024-01-17',202403,1,2024,17,3,202401,2024),('2024-01-18',202403,1,2024,18,3,202401,2024),('2024-01-19',202403,1,2024,19,3,202401,2024),('2024-01-20',202403,1,2024,20,3,202401,2024),('2024-01-21',202404,1,2024,21,4,202401,2024),('2024-01-22',202404,1,2024,22,4,202401,2024),('2024-01-23',202404,1,2024,23,4,202401,2024),('2024-01-24',202404,1,2024,24,4,202401,2024),('2024-01-25',202404,1,2024,25,4,202401,2024),('2024-01-26',202404,1,2024,26,4,202401,2024),('2024-01-27',202404,1,2024,27,4,202401,2024),('2024-01-28',202405,1,2024,28,5,202401,2024),('2024-01-29',202405,1,2024,29,5,202401,2024),('2024-01-30',202405,1,2024,30,5,202401,2024),('2024-01-31',202405,1,2024,31,5,202401,2024),('2024-02-01',202405,2,2024,1,5,202402,2024),('2024-02-02',202405,2,2024,2,5,202402,2024),('2024-02-03',202405,2,2024,3,5,202402,2024),('2024-02-04',202406,2,2024,4,6,202402,2024),('2024-02-05',202406,2,2024,5,6,202402,2024),('2024-02-06',202406,2,2024,6,6,202402,2024),('2024-02-07',202406,2,2024,7,6,202402,2024),('2024-02-08',202406,2,2024,8,6,202402,2024),('2024-02-09',202406,2,2024,9,6,202402,2024),('2024-02-10',202406,2,2024,10,6,202402,2024),('2024-02-11',202407,2,2024,11,7,202402,2024),('2024-02-12',202407,2,2024,12,7,202402,2024),('2024-02-13',202407,2,2024,13,7,202402,2024),('2024-02-14',202407,2,2024,14,7,202402,2024),('2024-02-15',202407,2,2024,15,7,202402,2024),('2024-02-16',202407,2,2024,16,7,202402,2024),('2024-02-17',202407,2,2024,17,7,202402,2024),('2024-02-18',202408,2,2024,18,8,202402,2024),('2024-02-19',202408,2,2024,19,8,202402,2024),('2024-02-20',202408,2,2024,20,8,202402,2024),('2024-02-21',202408,2,2024,21,8,202402,2024),('2024-02-22',202408,2,2024,22,8,202402,2024),('2024-02-23',202408,2,2024,23,8,202402,2024),('2024-02-24',202408,2,2024,24,8,202402,2024),('2024-02-25',202409,2,2024,25,9,202402,2024),('2024-02-26',202409,2,2024,26,9,202402,2024),('2024-02-27',202409,2,2024,27,9,202402,2024),('2024-02-28',202409,2,2024,28,9,202402,2024),('2024-02-29',202409,2,2024,29,9,202402,2024),('2024-03-01',202409,3,2024,1,9,202403,2024),('2024-03-02',202409,3,2024,2,9,202403,2024),('2024-03-03',202410,3,2024,3,10,202403,2024),('2024-03-04',202410,3,2024,4,10,202403,2024),('2024-03-05',202410,3,2024,5,10,202403,2024),('2024-03-06',202410,3,2024,6,10,202403,2024),('2024-03-07',202410,3,2024,7,10,202403,2024),('2024-03-08',202410,3,2024,8,10,202403,2024),('2024-03-09',202410,3,2024,9,10,202403,2024),('2024-03-10',202411,3,2024,10,11,202403,2024),('2024-03-11',202411,3,2024,11,11,202403,2024),('2024-03-12',202411,3,2024,12,11,202403,2024),('2024-03-13',202411,3,2024,13,11,202403,2024),('2024-03-14',202411,3,2024,14,11,202403,2024),('2024-03-15',202411,3,2024,15,11,202403,2024),('2024-03-16',202411,3,2024,16,11,202403,2024),('2024-03-17',202412,3,2024,17,12,202403,2024),('2024-03-18',202412,3,2024,18,12,202403,2024),('2024-03-19',202412,3,2024,19,12,202403,2024),('2024-03-20',202412,3,2024,20,12,202403,2024),('2024-03-21',202412,3,2024,21,12,202403,2024),('2024-03-22',202412,3,2024,22,12,202403,2024),('2024-03-23',202412,3,2024,23,12,202403,2024),('2024-03-24',202413,3,2024,24,13,202403,2024),('2024-03-25',202413,3,2024,25,13,202403,2024),('2024-03-26',202413,3,2024,26,13,202403,2024),('2024-03-27',202413,3,2024,27,13,202403,2024),('2024-03-28',202413,3,2024,28,13,202403,2024),('2024-03-29',202413,3,2024,29,13,202403,2024),('2024-03-30',202413,3,2024,30,13,202403,2024),('2024-03-31',202414,3,2024,31,14,202403,2024),('2024-04-01',202414,4,2024,1,14,202404,2024),('2024-04-02',202414,4,2024,2,14,202404,2024),('2024-04-03',202414,4,2024,3,14,202404,2024),('2024-04-04',202414,4,2024,4,14,202404,2024),('2024-04-05',202414,4,2024,5,14,202404,2024),('2024-04-06',202414,4,2024,6,14,202404,2024),('2024-04-07',202415,4,2024,7,15,202404,2024),('2024-04-08',202415,4,2024,8,15,202404,2024),('2024-04-09',202415,4,2024,9,15,202404,2024),('2024-04-10',202415,4,2024,10,15,202404,2024),('2024-04-11',202415,4,2024,11,15,202404,2024),('2024-04-12',202415,4,2024,12,15,202404,2024),('2024-04-13',202415,4,2024,13,15,202404,2024),('2024-04-14',202416,4,2024,14,16,202404,2024),('2024-04-15',202416,4,2024,15,16,202404,2024),('2024-04-16',202416,4,2024,16,16,202404,2024),('2024-04-17',202416,4,2024,17,16,202404,2024),('2024-04-18',202416,4,2024,18,16,202404,2024),('2024-04-19',202416,4,2024,19,16,202404,2024),('2024-04-20',202416,4,2024,20,16,202404,2024),('2024-04-21',202417,4,2024,21,17,202404,2024),('2024-04-22',202417,4,2024,22,17,202404,2024),('2024-04-23',202417,4,2024,23,17,202404,2024),('2024-04-24',202417,4,2024,24,17,202404,2024),('2024-04-25',202417,4,2024,25,17,202404,2024),('2024-04-26',202417,4,2024,26,17,202404,2024),('2024-04-27',202417,4,2024,27,17,202404,2024),('2024-04-28',202418,4,2024,28,18,202404,2024),('2024-04-29',202418,4,2024,29,18,202404,2024),('2024-04-30',202418,4,2024,30,18,202404,2024),('2024-05-01',202418,5,2024,1,18,202405,2024),('2024-05-02',202418,5,2024,2,18,202405,2024),('2024-05-03',202418,5,2024,3,18,202405,2024),('2024-05-04',202418,5,2024,4,18,202405,2024),('2024-05-05',202419,5,2024,5,19,202405,2024),('2024-05-06',202419,5,2024,6,19,202405,2024),('2024-05-07',202419,5,2024,7,19,202405,2024),('2024-05-08',202419,5,2024,8,19,202405,2024),('2024-05-09',202419,5,2024,9,19,202405,2024),('2024-05-10',202419,5,2024,10,19,202405,2024),('2024-05-11',202419,5,2024,11,19,202405,2024),('2024-05-12',202420,5,2024,12,20,202405,2024),('2024-05-13',202420,5,2024,13,20,202405,2024),('2024-05-14',202420,5,2024,14,20,202405,2024),('2024-05-15',202420,5,2024,15,20,202405,2024),('2024-05-16',202420,5,2024,16,20,202405,2024),('2024-05-17',202420,5,2024,17,20,202405,2024),('2024-05-18',202420,5,2024,18,20,202405,2024),('2024-05-19',202421,5,2024,19,21,202405,2024),('2024-05-20',202421,5,2024,20,21,202405,2024),('2024-05-21',202421,5,2024,21,21,202405,2024),('2024-05-22',202421,5,2024,22,21,202405,2024),('2024-05-23',202421,5,2024,23,21,202405,2024),('2024-05-24',202421,5,2024,24,21,202405,2024),('2024-05-25',202421,5,2024,25,21,202405,2024),('2024-05-26',202422,5,2024,26,22,202405,2024),('2024-05-27',202422,5,2024,27,22,202405,2024),('2024-05-28',202422,5,2024,28,22,202405,2024),('2024-05-29',202422,5,2024,29,22,202405,2024),('2024-05-30',202422,5,2024,30,22,202405,2024),('2024-05-31',202422,5,2024,31,22,202405,2024),('2024-06-01',202422,6,2024,1,22,202406,2024),('2024-06-02',202423,6,2024,2,23,202406,2024),('2024-06-03',202423,6,2024,3,23,202406,2024),('2024-06-04',202423,6,2024,4,23,202406,2024),('2024-06-05',202423,6,2024,5,23,202406,2024),('2024-06-06',202423,6,2024,6,23,202406,2024),('2024-06-07',202423,6,2024,7,23,202406,2024),('2024-06-08',202423,6,2024,8,23,202406,2024),('2024-06-09',202424,6,2024,9,24,202406,2024),('2024-06-10',202424,6,2024,10,24,202406,2024),('2024-06-11',202424,6,2024,11,24,202406,2024),('2024-06-12',202424,6,2024,12,24,202406,2024),('2024-06-13',202424,6,2024,13,24,202406,2024),('2024-06-14',202424,6,2024,14,24,202406,2024),('2024-06-15',202424,6,2024,15,24,202406,2024),('2024-06-16',202425,6,2024,16,25,202406,2024),('2024-06-17',202425,6,2024,17,25,202406,2024),('2024-06-18',202425,6,2024,18,25,202406,2024),('2024-06-19',202425,6,2024,19,25,202406,2024),('2024-06-20',202425,6,2024,20,25,202406,2024),('2024-06-21',202425,6,2024,21,25,202406,2024),('2024-06-22',202425,6,2024,22,25,202406,2024),('2024-06-23',202426,6,2024,23,26,202406,2024),('2024-06-24',202426,6,2024,24,26,202406,2024),('2024-06-25',202426,6,2024,25,26,202406,2024),('2024-06-26',202426,6,2024,26,26,202406,2024),('2024-06-27',202426,6,2024,27,26,202406,2024),('2024-06-28',202426,6,2024,28,26,202406,2024),('2024-06-29',202426,6,2024,29,26,202406,2024),('2024-06-30',202427,6,2024,30,27,202406,2024),('2024-07-01',202427,7,2024,1,27,202407,2024),('2024-07-02',202427,7,2024,2,27,202407,2024),('2024-07-03',202427,7,2024,3,27,202407,2024),('2024-07-04',202427,7,2024,4,27,202407,2024),('2024-07-05',202427,7,2024,5,27,202407,2024),('2024-07-06',202427,7,2024,6,27,202407,2024),('2024-07-07',202428,7,2024,7,28,202407,2024),('2024-07-08',202428,7,2024,8,28,202407,2024),('2024-07-09',202428,7,2024,9,28,202407,2024),('2024-07-10',202428,7,2024,10,28,202407,2024),('2024-07-11',202428,7,2024,11,28,202407,2024),('2024-07-12',202428,7,2024,12,28,202407,2024),('2024-07-13',202428,7,2024,13,28,202407,2024),('2024-07-14',202429,7,2024,14,29,202407,2024),('2024-07-15',202429,7,2024,15,29,202407,2024),('2024-07-16',202429,7,2024,16,29,202407,2024),('2024-07-17',202429,7,2024,17,29,202407,2024),('2024-07-18',202429,7,2024,18,29,202407,2024),('2024-07-19',202429,7,2024,19,29,202407,2024),('2024-07-20',202429,7,2024,20,29,202407,2024),('2024-07-21',202430,7,2024,21,30,202407,2024),('2024-07-22',202430,7,2024,22,30,202407,2024),('2024-07-23',202430,7,2024,23,30,202407,2024),('2024-07-24',202430,7,2024,24,30,202407,2024),('2024-07-25',202430,7,2024,25,30,202407,2024),('2024-07-26',202430,7,2024,26,30,202407,2024),('2024-07-27',202430,7,2024,27,30,202407,2024),('2024-07-28',202431,7,2024,28,31,202407,2024),('2024-07-29',202431,7,2024,29,31,202407,2024),('2024-07-30',202431,7,2024,30,31,202407,2024),('2024-07-31',202431,7,2024,31,31,202407,2024),('2024-08-01',202431,8,2024,1,31,202408,2024),('2024-08-02',202431,8,2024,2,31,202408,2024),('2024-08-03',202431,8,2024,3,31,202408,2024),('2024-08-04',202432,8,2024,4,32,202408,2024),('2024-08-05',202432,8,2024,5,32,202408,2024),('2024-08-06',202432,8,2024,6,32,202408,2024),('2024-08-07',202432,8,2024,7,32,202408,2024),('2024-08-08',202432,8,2024,8,32,202408,2024),('2024-08-09',202432,8,2024,9,32,202408,2024),('2024-08-10',202432,8,2024,10,32,202408,2024),('2024-08-11',202433,8,2024,11,33,202408,2024),('2024-08-12',202433,8,2024,12,33,202408,2024),('2024-08-13',202433,8,2024,13,33,202408,2024),('2024-08-14',202433,8,2024,14,33,202408,2024),('2024-08-15',202433,8,2024,15,33,202408,2024),('2024-08-16',202433,8,2024,16,33,202408,2024),('2024-08-17',202433,8,2024,17,33,202408,2024),('2024-08-18',202434,8,2024,18,34,202408,2024),('2024-08-19',202434,8,2024,19,34,202408,2024),('2024-08-20',202434,8,2024,20,34,202408,2024),('2024-08-21',202434,8,2024,21,34,202408,2024),('2024-08-22',202434,8,2024,22,34,202408,2024),('2024-08-23',202434,8,2024,23,34,202408,2024),('2024-08-24',202434,8,2024,24,34,202408,2024),('2024-08-25',202435,8,2024,25,35,202408,2024),('2024-08-26',202435,8,2024,26,35,202408,2024),('2024-08-27',202435,8,2024,27,35,202408,2024),('2024-08-28',202435,8,2024,28,35,202408,2024),('2024-08-29',202435,8,2024,29,35,202408,2024),('2024-08-30',202435,8,2024,30,35,202408,2024),('2024-08-31',202435,8,2024,31,35,202408,2024),('2024-09-01',202436,9,2024,1,36,202409,2024),('2024-09-02',202436,9,2024,2,36,202409,2024),('2024-09-03',202436,9,2024,3,36,202409,2024),('2024-09-04',202436,9,2024,4,36,202409,2024),('2024-09-05',202436,9,2024,5,36,202409,2024),('2024-09-06',202436,9,2024,6,36,202409,2024),('2024-09-07',202436,9,2024,7,36,202409,2024),('2024-09-08',202437,9,2024,8,37,202409,2024),('2024-09-09',202437,9,2024,9,37,202409,2024),('2024-09-10',202437,9,2024,10,37,202409,2024),('2024-09-11',202437,9,2024,11,37,202409,2024),('2024-09-12',202437,9,2024,12,37,202409,2024),('2024-09-13',202437,9,2024,13,37,202409,2024),('2024-09-14',202437,9,2024,14,37,202409,2024),('2024-09-15',202438,9,2024,15,38,202409,2024),('2024-09-16',202438,9,2024,16,38,202409,2024),('2024-09-17',202438,9,2024,17,38,202409,2024),('2024-09-18',202438,9,2024,18,38,202409,2024),('2024-09-19',202438,9,2024,19,38,202409,2024),('2024-09-20',202438,9,2024,20,38,202409,2024),('2024-09-21',202438,9,2024,21,38,202409,2024),('2024-09-22',202439,9,2024,22,39,202409,2024),('2024-09-23',202439,9,2024,23,39,202409,2024),('2024-09-24',202439,9,2024,24,39,202409,2024),('2024-09-25',202439,9,2024,25,39,202409,2024),('2024-09-26',202439,9,2024,26,39,202409,2024),('2024-09-27',202439,9,2024,27,39,202409,2024),('2024-09-28',202439,9,2024,28,39,202409,2024),('2024-09-29',202440,9,2024,29,40,202409,2024),('2024-09-30',202440,9,2024,30,40,202409,2024),('2024-10-01',202440,10,2024,1,40,202410,2024),('2024-10-02',202440,10,2024,2,40,202410,2024),('2024-10-03',202440,10,2024,3,40,202410,2024),('2024-10-04',202440,10,2024,4,40,202410,2024),('2024-10-05',202440,10,2024,5,40,202410,2024),('2024-10-06',202441,10,2024,6,41,202410,2024),('2024-10-07',202441,10,2024,7,41,202410,2024),('2024-10-08',202441,10,2024,8,41,202410,2024),('2024-10-09',202441,10,2024,9,41,202410,2024),('2024-10-10',202441,10,2024,10,41,202410,2024),('2024-10-11',202441,10,2024,11,41,202410,2024),('2024-10-12',202441,10,2024,12,41,202410,2024),('2024-10-13',202442,10,2024,13,42,202410,2024),('2024-10-14',202442,10,2024,14,42,202410,2024),('2024-10-15',202442,10,2024,15,42,202410,2024),('2024-10-16',202442,10,2024,16,42,202410,2024),('2024-10-17',202442,10,2024,17,42,202410,2024),('2024-10-18',202442,10,2024,18,42,202410,2024),('2024-10-19',202442,10,2024,19,42,202410,2024),('2024-10-20',202443,10,2024,20,43,202410,2024),('2024-10-21',202443,10,2024,21,43,202410,2024),('2024-10-22',202443,10,2024,22,43,202410,2024),('2024-10-23',202443,10,2024,23,43,202410,2024),('2024-10-24',202443,10,2024,24,43,202410,2024),('2024-10-25',202443,10,2024,25,43,202410,2024),('2024-10-26',202443,10,2024,26,43,202410,2024),('2024-10-27',202444,10,2024,27,44,202410,2024),('2024-10-28',202444,10,2024,28,44,202410,2024),('2024-10-29',202444,10,2024,29,44,202410,2024),('2024-10-30',202444,10,2024,30,44,202410,2024),('2024-10-31',202444,10,2024,31,44,202410,2024),('2024-11-01',202444,11,2024,1,44,202411,2024),('2024-11-02',202444,11,2024,2,44,202411,2024),('2024-11-03',202445,11,2024,3,45,202411,2024),('2024-11-04',202445,11,2024,4,45,202411,2024),('2024-11-05',202445,11,2024,5,45,202411,2024),('2024-11-06',202445,11,2024,6,45,202411,2024),('2024-11-07',202445,11,2024,7,45,202411,2024),('2024-11-08',202445,11,2024,8,45,202411,2024),('2024-11-09',202445,11,2024,9,45,202411,2024),('2024-11-10',202446,11,2024,10,46,202411,2024),('2024-11-11',202446,11,2024,11,46,202411,2024),('2024-11-12',202446,11,2024,12,46,202411,2024),('2024-11-13',202446,11,2024,13,46,202411,2024),('2024-11-14',202446,11,2024,14,46,202411,2024),('2024-11-15',202446,11,2024,15,46,202411,2024),('2024-11-16',202446,11,2024,16,46,202411,2024),('2024-11-17',202447,11,2024,17,47,202411,2024),('2024-11-18',202447,11,2024,18,47,202411,2024),('2024-11-19',202447,11,2024,19,47,202411,2024),('2024-11-20',202447,11,2024,20,47,202411,2024),('2024-11-21',202447,11,2024,21,47,202411,2024),('2024-11-22',202447,11,2024,22,47,202411,2024),('2024-11-23',202447,11,2024,23,47,202411,2024),('2024-11-24',202448,11,2024,24,48,202411,2024),('2024-11-25',202448,11,2024,25,48,202411,2024),('2024-11-26',202448,11,2024,26,48,202411,2024),('2024-11-27',202448,11,2024,27,48,202411,2024),('2024-11-28',202448,11,2024,28,48,202411,2024),('2024-11-29',202448,11,2024,29,48,202411,2024),('2024-11-30',202448,11,2024,30,48,202411,2024),('2024-12-01',202449,12,2024,1,49,202412,2025),('2024-12-02',202449,12,2024,2,49,202412,2025),('2024-12-03',202449,12,2024,3,49,202412,2025),('2024-12-04',202449,12,2024,4,49,202412,2025),('2024-12-05',202449,12,2024,5,49,202412,2025),('2024-12-06',202449,12,2024,6,49,202412,2025),('2024-12-07',202449,12,2024,7,49,202412,2025),('2024-12-08',202450,12,2024,8,50,202412,2025),('2024-12-09',202450,12,2024,9,50,202412,2025),('2024-12-10',202450,12,2024,10,50,202412,2025),('2024-12-11',202450,12,2024,11,50,202412,2025),('2024-12-12',202450,12,2024,12,50,202412,2025),('2024-12-13',202450,12,2024,13,50,202412,2025),('2024-12-14',202450,12,2024,14,50,202412,2025),('2024-12-15',202451,12,2024,15,51,202412,2025),('2024-12-16',202451,12,2024,16,51,202412,2025),('2024-12-17',202451,12,2024,17,51,202412,2025),('2024-12-18',202451,12,2024,18,51,202412,2025),('2024-12-19',202451,12,2024,19,51,202412,2025),('2024-12-20',202451,12,2024,20,51,202412,2025),('2024-12-21',202451,12,2024,21,51,202412,2025),('2024-12-22',202452,12,2024,22,52,202412,2025),('2024-12-23',202452,12,2024,23,52,202412,2025),('2024-12-24',202452,12,2024,24,52,202412,2025),('2024-12-25',202452,12,2024,25,52,202412,2025),('2024-12-26',202452,12,2024,26,52,202412,2025),('2024-12-27',202452,12,2024,27,52,202412,2025),('2024-12-28',202452,12,2024,28,52,202412,2025),('2024-12-29',202453,12,2024,29,1,202412,2025),('2024-12-30',202401,12,2024,30,1,202412,2025),('2024-12-31',202401,12,2024,31,1,202412,2025),('2025-01-01',202501,1,2025,1,1,202501,2025),('2025-01-02',202501,1,2025,2,1,202501,2025),('2025-01-03',202501,1,2025,3,1,202501,2025),('2025-01-04',202501,1,2025,4,1,202501,2025),('2025-01-05',202502,1,2025,5,2,202501,2025),('2025-01-06',202502,1,2025,6,2,202501,2025),('2025-01-07',202502,1,2025,7,2,202501,2025),('2025-01-08',202502,1,2025,8,2,202501,2025),('2025-01-09',202502,1,2025,9,2,202501,2025),('2025-01-10',202502,1,2025,10,2,202501,2025),('2025-01-11',202502,1,2025,11,2,202501,2025),('2025-01-12',202503,1,2025,12,3,202501,2025),('2025-01-13',202503,1,2025,13,3,202501,2025),('2025-01-14',202503,1,2025,14,3,202501,2025),('2025-01-15',202503,1,2025,15,3,202501,2025),('2025-01-16',202503,1,2025,16,3,202501,2025),('2025-01-17',202503,1,2025,17,3,202501,2025),('2025-01-18',202503,1,2025,18,3,202501,2025),('2025-01-19',202504,1,2025,19,4,202501,2025),('2025-01-20',202504,1,2025,20,4,202501,2025),('2025-01-21',202504,1,2025,21,4,202501,2025),('2025-01-22',202504,1,2025,22,4,202501,2025),('2025-01-23',202504,1,2025,23,4,202501,2025),('2025-01-24',202504,1,2025,24,4,202501,2025),('2025-01-25',202504,1,2025,25,4,202501,2025),('2025-01-26',202505,1,2025,26,5,202501,2025),('2025-01-27',202505,1,2025,27,5,202501,2025),('2025-01-28',202505,1,2025,28,5,202501,2025),('2025-01-29',202505,1,2025,29,5,202501,2025),('2025-01-30',202505,1,2025,30,5,202501,2025),('2025-01-31',202505,1,2025,31,5,202501,2025),('2025-02-01',202505,2,2025,1,5,202502,2025),('2025-02-02',202506,2,2025,2,6,202502,2025),('2025-02-03',202506,2,2025,3,6,202502,2025),('2025-02-04',202506,2,2025,4,6,202502,2025),('2025-02-05',202506,2,2025,5,6,202502,2025),('2025-02-06',202506,2,2025,6,6,202502,2025),('2025-02-07',202506,2,2025,7,6,202502,2025),('2025-02-08',202506,2,2025,8,6,202502,2025),('2025-02-09',202507,2,2025,9,7,202502,2025),('2025-02-10',202507,2,2025,10,7,202502,2025),('2025-02-11',202507,2,2025,11,7,202502,2025),('2025-02-12',202507,2,2025,12,7,202502,2025),('2025-02-13',202507,2,2025,13,7,202502,2025),('2025-02-14',202507,2,2025,14,7,202502,2025),('2025-02-15',202507,2,2025,15,7,202502,2025),('2025-02-16',202508,2,2025,16,8,202502,2025),('2025-02-17',202508,2,2025,17,8,202502,2025),('2025-02-18',202508,2,2025,18,8,202502,2025),('2025-02-19',202508,2,2025,19,8,202502,2025),('2025-02-20',202508,2,2025,20,8,202502,2025),('2025-02-21',202508,2,2025,21,8,202502,2025),('2025-02-22',202508,2,2025,22,8,202502,2025),('2025-02-23',202509,2,2025,23,9,202502,2025),('2025-02-24',202509,2,2025,24,9,202502,2025),('2025-02-25',202509,2,2025,25,9,202502,2025),('2025-02-26',202509,2,2025,26,9,202502,2025),('2025-02-27',202509,2,2025,27,9,202502,2025),('2025-02-28',202509,2,2025,28,9,202502,2025),('2025-03-01',202509,3,2025,1,9,202503,2025),('2025-03-02',202510,3,2025,2,10,202503,2025),('2025-03-03',202510,3,2025,3,10,202503,2025),('2025-03-04',202510,3,2025,4,10,202503,2025),('2025-03-05',202510,3,2025,5,10,202503,2025),('2025-03-06',202510,3,2025,6,10,202503,2025),('2025-03-07',202510,3,2025,7,10,202503,2025),('2025-03-08',202510,3,2025,8,10,202503,2025),('2025-03-09',202511,3,2025,9,11,202503,2025),('2025-03-10',202511,3,2025,10,11,202503,2025),('2025-03-11',202511,3,2025,11,11,202503,2025),('2025-03-12',202511,3,2025,12,11,202503,2025),('2025-03-13',202511,3,2025,13,11,202503,2025),('2025-03-14',202511,3,2025,14,11,202503,2025),('2025-03-15',202511,3,2025,15,11,202503,2025),('2025-03-16',202512,3,2025,16,12,202503,2025),('2025-03-17',202512,3,2025,17,12,202503,2025),('2025-03-18',202512,3,2025,18,12,202503,2025),('2025-03-19',202512,3,2025,19,12,202503,2025),('2025-03-20',202512,3,2025,20,12,202503,2025),('2025-03-21',202512,3,2025,21,12,202503,2025),('2025-03-22',202512,3,2025,22,12,202503,2025),('2025-03-23',202513,3,2025,23,13,202503,2025),('2025-03-24',202513,3,2025,24,13,202503,2025),('2025-03-25',202513,3,2025,25,13,202503,2025),('2025-03-26',202513,3,2025,26,13,202503,2025),('2025-03-27',202513,3,2025,27,13,202503,2025),('2025-03-28',202513,3,2025,28,13,202503,2025),('2025-03-29',202513,3,2025,29,13,202503,2025),('2025-03-30',202514,3,2025,30,14,202503,2025),('2025-03-31',202514,3,2025,31,14,202503,2025),('2025-04-01',202514,4,2025,1,14,202504,2025),('2025-04-02',202514,4,2025,2,14,202504,2025),('2025-04-03',202514,4,2025,3,14,202504,2025),('2025-04-04',202514,4,2025,4,14,202504,2025),('2025-04-05',202514,4,2025,5,14,202504,2025),('2025-04-06',202515,4,2025,6,15,202504,2025),('2025-04-07',202515,4,2025,7,15,202504,2025),('2025-04-08',202515,4,2025,8,15,202504,2025),('2025-04-09',202515,4,2025,9,15,202504,2025),('2025-04-10',202515,4,2025,10,15,202504,2025),('2025-04-11',202515,4,2025,11,15,202504,2025),('2025-04-12',202515,4,2025,12,15,202504,2025),('2025-04-13',202516,4,2025,13,16,202504,2025),('2025-04-14',202516,4,2025,14,16,202504,2025),('2025-04-15',202516,4,2025,15,16,202504,2025),('2025-04-16',202516,4,2025,16,16,202504,2025),('2025-04-17',202516,4,2025,17,16,202504,2025),('2025-04-18',202516,4,2025,18,16,202504,2025),('2025-04-19',202516,4,2025,19,16,202504,2025),('2025-04-20',202517,4,2025,20,17,202504,2025),('2025-04-21',202517,4,2025,21,17,202504,2025),('2025-04-22',202517,4,2025,22,17,202504,2025),('2025-04-23',202517,4,2025,23,17,202504,2025),('2025-04-24',202517,4,2025,24,17,202504,2025),('2025-04-25',202517,4,2025,25,17,202504,2025),('2025-04-26',202517,4,2025,26,17,202504,2025),('2025-04-27',202518,4,2025,27,18,202504,2025),('2025-04-28',202518,4,2025,28,18,202504,2025),('2025-04-29',202518,4,2025,29,18,202504,2025),('2025-04-30',202518,4,2025,30,18,202504,2025),('2025-05-01',202518,5,2025,1,18,202505,2025),('2025-05-02',202518,5,2025,2,18,202505,2025),('2025-05-03',202518,5,2025,3,18,202505,2025),('2025-05-04',202519,5,2025,4,19,202505,2025),('2025-05-05',202519,5,2025,5,19,202505,2025),('2025-05-06',202519,5,2025,6,19,202505,2025),('2025-05-07',202519,5,2025,7,19,202505,2025),('2025-05-08',202519,5,2025,8,19,202505,2025),('2025-05-09',202519,5,2025,9,19,202505,2025),('2025-05-10',202519,5,2025,10,19,202505,2025),('2025-05-11',202520,5,2025,11,20,202505,2025),('2025-05-12',202520,5,2025,12,20,202505,2025),('2025-05-13',202520,5,2025,13,20,202505,2025),('2025-05-14',202520,5,2025,14,20,202505,2025),('2025-05-15',202520,5,2025,15,20,202505,2025),('2025-05-16',202520,5,2025,16,20,202505,2025),('2025-05-17',202520,5,2025,17,20,202505,2025),('2025-05-18',202521,5,2025,18,21,202505,2025),('2025-05-19',202521,5,2025,19,21,202505,2025),('2025-05-20',202521,5,2025,20,21,202505,2025),('2025-05-21',202521,5,2025,21,21,202505,2025),('2025-05-22',202521,5,2025,22,21,202505,2025),('2025-05-23',202521,5,2025,23,21,202505,2025),('2025-05-24',202521,5,2025,24,21,202505,2025),('2025-05-25',202522,5,2025,25,22,202505,2025),('2025-05-26',202522,5,2025,26,22,202505,2025),('2025-05-27',202522,5,2025,27,22,202505,2025),('2025-05-28',202522,5,2025,28,22,202505,2025),('2025-05-29',202522,5,2025,29,22,202505,2025),('2025-05-30',202522,5,2025,30,22,202505,2025),('2025-05-31',202522,5,2025,31,22,202505,2025),('2025-06-01',202523,6,2025,1,23,202506,2025),('2025-06-02',202523,6,2025,2,23,202506,2025),('2025-06-03',202523,6,2025,3,23,202506,2025),('2025-06-04',202523,6,2025,4,23,202506,2025),('2025-06-05',202523,6,2025,5,23,202506,2025),('2025-06-06',202523,6,2025,6,23,202506,2025),('2025-06-07',202523,6,2025,7,23,202506,2025),('2025-06-08',202524,6,2025,8,24,202506,2025),('2025-06-09',202524,6,2025,9,24,202506,2025),('2025-06-10',202524,6,2025,10,24,202506,2025),('2025-06-11',202524,6,2025,11,24,202506,2025),('2025-06-12',202524,6,2025,12,24,202506,2025),('2025-06-13',202524,6,2025,13,24,202506,2025),('2025-06-14',202524,6,2025,14,24,202506,2025),('2025-06-15',202525,6,2025,15,25,202506,2025),('2025-06-16',202525,6,2025,16,25,202506,2025),('2025-06-17',202525,6,2025,17,25,202506,2025),('2025-06-18',202525,6,2025,18,25,202506,2025),('2025-06-19',202525,6,2025,19,25,202506,2025),('2025-06-20',202525,6,2025,20,25,202506,2025),('2025-06-21',202525,6,2025,21,25,202506,2025),('2025-06-22',202526,6,2025,22,26,202506,2025),('2025-06-23',202526,6,2025,23,26,202506,2025),('2025-06-24',202526,6,2025,24,26,202506,2025),('2025-06-25',202526,6,2025,25,26,202506,2025),('2025-06-26',202526,6,2025,26,26,202506,2025),('2025-06-27',202526,6,2025,27,26,202506,2025),('2025-06-28',202526,6,2025,28,26,202506,2025),('2025-06-29',202527,6,2025,29,27,202506,2025),('2025-06-30',202527,6,2025,30,27,202506,2025),('2025-07-01',202527,7,2025,1,27,202507,2025),('2025-07-02',202527,7,2025,2,27,202507,2025),('2025-07-03',202527,7,2025,3,27,202507,2025),('2025-07-04',202527,7,2025,4,27,202507,2025),('2025-07-05',202527,7,2025,5,27,202507,2025),('2025-07-06',202528,7,2025,6,28,202507,2025),('2025-07-07',202528,7,2025,7,28,202507,2025),('2025-07-08',202528,7,2025,8,28,202507,2025),('2025-07-09',202528,7,2025,9,28,202507,2025),('2025-07-10',202528,7,2025,10,28,202507,2025),('2025-07-11',202528,7,2025,11,28,202507,2025),('2025-07-12',202528,7,2025,12,28,202507,2025),('2025-07-13',202529,7,2025,13,29,202507,2025),('2025-07-14',202529,7,2025,14,29,202507,2025),('2025-07-15',202529,7,2025,15,29,202507,2025),('2025-07-16',202529,7,2025,16,29,202507,2025),('2025-07-17',202529,7,2025,17,29,202507,2025),('2025-07-18',202529,7,2025,18,29,202507,2025),('2025-07-19',202529,7,2025,19,29,202507,2025),('2025-07-20',202530,7,2025,20,30,202507,2025),('2025-07-21',202530,7,2025,21,30,202507,2025),('2025-07-22',202530,7,2025,22,30,202507,2025),('2025-07-23',202530,7,2025,23,30,202507,2025),('2025-07-24',202530,7,2025,24,30,202507,2025),('2025-07-25',202530,7,2025,25,30,202507,2025),('2025-07-26',202530,7,2025,26,30,202507,2025),('2025-07-27',202531,7,2025,27,31,202507,2025),('2025-07-28',202531,7,2025,28,31,202507,2025),('2025-07-29',202531,7,2025,29,31,202507,2025),('2025-07-30',202531,7,2025,30,31,202507,2025),('2025-07-31',202531,7,2025,31,31,202507,2025),('2025-08-01',202531,8,2025,1,31,202508,2025),('2025-08-02',202531,8,2025,2,31,202508,2025),('2025-08-03',202532,8,2025,3,32,202508,2025),('2025-08-04',202532,8,2025,4,32,202508,2025),('2025-08-05',202532,8,2025,5,32,202508,2025),('2025-08-06',202532,8,2025,6,32,202508,2025),('2025-08-07',202532,8,2025,7,32,202508,2025),('2025-08-08',202532,8,2025,8,32,202508,2025),('2025-08-09',202532,8,2025,9,32,202508,2025),('2025-08-10',202533,8,2025,10,33,202508,2025),('2025-08-11',202533,8,2025,11,33,202508,2025),('2025-08-12',202533,8,2025,12,33,202508,2025),('2025-08-13',202533,8,2025,13,33,202508,2025),('2025-08-14',202533,8,2025,14,33,202508,2025),('2025-08-15',202533,8,2025,15,33,202508,2025),('2025-08-16',202533,8,2025,16,33,202508,2025),('2025-08-17',202534,8,2025,17,34,202508,2025),('2025-08-18',202534,8,2025,18,34,202508,2025),('2025-08-19',202534,8,2025,19,34,202508,2025),('2025-08-20',202534,8,2025,20,34,202508,2025),('2025-08-21',202534,8,2025,21,34,202508,2025),('2025-08-22',202534,8,2025,22,34,202508,2025),('2025-08-23',202534,8,2025,23,34,202508,2025),('2025-08-24',202535,8,2025,24,35,202508,2025),('2025-08-25',202535,8,2025,25,35,202508,2025),('2025-08-26',202535,8,2025,26,35,202508,2025),('2025-08-27',202535,8,2025,27,35,202508,2025),('2025-08-28',202535,8,2025,28,35,202508,2025),('2025-08-29',202535,8,2025,29,35,202508,2025),('2025-08-30',202535,8,2025,30,35,202508,2025),('2025-08-31',202536,8,2025,31,36,202508,2025),('2025-09-01',202536,9,2025,1,36,202509,2025),('2025-09-02',202536,9,2025,2,36,202509,2025),('2025-09-03',202536,9,2025,3,36,202509,2025),('2025-09-04',202536,9,2025,4,36,202509,2025),('2025-09-05',202536,9,2025,5,36,202509,2025),('2025-09-06',202536,9,2025,6,36,202509,2025),('2025-09-07',202537,9,2025,7,37,202509,2025),('2025-09-08',202537,9,2025,8,37,202509,2025),('2025-09-09',202537,9,2025,9,37,202509,2025),('2025-09-10',202537,9,2025,10,37,202509,2025),('2025-09-11',202537,9,2025,11,37,202509,2025),('2025-09-12',202537,9,2025,12,37,202509,2025),('2025-09-13',202537,9,2025,13,37,202509,2025),('2025-09-14',202538,9,2025,14,38,202509,2025),('2025-09-15',202538,9,2025,15,38,202509,2025),('2025-09-16',202538,9,2025,16,38,202509,2025),('2025-09-17',202538,9,2025,17,38,202509,2025),('2025-09-18',202538,9,2025,18,38,202509,2025),('2025-09-19',202538,9,2025,19,38,202509,2025),('2025-09-20',202538,9,2025,20,38,202509,2025),('2025-09-21',202539,9,2025,21,39,202509,2025),('2025-09-22',202539,9,2025,22,39,202509,2025),('2025-09-23',202539,9,2025,23,39,202509,2025),('2025-09-24',202539,9,2025,24,39,202509,2025),('2025-09-25',202539,9,2025,25,39,202509,2025),('2025-09-26',202539,9,2025,26,39,202509,2025),('2025-09-27',202539,9,2025,27,39,202509,2025),('2025-09-28',202540,9,2025,28,40,202509,2025),('2025-09-29',202540,9,2025,29,40,202509,2025),('2025-09-30',202540,9,2025,30,40,202509,2025),('2025-10-01',202540,10,2025,1,40,202510,2025),('2025-10-02',202540,10,2025,2,40,202510,2025),('2025-10-03',202540,10,2025,3,40,202510,2025),('2025-10-04',202540,10,2025,4,40,202510,2025),('2025-10-05',202541,10,2025,5,41,202510,2025),('2025-10-06',202541,10,2025,6,41,202510,2025),('2025-10-07',202541,10,2025,7,41,202510,2025),('2025-10-08',202541,10,2025,8,41,202510,2025),('2025-10-09',202541,10,2025,9,41,202510,2025),('2025-10-10',202541,10,2025,10,41,202510,2025),('2025-10-11',202541,10,2025,11,41,202510,2025),('2025-10-12',202542,10,2025,12,42,202510,2025),('2025-10-13',202542,10,2025,13,42,202510,2025),('2025-10-14',202542,10,2025,14,42,202510,2025),('2025-10-15',202542,10,2025,15,42,202510,2025),('2025-10-16',202542,10,2025,16,42,202510,2025),('2025-10-17',202542,10,2025,17,42,202510,2025),('2025-10-18',202542,10,2025,18,42,202510,2025),('2025-10-19',202543,10,2025,19,43,202510,2025),('2025-10-20',202543,10,2025,20,43,202510,2025),('2025-10-21',202543,10,2025,21,43,202510,2025),('2025-10-22',202543,10,2025,22,43,202510,2025),('2025-10-23',202543,10,2025,23,43,202510,2025),('2025-10-24',202543,10,2025,24,43,202510,2025),('2025-10-25',202543,10,2025,25,43,202510,2025),('2025-10-26',202544,10,2025,26,44,202510,2025),('2025-10-27',202544,10,2025,27,44,202510,2025),('2025-10-28',202544,10,2025,28,44,202510,2025),('2025-10-29',202544,10,2025,29,44,202510,2025),('2025-10-30',202544,10,2025,30,44,202510,2025),('2025-10-31',202544,10,2025,31,44,202510,2025),('2025-11-01',202544,11,2025,1,44,202511,2025),('2025-11-02',202545,11,2025,2,45,202511,2025),('2025-11-03',202545,11,2025,3,45,202511,2025),('2025-11-04',202545,11,2025,4,45,202511,2025),('2025-11-05',202545,11,2025,5,45,202511,2025),('2025-11-06',202545,11,2025,6,45,202511,2025),('2025-11-07',202545,11,2025,7,45,202511,2025),('2025-11-08',202545,11,2025,8,45,202511,2025),('2025-11-09',202546,11,2025,9,46,202511,2025),('2025-11-10',202546,11,2025,10,46,202511,2025),('2025-11-11',202546,11,2025,11,46,202511,2025),('2025-11-12',202546,11,2025,12,46,202511,2025),('2025-11-13',202546,11,2025,13,46,202511,2025),('2025-11-14',202546,11,2025,14,46,202511,2025),('2025-11-15',202546,11,2025,15,46,202511,2025),('2025-11-16',202547,11,2025,16,47,202511,2025),('2025-11-17',202547,11,2025,17,47,202511,2025),('2025-11-18',202547,11,2025,18,47,202511,2025),('2025-11-19',202547,11,2025,19,47,202511,2025),('2025-11-20',202547,11,2025,20,47,202511,2025),('2025-11-21',202547,11,2025,21,47,202511,2025),('2025-11-22',202547,11,2025,22,47,202511,2025),('2025-11-23',202548,11,2025,23,48,202511,2025),('2025-11-24',202548,11,2025,24,48,202511,2025),('2025-11-25',202548,11,2025,25,48,202511,2025),('2025-11-26',202548,11,2025,26,48,202511,2025),('2025-11-27',202548,11,2025,27,48,202511,2025),('2025-11-28',202548,11,2025,28,48,202511,2025),('2025-11-29',202548,11,2025,29,48,202511,2025),('2025-11-30',202549,11,2025,30,49,202511,2025),('2025-12-01',202549,12,2025,1,49,202512,2026),('2025-12-02',202549,12,2025,2,49,202512,2026),('2025-12-03',202549,12,2025,3,49,202512,2026),('2025-12-04',202549,12,2025,4,49,202512,2026),('2025-12-05',202549,12,2025,5,49,202512,2026),('2025-12-06',202549,12,2025,6,49,202512,2026),('2025-12-07',202550,12,2025,7,50,202512,2026),('2025-12-08',202550,12,2025,8,50,202512,2026),('2025-12-09',202550,12,2025,9,50,202512,2026),('2025-12-10',202550,12,2025,10,50,202512,2026),('2025-12-11',202550,12,2025,11,50,202512,2026),('2025-12-12',202550,12,2025,12,50,202512,2026),('2025-12-13',202550,12,2025,13,50,202512,2026),('2025-12-14',202551,12,2025,14,51,202512,2026),('2025-12-15',202551,12,2025,15,51,202512,2026),('2025-12-16',202551,12,2025,16,51,202512,2026),('2025-12-17',202551,12,2025,17,51,202512,2026),('2025-12-18',202551,12,2025,18,51,202512,2026),('2025-12-19',202551,12,2025,19,51,202512,2026),('2025-12-20',202551,12,2025,20,51,202512,2026),('2025-12-21',202552,12,2025,21,52,202512,2026),('2025-12-22',202552,12,2025,22,52,202512,2026),('2025-12-23',202552,12,2025,23,52,202512,2026),('2025-12-24',202552,12,2025,24,52,202512,2026),('2025-12-25',202552,12,2025,25,52,202512,2026),('2025-12-26',202552,12,2025,26,52,202512,2026),('2025-12-27',202552,12,2025,27,52,202512,2026),('2025-12-28',202553,12,2025,28,53,202512,2026),('2025-12-29',202501,12,2025,29,53,202512,2026),('2025-12-30',202501,12,2025,30,53,202512,2026),('2025-12-31',202501,12,2025,31,53,202512,2026),('2026-01-01',202601,1,2026,1,53,202601,2026),('2026-01-02',202601,1,2026,2,53,202601,2026),('2026-01-03',202601,1,2026,3,53,202601,2026),('2026-01-04',202602,1,2026,4,1,202601,2026),('2026-01-05',202602,1,2026,5,1,202601,2026),('2026-01-06',202602,1,2026,6,1,202601,2026),('2026-01-07',202602,1,2026,7,1,202601,2026),('2026-01-08',202602,1,2026,8,1,202601,2026),('2026-01-09',202602,1,2026,9,1,202601,2026),('2026-01-10',202602,1,2026,10,1,202601,2026),('2026-01-11',202603,1,2026,11,2,202601,2026),('2026-01-12',202603,1,2026,12,2,202601,2026),('2026-01-13',202603,1,2026,13,2,202601,2026),('2026-01-14',202603,1,2026,14,2,202601,2026),('2026-01-15',202603,1,2026,15,2,202601,2026),('2026-01-16',202603,1,2026,16,2,202601,2026),('2026-01-17',202603,1,2026,17,2,202601,2026),('2026-01-18',202604,1,2026,18,3,202601,2026),('2026-01-19',202604,1,2026,19,3,202601,2026),('2026-01-20',202604,1,2026,20,3,202601,2026),('2026-01-21',202604,1,2026,21,3,202601,2026),('2026-01-22',202604,1,2026,22,3,202601,2026),('2026-01-23',202604,1,2026,23,3,202601,2026),('2026-01-24',202604,1,2026,24,3,202601,2026),('2026-01-25',202605,1,2026,25,4,202601,2026),('2026-01-26',202605,1,2026,26,4,202601,2026),('2026-01-27',202605,1,2026,27,4,202601,2026),('2026-01-28',202605,1,2026,28,4,202601,2026),('2026-01-29',202605,1,2026,29,4,202601,2026),('2026-01-30',202605,1,2026,30,4,202601,2026),('2026-01-31',202605,1,2026,31,4,202601,2026),('2026-02-01',202606,2,2026,1,5,202602,2026),('2026-02-02',202606,2,2026,2,5,202602,2026),('2026-02-03',202606,2,2026,3,5,202602,2026),('2026-02-04',202606,2,2026,4,5,202602,2026),('2026-02-05',202606,2,2026,5,5,202602,2026),('2026-02-06',202606,2,2026,6,5,202602,2026),('2026-02-07',202606,2,2026,7,5,202602,2026),('2026-02-08',202607,2,2026,8,6,202602,2026),('2026-02-09',202607,2,2026,9,6,202602,2026),('2026-02-10',202607,2,2026,10,6,202602,2026),('2026-02-11',202607,2,2026,11,6,202602,2026),('2026-02-12',202607,2,2026,12,6,202602,2026),('2026-02-13',202607,2,2026,13,6,202602,2026),('2026-02-14',202607,2,2026,14,6,202602,2026),('2026-02-15',202608,2,2026,15,7,202602,2026),('2026-02-16',202608,2,2026,16,7,202602,2026),('2026-02-17',202608,2,2026,17,7,202602,2026),('2026-02-18',202608,2,2026,18,7,202602,2026),('2026-02-19',202608,2,2026,19,7,202602,2026),('2026-02-20',202608,2,2026,20,7,202602,2026),('2026-02-21',202608,2,2026,21,7,202602,2026),('2026-02-22',202609,2,2026,22,8,202602,2026),('2026-02-23',202609,2,2026,23,8,202602,2026),('2026-02-24',202609,2,2026,24,8,202602,2026),('2026-02-25',202609,2,2026,25,8,202602,2026),('2026-02-26',202609,2,2026,26,8,202602,2026),('2026-02-27',202609,2,2026,27,8,202602,2026),('2026-02-28',202609,2,2026,28,8,202602,2026),('2026-03-01',202610,3,2026,1,9,202603,2026),('2026-03-02',202610,3,2026,2,9,202603,2026),('2026-03-03',202610,3,2026,3,9,202603,2026),('2026-03-04',202610,3,2026,4,9,202603,2026),('2026-03-05',202610,3,2026,5,9,202603,2026),('2026-03-06',202610,3,2026,6,9,202603,2026),('2026-03-07',202610,3,2026,7,9,202603,2026),('2026-03-08',202611,3,2026,8,10,202603,2026),('2026-03-09',202611,3,2026,9,10,202603,2026),('2026-03-10',202611,3,2026,10,10,202603,2026),('2026-03-11',202611,3,2026,11,10,202603,2026),('2026-03-12',202611,3,2026,12,10,202603,2026),('2026-03-13',202611,3,2026,13,10,202603,2026),('2026-03-14',202611,3,2026,14,10,202603,2026),('2026-03-15',202612,3,2026,15,11,202603,2026),('2026-03-16',202612,3,2026,16,11,202603,2026),('2026-03-17',202612,3,2026,17,11,202603,2026),('2026-03-18',202612,3,2026,18,11,202603,2026),('2026-03-19',202612,3,2026,19,11,202603,2026),('2026-03-20',202612,3,2026,20,11,202603,2026),('2026-03-21',202612,3,2026,21,11,202603,2026),('2026-03-22',202613,3,2026,22,12,202603,2026),('2026-03-23',202613,3,2026,23,12,202603,2026),('2026-03-24',202613,3,2026,24,12,202603,2026),('2026-03-25',202613,3,2026,25,12,202603,2026),('2026-03-26',202613,3,2026,26,12,202603,2026),('2026-03-27',202613,3,2026,27,12,202603,2026),('2026-03-28',202613,3,2026,28,12,202603,2026),('2026-03-29',202614,3,2026,29,13,202603,2026),('2026-03-30',202614,3,2026,30,13,202603,2026),('2026-03-31',202614,3,2026,31,13,202603,2026),('2026-04-01',202614,4,2026,1,13,202604,2026),('2026-04-02',202614,4,2026,2,13,202604,2026),('2026-04-03',202614,4,2026,3,13,202604,2026),('2026-04-04',202614,4,2026,4,13,202604,2026),('2026-04-05',202615,4,2026,5,14,202604,2026),('2026-04-06',202615,4,2026,6,14,202604,2026),('2026-04-07',202615,4,2026,7,14,202604,2026),('2026-04-08',202615,4,2026,8,14,202604,2026),('2026-04-09',202615,4,2026,9,14,202604,2026),('2026-04-10',202615,4,2026,10,14,202604,2026),('2026-04-11',202615,4,2026,11,14,202604,2026),('2026-04-12',202616,4,2026,12,15,202604,2026),('2026-04-13',202616,4,2026,13,15,202604,2026),('2026-04-14',202616,4,2026,14,15,202604,2026),('2026-04-15',202616,4,2026,15,15,202604,2026),('2026-04-16',202616,4,2026,16,15,202604,2026),('2026-04-17',202616,4,2026,17,15,202604,2026),('2026-04-18',202616,4,2026,18,15,202604,2026),('2026-04-19',202617,4,2026,19,16,202604,2026),('2026-04-20',202617,4,2026,20,16,202604,2026),('2026-04-21',202617,4,2026,21,16,202604,2026),('2026-04-22',202617,4,2026,22,16,202604,2026),('2026-04-23',202617,4,2026,23,16,202604,2026),('2026-04-24',202617,4,2026,24,16,202604,2026),('2026-04-25',202617,4,2026,25,16,202604,2026),('2026-04-26',202618,4,2026,26,17,202604,2026),('2026-04-27',202618,4,2026,27,17,202604,2026),('2026-04-28',202618,4,2026,28,17,202604,2026),('2026-04-29',202618,4,2026,29,17,202604,2026),('2026-04-30',202618,4,2026,30,17,202604,2026),('2026-05-01',202618,5,2026,1,17,202605,2026),('2026-05-02',202618,5,2026,2,17,202605,2026),('2026-05-03',202619,5,2026,3,18,202605,2026),('2026-05-04',202619,5,2026,4,18,202605,2026),('2026-05-05',202619,5,2026,5,18,202605,2026),('2026-05-06',202619,5,2026,6,18,202605,2026),('2026-05-07',202619,5,2026,7,18,202605,2026),('2026-05-08',202619,5,2026,8,18,202605,2026),('2026-05-09',202619,5,2026,9,18,202605,2026),('2026-05-10',202620,5,2026,10,19,202605,2026),('2026-05-11',202620,5,2026,11,19,202605,2026),('2026-05-12',202620,5,2026,12,19,202605,2026),('2026-05-13',202620,5,2026,13,19,202605,2026),('2026-05-14',202620,5,2026,14,19,202605,2026),('2026-05-15',202620,5,2026,15,19,202605,2026),('2026-05-16',202620,5,2026,16,19,202605,2026),('2026-05-17',202621,5,2026,17,20,202605,2026),('2026-05-18',202621,5,2026,18,20,202605,2026),('2026-05-19',202621,5,2026,19,20,202605,2026),('2026-05-20',202621,5,2026,20,20,202605,2026),('2026-05-21',202621,5,2026,21,20,202605,2026),('2026-05-22',202621,5,2026,22,20,202605,2026),('2026-05-23',202621,5,2026,23,20,202605,2026),('2026-05-24',202622,5,2026,24,21,202605,2026),('2026-05-25',202622,5,2026,25,21,202605,2026),('2026-05-26',202622,5,2026,26,21,202605,2026),('2026-05-27',202622,5,2026,27,21,202605,2026),('2026-05-28',202622,5,2026,28,21,202605,2026),('2026-05-29',202622,5,2026,29,21,202605,2026),('2026-05-30',202622,5,2026,30,21,202605,2026),('2026-05-31',202623,5,2026,31,22,202605,2026),('2026-06-01',202623,6,2026,1,22,202606,2026),('2026-06-02',202623,6,2026,2,22,202606,2026),('2026-06-03',202623,6,2026,3,22,202606,2026),('2026-06-04',202623,6,2026,4,22,202606,2026),('2026-06-05',202623,6,2026,5,22,202606,2026),('2026-06-06',202623,6,2026,6,22,202606,2026),('2026-06-07',202624,6,2026,7,23,202606,2026),('2026-06-08',202624,6,2026,8,23,202606,2026),('2026-06-09',202624,6,2026,9,23,202606,2026),('2026-06-10',202624,6,2026,10,23,202606,2026),('2026-06-11',202624,6,2026,11,23,202606,2026),('2026-06-12',202624,6,2026,12,23,202606,2026),('2026-06-13',202624,6,2026,13,23,202606,2026),('2026-06-14',202625,6,2026,14,24,202606,2026),('2026-06-15',202625,6,2026,15,24,202606,2026),('2026-06-16',202625,6,2026,16,24,202606,2026),('2026-06-17',202625,6,2026,17,24,202606,2026),('2026-06-18',202625,6,2026,18,24,202606,2026),('2026-06-19',202625,6,2026,19,24,202606,2026),('2026-06-20',202625,6,2026,20,24,202606,2026),('2026-06-21',202626,6,2026,21,25,202606,2026),('2026-06-22',202626,6,2026,22,25,202606,2026),('2026-06-23',202626,6,2026,23,25,202606,2026),('2026-06-24',202626,6,2026,24,25,202606,2026),('2026-06-25',202626,6,2026,25,25,202606,2026),('2026-06-26',202626,6,2026,26,25,202606,2026),('2026-06-27',202626,6,2026,27,25,202606,2026),('2026-06-28',202627,6,2026,28,26,202606,2026),('2026-06-29',202627,6,2026,29,26,202606,2026),('2026-06-30',202627,6,2026,30,26,202606,2026),('2026-07-01',202627,7,2026,1,26,202607,2026),('2026-07-02',202627,7,2026,2,26,202607,2026),('2026-07-03',202627,7,2026,3,26,202607,2026),('2026-07-04',202627,7,2026,4,26,202607,2026),('2026-07-05',202628,7,2026,5,27,202607,2026),('2026-07-06',202628,7,2026,6,27,202607,2026),('2026-07-07',202628,7,2026,7,27,202607,2026),('2026-07-08',202628,7,2026,8,27,202607,2026),('2026-07-09',202628,7,2026,9,27,202607,2026),('2026-07-10',202628,7,2026,10,27,202607,2026),('2026-07-11',202628,7,2026,11,27,202607,2026),('2026-07-12',202629,7,2026,12,28,202607,2026),('2026-07-13',202629,7,2026,13,28,202607,2026),('2026-07-14',202629,7,2026,14,28,202607,2026),('2026-07-15',202629,7,2026,15,28,202607,2026),('2026-07-16',202629,7,2026,16,28,202607,2026),('2026-07-17',202629,7,2026,17,28,202607,2026),('2026-07-18',202629,7,2026,18,28,202607,2026),('2026-07-19',202630,7,2026,19,29,202607,2026),('2026-07-20',202630,7,2026,20,29,202607,2026),('2026-07-21',202630,7,2026,21,29,202607,2026),('2026-07-22',202630,7,2026,22,29,202607,2026),('2026-07-23',202630,7,2026,23,29,202607,2026),('2026-07-24',202630,7,2026,24,29,202607,2026),('2026-07-25',202630,7,2026,25,29,202607,2026),('2026-07-26',202631,7,2026,26,30,202607,2026),('2026-07-27',202631,7,2026,27,30,202607,2026),('2026-07-28',202631,7,2026,28,30,202607,2026),('2026-07-29',202631,7,2026,29,30,202607,2026),('2026-07-30',202631,7,2026,30,30,202607,2026),('2026-07-31',202631,7,2026,31,30,202607,2026),('2026-08-01',202631,8,2026,1,30,202608,2026),('2026-08-02',202632,8,2026,2,31,202608,2026),('2026-08-03',202632,8,2026,3,31,202608,2026),('2026-08-04',202632,8,2026,4,31,202608,2026),('2026-08-05',202632,8,2026,5,31,202608,2026),('2026-08-06',202632,8,2026,6,31,202608,2026),('2026-08-07',202632,8,2026,7,31,202608,2026),('2026-08-08',202632,8,2026,8,31,202608,2026),('2026-08-09',202633,8,2026,9,32,202608,2026),('2026-08-10',202633,8,2026,10,32,202608,2026),('2026-08-11',202633,8,2026,11,32,202608,2026),('2026-08-12',202633,8,2026,12,32,202608,2026),('2026-08-13',202633,8,2026,13,32,202608,2026),('2026-08-14',202633,8,2026,14,32,202608,2026),('2026-08-15',202633,8,2026,15,32,202608,2026),('2026-08-16',202634,8,2026,16,33,202608,2026),('2026-08-17',202634,8,2026,17,33,202608,2026),('2026-08-18',202634,8,2026,18,33,202608,2026),('2026-08-19',202634,8,2026,19,33,202608,2026),('2026-08-20',202634,8,2026,20,33,202608,2026),('2026-08-21',202634,8,2026,21,33,202608,2026),('2026-08-22',202634,8,2026,22,33,202608,2026),('2026-08-23',202635,8,2026,23,34,202608,2026),('2026-08-24',202635,8,2026,24,34,202608,2026),('2026-08-25',202635,8,2026,25,34,202608,2026),('2026-08-26',202635,8,2026,26,34,202608,2026),('2026-08-27',202635,8,2026,27,34,202608,2026),('2026-08-28',202635,8,2026,28,34,202608,2026),('2026-08-29',202635,8,2026,29,34,202608,2026),('2026-08-30',202636,8,2026,30,35,202608,2026),('2026-08-31',202636,8,2026,31,35,202608,2026),('2026-09-01',202636,9,2026,1,35,202609,2026),('2026-09-02',202636,9,2026,2,35,202609,2026),('2026-09-03',202636,9,2026,3,35,202609,2026),('2026-09-04',202636,9,2026,4,35,202609,2026),('2026-09-05',202636,9,2026,5,35,202609,2026),('2026-09-06',202637,9,2026,6,36,202609,2026),('2026-09-07',202637,9,2026,7,36,202609,2026),('2026-09-08',202637,9,2026,8,36,202609,2026),('2026-09-09',202637,9,2026,9,36,202609,2026),('2026-09-10',202637,9,2026,10,36,202609,2026),('2026-09-11',202637,9,2026,11,36,202609,2026),('2026-09-12',202637,9,2026,12,36,202609,2026),('2026-09-13',202638,9,2026,13,37,202609,2026),('2026-09-14',202638,9,2026,14,37,202609,2026),('2026-09-15',202638,9,2026,15,37,202609,2026),('2026-09-16',202638,9,2026,16,37,202609,2026),('2026-09-17',202638,9,2026,17,37,202609,2026),('2026-09-18',202638,9,2026,18,37,202609,2026),('2026-09-19',202638,9,2026,19,37,202609,2026),('2026-09-20',202639,9,2026,20,38,202609,2026),('2026-09-21',202639,9,2026,21,38,202609,2026),('2026-09-22',202639,9,2026,22,38,202609,2026),('2026-09-23',202639,9,2026,23,38,202609,2026),('2026-09-24',202639,9,2026,24,38,202609,2026),('2026-09-25',202639,9,2026,25,38,202609,2026),('2026-09-26',202639,9,2026,26,38,202609,2026),('2026-09-27',202640,9,2026,27,39,202609,2026),('2026-09-28',202640,9,2026,28,39,202609,2026),('2026-09-29',202640,9,2026,29,39,202609,2026),('2026-09-30',202640,9,2026,30,39,202609,2026),('2026-10-01',202640,10,2026,1,39,202610,2026),('2026-10-02',202640,10,2026,2,39,202610,2026),('2026-10-03',202640,10,2026,3,39,202610,2026),('2026-10-04',202641,10,2026,4,40,202610,2026),('2026-10-05',202641,10,2026,5,40,202610,2026),('2026-10-06',202641,10,2026,6,40,202610,2026),('2026-10-07',202641,10,2026,7,40,202610,2026),('2026-10-08',202641,10,2026,8,40,202610,2026),('2026-10-09',202641,10,2026,9,40,202610,2026),('2026-10-10',202641,10,2026,10,40,202610,2026),('2026-10-11',202642,10,2026,11,41,202610,2026),('2026-10-12',202642,10,2026,12,41,202610,2026),('2026-10-13',202642,10,2026,13,41,202610,2026),('2026-10-14',202642,10,2026,14,41,202610,2026),('2026-10-15',202642,10,2026,15,41,202610,2026),('2026-10-16',202642,10,2026,16,41,202610,2026),('2026-10-17',202642,10,2026,17,41,202610,2026),('2026-10-18',202643,10,2026,18,42,202610,2026),('2026-10-19',202643,10,2026,19,42,202610,2026),('2026-10-20',202643,10,2026,20,42,202610,2026),('2026-10-21',202643,10,2026,21,42,202610,2026),('2026-10-22',202643,10,2026,22,42,202610,2026),('2026-10-23',202643,10,2026,23,42,202610,2026),('2026-10-24',202643,10,2026,24,42,202610,2026),('2026-10-25',202644,10,2026,25,43,202610,2026),('2026-10-26',202644,10,2026,26,43,202610,2026),('2026-10-27',202644,10,2026,27,43,202610,2026),('2026-10-28',202644,10,2026,28,43,202610,2026),('2026-10-29',202644,10,2026,29,43,202610,2026),('2026-10-30',202644,10,2026,30,43,202610,2026),('2026-10-31',202644,10,2026,31,43,202610,2026),('2026-11-01',202645,11,2026,1,44,202611,2026),('2026-11-02',202645,11,2026,2,44,202611,2026),('2026-11-03',202645,11,2026,3,44,202611,2026),('2026-11-04',202645,11,2026,4,44,202611,2026),('2026-11-05',202645,11,2026,5,44,202611,2026),('2026-11-06',202645,11,2026,6,44,202611,2026),('2026-11-07',202645,11,2026,7,44,202611,2026),('2026-11-08',202646,11,2026,8,45,202611,2026),('2026-11-09',202646,11,2026,9,45,202611,2026),('2026-11-10',202646,11,2026,10,45,202611,2026),('2026-11-11',202646,11,2026,11,45,202611,2026),('2026-11-12',202646,11,2026,12,45,202611,2026),('2026-11-13',202646,11,2026,13,45,202611,2026),('2026-11-14',202646,11,2026,14,45,202611,2026),('2026-11-15',202647,11,2026,15,46,202611,2026),('2026-11-16',202647,11,2026,16,46,202611,2026),('2026-11-17',202647,11,2026,17,46,202611,2026),('2026-11-18',202647,11,2026,18,46,202611,2026),('2026-11-19',202647,11,2026,19,46,202611,2026),('2026-11-20',202647,11,2026,20,46,202611,2026),('2026-11-21',202647,11,2026,21,46,202611,2026),('2026-11-22',202648,11,2026,22,47,202611,2026),('2026-11-23',202648,11,2026,23,47,202611,2026),('2026-11-24',202648,11,2026,24,47,202611,2026),('2026-11-25',202648,11,2026,25,47,202611,2026),('2026-11-26',202648,11,2026,26,47,202611,2026),('2026-11-27',202648,11,2026,27,47,202611,2026),('2026-11-28',202648,11,2026,28,47,202611,2026),('2026-11-29',202649,11,2026,29,48,202611,2026),('2026-11-30',202649,11,2026,30,48,202611,2026),('2026-12-01',202649,12,2026,1,48,202612,2027),('2026-12-02',202649,12,2026,2,48,202612,2027),('2026-12-03',202649,12,2026,3,48,202612,2027),('2026-12-04',202649,12,2026,4,48,202612,2027),('2026-12-05',202649,12,2026,5,48,202612,2027),('2026-12-06',202650,12,2026,6,49,202612,2027),('2026-12-07',202650,12,2026,7,49,202612,2027),('2026-12-08',202650,12,2026,8,49,202612,2027),('2026-12-09',202650,12,2026,9,49,202612,2027),('2026-12-10',202650,12,2026,10,49,202612,2027),('2026-12-11',202650,12,2026,11,49,202612,2027),('2026-12-12',202650,12,2026,12,49,202612,2027),('2026-12-13',202651,12,2026,13,50,202612,2027),('2026-12-14',202651,12,2026,14,50,202612,2027),('2026-12-15',202651,12,2026,15,50,202612,2027),('2026-12-16',202651,12,2026,16,50,202612,2027),('2026-12-17',202651,12,2026,17,50,202612,2027),('2026-12-18',202651,12,2026,18,50,202612,2027),('2026-12-19',202651,12,2026,19,50,202612,2027),('2026-12-20',202652,12,2026,20,51,202612,2027),('2026-12-21',202652,12,2026,21,51,202612,2027),('2026-12-22',202652,12,2026,22,51,202612,2027),('2026-12-23',202652,12,2026,23,51,202612,2027),('2026-12-24',202652,12,2026,24,51,202612,2027),('2026-12-25',202652,12,2026,25,51,202612,2027),('2026-12-26',202652,12,2026,26,51,202612,2027),('2026-12-27',202653,12,2026,27,52,202612,2027),('2026-12-28',202653,12,2026,28,52,202612,2027),('2026-12-29',202653,12,2026,29,52,202612,2027),('2026-12-30',202653,12,2026,30,52,202612,2027),('2026-12-31',202653,12,2026,31,52,202612,2027),('2027-01-01',202753,1,2027,1,52,202701,2027),('2027-01-02',202753,1,2027,2,52,202701,2027),('2027-01-03',202754,1,2027,3,1,202701,2027),('2027-01-04',202701,1,2027,4,1,202701,2027),('2027-01-05',202701,1,2027,5,1,202701,2027),('2027-01-06',202701,1,2027,6,1,202701,2027),('2027-01-07',202701,1,2027,7,1,202701,2027),('2027-01-08',202701,1,2027,8,1,202701,2027),('2027-01-09',202701,1,2027,9,1,202701,2027),('2027-01-10',202702,1,2027,10,2,202701,2027),('2027-01-11',202702,1,2027,11,2,202701,2027),('2027-01-12',202702,1,2027,12,2,202701,2027),('2027-01-13',202702,1,2027,13,2,202701,2027),('2027-01-14',202702,1,2027,14,2,202701,2027),('2027-01-15',202702,1,2027,15,2,202701,2027),('2027-01-16',202702,1,2027,16,2,202701,2027),('2027-01-17',202703,1,2027,17,3,202701,2027),('2027-01-18',202703,1,2027,18,3,202701,2027),('2027-01-19',202703,1,2027,19,3,202701,2027),('2027-01-20',202703,1,2027,20,3,202701,2027),('2027-01-21',202703,1,2027,21,3,202701,2027),('2027-01-22',202703,1,2027,22,3,202701,2027),('2027-01-23',202703,1,2027,23,3,202701,2027),('2027-01-24',202704,1,2027,24,4,202701,2027),('2027-01-25',202704,1,2027,25,4,202701,2027),('2027-01-26',202704,1,2027,26,4,202701,2027),('2027-01-27',202704,1,2027,27,4,202701,2027),('2027-01-28',202704,1,2027,28,4,202701,2027),('2027-01-29',202704,1,2027,29,4,202701,2027),('2027-01-30',202704,1,2027,30,4,202701,2027),('2027-01-31',202705,1,2027,31,5,202701,2027),('2027-02-01',202705,2,2027,1,5,202702,2027),('2027-02-02',202705,2,2027,2,5,202702,2027),('2027-02-03',202705,2,2027,3,5,202702,2027),('2027-02-04',202705,2,2027,4,5,202702,2027),('2027-02-05',202705,2,2027,5,5,202702,2027),('2027-02-06',202705,2,2027,6,5,202702,2027),('2027-02-07',202706,2,2027,7,6,202702,2027),('2027-02-08',202706,2,2027,8,6,202702,2027),('2027-02-09',202706,2,2027,9,6,202702,2027),('2027-02-10',202706,2,2027,10,6,202702,2027),('2027-02-11',202706,2,2027,11,6,202702,2027),('2027-02-12',202706,2,2027,12,6,202702,2027),('2027-02-13',202706,2,2027,13,6,202702,2027),('2027-02-14',202707,2,2027,14,7,202702,2027),('2027-02-15',202707,2,2027,15,7,202702,2027),('2027-02-16',202707,2,2027,16,7,202702,2027),('2027-02-17',202707,2,2027,17,7,202702,2027),('2027-02-18',202707,2,2027,18,7,202702,2027),('2027-02-19',202707,2,2027,19,7,202702,2027),('2027-02-20',202707,2,2027,20,7,202702,2027),('2027-02-21',202708,2,2027,21,8,202702,2027),('2027-02-22',202708,2,2027,22,8,202702,2027),('2027-02-23',202708,2,2027,23,8,202702,2027),('2027-02-24',202708,2,2027,24,8,202702,2027),('2027-02-25',202708,2,2027,25,8,202702,2027),('2027-02-26',202708,2,2027,26,8,202702,2027),('2027-02-27',202708,2,2027,27,8,202702,2027),('2027-02-28',202709,2,2027,28,9,202702,2027),('2027-03-01',202709,3,2027,1,9,202703,2027),('2027-03-02',202709,3,2027,2,9,202703,2027),('2027-03-03',202709,3,2027,3,9,202703,2027),('2027-03-04',202709,3,2027,4,9,202703,2027),('2027-03-05',202709,3,2027,5,9,202703,2027),('2027-03-06',202709,3,2027,6,9,202703,2027),('2027-03-07',202710,3,2027,7,10,202703,2027),('2027-03-08',202710,3,2027,8,10,202703,2027),('2027-03-09',202710,3,2027,9,10,202703,2027),('2027-03-10',202710,3,2027,10,10,202703,2027),('2027-03-11',202710,3,2027,11,10,202703,2027),('2027-03-12',202710,3,2027,12,10,202703,2027),('2027-03-13',202710,3,2027,13,10,202703,2027),('2027-03-14',202711,3,2027,14,11,202703,2027),('2027-03-15',202711,3,2027,15,11,202703,2027),('2027-03-16',202711,3,2027,16,11,202703,2027),('2027-03-17',202711,3,2027,17,11,202703,2027),('2027-03-18',202711,3,2027,18,11,202703,2027),('2027-03-19',202711,3,2027,19,11,202703,2027),('2027-03-20',202711,3,2027,20,11,202703,2027),('2027-03-21',202712,3,2027,21,12,202703,2027),('2027-03-22',202712,3,2027,22,12,202703,2027),('2027-03-23',202712,3,2027,23,12,202703,2027),('2027-03-24',202712,3,2027,24,12,202703,2027),('2027-03-25',202712,3,2027,25,12,202703,2027),('2027-03-26',202712,3,2027,26,12,202703,2027),('2027-03-27',202712,3,2027,27,12,202703,2027),('2027-03-28',202713,3,2027,28,13,202703,2027),('2027-03-29',202713,3,2027,29,13,202703,2027),('2027-03-30',202713,3,2027,30,13,202703,2027),('2027-03-31',202713,3,2027,31,13,202703,2027),('2027-04-01',202713,4,2027,1,13,202704,2027),('2027-04-02',202713,4,2027,2,13,202704,2027),('2027-04-03',202713,4,2027,3,13,202704,2027),('2027-04-04',202714,4,2027,4,14,202704,2027),('2027-04-05',202714,4,2027,5,14,202704,2027),('2027-04-06',202714,4,2027,6,14,202704,2027),('2027-04-07',202714,4,2027,7,14,202704,2027),('2027-04-08',202714,4,2027,8,14,202704,2027),('2027-04-09',202714,4,2027,9,14,202704,2027),('2027-04-10',202714,4,2027,10,14,202704,2027),('2027-04-11',202715,4,2027,11,15,202704,2027),('2027-04-12',202715,4,2027,12,15,202704,2027),('2027-04-13',202715,4,2027,13,15,202704,2027),('2027-04-14',202715,4,2027,14,15,202704,2027),('2027-04-15',202715,4,2027,15,15,202704,2027),('2027-04-16',202715,4,2027,16,15,202704,2027),('2027-04-17',202715,4,2027,17,15,202704,2027),('2027-04-18',202716,4,2027,18,16,202704,2027),('2027-04-19',202716,4,2027,19,16,202704,2027),('2027-04-20',202716,4,2027,20,16,202704,2027),('2027-04-21',202716,4,2027,21,16,202704,2027),('2027-04-22',202716,4,2027,22,16,202704,2027),('2027-04-23',202716,4,2027,23,16,202704,2027),('2027-04-24',202716,4,2027,24,16,202704,2027),('2027-04-25',202717,4,2027,25,17,202704,2027),('2027-04-26',202717,4,2027,26,17,202704,2027),('2027-04-27',202717,4,2027,27,17,202704,2027),('2027-04-28',202717,4,2027,28,17,202704,2027),('2027-04-29',202717,4,2027,29,17,202704,2027),('2027-04-30',202717,4,2027,30,17,202704,2027),('2027-05-01',202717,5,2027,1,17,202705,2027),('2027-05-02',202718,5,2027,2,18,202705,2027),('2027-05-03',202718,5,2027,3,18,202705,2027),('2027-05-04',202718,5,2027,4,18,202705,2027),('2027-05-05',202718,5,2027,5,18,202705,2027),('2027-05-06',202718,5,2027,6,18,202705,2027),('2027-05-07',202718,5,2027,7,18,202705,2027),('2027-05-08',202718,5,2027,8,18,202705,2027),('2027-05-09',202719,5,2027,9,19,202705,2027),('2027-05-10',202719,5,2027,10,19,202705,2027),('2027-05-11',202719,5,2027,11,19,202705,2027),('2027-05-12',202719,5,2027,12,19,202705,2027),('2027-05-13',202719,5,2027,13,19,202705,2027),('2027-05-14',202719,5,2027,14,19,202705,2027),('2027-05-15',202719,5,2027,15,19,202705,2027),('2027-05-16',202720,5,2027,16,20,202705,2027),('2027-05-17',202720,5,2027,17,20,202705,2027),('2027-05-18',202720,5,2027,18,20,202705,2027),('2027-05-19',202720,5,2027,19,20,202705,2027),('2027-05-20',202720,5,2027,20,20,202705,2027),('2027-05-21',202720,5,2027,21,20,202705,2027),('2027-05-22',202720,5,2027,22,20,202705,2027),('2027-05-23',202721,5,2027,23,21,202705,2027),('2027-05-24',202721,5,2027,24,21,202705,2027),('2027-05-25',202721,5,2027,25,21,202705,2027),('2027-05-26',202721,5,2027,26,21,202705,2027),('2027-05-27',202721,5,2027,27,21,202705,2027),('2027-05-28',202721,5,2027,28,21,202705,2027),('2027-05-29',202721,5,2027,29,21,202705,2027),('2027-05-30',202722,5,2027,30,22,202705,2027),('2027-05-31',202722,5,2027,31,22,202705,2027),('2027-06-01',202722,6,2027,1,22,202706,2027),('2027-06-02',202722,6,2027,2,22,202706,2027),('2027-06-03',202722,6,2027,3,22,202706,2027),('2027-06-04',202722,6,2027,4,22,202706,2027),('2027-06-05',202722,6,2027,5,22,202706,2027),('2027-06-06',202723,6,2027,6,23,202706,2027),('2027-06-07',202723,6,2027,7,23,202706,2027),('2027-06-08',202723,6,2027,8,23,202706,2027),('2027-06-09',202723,6,2027,9,23,202706,2027),('2027-06-10',202723,6,2027,10,23,202706,2027),('2027-06-11',202723,6,2027,11,23,202706,2027),('2027-06-12',202723,6,2027,12,23,202706,2027),('2027-06-13',202724,6,2027,13,24,202706,2027),('2027-06-14',202724,6,2027,14,24,202706,2027),('2027-06-15',202724,6,2027,15,24,202706,2027),('2027-06-16',202724,6,2027,16,24,202706,2027),('2027-06-17',202724,6,2027,17,24,202706,2027),('2027-06-18',202724,6,2027,18,24,202706,2027),('2027-06-19',202724,6,2027,19,24,202706,2027),('2027-06-20',202725,6,2027,20,25,202706,2027),('2027-06-21',202725,6,2027,21,25,202706,2027),('2027-06-22',202725,6,2027,22,25,202706,2027),('2027-06-23',202725,6,2027,23,25,202706,2027),('2027-06-24',202725,6,2027,24,25,202706,2027),('2027-06-25',202725,6,2027,25,25,202706,2027),('2027-06-26',202725,6,2027,26,25,202706,2027),('2027-06-27',202726,6,2027,27,26,202706,2027),('2027-06-28',202726,6,2027,28,26,202706,2027),('2027-06-29',202726,6,2027,29,26,202706,2027),('2027-06-30',202726,6,2027,30,26,202706,2027),('2027-07-01',202726,7,2027,1,26,202707,2027),('2027-07-02',202726,7,2027,2,26,202707,2027),('2027-07-03',202726,7,2027,3,26,202707,2027),('2027-07-04',202727,7,2027,4,27,202707,2027),('2027-07-05',202727,7,2027,5,27,202707,2027),('2027-07-06',202727,7,2027,6,27,202707,2027),('2027-07-07',202727,7,2027,7,27,202707,2027),('2027-07-08',202727,7,2027,8,27,202707,2027),('2027-07-09',202727,7,2027,9,27,202707,2027),('2027-07-10',202727,7,2027,10,27,202707,2027),('2027-07-11',202728,7,2027,11,28,202707,2027),('2027-07-12',202728,7,2027,12,28,202707,2027),('2027-07-13',202728,7,2027,13,28,202707,2027),('2027-07-14',202728,7,2027,14,28,202707,2027),('2027-07-15',202728,7,2027,15,28,202707,2027),('2027-07-16',202728,7,2027,16,28,202707,2027),('2027-07-17',202728,7,2027,17,28,202707,2027),('2027-07-18',202729,7,2027,18,29,202707,2027),('2027-07-19',202729,7,2027,19,29,202707,2027),('2027-07-20',202729,7,2027,20,29,202707,2027),('2027-07-21',202729,7,2027,21,29,202707,2027),('2027-07-22',202729,7,2027,22,29,202707,2027),('2027-07-23',202729,7,2027,23,29,202707,2027),('2027-07-24',202729,7,2027,24,29,202707,2027),('2027-07-25',202730,7,2027,25,30,202707,2027),('2027-07-26',202730,7,2027,26,30,202707,2027),('2027-07-27',202730,7,2027,27,30,202707,2027),('2027-07-28',202730,7,2027,28,30,202707,2027),('2027-07-29',202730,7,2027,29,30,202707,2027),('2027-07-30',202730,7,2027,30,30,202707,2027),('2027-07-31',202730,7,2027,31,30,202707,2027),('2027-08-01',202731,8,2027,1,31,202708,2027),('2027-08-02',202731,8,2027,2,31,202708,2027),('2027-08-03',202731,8,2027,3,31,202708,2027),('2027-08-04',202731,8,2027,4,31,202708,2027),('2027-08-05',202731,8,2027,5,31,202708,2027),('2027-08-06',202731,8,2027,6,31,202708,2027),('2027-08-07',202731,8,2027,7,31,202708,2027),('2027-08-08',202732,8,2027,8,32,202708,2027),('2027-08-09',202732,8,2027,9,32,202708,2027),('2027-08-10',202732,8,2027,10,32,202708,2027),('2027-08-11',202732,8,2027,11,32,202708,2027),('2027-08-12',202732,8,2027,12,32,202708,2027),('2027-08-13',202732,8,2027,13,32,202708,2027),('2027-08-14',202732,8,2027,14,32,202708,2027),('2027-08-15',202733,8,2027,15,33,202708,2027),('2027-08-16',202733,8,2027,16,33,202708,2027),('2027-08-17',202733,8,2027,17,33,202708,2027),('2027-08-18',202733,8,2027,18,33,202708,2027),('2027-08-19',202733,8,2027,19,33,202708,2027),('2027-08-20',202733,8,2027,20,33,202708,2027),('2027-08-21',202733,8,2027,21,33,202708,2027),('2027-08-22',202734,8,2027,22,34,202708,2027),('2027-08-23',202734,8,2027,23,34,202708,2027),('2027-08-24',202734,8,2027,24,34,202708,2027),('2027-08-25',202734,8,2027,25,34,202708,2027),('2027-08-26',202734,8,2027,26,34,202708,2027),('2027-08-27',202734,8,2027,27,34,202708,2027),('2027-08-28',202734,8,2027,28,34,202708,2027),('2027-08-29',202735,8,2027,29,35,202708,2027),('2027-08-30',202735,8,2027,30,35,202708,2027),('2027-08-31',202735,8,2027,31,35,202708,2027),('2027-09-01',202735,9,2027,1,35,202709,2027),('2027-09-02',202735,9,2027,2,35,202709,2027),('2027-09-03',202735,9,2027,3,35,202709,2027),('2027-09-04',202735,9,2027,4,35,202709,2027),('2027-09-05',202736,9,2027,5,36,202709,2027),('2027-09-06',202736,9,2027,6,36,202709,2027),('2027-09-07',202736,9,2027,7,36,202709,2027),('2027-09-08',202736,9,2027,8,36,202709,2027),('2027-09-09',202736,9,2027,9,36,202709,2027),('2027-09-10',202736,9,2027,10,36,202709,2027),('2027-09-11',202736,9,2027,11,36,202709,2027),('2027-09-12',202737,9,2027,12,37,202709,2027),('2027-09-13',202737,9,2027,13,37,202709,2027),('2027-09-14',202737,9,2027,14,37,202709,2027),('2027-09-15',202737,9,2027,15,37,202709,2027),('2027-09-16',202737,9,2027,16,37,202709,2027),('2027-09-17',202737,9,2027,17,37,202709,2027),('2027-09-18',202737,9,2027,18,37,202709,2027),('2027-09-19',202738,9,2027,19,38,202709,2027),('2027-09-20',202738,9,2027,20,38,202709,2027),('2027-09-21',202738,9,2027,21,38,202709,2027),('2027-09-22',202738,9,2027,22,38,202709,2027),('2027-09-23',202738,9,2027,23,38,202709,2027),('2027-09-24',202738,9,2027,24,38,202709,2027),('2027-09-25',202738,9,2027,25,38,202709,2027),('2027-09-26',202739,9,2027,26,39,202709,2027),('2027-09-27',202739,9,2027,27,39,202709,2027),('2027-09-28',202739,9,2027,28,39,202709,2027),('2027-09-29',202739,9,2027,29,39,202709,2027),('2027-09-30',202739,9,2027,30,39,202709,2027),('2027-10-01',202739,10,2027,1,39,202710,2027),('2027-10-02',202739,10,2027,2,39,202710,2027),('2027-10-03',202740,10,2027,3,40,202710,2027),('2027-10-04',202740,10,2027,4,40,202710,2027),('2027-10-05',202740,10,2027,5,40,202710,2027),('2027-10-06',202740,10,2027,6,40,202710,2027),('2027-10-07',202740,10,2027,7,40,202710,2027),('2027-10-08',202740,10,2027,8,40,202710,2027),('2027-10-09',202740,10,2027,9,40,202710,2027),('2027-10-10',202741,10,2027,10,41,202710,2027),('2027-10-11',202741,10,2027,11,41,202710,2027),('2027-10-12',202741,10,2027,12,41,202710,2027),('2027-10-13',202741,10,2027,13,41,202710,2027),('2027-10-14',202741,10,2027,14,41,202710,2027),('2027-10-15',202741,10,2027,15,41,202710,2027),('2027-10-16',202741,10,2027,16,41,202710,2027),('2027-10-17',202742,10,2027,17,42,202710,2027),('2027-10-18',202742,10,2027,18,42,202710,2027),('2027-10-19',202742,10,2027,19,42,202710,2027),('2027-10-20',202742,10,2027,20,42,202710,2027),('2027-10-21',202742,10,2027,21,42,202710,2027),('2027-10-22',202742,10,2027,22,42,202710,2027),('2027-10-23',202742,10,2027,23,42,202710,2027),('2027-10-24',202743,10,2027,24,43,202710,2027),('2027-10-25',202743,10,2027,25,43,202710,2027),('2027-10-26',202743,10,2027,26,43,202710,2027),('2027-10-27',202743,10,2027,27,43,202710,2027),('2027-10-28',202743,10,2027,28,43,202710,2027),('2027-10-29',202743,10,2027,29,43,202710,2027),('2027-10-30',202743,10,2027,30,43,202710,2027),('2027-10-31',202744,10,2027,31,44,202710,2027),('2027-11-01',202744,11,2027,1,44,202711,2027),('2027-11-02',202744,11,2027,2,44,202711,2027),('2027-11-03',202744,11,2027,3,44,202711,2027),('2027-11-04',202744,11,2027,4,44,202711,2027),('2027-11-05',202744,11,2027,5,44,202711,2027),('2027-11-06',202744,11,2027,6,44,202711,2027),('2027-11-07',202745,11,2027,7,45,202711,2027),('2027-11-08',202745,11,2027,8,45,202711,2027),('2027-11-09',202745,11,2027,9,45,202711,2027),('2027-11-10',202745,11,2027,10,45,202711,2027),('2027-11-11',202745,11,2027,11,45,202711,2027),('2027-11-12',202745,11,2027,12,45,202711,2027),('2027-11-13',202745,11,2027,13,45,202711,2027),('2027-11-14',202746,11,2027,14,46,202711,2027),('2027-11-15',202746,11,2027,15,46,202711,2027),('2027-11-16',202746,11,2027,16,46,202711,2027),('2027-11-17',202746,11,2027,17,46,202711,2027),('2027-11-18',202746,11,2027,18,46,202711,2027),('2027-11-19',202746,11,2027,19,46,202711,2027),('2027-11-20',202746,11,2027,20,46,202711,2027),('2027-11-21',202747,11,2027,21,47,202711,2027),('2027-11-22',202747,11,2027,22,47,202711,2027),('2027-11-23',202747,11,2027,23,47,202711,2027),('2027-11-24',202747,11,2027,24,47,202711,2027),('2027-11-25',202747,11,2027,25,47,202711,2027),('2027-11-26',202747,11,2027,26,47,202711,2027),('2027-11-27',202747,11,2027,27,47,202711,2027),('2027-11-28',202748,11,2027,28,48,202711,2027),('2027-11-29',202748,11,2027,29,48,202711,2027),('2027-11-30',202748,11,2027,30,48,202711,2027),('2027-12-01',202748,12,2027,1,48,202712,2028),('2027-12-02',202748,12,2027,2,48,202712,2028),('2027-12-03',202748,12,2027,3,48,202712,2028),('2027-12-04',202748,12,2027,4,48,202712,2028),('2027-12-05',202749,12,2027,5,49,202712,2028),('2027-12-06',202749,12,2027,6,49,202712,2028),('2027-12-07',202749,12,2027,7,49,202712,2028),('2027-12-08',202749,12,2027,8,49,202712,2028),('2027-12-09',202749,12,2027,9,49,202712,2028),('2027-12-10',202749,12,2027,10,49,202712,2028),('2027-12-11',202749,12,2027,11,49,202712,2028),('2027-12-12',202750,12,2027,12,50,202712,2028),('2027-12-13',202750,12,2027,13,50,202712,2028),('2027-12-14',202750,12,2027,14,50,202712,2028),('2027-12-15',202750,12,2027,15,50,202712,2028),('2027-12-16',202750,12,2027,16,50,202712,2028),('2027-12-17',202750,12,2027,17,50,202712,2028),('2027-12-18',202750,12,2027,18,50,202712,2028),('2027-12-19',202751,12,2027,19,51,202712,2028),('2027-12-20',202751,12,2027,20,51,202712,2028),('2027-12-21',202751,12,2027,21,51,202712,2028),('2027-12-22',202751,12,2027,22,51,202712,2028),('2027-12-23',202751,12,2027,23,51,202712,2028),('2027-12-24',202751,12,2027,24,51,202712,2028),('2027-12-25',202751,12,2027,25,51,202712,2028),('2027-12-26',202752,12,2027,26,52,202712,2028),('2027-12-27',202752,12,2027,27,52,202712,2028),('2027-12-28',202752,12,2027,28,52,202712,2028),('2027-12-29',202752,12,2027,29,52,202712,2028),('2027-12-30',202752,12,2027,30,52,202712,2028),('2027-12-31',202752,12,2027,31,52,202712,2028),('2028-01-01',202852,1,2028,1,52,202801,2028),('2028-01-02',202853,1,2028,2,1,202801,2028),('2028-01-03',202801,1,2028,3,1,202801,2028),('2028-01-04',202801,1,2028,4,1,202801,2028),('2028-01-05',202801,1,2028,5,1,202801,2028),('2028-01-06',202801,1,2028,6,1,202801,2028),('2028-01-07',202801,1,2028,7,1,202801,2028),('2028-01-08',202801,1,2028,8,1,202801,2028),('2028-01-09',202802,1,2028,9,2,202801,2028),('2028-01-10',202802,1,2028,10,2,202801,2028),('2028-01-11',202802,1,2028,11,2,202801,2028),('2028-01-12',202802,1,2028,12,2,202801,2028),('2028-01-13',202802,1,2028,13,2,202801,2028),('2028-01-14',202802,1,2028,14,2,202801,2028),('2028-01-15',202802,1,2028,15,2,202801,2028),('2028-01-16',202803,1,2028,16,3,202801,2028),('2028-01-17',202803,1,2028,17,3,202801,2028),('2028-01-18',202803,1,2028,18,3,202801,2028),('2028-01-19',202803,1,2028,19,3,202801,2028),('2028-01-20',202803,1,2028,20,3,202801,2028),('2028-01-21',202803,1,2028,21,3,202801,2028),('2028-01-22',202803,1,2028,22,3,202801,2028),('2028-01-23',202804,1,2028,23,4,202801,2028),('2028-01-24',202804,1,2028,24,4,202801,2028),('2028-01-25',202804,1,2028,25,4,202801,2028),('2028-01-26',202804,1,2028,26,4,202801,2028),('2028-01-27',202804,1,2028,27,4,202801,2028),('2028-01-28',202804,1,2028,28,4,202801,2028),('2028-01-29',202804,1,2028,29,4,202801,2028),('2028-01-30',202805,1,2028,30,5,202801,2028),('2028-01-31',202805,1,2028,31,5,202801,2028),('2028-02-01',202805,2,2028,1,5,202802,2028),('2028-02-02',202805,2,2028,2,5,202802,2028),('2028-02-03',202805,2,2028,3,5,202802,2028),('2028-02-04',202805,2,2028,4,5,202802,2028),('2028-02-05',202805,2,2028,5,5,202802,2028),('2028-02-06',202806,2,2028,6,6,202802,2028),('2028-02-07',202806,2,2028,7,6,202802,2028),('2028-02-08',202806,2,2028,8,6,202802,2028),('2028-02-09',202806,2,2028,9,6,202802,2028),('2028-02-10',202806,2,2028,10,6,202802,2028),('2028-02-11',202806,2,2028,11,6,202802,2028),('2028-02-12',202806,2,2028,12,6,202802,2028),('2028-02-13',202807,2,2028,13,7,202802,2028),('2028-02-14',202807,2,2028,14,7,202802,2028),('2028-02-15',202807,2,2028,15,7,202802,2028),('2028-02-16',202807,2,2028,16,7,202802,2028),('2028-02-17',202807,2,2028,17,7,202802,2028),('2028-02-18',202807,2,2028,18,7,202802,2028),('2028-02-19',202807,2,2028,19,7,202802,2028),('2028-02-20',202808,2,2028,20,8,202802,2028),('2028-02-21',202808,2,2028,21,8,202802,2028),('2028-02-22',202808,2,2028,22,8,202802,2028),('2028-02-23',202808,2,2028,23,8,202802,2028),('2028-02-24',202808,2,2028,24,8,202802,2028),('2028-02-25',202808,2,2028,25,8,202802,2028),('2028-02-26',202808,2,2028,26,8,202802,2028),('2028-02-27',202809,2,2028,27,9,202802,2028),('2028-02-28',202809,2,2028,28,9,202802,2028),('2028-02-29',202809,2,2028,29,9,202802,2028),('2028-03-01',202809,3,2028,1,9,202803,2028),('2028-03-02',202809,3,2028,2,9,202803,2028),('2028-03-03',202809,3,2028,3,9,202803,2028),('2028-03-04',202809,3,2028,4,9,202803,2028),('2028-03-05',202810,3,2028,5,10,202803,2028),('2028-03-06',202810,3,2028,6,10,202803,2028),('2028-03-07',202810,3,2028,7,10,202803,2028),('2028-03-08',202810,3,2028,8,10,202803,2028),('2028-03-09',202810,3,2028,9,10,202803,2028),('2028-03-10',202810,3,2028,10,10,202803,2028),('2028-03-11',202810,3,2028,11,10,202803,2028),('2028-03-12',202811,3,2028,12,11,202803,2028),('2028-03-13',202811,3,2028,13,11,202803,2028),('2028-03-14',202811,3,2028,14,11,202803,2028),('2028-03-15',202811,3,2028,15,11,202803,2028),('2028-03-16',202811,3,2028,16,11,202803,2028),('2028-03-17',202811,3,2028,17,11,202803,2028),('2028-03-18',202811,3,2028,18,11,202803,2028),('2028-03-19',202812,3,2028,19,12,202803,2028),('2028-03-20',202812,3,2028,20,12,202803,2028),('2028-03-21',202812,3,2028,21,12,202803,2028),('2028-03-22',202812,3,2028,22,12,202803,2028),('2028-03-23',202812,3,2028,23,12,202803,2028),('2028-03-24',202812,3,2028,24,12,202803,2028),('2028-03-25',202812,3,2028,25,12,202803,2028),('2028-03-26',202813,3,2028,26,13,202803,2028),('2028-03-27',202813,3,2028,27,13,202803,2028),('2028-03-28',202813,3,2028,28,13,202803,2028),('2028-03-29',202813,3,2028,29,13,202803,2028),('2028-03-30',202813,3,2028,30,13,202803,2028),('2028-03-31',202813,3,2028,31,13,202803,2028),('2028-04-01',202813,4,2028,1,13,202804,2028),('2028-04-02',202814,4,2028,2,14,202804,2028),('2028-04-03',202814,4,2028,3,14,202804,2028),('2028-04-04',202814,4,2028,4,14,202804,2028),('2028-04-05',202814,4,2028,5,14,202804,2028),('2028-04-06',202814,4,2028,6,14,202804,2028),('2028-04-07',202814,4,2028,7,14,202804,2028),('2028-04-08',202814,4,2028,8,14,202804,2028),('2028-04-09',202815,4,2028,9,15,202804,2028),('2028-04-10',202815,4,2028,10,15,202804,2028),('2028-04-11',202815,4,2028,11,15,202804,2028),('2028-04-12',202815,4,2028,12,15,202804,2028),('2028-04-13',202815,4,2028,13,15,202804,2028),('2028-04-14',202815,4,2028,14,15,202804,2028),('2028-04-15',202815,4,2028,15,15,202804,2028),('2028-04-16',202816,4,2028,16,16,202804,2028),('2028-04-17',202816,4,2028,17,16,202804,2028),('2028-04-18',202816,4,2028,18,16,202804,2028),('2028-04-19',202816,4,2028,19,16,202804,2028),('2028-04-20',202816,4,2028,20,16,202804,2028),('2028-04-21',202816,4,2028,21,16,202804,2028),('2028-04-22',202816,4,2028,22,16,202804,2028),('2028-04-23',202817,4,2028,23,17,202804,2028),('2028-04-24',202817,4,2028,24,17,202804,2028),('2028-04-25',202817,4,2028,25,17,202804,2028),('2028-04-26',202817,4,2028,26,17,202804,2028),('2028-04-27',202817,4,2028,27,17,202804,2028),('2028-04-28',202817,4,2028,28,17,202804,2028),('2028-04-29',202817,4,2028,29,17,202804,2028),('2028-04-30',202818,4,2028,30,18,202804,2028),('2028-05-01',202818,5,2028,1,18,202805,2028),('2028-05-02',202818,5,2028,2,18,202805,2028),('2028-05-03',202818,5,2028,3,18,202805,2028),('2028-05-04',202818,5,2028,4,18,202805,2028),('2028-05-05',202818,5,2028,5,18,202805,2028),('2028-05-06',202818,5,2028,6,18,202805,2028),('2028-05-07',202819,5,2028,7,19,202805,2028),('2028-05-08',202819,5,2028,8,19,202805,2028),('2028-05-09',202819,5,2028,9,19,202805,2028),('2028-05-10',202819,5,2028,10,19,202805,2028),('2028-05-11',202819,5,2028,11,19,202805,2028),('2028-05-12',202819,5,2028,12,19,202805,2028),('2028-05-13',202819,5,2028,13,19,202805,2028),('2028-05-14',202820,5,2028,14,20,202805,2028),('2028-05-15',202820,5,2028,15,20,202805,2028),('2028-05-16',202820,5,2028,16,20,202805,2028),('2028-05-17',202820,5,2028,17,20,202805,2028),('2028-05-18',202820,5,2028,18,20,202805,2028),('2028-05-19',202820,5,2028,19,20,202805,2028),('2028-05-20',202820,5,2028,20,20,202805,2028),('2028-05-21',202821,5,2028,21,21,202805,2028),('2028-05-22',202821,5,2028,22,21,202805,2028),('2028-05-23',202821,5,2028,23,21,202805,2028),('2028-05-24',202821,5,2028,24,21,202805,2028),('2028-05-25',202821,5,2028,25,21,202805,2028),('2028-05-26',202821,5,2028,26,21,202805,2028),('2028-05-27',202821,5,2028,27,21,202805,2028),('2028-05-28',202822,5,2028,28,22,202805,2028),('2028-05-29',202822,5,2028,29,22,202805,2028),('2028-05-30',202822,5,2028,30,22,202805,2028),('2028-05-31',202822,5,2028,31,22,202805,2028),('2028-06-01',202822,6,2028,1,22,202806,2028),('2028-06-02',202822,6,2028,2,22,202806,2028),('2028-06-03',202822,6,2028,3,22,202806,2028),('2028-06-04',202823,6,2028,4,23,202806,2028),('2028-06-05',202823,6,2028,5,23,202806,2028),('2028-06-06',202823,6,2028,6,23,202806,2028),('2028-06-07',202823,6,2028,7,23,202806,2028),('2028-06-08',202823,6,2028,8,23,202806,2028),('2028-06-09',202823,6,2028,9,23,202806,2028),('2028-06-10',202823,6,2028,10,23,202806,2028),('2028-06-11',202824,6,2028,11,24,202806,2028),('2028-06-12',202824,6,2028,12,24,202806,2028),('2028-06-13',202824,6,2028,13,24,202806,2028),('2028-06-14',202824,6,2028,14,24,202806,2028),('2028-06-15',202824,6,2028,15,24,202806,2028),('2028-06-16',202824,6,2028,16,24,202806,2028),('2028-06-17',202824,6,2028,17,24,202806,2028),('2028-06-18',202825,6,2028,18,25,202806,2028),('2028-06-19',202825,6,2028,19,25,202806,2028),('2028-06-20',202825,6,2028,20,25,202806,2028),('2028-06-21',202825,6,2028,21,25,202806,2028),('2028-06-22',202825,6,2028,22,25,202806,2028),('2028-06-23',202825,6,2028,23,25,202806,2028),('2028-06-24',202825,6,2028,24,25,202806,2028),('2028-06-25',202826,6,2028,25,26,202806,2028),('2028-06-26',202826,6,2028,26,26,202806,2028),('2028-06-27',202826,6,2028,27,26,202806,2028),('2028-06-28',202826,6,2028,28,26,202806,2028),('2028-06-29',202826,6,2028,29,26,202806,2028),('2028-06-30',202826,6,2028,30,26,202806,2028),('2028-07-01',202826,7,2028,1,26,202807,2028),('2028-07-02',202827,7,2028,2,27,202807,2028),('2028-07-03',202827,7,2028,3,27,202807,2028),('2028-07-04',202827,7,2028,4,27,202807,2028),('2028-07-05',202827,7,2028,5,27,202807,2028),('2028-07-06',202827,7,2028,6,27,202807,2028),('2028-07-07',202827,7,2028,7,27,202807,2028),('2028-07-08',202827,7,2028,8,27,202807,2028),('2028-07-09',202828,7,2028,9,28,202807,2028),('2028-07-10',202828,7,2028,10,28,202807,2028),('2028-07-11',202828,7,2028,11,28,202807,2028),('2028-07-12',202828,7,2028,12,28,202807,2028),('2028-07-13',202828,7,2028,13,28,202807,2028),('2028-07-14',202828,7,2028,14,28,202807,2028),('2028-07-15',202828,7,2028,15,28,202807,2028),('2028-07-16',202829,7,2028,16,29,202807,2028),('2028-07-17',202829,7,2028,17,29,202807,2028),('2028-07-18',202829,7,2028,18,29,202807,2028),('2028-07-19',202829,7,2028,19,29,202807,2028),('2028-07-20',202829,7,2028,20,29,202807,2028),('2028-07-21',202829,7,2028,21,29,202807,2028),('2028-07-22',202829,7,2028,22,29,202807,2028),('2028-07-23',202830,7,2028,23,30,202807,2028),('2028-07-24',202830,7,2028,24,30,202807,2028),('2028-07-25',202830,7,2028,25,30,202807,2028),('2028-07-26',202830,7,2028,26,30,202807,2028),('2028-07-27',202830,7,2028,27,30,202807,2028),('2028-07-28',202830,7,2028,28,30,202807,2028),('2028-07-29',202830,7,2028,29,30,202807,2028),('2028-07-30',202831,7,2028,30,31,202807,2028),('2028-07-31',202831,7,2028,31,31,202807,2028),('2028-08-01',202831,8,2028,1,31,202808,2028),('2028-08-02',202831,8,2028,2,31,202808,2028),('2028-08-03',202831,8,2028,3,31,202808,2028),('2028-08-04',202831,8,2028,4,31,202808,2028),('2028-08-05',202831,8,2028,5,31,202808,2028),('2028-08-06',202832,8,2028,6,32,202808,2028),('2028-08-07',202832,8,2028,7,32,202808,2028),('2028-08-08',202832,8,2028,8,32,202808,2028),('2028-08-09',202832,8,2028,9,32,202808,2028),('2028-08-10',202832,8,2028,10,32,202808,2028),('2028-08-11',202832,8,2028,11,32,202808,2028),('2028-08-12',202832,8,2028,12,32,202808,2028),('2028-08-13',202833,8,2028,13,33,202808,2028),('2028-08-14',202833,8,2028,14,33,202808,2028),('2028-08-15',202833,8,2028,15,33,202808,2028),('2028-08-16',202833,8,2028,16,33,202808,2028),('2028-08-17',202833,8,2028,17,33,202808,2028),('2028-08-18',202833,8,2028,18,33,202808,2028),('2028-08-19',202833,8,2028,19,33,202808,2028),('2028-08-20',202834,8,2028,20,34,202808,2028),('2028-08-21',202834,8,2028,21,34,202808,2028),('2028-08-22',202834,8,2028,22,34,202808,2028),('2028-08-23',202834,8,2028,23,34,202808,2028),('2028-08-24',202834,8,2028,24,34,202808,2028),('2028-08-25',202834,8,2028,25,34,202808,2028),('2028-08-26',202834,8,2028,26,34,202808,2028),('2028-08-27',202835,8,2028,27,35,202808,2028),('2028-08-28',202835,8,2028,28,35,202808,2028),('2028-08-29',202835,8,2028,29,35,202808,2028),('2028-08-30',202835,8,2028,30,35,202808,2028),('2028-08-31',202835,8,2028,31,35,202808,2028),('2028-09-01',202835,9,2028,1,35,202809,2028),('2028-09-02',202835,9,2028,2,35,202809,2028),('2028-09-03',202836,9,2028,3,36,202809,2028),('2028-09-04',202836,9,2028,4,36,202809,2028),('2028-09-05',202836,9,2028,5,36,202809,2028),('2028-09-06',202836,9,2028,6,36,202809,2028),('2028-09-07',202836,9,2028,7,36,202809,2028),('2028-09-08',202836,9,2028,8,36,202809,2028),('2028-09-09',202836,9,2028,9,36,202809,2028),('2028-09-10',202837,9,2028,10,37,202809,2028),('2028-09-11',202837,9,2028,11,37,202809,2028),('2028-09-12',202837,9,2028,12,37,202809,2028),('2028-09-13',202837,9,2028,13,37,202809,2028),('2028-09-14',202837,9,2028,14,37,202809,2028),('2028-09-15',202837,9,2028,15,37,202809,2028),('2028-09-16',202837,9,2028,16,37,202809,2028),('2028-09-17',202838,9,2028,17,38,202809,2028),('2028-09-18',202838,9,2028,18,38,202809,2028),('2028-09-19',202838,9,2028,19,38,202809,2028),('2028-09-20',202838,9,2028,20,38,202809,2028),('2028-09-21',202838,9,2028,21,38,202809,2028),('2028-09-22',202838,9,2028,22,38,202809,2028),('2028-09-23',202838,9,2028,23,38,202809,2028),('2028-09-24',202839,9,2028,24,39,202809,2028),('2028-09-25',202839,9,2028,25,39,202809,2028),('2028-09-26',202839,9,2028,26,39,202809,2028),('2028-09-27',202839,9,2028,27,39,202809,2028),('2028-09-28',202839,9,2028,28,39,202809,2028),('2028-09-29',202839,9,2028,29,39,202809,2028),('2028-09-30',202839,9,2028,30,39,202809,2028),('2028-10-01',202840,10,2028,1,40,202810,2028),('2028-10-02',202840,10,2028,2,40,202810,2028),('2028-10-03',202840,10,2028,3,40,202810,2028),('2028-10-04',202840,10,2028,4,40,202810,2028),('2028-10-05',202840,10,2028,5,40,202810,2028),('2028-10-06',202840,10,2028,6,40,202810,2028),('2028-10-07',202840,10,2028,7,40,202810,2028),('2028-10-08',202841,10,2028,8,41,202810,2028),('2028-10-09',202841,10,2028,9,41,202810,2028),('2028-10-10',202841,10,2028,10,41,202810,2028),('2028-10-11',202841,10,2028,11,41,202810,2028),('2028-10-12',202841,10,2028,12,41,202810,2028),('2028-10-13',202841,10,2028,13,41,202810,2028),('2028-10-14',202841,10,2028,14,41,202810,2028),('2028-10-15',202842,10,2028,15,42,202810,2028),('2028-10-16',202842,10,2028,16,42,202810,2028),('2028-10-17',202842,10,2028,17,42,202810,2028),('2028-10-18',202842,10,2028,18,42,202810,2028),('2028-10-19',202842,10,2028,19,42,202810,2028),('2028-10-20',202842,10,2028,20,42,202810,2028),('2028-10-21',202842,10,2028,21,42,202810,2028),('2028-10-22',202843,10,2028,22,43,202810,2028),('2028-10-23',202843,10,2028,23,43,202810,2028),('2028-10-24',202843,10,2028,24,43,202810,2028),('2028-10-25',202843,10,2028,25,43,202810,2028),('2028-10-26',202843,10,2028,26,43,202810,2028),('2028-10-27',202843,10,2028,27,43,202810,2028),('2028-10-28',202843,10,2028,28,43,202810,2028),('2028-10-29',202844,10,2028,29,44,202810,2028),('2028-10-30',202844,10,2028,30,44,202810,2028),('2028-10-31',202844,10,2028,31,44,202810,2028),('2028-11-01',202844,11,2028,1,44,202811,2028),('2028-11-02',202844,11,2028,2,44,202811,2028),('2028-11-03',202844,11,2028,3,44,202811,2028),('2028-11-04',202844,11,2028,4,44,202811,2028),('2028-11-05',202845,11,2028,5,45,202811,2028),('2028-11-06',202845,11,2028,6,45,202811,2028),('2028-11-07',202845,11,2028,7,45,202811,2028),('2028-11-08',202845,11,2028,8,45,202811,2028),('2028-11-09',202845,11,2028,9,45,202811,2028),('2028-11-10',202845,11,2028,10,45,202811,2028),('2028-11-11',202845,11,2028,11,45,202811,2028),('2028-11-12',202846,11,2028,12,46,202811,2028),('2028-11-13',202846,11,2028,13,46,202811,2028),('2028-11-14',202846,11,2028,14,46,202811,2028),('2028-11-15',202846,11,2028,15,46,202811,2028),('2028-11-16',202846,11,2028,16,46,202811,2028),('2028-11-17',202846,11,2028,17,46,202811,2028),('2028-11-18',202846,11,2028,18,46,202811,2028),('2028-11-19',202847,11,2028,19,47,202811,2028),('2028-11-20',202847,11,2028,20,47,202811,2028),('2028-11-21',202847,11,2028,21,47,202811,2028),('2028-11-22',202847,11,2028,22,47,202811,2028),('2028-11-23',202847,11,2028,23,47,202811,2028),('2028-11-24',202847,11,2028,24,47,202811,2028),('2028-11-25',202847,11,2028,25,47,202811,2028),('2028-11-26',202848,11,2028,26,48,202811,2028),('2028-11-27',202848,11,2028,27,48,202811,2028),('2028-11-28',202848,11,2028,28,48,202811,2028),('2028-11-29',202848,11,2028,29,48,202811,2028),('2028-11-30',202848,11,2028,30,48,202811,2028),('2028-12-01',202848,12,2028,1,48,202812,2029),('2028-12-02',202848,12,2028,2,48,202812,2029),('2028-12-03',202849,12,2028,3,49,202812,2029),('2028-12-04',202849,12,2028,4,49,202812,2029),('2028-12-05',202849,12,2028,5,49,202812,2029),('2028-12-06',202849,12,2028,6,49,202812,2029),('2028-12-07',202849,12,2028,7,49,202812,2029),('2028-12-08',202849,12,2028,8,49,202812,2029),('2028-12-09',202849,12,2028,9,49,202812,2029),('2028-12-10',202850,12,2028,10,50,202812,2029),('2028-12-11',202850,12,2028,11,50,202812,2029),('2028-12-12',202850,12,2028,12,50,202812,2029),('2028-12-13',202850,12,2028,13,50,202812,2029),('2028-12-14',202850,12,2028,14,50,202812,2029),('2028-12-15',202850,12,2028,15,50,202812,2029),('2028-12-16',202850,12,2028,16,50,202812,2029),('2028-12-17',202851,12,2028,17,51,202812,2029),('2028-12-18',202851,12,2028,18,51,202812,2029),('2028-12-19',202851,12,2028,19,51,202812,2029),('2028-12-20',202851,12,2028,20,51,202812,2029),('2028-12-21',202851,12,2028,21,51,202812,2029),('2028-12-22',202851,12,2028,22,51,202812,2029),('2028-12-23',202851,12,2028,23,51,202812,2029),('2028-12-24',202852,12,2028,24,52,202812,2029),('2028-12-25',202852,12,2028,25,52,202812,2029),('2028-12-26',202852,12,2028,26,52,202812,2029),('2028-12-27',202852,12,2028,27,52,202812,2029),('2028-12-28',202852,12,2028,28,52,202812,2029),('2028-12-29',202852,12,2028,29,52,202812,2029),('2028-12-30',202852,12,2028,30,52,202812,2029),('2028-12-31',202853,12,2028,31,1,202812,2029),('2029-01-01',202901,1,2029,1,1,202901,2029),('2029-01-02',202901,1,2029,2,1,202901,2029),('2029-01-03',202901,1,2029,3,1,202901,2029),('2029-01-04',202901,1,2029,4,1,202901,2029),('2029-01-05',202901,1,2029,5,1,202901,2029),('2029-01-06',202901,1,2029,6,1,202901,2029),('2029-01-07',202902,1,2029,7,2,202901,2029),('2029-01-08',202902,1,2029,8,2,202901,2029),('2029-01-09',202902,1,2029,9,2,202901,2029),('2029-01-10',202902,1,2029,10,2,202901,2029),('2029-01-11',202902,1,2029,11,2,202901,2029),('2029-01-12',202902,1,2029,12,2,202901,2029),('2029-01-13',202902,1,2029,13,2,202901,2029),('2029-01-14',202903,1,2029,14,3,202901,2029),('2029-01-15',202903,1,2029,15,3,202901,2029),('2029-01-16',202903,1,2029,16,3,202901,2029),('2029-01-17',202903,1,2029,17,3,202901,2029),('2029-01-18',202903,1,2029,18,3,202901,2029),('2029-01-19',202903,1,2029,19,3,202901,2029),('2029-01-20',202903,1,2029,20,3,202901,2029),('2029-01-21',202904,1,2029,21,4,202901,2029),('2029-01-22',202904,1,2029,22,4,202901,2029),('2029-01-23',202904,1,2029,23,4,202901,2029),('2029-01-24',202904,1,2029,24,4,202901,2029),('2029-01-25',202904,1,2029,25,4,202901,2029),('2029-01-26',202904,1,2029,26,4,202901,2029),('2029-01-27',202904,1,2029,27,4,202901,2029),('2029-01-28',202905,1,2029,28,5,202901,2029),('2029-01-29',202905,1,2029,29,5,202901,2029),('2029-01-30',202905,1,2029,30,5,202901,2029),('2029-01-31',202905,1,2029,31,5,202901,2029),('2029-02-01',202905,2,2029,1,5,202902,2029),('2029-02-02',202905,2,2029,2,5,202902,2029),('2029-02-03',202905,2,2029,3,5,202902,2029),('2029-02-04',202906,2,2029,4,6,202902,2029),('2029-02-05',202906,2,2029,5,6,202902,2029),('2029-02-06',202906,2,2029,6,6,202902,2029),('2029-02-07',202906,2,2029,7,6,202902,2029),('2029-02-08',202906,2,2029,8,6,202902,2029),('2029-02-09',202906,2,2029,9,6,202902,2029),('2029-02-10',202906,2,2029,10,6,202902,2029),('2029-02-11',202907,2,2029,11,7,202902,2029),('2029-02-12',202907,2,2029,12,7,202902,2029),('2029-02-13',202907,2,2029,13,7,202902,2029),('2029-02-14',202907,2,2029,14,7,202902,2029),('2029-02-15',202907,2,2029,15,7,202902,2029),('2029-02-16',202907,2,2029,16,7,202902,2029),('2029-02-17',202907,2,2029,17,7,202902,2029),('2029-02-18',202908,2,2029,18,8,202902,2029),('2029-02-19',202908,2,2029,19,8,202902,2029),('2029-02-20',202908,2,2029,20,8,202902,2029),('2029-02-21',202908,2,2029,21,8,202902,2029),('2029-02-22',202908,2,2029,22,8,202902,2029),('2029-02-23',202908,2,2029,23,8,202902,2029),('2029-02-24',202908,2,2029,24,8,202902,2029),('2029-02-25',202909,2,2029,25,9,202902,2029),('2029-02-26',202909,2,2029,26,9,202902,2029),('2029-02-27',202909,2,2029,27,9,202902,2029),('2029-02-28',202909,2,2029,28,9,202902,2029),('2029-03-01',202909,3,2029,1,9,202903,2029),('2029-03-02',202909,3,2029,2,9,202903,2029),('2029-03-03',202909,3,2029,3,9,202903,2029),('2029-03-04',202910,3,2029,4,10,202903,2029),('2029-03-05',202910,3,2029,5,10,202903,2029),('2029-03-06',202910,3,2029,6,10,202903,2029),('2029-03-07',202910,3,2029,7,10,202903,2029),('2029-03-08',202910,3,2029,8,10,202903,2029),('2029-03-09',202910,3,2029,9,10,202903,2029),('2029-03-10',202910,3,2029,10,10,202903,2029),('2029-03-11',202911,3,2029,11,11,202903,2029),('2029-03-12',202911,3,2029,12,11,202903,2029),('2029-03-13',202911,3,2029,13,11,202903,2029),('2029-03-14',202911,3,2029,14,11,202903,2029),('2029-03-15',202911,3,2029,15,11,202903,2029),('2029-03-16',202911,3,2029,16,11,202903,2029),('2029-03-17',202911,3,2029,17,11,202903,2029),('2029-03-18',202912,3,2029,18,12,202903,2029),('2029-03-19',202912,3,2029,19,12,202903,2029),('2029-03-20',202912,3,2029,20,12,202903,2029),('2029-03-21',202912,3,2029,21,12,202903,2029),('2029-03-22',202912,3,2029,22,12,202903,2029),('2029-03-23',202912,3,2029,23,12,202903,2029),('2029-03-24',202912,3,2029,24,12,202903,2029),('2029-03-25',202913,3,2029,25,13,202903,2029),('2029-03-26',202913,3,2029,26,13,202903,2029),('2029-03-27',202913,3,2029,27,13,202903,2029),('2029-03-28',202913,3,2029,28,13,202903,2029),('2029-03-29',202913,3,2029,29,13,202903,2029),('2029-03-30',202913,3,2029,30,13,202903,2029),('2029-03-31',202913,3,2029,31,13,202903,2029),('2029-04-01',202914,4,2029,1,14,202904,2029),('2029-04-02',202914,4,2029,2,14,202904,2029),('2029-04-03',202914,4,2029,3,14,202904,2029),('2029-04-04',202914,4,2029,4,14,202904,2029),('2029-04-05',202914,4,2029,5,14,202904,2029),('2029-04-06',202914,4,2029,6,14,202904,2029),('2029-04-07',202914,4,2029,7,14,202904,2029),('2029-04-08',202915,4,2029,8,15,202904,2029),('2029-04-09',202915,4,2029,9,15,202904,2029),('2029-04-10',202915,4,2029,10,15,202904,2029),('2029-04-11',202915,4,2029,11,15,202904,2029),('2029-04-12',202915,4,2029,12,15,202904,2029),('2029-04-13',202915,4,2029,13,15,202904,2029),('2029-04-14',202915,4,2029,14,15,202904,2029),('2029-04-15',202916,4,2029,15,16,202904,2029),('2029-04-16',202916,4,2029,16,16,202904,2029),('2029-04-17',202916,4,2029,17,16,202904,2029),('2029-04-18',202916,4,2029,18,16,202904,2029),('2029-04-19',202916,4,2029,19,16,202904,2029),('2029-04-20',202916,4,2029,20,16,202904,2029),('2029-04-21',202916,4,2029,21,16,202904,2029),('2029-04-22',202917,4,2029,22,17,202904,2029),('2029-04-23',202917,4,2029,23,17,202904,2029),('2029-04-24',202917,4,2029,24,17,202904,2029),('2029-04-25',202917,4,2029,25,17,202904,2029),('2029-04-26',202917,4,2029,26,17,202904,2029),('2029-04-27',202917,4,2029,27,17,202904,2029),('2029-04-28',202917,4,2029,28,17,202904,2029),('2029-04-29',202918,4,2029,29,18,202904,2029),('2029-04-30',202918,4,2029,30,18,202904,2029),('2029-05-01',202918,5,2029,1,18,202905,2029),('2029-05-02',202918,5,2029,2,18,202905,2029),('2029-05-03',202918,5,2029,3,18,202905,2029),('2029-05-04',202918,5,2029,4,18,202905,2029),('2029-05-05',202918,5,2029,5,18,202905,2029),('2029-05-06',202919,5,2029,6,19,202905,2029),('2029-05-07',202919,5,2029,7,19,202905,2029),('2029-05-08',202919,5,2029,8,19,202905,2029),('2029-05-09',202919,5,2029,9,19,202905,2029),('2029-05-10',202919,5,2029,10,19,202905,2029),('2029-05-11',202919,5,2029,11,19,202905,2029),('2029-05-12',202919,5,2029,12,19,202905,2029),('2029-05-13',202920,5,2029,13,20,202905,2029),('2029-05-14',202920,5,2029,14,20,202905,2029),('2029-05-15',202920,5,2029,15,20,202905,2029),('2029-05-16',202920,5,2029,16,20,202905,2029),('2029-05-17',202920,5,2029,17,20,202905,2029),('2029-05-18',202920,5,2029,18,20,202905,2029),('2029-05-19',202920,5,2029,19,20,202905,2029),('2029-05-20',202921,5,2029,20,21,202905,2029),('2029-05-21',202921,5,2029,21,21,202905,2029),('2029-05-22',202921,5,2029,22,21,202905,2029),('2029-05-23',202921,5,2029,23,21,202905,2029),('2029-05-24',202921,5,2029,24,21,202905,2029),('2029-05-25',202921,5,2029,25,21,202905,2029),('2029-05-26',202921,5,2029,26,21,202905,2029),('2029-05-27',202922,5,2029,27,22,202905,2029),('2029-05-28',202922,5,2029,28,22,202905,2029),('2029-05-29',202922,5,2029,29,22,202905,2029),('2029-05-30',202922,5,2029,30,22,202905,2029),('2029-05-31',202922,5,2029,31,22,202905,2029),('2029-06-01',202922,6,2029,1,22,202906,2029),('2029-06-02',202922,6,2029,2,22,202906,2029),('2029-06-03',202923,6,2029,3,23,202906,2029),('2029-06-04',202923,6,2029,4,23,202906,2029),('2029-06-05',202923,6,2029,5,23,202906,2029),('2029-06-06',202923,6,2029,6,23,202906,2029),('2029-06-07',202923,6,2029,7,23,202906,2029),('2029-06-08',202923,6,2029,8,23,202906,2029),('2029-06-09',202923,6,2029,9,23,202906,2029),('2029-06-10',202924,6,2029,10,24,202906,2029),('2029-06-11',202924,6,2029,11,24,202906,2029),('2029-06-12',202924,6,2029,12,24,202906,2029),('2029-06-13',202924,6,2029,13,24,202906,2029),('2029-06-14',202924,6,2029,14,24,202906,2029),('2029-06-15',202924,6,2029,15,24,202906,2029),('2029-06-16',202924,6,2029,16,24,202906,2029),('2029-06-17',202925,6,2029,17,25,202906,2029),('2029-06-18',202925,6,2029,18,25,202906,2029),('2029-06-19',202925,6,2029,19,25,202906,2029),('2029-06-20',202925,6,2029,20,25,202906,2029),('2029-06-21',202925,6,2029,21,25,202906,2029),('2029-06-22',202925,6,2029,22,25,202906,2029),('2029-06-23',202925,6,2029,23,25,202906,2029),('2029-06-24',202926,6,2029,24,26,202906,2029),('2029-06-25',202926,6,2029,25,26,202906,2029),('2029-06-26',202926,6,2029,26,26,202906,2029),('2029-06-27',202926,6,2029,27,26,202906,2029),('2029-06-28',202926,6,2029,28,26,202906,2029),('2029-06-29',202926,6,2029,29,26,202906,2029),('2029-06-30',202926,6,2029,30,26,202906,2029),('2029-07-01',202927,7,2029,1,27,202907,2029),('2029-07-02',202927,7,2029,2,27,202907,2029),('2029-07-03',202927,7,2029,3,27,202907,2029),('2029-07-04',202927,7,2029,4,27,202907,2029),('2029-07-05',202927,7,2029,5,27,202907,2029),('2029-07-06',202927,7,2029,6,27,202907,2029),('2029-07-07',202927,7,2029,7,27,202907,2029),('2029-07-08',202928,7,2029,8,28,202907,2029),('2029-07-09',202928,7,2029,9,28,202907,2029),('2029-07-10',202928,7,2029,10,28,202907,2029),('2029-07-11',202928,7,2029,11,28,202907,2029),('2029-07-12',202928,7,2029,12,28,202907,2029),('2029-07-13',202928,7,2029,13,28,202907,2029),('2029-07-14',202928,7,2029,14,28,202907,2029),('2029-07-15',202929,7,2029,15,29,202907,2029),('2029-07-16',202929,7,2029,16,29,202907,2029),('2029-07-17',202929,7,2029,17,29,202907,2029),('2029-07-18',202929,7,2029,18,29,202907,2029),('2029-07-19',202929,7,2029,19,29,202907,2029),('2029-07-20',202929,7,2029,20,29,202907,2029),('2029-07-21',202929,7,2029,21,29,202907,2029),('2029-07-22',202930,7,2029,22,30,202907,2029),('2029-07-23',202930,7,2029,23,30,202907,2029),('2029-07-24',202930,7,2029,24,30,202907,2029),('2029-07-25',202930,7,2029,25,30,202907,2029),('2029-07-26',202930,7,2029,26,30,202907,2029),('2029-07-27',202930,7,2029,27,30,202907,2029),('2029-07-28',202930,7,2029,28,30,202907,2029),('2029-07-29',202931,7,2029,29,31,202907,2029),('2029-07-30',202931,7,2029,30,31,202907,2029),('2029-07-31',202931,7,2029,31,31,202907,2029),('2029-08-01',202931,8,2029,1,31,202908,2029),('2029-08-02',202931,8,2029,2,31,202908,2029),('2029-08-03',202931,8,2029,3,31,202908,2029),('2029-08-04',202931,8,2029,4,31,202908,2029),('2029-08-05',202932,8,2029,5,32,202908,2029),('2029-08-06',202932,8,2029,6,32,202908,2029),('2029-08-07',202932,8,2029,7,32,202908,2029),('2029-08-08',202932,8,2029,8,32,202908,2029),('2029-08-09',202932,8,2029,9,32,202908,2029),('2029-08-10',202932,8,2029,10,32,202908,2029),('2029-08-11',202932,8,2029,11,32,202908,2029),('2029-08-12',202933,8,2029,12,33,202908,2029),('2029-08-13',202933,8,2029,13,33,202908,2029),('2029-08-14',202933,8,2029,14,33,202908,2029),('2029-08-15',202933,8,2029,15,33,202908,2029),('2029-08-16',202933,8,2029,16,33,202908,2029),('2029-08-17',202933,8,2029,17,33,202908,2029),('2029-08-18',202933,8,2029,18,33,202908,2029),('2029-08-19',202934,8,2029,19,34,202908,2029),('2029-08-20',202934,8,2029,20,34,202908,2029),('2029-08-21',202934,8,2029,21,34,202908,2029),('2029-08-22',202934,8,2029,22,34,202908,2029),('2029-08-23',202934,8,2029,23,34,202908,2029),('2029-08-24',202934,8,2029,24,34,202908,2029),('2029-08-25',202934,8,2029,25,34,202908,2029),('2029-08-26',202935,8,2029,26,35,202908,2029),('2029-08-27',202935,8,2029,27,35,202908,2029),('2029-08-28',202935,8,2029,28,35,202908,2029),('2029-08-29',202935,8,2029,29,35,202908,2029),('2029-08-30',202935,8,2029,30,35,202908,2029),('2029-08-31',202935,8,2029,31,35,202908,2029),('2029-09-01',202935,9,2029,1,35,202909,2029),('2029-09-02',202936,9,2029,2,36,202909,2029),('2029-09-03',202936,9,2029,3,36,202909,2029),('2029-09-04',202936,9,2029,4,36,202909,2029),('2029-09-05',202936,9,2029,5,36,202909,2029),('2029-09-06',202936,9,2029,6,36,202909,2029),('2029-09-07',202936,9,2029,7,36,202909,2029),('2029-09-08',202936,9,2029,8,36,202909,2029),('2029-09-09',202937,9,2029,9,37,202909,2029),('2029-09-10',202937,9,2029,10,37,202909,2029),('2029-09-11',202937,9,2029,11,37,202909,2029),('2029-09-12',202937,9,2029,12,37,202909,2029),('2029-09-13',202937,9,2029,13,37,202909,2029),('2029-09-14',202937,9,2029,14,37,202909,2029),('2029-09-15',202937,9,2029,15,37,202909,2029),('2029-09-16',202938,9,2029,16,38,202909,2029),('2029-09-17',202938,9,2029,17,38,202909,2029),('2029-09-18',202938,9,2029,18,38,202909,2029),('2029-09-19',202938,9,2029,19,38,202909,2029),('2029-09-20',202938,9,2029,20,38,202909,2029),('2029-09-21',202938,9,2029,21,38,202909,2029),('2029-09-22',202938,9,2029,22,38,202909,2029),('2029-09-23',202939,9,2029,23,39,202909,2029),('2029-09-24',202939,9,2029,24,39,202909,2029),('2029-09-25',202939,9,2029,25,39,202909,2029),('2029-09-26',202939,9,2029,26,39,202909,2029),('2029-09-27',202939,9,2029,27,39,202909,2029),('2029-09-28',202939,9,2029,28,39,202909,2029),('2029-09-29',202939,9,2029,29,39,202909,2029),('2029-09-30',202940,9,2029,30,40,202909,2029),('2029-10-01',202940,10,2029,1,40,202910,2029),('2029-10-02',202940,10,2029,2,40,202910,2029),('2029-10-03',202940,10,2029,3,40,202910,2029),('2029-10-04',202940,10,2029,4,40,202910,2029),('2029-10-05',202940,10,2029,5,40,202910,2029),('2029-10-06',202940,10,2029,6,40,202910,2029),('2029-10-07',202941,10,2029,7,41,202910,2029),('2029-10-08',202941,10,2029,8,41,202910,2029),('2029-10-09',202941,10,2029,9,41,202910,2029),('2029-10-10',202941,10,2029,10,41,202910,2029),('2029-10-11',202941,10,2029,11,41,202910,2029),('2029-10-12',202941,10,2029,12,41,202910,2029),('2029-10-13',202941,10,2029,13,41,202910,2029),('2029-10-14',202942,10,2029,14,42,202910,2029),('2029-10-15',202942,10,2029,15,42,202910,2029),('2029-10-16',202942,10,2029,16,42,202910,2029),('2029-10-17',202942,10,2029,17,42,202910,2029),('2029-10-18',202942,10,2029,18,42,202910,2029),('2029-10-19',202942,10,2029,19,42,202910,2029),('2029-10-20',202942,10,2029,20,42,202910,2029),('2029-10-21',202943,10,2029,21,43,202910,2029),('2029-10-22',202943,10,2029,22,43,202910,2029),('2029-10-23',202943,10,2029,23,43,202910,2029),('2029-10-24',202943,10,2029,24,43,202910,2029),('2029-10-25',202943,10,2029,25,43,202910,2029),('2029-10-26',202943,10,2029,26,43,202910,2029),('2029-10-27',202943,10,2029,27,43,202910,2029),('2029-10-28',202944,10,2029,28,44,202910,2029),('2029-10-29',202944,10,2029,29,44,202910,2029),('2029-10-30',202944,10,2029,30,44,202910,2029),('2029-10-31',202944,10,2029,31,44,202910,2029),('2029-11-01',202944,11,2029,1,44,202911,2029),('2029-11-02',202944,11,2029,2,44,202911,2029),('2029-11-03',202944,11,2029,3,44,202911,2029),('2029-11-04',202945,11,2029,4,45,202911,2029),('2029-11-05',202945,11,2029,5,45,202911,2029),('2029-11-06',202945,11,2029,6,45,202911,2029),('2029-11-07',202945,11,2029,7,45,202911,2029),('2029-11-08',202945,11,2029,8,45,202911,2029),('2029-11-09',202945,11,2029,9,45,202911,2029),('2029-11-10',202945,11,2029,10,45,202911,2029),('2029-11-11',202946,11,2029,11,46,202911,2029),('2029-11-12',202946,11,2029,12,46,202911,2029),('2029-11-13',202946,11,2029,13,46,202911,2029),('2029-11-14',202946,11,2029,14,46,202911,2029),('2029-11-15',202946,11,2029,15,46,202911,2029),('2029-11-16',202946,11,2029,16,46,202911,2029),('2029-11-17',202946,11,2029,17,46,202911,2029),('2029-11-18',202947,11,2029,18,47,202911,2029),('2029-11-19',202947,11,2029,19,47,202911,2029),('2029-11-20',202947,11,2029,20,47,202911,2029),('2029-11-21',202947,11,2029,21,47,202911,2029),('2029-11-22',202947,11,2029,22,47,202911,2029),('2029-11-23',202947,11,2029,23,47,202911,2029),('2029-11-24',202947,11,2029,24,47,202911,2029),('2029-11-25',202948,11,2029,25,48,202911,2029),('2029-11-26',202948,11,2029,26,48,202911,2029),('2029-11-27',202948,11,2029,27,48,202911,2029),('2029-11-28',202948,11,2029,28,48,202911,2029),('2029-11-29',202948,11,2029,29,48,202911,2029),('2029-11-30',202948,11,2029,30,48,202911,2029),('2029-12-01',202948,12,2029,1,48,202912,2030),('2029-12-02',202949,12,2029,2,49,202912,2030),('2029-12-03',202949,12,2029,3,49,202912,2030),('2029-12-04',202949,12,2029,4,49,202912,2030),('2029-12-05',202949,12,2029,5,49,202912,2030),('2029-12-06',202949,12,2029,6,49,202912,2030),('2029-12-07',202949,12,2029,7,49,202912,2030),('2029-12-08',202949,12,2029,8,49,202912,2030),('2029-12-09',202950,12,2029,9,50,202912,2030),('2029-12-10',202950,12,2029,10,50,202912,2030),('2029-12-11',202950,12,2029,11,50,202912,2030),('2029-12-12',202950,12,2029,12,50,202912,2030),('2029-12-13',202950,12,2029,13,50,202912,2030),('2029-12-14',202950,12,2029,14,50,202912,2030),('2029-12-15',202950,12,2029,15,50,202912,2030),('2029-12-16',202951,12,2029,16,51,202912,2030),('2029-12-17',202951,12,2029,17,51,202912,2030),('2029-12-18',202951,12,2029,18,51,202912,2030),('2029-12-19',202951,12,2029,19,51,202912,2030),('2029-12-20',202951,12,2029,20,51,202912,2030),('2029-12-21',202951,12,2029,21,51,202912,2030),('2029-12-22',202951,12,2029,22,51,202912,2030),('2029-12-23',202952,12,2029,23,52,202912,2030),('2029-12-24',202952,12,2029,24,52,202912,2030),('2029-12-25',202952,12,2029,25,52,202912,2030),('2029-12-26',202952,12,2029,26,52,202912,2030),('2029-12-27',202952,12,2029,27,52,202912,2030),('2029-12-28',202952,12,2029,28,52,202912,2030),('2029-12-29',202952,12,2029,29,52,202912,2030),('2029-12-30',202953,12,2029,30,1,202912,2030),('2029-12-31',202901,12,2029,31,1,202912,2030),('2030-01-01',203001,1,2030,1,1,203001,2030),('2030-01-02',203001,1,2030,2,1,203001,2030),('2030-01-03',203001,1,2030,3,1,203001,2030),('2030-01-04',203001,1,2030,4,1,203001,2030),('2030-01-05',203001,1,2030,5,1,203001,2030),('2030-01-06',203002,1,2030,6,2,203001,2030),('2030-01-07',203002,1,2030,7,2,203001,2030),('2030-01-08',203002,1,2030,8,2,203001,2030),('2030-01-09',203002,1,2030,9,2,203001,2030),('2030-01-10',203002,1,2030,10,2,203001,2030),('2030-01-11',203002,1,2030,11,2,203001,2030),('2030-01-12',203002,1,2030,12,2,203001,2030),('2030-01-13',203003,1,2030,13,3,203001,2030),('2030-01-14',203003,1,2030,14,3,203001,2030),('2030-01-15',203003,1,2030,15,3,203001,2030),('2030-01-16',203003,1,2030,16,3,203001,2030),('2030-01-17',203003,1,2030,17,3,203001,2030),('2030-01-18',203003,1,2030,18,3,203001,2030),('2030-01-19',203003,1,2030,19,3,203001,2030),('2030-01-20',203004,1,2030,20,4,203001,2030),('2030-01-21',203004,1,2030,21,4,203001,2030),('2030-01-22',203004,1,2030,22,4,203001,2030),('2030-01-23',203004,1,2030,23,4,203001,2030),('2030-01-24',203004,1,2030,24,4,203001,2030),('2030-01-25',203004,1,2030,25,4,203001,2030),('2030-01-26',203004,1,2030,26,4,203001,2030),('2030-01-27',203005,1,2030,27,5,203001,2030),('2030-01-28',203005,1,2030,28,5,203001,2030),('2030-01-29',203005,1,2030,29,5,203001,2030),('2030-01-30',203005,1,2030,30,5,203001,2030),('2030-01-31',203005,1,2030,31,5,203001,2030),('2030-02-01',203005,2,2030,1,5,203002,2030),('2030-02-02',203005,2,2030,2,5,203002,2030),('2030-02-03',203006,2,2030,3,6,203002,2030),('2030-02-04',203006,2,2030,4,6,203002,2030),('2030-02-05',203006,2,2030,5,6,203002,2030),('2030-02-06',203006,2,2030,6,6,203002,2030),('2030-02-07',203006,2,2030,7,6,203002,2030),('2030-02-08',203006,2,2030,8,6,203002,2030),('2030-02-09',203006,2,2030,9,6,203002,2030),('2030-02-10',203007,2,2030,10,7,203002,2030),('2030-02-11',203007,2,2030,11,7,203002,2030),('2030-02-12',203007,2,2030,12,7,203002,2030),('2030-02-13',203007,2,2030,13,7,203002,2030),('2030-02-14',203007,2,2030,14,7,203002,2030),('2030-02-15',203007,2,2030,15,7,203002,2030),('2030-02-16',203007,2,2030,16,7,203002,2030),('2030-02-17',203008,2,2030,17,8,203002,2030),('2030-02-18',203008,2,2030,18,8,203002,2030),('2030-02-19',203008,2,2030,19,8,203002,2030),('2030-02-20',203008,2,2030,20,8,203002,2030),('2030-02-21',203008,2,2030,21,8,203002,2030),('2030-02-22',203008,2,2030,22,8,203002,2030),('2030-02-23',203008,2,2030,23,8,203002,2030),('2030-02-24',203009,2,2030,24,9,203002,2030),('2030-02-25',203009,2,2030,25,9,203002,2030),('2030-02-26',203009,2,2030,26,9,203002,2030),('2030-02-27',203009,2,2030,27,9,203002,2030),('2030-02-28',203009,2,2030,28,9,203002,2030),('2030-03-01',203009,3,2030,1,9,203003,2030),('2030-03-02',203009,3,2030,2,9,203003,2030),('2030-03-03',203010,3,2030,3,10,203003,2030),('2030-03-04',203010,3,2030,4,10,203003,2030),('2030-03-05',203010,3,2030,5,10,203003,2030),('2030-03-06',203010,3,2030,6,10,203003,2030),('2030-03-07',203010,3,2030,7,10,203003,2030),('2030-03-08',203010,3,2030,8,10,203003,2030),('2030-03-09',203010,3,2030,9,10,203003,2030),('2030-03-10',203011,3,2030,10,11,203003,2030),('2030-03-11',203011,3,2030,11,11,203003,2030),('2030-03-12',203011,3,2030,12,11,203003,2030),('2030-03-13',203011,3,2030,13,11,203003,2030),('2030-03-14',203011,3,2030,14,11,203003,2030),('2030-03-15',203011,3,2030,15,11,203003,2030),('2030-03-16',203011,3,2030,16,11,203003,2030),('2030-03-17',203012,3,2030,17,12,203003,2030),('2030-03-18',203012,3,2030,18,12,203003,2030),('2030-03-19',203012,3,2030,19,12,203003,2030),('2030-03-20',203012,3,2030,20,12,203003,2030),('2030-03-21',203012,3,2030,21,12,203003,2030),('2030-03-22',203012,3,2030,22,12,203003,2030),('2030-03-23',203012,3,2030,23,12,203003,2030),('2030-03-24',203013,3,2030,24,13,203003,2030),('2030-03-25',203013,3,2030,25,13,203003,2030),('2030-03-26',203013,3,2030,26,13,203003,2030),('2030-03-27',203013,3,2030,27,13,203003,2030),('2030-03-28',203013,3,2030,28,13,203003,2030),('2030-03-29',203013,3,2030,29,13,203003,2030),('2030-03-30',203013,3,2030,30,13,203003,2030),('2030-03-31',203014,3,2030,31,14,203003,2030),('2030-04-01',203014,4,2030,1,14,203004,2030),('2030-04-02',203014,4,2030,2,14,203004,2030),('2030-04-03',203014,4,2030,3,14,203004,2030),('2030-04-04',203014,4,2030,4,14,203004,2030),('2030-04-05',203014,4,2030,5,14,203004,2030),('2030-04-06',203014,4,2030,6,14,203004,2030),('2030-04-07',203015,4,2030,7,15,203004,2030),('2030-04-08',203015,4,2030,8,15,203004,2030),('2030-04-09',203015,4,2030,9,15,203004,2030),('2030-04-10',203015,4,2030,10,15,203004,2030),('2030-04-11',203015,4,2030,11,15,203004,2030),('2030-04-12',203015,4,2030,12,15,203004,2030),('2030-04-13',203015,4,2030,13,15,203004,2030),('2030-04-14',203016,4,2030,14,16,203004,2030),('2030-04-15',203016,4,2030,15,16,203004,2030),('2030-04-16',203016,4,2030,16,16,203004,2030),('2030-04-17',203016,4,2030,17,16,203004,2030),('2030-04-18',203016,4,2030,18,16,203004,2030),('2030-04-19',203016,4,2030,19,16,203004,2030),('2030-04-20',203016,4,2030,20,16,203004,2030),('2030-04-21',203017,4,2030,21,17,203004,2030),('2030-04-22',203017,4,2030,22,17,203004,2030),('2030-04-23',203017,4,2030,23,17,203004,2030),('2030-04-24',203017,4,2030,24,17,203004,2030),('2030-04-25',203017,4,2030,25,17,203004,2030),('2030-04-26',203017,4,2030,26,17,203004,2030),('2030-04-27',203017,4,2030,27,17,203004,2030),('2030-04-28',203018,4,2030,28,18,203004,2030),('2030-04-29',203018,4,2030,29,18,203004,2030),('2030-04-30',203018,4,2030,30,18,203004,2030),('2030-05-01',203018,5,2030,1,18,203005,2030),('2030-05-02',203018,5,2030,2,18,203005,2030),('2030-05-03',203018,5,2030,3,18,203005,2030),('2030-05-04',203018,5,2030,4,18,203005,2030),('2030-05-05',203019,5,2030,5,19,203005,2030),('2030-05-06',203019,5,2030,6,19,203005,2030),('2030-05-07',203019,5,2030,7,19,203005,2030),('2030-05-08',203019,5,2030,8,19,203005,2030),('2030-05-09',203019,5,2030,9,19,203005,2030),('2030-05-10',203019,5,2030,10,19,203005,2030),('2030-05-11',203019,5,2030,11,19,203005,2030),('2030-05-12',203020,5,2030,12,20,203005,2030),('2030-05-13',203020,5,2030,13,20,203005,2030),('2030-05-14',203020,5,2030,14,20,203005,2030),('2030-05-15',203020,5,2030,15,20,203005,2030),('2030-05-16',203020,5,2030,16,20,203005,2030),('2030-05-17',203020,5,2030,17,20,203005,2030),('2030-05-18',203020,5,2030,18,20,203005,2030),('2030-05-19',203021,5,2030,19,21,203005,2030),('2030-05-20',203021,5,2030,20,21,203005,2030),('2030-05-21',203021,5,2030,21,21,203005,2030),('2030-05-22',203021,5,2030,22,21,203005,2030),('2030-05-23',203021,5,2030,23,21,203005,2030),('2030-05-24',203021,5,2030,24,21,203005,2030),('2030-05-25',203021,5,2030,25,21,203005,2030),('2030-05-26',203022,5,2030,26,22,203005,2030),('2030-05-27',203022,5,2030,27,22,203005,2030),('2030-05-28',203022,5,2030,28,22,203005,2030),('2030-05-29',203022,5,2030,29,22,203005,2030),('2030-05-30',203022,5,2030,30,22,203005,2030),('2030-05-31',203022,5,2030,31,22,203005,2030),('2030-06-01',203022,6,2030,1,22,203006,2030),('2030-06-02',203023,6,2030,2,23,203006,2030),('2030-06-03',203023,6,2030,3,23,203006,2030),('2030-06-04',203023,6,2030,4,23,203006,2030),('2030-06-05',203023,6,2030,5,23,203006,2030),('2030-06-06',203023,6,2030,6,23,203006,2030),('2030-06-07',203023,6,2030,7,23,203006,2030),('2030-06-08',203023,6,2030,8,23,203006,2030),('2030-06-09',203024,6,2030,9,24,203006,2030),('2030-06-10',203024,6,2030,10,24,203006,2030),('2030-06-11',203024,6,2030,11,24,203006,2030),('2030-06-12',203024,6,2030,12,24,203006,2030),('2030-06-13',203024,6,2030,13,24,203006,2030),('2030-06-14',203024,6,2030,14,24,203006,2030),('2030-06-15',203024,6,2030,15,24,203006,2030),('2030-06-16',203025,6,2030,16,25,203006,2030),('2030-06-17',203025,6,2030,17,25,203006,2030),('2030-06-18',203025,6,2030,18,25,203006,2030),('2030-06-19',203025,6,2030,19,25,203006,2030),('2030-06-20',203025,6,2030,20,25,203006,2030),('2030-06-21',203025,6,2030,21,25,203006,2030),('2030-06-22',203025,6,2030,22,25,203006,2030),('2030-06-23',203026,6,2030,23,26,203006,2030),('2030-06-24',203026,6,2030,24,26,203006,2030),('2030-06-25',203026,6,2030,25,26,203006,2030),('2030-06-26',203026,6,2030,26,26,203006,2030),('2030-06-27',203026,6,2030,27,26,203006,2030),('2030-06-28',203026,6,2030,28,26,203006,2030),('2030-06-29',203026,6,2030,29,26,203006,2030),('2030-06-30',203027,6,2030,30,27,203006,2030),('2030-07-01',203027,7,2030,1,27,203007,2030),('2030-07-02',203027,7,2030,2,27,203007,2030),('2030-07-03',203027,7,2030,3,27,203007,2030),('2030-07-04',203027,7,2030,4,27,203007,2030),('2030-07-05',203027,7,2030,5,27,203007,2030),('2030-07-06',203027,7,2030,6,27,203007,2030),('2030-07-07',203028,7,2030,7,28,203007,2030),('2030-07-08',203028,7,2030,8,28,203007,2030),('2030-07-09',203028,7,2030,9,28,203007,2030),('2030-07-10',203028,7,2030,10,28,203007,2030),('2030-07-11',203028,7,2030,11,28,203007,2030),('2030-07-12',203028,7,2030,12,28,203007,2030),('2030-07-13',203028,7,2030,13,28,203007,2030),('2030-07-14',203029,7,2030,14,29,203007,2030),('2030-07-15',203029,7,2030,15,29,203007,2030),('2030-07-16',203029,7,2030,16,29,203007,2030),('2030-07-17',203029,7,2030,17,29,203007,2030),('2030-07-18',203029,7,2030,18,29,203007,2030),('2030-07-19',203029,7,2030,19,29,203007,2030),('2030-07-20',203029,7,2030,20,29,203007,2030),('2030-07-21',203030,7,2030,21,30,203007,2030),('2030-07-22',203030,7,2030,22,30,203007,2030),('2030-07-23',203030,7,2030,23,30,203007,2030),('2030-07-24',203030,7,2030,24,30,203007,2030),('2030-07-25',203030,7,2030,25,30,203007,2030),('2030-07-26',203030,7,2030,26,30,203007,2030),('2030-07-27',203030,7,2030,27,30,203007,2030),('2030-07-28',203031,7,2030,28,31,203007,2030),('2030-07-29',203031,7,2030,29,31,203007,2030),('2030-07-30',203031,7,2030,30,31,203007,2030),('2030-07-31',203031,7,2030,31,31,203007,2030),('2030-08-01',203031,8,2030,1,31,203008,2030),('2030-08-02',203031,8,2030,2,31,203008,2030),('2030-08-03',203031,8,2030,3,31,203008,2030),('2030-08-04',203032,8,2030,4,32,203008,2030),('2030-08-05',203032,8,2030,5,32,203008,2030),('2030-08-06',203032,8,2030,6,32,203008,2030),('2030-08-07',203032,8,2030,7,32,203008,2030),('2030-08-08',203032,8,2030,8,32,203008,2030),('2030-08-09',203032,8,2030,9,32,203008,2030),('2030-08-10',203032,8,2030,10,32,203008,2030),('2030-08-11',203033,8,2030,11,33,203008,2030),('2030-08-12',203033,8,2030,12,33,203008,2030),('2030-08-13',203033,8,2030,13,33,203008,2030),('2030-08-14',203033,8,2030,14,33,203008,2030),('2030-08-15',203033,8,2030,15,33,203008,2030),('2030-08-16',203033,8,2030,16,33,203008,2030),('2030-08-17',203033,8,2030,17,33,203008,2030),('2030-08-18',203034,8,2030,18,34,203008,2030),('2030-08-19',203034,8,2030,19,34,203008,2030),('2030-08-20',203034,8,2030,20,34,203008,2030),('2030-08-21',203034,8,2030,21,34,203008,2030),('2030-08-22',203034,8,2030,22,34,203008,2030),('2030-08-23',203034,8,2030,23,34,203008,2030),('2030-08-24',203034,8,2030,24,34,203008,2030),('2030-08-25',203035,8,2030,25,35,203008,2030),('2030-08-26',203035,8,2030,26,35,203008,2030),('2030-08-27',203035,8,2030,27,35,203008,2030),('2030-08-28',203035,8,2030,28,35,203008,2030),('2030-08-29',203035,8,2030,29,35,203008,2030),('2030-08-30',203035,8,2030,30,35,203008,2030),('2030-08-31',203035,8,2030,31,35,203008,2030),('2030-09-01',203036,9,2030,1,36,203009,2030),('2030-09-02',203036,9,2030,2,36,203009,2030),('2030-09-03',203036,9,2030,3,36,203009,2030),('2030-09-04',203036,9,2030,4,36,203009,2030),('2030-09-05',203036,9,2030,5,36,203009,2030),('2030-09-06',203036,9,2030,6,36,203009,2030),('2030-09-07',203036,9,2030,7,36,203009,2030),('2030-09-08',203037,9,2030,8,37,203009,2030),('2030-09-09',203037,9,2030,9,37,203009,2030),('2030-09-10',203037,9,2030,10,37,203009,2030),('2030-09-11',203037,9,2030,11,37,203009,2030),('2030-09-12',203037,9,2030,12,37,203009,2030),('2030-09-13',203037,9,2030,13,37,203009,2030),('2030-09-14',203037,9,2030,14,37,203009,2030),('2030-09-15',203038,9,2030,15,38,203009,2030),('2030-09-16',203038,9,2030,16,38,203009,2030),('2030-09-17',203038,9,2030,17,38,203009,2030),('2030-09-18',203038,9,2030,18,38,203009,2030),('2030-09-19',203038,9,2030,19,38,203009,2030),('2030-09-20',203038,9,2030,20,38,203009,2030),('2030-09-21',203038,9,2030,21,38,203009,2030),('2030-09-22',203039,9,2030,22,39,203009,2030),('2030-09-23',203039,9,2030,23,39,203009,2030),('2030-09-24',203039,9,2030,24,39,203009,2030),('2030-09-25',203039,9,2030,25,39,203009,2030),('2030-09-26',203039,9,2030,26,39,203009,2030),('2030-09-27',203039,9,2030,27,39,203009,2030),('2030-09-28',203039,9,2030,28,39,203009,2030),('2030-09-29',203040,9,2030,29,40,203009,2030),('2030-09-30',203040,9,2030,30,40,203009,2030),('2030-10-01',203040,10,2030,1,40,203010,2030),('2030-10-02',203040,10,2030,2,40,203010,2030),('2030-10-03',203040,10,2030,3,40,203010,2030),('2030-10-04',203040,10,2030,4,40,203010,2030),('2030-10-05',203040,10,2030,5,40,203010,2030),('2030-10-06',203041,10,2030,6,41,203010,2030),('2030-10-07',203041,10,2030,7,41,203010,2030),('2030-10-08',203041,10,2030,8,41,203010,2030),('2030-10-09',203041,10,2030,9,41,203010,2030),('2030-10-10',203041,10,2030,10,41,203010,2030),('2030-10-11',203041,10,2030,11,41,203010,2030),('2030-10-12',203041,10,2030,12,41,203010,2030),('2030-10-13',203042,10,2030,13,42,203010,2030),('2030-10-14',203042,10,2030,14,42,203010,2030),('2030-10-15',203042,10,2030,15,42,203010,2030),('2030-10-16',203042,10,2030,16,42,203010,2030),('2030-10-17',203042,10,2030,17,42,203010,2030),('2030-10-18',203042,10,2030,18,42,203010,2030),('2030-10-19',203042,10,2030,19,42,203010,2030),('2030-10-20',203043,10,2030,20,43,203010,2030),('2030-10-21',203043,10,2030,21,43,203010,2030),('2030-10-22',203043,10,2030,22,43,203010,2030),('2030-10-23',203043,10,2030,23,43,203010,2030),('2030-10-24',203043,10,2030,24,43,203010,2030),('2030-10-25',203043,10,2030,25,43,203010,2030),('2030-10-26',203043,10,2030,26,43,203010,2030),('2030-10-27',203044,10,2030,27,44,203010,2030),('2030-10-28',203044,10,2030,28,44,203010,2030),('2030-10-29',203044,10,2030,29,44,203010,2030),('2030-10-30',203044,10,2030,30,44,203010,2030),('2030-10-31',203044,10,2030,31,44,203010,2030),('2030-11-01',203044,11,2030,1,44,203011,2030),('2030-11-02',203044,11,2030,2,44,203011,2030),('2030-11-03',203045,11,2030,3,45,203011,2030),('2030-11-04',203045,11,2030,4,45,203011,2030),('2030-11-05',203045,11,2030,5,45,203011,2030),('2030-11-06',203045,11,2030,6,45,203011,2030),('2030-11-07',203045,11,2030,7,45,203011,2030),('2030-11-08',203045,11,2030,8,45,203011,2030),('2030-11-09',203045,11,2030,9,45,203011,2030),('2030-11-10',203046,11,2030,10,46,203011,2030),('2030-11-11',203046,11,2030,11,46,203011,2030),('2030-11-12',203046,11,2030,12,46,203011,2030),('2030-11-13',203046,11,2030,13,46,203011,2030),('2030-11-14',203046,11,2030,14,46,203011,2030),('2030-11-15',203046,11,2030,15,46,203011,2030),('2030-11-16',203046,11,2030,16,46,203011,2030),('2030-11-17',203047,11,2030,17,47,203011,2030),('2030-11-18',203047,11,2030,18,47,203011,2030),('2030-11-19',203047,11,2030,19,47,203011,2030),('2030-11-20',203047,11,2030,20,47,203011,2030),('2030-11-21',203047,11,2030,21,47,203011,2030),('2030-11-22',203047,11,2030,22,47,203011,2030),('2030-11-23',203047,11,2030,23,47,203011,2030),('2030-11-24',203048,11,2030,24,48,203011,2030),('2030-11-25',203048,11,2030,25,48,203011,2030),('2030-11-26',203048,11,2030,26,48,203011,2030),('2030-11-27',203048,11,2030,27,48,203011,2030),('2030-11-28',203048,11,2030,28,48,203011,2030),('2030-11-29',203048,11,2030,29,48,203011,2030),('2030-11-30',203048,11,2030,30,48,203011,2030),('2030-12-01',203049,12,2030,1,49,203012,2031),('2030-12-02',203049,12,2030,2,49,203012,2031),('2030-12-03',203049,12,2030,3,49,203012,2031),('2030-12-04',203049,12,2030,4,49,203012,2031),('2030-12-05',203049,12,2030,5,49,203012,2031),('2030-12-06',203049,12,2030,6,49,203012,2031),('2030-12-07',203049,12,2030,7,49,203012,2031),('2030-12-08',203050,12,2030,8,50,203012,2031),('2030-12-09',203050,12,2030,9,50,203012,2031),('2030-12-10',203050,12,2030,10,50,203012,2031),('2030-12-11',203050,12,2030,11,50,203012,2031),('2030-12-12',203050,12,2030,12,50,203012,2031),('2030-12-13',203050,12,2030,13,50,203012,2031),('2030-12-14',203050,12,2030,14,50,203012,2031),('2030-12-15',203051,12,2030,15,51,203012,2031),('2030-12-16',203051,12,2030,16,51,203012,2031),('2030-12-17',203051,12,2030,17,51,203012,2031),('2030-12-18',203051,12,2030,18,51,203012,2031),('2030-12-19',203051,12,2030,19,51,203012,2031),('2030-12-20',203051,12,2030,20,51,203012,2031),('2030-12-21',203051,12,2030,21,51,203012,2031),('2030-12-22',203052,12,2030,22,52,203012,2031),('2030-12-23',203052,12,2030,23,52,203012,2031),('2030-12-24',203052,12,2030,24,52,203012,2031),('2030-12-25',203052,12,2030,25,52,203012,2031),('2030-12-26',203052,12,2030,26,52,203012,2031),('2030-12-27',203052,12,2030,27,52,203012,2031),('2030-12-28',203052,12,2030,28,52,203012,2031),('2030-12-29',203053,12,2030,29,1,203012,2031),('2030-12-30',203001,12,2030,30,1,203012,2031),('2030-12-31',203001,12,2030,31,1,203012,2031),('2031-01-01',203101,1,2031,1,1,203101,2031),('2031-01-02',203101,1,2031,2,1,203101,2031),('2031-01-03',203101,1,2031,3,1,203101,2031),('2031-01-04',203101,1,2031,4,1,203101,2031),('2031-01-05',203102,1,2031,5,2,203101,2031),('2031-01-06',203102,1,2031,6,2,203101,2031),('2031-01-07',203102,1,2031,7,2,203101,2031),('2031-01-08',203102,1,2031,8,2,203101,2031),('2031-01-09',203102,1,2031,9,2,203101,2031),('2031-01-10',203102,1,2031,10,2,203101,2031),('2031-01-11',203102,1,2031,11,2,203101,2031),('2031-01-12',203103,1,2031,12,3,203101,2031),('2031-01-13',203103,1,2031,13,3,203101,2031),('2031-01-14',203103,1,2031,14,3,203101,2031),('2031-01-15',203103,1,2031,15,3,203101,2031),('2031-01-16',203103,1,2031,16,3,203101,2031),('2031-01-17',203103,1,2031,17,3,203101,2031),('2031-01-18',203103,1,2031,18,3,203101,2031),('2031-01-19',203104,1,2031,19,4,203101,2031),('2031-01-20',203104,1,2031,20,4,203101,2031),('2031-01-21',203104,1,2031,21,4,203101,2031),('2031-01-22',203104,1,2031,22,4,203101,2031),('2031-01-23',203104,1,2031,23,4,203101,2031),('2031-01-24',203104,1,2031,24,4,203101,2031),('2031-01-25',203104,1,2031,25,4,203101,2031),('2031-01-26',203105,1,2031,26,5,203101,2031),('2031-01-27',203105,1,2031,27,5,203101,2031),('2031-01-28',203105,1,2031,28,5,203101,2031),('2031-01-29',203105,1,2031,29,5,203101,2031),('2031-01-30',203105,1,2031,30,5,203101,2031),('2031-01-31',203105,1,2031,31,5,203101,2031),('2031-02-01',203105,2,2031,1,5,203102,2031),('2031-02-02',203106,2,2031,2,6,203102,2031),('2031-02-03',203106,2,2031,3,6,203102,2031),('2031-02-04',203106,2,2031,4,6,203102,2031),('2031-02-05',203106,2,2031,5,6,203102,2031),('2031-02-06',203106,2,2031,6,6,203102,2031),('2031-02-07',203106,2,2031,7,6,203102,2031),('2031-02-08',203106,2,2031,8,6,203102,2031),('2031-02-09',203107,2,2031,9,7,203102,2031),('2031-02-10',203107,2,2031,10,7,203102,2031),('2031-02-11',203107,2,2031,11,7,203102,2031),('2031-02-12',203107,2,2031,12,7,203102,2031),('2031-02-13',203107,2,2031,13,7,203102,2031),('2031-02-14',203107,2,2031,14,7,203102,2031),('2031-02-15',203107,2,2031,15,7,203102,2031),('2031-02-16',203108,2,2031,16,8,203102,2031),('2031-02-17',203108,2,2031,17,8,203102,2031),('2031-02-18',203108,2,2031,18,8,203102,2031),('2031-02-19',203108,2,2031,19,8,203102,2031),('2031-02-20',203108,2,2031,20,8,203102,2031),('2031-02-21',203108,2,2031,21,8,203102,2031),('2031-02-22',203108,2,2031,22,8,203102,2031),('2031-02-23',203109,2,2031,23,9,203102,2031),('2031-02-24',203109,2,2031,24,9,203102,2031),('2031-02-25',203109,2,2031,25,9,203102,2031),('2031-02-26',203109,2,2031,26,9,203102,2031),('2031-02-27',203109,2,2031,27,9,203102,2031),('2031-02-28',203109,2,2031,28,9,203102,2031),('2031-03-01',203109,3,2031,1,9,203103,2031),('2031-03-02',203110,3,2031,2,10,203103,2031),('2031-03-03',203110,3,2031,3,10,203103,2031),('2031-03-04',203110,3,2031,4,10,203103,2031),('2031-03-05',203110,3,2031,5,10,203103,2031),('2031-03-06',203110,3,2031,6,10,203103,2031),('2031-03-07',203110,3,2031,7,10,203103,2031),('2031-03-08',203110,3,2031,8,10,203103,2031),('2031-03-09',203111,3,2031,9,11,203103,2031),('2031-03-10',203111,3,2031,10,11,203103,2031),('2031-03-11',203111,3,2031,11,11,203103,2031),('2031-03-12',203111,3,2031,12,11,203103,2031),('2031-03-13',203111,3,2031,13,11,203103,2031),('2031-03-14',203111,3,2031,14,11,203103,2031),('2031-03-15',203111,3,2031,15,11,203103,2031),('2031-03-16',203112,3,2031,16,12,203103,2031),('2031-03-17',203112,3,2031,17,12,203103,2031),('2031-03-18',203112,3,2031,18,12,203103,2031),('2031-03-19',203112,3,2031,19,12,203103,2031),('2031-03-20',203112,3,2031,20,12,203103,2031),('2031-03-21',203112,3,2031,21,12,203103,2031),('2031-03-22',203112,3,2031,22,12,203103,2031),('2031-03-23',203113,3,2031,23,13,203103,2031),('2031-03-24',203113,3,2031,24,13,203103,2031),('2031-03-25',203113,3,2031,25,13,203103,2031),('2031-03-26',203113,3,2031,26,13,203103,2031),('2031-03-27',203113,3,2031,27,13,203103,2031),('2031-03-28',203113,3,2031,28,13,203103,2031),('2031-03-29',203113,3,2031,29,13,203103,2031),('2031-03-30',203114,3,2031,30,14,203103,2031),('2031-03-31',203114,3,2031,31,14,203103,2031),('2031-04-01',203114,4,2031,1,14,203104,2031),('2031-04-02',203114,4,2031,2,14,203104,2031),('2031-04-03',203114,4,2031,3,14,203104,2031),('2031-04-04',203114,4,2031,4,14,203104,2031),('2031-04-05',203114,4,2031,5,14,203104,2031),('2031-04-06',203115,4,2031,6,15,203104,2031),('2031-04-07',203115,4,2031,7,15,203104,2031),('2031-04-08',203115,4,2031,8,15,203104,2031),('2031-04-09',203115,4,2031,9,15,203104,2031),('2031-04-10',203115,4,2031,10,15,203104,2031),('2031-04-11',203115,4,2031,11,15,203104,2031),('2031-04-12',203115,4,2031,12,15,203104,2031),('2031-04-13',203116,4,2031,13,16,203104,2031),('2031-04-14',203116,4,2031,14,16,203104,2031),('2031-04-15',203116,4,2031,15,16,203104,2031),('2031-04-16',203116,4,2031,16,16,203104,2031),('2031-04-17',203116,4,2031,17,16,203104,2031),('2031-04-18',203116,4,2031,18,16,203104,2031),('2031-04-19',203116,4,2031,19,16,203104,2031),('2031-04-20',203117,4,2031,20,17,203104,2031),('2031-04-21',203117,4,2031,21,17,203104,2031),('2031-04-22',203117,4,2031,22,17,203104,2031),('2031-04-23',203117,4,2031,23,17,203104,2031),('2031-04-24',203117,4,2031,24,17,203104,2031),('2031-04-25',203117,4,2031,25,17,203104,2031),('2031-04-26',203117,4,2031,26,17,203104,2031),('2031-04-27',203118,4,2031,27,18,203104,2031),('2031-04-28',203118,4,2031,28,18,203104,2031),('2031-04-29',203118,4,2031,29,18,203104,2031),('2031-04-30',203118,4,2031,30,18,203104,2031),('2031-05-01',203118,5,2031,1,18,203105,2031),('2031-05-02',203118,5,2031,2,18,203105,2031),('2031-05-03',203118,5,2031,3,18,203105,2031),('2031-05-04',203119,5,2031,4,19,203105,2031),('2031-05-05',203119,5,2031,5,19,203105,2031),('2031-05-06',203119,5,2031,6,19,203105,2031),('2031-05-07',203119,5,2031,7,19,203105,2031),('2031-05-08',203119,5,2031,8,19,203105,2031),('2031-05-09',203119,5,2031,9,19,203105,2031),('2031-05-10',203119,5,2031,10,19,203105,2031),('2031-05-11',203120,5,2031,11,20,203105,2031),('2031-05-12',203120,5,2031,12,20,203105,2031),('2031-05-13',203120,5,2031,13,20,203105,2031),('2031-05-14',203120,5,2031,14,20,203105,2031),('2031-05-15',203120,5,2031,15,20,203105,2031),('2031-05-16',203120,5,2031,16,20,203105,2031),('2031-05-17',203120,5,2031,17,20,203105,2031),('2031-05-18',203121,5,2031,18,21,203105,2031),('2031-05-19',203121,5,2031,19,21,203105,2031),('2031-05-20',203121,5,2031,20,21,203105,2031),('2031-05-21',203121,5,2031,21,21,203105,2031),('2031-05-22',203121,5,2031,22,21,203105,2031),('2031-05-23',203121,5,2031,23,21,203105,2031),('2031-05-24',203121,5,2031,24,21,203105,2031),('2031-05-25',203122,5,2031,25,22,203105,2031),('2031-05-26',203122,5,2031,26,22,203105,2031),('2031-05-27',203122,5,2031,27,22,203105,2031),('2031-05-28',203122,5,2031,28,22,203105,2031),('2031-05-29',203122,5,2031,29,22,203105,2031),('2031-05-30',203122,5,2031,30,22,203105,2031),('2031-05-31',203122,5,2031,31,22,203105,2031),('2031-06-01',203123,6,2031,1,23,203106,2031),('2031-06-02',203123,6,2031,2,23,203106,2031),('2031-06-03',203123,6,2031,3,23,203106,2031),('2031-06-04',203123,6,2031,4,23,203106,2031),('2031-06-05',203123,6,2031,5,23,203106,2031),('2031-06-06',203123,6,2031,6,23,203106,2031),('2031-06-07',203123,6,2031,7,23,203106,2031),('2031-06-08',203124,6,2031,8,24,203106,2031),('2031-06-09',203124,6,2031,9,24,203106,2031),('2031-06-10',203124,6,2031,10,24,203106,2031),('2031-06-11',203124,6,2031,11,24,203106,2031),('2031-06-12',203124,6,2031,12,24,203106,2031),('2031-06-13',203124,6,2031,13,24,203106,2031),('2031-06-14',203124,6,2031,14,24,203106,2031),('2031-06-15',203125,6,2031,15,25,203106,2031),('2031-06-16',203125,6,2031,16,25,203106,2031),('2031-06-17',203125,6,2031,17,25,203106,2031),('2031-06-18',203125,6,2031,18,25,203106,2031),('2031-06-19',203125,6,2031,19,25,203106,2031),('2031-06-20',203125,6,2031,20,25,203106,2031),('2031-06-21',203125,6,2031,21,25,203106,2031),('2031-06-22',203126,6,2031,22,26,203106,2031),('2031-06-23',203126,6,2031,23,26,203106,2031),('2031-06-24',203126,6,2031,24,26,203106,2031),('2031-06-25',203126,6,2031,25,26,203106,2031),('2031-06-26',203126,6,2031,26,26,203106,2031),('2031-06-27',203126,6,2031,27,26,203106,2031),('2031-06-28',203126,6,2031,28,26,203106,2031),('2031-06-29',203127,6,2031,29,27,203106,2031),('2031-06-30',203127,6,2031,30,27,203106,2031),('2031-07-01',203127,7,2031,1,27,203107,2031),('2031-07-02',203127,7,2031,2,27,203107,2031),('2031-07-03',203127,7,2031,3,27,203107,2031),('2031-07-04',203127,7,2031,4,27,203107,2031),('2031-07-05',203127,7,2031,5,27,203107,2031),('2031-07-06',203128,7,2031,6,28,203107,2031),('2031-07-07',203128,7,2031,7,28,203107,2031),('2031-07-08',203128,7,2031,8,28,203107,2031),('2031-07-09',203128,7,2031,9,28,203107,2031),('2031-07-10',203128,7,2031,10,28,203107,2031),('2031-07-11',203128,7,2031,11,28,203107,2031),('2031-07-12',203128,7,2031,12,28,203107,2031),('2031-07-13',203129,7,2031,13,29,203107,2031),('2031-07-14',203129,7,2031,14,29,203107,2031),('2031-07-15',203129,7,2031,15,29,203107,2031),('2031-07-16',203129,7,2031,16,29,203107,2031),('2031-07-17',203129,7,2031,17,29,203107,2031),('2031-07-18',203129,7,2031,18,29,203107,2031),('2031-07-19',203129,7,2031,19,29,203107,2031),('2031-07-20',203130,7,2031,20,30,203107,2031),('2031-07-21',203130,7,2031,21,30,203107,2031),('2031-07-22',203130,7,2031,22,30,203107,2031),('2031-07-23',203130,7,2031,23,30,203107,2031),('2031-07-24',203130,7,2031,24,30,203107,2031),('2031-07-25',203130,7,2031,25,30,203107,2031),('2031-07-26',203130,7,2031,26,30,203107,2031),('2031-07-27',203131,7,2031,27,31,203107,2031),('2031-07-28',203131,7,2031,28,31,203107,2031),('2031-07-29',203131,7,2031,29,31,203107,2031),('2031-07-30',203131,7,2031,30,31,203107,2031),('2031-07-31',203131,7,2031,31,31,203107,2031),('2031-08-01',203131,8,2031,1,31,203108,2031),('2031-08-02',203131,8,2031,2,31,203108,2031),('2031-08-03',203132,8,2031,3,32,203108,2031),('2031-08-04',203132,8,2031,4,32,203108,2031),('2031-08-05',203132,8,2031,5,32,203108,2031),('2031-08-06',203132,8,2031,6,32,203108,2031),('2031-08-07',203132,8,2031,7,32,203108,2031),('2031-08-08',203132,8,2031,8,32,203108,2031),('2031-08-09',203132,8,2031,9,32,203108,2031),('2031-08-10',203133,8,2031,10,33,203108,2031),('2031-08-11',203133,8,2031,11,33,203108,2031),('2031-08-12',203133,8,2031,12,33,203108,2031),('2031-08-13',203133,8,2031,13,33,203108,2031),('2031-08-14',203133,8,2031,14,33,203108,2031),('2031-08-15',203133,8,2031,15,33,203108,2031),('2031-08-16',203133,8,2031,16,33,203108,2031),('2031-08-17',203134,8,2031,17,34,203108,2031),('2031-08-18',203134,8,2031,18,34,203108,2031),('2031-08-19',203134,8,2031,19,34,203108,2031),('2031-08-20',203134,8,2031,20,34,203108,2031),('2031-08-21',203134,8,2031,21,34,203108,2031),('2031-08-22',203134,8,2031,22,34,203108,2031),('2031-08-23',203134,8,2031,23,34,203108,2031),('2031-08-24',203135,8,2031,24,35,203108,2031),('2031-08-25',203135,8,2031,25,35,203108,2031),('2031-08-26',203135,8,2031,26,35,203108,2031),('2031-08-27',203135,8,2031,27,35,203108,2031),('2031-08-28',203135,8,2031,28,35,203108,2031),('2031-08-29',203135,8,2031,29,35,203108,2031),('2031-08-30',203135,8,2031,30,35,203108,2031),('2031-08-31',203136,8,2031,31,36,203108,2031),('2031-09-01',203136,9,2031,1,36,203109,2031),('2031-09-02',203136,9,2031,2,36,203109,2031),('2031-09-03',203136,9,2031,3,36,203109,2031),('2031-09-04',203136,9,2031,4,36,203109,2031),('2031-09-05',203136,9,2031,5,36,203109,2031),('2031-09-06',203136,9,2031,6,36,203109,2031),('2031-09-07',203137,9,2031,7,37,203109,2031),('2031-09-08',203137,9,2031,8,37,203109,2031),('2031-09-09',203137,9,2031,9,37,203109,2031),('2031-09-10',203137,9,2031,10,37,203109,2031),('2031-09-11',203137,9,2031,11,37,203109,2031),('2031-09-12',203137,9,2031,12,37,203109,2031),('2031-09-13',203137,9,2031,13,37,203109,2031),('2031-09-14',203138,9,2031,14,38,203109,2031),('2031-09-15',203138,9,2031,15,38,203109,2031),('2031-09-16',203138,9,2031,16,38,203109,2031),('2031-09-17',203138,9,2031,17,38,203109,2031),('2031-09-18',203138,9,2031,18,38,203109,2031),('2031-09-19',203138,9,2031,19,38,203109,2031),('2031-09-20',203138,9,2031,20,38,203109,2031),('2031-09-21',203139,9,2031,21,39,203109,2031),('2031-09-22',203139,9,2031,22,39,203109,2031),('2031-09-23',203139,9,2031,23,39,203109,2031),('2031-09-24',203139,9,2031,24,39,203109,2031),('2031-09-25',203139,9,2031,25,39,203109,2031),('2031-09-26',203139,9,2031,26,39,203109,2031),('2031-09-27',203139,9,2031,27,39,203109,2031),('2031-09-28',203140,9,2031,28,40,203109,2031),('2031-09-29',203140,9,2031,29,40,203109,2031),('2031-09-30',203140,9,2031,30,40,203109,2031),('2031-10-01',203140,10,2031,1,40,203110,2031),('2031-10-02',203140,10,2031,2,40,203110,2031),('2031-10-03',203140,10,2031,3,40,203110,2031),('2031-10-04',203140,10,2031,4,40,203110,2031),('2031-10-05',203141,10,2031,5,41,203110,2031),('2031-10-06',203141,10,2031,6,41,203110,2031),('2031-10-07',203141,10,2031,7,41,203110,2031),('2031-10-08',203141,10,2031,8,41,203110,2031),('2031-10-09',203141,10,2031,9,41,203110,2031),('2031-10-10',203141,10,2031,10,41,203110,2031),('2031-10-11',203141,10,2031,11,41,203110,2031),('2031-10-12',203142,10,2031,12,42,203110,2031),('2031-10-13',203142,10,2031,13,42,203110,2031),('2031-10-14',203142,10,2031,14,42,203110,2031),('2031-10-15',203142,10,2031,15,42,203110,2031),('2031-10-16',203142,10,2031,16,42,203110,2031),('2031-10-17',203142,10,2031,17,42,203110,2031),('2031-10-18',203142,10,2031,18,42,203110,2031),('2031-10-19',203143,10,2031,19,43,203110,2031),('2031-10-20',203143,10,2031,20,43,203110,2031),('2031-10-21',203143,10,2031,21,43,203110,2031),('2031-10-22',203143,10,2031,22,43,203110,2031),('2031-10-23',203143,10,2031,23,43,203110,2031),('2031-10-24',203143,10,2031,24,43,203110,2031),('2031-10-25',203143,10,2031,25,43,203110,2031),('2031-10-26',203144,10,2031,26,44,203110,2031),('2031-10-27',203144,10,2031,27,44,203110,2031),('2031-10-28',203144,10,2031,28,44,203110,2031),('2031-10-29',203144,10,2031,29,44,203110,2031),('2031-10-30',203144,10,2031,30,44,203110,2031),('2031-10-31',203144,10,2031,31,44,203110,2031),('2031-11-01',203144,11,2031,1,44,203111,2031),('2031-11-02',203145,11,2031,2,45,203111,2031),('2031-11-03',203145,11,2031,3,45,203111,2031),('2031-11-04',203145,11,2031,4,45,203111,2031),('2031-11-05',203145,11,2031,5,45,203111,2031),('2031-11-06',203145,11,2031,6,45,203111,2031),('2031-11-07',203145,11,2031,7,45,203111,2031),('2031-11-08',203145,11,2031,8,45,203111,2031),('2031-11-09',203146,11,2031,9,46,203111,2031),('2031-11-10',203146,11,2031,10,46,203111,2031),('2031-11-11',203146,11,2031,11,46,203111,2031),('2031-11-12',203146,11,2031,12,46,203111,2031),('2031-11-13',203146,11,2031,13,46,203111,2031),('2031-11-14',203146,11,2031,14,46,203111,2031),('2031-11-15',203146,11,2031,15,46,203111,2031),('2031-11-16',203147,11,2031,16,47,203111,2031),('2031-11-17',203147,11,2031,17,47,203111,2031),('2031-11-18',203147,11,2031,18,47,203111,2031),('2031-11-19',203147,11,2031,19,47,203111,2031),('2031-11-20',203147,11,2031,20,47,203111,2031),('2031-11-21',203147,11,2031,21,47,203111,2031),('2031-11-22',203147,11,2031,22,47,203111,2031),('2031-11-23',203148,11,2031,23,48,203111,2031),('2031-11-24',203148,11,2031,24,48,203111,2031),('2031-11-25',203148,11,2031,25,48,203111,2031),('2031-11-26',203148,11,2031,26,48,203111,2031),('2031-11-27',203148,11,2031,27,48,203111,2031),('2031-11-28',203148,11,2031,28,48,203111,2031),('2031-11-29',203148,11,2031,29,48,203111,2031),('2031-11-30',203149,11,2031,30,49,203111,2031),('2031-12-01',203149,12,2031,1,49,203112,2032),('2031-12-02',203149,12,2031,2,49,203112,2032),('2031-12-03',203149,12,2031,3,49,203112,2032),('2031-12-04',203149,12,2031,4,49,203112,2032),('2031-12-05',203149,12,2031,5,49,203112,2032),('2031-12-06',203149,12,2031,6,49,203112,2032),('2031-12-07',203150,12,2031,7,50,203112,2032),('2031-12-08',203150,12,2031,8,50,203112,2032),('2031-12-09',203150,12,2031,9,50,203112,2032),('2031-12-10',203150,12,2031,10,50,203112,2032),('2031-12-11',203150,12,2031,11,50,203112,2032),('2031-12-12',203150,12,2031,12,50,203112,2032),('2031-12-13',203150,12,2031,13,50,203112,2032),('2031-12-14',203151,12,2031,14,51,203112,2032),('2031-12-15',203151,12,2031,15,51,203112,2032),('2031-12-16',203151,12,2031,16,51,203112,2032),('2031-12-17',203151,12,2031,17,51,203112,2032),('2031-12-18',203151,12,2031,18,51,203112,2032),('2031-12-19',203151,12,2031,19,51,203112,2032),('2031-12-20',203151,12,2031,20,51,203112,2032),('2031-12-21',203152,12,2031,21,52,203112,2032),('2031-12-22',203152,12,2031,22,52,203112,2032),('2031-12-23',203152,12,2031,23,52,203112,2032),('2031-12-24',203152,12,2031,24,52,203112,2032),('2031-12-25',203152,12,2031,25,52,203112,2032),('2031-12-26',203152,12,2031,26,52,203112,2032),('2031-12-27',203152,12,2031,27,52,203112,2032),('2031-12-28',203153,12,2031,28,53,203112,2032),('2031-12-29',203101,12,2031,29,53,203112,2032),('2031-12-30',203101,12,2031,30,53,203112,2032),('2031-12-31',203101,12,2031,31,53,203112,2032),('2032-01-01',203201,1,2032,1,53,203201,2032),('2032-01-02',203201,1,2032,2,53,203201,2032),('2032-01-03',203201,1,2032,3,53,203201,2032),('2032-01-04',203202,1,2032,4,1,203201,2032),('2032-01-05',203202,1,2032,5,1,203201,2032),('2032-01-06',203202,1,2032,6,1,203201,2032),('2032-01-07',203202,1,2032,7,1,203201,2032),('2032-01-08',203202,1,2032,8,1,203201,2032),('2032-01-09',203202,1,2032,9,1,203201,2032),('2032-01-10',203202,1,2032,10,1,203201,2032),('2032-01-11',203203,1,2032,11,2,203201,2032),('2032-01-12',203203,1,2032,12,2,203201,2032),('2032-01-13',203203,1,2032,13,2,203201,2032),('2032-01-14',203203,1,2032,14,2,203201,2032),('2032-01-15',203203,1,2032,15,2,203201,2032),('2032-01-16',203203,1,2032,16,2,203201,2032),('2032-01-17',203203,1,2032,17,2,203201,2032),('2032-01-18',203204,1,2032,18,3,203201,2032),('2032-01-19',203204,1,2032,19,3,203201,2032),('2032-01-20',203204,1,2032,20,3,203201,2032),('2032-01-21',203204,1,2032,21,3,203201,2032),('2032-01-22',203204,1,2032,22,3,203201,2032),('2032-01-23',203204,1,2032,23,3,203201,2032),('2032-01-24',203204,1,2032,24,3,203201,2032),('2032-01-25',203205,1,2032,25,4,203201,2032),('2032-01-26',203205,1,2032,26,4,203201,2032),('2032-01-27',203205,1,2032,27,4,203201,2032),('2032-01-28',203205,1,2032,28,4,203201,2032),('2032-01-29',203205,1,2032,29,4,203201,2032),('2032-01-30',203205,1,2032,30,4,203201,2032),('2032-01-31',203205,1,2032,31,4,203201,2032),('2032-02-01',203206,2,2032,1,5,203202,2032),('2032-02-02',203206,2,2032,2,5,203202,2032),('2032-02-03',203206,2,2032,3,5,203202,2032),('2032-02-04',203206,2,2032,4,5,203202,2032),('2032-02-05',203206,2,2032,5,5,203202,2032),('2032-02-06',203206,2,2032,6,5,203202,2032),('2032-02-07',203206,2,2032,7,5,203202,2032),('2032-02-08',203207,2,2032,8,6,203202,2032),('2032-02-09',203207,2,2032,9,6,203202,2032),('2032-02-10',203207,2,2032,10,6,203202,2032),('2032-02-11',203207,2,2032,11,6,203202,2032),('2032-02-12',203207,2,2032,12,6,203202,2032),('2032-02-13',203207,2,2032,13,6,203202,2032),('2032-02-14',203207,2,2032,14,6,203202,2032),('2032-02-15',203208,2,2032,15,7,203202,2032),('2032-02-16',203208,2,2032,16,7,203202,2032),('2032-02-17',203208,2,2032,17,7,203202,2032),('2032-02-18',203208,2,2032,18,7,203202,2032),('2032-02-19',203208,2,2032,19,7,203202,2032),('2032-02-20',203208,2,2032,20,7,203202,2032),('2032-02-21',203208,2,2032,21,7,203202,2032),('2032-02-22',203209,2,2032,22,8,203202,2032),('2032-02-23',203209,2,2032,23,8,203202,2032),('2032-02-24',203209,2,2032,24,8,203202,2032),('2032-02-25',203209,2,2032,25,8,203202,2032),('2032-02-26',203209,2,2032,26,8,203202,2032),('2032-02-27',203209,2,2032,27,8,203202,2032),('2032-02-28',203209,2,2032,28,8,203202,2032),('2032-02-29',203210,2,2032,29,9,203202,2032),('2032-03-01',203210,3,2032,1,9,203203,2032),('2032-03-02',203210,3,2032,2,9,203203,2032),('2032-03-03',203210,3,2032,3,9,203203,2032),('2032-03-04',203210,3,2032,4,9,203203,2032),('2032-03-05',203210,3,2032,5,9,203203,2032),('2032-03-06',203210,3,2032,6,9,203203,2032),('2032-03-07',203211,3,2032,7,10,203203,2032),('2032-03-08',203211,3,2032,8,10,203203,2032),('2032-03-09',203211,3,2032,9,10,203203,2032),('2032-03-10',203211,3,2032,10,10,203203,2032),('2032-03-11',203211,3,2032,11,10,203203,2032),('2032-03-12',203211,3,2032,12,10,203203,2032),('2032-03-13',203211,3,2032,13,10,203203,2032),('2032-03-14',203212,3,2032,14,11,203203,2032),('2032-03-15',203212,3,2032,15,11,203203,2032),('2032-03-16',203212,3,2032,16,11,203203,2032),('2032-03-17',203212,3,2032,17,11,203203,2032),('2032-03-18',203212,3,2032,18,11,203203,2032),('2032-03-19',203212,3,2032,19,11,203203,2032),('2032-03-20',203212,3,2032,20,11,203203,2032),('2032-03-21',203213,3,2032,21,12,203203,2032),('2032-03-22',203213,3,2032,22,12,203203,2032),('2032-03-23',203213,3,2032,23,12,203203,2032),('2032-03-24',203213,3,2032,24,12,203203,2032),('2032-03-25',203213,3,2032,25,12,203203,2032),('2032-03-26',203213,3,2032,26,12,203203,2032),('2032-03-27',203213,3,2032,27,12,203203,2032),('2032-03-28',203214,3,2032,28,13,203203,2032),('2032-03-29',203214,3,2032,29,13,203203,2032),('2032-03-30',203214,3,2032,30,13,203203,2032),('2032-03-31',203214,3,2032,31,13,203203,2032),('2032-04-01',203214,4,2032,1,13,203204,2032),('2032-04-02',203214,4,2032,2,13,203204,2032),('2032-04-03',203214,4,2032,3,13,203204,2032),('2032-04-04',203215,4,2032,4,14,203204,2032),('2032-04-05',203215,4,2032,5,14,203204,2032),('2032-04-06',203215,4,2032,6,14,203204,2032),('2032-04-07',203215,4,2032,7,14,203204,2032),('2032-04-08',203215,4,2032,8,14,203204,2032),('2032-04-09',203215,4,2032,9,14,203204,2032),('2032-04-10',203215,4,2032,10,14,203204,2032),('2032-04-11',203216,4,2032,11,15,203204,2032),('2032-04-12',203216,4,2032,12,15,203204,2032),('2032-04-13',203216,4,2032,13,15,203204,2032),('2032-04-14',203216,4,2032,14,15,203204,2032),('2032-04-15',203216,4,2032,15,15,203204,2032),('2032-04-16',203216,4,2032,16,15,203204,2032),('2032-04-17',203216,4,2032,17,15,203204,2032),('2032-04-18',203217,4,2032,18,16,203204,2032),('2032-04-19',203217,4,2032,19,16,203204,2032),('2032-04-20',203217,4,2032,20,16,203204,2032),('2032-04-21',203217,4,2032,21,16,203204,2032),('2032-04-22',203217,4,2032,22,16,203204,2032),('2032-04-23',203217,4,2032,23,16,203204,2032),('2032-04-24',203217,4,2032,24,16,203204,2032),('2032-04-25',203218,4,2032,25,17,203204,2032),('2032-04-26',203218,4,2032,26,17,203204,2032),('2032-04-27',203218,4,2032,27,17,203204,2032),('2032-04-28',203218,4,2032,28,17,203204,2032),('2032-04-29',203218,4,2032,29,17,203204,2032),('2032-04-30',203218,4,2032,30,17,203204,2032),('2032-05-01',203218,5,2032,1,17,203205,2032),('2032-05-02',203219,5,2032,2,18,203205,2032),('2032-05-03',203219,5,2032,3,18,203205,2032),('2032-05-04',203219,5,2032,4,18,203205,2032),('2032-05-05',203219,5,2032,5,18,203205,2032),('2032-05-06',203219,5,2032,6,18,203205,2032),('2032-05-07',203219,5,2032,7,18,203205,2032),('2032-05-08',203219,5,2032,8,18,203205,2032),('2032-05-09',203220,5,2032,9,19,203205,2032),('2032-05-10',203220,5,2032,10,19,203205,2032),('2032-05-11',203220,5,2032,11,19,203205,2032),('2032-05-12',203220,5,2032,12,19,203205,2032),('2032-05-13',203220,5,2032,13,19,203205,2032),('2032-05-14',203220,5,2032,14,19,203205,2032),('2032-05-15',203220,5,2032,15,19,203205,2032),('2032-05-16',203221,5,2032,16,20,203205,2032),('2032-05-17',203221,5,2032,17,20,203205,2032),('2032-05-18',203221,5,2032,18,20,203205,2032),('2032-05-19',203221,5,2032,19,20,203205,2032),('2032-05-20',203221,5,2032,20,20,203205,2032),('2032-05-21',203221,5,2032,21,20,203205,2032),('2032-05-22',203221,5,2032,22,20,203205,2032),('2032-05-23',203222,5,2032,23,21,203205,2032),('2032-05-24',203222,5,2032,24,21,203205,2032),('2032-05-25',203222,5,2032,25,21,203205,2032),('2032-05-26',203222,5,2032,26,21,203205,2032),('2032-05-27',203222,5,2032,27,21,203205,2032),('2032-05-28',203222,5,2032,28,21,203205,2032),('2032-05-29',203222,5,2032,29,21,203205,2032),('2032-05-30',203223,5,2032,30,22,203205,2032),('2032-05-31',203223,5,2032,31,22,203205,2032),('2032-06-01',203223,6,2032,1,22,203206,2032),('2032-06-02',203223,6,2032,2,22,203206,2032),('2032-06-03',203223,6,2032,3,22,203206,2032),('2032-06-04',203223,6,2032,4,22,203206,2032),('2032-06-05',203223,6,2032,5,22,203206,2032),('2032-06-06',203224,6,2032,6,23,203206,2032),('2032-06-07',203224,6,2032,7,23,203206,2032),('2032-06-08',203224,6,2032,8,23,203206,2032),('2032-06-09',203224,6,2032,9,23,203206,2032),('2032-06-10',203224,6,2032,10,23,203206,2032),('2032-06-11',203224,6,2032,11,23,203206,2032),('2032-06-12',203224,6,2032,12,23,203206,2032),('2032-06-13',203225,6,2032,13,24,203206,2032),('2032-06-14',203225,6,2032,14,24,203206,2032),('2032-06-15',203225,6,2032,15,24,203206,2032),('2032-06-16',203225,6,2032,16,24,203206,2032),('2032-06-17',203225,6,2032,17,24,203206,2032),('2032-06-18',203225,6,2032,18,24,203206,2032),('2032-06-19',203225,6,2032,19,24,203206,2032),('2032-06-20',203226,6,2032,20,25,203206,2032),('2032-06-21',203226,6,2032,21,25,203206,2032),('2032-06-22',203226,6,2032,22,25,203206,2032),('2032-06-23',203226,6,2032,23,25,203206,2032),('2032-06-24',203226,6,2032,24,25,203206,2032),('2032-06-25',203226,6,2032,25,25,203206,2032),('2032-06-26',203226,6,2032,26,25,203206,2032),('2032-06-27',203227,6,2032,27,26,203206,2032),('2032-06-28',203227,6,2032,28,26,203206,2032),('2032-06-29',203227,6,2032,29,26,203206,2032),('2032-06-30',203227,6,2032,30,26,203206,2032),('2032-07-01',203227,7,2032,1,26,203207,2032),('2032-07-02',203227,7,2032,2,26,203207,2032),('2032-07-03',203227,7,2032,3,26,203207,2032),('2032-07-04',203228,7,2032,4,27,203207,2032),('2032-07-05',203228,7,2032,5,27,203207,2032),('2032-07-06',203228,7,2032,6,27,203207,2032),('2032-07-07',203228,7,2032,7,27,203207,2032),('2032-07-08',203228,7,2032,8,27,203207,2032),('2032-07-09',203228,7,2032,9,27,203207,2032),('2032-07-10',203228,7,2032,10,27,203207,2032),('2032-07-11',203229,7,2032,11,28,203207,2032),('2032-07-12',203229,7,2032,12,28,203207,2032),('2032-07-13',203229,7,2032,13,28,203207,2032),('2032-07-14',203229,7,2032,14,28,203207,2032),('2032-07-15',203229,7,2032,15,28,203207,2032),('2032-07-16',203229,7,2032,16,28,203207,2032),('2032-07-17',203229,7,2032,17,28,203207,2032),('2032-07-18',203230,7,2032,18,29,203207,2032),('2032-07-19',203230,7,2032,19,29,203207,2032),('2032-07-20',203230,7,2032,20,29,203207,2032),('2032-07-21',203230,7,2032,21,29,203207,2032),('2032-07-22',203230,7,2032,22,29,203207,2032),('2032-07-23',203230,7,2032,23,29,203207,2032),('2032-07-24',203230,7,2032,24,29,203207,2032),('2032-07-25',203231,7,2032,25,30,203207,2032),('2032-07-26',203231,7,2032,26,30,203207,2032),('2032-07-27',203231,7,2032,27,30,203207,2032),('2032-07-28',203231,7,2032,28,30,203207,2032),('2032-07-29',203231,7,2032,29,30,203207,2032),('2032-07-30',203231,7,2032,30,30,203207,2032),('2032-07-31',203231,7,2032,31,30,203207,2032),('2032-08-01',203232,8,2032,1,31,203208,2032),('2032-08-02',203232,8,2032,2,31,203208,2032),('2032-08-03',203232,8,2032,3,31,203208,2032),('2032-08-04',203232,8,2032,4,31,203208,2032),('2032-08-05',203232,8,2032,5,31,203208,2032),('2032-08-06',203232,8,2032,6,31,203208,2032),('2032-08-07',203232,8,2032,7,31,203208,2032),('2032-08-08',203233,8,2032,8,32,203208,2032),('2032-08-09',203233,8,2032,9,32,203208,2032),('2032-08-10',203233,8,2032,10,32,203208,2032),('2032-08-11',203233,8,2032,11,32,203208,2032),('2032-08-12',203233,8,2032,12,32,203208,2032),('2032-08-13',203233,8,2032,13,32,203208,2032),('2032-08-14',203233,8,2032,14,32,203208,2032),('2032-08-15',203234,8,2032,15,33,203208,2032),('2032-08-16',203234,8,2032,16,33,203208,2032),('2032-08-17',203234,8,2032,17,33,203208,2032),('2032-08-18',203234,8,2032,18,33,203208,2032),('2032-08-19',203234,8,2032,19,33,203208,2032),('2032-08-20',203234,8,2032,20,33,203208,2032),('2032-08-21',203234,8,2032,21,33,203208,2032),('2032-08-22',203235,8,2032,22,34,203208,2032),('2032-08-23',203235,8,2032,23,34,203208,2032),('2032-08-24',203235,8,2032,24,34,203208,2032),('2032-08-25',203235,8,2032,25,34,203208,2032),('2032-08-26',203235,8,2032,26,34,203208,2032),('2032-08-27',203235,8,2032,27,34,203208,2032),('2032-08-28',203235,8,2032,28,34,203208,2032),('2032-08-29',203236,8,2032,29,35,203208,2032),('2032-08-30',203236,8,2032,30,35,203208,2032),('2032-08-31',203236,8,2032,31,35,203208,2032),('2032-09-01',203236,9,2032,1,35,203209,2032),('2032-09-02',203236,9,2032,2,35,203209,2032),('2032-09-03',203236,9,2032,3,35,203209,2032),('2032-09-04',203236,9,2032,4,35,203209,2032),('2032-09-05',203237,9,2032,5,36,203209,2032),('2032-09-06',203237,9,2032,6,36,203209,2032),('2032-09-07',203237,9,2032,7,36,203209,2032),('2032-09-08',203237,9,2032,8,36,203209,2032),('2032-09-09',203237,9,2032,9,36,203209,2032),('2032-09-10',203237,9,2032,10,36,203209,2032),('2032-09-11',203237,9,2032,11,36,203209,2032),('2032-09-12',203238,9,2032,12,37,203209,2032),('2032-09-13',203238,9,2032,13,37,203209,2032),('2032-09-14',203238,9,2032,14,37,203209,2032),('2032-09-15',203238,9,2032,15,37,203209,2032),('2032-09-16',203238,9,2032,16,37,203209,2032),('2032-09-17',203238,9,2032,17,37,203209,2032),('2032-09-18',203238,9,2032,18,37,203209,2032),('2032-09-19',203239,9,2032,19,38,203209,2032),('2032-09-20',203239,9,2032,20,38,203209,2032),('2032-09-21',203239,9,2032,21,38,203209,2032),('2032-09-22',203239,9,2032,22,38,203209,2032),('2032-09-23',203239,9,2032,23,38,203209,2032),('2032-09-24',203239,9,2032,24,38,203209,2032),('2032-09-25',203239,9,2032,25,38,203209,2032),('2032-09-26',203240,9,2032,26,39,203209,2032),('2032-09-27',203240,9,2032,27,39,203209,2032),('2032-09-28',203240,9,2032,28,39,203209,2032),('2032-09-29',203240,9,2032,29,39,203209,2032),('2032-09-30',203240,9,2032,30,39,203209,2032),('2032-10-01',203240,10,2032,1,39,203210,2032),('2032-10-02',203240,10,2032,2,39,203210,2032),('2032-10-03',203241,10,2032,3,40,203210,2032),('2032-10-04',203241,10,2032,4,40,203210,2032),('2032-10-05',203241,10,2032,5,40,203210,2032),('2032-10-06',203241,10,2032,6,40,203210,2032),('2032-10-07',203241,10,2032,7,40,203210,2032),('2032-10-08',203241,10,2032,8,40,203210,2032),('2032-10-09',203241,10,2032,9,40,203210,2032),('2032-10-10',203242,10,2032,10,41,203210,2032),('2032-10-11',203242,10,2032,11,41,203210,2032),('2032-10-12',203242,10,2032,12,41,203210,2032),('2032-10-13',203242,10,2032,13,41,203210,2032),('2032-10-14',203242,10,2032,14,41,203210,2032),('2032-10-15',203242,10,2032,15,41,203210,2032),('2032-10-16',203242,10,2032,16,41,203210,2032),('2032-10-17',203243,10,2032,17,42,203210,2032),('2032-10-18',203243,10,2032,18,42,203210,2032),('2032-10-19',203243,10,2032,19,42,203210,2032),('2032-10-20',203243,10,2032,20,42,203210,2032),('2032-10-21',203243,10,2032,21,42,203210,2032),('2032-10-22',203243,10,2032,22,42,203210,2032),('2032-10-23',203243,10,2032,23,42,203210,2032),('2032-10-24',203244,10,2032,24,43,203210,2032),('2032-10-25',203244,10,2032,25,43,203210,2032),('2032-10-26',203244,10,2032,26,43,203210,2032),('2032-10-27',203244,10,2032,27,43,203210,2032),('2032-10-28',203244,10,2032,28,43,203210,2032),('2032-10-29',203244,10,2032,29,43,203210,2032),('2032-10-30',203244,10,2032,30,43,203210,2032),('2032-10-31',203245,10,2032,31,44,203210,2032),('2032-11-01',203245,11,2032,1,44,203211,2032),('2032-11-02',203245,11,2032,2,44,203211,2032),('2032-11-03',203245,11,2032,3,44,203211,2032),('2032-11-04',203245,11,2032,4,44,203211,2032),('2032-11-05',203245,11,2032,5,44,203211,2032),('2032-11-06',203245,11,2032,6,44,203211,2032),('2032-11-07',203246,11,2032,7,45,203211,2032),('2032-11-08',203246,11,2032,8,45,203211,2032),('2032-11-09',203246,11,2032,9,45,203211,2032),('2032-11-10',203246,11,2032,10,45,203211,2032),('2032-11-11',203246,11,2032,11,45,203211,2032),('2032-11-12',203246,11,2032,12,45,203211,2032),('2032-11-13',203246,11,2032,13,45,203211,2032),('2032-11-14',203247,11,2032,14,46,203211,2032),('2032-11-15',203247,11,2032,15,46,203211,2032),('2032-11-16',203247,11,2032,16,46,203211,2032),('2032-11-17',203247,11,2032,17,46,203211,2032),('2032-11-18',203247,11,2032,18,46,203211,2032),('2032-11-19',203247,11,2032,19,46,203211,2032),('2032-11-20',203247,11,2032,20,46,203211,2032),('2032-11-21',203248,11,2032,21,47,203211,2032),('2032-11-22',203248,11,2032,22,47,203211,2032),('2032-11-23',203248,11,2032,23,47,203211,2032),('2032-11-24',203248,11,2032,24,47,203211,2032),('2032-11-25',203248,11,2032,25,47,203211,2032),('2032-11-26',203248,11,2032,26,47,203211,2032),('2032-11-27',203248,11,2032,27,47,203211,2032),('2032-11-28',203249,11,2032,28,48,203211,2032),('2032-11-29',203249,11,2032,29,48,203211,2032),('2032-11-30',203249,11,2032,30,48,203211,2032),('2032-12-01',203249,12,2032,1,48,203212,2033),('2032-12-02',203249,12,2032,2,48,203212,2033),('2032-12-03',203249,12,2032,3,48,203212,2033),('2032-12-04',203249,12,2032,4,48,203212,2033),('2032-12-05',203250,12,2032,5,49,203212,2033),('2032-12-06',203250,12,2032,6,49,203212,2033),('2032-12-07',203250,12,2032,7,49,203212,2033),('2032-12-08',203250,12,2032,8,49,203212,2033),('2032-12-09',203250,12,2032,9,49,203212,2033),('2032-12-10',203250,12,2032,10,49,203212,2033),('2032-12-11',203250,12,2032,11,49,203212,2033),('2032-12-12',203251,12,2032,12,50,203212,2033),('2032-12-13',203251,12,2032,13,50,203212,2033),('2032-12-14',203251,12,2032,14,50,203212,2033),('2032-12-15',203251,12,2032,15,50,203212,2033),('2032-12-16',203251,12,2032,16,50,203212,2033),('2032-12-17',203251,12,2032,17,50,203212,2033),('2032-12-18',203251,12,2032,18,50,203212,2033),('2032-12-19',203252,12,2032,19,51,203212,2033),('2032-12-20',203252,12,2032,20,51,203212,2033),('2032-12-21',203252,12,2032,21,51,203212,2033),('2032-12-22',203252,12,2032,22,51,203212,2033),('2032-12-23',203252,12,2032,23,51,203212,2033),('2032-12-24',203252,12,2032,24,51,203212,2033),('2032-12-25',203252,12,2032,25,51,203212,2033),('2032-12-26',203253,12,2032,26,52,203212,2033),('2032-12-27',203253,12,2032,27,52,203212,2033),('2032-12-28',203253,12,2032,28,52,203212,2033),('2032-12-29',203253,12,2032,29,52,203212,2033),('2032-12-30',203253,12,2032,30,52,203212,2033),('2032-12-31',203253,12,2032,31,52,203212,2033),('2033-01-01',203353,1,2033,1,52,203301,2033),('2033-01-02',203354,1,2033,2,1,203301,2033),('2033-01-03',203301,1,2033,3,1,203301,2033),('2033-01-04',203301,1,2033,4,1,203301,2033),('2033-01-05',203301,1,2033,5,1,203301,2033),('2033-01-06',203301,1,2033,6,1,203301,2033),('2033-01-07',203301,1,2033,7,1,203301,2033),('2033-01-08',203301,1,2033,8,1,203301,2033),('2033-01-09',203302,1,2033,9,2,203301,2033),('2033-01-10',203302,1,2033,10,2,203301,2033),('2033-01-11',203302,1,2033,11,2,203301,2033),('2033-01-12',203302,1,2033,12,2,203301,2033),('2033-01-13',203302,1,2033,13,2,203301,2033),('2033-01-14',203302,1,2033,14,2,203301,2033),('2033-01-15',203302,1,2033,15,2,203301,2033),('2033-01-16',203303,1,2033,16,3,203301,2033),('2033-01-17',203303,1,2033,17,3,203301,2033),('2033-01-18',203303,1,2033,18,3,203301,2033),('2033-01-19',203303,1,2033,19,3,203301,2033),('2033-01-20',203303,1,2033,20,3,203301,2033),('2033-01-21',203303,1,2033,21,3,203301,2033),('2033-01-22',203303,1,2033,22,3,203301,2033),('2033-01-23',203304,1,2033,23,4,203301,2033),('2033-01-24',203304,1,2033,24,4,203301,2033),('2033-01-25',203304,1,2033,25,4,203301,2033),('2033-01-26',203304,1,2033,26,4,203301,2033),('2033-01-27',203304,1,2033,27,4,203301,2033),('2033-01-28',203304,1,2033,28,4,203301,2033),('2033-01-29',203304,1,2033,29,4,203301,2033),('2033-01-30',203305,1,2033,30,5,203301,2033),('2033-01-31',203305,1,2033,31,5,203301,2033),('2033-02-01',203305,2,2033,1,5,203302,2033),('2033-02-02',203305,2,2033,2,5,203302,2033),('2033-02-03',203305,2,2033,3,5,203302,2033),('2033-02-04',203305,2,2033,4,5,203302,2033),('2033-02-05',203305,2,2033,5,5,203302,2033),('2033-02-06',203306,2,2033,6,6,203302,2033),('2033-02-07',203306,2,2033,7,6,203302,2033),('2033-02-08',203306,2,2033,8,6,203302,2033),('2033-02-09',203306,2,2033,9,6,203302,2033),('2033-02-10',203306,2,2033,10,6,203302,2033),('2033-02-11',203306,2,2033,11,6,203302,2033),('2033-02-12',203306,2,2033,12,6,203302,2033),('2033-02-13',203307,2,2033,13,7,203302,2033),('2033-02-14',203307,2,2033,14,7,203302,2033),('2033-02-15',203307,2,2033,15,7,203302,2033),('2033-02-16',203307,2,2033,16,7,203302,2033),('2033-02-17',203307,2,2033,17,7,203302,2033),('2033-02-18',203307,2,2033,18,7,203302,2033),('2033-02-19',203307,2,2033,19,7,203302,2033),('2033-02-20',203308,2,2033,20,8,203302,2033),('2033-02-21',203308,2,2033,21,8,203302,2033),('2033-02-22',203308,2,2033,22,8,203302,2033),('2033-02-23',203308,2,2033,23,8,203302,2033),('2033-02-24',203308,2,2033,24,8,203302,2033),('2033-02-25',203308,2,2033,25,8,203302,2033),('2033-02-26',203308,2,2033,26,8,203302,2033),('2033-02-27',203309,2,2033,27,9,203302,2033),('2033-02-28',203309,2,2033,28,9,203302,2033),('2033-03-01',203309,3,2033,1,9,203303,2033),('2033-03-02',203309,3,2033,2,9,203303,2033),('2033-03-03',203309,3,2033,3,9,203303,2033),('2033-03-04',203309,3,2033,4,9,203303,2033),('2033-03-05',203309,3,2033,5,9,203303,2033),('2033-03-06',203310,3,2033,6,10,203303,2033),('2033-03-07',203310,3,2033,7,10,203303,2033),('2033-03-08',203310,3,2033,8,10,203303,2033),('2033-03-09',203310,3,2033,9,10,203303,2033),('2033-03-10',203310,3,2033,10,10,203303,2033),('2033-03-11',203310,3,2033,11,10,203303,2033),('2033-03-12',203310,3,2033,12,10,203303,2033),('2033-03-13',203311,3,2033,13,11,203303,2033),('2033-03-14',203311,3,2033,14,11,203303,2033),('2033-03-15',203311,3,2033,15,11,203303,2033),('2033-03-16',203311,3,2033,16,11,203303,2033),('2033-03-17',203311,3,2033,17,11,203303,2033),('2033-03-18',203311,3,2033,18,11,203303,2033),('2033-03-19',203311,3,2033,19,11,203303,2033),('2033-03-20',203312,3,2033,20,12,203303,2033),('2033-03-21',203312,3,2033,21,12,203303,2033),('2033-03-22',203312,3,2033,22,12,203303,2033),('2033-03-23',203312,3,2033,23,12,203303,2033),('2033-03-24',203312,3,2033,24,12,203303,2033),('2033-03-25',203312,3,2033,25,12,203303,2033),('2033-03-26',203312,3,2033,26,12,203303,2033),('2033-03-27',203313,3,2033,27,13,203303,2033),('2033-03-28',203313,3,2033,28,13,203303,2033),('2033-03-29',203313,3,2033,29,13,203303,2033),('2033-03-30',203313,3,2033,30,13,203303,2033),('2033-03-31',203313,3,2033,31,13,203303,2033),('2033-04-01',203313,4,2033,1,13,203304,2033),('2033-04-02',203313,4,2033,2,13,203304,2033),('2033-04-03',203314,4,2033,3,14,203304,2033),('2033-04-04',203314,4,2033,4,14,203304,2033),('2033-04-05',203314,4,2033,5,14,203304,2033),('2033-04-06',203314,4,2033,6,14,203304,2033),('2033-04-07',203314,4,2033,7,14,203304,2033),('2033-04-08',203314,4,2033,8,14,203304,2033),('2033-04-09',203314,4,2033,9,14,203304,2033),('2033-04-10',203315,4,2033,10,15,203304,2033),('2033-04-11',203315,4,2033,11,15,203304,2033),('2033-04-12',203315,4,2033,12,15,203304,2033),('2033-04-13',203315,4,2033,13,15,203304,2033),('2033-04-14',203315,4,2033,14,15,203304,2033),('2033-04-15',203315,4,2033,15,15,203304,2033),('2033-04-16',203315,4,2033,16,15,203304,2033),('2033-04-17',203316,4,2033,17,16,203304,2033),('2033-04-18',203316,4,2033,18,16,203304,2033),('2033-04-19',203316,4,2033,19,16,203304,2033),('2033-04-20',203316,4,2033,20,16,203304,2033),('2033-04-21',203316,4,2033,21,16,203304,2033),('2033-04-22',203316,4,2033,22,16,203304,2033),('2033-04-23',203316,4,2033,23,16,203304,2033),('2033-04-24',203317,4,2033,24,17,203304,2033),('2033-04-25',203317,4,2033,25,17,203304,2033),('2033-04-26',203317,4,2033,26,17,203304,2033),('2033-04-27',203317,4,2033,27,17,203304,2033),('2033-04-28',203317,4,2033,28,17,203304,2033),('2033-04-29',203317,4,2033,29,17,203304,2033),('2033-04-30',203317,4,2033,30,17,203304,2033),('2033-05-01',203318,5,2033,1,18,203305,2033),('2033-05-02',203318,5,2033,2,18,203305,2033),('2033-05-03',203318,5,2033,3,18,203305,2033),('2033-05-04',203318,5,2033,4,18,203305,2033),('2033-05-05',203318,5,2033,5,18,203305,2033),('2033-05-06',203318,5,2033,6,18,203305,2033),('2033-05-07',203318,5,2033,7,18,203305,2033),('2033-05-08',203319,5,2033,8,19,203305,2033),('2033-05-09',203319,5,2033,9,19,203305,2033),('2033-05-10',203319,5,2033,10,19,203305,2033),('2033-05-11',203319,5,2033,11,19,203305,2033),('2033-05-12',203319,5,2033,12,19,203305,2033),('2033-05-13',203319,5,2033,13,19,203305,2033),('2033-05-14',203319,5,2033,14,19,203305,2033),('2033-05-15',203320,5,2033,15,20,203305,2033),('2033-05-16',203320,5,2033,16,20,203305,2033),('2033-05-17',203320,5,2033,17,20,203305,2033),('2033-05-18',203320,5,2033,18,20,203305,2033),('2033-05-19',203320,5,2033,19,20,203305,2033),('2033-05-20',203320,5,2033,20,20,203305,2033),('2033-05-21',203320,5,2033,21,20,203305,2033),('2033-05-22',203321,5,2033,22,21,203305,2033),('2033-05-23',203321,5,2033,23,21,203305,2033),('2033-05-24',203321,5,2033,24,21,203305,2033),('2033-05-25',203321,5,2033,25,21,203305,2033),('2033-05-26',203321,5,2033,26,21,203305,2033),('2033-05-27',203321,5,2033,27,21,203305,2033),('2033-05-28',203321,5,2033,28,21,203305,2033),('2033-05-29',203322,5,2033,29,22,203305,2033),('2033-05-30',203322,5,2033,30,22,203305,2033),('2033-05-31',203322,5,2033,31,22,203305,2033),('2033-06-01',203322,6,2033,1,22,203306,2033),('2033-06-02',203322,6,2033,2,22,203306,2033),('2033-06-03',203322,6,2033,3,22,203306,2033),('2033-06-04',203322,6,2033,4,22,203306,2033),('2033-06-05',203323,6,2033,5,23,203306,2033),('2033-06-06',203323,6,2033,6,23,203306,2033),('2033-06-07',203323,6,2033,7,23,203306,2033),('2033-06-08',203323,6,2033,8,23,203306,2033),('2033-06-09',203323,6,2033,9,23,203306,2033),('2033-06-10',203323,6,2033,10,23,203306,2033),('2033-06-11',203323,6,2033,11,23,203306,2033),('2033-06-12',203324,6,2033,12,24,203306,2033),('2033-06-13',203324,6,2033,13,24,203306,2033),('2033-06-14',203324,6,2033,14,24,203306,2033),('2033-06-15',203324,6,2033,15,24,203306,2033),('2033-06-16',203324,6,2033,16,24,203306,2033),('2033-06-17',203324,6,2033,17,24,203306,2033),('2033-06-18',203324,6,2033,18,24,203306,2033),('2033-06-19',203325,6,2033,19,25,203306,2033),('2033-06-20',203325,6,2033,20,25,203306,2033),('2033-06-21',203325,6,2033,21,25,203306,2033),('2033-06-22',203325,6,2033,22,25,203306,2033),('2033-06-23',203325,6,2033,23,25,203306,2033),('2033-06-24',203325,6,2033,24,25,203306,2033),('2033-06-25',203325,6,2033,25,25,203306,2033),('2033-06-26',203326,6,2033,26,26,203306,2033),('2033-06-27',203326,6,2033,27,26,203306,2033),('2033-06-28',203326,6,2033,28,26,203306,2033),('2033-06-29',203326,6,2033,29,26,203306,2033),('2033-06-30',203326,6,2033,30,26,203306,2033),('2033-07-01',203326,7,2033,1,26,203307,2033),('2033-07-02',203326,7,2033,2,26,203307,2033),('2033-07-03',203327,7,2033,3,27,203307,2033),('2033-07-04',203327,7,2033,4,27,203307,2033),('2033-07-05',203327,7,2033,5,27,203307,2033),('2033-07-06',203327,7,2033,6,27,203307,2033),('2033-07-07',203327,7,2033,7,27,203307,2033),('2033-07-08',203327,7,2033,8,27,203307,2033),('2033-07-09',203327,7,2033,9,27,203307,2033),('2033-07-10',203328,7,2033,10,28,203307,2033),('2033-07-11',203328,7,2033,11,28,203307,2033),('2033-07-12',203328,7,2033,12,28,203307,2033),('2033-07-13',203328,7,2033,13,28,203307,2033),('2033-07-14',203328,7,2033,14,28,203307,2033),('2033-07-15',203328,7,2033,15,28,203307,2033),('2033-07-16',203328,7,2033,16,28,203307,2033),('2033-07-17',203329,7,2033,17,29,203307,2033),('2033-07-18',203329,7,2033,18,29,203307,2033),('2033-07-19',203329,7,2033,19,29,203307,2033),('2033-07-20',203329,7,2033,20,29,203307,2033),('2033-07-21',203329,7,2033,21,29,203307,2033),('2033-07-22',203329,7,2033,22,29,203307,2033),('2033-07-23',203329,7,2033,23,29,203307,2033),('2033-07-24',203330,7,2033,24,30,203307,2033),('2033-07-25',203330,7,2033,25,30,203307,2033),('2033-07-26',203330,7,2033,26,30,203307,2033),('2033-07-27',203330,7,2033,27,30,203307,2033),('2033-07-28',203330,7,2033,28,30,203307,2033),('2033-07-29',203330,7,2033,29,30,203307,2033),('2033-07-30',203330,7,2033,30,30,203307,2033),('2033-07-31',203331,7,2033,31,31,203307,2033),('2033-08-01',203331,8,2033,1,31,203308,2033),('2033-08-02',203331,8,2033,2,31,203308,2033),('2033-08-03',203331,8,2033,3,31,203308,2033),('2033-08-04',203331,8,2033,4,31,203308,2033),('2033-08-05',203331,8,2033,5,31,203308,2033),('2033-08-06',203331,8,2033,6,31,203308,2033),('2033-08-07',203332,8,2033,7,32,203308,2033),('2033-08-08',203332,8,2033,8,32,203308,2033),('2033-08-09',203332,8,2033,9,32,203308,2033),('2033-08-10',203332,8,2033,10,32,203308,2033),('2033-08-11',203332,8,2033,11,32,203308,2033),('2033-08-12',203332,8,2033,12,32,203308,2033),('2033-08-13',203332,8,2033,13,32,203308,2033),('2033-08-14',203333,8,2033,14,33,203308,2033),('2033-08-15',203333,8,2033,15,33,203308,2033),('2033-08-16',203333,8,2033,16,33,203308,2033),('2033-08-17',203333,8,2033,17,33,203308,2033),('2033-08-18',203333,8,2033,18,33,203308,2033),('2033-08-19',203333,8,2033,19,33,203308,2033),('2033-08-20',203333,8,2033,20,33,203308,2033),('2033-08-21',203334,8,2033,21,34,203308,2033),('2033-08-22',203334,8,2033,22,34,203308,2033),('2033-08-23',203334,8,2033,23,34,203308,2033),('2033-08-24',203334,8,2033,24,34,203308,2033),('2033-08-25',203334,8,2033,25,34,203308,2033),('2033-08-26',203334,8,2033,26,34,203308,2033),('2033-08-27',203334,8,2033,27,34,203308,2033),('2033-08-28',203335,8,2033,28,35,203308,2033),('2033-08-29',203335,8,2033,29,35,203308,2033),('2033-08-30',203335,8,2033,30,35,203308,2033),('2033-08-31',203335,8,2033,31,35,203308,2033),('2033-09-01',203335,9,2033,1,35,203309,2033),('2033-09-02',203335,9,2033,2,35,203309,2033),('2033-09-03',203335,9,2033,3,35,203309,2033),('2033-09-04',203336,9,2033,4,36,203309,2033),('2033-09-05',203336,9,2033,5,36,203309,2033),('2033-09-06',203336,9,2033,6,36,203309,2033),('2033-09-07',203336,9,2033,7,36,203309,2033),('2033-09-08',203336,9,2033,8,36,203309,2033),('2033-09-09',203336,9,2033,9,36,203309,2033),('2033-09-10',203336,9,2033,10,36,203309,2033),('2033-09-11',203337,9,2033,11,37,203309,2033),('2033-09-12',203337,9,2033,12,37,203309,2033),('2033-09-13',203337,9,2033,13,37,203309,2033),('2033-09-14',203337,9,2033,14,37,203309,2033),('2033-09-15',203337,9,2033,15,37,203309,2033),('2033-09-16',203337,9,2033,16,37,203309,2033),('2033-09-17',203337,9,2033,17,37,203309,2033),('2033-09-18',203338,9,2033,18,38,203309,2033),('2033-09-19',203338,9,2033,19,38,203309,2033),('2033-09-20',203338,9,2033,20,38,203309,2033),('2033-09-21',203338,9,2033,21,38,203309,2033),('2033-09-22',203338,9,2033,22,38,203309,2033),('2033-09-23',203338,9,2033,23,38,203309,2033),('2033-09-24',203338,9,2033,24,38,203309,2033),('2033-09-25',203339,9,2033,25,39,203309,2033),('2033-09-26',203339,9,2033,26,39,203309,2033),('2033-09-27',203339,9,2033,27,39,203309,2033),('2033-09-28',203339,9,2033,28,39,203309,2033),('2033-09-29',203339,9,2033,29,39,203309,2033),('2033-09-30',203339,9,2033,30,39,203309,2033),('2033-10-01',203339,10,2033,1,39,203310,2033),('2033-10-02',203340,10,2033,2,40,203310,2033),('2033-10-03',203340,10,2033,3,40,203310,2033),('2033-10-04',203340,10,2033,4,40,203310,2033),('2033-10-05',203340,10,2033,5,40,203310,2033),('2033-10-06',203340,10,2033,6,40,203310,2033),('2033-10-07',203340,10,2033,7,40,203310,2033),('2033-10-08',203340,10,2033,8,40,203310,2033),('2033-10-09',203341,10,2033,9,41,203310,2033),('2033-10-10',203341,10,2033,10,41,203310,2033),('2033-10-11',203341,10,2033,11,41,203310,2033),('2033-10-12',203341,10,2033,12,41,203310,2033),('2033-10-13',203341,10,2033,13,41,203310,2033),('2033-10-14',203341,10,2033,14,41,203310,2033),('2033-10-15',203341,10,2033,15,41,203310,2033),('2033-10-16',203342,10,2033,16,42,203310,2033),('2033-10-17',203342,10,2033,17,42,203310,2033),('2033-10-18',203342,10,2033,18,42,203310,2033),('2033-10-19',203342,10,2033,19,42,203310,2033),('2033-10-20',203342,10,2033,20,42,203310,2033),('2033-10-21',203342,10,2033,21,42,203310,2033),('2033-10-22',203342,10,2033,22,42,203310,2033),('2033-10-23',203343,10,2033,23,43,203310,2033),('2033-10-24',203343,10,2033,24,43,203310,2033),('2033-10-25',203343,10,2033,25,43,203310,2033),('2033-10-26',203343,10,2033,26,43,203310,2033),('2033-10-27',203343,10,2033,27,43,203310,2033),('2033-10-28',203343,10,2033,28,43,203310,2033),('2033-10-29',203343,10,2033,29,43,203310,2033),('2033-10-30',203344,10,2033,30,44,203310,2033),('2033-10-31',203344,10,2033,31,44,203310,2033),('2033-11-01',203344,11,2033,1,44,203311,2033),('2033-11-02',203344,11,2033,2,44,203311,2033),('2033-11-03',203344,11,2033,3,44,203311,2033),('2033-11-04',203344,11,2033,4,44,203311,2033),('2033-11-05',203344,11,2033,5,44,203311,2033),('2033-11-06',203345,11,2033,6,45,203311,2033),('2033-11-07',203345,11,2033,7,45,203311,2033),('2033-11-08',203345,11,2033,8,45,203311,2033),('2033-11-09',203345,11,2033,9,45,203311,2033),('2033-11-10',203345,11,2033,10,45,203311,2033),('2033-11-11',203345,11,2033,11,45,203311,2033),('2033-11-12',203345,11,2033,12,45,203311,2033),('2033-11-13',203346,11,2033,13,46,203311,2033),('2033-11-14',203346,11,2033,14,46,203311,2033),('2033-11-15',203346,11,2033,15,46,203311,2033),('2033-11-16',203346,11,2033,16,46,203311,2033),('2033-11-17',203346,11,2033,17,46,203311,2033),('2033-11-18',203346,11,2033,18,46,203311,2033),('2033-11-19',203346,11,2033,19,46,203311,2033),('2033-11-20',203347,11,2033,20,47,203311,2033),('2033-11-21',203347,11,2033,21,47,203311,2033),('2033-11-22',203347,11,2033,22,47,203311,2033),('2033-11-23',203347,11,2033,23,47,203311,2033),('2033-11-24',203347,11,2033,24,47,203311,2033),('2033-11-25',203347,11,2033,25,47,203311,2033),('2033-11-26',203347,11,2033,26,47,203311,2033),('2033-11-27',203348,11,2033,27,48,203311,2033),('2033-11-28',203348,11,2033,28,48,203311,2033),('2033-11-29',203348,11,2033,29,48,203311,2033),('2033-11-30',203348,11,2033,30,48,203311,2033),('2033-12-01',203348,12,2033,1,48,203312,2034),('2033-12-02',203348,12,2033,2,48,203312,2034),('2033-12-03',203348,12,2033,3,48,203312,2034),('2033-12-04',203349,12,2033,4,49,203312,2034),('2033-12-05',203349,12,2033,5,49,203312,2034),('2033-12-06',203349,12,2033,6,49,203312,2034),('2033-12-07',203349,12,2033,7,49,203312,2034),('2033-12-08',203349,12,2033,8,49,203312,2034),('2033-12-09',203349,12,2033,9,49,203312,2034),('2033-12-10',203349,12,2033,10,49,203312,2034),('2033-12-11',203350,12,2033,11,50,203312,2034),('2033-12-12',203350,12,2033,12,50,203312,2034),('2033-12-13',203350,12,2033,13,50,203312,2034),('2033-12-14',203350,12,2033,14,50,203312,2034),('2033-12-15',203350,12,2033,15,50,203312,2034),('2033-12-16',203350,12,2033,16,50,203312,2034),('2033-12-17',203350,12,2033,17,50,203312,2034),('2033-12-18',203351,12,2033,18,51,203312,2034),('2033-12-19',203351,12,2033,19,51,203312,2034),('2033-12-20',203351,12,2033,20,51,203312,2034),('2033-12-21',203351,12,2033,21,51,203312,2034),('2033-12-22',203351,12,2033,22,51,203312,2034),('2033-12-23',203351,12,2033,23,51,203312,2034),('2033-12-24',203351,12,2033,24,51,203312,2034),('2033-12-25',203352,12,2033,25,52,203312,2034),('2033-12-26',203352,12,2033,26,52,203312,2034),('2033-12-27',203352,12,2033,27,52,203312,2034),('2033-12-28',203352,12,2033,28,52,203312,2034),('2033-12-29',203352,12,2033,29,52,203312,2034),('2033-12-30',203352,12,2033,30,52,203312,2034),('2033-12-31',203352,12,2033,31,52,203312,2034),('2034-01-01',203453,1,2034,1,1,203401,2034),('2034-01-02',203401,1,2034,2,1,203401,2034),('2034-01-03',203401,1,2034,3,1,203401,2034),('2034-01-04',203401,1,2034,4,1,203401,2034),('2034-01-05',203401,1,2034,5,1,203401,2034),('2034-01-06',203401,1,2034,6,1,203401,2034),('2034-01-07',203401,1,2034,7,1,203401,2034),('2034-01-08',203402,1,2034,8,2,203401,2034),('2034-01-09',203402,1,2034,9,2,203401,2034),('2034-01-10',203402,1,2034,10,2,203401,2034),('2034-01-11',203402,1,2034,11,2,203401,2034),('2034-01-12',203402,1,2034,12,2,203401,2034),('2034-01-13',203402,1,2034,13,2,203401,2034),('2034-01-14',203402,1,2034,14,2,203401,2034),('2034-01-15',203403,1,2034,15,3,203401,2034),('2034-01-16',203403,1,2034,16,3,203401,2034),('2034-01-17',203403,1,2034,17,3,203401,2034),('2034-01-18',203403,1,2034,18,3,203401,2034),('2034-01-19',203403,1,2034,19,3,203401,2034),('2034-01-20',203403,1,2034,20,3,203401,2034),('2034-01-21',203403,1,2034,21,3,203401,2034),('2034-01-22',203404,1,2034,22,4,203401,2034),('2034-01-23',203404,1,2034,23,4,203401,2034),('2034-01-24',203404,1,2034,24,4,203401,2034),('2034-01-25',203404,1,2034,25,4,203401,2034),('2034-01-26',203404,1,2034,26,4,203401,2034),('2034-01-27',203404,1,2034,27,4,203401,2034),('2034-01-28',203404,1,2034,28,4,203401,2034),('2034-01-29',203405,1,2034,29,5,203401,2034),('2034-01-30',203405,1,2034,30,5,203401,2034),('2034-01-31',203405,1,2034,31,5,203401,2034),('2034-02-01',203405,2,2034,1,5,203402,2034),('2034-02-02',203405,2,2034,2,5,203402,2034),('2034-02-03',203405,2,2034,3,5,203402,2034),('2034-02-04',203405,2,2034,4,5,203402,2034),('2034-02-05',203406,2,2034,5,6,203402,2034),('2034-02-06',203406,2,2034,6,6,203402,2034),('2034-02-07',203406,2,2034,7,6,203402,2034),('2034-02-08',203406,2,2034,8,6,203402,2034),('2034-02-09',203406,2,2034,9,6,203402,2034),('2034-02-10',203406,2,2034,10,6,203402,2034),('2034-02-11',203406,2,2034,11,6,203402,2034),('2034-02-12',203407,2,2034,12,7,203402,2034),('2034-02-13',203407,2,2034,13,7,203402,2034),('2034-02-14',203407,2,2034,14,7,203402,2034),('2034-02-15',203407,2,2034,15,7,203402,2034),('2034-02-16',203407,2,2034,16,7,203402,2034),('2034-02-17',203407,2,2034,17,7,203402,2034),('2034-02-18',203407,2,2034,18,7,203402,2034),('2034-02-19',203408,2,2034,19,8,203402,2034),('2034-02-20',203408,2,2034,20,8,203402,2034),('2034-02-21',203408,2,2034,21,8,203402,2034),('2034-02-22',203408,2,2034,22,8,203402,2034),('2034-02-23',203408,2,2034,23,8,203402,2034),('2034-02-24',203408,2,2034,24,8,203402,2034),('2034-02-25',203408,2,2034,25,8,203402,2034),('2034-02-26',203409,2,2034,26,9,203402,2034),('2034-02-27',203409,2,2034,27,9,203402,2034),('2034-02-28',203409,2,2034,28,9,203402,2034),('2034-03-01',203409,3,2034,1,9,203403,2034),('2034-03-02',203409,3,2034,2,9,203403,2034),('2034-03-03',203409,3,2034,3,9,203403,2034),('2034-03-04',203409,3,2034,4,9,203403,2034),('2034-03-05',203410,3,2034,5,10,203403,2034),('2034-03-06',203410,3,2034,6,10,203403,2034),('2034-03-07',203410,3,2034,7,10,203403,2034),('2034-03-08',203410,3,2034,8,10,203403,2034),('2034-03-09',203410,3,2034,9,10,203403,2034),('2034-03-10',203410,3,2034,10,10,203403,2034),('2034-03-11',203410,3,2034,11,10,203403,2034),('2034-03-12',203411,3,2034,12,11,203403,2034),('2034-03-13',203411,3,2034,13,11,203403,2034),('2034-03-14',203411,3,2034,14,11,203403,2034),('2034-03-15',203411,3,2034,15,11,203403,2034),('2034-03-16',203411,3,2034,16,11,203403,2034),('2034-03-17',203411,3,2034,17,11,203403,2034),('2034-03-18',203411,3,2034,18,11,203403,2034),('2034-03-19',203412,3,2034,19,12,203403,2034),('2034-03-20',203412,3,2034,20,12,203403,2034),('2034-03-21',203412,3,2034,21,12,203403,2034),('2034-03-22',203412,3,2034,22,12,203403,2034),('2034-03-23',203412,3,2034,23,12,203403,2034),('2034-03-24',203412,3,2034,24,12,203403,2034),('2034-03-25',203412,3,2034,25,12,203403,2034),('2034-03-26',203413,3,2034,26,13,203403,2034),('2034-03-27',203413,3,2034,27,13,203403,2034),('2034-03-28',203413,3,2034,28,13,203403,2034),('2034-03-29',203413,3,2034,29,13,203403,2034),('2034-03-30',203413,3,2034,30,13,203403,2034),('2034-03-31',203413,3,2034,31,13,203403,2034),('2034-04-01',203413,4,2034,1,13,203404,2034),('2034-04-02',203414,4,2034,2,14,203404,2034),('2034-04-03',203414,4,2034,3,14,203404,2034),('2034-04-04',203414,4,2034,4,14,203404,2034),('2034-04-05',203414,4,2034,5,14,203404,2034),('2034-04-06',203414,4,2034,6,14,203404,2034),('2034-04-07',203414,4,2034,7,14,203404,2034),('2034-04-08',203414,4,2034,8,14,203404,2034),('2034-04-09',203415,4,2034,9,15,203404,2034),('2034-04-10',203415,4,2034,10,15,203404,2034),('2034-04-11',203415,4,2034,11,15,203404,2034),('2034-04-12',203415,4,2034,12,15,203404,2034),('2034-04-13',203415,4,2034,13,15,203404,2034),('2034-04-14',203415,4,2034,14,15,203404,2034),('2034-04-15',203415,4,2034,15,15,203404,2034),('2034-04-16',203416,4,2034,16,16,203404,2034),('2034-04-17',203416,4,2034,17,16,203404,2034),('2034-04-18',203416,4,2034,18,16,203404,2034),('2034-04-19',203416,4,2034,19,16,203404,2034),('2034-04-20',203416,4,2034,20,16,203404,2034),('2034-04-21',203416,4,2034,21,16,203404,2034),('2034-04-22',203416,4,2034,22,16,203404,2034),('2034-04-23',203417,4,2034,23,17,203404,2034),('2034-04-24',203417,4,2034,24,17,203404,2034),('2034-04-25',203417,4,2034,25,17,203404,2034),('2034-04-26',203417,4,2034,26,17,203404,2034),('2034-04-27',203417,4,2034,27,17,203404,2034),('2034-04-28',203417,4,2034,28,17,203404,2034),('2034-04-29',203417,4,2034,29,17,203404,2034),('2034-04-30',203418,4,2034,30,18,203404,2034),('2034-05-01',203418,5,2034,1,18,203405,2034),('2034-05-02',203418,5,2034,2,18,203405,2034),('2034-05-03',203418,5,2034,3,18,203405,2034),('2034-05-04',203418,5,2034,4,18,203405,2034),('2034-05-05',203418,5,2034,5,18,203405,2034),('2034-05-06',203418,5,2034,6,18,203405,2034),('2034-05-07',203419,5,2034,7,19,203405,2034),('2034-05-08',203419,5,2034,8,19,203405,2034),('2034-05-09',203419,5,2034,9,19,203405,2034),('2034-05-10',203419,5,2034,10,19,203405,2034),('2034-05-11',203419,5,2034,11,19,203405,2034),('2034-05-12',203419,5,2034,12,19,203405,2034),('2034-05-13',203419,5,2034,13,19,203405,2034),('2034-05-14',203420,5,2034,14,20,203405,2034),('2034-05-15',203420,5,2034,15,20,203405,2034),('2034-05-16',203420,5,2034,16,20,203405,2034),('2034-05-17',203420,5,2034,17,20,203405,2034),('2034-05-18',203420,5,2034,18,20,203405,2034),('2034-05-19',203420,5,2034,19,20,203405,2034),('2034-05-20',203420,5,2034,20,20,203405,2034),('2034-05-21',203421,5,2034,21,21,203405,2034),('2034-05-22',203421,5,2034,22,21,203405,2034),('2034-05-23',203421,5,2034,23,21,203405,2034),('2034-05-24',203421,5,2034,24,21,203405,2034),('2034-05-25',203421,5,2034,25,21,203405,2034),('2034-05-26',203421,5,2034,26,21,203405,2034),('2034-05-27',203421,5,2034,27,21,203405,2034),('2034-05-28',203422,5,2034,28,22,203405,2034),('2034-05-29',203422,5,2034,29,22,203405,2034),('2034-05-30',203422,5,2034,30,22,203405,2034),('2034-05-31',203422,5,2034,31,22,203405,2034),('2034-06-01',203422,6,2034,1,22,203406,2034),('2034-06-02',203422,6,2034,2,22,203406,2034),('2034-06-03',203422,6,2034,3,22,203406,2034),('2034-06-04',203423,6,2034,4,23,203406,2034),('2034-06-05',203423,6,2034,5,23,203406,2034),('2034-06-06',203423,6,2034,6,23,203406,2034),('2034-06-07',203423,6,2034,7,23,203406,2034),('2034-06-08',203423,6,2034,8,23,203406,2034),('2034-06-09',203423,6,2034,9,23,203406,2034),('2034-06-10',203423,6,2034,10,23,203406,2034),('2034-06-11',203424,6,2034,11,24,203406,2034),('2034-06-12',203424,6,2034,12,24,203406,2034),('2034-06-13',203424,6,2034,13,24,203406,2034),('2034-06-14',203424,6,2034,14,24,203406,2034),('2034-06-15',203424,6,2034,15,24,203406,2034),('2034-06-16',203424,6,2034,16,24,203406,2034),('2034-06-17',203424,6,2034,17,24,203406,2034),('2034-06-18',203425,6,2034,18,25,203406,2034),('2034-06-19',203425,6,2034,19,25,203406,2034),('2034-06-20',203425,6,2034,20,25,203406,2034),('2034-06-21',203425,6,2034,21,25,203406,2034),('2034-06-22',203425,6,2034,22,25,203406,2034),('2034-06-23',203425,6,2034,23,25,203406,2034),('2034-06-24',203425,6,2034,24,25,203406,2034),('2034-06-25',203426,6,2034,25,26,203406,2034),('2034-06-26',203426,6,2034,26,26,203406,2034),('2034-06-27',203426,6,2034,27,26,203406,2034),('2034-06-28',203426,6,2034,28,26,203406,2034),('2034-06-29',203426,6,2034,29,26,203406,2034),('2034-06-30',203426,6,2034,30,26,203406,2034),('2034-07-01',203426,7,2034,1,26,203407,2034),('2034-07-02',203427,7,2034,2,27,203407,2034),('2034-07-03',203427,7,2034,3,27,203407,2034),('2034-07-04',203427,7,2034,4,27,203407,2034),('2034-07-05',203427,7,2034,5,27,203407,2034),('2034-07-06',203427,7,2034,6,27,203407,2034),('2034-07-07',203427,7,2034,7,27,203407,2034),('2034-07-08',203427,7,2034,8,27,203407,2034),('2034-07-09',203428,7,2034,9,28,203407,2034),('2034-07-10',203428,7,2034,10,28,203407,2034),('2034-07-11',203428,7,2034,11,28,203407,2034),('2034-07-12',203428,7,2034,12,28,203407,2034),('2034-07-13',203428,7,2034,13,28,203407,2034),('2034-07-14',203428,7,2034,14,28,203407,2034),('2034-07-15',203428,7,2034,15,28,203407,2034),('2034-07-16',203429,7,2034,16,29,203407,2034),('2034-07-17',203429,7,2034,17,29,203407,2034),('2034-07-18',203429,7,2034,18,29,203407,2034),('2034-07-19',203429,7,2034,19,29,203407,2034),('2034-07-20',203429,7,2034,20,29,203407,2034),('2034-07-21',203429,7,2034,21,29,203407,2034),('2034-07-22',203429,7,2034,22,29,203407,2034),('2034-07-23',203430,7,2034,23,30,203407,2034),('2034-07-24',203430,7,2034,24,30,203407,2034),('2034-07-25',203430,7,2034,25,30,203407,2034),('2034-07-26',203430,7,2034,26,30,203407,2034),('2034-07-27',203430,7,2034,27,30,203407,2034),('2034-07-28',203430,7,2034,28,30,203407,2034),('2034-07-29',203430,7,2034,29,30,203407,2034),('2034-07-30',203431,7,2034,30,31,203407,2034),('2034-07-31',203431,7,2034,31,31,203407,2034),('2034-08-01',203431,8,2034,1,31,203408,2034),('2034-08-02',203431,8,2034,2,31,203408,2034),('2034-08-03',203431,8,2034,3,31,203408,2034),('2034-08-04',203431,8,2034,4,31,203408,2034),('2034-08-05',203431,8,2034,5,31,203408,2034),('2034-08-06',203432,8,2034,6,32,203408,2034),('2034-08-07',203432,8,2034,7,32,203408,2034),('2034-08-08',203432,8,2034,8,32,203408,2034),('2034-08-09',203432,8,2034,9,32,203408,2034),('2034-08-10',203432,8,2034,10,32,203408,2034),('2034-08-11',203432,8,2034,11,32,203408,2034),('2034-08-12',203432,8,2034,12,32,203408,2034),('2034-08-13',203433,8,2034,13,33,203408,2034),('2034-08-14',203433,8,2034,14,33,203408,2034),('2034-08-15',203433,8,2034,15,33,203408,2034),('2034-08-16',203433,8,2034,16,33,203408,2034),('2034-08-17',203433,8,2034,17,33,203408,2034),('2034-08-18',203433,8,2034,18,33,203408,2034),('2034-08-19',203433,8,2034,19,33,203408,2034),('2034-08-20',203434,8,2034,20,34,203408,2034),('2034-08-21',203434,8,2034,21,34,203408,2034),('2034-08-22',203434,8,2034,22,34,203408,2034),('2034-08-23',203434,8,2034,23,34,203408,2034),('2034-08-24',203434,8,2034,24,34,203408,2034),('2034-08-25',203434,8,2034,25,34,203408,2034),('2034-08-26',203434,8,2034,26,34,203408,2034),('2034-08-27',203435,8,2034,27,35,203408,2034),('2034-08-28',203435,8,2034,28,35,203408,2034),('2034-08-29',203435,8,2034,29,35,203408,2034),('2034-08-30',203435,8,2034,30,35,203408,2034),('2034-08-31',203435,8,2034,31,35,203408,2034),('2034-09-01',203435,9,2034,1,35,203409,2034),('2034-09-02',203435,9,2034,2,35,203409,2034),('2034-09-03',203436,9,2034,3,36,203409,2034),('2034-09-04',203436,9,2034,4,36,203409,2034),('2034-09-05',203436,9,2034,5,36,203409,2034),('2034-09-06',203436,9,2034,6,36,203409,2034),('2034-09-07',203436,9,2034,7,36,203409,2034),('2034-09-08',203436,9,2034,8,36,203409,2034),('2034-09-09',203436,9,2034,9,36,203409,2034),('2034-09-10',203437,9,2034,10,37,203409,2034),('2034-09-11',203437,9,2034,11,37,203409,2034),('2034-09-12',203437,9,2034,12,37,203409,2034),('2034-09-13',203437,9,2034,13,37,203409,2034),('2034-09-14',203437,9,2034,14,37,203409,2034),('2034-09-15',203437,9,2034,15,37,203409,2034),('2034-09-16',203437,9,2034,16,37,203409,2034),('2034-09-17',203438,9,2034,17,38,203409,2034),('2034-09-18',203438,9,2034,18,38,203409,2034),('2034-09-19',203438,9,2034,19,38,203409,2034),('2034-09-20',203438,9,2034,20,38,203409,2034),('2034-09-21',203438,9,2034,21,38,203409,2034),('2034-09-22',203438,9,2034,22,38,203409,2034),('2034-09-23',203438,9,2034,23,38,203409,2034),('2034-09-24',203439,9,2034,24,39,203409,2034),('2034-09-25',203439,9,2034,25,39,203409,2034),('2034-09-26',203439,9,2034,26,39,203409,2034),('2034-09-27',203439,9,2034,27,39,203409,2034),('2034-09-28',203439,9,2034,28,39,203409,2034),('2034-09-29',203439,9,2034,29,39,203409,2034),('2034-09-30',203439,9,2034,30,39,203409,2034),('2034-10-01',203440,10,2034,1,40,203410,2034),('2034-10-02',203440,10,2034,2,40,203410,2034),('2034-10-03',203440,10,2034,3,40,203410,2034),('2034-10-04',203440,10,2034,4,40,203410,2034),('2034-10-05',203440,10,2034,5,40,203410,2034),('2034-10-06',203440,10,2034,6,40,203410,2034),('2034-10-07',203440,10,2034,7,40,203410,2034),('2034-10-08',203441,10,2034,8,41,203410,2034),('2034-10-09',203441,10,2034,9,41,203410,2034),('2034-10-10',203441,10,2034,10,41,203410,2034),('2034-10-11',203441,10,2034,11,41,203410,2034),('2034-10-12',203441,10,2034,12,41,203410,2034),('2034-10-13',203441,10,2034,13,41,203410,2034),('2034-10-14',203441,10,2034,14,41,203410,2034),('2034-10-15',203442,10,2034,15,42,203410,2034),('2034-10-16',203442,10,2034,16,42,203410,2034),('2034-10-17',203442,10,2034,17,42,203410,2034),('2034-10-18',203442,10,2034,18,42,203410,2034),('2034-10-19',203442,10,2034,19,42,203410,2034),('2034-10-20',203442,10,2034,20,42,203410,2034),('2034-10-21',203442,10,2034,21,42,203410,2034),('2034-10-22',203443,10,2034,22,43,203410,2034),('2034-10-23',203443,10,2034,23,43,203410,2034),('2034-10-24',203443,10,2034,24,43,203410,2034),('2034-10-25',203443,10,2034,25,43,203410,2034),('2034-10-26',203443,10,2034,26,43,203410,2034),('2034-10-27',203443,10,2034,27,43,203410,2034),('2034-10-28',203443,10,2034,28,43,203410,2034),('2034-10-29',203444,10,2034,29,44,203410,2034),('2034-10-30',203444,10,2034,30,44,203410,2034),('2034-10-31',203444,10,2034,31,44,203410,2034),('2034-11-01',203444,11,2034,1,44,203411,2034),('2034-11-02',203444,11,2034,2,44,203411,2034),('2034-11-03',203444,11,2034,3,44,203411,2034),('2034-11-04',203444,11,2034,4,44,203411,2034),('2034-11-05',203445,11,2034,5,45,203411,2034),('2034-11-06',203445,11,2034,6,45,203411,2034),('2034-11-07',203445,11,2034,7,45,203411,2034),('2034-11-08',203445,11,2034,8,45,203411,2034),('2034-11-09',203445,11,2034,9,45,203411,2034),('2034-11-10',203445,11,2034,10,45,203411,2034),('2034-11-11',203445,11,2034,11,45,203411,2034),('2034-11-12',203446,11,2034,12,46,203411,2034),('2034-11-13',203446,11,2034,13,46,203411,2034),('2034-11-14',203446,11,2034,14,46,203411,2034),('2034-11-15',203446,11,2034,15,46,203411,2034),('2034-11-16',203446,11,2034,16,46,203411,2034),('2034-11-17',203446,11,2034,17,46,203411,2034),('2034-11-18',203446,11,2034,18,46,203411,2034),('2034-11-19',203447,11,2034,19,47,203411,2034),('2034-11-20',203447,11,2034,20,47,203411,2034),('2034-11-21',203447,11,2034,21,47,203411,2034),('2034-11-22',203447,11,2034,22,47,203411,2034),('2034-11-23',203447,11,2034,23,47,203411,2034),('2034-11-24',203447,11,2034,24,47,203411,2034),('2034-11-25',203447,11,2034,25,47,203411,2034),('2034-11-26',203448,11,2034,26,48,203411,2034),('2034-11-27',203448,11,2034,27,48,203411,2034),('2034-11-28',203448,11,2034,28,48,203411,2034),('2034-11-29',203448,11,2034,29,48,203411,2034),('2034-11-30',203448,11,2034,30,48,203411,2034),('2034-12-01',203448,12,2034,1,48,203412,2035),('2034-12-02',203448,12,2034,2,48,203412,2035),('2034-12-03',203449,12,2034,3,49,203412,2035),('2034-12-04',203449,12,2034,4,49,203412,2035),('2034-12-05',203449,12,2034,5,49,203412,2035),('2034-12-06',203449,12,2034,6,49,203412,2035),('2034-12-07',203449,12,2034,7,49,203412,2035),('2034-12-08',203449,12,2034,8,49,203412,2035),('2034-12-09',203449,12,2034,9,49,203412,2035),('2034-12-10',203450,12,2034,10,50,203412,2035),('2034-12-11',203450,12,2034,11,50,203412,2035),('2034-12-12',203450,12,2034,12,50,203412,2035),('2034-12-13',203450,12,2034,13,50,203412,2035),('2034-12-14',203450,12,2034,14,50,203412,2035),('2034-12-15',203450,12,2034,15,50,203412,2035),('2034-12-16',203450,12,2034,16,50,203412,2035),('2034-12-17',203451,12,2034,17,51,203412,2035),('2034-12-18',203451,12,2034,18,51,203412,2035),('2034-12-19',203451,12,2034,19,51,203412,2035),('2034-12-20',203451,12,2034,20,51,203412,2035),('2034-12-21',203451,12,2034,21,51,203412,2035),('2034-12-22',203451,12,2034,22,51,203412,2035),('2034-12-23',203451,12,2034,23,51,203412,2035),('2034-12-24',203452,12,2034,24,52,203412,2035),('2034-12-25',203452,12,2034,25,52,203412,2035),('2034-12-26',203452,12,2034,26,52,203412,2035),('2034-12-27',203452,12,2034,27,52,203412,2035),('2034-12-28',203452,12,2034,28,52,203412,2035),('2034-12-29',203452,12,2034,29,52,203412,2035),('2034-12-30',203452,12,2034,30,52,203412,2035),('2034-12-31',203453,12,2034,31,1,203412,2035),('2035-01-01',203501,1,2035,1,1,203501,2035),('2035-01-02',203501,1,2035,2,1,203501,2035),('2035-01-03',203501,1,2035,3,1,203501,2035),('2035-01-04',203501,1,2035,4,1,203501,2035),('2035-01-05',203501,1,2035,5,1,203501,2035),('2035-01-06',203501,1,2035,6,1,203501,2035),('2035-01-07',203502,1,2035,7,2,203501,2035),('2035-01-08',203502,1,2035,8,2,203501,2035),('2035-01-09',203502,1,2035,9,2,203501,2035),('2035-01-10',203502,1,2035,10,2,203501,2035),('2035-01-11',203502,1,2035,11,2,203501,2035),('2035-01-12',203502,1,2035,12,2,203501,2035),('2035-01-13',203502,1,2035,13,2,203501,2035),('2035-01-14',203503,1,2035,14,3,203501,2035),('2035-01-15',203503,1,2035,15,3,203501,2035),('2035-01-16',203503,1,2035,16,3,203501,2035),('2035-01-17',203503,1,2035,17,3,203501,2035),('2035-01-18',203503,1,2035,18,3,203501,2035),('2035-01-19',203503,1,2035,19,3,203501,2035),('2035-01-20',203503,1,2035,20,3,203501,2035),('2035-01-21',203504,1,2035,21,4,203501,2035),('2035-01-22',203504,1,2035,22,4,203501,2035),('2035-01-23',203504,1,2035,23,4,203501,2035),('2035-01-24',203504,1,2035,24,4,203501,2035),('2035-01-25',203504,1,2035,25,4,203501,2035),('2035-01-26',203504,1,2035,26,4,203501,2035),('2035-01-27',203504,1,2035,27,4,203501,2035),('2035-01-28',203505,1,2035,28,5,203501,2035),('2035-01-29',203505,1,2035,29,5,203501,2035),('2035-01-30',203505,1,2035,30,5,203501,2035),('2035-01-31',203505,1,2035,31,5,203501,2035),('2035-02-01',203505,2,2035,1,5,203502,2035),('2035-02-02',203505,2,2035,2,5,203502,2035),('2035-02-03',203505,2,2035,3,5,203502,2035),('2035-02-04',203506,2,2035,4,6,203502,2035),('2035-02-05',203506,2,2035,5,6,203502,2035),('2035-02-06',203506,2,2035,6,6,203502,2035),('2035-02-07',203506,2,2035,7,6,203502,2035),('2035-02-08',203506,2,2035,8,6,203502,2035),('2035-02-09',203506,2,2035,9,6,203502,2035),('2035-02-10',203506,2,2035,10,6,203502,2035),('2035-02-11',203507,2,2035,11,7,203502,2035),('2035-02-12',203507,2,2035,12,7,203502,2035),('2035-02-13',203507,2,2035,13,7,203502,2035),('2035-02-14',203507,2,2035,14,7,203502,2035),('2035-02-15',203507,2,2035,15,7,203502,2035),('2035-02-16',203507,2,2035,16,7,203502,2035),('2035-02-17',203507,2,2035,17,7,203502,2035),('2035-02-18',203508,2,2035,18,8,203502,2035),('2035-02-19',203508,2,2035,19,8,203502,2035),('2035-02-20',203508,2,2035,20,8,203502,2035),('2035-02-21',203508,2,2035,21,8,203502,2035),('2035-02-22',203508,2,2035,22,8,203502,2035),('2035-02-23',203508,2,2035,23,8,203502,2035),('2035-02-24',203508,2,2035,24,8,203502,2035),('2035-02-25',203509,2,2035,25,9,203502,2035),('2035-02-26',203509,2,2035,26,9,203502,2035),('2035-02-27',203509,2,2035,27,9,203502,2035),('2035-02-28',203509,2,2035,28,9,203502,2035),('2035-03-01',203509,3,2035,1,9,203503,2035),('2035-03-02',203509,3,2035,2,9,203503,2035),('2035-03-03',203509,3,2035,3,9,203503,2035),('2035-03-04',203510,3,2035,4,10,203503,2035),('2035-03-05',203510,3,2035,5,10,203503,2035),('2035-03-06',203510,3,2035,6,10,203503,2035),('2035-03-07',203510,3,2035,7,10,203503,2035),('2035-03-08',203510,3,2035,8,10,203503,2035),('2035-03-09',203510,3,2035,9,10,203503,2035),('2035-03-10',203510,3,2035,10,10,203503,2035),('2035-03-11',203511,3,2035,11,11,203503,2035),('2035-03-12',203511,3,2035,12,11,203503,2035),('2035-03-13',203511,3,2035,13,11,203503,2035),('2035-03-14',203511,3,2035,14,11,203503,2035),('2035-03-15',203511,3,2035,15,11,203503,2035),('2035-03-16',203511,3,2035,16,11,203503,2035),('2035-03-17',203511,3,2035,17,11,203503,2035),('2035-03-18',203512,3,2035,18,12,203503,2035),('2035-03-19',203512,3,2035,19,12,203503,2035),('2035-03-20',203512,3,2035,20,12,203503,2035),('2035-03-21',203512,3,2035,21,12,203503,2035),('2035-03-22',203512,3,2035,22,12,203503,2035),('2035-03-23',203512,3,2035,23,12,203503,2035),('2035-03-24',203512,3,2035,24,12,203503,2035),('2035-03-25',203513,3,2035,25,13,203503,2035),('2035-03-26',203513,3,2035,26,13,203503,2035),('2035-03-27',203513,3,2035,27,13,203503,2035),('2035-03-28',203513,3,2035,28,13,203503,2035),('2035-03-29',203513,3,2035,29,13,203503,2035),('2035-03-30',203513,3,2035,30,13,203503,2035),('2035-03-31',203513,3,2035,31,13,203503,2035),('2035-04-01',203514,4,2035,1,14,203504,2035),('2035-04-02',203514,4,2035,2,14,203504,2035),('2035-04-03',203514,4,2035,3,14,203504,2035),('2035-04-04',203514,4,2035,4,14,203504,2035),('2035-04-05',203514,4,2035,5,14,203504,2035),('2035-04-06',203514,4,2035,6,14,203504,2035),('2035-04-07',203514,4,2035,7,14,203504,2035),('2035-04-08',203515,4,2035,8,15,203504,2035),('2035-04-09',203515,4,2035,9,15,203504,2035),('2035-04-10',203515,4,2035,10,15,203504,2035),('2035-04-11',203515,4,2035,11,15,203504,2035),('2035-04-12',203515,4,2035,12,15,203504,2035),('2035-04-13',203515,4,2035,13,15,203504,2035),('2035-04-14',203515,4,2035,14,15,203504,2035),('2035-04-15',203516,4,2035,15,16,203504,2035),('2035-04-16',203516,4,2035,16,16,203504,2035),('2035-04-17',203516,4,2035,17,16,203504,2035),('2035-04-18',203516,4,2035,18,16,203504,2035),('2035-04-19',203516,4,2035,19,16,203504,2035),('2035-04-20',203516,4,2035,20,16,203504,2035),('2035-04-21',203516,4,2035,21,16,203504,2035),('2035-04-22',203517,4,2035,22,17,203504,2035),('2035-04-23',203517,4,2035,23,17,203504,2035),('2035-04-24',203517,4,2035,24,17,203504,2035),('2035-04-25',203517,4,2035,25,17,203504,2035),('2035-04-26',203517,4,2035,26,17,203504,2035),('2035-04-27',203517,4,2035,27,17,203504,2035),('2035-04-28',203517,4,2035,28,17,203504,2035),('2035-04-29',203518,4,2035,29,18,203504,2035),('2035-04-30',203518,4,2035,30,18,203504,2035),('2035-05-01',203518,5,2035,1,18,203505,2035),('2035-05-02',203518,5,2035,2,18,203505,2035),('2035-05-03',203518,5,2035,3,18,203505,2035),('2035-05-04',203518,5,2035,4,18,203505,2035),('2035-05-05',203518,5,2035,5,18,203505,2035),('2035-05-06',203519,5,2035,6,19,203505,2035),('2035-05-07',203519,5,2035,7,19,203505,2035),('2035-05-08',203519,5,2035,8,19,203505,2035),('2035-05-09',203519,5,2035,9,19,203505,2035),('2035-05-10',203519,5,2035,10,19,203505,2035),('2035-05-11',203519,5,2035,11,19,203505,2035),('2035-05-12',203519,5,2035,12,19,203505,2035),('2035-05-13',203520,5,2035,13,20,203505,2035),('2035-05-14',203520,5,2035,14,20,203505,2035),('2035-05-15',203520,5,2035,15,20,203505,2035),('2035-05-16',203520,5,2035,16,20,203505,2035),('2035-05-17',203520,5,2035,17,20,203505,2035),('2035-05-18',203520,5,2035,18,20,203505,2035),('2035-05-19',203520,5,2035,19,20,203505,2035),('2035-05-20',203521,5,2035,20,21,203505,2035),('2035-05-21',203521,5,2035,21,21,203505,2035),('2035-05-22',203521,5,2035,22,21,203505,2035),('2035-05-23',203521,5,2035,23,21,203505,2035),('2035-05-24',203521,5,2035,24,21,203505,2035),('2035-05-25',203521,5,2035,25,21,203505,2035),('2035-05-26',203521,5,2035,26,21,203505,2035),('2035-05-27',203522,5,2035,27,22,203505,2035),('2035-05-28',203522,5,2035,28,22,203505,2035),('2035-05-29',203522,5,2035,29,22,203505,2035),('2035-05-30',203522,5,2035,30,22,203505,2035),('2035-05-31',203522,5,2035,31,22,203505,2035),('2035-06-01',203522,6,2035,1,22,203506,2035),('2035-06-02',203522,6,2035,2,22,203506,2035),('2035-06-03',203523,6,2035,3,23,203506,2035),('2035-06-04',203523,6,2035,4,23,203506,2035),('2035-06-05',203523,6,2035,5,23,203506,2035),('2035-06-06',203523,6,2035,6,23,203506,2035),('2035-06-07',203523,6,2035,7,23,203506,2035),('2035-06-08',203523,6,2035,8,23,203506,2035),('2035-06-09',203523,6,2035,9,23,203506,2035),('2035-06-10',203524,6,2035,10,24,203506,2035),('2035-06-11',203524,6,2035,11,24,203506,2035),('2035-06-12',203524,6,2035,12,24,203506,2035),('2035-06-13',203524,6,2035,13,24,203506,2035),('2035-06-14',203524,6,2035,14,24,203506,2035),('2035-06-15',203524,6,2035,15,24,203506,2035),('2035-06-16',203524,6,2035,16,24,203506,2035),('2035-06-17',203525,6,2035,17,25,203506,2035),('2035-06-18',203525,6,2035,18,25,203506,2035),('2035-06-19',203525,6,2035,19,25,203506,2035),('2035-06-20',203525,6,2035,20,25,203506,2035),('2035-06-21',203525,6,2035,21,25,203506,2035),('2035-06-22',203525,6,2035,22,25,203506,2035),('2035-06-23',203525,6,2035,23,25,203506,2035),('2035-06-24',203526,6,2035,24,26,203506,2035),('2035-06-25',203526,6,2035,25,26,203506,2035),('2035-06-26',203526,6,2035,26,26,203506,2035),('2035-06-27',203526,6,2035,27,26,203506,2035),('2035-06-28',203526,6,2035,28,26,203506,2035),('2035-06-29',203526,6,2035,29,26,203506,2035),('2035-06-30',203526,6,2035,30,26,203506,2035),('2035-07-01',203527,7,2035,1,27,203507,2035),('2035-07-02',203527,7,2035,2,27,203507,2035),('2035-07-03',203527,7,2035,3,27,203507,2035),('2035-07-04',203527,7,2035,4,27,203507,2035),('2035-07-05',203527,7,2035,5,27,203507,2035),('2035-07-06',203527,7,2035,6,27,203507,2035),('2035-07-07',203527,7,2035,7,27,203507,2035),('2035-07-08',203528,7,2035,8,28,203507,2035),('2035-07-09',203528,7,2035,9,28,203507,2035),('2035-07-10',203528,7,2035,10,28,203507,2035),('2035-07-11',203528,7,2035,11,28,203507,2035),('2035-07-12',203528,7,2035,12,28,203507,2035),('2035-07-13',203528,7,2035,13,28,203507,2035),('2035-07-14',203528,7,2035,14,28,203507,2035),('2035-07-15',203529,7,2035,15,29,203507,2035),('2035-07-16',203529,7,2035,16,29,203507,2035),('2035-07-17',203529,7,2035,17,29,203507,2035),('2035-07-18',203529,7,2035,18,29,203507,2035),('2035-07-19',203529,7,2035,19,29,203507,2035),('2035-07-20',203529,7,2035,20,29,203507,2035),('2035-07-21',203529,7,2035,21,29,203507,2035),('2035-07-22',203530,7,2035,22,30,203507,2035),('2035-07-23',203530,7,2035,23,30,203507,2035),('2035-07-24',203530,7,2035,24,30,203507,2035),('2035-07-25',203530,7,2035,25,30,203507,2035),('2035-07-26',203530,7,2035,26,30,203507,2035),('2035-07-27',203530,7,2035,27,30,203507,2035),('2035-07-28',203530,7,2035,28,30,203507,2035),('2035-07-29',203531,7,2035,29,31,203507,2035),('2035-07-30',203531,7,2035,30,31,203507,2035),('2035-07-31',203531,7,2035,31,31,203507,2035),('2035-08-01',203531,8,2035,1,31,203508,2035),('2035-08-02',203531,8,2035,2,31,203508,2035),('2035-08-03',203531,8,2035,3,31,203508,2035),('2035-08-04',203531,8,2035,4,31,203508,2035),('2035-08-05',203532,8,2035,5,32,203508,2035),('2035-08-06',203532,8,2035,6,32,203508,2035),('2035-08-07',203532,8,2035,7,32,203508,2035),('2035-08-08',203532,8,2035,8,32,203508,2035),('2035-08-09',203532,8,2035,9,32,203508,2035),('2035-08-10',203532,8,2035,10,32,203508,2035),('2035-08-11',203532,8,2035,11,32,203508,2035),('2035-08-12',203533,8,2035,12,33,203508,2035),('2035-08-13',203533,8,2035,13,33,203508,2035),('2035-08-14',203533,8,2035,14,33,203508,2035),('2035-08-15',203533,8,2035,15,33,203508,2035),('2035-08-16',203533,8,2035,16,33,203508,2035),('2035-08-17',203533,8,2035,17,33,203508,2035),('2035-08-18',203533,8,2035,18,33,203508,2035),('2035-08-19',203534,8,2035,19,34,203508,2035),('2035-08-20',203534,8,2035,20,34,203508,2035),('2035-08-21',203534,8,2035,21,34,203508,2035),('2035-08-22',203534,8,2035,22,34,203508,2035),('2035-08-23',203534,8,2035,23,34,203508,2035),('2035-08-24',203534,8,2035,24,34,203508,2035),('2035-08-25',203534,8,2035,25,34,203508,2035),('2035-08-26',203535,8,2035,26,35,203508,2035),('2035-08-27',203535,8,2035,27,35,203508,2035),('2035-08-28',203535,8,2035,28,35,203508,2035),('2035-08-29',203535,8,2035,29,35,203508,2035),('2035-08-30',203535,8,2035,30,35,203508,2035),('2035-08-31',203535,8,2035,31,35,203508,2035),('2035-09-01',203535,9,2035,1,35,203509,2035),('2035-09-02',203536,9,2035,2,36,203509,2035),('2035-09-03',203536,9,2035,3,36,203509,2035),('2035-09-04',203536,9,2035,4,36,203509,2035),('2035-09-05',203536,9,2035,5,36,203509,2035),('2035-09-06',203536,9,2035,6,36,203509,2035),('2035-09-07',203536,9,2035,7,36,203509,2035),('2035-09-08',203536,9,2035,8,36,203509,2035),('2035-09-09',203537,9,2035,9,37,203509,2035),('2035-09-10',203537,9,2035,10,37,203509,2035),('2035-09-11',203537,9,2035,11,37,203509,2035),('2035-09-12',203537,9,2035,12,37,203509,2035),('2035-09-13',203537,9,2035,13,37,203509,2035),('2035-09-14',203537,9,2035,14,37,203509,2035),('2035-09-15',203537,9,2035,15,37,203509,2035),('2035-09-16',203538,9,2035,16,38,203509,2035),('2035-09-17',203538,9,2035,17,38,203509,2035),('2035-09-18',203538,9,2035,18,38,203509,2035),('2035-09-19',203538,9,2035,19,38,203509,2035),('2035-09-20',203538,9,2035,20,38,203509,2035),('2035-09-21',203538,9,2035,21,38,203509,2035),('2035-09-22',203538,9,2035,22,38,203509,2035),('2035-09-23',203539,9,2035,23,39,203509,2035),('2035-09-24',203539,9,2035,24,39,203509,2035),('2035-09-25',203539,9,2035,25,39,203509,2035),('2035-09-26',203539,9,2035,26,39,203509,2035),('2035-09-27',203539,9,2035,27,39,203509,2035),('2035-09-28',203539,9,2035,28,39,203509,2035),('2035-09-29',203539,9,2035,29,39,203509,2035),('2035-09-30',203540,9,2035,30,40,203509,2035),('2035-10-01',203540,10,2035,1,40,203510,2035),('2035-10-02',203540,10,2035,2,40,203510,2035),('2035-10-03',203540,10,2035,3,40,203510,2035),('2035-10-04',203540,10,2035,4,40,203510,2035),('2035-10-05',203540,10,2035,5,40,203510,2035),('2035-10-06',203540,10,2035,6,40,203510,2035),('2035-10-07',203541,10,2035,7,41,203510,2035),('2035-10-08',203541,10,2035,8,41,203510,2035),('2035-10-09',203541,10,2035,9,41,203510,2035),('2035-10-10',203541,10,2035,10,41,203510,2035),('2035-10-11',203541,10,2035,11,41,203510,2035),('2035-10-12',203541,10,2035,12,41,203510,2035),('2035-10-13',203541,10,2035,13,41,203510,2035),('2035-10-14',203542,10,2035,14,42,203510,2035),('2035-10-15',203542,10,2035,15,42,203510,2035),('2035-10-16',203542,10,2035,16,42,203510,2035),('2035-10-17',203542,10,2035,17,42,203510,2035),('2035-10-18',203542,10,2035,18,42,203510,2035),('2035-10-19',203542,10,2035,19,42,203510,2035),('2035-10-20',203542,10,2035,20,42,203510,2035),('2035-10-21',203543,10,2035,21,43,203510,2035),('2035-10-22',203543,10,2035,22,43,203510,2035),('2035-10-23',203543,10,2035,23,43,203510,2035),('2035-10-24',203543,10,2035,24,43,203510,2035),('2035-10-25',203543,10,2035,25,43,203510,2035),('2035-10-26',203543,10,2035,26,43,203510,2035),('2035-10-27',203543,10,2035,27,43,203510,2035),('2035-10-28',203544,10,2035,28,44,203510,2035),('2035-10-29',203544,10,2035,29,44,203510,2035),('2035-10-30',203544,10,2035,30,44,203510,2035),('2035-10-31',203544,10,2035,31,44,203510,2035),('2035-11-01',203544,11,2035,1,44,203511,2035),('2035-11-02',203544,11,2035,2,44,203511,2035),('2035-11-03',203544,11,2035,3,44,203511,2035),('2035-11-04',203545,11,2035,4,45,203511,2035),('2035-11-05',203545,11,2035,5,45,203511,2035),('2035-11-06',203545,11,2035,6,45,203511,2035),('2035-11-07',203545,11,2035,7,45,203511,2035),('2035-11-08',203545,11,2035,8,45,203511,2035),('2035-11-09',203545,11,2035,9,45,203511,2035),('2035-11-10',203545,11,2035,10,45,203511,2035),('2035-11-11',203546,11,2035,11,46,203511,2035),('2035-11-12',203546,11,2035,12,46,203511,2035),('2035-11-13',203546,11,2035,13,46,203511,2035),('2035-11-14',203546,11,2035,14,46,203511,2035),('2035-11-15',203546,11,2035,15,46,203511,2035),('2035-11-16',203546,11,2035,16,46,203511,2035),('2035-11-17',203546,11,2035,17,46,203511,2035),('2035-11-18',203547,11,2035,18,47,203511,2035),('2035-11-19',203547,11,2035,19,47,203511,2035),('2035-11-20',203547,11,2035,20,47,203511,2035),('2035-11-21',203547,11,2035,21,47,203511,2035),('2035-11-22',203547,11,2035,22,47,203511,2035),('2035-11-23',203547,11,2035,23,47,203511,2035),('2035-11-24',203547,11,2035,24,47,203511,2035),('2035-11-25',203548,11,2035,25,48,203511,2035),('2035-11-26',203548,11,2035,26,48,203511,2035),('2035-11-27',203548,11,2035,27,48,203511,2035),('2035-11-28',203548,11,2035,28,48,203511,2035),('2035-11-29',203548,11,2035,29,48,203511,2035),('2035-11-30',203548,11,2035,30,48,203511,2035),('2035-12-01',203548,12,2035,1,48,203512,2036),('2035-12-02',203549,12,2035,2,49,203512,2036),('2035-12-03',203549,12,2035,3,49,203512,2036),('2035-12-04',203549,12,2035,4,49,203512,2036),('2035-12-05',203549,12,2035,5,49,203512,2036),('2035-12-06',203549,12,2035,6,49,203512,2036),('2035-12-07',203549,12,2035,7,49,203512,2036),('2035-12-08',203549,12,2035,8,49,203512,2036),('2035-12-09',203550,12,2035,9,50,203512,2036),('2035-12-10',203550,12,2035,10,50,203512,2036),('2035-12-11',203550,12,2035,11,50,203512,2036),('2035-12-12',203550,12,2035,12,50,203512,2036),('2035-12-13',203550,12,2035,13,50,203512,2036),('2035-12-14',203550,12,2035,14,50,203512,2036),('2035-12-15',203550,12,2035,15,50,203512,2036),('2035-12-16',203551,12,2035,16,51,203512,2036),('2035-12-17',203551,12,2035,17,51,203512,2036),('2035-12-18',203551,12,2035,18,51,203512,2036),('2035-12-19',203551,12,2035,19,51,203512,2036),('2035-12-20',203551,12,2035,20,51,203512,2036),('2035-12-21',203551,12,2035,21,51,203512,2036),('2035-12-22',203551,12,2035,22,51,203512,2036),('2035-12-23',203552,12,2035,23,52,203512,2036),('2035-12-24',203552,12,2035,24,52,203512,2036),('2035-12-25',203552,12,2035,25,52,203512,2036),('2035-12-26',203552,12,2035,26,52,203512,2036),('2035-12-27',203552,12,2035,27,52,203512,2036),('2035-12-28',203552,12,2035,28,52,203512,2036),('2035-12-29',203552,12,2035,29,52,203512,2036),('2035-12-30',203553,12,2035,30,1,203512,2036),('2035-12-31',203501,12,2035,31,1,203512,2036),('2036-01-01',203601,1,2036,1,1,203601,2036),('2036-01-02',203601,1,2036,2,1,203601,2036),('2036-01-03',203601,1,2036,3,1,203601,2036),('2036-01-04',203601,1,2036,4,1,203601,2036),('2036-01-05',203601,1,2036,5,1,203601,2036),('2036-01-06',203602,1,2036,6,2,203601,2036),('2036-01-07',203602,1,2036,7,2,203601,2036),('2036-01-08',203602,1,2036,8,2,203601,2036),('2036-01-09',203602,1,2036,9,2,203601,2036),('2036-01-10',203602,1,2036,10,2,203601,2036),('2036-01-11',203602,1,2036,11,2,203601,2036),('2036-01-12',203602,1,2036,12,2,203601,2036),('2036-01-13',203603,1,2036,13,3,203601,2036),('2036-01-14',203603,1,2036,14,3,203601,2036),('2036-01-15',203603,1,2036,15,3,203601,2036),('2036-01-16',203603,1,2036,16,3,203601,2036),('2036-01-17',203603,1,2036,17,3,203601,2036),('2036-01-18',203603,1,2036,18,3,203601,2036),('2036-01-19',203603,1,2036,19,3,203601,2036),('2036-01-20',203604,1,2036,20,4,203601,2036),('2036-01-21',203604,1,2036,21,4,203601,2036),('2036-01-22',203604,1,2036,22,4,203601,2036),('2036-01-23',203604,1,2036,23,4,203601,2036),('2036-01-24',203604,1,2036,24,4,203601,2036),('2036-01-25',203604,1,2036,25,4,203601,2036),('2036-01-26',203604,1,2036,26,4,203601,2036),('2036-01-27',203605,1,2036,27,5,203601,2036),('2036-01-28',203605,1,2036,28,5,203601,2036),('2036-01-29',203605,1,2036,29,5,203601,2036),('2036-01-30',203605,1,2036,30,5,203601,2036),('2036-01-31',203605,1,2036,31,5,203601,2036),('2036-02-01',203605,2,2036,1,5,203602,2036),('2036-02-02',203605,2,2036,2,5,203602,2036),('2036-02-03',203606,2,2036,3,6,203602,2036),('2036-02-04',203606,2,2036,4,6,203602,2036),('2036-02-05',203606,2,2036,5,6,203602,2036),('2036-02-06',203606,2,2036,6,6,203602,2036),('2036-02-07',203606,2,2036,7,6,203602,2036),('2036-02-08',203606,2,2036,8,6,203602,2036),('2036-02-09',203606,2,2036,9,6,203602,2036),('2036-02-10',203607,2,2036,10,7,203602,2036),('2036-02-11',203607,2,2036,11,7,203602,2036),('2036-02-12',203607,2,2036,12,7,203602,2036),('2036-02-13',203607,2,2036,13,7,203602,2036),('2036-02-14',203607,2,2036,14,7,203602,2036),('2036-02-15',203607,2,2036,15,7,203602,2036),('2036-02-16',203607,2,2036,16,7,203602,2036),('2036-02-17',203608,2,2036,17,8,203602,2036),('2036-02-18',203608,2,2036,18,8,203602,2036),('2036-02-19',203608,2,2036,19,8,203602,2036),('2036-02-20',203608,2,2036,20,8,203602,2036),('2036-02-21',203608,2,2036,21,8,203602,2036),('2036-02-22',203608,2,2036,22,8,203602,2036),('2036-02-23',203608,2,2036,23,8,203602,2036),('2036-02-24',203609,2,2036,24,9,203602,2036),('2036-02-25',203609,2,2036,25,9,203602,2036),('2036-02-26',203609,2,2036,26,9,203602,2036),('2036-02-27',203609,2,2036,27,9,203602,2036),('2036-02-28',203609,2,2036,28,9,203602,2036),('2036-02-29',203609,2,2036,29,9,203602,2036),('2036-03-01',203609,3,2036,1,9,203603,2036),('2036-03-02',203610,3,2036,2,10,203603,2036),('2036-03-03',203610,3,2036,3,10,203603,2036),('2036-03-04',203610,3,2036,4,10,203603,2036),('2036-03-05',203610,3,2036,5,10,203603,2036),('2036-03-06',203610,3,2036,6,10,203603,2036),('2036-03-07',203610,3,2036,7,10,203603,2036),('2036-03-08',203610,3,2036,8,10,203603,2036),('2036-03-09',203611,3,2036,9,11,203603,2036),('2036-03-10',203611,3,2036,10,11,203603,2036),('2036-03-11',203611,3,2036,11,11,203603,2036),('2036-03-12',203611,3,2036,12,11,203603,2036),('2036-03-13',203611,3,2036,13,11,203603,2036),('2036-03-14',203611,3,2036,14,11,203603,2036),('2036-03-15',203611,3,2036,15,11,203603,2036),('2036-03-16',203612,3,2036,16,12,203603,2036),('2036-03-17',203612,3,2036,17,12,203603,2036),('2036-03-18',203612,3,2036,18,12,203603,2036),('2036-03-19',203612,3,2036,19,12,203603,2036),('2036-03-20',203612,3,2036,20,12,203603,2036),('2036-03-21',203612,3,2036,21,12,203603,2036),('2036-03-22',203612,3,2036,22,12,203603,2036),('2036-03-23',203613,3,2036,23,13,203603,2036),('2036-03-24',203613,3,2036,24,13,203603,2036),('2036-03-25',203613,3,2036,25,13,203603,2036),('2036-03-26',203613,3,2036,26,13,203603,2036),('2036-03-27',203613,3,2036,27,13,203603,2036),('2036-03-28',203613,3,2036,28,13,203603,2036),('2036-03-29',203613,3,2036,29,13,203603,2036),('2036-03-30',203614,3,2036,30,14,203603,2036),('2036-03-31',203614,3,2036,31,14,203603,2036),('2036-04-01',203614,4,2036,1,14,203604,2036),('2036-04-02',203614,4,2036,2,14,203604,2036),('2036-04-03',203614,4,2036,3,14,203604,2036),('2036-04-04',203614,4,2036,4,14,203604,2036),('2036-04-05',203614,4,2036,5,14,203604,2036),('2036-04-06',203615,4,2036,6,15,203604,2036),('2036-04-07',203615,4,2036,7,15,203604,2036),('2036-04-08',203615,4,2036,8,15,203604,2036),('2036-04-09',203615,4,2036,9,15,203604,2036),('2036-04-10',203615,4,2036,10,15,203604,2036),('2036-04-11',203615,4,2036,11,15,203604,2036),('2036-04-12',203615,4,2036,12,15,203604,2036),('2036-04-13',203616,4,2036,13,16,203604,2036),('2036-04-14',203616,4,2036,14,16,203604,2036),('2036-04-15',203616,4,2036,15,16,203604,2036),('2036-04-16',203616,4,2036,16,16,203604,2036),('2036-04-17',203616,4,2036,17,16,203604,2036),('2036-04-18',203616,4,2036,18,16,203604,2036),('2036-04-19',203616,4,2036,19,16,203604,2036),('2036-04-20',203617,4,2036,20,17,203604,2036),('2036-04-21',203617,4,2036,21,17,203604,2036),('2036-04-22',203617,4,2036,22,17,203604,2036),('2036-04-23',203617,4,2036,23,17,203604,2036),('2036-04-24',203617,4,2036,24,17,203604,2036),('2036-04-25',203617,4,2036,25,17,203604,2036),('2036-04-26',203617,4,2036,26,17,203604,2036),('2036-04-27',203618,4,2036,27,18,203604,2036),('2036-04-28',203618,4,2036,28,18,203604,2036),('2036-04-29',203618,4,2036,29,18,203604,2036),('2036-04-30',203618,4,2036,30,18,203604,2036),('2036-05-01',203618,5,2036,1,18,203605,2036),('2036-05-02',203618,5,2036,2,18,203605,2036),('2036-05-03',203618,5,2036,3,18,203605,2036),('2036-05-04',203619,5,2036,4,19,203605,2036),('2036-05-05',203619,5,2036,5,19,203605,2036),('2036-05-06',203619,5,2036,6,19,203605,2036),('2036-05-07',203619,5,2036,7,19,203605,2036),('2036-05-08',203619,5,2036,8,19,203605,2036),('2036-05-09',203619,5,2036,9,19,203605,2036),('2036-05-10',203619,5,2036,10,19,203605,2036),('2036-05-11',203620,5,2036,11,20,203605,2036),('2036-05-12',203620,5,2036,12,20,203605,2036),('2036-05-13',203620,5,2036,13,20,203605,2036),('2036-05-14',203620,5,2036,14,20,203605,2036),('2036-05-15',203620,5,2036,15,20,203605,2036),('2036-05-16',203620,5,2036,16,20,203605,2036),('2036-05-17',203620,5,2036,17,20,203605,2036),('2036-05-18',203621,5,2036,18,21,203605,2036),('2036-05-19',203621,5,2036,19,21,203605,2036),('2036-05-20',203621,5,2036,20,21,203605,2036),('2036-05-21',203621,5,2036,21,21,203605,2036),('2036-05-22',203621,5,2036,22,21,203605,2036),('2036-05-23',203621,5,2036,23,21,203605,2036),('2036-05-24',203621,5,2036,24,21,203605,2036),('2036-05-25',203622,5,2036,25,22,203605,2036),('2036-05-26',203622,5,2036,26,22,203605,2036),('2036-05-27',203622,5,2036,27,22,203605,2036),('2036-05-28',203622,5,2036,28,22,203605,2036),('2036-05-29',203622,5,2036,29,22,203605,2036),('2036-05-30',203622,5,2036,30,22,203605,2036),('2036-05-31',203622,5,2036,31,22,203605,2036),('2036-06-01',203623,6,2036,1,23,203606,2036),('2036-06-02',203623,6,2036,2,23,203606,2036),('2036-06-03',203623,6,2036,3,23,203606,2036),('2036-06-04',203623,6,2036,4,23,203606,2036),('2036-06-05',203623,6,2036,5,23,203606,2036),('2036-06-06',203623,6,2036,6,23,203606,2036),('2036-06-07',203623,6,2036,7,23,203606,2036),('2036-06-08',203624,6,2036,8,24,203606,2036),('2036-06-09',203624,6,2036,9,24,203606,2036),('2036-06-10',203624,6,2036,10,24,203606,2036),('2036-06-11',203624,6,2036,11,24,203606,2036),('2036-06-12',203624,6,2036,12,24,203606,2036),('2036-06-13',203624,6,2036,13,24,203606,2036),('2036-06-14',203624,6,2036,14,24,203606,2036),('2036-06-15',203625,6,2036,15,25,203606,2036),('2036-06-16',203625,6,2036,16,25,203606,2036),('2036-06-17',203625,6,2036,17,25,203606,2036),('2036-06-18',203625,6,2036,18,25,203606,2036),('2036-06-19',203625,6,2036,19,25,203606,2036),('2036-06-20',203625,6,2036,20,25,203606,2036),('2036-06-21',203625,6,2036,21,25,203606,2036),('2036-06-22',203626,6,2036,22,26,203606,2036),('2036-06-23',203626,6,2036,23,26,203606,2036),('2036-06-24',203626,6,2036,24,26,203606,2036),('2036-06-25',203626,6,2036,25,26,203606,2036),('2036-06-26',203626,6,2036,26,26,203606,2036),('2036-06-27',203626,6,2036,27,26,203606,2036),('2036-06-28',203626,6,2036,28,26,203606,2036),('2036-06-29',203627,6,2036,29,27,203606,2036),('2036-06-30',203627,6,2036,30,27,203606,2036),('2036-07-01',203627,7,2036,1,27,203607,2036),('2036-07-02',203627,7,2036,2,27,203607,2036),('2036-07-03',203627,7,2036,3,27,203607,2036),('2036-07-04',203627,7,2036,4,27,203607,2036),('2036-07-05',203627,7,2036,5,27,203607,2036),('2036-07-06',203628,7,2036,6,28,203607,2036),('2036-07-07',203628,7,2036,7,28,203607,2036),('2036-07-08',203628,7,2036,8,28,203607,2036),('2036-07-09',203628,7,2036,9,28,203607,2036),('2036-07-10',203628,7,2036,10,28,203607,2036),('2036-07-11',203628,7,2036,11,28,203607,2036),('2036-07-12',203628,7,2036,12,28,203607,2036),('2036-07-13',203629,7,2036,13,29,203607,2036),('2036-07-14',203629,7,2036,14,29,203607,2036),('2036-07-15',203629,7,2036,15,29,203607,2036),('2036-07-16',203629,7,2036,16,29,203607,2036),('2036-07-17',203629,7,2036,17,29,203607,2036),('2036-07-18',203629,7,2036,18,29,203607,2036),('2036-07-19',203629,7,2036,19,29,203607,2036),('2036-07-20',203630,7,2036,20,30,203607,2036),('2036-07-21',203630,7,2036,21,30,203607,2036),('2036-07-22',203630,7,2036,22,30,203607,2036),('2036-07-23',203630,7,2036,23,30,203607,2036),('2036-07-24',203630,7,2036,24,30,203607,2036),('2036-07-25',203630,7,2036,25,30,203607,2036),('2036-07-26',203630,7,2036,26,30,203607,2036),('2036-07-27',203631,7,2036,27,31,203607,2036),('2036-07-28',203631,7,2036,28,31,203607,2036),('2036-07-29',203631,7,2036,29,31,203607,2036),('2036-07-30',203631,7,2036,30,31,203607,2036),('2036-07-31',203631,7,2036,31,31,203607,2036),('2036-08-01',203631,8,2036,1,31,203608,2036),('2036-08-02',203631,8,2036,2,31,203608,2036),('2036-08-03',203632,8,2036,3,32,203608,2036),('2036-08-04',203632,8,2036,4,32,203608,2036),('2036-08-05',203632,8,2036,5,32,203608,2036),('2036-08-06',203632,8,2036,6,32,203608,2036),('2036-08-07',203632,8,2036,7,32,203608,2036),('2036-08-08',203632,8,2036,8,32,203608,2036),('2036-08-09',203632,8,2036,9,32,203608,2036),('2036-08-10',203633,8,2036,10,33,203608,2036),('2036-08-11',203633,8,2036,11,33,203608,2036),('2036-08-12',203633,8,2036,12,33,203608,2036),('2036-08-13',203633,8,2036,13,33,203608,2036),('2036-08-14',203633,8,2036,14,33,203608,2036),('2036-08-15',203633,8,2036,15,33,203608,2036),('2036-08-16',203633,8,2036,16,33,203608,2036),('2036-08-17',203634,8,2036,17,34,203608,2036),('2036-08-18',203634,8,2036,18,34,203608,2036),('2036-08-19',203634,8,2036,19,34,203608,2036),('2036-08-20',203634,8,2036,20,34,203608,2036),('2036-08-21',203634,8,2036,21,34,203608,2036),('2036-08-22',203634,8,2036,22,34,203608,2036),('2036-08-23',203634,8,2036,23,34,203608,2036),('2036-08-24',203635,8,2036,24,35,203608,2036),('2036-08-25',203635,8,2036,25,35,203608,2036),('2036-08-26',203635,8,2036,26,35,203608,2036),('2036-08-27',203635,8,2036,27,35,203608,2036),('2036-08-28',203635,8,2036,28,35,203608,2036),('2036-08-29',203635,8,2036,29,35,203608,2036),('2036-08-30',203635,8,2036,30,35,203608,2036),('2036-08-31',203636,8,2036,31,36,203608,2036),('2036-09-01',203636,9,2036,1,36,203609,2036),('2036-09-02',203636,9,2036,2,36,203609,2036),('2036-09-03',203636,9,2036,3,36,203609,2036),('2036-09-04',203636,9,2036,4,36,203609,2036),('2036-09-05',203636,9,2036,5,36,203609,2036),('2036-09-06',203636,9,2036,6,36,203609,2036),('2036-09-07',203637,9,2036,7,37,203609,2036),('2036-09-08',203637,9,2036,8,37,203609,2036),('2036-09-09',203637,9,2036,9,37,203609,2036),('2036-09-10',203637,9,2036,10,37,203609,2036),('2036-09-11',203637,9,2036,11,37,203609,2036),('2036-09-12',203637,9,2036,12,37,203609,2036),('2036-09-13',203637,9,2036,13,37,203609,2036),('2036-09-14',203638,9,2036,14,38,203609,2036),('2036-09-15',203638,9,2036,15,38,203609,2036),('2036-09-16',203638,9,2036,16,38,203609,2036),('2036-09-17',203638,9,2036,17,38,203609,2036),('2036-09-18',203638,9,2036,18,38,203609,2036),('2036-09-19',203638,9,2036,19,38,203609,2036),('2036-09-20',203638,9,2036,20,38,203609,2036),('2036-09-21',203639,9,2036,21,39,203609,2036),('2036-09-22',203639,9,2036,22,39,203609,2036),('2036-09-23',203639,9,2036,23,39,203609,2036),('2036-09-24',203639,9,2036,24,39,203609,2036),('2036-09-25',203639,9,2036,25,39,203609,2036),('2036-09-26',203639,9,2036,26,39,203609,2036),('2036-09-27',203639,9,2036,27,39,203609,2036),('2036-09-28',203640,9,2036,28,40,203609,2036),('2036-09-29',203640,9,2036,29,40,203609,2036),('2036-09-30',203640,9,2036,30,40,203609,2036),('2036-10-01',203640,10,2036,1,40,203610,2036),('2036-10-02',203640,10,2036,2,40,203610,2036),('2036-10-03',203640,10,2036,3,40,203610,2036),('2036-10-04',203640,10,2036,4,40,203610,2036),('2036-10-05',203641,10,2036,5,41,203610,2036),('2036-10-06',203641,10,2036,6,41,203610,2036),('2036-10-07',203641,10,2036,7,41,203610,2036),('2036-10-08',203641,10,2036,8,41,203610,2036),('2036-10-09',203641,10,2036,9,41,203610,2036),('2036-10-10',203641,10,2036,10,41,203610,2036),('2036-10-11',203641,10,2036,11,41,203610,2036),('2036-10-12',203642,10,2036,12,42,203610,2036),('2036-10-13',203642,10,2036,13,42,203610,2036),('2036-10-14',203642,10,2036,14,42,203610,2036),('2036-10-15',203642,10,2036,15,42,203610,2036),('2036-10-16',203642,10,2036,16,42,203610,2036),('2036-10-17',203642,10,2036,17,42,203610,2036),('2036-10-18',203642,10,2036,18,42,203610,2036),('2036-10-19',203643,10,2036,19,43,203610,2036),('2036-10-20',203643,10,2036,20,43,203610,2036),('2036-10-21',203643,10,2036,21,43,203610,2036),('2036-10-22',203643,10,2036,22,43,203610,2036),('2036-10-23',203643,10,2036,23,43,203610,2036),('2036-10-24',203643,10,2036,24,43,203610,2036),('2036-10-25',203643,10,2036,25,43,203610,2036),('2036-10-26',203644,10,2036,26,44,203610,2036),('2036-10-27',203644,10,2036,27,44,203610,2036),('2036-10-28',203644,10,2036,28,44,203610,2036),('2036-10-29',203644,10,2036,29,44,203610,2036),('2036-10-30',203644,10,2036,30,44,203610,2036),('2036-10-31',203644,10,2036,31,44,203610,2036),('2036-11-01',203644,11,2036,1,44,203611,2036),('2036-11-02',203645,11,2036,2,45,203611,2036),('2036-11-03',203645,11,2036,3,45,203611,2036),('2036-11-04',203645,11,2036,4,45,203611,2036),('2036-11-05',203645,11,2036,5,45,203611,2036),('2036-11-06',203645,11,2036,6,45,203611,2036),('2036-11-07',203645,11,2036,7,45,203611,2036),('2036-11-08',203645,11,2036,8,45,203611,2036),('2036-11-09',203646,11,2036,9,46,203611,2036),('2036-11-10',203646,11,2036,10,46,203611,2036),('2036-11-11',203646,11,2036,11,46,203611,2036),('2036-11-12',203646,11,2036,12,46,203611,2036),('2036-11-13',203646,11,2036,13,46,203611,2036),('2036-11-14',203646,11,2036,14,46,203611,2036),('2036-11-15',203646,11,2036,15,46,203611,2036),('2036-11-16',203647,11,2036,16,47,203611,2036),('2036-11-17',203647,11,2036,17,47,203611,2036),('2036-11-18',203647,11,2036,18,47,203611,2036),('2036-11-19',203647,11,2036,19,47,203611,2036),('2036-11-20',203647,11,2036,20,47,203611,2036),('2036-11-21',203647,11,2036,21,47,203611,2036),('2036-11-22',203647,11,2036,22,47,203611,2036),('2036-11-23',203648,11,2036,23,48,203611,2036),('2036-11-24',203648,11,2036,24,48,203611,2036),('2036-11-25',203648,11,2036,25,48,203611,2036),('2036-11-26',203648,11,2036,26,48,203611,2036),('2036-11-27',203648,11,2036,27,48,203611,2036),('2036-11-28',203648,11,2036,28,48,203611,2036),('2036-11-29',203648,11,2036,29,48,203611,2036),('2036-11-30',203649,11,2036,30,49,203611,2036),('2036-12-01',203649,12,2036,1,49,203612,2037),('2036-12-02',203649,12,2036,2,49,203612,2037),('2036-12-03',203649,12,2036,3,49,203612,2037),('2036-12-04',203649,12,2036,4,49,203612,2037),('2036-12-05',203649,12,2036,5,49,203612,2037),('2036-12-06',203649,12,2036,6,49,203612,2037),('2036-12-07',203650,12,2036,7,50,203612,2037),('2036-12-08',203650,12,2036,8,50,203612,2037),('2036-12-09',203650,12,2036,9,50,203612,2037),('2036-12-10',203650,12,2036,10,50,203612,2037),('2036-12-11',203650,12,2036,11,50,203612,2037),('2036-12-12',203650,12,2036,12,50,203612,2037),('2036-12-13',203650,12,2036,13,50,203612,2037),('2036-12-14',203651,12,2036,14,51,203612,2037),('2036-12-15',203651,12,2036,15,51,203612,2037),('2036-12-16',203651,12,2036,16,51,203612,2037),('2036-12-17',203651,12,2036,17,51,203612,2037),('2036-12-18',203651,12,2036,18,51,203612,2037),('2036-12-19',203651,12,2036,19,51,203612,2037),('2036-12-20',203651,12,2036,20,51,203612,2037),('2036-12-21',203652,12,2036,21,52,203612,2037),('2036-12-22',203652,12,2036,22,52,203612,2037),('2036-12-23',203652,12,2036,23,52,203612,2037),('2036-12-24',203652,12,2036,24,52,203612,2037),('2036-12-25',203652,12,2036,25,52,203612,2037),('2036-12-26',203652,12,2036,26,52,203612,2037),('2036-12-27',203652,12,2036,27,52,203612,2037),('2036-12-28',203653,12,2036,28,53,203612,2037),('2036-12-29',203601,12,2036,29,53,203612,2037),('2036-12-30',203601,12,2036,30,53,203612,2037); /*!40000 ALTER TABLE `time` ENABLE KEYS */; UNLOCK TABLES; @@ -357,7 +357,7 @@ UNLOCK TABLES; LOCK TABLES `component` WRITE; /*!40000 ALTER TABLE `component` DISABLE KEYS */; -INSERT INTO `component` VALUES (10,'Precios Especiales',4,NULL,NULL,1,'specialPrices'),(14,'porte extra por dia semana',6,NULL,NULL,1,'extraCostPerWeekDay'),(15,'reparto',6,NULL,NULL,1,'delivery'),(17,'recobro',5,NULL,NULL,1,'debtCollection'),(21,'ajuste',11,NULL,NULL,1,'adjustment'),(22,'venta por paquete',9,1,NULL,0,'salePerPackage'),(23,'venta por caja',9,2,NULL,0,'salePerBox'),(28,'valor de compra',1,NULL,NULL,1,'purchaseValue'),(29,'margen',4,NULL,NULL,1,'margin'),(32,'descuento ultimas unidades',9,3,-0.05,0,'lastUnitsDiscount'),(33,'venta por caja',9,1,NULL,0,'salePerBox'),(34,'descuento comprador',4,NULL,NULL,1,'buyerDiscount'),(35,'cartera comprador',10,NULL,NULL,1,NULL),(36,'descuadre',12,NULL,NULL,1,'imbalance'),(37,'maná',7,4,NULL,0,'mana'),(38,'embolsado',9,NULL,NULL,1,'bagged'),(39,'maná auto',7,NULL,NULL,1,'autoMana'),(40,'cambios Santos 2016',4,NULL,NULL,1,NULL),(41,'bonificacion porte',4,NULL,NULL,1,'freightCharge'),(42,'promocion Francia',4,NULL,NULL,1,'frenchOffer'); +INSERT INTO `component` VALUES (10,'Precios Especiales',4,NULL,NULL,1,'specialPrices'),(14,'porte extra por dia semana',6,NULL,NULL,1,'extraCostPerWeekDay'),(15,'reparto',6,NULL,NULL,1,'delivery'),(17,'recobro',5,NULL,NULL,1,'debtCollection'),(21,'ajuste',11,NULL,NULL,1,'adjustment'),(22,'venta por paquete',9,1,NULL,0,'salePerPackage'),(23,'venta por caja',9,2,NULL,0,'salePerBox'),(28,'valor de compra',1,NULL,NULL,1,'purchaseValue'),(29,'margen',4,NULL,NULL,1,'margin'),(32,'descuento ultimas unidades',9,3,-0.05,0,'lastUnitsDiscount'),(33,'venta por caja',9,1,NULL,0,'salePerBox'),(34,'descuento comprador',4,NULL,NULL,1,'buyerDiscount'),(35,'cartera comprador',10,NULL,NULL,1,NULL),(36,'descuadre',12,NULL,NULL,1,'imbalance'),(37,'maná',7,4,NULL,0,'mana'),(38,'embolsado',9,NULL,NULL,1,'bagged'),(39,'maná auto',7,NULL,NULL,1,'autoMana'),(40,'cambios Santos 2016',4,NULL,NULL,1,NULL),(41,'bonificacion porte',4,NULL,NULL,1,'freightCharge'),(42,'promocion Francia',4,NULL,NULL,1,'frenchOffer'),(43,'promocion Floramondo',4,NULL,NULL,1,'floramondoPromo'); /*!40000 ALTER TABLE `component` ENABLE KEYS */; UNLOCK TABLES; @@ -380,7 +380,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-25 12:04:00 +-- Dump completed on 2020-12-17 8:49:57 USE `cache`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -418,7 +418,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-25 12:04:01 +-- Dump completed on 2020-12-17 8:49:57 USE `hedera`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -486,7 +486,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-25 12:04:02 +-- Dump completed on 2020-12-17 8:50:02 USE `postgresql`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -561,7 +561,7 @@ UNLOCK TABLES; LOCK TABLES `workcenter` WRITE; /*!40000 ALTER TABLE `workcenter` DISABLE KEYS */; -INSERT INTO `workcenter` VALUES (1,'Silla',20,1082,1,'Av espioca 100',552703),(2,'Mercaflor',19,NULL,NULL,NULL,NULL),(3,'Marjales',26,20008,NULL,NULL,NULL),(4,'VNH',NULL,NULL,3,NULL,NULL),(5,'Madrid',28,2856,5,'Av constitución 3',554145),(6,'Vilassar',88,88031,2,'Cami del Crist, 33',556412),(7,'Tenerife',NULL,NULL,10,NULL,NULL); +INSERT INTO `workcenter` VALUES (1,'Silla',20,1091,1,'Av espioca 100',552703),(2,'Mercaflor',19,NULL,NULL,NULL,NULL),(3,'Marjales',26,20008,NULL,NULL,NULL),(4,'VNH',NULL,NULL,3,NULL,NULL),(5,'Madrid',28,2858,5,'Av constitución 3',554145),(6,'Vilassar',88,88031,2,'Cami del Crist, 33',556412),(7,'Tenerife',NULL,NULL,10,NULL,NULL); /*!40000 ALTER TABLE `workcenter` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -574,7 +574,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-25 12:04:04 +-- Dump completed on 2020-12-17 8:50:04 USE `sage`; -- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64) -- @@ -632,4 +632,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-25 12:04:05 +-- Dump completed on 2020-12-17 8:50:05 diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 879c4c6ee8..b53d946309 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -148,18 +148,23 @@ INSERT INTO `vn`.`shelving` (`code`, `parkingFk`, `isPrinted`, `priority`, `park ('GVC', '1', '0', '1', '0', '106'), ('HEJ', '2', '0', '1', '0', '106'); -INSERT INTO `vn`.`accountingType`(`id`, `description`, `receiptDescription`) +INSERT INTO `vn`.`accountingType`(`id`, `description`, `receiptDescription`,`code`) VALUES - (1, 'Digital money', ''), - (2, 'Cash', 'Cash'), - (3, 'Card', 'Pay on receipt'), - (4, 'Stolen Money', ''), - (5, 'Miscellaneous', ''); + (1, 'CC y Polizas de crédito', NULL, NULL), + (2, 'Caja registradora', NULL, NULL), + (3, 'Tarjeta de credito', NULL, NULL), + (4, 'Lineas de financiacion', NULL, NULL), + (5, 'Otros productos', NULL, NULL), + (6, 'Prestamos', NULL, NULL), + (7, 'Leasing', NULL, NULL), + (8, 'Compensaciones', NULL, NULL), + (9, 'Cash', 'Cash', NULL), + (10, 'Card', 'Pay on receipt', NULL); INSERT INTO `vn`.`bank`(`id`, `bank`, `account`, `cash`, `entityFk`, `isActive`, `currencyFk`) VALUES - (1, 'Pay on receipt', '0000000000', 3, 0, 1, 1), - (2, 'Cash', '1111111111', 2, 0, 1, 1); + (1, 'Pay on receipt', '0000000000', 10, 0, 1, 1), + (2, 'Cash', '1111111111', 9, 0, 1, 1); INSERT INTO `vn`.`deliveryMethod`(`id`, `code`, `description`) VALUES diff --git a/db/dump/structure.sql b/db/dump/structure.sql index c5303eec23..590ab5e914 100644 --- a/db/dump/structure.sql +++ b/db/dump/structure.sql @@ -3052,6 +3052,24 @@ CREATE TABLE `salesByWeek` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `salesMonthlySnapshot` +-- + +DROP TABLE IF EXISTS `salesMonthlySnapshot`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `salesMonthlySnapshot` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `workerFk` int(11) NOT NULL, + `year` int(4) NOT NULL, + `month` int(2) NOT NULL, + `departmentFk` int(11) NOT NULL, + `amount` decimal(10,2) DEFAULT '0.00', + PRIMARY KEY (`id`) +) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='cada trimestre se guardan aqui los datos de forma estática, para consulta en grafana.'; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `salesPersonClient` -- @@ -3710,7 +3728,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `clientDied`() BEGIN - IF DAY(CURDATE()) = 6 THEN + IF DAY(CURDATE()) = 3 THEN SET @primerAviso := TIMESTAMPADD(MONTH,-1,CURDATE()); SET @segundoAviso := TIMESTAMPADD(MONTH,-2,CURDATE()); @@ -6833,9 +6851,9 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; @@ -6861,8 +6879,8 @@ BEGIN WHERE t.shipped >= TIMESTAMPADD(MONTH,-3,CURDATE()) AND r.agencyModeFk AND t.routeFk + AND t.zoneFk GROUP BY agencyModeFk, zoneFk; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -7960,7 +7978,7 @@ CREATE TABLE `VMPSettings` ( `dateTimeLastSync` timestamp NULL DEFAULT NULL, `closedFrom` int(11) DEFAULT NULL, `closedTo` int(11) DEFAULT NULL, - `totalRefreshHours` int(11) DEFAULT NULL, + `totalRefreshHours` int(11) DEFAULT NULL COMMENT 'Numero > 4 para no saturar, no repetir para que no solapen las actualizaciones', PRIMARY KEY (`VMPID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -8092,6 +8110,26 @@ CREATE TABLE `ekt` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `ektEntryAssign__` +-- + +DROP TABLE IF EXISTS `ektEntryAssign__`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `ektEntryAssign__` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `kop` int(11) DEFAULT NULL, + `sub` mediumint(8) unsigned DEFAULT NULL, + `warehouseOutFk` int(11) DEFAULT NULL, + `warehouseInFk` int(11) DEFAULT NULL, + `agencyModeFk` int(11) DEFAULT NULL, + `supplierFk` int(11) DEFAULT NULL, + `entryFk` int(11) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='define las condiciones para asignar entradas a los ekt'; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `exchange` -- @@ -8385,6 +8423,7 @@ CREATE TABLE `item_track` ( `s6` tinyint(3) NOT NULL DEFAULT '0', `kop` tinyint(3) NOT NULL DEFAULT '0', `sub` tinyint(3) NOT NULL DEFAULT '0', + `item` tinyint(3) NOT NULL DEFAULT '0', PRIMARY KEY (`item_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -8796,6 +8835,25 @@ CREATE TABLE `value` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='/tmp/floricode/florecompc2/FV130916.txt'; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `warehouseFloramondo` +-- + +DROP TABLE IF EXISTS `warehouseFloramondo`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `warehouseFloramondo` ( + `warehouseFk` smallint(6) unsigned NOT NULL, + `travellingDays` int(11) NOT NULL DEFAULT '1', + `entryFk` int(11) DEFAULT NULL, + `isFV` int(11) DEFAULT NULL COMMENT 'NULL indiferente\n0 no\n1 si\n', + PRIMARY KEY (`warehouseFk`), + KEY `warehouseFloramondo_FK2_idx` (`entryFk`), + CONSTRAINT `warehouseFloramondo_FK2` FOREIGN KEY (`entryFk`) REFERENCES `vn`.`entry` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, + CONSTRAINT `warehouseFloramondo_fk` FOREIGN KEY (`warehouseFk`) REFERENCES `vn`.`warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Dumping events for database 'edi' -- @@ -8949,13 +9007,138 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `ektEntryAssign_setEntry__` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `ektEntryAssign_setEntry__`() +BEGIN + +DECLARE done INT DEFAULT FALSE; +DECLARE vEntryFk INT; +DECLARE vTravelFk INT; +DECLARE vId INT; +DECLARE vLanded DATE DEFAULT CURDATE(); + +DECLARE cur1 CURSOR FOR SELECT id FROM edi.ektEntryAssign; + +DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + + IF HOUR(NOW()) > 12 THEN + + SET vLanded = TIMESTAMPADD(DAY,1,vLanded); + + END IF; + +OPEN cur1; + + read_loop: LOOP + + SET done = FALSE; + SET vEntryFk = 0; + + FETCH cur1 INTO vId; + + IF done THEN + LEAVE read_loop; + END IF; + + SELECT IFNULL(e.id,0) INTO vEntryFk + FROM vn.entry e + JOIN vn.travel tr ON tr.id = e.travelFk + JOIN edi.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + AND ea.warehouseInFk = tr.warehouseInFk + AND ea.agencyModeFk = tr.agencyFk + AND ea.supplierFk = e.supplierFk + WHERE ea.id = vId + AND tr.landed = vLanded + LIMIT 1; + + IF NOT vEntryFk THEN + + SELECT IFNULL(e.id,0) INTO vEntryFk + FROM vn.entry e + JOIN vn.travel tr ON tr.id = e.travelFk + JOIN edi.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + AND ea.warehouseInFk = tr.warehouseInFk + AND ea.agencyModeFk = tr.agencyFk + WHERE ea.id = vId + AND tr.landed = vLanded + AND ea.supplierFk IS NULL + LIMIT 1; + + END IF; + + IF NOT vEntryFk THEN + + SET vTravelFk = 0; + + SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk + FROM vn.travel tr + JOIN edi.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + AND ea.warehouseInFk = tr.warehouseInFk + AND ea.agencyModeFk = tr.agencyFk + WHERE ea.id = vId + AND tr.landed = vLanded; + + IF NOT vTravelFk THEN + + INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyFk) + SELECT vLanded, vLanded, warehouseInFk, warehouseOutFk, agencyModeFk + FROM edi.ektEntryAssign + WHERE id = vId; + + SELECT MAX(tr.id) INTO vTravelFk + FROM vn.travel tr + JOIN edi.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + AND ea.warehouseInFk = tr.warehouseInFk + AND ea.agencyModeFk = tr.agencyFk + WHERE ea.id = vId + AND tr.landed = vLanded; + + END IF; + + INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk) + SELECT vTravelFk, IFNULL(ea.supplierFk,s.id), c.id, cu.id + FROM vn.supplier s + JOIN vn.company c ON c.code = 'VNL' + JOIN vn.currency cu ON cu.code = 'EUR' + JOIN edi.ektEntryAssign ea ON ea.id = vId + WHERE s.name = 'KONINKLIJE COOPERATIEVE BLOEMENVEILING FLORAHOLLAN'; + + SELECT MAX(id) INTO vEntryFk + FROM vn.entry + WHERE travelFk = vTravelFk; + + END IF; + + UPDATE edi.ektEntryAssign + SET entryFk = vEntryFk + WHERE id = vId; + + END LOOP; + + CLOSE cur1; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `ekt_load` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; @@ -8969,6 +9152,7 @@ BEGIN DECLARE vPutOrderFk INT; DECLARE vIsLot BOOLEAN; DECLARE vForceToPacking INT DEFAULT 2; + DECLARE vEntryFk INT; -- Carga los datos necesarios del EKT @@ -8976,7 +9160,10 @@ BEGIN FROM ekt e LEFT JOIN item i ON e.ref = i.id WHERE e.id = vSelf; - + + -- Asigna la entrada + SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk; + -- Inserta el cubo si no existe IF vPackage = 800 @@ -9003,11 +9190,435 @@ BEGIN -- Si es una compra de Floramondo obtiene el articulo IF vPutOrderFk THEN - /*SELECT b.itemFk, b.id INTO vItem, vBuy + + SELECT i.id INTO vItem FROM edi.putOrder po - JOIN vn.buy b ON b.deliveryFk = po.deliveryInformationID + JOIN vn.item i ON i.supplyResponseFk = po.supplyResponseID WHERE po.id = vPutOrderFk - LIMIT 1;*/ + LIMIT 1; + END IF; + + IF IFNULL(vItem,0) = 0 THEN + -- Intenta obtener el artículo en base a los atributos holandeses + + INSERT IGNORE INTO item_track SET + item_id = vRef; + + SELECT b.id, b.itemFk INTO vBuy, vItem + FROM edi.ekt e + JOIN edi.item_track t ON t.item_id = e.ref + LEFT JOIN edi.ekt l ON l.ref = e.ref + LEFT JOIN vn.buy b ON b.ektFk = l.id + JOIN vn2008.config cfg + WHERE e.id = vSelf + AND l.id != vSelf + AND b.itemFk != cfg.generic_item + AND IF(t.s1, l.s1 = e.s1, TRUE) + AND IF(t.s2, l.s2 = e.s2, TRUE) + AND IF(t.s3, l.s3 = e.s3, TRUE) + AND IF(t.s4, l.s4 = e.s4, TRUE) + AND IF(t.s5, l.s5 = e.s5, TRUE) + AND IF(t.s6, l.s6 = e.s6, TRUE) + AND IF(t.kop, l.kop = e.kop, TRUE) + AND IF(t.pac, l.pac = e.pac, TRUE) + AND IF(t.cat, l.cat = e.cat, TRUE) + AND IF(t.ori, l.ori = e.ori, TRUE) + AND IF(t.pro, l.pro = e.pro, TRUE) + AND IF(t.sub, l.sub = e.sub, TRUE) + AND IF(t.package, l.package = e.package, TRUE) + AND IF(t.item, l.item = e.item, TRUE) + AND b.itemFk < 170000 + ORDER BY l.now DESC, b.id ASC LIMIT 1; +/* + SELECT c.Id_Compra, c.Id_Article INTO vBuy, vItem + FROM vn2008.buy_edi e + JOIN item_track t ON t.item_id = e.ref + LEFT JOIN vn2008.buy_edi l ON l.ref = e.ref + LEFT JOIN vn2008.Compres c ON c.buy_edi_id = l.id + JOIN vn2008.config cfg + WHERE e.id = vSelf + AND l.id != vSelf + AND c.Id_Article != cfg.generic_item + AND IF(t.s1, l.s1 = e.s1, TRUE) + AND IF(t.s2, l.s2 = e.s2, TRUE) + AND IF(t.s3, l.s3 = e.s3, TRUE) + AND IF(t.s4, l.s4 = e.s4, TRUE) + AND IF(t.s5, l.s5 = e.s5, TRUE) + AND IF(t.s6, l.s6 = e.s6, TRUE) + AND IF(t.kop, l.kop = e.kop, TRUE) + AND IF(t.pac, l.pac = e.pac, TRUE) + AND IF(t.cat, l.cat = e.cat, TRUE) + AND IF(t.ori, l.ori = e.ori, TRUE) + AND IF(t.pro, l.pro = e.pro, TRUE) + AND IF(t.sub, l.sub = e.sub, TRUE) + AND IF(t.package, l.package = e.package, TRUE) + AND IF(t.package, l.package = e.package, TRUE) + AND c.Id_Article < 170000 + ORDER BY l.now DESC, c.Id_Compra ASC LIMIT 1; + */ + END IF; + + -- Inserta la compra asociada al EKT + /*INSERT INTO vn2008.Compres + ( + Id_Entrada + ,buy_edi_id + ,Costefijo + ,Id_Article + ,`grouping` + ,caja + ,Packing + ,Cantidad + ,Productor + ,Etiquetas + ,Id_Cubo + ,`weight` + ) + SELECT + vEntryFk + ,vSelf + ,(@t := IF(a.Tallos, a.Tallos, 1)) * e.pri + ,IFNULL(vItem, cfg.generic_item) + ,IFNULL(c.`grouping`, e.pac) + ,vForceToPacking + ,@pac := e.pac / @t + ,@pac * e.qty + ,s.company_name + ,e.qty + ,IFNULL(c.Id_Cubo, e.package) + ,a.density * (vn.item_getVolume(a.Id_Article, IFNULL(c.Id_Cubo, e.package)) / 1000000) + FROM vn2008.buy_edi e + LEFT JOIN vn2008.Compres c ON c.Id_Compra = vBuy + LEFT JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article + LEFT JOIN supplier s ON e.pro = s.supplier_id + JOIN vn2008.config cfg + WHERE e.id = vSelf + LIMIT 1;*/ + + INSERT INTO vn.buy + ( + entryFk + ,ektFk + ,buyingValue + ,itemFk + ,stickers + ,packing + ,`grouping` + ,quantity + ,groupingMode + ,producer + ,packageFk + ,weight + ) + SELECT + vEntryFk + ,vSelf + ,(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue + ,IFNULL(vItem, cfg.generic_item) itemFk + ,e.qty stickers + ,@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing + ,IFNULL(b.`grouping`, e.pac) + ,@pac * e.qty + ,vForceToPacking + ,s.`name` + ,IFNULL(b.packageFk, e.package) + ,i.density * (vn.item_getVolume(i.id, IFNULL(b.packageFk, e.package)) / 1000000) + FROM edi.ekt e + LEFT JOIN vn.buy b ON b.id = vBuy + LEFT JOIN vn.item i ON i.id = b.itemFk + LEFT JOIN vn.supplier s ON e.pro = s.id + JOIN vn2008.config cfg + + WHERE e.id = vSelf + LIMIT 1; + + DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc; + + CREATE TEMPORARY TABLE tmp.buyRecalc + SELECT buy.id + FROM vn.buy + WHERE ektFk = vSelf; + + CALL vn.buy_recalcPrices(); +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `ekt_load_beta` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `ekt_load_beta`(IN `vSelf` INT) +BEGIN + DECLARE vRef INT; + DECLARE vBuy INT; + DECLARE vItem INT; + DECLARE vQty INT; + DECLARE vPackage INT; + DECLARE vPutOrderFk INT; + DECLARE vIsLot BOOLEAN; + DECLARE vForceToPacking INT DEFAULT 2; + DECLARE vEntryFk INT; + + -- Carga los datos necesarios del EKT + + SELECT ref, qty, package, putOrderFk INTO vRef, vQty, vPackage, vPutOrderFk + FROM ekt e + LEFT JOIN item i ON e.ref = i.id + WHERE e.id = vSelf; + + -- Asigna la entrada + SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk; + + -- Inserta el cubo si no existe + + IF vPackage = 800 + THEN + SET vPackage = 800 + vQty; + + INSERT IGNORE INTO vn2008.Cubos SET + Id_Cubo = vPackage, + x = 7200 / vQty, + y = 1; + ELSE + INSERT IGNORE INTO vn2008.Cubos (Id_Cubo, X, Y, Z) + SELECT bucket_id, ROUND(x_size/10), ROUND(y_size/10), ROUND(z_size/10) + FROM bucket WHERE bucket_id = vPackage; + + IF ROW_COUNT() > 0 + THEN + INSERT INTO vn2008.mail SET + `subject` = 'Cubo añadido', + `text` = CONCAT('Se ha añadido el cubo: ', vPackage), + `to` = 'ekt@verdnatura.es'; + END IF; + END IF; + + -- Si es una compra de Floramondo obtiene el articulo + IF vPutOrderFk THEN + + SELECT i.id INTO vItem + FROM edi.putOrder po + JOIN vn.item i ON i.supplyResponseFk = po.supplyResponseID + WHERE po.id = vPutOrderFk + LIMIT 1; + END IF; + + IF IFNULL(vItem,0) = 0 THEN + -- Intenta obtener el artículo en base a los atributos holandeses + + INSERT IGNORE INTO item_track SET + item_id = vRef; + + SELECT b.id, b.itemFk INTO vBuy, vItem + FROM edi.ekt e + JOIN edi.item_track t ON t.item_id = e.ref + LEFT JOIN edi.ekt l ON l.ref = e.ref + LEFT JOIN vn.buy b ON b.ektFk = l.id + JOIN vn2008.config cfg + WHERE e.id = vSelf + AND l.id != vSelf + AND b.itemFk != cfg.generic_item + AND IF(t.s1, l.s1 = e.s1, TRUE) + AND IF(t.s2, l.s2 = e.s2, TRUE) + AND IF(t.s3, l.s3 = e.s3, TRUE) + AND IF(t.s4, l.s4 = e.s4, TRUE) + AND IF(t.s5, l.s5 = e.s5, TRUE) + AND IF(t.s6, l.s6 = e.s6, TRUE) + AND IF(t.kop, l.kop = e.kop, TRUE) + AND IF(t.pac, l.pac = e.pac, TRUE) + AND IF(t.cat, l.cat = e.cat, TRUE) + AND IF(t.ori, l.ori = e.ori, TRUE) + AND IF(t.pro, l.pro = e.pro, TRUE) + AND IF(t.sub, l.sub = e.sub, TRUE) + AND IF(t.package, l.package = e.package, TRUE) + AND IF(t.item, l.item = e.item, TRUE) + AND b.itemFk < 170000 + ORDER BY l.now DESC, b.id ASC LIMIT 1; +/* + SELECT c.Id_Compra, c.Id_Article INTO vBuy, vItem + FROM vn2008.buy_edi e + JOIN item_track t ON t.item_id = e.ref + LEFT JOIN vn2008.buy_edi l ON l.ref = e.ref + LEFT JOIN vn2008.Compres c ON c.buy_edi_id = l.id + JOIN vn2008.config cfg + WHERE e.id = vSelf + AND l.id != vSelf + AND c.Id_Article != cfg.generic_item + AND IF(t.s1, l.s1 = e.s1, TRUE) + AND IF(t.s2, l.s2 = e.s2, TRUE) + AND IF(t.s3, l.s3 = e.s3, TRUE) + AND IF(t.s4, l.s4 = e.s4, TRUE) + AND IF(t.s5, l.s5 = e.s5, TRUE) + AND IF(t.s6, l.s6 = e.s6, TRUE) + AND IF(t.kop, l.kop = e.kop, TRUE) + AND IF(t.pac, l.pac = e.pac, TRUE) + AND IF(t.cat, l.cat = e.cat, TRUE) + AND IF(t.ori, l.ori = e.ori, TRUE) + AND IF(t.pro, l.pro = e.pro, TRUE) + AND IF(t.sub, l.sub = e.sub, TRUE) + AND IF(t.package, l.package = e.package, TRUE) + AND IF(t.package, l.package = e.package, TRUE) + AND c.Id_Article < 170000 + ORDER BY l.now DESC, c.Id_Compra ASC LIMIT 1; + */ + END IF; + + -- Inserta la compra asociada al EKT + /*INSERT INTO vn2008.Compres + ( + Id_Entrada + ,buy_edi_id + ,Costefijo + ,Id_Article + ,`grouping` + ,caja + ,Packing + ,Cantidad + ,Productor + ,Etiquetas + ,Id_Cubo + ,`weight` + ) + SELECT + vEntryFk + ,vSelf + ,(@t := IF(a.Tallos, a.Tallos, 1)) * e.pri + ,IFNULL(vItem, cfg.generic_item) + ,IFNULL(c.`grouping`, e.pac) + ,vForceToPacking + ,@pac := e.pac / @t + ,@pac * e.qty + ,s.company_name + ,e.qty + ,IFNULL(c.Id_Cubo, e.package) + ,a.density * (vn.item_getVolume(a.Id_Article, IFNULL(c.Id_Cubo, e.package)) / 1000000) + FROM vn2008.buy_edi e + LEFT JOIN vn2008.Compres c ON c.Id_Compra = vBuy + LEFT JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article + LEFT JOIN supplier s ON e.pro = s.supplier_id + JOIN vn2008.config cfg + WHERE e.id = vSelf + LIMIT 1;*/ + + INSERT INTO vn.buy + ( + entryFk + ,ektFk + ,buyingValue + ,itemFk + ,stickers + ,packing + ,`grouping` + ,quantity + ,groupingMode + ,producer + ,packageFk + ,weight + ) + SELECT + vEntryFk + ,vSelf + ,(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue + ,IFNULL(vItem, cfg.generic_item) itemFk + ,e.qty stickers + ,@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing + ,IFNULL(b.`grouping`, e.pac) + ,@pac * e.qty + ,vForceToPacking + ,s.`name` + ,IFNULL(b.packageFk, e.package) + ,i.density * (vn.item_getVolume(i.id, IFNULL(b.packageFk, e.package)) / 1000000) + FROM edi.ekt e + LEFT JOIN vn.buy b ON b.id = vBuy + LEFT JOIN vn.item i ON i.id = b.itemFk + LEFT JOIN vn.supplier s ON e.pro = s.id + JOIN vn2008.config cfg + + WHERE e.id = vSelf + LIMIT 1; + + DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc; + + CREATE TEMPORARY TABLE tmp.buyRecalc + SELECT buy.id + FROM vn.buy + WHERE ektFk = vSelf; + + CALL vn.buy_recalcPrices(); +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `ekt_load___` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `ekt_load___`(IN `vSelf` INT) +BEGIN + DECLARE vRef INT; + DECLARE vBuy INT; + DECLARE vItem INT; + DECLARE vQty INT; + DECLARE vPackage INT; + DECLARE vPutOrderFk INT; + DECLARE vIsLot BOOLEAN; + DECLARE vForceToPacking INT DEFAULT 2; + DECLARE vEntryFk INT; + + -- Carga los datos necesarios del EKT + + SELECT ref, qty, package, putOrderFk INTO vRef, vQty, vPackage, vPutOrderFk + FROM ekt e + LEFT JOIN item i ON e.ref = i.id + WHERE e.id = vSelf; + + -- Asigna la entrada + SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk; + + -- Inserta el cubo si no existe + + IF vPackage = 800 + THEN + SET vPackage = 800 + vQty; + + INSERT IGNORE INTO vn2008.Cubos SET + Id_Cubo = vPackage, + x = 7200 / vQty, + y = 1; + ELSE + INSERT IGNORE INTO vn2008.Cubos (Id_Cubo, X, Y, Z) + SELECT bucket_id, ROUND(x_size/10), ROUND(y_size/10), ROUND(z_size/10) + FROM bucket WHERE bucket_id = vPackage; + + IF ROW_COUNT() > 0 + THEN + INSERT INTO vn2008.mail SET + `subject` = 'Cubo añadido', + `text` = CONCAT('Se ha añadido el cubo: ', vPackage), + `to` = 'ekt@verdnatura.es'; + END IF; + END IF; + + -- Si es una compra de Floramondo obtiene el articulo + IF vPutOrderFk THEN + SELECT i.id INTO vItem FROM edi.putOrder po JOIN vn.item i ON i.supplyResponseFk = po.supplyResponseID @@ -9048,7 +9659,7 @@ BEGIN END IF; -- Inserta la compra asociada al EKT - INSERT INTO vn2008.Compres + /*INSERT INTO vn2008.Compres ( Id_Entrada ,buy_edi_id @@ -9064,7 +9675,7 @@ BEGIN ,`weight` ) SELECT - cfg.edi_entry + vEntryFk ,vSelf ,(@t := IF(a.Tallos, a.Tallos, 1)) * e.pri ,IFNULL(vItem, cfg.generic_item) @@ -9082,189 +9693,53 @@ BEGIN LEFT JOIN supplier s ON e.pro = s.supplier_id JOIN vn2008.config cfg WHERE e.id = vSelf - LIMIT 1; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `ekt_load__` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `ekt_load__`(IN `vSelf` INT) -BEGIN - DECLARE vRef INT; - DECLARE vBuy INT; - DECLARE vItem INT; - DECLARE vQty INT; - DECLARE vPackage INT; - DECLARE vPutOrderFk INT; - DECLARE vIsLot BOOLEAN; - DECLARE vForceToPacking INT DEFAULT 2; - - -- Carga los datos necesarios del EKT - - SELECT ref, qty, package, putOrderFk INTO vRef, vQty, vPackage, vPutOrderFk - FROM ekt e - LEFT JOIN item i ON e.ref = i.id - WHERE e.id = vSelf; - - -- Inserta el cubo si no existe - - IF vPackage = 800 - THEN - SET vPackage = 800 + vQty; - - INSERT IGNORE INTO vn2008.Cubos SET - Id_Cubo = vPackage, - x = 7200 / vQty, - y = 1; - ELSE - INSERT IGNORE INTO vn2008.Cubos (Id_Cubo, X, Y, Z) - SELECT bucket_id, ROUND(x_size/10), ROUND(y_size/10), ROUND(z_size/10) - FROM bucket WHERE bucket_id = vPackage; - - IF ROW_COUNT() > 0 - THEN - INSERT INTO vn2008.mail SET - `subject` = 'Cubo añadido', - `text` = CONCAT('Se ha añadido el cubo: ', vPackage), - `to` = 'ekt@verdnatura.es'; - END IF; - END IF; - - -- Si es una compra de Floramondo obtiene el articulo - IF vPutOrderFk THEN - SELECT b.itemFk, b.id INTO vItem, vBuy - FROM edi.putOrder po - JOIN vn.buy b ON b.deliveryFk = po.deliveryInformationID - WHERE po.id = vPutOrderFk - LIMIT 1; - END IF; + LIMIT 1;*/ - IF IFNULL(vItem,0) = 0 THEN - -- Intenta obtener el artículo en base a los atributos holandeses - - INSERT IGNORE INTO item_track SET - item_id = vRef; - - SELECT c.Id_Compra, c.Id_Article INTO vBuy, vItem - FROM vn2008.buy_edi e - JOIN item_track t ON t.item_id = e.ref - LEFT JOIN vn2008.buy_edi l ON l.ref = e.ref - LEFT JOIN vn2008.Compres c ON c.buy_edi_id = l.id - JOIN vn2008.config cfg - WHERE e.id = vSelf - AND l.id != vSelf - AND c.Id_Article != cfg.generic_item - AND IF(t.s1, l.s1 = e.s1, TRUE) - AND IF(t.s2, l.s2 = e.s2, TRUE) - AND IF(t.s3, l.s3 = e.s3, TRUE) - AND IF(t.s4, l.s4 = e.s4, TRUE) - AND IF(t.s5, l.s5 = e.s5, TRUE) - AND IF(t.s6, l.s6 = e.s6, TRUE) - AND IF(t.kop, l.kop = e.kop, TRUE) - AND IF(t.pac, l.pac = e.pac, TRUE) - AND IF(t.cat, l.cat = e.cat, TRUE) - AND IF(t.ori, l.ori = e.ori, TRUE) - AND IF(t.pro, l.pro = e.pro, TRUE) - AND IF(t.sub, l.sub = e.sub, TRUE) - AND IF(t.package, l.package = e.package, TRUE) - AND c.Id_Article < 170000 - ORDER BY l.now DESC, c.Id_Compra ASC LIMIT 1; - END IF; - - -- Determina si el articulo se vende por lotes - IF vItem - THEN - SELECT COUNT(*) > 0 INTO vIsLot - FROM vn2008.Articles a - LEFT JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id - WHERE a.Id_Article = vItem - AND t.`transaction`; - - -- Si el articulo se vende por lotes se inserta un nuevo artículo - - IF vIsLot - THEN - INSERT INTO vn2008.Articles ( - Article - ,Medida - ,Categoria - ,Id_Origen - ,iva_group_id - ,Foto - ,Color - ,Codintrastat - ,tipo_id - ,Tallos - ) - SELECT - i.`name` - ,IFNULL(e.s1, e.pac) - ,e.cat - ,IFNULL(o.id, 17) - ,IFNULL(a.iva_group_id, 1) - ,a.Foto - ,a.Color - ,a.Codintrastat - ,IFNULL(a.tipo_id, 10) - ,IF(a.tipo_id = 15, 0, 1) - FROM vn2008.buy_edi e - LEFT JOIN item i ON i.id = e.ref - LEFT JOIN vn2008.Origen o ON o.Abreviatura = e.ori - LEFT JOIN vn2008.Articles a ON a.Id_Article = vItem - WHERE e.id = vSelf; - - SET vItem = LAST_INSERT_ID(); - END IF; - END IF; - - -- Inserta la compra asociada al EKT - - INSERT INTO vn2008.Compres + INSERT INTO vn.buy ( - Id_Entrada - ,buy_edi_id - ,Costefijo - ,Id_Article + entryFk + ,ektFk + ,buyingValue + ,itemFk + ,stickers + ,packing ,`grouping` - ,caja - ,Packing - ,Cantidad - ,Productor - ,Etiquetas - ,Id_Cubo - ,`weight` + ,quantity + ,groupingMode + ,producer + ,packageFk + ,weight ) SELECT - cfg.edi_entry + vEntryFk ,vSelf - ,(@t := IF(a.Tallos, a.Tallos, 1)) * e.pri - ,IFNULL(vItem, cfg.generic_item) - ,IFNULL(c.`grouping`, e.pac) + ,(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue + ,IFNULL(vItem, cfg.generic_item) itemFk + ,e.qty stickers + ,@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing + ,IFNULL(b.`grouping`, e.pac) + ,@pac * e.qty ,vForceToPacking - ,@pac := e.pac / @t - ,@pac * e.qty - ,s.company_name - ,e.qty - ,IFNULL(c.Id_Cubo, e.package) - ,a.density * (vn.item_getVolume(a.Id_Article, IFNULL(c.Id_Cubo, e.package)) / 1000000) - FROM vn2008.buy_edi e - LEFT JOIN vn2008.Compres c ON c.Id_Compra = vBuy - LEFT JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article - LEFT JOIN supplier s ON e.pro = s.supplier_id - JOIN vn2008.config cfg + ,s.`name` + ,IFNULL(b.packageFk, e.package) + ,i.density * (vn.item_getVolume(i.id, IFNULL(b.packageFk, e.package)) / 1000000) + FROM edi.ekt e + LEFT JOIN vn.buy b ON b.id = vBuy + LEFT JOIN vn.item i ON i.id = b.itemFk + LEFT JOIN vn.supplier s ON e.pro = s.id + JOIN vn2008.config cfg + WHERE e.id = vSelf LIMIT 1; + + DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc; + + CREATE TEMPORARY TABLE tmp.buyRecalc + SELECT buy.id + FROM vn.buy + WHERE ektFk = vSelf; + + CALL vn.buy_recalcPrices(); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -9479,6 +9954,400 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `floramondo_offerRefresh`() +proc: BEGIN + + DECLARE vLanded DATETIME; + DECLARE done INT DEFAULT FALSE; + DECLARE vFreeId INT; + DECLARE vSupplyResponseFk INT; + DECLARE vLastInserted DATETIME; + + DECLARE cur1 CURSOR FOR + SELECT id + FROM edi.item_free; + + DECLARE cur2 CURSOR FOR + SELECT srId + FROM itemToInsert; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + DECLARE EXIT HANDLER FOR SQLSTATE '45000' + BEGIN + ROLLBACK; + RESIGNAL; + END; + + START TRANSACTION; + -- select now(),'Antes de borrar'; + DELETE itf.* + FROM edi.item_free itf + JOIN vn.item i ON i.id = itf.id; + -- -- select now(),'Tras borrar'; + DROP TEMPORARY TABLE IF EXISTS tmp; + CREATE TEMPORARY TABLE tmp (INDEX (`Item_ArticleCode`)) ENGINE = MEMORY + SELECT * FROM ( + SELECT * + FROM edi.supplyOffer + ORDER BY NumberOfUnits DESC) t + JOIN edi.item_groupToOffer igo ON igo.group_code = t.group_id + GROUP BY Item_ArticleCode, s1, s2, s3, s4, s5, s6, company_name, Quality, NumberOfItemsPerCask, EmbalageCode, Price; + + -- -- select now(),'Antes de crear edi.offer'; + DROP TEMPORARY TABLE IF EXISTS edi.offer; + CREATE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`)) ENGINE = MEMORY + SELECT so.*, ev1.type_description s1Value, ev2.type_description s2Value, ev3.type_description s3Value, + ev4.type_description s4Value, ev5.type_description s5Value, ev6.type_description s6Value, + eif1.feature ef1, eif2.feature ef2, eif3.feature ef3, eif4.feature ef4, eif5.feature ef5, eif6.feature ef6 + FROM tmp so + LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode + AND eif1.presentation_order = 1 AND eif1.expiry_date IS NULL + LEFT JOIN edi.item_feature eif2 ON eif2.item_id = so.Item_ArticleCode + AND eif2.presentation_order = 2 AND eif2.expiry_date IS NULL + LEFT JOIN edi.item_feature eif3 ON eif3.item_id = so.Item_ArticleCode + AND eif3.presentation_order = 3 AND eif3.expiry_date IS NULL + LEFT JOIN edi.item_feature eif4 ON eif4.item_id = so.Item_ArticleCode + AND eif4.presentation_order = 4 AND eif4.expiry_date IS NULL + LEFT JOIN edi.item_feature eif5 ON eif5.item_id = so.Item_ArticleCode + AND eif5.presentation_order = 5 AND eif5.expiry_date IS NULL + LEFT JOIN edi.item_feature eif6 ON eif6.item_id = so.Item_ArticleCode + AND eif6.presentation_order = 6 AND eif6.expiry_date IS NULL + LEFT JOIN edi.`value` ev1 ON ev1.type_id = eif1.feature AND so.s1 = ev1.type_value + LEFT JOIN edi.`value` ev2 ON ev2.type_id = eif2.feature AND so.s2 = ev2.type_value + LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature AND so.s3 = ev3.type_value + LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature AND so.s4 = ev4.type_value + LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature AND so.s5 = ev5.type_value + LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature AND so.s6 = ev6.type_value + ORDER BY Price; + + DROP TEMPORARY TABLE tmp; + + -- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos + UPDATE IGNORE edi.offer o + LEFT JOIN vn.item iExist ON iExist.supplyResponseFk = o.srID + JOIN vn.item i + ON i.name = o.product_name + AND i.subname <=> o.company_name + AND i.value5 <=> o.s1Value + AND i.value6 <=> o.s2Value + AND i.value7 <=> o.s3Value + AND i.value8 <=> o.s4Value + AND i.value9 <=> o.s5Value + AND i.value10 <=> o.s6Value + AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask + AND i.EmbalageCode <=> o.EmbalageCode + AND i.quality <=> o.Quality + LEFT JOIN deliveryInformation di ON di.supplyResponseID = i.supplyResponseFk + JOIN vn.itemType it ON it.id = i.typeFk + SET i.supplyResponseFk = o.srID + WHERE iExist.id IS NULL + AND (di.LatestOrderDateTime < NOW() OR di.ID IS NULL) + AND it.isInventory + ; + -- select now(),'Antes de crear ITO'; + DROP TEMPORARY TABLE IF EXISTS itemToInsert; + CREATE TEMPORARY TABLE itemToInsert ENGINE = MEMORY + SELECT o.*, CAST(NULL AS DECIMAL(6,0)) as itemFk + FROM edi.offer o + LEFT JOIN vn.item i ON i.supplyResponseFk = o.srId + WHERE i.id IS NULL; + -- select now(),'Tras crear itemToInsert'; + -- Reciclado de nº de item + OPEN cur1; + OPEN cur2; + + read_loop: LOOP + + FETCH cur2 INTO vSupplyResponseFk; + FETCH cur1 INTO vFreeId; + + IF done THEN + LEAVE read_loop; + END IF; + + UPDATE itemToInsert + SET itemFk = vFreeId + WHERE srId = vSupplyResponseFk; + + END LOOP; + + CLOSE cur1; + CLOSE cur2; + + -- Insertamos todos los items en Articles de la oferta + INSERT INTO vn.item( id, + `name`, + longName, + subName, + expenceFk, + typeFk, + intrastatFk, + originFk, + supplyResponseFk, + numberOfItemsPerCask, + embalageCode, + quality) + SELECT itemFk, + product_name, + product_name, + company_name, + expenseFk, + itemTypeFk, + intrastatFk, + originFk, + `srId`, + NumberOfItemsPerCask, + EmbalageCode, + Quality + FROM itemToInsert; + + INSERT IGNORE INTO vn.itemImageQueue(itemFk, url) + SELECT i.id, PictureReference + FROM itemToInsert ii + JOIN vn.item i ON i.supplyResponseFk = ii.srId; + + -- Inserta si se añadiesen tags nuevos + INSERT IGNORE INTO vn.tag (name, ediTypeFk) + SELECT description, type_id FROM edi.type; + + -- Inserta los tags sólo en los articulos nuevos + + -- desabilita el trigger para recalcular los tags al final + SET @isTriggerDisabled = TRUE; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , ii.product_name, 1 + FROM itemToInsert ii + JOIN vn.tag t ON t.`name` = 'Producto' + JOIN vn.item i ON i.supplyResponseFk = ii.`srId`; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , ii.Quality, 3 + FROM itemToInsert ii + JOIN vn.tag t ON t.`name` = 'Calidad' + JOIN vn.item i ON i.supplyResponseFk = ii.`srId`; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , ii.company_name, 4 + FROM itemToInsert ii + JOIN vn.tag t ON t.`name` = 'Productor' + JOIN vn.item i ON i.supplyResponseFk = ii.`srId`; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , s1Value, 5 + FROM itemToInsert ii + JOIN vn.tag t ON t.ediTypeFk = ii.ef1 + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE s1Value != ''; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , s2Value, 6 + FROM itemToInsert ii + JOIN vn.tag t ON t.ediTypeFk = ii.ef2 + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE s2Value != ''; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , s3Value, 7 + FROM itemToInsert ii + JOIN vn.tag t ON t.ediTypeFk = ii.ef3 + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE s3Value != ''; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , s4Value, 8 + FROM itemToInsert ii + JOIN vn.tag t ON t.ediTypeFk = ii.ef4 + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE s4Value != ''; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , s5Value, 9 + FROM itemToInsert ii + JOIN vn.tag t ON t.ediTypeFk = ii.ef5 + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE s5Value != ''; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , s6Value, 10 + FROM itemToInsert ii + JOIN vn.tag t ON t.ediTypeFk = ii.ef6 + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE s6Value != ''; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id, ink.name, 11 + FROM itemToInsert ii + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + JOIN vn.tag t ON t.`name` = 'Color' + JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode + JOIN edi.`type` tp ON tp.type_id = f.feature_type_id AND tp.`description` = 'Hoofdkleur 1' + JOIN vn.ink ON ink.dutchCode = f.feature_value; + + UPDATE vn.item i + JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId` + JOIN vn.packaging p ON p.id LIKE ii.EmbalageCode AND hasCompressionVariations + JOIN vn.itemTag diameter ON diameter.itemFk = i.id + JOIN vn.tag tDiameter ON tDiameter.overwrite = 'diameter' AND tDiameter.id = diameter.tagFk + JOIN vn.itemTag size ON size.itemFk = i.id + JOIN vn.tag tSize ON tSize.overwrite = 'size' AND tSize.id = size.tagFk + SET i.`compression` = + (PI() * POW(diameter.`value`/ 2, 2) * size.`value`) + / + ((p.width * p.depth * p.height) / ii.NumberOfItemsPerCask); + + DROP TABLE IF EXISTS tmp.item; + CREATE TABLE tmp.item + (PRIMARY KEY (id)) + SELECT i.id FROM vn.item i + JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`; + + CALL vn.item_refreshTags(); + + SET @isTriggerDisabled = FALSE; + + IF HOUR(NOW()) < ( SELECT MaxLatestDeliveryHour FROM vn.floramondoConfig ) THEN + + SELECT MAX(LatestOrderDateTime) INTO vLanded + FROM edi.offer o + JOIN vn.floramondoConfig fm + JOIN edi.marketPlace mp ON o.MarketPlaceID = mp.id + WHERE mp.isLatestOrderDateTimeRelevant + AND LatestOrderDateTime BETWEEN CURDATE() AND TIMESTAMPADD(HOUR, fm.MaxLatestDeliveryHour, CURDATE()); + + INSERT INTO tmp.kk(fecha) VALUES(vLanded); + + IF DATE(vLanded) = CURDATE() THEN + + SELECT TIMESTAMPADD(HOUR, fm.MaxLatestDeliveryHour, CURDATE()) INTO vLanded + FROM vn.floramondoConfig; + + END IF; + + INSERT INTO tmp.kk(fecha) VALUES(vLanded); + + ELSE + + SELECT MIN(LatestOrderDateTime) INTO vLanded + FROM edi.deliveryInformation di + JOIN edi.supplyResponse sr ON sr.ID = di.supplyResponseID + JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID + WHERE mp.isLatestOrderDateTimeRelevant + AND LatestOrderDateTime >= TIMESTAMPADD(DAY,1,CURDATE()); + + END IF; + + + UPDATE vn.floramondoConfig + SET nextLanded = vLanded + WHERE vLanded IS NOT NULL; + + DROP TEMPORARY TABLE IF EXISTS edi.kk; + CREATE TEMPORARY TABLE edi.kk + SELECT vLanded; + + -- Localiza las entradas de cada almacen + UPDATE edi.warehouseFloramondo + SET entryFk = vn.floramondo_getEntry(TIMESTAMPADD(DAY,travellingDays,vLanded), warehouseFk); + + + + -- Elimina la oferta obsoleta + DELETE b + FROM vn.buy b + JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk + JOIN vn.item i ON i.id = b.itemFk + LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId` + LEFT JOIN putOrder po ON b.deliveryFk = po.deliveryInformationID + WHERE o.`srId` IS NULL + AND po.id IS NULL; + + UPDATE vn.buy b + JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk + JOIN vn.item i ON i.id = b.itemFk + LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId` + SET b.quantity = 0 + WHERE o.`srId` IS NULL; + + -- actualiza la oferta existente + UPDATE vn.buy b + JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk + JOIN vn.item i ON i.id = b.itemFk + JOIN edi.offer o ON i.supplyResponseFk = o.`srId` + SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask, + b.buyingValue = o.price + WHERE (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask OR b.buyingValue <> o.price); + + -- Se eliminan las ofertas ya incluidas en las entradas + DELETE o + FROM edi.offer o + JOIN vn.item i ON i.supplyResponseFk = o.srId + JOIN vn.buy b ON i.id = b.itemFk + JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk; + + -- Se inserta el resto + SET vLastInserted := NOW(); + -- Inserta la oferta + INSERT INTO vn.buy(entryFk, + itemFk, + quantity, + buyingValue, + stickers, + packing, + `grouping`, + groupingMode, + packageFk, + deliveryFk) + + SELECT wf.entryFk, + i.id, + o.NumberOfUnits * o.NumberOfItemsPerCask as quantity, + o.Price, + o.NumberOfUnits as etiquetas, + o.NumberOfItemsPerCask as packing, + GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask as `grouping`, + 2, -- Obliga al Packing + o.embalageCode, + o.diId + FROM edi.offer o + JOIN vn.item i ON i.supplyResponseFk = o.srId + JOIN vn.itemType it ON it.id = i.typeFk + JOIN edi.warehouseFloramondo wf ON wf.isFV = it.isFV OR wf.isFV IS NULL + JOIN vn.packaging p ON p.id LIKE o.embalageCode; -- llevar esta linea i mirar de crear els packages a temps real + + DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc; + + CREATE TEMPORARY TABLE tmp.buyRecalc + SELECT b.id + FROM vn.buy b + JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk + WHERE b.created >= vLastInserted; + + CALL vn.buy_recalcPrices(); + + DROP TEMPORARY TABLE + edi.offer, + itemToInsert; + + DROP TABLE tmp.item; + -- select now(),'FINAL'; + COMMIT; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `floramondo_offerRefresh__` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `floramondo_offerRefresh__`() proc: BEGIN DECLARE vLanded DATETIME; @@ -9899,7 +10768,7 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `floramondo_offerRefresh__` */; +/*!50003 DROP PROCEDURE IF EXISTS `floramondo_offerRefresh___` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; @@ -9909,15 +10778,16 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `floramondo_offerRefresh__`() -BEGIN +CREATE DEFINER=`root`@`%` PROCEDURE `floramondo_offerRefresh___`() +proc: BEGIN + DECLARE vLanded DATETIME; DECLARE done INT DEFAULT FALSE; DECLARE vFreeId INT; DECLARE vSupplyResponseFk INT; DECLARE vLastInserted DATETIME; - DECLARE vCounter INT DEFAULT 400000; - DECLARE vExistingItemFk INT; + DECLARE vVNH_WarehouseFk INT; + DECLARE vFloramondo_WarehouseFk INT; DECLARE cur1 CURSOR FOR SELECT id @@ -9935,6 +10805,14 @@ BEGIN END; START TRANSACTION; + + SELECT id INTO vVNH_WarehouseFk + FROM vn.warehouse + WHERE name = 'VNH'; + + SELECT id INTO vFloramondo_WarehouseFk + FROM vn.warehouse + WHERE name = 'Floramondo'; -- select now(),'Antes de borrar'; DELETE itf.* FROM edi.item_free itf @@ -9948,7 +10826,7 @@ BEGIN FROM edi.supplyOffer ORDER BY NumberOfUnits DESC) t JOIN edi.item_groupToOffer igo ON igo.group_code = t.group_id - GROUP BY Item_ArticleCode, s1, s2, s3, s4, s5, s6, company_name, Price, Quality, NumberOfItemsPerCask, EmbalageCode; + GROUP BY Item_ArticleCode, s1, s2, s3, s4, s5, s6, company_name, Quality, NumberOfItemsPerCask, EmbalageCode, Price; -- -- select now(),'Antes de crear edi.offer'; DROP TEMPORARY TABLE IF EXISTS edi.offer; @@ -9974,14 +10852,18 @@ BEGIN LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature AND so.s3 = ev3.type_value LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature AND so.s4 = ev4.type_value LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature AND so.s5 = ev5.type_value - LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature AND so.s6 = ev6.type_value; + LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature AND so.s6 = ev6.type_value + ORDER BY Price; DROP TEMPORARY TABLE tmp; - -- select now(),'Antes de actualizar srID'; +-- propuesta para arreglar codigos 90 + + -- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos UPDATE IGNORE edi.offer o LEFT JOIN vn.item iExist ON iExist.supplyResponseFk = o.srID - JOIN vn.item i ON i.name = o.product_name + JOIN vn.item i + ON i.name = o.product_name AND i.subname <=> o.company_name AND i.value5 <=> o.s1Value AND i.value6 <=> o.s2Value @@ -9989,10 +10871,17 @@ BEGIN AND i.value8 <=> o.s4Value AND i.value9 <=> o.s5Value AND i.value10 <=> o.s6Value + AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask + AND i.EmbalageCode <=> o.EmbalageCode + AND i.quality <=> o.Quality + LEFT JOIN deliveryInformation di ON di.supplyResponseID = i.supplyResponseFk + JOIN vn.itemType it ON it.id = i.typeFk SET i.supplyResponseFk = o.srID - WHERE iExist.id IS NULL - AND i.id > 400000; - -- select now(),'Antes de crear ITO'; + WHERE iExist.id IS NULL + AND (di.LatestOrderDateTime < NOW() OR di.ID IS NULL) + AND it.isInventory + ; + -- select now(),'Antes de crear ITO'; DROP TEMPORARY TABLE IF EXISTS itemToInsert; CREATE TEMPORARY TABLE itemToInsert ENGINE = MEMORY SELECT o.*, CAST(NULL AS DECIMAL(6,0)) as itemFk @@ -10031,7 +10920,10 @@ BEGIN typeFk, intrastatFk, originFk, - supplyResponseFk) + supplyResponseFk, + numberOfItemsPerCask, + embalageCode, + quality) SELECT itemFk, product_name, product_name, @@ -10040,7 +10932,10 @@ BEGIN itemTypeFk, intrastatFk, originFk, - `srId` + `srId`, + NumberOfItemsPerCask, + EmbalageCode, + Quality FROM itemToInsert; INSERT IGNORE INTO vn.itemImageQueue(itemFk, url) @@ -10058,10 +10953,16 @@ BEGIN SET @isTriggerDisabled = TRUE; INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) - SELECT i.id, t.id , CONCAT(ii.product_name,IF(ii.Quality != 'A1', CONCAT(' ',ii.Quality),'')), 1 + SELECT i.id, t.id , ii.product_name, 1 FROM itemToInsert ii JOIN vn.tag t ON t.`name` = 'Producto' JOIN vn.item i ON i.supplyResponseFk = ii.`srId`; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , ii.Quality, 3 + FROM itemToInsert ii + JOIN vn.tag t ON t.`name` = 'Calidad' + JOIN vn.item i ON i.supplyResponseFk = ii.`srId`; INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) SELECT i.id, t.id , ii.company_name, 4 @@ -10074,42 +10975,42 @@ BEGIN FROM itemToInsert ii JOIN vn.tag t ON t.ediTypeFk = ii.ef1 JOIN vn.item i ON i.supplyResponseFk = ii.`srId` - WHERE s1Value; + WHERE s1Value != ''; INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) SELECT i.id, t.id , s2Value, 6 FROM itemToInsert ii JOIN vn.tag t ON t.ediTypeFk = ii.ef2 JOIN vn.item i ON i.supplyResponseFk = ii.`srId` - WHERE s2Value; + WHERE s2Value != ''; INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) SELECT i.id, t.id , s3Value, 7 FROM itemToInsert ii JOIN vn.tag t ON t.ediTypeFk = ii.ef3 JOIN vn.item i ON i.supplyResponseFk = ii.`srId` - WHERE s3Value; + WHERE s3Value != ''; INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) - SELECT i.id, t.id , ii.Quality, 8 + SELECT i.id, t.id , s4Value, 8 FROM itemToInsert ii JOIN vn.tag t ON t.ediTypeFk = ii.ef4 JOIN vn.item i ON i.supplyResponseFk = ii.`srId` - WHERE s4Value; + WHERE s4Value != ''; INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) SELECT i.id, t.id , s5Value, 9 FROM itemToInsert ii JOIN vn.tag t ON t.ediTypeFk = ii.ef5 JOIN vn.item i ON i.supplyResponseFk = ii.`srId` - WHERE s5Value; + WHERE s5Value != ''; INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) - SELECT i.id, t.id , s5Value, 10 + SELECT i.id, t.id , s6Value, 10 FROM itemToInsert ii JOIN vn.tag t ON t.ediTypeFk = ii.ef6 JOIN vn.item i ON i.supplyResponseFk = ii.`srId` - WHERE s6Value; + WHERE s6Value != ''; INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) SELECT i.id, t.id, ink.name, 11 @@ -10119,13 +11020,7 @@ BEGIN JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode JOIN edi.`type` tp ON tp.type_id = f.feature_type_id AND tp.`description` = 'Hoofdkleur 1' JOIN vn.ink ON ink.dutchCode = f.feature_value; - - INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) - SELECT i.id, t.id , ii.Quality, 12 - FROM itemToInsert ii - JOIN vn.tag t ON t.`name` = 'Calidad' - JOIN vn.item i ON i.supplyResponseFk = ii.`srId`; - + UPDATE vn.item i JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId` JOIN vn.packaging p ON p.id LIKE ii.EmbalageCode AND hasCompressionVariations @@ -10133,7 +11028,7 @@ BEGIN JOIN vn.tag tDiameter ON tDiameter.overwrite = 'diameter' AND tDiameter.id = diameter.tagFk JOIN vn.itemTag size ON size.itemFk = i.id JOIN vn.tag tSize ON tSize.overwrite = 'size' AND tSize.id = size.tagFk - SET i.compression = + SET i.`compression` = (PI() * POW(diameter.`value`/ 2, 2) * size.`value`) / ((p.width * p.depth * p.height) / ii.NumberOfItemsPerCask); @@ -10153,14 +11048,27 @@ BEGIN JOIN marketPlace mp ON mp.id = o.MarketPlaceID WHERE mp.isLatestOrderDateTimeRelevant; - SET @myEntry := vn.floramondo_getEntry(vLanded); + SET @myEntry := vn.floramondo_getEntry(vLanded, vVNH_WarehouseFk); + IF @myEntry THEN - -- Inserta la oferta obsoleta + SELECT @myEntry; + + -- Elimina la oferta obsoleta DELETE b FROM vn.buy b JOIN vn.item i ON i.id = b.itemFk LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId` - WHERE b.entryFk = @myEntry AND o.`srId` IS NULL; + LEFT JOIN putOrder po ON b.deliveryFk = po.deliveryInformationID + WHERE b.entryFk = @myEntry + AND o.`srId` IS NULL + AND po.id IS NULL; + + UPDATE vn.buy b + JOIN vn.item i ON i.id = b.itemFk + LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId` + SET b.quantity = 0 + WHERE b.entryFk = @myEntry + AND o.`srId` IS NULL; -- actualiza la oferta existente UPDATE vn.buy b @@ -10205,7 +11113,79 @@ BEGIN SELECT id from vn.buy where entryFk = @myEntry AND created >= vLastInserted; CALL vn.buy_recalcPrices(); + END IF; + /* + -- Ara la entrada per a Floramondo + SET @myFloramondoEntry := vn.floramondo_getEntry(vLanded, vFloramondo_WarehouseFk); + + IF @myFloramondoEntry THEN + + SELECT @myFloramondoEntry; + + -- Elimina la oferta obsoleta + DELETE b FROM vn.buy b + JOIN vn.item i ON i.id = b.itemFk + LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId` + LEFT JOIN putOrder po ON b.deliveryFk = po.deliveryInformationID + WHERE b.entryFk = @myFloramondoEntry + AND o.`srId` IS NULL + AND po.id IS NULL; + + UPDATE vn.buy b + JOIN vn.item i ON i.id = b.itemFk + LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId` + SET b.quantity = 0 + WHERE b.entryFk = @myFloramondoEntry + AND o.`srId` IS NULL; + + -- actualiza la oferta existente + UPDATE vn.buy b + JOIN vn.item i ON i.id = b.itemFk + JOIN edi.offer o ON i.supplyResponseFk = o.`srId` + SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask, + b.buyingValue = o.price + WHERE b.entryFk = @myFloramondoEntry + AND (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask OR b.buyingValue <> o.price); + + SET vLastInserted := NOW(); + -- Inserta la oferta + INSERT INTO vn.buy(entryFk, + itemFk, + quantity, + buyingValue, + stickers, + packing, + `grouping`, + groupingMode, + packageFk, + deliveryFk) + + SELECT @myFloramondoEntry, + i.id, + o.NumberOfUnits * o.NumberOfItemsPerCask as quantity, + o.Price, + o.NumberOfUnits as etiquetas, + o.NumberOfItemsPerCask as packing, + o.MinimumQuantity * o.NumberOfItemsPerCask as `grouping`, + 1, -- Obliga al Packing + o.embalageCode, + o.diId + FROM edi.offer o + JOIN vn.item i ON i.supplyResponseFk = o.srId + LEFT JOIN vn.buy b ON i.id = b.itemFk AND b.entryFk = @myFloramondoEntry + JOIN vn.packaging p ON p.id LIKE o.embalageCode -- llevar esta linea i mirar de crear els packages a temps real + WHERE b.id IS NULL; + + DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc; + CREATE TEMPORARY TABLE tmp.buyRecalc + SELECT id from vn.buy where entryFk = @myFloramondoEntry AND created >= vLastInserted; + + CALL vn.buy_recalcPrices(); + + + END IF; + */ DROP TEMPORARY TABLE edi.offer, itemToInsert; @@ -13611,9 +14591,9 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; @@ -13829,23 +14809,26 @@ BEGIN UPDATE order_row SET Id_Movimiento = vSale WHERE id = vRowId; - SELECT (warehouseInFk = vWarehouse) INTO vIsFloramondoWarehouse FROM vn.floramondoConfig; + /* SELECT COUNT(*) INTO vIsFloramondoWarehouse + FROM edi.warehouseFloramondo + WHERE warehouseFk = vWarehouse; IF vIsFloramondoWarehouse THEN + */ INSERT INTO edi.putOrder (deliveryInformationID, supplyResponseId, quantity, EndUserPartyId, EndUserPartyGLN) - SELECT di.ID, i.supplyResponseFk, vAmount / sr.NumberOfItemsPerCask, FALSE, vClientId + SELECT di.ID, i.supplyResponseFk, CEIL(vAmount / sr.NumberOfItemsPerCask), FALSE, vClientId FROM edi.deliveryInformation di JOIN vn.item i ON i.supplyResponseFk = di.supplyResponseID JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk - WHERE i.id = vItem -- AND di.LatestDeliveryDateTime > NOW() + WHERE i.id = vItem AND vAmount / sr.NumberOfItemsPerCask LIMIT 1; - END IF; + -- END IF; END LOOP; CLOSE cRows; @@ -14568,7 +15551,7 @@ DELIMITER ; /*!50003 SET character_set_results = utf8 */ ; /*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `tpvTransaction_confirm`( vAmount INT @@ -14611,36 +15594,34 @@ BEGIN SELECT COUNT(*) > 0 INTO vIsDuplicated FROM tpvTransaction - WHERE id = vOrder AND response IS NOT NULL + WHERE id = vOrder AND response IS NOT NULL FOR UPDATE; - IF vIsDuplicated - THEN - CALL util.throw ('TRANSACTION_DUPLICATED'); + IF vIsDuplicated THEN + CALL util.throw('Transaction already confirmed'); END IF; - IF vResponse BETWEEN 0 AND 99 - THEN + IF vResponse BETWEEN 0 AND 99 THEN SELECT - t.clientFk + t.clientFk ,m.bankFk ,m.companyFk ,c.employeeFk ,DATE(t.created) INTO - vCustomer + vCustomer ,vBank ,vCompany ,vEmployee ,vDate FROM tpvMerchant m - JOIN tpvConfig c - LEFT JOIN tpvTransaction t ON t.id = vOrder - WHERE m.id = vMerchant; + JOIN tpvConfig c + LEFT JOIN tpvTransaction t ON t.id = vOrder + WHERE m.id = vMerchant; INSERT INTO vn.receipt SET - amountPaid = vAmount / 100 + amountPaid = vAmount / 100 ,payed = vDate ,workerFk = vEmployee ,bankFk = vBank @@ -14654,9 +15635,8 @@ BEGIN -- Código redundante - DO vn.till_new - ( - vCustomer + DO vn.till_new( + vCustomer ,vBank ,vAmount / 100 ,vConcept @@ -14673,14 +15653,14 @@ BEGIN END IF; UPDATE tpvTransaction - SET - merchantFk = vMerchant - ,receiptFk = vReceipt - ,amount = vAmount - ,response = vResponse - ,errorCode = vErrorCode - ,status = vStatus - WHERE id = vOrder; + SET merchantFk = vMerchant + ,receiptFk = vReceipt + ,amount = vAmount + ,response = vResponse + ,errorCode = vErrorCode + ,status = vStatus + WHERE id = vOrder; + COMMIT; END ;; DELIMITER ; @@ -15937,9 +16917,9 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; @@ -15950,9 +16930,9 @@ BEGIN INSERT INTO sipReg SET userId = NEW.user_id; - UPDATE account.user - SET sync = FALSE - WHERE id = NEW.user_id; + INSERT IGNORE INTO `account`.userSync (`name`) + SELECT `name` FROM `account`.`user` + WHERE id = NEW.user_id; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -15982,9 +16962,9 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; @@ -15992,10 +16972,11 @@ DELIMITER ;; AFTER UPDATE ON `sip` FOR EACH ROW BEGIN - IF !(OLD.extension <=> NEW.extension) THEN - UPDATE account.user - SET sync = FALSE - WHERE id = NEW.user_id; + IF !(OLD.extension <=> NEW.extension) + OR !(OLD.user_id <=> NEW.user_id) THEN + INSERT IGNORE INTO `account`.userSync (`name`) + SELECT `name` FROM `account`.`user` + WHERE id = NEW.user_id; END IF; END */;; DELIMITER ; @@ -17864,7 +18845,7 @@ TRUNCATE TABLE clientesProveedores; IF (sn.SiglaNacion = "XB",IF(sp.CodigoProvincia IN (51,52), 22, IF (sp.CodigoProvincia IN (35,38), 21, sn.CodigoNacion)), sn.CodigoNacion) CodigoNacion, IF (sn.SiglaNacion = "XB",IF(sp.CodigoProvincia IN (51,52), "XC",IF (sp.CodigoProvincia IN (35,38), "XB", sn.SiglaNacion)), sn.SiglaNacion) SiglaNacion, IF((cl.fi REGEXP '^([[:blank:]]|[[:digit:]])'), 'J','F') PersonaFisicaJuridica, - IF((co.id = 1), 1, IF((co.isUeeMember = 1), 2, 4)) TipoDocumentoPersona, + IF((co.id = 1 OR co.id = 30), 1, IF((co.isUeeMember = 1), 2, 4)) TipoDocumentoPersona, -- IF(cl.isEqualizated, 'R', IF ((cl.isVies AND cl.countryFk <> 1) OR (NOT co.isUeeMember),'E','I'))AS CodigoIva, cl.taxTypeSageFk CodigoIva, IF(sn.SiglaNacion = "XB", IF(sp.CodigoProvincia IN (51,52), "CEUTA Y MELILLA", IF (sp.CodigoProvincia IN (35,38), "ISLAS CANARIAS",sn.Nacion)) , sn.Nacion) Nacion, @@ -18154,8 +19135,7 @@ BEGIN m.enlazadoSage = FALSE ) AS sub ON m.Asiento = sub.Asiento SET m.Metalico347 = TRUE, - m.Contrapartida = "", - m.TipoFactura = "I", + m.TipoFactura = "", m.CifDni = sub.fi , m.Nombre = sub.Nombre, m.SiglaNacion = sub.SiglaNacion @@ -18163,7 +19143,6 @@ BEGIN UPDATE sage.movConta m SET Metalico347 = FALSE, - Contrapartida ="", m.TipoFactura = "", m.Metalico347 = FALSE WHERE CargoAbono = "D"; @@ -19088,9 +20067,6 @@ BEGIN DELETE FROM XDiario_movConta_IVA WHERE id = vXDiarioId; - INSERT INTO XDiario_movConta_IVA(id, LibreA1) - VALUES (vXDiarioId, vInvoiceInFk); - OPEN rs; FETCH rs INTO vBase, vVat, @@ -19125,13 +20101,8 @@ BEGIN CASE vCounter WHEN 1 THEN - UPDATE XDiario_movConta_IVA - SET BaseIva1 = vBase, - PorIva1 = vRate, - CuotaIva1 = vVat, - CodigoTransaccion1 = vTransactionCode, - CodigoIva1 = vTaxCode - WHERE id = vXDiarioId; + INSERT INTO XDiario_movConta_IVA(id, LibreA1, BaseIva1 , PorIva1 , CuotaIva1, CodigoTransaccion1, CodigoIva1) + VALUES (vXDiarioId, vInvoiceInFk,vBase, vRate, vVat, vTransactionCode, vTaxCode); WHEN 2 THEN UPDATE XDiario_movConta_IVA SET BaseIva2 = vBase, @@ -19178,6 +20149,9 @@ BEGIN vOperationCode, vDuaExcluded; END WHILE; + ELSE + INSERT INTO XDiario_movConta_IVA(id, LibreA1) + VALUES (vXDiarioId, vInvoiceInFk); END IF; CLOSE rs; @@ -19672,7 +20646,7 @@ BEGIN SELECT * FROM tmp.XDiario_movConta_IVA; DROP TEMPORARY TABLE tmp.XDiario_movConta_IVA; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -23137,6 +24111,7 @@ CREATE TABLE `accountingType` ( `id` smallint(6) NOT NULL DEFAULT '0', `description` varchar(100) COLLATE utf8_unicode_ci NOT NULL, `receiptDescription` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Descripción por defecto al crear nuevo recibo', + `code` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='descripcio dels valors de la columna "cash" de la taula vn2008.Bancios'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -23204,6 +24179,7 @@ CREATE TABLE `address` ( `customsAgentFk` int(11) DEFAULT NULL, `incotermsFk` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL, `isVilassarBuyer` tinyint(4) NOT NULL DEFAULT '0', + `isLogifloraAllowed` tinyint(4) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `Id_Agencia` (`agencyModeFk`), KEY `Id_cliente` (`clientFk`), @@ -24106,18 +25082,20 @@ DROP TABLE IF EXISTS `calendarHolidays`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `calendarHolidays` ( + `id` int(11) NOT NULL AUTO_INCREMENT, `calendarHolidaysTypeFk` int(11) NOT NULL, `dated` date NOT NULL, `calendarHolidaysNameFk` int(11) DEFAULT NULL, - `workCenterFk` int(11) NOT NULL, - PRIMARY KEY (`dated`,`workCenterFk`), + `workCenterFk` int(11) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `calendarHolidays_UN` (`dated`,`workCenterFk`), KEY `calendarholidaystypeFk_idx` (`calendarHolidaysTypeFk`), KEY `calendarHolidaysNameFk_idx` (`calendarHolidaysNameFk`), KEY `workCenterFk_idx` (`workCenterFk`), CONSTRAINT `calendarHolidaysNameFk` FOREIGN KEY (`calendarHolidaysNameFk`) REFERENCES `calendarHolidaysName` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `calendarholidaystypeFk` FOREIGN KEY (`calendarHolidaysTypeFk`) REFERENCES `calendarHolidaysType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `workCenterFk` FOREIGN KEY (`workCenterFk`) REFERENCES `workCenter` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDBDEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -24940,6 +25918,7 @@ CREATE TABLE `clientObservation` ( PRIMARY KEY (`id`), KEY `Id_Trabajador` (`workerFk`), KEY `Id_Cliente` (`clientFk`), + KEY `clientObservation_created_IDX` (`created`) USING BTREE, CONSTRAINT `clientObservation_ibfk_1` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `clientObservation_ibfk_2` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket'; @@ -26619,7 +27598,7 @@ CREATE TABLE `duaInvoiceIn` ( KEY `duaInvoiceIn_fk1_idx` (`duaFk`), KEY `duaInvoiceIn_fk2_idx` (`invoiceInFk`), CONSTRAINT `duaInvoiceIn_fk1` FOREIGN KEY (`duaFk`) REFERENCES `dua` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `duaInvoiceIn_fk2` FOREIGN KEY (`invoiceInFk`) REFERENCES `vn2008`.`recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `duaInvoiceIn_fk2` FOREIGN KEY (`invoiceInFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Facturas asociadas a la declaración aduanera, básicamente la del agente transitario'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -26733,6 +27712,27 @@ CREATE TABLE `educationLevel` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Nivel de formación mismo de a3'; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `ektEntryAssign` +-- + +DROP TABLE IF EXISTS `ektEntryAssign`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `ektEntryAssign` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `kop` int(11) DEFAULT NULL, + `sub` mediumint(8) unsigned DEFAULT NULL, + `warehouseOutFk` int(11) DEFAULT NULL, + `warehouseInFk` int(11) DEFAULT NULL, + `agencyModeFk` int(11) DEFAULT NULL, + `supplierFk` int(11) DEFAULT NULL, + `entryFk` int(11) DEFAULT NULL, + `ref` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='define las condiciones para asignar entradas a los ekt'; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `emergencyMedia` -- @@ -26807,6 +27807,8 @@ CREATE TABLE `entry` ( `invoiceInFk` mediumint(8) unsigned DEFAULT NULL, `isBlocked` tinyint(4) NOT NULL DEFAULT '0', `loadPriority` int(11) DEFAULT NULL, + `kop` int(11) DEFAULT NULL, + `sub` mediumint(8) unsigned DEFAULT NULL, PRIMARY KEY (`id`), KEY `Id_Proveedor` (`supplierFk`), KEY `Fecha` (`dated`), @@ -26814,7 +27816,7 @@ CREATE TABLE `entry` ( KEY `empresa_id` (`companyFk`), KEY `gestdoc_id` (`gestDocFk`), KEY `recibida_id` (`invoiceInFk`), - CONSTRAINT `Entradas_fk8` FOREIGN KEY (`invoiceInFk`) REFERENCES `vn2008`.`recibida` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, + CONSTRAINT `Entradas_fk8` FOREIGN KEY (`invoiceInFk`) REFERENCES `invoiceIn` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `entry_ibfk_1` FOREIGN KEY (`supplierFk`) REFERENCES `supplier` (`id`) ON UPDATE CASCADE, CONSTRAINT `entry_ibfk_6` FOREIGN KEY (`travelFk`) REFERENCES `travel` (`id`) ON UPDATE CASCADE, CONSTRAINT `entry_ibfk_7` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE @@ -27781,18 +28783,19 @@ DROP TABLE IF EXISTS `floramondoConfig`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `floramondoConfig` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `entryFk` int(11) DEFAULT NULL COMMENT 'ultima entrada de floramondo', + `entryFk__` int(11) DEFAULT NULL COMMENT 'ultima entrada de floramondo', `nextLanded` datetime DEFAULT NULL, `warehouseInFk` smallint(6) unsigned DEFAULT NULL, - `warehouseOutFk` smallint(6) unsigned DEFAULT NULL, - `agencyModeFk` int(11) DEFAULT NULL, + `warehouseOutFk__` smallint(6) unsigned DEFAULT NULL, + `agencyModeFk__` int(11) DEFAULT NULL, + `MaxLatestDeliveryHour` int(11) DEFAULT NULL, PRIMARY KEY (`id`), KEY `floramondoConfigWarehouseIn_idx` (`warehouseInFk`), - KEY `floramondoConfigWarehouseOut_idx` (`warehouseOutFk`), - KEY `floramondoConfigAgencyModeFk_idx` (`agencyModeFk`), - CONSTRAINT `floramondoConfigAgencyModeFk` FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, + KEY `floramondoConfigWarehouseOut_idx` (`warehouseOutFk__`), + KEY `floramondoConfigAgencyModeFk_idx` (`agencyModeFk__`), + CONSTRAINT `floramondoConfigAgencyModeFk` FOREIGN KEY (`agencyModeFk__`) REFERENCES `agencyMode` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `floramondoConfigWarehouseInFk` FOREIGN KEY (`warehouseInFk`) REFERENCES `warehouse` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, - CONSTRAINT `floramondoConfigWarehouseOutFk` FOREIGN KEY (`warehouseOutFk`) REFERENCES `warehouse` (`id`) ON DELETE SET NULL ON UPDATE CASCADE + CONSTRAINT `floramondoConfigWarehouseOutFk` FOREIGN KEY (`warehouseOutFk__`) REFERENCES `warehouse` (`id`) ON DELETE SET NULL ON UPDATE CASCADE ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; @@ -28274,6 +29277,39 @@ CREATE TABLE `invoiceInTaxBookingAccount` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Temporary table structure for view `invoiceIn__` +-- + +DROP TABLE IF EXISTS `invoiceIn__`; +/*!50001 DROP VIEW IF EXISTS `invoiceIn__`*/; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +/*!50001 CREATE VIEW `invoiceIn__` AS SELECT + 1 AS `id`, + 1 AS `serialNumber`, + 1 AS `serial`, + 1 AS `supplierFk`, + 1 AS `issued`, + 1 AS `supplierRef`, + 1 AS `isBooked`, + 1 AS `currencyFk`, + 1 AS `created`, + 1 AS `companyFk`, + 1 AS `docFk`, + 1 AS `booked`, + 1 AS `operated`, + 1 AS `cplusInvoiceType472Fk`, + 1 AS `cplusRectificationTypeFk`, + 1 AS `cplusSubjectOpFk`, + 1 AS `cplusTaxBreakFk`, + 1 AS `cplusTrascendency472Fk`, + 1 AS `bookEntried`, + 1 AS `isVatDeductible`, + 1 AS `withholdingSageFk`, + 1 AS `transactionTypeSageFk`*/; +SET character_set_client = @saved_cs_client; + -- -- Table structure for table `invoiceOut` -- @@ -28558,6 +29594,8 @@ CREATE TABLE `item` ( `numberOfItemsPerCask` int(11) DEFAULT NULL COMMENT 'Campo para Floramondo', `embalageCode` int(11) DEFAULT NULL COMMENT 'Campo para Floramondo', `quality` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Campo para Floramondo', + `stars` int(11) DEFAULT NULL, + `stemMultiplier` double NOT NULL DEFAULT '1' COMMENT 'este valor multiplica las unidades y divide los precios en el procedimiento edi.ekt_load', PRIMARY KEY (`id`), UNIQUE KEY `item_supplyResponseFk_idx` (`supplyResponseFk`), KEY `Color` (`inkFk`), @@ -29262,11 +30300,14 @@ CREATE TABLE `itemShelving` ( /*!50003 SET character_set_results = utf8 */ ; /*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemShelving_BEFORE_INSERT` BEFORE INSERT ON `itemShelving` FOR EACH ROW BEGIN + SET NEW.userFk = account.userGetId(); + + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -29282,6 +30323,47 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER itemShelving_AFTER_INSERT +AFTER INSERT +ON itemShelving FOR EACH ROW + +INSERT INTO vn.itemShelvingLog(itemShelvingFk, + workerFk, + accion, + itemFk, + shelvingFk, + quantity, + available, + visible, + `grouping`, + packing, + stars) + VALUES( NEW.id, + NEW.userFk, + 'CREA REGISTRO', + NEW.itemFk, + NEW.shelvingFk, + NEW.quantity, + NEW.available, + NEW.visible, + NEW.`grouping`, + NEW.packing, + NEW.stars + ) */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemShelving_BEFORE_UPDATE` BEFORE UPDATE ON `itemShelving` FOR EACH ROW BEGIN SET NEW.userFk = account.userGetId(); @@ -29291,6 +30373,73 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER itemShelving_AFTER_UPDATE +AFTER UPDATE +ON itemShelving FOR EACH ROW +INSERT INTO vn.itemShelvingLog(itemShelvingFk, + workerFk, + accion, + itemFk, + shelvingFk, + quantity, + available, + visible, + `grouping`, + packing, + stars) + VALUES( NEW.id, + account.userGetId(), + 'CAMBIO', + NEW.itemFk, + NEW.shelvingFk, + NEW.quantity, + NEW.available, + NEW.visible, + NEW.`grouping`, + NEW.packing, + NEW.stars + ) */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER itemShelving_BEFORE_DELETE +BEFORE DELETE +ON itemShelving FOR EACH ROW +INSERT INTO vn.itemShelvingLog(itemShelvingFk, + workerFk, + accion, + shelvingFk, + itemFk) + VALUES( OLD.id, + account.userGetId(), + 'ELIMINADO', + OLD.shelvingFk, + OLD.itemFk) */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; -- -- Temporary table structure for view `itemShelvingAvailable` @@ -29346,6 +30495,32 @@ SET character_set_client = utf8; 1 AS `parked`*/; SET character_set_client = @saved_cs_client; +-- +-- Table structure for table `itemShelvingLog` +-- + +DROP TABLE IF EXISTS `itemShelvingLog`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `itemShelvingLog` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `itemShelvingFk` int(10) unsigned DEFAULT NULL, + `workerFk` int(11) DEFAULT NULL, + `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `accion` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL, + `itemFk` int(11) DEFAULT NULL, + `shelvingFk` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL, + `quantity` int(11) DEFAULT NULL, + `visible` int(11) DEFAULT NULL, + `available` int(11) DEFAULT NULL, + `grouping` int(11) DEFAULT NULL, + `packing` int(11) DEFAULT NULL, + `stars` int(11) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `itemShelving_Log_FK` (`itemShelvingFk`) +) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `itemShelvingPlacementSupply` -- @@ -29624,7 +30799,11 @@ trig: BEGIN LEAVE trig; END IF; - CALL vn.itemRefreshTags(NEW.itemFk); + DROP TEMPORARY TABLE IF EXISTS tmp.item; + CREATE TEMPORARY TABLE tmp.item + SELECT NEW.itemFk id; + CALL item_refreshTags(); + DROP TEMPORARY TABLE tmp.item; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -29656,9 +30835,9 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; @@ -29679,9 +30858,9 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; @@ -29692,7 +30871,11 @@ trig: BEGIN LEAVE trig; END IF; - CALL vn.itemRefreshTags(OLD.itemFk); + DROP TEMPORARY TABLE IF EXISTS tmp.item; + CREATE TEMPORARY TABLE tmp.item + SELECT OLD.itemFk id; + CALL item_refreshTags(); + DROP TEMPORARY TABLE tmp.item; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -29784,7 +30967,7 @@ CREATE TABLE `itemType` ( `target` double NOT NULL DEFAULT '0.15', `topMargin` double NOT NULL DEFAULT '0.3', `profit` double NOT NULL DEFAULT '0.02', - `isFV__` tinyint(3) DEFAULT '1', + `isFV` tinyint(3) DEFAULT '1', `density` double NOT NULL DEFAULT '167' COMMENT 'Almacena el valor por defecto de la densidad en kg/m3 para el calculo de los portes aereos, en articulos se guarda la correcta', `promo` double NOT NULL DEFAULT '0', `isBox__` tinyint(4) NOT NULL DEFAULT '0', @@ -30304,7 +31487,7 @@ CREATE TABLE `mrw` ( `shipped` date DEFAULT NULL, `price` decimal(10,2) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -31015,7 +32198,7 @@ CREATE TABLE `ppeComponent` ( KEY `ppeComponent_fk1_idx` (`ppeFk`), KEY `ppeComponent_fk2_idx` (`invoiceInFk`), CONSTRAINT `ppeComponent_fk1` FOREIGN KEY (`ppeFk`) REFERENCES `ppe` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `ppeComponent_fk2` FOREIGN KEY (`invoiceInFk`) REFERENCES `vn2008`.`recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `ppeComponent_fk2` FOREIGN KEY (`invoiceInFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -31608,6 +32791,30 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_beforeUpdate` BEFORE UPDATE ON `receipt` FOR EACH ROW BEGIN CALL clientRisk_update(OLD.clientFk, OLD.companyFk, OLD.amountPaid); CALL clientRisk_update(NEW.clientFk, NEW.companyFk, -NEW.amountPaid); + SET NEW.workerFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_afterUpdate` AFTER UPDATE ON `receipt` FOR EACH ROW +BEGIN + IF NEW.isConciliate = FALSE AND NEW.payed > OLD.payed THEN + INSERT INTO vn.mail(`sender`, subject, `body`) + SELECT 'finanzas@verdnatura.es', + CONCAT(' Cambios de recibos del cliente: ', NEW.clientFk), + CONCAT('Se ha cambiado el recibo: ', NEW.Id, ' de ', OLD.payed, ' a ', NEW.payed); + END IF; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -31794,7 +33001,7 @@ CREATE TABLE `route` ( CONSTRAINT `route_fk5` FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `route_ibfk_1` FOREIGN KEY (`gestdocFk`) REFERENCES `dms` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `route_ibfk_2` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE, - CONSTRAINT `route_invoiceInFk` FOREIGN KEY (`invoiceInFk`) REFERENCES `vn2008`.`recibida` (`id`) ON DELETE SET NULL ON UPDATE CASCADE + CONSTRAINT `route_invoiceInFk` FOREIGN KEY (`invoiceInFk`) REFERENCES `invoiceIn` (`id`) ON DELETE SET NULL ON UPDATE CASCADE ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; @@ -34424,6 +35631,7 @@ CREATE TABLE `time` ( `day` int(2) NOT NULL, `week` int(2) NOT NULL, `yearMonth` int(6) NOT NULL, + `salesYear` int(4) NOT NULL COMMENT 'año para los calculos de las comisiones ventas', PRIMARY KEY (`dated`), KEY `day_index` (`day`) USING HASH, KEY `week_index` (`week`) USING HASH, @@ -37731,6 +38939,134 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP FUNCTION IF EXISTS `ekt_getEntry` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` FUNCTION `ekt_getEntry`(vEktFk INT) RETURNS int(11) + READS SQL DATA +BEGIN + + DECLARE vTravelFk INT; + DECLARE vEntryFk INT DEFAULT 0; + + SET vTravelFk = ekt_getTravel(vEktFk); + + IF vTravelFk THEN + + SELECT e.id INTO vEntryFk + FROM vn.entry e + JOIN edi.ekt ON ekt.kop = e.kop AND (ekt.sub <=> e.sub OR e.sub IS NULL) + WHERE e.travelFk = vTravelFk + AND ekt.id = vEktFk + AND e.invoiceInFk IS NULL + AND NOT (isConfirmed AND isOrdered) + ORDER BY e.sub <=> ekt.sub DESC + LIMIT 1; + + IF NOT vEntryFk THEN + + INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, ref) + SELECT vTravelFk, ea.supplierFk, c.id, cu.id, ea.kop, ea.sub, ea.ref + FROM edi.ekt + JOIN vn.travel tr ON tr.id = vTravelFk + JOIN vn.company c ON c.code = 'VNL' + JOIN vn.currency cu ON cu.code = 'EUR' + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + AND ea.warehouseInFk = tr.warehouseInFk + AND ea.agencyModeFk = tr.agencyFk + AND ea.kop = ekt.kop + AND (ea.sub <=> ekt.sub OR ea.sub IS NULL) + AND tr.landed = ekt.fec + WHERE ekt.id = vEktFk + ORDER BY ea.sub <=> ekt.sub DESC + LIMIT 1; + + SELECT MAX(id) INTO vEntryFk + FROM vn.entry + WHERE travelFk = vTravelFk; + + END IF; + + ELSE + + SET vEntryFk = 9200; + + END IF; + + RETURN vEntryFk; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP FUNCTION IF EXISTS `ekt_getTravel` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` FUNCTION `ekt_getTravel`(vEktFk INT) RETURNS int(11) + READS SQL DATA +BEGIN + + DECLARE vTravelFk INT; + + SELECT tr.id INTO vTravelFk + FROM vn.travel tr + JOIN edi.ekt e ON e.id = vEktFk + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + AND ea.warehouseInFk = tr.warehouseInFk + AND ea.agencyModeFk = tr.agencyFk + AND ea.kop = e.kop + AND (ea.sub <=> e.sub OR ea.sub IS NULL) + AND tr.landed = e.fec + ORDER BY ea.sub <=> e.sub DESC + LIMIT 1; + + IF NOT vTravelFk THEN + + INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyFk) + SELECT e.fec, e.fec, ea.warehouseInFk, ea.warehouseOutFk, ea.agencyModeFk + FROM edi.ekt e + JOIN vn.ektEntryAssign ea ON ea.kop = e.kop + WHERE e.id = vEktFk + ORDER BY ea.sub <=> e.sub DESC, ea.sub IS NULL DESC + LIMIT 1; + + SELECT tr.id INTO vTravelFk + FROM vn.travel tr + JOIN edi.ekt e ON e.id = vEktFk + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + AND ea.warehouseInFk = tr.warehouseInFk + AND ea.agencyModeFk = tr.agencyFk + AND ea.kop = e.kop + AND tr.landed = e.fec + ORDER BY ea.sub <=> e.sub DESC, ea.sub IS NULL DESC + LIMIT 1; + + END IF; + + RETURN vTravelFk; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP FUNCTION IF EXISTS `entry_calcCommission__` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -37993,15 +39329,15 @@ BEGIN END IF; SELECT entryFk INTO previousEntryFk - FROM floramondoConfig - WHERE warehouseInFk = vWarehouseFk; + FROM edi.warehouseFloramondo wf + WHERE wf.warehouseFk = vWarehouseFk; - IF NOT (previousEntryFk <=> vEntryFk) THEN + IF IFNULL(previousEntryFk,0) != vEntryFk THEN DELETE FROM buy WHERE entryFk = previousEntryFk; DELETE FROM entry WHERE id = previousEntryFk; - + /* UPDATE floramondoConfig SET entryFk = vEntryFk WHERE warehouseInFk = vWarehouseFk; @@ -38010,7 +39346,7 @@ BEGIN SET nextLanded = vLanded WHERE vLanded IS NOT NULL AND warehouseInFk = vWarehouseFk; - + */ END IF; RETURN vEntryFk; @@ -38038,7 +39374,7 @@ BEGIN DECLARE vTravelFk INT; DECLARE vWarehouseOutName VARCHAR(50) DEFAULT 'Holanda'; -- DECLARE vWarehouseInName VARCHAR(50) DEFAULT 'VNH'; - DECLARE vAgencyModeName VARCHAR(50) DEFAULT 'HOLANDA DIRECTO'; + DECLARE vAgencyModeName VARCHAR(50) DEFAULT 'LOGIFLORA'; IF vLanded THEN SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk @@ -40367,6 +41703,31 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP FUNCTION IF EXISTS `time_getSalesYear` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`z-sysadmin`@`%` FUNCTION `time_getSalesYear`(vMonth INT, vYear INT) RETURNS int(11) + DETERMINISTIC +BEGIN +DECLARE vSalesYear INT; +SELECT salesYear INTO vSalesYear +FROM `time` +WHERE `month` = vMonth AND `year` = vYear +LIMIT 1; +RETURN vSalesYear; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP FUNCTION IF EXISTS `validationCode` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -41438,14 +42799,113 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `buy_afterUpsert`(vSelf INT) BEGIN +/** + * Triggered actions when a buy is updated or inserted. + * + * @param vSelf The buy reference + */ + DECLARE vEntryFk INT; + DECLARE vItemFk INT; + DECLARE vSize INT; + DECLARE vPackageFk VARCHAR(10); + DECLARE vStickers INT; + DECLARE vPacking INT; + DECLARE vWarehouse INT; + DECLARE vWarehouseOut INT; + DECLARE vIsMerchandise BOOL; + DECLARE vIsFeedStock BOOL; + + SELECT b.entryFk, b.itemFk, b.stickers, b.packing, p.id, i.`size` + INTO vEntryFk, vItemFk, vStickers, vPacking, vPackageFk, vSize + FROM buy b + LEFT JOIN item i ON i.id = b.itemFk + LEFT JOIN packaging p ON p.id = b.packageFk AND NOT p.isBox + WHERE b.id = vSelf; + + SELECT t.warehouseInFk, t.warehouseOutFk + INTO vWarehouse, vWarehouseOut + FROM entry e + JOIN travel t ON t.id = e.travelFk + WHERE e.id = vEntryFk; + + SELECT k.merchandise + INTO vIsMerchandise + FROM itemCategory k + JOIN itemType it ON it.categoryFk = k.id + JOIN item i ON i.typeFk = it.id + WHERE i.id = vItemFk; + + IF vIsMerchandise THEN + + REPLACE itemCost SET + itemFk = vItemFk, + warehouseFk = vWarehouse, + cm3 = buy_getUnitVolume(vSelf); + + UPDATE vn.itemCost ic + JOIN vn.item i ON i.id = ic.itemFk + SET ic.cm3delivery = i.compression * ic.cm3 + WHERE ic.itemFk = vItemFk AND + ic.warehouseFk = vWarehouse; + + UPDATE vn.itemCost ic + JOIN cache.last_buy lb ON lb.item_id = ic.itemFk AND lb.warehouse_id = ic.warehouseFk + JOIN vn.buy b ON b.id = lb.buy_id + SET ic.grams = b.weight * 1000 / b.packing + WHERE ic.itemFk = vItemFk AND + ic.warehouseFk = vWarehouse; + /* + IF vSize IS NULL AND vPackageFk > '' THEN + INSERT INTO vn.mail(`subject`,`body`,`sender`) + VALUES (CONCAT('Articulo sin medida ', vItemFk), + CONCAT('Se ha añadido el artículo ', vItemFk, ' sin medida a la entrada ', vEntryFk, + ' con el cubo ', vPackageFk), + 'ekt@verdnatura.es'); + END IF;*/ + END IF; + + SELECT isFeedStock INTO vIsFeedStock + FROM warehouse WHERE id = vWarehouseOut AND id <> 13; + + IF vIsFeedStock THEN + INSERT IGNORE INTO producer(`name`) + SELECT es.company_name + FROM buy b + JOIN edi.ekt be ON be.id = b.ektFk + JOIN edi.supplier es ON es.supplier_id = be.pro + WHERE b.id = vSelf; + + IF buy_hasNotifyPassport(vSelf, vItemFk) THEN + CALL vn.buy_notifyPassport(vSelf, vItemFk, vStickers, vPacking); + END IF; + END IF; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `buy_afterUpsert__` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `buy_afterUpsert__`(vSelf INT) +BEGIN /** * Triggered actions when a buy is updated or inserted. * @@ -41516,95 +42976,6 @@ BEGIN END IF; END IF; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `buy_afterUpsert__` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `buy_afterUpsert__`(vSelf INT) -BEGIN -/** - * Triggered actions when a buy is updated or inserted. - * - * @param vSelf The buy reference - */ - DECLARE vEntryFk INT; - DECLARE vItemFk INT; - DECLARE vStickers INT; - DECLARE vPacking INT; - DECLARE vWarehouse INT; - DECLARE vWarehouseOut INT; - DECLARE vIsMerchandise BOOL; - DECLARE vIsFeedStock BOOL; - DECLARE vLanded DATE; - DECLARE vBuyerFk INT; - DECLARE vItemName VARCHAR(50); - - SELECT entryFk, itemFk, stickers, packing - INTO vEntryFk, vItemFk, vStickers, vPacking - FROM buy - WHERE id = vSelf; - - SELECT t.warehouseInFk, t.warehouseOutFk, t.landed - INTO vWarehouse, vWarehouseOut, vLanded - FROM entry e - JOIN travel t ON t.id = e.travelFk - WHERE e.id = vEntryFk; - - SELECT k.merchandise, it.workerFk, i.longName - INTO vIsMerchandise, vBuyerFk, vItemName - FROM itemCategory k - JOIN itemType it ON it.categoryFk = k.id - JOIN item i ON i.typeFk = it.id - WHERE i.id = vItemFk; - - IF vIsMerchandise THEN - REPLACE itemCost SET - itemFk = vItemFk, - warehouseFk = vWarehouse, - cm3 = buy_getUnitVolume(vSelf); - END IF; - - SELECT isFeedStock INTO vIsFeedStock - FROM warehouse WHERE id = vWarehouseOut AND id <> 13; - - IF vIsFeedStock THEN - INSERT IGNORE INTO producer(`name`) - SELECT es.company_name - FROM buy b - JOIN edi.ekt be ON be.id = b.ektFk - JOIN edi.supplier es ON es.supplier_id = be.pro - WHERE b.id = vSelf; - - IF buy_hasNotifyPassport(vSelf, vItemFk) THEN - CALL vn.buy_notifyPassport(vSelf, vItemFk, vStickers, vPacking); - END IF; - END IF; - - -- Aviso al comprador de modificacion de entrada en Barajas - IF (SELECT isBuyerToBeEmailed FROM warehouse WHERE id = vWarehouse) - AND vLanded = CURDATE() - AND vBuyerFk != account.myUserGetId() - THEN - - CALL vn.mail_insert(CONCAT(account.user_getNameFromId(vBuyerFk),'@verdnatura.es'), - CONCAT(account.myUser_getName(),'@verdnatura.es'), - CONCAT('E ',vEntryFk,' Se ha modificado item ', vItemFk, ' ',vItemName), - 'Este email se ha generado automáticamente'); - - END IF; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -42465,12 +43836,15 @@ proc: BEGIN DECLARE vFrenchOffer INT DEFAULT 42; DECLARE vIsFrenchVNHBuyer BOOLEAN DEFAULT FALSE; DECLARE vVNHWarehouseFk INT DEFAULT 7; + DECLARE vIsLogifloraAllowed BOOLEAN DEFAULT 0; + DECLARE vMaxLogifloraDays INT; + DECLARE vRangeLogifloraDays INT DEFAULT 3; SELECT volume INTO vBoxVolume FROM vn.packaging WHERE id = '94'; - SELECT clientFk INTO vClientFK + SELECT clientFk, isLogifloraAllowed INTO vClientFK, vIsLogifloraAllowed FROM address WHERE id = vAddressFk; @@ -42480,7 +43854,27 @@ proc: BEGIN JOIN vn.province p ON p.countryFk = c.id JOIN vn.address a ON a.provinceFk = p.id WHERE a.id = vAddressFk; - + + SELECT travellingDays INTO vMaxLogifloraDays + FROM edi.warehouseFloramondo + WHERE warehouseFk = vWarehouseFk; + + IF (NOT vIsLogifloraAllowed AND vVNHWarehouseFk <> vWarehouseFk) + OR NOT (vShipped BETWEEN TIMESTAMPADD(DAY, vMaxLogifloraDays, CURDATE()) + AND TIMESTAMPADD(DAY, vMaxLogifloraDays + vRangeLogifloraDays, CURDATE()) ) + THEN + DELETE tl FROM tmp.ticketLot tl + JOIN item i ON i.id = tl.itemFk + LEFT JOIN (SELECT DISTINCT s.itemFk + FROM vn.sale s + JOIN vn.ticket t ON t.id = s.ticketFk + WHERE t.warehouseFk = vWarehouseFk + AND t.addressFk = vAddressFk + AND t.shipped = vShipped + AND t.zoneFk = vZoneFk) sub ON sub.itemFk = i.id + WHERE i.supplyResponseFk + AND ISNULL(sub.itemFk); + END IF; SET @rate2 := 0; SET @rate3 := 0; @@ -42720,7 +44114,6 @@ proc: BEGIN tmp.ticketComponentBase, tmp.ticketComponentRate, tmp.ticketComponentCopy; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -42793,9 +44186,9 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; @@ -42836,7 +44229,7 @@ BEGIN LEFT JOIN sale s ON s.ticketFk = tw.ticketFk WHERE s.itemFk IS NULL; DELETE FROM claim WHERE ticketCreated < v18Month; DELETE FROM message WHERE sendDate < vDateShort; - DELETE FROM travelLog WHERE creationDate < v3Month; + -- Robert ubicacion anterior de trevelLog comentario para debug DELETE sc FROM saleChecked sc JOIN sale s ON sc.saleFk = s.id WHERE s.created < vDateShort; DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Month; @@ -42848,7 +44241,9 @@ BEGIN WHERE t.landed <= vDateShort; DELETE FROM stowaway WHERE created < v3Month; DELETE FROM vn.buy WHERE created < vDateShort AND entryFk = 9200; - + DELETE FROM vn.itemShelvingLog WHERE created < vDateShort; + DELETE FROM vn.stockBuyed WHERE creationDate < vDateShort; + -- Equipos duplicados DELETE w.* FROM workerTeam w @@ -42929,6 +44324,8 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete; DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete; + DELETE FROM travelLog WHERE creationDate < v3Month; + CALL shelving_clean; CALL ticketPackagingRecovery; END ;; @@ -43799,13 +45196,66 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `clientRemoveWorker`() +BEGIN + DECLARE vDone BOOL DEFAULT FALSE; + DECLARE vClientFk INT; + DECLARE rs CURSOR FOR + SELECT c.clientFk + FROM tmp.clientGetDebt c + LEFT JOIN clientRisk r ON r.clientFk = c.clientFk + GROUP BY c.clientFk + HAVING SUM(IFNULL(r.amount,0)) = 0; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt; + CREATE TEMPORARY TABLE tmp.clientGetDebt + SELECT cd.id as clientFk + FROM bs.clientDied cd + LEFT JOIN vn.clientProtected cp ON cp.clientFk = cd.id + JOIN vn.client c ON c.id = cd.id + JOIN vn.province p ON p.id = c.provinceFk + JOIN vn.country co ON co.id = p.countryFk + WHERE cd.Aviso = 'TERCER AVISO' AND + cp.clientFk IS NULL AND + co.country NOT IN ('Portugal','Francia','España exento') AND + c.salesPersonFk IS NOT NULL; + + OPEN rs; + FETCH rs INTO vClientFk; + WHILE NOT vDone DO + CALL vn.clientGreugeSpray(vClientFk, TRUE, '',TRUE); + UPDATE vn.client SET salesPersonFk = NULL WHERE id = vClientFk; + INSERT INTO vn.clientLog (originFk, userFk, `action`, description) + VALUES (vClientFk, account.userGetId(), 'update', CONCAT('Se ha desasignado el cliente por que no ha comprado en 3 meses')); + FETCH rs INTO vClientFk; + END WHILE; + CLOSE rs; + DROP TEMPORARY TABLE tmp.clientGetDebt; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `clientRemoveWorker__` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `clientRemoveWorker__`() BEGIN DECLARE done BOOL DEFAULT FALSE; DECLARE vClientFk INT; @@ -43859,71 +45309,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `clientRemoveWorker__` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `clientRemoveWorker__`() -BEGIN - DECLARE done BOOL DEFAULT FALSE; - DECLARE vClientFk INT; - - DECLARE rs CURSOR FOR - SELECT c.clientFk - FROM tmp.clientGetDebt c - LEFT JOIN tmp.risk r ON r.clientFk = c.clientFk - WHERE IFNULL(r.risk,0) = 0; - - DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; - - DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt; - CREATE TEMPORARY TABLE tmp.clientGetDebt - SELECT cd.id as clientFk - FROM bs.clientDied cd - LEFT JOIN vn.clientProtected cp ON cp.clientFk = cd.id - JOIN vn.client c ON c.id = cd.id - JOIN vn.province p ON p.id = c.provinceFk - JOIN vn.country co ON co.id = p.countryFk - WHERE cd.Aviso = 'TERCER AVISO' - AND cp.clientFk IS NULL - AND co.country NOT IN ('Portugal','Francia','España exento') - AND c.salesPersonFk IS NOT NULL; - - CALL vn.clientGetDebt(curdate()); - - DROP TEMPORARY TABLE IF EXISTS tmp.contador; - CREATE TEMPORARY TABLE tmp.contador (id INT) - ENGINE = MEMORY; - - OPEN rs; - FETCH rs INTO vClientFk; - - WHILE NOT done DO - INSERT INTO tmp.contador SET id = vClientFk; - CALL vn.clientGreugeSpray(vClientFk, TRUE, '',TRUE); - UPDATE vn.client SET salesPersonFk = NULL WHERE id = vClientFk; - - INSERT INTO vn.clientLog (originFk, userFk, `action`, description) - VALUES (vClientFk, account.userGetId(), 'update', CONCAT('Se ha desasignado el cliente por que no ha comprado en 3 meses')); - - REPLACE bs.clientNewBorn(clientFk, shipped) - VALUES(vClientFk, CURDATE()); - FETCH rs INTO vClientFk; - END WHILE; - - CLOSE rs; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `clientRisk_update` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -44028,15 +45413,21 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `clonTravelComplete`(IN `vTravelFk` INT, IN `vDateStart` DATE, IN `vDateEnd` DATE, IN `vRef` VARCHAR(255)) BEGIN - +/* + * Clona un travel, junto con sus entradas y compras + * @param vTravelFk travel a clonar + * @param vDateStart fecha de salida del nuevo travel + * @param vDateEnd fecha de llegada del nuevo travel + * @param vRef referencia del nuevo travel +*/ DECLARE vTravelNew INT; DECLARE vEntryNew INT; DECLARE vDone BOOLEAN DEFAULT FALSE; @@ -44044,17 +45435,15 @@ BEGIN DECLARE vRsEntry CURSOR FOR SELECT e.id FROM entry e - JOIN travel t - ON t.id = e.travelFk + JOIN travel t ON t.id = e.travelFk WHERE e.travelFk = vTravelFk; DECLARE vRsBuy CURSOR FOR SELECT b.* FROM buy b - JOIN entry e - ON b.entryFk = e.id - WHERE e.travelFk = vTravelNew and b.entryFk=entryNew - ORDER BY e.id; + JOIN entry e ON b.entryFk = e.id + WHERE e.travelFk = vTravelNew and b.entryFk = entryNew + ORDER BY e.id; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; @@ -44073,25 +45462,11 @@ BEGIN SET vTravelNew = LAST_INSERT_ID(); SET vDone = FALSE; - OPEN vRsEntry ; + OPEN vRsEntry; FETCH vRsEntry INTO vAuxEntryFk; - WHILE NOT vDone DO - INSERT INTO entry (supplierFk, - ref, - isInventory, - isConfirmed, - isOrdered, - isRaid, - commission, - created, - evaNotes, - travelFk, - currencyFk, - companyFk, - gestDocFk, - invoiceInFk) - SELECT supplierFk, + WHILE NOT vDone DO + INSERT INTO entry (supplierFk, ref, isInventory, isConfirmed, @@ -44100,65 +45475,77 @@ BEGIN commission, created, evaNotes, - vTravelNew, + travelFk, currencyFk, companyFk, gestDocFk, - invoiceInFk - FROM entry - WHERE id = vAuxEntryFk; - - SET vEntryNew = LAST_INSERT_ID(); - - - INSERT INTO buy (entryFk, - itemFk, - quantity, - buyingValue, - packageFk, - stickers, - freightValue, - packageValue, - comissionValue, - packing, - `grouping`, - groupingMode, - location, - price1, - price2, - price3, - minPrice, - producer, - printedStickers, - isChecked, - weight) - SELECT vEntryNew, - itemFk, - quantity, - buyingValue, - packageFk, - stickers, - freightValue, - packageValue, - comissionValue, - packing, - `grouping`, - groupingMode, - location, - price1, - price2, - price3, - minPrice, - producer, - printedStickers, - isChecked, - weight - FROM buy - WHERE entryFk = vAuxEntryFk; - - - FETCH vRsEntry INTO vAuxEntryFk; - END WHILE; + invoiceInFk) + SELECT supplierFk, + ref, + isInventory, + isConfirmed, + isOrdered, + isRaid, + commission, + created, + evaNotes, + vTravelNew, + currencyFk, + companyFk, + gestDocFk, + invoiceInFk + FROM entry + WHERE id = vAuxEntryFk; + + SET vEntryNew = LAST_INSERT_ID(); + + INSERT INTO buy (entryFk, + itemFk, + quantity, + buyingValue, + packageFk, + stickers, + freightValue, + packageValue, + comissionValue, + packing, + `grouping`, + groupingMode, + location, + price1, + price2, + price3, + minPrice, + producer, + printedStickers, + isChecked, + weight) + SELECT vEntryNew, + itemFk, + quantity, + buyingValue, + packageFk, + stickers, + freightValue, + packageValue, + comissionValue, + packing, + `grouping`, + groupingMode, + location, + price1, + price2, + price3, + minPrice, + producer, + printedStickers, + isChecked, + weight + FROM buy + WHERE entryFk = vAuxEntryFk; + + FETCH vRsEntry INTO vAuxEntryFk; + END WHILE; CLOSE vRsEntry; COMMIT; END ;; @@ -46126,8 +47513,21 @@ DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `collection_reject`(vSale INT, vQuantity INT) proc: BEGIN -UPDATE vn.sale SET quantity = vQuantity -WHERE id = vSale; +DECLARE vDescription VARCHAR(100); +DECLARE vOriginalQuantity INT; +DECLARE vConcept VARCHAR(100); +DECLARE vOrigin INT; + +SELECT concept INTO vConcept FROM vn.sale WHERE id = vSale; +SELECT ticketFk INTO vOrigin FROM vn.sale WHERE id = vSale; +SELECT CONCAT("Cambio cantidad ",vConcept," a ", vQuantity) INTO vDescription; + +INSERT INTO vn.ticketLog (originFk, userFk, action , description) + VALUES(vOrigin, vn.getUser(), 'update', vDescription); + + +SELECT quantity INTO vOriginalQuantity FROM vn.sale WHERE id = vSale; +UPDATE vn.sale SET originalQuantity = vOriginalQuantity ,quantity = vQuantity WHERE id = vSale; END ;; @@ -47704,6 +49104,131 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `ektEntryAssign_setEntry` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `ektEntryAssign_setEntry`() +BEGIN + +DECLARE done INT DEFAULT FALSE; +DECLARE vEntryFk INT; +DECLARE vTravelFk INT; +DECLARE vId INT; +DECLARE vLanded DATE DEFAULT CURDATE(); + +DECLARE cur1 CURSOR FOR SELECT id FROM vn.ektEntryAssign; + +DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + + IF HOUR(NOW()) > 12 THEN + + SET vLanded = TIMESTAMPADD(DAY,1,vLanded); + + END IF; + +OPEN cur1; + + read_loop: LOOP + + SET done = FALSE; + SET vEntryFk = 0; + + FETCH cur1 INTO vId; + + IF done THEN + LEAVE read_loop; + END IF; + + SELECT IFNULL(e.id,0) INTO vEntryFk + FROM vn.entry e + JOIN vn.travel tr ON tr.id = e.travelFk + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + AND ea.warehouseInFk = tr.warehouseInFk + AND ea.agencyModeFk = tr.agencyFk + AND ea.supplierFk = e.supplierFk + WHERE ea.id = vId + AND tr.landed = vLanded + LIMIT 1; + + IF NOT vEntryFk THEN + + SELECT IFNULL(e.id,0) INTO vEntryFk + FROM vn.entry e + JOIN vn.travel tr ON tr.id = e.travelFk + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + AND ea.warehouseInFk = tr.warehouseInFk + AND ea.agencyModeFk = tr.agencyFk + WHERE ea.id = vId + AND tr.landed = vLanded + AND ea.supplierFk IS NULL + LIMIT 1; + + END IF; + + IF NOT vEntryFk THEN + + SET vTravelFk = 0; + + SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk + FROM vn.travel tr + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + AND ea.warehouseInFk = tr.warehouseInFk + AND ea.agencyModeFk = tr.agencyFk + WHERE ea.id = vId + AND tr.landed = vLanded; + + IF NOT vTravelFk THEN + + INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyFk) + SELECT vLanded, vLanded, warehouseInFk, warehouseOutFk, agencyModeFk + FROM vn.ektEntryAssign + WHERE id = vId; + + SELECT MAX(tr.id) INTO vTravelFk + FROM vn.travel tr + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + AND ea.warehouseInFk = tr.warehouseInFk + AND ea.agencyModeFk = tr.agencyFk + WHERE ea.id = vId + AND tr.landed = vLanded; + + END IF; + + INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk) + SELECT vTravelFk, IFNULL(ea.supplierFk,s.id), c.id, cu.id + FROM vn.supplier s + JOIN vn.company c ON c.code = 'VNL' + JOIN vn.currency cu ON cu.code = 'EUR' + JOIN vn.ektEntryAssign ea ON ea.id = vId + WHERE s.name = 'KONINKLIJE COOPERATIEVE BLOEMENVEILING FLORAHOLLAN'; + + SELECT MAX(id) INTO vEntryFk + FROM vn.entry + WHERE travelFk = vTravelFk; + + END IF; + + UPDATE vn.ektEntryAssign + SET entryFk = vEntryFk + WHERE id = vId; + + END LOOP; + + CLOSE cur1; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `energyMeter_record` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -54123,6 +55648,57 @@ BEGIN ) ts ON ts.itemFk = i.id; + DROP TEMPORARY TABLE tmp.item; + DROP TEMPORARY TABLE tmp.item2; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingRadar_Entry_State_beta` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingRadar_Entry_State_beta`(vEntryFk INT) +BEGIN + + DECLARE vWarehouseFk INT DEFAULT 1; + DECLARE vCalcVisibleFk INT; + DECLARE vCalcAvailableFk INT; + DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(CURDATE()); + + CALL cache.visible_refresh(vCalcVisibleFk, FALSE, 1); + CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, CURDATE()); + + DROP TEMPORARY TABLE IF EXISTS tmp.item; + CREATE TEMPORARY TABLE tmp.item + ENGINE = MEMORY + SELECT DISTINCT itemFk + FROM vn.buy + WHERE entryFk = vEntryFk; + + DROP TEMPORARY TABLE IF EXISTS tmp.item2; + CREATE TEMPORARY TABLE tmp.item2 + ENGINE = MEMORY + SELECT * + FROM tmp.item; + + SELECT i.id as itemFk, + CAST(IFNULL(iss.visible,0) - IFNULL(v.visible,0) AS DECIMAL(10,0)) as outShelving + FROM vn.item i + JOIN tmp.item ti ON ti.itemFk = i.id + LEFT JOIN cache.visible v ON v.calc_id = vCalcVisibleFk AND v.item_id = i.id + LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = i.id; + + DROP TEMPORARY TABLE tmp.item; DROP TEMPORARY TABLE tmp.item2; @@ -54169,33 +55745,81 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingSaleSupplyAdd`(vItemShelvingFk INT, saleFk INT, vQuantity INT,idMovimiento INT) BEGIN - INSERT INTO vn.itemShelvingSale( itemShelvingFk, - saleFk, - quantity, - userFk) - VALUES ( vItemShelvingFk, - saleFk, - vQuantity, - getUser()); - - UPDATE vn.itemShelving - SET quantity = quantity - vQuantity, - visible = visible - vQuantity, - available = available - vQuantity - WHERE id = vItemShelvingFk; - - UPDATE vn2008.Movimientos_mark - SET valor = 1 - WHERE Id_Movimiento = idMovimiento; +INSERT INTO vn.itemShelvingSale( itemShelvingFk, + saleFk, + quantity, + userFk) + VALUES ( vItemShelvingFk, + saleFk, + vQuantity, + getUser()); + + UPDATE vn.itemShelving + SET quantity = quantity - vQuantity, + visible = visible - vQuantity, + available = available - vQuantity + WHERE id = vItemShelvingFk; + + UPDATE vn2008.Movimientos_mark + SET valor = 1 + WHERE Id_Movimiento = idMovimiento; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingSaleSupplyAddVoz` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingSaleSupplyAddVoz`(vItemShelvingFk VARCHAR(50), saleFk INT, vQuantity INT,idMovimiento INT) +BEGIN + + +/*INSERT INTO `vn`.`errorLogApp` (`error`, `workerFk`) VALUES (CONCAT(vItemShelvingFk," ",saleFk), '14255');*/ + +DECLARE vItemShelvingFkAux INT; +DECLARE vItemFk INT; + +SELECT itemFk INTO vItemFk FROM vn.sale WHERE id = saleFk; + +SELECT id INTO vItemShelvingFkAux FROM vn.itemShelving WHERE shelvingFk = vItemShelvingFk COLLATE utf8_general_ci AND itemFk = vItemFk; + +INSERT INTO vn.itemShelvingSale( itemShelvingFk, + saleFk, + quantity, + userFk) + VALUES ( vItemShelvingFkAux, + saleFk, + vQuantity, + getUser()); + + UPDATE vn.itemShelving + SET quantity = quantity - vQuantity, + visible = visible - vQuantity, + available = available - vQuantity + WHERE id = vItemShelvingFkAux; + + UPDATE vn2008.Movimientos_mark + SET valor = 1 + WHERE Id_Movimiento = idMovimiento; END ;; DELIMITER ; @@ -54341,9 +55965,9 @@ DELIMITER ; /*!50003 SET character_set_results = utf8 */ ; /*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`z-developer`@`%` PROCEDURE `itemShelving_StarsUpdate`(vId INT, vStars INT) +CREATE DEFINER=`root`@`%` PROCEDURE `itemShelving_StarsUpdate`(vId INT, vStars INT) BEGIN UPDATE vn.itemShelving @@ -55989,7 +57613,7 @@ DELIMITER ; /*!50003 SET character_set_results = utf8 */ ; /*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `ledger_doCompensation`(vDated DATE, vCompensationAccount VARCHAR(10) , vBankFk VARCHAR(10), vConcept VARCHAR(255), vAmount DECIMAL(10,2), vCompanyFk INT, vOriginalAccount VARCHAR(10)) BEGIN @@ -56004,15 +57628,13 @@ BEGIN * @param vCompany empresa * @param vOriginalAccount cuenta contable desde la cual se compensa * - */ - + */ DECLARE vNewBookEntry INT; DECLARE vIsClientCompensation INT; DECLARE vClientFk INT; DECLARE vSupplierFk INT; DECLARE vIsOriginalAClient BOOL; DECLARE vPayMethodCompensation INT; - DECLARE vAmountCompensation DECIMAL(10,2); CALL ledger_next(vNewBookEntry); @@ -56022,8 +57644,8 @@ BEGIN FROM client WHERE accountingAccount LIKE vCompensationAccount COLLATE utf8_general_ci; - SET @vAmount1:= 0; - SET @vAmount2:= 0; + SET @vAmount1:= 0.0; + SET @vAmount2:= 0.0; INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id) VALUES ( vNewBookEntry, vDated, @@ -56052,95 +57674,15 @@ BEGIN vCompanyFk); IF vIsClientCompensation THEN - + IF vIsOriginalAClient THEN + SET vAmount = -vAmount; + END IF; INSERT INTO receipt(invoiceFk, amountPaid, payed, bankFk, companyFk, clientFk, isConciliate) VALUES (vConcept, vAmount, vDated, vBankFk, vCompanyFk, vClientFk, TRUE); ELSE - - SELECT id INTO vSupplierFk FROM supplier WHERE `account` LIKE vCompensationAccount COLLATE utf8_general_ci; - SELECT id INTO vPayMethodCompensation FROM payMethod WHERE `code` = 'compensation'; - - INSERT INTO vn2008.pago (fecha, dueDated, id_proveedor, importe, id_banco, pay_met_id, concepte, empresa_id, conciliado) - VALUES(vDated, vDated, vSupplierFk, vAmount, vBankFk, vPayMethodCompensation, vConcept, vCompanyFk, TRUE); - END IF; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `ledger_doCompensation__` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `ledger_doCompensation__`(vDated DATE, vCompensationAccount VARCHAR(10) , vBankFk VARCHAR(10), vConcept VARCHAR(255), vAmount DECIMAL(10,2), vCompanyFk INT, vOriginalAccount VARCHAR(10)) -BEGIN -/** - * Compensa un pago o un recibo insertando en contabilidad - * - * @param vDated fecha en la cual se anota - * @param vCompensationAccount cuenta contable contra la que se compensa - * @param vBankFk banco de la compensacion - * @param vConcept descripcion - * @param vAmount cantidad que se compensa - * @param vCompany empresa - * @param vOriginalAccount cuenta contable desde la cual se compensa - * - */ - - DECLARE vNewBookEntry INT; - DECLARE vIsClientCompensation INT; - DECLARE vClientFk INT; - DECLARE vSupplierFk INT; - DECLARE vIsOriginalAClient BOOL; - DECLARE vPayMethodCompensation INT; - DECLARE vAmountCompensation INT; - - CALL ledger_next(vNewBookEntry); - - SELECT COUNT(id) INTO vIsOriginalAClient FROM client WHERE accountingAccount LIKE vOriginalAccount COLLATE utf8_general_ci; - - SELECT id, COUNT(id) INTO vClientFk, vIsClientCompensation - FROM client - WHERE accountingAccount LIKE vCompensationAccount COLLATE utf8_general_ci; - - IF vIsOriginalAClient = vIsClientCompensation THEN - SET vAmountCompensation = -vAmount; - ELSE - SET vAmountCompensation = vAmount; - END IF; - - INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id) - VALUES ( vNewBookEntry, - vDated, - vOriginalAccount, - vCompensationAccount, - vConcept, - IF(vIsOriginalAClient, 0, vAmount), - IF(vIsOriginalAClient, vAmount, 0), - vCompanyFk - ), - ( vNewBookEntry, - vDated, - vCompensationAccount, - vOriginalAccount, - vConcept, - IF(vIsClientCompensation, 0, vAmountCompensation), - IF(vIsClientCompensation, vAmountCompensation, 0), - vCompanyFk); - - IF vIsClientCompensation THEN - - INSERT INTO receipt(invoiceFk, amountPaid, payed, bankFk, companyFk, clientFk, isConciliate) - VALUES (vConcept, vAmount, vDated, vBankFk, vCompanyFk, vClientFk, TRUE); - ELSE - + IF NOT vIsOriginalAClient THEN + SET vAmount = -vAmount; + END IF; SELECT id INTO vSupplierFk FROM supplier WHERE `account` LIKE vCompensationAccount COLLATE utf8_general_ci; SELECT id INTO vPayMethodCompensation FROM payMethod WHERE `code` = 'compensation'; @@ -60326,9 +61868,9 @@ ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; @@ -60336,6 +61878,16 @@ CREATE DEFINER=`root`@`%` PROCEDURE `stockBuyed`(vDate DATE) BEGIN DECLARE vVolume DECIMAL(10,2); DECLARE vWarehouse INT DEFAULT 7; + DECLARE vRuben INT; + DECLARE vClaudi INT; + + SELECT w.id INTO vRuben + FROM vn.worker w + WHERE w.code = 'RET'; + + SELECT w.id INTO vClaudi + FROM vn.worker w + WHERE w.code = 'CSR'; CALL stockTraslation(vDate); @@ -60353,6 +61905,33 @@ BEGIN WHERE r.display <> 0 GROUP BY tr.Id_Trabajador ON DUPLICATE KEY UPDATE buyed = VALUES(buyed); + + INSERT INTO stockBuyed(USER, buyed, `date`) + SELECT vRuben, @amount := SUM(ic.cm3 * io.amount / 2400000), vDate + FROM vn2008.item_out io + JOIN vn.itemCost ic ON ic.itemFk = io.item_id AND ic.warehouseFk = vWarehouse + JOIN vn.ticket t ON t.id = io.ticketFk + JOIN vn.address a ON a.id = t.addressFk + JOIN vn.province p ON p.id = a.provinceFk + JOIN vn.country c ON c.id = p.countryFk + WHERE dat = vDate + AND warehouse_id = vWarehouse + AND c.country = 'Francia' + ON DUPLICATE KEY UPDATE buyed = buyed + @amount; + + INSERT INTO stockBuyed(USER, buyed, `date`) + SELECT vClaudi, @amount := SUM(ic.cm3 * io.amount / 2400000), vDate + FROM vn2008.item_out io + JOIN vn.itemCost ic ON ic.itemFk = io.item_id AND ic.warehouseFk = vWarehouse + JOIN vn.ticket t ON t.id = io.ticketFk + JOIN vn.address a ON a.id = t.addressFk + JOIN vn.province p ON p.id = a.provinceFk + JOIN vn.country c ON c.id = p.countryFk + WHERE dat = vDate + AND warehouse_id = vWarehouse + AND c.country != 'Francia' + ON DUPLICATE KEY UPDATE buyed = buyed + @amount; + END ;; DELIMITER ; @@ -60447,8 +62026,8 @@ BEGIN sin tener en cuenta las salidas del mismo dia vDate para ver el transporte a reservar **/ - - DECLARE vWarehouse INT DEFAULT 7; + + DECLARE vWarehouse INT DEFAULT 7; DELETE FROM stockBuyed WHERE `date` = vDate; @@ -60456,20 +62035,24 @@ BEGIN CREATE TEMPORARY TABLE tmp_item (UNIQUE INDEX i USING HASH (item_id)) ENGINE = MEMORY - SELECT item_id, SUM(amount) amount FROM vn2008.item_entry_in - WHERE dat = vDate and vDate >= CURDATE() + SELECT item_id, SUM(amount) amount + FROM vn2008.item_entry_in + WHERE dat = vDate + AND vDate >= CURDATE() AND warehouse_id = vWarehouse AND isVirtualStock is FALSE - GROUP BY item_id HAVING amount != 0; + GROUP BY item_id + HAVING amount != 0; CALL `cache`.stock_refresh (FALSE); INSERT INTO tmp_item (item_id,amount) - SELECT item_id,s.amount FROM `cache`.stock s + SELECT item_id,s.amount + FROM `cache`.stock s WHERE warehouse_id = vWarehouse ON DUPLICATE KEY UPDATE amount = tmp_item.amount + VALUES(amount); - + CALL vn2008.item_last_buy_(vWarehouse,vDate); END ;; @@ -63475,6 +65058,42 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `ticketManaToPromo` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`z-developer`@`%` PROCEDURE `ticketManaToPromo`(vTicketFk INT) +BEGIN + + DECLARE vManaComponent INT; + + DECLARE vPromoComponent INT; + + SELECT id INTO vManaComponent + FROM vn.component c + WHERE c.code = 'mana'; + + SELECT id INTO vPromoComponent + FROM vn.component c + WHERE c.code = 'floramondoPromo'; + + UPDATE vn.saleComponent sc + JOIN vn.sale s ON s.id = sc.saleFk + SET componentFk = vPromoComponent + WHERE componentFk = vManaComponent + AND s.ticketFk = vTicketFk; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `ticketMissed_List` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -64277,13 +65896,153 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `ticket_cloneWeekly`(IN vWeek INT) +BEGIN +/* --pendiente del CAU 17775 + DECLARE vIsDone BOOL; + DECLARE vLanding DATE; + DECLARE vShipment DATE; + DECLARE vWarehouse INT; + DECLARE vTicket INT; + DECLARE vWeekDay INT; + DECLARE vClient INT; + DECLARE vEmpresa INT; + DECLARE vAddressFk INT; + DECLARE vAgencyModeFk INT; + DECLARE vNewTicket INT; + DECLARE vYear INT; + + DECLARE rsTicket CURSOR FOR + SELECT tw.ticketFk, weekDay, t.clientFk, t.warehouseFk, t.companyFk, t.addressFk, tw.agencyModeFk + FROM ticketWeekly tw + JOIN ticket t ON tw.ticketFk = t.id; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE; + + SET vYear = YEAR(CURDATE()) + IF(vWeek < WEEK(CURDATE()),1, 0); + + OPEN rsTicket; + + myLoop: LOOP + BEGIN + DECLARE vError TEXT; + DECLARE vSalesPersonEmail VARCHAR(150); + DECLARE vMailSent BOOL; + DECLARE vSubject VARCHAR(150); + DECLARE vMessage TEXT; + DECLARE CONTINUE HANDLER FOR SQLEXCEPTION + BEGIN + GET DIAGNOSTICS CONDITION 1 + vError = MESSAGE_TEXT; + END; + + SET vIsDone = FALSE; + FETCH rsTicket INTO vTicket, vWeekDay, vClient, vWarehouse, vEmpresa, vAddressFk, vAgencyModeFk; + + IF vIsDone THEN + + LEAVE myLoop; + END IF; + SELECT date INTO vShipment + FROM `time` + WHERE `year` = vYear AND `week` = vWeek + AND WEEKDAY(date) = vWeekDay; + + -- busca si el ticket ya ha sido clonado + IF (SELECT COUNT(*) FROM vn.ticket tOrig + JOIN vn.sale saleOrig ON tOrig.id = saleOrig.ticketFk + JOIN vn.saleCloned sc ON sc.saleOriginalFk = saleOrig.id + JOIN vn.sale saleClon ON saleClon.id = sc.saleClonedFk + JOIN vn.ticket tClon ON tClon.id = saleClon.ticketFk + WHERE tOrig.id = vTicket AND DATE(tClon.shipped) = vShipment) > 0 + THEN + ITERATE myLoop; + END IF; + CALL vn.zone_getLanded(vShipment, vAddressFk, vAgencyModeFk, vWarehouse, TRUE); + + SELECT landed INTO vLanding from tmp.zoneGetLanded LIMIT 1; + + CALL vn.ticketCreateWithoutZone(vClient, vShipment, vWarehouse, vEmpresa, vAddressFk, vAgencyModeFk, NULL, vLanding, account.userGetId(), vNewTicket); + + IF (vLanding IS NULL) THEN + + SELECT e.email INTO vSalesPersonEmail + FROM vn.client c + JOIN vn.worker sp ON sp.id = c.salesPersonFk + JOIN account.emailUser e ON e.userFk = sp.userFk + WHERE c.id = vClient; + + SET vSubject = CONCAT('Turnos - No se ha podido clonar correctamente el ticket ', vTicket, + ' para el dia: ', vShipment); + SET vMessage = CONCAT('No se ha podido clonar el ticket ', vTicket, + ' para el dia: ', vShipment, + ' porque no hay una zona de envío disponible. Se ha creado el ticket: ', vNewTicket, + ' pero ha que revisar las fechas y la agencia'); + + SELECT COUNT(*) INTO vMailSent + FROM vn.mail + WHERE sender = vSalesPersonEmail + AND subject = vSubject; + + IF NOT vMailSent THEN + INSERT INTO vn.mail (sender,`subject`,body) + VALUES (vSalesPersonEmail, vSubject, vMessage); + END IF; + CALL vn.ticketStateUpdate (vNewTicket, 'FIXING'); + END IF; + + INSERT INTO vn.sale (ticketFk, itemFk, concept, quantity, price, discount, priceFixed, isPriceFixed) + SELECT vNewTicket, saleOrig.itemFk , saleOrig.concept , saleOrig.quantity, saleOrig.price , saleOrig.discount, saleOrig.priceFixed, saleOrig.isPriceFixed + FROM vn.ticket tOrig + JOIN vn.sale saleOrig ON tOrig.id = saleOrig.ticketFk + LEFT JOIN vn.saleCloned sc ON sc.saleOriginalFk = saleOrig.id + LEFT JOIN vn.sale saleClon ON saleClon.id = sc.saleClonedFk + LEFT JOIN vn.ticket tClon ON tClon.id = saleClon.ticketFk AND DATE(tClon.shipped) = vShipment + WHERE tOrig.id = vTicket AND saleClon.id IS NULL; + + INSERT IGNORE INTO vn.saleCloned(saleOriginalFk, saleClonedFk) + SELECT saleOriginal.id, saleClon.id + FROM vn.sale saleOriginal + JOIN vn.sale saleClon ON saleOriginal.itemFk = saleClon.itemFk AND saleOriginal.quantity = saleClon.quantity + WHERE saleOriginal.ticketFk = vTicket AND saleClon.ticketFk = vNewTicket; + + INSERT INTO ticketRequest (description, ordered, shipped, salesPersonCode, buyerCode, quantity, price, + itemFk ,clientFk, response, total, buyed, saleFk) + SELECT tr.description, tr.ordered, tr.shipped, tr.salesPersonCode, tr.buyerCode, tr.quantity, tr.price, + tr.itemFk, tr.clientFk, tr.response, tr.total, tr.buyed, tr.saleFk + FROM sale s JOIN ticketRequest tr ON tr.saleFk = s.id + JOIN sale s2 ON s.concept = s2.concept AND s.quantity = s2.quantity AND m.Id_Article = m2.Id_Article + WHERE s.ticketFk = vTicket AND s2.ticketFk = vNewTicket; + + CALL vn.ticketCalculateClon(vNewTicket, vTicket); + END; + END LOOP; + + CLOSE rsTicket; +*/ +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `ticket_cloneWeekly__` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `ticket_cloneWeekly__`(IN vWeek INT) BEGIN DECLARE vIsDone BOOL; DECLARE vLanding DATE; @@ -68655,6 +70414,272 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_sendMail`(vWeek INT, vYear INT, vWorkerFk INT) BEGIN +/** + * Inserta en la tabla vn.mail para notificar a los empleados que teletrabajan de las jornadas que se han registrado. + * Inserta fichadas en el casos que se determina que el empleado está realizando teletrabajo + * + * @param vWeek + * @param vYear + * @param vWorkerFk -> En el caso de querer generarlo para todos los empleados deberá de informarse como NULL + */ + DECLARE vStarted VARCHAR(25); + DECLARE vEnded VARCHAR(25); + DECLARE vDone BOOL; + DECLARE vSender VARCHAR(255); + DECLARE vSenderOld VARCHAR(255); + DECLARE vDated DATE; + DECLARE vTimeWorkDecimal DECIMAL(5,2); + DECLARE vTimeWorkSexagesimal VARCHAR(5); + DECLARE vTimeWorkedDecimal DECIMAL(5,2); + DECLARE vTimeWorkedSexagesimal VARCHAR(5); + DECLARE vTimeWorkDecimalTotal DECIMAL(5,2); + DECLARE vTimeTable VARCHAR(100); + DECLARE vTimeTableDecimal DECIMAL(5,2); + DECLARE vWorkerFkOld INTEGER; + DECLARE vBusinessFk INTEGER; + DECLARE vHeader TEXT; + DECLARE vBody TEXT; + DECLARE vFooter TEXT; + DECLARE vReturn INTEGER; + DECLARE vAbsenceType VARCHAR(50); + DECLARE vWorkerInfo VARCHAR(90); + + DECLARE vCursor CURSOR FOR + SELECT CONCAT(u.name, '@verdnatura.es'), u.id, tb.dated, tb.timeWorkDecimal, LEFT(tb.timeWorkSexagesimal,5) timeWorkSexagesimal, + tb.timeTable, tc.timeWorkDecimal timeWorkedDecimal, LEFT(tc.timeWorkSexagesimal,5) timeWorkedSexagesimal, tb.type, tb.businessFk + FROM tmp.timeBusinessCalculate tb + JOIN user u ON u.id = tb.userFk + JOIN department d ON d.id = tb.departmentFk + JOIN postgresql.business b ON b.business_id = tb.businessFk + JOIN company c ON c.id = b.provider_id + LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = tb.userFk AND tc.dated = tb.dated + JOIN (SELECT tb.userFk, + SUM(IF(tb.type IS NULL, + IF(tc.timeWorkDecimal > 0, FALSE, IF(tb.timeWorkDecimal > 0, TRUE, FALSE)), + TRUE))isTeleworkingWeek + FROM tmp.timeBusinessCalculate1 tb + LEFT JOIN tmp.timeControlCalculate1 tc ON tc.userFk = tb.userFk AND tc.dated = tb.dated + GROUP BY tb.userFk + HAVING isTeleworkingWeek > 0 + )sub ON sub.userFk = u.id + WHERE d.isTeleworking AND + IFNULL(vWorkerFk,u.id) = u.id AND + c.code = 'VNL' + ORDER BY u.id, tb.dated; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + DROP TABLE IF EXISTS tmp.timeControlCalculate; + DROP TABLE IF EXISTS tmp.timeBusinessCalculate; + DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate; + DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate; + DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate1; + DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate1; + + SELECT CONCAT (MIN(dated), ' 00:00:00'), CONCAT (MAX(dated), ' 23:59:59') INTO vStarted, vEnded + FROM time + WHERE year = vYear AND + week = vWeek; + + DELETE FROM workerTimeControl + WHERE IFNULL(vWorkerFk, userFk) = userFk AND + timed BETWEEN vStarted AND vEnded AND + isSendMail; + + UPDATE workerTimeControlMail + SET updated = NOW(), state = 'SENDED' + WHERE year = vYear AND + week = vWeek AND + IFNULL(vWorkerFk, workerFk) = workerFk ; + + IF vWorkerFk IS NULL THEN + CALL timeControl_calculateAll(vStarted,vEnded); + CALL timeBusiness_calculateAll(vStarted,vEnded); + ELSE + CALL timeControl_calculateByUser(vWorkerFk,vStarted,vEnded); + CALL timeBusiness_calculateByUser(vWorkerFk,vStarted,vEnded); + END IF; + + CREATE TEMPORARY TABLE tmp.timeControlCalculate1 + SELECT * FROM tmp.timeControlCalculate; + CREATE TEMPORARY TABLE tmp.timeBusinessCalculate1 + SELECT * FROM tmp.timeBusinessCalculate; + + SET vTimeWorkDecimalTotal = 0; + SET vBody= ''; + OPEN vCursor; + FETCH vCursor INTO vSender, vWorkerFk, vDated, vTimeWorkDecimal, vTimeWorkSexagesimal, vTimeTable, vTimeWorkedDecimal, vTimeWorkedSexagesimal, vAbsenceType, vBusinessFk ; + SET vWorkerFkOld = vWorkerFk ; + SET vSenderOld = vSender; + proc: LOOP + IF vDone THEN + LEAVE proc; + END IF; + + IF vTimeTable IS NULL AND vTimeWorkDecimal>0 AND vTimeWorkedDecimal IS NULL THEN + INSERT INTO workerTimeControl (userFk, timed, manual, direction, isSendMail) + SELECT vWorkerFk, CONCAT(vDated,' 08:00'), TRUE, 'in', TRUE; + IF vTimeWorkDecimal >= 5 THEN + INSERT INTO workerTimeControl (userFk, timed, manual, direction, isSendMail) + SELECT vWorkerFk, CONCAT(vDated,' 09:00'), TRUE, 'middle', TRUE; + INSERT INTO workerTimeControl (userFk, timed, manual, direction, isSendMail) + SELECT vWorkerFk, CONCAT(vDated,' 09:20'), TRUE, 'middle', TRUE; + END IF; + INSERT INTO workerTimeControl (userFk, timed, manual, direction, isSendMail) + SELECT vWorkerFk,CONCAT(vDated,' ', LEFT (SEC_TO_TIME(28800 + (vTimeWorkDecimal * 3600)), 5)), TRUE, 'out', TRUE; + ELSEIF vTimeWorkDecimal>0 AND vTimeWorkedDecimal IS NULL THEN + SELECT SUM(TIME_TO_SEC(j.end)-TIME_TO_SEC(j.start))/3600 INTO vTimeTableDecimal + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + IF vTimeWorkDecimal = vTimeTableDecimal THEN + INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) + SELECT vWorkerFk, CONCAT(vDated, ' ', j.start), TRUE, TRUE + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + + INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) + SELECT vWorkerFk, CONCAT(vDated, ' ', j.end), TRUE, TRUE + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + ELSE + INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) + SELECT vWorkerFk, CONCAT(vDated, ' ', MIN(j.start)), TRUE, TRUE + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) + SELECT vWorkerFk, CONCAT(vDated, ' ', SEC_TO_TIME(TIME_TO_SEC(MIN(j.start)) + (vTimeWorkDecimal * 3600))), TRUE, TRUE + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + END IF; + + IF vTimeWorkDecimal >= 5 THEN + INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) + SELECT vWorkerFk, CONCAT(vDated, ' ', SEC_TO_TIME(TIME_TO_SEC(MIN(j.start)) + 3600)), TRUE, TRUE + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) + SELECT vWorkerFk, CONCAT(vDated, ' ', SEC_TO_TIME(TIME_TO_SEC(MIN(j.start)) + 4800)), TRUE, TRUE + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + END IF; + + UPDATE workerTimeControl wtc + JOIN (SELECT id FROM workerTimeControl + WHERE userFk = vWorkerFk AND + timed BETWEEN vDated AND CONCAT(vDated, ' 23:59:59') + ORDER BY timed ASC + LIMIT 1)sub on sub.id= wtc.id + SET direction = 'in' ; + + UPDATE workerTimeControl wtc + JOIN (SELECT id FROM workerTimeControl + WHERE userFk = vWorkerFk AND + timed BETWEEN vDated AND CONCAT(vDated, ' 23:59:59') + ORDER BY timed DESC + LIMIT 1)sub on sub.id= wtc.id + SET direction = 'out' ; + + END IF; + + SELECT CONCAT(IFNULL(vBody,""), " + ", DATE_FORMAT(vDated, "%d/%m/%Y"), " + ", CASE WEEKDAY(vDated)+1 + WHEN 1 THEN 'Lunes' + WHEN 2 THEN 'Martes' + WHEN 3 THEN 'Miércoles' + WHEN 4 THEN 'Jueves' + WHEN 5 THEN 'Viernes' + WHEN 6 THEN 'Sábado' + WHEN 7 THEN 'Domingo' + END , " + ", IFNULL(GROUP_CONCAT(MID(timed, 12, 5) ORDER BY timed ASC SEPARATOR ' - '), " - ")," + ", IFNULL(vAbsenceType, IF (vTimeWorkedDecimal>0, "Presencial", IF(vTimeWorkDecimal>0, "Teletrabajo", " - "))), " + ", IFNULL(vTimeWorkedSexagesimal, vTimeWorkSexagesimal), " + ") INTO vBody + FROM workerTimeControl + WHERE userFk = vWorkerFk AND + timed BETWEEN vDated AND CONCAT(vDated," 23:59:59"); + SET vTimeWorkDecimalTotal = vTimeWorkDecimalTotal + IFNULL(vTimeWorkedDecimal, vTimeWorkDecimal); + SET vDone = FALSE; + FETCH vCursor INTO vSender, vWorkerFk, vDated, vTimeWorkDecimal, vTimeWorkSexagesimal, vTimeTable, vTimeWorkedDecimal, vTimeWorkedSexagesimal, vAbsenceType, vBusinessFk; + + IF vWorkerFk <> vWorkerFkOld OR vDone THEN + SELECT CONCAT( IFNULL(nif, ''), ' - ', firstName, ' ', name ) INTO vWorkerInfo + FROM postgresql.person + WHERE id_trabajador = vWorkerFkOld; + SET vHeader = CONCAT("


+
+

", vWorkerInfo , "

+ + + + + + + + + + + + "); + + SET vFooter = CONCAT(" + + + + +
+ Según la información recogida en el sistema adjuntamos la tabla con los registros de las horas trabajadas en el período indicado. + Si está conforme tiene que contestar indicando únicamente la palabra OK, en caso contrario puede contestar detallando la causa de la disconformidad. + Rogamos nos conteste lo antes posible. +

+
FechaDíaFichadasDescripciónHoras
TOTAL", IFNULL(LEFT (SEC_TO_TIME(vTimeWorkDecimalTotal * 3600), 5), 0), "
+
"); + INSERT INTO mail(sender, replyto, subject, body) + VALUES (vSenderOld, + 'timecontrol@verdnatura.es', + CONCAT('Registro de horas semana ', vWeek, ' año ', vYear) , + CONCAT(vHeader, ' ' , vBody, ' ', vFooter)); + + INSERT IGNORE INTO workerTimeControlMail (workerFk, year, week) + VALUES(vWorkerFkOld, vYear, vWeek); + SET vBody = ''; + SET vTimeWorkDecimalTotal = 0; + SET vWorkerFkOld = vWorkerFk ; + SET vSenderOld = vSender; + END IF; + END LOOP; + CLOSE vCursor; + + DROP TABLE IF EXISTS tmp.timeControlCalculate; + DROP TABLE IF EXISTS tmp.timeBusinessCalculate; + DROP TABLE IF EXISTS tmp.timeControlCalculate1; + DROP TABLE IF EXISTS tmp.timeBusinessCalculate1; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `workerTimeControl_sendMail__` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_sendMail__`(vWeek INT, vYear INT, vWorkerFk INT) +BEGIN /** * Inserta en la tabla vn.mail para notificar a los empleados que teletrabajan de las jornadas que se han registrado. * Inserta fichadas en el casos que se determina que el empleado está realizando teletrabajo @@ -68880,6 +70905,263 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `workerTimeControl_sendMail____` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_sendMail____`(vWeek INT, vYear INT, vWorkerFk INT) +BEGIN +/** + * Inserta en la tabla vn.mail para notificar a los empleados que teletrabajan de las jornadas que se han registrado. + * Inserta fichadas en el casos que se determina que el empleado está realizando teletrabajo + * + * @param vWeek + * @param vYear + * @param vWorkerFk -> En el caso de querer generarlo para todos los empleados deberá de informarse como NULL + */ + DECLARE vStarted VARCHAR(25); + DECLARE vEnded VARCHAR(25); + DECLARE vDone BOOL; + DECLARE vSender VARCHAR(255); + DECLARE vSenderOld VARCHAR(255); + DECLARE vDated DATE; + DECLARE vTimeWorkDecimal DECIMAL(5,2); + DECLARE vTimeWorkSexagesimal VARCHAR(5); + DECLARE vTimeWorkedDecimal DECIMAL(5,2); + DECLARE vTimeWorkedSexagesimal VARCHAR(5); + DECLARE vTimeWorkDecimalTotal DECIMAL(5,2); + DECLARE vTimeTable VARCHAR(100); + DECLARE vTimeTableDecimal DECIMAL(5,2); + DECLARE vWorkerFkOld INTEGER; + DECLARE vBusinessFk INTEGER; + DECLARE vHeader TEXT; + DECLARE vBody TEXT; + DECLARE vFooter TEXT; + DECLARE vReturn INTEGER; + DECLARE vAbsenceType VARCHAR(50); + DECLARE vWorkerInfo VARCHAR(90); + + DECLARE vCursor CURSOR FOR + SELECT CONCAT(u.name, '@verdnatura.es'), u.id, tb.dated, tb.timeWorkDecimal, LEFT(tb.timeWorkSexagesimal,5) timeWorkSexagesimal, + tb.timeTable, tc.timeWorkDecimal timeWorkedDecimal, LEFT(tc.timeWorkSexagesimal,5) timeWorkedSexagesimal, tb.type, tb.businessFk + FROM tmp.timeBusinessCalculate tb + JOIN user u ON u.id = tb.userFk + JOIN department d ON d.id = tb.departmentFk + JOIN postgresql.business b ON b.business_id = tb.businessFk + JOIN company c ON c.id = b.provider_id + LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = tb.userFk AND tc.dated = tb.dated + JOIN (SELECT tb.userFk, + SUM(IF(tb.type IS NULL, + IF(tc.timeWorkDecimal > 0, FALSE, IF(tb.timeWorkDecimal > 0, TRUE, FALSE)), + TRUE))isTeleworkingWeek + FROM tmp.timeBusinessCalculate tb + LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = tb.userFk AND tc.dated = tb.dated + GROUP BY tb.userFk + HAVING isTeleworkingWeek > 0 + )sub ON sub.userFk = u.id + WHERE d.isTeleworking AND + IFNULL(vWorkerFk,u.id) = u.id AND + c.code = 'VNL' + ORDER BY u.id, tb.dated; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + DROP TABLE IF EXISTS tmp.timeControlCalculate; + DROP TABLE IF EXISTS tmp.timeBusinessCalculate; + DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate; + DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate; + + SELECT CONCAT (MIN(dated), ' 00:00:00'), CONCAT (MAX(dated), ' 23:59:59') INTO vStarted, vEnded + FROM time + WHERE year = vYear AND + week = vWeek; + + DELETE FROM workerTimeControl + WHERE IFNULL(vWorkerFk, userFk) = userFk AND + timed BETWEEN vStarted AND vEnded AND + isSendMail; + + UPDATE workerTimeControlMail + SET updated = NOW(), state = 'SENDED' + WHERE year = vYear AND + week = vWeek AND + IFNULL(vWorkerFk, workerFk) = workerFk ; + + IF vWorkerFk IS NULL THEN + CALL timeControl_calculateAll(vStarted,vEnded); + CALL timeBusiness_calculateAll(vStarted,vEnded); + ELSE + CALL timeControl_calculateByUser(vWorkerFk,vStarted,vEnded); + CALL timeBusiness_calculateByUser(vWorkerFk,vStarted,vEnded); + END IF; + + SET vTimeWorkDecimalTotal = 0; + SET vBody= ''; + OPEN vCursor; + FETCH vCursor INTO vSender, vWorkerFk, vDated, vTimeWorkDecimal, vTimeWorkSexagesimal, vTimeTable, vTimeWorkedDecimal, vTimeWorkedSexagesimal, vAbsenceType, vBusinessFk ; + SET vWorkerFkOld = vWorkerFk ; + SET vSenderOld = vSender; + proc: LOOP + IF vDone THEN + LEAVE proc; + END IF; + + IF vTimeTable IS NULL AND vTimeWorkDecimal>0 AND vTimeWorkedDecimal IS NULL THEN + INSERT INTO workerTimeControl (userFk, timed, manual, direction, isSendMail) + SELECT vWorkerFk, CONCAT(vDated,' 08:00'), TRUE, 'in', TRUE; + IF vTimeWorkDecimal >= 5 THEN + INSERT INTO workerTimeControl (userFk, timed, manual, direction, isSendMail) + SELECT vWorkerFk, CONCAT(vDated,' 09:00'), TRUE, 'middle', TRUE; + INSERT INTO workerTimeControl (userFk, timed, manual, direction, isSendMail) + SELECT vWorkerFk, CONCAT(vDated,' 09:20'), TRUE, 'middle', TRUE; + END IF; + INSERT INTO workerTimeControl (userFk, timed, manual, direction, isSendMail) + SELECT vWorkerFk,CONCAT(vDated,' ', LEFT (SEC_TO_TIME(28800 + (vTimeWorkDecimal * 3600)), 5)), TRUE, 'out', TRUE; + ELSEIF vTimeWorkDecimal>0 AND vTimeWorkedDecimal IS NULL THEN + SELECT SUM(TIME_TO_SEC(j.end)-TIME_TO_SEC(j.start))/3600 INTO vTimeTableDecimal + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + IF vTimeWorkDecimal = vTimeTableDecimal THEN + INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) + SELECT vWorkerFk, CONCAT(vDated, ' ', j.start), TRUE, TRUE + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + + INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) + SELECT vWorkerFk, CONCAT(vDated, ' ', j.end), TRUE, TRUE + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + ELSE + INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) + SELECT vWorkerFk, CONCAT(vDated, ' ', MIN(j.start)), TRUE, TRUE + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) + SELECT vWorkerFk, CONCAT(vDated, ' ', SEC_TO_TIME(TIME_TO_SEC(MIN(j.start)) + (vTimeWorkDecimal * 3600))), TRUE, TRUE + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + END IF; + + IF vTimeWorkDecimal >= 5 THEN + INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) + SELECT vWorkerFk, CONCAT(vDated, ' ', SEC_TO_TIME(TIME_TO_SEC(MIN(j.start)) + 3600)), TRUE, TRUE + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + INSERT INTO workerTimeControl (userFk, timed, manual, isSendMail) + SELECT vWorkerFk, CONCAT(vDated, ' ', SEC_TO_TIME(TIME_TO_SEC(MIN(j.start)) + 4800)), TRUE, TRUE + FROM postgresql.journey j + WHERE j.business_id = vBusinessFk AND + j.day_id = WEEKDAY(vDated)+1; + END IF; + + UPDATE workerTimeControl wtc + JOIN (SELECT id FROM workerTimeControl + WHERE userFk = vWorkerFk AND + timed BETWEEN vDated AND CONCAT(vDated, ' 23:59:59') + ORDER BY timed ASC + LIMIT 1)sub on sub.id= wtc.id + SET direction = 'in' ; + + UPDATE workerTimeControl wtc + JOIN (SELECT id FROM workerTimeControl + WHERE userFk = vWorkerFk AND + timed BETWEEN vDated AND CONCAT(vDated, ' 23:59:59') + ORDER BY timed DESC + LIMIT 1)sub on sub.id= wtc.id + SET direction = 'out' ; + + END IF; + + SELECT CONCAT(IFNULL(vBody,""), " + ", DATE_FORMAT(vDated, "%d/%m/%Y"), " + ", CASE WEEKDAY(vDated)+1 + WHEN 1 THEN 'Lunes' + WHEN 2 THEN 'Martes' + WHEN 3 THEN 'Miércoles' + WHEN 4 THEN 'Jueves' + WHEN 5 THEN 'Viernes' + WHEN 6 THEN 'Sábado' + WHEN 7 THEN 'Domingo' + END , " + ", IFNULL(GROUP_CONCAT(MID(timed, 12, 5) ORDER BY timed ASC SEPARATOR ' - '), " - ")," + ", IFNULL(vAbsenceType, IF (vTimeWorkedDecimal>0, "Presencial", IF(vTimeWorkDecimal>0, "Teletrabajo", " - "))), " + ", IFNULL(vTimeWorkedSexagesimal, vTimeWorkSexagesimal), " + ") INTO vBody + FROM workerTimeControl + WHERE userFk = vWorkerFk AND + timed BETWEEN vDated AND CONCAT(vDated," 23:59:59"); + SET vTimeWorkDecimalTotal = vTimeWorkDecimalTotal + IFNULL(vTimeWorkedDecimal, vTimeWorkDecimal); + SET vDone = FALSE; + FETCH vCursor INTO vSender, vWorkerFk, vDated, vTimeWorkDecimal, vTimeWorkSexagesimal, vTimeTable, vTimeWorkedDecimal, vTimeWorkedSexagesimal, vAbsenceType, vBusinessFk; + + IF vWorkerFk <> vWorkerFkOld OR vDone THEN + SELECT CONCAT( IFNULL(nif, ''), ' - ', firstName, ' ', name ) INTO vWorkerInfo + FROM postgresql.person + WHERE id_trabajador = vWorkerFkOld; + SET vHeader = CONCAT("


+
+

", vWorkerInfo , "

+ + + + + + + + + + + + "); + + SET vFooter = CONCAT(" + + + + +
+ Según la información recogida en el sistema adjuntamos la tabla con los registros de las horas trabajadas en el período indicado. + Si está conforme tiene que contestar indicando únicamente la palabra OK, en caso contrario puede contestar detallando la causa de la disconformidad. + Rogamos nos conteste lo antes posible. +

+
FechaDíaFichadasDescripciónHoras
TOTAL", IFNULL(LEFT (SEC_TO_TIME(vTimeWorkDecimalTotal * 3600), 5), 0), "
+
"); + INSERT INTO mail(sender, replyto, subject, body) + VALUES (vSenderOld, + 'timecontrol@verdnatura.es', + CONCAT('Registro de horas semana ', vWeek, ' año ', vYear) , + CONCAT(vHeader, ' ' , vBody, ' ', vFooter)); + + INSERT IGNORE INTO workerTimeControlMail (workerFk, year, week) + VALUES(vWorkerFkOld, vYear, vWeek); + SET vBody = ''; + SET vTimeWorkDecimalTotal = 0; + SET vWorkerFkOld = vWorkerFk ; + SET vSenderOld = vSender; + END IF; + END LOOP; + CLOSE vCursor; + + DROP TABLE IF EXISTS tmp.timeControlCalculate; + DROP TABLE IF EXISTS tmp.timeBusinessCalculate; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `workerWeekControl` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -72708,7 +74990,7 @@ USE `sage`; /*!50001 SET collation_connection = utf8mb4_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `invoiceInList` AS select `invoiceIn`.`id` AS `id`,`invoiceIn`.`supplierRef` AS `supplierRef`,`invoiceIn`.`serial` AS `serial`,`invoiceIn`.`supplierFk` AS `supplierFk`,`invoiceIn`.`issued` AS `issued`,`invoiceIn`.`isVatDeductible` AS `isVatDeductible`,`invoiceIn`.`serialNumber` AS `serialNumber` from `vn`.`invoiceIn` where (`invoiceIn`.`issued` >= (date_format(curdate(),'%Y-01-01') + interval -(1) year)) union all select `vn`.`dua`.`id` AS `id`,`vn`.`dua`.`code` AS `code`,'D' AS `D`,442 AS `442`,`vn`.`dua`.`issued` AS `issued`,0 AS `FALSE`,`vn`.`dua`.`id` AS `serialNumber` from `vn`.`dua` */; +/*!50001 VIEW `invoiceInList` AS select `vn`.`invoiceIn`.`id` AS `id`,`vn`.`invoiceIn`.`supplierRef` AS `supplierRef`,`vn`.`invoiceIn`.`serial` AS `serial`,`vn`.`invoiceIn`.`supplierFk` AS `supplierFk`,`vn`.`invoiceIn`.`issued` AS `issued`,`vn`.`invoiceIn`.`isVatDeductible` AS `isVatDeductible`,`vn`.`invoiceIn`.`serialNumber` AS `serialNumber` from `vn`.`invoiceIn` where (`vn`.`invoiceIn`.`issued` >= (date_format(curdate(),'%Y-01-01') + interval -(1) year)) union all select `vn`.`dua`.`id` AS `id`,`vn`.`dua`.`code` AS `code`,'D' AS `D`,442 AS `442`,`vn`.`dua`.`issued` AS `issued`,0 AS `FALSE`,`vn`.`dua`.`id` AS `serialNumber` from `vn`.`dua` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -73655,6 +75937,24 @@ USE `vn`; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; +-- +-- Final view structure for view `invoiceIn__` +-- + +/*!50001 DROP VIEW IF EXISTS `invoiceIn__`*/; +/*!50001 SET @saved_cs_client = @@character_set_client */; +/*!50001 SET @saved_cs_results = @@character_set_results */; +/*!50001 SET @saved_col_connection = @@collation_connection */; +/*!50001 SET character_set_client = utf8mb4 */; +/*!50001 SET character_set_results = utf8mb4 */; +/*!50001 SET collation_connection = utf8mb4_general_ci */; +/*!50001 CREATE ALGORITHM=UNDEFINED */ +/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ +/*!50001 VIEW `invoiceIn__` AS select `r`.`id` AS `id`,`r`.`num_recibida` AS `serialNumber`,`r`.`serie` AS `serial`,`r`.`proveedor_id` AS `supplierFk`,`r`.`fecha` AS `issued`,`r`.`sref` AS `supplierRef`,`r`.`contabilizada` AS `isBooked`,`r`.`moneda_id` AS `currencyFk`,`r`.`MYSQL_TIME` AS `created`,`r`.`empresa_id` AS `companyFk`,`r`.`gestdoc_id` AS `docFk`,`r`.`dateBooking` AS `booked`,`r`.`dateOperation` AS `operated`,`r`.`cplusInvoiceType472Fk` AS `cplusInvoiceType472Fk`,`r`.`cplusRectificationTypeFk` AS `cplusRectificationTypeFk`,`r`.`cplusSubjectOpFk` AS `cplusSubjectOpFk`,`r`.`cplusTaxBreakFk` AS `cplusTaxBreakFk`,`r`.`cplusTrascendency472Fk` AS `cplusTrascendency472Fk`,`r`.`bookEntried` AS `bookEntried`,`r`.`isVatDeductible` AS `isVatDeductible`,`r`.`withholdingSageFk` AS `withholdingSageFk`,`r`.`transactionTypeSageFk` AS `transactionTypeSageFk` from `vn2008`.`recibida` `r` */; +/*!50001 SET character_set_client = @saved_cs_client */; +/*!50001 SET character_set_results = @saved_cs_results */; +/*!50001 SET collation_connection = @saved_col_connection */; + -- -- Final view structure for view `itemBotanicalWithGenus` -- @@ -74894,4 +77194,4 @@ USE `vncontrol`; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2020-11-25 9:17:08 +-- Dump completed on 2020-12-17 8:13:33 From b9344832d6dd505e194eff563b03507a7c3c1087 Mon Sep 17 00:00:00 2001 From: bernat Date: Fri, 18 Dec 2020 10:08:51 +0100 Subject: [PATCH 053/101] cr changes --- .../back/methods/supplier/consumption.js | 19 +++--- modules/supplier/front/consumption/index.html | 12 ++-- modules/supplier/front/routes.json | 1 + .../supplier-campaign-metrics/sql/buys.sql | 64 +++++++++---------- .../supplier-campaign-metrics/sql/entries.sql | 16 ++--- 5 files changed, 59 insertions(+), 53 deletions(-) diff --git a/modules/supplier/back/methods/supplier/consumption.js b/modules/supplier/back/methods/supplier/consumption.js index 1d7cd04117..e8e22625fb 100644 --- a/modules/supplier/back/methods/supplier/consumption.js +++ b/modules/supplier/back/methods/supplier/consumption.js @@ -71,9 +71,9 @@ module.exports = Self => { case 'buyerId': return {'it.workerFk': value}; case 'from': - return {'e.shipped': {gte: value}}; + return {'t.shipped': {gte: value}}; case 'to': - return {'e.shipped': {lte: value}}; + return {'t.shipped': {lte: value}}; } }); @@ -93,9 +93,13 @@ module.exports = Self => { e.supplierFk, t.shipped FROM vn.entry e - JOIN vn.travel t ON t.id = e.travelFk`); - + JOIN vn.travel t ON t.id = e.travelFk + JOIN buy b ON b.id = b.entryFk + JOIN item i ON i.id = b.itemFk + JOIN itemType it ON it.id = i.typeFk`); + stmt.merge(conn.makeWhere(filter.where)); stmt.merge(conn.makeGroupBy('e.id')); + stmt.merge(conn.makeLimit(filter)); stmts.push(stmt); const entriesIndex = stmts.push('SELECT * FROM tmp.entry') - 1; @@ -129,19 +133,18 @@ module.exports = Self => { it.workerFk, it.categoryFk, it.code AS itemTypeCode - FROM buy b + FROM buy b JOIN tmp.entry e ON e.id = b.entryFk JOIN item i ON i.id = b.itemFk JOIN itemType it ON it.id = i.typeFk` ); - stmt.merge(conn.makeWhere(filter.where)); + stmt.merge('WHERE b.quantity > 0'); stmt.merge(conn.makeGroupBy('b.id')); + stmt.merge(conn.makeOrderBy(filter.order)); const buysIndex = stmts.push(stmt) - 1; stmts.push(`DROP TEMPORARY TABLE tmp.entry`); const sql = ParameterizedSQL.join(stmts, ';'); - stmt.merge(conn.makePagination(filter)); - const result = await conn.executeStmt(sql); const entries = result[entriesIndex]; diff --git a/modules/supplier/front/consumption/index.html b/modules/supplier/front/consumption/index.html index 4587f60f2a..a0df60ea9b 100644 --- a/modules/supplier/front/consumption/index.html +++ b/modules/supplier/front/consumption/index.html @@ -36,12 +36,12 @@ ng-if="entry.buys"> - Entry - {{::entry.id}} + Entry + {{::entry.id}} Date {{::entry.shipped | date: 'dd/MM/yyyy'}} Reference - {{::entry.ref}} + {{::entry.ref}} @@ -62,6 +62,8 @@ {{::buy.total | dashIfEmpty}} + + - - + + diff --git a/modules/supplier/front/routes.json b/modules/supplier/front/routes.json index 7501d329cb..fc03ffe700 100644 --- a/modules/supplier/front/routes.json +++ b/modules/supplier/front/routes.json @@ -82,6 +82,7 @@ "state": "supplier.card.consumption", "component": "vn-supplier-consumption", "description": "Consumption", + "acl": ["administrative"], "params": { "supplier": "$ctrl.supplier" } diff --git a/print/templates/reports/supplier-campaign-metrics/sql/buys.sql b/print/templates/reports/supplier-campaign-metrics/sql/buys.sql index 898568c0a9..a094ac2054 100644 --- a/print/templates/reports/supplier-campaign-metrics/sql/buys.sql +++ b/print/templates/reports/supplier-campaign-metrics/sql/buys.sql @@ -1,33 +1,33 @@ SELECT - b.id AS buyId, - b.itemFk, - b.entryFk, - CAST(b.buyingValue AS DECIMAL(10,2)) AS price, - b.quantity, - i.id, - i.description, - i.name AS itemName, - i.subName, - i.size AS itemSize, - i.typeFk AS itemTypeFk, - i.tag5, - i.value5, - i.tag6, - i.value6, - i.tag7, - i.value7, - i.tag8, - i.value8, - i.tag9, - i.value9, - i.tag10, - i.value10, - it.id, - it.workerFk, - it.categoryFk, - it.code AS itemTypeCode - FROM buy b - JOIN item i ON i.id = b.itemFk - JOIN itemType it ON it.id = i.typeFk - WHERE b.entryFk IN(:entriesId) AND b.quantity > 0 - ORDER BY i.typeFk , i.name \ No newline at end of file + b.id AS buyId, + b.itemFk, + b.entryFk, + CAST(b.buyingValue AS DECIMAL(10,2)) AS price, + b.quantity, + i.id, + i.description, + i.name AS itemName, + i.subName, + i.size AS itemSize, + i.typeFk AS itemTypeFk, + i.tag5, + i.value5, + i.tag6, + i.value6, + i.tag7, + i.value7, + i.tag8, + i.value8, + i.tag9, + i.value9, + i.tag10, + i.value10, + it.id, + it.workerFk, + it.categoryFk, + it.code AS itemTypeCode + FROM buy b + JOIN item i ON i.id = b.itemFk + JOIN itemType it ON it.id = i.typeFk + WHERE b.entryFk IN(:entriesId) AND b.quantity > 0 + ORDER BY i.typeFk , i.name \ No newline at end of file diff --git a/print/templates/reports/supplier-campaign-metrics/sql/entries.sql b/print/templates/reports/supplier-campaign-metrics/sql/entries.sql index 946c4ab65c..aa458dda0e 100644 --- a/print/templates/reports/supplier-campaign-metrics/sql/entries.sql +++ b/print/templates/reports/supplier-campaign-metrics/sql/entries.sql @@ -1,8 +1,8 @@ - SELECT - e.id, - e.ref, - e.supplierFk, - t.shipped - FROM vn.entry e - JOIN vn.travel t ON t.id = e.travelFk - WHERE e.supplierFk = ? AND DATE(t.shipped) BETWEEN ? AND ? +SELECT + e.id, + e.ref, + e.supplierFk, + t.shipped + FROM vn.entry e + JOIN vn.travel t ON t.id = e.travelFk + WHERE e.supplierFk = ? AND DATE(t.shipped) BETWEEN ? AND ? From 177d3cd35bcf71a88e34f90a3f8e2eaa951827aa Mon Sep 17 00:00:00 2001 From: carlosjr Date: Fri, 18 Dec 2020 13:16:44 +0100 Subject: [PATCH 054/101] fixtures amended for calendar testing --- db/dump/fixtures.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index b53d946309..f923e2a577 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -1758,16 +1758,16 @@ INSERT INTO `postgresql`.`calendar_employee` (`business_id`, `calendar_state_id` (106, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -11 DAY), DATE_ADD(CURDATE(), INTERVAL 11 DAY))), (106, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -12 DAY), DATE_ADD(CURDATE(), INTERVAL 12 DAY))), (106, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -20 DAY), DATE_ADD(CURDATE(), INTERVAL 20 DAY))), - (106, 2, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -13 DAY), DATE_ADD(CURDATE(), INTERVAL 13 DAY))), - (106, 1, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -14 DAY), DATE_ADD(CURDATE(), INTERVAL 14 DAY))), - (106, 2, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -15 DAY), DATE_ADD(CURDATE(), INTERVAL 15 DAY))), + (106, 2, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -13 DAY), DATE_ADD(CURDATE(), INTERVAL 8 DAY))), + (106, 1, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -14 DAY), DATE_ADD(CURDATE(), INTERVAL 9 DAY))), + (106, 2, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -15 DAY), DATE_ADD(CURDATE(), INTERVAL 7 DAY))), (107, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -10 DAY), DATE_ADD(CURDATE(), INTERVAL 10 DAY))), (107, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -11 DAY), DATE_ADD(CURDATE(), INTERVAL 11 DAY))), (107, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -12 DAY), DATE_ADD(CURDATE(), INTERVAL 12 DAY))), (107, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -20 DAY), DATE_ADD(CURDATE(), INTERVAL 20 DAY))), - (107, 2, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -13 DAY), DATE_ADD(CURDATE(), INTERVAL 13 DAY))), - (107, 1, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -14 DAY), DATE_ADD(CURDATE(), INTERVAL 14 DAY))), - (107, 2, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -15 DAY), DATE_ADD(CURDATE(), INTERVAL 15 DAY))); + (107, 2, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -13 DAY), DATE_ADD(CURDATE(), INTERVAL 8 DAY))), + (107, 1, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -14 DAY), DATE_ADD(CURDATE(), INTERVAL 9 DAY))), + (107, 2, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -15 DAY), DATE_ADD(CURDATE(), INTERVAL 7 DAY))); INSERT INTO `vn`.`smsConfig` (`id`, `uri`, `title`) VALUES From 2fe22efe3621175f263abd67d9ff6832655e7c30 Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Fri, 18 Dec 2020 15:12:52 +0100 Subject: [PATCH 055/101] filter vehicles by worehouse --- modules/route/front/create/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/route/front/create/index.html b/modules/route/front/create/index.html index 754bed9f42..1a9a4b96d0 100644 --- a/modules/route/front/create/index.html +++ b/modules/route/front/create/index.html @@ -26,6 +26,7 @@ label="Vehicle" ng-model="$ctrl.route.vehicleFk" url="Vehicles" + where="{warehouseFk: $ctrl.vnConfig.warehouseFk}" show-field="numberPlate"> Date: Fri, 18 Dec 2020 17:23:04 +0100 Subject: [PATCH 056/101] Refactor v2 --- .gitignore | 2 +- back/methods/dms/updateFile.js | 59 +++++--------- back/methods/dms/uploadFile.js | 57 ++++++-------- back/methods/image/download.js | 4 +- back/methods/image/specs/upload.spec.js | 16 ++-- back/methods/image/upload.js | 73 ++++++++---------- back/model-config.json | 9 ++- back/models/container.json | 13 ---- back/models/dms-container.json | 10 +++ back/models/{dmsType.js => dms-type.js} | 0 back/models/{dmsType.json => dms-type.json} | 0 back/models/dms.js | 8 +- back/models/image-container.json | 19 ++--- back/models/image.js | 16 ++-- back/models/temp-container.json | 10 +++ db/dump/fixtures.sql | 26 +++---- .../salix/components/upload-photo/index.html | 16 ++++ front/salix/components/upload-photo/index.js | 20 ++++- .../components/upload-photo/locale/es.yml | 3 +- loopback/common/models/container.js | 57 ++++++++++++++ loopback/common/models/container.json | 12 +++ loopback/server/boot/storage.js | 31 -------- loopback/server/datasources.json | 20 +++++ loopback/server/model-config.json | 3 + .../methods/client-dms/allowedContentTypes.js | 23 ------ modules/client/back/models/client-dms.js | 1 - modules/client/front/dms/create/index.js | 2 +- modules/client/front/dms/edit/index.js | 2 +- .../item-image-queue/downloadImages.js | 8 +- .../methods/ticket-dms/allowedContentTypes.js | 23 ------ modules/ticket/back/models/ticket-dms.js | 1 - modules/ticket/front/dms/create/index.js | 2 +- modules/ticket/front/dms/edit/index.js | 2 +- .../travel-thermograph/allowedContentTypes.js | 23 ------ .../travel/back/models/travel-thermograph.js | 1 - .../travel/front/thermograph/create/index.js | 2 +- .../travel/front/thermograph/edit/index.js | 2 +- .../methods/worker-dms/allowedContentTypes.js | 23 ------ modules/worker/back/models/worker-dms.js | 1 - modules/worker/front/dms/create/index.js | 2 +- modules/worker/front/dms/edit/index.js | 2 +- modules/worker/front/dms/index/index.html | 2 +- print/config/print.json | 2 +- ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 1.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 10.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 11.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 12.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 13.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 2.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 3.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 4.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 5.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 6.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 7.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 8.png} | Bin ...-3ab5-11eb-9ab8-27f6fc3b85fd.png => 9.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 1.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 10.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 11.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 12.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 13.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 2.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 3.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 4.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 5.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 6.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 7.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 8.png} | Bin ...-3ab5-11eb-9ab8-27f6fc3b85fd.png => 9.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 1.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 10.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 11.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 12.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 13.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 2.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 3.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 4.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 5.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 6.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 7.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 8.png} | Bin ...-3ab5-11eb-9ab8-27f6fc3b85fd.png => 9.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 1.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 10.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 11.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 12.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 13.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 2.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 3.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 4.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 5.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 6.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 7.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 8.png} | Bin ...-3ab5-11eb-9ab8-27f6fc3b85fd.png => 9.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 1.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 10.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 11.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 12.png} | Bin ...3ab5-11eb-9ab8-27f6fc3b85fd.png => 13.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 2.png} | Bin ...-3ab3-11eb-9ab8-27f6fc3b85fd.png => 3.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 4.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 5.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 6.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 7.png} | Bin ...-3ab4-11eb-9ab8-27f6fc3b85fd.png => 8.png} | Bin ...-3ab5-11eb-9ab8-27f6fc3b85fd.png => 9.png} | Bin storage/tmp/tmp.txt | 1 + 109 files changed, 291 insertions(+), 318 deletions(-) delete mode 100644 back/models/container.json create mode 100644 back/models/dms-container.json rename back/models/{dmsType.js => dms-type.js} (100%) rename back/models/{dmsType.json => dms-type.json} (100%) create mode 100644 back/models/temp-container.json create mode 100644 loopback/common/models/container.js create mode 100644 loopback/common/models/container.json delete mode 100644 loopback/server/boot/storage.js delete mode 100644 modules/client/back/methods/client-dms/allowedContentTypes.js delete mode 100644 modules/ticket/back/methods/ticket-dms/allowedContentTypes.js delete mode 100644 modules/travel/back/methods/travel-thermograph/allowedContentTypes.js delete mode 100644 modules/worker/back/methods/worker-dms/allowedContentTypes.js rename storage/image/catalog/1600x900/{861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png => 1.png} (100%) rename storage/image/catalog/1600x900/{2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png => 10.png} (100%) rename storage/image/catalog/1600x900/{a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 11.png} (100%) rename storage/image/catalog/1600x900/{e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png => 12.png} (100%) rename storage/image/catalog/1600x900/{fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 13.png} (100%) rename storage/image/catalog/1600x900/{9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png => 2.png} (100%) rename storage/image/catalog/1600x900/{a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png => 3.png} (100%) rename storage/image/catalog/1600x900/{0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png => 4.png} (100%) rename storage/image/catalog/1600x900/{189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png => 5.png} (100%) rename storage/image/catalog/1600x900/{25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png => 6.png} (100%) rename storage/image/catalog/1600x900/{c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png => 7.png} (100%) rename storage/image/catalog/1600x900/{d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png => 8.png} (100%) rename storage/image/catalog/1600x900/{20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 9.png} (100%) rename storage/image/catalog/200x200/{861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png => 1.png} (100%) rename storage/image/catalog/200x200/{2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png => 10.png} (100%) rename storage/image/catalog/200x200/{a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 11.png} (100%) rename storage/image/catalog/200x200/{e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png => 12.png} (100%) rename storage/image/catalog/200x200/{fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 13.png} (100%) rename storage/image/catalog/200x200/{9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png => 2.png} (100%) rename storage/image/catalog/200x200/{a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png => 3.png} (100%) rename storage/image/catalog/200x200/{0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png => 4.png} (100%) rename storage/image/catalog/200x200/{189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png => 5.png} (100%) rename storage/image/catalog/200x200/{25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png => 6.png} (100%) rename storage/image/catalog/200x200/{c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png => 7.png} (100%) rename storage/image/catalog/200x200/{d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png => 8.png} (100%) rename storage/image/catalog/200x200/{20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 9.png} (100%) rename storage/image/catalog/50x50/{861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png => 1.png} (100%) rename storage/image/catalog/50x50/{2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png => 10.png} (100%) rename storage/image/catalog/50x50/{a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 11.png} (100%) rename storage/image/catalog/50x50/{e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png => 12.png} (100%) rename storage/image/catalog/50x50/{fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 13.png} (100%) rename storage/image/catalog/50x50/{9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png => 2.png} (100%) rename storage/image/catalog/50x50/{a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png => 3.png} (100%) rename storage/image/catalog/50x50/{0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png => 4.png} (100%) rename storage/image/catalog/50x50/{189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png => 5.png} (100%) rename storage/image/catalog/50x50/{25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png => 6.png} (100%) rename storage/image/catalog/50x50/{c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png => 7.png} (100%) rename storage/image/catalog/50x50/{d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png => 8.png} (100%) rename storage/image/catalog/50x50/{20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 9.png} (100%) rename storage/image/catalog/70x70/{861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png => 1.png} (100%) rename storage/image/catalog/70x70/{2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png => 10.png} (100%) rename storage/image/catalog/70x70/{a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 11.png} (100%) rename storage/image/catalog/70x70/{e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png => 12.png} (100%) rename storage/image/catalog/70x70/{fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 13.png} (100%) rename storage/image/catalog/70x70/{9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png => 2.png} (100%) rename storage/image/catalog/70x70/{a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png => 3.png} (100%) rename storage/image/catalog/70x70/{0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png => 4.png} (100%) rename storage/image/catalog/70x70/{189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png => 5.png} (100%) rename storage/image/catalog/70x70/{25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png => 6.png} (100%) rename storage/image/catalog/70x70/{c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png => 7.png} (100%) rename storage/image/catalog/70x70/{d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png => 8.png} (100%) rename storage/image/catalog/70x70/{20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 9.png} (100%) rename storage/image/catalog/full/{861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png => 1.png} (100%) rename storage/image/catalog/full/{2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png => 10.png} (100%) rename storage/image/catalog/full/{a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 11.png} (100%) rename storage/image/catalog/full/{e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png => 12.png} (100%) rename storage/image/catalog/full/{fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 13.png} (100%) rename storage/image/catalog/full/{9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png => 2.png} (100%) rename storage/image/catalog/full/{a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png => 3.png} (100%) rename storage/image/catalog/full/{0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png => 4.png} (100%) rename storage/image/catalog/full/{189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png => 5.png} (100%) rename storage/image/catalog/full/{25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png => 6.png} (100%) rename storage/image/catalog/full/{c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png => 7.png} (100%) rename storage/image/catalog/full/{d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png => 8.png} (100%) rename storage/image/catalog/full/{20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png => 9.png} (100%) create mode 100644 storage/tmp/tmp.txt diff --git a/.gitignore b/.gitignore index 04a977352c..a6007f3181 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ coverage node_modules dist -storage +#storage npm-debug.log .eslintcache datasources.*.json diff --git a/back/methods/dms/updateFile.js b/back/methods/dms/updateFile.js index 9f8f4f2938..a420f2ea11 100644 --- a/back/methods/dms/updateFile.js +++ b/back/methods/dms/updateFile.js @@ -1,5 +1,6 @@ const UserError = require('vn-loopback/util/user-error'); const fs = require('fs-extra'); +const path = require('path'); module.exports = Self => { Self.remoteMethodCtx('updateFile', { @@ -84,66 +85,46 @@ module.exports = Self => { }; async function uploadNewFile(ctx, dms, myOptions) { - const storageConnector = Self.app.dataSources.dmsStorage.connector; const models = Self.app.models; + const TempContainer = models.TempContainer; + const DmsContainer = models.DmsContainer; const fileOptions = {}; - - const tempContainer = await getContainer('temp'); - const makeUpload = await models.Container.upload(tempContainer.name, ctx.req, ctx.result, fileOptions); + const tempContainer = await TempContainer.container('dms'); + const makeUpload = await TempContainer.upload(tempContainer.name, ctx.req, ctx.result, fileOptions); const keys = Object.values(makeUpload.files); const files = keys.map(file => file[0]); - const file = files[0]; + const uploadedFile = files[0]; - if (file) { - const oldExtension = storageConnector.getFileExtension(dms.file); - const newExtension = storageConnector.getFileExtension(file.name); + if (uploadedFile) { + const oldExtension = DmsContainer.getFileExtension(dms.file); + const newExtension = DmsContainer.getFileExtension(uploadedFile.name); const fileName = `${dms.id}.${newExtension}`; try { if (oldExtension != newExtension) { - const pathHash = storageConnector.getPathHash(dms.id); + const pathHash = DmsContainer.getHash(dms.id); - await models.Container.removeFile(pathHash, dms.file); + await DmsContainer.removeFile(pathHash, dms.file); } } catch (err) {} const updatedDms = await dms.updateAttributes({ - contentType: file.type, + contentType: uploadedFile.type, file: fileName }, myOptions); - const pathHash = storageConnector.getPathHash(updatedDms.id); - const container = await getContainer(pathHash); + const file = await TempContainer.getFile(tempContainer.name, uploadedFile.name); + const srcFile = path.join(file.client.root, file.container, file.name); - const originPath = `${tempContainer.client.root}/${tempContainer.name}/${file.name}`; - const destinationPath = `${container.client.root}/${pathHash}/${updatedDms.file}`; + const pathHash = DmsContainer.getHash(updatedDms.id); + const dmsContainer = await DmsContainer.container(pathHash); + const dstFile = path.join(dmsContainer.client.root, pathHash, updatedDms.file); - fs.rename(originPath, destinationPath); + await fs.move(srcFile, dstFile, { + overwrite: true + }); return updatedDms; } } - - /** - * Returns a container instance - * If doesn't exists creates a new one - * - * @param {String} name Container name - * @return {Object} Container instance - */ - async function getContainer(name) { - const models = Self.app.models; - let container; - try { - container = await models.Container.getContainer(name); - } catch (err) { - if (err.code === 'ENOENT') { - container = await models.Container.createContainer({ - name: name - }); - } else throw err; - } - - return container; - } }; diff --git a/back/methods/dms/uploadFile.js b/back/methods/dms/uploadFile.js index 8e5c4eb638..c3065c3cce 100644 --- a/back/methods/dms/uploadFile.js +++ b/back/methods/dms/uploadFile.js @@ -1,5 +1,6 @@ const UserError = require('vn-loopback/util/user-error'); const fs = require('fs-extra'); +const path = require('path'); module.exports = Self => { Self.remoteMethodCtx('uploadFile', { @@ -46,8 +47,9 @@ module.exports = Self => { }); Self.uploadFile = async(ctx, options) => { - const storageConnector = Self.app.dataSources.dmsStorage.connector; const models = Self.app.models; + const TempContainer = models.TempContainer; + const DmsContainer = models.DmsContainer; const fileOptions = {}; const args = ctx.args; @@ -62,28 +64,33 @@ module.exports = Self => { myOptions.transaction = tx; } + let srcFile; try { const hasWriteRole = await models.DmsType.hasWriteRole(ctx, args.dmsTypeId, myOptions); if (!hasWriteRole) throw new UserError(`You don't have enough privileges`); // Upload file to temporary path - const tempContainer = await getContainer('temp'); - const uploaded = await models.Container.upload(tempContainer.name, ctx.req, ctx.result, fileOptions); + const tempContainer = await TempContainer.container('dms'); + const uploaded = await TempContainer.upload(tempContainer.name, ctx.req, ctx.result, fileOptions); const files = Object.values(uploaded.files).map(file => { return file[0]; }); const addedDms = []; - for (const file of files) { - const newDms = await createDms(ctx, file, myOptions); - const pathHash = storageConnector.getPathHash(newDms.id); - const container = await getContainer(pathHash); + for (const uploadedFile of files) { + const newDms = await createDms(ctx, uploadedFile, myOptions); + const pathHash = DmsContainer.getHash(newDms.id); - const originPath = `${tempContainer.client.root}/${tempContainer.name}/${file.name}`; - const destinationPath = `${container.client.root}/${pathHash}/${newDms.file}`; + const file = await TempContainer.getFile(tempContainer.name, uploadedFile.name); + srcFile = path.join(file.client.root, file.container, file.name); - await fs.rename(originPath, destinationPath); + const dmsContainer = await DmsContainer.container(pathHash); + const dstFile = path.join(dmsContainer.client.root, pathHash, newDms.file); + + await fs.move(srcFile, dstFile, { + overwrite: true + }); addedDms.push(newDms); } @@ -92,13 +99,16 @@ module.exports = Self => { return addedDms; } catch (e) { if (tx) await tx.rollback(); + + if (fs.existsSync(srcFile)) + await fs.unlink(srcFile); + throw e; } }; async function createDms(ctx, file, myOptions) { const models = Self.app.models; - const storageConnector = Self.app.dataSources.dmsStorage.connector; const myUserId = ctx.req.accessToken.userId; const myWorker = await models.Worker.findOne({where: {userFk: myUserId}}, myOptions); const args = ctx.args; @@ -115,32 +125,9 @@ module.exports = Self => { }, myOptions); let fileName = file.name; - const extension = storageConnector.getFileExtension(fileName); + const extension = models.DmsContainer.getFileExtension(fileName); fileName = `${newDms.id}.${extension}`; return newDms.updateAttribute('file', fileName, myOptions); } - - /** - * Returns a container instance - * If doesn't exists creates a new one - * - * @param {String} name Container name - * @return {Object} Container instance - */ - async function getContainer(name) { - const models = Self.app.models; - let container; - try { - container = await models.Container.getContainer(name); - } catch (err) { - if (err.code === 'ENOENT') { - container = await models.Container.createContainer({ - name: name - }); - } else throw err; - } - - return container; - } }; diff --git a/back/methods/image/download.js b/back/methods/image/download.js index ba709aff88..9b02a7b395 100644 --- a/back/methods/image/download.js +++ b/back/methods/image/download.js @@ -1,5 +1,6 @@ const UserError = require('vn-loopback/util/user-error'); const fs = require('fs-extra'); +const path = require('path'); module.exports = Self => { Self.remoteMethodCtx('download', { @@ -69,8 +70,9 @@ module.exports = Self => { const container = await models.ImageContainer.getContainer(collection); const rootPath = container.client.root; + const fileSrc = path.join(rootPath, collection, size); const file = { - path: `${rootPath}/${collection}/${size}/${image.name}.png`, + path: `${fileSrc}/${image.name}.png`, contentType: 'image/png', name: `${image.name}.png` }; diff --git a/back/methods/image/specs/upload.spec.js b/back/methods/image/specs/upload.spec.js index 3f2cb6f64d..8521f2f20d 100644 --- a/back/methods/image/specs/upload.spec.js +++ b/back/methods/image/specs/upload.spec.js @@ -29,8 +29,8 @@ describe('image upload()', () => { expect(error.message).toEqual(`You don't have enough privileges`); }); - it('should call to the ImageContainer upload method for the collection "catalog"', async() => { - const containerModel = app.models.ImageContainer; + it('should call to the TempContainer upload method for the collection "catalog"', async() => { + const containerModel = app.models.TempContainer; spyOn(containerModel, 'upload'); const ctx = {req: {accessToken: {userId: buyerId}}, @@ -73,8 +73,8 @@ describe('image upload()', () => { const workerId = 106; const itemId = 4; - it('should be able to call to the ImageContainer upload method for the collection "user"', async() => { - const containerModel = app.models.ImageContainer; + it('should be able to call to the TempContainer upload method for the collection "user"', async() => { + const containerModel = app.models.TempContainer; spyOn(containerModel, 'upload'); const ctx = {req: {accessToken: {userId: marketingId}}, @@ -91,8 +91,8 @@ describe('image upload()', () => { expect(containerModel.upload).toHaveBeenCalled(); }); - it('should be able to call to the ImageContainer upload method for the collection "catalog"', async() => { - const containerModel = app.models.ImageContainer; + it('should be able to call to the TempContainer upload method for the collection "catalog"', async() => { + const containerModel = app.models.TempContainer; spyOn(containerModel, 'upload'); const ctx = {req: {accessToken: {userId: marketingId}}, @@ -115,8 +115,8 @@ describe('image upload()', () => { const workerId = 106; const itemId = 4; - it('should upload a file for the collection "user" and call to the ImageContainer upload method', async() => { - const containerModel = app.models.ImageContainer; + it('should upload a file for the collection "user" and call to the TempContainer upload method', async() => { + const containerModel = app.models.TempContainer; spyOn(containerModel, 'upload'); const ctx = {req: {accessToken: {userId: hhrrId}}, diff --git a/back/methods/image/upload.js b/back/methods/image/upload.js index b50a55b346..59e9738ec5 100644 --- a/back/methods/image/upload.js +++ b/back/methods/image/upload.js @@ -1,5 +1,6 @@ const UserError = require('vn-loopback/util/user-error'); const fs = require('fs-extra'); +const path = require('path'); module.exports = Self => { Self.remoteMethodCtx('upload', { @@ -17,6 +18,12 @@ module.exports = Self => { type: 'string', description: 'The collection name', required: true + }, + { + arg: 'fileName', + type: 'string', + description: 'The file name', + required: true }], returns: { type: 'Object', @@ -30,48 +37,36 @@ module.exports = Self => { Self.upload = async ctx => { const models = Self.app.models; + const TempContainer = models.TempContainer; const fileOptions = {}; const args = ctx.args; - const hasWriteRole = await models.ImageCollection.hasWriteRole(ctx, args.collection); - if (!hasWriteRole) - throw new UserError(`You don't have enough privileges`); - - if (process.env.NODE_ENV == 'test') - throw new UserError(`You can't upload images on the test instance`); - - // Upload file to temporary path - const container = await getContainer(args.collection); - const uploaded = await models.ImageContainer.upload(container.name, ctx.req, ctx.result, fileOptions); - const [uploadedFile] = Object.values(uploaded.files).map(file => { - return file[0]; - }); - - const file = await models.ImageContainer.getFile(container.name, uploadedFile.name); - const srcFile = `${file.client.root}/${file.container}/${file.name}`; - await models.Image.registerImage(container.name, srcFile, args.id); - }; - - /** - * Returns a container instance - * If doesn't exists creates a new one - * - * @param {String} name Container name - * @return {Object} Container instance - */ - async function getContainer(name) { - const models = Self.app.models; - let container; + let srcFile; try { - container = await models.ImageContainer.getContainer(name); - } catch (err) { - if (err.code === 'ENOENT') { - container = await models.ImageContainer.createContainer({ - name: name - }); - } else throw err; - } + const hasWriteRole = await models.ImageCollection.hasWriteRole(ctx, args.collection); + if (!hasWriteRole) + throw new UserError(`You don't have enough privileges`); - return container; - } + if (process.env.NODE_ENV == 'test') + throw new UserError(`You can't upload images on the test instance`); + + await TempContainer.allowedContentTypes(); + + // Upload file to temporary path + const tempContainer = await TempContainer.container(args.collection); + const uploaded = await TempContainer.upload(tempContainer.name, ctx.req, ctx.result, fileOptions); + const [uploadedFile] = Object.values(uploaded.files).map(file => { + return file[0]; + }); + const file = await TempContainer.getFile(tempContainer.name, uploadedFile.name); + srcFile = path.join(file.client.root, file.container, file.name); + + await models.Image.registerImage(args.collection, srcFile, args.fileName, args.id); + } catch (e) { + if (fs.existsSync(srcFile)) + await fs.unlink(srcFile); + + throw e; + } + }; }; diff --git a/back/model-config.json b/back/model-config.json index 3db249f0fe..5e4cc23a25 100644 --- a/back/model-config.json +++ b/back/model-config.json @@ -17,9 +17,6 @@ "Company": { "dataSource": "vn" }, - "Container": { - "dataSource": "dmsStorage" - }, "Continent": { "dataSource": "vn" }, @@ -35,6 +32,9 @@ "Delivery": { "dataSource": "vn" }, + "DmsContainer": { + "dataSource": "dmsStorage" + }, "Image": { "dataSource": "vn" }, @@ -53,6 +53,9 @@ "Province": { "dataSource": "vn" }, + "TempContainer": { + "dataSource": "tempStorage" + }, "UserConfig": { "dataSource": "vn" }, diff --git a/back/models/container.json b/back/models/container.json deleted file mode 100644 index eca4c30c7c..0000000000 --- a/back/models/container.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "Container", - "base": "VnModel", - "idInjection": true, - "options": { - "validateUpsert": true - }, - "properties": {}, - "validations": [], - "relations": {}, - "acls": [], - "methods": [] - } \ No newline at end of file diff --git a/back/models/dms-container.json b/back/models/dms-container.json new file mode 100644 index 0000000000..196c954203 --- /dev/null +++ b/back/models/dms-container.json @@ -0,0 +1,10 @@ +{ + "name": "DmsContainer", + "base": "Container", + "acls": [{ + "accessType": "READ", + "principalType": "ROLE", + "principalId": "$everyone", + "permission": "ALLOW" + }] +} \ No newline at end of file diff --git a/back/models/dmsType.js b/back/models/dms-type.js similarity index 100% rename from back/models/dmsType.js rename to back/models/dms-type.js diff --git a/back/models/dmsType.json b/back/models/dms-type.json similarity index 100% rename from back/models/dmsType.json rename to back/models/dms-type.json diff --git a/back/models/dms.js b/back/models/dms.js index 9e767904e9..91291a0c2a 100644 --- a/back/models/dms.js +++ b/back/models/dms.js @@ -14,12 +14,12 @@ module.exports = Self => { }; Self.getFile = async function(id) { - const storageConnector = Self.app.dataSources.dmsStorage.connector; const models = Self.app.models; + const DmsContainer = models.DmsContainer; const dms = await Self.findById(id); - const pathHash = storageConnector.getPathHash(dms.id); + const pathHash = DmsContainer.getHash(dms.id); try { - await models.Container.getFile(pathHash, dms.file); + await DmsContainer.getFile(pathHash, dms.file); } catch (e) { if (e.code != 'ENOENT') throw e; @@ -30,7 +30,7 @@ module.exports = Self => { throw error; } - const stream = models.Container.downloadStream(pathHash, dms.file); + const stream = DmsContainer.downloadStream(pathHash, dms.file); return [stream, dms.contentType, `filename="${dms.file}"`]; }; diff --git a/back/models/image-container.json b/back/models/image-container.json index 22cea05f53..26a6cb44d8 100644 --- a/back/models/image-container.json +++ b/back/models/image-container.json @@ -1,13 +1,10 @@ { "name": "ImageContainer", - "base": "VnModel", - "idInjection": true, - "options": { - "validateUpsert": true - }, - "properties": {}, - "validations": [], - "relations": {}, - "acls": [], - "methods": [] - } \ No newline at end of file + "base": "Container", + "acls": [{ + "accessType": "READ", + "principalType": "ROLE", + "principalId": "$everyone", + "permission": "ALLOW" + }] +} \ No newline at end of file diff --git a/back/models/image.js b/back/models/image.js index cbe2cfdac4..78d1599407 100644 --- a/back/models/image.js +++ b/back/models/image.js @@ -6,7 +6,7 @@ module.exports = Self => { require('../methods/image/download')(Self); require('../methods/image/upload')(Self); - Self.registerImage = async(collectionName, srcFile, entityId) => { + Self.registerImage = async(collectionName, srcFilePath, fileName, entityId) => { const models = Self.app.models; const tx = await Self.beginTransaction({}); const myOptions = {transaction: tx}; @@ -30,13 +30,10 @@ module.exports = Self => { } }, myOptions); - const file = srcFile.split('/').pop(); - const fileName = file.split('.')[0]; const data = { name: fileName, collectionFk: collectionName }; - const newImage = await Self.upsertWithWhere(data, { name: fileName, collectionFk: collectionName, @@ -44,9 +41,10 @@ module.exports = Self => { }, myOptions); // Resizes and saves the image - const container = await models.ImageContainer.getContainer(collectionName); + const container = await models.ImageContainer.container(collectionName); const rootPath = container.client.root; const collectionDir = path.join(rootPath, collectionName); + const file = `${fileName}.png`; const dstDir = path.join(collectionDir, 'full'); const dstFile = path.join(dstDir, file); @@ -56,7 +54,7 @@ module.exports = Self => { }; await fs.mkdir(dstDir, {recursive: true}); - await sharp(srcFile, {failOnError: false}) + await sharp(srcFilePath, {failOnError: false}) .resize(collection.maxWidth, collection.maxHeight, resizeOpts) .png() .toFile(dstFile); @@ -71,7 +69,7 @@ module.exports = Self => { }; await fs.mkdir(dstDir, {recursive: true}); - await sharp(srcFile, {failOnError: false}) + await sharp(srcFilePath, {failOnError: false}) .resize(size.width, size.height, resizeOpts) .png() .toFile(dstFile); @@ -91,8 +89,8 @@ module.exports = Self => { ); } - if (fs.existsSync(srcFile)) - await fs.unlink(srcFile); + if (fs.existsSync(srcFilePath)) + await fs.unlink(srcFilePath); await tx.commit(); return newImage; diff --git a/back/models/temp-container.json b/back/models/temp-container.json new file mode 100644 index 0000000000..1456497f1f --- /dev/null +++ b/back/models/temp-container.json @@ -0,0 +1,10 @@ +{ + "name": "TempContainer", + "base": "Container", + "acls": [{ + "accessType": "READ", + "principalType": "ROLE", + "principalId": "$everyone", + "permission": "ALLOW" + }] +} \ No newline at end of file diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 690b2572e7..f7a9b42417 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -767,19 +767,19 @@ INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`) INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `isOnOffer`, `expenceFk`, `isBargain`, `comment`, `relevancy`, `image`, `taxClassFk`, `subName`, `minPrice`) VALUES - (1, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd', 1, NULL, 0), - (2, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd', 1, NULL, 0), - (3, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, 'a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd', 1, NULL, 0), - (4, 1, 60, 'YEL', 1, 1, 'Increases block', 1, 05080000, 1, 4751000000, 0, NULL, 0, '0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd', 2, NULL, 0), - (5, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, '189081e0-3ab4-11eb-9ab8-27f6fc3b85fd', 2, NULL, 0), - (6, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '25238060-3ab4-11eb-9ab8-27f6fc3b85fd', 2, NULL, 0), - (7, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 'c4097310-3ab4-11eb-9ab8-27f6fc3b85fd', 2, NULL, 0), - (8, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 'd3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd', 1, NULL, 0), - (9, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd', 1, NULL, 0), - (10, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, '2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd', 1, NULL, 0), - (11, 1, 60, 'YEL', 1, 1, NULL, 1, 05080000, 1, 4751000000, 0, NULL, 0, 'a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd', 2, NULL, 0), - (12, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, 'e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd', 2, NULL, 0), - (13, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 'fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd', 2, NULL, 0), + (1, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '1', 1, NULL, 0), + (2, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '2', 1, NULL, 0), + (3, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, '3', 1, NULL, 0), + (4, 1, 60, 'YEL', 1, 1, 'Increases block', 1, 05080000, 1, 4751000000, 0, NULL, 0, '4', 2, NULL, 0), + (5, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, '5', 2, NULL, 0), + (6, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '6', 2, NULL, 0), + (7, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '7', 2, NULL, 0), + (8, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '8', 1, NULL, 0), + (9, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '9', 1, NULL, 0), + (10, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, '10', 1, NULL, 0), + (11, 1, 60, 'YEL', 1, 1, NULL, 1, 05080000, 1, 4751000000, 0, NULL, 0, '11', 2, NULL, 0), + (12, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, '12', 2, NULL, 0), + (13, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '13', 2, NULL, 0), (14, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '', 2, NULL, 0), (15, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '', 2, NULL, 0), (16, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '', 2, NULL, 0), diff --git a/front/salix/components/upload-photo/index.html b/front/salix/components/upload-photo/index.html index fc5b6c7352..c36eb7fe10 100644 --- a/front/salix/components/upload-photo/index.html +++ b/front/salix/components/upload-photo/index.html @@ -6,13 +6,29 @@
+ + + + + + + + diff --git a/front/salix/components/upload-photo/index.js b/front/salix/components/upload-photo/index.js index aa3c1a22a1..924a6a8a44 100644 --- a/front/salix/components/upload-photo/index.js +++ b/front/salix/components/upload-photo/index.js @@ -12,8 +12,26 @@ export default class UploadPhoto extends Component { * @param {*} id - Entity id */ show(collection, id) { - this.newPhoto = {id, collection}; + this.newPhoto = { + id: id, + collection: collection, + fileName: id + }; this.$.dialog.show(); + this.getAllowedContentTypes(); + } + + getAllowedContentTypes() { + this.$http.get('ImageContainers/allowedContentTypes').then(res => { + const contentTypes = res.data.join(', '); + this.allowedContentTypes = contentTypes; + }); + } + + get contentTypesInfo() { + return this.$t('ContentTypesInfo', { + allowedContentTypes: this.allowedContentTypes + }); } /** diff --git a/front/salix/components/upload-photo/locale/es.yml b/front/salix/components/upload-photo/locale/es.yml index 10271cf921..d2e696ba9c 100644 --- a/front/salix/components/upload-photo/locale/es.yml +++ b/front/salix/components/upload-photo/locale/es.yml @@ -1,2 +1,3 @@ Upload new photo: Subir una nueva foto -Select an image: Selecciona una imagen \ No newline at end of file +Select an image: Selecciona una imagen +File name: Nombre del fichero \ No newline at end of file diff --git a/loopback/common/models/container.js b/loopback/common/models/container.js new file mode 100644 index 0000000000..f249820216 --- /dev/null +++ b/loopback/common/models/container.js @@ -0,0 +1,57 @@ +const md5 = require('md5'); + +module.exports = function(Self) { + Self.setup = function() { + Self.super_.setup.call(this); + + this.remoteMethod('allowedContentTypes', { + description: 'Returns a list of allowed contentTypes', + accessType: 'READ', + returns: { + type: ['Object'], + root: true + }, + http: { + path: `/allowedContentTypes`, + verb: 'GET' + } + }); + }; + + /** + * Returns a container instance + * If doesn't exists creates a new one + * + * @param {String} name Container name + * @return {Object} Container instance + */ + Self.container = async function(name) { + const models = Self.app.models; + let container; + try { + container = await models[this.modelName].getContainer(name); + } catch (err) { + if (err.code === 'ENOENT') { + container = await models[this.modelName].createContainer({ + name: name + }); + } else throw err; + } + + return container; + }; + + Self.getHash = function(id) { + return md5(id.toString()).substring(0, 3); + }; + + Self.getFileExtension = function(fileName) { + return fileName.split('.').pop().toLowerCase(); + }; + + Self.allowedContentTypes = async function() { + const connector = this.dataSource.connector; + const allowedContentTypes = connector.allowedContentTypes; + return allowedContentTypes; + }; +}; diff --git a/loopback/common/models/container.json b/loopback/common/models/container.json new file mode 100644 index 0000000000..da4811028e --- /dev/null +++ b/loopback/common/models/container.json @@ -0,0 +1,12 @@ +{ + "name": "Container", + "base": "VnModel", + "acls": [ + { + "property": "status", + "principalType": "ROLE", + "principalId": "$everyone", + "permission": "ALLOW" + } + ] +} diff --git a/loopback/server/boot/storage.js b/loopback/server/boot/storage.js deleted file mode 100644 index 7559a7dec5..0000000000 --- a/loopback/server/boot/storage.js +++ /dev/null @@ -1,31 +0,0 @@ -const uuid = require('uuid/v1'); -const md5 = require('md5'); - -module.exports = app => { - const storageConnector = app.dataSources.dmsStorage.connector; - - storageConnector.getFilename = function(file) { - return `${uuid()}.${storageConnector.getFileExtension(file.name)}`; - }; - - storageConnector.getFileExtension = function(fileName) { - return fileName.split('.').pop().toLowerCase(); - }; - - storageConnector.getPathHash = function(id) { - return md5(id.toString()).substring(0, 3); - }; - - const imageStorageConnector = app.dataSources.imageStorage.connector; - imageStorageConnector.getFilename = function(file) { - return `${uuid()}.png`; - }; - - /* imageStorageConnector.getFileExtension = function(fileName) { - return fileName.split('.').pop().toLowerCase(); - }; - - imageStorageConnector.getPathHash = function(id) { - return md5(id.toString()).substring(0, 3); - }; */ -}; diff --git a/loopback/server/datasources.json b/loopback/server/datasources.json index 793dcaea8e..8ce442b8e5 100644 --- a/loopback/server/datasources.json +++ b/loopback/server/datasources.json @@ -17,6 +17,26 @@ "connectTimeout": 40000, "acquireTimeout": 20000 }, + "tempStorage": { + "name": "tempStorage", + "connector": "loopback-component-storage", + "provider": "filesystem", + "root": "./storage/tmp", + "maxFileSize": "262144000", + "allowedContentTypes": [ + "application/x-7z-compressed", + "application/x-zip-compressed", + "application/x-rar-compressed", + "application/octet-stream", + "application/pdf", + "application/zip", + "application/rar", + "multipart/x-zip", + "image/png", + "image/jpeg", + "image/jpg" + ] + }, "dmsStorage": { "name": "dmsStorage", "connector": "loopback-component-storage", diff --git a/loopback/server/model-config.json b/loopback/server/model-config.json index 20e22accdc..ff1a2daa20 100644 --- a/loopback/server/model-config.json +++ b/loopback/server/model-config.json @@ -49,5 +49,8 @@ }, "Application": { "dataSource": "vn" + }, + "Container": { + "dataSource": "vn" } } \ No newline at end of file diff --git a/modules/client/back/methods/client-dms/allowedContentTypes.js b/modules/client/back/methods/client-dms/allowedContentTypes.js deleted file mode 100644 index 3d4b908767..0000000000 --- a/modules/client/back/methods/client-dms/allowedContentTypes.js +++ /dev/null @@ -1,23 +0,0 @@ -module.exports = Self => { - Self.remoteMethodCtx('allowedContentTypes', { - description: 'Returns a list of allowed contentTypes', - accessType: 'READ', - returns: { - type: ['Object'], - root: true - }, - http: { - path: `/allowedContentTypes`, - verb: 'GET' - } - }); - - Self.allowedContentTypes = async() => { - const storageConnector = Self.app.dataSources.dmsStorage.connector; - const allowedContentTypes = storageConnector.allowedContentTypes; - const modelAllowedContentTypes = Self.definition.settings.allowedContentTypes; - - return modelAllowedContentTypes || allowedContentTypes; - }; -}; - diff --git a/modules/client/back/models/client-dms.js b/modules/client/back/models/client-dms.js index 0cffb042c1..9e5da9132e 100644 --- a/modules/client/back/models/client-dms.js +++ b/modules/client/back/models/client-dms.js @@ -1,4 +1,3 @@ module.exports = Self => { require('../methods/client-dms/removeFile')(Self); - require('../methods/client-dms/allowedContentTypes')(Self); }; diff --git a/modules/client/front/dms/create/index.js b/modules/client/front/dms/create/index.js index 3c3f201009..461d0aa368 100644 --- a/modules/client/front/dms/create/index.js +++ b/modules/client/front/dms/create/index.js @@ -26,7 +26,7 @@ class Controller extends Section { } getAllowedContentTypes() { - this.$http.get('clientDms/allowedContentTypes').then(res => { + this.$http.get('DmsContainers/allowedContentTypes').then(res => { const contentTypes = res.data.join(', '); this.allowedContentTypes = contentTypes; }); diff --git a/modules/client/front/dms/edit/index.js b/modules/client/front/dms/edit/index.js index 2b8a7046de..8765eeff2c 100644 --- a/modules/client/front/dms/edit/index.js +++ b/modules/client/front/dms/edit/index.js @@ -17,7 +17,7 @@ class Controller extends Section { } getAllowedContentTypes() { - this.$http.get('clientDms/allowedContentTypes').then(res => { + this.$http.get('DmsContainers/allowedContentTypes').then(res => { const contentTypes = res.data.join(', '); this.allowedContentTypes = contentTypes; }); diff --git a/modules/item/back/methods/item-image-queue/downloadImages.js b/modules/item/back/methods/item-image-queue/downloadImages.js index ec9177505a..ce52c103b1 100644 --- a/modules/item/back/methods/item-image-queue/downloadImages.js +++ b/modules/item/back/methods/item-image-queue/downloadImages.js @@ -33,8 +33,10 @@ module.exports = Self => { // Exit loop if (!image) return clearInterval(timer); - const fileName = `${image.itemFk}.png`; - const filePath = path.join(tempPath, fileName); + const srcFile = image.url.split('/').pop(); + const fileName = srcFile.split('.')[0]; + const file = `${fileName}.png`; + const filePath = path.join(tempPath, file); const writeStream = fs.createWriteStream(filePath); writeStream.on('open', () => { @@ -57,7 +59,7 @@ module.exports = Self => { writeStream.on('finish', async function() { try { - await models.Image.registerImage('catalog', filePath, image.itemFk); + await models.Image.registerImage('catalog', filePath, fileName, image.itemFk); await image.destroy(); } catch (error) { await errorHandler(image.itemFk, error, filePath); diff --git a/modules/ticket/back/methods/ticket-dms/allowedContentTypes.js b/modules/ticket/back/methods/ticket-dms/allowedContentTypes.js deleted file mode 100644 index 3d4b908767..0000000000 --- a/modules/ticket/back/methods/ticket-dms/allowedContentTypes.js +++ /dev/null @@ -1,23 +0,0 @@ -module.exports = Self => { - Self.remoteMethodCtx('allowedContentTypes', { - description: 'Returns a list of allowed contentTypes', - accessType: 'READ', - returns: { - type: ['Object'], - root: true - }, - http: { - path: `/allowedContentTypes`, - verb: 'GET' - } - }); - - Self.allowedContentTypes = async() => { - const storageConnector = Self.app.dataSources.dmsStorage.connector; - const allowedContentTypes = storageConnector.allowedContentTypes; - const modelAllowedContentTypes = Self.definition.settings.allowedContentTypes; - - return modelAllowedContentTypes || allowedContentTypes; - }; -}; - diff --git a/modules/ticket/back/models/ticket-dms.js b/modules/ticket/back/models/ticket-dms.js index 8a6d034340..ddb338632e 100644 --- a/modules/ticket/back/models/ticket-dms.js +++ b/modules/ticket/back/models/ticket-dms.js @@ -1,4 +1,3 @@ module.exports = Self => { require('../methods/ticket-dms/removeFile')(Self); - require('../methods/ticket-dms/allowedContentTypes')(Self); }; diff --git a/modules/ticket/front/dms/create/index.js b/modules/ticket/front/dms/create/index.js index 142158e464..b25abf17c2 100644 --- a/modules/ticket/front/dms/create/index.js +++ b/modules/ticket/front/dms/create/index.js @@ -25,7 +25,7 @@ class Controller extends Section { } getAllowedContentTypes() { - this.$http.get('ticketDms/allowedContentTypes').then(res => { + this.$http.get('DmsContainers/allowedContentTypes').then(res => { const contentTypes = res.data.join(', '); this.allowedContentTypes = contentTypes; }); diff --git a/modules/ticket/front/dms/edit/index.js b/modules/ticket/front/dms/edit/index.js index e50092f776..808ca6a6a5 100644 --- a/modules/ticket/front/dms/edit/index.js +++ b/modules/ticket/front/dms/edit/index.js @@ -16,7 +16,7 @@ class Controller extends Section { } getAllowedContentTypes() { - this.$http.get('ticketDms/allowedContentTypes').then(res => { + this.$http.get('DmsContainers/allowedContentTypes').then(res => { const contentTypes = res.data.join(', '); this.allowedContentTypes = contentTypes; }); diff --git a/modules/travel/back/methods/travel-thermograph/allowedContentTypes.js b/modules/travel/back/methods/travel-thermograph/allowedContentTypes.js deleted file mode 100644 index 3d4b908767..0000000000 --- a/modules/travel/back/methods/travel-thermograph/allowedContentTypes.js +++ /dev/null @@ -1,23 +0,0 @@ -module.exports = Self => { - Self.remoteMethodCtx('allowedContentTypes', { - description: 'Returns a list of allowed contentTypes', - accessType: 'READ', - returns: { - type: ['Object'], - root: true - }, - http: { - path: `/allowedContentTypes`, - verb: 'GET' - } - }); - - Self.allowedContentTypes = async() => { - const storageConnector = Self.app.dataSources.dmsStorage.connector; - const allowedContentTypes = storageConnector.allowedContentTypes; - const modelAllowedContentTypes = Self.definition.settings.allowedContentTypes; - - return modelAllowedContentTypes || allowedContentTypes; - }; -}; - diff --git a/modules/travel/back/models/travel-thermograph.js b/modules/travel/back/models/travel-thermograph.js index a16e68b985..91aa4de699 100644 --- a/modules/travel/back/models/travel-thermograph.js +++ b/modules/travel/back/models/travel-thermograph.js @@ -1,5 +1,4 @@ module.exports = Self => { - require('../methods/travel-thermograph/allowedContentTypes')(Self); require('../methods/travel-thermograph/getThermographTemperatures')(Self); }; diff --git a/modules/travel/front/thermograph/create/index.js b/modules/travel/front/thermograph/create/index.js index df8d0fe687..666393350c 100644 --- a/modules/travel/front/thermograph/create/index.js +++ b/modules/travel/front/thermograph/create/index.js @@ -21,7 +21,7 @@ class Controller extends Section { } getAllowedContentTypes() { - this.$http.get('TravelThermographs/allowedContentTypes').then(res => { + this.$http.get('DmsContainers/allowedContentTypes').then(res => { const contentTypes = res.data.join(', '); this.allowedContentTypes = contentTypes; }); diff --git a/modules/travel/front/thermograph/edit/index.js b/modules/travel/front/thermograph/edit/index.js index daa0f696bc..a8df3142d3 100644 --- a/modules/travel/front/thermograph/edit/index.js +++ b/modules/travel/front/thermograph/edit/index.js @@ -17,7 +17,7 @@ class Controller extends Section { } getAllowedContentTypes() { - this.$http.get('TravelThermographs/allowedContentTypes').then(res => { + this.$http.get('DmsContainers/allowedContentTypes').then(res => { const contentTypes = res.data.join(', '); this.allowedContentTypes = contentTypes; }); diff --git a/modules/worker/back/methods/worker-dms/allowedContentTypes.js b/modules/worker/back/methods/worker-dms/allowedContentTypes.js deleted file mode 100644 index 3d4b908767..0000000000 --- a/modules/worker/back/methods/worker-dms/allowedContentTypes.js +++ /dev/null @@ -1,23 +0,0 @@ -module.exports = Self => { - Self.remoteMethodCtx('allowedContentTypes', { - description: 'Returns a list of allowed contentTypes', - accessType: 'READ', - returns: { - type: ['Object'], - root: true - }, - http: { - path: `/allowedContentTypes`, - verb: 'GET' - } - }); - - Self.allowedContentTypes = async() => { - const storageConnector = Self.app.dataSources.dmsStorage.connector; - const allowedContentTypes = storageConnector.allowedContentTypes; - const modelAllowedContentTypes = Self.definition.settings.allowedContentTypes; - - return modelAllowedContentTypes || allowedContentTypes; - }; -}; - diff --git a/modules/worker/back/models/worker-dms.js b/modules/worker/back/models/worker-dms.js index 4b862a81e3..b9d6f9a775 100644 --- a/modules/worker/back/models/worker-dms.js +++ b/modules/worker/back/models/worker-dms.js @@ -1,7 +1,6 @@ module.exports = Self => { require('../methods/worker-dms/downloadFile')(Self); require('../methods/worker-dms/removeFile')(Self); - require('../methods/worker-dms/allowedContentTypes')(Self); require('../methods/worker-dms/filter')(Self); Self.isMine = async function(ctx, dmsId) { diff --git a/modules/worker/front/dms/create/index.js b/modules/worker/front/dms/create/index.js index f712edaf31..ff6112211a 100644 --- a/modules/worker/front/dms/create/index.js +++ b/modules/worker/front/dms/create/index.js @@ -26,7 +26,7 @@ class Controller extends Section { } getAllowedContentTypes() { - this.$http.get('workerDms/allowedContentTypes').then(res => { + this.$http.get('DmsContainers/allowedContentTypes').then(res => { const contentTypes = res.data.join(', '); this.allowedContentTypes = contentTypes; }); diff --git a/modules/worker/front/dms/edit/index.js b/modules/worker/front/dms/edit/index.js index 68c851ff3b..31d4c2853b 100644 --- a/modules/worker/front/dms/edit/index.js +++ b/modules/worker/front/dms/edit/index.js @@ -17,7 +17,7 @@ class Controller extends Section { } getAllowedContentTypes() { - this.$http.get('WorkerDms/allowedContentTypes').then(res => { + this.$http.get('DmsContainers/allowedContentTypes').then(res => { const contentTypes = res.data.join(', '); this.allowedContentTypes = contentTypes; }); diff --git a/modules/worker/front/dms/index/index.html b/modules/worker/front/dms/index/index.html index ce236932f2..d6e1bc25c8 100644 --- a/modules/worker/front/dms/index/index.html +++ b/modules/worker/front/dms/index/index.html @@ -60,7 +60,7 @@ - diff --git a/print/config/print.json b/print/config/print.json index 5f4c0f7b82..bb74682814 100755 --- a/print/config/print.json +++ b/print/config/print.json @@ -43,6 +43,6 @@ "pool": true }, "storage": { - "root": "./e2e/dms" + "root": "./storage/dms" } } \ No newline at end of file diff --git a/storage/image/catalog/1600x900/861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/1600x900/1.png similarity index 100% rename from storage/image/catalog/1600x900/861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/1600x900/1.png diff --git a/storage/image/catalog/1600x900/2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/1600x900/10.png similarity index 100% rename from storage/image/catalog/1600x900/2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/1600x900/10.png diff --git a/storage/image/catalog/1600x900/a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/1600x900/11.png similarity index 100% rename from storage/image/catalog/1600x900/a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/1600x900/11.png diff --git a/storage/image/catalog/1600x900/e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/1600x900/12.png similarity index 100% rename from storage/image/catalog/1600x900/e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/1600x900/12.png diff --git a/storage/image/catalog/1600x900/fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/1600x900/13.png similarity index 100% rename from storage/image/catalog/1600x900/fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/1600x900/13.png diff --git a/storage/image/catalog/1600x900/9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/1600x900/2.png similarity index 100% rename from storage/image/catalog/1600x900/9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/1600x900/2.png diff --git a/storage/image/catalog/1600x900/a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/1600x900/3.png similarity index 100% rename from storage/image/catalog/1600x900/a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/1600x900/3.png diff --git a/storage/image/catalog/1600x900/0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/1600x900/4.png similarity index 100% rename from storage/image/catalog/1600x900/0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/1600x900/4.png diff --git a/storage/image/catalog/1600x900/189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/1600x900/5.png similarity index 100% rename from storage/image/catalog/1600x900/189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/1600x900/5.png diff --git a/storage/image/catalog/1600x900/25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/1600x900/6.png similarity index 100% rename from storage/image/catalog/1600x900/25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/1600x900/6.png diff --git a/storage/image/catalog/1600x900/c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/1600x900/7.png similarity index 100% rename from storage/image/catalog/1600x900/c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/1600x900/7.png diff --git a/storage/image/catalog/1600x900/d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/1600x900/8.png similarity index 100% rename from storage/image/catalog/1600x900/d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/1600x900/8.png diff --git a/storage/image/catalog/1600x900/20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/1600x900/9.png similarity index 100% rename from storage/image/catalog/1600x900/20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/1600x900/9.png diff --git a/storage/image/catalog/200x200/861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/200x200/1.png similarity index 100% rename from storage/image/catalog/200x200/861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/200x200/1.png diff --git a/storage/image/catalog/200x200/2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/200x200/10.png similarity index 100% rename from storage/image/catalog/200x200/2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/200x200/10.png diff --git a/storage/image/catalog/200x200/a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/200x200/11.png similarity index 100% rename from storage/image/catalog/200x200/a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/200x200/11.png diff --git a/storage/image/catalog/200x200/e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/200x200/12.png similarity index 100% rename from storage/image/catalog/200x200/e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/200x200/12.png diff --git a/storage/image/catalog/200x200/fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/200x200/13.png similarity index 100% rename from storage/image/catalog/200x200/fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/200x200/13.png diff --git a/storage/image/catalog/200x200/9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/200x200/2.png similarity index 100% rename from storage/image/catalog/200x200/9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/200x200/2.png diff --git a/storage/image/catalog/200x200/a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/200x200/3.png similarity index 100% rename from storage/image/catalog/200x200/a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/200x200/3.png diff --git a/storage/image/catalog/200x200/0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/200x200/4.png similarity index 100% rename from storage/image/catalog/200x200/0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/200x200/4.png diff --git a/storage/image/catalog/200x200/189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/200x200/5.png similarity index 100% rename from storage/image/catalog/200x200/189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/200x200/5.png diff --git a/storage/image/catalog/200x200/25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/200x200/6.png similarity index 100% rename from storage/image/catalog/200x200/25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/200x200/6.png diff --git a/storage/image/catalog/200x200/c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/200x200/7.png similarity index 100% rename from storage/image/catalog/200x200/c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/200x200/7.png diff --git a/storage/image/catalog/200x200/d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/200x200/8.png similarity index 100% rename from storage/image/catalog/200x200/d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/200x200/8.png diff --git a/storage/image/catalog/200x200/20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/200x200/9.png similarity index 100% rename from storage/image/catalog/200x200/20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/200x200/9.png diff --git a/storage/image/catalog/50x50/861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/50x50/1.png similarity index 100% rename from storage/image/catalog/50x50/861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/50x50/1.png diff --git a/storage/image/catalog/50x50/2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/50x50/10.png similarity index 100% rename from storage/image/catalog/50x50/2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/50x50/10.png diff --git a/storage/image/catalog/50x50/a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/50x50/11.png similarity index 100% rename from storage/image/catalog/50x50/a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/50x50/11.png diff --git a/storage/image/catalog/50x50/e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/50x50/12.png similarity index 100% rename from storage/image/catalog/50x50/e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/50x50/12.png diff --git a/storage/image/catalog/50x50/fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/50x50/13.png similarity index 100% rename from storage/image/catalog/50x50/fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/50x50/13.png diff --git a/storage/image/catalog/50x50/9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/50x50/2.png similarity index 100% rename from storage/image/catalog/50x50/9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/50x50/2.png diff --git a/storage/image/catalog/50x50/a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/50x50/3.png similarity index 100% rename from storage/image/catalog/50x50/a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/50x50/3.png diff --git a/storage/image/catalog/50x50/0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/50x50/4.png similarity index 100% rename from storage/image/catalog/50x50/0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/50x50/4.png diff --git a/storage/image/catalog/50x50/189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/50x50/5.png similarity index 100% rename from storage/image/catalog/50x50/189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/50x50/5.png diff --git a/storage/image/catalog/50x50/25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/50x50/6.png similarity index 100% rename from storage/image/catalog/50x50/25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/50x50/6.png diff --git a/storage/image/catalog/50x50/c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/50x50/7.png similarity index 100% rename from storage/image/catalog/50x50/c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/50x50/7.png diff --git a/storage/image/catalog/50x50/d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/50x50/8.png similarity index 100% rename from storage/image/catalog/50x50/d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/50x50/8.png diff --git a/storage/image/catalog/50x50/20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/50x50/9.png similarity index 100% rename from storage/image/catalog/50x50/20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/50x50/9.png diff --git a/storage/image/catalog/70x70/861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/70x70/1.png similarity index 100% rename from storage/image/catalog/70x70/861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/70x70/1.png diff --git a/storage/image/catalog/70x70/2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/70x70/10.png similarity index 100% rename from storage/image/catalog/70x70/2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/70x70/10.png diff --git a/storage/image/catalog/70x70/a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/70x70/11.png similarity index 100% rename from storage/image/catalog/70x70/a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/70x70/11.png diff --git a/storage/image/catalog/70x70/e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/70x70/12.png similarity index 100% rename from storage/image/catalog/70x70/e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/70x70/12.png diff --git a/storage/image/catalog/70x70/fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/70x70/13.png similarity index 100% rename from storage/image/catalog/70x70/fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/70x70/13.png diff --git a/storage/image/catalog/70x70/9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/70x70/2.png similarity index 100% rename from storage/image/catalog/70x70/9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/70x70/2.png diff --git a/storage/image/catalog/70x70/a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/70x70/3.png similarity index 100% rename from storage/image/catalog/70x70/a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/70x70/3.png diff --git a/storage/image/catalog/70x70/0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/70x70/4.png similarity index 100% rename from storage/image/catalog/70x70/0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/70x70/4.png diff --git a/storage/image/catalog/70x70/189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/70x70/5.png similarity index 100% rename from storage/image/catalog/70x70/189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/70x70/5.png diff --git a/storage/image/catalog/70x70/25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/70x70/6.png similarity index 100% rename from storage/image/catalog/70x70/25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/70x70/6.png diff --git a/storage/image/catalog/70x70/c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/70x70/7.png similarity index 100% rename from storage/image/catalog/70x70/c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/70x70/7.png diff --git a/storage/image/catalog/70x70/d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/70x70/8.png similarity index 100% rename from storage/image/catalog/70x70/d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/70x70/8.png diff --git a/storage/image/catalog/70x70/20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/70x70/9.png similarity index 100% rename from storage/image/catalog/70x70/20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/70x70/9.png diff --git a/storage/image/catalog/full/861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/full/1.png similarity index 100% rename from storage/image/catalog/full/861e1ed0-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/full/1.png diff --git a/storage/image/catalog/full/2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/full/10.png similarity index 100% rename from storage/image/catalog/full/2c484f00-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/full/10.png diff --git a/storage/image/catalog/full/a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/full/11.png similarity index 100% rename from storage/image/catalog/full/a3d9bea0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/full/11.png diff --git a/storage/image/catalog/full/e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/full/12.png similarity index 100% rename from storage/image/catalog/full/e48b2d30-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/full/12.png diff --git a/storage/image/catalog/full/fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/full/13.png similarity index 100% rename from storage/image/catalog/full/fb5cd9f0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/full/13.png diff --git a/storage/image/catalog/full/9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/full/2.png similarity index 100% rename from storage/image/catalog/full/9b0316c0-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/full/2.png diff --git a/storage/image/catalog/full/a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/full/3.png similarity index 100% rename from storage/image/catalog/full/a93bd600-3ab3-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/full/3.png diff --git a/storage/image/catalog/full/0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/full/4.png similarity index 100% rename from storage/image/catalog/full/0e1c92d0-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/full/4.png diff --git a/storage/image/catalog/full/189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/full/5.png similarity index 100% rename from storage/image/catalog/full/189081e0-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/full/5.png diff --git a/storage/image/catalog/full/25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/full/6.png similarity index 100% rename from storage/image/catalog/full/25238060-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/full/6.png diff --git a/storage/image/catalog/full/c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/full/7.png similarity index 100% rename from storage/image/catalog/full/c4097310-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/full/7.png diff --git a/storage/image/catalog/full/d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/full/8.png similarity index 100% rename from storage/image/catalog/full/d3bf8380-3ab4-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/full/8.png diff --git a/storage/image/catalog/full/20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png b/storage/image/catalog/full/9.png similarity index 100% rename from storage/image/catalog/full/20e9fff0-3ab5-11eb-9ab8-27f6fc3b85fd.png rename to storage/image/catalog/full/9.png diff --git a/storage/tmp/tmp.txt b/storage/tmp/tmp.txt new file mode 100644 index 0000000000..dd8c1c65f1 --- /dev/null +++ b/storage/tmp/tmp.txt @@ -0,0 +1 @@ +// Force dir creation \ No newline at end of file From 2d31752bdf85e996af67c8916ca7c94e5988746f Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 18 Dec 2020 17:25:08 +0100 Subject: [PATCH 057/101] Updated gitignore --- .gitignore | 2 +- storage/tmp/tmp.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 storage/tmp/tmp.txt diff --git a/.gitignore b/.gitignore index a6007f3181..04a977352c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ coverage node_modules dist -#storage +storage npm-debug.log .eslintcache datasources.*.json diff --git a/storage/tmp/tmp.txt b/storage/tmp/tmp.txt deleted file mode 100644 index dd8c1c65f1..0000000000 --- a/storage/tmp/tmp.txt +++ /dev/null @@ -1 +0,0 @@ -// Force dir creation \ No newline at end of file From 95df28fc35408b38e47fa74badbcd728f3bb3afd Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 18 Dec 2020 17:29:04 +0100 Subject: [PATCH 058/101] Keep file --- storage/tmp/.keep | 1 + 1 file changed, 1 insertion(+) create mode 100644 storage/tmp/.keep diff --git a/storage/tmp/.keep b/storage/tmp/.keep new file mode 100644 index 0000000000..8e25568966 --- /dev/null +++ b/storage/tmp/.keep @@ -0,0 +1 @@ +Forces tmp folder creation! \ No newline at end of file From 6717853efb82aaa91012857ad6229cce961f54f7 Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 18 Dec 2020 18:02:41 +0100 Subject: [PATCH 059/101] Updated front tests --- modules/client/front/dms/create/index.spec.js | 2 +- modules/client/front/dms/edit/index.spec.js | 2 +- modules/ticket/front/dms/create/index.spec.js | 2 +- modules/ticket/front/dms/edit/index.spec.js | 2 +- modules/travel/front/thermograph/create/index.spec.js | 2 +- modules/travel/front/thermograph/edit/index.spec.js | 2 +- modules/worker/front/dms/create/index.spec.js | 2 +- modules/worker/front/dms/edit/index.spec.js | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/client/front/dms/create/index.spec.js b/modules/client/front/dms/create/index.spec.js index 0ed3f6671a..5fa1a38352 100644 --- a/modules/client/front/dms/create/index.spec.js +++ b/modules/client/front/dms/create/index.spec.js @@ -62,7 +62,7 @@ describe('Client', () => { describe('getAllowedContentTypes()', () => { it('should make an HTTP GET request to get the allowed content types', () => { const expectedResponse = ['image/png', 'image/jpg']; - $httpBackend.expect('GET', `clientDms/allowedContentTypes`).respond(expectedResponse); + $httpBackend.expect('GET', `DmsContainers/allowedContentTypes`).respond(expectedResponse); controller.getAllowedContentTypes(); $httpBackend.flush(); diff --git a/modules/client/front/dms/edit/index.spec.js b/modules/client/front/dms/edit/index.spec.js index e52ab7f7ba..d063db57d6 100644 --- a/modules/client/front/dms/edit/index.spec.js +++ b/modules/client/front/dms/edit/index.spec.js @@ -69,7 +69,7 @@ describe('Client', () => { describe('getAllowedContentTypes()', () => { it('should make an HTTP GET request to get the allowed content types', () => { const expectedResponse = ['image/png', 'image/jpg']; - $httpBackend.expect('GET', `clientDms/allowedContentTypes`).respond(expectedResponse); + $httpBackend.expect('GET', `DmsContainers/allowedContentTypes`).respond(expectedResponse); controller.getAllowedContentTypes(); $httpBackend.flush(); diff --git a/modules/ticket/front/dms/create/index.spec.js b/modules/ticket/front/dms/create/index.spec.js index e3c1957998..15017daf95 100644 --- a/modules/ticket/front/dms/create/index.spec.js +++ b/modules/ticket/front/dms/create/index.spec.js @@ -67,7 +67,7 @@ describe('Ticket', () => { describe('getAllowedContentTypes()', () => { it('should make an HTTP GET request to get the allowed content types', () => { const expectedResponse = ['image/png', 'image/jpg']; - $httpBackend.expect('GET', `ticketDms/allowedContentTypes`).respond(expectedResponse); + $httpBackend.expect('GET', `DmsContainers/allowedContentTypes`).respond(expectedResponse); controller.getAllowedContentTypes(); $httpBackend.flush(); diff --git a/modules/ticket/front/dms/edit/index.spec.js b/modules/ticket/front/dms/edit/index.spec.js index 052b08a1b5..15ab588f79 100644 --- a/modules/ticket/front/dms/edit/index.spec.js +++ b/modules/ticket/front/dms/edit/index.spec.js @@ -69,7 +69,7 @@ describe('Ticket', () => { describe('getAllowedContentTypes()', () => { it('should make an HTTP GET request to get the allowed content types', () => { const expectedResponse = ['image/png', 'image/jpg']; - $httpBackend.expect('GET', `ticketDms/allowedContentTypes`).respond(expectedResponse); + $httpBackend.expect('GET', `DmsContainers/allowedContentTypes`).respond(expectedResponse); controller.getAllowedContentTypes(); $httpBackend.flush(); diff --git a/modules/travel/front/thermograph/create/index.spec.js b/modules/travel/front/thermograph/create/index.spec.js index 36f17a409f..c2b94d3e84 100644 --- a/modules/travel/front/thermograph/create/index.spec.js +++ b/modules/travel/front/thermograph/create/index.spec.js @@ -53,7 +53,7 @@ describe('Ticket', () => { describe('getAllowedContentTypes()', () => { it('should make an HTTP GET request to get the allowed content types', () => { const expectedResponse = ['application/pdf', 'image/png', 'image/jpg']; - $httpBackend.expect('GET', `TravelThermographs/allowedContentTypes`).respond(expectedResponse); + $httpBackend.expect('GET', `DmsContainers/allowedContentTypes`).respond(expectedResponse); controller.getAllowedContentTypes(); $httpBackend.flush(); diff --git a/modules/travel/front/thermograph/edit/index.spec.js b/modules/travel/front/thermograph/edit/index.spec.js index 68ce763c26..c0b044a8df 100644 --- a/modules/travel/front/thermograph/edit/index.spec.js +++ b/modules/travel/front/thermograph/edit/index.spec.js @@ -79,7 +79,7 @@ describe('Worker', () => { describe('getAllowedContentTypes()', () => { it('should make an HTTP GET request to get the allowed content types', () => { const expectedResponse = ['image/png', 'image/jpg']; - $httpBackend.expect('GET', `TravelThermographs/allowedContentTypes`).respond(expectedResponse); + $httpBackend.expect('GET', `DmsContainers/allowedContentTypes`).respond(expectedResponse); controller.getAllowedContentTypes(); $httpBackend.flush(); diff --git a/modules/worker/front/dms/create/index.spec.js b/modules/worker/front/dms/create/index.spec.js index f0d0887157..07a66b9dc6 100644 --- a/modules/worker/front/dms/create/index.spec.js +++ b/modules/worker/front/dms/create/index.spec.js @@ -64,7 +64,7 @@ describe('Client', () => { describe('getAllowedContentTypes()', () => { it('should make an HTTP GET request to get the allowed content types', () => { const expectedResponse = ['image/png', 'image/jpg']; - $httpBackend.expect('GET', `workerDms/allowedContentTypes`).respond(expectedResponse); + $httpBackend.expect('GET', `DmsContainers/allowedContentTypes`).respond(expectedResponse); controller.getAllowedContentTypes(); $httpBackend.flush(); diff --git a/modules/worker/front/dms/edit/index.spec.js b/modules/worker/front/dms/edit/index.spec.js index 3724a6c7c2..44abc6d640 100644 --- a/modules/worker/front/dms/edit/index.spec.js +++ b/modules/worker/front/dms/edit/index.spec.js @@ -70,7 +70,7 @@ describe('Worker', () => { describe('getAllowedContentTypes()', () => { it('should make an HTTP GET request to get the allowed content types', () => { const expectedResponse = ['image/png', 'image/jpg']; - $httpBackend.expect('GET', `WorkerDms/allowedContentTypes`).respond(expectedResponse); + $httpBackend.expect('GET', `DmsContainers/allowedContentTypes`).respond(expectedResponse); controller.getAllowedContentTypes(); $httpBackend.flush(); From 1a641d1d4b35a513d660705967534001715f48c5 Mon Sep 17 00:00:00 2001 From: bernat Date: Fri, 18 Dec 2020 22:31:46 +0100 Subject: [PATCH 060/101] cr changes --- .../back/methods/supplier/specs/consumption.spec.js | 2 +- .../supplier/front/consumption-search-panel/index.js | 10 +--------- modules/supplier/front/routes.json | 1 - 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/supplier/back/methods/supplier/specs/consumption.spec.js b/modules/supplier/back/methods/supplier/specs/consumption.spec.js index 2436f485e8..0e8f3afcc2 100644 --- a/modules/supplier/back/methods/supplier/specs/consumption.spec.js +++ b/modules/supplier/back/methods/supplier/specs/consumption.spec.js @@ -11,7 +11,7 @@ describe('supplier consumption() filter', () => { }; const result = await app.models.Supplier.consumption(ctx, filter); - expect(result.length).toEqual(8); + expect(result.length).toEqual(6); }); it('should return a list of entries from the item id 1 and supplier 1', async() => { diff --git a/modules/supplier/front/consumption-search-panel/index.js b/modules/supplier/front/consumption-search-panel/index.js index 8e636661a0..f6c63c55c0 100644 --- a/modules/supplier/front/consumption-search-panel/index.js +++ b/modules/supplier/front/consumption-search-panel/index.js @@ -1,15 +1,7 @@ import ngModule from '../module'; import SearchPanel from 'core/components/searchbar/search-panel'; -class Controller extends SearchPanel { - constructor($, $element) { - super($, $element); - - this.filter = this.$.filter; - } -} - ngModule.vnComponent('vnSupplierConsumptionSearchPanel', { template: require('./index.html'), - controller: Controller + controller: SearchPanel }); diff --git a/modules/supplier/front/routes.json b/modules/supplier/front/routes.json index 684895c66b..54d203c8cd 100644 --- a/modules/supplier/front/routes.json +++ b/modules/supplier/front/routes.json @@ -83,7 +83,6 @@ "state": "supplier.card.consumption", "component": "vn-supplier-consumption", "description": "Consumption", - "acl": ["administrative"], "params": { "supplier": "$ctrl.supplier" } From 027a37bdad117d303e34ee9187d07dc8ec8b0b39 Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 21 Dec 2020 10:14:15 +0100 Subject: [PATCH 061/101] Requested changes --- back/methods/image/specs/upload.spec.js | 25 ------------------------- back/methods/image/upload.js | 2 -- 2 files changed, 27 deletions(-) diff --git a/back/methods/image/specs/upload.spec.js b/back/methods/image/specs/upload.spec.js index 8521f2f20d..86b598b49f 100644 --- a/back/methods/image/specs/upload.spec.js +++ b/back/methods/image/specs/upload.spec.js @@ -1,11 +1,6 @@ const app = require('vn-loopback/server/server'); describe('image upload()', () => { - afterEach(() => { - // RESTORE NODE ENV - delete process.env.NODE_ENV; - }); - describe('as buyer', () => { const buyerId = 35; const workerId = 106; @@ -46,26 +41,6 @@ describe('image upload()', () => { expect(containerModel.upload).toHaveBeenCalled(); }); - - it('should throw an error to upload a photo on test environment', async() => { - process.env.NODE_ENV = 'test'; - - const ctx = {req: {accessToken: {userId: buyerId}}, - args: { - id: itemId, - collection: 'catalog' - } - }; - - let error; - try { - await app.models.Image.upload(ctx); - } catch (err) { - error = err; - } - - expect(error.message).toEqual(`You can't upload images on the test instance`); - }); }); describe('as marketing', () => { diff --git a/back/methods/image/upload.js b/back/methods/image/upload.js index 59e9738ec5..649d13c680 100644 --- a/back/methods/image/upload.js +++ b/back/methods/image/upload.js @@ -50,8 +50,6 @@ module.exports = Self => { if (process.env.NODE_ENV == 'test') throw new UserError(`You can't upload images on the test instance`); - await TempContainer.allowedContentTypes(); - // Upload file to temporary path const tempContainer = await TempContainer.container(args.collection); const uploaded = await TempContainer.upload(tempContainer.name, ctx.req, ctx.result, fileOptions); From 369a79b79fcfbec8f6cbce276e9b5584faf19a9c Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 21 Dec 2020 12:37:36 +0100 Subject: [PATCH 062/101] route.tickets refactor --- loopback/locale/es.json | 3 +- .../route/back/methods/route/guessPriority.js | 32 ++++++++++++++++--- .../methods/route/specs/guessPriority.spec.js | 8 ++++- modules/route/front/tickets/index.html | 12 +++---- modules/route/front/tickets/locale/es.yml | 3 +- modules/route/front/tickets/style.scss | 4 +++ modules/ticket/front/locale/es.yml | 2 +- 7 files changed, 49 insertions(+), 15 deletions(-) diff --git a/loopback/locale/es.json b/loopback/locale/es.json index f01da55acc..769ccc1bd6 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -161,5 +161,6 @@ "The nif cannot be empty": "El NIF no puede quedar en blanco", "You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados", "ASSIGN_ZONE_FIRST": "Asigna una zona primero", - "You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria" + "You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria", + "Sorts whole route": "Reordena ruta entera" } \ No newline at end of file diff --git a/modules/route/back/methods/route/guessPriority.js b/modules/route/back/methods/route/guessPriority.js index bb5b34ca3f..eab9f3473e 100644 --- a/modules/route/back/methods/route/guessPriority.js +++ b/modules/route/back/methods/route/guessPriority.js @@ -1,5 +1,5 @@ module.exports = Self => { - Self.remoteMethod('guessPriority', { + Self.remoteMethodCtx('guessPriority', { description: 'Changes automatically the priority of the tickets in a route', accessType: 'READ', accepts: [{ @@ -19,10 +19,32 @@ module.exports = Self => { } }); - Self.guessPriority = async id => { - let query = `CALL vn.routeGuessPriority(?)`; + Self.guessPriority = async(ctx, id) => { + const userId = ctx.req.accessToken.userId; + const $t = ctx.req.__; // $translate + const query = `CALL vn.routeGuessPriority(?)`; + const tx = await Self.beginTransaction({}); - let options = [id]; - return await Self.rawSql(query, options); + try { + let options = {transaction: tx}; + + const priority = await Self.rawSql(query, [id], options); + + let logRecord = { + originFk: id, + userFk: userId, + action: 'update', + changedModel: 'Route', + description: $t('Sorts whole route') + }; + + await Self.app.models.RouteLog.create(logRecord, options); + + await tx.commit(); + return priority; + } catch (e) { + await tx.rollback(); + throw e; + } }; }; diff --git a/modules/route/back/methods/route/specs/guessPriority.spec.js b/modules/route/back/methods/route/specs/guessPriority.spec.js index 448501e67e..4e70d727e0 100644 --- a/modules/route/back/methods/route/specs/guessPriority.spec.js +++ b/modules/route/back/methods/route/specs/guessPriority.spec.js @@ -15,9 +15,15 @@ describe('route guessPriority()', () => { }); it('should call guessPriority() and then check the tickets in the target route now have their priorities defined', async() => { + const ctx = { + req: { + accessToken: {userId: 9}, + __: () => {} + }, + }; routeTicketsToRestore = await app.models.Ticket.find({where: {routeFk: targetRouteId}}); - await app.models.Route.guessPriority(targetRouteId); + await app.models.Route.guessPriority(ctx, targetRouteId); let routeTickets = await app.models.Ticket.find({where: {routeFk: targetRouteId}, fields: ['id', 'priority']}); expect(routeTickets.length).toEqual(2); diff --git a/modules/route/front/tickets/index.html b/modules/route/front/tickets/index.html index 1f91dd3f1c..7e03a39812 100644 --- a/modules/route/front/tickets/index.html +++ b/modules/route/front/tickets/index.html @@ -31,13 +31,13 @@ model="model"> - Order + Order Ticket Client Packages - + Warehouse - Postcode + PC Street @@ -50,7 +50,7 @@ ng-model="ticket.checked"> - + {{ticket.packages}} - {{::ticket.volume | number:1}} + {{::ticket.volume | number:1}} {{ticket.warehouse.name}} - {{ticket.address.postalCode}} + {{ticket.address.postalCode}} {{ticket.address.street}} Date: Mon, 21 Dec 2020 13:52:37 +0100 Subject: [PATCH 063/101] years previous to contrar error corrected --- modules/worker/back/methods/calendar/absences.js | 2 +- modules/worker/front/calendar/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/worker/back/methods/calendar/absences.js b/modules/worker/back/methods/calendar/absences.js index 36d71ea81d..b84b558438 100644 --- a/modules/worker/back/methods/calendar/absences.js +++ b/modules/worker/back/methods/calendar/absences.js @@ -146,7 +146,7 @@ module.exports = Self => { }); if (currentContract) { - const maxHolidays = currentContract.holidays().days; + const maxHolidays = currentContract.holidays() && currentContract.holidays().days; calendar.totalHolidays = maxHolidays; workedDays -= entitlementRate; diff --git a/modules/worker/front/calendar/index.html b/modules/worker/front/calendar/index.html index fe61e828ec..f10201763d 100644 --- a/modules/worker/front/calendar/index.html +++ b/modules/worker/front/calendar/index.html @@ -26,7 +26,7 @@
Holidays
{{'Used' | translate}} {{$ctrl.calendar.holidaysEnjoyed}} - {{'of' | translate}} {{$ctrl.calendar.totalHolidays}} {{'days' | translate}} + {{'of' | translate}} {{$ctrl.calendar.totalHolidays || 0}} {{'days' | translate}}
@@ -54,7 +54,7 @@ {{::log.user.name | dashIfEmpty}} + translate>{{::log.user.name || 'System' | translate}} @@ -70,7 +70,7 @@
{{::old.key}}: - {{::old.value}} + {{::old.value | dashIfEmpty}}
@@ -81,7 +81,7 @@ id="newInstance">
{{::new.key}}: - {{::new.value}} + {{::new.value | dashIfEmpty}}
{ SELECT t.id, t.clientFk, + c.name clientName, c.email recipient, c.salesPersonFk, c.isToBeMailed, @@ -196,6 +197,10 @@ module.exports = app => { const email = new Email('delivery-note-link', args); await email.send(); } catch (error) { + // Domain not found + if (error.responseCode == 450) + return invalidEmail(ticket); + // Save tickets on a list of failed ids failedtickets.push({ id: ticket.id, @@ -220,4 +225,33 @@ module.exports = app => { }); } } + + async function invalidEmail(ticket) { + await db.rawSql(`UPDATE client SET email = NULL WHERE id = :clientId`, { + clientId: ticket.clientFk + }); + + const oldInstance = `{"email": "${ticket.recipient}"}`; + const newInstance = `{"email": ""}`; + await db.rawSql(` + INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance) + VALUES (:clientId, :userId, 'UPDATE', 'Client', :oldInstance, :newInstance)`, { + clientId: ticket.clientFk, + userId: null, + oldInstance: oldInstance, + newInstance: newInstance + }); + + const body = `No se ha podido enviar el albarán ${ticket.id} + al cliente ${ticket.clientFk} - ${ticket.clientName} + porque la dirección de email "${ticket.recipient}" no es correcta o no está disponible.

+ Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente. + Actualiza la dirección de email con una correcta.`; + + smtp.send({ + to: ticket.salesPersonEmail, + subject: 'No se ha podido enviar el albarán', + html: body + }); + } }; From a19064cb1b6088c491630caced5428081865ceec Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Wed, 23 Dec 2020 12:23:37 +0100 Subject: [PATCH 066/101] Nueva tabla entryObservation y he juntado la consulta de 1260-navidad con 1260-holydays --- db/changes/10260-holidays/00-ACL.sql | 3 ++- db/changes/10260-holidays/00-entryObservation.sql | 11 +++++++++++ db/changes/10260-navidad/00-acl.sql | 2 -- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 db/changes/10260-holidays/00-entryObservation.sql delete mode 100644 db/changes/10260-navidad/00-acl.sql diff --git a/db/changes/10260-holidays/00-ACL.sql b/db/changes/10260-holidays/00-ACL.sql index 1f8045bc7c..e72e6fa73b 100644 --- a/db/changes/10260-holidays/00-ACL.sql +++ b/db/changes/10260-holidays/00-ACL.sql @@ -1 +1,2 @@ -INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) VALUES ('Image', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee') \ No newline at end of file +INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) VALUES ('Image', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee'); +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('PayDem', '*', 'READ', 'ALLOW', 'ROLE', 'employee'); \ No newline at end of file diff --git a/db/changes/10260-holidays/00-entryObservation.sql b/db/changes/10260-holidays/00-entryObservation.sql new file mode 100644 index 0000000000..f72d64b015 --- /dev/null +++ b/db/changes/10260-holidays/00-entryObservation.sql @@ -0,0 +1,11 @@ +CREATE TABLE `vn`.`entryObservation` ( + id int NOT NULL AUTO_INCREMENT, + entryFk int NOT NULL, + observationTypeFk TINYINT(3) UNSIGNED, + description TEXT, + PRIMARY KEY (id), + CONSTRAINT entry_id_entryFk + FOREIGN KEY (entryFk) REFERENCES entry(id), + CONSTRAINT observationType_id_observationTypeFk + FOREIGN KEY (observationTypeFk) REFERENCES observationType(id) +); \ No newline at end of file diff --git a/db/changes/10260-navidad/00-acl.sql b/db/changes/10260-navidad/00-acl.sql deleted file mode 100644 index 9fba4786b7..0000000000 --- a/db/changes/10260-navidad/00-acl.sql +++ /dev/null @@ -1,2 +0,0 @@ - INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) - VALUES ('PayDem', '*', 'READ', 'ALLOW', 'ROLE', 'employee'); From 2948747da3497c2f016b74481f84852bc9390243 Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Wed, 23 Dec 2020 12:25:12 +0100 Subject: [PATCH 067/101] Seccion nueva, "Note" mas campo entryObservation --- modules/entry/back/model-config.json | 3 + .../entry/back/models/entry-observation.js | 9 +++ .../entry/back/models/entry-observation.json | 38 ++++++++++ modules/entry/front/index.js | 1 + modules/entry/front/note/index.html | 72 +++++++++++++++++++ modules/entry/front/note/index.js | 20 ++++++ modules/entry/front/routes.json | 11 ++- 7 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 modules/entry/back/models/entry-observation.js create mode 100644 modules/entry/back/models/entry-observation.json create mode 100644 modules/entry/front/note/index.html create mode 100644 modules/entry/front/note/index.js diff --git a/modules/entry/back/model-config.json b/modules/entry/back/model-config.json index 0e37b947ff..eddef9c410 100644 --- a/modules/entry/back/model-config.json +++ b/modules/entry/back/model-config.json @@ -7,5 +7,8 @@ }, "EntryLog": { "dataSource": "vn" + }, + "EntryObservation": { + "dataSource": "vn" } } diff --git a/modules/entry/back/models/entry-observation.js b/modules/entry/back/models/entry-observation.js new file mode 100644 index 0000000000..77d15d85c3 --- /dev/null +++ b/modules/entry/back/models/entry-observation.js @@ -0,0 +1,9 @@ +const UserError = require('vn-loopback/util/user-error'); + +module.exports = Self => { + Self.rewriteDbError(function(err) { + if (err.code === 'ER_DUP_ENTRY') + return new UserError(`The observation type can't be repeated`); + return err; + }); +}; diff --git a/modules/entry/back/models/entry-observation.json b/modules/entry/back/models/entry-observation.json new file mode 100644 index 0000000000..87d3fd964c --- /dev/null +++ b/modules/entry/back/models/entry-observation.json @@ -0,0 +1,38 @@ +{ + "name": "EntryObservation", + "base": "Loggable", + "log": { + "model": "EntryLog", + "relation": "entry" + }, + "options": { + "mysql": { + "table": "entryObservation" + } + }, + "properties": { + "id": { + "id": true, + "type": "Number", + "description": "Identifier" + }, + "description": { + "type": "String", + "required": true + } + }, + "relations": { + "entry": { + "type": "belongsTo", + "model": "Entry", + "foreignKey": "entryFk", + "required": true + }, + "observationType": { + "type": "belongsTo", + "model": "ObservationType", + "foreignKey": "observationTypeFk", + "required": true + } + } +} diff --git a/modules/entry/front/index.js b/modules/entry/front/index.js index e92f23fc19..14aecc8dbf 100644 --- a/modules/entry/front/index.js +++ b/modules/entry/front/index.js @@ -10,6 +10,7 @@ import './latest-buys-search-panel'; import './descriptor'; import './descriptor-popover'; import './card'; +import './note'; import './summary'; import './log'; import './buy'; diff --git a/modules/entry/front/note/index.html b/modules/entry/front/note/index.html new file mode 100644 index 0000000000..5f3c7f77e7 --- /dev/null +++ b/modules/entry/front/note/index.html @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/entry/front/note/index.js b/modules/entry/front/note/index.js new file mode 100644 index 0000000000..fccd609137 --- /dev/null +++ b/modules/entry/front/note/index.js @@ -0,0 +1,20 @@ +import ngModule from '../module'; +import Section from 'salix/components/section'; + +class Controller extends Section { + onSubmit() { + this.$.watcher.check(); + this.$.model.save().then(() => { + this.$.watcher.notifySaved(); + this.$.watcher.updateOriginalData(); + }); + } +} + +ngModule.vnComponent('vnEntryObservation', { + template: require('./index.html'), + controller: Controller, + bindings: { + entry: '<' + } +}); diff --git a/modules/entry/front/routes.json b/modules/entry/front/routes.json index a430a95fa7..010e738b30 100644 --- a/modules/entry/front/routes.json +++ b/modules/entry/front/routes.json @@ -12,6 +12,7 @@ "card": [ {"state": "entry.card.basicData", "icon": "settings"}, {"state": "entry.card.buy", "icon": "icon-lines"}, + {"state": "entry.card.observation", "icon": "insert_drive_file"}, {"state": "entry.card.log", "icon": "history"} ] }, @@ -61,7 +62,15 @@ "params": { "entry": "$ctrl.entry" } - }, { + },{ + "url": "/observation", + "state": "entry.card.observation", + "component": "vn-entry-observation", + "description": "Notes", + "params": { + "entry": "$ctrl.entry" + } + },{ "url" : "/log", "state": "entry.card.log", "component": "vn-entry-log", From a21476e3df80bf6f136df3807280c786d44ad6e0 Mon Sep 17 00:00:00 2001 From: bernat Date: Wed, 23 Dec 2020 12:42:41 +0100 Subject: [PATCH 068/101] fix searchbar index --- db/dump/fixtures.sql | 2 +- e2e/paths/02-client/15_user_config.spec.js | 2 +- modules/route/front/main/index.html | 5 ++--- modules/route/front/main/index.js | 3 ++- modules/ticket/front/main/index.html | 2 +- modules/ticket/front/main/index.js | 2 +- modules/travel/front/main/index.html | 3 ++- modules/travel/front/main/index.js | 8 ++++++++ 8 files changed, 18 insertions(+), 9 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 4ad5321b0d..aa15b774fb 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -1638,7 +1638,7 @@ INSERT INTO `vn`.`orderTicket`(`orderFk`, `ticketFk`) INSERT INTO `vn`.`userConfig` (`userFk`, `warehouseFk`, `companyFk`) VALUES - (1, 2, 69), + (1, 1, 69), (5, 1, 442), (9, 1, 442), (18, 3, 567); diff --git a/e2e/paths/02-client/15_user_config.spec.js b/e2e/paths/02-client/15_user_config.spec.js index 0e18c07add..2954ff522f 100644 --- a/e2e/paths/02-client/15_user_config.spec.js +++ b/e2e/paths/02-client/15_user_config.spec.js @@ -71,7 +71,7 @@ describe('User config', () => { expect(expectedLocalWarehouse).toBeTruthy(); expect(expectedLocalBank).toBeTruthy(); expect(expectedLocalCompany).toBeTruthy(); - expect(userWarehouse).toEqual('Warehouse Two'); + expect(userWarehouse).toEqual('Warehouse One'); expect(userCompany).toEqual('CCs'); }); diff --git a/modules/route/front/main/index.html b/modules/route/front/main/index.html index f0de3f09b3..16243be032 100644 --- a/modules/route/front/main/index.html +++ b/modules/route/front/main/index.html @@ -2,15 +2,14 @@ vn-id="model" url="Routes/filter" limit="20" - order="created DESC" - auto-load="true"> + order="created DESC"> diff --git a/modules/route/front/main/index.js b/modules/route/front/main/index.js index 8aa6552e1d..a6d5bedd1d 100644 --- a/modules/route/front/main/index.js +++ b/modules/route/front/main/index.js @@ -10,7 +10,8 @@ export default class Route extends ModuleMain { let from = new Date(); from.setHours(0, 0, 0, 0); - this.filter = {from, to, warehouseFk: this.vnConfig.warehouseFk}; + this.filterParams = {from, to, warehouseFk: this.vnConfig.warehouseFk}; + this.$.model.applyFilter(null, this.filterParams); } } diff --git a/modules/ticket/front/main/index.html b/modules/ticket/front/main/index.html index 7ea5c86e6e..953dc8a6be 100644 --- a/modules/ticket/front/main/index.html +++ b/modules/ticket/front/main/index.html @@ -11,7 +11,7 @@ info="Search ticket by id or alias" model="model" fetch-params="$ctrl.fetchParams($params)" - suggested-filter="$ctrl.defaultFilter"> + suggested-filter="$ctrl.filterParams"> diff --git a/modules/ticket/front/main/index.js b/modules/ticket/front/main/index.js index 9bbedbcc96..78334ba97c 100644 --- a/modules/ticket/front/main/index.js +++ b/modules/ticket/front/main/index.js @@ -5,7 +5,7 @@ export default class Ticket extends ModuleMain { constructor() { super(); - this.defaultFilter = { + this.filterParams = { scopeDays: 1 }; } diff --git a/modules/travel/front/main/index.html b/modules/travel/front/main/index.html index 56167c6fc1..feb1e8b017 100644 --- a/modules/travel/front/main/index.html +++ b/modules/travel/front/main/index.html @@ -10,7 +10,8 @@ panel="vn-travel-search-panel" info="Search travels by id" model="model" - fetch-params="$ctrl.fetchParams($params)"> + fetch-params="$ctrl.fetchParams($params)" + suggested-filter="$ctrl.filterParams"> diff --git a/modules/travel/front/main/index.js b/modules/travel/front/main/index.js index f04cc750d2..d6f1030338 100644 --- a/modules/travel/front/main/index.js +++ b/modules/travel/front/main/index.js @@ -2,6 +2,14 @@ import ngModule from '../module'; import ModuleMain from 'salix/components/module-main'; export default class Travel extends ModuleMain { + constructor() { + super(); + + this.filterParams = { + scopeDays: 1 + }; + } + fetchParams($params) { if (!Object.entries($params).length) $params.scopeDays = 1; From 3517bdea415feb31b282ced953e66e90f94141ec Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Wed, 23 Dec 2020 13:31:55 +0100 Subject: [PATCH 069/101] =?UTF-8?q?A=C3=B1adido=20a=20las=20foreignKeys=20?= =?UTF-8?q?el=20valor=20UNIQUE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/changes/10260-holidays/00-entryObservation.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/db/changes/10260-holidays/00-entryObservation.sql b/db/changes/10260-holidays/00-entryObservation.sql index f72d64b015..6184cf3bd9 100644 --- a/db/changes/10260-holidays/00-entryObservation.sql +++ b/db/changes/10260-holidays/00-entryObservation.sql @@ -8,4 +8,7 @@ CREATE TABLE `vn`.`entryObservation` ( FOREIGN KEY (entryFk) REFERENCES entry(id), CONSTRAINT observationType_id_observationTypeFk FOREIGN KEY (observationTypeFk) REFERENCES observationType(id) -); \ No newline at end of file +); + +ALTER TABLE `vn`.`entryObservation` +ADD UNIQUE INDEX `entryFk_observationTypeFk_UNIQUE` (`entryFk` ASC,`observationTypeFk` ASC); \ No newline at end of file From 259842c22de493210ffba283a7826ef5fd4a5bf8 Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Wed, 23 Dec 2020 13:32:58 +0100 Subject: [PATCH 070/101] Retirado el parametro required por no utilizarse --- modules/entry/back/models/entry-observation.json | 3 +-- modules/ticket/back/models/ticket-observation.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/entry/back/models/entry-observation.json b/modules/entry/back/models/entry-observation.json index 87d3fd964c..535735d839 100644 --- a/modules/entry/back/models/entry-observation.json +++ b/modules/entry/back/models/entry-observation.json @@ -25,8 +25,7 @@ "entry": { "type": "belongsTo", "model": "Entry", - "foreignKey": "entryFk", - "required": true + "foreignKey": "entryFk" }, "observationType": { "type": "belongsTo", diff --git a/modules/ticket/back/models/ticket-observation.json b/modules/ticket/back/models/ticket-observation.json index 51469c7a6c..ba4f85ce8b 100644 --- a/modules/ticket/back/models/ticket-observation.json +++ b/modules/ticket/back/models/ticket-observation.json @@ -25,8 +25,7 @@ "ticket": { "type": "belongsTo", "model": "Ticket", - "foreignKey": "ticketFk", - "required": true + "foreignKey": "ticketFk" }, "observationType": { "type": "belongsTo", From 8ede30398b1577814a2d292ceb5779c5c13baba5 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 24 Dec 2020 11:31:20 +0100 Subject: [PATCH 071/101] clone feature for routes index --- modules/route/back/methods/route/clone.js | 56 +++++++++++++++++++ .../back/methods/route/specs/clone.spec.js | 31 ++++++++++ modules/route/back/models/route.js | 1 + modules/route/front/basic-data/locale/es.yml | 2 + modules/route/front/index/index.html | 36 ++++++++++-- modules/route/front/index/index.js | 16 ++++++ modules/route/front/index/index.spec.js | 10 ++++ modules/route/front/index/locale/es.yml | 5 +- 8 files changed, 151 insertions(+), 6 deletions(-) create mode 100644 modules/route/back/methods/route/clone.js create mode 100644 modules/route/back/methods/route/specs/clone.spec.js diff --git a/modules/route/back/methods/route/clone.js b/modules/route/back/methods/route/clone.js new file mode 100644 index 0000000000..ece232ccfc --- /dev/null +++ b/modules/route/back/methods/route/clone.js @@ -0,0 +1,56 @@ +module.exports = Self => { + Self.remoteMethod('clone', { + description: 'Clones the selected routes', + accessType: 'WRITE', + accepts: [ + { + arg: 'ids', + type: ['number'], + required: true, + description: 'The routes ids to clone' + }, + { + arg: 'started', + type: 'date', + required: true, + description: 'The started date for all routes' + } + ], + returns: { + type: ['Object'], + root: true + }, + http: { + path: `/clone`, + verb: 'POST' + } + }); + + Self.clone = async(ids, started) => { + const tx = await Self.beginTransaction({}); + try { + const options = {transaction: tx}; + const originalRoutes = await Self.find({ + where: {id: {inq: ids}}, + fields: ['workerFk', 'agencyModeFk', 'vehicleFk', 'description'] + }, options); + + if (ids.length != originalRoutes.length) + throw new Error(`The amount of routes found don't match`); + + const routes = originalRoutes.map(route => { + route.started = started; + route.created = new Date(); + return route; + }); + + const clones = await Self.create(routes, options); + + await tx.commit(); + return clones; + } catch (e) { + await tx.rollback(); + throw e; + } + }; +}; diff --git a/modules/route/back/methods/route/specs/clone.spec.js b/modules/route/back/methods/route/specs/clone.spec.js new file mode 100644 index 0000000000..c0f5f04f10 --- /dev/null +++ b/modules/route/back/methods/route/specs/clone.spec.js @@ -0,0 +1,31 @@ +const app = require('vn-loopback/server/server'); + +describe('route clone()', () => { + const startDate = new Date(); + it('should throw an error if the amount of ids pased to the clone function do no match the database', async() => { + const ids = [996, 997, 998, 999]; + + let error; + + try { + await app.models.Route.clone(ids, startDate); + } catch (e) { + error = e; + } + + expect(error).toBeDefined(); + expect(error.message).toEqual(`The amount of routes found don't match`); + }); + + it('should clone two routes', async() => { + const ids = [1, 2]; + + const clones = await app.models.Route.clone(ids, startDate); + + expect(clones.length).toEqual(2); + + // restores + for (const clone of clones) + await app.models.Route.destroyById(clone.id); + }); +}); diff --git a/modules/route/back/models/route.js b/modules/route/back/models/route.js index 6320a888c5..4423131bf1 100644 --- a/modules/route/back/models/route.js +++ b/modules/route/back/models/route.js @@ -6,6 +6,7 @@ module.exports = Self => { require('../methods/route/updateVolume')(Self); require('../methods/route/getDeliveryPoint')(Self); require('../methods/route/insertTicket')(Self); + require('../methods/route/clone')(Self); Self.validate('kmStart', validateDistance, { message: 'Distance must be lesser than 1000' diff --git a/modules/route/front/basic-data/locale/es.yml b/modules/route/front/basic-data/locale/es.yml index f0414b5b15..a98f20215c 100644 --- a/modules/route/front/basic-data/locale/es.yml +++ b/modules/route/front/basic-data/locale/es.yml @@ -3,3 +3,5 @@ Date started: Fecha inicio Km start: Km de inicio Km end: Km de fin Description: Descripción +Hour started: Hora inicio +Hour finished: Hora fin diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html index d71bcbc486..7bbadefe46 100644 --- a/modules/route/front/index/index.html +++ b/modules/route/front/index/index.html @@ -44,7 +44,7 @@ {{::route.agencyName | dashIfEmpty}} {{::route.vehiclePlateNumber | dashIfEmpty}} - {{::route.created | date:'dd/MM/yyyy' | dashIfEmpty}} + {{::route.created | dashIfEmpty | date:'dd/MM/yyyy'}} {{::route.m3 | dashIfEmpty}} {{::route.description | dashIfEmpty}} @@ -59,19 +59,26 @@ + + - -
\ No newline at end of file +
+ + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/route/front/index/index.js b/modules/route/front/index/index.js index 4400bdbb15..2dc767f4cb 100644 --- a/modules/route/front/index/index.js +++ b/modules/route/front/index/index.js @@ -40,6 +40,22 @@ export default class Controller extends Section { }); } + openClonationDialog() { + this.startedDate = new Date(); + this.$.clonationDialog.show(); + } + + cloneSelectedRoutes() { + const routesIds = []; + for (let route of this.checked) + routesIds.push(route.id); + + return this.$http.post('Routes/clone', {ids: routesIds, started: this.startedDate}).then(() => { + this.$.model.refresh(); + this.vnApp.showSuccess(this.$t('Data saved!')); + }); + } + onDrop($event) { const target = $event.target; const droppable = target.closest(this.droppableElement); diff --git a/modules/route/front/index/index.spec.js b/modules/route/front/index/index.spec.js index b66ecaf00c..8346f924c5 100644 --- a/modules/route/front/index/index.spec.js +++ b/modules/route/front/index/index.spec.js @@ -60,6 +60,16 @@ describe('Component vnRouteIndex', () => { }); }); + describe('cloneSelectedRoutes()', () => { + it('should perform an http request to Routes/clone', () => { + controller.startedDate = new Date(); + + $httpBackend.expect('POST', 'Routes/clone').respond(); + controller.cloneSelectedRoutes(); + $httpBackend.flush(); + }); + }); + describe('onDrop()', () => { it('should call the insert method when dragging a ticket number', () => { jest.spyOn(controller, 'insert'); diff --git a/modules/route/front/index/locale/es.yml b/modules/route/front/index/locale/es.yml index 0c09b21eea..40cd5f2b5f 100644 --- a/modules/route/front/index/locale/es.yml +++ b/modules/route/front/index/locale/es.yml @@ -1,2 +1,5 @@ Vehicle: Vehículo -Download selected routes as PDF: Descargar rutas seleccionadas como PDF \ No newline at end of file +Download selected routes as PDF: Descargar rutas seleccionadas como PDF +Clone selected routes: Clonar rutas seleccionadas +Select the starting date: Seleccione fecha de inicio +Starting date: Fecha de inicio \ No newline at end of file From 68f2976c2de94494b65e90e31205cd9ec2fdf97c Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 24 Dec 2020 13:15:14 +0100 Subject: [PATCH 072/101] e2e path updated for clonation --- e2e/helpers/selectors.js | 9 +++++++- ...te.spec.js => 03_create_and_clone.spec.js} | 21 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) rename e2e/paths/08-route/{03_create.spec.js => 03_create_and_clone.spec.js} (68%) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 11087d2d4a..0ed3607ad4 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -674,7 +674,14 @@ export default { confirmButton: '.vn-confirm.shown button[response="accept"]', }, routeIndex: { - addNewRouteButton: 'vn-route-index a[ui-sref="route.create"]' + anyResult: 'vn-table a', + firstRouteCheckbox: 'a:nth-child(1) vn-td:nth-child(1) > vn-check', + addNewRouteButton: 'vn-route-index a[ui-sref="route.create"]', + cloneButton: 'vn-route-index button > vn-icon[icon="icon-clone"]', + submitClonationButton: 'tpl-buttons > button[response="accept"]', + openAdvancedSearchButton: 'vn-searchbar .append vn-icon[icon="arrow_drop_down"]', + searchAgencyAutocomlete: 'vn-route-search-panel vn-autocomplete[ng-model="filter.agencyModeFk"]', + advancedSearchButton: 'vn-route-search-panel button[type=submit]', }, createRouteView: { worker: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.workerFk"]', diff --git a/e2e/paths/08-route/03_create.spec.js b/e2e/paths/08-route/03_create_and_clone.spec.js similarity index 68% rename from e2e/paths/08-route/03_create.spec.js rename to e2e/paths/08-route/03_create_and_clone.spec.js index 670f7e17b9..f2de57a855 100644 --- a/e2e/paths/08-route/03_create.spec.js +++ b/e2e/paths/08-route/03_create_and_clone.spec.js @@ -57,5 +57,26 @@ describe('Route create path', () => { it(`should confirm the redirection to the created route summary`, async() => { await page.waitForState('route.card.summary'); }); + + it(`should navigate back to the route index`, async() => { + await page.waitToClick(selectors.globalItems.returnToModuleIndexButton); + await page.waitForState('route.index'); + }); + + it(`should clone the first route`, async() => { + await page.waitToClick(selectors.routeIndex.firstRouteCheckbox); + await page.waitToClick(selectors.routeIndex.cloneButton); + await page.waitToClick(selectors.routeIndex.submitClonationButton); + const message = await page.waitForSnackbar(); + + expect(message.text).toContain('Data saved!'); + }); + + it(`should search for the agency of the cloned routes and find two results`, async() => { + await page.waitToClick(selectors.routeIndex.openAdvancedSearchButton); + await page.autocompleteSearch(selectors.routeIndex.searchAgencyAutocomlete, 'inhouse pickup'); + await page.waitToClick(selectors.routeIndex.advancedSearchButton); + await page.waitForNumberOfElements(selectors.routeIndex.anyResult, 2); + }); }); }); From 3f9446d94f4b81780630e2460f2121fc2d6a786c Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 24 Dec 2020 16:48:56 +0100 Subject: [PATCH 073/101] e2e path updated + extension refactor --- e2e/helpers/extensions.js | 11 ++++++++--- e2e/paths/08-route/03_create_and_clone.spec.js | 17 ++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js index b38b3f7184..71f8344767 100644 --- a/e2e/helpers/extensions.js +++ b/e2e/helpers/extensions.js @@ -300,9 +300,14 @@ let actions = { }, waitForNumberOfElements: async function(selector, count) { - return await this.waitForFunction((selector, count) => { - return document.querySelectorAll(selector).length == count; - }, {}, selector, count); + try { + await this.waitForFunction((selector, count) => { + return document.querySelectorAll(selector).length == count; + }, {}, selector, count); + } catch (error) { + const amount = await this.countElement(selector); + throw new Error(`actual amount of elements was: ${amount} instead of ${count}, ${error}`); + } }, waitForClassNotPresent: async function(selector, className) { diff --git a/e2e/paths/08-route/03_create_and_clone.spec.js b/e2e/paths/08-route/03_create_and_clone.spec.js index f2de57a855..c42bbdc554 100644 --- a/e2e/paths/08-route/03_create_and_clone.spec.js +++ b/e2e/paths/08-route/03_create_and_clone.spec.js @@ -63,6 +63,13 @@ describe('Route create path', () => { await page.waitForState('route.index'); }); + it(`should count the amount of routes before clonation`, async() => { + await page.waitForNumberOfElements(selectors.routeIndex.anyResult, 8); + const result = await page.countElement(selectors.routeIndex.anyResult); + + expect(result).toEqual(8); + }); + it(`should clone the first route`, async() => { await page.waitToClick(selectors.routeIndex.firstRouteCheckbox); await page.waitToClick(selectors.routeIndex.cloneButton); @@ -72,11 +79,11 @@ describe('Route create path', () => { expect(message.text).toContain('Data saved!'); }); - it(`should search for the agency of the cloned routes and find two results`, async() => { - await page.waitToClick(selectors.routeIndex.openAdvancedSearchButton); - await page.autocompleteSearch(selectors.routeIndex.searchAgencyAutocomlete, 'inhouse pickup'); - await page.waitToClick(selectors.routeIndex.advancedSearchButton); - await page.waitForNumberOfElements(selectors.routeIndex.anyResult, 2); + it(`should reload the section and count the amount of routes after clonation`, async() => { + await page.waitForNumberOfElements(selectors.routeIndex.anyResult, 9); + const result = await page.countElement(selectors.routeIndex.anyResult); + + expect(result).toEqual(9); }); }); }); From 0715f8ac81bc633bfb3387ee0b3becde7351cb08 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 28 Dec 2020 09:44:21 +0100 Subject: [PATCH 074/101] now loopback reconects to db --- loopback/server/connectors/vn-mysql.js | 95 ++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/loopback/server/connectors/vn-mysql.js b/loopback/server/connectors/vn-mysql.js index 4e1345cd69..fde0ddcf64 100644 --- a/loopback/server/connectors/vn-mysql.js +++ b/loopback/server/connectors/vn-mysql.js @@ -246,3 +246,98 @@ exports.initialize = function initialize(dataSource, callback) { dataSource.connector.connect(callback); } }; + +MySQL.prototype.connect = function(callback) { + const self = this; + const options = generateOptions(this.settings); + + if (this.client) { + if (callback) { + process.nextTick(function() { + callback(null, self.client); + }); + } + } else + this.client = connectionHandler(options, callback); + + function connectionHandler(options, callback) { + const client = mysql.createPool(options); + client.getConnection(function(err, connection) { + const conn = connection; + if (!err) { + if (self.debug) + debug('MySQL connection is established: ' + self.settings || {}); + + connection.release(); + } else { + if (err.code == 'ECONNREFUSED' || err.code == 'PROTOCOL_CONNECTION_LOST') { // PROTOCOL_CONNECTION_LOST + console.error(`MySQL connection lost (${err.code}). Retrying..`); + + return setTimeout(() => + connectionHandler(options, callback), 5000); + } + if (self.debug || !callback) + console.error('MySQL connection is failed: ' + self.settings || {}, err); + } + callback && callback(err, conn); + }); + + return client; + } +}; + +function generateOptions(settings) { + const s = settings || {}; + if (s.collation) { + // Charset should be first 'chunk' of collation. + s.charset = s.collation.substr(0, s.collation.indexOf('_')); + } else { + s.collation = 'utf8_general_ci'; + s.charset = 'utf8'; + } + + s.supportBigNumbers = (s.supportBigNumbers || false); + s.timezone = (s.timezone || 'local'); + + if (isNaN(s.connectionLimit)) + s.connectionLimit = 10; + + let options; + if (s.url) { + // use url to override other settings if url provided + options = s.url; + } else { + options = { + host: s.host || s.hostname || 'localhost', + port: s.port || 3306, + user: s.username || s.user, + password: s.password, + timezone: s.timezone, + socketPath: s.socketPath, + charset: s.collation.toUpperCase(), // Correct by docs despite seeming odd. + supportBigNumbers: s.supportBigNumbers, + connectionLimit: s.connectionLimit, + }; + + // Don't configure the DB if the pool can be used for multiple DBs + if (!s.createDatabase) + options.database = s.database; + + // Take other options for mysql driver + // See https://github.com/strongloop/loopback-connector-mysql/issues/46 + for (const p in s) { + if (p === 'database' && s.createDatabase) + continue; + + if (options[p] === undefined) + options[p] = s[p]; + } + // Legacy UTC Date Processing fallback - SHOULD BE TRANSITIONAL + if (s.legacyUtcDateProcessing === undefined) + s.legacyUtcDateProcessing = true; + + if (s.legacyUtcDateProcessing) + options.timezone = 'Z'; + } + return options; +} From f16eaf105be99c8a105a8fe0574865da767c44c8 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 28 Dec 2020 09:46:33 +0100 Subject: [PATCH 075/101] enabled back end unit tests for jenkins --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d87695cc42..444eaefc47 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,13 +69,13 @@ pipeline { } } } - /* stage('Backend') { + stage('Backend') { steps { nodejs('node-lts') { sh 'gulp launchBackTest --ci' } } - } */ + } } } stage('Build') { From 846117d3bdbe1ec10ef9fbba2aeae74b89ec41a6 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 28 Dec 2020 10:16:25 +0100 Subject: [PATCH 076/101] backend unit tests disabled for jenkins --- Jenkinsfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 444eaefc47..06eb855612 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,13 +69,13 @@ pipeline { } } } - stage('Backend') { - steps { - nodejs('node-lts') { - sh 'gulp launchBackTest --ci' - } - } - } + // stage('Backend') { + // steps { + // nodejs('node-lts') { + // sh 'gulp launchBackTest --ci' + // } + // } + // } } } stage('Build') { From 5af51763d6c954a71458b181b35ec0a691ac00a8 Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Mon, 28 Dec 2020 12:55:28 +0100 Subject: [PATCH 077/101] Created back test field for entryObservation --- .../models/specs/entry-observation.spec.js | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 modules/entry/back/models/specs/entry-observation.spec.js diff --git a/modules/entry/back/models/specs/entry-observation.spec.js b/modules/entry/back/models/specs/entry-observation.spec.js new file mode 100644 index 0000000000..fca13139c4 --- /dev/null +++ b/modules/entry/back/models/specs/entry-observation.spec.js @@ -0,0 +1,29 @@ +const app = require('vn-loopback/server/server'); + +describe('EntryObservation', () => { + const entryId = 1; + + it('should throw a user error if the observation type is duplicated.', async() => { + const observations = [ + { + entryFk: entryId, + observationTypeFk: 1, + description: 'repeated description' + }, + { + entryFk: entryId, + observationTypeFk: 1, + description: 'repeated description' + }, + ]; + + let error; + try { + await app.models.EntryObservation.create(observations); + } catch (e) { + error = e; + } + + expect(error).toBeDefined(); + }); +}); From 67072f5c2372fd84d908d4781ce27448ec1b487c Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 28 Dec 2020 14:13:22 +0100 Subject: [PATCH 078/101] e2e path for route index now works focused and full run --- e2e/paths/08-route/03_create_and_clone.spec.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/e2e/paths/08-route/03_create_and_clone.spec.js b/e2e/paths/08-route/03_create_and_clone.spec.js index c42bbdc554..be758f7887 100644 --- a/e2e/paths/08-route/03_create_and_clone.spec.js +++ b/e2e/paths/08-route/03_create_and_clone.spec.js @@ -63,11 +63,14 @@ describe('Route create path', () => { await page.waitForState('route.index'); }); + let count; it(`should count the amount of routes before clonation`, async() => { - await page.waitForNumberOfElements(selectors.routeIndex.anyResult, 8); - const result = await page.countElement(selectors.routeIndex.anyResult); + await page.waitForFunction(selector => { + return document.querySelectorAll(selector).length > 6; + }, {}, selectors.routeIndex.anyResult); + count = await page.countElement(selectors.routeIndex.anyResult); - expect(result).toEqual(8); + expect(count).toBeGreaterThanOrEqual(7); }); it(`should clone the first route`, async() => { @@ -80,10 +83,10 @@ describe('Route create path', () => { }); it(`should reload the section and count the amount of routes after clonation`, async() => { - await page.waitForNumberOfElements(selectors.routeIndex.anyResult, 9); + await page.waitForNumberOfElements(selectors.routeIndex.anyResult, count + 1); const result = await page.countElement(selectors.routeIndex.anyResult); - expect(result).toEqual(9); + expect(result).toEqual(count + 1); }); }); }); From 910caf5689944a118988c26d17a53a0a733f6d81 Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 28 Dec 2020 14:53:26 +0100 Subject: [PATCH 079/101] 2661 - Added clone options --- .../00-travel_cloneWithEntries.sql | 135 ++++++++++++++++++ loopback/util/log.js | 12 +- modules/ticket/back/methods/ticket/new.js | 2 +- .../back/methods/travel/cloneWithEntries.js | 87 +++++++++++ .../travel/specs/cloneWithEntries.spec.js | 79 ++++++++++ modules/travel/back/models/travel.js | 1 + modules/travel/front/create/index.js | 2 +- modules/travel/front/create/index.spec.js | 3 +- .../travel/front/descriptor-menu/index.html | 14 ++ modules/travel/front/descriptor-menu/index.js | 5 + .../front/descriptor-menu/index.spec.js | 19 ++- .../front/descriptor-menu/locale/es.yml | 4 +- modules/travel/front/locale/es.yml | 2 +- modules/travel/front/summary/index.html | 1 + 14 files changed, 355 insertions(+), 11 deletions(-) create mode 100644 db/changes/10260-holidays/00-travel_cloneWithEntries.sql create mode 100644 modules/travel/back/methods/travel/cloneWithEntries.js create mode 100644 modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js diff --git a/db/changes/10260-holidays/00-travel_cloneWithEntries.sql b/db/changes/10260-holidays/00-travel_cloneWithEntries.sql new file mode 100644 index 0000000000..1302a78ca9 --- /dev/null +++ b/db/changes/10260-holidays/00-travel_cloneWithEntries.sql @@ -0,0 +1,135 @@ +-- DROP PROCEDURE `vn`.`clonTravelComplete`; + +DELIMITER $$ +USE `vn`$$ +CREATE + DEFINER = root@`%` PROCEDURE `vn`.`travel_cloneWithEntries`(IN vTravelFk INT, IN vDateStart DATE, IN vDateEnd DATE, + IN vRef VARCHAR(255), OUT vNewTravelFk INT) +BEGIN + DECLARE vEntryNew INT; + DECLARE vDone BOOLEAN DEFAULT FALSE; + DECLARE vAuxEntryFk INT; + DECLARE vRsEntry CURSOR FOR + SELECT e.id + FROM entry e + JOIN travel t + ON t.id = e.travelFk + WHERE e.travelFk = vTravelFk; + + DECLARE vRsBuy CURSOR FOR + SELECT b.* + FROM buy b + JOIN entry e + ON b.entryFk = e.id + WHERE e.travelFk = vNewTravelFk and b.entryFk=vNewTravelFk + ORDER BY e.id; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + DECLARE EXIT HANDLER FOR SQLEXCEPTION + BEGIN + ROLLBACK; + RESIGNAL; + END; + + START TRANSACTION; + + INSERT INTO travel (shipped,landed, warehouseInFk, warehouseOutFk, agencyFk, ref, isDelivered, isReceived, m3, kg) + SELECT vDateStart, vDateEnd,warehouseInFk, warehouseOutFk, agencyFk, vRef, isDelivered, isReceived, m3, kg + FROM travel + WHERE id = vTravelFk; + + SET vNewTravelFk = LAST_INSERT_ID(); + SET vDone = FALSE; + OPEN vRsEntry ; + FETCH vRsEntry INTO vAuxEntryFk; + + WHILE NOT vDone DO + INSERT INTO entry (supplierFk, + ref, + isInventory, + isConfirmed, + isOrdered, + isRaid, + commission, + created, + evaNotes, + travelFk, + currencyFk, + companyFk, + gestDocFk, + invoiceInFk) + SELECT supplierFk, + ref, + isInventory, + isConfirmed, + isOrdered, + isRaid, + commission, + created, + evaNotes, + vNewTravelFk, + currencyFk, + companyFk, + gestDocFk, + invoiceInFk + FROM entry + WHERE id = vAuxEntryFk; + + SET vEntryNew = LAST_INSERT_ID(); + + + INSERT INTO buy (entryFk, + itemFk, + quantity, + buyingValue, + packageFk, + stickers, + freightValue, + packageValue, + comissionValue, + packing, + `grouping`, + groupingMode, + location, + price1, + price2, + price3, + minPrice, + producer, + printedStickers, + isChecked, + weight) + SELECT vEntryNew, + itemFk, + quantity, + buyingValue, + packageFk, + stickers, + freightValue, + packageValue, + comissionValue, + packing, + `grouping`, + groupingMode, + location, + price1, + price2, + price3, + minPrice, + producer, + printedStickers, + isChecked, + weight + FROM buy + WHERE entryFk = vAuxEntryFk; + + + FETCH vRsEntry INTO vAuxEntryFk; + END WHILE; + CLOSE vRsEntry; + COMMIT; +END;$$ +DELIMITER ; + + diff --git a/loopback/util/log.js b/loopback/util/log.js index baba3e8279..d81fc39a09 100644 --- a/loopback/util/log.js +++ b/loopback/util/log.js @@ -33,6 +33,9 @@ exports.translateValues = async(instance, changes) => { }).format(date); } + if (changes instanceof instance) + changes = changes.__data; + const properties = Object.assign({}, changes); for (let property in properties) { const relation = getRelation(instance, property); @@ -41,13 +44,14 @@ exports.translateValues = async(instance, changes) => { if (relation) { let fieldsToShow = ['alias', 'name', 'code', 'description']; - const log = instance.definition.settings.log; + const modelName = relation.model; + const model = models[modelName]; + const log = model.definition.settings.log; if (log && log.showField) - fieldsToShow = log.showField; + fieldsToShow = [log.showField]; - const model = relation.model; - const row = await models[model].findById(value, { + const row = await model.findById(value, { fields: fieldsToShow }); const newValue = getValue(row); diff --git a/modules/ticket/back/methods/ticket/new.js b/modules/ticket/back/methods/ticket/new.js index 2763f1bd09..8bafe5403e 100644 --- a/modules/ticket/back/methods/ticket/new.js +++ b/modules/ticket/back/methods/ticket/new.js @@ -130,7 +130,7 @@ module.exports = Self => { let logRecord = { originFk: cleanInstance.id, userFk: myUserId, - action: 'create', + action: 'insert', changedModel: 'Ticket', changedModelId: cleanInstance.id, oldInstance: {}, diff --git a/modules/travel/back/methods/travel/cloneWithEntries.js b/modules/travel/back/methods/travel/cloneWithEntries.js new file mode 100644 index 0000000000..82d6b40e2b --- /dev/null +++ b/modules/travel/back/methods/travel/cloneWithEntries.js @@ -0,0 +1,87 @@ +const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; +const UserError = require('vn-loopback/util/user-error'); +const loggable = require('vn-loopback/util/log'); + +module.exports = Self => { + Self.remoteMethodCtx('cloneWithEntries', { + description: 'Clone travel', + accessType: 'WRITE', + accepts: [{ + arg: 'id', + type: 'number', + required: true, + description: 'The original travel id', + http: {source: 'path'} + }], + returns: { + type: 'Object', + description: 'The new cloned travel id', + root: true, + }, + http: { + path: `/:id/cloneWithEntries`, + verb: 'post' + } + }); + + Self.cloneWithEntries = async(ctx, id) => { + const userId = ctx.req.accessToken.userId; + const conn = Self.dataSource.connector; + const models = Self.app.models; + const travel = await Self.findById(id, { + fields: [ + 'id', + 'shipped', + 'landed', + 'warehouseInFk', + 'warehouseOutFk', + 'agencyFk', + 'ref' + ] + }); + const started = new Date(); + const ended = new Date(); + + if (!travel) + throw new UserError('Travel not found'); + + let stmts = []; + let stmt; + + stmt = new ParameterizedSQL( + `CALL travel_cloneWithEntries(?, ?, ?, ?, @vTravelFk)`, [ + id, started, ended, travel.ref]); + + stmts.push(stmt); + const index = stmts.push('SELECT @vTravelFk AS id') - 1; + + const sql = ParameterizedSQL.join(stmts, ';'); + const result = await conn.executeStmt(sql); + const [lastInsert] = result[index]; + const newTravel = await Self.findById(lastInsert.id, { + fields: [ + 'id', + 'shipped', + 'landed', + 'warehouseInFk', + 'warehouseOutFk', + 'agencyFk', + 'ref' + ] + }); + + const oldProperties = await loggable.translateValues(Self, travel); + const newProperties = await loggable.translateValues(Self, newTravel); + await models.TravelLog.create({ + originFk: newTravel.id, + userFk: userId, + action: 'insert', + changedModel: 'Travel', + changedModelId: newTravel.id, + oldInstance: oldProperties, + newInstance: newProperties + }); + + return newTravel.id; + }; +}; diff --git a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js new file mode 100644 index 0000000000..ab7d3aa1d9 --- /dev/null +++ b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js @@ -0,0 +1,79 @@ +const app = require('vn-loopback/server/server'); + +// #2687 - Cannot make a data rollback because of the triggers +xdescribe('Travel cloneWithEntries()', () => { + const models = app.models; + const travelId = 5; + const currentUserId = 102; + const ctx = {req: {accessToken: {userId: currentUserId}}}; + let travelBefore; + let newTravelId; + + afterAll(async done => { + try { + const entries = await models.Entry.find({ + where: { + travelFk: newTravelId + } + }); + const entriesId = entries.map(entry => entry.id); + + // Destroy all entries buys + await models.Buy.destroyAll({ + where: { + entryFk: {inq: entriesId} + } + }); + + // Destroy travel entries + await models.Entry.destroyAll({ + where: { + travelFk: newTravelId + } + }); + + // Destroy new travel + await models.Travel.destroyById(newTravelId); + + // Restore original travel shipped & landed + const travel = await models.Travel.findById(travelId); + await travel.updateAttributes({ + shipped: travelBefore.shipped, + landed: travelBefore.landed + }); + } catch (error) { + console.error(error); + } + + done(); + }); + + it(`should clone the travel and the containing entries`, async() => { + const warehouseThree = 3; + const agencyModeOne = 1; + const yesterday = new Date(); + yesterday.setDate(yesterday.getDate() - 1); + + travelBefore = await models.Travel.findById(travelId); + await travelBefore.updateAttributes({ + shipped: yesterday, + landed: yesterday + }); + + newTravelId = await models.Travel.cloneWithEntries(ctx, travelId); + const travelEntries = await models.Entry.find({ + where: { + travelFk: newTravelId + } + }); + + const newTravel = await models.Travel.findById(travelId); + + expect(newTravelId).not.toEqual(travelId); + expect(newTravel.ref).toEqual('fifth travel'); + expect(newTravel.warehouseInFk).toEqual(warehouseThree); + expect(newTravel.warehouseOutFk).toEqual(warehouseThree); + expect(newTravel.agencyFk).toEqual(agencyModeOne); + expect(travelEntries.length).toBeGreaterThan(0); + }); +}); diff --git a/modules/travel/back/models/travel.js b/modules/travel/back/models/travel.js index b8a1a24b36..46d33b305d 100644 --- a/modules/travel/back/models/travel.js +++ b/modules/travel/back/models/travel.js @@ -8,6 +8,7 @@ module.exports = Self => { require('../methods/travel/deleteThermograph')(Self); require('../methods/travel/updateThermograph')(Self); require('../methods/travel/extraCommunityFilter')(Self); + require('../methods/travel/cloneWithEntries')(Self); Self.rewriteDbError(function(err) { if (err.code === 'ER_DUP_ENTRY') diff --git a/modules/travel/front/create/index.js b/modules/travel/front/create/index.js index 7d0020034b..9a9c5ce9db 100644 --- a/modules/travel/front/create/index.js +++ b/modules/travel/front/create/index.js @@ -9,7 +9,7 @@ class Controller extends Section { onSubmit() { return this.$.watcher.submit().then( - res => this.$state.go('travel.card.summary', {id: res.data.id}) + res => this.$state.go('travel.card.basicData', {id: res.data.id}) ); } } diff --git a/modules/travel/front/create/index.spec.js b/modules/travel/front/create/index.spec.js index 4bde7747e2..99f52b322c 100644 --- a/modules/travel/front/create/index.spec.js +++ b/modules/travel/front/create/index.spec.js @@ -22,7 +22,7 @@ describe('Travel Component vnTravelCreate', () => { controller.onSubmit(); - expect(controller.$state.go).toHaveBeenCalledWith('travel.card.summary', {id: 1234}); + expect(controller.$state.go).toHaveBeenCalledWith('travel.card.basicData', {id: 1234}); }); }); @@ -39,4 +39,3 @@ describe('Travel Component vnTravelCreate', () => { }); }); }); - diff --git a/modules/travel/front/descriptor-menu/index.html b/modules/travel/front/descriptor-menu/index.html index 1eb558008a..714d3ce3f2 100644 --- a/modules/travel/front/descriptor-menu/index.html +++ b/modules/travel/front/descriptor-menu/index.html @@ -10,6 +10,12 @@ translate> Clone travel + + Clone travel and his entries + @@ -20,3 +26,11 @@ question="Do you want to clone this travel?" message="All it's properties will be copied"> + + + + diff --git a/modules/travel/front/descriptor-menu/index.js b/modules/travel/front/descriptor-menu/index.js index 975cd91342..e83a90b97a 100644 --- a/modules/travel/front/descriptor-menu/index.js +++ b/modules/travel/front/descriptor-menu/index.js @@ -59,6 +59,11 @@ class Controller extends Section { }); this.$state.go('travel.create', {q: params}); } + + onCloneWithEntriesAccept() { + this.$http.post(`Travels/${this.travelId}/cloneWithEntries`) + .then(res => this.$state.go('travel.card.basicData', {id: res.data})); + } } Controller.$inject = ['$element', '$scope']; diff --git a/modules/travel/front/descriptor-menu/index.spec.js b/modules/travel/front/descriptor-menu/index.spec.js index d66f3a4356..3d94a09637 100644 --- a/modules/travel/front/descriptor-menu/index.spec.js +++ b/modules/travel/front/descriptor-menu/index.spec.js @@ -2,11 +2,14 @@ import './index.js'; describe('Travel Component vnTravelDescriptorMenu', () => { let controller; + let $httpBackend; beforeEach(ngModule('travel')); - beforeEach(inject(($componentController, $state,) => { + beforeEach(inject(($componentController, _$httpBackend_) => { + $httpBackend = _$httpBackend_; const $element = angular.element(''); controller = $componentController('vnTravelDescriptorMenu', {$element}); + controller._travelId = 5; })); describe('onCloneAccept()', () => { @@ -36,4 +39,18 @@ describe('Travel Component vnTravelDescriptorMenu', () => { expect(controller.$state.go).toHaveBeenCalledWith('travel.create', {'q': params}); }); }); + + describe('onCloneWithEntriesAccept()', () => { + it('should make an HTTP query and then call to the $state.go method with the returned id', () => { + jest.spyOn(controller.$state, 'go').mockReturnValue('ok'); + + $httpBackend.expect('POST', `Travels/${controller.travelId}/cloneWithEntries`).respond(200, 9); + controller.onCloneWithEntriesAccept(); + $httpBackend.flush(); + + expect(controller.$state.go).toHaveBeenCalledWith('travel.card.basicData', { + id: jasmine.any(Number) + }); + }); + }); }); diff --git a/modules/travel/front/descriptor-menu/locale/es.yml b/modules/travel/front/descriptor-menu/locale/es.yml index 117611660f..ca61c4e016 100644 --- a/modules/travel/front/descriptor-menu/locale/es.yml +++ b/modules/travel/front/descriptor-menu/locale/es.yml @@ -1 +1,3 @@ -Clone travel: Clonar envío \ No newline at end of file +Clone travel: Clonar envío +Clone travel and his entries: Clonar travel y sus entradas +Do you want to clone this travel and all containing entries?: ¿Quieres clonar este travel y todas las entradas que contiene? \ No newline at end of file diff --git a/modules/travel/front/locale/es.yml b/modules/travel/front/locale/es.yml index 06fc80601b..7231d37cda 100644 --- a/modules/travel/front/locale/es.yml +++ b/modules/travel/front/locale/es.yml @@ -13,7 +13,7 @@ Received: Recibido Travel id: Id envío Search travels by id: Buscar envíos por identificador New travel: Nuevo envío -travel: envio +travel: envío # Sections Travels: Envíos diff --git a/modules/travel/front/summary/index.html b/modules/travel/front/summary/index.html index 8815c09e2f..de6f6e979e 100644 --- a/modules/travel/front/summary/index.html +++ b/modules/travel/front/summary/index.html @@ -7,6 +7,7 @@ {{$ctrl.travelData.id}} - {{$ctrl.travelData.ref}} + From f29840b37b368f878dc4b4c9453eed94946091f0 Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 29 Dec 2020 07:52:36 +0100 Subject: [PATCH 080/101] Buyer ACL --- modules/travel/front/descriptor-menu/index.html | 2 ++ modules/travel/front/descriptor-menu/index.js | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/modules/travel/front/descriptor-menu/index.html b/modules/travel/front/descriptor-menu/index.html index 714d3ce3f2..171aa89ec2 100644 --- a/modules/travel/front/descriptor-menu/index.html +++ b/modules/travel/front/descriptor-menu/index.html @@ -7,12 +7,14 @@ Clone travel Clone travel and his entries diff --git a/modules/travel/front/descriptor-menu/index.js b/modules/travel/front/descriptor-menu/index.js index e83a90b97a..d34c5495b3 100644 --- a/modules/travel/front/descriptor-menu/index.js +++ b/modules/travel/front/descriptor-menu/index.js @@ -48,6 +48,10 @@ class Controller extends Section { .then(res => this.travel = res.data); } + get isBuyer() { + return this.aclService.hasAny(['buyer']); + } + onCloneAccept() { const params = JSON.stringify({ ref: this.travel.ref, From 2886e02328db37fea4dc01fa39bed770a984a6f7 Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 29 Dec 2020 08:50:12 +0100 Subject: [PATCH 081/101] Enabled loggable for locations --- .../{10260-december => 10260-holidays}/00-zoneLog.sql | 0 modules/zone/back/models/zone-included.json | 7 ++++++- modules/zone/back/models/zone.json | 5 ----- 3 files changed, 6 insertions(+), 6 deletions(-) rename db/changes/{10260-december => 10260-holidays}/00-zoneLog.sql (100%) diff --git a/db/changes/10260-december/00-zoneLog.sql b/db/changes/10260-holidays/00-zoneLog.sql similarity index 100% rename from db/changes/10260-december/00-zoneLog.sql rename to db/changes/10260-holidays/00-zoneLog.sql diff --git a/modules/zone/back/models/zone-included.json b/modules/zone/back/models/zone-included.json index 9f95088246..e462b7a65a 100644 --- a/modules/zone/back/models/zone-included.json +++ b/modules/zone/back/models/zone-included.json @@ -1,6 +1,11 @@ { "name": "ZoneIncluded", - "base": "VnModel", + "base": "Loggable", + "log": { + "model": "ZoneLog", + "relation": "zone", + "showField": "isIncluded" + }, "options": { "mysql": { "table": "zoneIncluded" diff --git a/modules/zone/back/models/zone.json b/modules/zone/back/models/zone.json index 1d1ccfd90d..bafef0a952 100644 --- a/modules/zone/back/models/zone.json +++ b/modules/zone/back/models/zone.json @@ -43,11 +43,6 @@ } }, "relations": { - "geolocations": { - "type": "hasMany", - "model": "ZoneGeo", - "foreignKey": "zoneFk" - }, "agencyMode": { "type": "belongsTo", "model": "AgencyMode", From 20862db8546bae63d37f037917430982fef9ecaf Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 29 Dec 2020 13:39:10 +0100 Subject: [PATCH 082/101] 2690 - Duplicated foreign key fix --- loopback/common/models/vn-model.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/loopback/common/models/vn-model.js b/loopback/common/models/vn-model.js index f56183df2e..56fb7e6562 100644 --- a/loopback/common/models/vn-model.js +++ b/loopback/common/models/vn-model.js @@ -146,8 +146,14 @@ module.exports = function(Self) { function replaceErr(err, replaceErrFunc) { if (Array.isArray(err)) { let errs = []; - for (let e of err) - errs.push(replaceErrFunc(e)); + const errors = err.filter(error => { + return error != undefined && error != null; + }); + for (let e of errors) { + if (!(e instanceof UserError)) + errs.push(replaceErrFunc(e)); + else errs.push(e); + } return errs; } return replaceErrFunc(err); From edd25a347bd6c04806f84767b57f1983bd9cf3db Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 29 Dec 2020 13:44:12 +0100 Subject: [PATCH 083/101] Moved line --- loopback/common/models/vn-model.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loopback/common/models/vn-model.js b/loopback/common/models/vn-model.js index 56fb7e6562..cc3eede8e4 100644 --- a/loopback/common/models/vn-model.js +++ b/loopback/common/models/vn-model.js @@ -145,10 +145,10 @@ module.exports = function(Self) { rewriteDbError(replaceErrFunc) { function replaceErr(err, replaceErrFunc) { if (Array.isArray(err)) { - let errs = []; const errors = err.filter(error => { return error != undefined && error != null; }); + let errs = []; for (let e of errors) { if (!(e instanceof UserError)) errs.push(replaceErrFunc(e)); From c2d50c6044cb160acaf7df5af0ab5b72cc93e92b Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 29 Dec 2020 14:02:26 +0100 Subject: [PATCH 084/101] Dup entry error handler --- .../back/methods/travel/cloneWithEntries.js | 68 ++++++++++--------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/modules/travel/back/methods/travel/cloneWithEntries.js b/modules/travel/back/methods/travel/cloneWithEntries.js index 82d6b40e2b..ef385f1e05 100644 --- a/modules/travel/back/methods/travel/cloneWithEntries.js +++ b/modules/travel/back/methods/travel/cloneWithEntries.js @@ -48,40 +48,46 @@ module.exports = Self => { let stmts = []; let stmt; - stmt = new ParameterizedSQL( - `CALL travel_cloneWithEntries(?, ?, ?, ?, @vTravelFk)`, [ - id, started, ended, travel.ref]); + try { + stmt = new ParameterizedSQL( + `CALL travel_cloneWithEntries(?, ?, ?, ?, @vTravelFk)`, [ + id, started, ended, travel.ref]); - stmts.push(stmt); - const index = stmts.push('SELECT @vTravelFk AS id') - 1; + stmts.push(stmt); + const index = stmts.push('SELECT @vTravelFk AS id') - 1; - const sql = ParameterizedSQL.join(stmts, ';'); - const result = await conn.executeStmt(sql); - const [lastInsert] = result[index]; - const newTravel = await Self.findById(lastInsert.id, { - fields: [ - 'id', - 'shipped', - 'landed', - 'warehouseInFk', - 'warehouseOutFk', - 'agencyFk', - 'ref' - ] - }); + const sql = ParameterizedSQL.join(stmts, ';'); + const result = await conn.executeStmt(sql); + const [lastInsert] = result[index]; + const newTravel = await Self.findById(lastInsert.id, { + fields: [ + 'id', + 'shipped', + 'landed', + 'warehouseInFk', + 'warehouseOutFk', + 'agencyFk', + 'ref' + ] + }); - const oldProperties = await loggable.translateValues(Self, travel); - const newProperties = await loggable.translateValues(Self, newTravel); - await models.TravelLog.create({ - originFk: newTravel.id, - userFk: userId, - action: 'insert', - changedModel: 'Travel', - changedModelId: newTravel.id, - oldInstance: oldProperties, - newInstance: newProperties - }); + const oldProperties = await loggable.translateValues(Self, travel); + const newProperties = await loggable.translateValues(Self, newTravel); + await models.TravelLog.create({ + originFk: newTravel.id, + userFk: userId, + action: 'insert', + changedModel: 'Travel', + changedModelId: newTravel.id, + oldInstance: oldProperties, + newInstance: newProperties + }); - return newTravel.id; + return newTravel.id; + } catch (error) { + if (error.code === 'ER_DUP_ENTRY') + throw new UserError('A travel with this data already exists'); + throw error; + } }; }; From 23a1494fdd2dab6c9d79adb41466f8f20d0f3db2 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Tue, 29 Dec 2020 14:05:43 +0100 Subject: [PATCH 085/101] selectors for create travel --- e2e/helpers/selectors.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 11087d2d4a..78efd6ecca 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -858,6 +858,15 @@ export default { dotMenu: 'vn-travel-descriptor vn-icon-button[icon="more_vert"]', dotMenuClone: '#clone' }, + travelCreate: { + reference: 'vn-travel-create vn-textfield[ng-model="$ctrl.travel.ref"]', + agency: 'vn-travel-create vn-autocomplete[ng-model="$ctrl.travel.agencyModeFk"]', + shipped: 'vn-travel-create vn-date-picker[ng-model="$ctrl.travel.shipped"]', + landed: 'vn-travel-create vn-date-picker[ng-model="$ctrl.travel.landed"]', + warehouseOut: 'vn-travel-create vn-autocomplete[ng-model="$ctrl.travel.warehouseOutFk"]', + warehouseIn: 'vn-travel-create vn-autocomplete[ng-model="$ctrl.travel.warehouseInFk"]', + saveButton: 'vn-travel-create vn-submit[label="Save"]' + }, zoneIndex: { searchResult: 'vn-zone-index a.vn-tr', }, From c9ae5989f9b2652f59637c00ef25ba37bd9e5b22 Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Wed, 30 Dec 2020 10:49:02 +0100 Subject: [PATCH 086/101] Add id on description of typeTransiction on client and supplier --- modules/client/front/fiscal-data/index.html | 11 ++++------- modules/supplier/front/fiscal-data/index.html | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html index 2b671c69a4..a03bcfdd4e 100644 --- a/modules/client/front/fiscal-data/index.html +++ b/modules/client/front/fiscal-data/index.html @@ -24,12 +24,6 @@ data="sageTaxTypes" order="vat"> - -
@@ -69,12 +63,15 @@ + {{id}}: {{transaction}} - - + {{id}}: {{transaction}} From 77e3ae9fee1f58f9711b7001018956a042c276cf Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Wed, 30 Dec 2020 10:49:42 +0100 Subject: [PATCH 087/101] Modificated the e2e of fiscal data on client --- e2e/paths/02-client/03_edit_fiscal_data.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/paths/02-client/03_edit_fiscal_data.spec.js b/e2e/paths/02-client/03_edit_fiscal_data.spec.js index da04c813aa..614ede0f06 100644 --- a/e2e/paths/02-client/03_edit_fiscal_data.spec.js +++ b/e2e/paths/02-client/03_edit_fiscal_data.spec.js @@ -200,7 +200,7 @@ describe('Client Edit fiscalData path', () => { it('should confirm the sageTransaction have been edited', async() => { const result = await page.waitToGetProperty(selectors.clientFiscalData.sageTransaction, 'value'); - expect(result).toEqual('Regularización de inversiones'); + expect(result).toEqual('36: Regularización de inversiones'); }); it('should confirm the transferor have been edited', async() => { From 52cb6c076c5b55cfe06fb9499f72a8db54c65ba5 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 30 Dec 2020 14:54:51 +0100 Subject: [PATCH 088/101] travel cloneWithEntries path + e2e fix --- e2e/helpers/selectors.js | 7 ++- e2e/paths/10-travel/03_descriptor.spec.js | 43 +++++++++++++++++++ .../10-travel/04_extra_community.spec.js | 1 + 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 2260e0bd81..066d432c8a 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -831,7 +831,8 @@ export default { firstSearchResult: 'vn-travel-index vn-tbody > a:nth-child(1)' }, travelExtraCommunity: { - firstTravelReference: 'vn-travel-extra-community > vn-data-viewer div > vn-tbody > vn-tr > vn-td-editable', + anySearchResult: 'vn-travel-extra-community > vn-data-viewer div > vn-tbody > vn-tr', + firstTravelReference: 'vn-travel-extra-community vn-card:nth-child(1) vn-td-editable', removeContinentFilter: 'vn-searchbar > form > vn-textfield > div.container > div.prepend > prepend > div > span:nth-child(3) > vn-icon > i' }, travelBasicData: { @@ -863,7 +864,9 @@ export default { travelDescriptor: { filterByAgencyButton: 'vn-descriptor-content .quicklinks > div:nth-child(1) > vn-quick-link > a[vn-tooltip="All travels with current agency"]', dotMenu: 'vn-travel-descriptor vn-icon-button[icon="more_vert"]', - dotMenuClone: '#clone' + dotMenuClone: '#clone', + dotMenuCloneWithEntries: '#cloneWithEntries', + acceptClonation: 'tpl-buttons > button[response="accept"]' }, travelCreate: { reference: 'vn-travel-create vn-textfield[ng-model="$ctrl.travel.ref"]', diff --git a/e2e/paths/10-travel/03_descriptor.spec.js b/e2e/paths/10-travel/03_descriptor.spec.js index 3f79bea061..bf6c3a02ef 100644 --- a/e2e/paths/10-travel/03_descriptor.spec.js +++ b/e2e/paths/10-travel/03_descriptor.spec.js @@ -42,4 +42,47 @@ describe('Travel descriptor path', () => { expect(state).toBe('travel.create'); }); + + it('should edit the data to clone and then get redirected to the cloned travel basic data', async() => { + await page.clearInput(selectors.travelCreate.reference); + await page.write(selectors.travelCreate.reference, 'reference'); + await page.autocompleteSearch(selectors.travelCreate.agency, 'entanglement'); + await page.pickDate(selectors.travelCreate.shipped); + await page.pickDate(selectors.travelCreate.landed); + await page.autocompleteSearch(selectors.travelCreate.warehouseOut, 'warehouse one'); + await page.autocompleteSearch(selectors.travelCreate.warehouseIn, 'warehouse two'); + await page.waitToClick(selectors.travelCreate.saveButton); + await page.waitForState('travel.card.basicData'); + const message = await page.waitForSnackbar(); + + expect(message.text).toContain('Data saved!'); + }); + + it('should atempt to clone the travel and its entries using the descriptor menu but receive an error', async() => { + await page.waitToClick(selectors.travelDescriptor.dotMenu); + await page.waitToClick(selectors.travelDescriptor.dotMenuCloneWithEntries); + await page.waitToClick(selectors.travelDescriptor.acceptClonation); + const message = await page.waitForSnackbar(); + + expect(message.text).toContain('A travel with this data already exists'); + }); + + it('should update the landed date to a future date to enable cloneWithEntries', async() => { + const nextMonth = new Date(); + nextMonth.setMonth(nextMonth.getMonth() + 1); + await page.pickDate(selectors.travelBasicData.deliveryDate, nextMonth); + await page.waitToClick(selectors.travelBasicData.save); + await page.waitForState('travel.card.basicData'); + const message = await page.waitForSnackbar(); + + expect(message.text).toContain('Data saved!'); + }); + + it('should navigate to the summary and then clone the travel and its entries using the descriptor menu to get redirected to the cloned travel basic data', async() => { + await page.waitToClick('vn-icon[icon="preview"]'); // summary icon + await page.waitToClick(selectors.travelDescriptor.dotMenu); + await page.waitToClick(selectors.travelDescriptor.dotMenuCloneWithEntries); + await page.waitToClick(selectors.travelDescriptor.acceptClonation); + await page.waitForState('travel.card.basicData'); + }); }); diff --git a/e2e/paths/10-travel/04_extra_community.spec.js b/e2e/paths/10-travel/04_extra_community.spec.js index bc81c086c8..7a37b89e41 100644 --- a/e2e/paths/10-travel/04_extra_community.spec.js +++ b/e2e/paths/10-travel/04_extra_community.spec.js @@ -18,6 +18,7 @@ describe('Travel extra community path', () => { it('should edit the travel reference', async() => { await page.waitToClick(selectors.travelExtraCommunity.removeContinentFilter); + await page.waitForSpinnerLoad(); await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelReference, 'edited reference'); }); From b4038990723a8d27db8d7fa3b1b03ff2e87a7ac2 Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Wed, 30 Dec 2020 15:39:27 +0100 Subject: [PATCH 089/101] modificated value of "order" on client and supplier --- modules/client/front/fiscal-data/index.html | 2 +- modules/supplier/front/fiscal-data/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html index a03bcfdd4e..2ae9e04751 100644 --- a/modules/client/front/fiscal-data/index.html +++ b/modules/client/front/fiscal-data/index.html @@ -69,7 +69,7 @@ label="Sage transaction type" search-function="{or: [{id: $search}, {transaction: {like: '%'+ $search +'%'}}]}" vn-acl="salesAssistant" - order="id" + order="transaction" rule> {{id}}: {{transaction}} diff --git a/modules/supplier/front/fiscal-data/index.html b/modules/supplier/front/fiscal-data/index.html index 2c7b09f95e..fc44468f4b 100644 --- a/modules/supplier/front/fiscal-data/index.html +++ b/modules/supplier/front/fiscal-data/index.html @@ -82,7 +82,7 @@ value-field="id" label="Sage transaction type" search-function="{or: [{id: $search}, {transaction: {like: '%'+ $search +'%'}}]}" - order="id" + order="transaction" rule> {{id}}: {{transaction}} From 12d6948c0e53ae39a72eff7562e95e68c4337e68 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 31 Dec 2020 09:17:55 +0100 Subject: [PATCH 090/101] Route.index e2e path needs time to load results --- e2e/paths/08-route/03_create_and_clone.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/paths/08-route/03_create_and_clone.spec.js b/e2e/paths/08-route/03_create_and_clone.spec.js index be758f7887..c0132362fb 100644 --- a/e2e/paths/08-route/03_create_and_clone.spec.js +++ b/e2e/paths/08-route/03_create_and_clone.spec.js @@ -74,6 +74,7 @@ describe('Route create path', () => { }); it(`should clone the first route`, async() => { + await page.waitForTimeout(1000); // needs time for the index to show all items await page.waitToClick(selectors.routeIndex.firstRouteCheckbox); await page.waitToClick(selectors.routeIndex.cloneButton); await page.waitToClick(selectors.routeIndex.submitClonationButton); From 4754d5481b244b12fd222868d958646c3c70cb1e Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 31 Dec 2020 10:13:42 +0100 Subject: [PATCH 091/101] added street arg to updateFiscalData method --- modules/supplier/back/methods/supplier/updateFiscalData.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/supplier/back/methods/supplier/updateFiscalData.js b/modules/supplier/back/methods/supplier/updateFiscalData.js index be031a18ac..bbbb658b2a 100644 --- a/modules/supplier/back/methods/supplier/updateFiscalData.js +++ b/modules/supplier/back/methods/supplier/updateFiscalData.js @@ -41,6 +41,10 @@ module.exports = Self => { arg: 'postCode', type: 'string' }, + { + arg: 'street', + type: 'string' + }, { arg: 'city', type: 'string' From 3b73e1bee244887902af90592eeb8c30be9f6f4b Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 31 Dec 2020 10:28:35 +0100 Subject: [PATCH 092/101] supplier updateFiscalData changed to table config --- .../back/methods/supplier/updateFiscalData.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/supplier/back/methods/supplier/updateFiscalData.js b/modules/supplier/back/methods/supplier/updateFiscalData.js index bbbb658b2a..daa602af05 100644 --- a/modules/supplier/back/methods/supplier/updateFiscalData.js +++ b/modules/supplier/back/methods/supplier/updateFiscalData.js @@ -23,27 +23,27 @@ module.exports = Self => { }, { arg: 'account', - type: 'string' + type: 'any' }, { arg: 'sageTaxTypeFk', - type: 'number' + type: 'any' }, { arg: 'sageWithholdingFk', - type: 'number' + type: 'any' }, { arg: 'sageTransactionTypeFk', - type: 'number' + type: 'any' }, { arg: 'postCode', - type: 'string' + type: 'any' }, { arg: 'street', - type: 'string' + type: 'any' }, { arg: 'city', @@ -51,11 +51,11 @@ module.exports = Self => { }, { arg: 'provinceFk', - type: 'number' + type: 'any' }, { arg: 'countryFk', - type: 'number' + type: 'any' }], returns: { arg: 'res', From 6bbe33433d0ec82c99bdc2f3c785c4709eefbeeb Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 31 Dec 2020 10:30:51 +0100 Subject: [PATCH 093/101] 2696 - Geo autocompletion fix --- e2e/paths/06-claim/05_summary.spec.js | 2 +- e2e/paths/06-claim/06_descriptor.spec.js | 2 +- e2e/paths/13-supplier/03_fiscal_data.spec.js | 2 +- modules/client/front/address/edit/index.js | 6 ++++-- modules/client/front/fiscal-data/index.js | 6 ++++-- modules/supplier/front/fiscal-data/index.js | 6 ++++-- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/e2e/paths/06-claim/05_summary.spec.js b/e2e/paths/06-claim/05_summary.spec.js index c63e686cbf..cea5edb559 100644 --- a/e2e/paths/06-claim/05_summary.spec.js +++ b/e2e/paths/06-claim/05_summary.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -describe('claim Summary path', () => { +describe('Claim summary path', () => { let browser; let page; const claimId = '4'; diff --git a/e2e/paths/06-claim/06_descriptor.spec.js b/e2e/paths/06-claim/06_descriptor.spec.js index c0affb3cc5..0826bad633 100644 --- a/e2e/paths/06-claim/06_descriptor.spec.js +++ b/e2e/paths/06-claim/06_descriptor.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -describe('claim Descriptor path', () => { +describe('Claim descriptor path', () => { let browser; let page; const claimId = '1'; diff --git a/e2e/paths/13-supplier/03_fiscal_data.spec.js b/e2e/paths/13-supplier/03_fiscal_data.spec.js index d929288d46..06fd2605ba 100644 --- a/e2e/paths/13-supplier/03_fiscal_data.spec.js +++ b/e2e/paths/13-supplier/03_fiscal_data.spec.js @@ -26,7 +26,7 @@ describe('Supplier fiscal data path', () => { await page.clearInput(selectors.supplierFiscalData.socialName); await page.write(selectors.supplierFiscalData.socialName, 'Farmer King SL'); await page.clearInput(selectors.supplierFiscalData.taxNumber); - await page.write(selectors.supplierFiscalData.taxNumber, 'invalid tax number'); + await page.write(selectors.supplierFiscalData.taxNumber, 'Wrong tax number'); await page.clearInput(selectors.supplierFiscalData.account); await page.write(selectors.supplierFiscalData.account, 'edited account number'); await page.autocompleteSearch(selectors.supplierFiscalData.sageWihholding, 'retencion estimacion objetiva'); diff --git a/modules/client/front/address/edit/index.js b/modules/client/front/address/edit/index.js index 30201b880b..b8d2e28a4a 100644 --- a/modules/client/front/address/edit/index.js +++ b/modules/client/front/address/edit/index.js @@ -42,9 +42,10 @@ export default class Controller extends Section { // Town auto complete set town(selection) { + const oldValue = this._town; this._town = selection; - if (!selection) return; + if (!selection || !oldValue) return; const province = selection.province; const postcodes = selection.postcodes; @@ -62,9 +63,10 @@ export default class Controller extends Section { // Postcode auto complete set postcode(selection) { + const oldValue = this._postcode; this._postcode = selection; - if (!selection) return; + if (!selection || !oldValue) return; const town = selection.town; const province = town.province; diff --git a/modules/client/front/fiscal-data/index.js b/modules/client/front/fiscal-data/index.js index 397bb20e16..73580af43b 100644 --- a/modules/client/front/fiscal-data/index.js +++ b/modules/client/front/fiscal-data/index.js @@ -106,9 +106,10 @@ export default class Controller extends Section { // Province auto complete set province(selection) { + const oldValue = this._province; this._province = selection; - if (!selection) return; + if (!selection || !oldValue) return; const country = selection.country; @@ -122,9 +123,10 @@ export default class Controller extends Section { // Town auto complete set town(selection) { + const oldValue = this._town; this._town = selection; - if (!selection) return; + if (!selection || !oldValue) return; const province = selection.province; const country = province.country; diff --git a/modules/supplier/front/fiscal-data/index.js b/modules/supplier/front/fiscal-data/index.js index f2929c91f3..8a6a51249f 100644 --- a/modules/supplier/front/fiscal-data/index.js +++ b/modules/supplier/front/fiscal-data/index.js @@ -8,9 +8,10 @@ export default class Controller extends Section { // Province auto complete set province(selection) { + const oldValue = this._province; this._province = selection; - if (!selection) return; + if (!selection || !oldValue) return; const country = selection.country; @@ -24,9 +25,10 @@ export default class Controller extends Section { // Town auto complete set town(selection) { + const oldValue = this._town; this._town = selection; - if (!selection) return; + if (!selection || !oldValue) return; const province = selection.province; const country = province.country; From 7711367e357d9acd4c9b1774d7315a1e81bbed19 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 31 Dec 2020 10:39:09 +0100 Subject: [PATCH 094/101] added summary state check to e2e path --- e2e/paths/10-travel/03_descriptor.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/paths/10-travel/03_descriptor.spec.js b/e2e/paths/10-travel/03_descriptor.spec.js index bf6c3a02ef..cdca379ad8 100644 --- a/e2e/paths/10-travel/03_descriptor.spec.js +++ b/e2e/paths/10-travel/03_descriptor.spec.js @@ -80,6 +80,7 @@ describe('Travel descriptor path', () => { it('should navigate to the summary and then clone the travel and its entries using the descriptor menu to get redirected to the cloned travel basic data', async() => { await page.waitToClick('vn-icon[icon="preview"]'); // summary icon + await page.waitForState('travel.card.summary'); await page.waitToClick(selectors.travelDescriptor.dotMenu); await page.waitToClick(selectors.travelDescriptor.dotMenuCloneWithEntries); await page.waitToClick(selectors.travelDescriptor.acceptClonation); From 5dd7db23ecd1d0f235bdc6f8da061e9bb9f9ca18 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 31 Dec 2020 10:39:37 +0100 Subject: [PATCH 095/101] submit should always be enabled for creation forms --- modules/travel/front/create/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/travel/front/create/index.html b/modules/travel/front/create/index.html index 1400ef6d7a..0931c322ee 100644 --- a/modules/travel/front/create/index.html +++ b/modules/travel/front/create/index.html @@ -43,7 +43,6 @@ Date: Thu, 31 Dec 2020 11:17:42 +0100 Subject: [PATCH 096/101] re-enabled working unit test --- modules/client/back/methods/client/specs/sendSms.spec.js | 3 +-- modules/client/back/methods/sms/send.spec.js | 3 +-- modules/ticket/back/methods/ticket/specs/sendSms.spec.js | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/client/back/methods/client/specs/sendSms.spec.js b/modules/client/back/methods/client/specs/sendSms.spec.js index 673a95cae9..b299ac3c18 100644 --- a/modules/client/back/methods/client/specs/sendSms.spec.js +++ b/modules/client/back/methods/client/specs/sendSms.spec.js @@ -1,7 +1,6 @@ const app = require('vn-loopback/server/server'); -// Issue #2471 -xdescribe('client sendSms()', () => { +describe('client sendSms()', () => { let createdLog; afterAll(async done => { diff --git a/modules/client/back/methods/sms/send.spec.js b/modules/client/back/methods/sms/send.spec.js index 06288ffb52..612a16cf14 100644 --- a/modules/client/back/methods/sms/send.spec.js +++ b/modules/client/back/methods/sms/send.spec.js @@ -1,8 +1,7 @@ const app = require('vn-loopback/server/server'); const soap = require('soap'); -// Issue #2471 -xdescribe('sms send()', () => { +describe('sms send()', () => { it('should return the expected message and status code', async() => { const code = 200; const smsConfig = await app.models.SmsConfig.findOne(); diff --git a/modules/ticket/back/methods/ticket/specs/sendSms.spec.js b/modules/ticket/back/methods/ticket/specs/sendSms.spec.js index a08e7555ac..20066a5ba8 100644 --- a/modules/ticket/back/methods/ticket/specs/sendSms.spec.js +++ b/modules/ticket/back/methods/ticket/specs/sendSms.spec.js @@ -1,7 +1,6 @@ const app = require('vn-loopback/server/server'); -// Issue #2471 -xdescribe('ticket sendSms()', () => { +describe('ticket sendSms()', () => { let logId; afterAll(async done => { From bf53bff017f38317952588b7e32637651ec347bd Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 31 Dec 2020 12:25:20 +0100 Subject: [PATCH 097/101] e2e amends --- e2e/paths/13-supplier/03_fiscal_data.spec.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/e2e/paths/13-supplier/03_fiscal_data.spec.js b/e2e/paths/13-supplier/03_fiscal_data.spec.js index 06fd2605ba..2ef52f7afd 100644 --- a/e2e/paths/13-supplier/03_fiscal_data.spec.js +++ b/e2e/paths/13-supplier/03_fiscal_data.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -describe('Supplier fiscal data path', () => { +fdescribe('Supplier fiscal data path', () => { let browser; let page; @@ -23,6 +23,9 @@ describe('Supplier fiscal data path', () => { await page.clearInput(selectors.supplierFiscalData.country); await page.clearInput(selectors.supplierFiscalData.postCode); await page.write(selectors.supplierFiscalData.city, 'Valencia'); + await page.waitForTimeout(1000); // must repeat this action twice or fails. also #2699 may be a cool solution to this. + await page.clearInput(selectors.supplierFiscalData.city); + await page.write(selectors.supplierFiscalData.city, 'Valencia'); await page.clearInput(selectors.supplierFiscalData.socialName); await page.write(selectors.supplierFiscalData.socialName, 'Farmer King SL'); await page.clearInput(selectors.supplierFiscalData.taxNumber); From a867df7085226382c1f5d83f35bc530736052fbc Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 31 Dec 2020 12:38:54 +0100 Subject: [PATCH 098/101] removed focus on describe and added translation --- e2e/paths/13-supplier/03_fiscal_data.spec.js | 2 +- loopback/locale/en.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/e2e/paths/13-supplier/03_fiscal_data.spec.js b/e2e/paths/13-supplier/03_fiscal_data.spec.js index 2ef52f7afd..0238c8704a 100644 --- a/e2e/paths/13-supplier/03_fiscal_data.spec.js +++ b/e2e/paths/13-supplier/03_fiscal_data.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -fdescribe('Supplier fiscal data path', () => { +describe('Supplier fiscal data path', () => { let browser; let page; diff --git a/loopback/locale/en.json b/loopback/locale/en.json index 0081af429b..2e22f828bc 100644 --- a/loopback/locale/en.json +++ b/loopback/locale/en.json @@ -84,5 +84,6 @@ "companyFk": "Company", "You need to fill sage information before you check verified data": "You need to fill sage information before you check verified data", "The social name cannot be empty": "The social name cannot be empty", - "The nif cannot be empty": "The nif cannot be empty" + "The nif cannot be empty": "The nif cannot be empty", + "A travel with this data already exists": "A travel with this data already exists" } \ No newline at end of file From a521ad426274e7c7ac39e7eab27a320b288211c6 Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 31 Dec 2020 14:18:06 +0100 Subject: [PATCH 099/101] Fixed claim basicData back error --- modules/claim/front/basic-data/index.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html index eb3c3b9e32..064a9d4f55 100644 --- a/modules/claim/front/basic-data/index.html +++ b/modules/claim/front/basic-data/index.html @@ -1,8 +1,9 @@ + + form="form" + save="patch"> Date: Thu, 31 Dec 2020 16:42:38 +0100 Subject: [PATCH 100/101] e2e path for entry.observation - missing role --- e2e/helpers/selectors.js | 8 +++ e2e/paths/12-entry/06_observations.spec.js | 66 ++++++++++++++++++++++ loopback/locale/en.json | 3 +- 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 e2e/paths/12-entry/06_observations.spec.js diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 066d432c8a..8d40542b88 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -939,6 +939,14 @@ export default { newEntryCompany: 'vn-entry-create vn-autocomplete[ng-model="$ctrl.entry.companyFk"]', saveNewEntry: 'vn-entry-create button[type="submit"]' }, + entryObservations: { + addNewObservation: 'vn-entry-observation vn-icon-button[icon="add_circle"]', + firstObservationType: 'vn-entry-observation vn-horizontal:nth-child(1) > vn-autocomplete[ng-model="observation.observationTypeFk"]', + secondObservationType: 'vn-entry-observation vn-horizontal:nth-child(2) > vn-autocomplete[ng-model="observation.observationTypeFk"]', + firstObservationDescription: 'vn-entry-observation vn-horizontal:nth-child(1) > vn-textfield[ng-model="observation.description"]', + secondObservationDescription: 'vn-entry-observation vn-horizontal:nth-child(2) > vn-textfield[ng-model="observation.description"]', + saveObservationsButton: 'vn-entry-observation vn-submit > button' + }, supplierSummary: { header: 'vn-supplier-summary > vn-card > h5', basicDataId: 'vn-supplier-summary vn-label-value[label="Id"]', diff --git a/e2e/paths/12-entry/06_observations.spec.js b/e2e/paths/12-entry/06_observations.spec.js new file mode 100644 index 0000000000..107c2e0b6b --- /dev/null +++ b/e2e/paths/12-entry/06_observations.spec.js @@ -0,0 +1,66 @@ +import selectors from '../../helpers/selectors.js'; +import getBrowser from '../../helpers/puppeteer'; + +describe('Entry observations path', () => { + let browser; + let page; + + beforeAll(async() => { + browser = await getBrowser(); + page = browser.page; + // await page.loginAndModule('buyer', 'entry'); // access denied, awaiting role confirmation + await page.loginAndModule('developer', 'entry'); + await page.accessToSearchResult('2'); + await page.accessToSection('entry.card.observation'); + }); + + afterAll(async() => { + await browser.close(); + }); + + it(`should add two new observations of the same type then fail to save as they can't be repeated`, async() => { + await page.waitToClick(selectors.entryObservations.addNewObservation); + await page.waitToClick(selectors.entryObservations.addNewObservation); + await page.autocompleteSearch(selectors.entryObservations.firstObservationType, 'comercial'); + await page.autocompleteSearch(selectors.entryObservations.secondObservationType, 'comercial'); + await page.write(selectors.entryObservations.firstObservationDescription, 'first observation'); + await page.write(selectors.entryObservations.secondObservationDescription, 'second observation'); + await page.waitToClick(selectors.entryObservations.saveObservationsButton); + const message = await page.waitForSnackbar(); + + expect(message.text).toContain(`The observation type can't be repeated`); + }); + + it('should set the 2nd observation of a different one and successfully save both', async() => { + await page.autocompleteSearch(selectors.entryObservations.secondObservationType, 'delivery'); + await page.waitToClick(selectors.entryObservations.saveObservationsButton); + const message = await page.waitForSnackbar(); + + expect(message.text).toContain('Data saved!'); + }); + + it('should reload the section and make sure the first observation type was saved correctly', async() => { + await page.reloadSection('entry.card.observation'); + const result = await page.waitToGetProperty(selectors.entryObservations.firstObservationType, 'value'); + + expect(result).toEqual('comercial'); + }); + + it('should make sure the first observation description was saved correctly', async() => { + const result = await page.waitToGetProperty(selectors.entryObservations.firstObservationDescription, 'value'); + + expect(result).toEqual('first observation'); + }); + + it('should make sure the second observation type was saved correctly', async() => { + const result = await page.waitToGetProperty(selectors.entryObservations.secondObservationType, 'value'); + + expect(result).toEqual('delivery'); + }); + + it('should make sure the second observation description was saved correctly', async() => { + const result = await page.waitToGetProperty(selectors.entryObservations.secondObservationDescription, 'value'); + + expect(result).toEqual('second observation'); + }); +}); diff --git a/loopback/locale/en.json b/loopback/locale/en.json index 2e22f828bc..1f85356dd2 100644 --- a/loopback/locale/en.json +++ b/loopback/locale/en.json @@ -85,5 +85,6 @@ "You need to fill sage information before you check verified data": "You need to fill sage information before you check verified data", "The social name cannot be empty": "The social name cannot be empty", "The nif cannot be empty": "The nif cannot be empty", - "A travel with this data already exists": "A travel with this data already exists" + "A travel with this data already exists": "A travel with this data already exists", + "The observation type can't be repeated": "The observation type can't be repeated" } \ No newline at end of file From 1353a0987d80e3f3f7a27b867d5b323d96b4881a Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 4 Jan 2021 09:22:32 +0100 Subject: [PATCH 101/101] 2700 - Closure by multiple agencies --- print/methods/closure.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/print/methods/closure.js b/print/methods/closure.js index 1df9564bdd..2a7ac19fb4 100644 --- a/print/methods/closure.js +++ b/print/methods/closure.js @@ -73,7 +73,7 @@ module.exports = app => { } }); - app.get('/api/closure/by-agency', async function(req, res) { + app.get('/api/closure/by-agency', async function(req, res, next) { try { const reqArgs = req.args; if (!reqArgs.agencyModeId) @@ -89,6 +89,7 @@ module.exports = app => { message: 'Task executed successfully' }); + const agenciesId = reqArgs.agencyModeId.split(','); const tickets = await db.rawSql(` SELECT t.id @@ -97,12 +98,12 @@ module.exports = app => { JOIN ticketState ts ON ts.ticketFk = t.id JOIN alertLevel al ON al.alertLevel = ts.alertLevel WHERE al.code = 'PACKED' - AND t.agencyModeFk = :agencyModeId + AND t.agencyModeFk IN(:agencyModeId) AND t.warehouseFk = :warehouseId AND DATE(t.shipped) BETWEEN DATE_ADD(:to, INTERVAL -2 DAY) AND :to AND t.refFk IS NULL GROUP BY e.ticketFk`, { - agencyModeId: reqArgs.agencyModeId, + agencyModeId: agenciesId, warehouseId: reqArgs.warehouseId, to: reqArgs.to }); @@ -114,7 +115,7 @@ module.exports = app => { } }); - app.get('/api/closure/by-route', async function(req, res) { + app.get('/api/closure/by-route', async function(req, res, next) { try { const reqArgs = req.args; if (!reqArgs.routeId)
From 1419acb8a7d9463e886e42fb0f39e09b6bed2f3f Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 21 Dec 2020 14:48:47 +0100 Subject: [PATCH 064/101] 2663 - Drag & drop ticket to route index --- loopback/locale/es.json | 3 +- .../{ticketToRoute.js => insertTicket.js} | 15 ++-- ...etToRoute.spec.js => insertTicket.spec.js} | 6 +- modules/route/back/models/route.js | 2 +- modules/route/front/index/index.html | 3 +- modules/route/front/index/index.js | 36 ++++++++ modules/route/front/index/index.spec.js | 83 ++++++++++++++++++- modules/route/front/tickets/index.js | 8 +- modules/route/front/tickets/index.spec.js | 4 +- 9 files changed, 140 insertions(+), 20 deletions(-) rename modules/route/back/methods/route/{ticketToRoute.js => insertTicket.js} (83%) rename modules/route/back/methods/route/specs/{ticketToRoute.spec.js => insertTicket.spec.js} (86%) diff --git a/loopback/locale/es.json b/loopback/locale/es.json index 6764ca1f1a..84347550c4 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -162,5 +162,6 @@ "You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados", "ASSIGN_ZONE_FIRST": "Asigna una zona primero", "You can't upload images on the test environment": "No puedes subir imágenes en el entorno de pruebas", - "You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria" + "You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria", + "The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta" } \ No newline at end of file diff --git a/modules/route/back/methods/route/ticketToRoute.js b/modules/route/back/methods/route/insertTicket.js similarity index 83% rename from modules/route/back/methods/route/ticketToRoute.js rename to modules/route/back/methods/route/insertTicket.js index 93b2700158..ca047aaab1 100644 --- a/modules/route/back/methods/route/ticketToRoute.js +++ b/modules/route/back/methods/route/insertTicket.js @@ -1,18 +1,18 @@ const UserError = require('vn-loopback/util/user-error'); module.exports = Self => { - Self.remoteMethod('ticketToRoute', { + Self.remoteMethod('insertTicket', { description: 'Check if the ticket can be insert into the route and insert it', accessType: 'READ', accepts: [{ - arg: 'ticketId', + arg: 'routeId', type: 'number', required: true, - description: 'ticketId ', + description: 'The route id', http: {source: 'path'} }, { - arg: 'routeId', + arg: 'ticketId', type: 'number', required: true }], @@ -21,12 +21,12 @@ module.exports = Self => { root: true }, http: { - path: `/:ticketId/ticketToRoute`, + path: `/:routeId/insertTicket`, verb: 'PATCH' } }); - Self.ticketToRoute = async(ticketId, routeId) => { + Self.insertTicket = async(routeId, ticketId) => { const models = Self.app.models; const route = await models.Route.findById(routeId); @@ -43,9 +43,10 @@ module.exports = Self => { landed: {between: [minDate, maxDate]}, } }); + if (!ticket) throw new UserError('The selected ticket is not suitable for this route'); - return await ticket.updateAttribute('routeFk', route.id); + return ticket.updateAttribute('routeFk', route.id); }; }; diff --git a/modules/route/back/methods/route/specs/ticketToRoute.spec.js b/modules/route/back/methods/route/specs/insertTicket.spec.js similarity index 86% rename from modules/route/back/methods/route/specs/ticketToRoute.spec.js rename to modules/route/back/methods/route/specs/insertTicket.spec.js index 83c1d50808..49bf04bd35 100644 --- a/modules/route/back/methods/route/specs/ticketToRoute.spec.js +++ b/modules/route/back/methods/route/specs/insertTicket.spec.js @@ -1,7 +1,7 @@ const app = require('vn-loopback/server/server'); const LoopBackContext = require('loopback-context'); -describe('route ticketToRoute()', () => { +describe('route insertTicket()', () => { const deliveryId = 56; let originalTicket; const routeId = 2; @@ -30,7 +30,7 @@ describe('route ticketToRoute()', () => { originalTicket = await app.models.Ticket.findById(14); const ticketId = 14; - const result = await app.models.Route.ticketToRoute(ticketId, routeId); + const result = await app.models.Route.insertTicket(routeId, ticketId); expect(result.routeFk).toEqual(2); }); @@ -40,7 +40,7 @@ describe('route ticketToRoute()', () => { let error; try { - await app.models.Route.ticketToRoute(ticketId, routeId); + await app.models.Route.insertTicket(routeId, ticketId); } catch (e) { error = e.message; } diff --git a/modules/route/back/models/route.js b/modules/route/back/models/route.js index cdb51c6096..6320a888c5 100644 --- a/modules/route/back/models/route.js +++ b/modules/route/back/models/route.js @@ -5,7 +5,7 @@ module.exports = Self => { require('../methods/route/guessPriority')(Self); require('../methods/route/updateVolume')(Self); require('../methods/route/getDeliveryPoint')(Self); - require('../methods/route/ticketToRoute')(Self); + require('../methods/route/insertTicket')(Self); Self.validate('kmStart', validateDistance, { message: 'Distance must be lesser than 1000' diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html index 66e30d8399..d71bcbc486 100644 --- a/modules/route/front/index/index.html +++ b/modules/route/front/index/index.html @@ -26,7 +26,8 @@ + ui-sref="route.card.summary({id: {{::route.id}}})" + ng-attr-id="{{::route.id}}" vn-droppable="$ctrl.onDrop($event)"> { + this.vnApp.showSuccess(this.$t('Data saved!')); + this.$.model.refresh(); + }).catch(error => { + if (error.status == 404) + return this.vnApp.showError(this.$t('Ticket not found')); + throw error; + }); + } } Controller.$inject = ['$element', '$scope', 'vnReport']; diff --git a/modules/route/front/index/index.spec.js b/modules/route/front/index/index.spec.js index e90fc71648..b66ecaf00c 100644 --- a/modules/route/front/index/index.spec.js +++ b/modules/route/front/index/index.spec.js @@ -3,10 +3,12 @@ import crudModel from 'core/mocks/crud-model'; describe('Component vnRouteIndex', () => { let controller; + let $httpBackend; beforeEach(ngModule('route')); - beforeEach(inject($componentController => { + beforeEach(inject(($componentController, _$httpBackend_) => { + $httpBackend = _$httpBackend_; const $element = angular.element(''); controller = $componentController('vnRouteIndex', {$element}); controller.$.model = crudModel; @@ -57,4 +59,83 @@ describe('Component vnRouteIndex', () => { expect(controller.vnReport.show).toHaveBeenCalledWith('driver-route', expectedParams); }); }); + + describe('onDrop()', () => { + it('should call the insert method when dragging a ticket number', () => { + jest.spyOn(controller, 'insert'); + + const routeId = '1'; + const expectedTicketId = '16'; + const draggedElement = '16'; + const droppable = document.createElement('a'); + droppable.setAttribute('id', 1); + droppable.classList.add('vn-tr'); + + const $event = { + dataTransfer: { + getData: () => draggedElement + }, + target: droppable + }; + controller.onDrop($event); + + expect(controller.insert).toHaveBeenCalledWith(routeId, expectedTicketId); + }); + + it('should call the insert method when dragging a ticket link', () => { + jest.spyOn(controller, 'insert'); + + const routeId = '1'; + const expectedTicketId = '11'; + const draggedElement = 'http://arkamcity.com/#!/ticket/11/summary'; + const droppable = document.createElement('a'); + droppable.setAttribute('id', 1); + droppable.classList.add('vn-tr'); + + const $event = { + dataTransfer: { + getData: () => draggedElement + }, + target: droppable + }; + controller.onDrop($event); + + expect(controller.insert).toHaveBeenCalledWith(routeId, expectedTicketId); + }); + + it('should throw an error when dragging an invalid ticket link', () => { + jest.spyOn(controller.vnApp, 'showError'); + + const draggedElement = 'http://arkamcity.com/#!/item/11/summary'; + const droppable = document.createElement('a'); + droppable.setAttribute('id', 1); + droppable.classList.add('vn-tr'); + const $event = { + dataTransfer: { + getData: () => draggedElement + }, + target: droppable + }; + controller.onDrop($event); + + expect(controller.vnApp.showError).toHaveBeenCalledWith('Ticket not found'); + }); + }); + + describe('insert()', () => { + it('should make a HTTP patch query and then call both refresh and showSuccess methods', () => { + jest.spyOn(controller.$.model, 'refresh').mockReturnThis(); + jest.spyOn(controller.vnApp, 'showSuccess'); + + const routeId = 1; + const ticketId = 11; + const data = {ticketId}; + $httpBackend.expect('PATCH', `Routes/1/insertTicket`, data).respond(); + controller.insert(routeId, ticketId); + $httpBackend.flush(); + + expect(controller.vnApp.showSuccess).toHaveBeenCalled(); + expect(controller.$.model.refresh).toHaveBeenCalledWith(); + }); + }); }); diff --git a/modules/route/front/tickets/index.js b/modules/route/front/tickets/index.js index 49ca8d60f4..0264faf357 100644 --- a/modules/route/front/tickets/index.js +++ b/modules/route/front/tickets/index.js @@ -161,11 +161,11 @@ class Controller extends Section { this.insert(ticketId); } - insert(id) { - const params = {routeId: this.route.id}; - const query = `Routes/${id}/ticketToRoute`; + insert(ticketId) { + ticketId = parseInt(ticketId); - return this.$http.patch(query, params).then(() => { + const query = `Routes/${this.route.id}/insertTicket`; + return this.$http.patch(query, {ticketId}).then(() => { this.vnApp.showSuccess(this.$t('Data saved!')); this.$.model.refresh(); this.card.reload(); diff --git a/modules/route/front/tickets/index.spec.js b/modules/route/front/tickets/index.spec.js index a1b9229b73..8a8f094896 100644 --- a/modules/route/front/tickets/index.spec.js +++ b/modules/route/front/tickets/index.spec.js @@ -309,8 +309,8 @@ describe('Route', () => { jest.spyOn(controller.vnApp, 'showSuccess'); const ticketId = 11; - const data = {routeId: 1}; - $httpBackend.expect('PATCH', `Routes/11/ticketToRoute`, data).respond(); + const data = {ticketId}; + $httpBackend.expect('PATCH', `Routes/1/insertTicket`, data).respond(); controller.insert(ticketId); $httpBackend.flush(); From 6416b0ad799f9abad1cc03e62ae8423bf6ce231c Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 22 Dec 2020 14:56:21 +0100 Subject: [PATCH 065/101] 2666 - Closure invalid email notification --- .../components/descriptor-popover/index.js | 2 ++ .../ticket/front/tracking/index/index.html | 4 +-- modules/worker/front/log/index.html | 8 ++--- modules/worker/front/log/locale/es.yml | 3 +- print/methods/closure.js | 34 +++++++++++++++++++ 5 files changed, 44 insertions(+), 7 deletions(-) diff --git a/front/salix/components/descriptor-popover/index.js b/front/salix/components/descriptor-popover/index.js index b746f5c817..3ec5be1aec 100644 --- a/front/salix/components/descriptor-popover/index.js +++ b/front/salix/components/descriptor-popover/index.js @@ -4,6 +4,8 @@ import './style.scss'; export default class DescriptorPopover extends Popover { show(parent, id) { + if (!id) return; + super.show(parent); this.id = id; diff --git a/modules/ticket/front/tracking/index/index.html b/modules/ticket/front/tracking/index/index.html index 42d2197d0f..7cb9431ab4 100644 --- a/modules/ticket/front/tracking/index/index.html +++ b/modules/ticket/front/tracking/index/index.html @@ -23,9 +23,9 @@ {{::tracking.state.name}} - {{::tracking.worker.user.name | dashIfEmpty}} + {{::tracking.worker.user.name || 'System' | translate}} {{::tracking.created | date:'dd/MM/yyyy HH:mm'}} diff --git a/modules/worker/front/log/index.html b/modules/worker/front/log/index.html index bfa60a8c38..b7cf9fc77c 100644 --- a/modules/worker/front/log/index.html +++ b/modules/worker/front/log/index.html @@ -33,7 +33,7 @@ {{::log.user.name | dashIfEmpty}} + translate>{{::log.user.name || 'System' | translate}}