- Fix liens (b0303577) · Commits · open-source / oscar

module/Oscar/config/module.config.php

+1 −0

Original line number	Diff line number	Diff line
		@@ -720,6 +720,7 @@ return array(
		'fileSize' => \Oscar\View\Helpers\Filesize::class,
		'hasAccess' => \Oscar\View\Helpers\Access::class,
		'keyvalue' => \Oscar\View\Helpers\KeyValueHelper::class,
		'activityNumbers' => \Oscar\View\Helpers\ActivityNumberHelper::class,
		'moment' => \Oscar\View\Helpers\Moment::class,
		'oscarFormRow' => \Oscar\View\Helpers\OscarFormRow::class,
		'pager' => UnicaenDoctrinePaginatorHelper::class,

module/Oscar/src/Oscar/Form/ProjectGrantForm.php

+7 −1

Original line number	Diff line number	Diff line
		@@ -164,8 +164,14 @@ class ProjectGrantForm extends Form implements InputFilterProviderInterface, Use
		'class' => 'control-label'
		]
		];

		$css = 'form-control';
		if( $fieldConfig['type'] == 'Checkbox' ){
		$css = "form-check-input";
		}

		$attributes = [
		'class' => 'form-control ' . ($fieldConfig['empty'] === false ? 'is-required' : ''),
		'class' => $css . ' ' . ($fieldConfig['empty'] === false ? 'is-required' : ''),
		];

		if ($fieldConfig['help']) {

module/Oscar/src/Oscar/View/Helpers/ActivityNumberHelper.php

0 → 100644

+72 −0

Original line number	Diff line number	Diff line
		<?php
		/**
		* @author Stéphane Bouvry<stephane.bouvry@unicaen.fr>
		* @date: 16-10-13 14:21
		* @copyright Certic (c) 2016
		*/

		namespace Oscar\View\Helpers;


		use Laminas\Form\ElementInterface;
		use Laminas\Form\View\Helper\FormElement;

		class ActivityNumberHelper extends FormElement
		{
		public function __invoke(ElementInterface $element = null)
		{
		return parent::__invoke($element); // TODO: Change the autogenerated stub
		}


		public static function getTemplateLine($name, $key, $value, $deletable = false){
		$tpl = '
		<div class="keyvalue-line card">
		<strong class="keyvalue-key">'.$key.'</strong>
		<input type="text" name="'.$name.'['.$key.']" value="'.$value.'" class="keyvalue-value" />';

		if( $deletable == true ){
		$tpl .= '<button class="btn btn-xs btn-default btn-delete">
		<i class="icon-trash"></i>
		<span>Supprimer</span>
		</button>';
		}
		$tpl .= '</div>';

		return $tpl;
		}

		public function render(ElementInterface $element): string
		{
		$datas = [];
		$name = $element->getAttribute('name');
		foreach ($element->getOptions()['keys'] as $key) {
		$datas[$key] = [
		'key' => $key,
		'fixed' => true,
		'value' => '',
		];
		}
		foreach ($element->getValue() as $key => $value) {
		if( !array_key_exists($key, $datas) ){
		$datas[$key] = [
		'key' => $key,
		'fixed' => false,
		];
		}
		$datas[$key]['value'] = $value;
		}
		ob_start();
		?>
		<div class="activity-numbers">
		<?php foreach ($datas as $key=>$numberInfos): ?>
		<div class="form-activity-number <?= $numberInfos['fixed'] ? 'configured' : 'freeconf' ?>">
		<strong><?= $numberInfos['key'] ?></strong>
		<input type="text" class="form-control" name="<?= $name . '[' . $key . ']' ?>" value="<?= $numberInfos['value'] ?>">
		</div>
		<?php endforeach; ?>
		</div>
		<?php
		return ob_get_clean();
		}
		}
		No newline at end of file

module/Oscar/view/layout/layout.phtml

+1 −1

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ echo getenv('APPLICATION_ENV') ?: 'development' ?>">
		</li>
		<li>
		<a class="dropdown-item"
		href="<?= $this->url('contract/advancedsearch') ?>?projectview=on">
		href="<?= $this->url('contract/advancedsearch') ?>?&project=1">
		<?= $this->oscarText("Liste des projets") ?>
		</a>
		</li>

module/Oscar/view/oscar/project-grant/form.phtml

+2 −1

Original line number	Diff line number	Diff line
		@@ -154,7 +154,8 @@ use Oscar\OscarText;
		</div>
		<div class="col-md-6">
		<h3><?= $this->translate("Numérotation") ?></h3>
		<?php echo $this->keyvalue($form->get('numbers')); ?>
		<?php /* echo $this->keyvalue($form->get('numbers')); */ ?>
		<?php echo $this->activityNumbers($form->get('numbers')); ?>
		<?php echo $this->formElementErrors($form->get('numbers')); ?>
		</div>
		</div>