lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use fieldrequired class on mandatory field

Browse Source 
Better error management
This commit is contained in:
Laurent Destailleur 2010-02-27 12:28:36 +00:00
parent 843123d84a
commit 0797106c3b
1 changed files with 62 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
htdocs/compta/deplacement/fiche.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -20,7 +20,7 @@
/** /**
* \file htdocs/compta/deplacement/fiche.php * \file htdocs/compta/deplacement/fiche.php
* \brief Page fiche d'un deplacement * \brief Page to show a trip card
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -66,6 +66,8 @@ if ($_POST["action"] == 'add' && $user->rights->deplacement->creer)
{ {
if (! $_POST["cancel"]) if (! $_POST["cancel"])
{ {
$error=0;
$deplacement = new Deplacement($db); $deplacement = new Deplacement($db);
$deplacement->date = dol_mktime(12, 0, 0, $deplacement->date = dol_mktime(12, 0, 0,
@ -78,16 +80,34 @@ if ($_POST["action"] == 'add' && $user->rights->deplacement->creer)
$deplacement->socid = $_POST["socid"]; $deplacement->socid = $_POST["socid"];
$deplacement->fk_user = $_POST["fk_user"]; $deplacement->fk_user = $_POST["fk_user"];
$id = $deplacement->create($user); if ($deplacement->type == '-1') // Otherwise it is TF_LUNCH,...
if ($id > 0)
{ {
Header ( "Location: fiche.php?id=".$id); $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'</div>';
exit; $error++;
}
if (! ($deplacement->fk_user > 0))
{
$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Person")).'</div>';
$error++;
}
if (! $error)
{
$id = $deplacement->create($user);
if ($id > 0)
{
Header ( "Location: fiche.php?id=".$id);
exit;
}
else
{
$mesg=$deplacement->error;
$_GET["action"]='create';
}
} }
else else
{ {
$mesg=$deplacement->error;
$_GET["action"]='create'; $_GET["action"]='create';
} }
} }
@ -157,29 +177,31 @@ if ($_GET["action"] == 'create')
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr>"; print "<tr>";
print '<td width="25%">'.$langs->trans("CompanyVisited").'</td><td>'; print '<td width="25%" class="fieldrequired">'.$langs->trans("Type").'</td><td>';
print $html->select_societes($_GET["socid"],'socid','',1);
print '</td></tr>';
print "<tr>";
print '<td>'.$langs->trans("Type").'</td><td>';
print $html->select_type_fees($_GET["type"],'type',1); print $html->select_type_fees($_GET["type"],'type',1);
print '</td></tr>'; print '</td></tr>';
print "<tr>"; print "<tr>";
print '<td>'.$langs->trans("Person").'</td><td>'; print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
print $html->select_users($_GET["fk_user"],'fk_user',1); print $html->select_users($_GET["fk_user"],'fk_user',1);
print '</td></tr>'; print '</td></tr>';
print "<tr>"; print "<tr>";
print '<td>'.$langs->trans("Date").'</td><td>'; print '<td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
print $html->select_date('','','','','','add'); print $html->select_date('','','','','','add');
print '</td></tr>'; print '</td></tr>';
print "<tr>";
print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
print $html->select_societes($_GET["socid"],'socid','',1);
print '</td></tr>';
print '<tr><td>'.$langs->trans("FeesKilometersOrAmout").'</td><td><input name="km" size="10" value=""></td></tr>'; print '<tr><td>'.$langs->trans("FeesKilometersOrAmout").'</td><td><input name="km" size="10" value=""></td></tr>';
print '<tr><td colspan="2" align="center"><input class="button" type="submit" value="'.$langs->trans("Save").'">&nbsp;';
print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></td></tr>';
print '</table>'; print '</table>';
print '<br><center><input class="button" type="submit" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; ';
print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></center';
print '</form>'; print '</form>';
} }
else else
@ -226,28 +248,31 @@ else
print '</td></tr>'; print '</td></tr>';
print "<tr>"; print "<tr>";
print '<td>'.$langs->trans("Type").'</td><td>'; print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
print $html->select_type_fees($deplacement->type,'type',1); print $html->select_type_fees($deplacement->type,'type',0);
print '</td></tr>'; print '</td></tr>';
print "<tr>";
print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
print $html->select_users($deplacement->fk_user,'fk_user',0);
print '</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
print $html->select_date($deplacement->date,'','','','','update');
print '</td></tr>';
print '<tr><td>'.$langs->trans("FeesKilometersOrAmout").'</td><td><input name="km" class="flat" size="10" value="'.$deplacement->km.'"></td></tr>';
print "<tr>"; print "<tr>";
print '<td>'.$langs->trans("CompanyVisited").'</td><td>'; print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
print $html->select_societes($soc->id,'socid','',1); print $html->select_societes($soc->id,'socid','',1);
print '</td></tr>'; print '</td></tr>';
print "<tr>";
print '<td>'.$langs->trans("Person").'</td><td>';
print $html->select_users($deplacement->fk_user,'fk_user',1);
print '</td></tr>';
print '<tr><td>'.$langs->trans("Date").'</td><td>';
print $html->select_date($deplacement->date,'','','','','update');
print '</td></tr>';
print '<tr><td>'.$langs->trans("FeesKilometersOrAmout").'</td><td><input name="km" class="flat" size="10" value="'.$deplacement->km.'"></td></tr>';
print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'"></td></tr>';
print '</table>'; print '</table>';
print '<br><center><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
print '</center>';
print '</form>'; print '</form>';
print '</div>'; print '</div>';
@ -275,11 +300,6 @@ else
print '<tr><td>'.$langs->trans("Type").'</td><td>'.$langs->trans($deplacement->type).'</td></tr>'; print '<tr><td>'.$langs->trans("Type").'</td><td>'.$langs->trans($deplacement->type).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("CompanyVisited").'</td>';
print '<td>';
if ($soc->id) print $soc->getNomUrl(1);
print '</td></tr>';
print '<tr><td>'.$langs->trans("Person").'</td><td>'; print '<tr><td>'.$langs->trans("Person").'</td><td>';
$userfee=new User($db,$deplacement->fk_user); $userfee=new User($db,$deplacement->fk_user);
$userfee->fetch(); $userfee->fetch();
@ -290,6 +310,11 @@ else
print dol_print_date($deplacement->date); print dol_print_date($deplacement->date);
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
print '<td>';
if ($soc->id) print $soc->getNomUrl(1);
print '</td></tr>';
print '<tr><td>'.$langs->trans("FeesKilometersOrAmout").'</td><td>'.$deplacement->km.'</td></tr>'; print '<tr><td>'.$langs->trans("FeesKilometersOrAmout").'</td><td>'.$deplacement->km.'</td></tr>';
print "</table>"; print "</table>";