Test sur la génération de la feuille de temps de synthèse mensuelle d'activité (573b6a70) · Commits · open-source / oscar

labs/composer.json

0 → 100644

+12 −0

Changes for labs/composer.json: 12 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		{
		"name": "bouvry/generate-excel",
		"authors": [
		{
		"name": "bouvry",
		"email": "stephane.bouvry@unicaen.fr"
		}
		],
		"require": {
		"phpoffice/phpspreadsheet": "^1.6"
		}
		}

labs/composer.lock

0 → 100644

+325 −0

Changes for labs/composer.lock: 325 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		{
		"_readme": [
		"This file locks the dependencies of your project to a known state",
		"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
		"This file is @generated automatically"
		],
		"content-hash": "0357b4084ee55a66632f09250ee8b974",
		"packages": [
		{
		"name": "markbaker/complex",
		"version": "1.4.7",
		"source": {
		"type": "git",
		"url": "https://github.com/MarkBaker/PHPComplex.git",
		"reference": "1ea674a8308baf547cbcbd30c5fcd6d301b7c000"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/1ea674a8308baf547cbcbd30c5fcd6d301b7c000",
		"reference": "1ea674a8308baf547cbcbd30c5fcd6d301b7c000",
		"shasum": ""
		},
		"require": {
		"php": "^5.6.0\|^7.0.0"
		},
		"require-dev": {
		"dealerdirect/phpcodesniffer-composer-installer": "^0.4.3",
		"phpcompatibility/php-compatibility": "^8.0",
		"phpdocumentor/phpdocumentor": "2.*",
		"phploc/phploc": "2.*",
		"phpmd/phpmd": "2.*",
		"phpunit/phpunit": "^4.8.35\|^5.4.0",
		"sebastian/phpcpd": "2.*",
		"squizlabs/php_codesniffer": "^3.3.0"
		},
		"type": "library",
		"autoload": {
		"psr-4": {
		"Complex\\": "classes/src/"
		},
		"files": [
		"classes/src/functions/abs.php",
		"classes/src/functions/acos.php",
		"classes/src/functions/acosh.php",
		"classes/src/functions/acot.php",
		"classes/src/functions/acoth.php",
		"classes/src/functions/acsc.php",
		"classes/src/functions/acsch.php",
		"classes/src/functions/argument.php",
		"classes/src/functions/asec.php",
		"classes/src/functions/asech.php",
		"classes/src/functions/asin.php",
		"classes/src/functions/asinh.php",
		"classes/src/functions/atan.php",
		"classes/src/functions/atanh.php",
		"classes/src/functions/conjugate.php",
		"classes/src/functions/cos.php",
		"classes/src/functions/cosh.php",
		"classes/src/functions/cot.php",
		"classes/src/functions/coth.php",
		"classes/src/functions/csc.php",
		"classes/src/functions/csch.php",
		"classes/src/functions/exp.php",
		"classes/src/functions/inverse.php",
		"classes/src/functions/ln.php",
		"classes/src/functions/log2.php",
		"classes/src/functions/log10.php",
		"classes/src/functions/negative.php",
		"classes/src/functions/pow.php",
		"classes/src/functions/rho.php",
		"classes/src/functions/sec.php",
		"classes/src/functions/sech.php",
		"classes/src/functions/sin.php",
		"classes/src/functions/sinh.php",
		"classes/src/functions/sqrt.php",
		"classes/src/functions/tan.php",
		"classes/src/functions/tanh.php",
		"classes/src/functions/theta.php",
		"classes/src/operations/add.php",
		"classes/src/operations/subtract.php",
		"classes/src/operations/multiply.php",
		"classes/src/operations/divideby.php",
		"classes/src/operations/divideinto.php"
		]
		},
		"notification-url": "https://packagist.org/downloads/",
		"license": [
		"MIT"
		],
		"authors": [
		{
		"name": "Mark Baker",
		"email": "mark@lange.demon.co.uk"
		}
		],
		"description": "PHP Class for working with complex numbers",
		"homepage": "https://github.com/MarkBaker/PHPComplex",
		"keywords": [
		"complex",
		"mathematics"
		],
		"time": "2018-10-13T23:28:42+00:00"
		},
		{
		"name": "markbaker/matrix",
		"version": "1.1.4",
		"source": {
		"type": "git",
		"url": "https://github.com/MarkBaker/PHPMatrix.git",
		"reference": "6ea97472b5baf12119b4f31f802835b820dd6d64"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/6ea97472b5baf12119b4f31f802835b820dd6d64",
		"reference": "6ea97472b5baf12119b4f31f802835b820dd6d64",
		"shasum": ""
		},
		"require": {
		"php": "^5.6.0\|^7.0.0"
		},
		"require-dev": {
		"dealerdirect/phpcodesniffer-composer-installer": "^0.4.3",
		"phpcompatibility/php-compatibility": "^8.0",
		"phpdocumentor/phpdocumentor": "2.*",
		"phploc/phploc": "2.*",
		"phpmd/phpmd": "2.*",
		"phpunit/phpunit": "^4.8.35\|^5.4.0",
		"sebastian/phpcpd": "2.*",
		"squizlabs/php_codesniffer": "^3.3.0"
		},
		"type": "library",
		"autoload": {
		"psr-4": {
		"Matrix\\": "classes/src/"
		},
		"files": [
		"classes/src/functions/adjoint.php",
		"classes/src/functions/antidiagonal.php",
		"classes/src/functions/cofactors.php",
		"classes/src/functions/determinant.php",
		"classes/src/functions/diagonal.php",
		"classes/src/functions/identity.php",
		"classes/src/functions/inverse.php",
		"classes/src/functions/minors.php",
		"classes/src/functions/trace.php",
		"classes/src/functions/transpose.php",
		"classes/src/operations/add.php",
		"classes/src/operations/directsum.php",
		"classes/src/operations/subtract.php",
		"classes/src/operations/multiply.php",
		"classes/src/operations/divideby.php",
		"classes/src/operations/divideinto.php"
		]
		},
		"notification-url": "https://packagist.org/downloads/",
		"license": [
		"MIT"
		],
		"authors": [
		{
		"name": "Mark Baker",
		"email": "mark@lange.demon.co.uk"
		}
		],
		"description": "PHP Class for working with matrices",
		"homepage": "https://github.com/MarkBaker/PHPMatrix",
		"keywords": [
		"mathematics",
		"matrix",
		"vector"
		],
		"time": "2018-11-04T22:12:12+00:00"
		},
		{
		"name": "phpoffice/phpspreadsheet",
		"version": "1.6.0",
		"source": {
		"type": "git",
		"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
		"reference": "bf00f0cc5f55c354018f9a9ef15e6e3e1a229051"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/bf00f0cc5f55c354018f9a9ef15e6e3e1a229051",
		"reference": "bf00f0cc5f55c354018f9a9ef15e6e3e1a229051",
		"shasum": ""
		},
		"require": {
		"ext-ctype": "*",
		"ext-dom": "*",
		"ext-fileinfo": "*",
		"ext-gd": "*",
		"ext-iconv": "*",
		"ext-libxml": "*",
		"ext-mbstring": "*",
		"ext-simplexml": "*",
		"ext-xml": "*",
		"ext-xmlreader": "*",
		"ext-xmlwriter": "*",
		"ext-zip": "*",
		"ext-zlib": "*",
		"markbaker/complex": "^1.4",
		"markbaker/matrix": "^1.1",
		"php": "^5.6\|^7.0",
		"psr/simple-cache": "^1.0"
		},
		"require-dev": {
		"doctrine/instantiator": "^1.0.0",
		"dompdf/dompdf": "^0.8.0",
		"friendsofphp/php-cs-fixer": "@stable",
		"jpgraph/jpgraph": "^4.0",
		"mpdf/mpdf": "^7.0.0",
		"phpcompatibility/php-compatibility": "^8.0",
		"phpunit/phpunit": "^5.7",
		"squizlabs/php_codesniffer": "^3.3",
		"tecnickcom/tcpdf": "^6.2"
		},
		"suggest": {
		"dompdf/dompdf": "Option for rendering PDF with PDF Writer",
		"jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
		"mpdf/mpdf": "Option for rendering PDF with PDF Writer",
		"tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer"
		},
		"type": "library",
		"autoload": {
		"psr-4": {
		"PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet"
		}
		},
		"notification-url": "https://packagist.org/downloads/",
		"license": [
		"LGPL-2.1-or-later"
		],
		"authors": [
		{
		"name": "Erik Tilt"
		},
		{
		"name": "Adrien Crivelli"
		},
		{
		"name": "Maarten Balliauw",
		"homepage": "https://blog.maartenballiauw.be"
		},
		{
		"name": "Mark Baker",
		"homepage": "https://markbakeruk.net"
		},
		{
		"name": "Franck Lefevre",
		"homepage": "https://rootslabs.net"
		}
		],
		"description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
		"homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
		"keywords": [
		"OpenXML",
		"excel",
		"gnumeric",
		"ods",
		"php",
		"spreadsheet",
		"xls",
		"xlsx"
		],
		"time": "2019-01-02T04:42:54+00:00"
		},
		{
		"name": "psr/simple-cache",
		"version": "1.0.1",
		"source": {
		"type": "git",
		"url": "https://github.com/php-fig/simple-cache.git",
		"reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
		"reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
		"shasum": ""
		},
		"require": {
		"php": ">=5.3.0"
		},
		"type": "library",
		"extra": {
		"branch-alias": {
		"dev-master": "1.0.x-dev"
		}
		},
		"autoload": {
		"psr-4": {
		"Psr\\SimpleCache\\": "src/"
		}
		},
		"notification-url": "https://packagist.org/downloads/",
		"license": [
		"MIT"
		],
		"authors": [
		{
		"name": "PHP-FIG",
		"homepage": "http://www.php-fig.org/"
		}
		],
		"description": "Common interfaces for simple caching",
		"keywords": [
		"cache",
		"caching",
		"psr",
		"psr-16",
		"simple-cache"
		],
		"time": "2017-10-23T01:57:42+00:00"
		}
		],
		"packages-dev": [],
		"aliases": [],
		"minimum-stability": "stable",
		"stability-flags": [],
		"prefer-stable": false,
		"prefer-lowest": false,
		"platform": [],
		"platform-dev": []
		}

