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

ok for entry index in movement

This commit is contained in:
JBthePenguin 2021-09-01 10:11:24 +02:00
parent 5c85f04581
commit e2bc0ea8f8
10 changed files with 66 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/Movement.php
View File

@ -7,4 +7,16 @@ use Garradin\Plugin\Materiels\Equipment;
class Movement
{
public function listAllOneSide($side)
// return all entries if side is 0 or all outputs if side is 1 ordered by date
{
$mvts = DB::getInstance()->get("SELECT * FROM plugin_materiels_movement WHERE side = '{$side}' ORDER BY mvt_date DESC;");
// for each movements get the equipment's designation
$eqmt = new Equipment;
foreach ($mvts as $key => $value) {
$mvt_eqmt = $eqmt->get($value->equipment_id);
$mvts[$key]->equipment = $mvt_eqmt->designation;
}
return $mvts;
}
}

38
src/templates/mouvements/entrees/index.tpl
View File

@ -1,37 +1,17 @@
<!-- nav bar-->
{include file="%s_nav.tpl"|args:$plugin_tpl current_nav="entrees"}
<!-- -->
<!-- add entry links -->
<fieldset>
<legend>Ajouter une entrée pour du </legend>
{linkbutton shape="plus" label="Matériel répertorié" href="repertorie.php"}
{linkbutton shape="plus" label="Matériel non répertorié" href="non_repertorie.php"}
{linkbutton shape="plus" label="Matériel en retour de location / prêt" href="retour.php"}
</fieldset>
{if $entries}
<table class="list">
<thead>
<th><b>Date</b></th>
<th><b>Type</b></th>
<th><b>Nombre</b></th>
<th><b>Matériel</b></th>
<th><b>Remarques</b></th>
<th></th>
</thead>
<tbody>
{foreach from=$entries item="entry"}
<tr>
<td>{$entry.entry_date|date_format:'%d/%m/%y'}</td>
<td>{$entry.kind}</td>
<td>{$entry.equipment_number}</td>
<td>{$entry.equipment}</td>
<td>{$entry.additional_comment}</td>
<td class="actions">
{linkbutton shape="delete" label="Supprimer" href="supprimer_entree.php?id=%d"|args:$entry.id}
</td>
</tr>
{/foreach}
</tbody>
</table>
{/if}
<!-- -->
<!-- entries table -->
{include file="%smouvements/tableau_mouvements.tpl"|args:$plugin_tpl mvts=$mvts del_href="supprimer_entree.php?id=%d"}
<!-- -->
<!-- footer -->
{include file="admin/_foot.tpl"}
<!-- -->

28
src/templates/mouvements/tableau_mouvements.tpl Normal file
View File

@ -0,0 +1,28 @@
<!-- table of movements -->
{if $mvts}
<table class="list">
<thead>
<th><b>Date</b></th>
<th><b>Type</b></th>
<th><b>Nombre</b></th>
<th><b>Matériel</b></th>
<th><b>Remarques</b></th>
<th></th>
</thead>
<tbody>
{foreach from=$mvts item="mvt"}
<tr>
<td>{$mvt.mvt_date|date_format:'%d/%m/%y'}</td>
<td>{$mvt.kind}</td>
<td>{$mvt.equipment_number}</td>
<td>{$mvt.equipment}</td>
<td>{$mvt.additional_comment}</td>
<td class="actions">
{linkbutton shape="delete" label="Supprimer" href=$del_href|args:$mvt.id}
</td>
</tr>
{/foreach}
</tbody>
</table>
{/if}
<!-- -->

2
src/www/admin/categories/_inc.php
View File

@ -4,6 +4,8 @@
namespace Garradin;
require_once __DIR__ . '/../_inc.php';
use Garradin\Plugin\Materiels\Category;
$cat = new Category;

1
src/www/admin/categories/index.php
View File

@ -2,7 +2,6 @@
namespace Garradin;
require_once __DIR__ . '/../_inc.php';
require_once __DIR__ . '/_inc.php';
use Garradin\Utils;

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

@ -2,7 +2,6 @@
namespace Garradin;
require_once __DIR__ . '/../_inc.php';
require_once __DIR__ . '/_inc.php';
use Garradin\Plugin\Materiels\Equipment;

1
src/www/admin/categories/modifier_categorie.php
View File

@ -2,7 +2,6 @@
namespace Garradin;
require_once __DIR__ . '/../_inc.php';
require_once __DIR__ . '/_inc.php';
use Garradin\Utils;

1
src/www/admin/categories/supprimer_categorie.php
View File

@ -2,7 +2,6 @@
namespace Garradin;
require_once __DIR__ . '/../_inc.php';
require_once __DIR__ . '/_inc.php';
use Garradin\Utils;

11
src/www/admin/mouvements/_inc.php Normal file
View File

@ -0,0 +1,11 @@
<?php
// create variable with Movement class
namespace Garradin;
require_once __DIR__ . '/../_inc.php';
use Garradin\Plugin\Materiels\Movement;
$mvt = new Movement;

17
src/www/admin/mouvements/entrees/index.php
View File

@ -2,21 +2,12 @@
namespace Garradin;
use Garradin\Plugin\Materiels\Equipment;
use Garradin\Plugin\Materiels\Entry;
require_once __DIR__ . '/../_inc.php';
require_once __DIR__ . '/../../_inc.php';
// get the list of all entries and send it to template
$eqmt = new Equipment;
$entry = new Entry;
$mvts = $mvt->listAllOneSide(0);
$entries = $entry->listAll();
foreach ($entries as $key => $value) {
$entry_eqmt = $eqmt->get($value->equipment_id);
$entries[$key]->equipment = $entry_eqmt->designation;
}
$tpl->assign(compact('entries'));
$tpl->assign(compact('mvts'));
$tpl->display(PLUGIN_ROOT . '/templates/mouvements/entrees/index.tpl');