ok for available equipments output in movement
This commit is contained in:
parent
964806a0c0
commit
98cbe7f4a8
9 changed files with 186 additions and 72 deletions
|
|
@ -14,13 +14,6 @@ $eqmt = new Equipment;
|
|||
$eqmts_by_cat = $eqmt->listAllReleasedRentByCategory();
|
||||
$selected_eqmt = "";
|
||||
|
||||
// make default date (now) and default comment (empty)
|
||||
$date = new \DateTime;
|
||||
$date->setTimestamp(time());
|
||||
$default_date = $date;
|
||||
|
||||
$default_comment = "";
|
||||
|
||||
// check if add form is submitted
|
||||
$csrf_key = 'add_entry';
|
||||
|
||||
|
|
@ -45,20 +38,24 @@ if (f('save') && $form->check($csrf_key) && !$form->hasErrors())
|
|||
Utils::redirect(PLUGIN_URL . 'mouvements/entrees/index.php');
|
||||
} else
|
||||
{
|
||||
// not possible, keep the datas submitted as defaults and add error to form
|
||||
$mvt_date = f('mvt_date');
|
||||
$selected_eqmt = $eqmt_id;
|
||||
$default_date = $mvt_date;
|
||||
$default_comment = f('additional_comment');
|
||||
|
||||
// not possible, add error to form
|
||||
$equiment = $eqmt->get($eqmt_id);
|
||||
$form->addError(
|
||||
"Il est impossible de rentrer " . (string) $eqmt_number . " " . $equiment->designation . " à la date du " . (string) $mvt_date . '.');
|
||||
"Il est impossible de rentrer " . (string) $eqmt_number . " " . $equiment->designation . " à la date du " . (string) f('mvt_date') . '.');
|
||||
// keep the datas submitted as selected
|
||||
$selected_eqmt = $eqmt_id;
|
||||
}
|
||||
}
|
||||
|
||||
// make default date (now), default number (1)
|
||||
// make default date (now), default number (1) and default comment (empty)
|
||||
$default_number = "1";
|
||||
$date = new \DateTime;
|
||||
$date->setTimestamp(time());
|
||||
$default_date = $date;
|
||||
$default_comment = "";
|
||||
|
||||
// make comment placeholder
|
||||
$comment_placeholder = "ex: retour de prêt...";
|
||||
|
||||
// make cancel link, legend for the title of the form
|
||||
// and the template name for equipment to use in form
|
||||
|
|
@ -73,7 +70,7 @@ $selected_kind = false;
|
|||
// send all to template
|
||||
$tpl->assign(compact(
|
||||
'eqmts_by_cat', 'default_date', 'default_number',
|
||||
'default_comment', 'cancel_link', 'legend_part',
|
||||
'default_comment', 'cancel_link', 'legend_part', 'comment_placeholder',
|
||||
'tpl_materiel_name', 'csrf_key', 'selected_eqmt', 'kinds', 'selected_kind',
|
||||
));
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue