Normalisation attribut (Utils.php) ; ajout onglet Configuration ; préparation choix méthode de génération de reçus

FossilOrigin-Name: 08d84642c176039d5b91135007ba419f5cae36eca6445b55d0ed47b7db362df9
This commit is contained in:
engel 2022-01-28 14:40:21 +00:00
parent fa590c0d67
commit a59923348f
11 changed files with 223 additions and 107 deletions

View file

@ -14,7 +14,7 @@ class Utils
{
return DB::getInstance()->get(
"SELECT
id,
id as idActivite,
label,
description
FROM services
@ -47,9 +47,9 @@ class Utils
{
return DB::getInstance()->get(
"SELECT
services.id as idService,
services.label as titreService,
services.description as descService,
services.id as idActivite,
services.label as titreActivite,
services.description as descActivite,
services_fees.id as idTarif,
services_fees.label as titreTarif,
services_fees.description as descTarif
@ -66,13 +66,14 @@ class Utils
{
return DB::getInstance()->get(
"SELECT
services.id as Id,
services.label,
services.description as descService,
services_fees.label as tarif,
services.id as idActivite,
services.label as titreActivite,
services.description as descActivite,
services_fees.id as idTarif,
services_fees.label as titreTarif,
services_fees.description as descTarif,
acc_accounts.code as numero_cpt,
acc_accounts.label as nom_cpt
acc_accounts.code as numeroCpt,
acc_accounts.label as nomCpt
FROM services
LEFT JOIN services_fees ON services_fees.id_service = services.id
LEFT JOIN acc_accounts ON services_fees.id_account = acc_accounts.id
@ -164,7 +165,7 @@ class Utils
public static function getVersementsTotaux($annee) {
$sql =
"SELECT
acc_transactions_users.id_user as id,
acc_transactions_users.id_user as idUser,
membres.nom as nom,
sum(acc_transactions_lines.credit) AS montant,
membres.adresse as adresse,
@ -195,43 +196,54 @@ class Utils
* @return nom de l'association
*/
public static function getNomAsso() {
return DB::getInstance()->get(
return DB::getInstance()->first(
"SELECT value
FROM config
WHERE key = 'nom_asso'"
)[0]->value;
)->value;
}
/**
* @return adresse de l'association
*/
public static function getAdresseAsso() {
return DB::getInstance()->get(
return DB::getInstance()->first(
"SELECT value
FROM config
WHERE key = 'adresse_asso'"
)[0]->value;
)->value;
}
/**
* récupérer l'année du premier exercice
* @return liste des années fiscales
*/
public static function getPremiereAnnee() {
return DB::getInstance()->get(
public static function getAnneesFiscales() {
$rows = DB::getInstance()->get(
"SELECT strftime('%Y', start_date) as annee
FROM acc_years
ORDER by start_date"
)[0]->value;
ORDER by start_date DESC"
);
$anneesFiscales = array();
foreach ($rows as $row) {
$anneesFiscales[] = $row->annee;
}
return $anneesFiscales;
}
// ------------------------------------------------------------------------
// zip archive creation
// ------------------------------------------------------------------------
/**
* enregistrer les fichiers dans une archive zip
* @param $fileList : liste des fichiers à archiver
* @param $year : pour générer le nom de l'archive
* @param $archiveDir : ne sert plus
*/
static function makeArchive(
$fileList,
$year,
$archiveDir)
$archiveDir = null)
{
$zipFilename = "recus_dons" . $year . ".zip";
header('Content-type: application/zip');