From 12a11611c6b1e1335be19b23f4f4517ccc1f6fd8 Mon Sep 17 00:00:00 2001 From: JBthePenguin Date: Sat, 5 Jun 2021 18:48:45 +0200 Subject: [PATCH] clean and simplify tree of the plugin --- materiels.tar.gz | Bin 18942 -> 18678 bytes src/lib/Entry.php | 2 +- src/schema.sql | 22 +----------------- src/templates/_nav.tpl | 8 +++---- .../{definitives => }/deja_repertorie.tpl | 2 +- .../entrees/{definitives => }/index.tpl | 4 ++-- .../{definitives => }/non_repertorie.tpl | 4 ++-- .../{entrees_provisoires.tpl => sorties.tpl} | 2 +- src/templates/sorties_definitives.tpl | 5 ---- src/templates/sorties_provisoires.tpl | 5 ---- .../entrees/definitives/deja_repertorie.php | 7 ------ src/www/admin/entrees/deja_repertorie.php | 7 ++++++ .../admin/entrees/{definitives => }/index.php | 4 ++-- .../{definitives => }/non_repertorie.php | 8 +++---- src/www/admin/entrees_provisoires.php | 7 ------ src/www/admin/sorties.php | 7 ++++++ src/www/admin/sorties_definitives.php | 7 ------ src/www/admin/sorties_provisoires.php | 7 ------ 18 files changed, 31 insertions(+), 77 deletions(-) rename src/templates/entrees/{definitives => }/deja_repertorie.tpl (66%) rename src/templates/entrees/{definitives => }/index.tpl (84%) rename src/templates/entrees/{definitives => }/non_repertorie.tpl (90%) rename src/templates/{entrees_provisoires.tpl => sorties.tpl} (63%) delete mode 100644 src/templates/sorties_definitives.tpl delete mode 100644 src/templates/sorties_provisoires.tpl delete mode 100644 src/www/admin/entrees/definitives/deja_repertorie.php create mode 100644 src/www/admin/entrees/deja_repertorie.php rename src/www/admin/entrees/{definitives => }/index.php (73%) rename src/www/admin/entrees/{definitives => }/non_repertorie.php (85%) delete mode 100644 src/www/admin/entrees_provisoires.php create mode 100644 src/www/admin/sorties.php delete mode 100644 src/www/admin/sorties_definitives.php delete mode 100644 src/www/admin/sorties_provisoires.php diff --git a/materiels.tar.gz b/materiels.tar.gz index 65b8a9dcc86d4cf194dd2fd9fe53e467c78b7b64..0c4647239170bb674af7ee69f14fdaae18d41bc5 100644 GIT binary patch literal 18678 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 diff --git a/src/lib/Entry.php b/src/lib/Entry.php index 9766c0f..a455462 100644 --- a/src/lib/Entry.php +++ b/src/lib/Entry.php @@ -4,7 +4,7 @@ namespace Garradin\Plugin\Materiels; use Garradin\DB; -class Entry // entrées définitives +class Entry { protected $columns_order = array( 'id', diff --git a/src/schema.sql b/src/schema.sql index 27d23fc..8af9085 100644 --- a/src/schema.sql +++ b/src/schema.sql @@ -22,31 +22,11 @@ CREATE TABLE IF NOT EXISTS plugin_materiels_entry ( FOREIGN KEY ( equipment_id ) REFERENCES plugin_materiels_equipment( id ) ON DELETE RESTRICT ON UPDATE CASCADE ); -CREATE TABLE IF NOT EXISTS plugin_materiels_temporary_entry ( - id integer NOT NULL PRIMARY KEY autoincrement, - kind varchar(20) NOT NULL, - number_of_equipments integer NOT NULL, - equipment_id integer NOT NULL, - start_date date NOT NULL, - end_date date, - 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_id integer NOT NULL, output_date date NOT NULL, - FOREIGN KEY ( equipment_id ) REFERENCES plugin_materiels_entry( equipment_id ) ON DELETE RESTRICT ON UPDATE CASCADE -); - -CREATE TABLE IF NOT EXISTS plugin_materiels_temporary_output ( - id integer NOT NULL PRIMARY KEY autoincrement, - kind varchar(20) NOT NULL, - number_of_equipments integer NOT NULL, - equipment_id integer NOT NULL, - start_date date NOT NULL, - end_date date, - FOREIGN KEY ( equipment_id ) REFERENCES plugin_materiels_entry( equipment_id ) ON DELETE RESTRICT ON UPDATE CASCADE + FOREIGN KEY ( equipment_id ) REFERENCES plugin_materiels_equipment( id ) ON DELETE RESTRICT ON UPDATE CASCADE ); diff --git a/src/templates/_nav.tpl b/src/templates/_nav.tpl index 9ed7323..53d00bb 100644 --- a/src/templates/_nav.tpl +++ b/src/templates/_nav.tpl @@ -1,11 +1,9 @@ diff --git a/src/templates/entrees/definitives/deja_repertorie.tpl b/src/templates/entrees/deja_repertorie.tpl similarity index 66% rename from src/templates/entrees/definitives/deja_repertorie.tpl rename to src/templates/entrees/deja_repertorie.tpl index 1353504..a9f7c70 100644 --- a/src/templates/entrees/definitives/deja_repertorie.tpl +++ b/src/templates/entrees/deja_repertorie.tpl @@ -1,6 +1,6 @@ {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="entrees_definitives"} +{include file="%s_nav.tpl"|args:$plugin_tpl current="entrees"} déjà repertorie diff --git a/src/templates/entrees/definitives/index.tpl b/src/templates/entrees/index.tpl similarity index 84% rename from src/templates/entrees/definitives/index.tpl rename to src/templates/entrees/index.tpl index f09d0b5..4f7500a 100644 --- a/src/templates/entrees/definitives/index.tpl +++ b/src/templates/entrees/index.tpl @@ -1,9 +1,9 @@ {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="entrees_definitives"} +{include file="%s_nav.tpl"|args:$plugin_tpl current="entrees"}
- Ajouter une entrée définitive pour du + Ajouter une entrée pour du {linkbutton shape="plus" label="Matériel pas encore répertorié" href="non_repertorie.php"} {linkbutton shape="plus" label="Matériel déjà répertorié" href="deja_repertorie.php"}
diff --git a/src/templates/entrees/definitives/non_repertorie.tpl b/src/templates/entrees/non_repertorie.tpl similarity index 90% rename from src/templates/entrees/definitives/non_repertorie.tpl rename to src/templates/entrees/non_repertorie.tpl index 9a87bec..504d976 100644 --- a/src/templates/entrees/definitives/non_repertorie.tpl +++ b/src/templates/entrees/non_repertorie.tpl @@ -1,10 +1,10 @@ {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="entrees_definitives"} +{include file="%s_nav.tpl"|args:$plugin_tpl current="entrees"}
- Ajouter une entrée définitive d'un matériel pas encore répertorié + Ajouter une entrée d'un matériel pas encore répertorié {form_errors}
(obligatoire)
diff --git a/src/templates/entrees_provisoires.tpl b/src/templates/sorties.tpl similarity index 63% rename from src/templates/entrees_provisoires.tpl rename to src/templates/sorties.tpl index 1c6b217..a458237 100644 --- a/src/templates/entrees_provisoires.tpl +++ b/src/templates/sorties.tpl @@ -1,5 +1,5 @@ {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="entrees_provisoires"} +{include file="%s_nav.tpl"|args:$plugin_tpl current="sorties"} {include file="admin/_foot.tpl"} diff --git a/src/templates/sorties_definitives.tpl b/src/templates/sorties_definitives.tpl deleted file mode 100644 index 3aaee83..0000000 --- a/src/templates/sorties_definitives.tpl +++ /dev/null @@ -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="sorties_definitives"} - -{include file="admin/_foot.tpl"} diff --git a/src/templates/sorties_provisoires.tpl b/src/templates/sorties_provisoires.tpl deleted file mode 100644 index 6f8b5ff..0000000 --- a/src/templates/sorties_provisoires.tpl +++ /dev/null @@ -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="sorties_provisoires"} - -{include file="admin/_foot.tpl"} diff --git a/src/www/admin/entrees/definitives/deja_repertorie.php b/src/www/admin/entrees/definitives/deja_repertorie.php deleted file mode 100644 index 1d028d1..0000000 --- a/src/www/admin/entrees/definitives/deja_repertorie.php +++ /dev/null @@ -1,7 +0,0 @@ -display(PLUGIN_ROOT . '/templates/entrees/definitives/deja_repertorie.tpl'); diff --git a/src/www/admin/entrees/deja_repertorie.php b/src/www/admin/entrees/deja_repertorie.php new file mode 100644 index 0000000..dea103d --- /dev/null +++ b/src/www/admin/entrees/deja_repertorie.php @@ -0,0 +1,7 @@ +display(PLUGIN_ROOT . '/templates/entrees/deja_repertorie.tpl'); diff --git a/src/www/admin/entrees/definitives/index.php b/src/www/admin/entrees/index.php similarity index 73% rename from src/www/admin/entrees/definitives/index.php rename to src/www/admin/entrees/index.php index db76ecb..f0b8989 100644 --- a/src/www/admin/entrees/definitives/index.php +++ b/src/www/admin/entrees/index.php @@ -5,7 +5,7 @@ namespace Garradin; use Garradin\Plugin\Materiels\Equipment; use Garradin\Plugin\Materiels\Entry; -require_once __DIR__ . '/../../_inc.php'; +require_once __DIR__ . '/../_inc.php'; $eqmt = new Equipment; $entry = new Entry; @@ -18,4 +18,4 @@ foreach ($entries as $key => $value) { $tpl->assign(compact('entries')); -$tpl->display(PLUGIN_ROOT . '/templates/entrees/definitives/index.tpl'); +$tpl->display(PLUGIN_ROOT . '/templates/entrees/index.tpl'); diff --git a/src/www/admin/entrees/definitives/non_repertorie.php b/src/www/admin/entrees/non_repertorie.php similarity index 85% rename from src/www/admin/entrees/definitives/non_repertorie.php rename to src/www/admin/entrees/non_repertorie.php index bc57deb..beb1969 100644 --- a/src/www/admin/entrees/definitives/non_repertorie.php +++ b/src/www/admin/entrees/non_repertorie.php @@ -7,7 +7,7 @@ use Garradin\Plugin\Materiels\Category; use Garradin\Plugin\Materiels\Equipment; use Garradin\Utils; -require_once __DIR__ . '/../../_inc.php'; +require_once __DIR__ . '/../_inc.php'; $entry = new Entry; $kinds = $entry->listKinds(); @@ -48,7 +48,7 @@ if (f('save')) 'equipment_id' => $eqmt_id, 'date_of_entry' => f('date_entree'), ]); - Utils::redirect(PLUGIN_URL . 'entrees/definitives/index.php'); + Utils::redirect(PLUGIN_URL . 'entrees/index.php'); } catch (\RuntimeException $e) { @@ -63,8 +63,8 @@ if (f('save')) } } -$cancel_link = PLUGIN_URL . 'entrees/definitives/index.php'; +$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->display(PLUGIN_ROOT . '/templates/entrees/definitives/non_repertorie.tpl'); +$tpl->display(PLUGIN_ROOT . '/templates/entrees/non_repertorie.tpl'); diff --git a/src/www/admin/entrees_provisoires.php b/src/www/admin/entrees_provisoires.php deleted file mode 100644 index a329be4..0000000 --- a/src/www/admin/entrees_provisoires.php +++ /dev/null @@ -1,7 +0,0 @@ -display(PLUGIN_ROOT . '/templates/entrees_provisoires.tpl'); diff --git a/src/www/admin/sorties.php b/src/www/admin/sorties.php new file mode 100644 index 0000000..166bb15 --- /dev/null +++ b/src/www/admin/sorties.php @@ -0,0 +1,7 @@ +display(PLUGIN_ROOT . '/templates/sorties.tpl'); diff --git a/src/www/admin/sorties_definitives.php b/src/www/admin/sorties_definitives.php deleted file mode 100644 index 359f80d..0000000 --- a/src/www/admin/sorties_definitives.php +++ /dev/null @@ -1,7 +0,0 @@ -display(PLUGIN_ROOT . '/templates/sorties_definitives.tpl'); diff --git a/src/www/admin/sorties_provisoires.php b/src/www/admin/sorties_provisoires.php deleted file mode 100644 index 77ba811..0000000 --- a/src/www/admin/sorties_provisoires.php +++ /dev/null @@ -1,7 +0,0 @@ -display(PLUGIN_ROOT . '/templates/sorties_provisoires.tpl');