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

modify db and add doc for it

Browse source
This commit is contained in:
JBthePenguin 2021-06-06 12:02:18 +02:00
parent 12a11611c6
commit 8dcd7670a5
10 changed files with 407 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/Entry.php
View file

@ -9,9 +9,10 @@ class Entry
protected $columns_order = array(
'id',
'kind',
'number_of_equipments',
'equipment_number',
'equipment_id',
'date_of_entry',
'entry_date',
'additional_comment',
);
public function listKinds()
@ -36,6 +37,6 @@ class Entry
public function listAll()
{
return DB::getInstance()->get('SELECT * FROM plugin_materiels_entry ORDER BY date_of_entry DESC;');
return DB::getInstance()->get('SELECT * FROM plugin_materiels_entry ORDER BY entry_date DESC;');
}
}

4
src/lib/Equipment.php
View file

@ -9,8 +9,8 @@ class Equipment
protected $columns_order = array(
'id',
'category_id',
'number_of_equipments',
'designation'
'stock_number',
'designation',
);
public function add($data = [])

10
src/schema.sql
View file

@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS plugin_materiels_category (
CREATE TABLE IF NOT EXISTS plugin_materiels_equipment (
id integer NOT NULL PRIMARY KEY autoincrement,
category_id integer NOT NULL,
number_of_equipments integer NOT NULL,
stock_number integer NOT NULL,
designation varchar(255) NOT NULL,
CONSTRAINT u_equipment_designation UNIQUE ( designation ),
FOREIGN KEY ( category_id ) REFERENCES plugin_materiels_category( id ) ON DELETE RESTRICT ON UPDATE CASCADE
@ -16,17 +16,19 @@ CREATE TABLE IF NOT EXISTS plugin_materiels_equipment (
CREATE TABLE IF NOT EXISTS plugin_materiels_entry (
id integer NOT NULL PRIMARY KEY autoincrement,
kind varchar(20) NOT NULL,
number_of_equipments integer NOT NULL,
equipment_number integer NOT NULL,
equipment_id integer NOT NULL,
date_of_entry date NOT NULL,
entry_date date NOT NULL,
additional_comment varchar(255),
FOREIGN KEY ( equipment_id ) REFERENCES plugin_materiels_equipment( id ) ON DELETE RESTRICT ON UPDATE CASCADE
);
CREATE TABLE IF NOT EXISTS plugin_materiels_output (
id integer NOT NULL PRIMARY KEY autoincrement,
kind varchar(20) NOT NULL,
number_of_equipments integer NOT NULL,
equipment_number integer NOT NULL,
equipment_id integer NOT NULL,
output_date date NOT NULL,
additional_comment varchar(255),
FOREIGN KEY ( equipment_id ) REFERENCES plugin_materiels_equipment( id ) ON DELETE RESTRICT ON UPDATE CASCADE
);

4
src/templates/entrees/index.tpl
View file

@ -18,9 +18,9 @@
<tbody>
{foreach from=$entries item="entry"}
<tr>
<td>{$entry.date_of_entry}</td>
<td>{$entry.entry_date}</td>
<td>{$entry.kind}</td>
<td>{$entry.number_of_equipments}</td>
<td>{$entry.equipment_number}</td>
<td>{$entry.equipment.designation}</td>
</tr>
{/foreach}

4
src/templates/entrees/non_repertorie.tpl
View file

@ -15,8 +15,8 @@
{/foreach}
</select>
</dd>
{input type="date" name="date_entree" default=$default_date label="Date d'entrée" required=true }
{input type="number" name="number" label="Nombre d'entrée" required=true step="1" min="1" default=$default_number}
{input type="date" name="entry_date" default=$default_date label="Date d'entrée" required=true }
{input type="number" name="equipment_number" label="Nombre" required=true step="1" min="1" default=$default_number}
</dl>
<fieldset>
<legend><h3>Matériel</h3></legend>

4
src/templates/index.tpl
View file

@ -4,7 +4,7 @@
<table class="list">
<thead>
<th><b>Nombre</b></th>
<th><b>Nombre en stock</b></th>
<th><b>Désignation</b></th>
<th><b>Categorie</b></th>
<th></th>
@ -12,7 +12,7 @@
<tbody>
{foreach from=$eqmts item="eqmt"}
<tr>
<td>{$eqmt.number_of_equipments}</td>
<td>{$eqmt.stock_number}</td>
<td>{$eqmt.designation}</td>
<td>{$eqmt.category.name}</td>
<td class="actions">

12
src/www/admin/entrees/non_repertorie.php
View file

@ -28,8 +28,8 @@ $csrf_key = 'add_entry';
if (f('save'))
{
$selected_kind = f('kind');
$default_date = f('date_entree');
$default_number = f('number');
$default_date = f('entry_date');
$default_number = f('equipment_number');
$selected_cat = f('category_id');
if ($form->check($csrf_key) && !$form->hasErrors())
@ -39,14 +39,14 @@ if (f('save'))
$eqmt = new Equipment;
$eqmt_id = $eqmt->add([
'category_id' => (int) f('category_id'),
'number_of_equipments' => (int) f('number'),
'stock_number' => (int) f('equipment_number'),
'designation' => ucfirst(strtolower(f('designation'))),
]);
$entry->add([
'kind' => f('kind'),
'number_of_equipments' => (int) f('number'),
'equipment_number' => (int) f('equipment_number'),
'equipment_id' => $eqmt_id,
'date_of_entry' => f('date_entree'),
'entry_date' => f('entry_date'),
]);
Utils::redirect(PLUGIN_URL . 'entrees/index.php');
}
@ -65,6 +65,6 @@ if (f('save'))
$cancel_link = PLUGIN_URL . 'entrees/index.php';
$tpl->assign(compact('kinds', 'date', 'cats', 'selected_kind', 'default_date', 'default_number', 'selected_cat', 'cancel_link', 'csrf_key'));
$tpl->assign(compact('kinds', 'cats', 'selected_kind', 'default_date', 'default_number', 'selected_cat', 'cancel_link', 'csrf_key'));
$tpl->display(PLUGIN_ROOT . '/templates/entrees/non_repertorie.tpl');