labs/test.php

0 → 100644

+595 −0

File added.

Preview size limit exceeded, changes collapsed.

module/Oscar/src/Oscar/Service/TimesheetService.php

+2 −1

Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -1191,7 +1191,8 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa
		public function getSynthesisActivityPeriod($idActivity, $period){
		$output = [
		'activity' => null,
		'persons' => []
		'persons' => [],
		'period' => DateTimeUtils::periodBounds($period)
		];

		/** @var string[] $ceStr Liste des acronymes des autres activités */

module/Oscar/src/Oscar/Utils/DateTimeUtils.php

+10 −2

Changes for module/Oscar/src/Oscar/Utils/DateTimeUtils.php: 10 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -27,19 +27,27 @@ class DateTimeUtils {

		$dateRef = new \DateTime(sprintf('%s-01', $period));
		$nbr = cal_days_in_month(CAL_GREGORIAN, (int)$dateRef->format('m'), (int)$dateRef->format(('Y')));
		$dateFin = $dateRef->format('Y-m-'. $nbr);

		$fmt = datefmt_create('fr_FR', \IntlDateFormatter::FULL, \IntlDateFormatter::NONE, 'Europe/Paris', \IntlDateFormatter::GREGORIAN);

		$startLabel = datefmt_format($fmt, $dateRef->getTimestamp());
		$endLabel = datefmt_format($fmt, (new \DateTime($dateFin))->getTimestamp());
		$periodLabel = $dateRef->format('M Y');

		$datas = [
		'totalDays' => $nbr,
		'year' => $dateRef->format('Y'),
		'month' => $dateRef->format('m'),
		'periodLabel' => $periodLabel,
		'start' => $dateRef->format('Y-m-01 00:00:00'),
		'startLabel' => $startLabel,
		'firstDay' => $dateRef->format('Y-m-01'),
		'end' => $dateRef->format('Y-m-' . $nbr .' 23:59:59'),
		'endLabel' => $endLabel,
		'lastDay' => $dateRef->format('Y-m-'. $nbr),
		];



		$daysLabel = ['', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam', 'Dim'];
		$i = 1;
		$days = [];