lesanges
/
materiels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ok to list equipments for a specific category, next historical entries and outputs for a specific equipment.

This commit is contained in:
JBthePenguin 2021-06-12 17:17:03 +02:00
parent 20f55add52
commit 5ee30cf9ed
9 changed files with 165 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
materiels.tar.gz
View File

Binary file not shown.

20
src/lib/Equipment.php
View File

@ -70,13 +70,8 @@ class Equipment
return $entries - $outputs;
}
public function AllListsAllByCategory()
public function AllListsAll($eqmts)
{
$eqmts_by_cat = $this->listAllByCategory();
$eqmts_owned_by_cat = array();
$eqmts_no_owned_by_cat = array();
$eqmts_just_listed_by_cat = array();
foreach ($eqmts_by_cat as $cat => $eqmts) {
$eqmts_owned = array();
$eqmts_no_owned = array();
$eqmts_just_listed = array();
@ -101,6 +96,19 @@ class Equipment
array_push($eqmts_just_listed, $eqmt);
}
}
return array(
$eqmts_owned, $eqmts_no_owned, $eqmts_just_listed
);
}
public function AllListsAllByCategory()
{
$eqmts_by_cat = $this->listAllByCategory();
$eqmts_owned_by_cat = array();
$eqmts_no_owned_by_cat = array();
$eqmts_just_listed_by_cat = array();
foreach ($eqmts_by_cat as $cat => $eqmts) {
list($eqmts_owned, $eqmts_no_owned, $eqmts_just_listed) = $this->AllListsAll($eqmts);
$eqmts_owned_by_cat[$cat] = $eqmts_owned;
$eqmts_no_owned_by_cat[$cat] = $eqmts_no_owned;
$eqmts_just_listed_by_cat[$cat] = $eqmts_just_listed;

1
src/templates/_nav.tpl
View File

@ -4,6 +4,5 @@
<li class="{if $current == 'categories'}current{/if}"><a href="{plugin_url file="categories/index.php"}">Catégories</a></li>
<li class="{if $current == 'entrees'}current{/if}"><a href="{plugin_url file="entrees/index.php"}">Entrées</a></li>
<li class="{if $current == 'sorties'}current{/if}"><a href="{plugin_url file="sorties/index.php"}">Sorties</a></li>
<li class="{if $current == 'recherche'}current{/if}"><a href="{plugin_url file="recherche.php"}">Recherche</a></li>
</ul>
</nav>

75
src/templates/categories/materiels_par_categorie.tpl
View File

@ -2,4 +2,79 @@
{include file="%s_nav.tpl"|args:$plugin_tpl current="categories"}
<h2 style="text-align: center;">{$cat_name}</h2>
<br>
{if $eqmts_owned}
<table class="list">
<thead>
<tr>
<th colspan="4" style="text-align: center;"><h3>Matériel dont l'association est propriétaire</h3></th>
</tr>
<tr>
<th><b>Désignation</b></th>
<th style="text-align: center;"><b>Stock</b></th>
<th style="text-align: center;"><b>Sortie</b></th>
<th style="text-align: center;"><b>Disponible</b></th>
</tr>
</thead>
<tbody>
{foreach from=$eqmts_owned item="eqmt"}
<tr>
<td>{$eqmt.designation}</td>
<td style="text-align: center;">{$eqmt.stock}</td>
<td style="text-align: center;">{$eqmt.out_of_stock}</td>
<td style="text-align: center;">{$eqmt.stock - $eqmt.out_of_stock}</td>
</tr>
{/foreach}
</tbody>
</table>
{/if}
{if $eqmts_no_owned}
<table class="list">
<thead>
<tr>
<th colspan="2" style="text-align: center;"><h3>Matériel dont l'association n'est pas propriétaire (emprunté)</h3></th>
</tr>
<tr>
<th><b>Désignation</b></th>
<th style="text-align: center;"><b>Nombre</b></th>
</tr>
</thead>
<tbody>
{foreach from=$eqmts_no_owned item="eqmt"}
<tr>
<td>{$eqmt.designation}</td>
<td style="text-align: center;">{$eqmt.no_owned}</td>
</tr>
{/foreach}
</tbody>
</table>
{/if}
{if $eqmts_just_listed}
<table class="list">
<thead>
<tr>
<th style="text-align: center;"><h3>Matériel dont l'association n'est plus en possession</h3></th>
</tr>
<tr>
<th><b>Désignation</b></th>
</tr>
</thead>
<tbody>
{foreach from=$eqmts_just_listed item="eqmt"}
<tr>
<td>{$eqmt.designation}</td>
</td>
</tr>
{/foreach}
</tbody>
</table>
{/if}
{linkbutton label="Retour" shape="export" href=$return_link}
{include file="admin/_foot.tpl"}

61
src/templates/index.tpl
View File

@ -2,17 +2,22 @@
{include file="%s_nav.tpl"|args:$plugin_tpl current="index"}
<h2>Matériel dont l'association est propriétaire</h2>
<h2 style="text-align: center;">Matériel dont l'association est propriétaire</h2>
<br>
{foreach from=$eqmts_owned_by_cat key='cat' item="eqmts"}
{if $eqmts}
<h3>{$cat}</h3>
<table class="list">
<thead>
<tr>
<th colspan="5" style="text-align: center;"><h3>{$cat}</h3></th>
</tr>
<tr>
<th><b>Désignation</b></th>
<th><b>Stock</b></th>
<th><b>Sortie</b></th>
<th><b>Disponible</b></th>
<th style="text-align: center;"><b>Stock</b></th>
<th style="text-align: center;"><b>Sortie</b></th>
<th style="text-align: center;"><b>Disponible</b></th>
<th></th>
</tr>
</thead>
@ -20,10 +25,10 @@
{foreach from=$eqmts item="eqmt"}
<tr>
<td>{$eqmt.designation}</td>
<td>{$eqmt.stock}</td>
<td>{$eqmt.out_of_stock}</td>
<td>{$eqmt.stock - $eqmt.out_of_stock}</td>
<td class="actions">
<td style="text-align: center;">{$eqmt.stock}</td>
<td style="text-align: center;">{$eqmt.out_of_stock}</td>
<td style="text-align: center;">{$eqmt.stock - $eqmt.out_of_stock}</td>
<td class="actions" style="text-align: center;">
{linkbutton shape="edit" label="Modifier" href="modifier_materiel.php?id=%d"|args:$eqmt.id}
</td>
</tr>
@ -33,15 +38,26 @@
{/if}
{/foreach}
<h2>Matériel dont l'association n'est pas propriétaire (emprunté)</h2>
<br>
<hr>
<br>
<h2 style="text-align: center;">Matériel dont l'association n'est pas propriétaire (emprunté)</h2>
<br>
{foreach from=$eqmts_no_owned_by_cat key='cat' item="eqmts"}
{if $eqmts}
<h3>{$cat}</h3>
<table class="list">
<thead>
<tr>
<th colspan="5" style="text-align: center;"><h3>{$cat}</h3></th>
</tr>
<tr>
<th><b>Désignation</b></th>
<th><b>Nombre</b></th>
<th style="text-align: center;"><b>Nombre</b></th>
<th></th>
</tr>
</thead>
@ -49,8 +65,8 @@
{foreach from=$eqmts item="eqmt"}
<tr>
<td>{$eqmt.designation}</td>
<td>{$eqmt.no_owned}</td>
<td class="actions">
<td style="text-align: center;">{$eqmt.no_owned}</td>
<td class="actions" style="text-align: center;">
{linkbutton shape="edit" label="Modifier" href="modifier_materiel.php?id=%d"|args:$eqmt.id}
</td>
</tr>
@ -60,12 +76,23 @@
{/if}
{/foreach}
<h2>Matériel dont l'association n'est plus en possession</h2>
<br>
<hr>
<br>
<h2 style="text-align: center;">Matériel dont l'association n'est plus en possession</h2>
<br>
{foreach from=$eqmts_just_listed_by_cat key='cat' item="eqmts"}
{if $eqmts}
<h3>{$cat}</h3>
<table class="list">
<thead>
<tr>
<th colspan="5" style="text-align: center;"><h3>{$cat}</h3></th>
</tr>
<tr>
<th><b>Désignation</b></th>
<th></th>
@ -75,7 +102,7 @@
{foreach from=$eqmts item="eqmt"}
<tr>
<td>{$eqmt.designation}</td>
<td class="actions">
<td class="actions" style="text-align: center;">
{linkbutton shape="edit" label="Modifier" href="modifier_materiel.php?id=%d"|args:$eqmt.id}
</td>
</tr>

5
src/templates/recherche.tpl
View File

@ -1,5 +0,0 @@
{include file="admin/_head.tpl" title="%s"|args:$plugin.nom current="plugin_%s"|args:$plugin.id}
{include file="%s_nav.tpl"|args:$plugin_tpl current="recherche"}
{include file="admin/_foot.tpl"}

14
src/www/admin/categories/materiels_par_categorie.php
View File

@ -3,6 +3,7 @@
namespace Garradin;
use Garradin\Plugin\Materiels\Category;
use Garradin\Plugin\Materiels\Equipment;
use Garradin\Utils;
require_once __DIR__ . '/../_inc.php';
@ -15,6 +16,17 @@ if (!$c) {
throw new UserException("Cette catégorie n'existe pas.");
}
$tpl->assign(compact('c'));
$eqmts = $cat->listAllEquipments($c->id);
$eqmt = new Equipment;
list($eqmts_owned, $eqmts_no_owned, $eqmts_just_listed) = $eqmt->AllListsAll($eqmts);
$cat_name = $c->name;
$return_link = PLUGIN_URL . 'categories/index.php';
$tpl->assign(compact(
'cat_name', 'eqmts_owned', 'eqmts_no_owned', 'eqmts_just_listed', 'return_link'));
$tpl->display(PLUGIN_ROOT . '/templates/categories/materiels_par_categorie.tpl');

7
src/www/admin/recherche.php
View File

@ -1,7 +0,0 @@
<?php
namespace Garradin;
require_once __DIR__ . '/_inc.php';
$tpl->display(PLUGIN_ROOT . '/templates/recherche.tpl');