Merge branch 'creed-patch-time' into creed (0c6cc0e2) · Commits · open-source / oscar

.gitignore

+4 −0

Changes for .gitignore: 4 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -66,6 +66,10 @@ data/documents/public/**
		data/documents/request/**
		!data/documents/request/.gitkeep

		# Gabarits
		data/templates/timesheet_activity_synthesis.html.php
		data/templates/timesheet_person_month.html.php

		# Fichiers d'exemple
		!data/timesheet_model.xls
		!data/backup_oscar-empty.sql

composer.json

+16 −22

Changes for composer.json: 16 added lines, 22 removed lines.
Original line number	Diff line number	Diff line
		@@ -8,37 +8,31 @@
		"description": "",

		"require": {
		"unicaen/auth": "^1.2",
		"unicaen/app": "^1.3.10",
		"symfony/yaml": "^3.3",
		"monolog/monolog": "^1.23",
		"kmelia/monolog-stdout-handler": "^1.2",
		"fightbulc/moment": "^1.26",
		"unicaen/app": "^1.3",
		"unicaen/auth": "^1.3",
		"oro/doctrine-extensions": "^1.2",
		"cocur/slugify": "^3.0",
		"erusev/parsedown": "^1.6",
		"symfony/yaml": "^3.3",
		"fightbulc/moment": "^1.30",
		"cocur/slugify": "^3.2",
		"erusev/parsedown": "^1.7",
		"zf1/zend-search-lucene": "^1.12",
		"jacksay/php-file-extension": "^0.0.1",
		"elasticsearch/elasticsearch": "^7.2",
		"monolog/monolog": "^1.24",
		"kmelia/monolog-stdout-handler": "^1.2",
		"phpoffice/phpspreadsheet": "^1.9",
		"dompdf/dompdf": "^0.8.3",
		"swiftmailer/swiftmailer": "^6.2",
		"phpoffice/phpword": "^0.16.0",
		"phpoffice/phpexcel": "^1.8",
		"elasticsearch/elasticsearch": "^6.0",
		"swiftmailer/swiftmailer": "^6.0",
		"zendframework/zend-text": "^2.4",
		"phpoffice/phpword": "^0.14.0",
		"phpoffice/phpspreadsheet": "^1.6"
		"zendframework/zend-text": "~2.4"
		},
		"require-dev": {
		"phpmd/phpmd": "@stable",
		"twig/twig": "^2.0@dev",
		"phpunit/phpunit": "^6",
		"zendframework/zend-developer-tools": "^1.0"

		},
		"minimum-stability": "stable",
		"config": {
		"github-protocols": ["https", "ssh"],
		"secure-http": false,
		"platform": {
		"php": "7.0"
		}
		"secure-http": false
		},
		"autoload": {
		"psr-0": {

composer.lock

+601 −2262

File changed.

Preview size limit exceeded, changes collapsed.

config/autoload/global.php

+16 −1

Changes for config/autoload/global.php: 16 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -202,6 +202,20 @@ return array(
		'activity' => []
		],

		// Emplacement du template pour les feuilles de temps individuelles mensuelles
		'timesheet_person_month_template' => realpath(__DIR__.'/../../data/templates/timesheet_person_month.default.html.php'),

		// Emplacement du template pour les feuilles de temps des synthèse des activités
		'timesheet_activity_synthesis_template' => realpath(__DIR__.'/../../data/templates/timesheet_activity_synthesis.default.html.php'),

		// Permet de télécharger les feuilles de temps avant validation
		'timesheet_preview' => false,

		// Propose une version Excel pour les feuilles de temps mensuelle des personnes/activités
		'timesheet_allow_excel' => false,

		//

		// Notification par défaut
		/* Notifications */
		'notifications' => [
		@@ -233,7 +247,7 @@ return array(
		// Il s'agit de l'expression régulière utilisée par Oscar pour
		// vérifier la validité formelle du PFI saisi.
		// ex: 209ED2024
		'pfi' => '/^[0-9]{3}[A-Z]{2,3}[0-9]{2,4}$/mi'
		'pfi' => '/^([0-9]{3}[A-Z]{2,3}[0-9]{2,4})\|([0-9]{3}C[0-9]{3}[A-Z]{1}[FPI]?)$/mi'
		]
		],

		@@ -275,6 +289,7 @@ return array(
		]
		),
		),

		'driver' => array(
		'oscar_entities' => array(
		'class' => 'Doctrine\ORM\Mapping\Driver\AnnotationDriver',

data/templates/common.css

0 → 100644

+149 −0

Changes for data/templates/common.css: 149 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		body {
		font-size: 12px;
		font-family: Helvetica, Arial, sans-serif;
		}

		table {
		width: 100%;
		max-width: 100%;
		border-collapse: collapse;
		}

		tr { border: thin solid #adb6bd}

		td {}

		thead h1 {
		font-weight: normal;
		}

		thead th {
		text-align: center;
		}


		.dateHeading th:nth-child(odd) {
		background-color: #c0e1f1;
		}
		.dateHeading th:nth-child(even) {
		background-color: #cde7f1;
		}
		.dateHeading th {
		font-weight: bold;
		font-size: .8em;
		}

		.subgroup {
		font-size: 9px;
		}
		.subgroup .label {
		font-weight: normal;
		}
		th {
		/border: thin solid #adb6bd;/
		}
		thead td {
		/background: #e3e8e6;/
		border-bottom: dotted 1px #333;
		}
		.value {
		text-align: right;
		font-weight: 900;
		font-size: 12px;
		}
		thead td.valueLabel, tfoot td.valueLabel {
		text-align: right;
		}

		td, th {
		text-align: right;
		padding: 1px;
		border-top: thin solid rgba(255,255,255,.7);
		border-right: thin solid rgba(255,255,255,.3)
		}

		.feed {
		font-weight: bold;
		}
		.empty {
		font-size: 10px;
		}
		.lock {
		background: #fff !important;
		}
		.soustotal {
		font-weight: bold;
		font-size: 12px;
		}
		.total {
		font-weight: 700;
		font-size: 14px;
		}

		small {
		font-weight: 100;
		display: block;
		}
		th {
		vertical-align: center;
		font-weight: normal;
		}
		.main {
		background: #97c6d6;
		}
		.research {
		background: #8bd1dd;
		}
		.education {
		background: #a6e3c7;
		}
		.abs {
		background: #d6e4b2;
		}
		.other {
		background: #d7b5e5;
		}
		.duration {
		text-align: right;
		}

		.labelvalue {
		font-size: 10px;
		}


		.research.ce {
		background: #67b4c2;
		}
		.research.main {
		background: #93d8e4;
		}
		.research.other {
		background: #b6dbe1;
		}
		.research.totalcategory {
		background: #8bd1dd;
		}

		tr {
		border: none;
		}
		.table tr > th {
		border: none;
		}
		.table > thead > tr th {
		vertical-align: center;
		}

		/* Feuille de temps de la personne /
		.group > th { font-weight: bold; text-align: left }
		.group th {
		font-weight: 800;
		font-size: 1em;
		margin-top: 1em;
		color: rgba(0,0,0,.8);
		}


		.subgroup > th { font-weight: bold; text-align: left }
		.subgroup th { font-weight: normal }
		No newline at end of file