Compare commits

..

No commits in common. "ec0702e48c602f9e8e2edbfa1ab46ffb0ae30bb8" and "4fd56bf12dbcde5ee9fa730450826685ce42c7d4" have entirely different histories.

4 changed files with 47 additions and 34 deletions

View File

@ -34,18 +34,5 @@ div.previs_recu
font-family: Serif; font-family: Serif;
font-size: 11pt; font-size: 11pt;
background-color: white; background-color: white;
break-after: always; page-break-after: always;
}
/* supprimer saut de page après dernier */
div.previs_recu:last-of-type
{
font-family: Serif;
font-size: 11pt;
background-color: white;
break-after: avoid;
}
#__profiler {
display: none;
} }

View File

@ -22,7 +22,7 @@ class Utils
description, description,
amount as montant amount as montant
FROM services_fees'); FROM services_fees');
return $db->getGrouped($sql); return Utils::toAssoc($db->get($sql), 'id');
} }
/** /**
@ -37,7 +37,7 @@ class Utils
services.label, services.label,
services.description services.description
FROM services'); FROM services');
return $db->getGrouped($sql); return Utils::toAssoc($db->get($sql), 'id');
} }
/** /**
@ -76,7 +76,7 @@ class Utils
$annee, $annee,
$db->where('code', $op, $comptes) $db->where('code', $op, $comptes)
); );
return $db->getGrouped($sql); return Utils::toAssoc($db->get($sql), 'id');
} }
/** /**
@ -120,6 +120,32 @@ class Utils
return $db->get($sql); return $db->get($sql);
} }
/**
* faire un tableau associatif avec le résultat d'une requête
*/
static function toAssoc($array, $nomCle)
{
$assoc = array();
foreach ($array as $elem)
{
$ro = new \ReflectionObject($elem);
$proprietes = $ro->getProperties();
$obj = new \stdClass();
foreach ($proprietes as $p)
{
$pname = $p->getName();
if ($pname == $nomCle) {
$key = $p->getValue($elem);
}
else {
$obj->$pname = $p->getValue($elem);
}
}
$assoc[$key] = $obj;
}
return $assoc;
}
/** /**
* @return versements correspondants à l'année donnée * @return versements correspondants à l'année donnée
* @param $annee * @param $annee

View File

@ -5,8 +5,8 @@
<nav class="tabs"> <nav class="tabs">
<ul> <ul>
<li{if $current_nav == 'index'} class="current"{/if}><a href="{plugin_url}">Accueil</a></li> <li{if $current_nav == 'index'} class="current"{/if}><a href="{plugin_url}">Accueil</a></li>
{if $current_nav == 'personne'} <li class="current"><a>Versements par personne</a></li>{/if} <li{if $current_nav == 'personne'} class="current"{/if}><a href="{plugin_url file="action.php?action=personne"}">Versements par personne</a></li>
{if $current_nav == 'activite'} <li class="current"><a>Versements par activité et tarif</a></li>{/if} <li{if $current_nav == 'activite'} class="current"{/if}><a href="{plugin_url file="action.php?action=activite"}">Versements par activité et tarif</a></li>
{if $session->canAccess($session::SECTION_ACCOUNTING, $session::ACCESS_WRITE)} {if $session->canAccess($session::SECTION_ACCOUNTING, $session::ACCESS_WRITE)}
<li{if $current_nav == 'config'} class="current"{/if}><a href="{plugin_url file="config.php"}">Configuration</a></li> <li{if $current_nav == 'config'} class="current"{/if}><a href="{plugin_url file="config.php"}">Configuration</a></li>
{/if} {/if}

View File

@ -1,4 +1,4 @@
{include file="_head.tpl" title="%s"|args:$plugin.label current="plugin_%s"|args:$plugin.id} {include file="_head.tpl" title="%s"|args:$plugin.name current="plugin_%s"|args:$plugin.id}
<?php <?php
$fmt = new \NumberFormatter('fr_FR', \NumberFormatter::SPELLOUT); $fmt = new \NumberFormatter('fr_FR', \NumberFormatter::SPELLOUT);