Overview
Comment: | Add ability to search accounting using accounts and analytical |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
3abc5388d1207500ca26ed92cc883b82 |
User & Date: | bohwaz on 2020-11-25 16:06:50 |
Other Links: | branch diff | manifest | tags |
Context
2020-11-25
| ||
18:25 | Add types for positive and negative result check-in: cc06f5744a user: bohwaz tags: dev | |
16:06 | Add ability to search accounting using accounts and analytical check-in: 3abc5388d1 user: bohwaz tags: dev | |
15:35 | Refactor old date_fr modifiers check-in: 6dd8cf19c9 user: bohwaz tags: dev | |
Changes
Modified src/include/lib/Garradin/Install.php from [ea5dc7ffc9] to [f40229806d].
︙ | ︙ | |||
164 165 166 167 168 169 170 | 'type' => Account::TYPE_BANK, 'position' => Account::ASSET_OR_LIABILITY, 'id_chart' => $chart->id(), 'user' => 1, ]); $account->save(); | | > > > > > > > > > > > > > > > > > > > > | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | 'type' => Account::TYPE_BANK, 'position' => Account::ASSET_OR_LIABILITY, 'id_chart' => $chart->id(), 'user' => 1, ]); $account->save(); // Ajout d'une recherche avancée en exemple (membres) $query = (object) [ 'query' => [[ 'operator' => 'AND', 'conditions' => [ [ 'column' => 'lettre_infos', 'operator' => '= 1', 'values' => [], ], ], ]], 'order' => 'numero', 'desc' => true, 'limit' => '10000', ]; $recherche = new Recherche; $recherche->add('Membres inscrits à la lettre d\'information', null, $recherche::TYPE_JSON, 'membres', $query); // Ajout d'une recherche avancée en exemple (compta) $query = (object) [ 'query' => [[ 'operator' => 'AND', 'conditions' => [ [ 'column' => 'a2.code', 'operator' => 'IS NULL', 'values' => [], ], ], ]], 'order' => 't.id', 'desc' => false, 'limit' => '100', ]; $recherche = new Recherche; $recherche->add('Écritures sans projet', null, $recherche::TYPE_JSON, 'compta', $query); return $config->save(); } static public function checkAndCreateDirectories() { // Vérifier que les répertoires vides existent, sinon les créer $paths = [DATA_ROOT, PLUGINS_ROOT, CACHE_ROOT, CACHE_ROOT . '/static', CACHE_ROOT . '/compiled']; |
︙ | ︙ |
Modified src/include/lib/Garradin/Recherche.php from [df28230a8c] to [c748f37f3f].
︙ | ︙ | |||
317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 | 'textMatch'=> false, 'label' => 'Type d\'écriture', 'type' => 'enum', 'null' => false, 'values' => Transaction::TYPES_NAMES, 'alias' => 'type', ]; $columns['t.id_year'] = (object) [ 'textMatch'=> false, 'label' => 'Exercice', 'type' => 'enum', 'null' => false, 'values' => $db->getAssoc('SELECT id, label FROM acc_years ORDER BY end_date;'), 'alias' => 'id_year', ]; } return $columns; } /** * Construire une recherche SQL à partir d'un objet généré par QueryBuilder | > > > > > > > > > > > > > > > > | 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 | 'textMatch'=> false, 'label' => 'Type d\'écriture', 'type' => 'enum', 'null' => false, 'values' => Transaction::TYPES_NAMES, 'alias' => 'type', ]; $columns['a.code'] = (object) [ 'textMatch'=> true, 'label' => 'Numéro de compte', 'type' => 'text', 'null' => false, 'alias' => 'code', ]; $columns['t.id_year'] = (object) [ 'textMatch'=> false, 'label' => 'Exercice', 'type' => 'enum', 'null' => false, 'values' => $db->getAssoc('SELECT id, label FROM acc_years ORDER BY end_date;'), 'alias' => 'id_year', ]; $columns['a2.code'] = (object) [ 'textMatch'=> true, 'label' => 'N° de compte projet', 'type' => 'text', 'null' => true, 'alias' => 'id_analytical', ]; } return $columns; } /** * Construire une recherche SQL à partir d'un objet généré par QueryBuilder |
︙ | ︙ | |||
355 356 357 358 359 360 361 362 363 364 365 366 367 368 | { $config = Config::getInstance(); $champs = $config->get('champs_membres'); } $db = DB::getInstance(); $target_columns = $this->getColumns($target); $query_columns = []; $query_groups = []; static $no_transform_operators = ['IS NULL', 'IS NOT NULL', '= 0', '= 1', '&']; foreach ($groups as $group) | > > > > > | 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 | { $config = Config::getInstance(); $champs = $config->get('champs_membres'); } $db = DB::getInstance(); $target_columns = $this->getColumns($target); if (!isset($target_columns[$order])) { throw new UserException('Colonne de tri inconnue : ' . $order); } $query_columns = []; $query_groups = []; static $no_transform_operators = ['IS NULL', 'IS NOT NULL', '= 0', '= 1', '&']; foreach ($groups as $group) |
︙ | ︙ | |||
387 388 389 390 391 392 393 | } if (!array_key_exists($condition['column'], $target_columns)) { // Ignorer une condition qui se rapporte à une colonne // qui n'existe pas, cas possible si on reprend une recherche // après avoir modifié les fiches de membres | | | 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 | } if (!array_key_exists($condition['column'], $target_columns)) { // Ignorer une condition qui se rapporte à une colonne // qui n'existe pas, cas possible si on reprend une recherche // après avoir modifié les fiches de membres throw new UserException('Cette recherche fait référence à une colonne qui n\'existe pas : ' . $condition['column']); } $query_columns[] = $condition['column']; $column = $target_columns[$condition['column']]; if ($column->textMatch == 'text' && !in_array($condition['operator'], $no_transform_operators)) { |
︙ | ︙ | |||
481 482 483 484 485 486 487 | if ($target == 'membres') { $query_columns = array_merge(['id', $config->get('champ_identite')], $query_columns); } // Ajout de champs compta si pas présents elseif ($target == 'compta') { | | | 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 | if ($target == 'membres') { $query_columns = array_merge(['id', $config->get('champ_identite')], $query_columns); } // Ajout de champs compta si pas présents elseif ($target == 'compta') { $query_columns = array_merge(['t.id', 't.date', 't.label', 'l.debit', 'l.credit', 'a.code'], $query_columns); } $query_columns[] = $order; if ($target_columns[$order]->textMatch) { $order = sprintf('transliterate_to_ascii(%s) COLLATE NOCASE', $db->quoteIdentifier($order)); |
︙ | ︙ | |||
510 511 512 513 514 515 516 | $query_columns = implode(', ', $query_columns); $query_groups = '(' . implode(') AND (', $query_groups) . ')'; $desc = $desc ? 'DESC' : 'ASC'; if ('compta' === $target) { | > > | > > > | | 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 | $query_columns = implode(', ', $query_columns); $query_groups = '(' . implode(') AND (', $query_groups) . ')'; $desc = $desc ? 'DESC' : 'ASC'; if ('compta' === $target) { $sql_query = sprintf('SELECT %s FROM acc_transactions AS t INNER JOIN acc_transactions_lines AS l ON l.id_transaction = t.id INNER JOIN acc_accounts AS a ON l.id_account = a.id LEFT JOIN acc_accounts AS a2 ON l.id_analytical = a2.id WHERE %s GROUP BY t.id ORDER BY %s %s LIMIT %d;', $query_columns, $query_groups, $order, $desc, (int) $limit); $sql_query = preg_replace('/"(a|a2|l|t)\./', '"$1"."', $sql_query); } else { $sql_query = sprintf('SELECT id, %s FROM %s WHERE %s ORDER BY %s %s LIMIT %d;', $query_columns, $target, $query_groups, $order, $desc, (int) $limit); } return $sql_query; |
︙ | ︙ | |||
546 547 548 549 550 551 552 | $query = preg_replace('/;?\s*$/', '', $query); $query .= ' LIMIT 100'; } try { $db = DB::getInstance(); static $allowed = [ | | | 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 | $query = preg_replace('/;?\s*$/', '', $query); $query .= ' LIMIT 100'; } try { $db = DB::getInstance(); static $allowed = [ 'compta' => ['acc_transactions' => null, 'acc_transactions_lines' => null, 'acc_accounts' => null], 'membres' => ['membres' => null], ]; $db->protectSelect($allowed[$target], $query); return $db->get($query); } catch (\Exception $e) { |
︙ | ︙ |
Modified src/templates/acc/search.tpl from [7bb9200584] to [3ea0dd29df].
︙ | ︙ | |||
34 35 36 37 38 39 40 41 42 43 44 45 46 47 | <td class="num"> <a href="{$admin_url}acc/transactions/details.php?id={$value}">{$value}</a> </td> {else} <td> {if $key == 'credit' || $key == 'debit'} {$value|raw|html_money:false} {else} {$value} {/if} </td> {/if} {/foreach} <td class="actions"> | > > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | <td class="num"> <a href="{$admin_url}acc/transactions/details.php?id={$value}">{$value}</a> </td> {else} <td> {if $key == 'credit' || $key == 'debit'} {$value|raw|html_money:false} {elseif null == $value} <em>(nul)</em> {else} {$value} {/if} </td> {/if} {/foreach} <td class="actions"> |
︙ | ︙ |
Modified src/www/admin/static/scripts/password.js from [7acb018c50] to [e1cdbb36d3].
︙ | ︙ | |||
32 33 34 35 36 37 38 | match_elm.className = 'password_check'; pw2_elm.parentNode.appendChild(match_elm); pw_elm.onkeyup = checkPasswordStrength; pw_elm.onchange = function () { checkPasswordStrength(); checkPasswordMatch(); }; pw_elm.onblur = function () { checkPasswordStrength(); checkPasswordMatch(); }; | < | < | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | match_elm.className = 'password_check'; pw2_elm.parentNode.appendChild(match_elm); pw_elm.onkeyup = checkPasswordStrength; pw_elm.onchange = function () { checkPasswordStrength(); checkPasswordMatch(); }; pw_elm.onblur = function () { checkPasswordStrength(); checkPasswordMatch(); }; pw2_elm.onkeyup = checkPasswordMatch; pw_elm.form.addEventListener('submit', function (e) { if (pw_elm.value == '') return true; if (scorePassword(pw_elm.value) <= 30 && !window.confirm("Êtes-vous sûr de vouloir utiliser un mot de passe aussi mauvais que ça ?")) { e = e || window.event; if(e.preventDefault) |
︙ | ︙ |