Skip to content
Snippets Groups Projects
Commit 9c39e5e5 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Diverses corrections (champs autres et statut intervenant)

parent 1862f258
Branches
Tags
1 merge request!55Ll bug report services
Show whitespace changes
Inline Side-by-side
Showing
with 121 additions and 62 deletions
data/ddl/table/DOSSIER_CHAMP_AUTRE.php
+ 24
− 0
View file @ 9c39e5e5
......@@ -81,6 +81,30 @@ return [
'position' => 7,
'commentaire' => NULL,
],
'SQL_VALUE' => [
'name' => 'SQL_VALUE',
'type' => 'string',
'bdd-type' => 'VARCHAR2',
'length' => 4000,
'scale' => NULL,
'precision' => NULL,
'nullable' => TRUE,
'default' => NULL,
'position' => 8,
'commentaire' => NULL,
],
'JSON_VALUE' => [
'name' => 'JSON_VALUE',
'type' => 'clob',
'bdd-type' => 'CLOB',
'length' => 0,
'scale' => NULL,
'precision' => NULL,
'nullable' => TRUE,
'default' => NULL,
'position' => 39,
'commentaire' => NULL,
],
],
];
......
module/Application/src/Application/Controller/AutresController.php
+ 1
− 1
View file @ 9c39e5e5
......@@ -39,6 +39,6 @@ class AutresController extends AbstractController
}
});
return compact('form', 'title');
return compact('form', 'title', 'dossierAutre');
}
}
module/Application/src/Application/Controller/StatutIntervenantController.php
+ 0
− 1
View file @ 9c39e5e5
......@@ -38,7 +38,6 @@ class StatutIntervenantController extends AbstractController
public function saisieAction()
{
/* @var $statutIntervenant StatutIntervenant */
try {
......
module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.StatutIntervenant.dcm.xml
+ 28
− 5
View file @ 9c39e5e5
......@@ -12,12 +12,17 @@
<field name="histoModification" type="datetime" column="HISTO_MODIFICATION" nullable="false"/>
<field name="libelle" type="string" column="LIBELLE" length="128" nullable="false"/>
<field name="serviceStatutaire" type="float" column="SERVICE_STATUTAIRE" precision="126" scale="0" nullable="false"/>
<field name="plafondReferentiel" type="float" column="PLAFOND_REFERENTIEL" precision="126" scale="0" nullable="false"/>
<field name="plafondReferentielService" type="float" column="PLAFOND_REFERENTIEL_SERVICE" precision="126" scale="0" nullable="false"/>
<field name="plafondReferentielHc" type="float" column="PLAFOND_REFERENTIEL_HC" precision="126" scale="0" nullable="false"/>
<field name="plafondHcHorsRemuFc" type="float" column="PLAFOND_HC_HORS_REMU_FC" precision="126" scale="0" nullable="false"/>
<field name="plafondReferentiel" type="float" column="PLAFOND_REFERENTIEL" precision="126" scale="0"
nullable="false"/>
<field name="plafondReferentielService" type="float" column="PLAFOND_REFERENTIEL_SERVICE" precision="126" scale="0"
nullable="false"/>
<field name="plafondReferentielHc" type="float" column="PLAFOND_REFERENTIEL_HC" precision="126" scale="0"
nullable="false"/>
<field name="plafondHcHorsRemuFc" type="float" column="PLAFOND_HC_HORS_REMU_FC" precision="126" scale="0"
nullable="false"/>
<field name="plafondHcRemuFc" type="float" column="PLAFOND_HC_REMU_FC" precision="126" scale="0" nullable="false"/>
<field name="plafondHcFiHorsEad" type="float" column="PLAFOND_HC_FI_HORS_EAD" precision="126" scale="0" nullable="false"/>
<field name="plafondHcFiHorsEad" type="float" column="PLAFOND_HC_FI_HORS_EAD" precision="126" scale="0"
nullable="false"/>
<field name="maximumHETD" type="float" column="MAXIMUM_HETD" precision="126" scale="0" nullable="false"/>
<field name="chargesPatronales" type="float" column="CHARGES_PATRONALES" precision="126" scale="0" nullable="false"/>
<field name="codesCorresp1" type="string" column="CODES_CORRESP_1" length="1000" nullable="true"/>
......@@ -38,6 +43,24 @@
<field name="temAtv" type="boolean" column="TEM_ATV" nullable="false"/>
<field name="temBiatss" type="boolean" column="TEM_BIATSS" nullable="false"/>
<field name="depassementSDSHC" type="boolean" column="DEPASSEMENT_SERVICE_DU_SANS_HC" nullable="false"/>
<field name="dossierIdentiteComplementaire" type="boolean" column="DOSSIER_IDENTITE_COMP" nullable="false"/>
<field name="dossierAdresse" type="boolean" column="DOSSIER_ADRESSE" nullable="false"/>
<field name="dossierContact" type="boolean" column="DOSSIER_CONTACT" nullable="false"/>
<field name="dossierInsee" type="boolean" column="DOSSIER_INSEE" nullable="false"/>
<field name="dossierIban" type="boolean" column="DOSSIER_IBAN" nullable="false"/>
<field name="dossierEmployeur" type="boolean" column="DOSSIER_EMPLOYEUR" nullable="false"/>
<field name="dossierEmailPerso" type="boolean" column="DOSSIER_EMAIL_PERSO" nullable="false"/>
<field name="dossierTelPerso" type="boolean" column="DOSSIER_TEL_PERSO" nullable="false"/>
<many-to-many field="champsAutres" target-entity="Application\Entity\Db\DossierAutre" fetch="EXTRA_LAZY">
<join-table name="DOSSIER_CHAMP_AUTRE_PAR_STATUT">
<join-columns>
<join-column name="STATUT_ID" referenced-column-name="ID"/>
</join-columns>
<inverse-join-columns>
<join-column name="DOSSIER_CHAMP_AUTRE_ID" referenced-column-name="ID"/>
</inverse-join-columns>
</join-table>
</many-to-many>
<many-to-one field="typeIntervenant" target-entity="Application\Entity\Db\TypeIntervenant">
<join-columns>
<join-column name="TYPE_INTERVENANT_ID" referenced-column-name="ID"/>
......
module/Application/src/Application/Entity/Db/StatutIntervenant.php
+ 1
− 1
View file @ 9c39e5e5
......@@ -1431,7 +1431,7 @@ class StatutIntervenant implements HistoriqueAwareInterface, RoleInterface
*/
public function removeChampAutre(DossierAutre $champAutre)
{
if ($this->champsAutres->contains($champAutre)) {
if ($this->champsAutres) {
$this->champsAutres->removeElement($champAutre);
}
}
......
module/Application/src/Application/Form/Intervenant/Dossier/DossierAutresFieldset.php
+ 33
− 30
View file @ 9c39e5e5
......@@ -35,6 +35,8 @@ class DossierAutresFieldset extends AbstractFieldset
{
$listChampsAutres = $this->getOption('listChampsAutres');
if ($listChampsAutres) {
foreach ($listChampsAutres as $champ) {
$this->add([
......@@ -72,6 +74,7 @@ class DossierAutresFieldset extends AbstractFieldset
$champAutreElement->setLabel($champ->getLibelle() . ' <span class="text-danger">*</span>');
}
}
}
return $this;
......
module/Application/src/Application/Form/StatutIntervenant/StatutIntervenantSaisieForm.php
+ 11
− 9
View file @ 9c39e5e5
......@@ -72,6 +72,7 @@ class StatutIntervenantSaisieForm extends AbstractForm
}
$champsAutres = $this->getServiceDossierAutre()->getList();
if ($champsAutres) {
foreach ($champsAutres as $autre) {
$this->add([
'name' => 'champ-autre-' . $autre->getId(),
......@@ -82,6 +83,7 @@ class StatutIntervenantSaisieForm extends AbstractForm
'type' => 'Checkbox',
]);
}
}
//Gestion des règles informations contact sur le dossier intervenant
$this->add([
......
module/Application/src/Application/Service/DossierService.php
+ 8
− 7
View file @ 9c39e5e5
......@@ -230,7 +230,7 @@ class DossierService extends AbstractEntityService
$statut = $intervenantDossier->getStatut();
$champsAutres = $intervenantDossier->getStatut()->getChampsAutres();
$statutChampsAutres = ($intervenantDossier->getStatut()) ? $intervenantDossier->getStatut()->getChampsAutres() : [];
$count = count($champsAutres);
if ($statutChampsAutres) {
foreach ($statutChampsAutres as $champ) {
$method = 'getAutre' . $champ->getId();
$obligatoire = $champ->isObligatoire();
......@@ -239,6 +239,7 @@ class DossierService extends AbstractEntityService
break;
}
}
}
$completudeDossier = ($completudeDossierIdentite &&
$completudeDossierIdentieComplementaire &&
......
module/Application/view/application/autres/saisie.phtml
+ 15
− 8
View file @ 9c39e5e5
......@@ -4,7 +4,7 @@
* @var $form \Application\Form\TypeRessource\TypeRessourceSaisieForm
*/
echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
$type = $dossierAutre->getType()->getId();
echo $this->form()->openTag($form); ?>
......@@ -24,27 +24,34 @@ echo $this->form()->openTag($form); ?>
<div class="col-md-12">
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#json" aria-controls="json" role="tab"
<li role="presentation" class="<?= ($type != '3') ? 'active' : ''; ?>"><a href="#json" aria-controls="json"
role="tab"
>Valeurs manuelles</a></li>
<li role="presentation"><a href="#sql" aria-controls="sql" role="tab"
<li role="presentation" class="<?= ($type == '3') ? 'active' : ''; ?>"><a href="#sql" aria-controls="sql"
role="tab"
>Valeurs via SQL </a></li>
</ul>
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="json">
<div role="tabpanel" class="tab-pane <?= ($type != '3') ? 'active' : ''; ?>"
id="json">
<div class="panel panel-default json-value">
<div class="panel-heading" role="tab">
<label>Valeurs sous forme JSON</label>
<label>Valeurs sous forme JSON<br/>
<small style="font-weight:normal">Format : { "0":"VALUE1" , "1":"VALUE2" ...}</small></label>
</div>
<div class="panel-body">
<?= $this->formTextarea($form->get('json-value')) ?>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="sql">
<div role="tabpanel" class="tab-pane <?= ($dossierAutre->getType()->getId() == '3') ? 'active' : ''; ?>"
id="sql">
<div class="panel panel-default sql-value">
<div class="panel-heading" role="tab">
<label>Valeurs sous forme SQL</label>
<label>Valeurs sous forme SQL<br/> <small style="font-weight:normal">Format : SELECT
votre_champs as VALUE_OPTION FROM
votre_table</small></label>
</div>
<div class="panel-body">
<?= $this->formTextarea($form->get('sql-value')) ?>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment