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

Fix: L'alerte anniversaire est bien stocke en base.

Browse Source 
New: Renommage de llx_birthday_alert en llx_user_alert et ajout d'un champ type d'alerte afin de pouvoir spcifier d'autres types d'alertes que les anniversaires.
This commit is contained in:
Laurent Destailleur 2004-07-17 17:14:36 +00:00
parent 4d13a0401b
commit 3e9a4232c2
2 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/contact/fiche.php
View File

@ -46,12 +46,6 @@ if ($_POST["action"] == 'add')
$contact->address = $_POST["adresse"]; $contact->address = $_POST["adresse"];
$contact->cp = $_POST["cp"]; $contact->cp = $_POST["cp"];
$contact->ville = $_POST["ville"]; $contact->ville = $_POST["ville"];
if ($_POST["birthdayyear"] && $_POST["birthdayyear"]<=1970 && $_SERVER["WINDIR"]) {
# windows does not support negative date timestamp so birthday is not support for old persons
array_push($error,"Windows ne sachant pas gérer des dates avant 1970, les dates de naissance avant cette date ne seront pas sauvegardées");
} else {
$contact->birthday = mktime(0,0,0,$_POST["birthdaymonth"],$_POST["birthdayday"],$_POST["birthdayyear"]);
}
$contact->email = $_POST["email"]; $contact->email = $_POST["email"];
$contact->phone_pro = $_POST["phone_pro"]; $contact->phone_pro = $_POST["phone_pro"];
$contact->phone_perso = $_POST["phone_perso"]; $contact->phone_perso = $_POST["phone_perso"];
@ -102,8 +96,6 @@ if ($_POST["action"] == 'update')
$contact->fax = $_POST["fax"]; $contact->fax = $_POST["fax"];
$contact->jabberid = $_POST["jabberid"]; $contact->jabberid = $_POST["jabberid"];
$contact->birthday = mktime(0,0,0,$_POST["birthdaymonth"],$_POST["birthdayday"],$_POST["birthdayyear"]);
$contact->note = $_POST["note"]; $contact->note = $_POST["note"];
$result = $contact->update($_POST["contactid"], $user); $result = $contact->update($_POST["contactid"], $user);
@ -203,9 +195,9 @@ if ($_GET["action"] == 'create')
print '<tr><td>Jabberid</td><td colspan="5"><input name="jabberid" type="text" size="50" maxlength="80" value="'.$contact->jabberid.'"></td></tr>'; print '<tr><td>Jabberid</td><td colspan="5"><input name="jabberid" type="text" size="50" maxlength="80" value="'.$contact->jabberid.'"></td></tr>';
print '<tr><td>Date de naissance</td><td colspan="5">'; // print '<tr><td>Date de naissance</td><td colspan="5">';
print $form->select_date('','birthday',0,0,1); // print $form->select_date('','birthday',0,0,1);
print '</td></tr>'; // print '</td></tr>';
print '<tr><td>Note</td><td colspan="5"><textarea name="note" cols="60" rows="3"></textarea></td></tr>'; print '<tr><td>Note</td><td colspan="5"><textarea name="note" cols="60" rows="3"></textarea></td></tr>';
print '<tr><td align="center" colspan="6"><input type="submit" value="Ajouter"></td></tr>'; print '<tr><td align="center" colspan="6"><input type="submit" value="Ajouter"></td></tr>';
@ -257,14 +249,6 @@ elseif ($_GET["action"] == 'edit')
print '<tr><td>Jabberid</td><td colspan="5"><input name="jabberid" type="text" size="50" maxlength="80" value="'.$contact->jabberid.'"></td></tr>'; print '<tr><td>Jabberid</td><td colspan="5"><input name="jabberid" type="text" size="50" maxlength="80" value="'.$contact->jabberid.'"></td></tr>';
print '<tr><td>Date de naissance</td><td colspan="5">';
if ($contact->birthday) {
print $form->select_date($contact->birthday,'birthday',0,0,0);
} else {
print $form->select_date(0,'birthday',0,0,1);
}
print '</td></tr>';
print '<tr><td>Note</td><td colspan="5">'; print '<tr><td>Note</td><td colspan="5">';
print '<textarea name="note" cols="60" rows="3">'; print '<textarea name="note" cols="60" rows="3">';
print nl2br($contact->note); print nl2br($contact->note);
@ -329,9 +313,6 @@ else
print '</td></tr>'; print '</td></tr>';
if($contact->birthday && $contact->birthday > 0)
print '<tr><td>Date de naissance : '.dolibarr_print_date($contact->birthday)."</td></tr>";
if ($contact->note) { if ($contact->note) {
print '<tr><td>'; print '<tr><td>';
print nl2br($contact->note); print nl2br($contact->note);

35
htdocs/contact/perso.php
View File

@ -29,8 +29,15 @@ if ($_POST["action"] == 'update')
$contact = new Contact($db); $contact = new Contact($db);
$contact->id = $_POST["contactid"]; $contact->id = $_POST["contactid"];
$contact->birthday = $_POST["reyear"].'-'.$_POST["remonth"].'-'.$_POST["reday"]; if ($_POST["birthdayyear"]) {
if ($_POST["birthdayyear"]<=1970 && $_SERVER["WINDIR"]) {
# windows mktime does not support negative date timestamp so birthday is not support for old persons
$contact->birthday = $_POST["birthdayyear"].'-'.$_POST["birthdaymonth"].'-'.$_POST["birthdayday"];
//array_push($error,"Windows ne sachant pas gérer des dates avant 1970, les dates de naissance avant cette date ne seront pas sauvegardées");
} else {
$contact->birthday = mktime(0,0,0,$_POST["birthdaymonth"],$_POST["birthdayday"],$_POST["birthdayyear"]);
}
}
$contact->birthday_alert = $_POST["birthday_alert"]; $contact->birthday_alert = $_POST["birthday_alert"];
@ -53,11 +60,13 @@ print '<div class="tabBar">';
if ($_GET["action"] == 'edit') if ($_GET["action"] == 'edit')
{ {
print_fiche_titre ("Edition d'un contact"); // Fiche info perso en mode edition
$contact = new Contact($db); $contact = new Contact($db);
$contact->fetch($_GET["id"], $user); $contact->fetch($_GET["id"], $user);
print_fiche_titre ("Contact : ". $contact->firstname.' '.$contact->name);
print '<form method="post" action="perso.php?id='.$_GET["id"].'">'; print '<form method="post" action="perso.php?id='.$_GET["id"].'">';
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="contactid" value="'.$contact->id.'">'; print '<input type="hidden" name="contactid" value="'.$contact->id.'">';
@ -67,18 +76,24 @@ if ($_GET["action"] == 'edit')
$objsoc = new Societe($db); $objsoc = new Societe($db);
$objsoc->fetch($contact->socid); $objsoc->fetch($contact->socid);
print 'Société : '.$objsoc->nom.'<br>'; print 'Société : '.$objsoc->nom_url.'<br>';
} }
print 'Nom : '.$contact->name.' '.$contact->firstname ."<br>"; print 'Nom : '.$contact->name.' '.$contact->firstname ."<br>";
print '<table class="border" cellpadding="3" celspacing="0" border="0" width="100%">'; print '<table class="border" cellpadding="3" celspacing="0" border="0" width="100%">';
print '<tr><td>Date de naissance</td><td>';
$html = new Form($db); $html = new Form($db);
print $html->select_date('','re',0,0,1); print '<tr><td>Date de naissance</td><td>';
print '</td><td>Alerte : '; if ($contact->birthday && $contact->birthday > 0) {
print $html->select_date($contact->birthday,'birthday',0,0,0);
} else {
print $html->select_date(0,'birthday',0,0,1);
}
print '</td>';
print '<td>Alerte : ';
if ($contact->birthday_alert) if ($contact->birthday_alert)
{ {
print '<input type="checkbox" name="birthday_alert" checked></td></tr>'; print '<input type="checkbox" name="birthday_alert" checked></td></tr>';
@ -114,13 +129,13 @@ else
print 'Société : '.$objsoc->nom_url.'<br>'; print 'Société : '.$objsoc->nom_url.'<br>';
} }
if ($contact->birthday) { if ($contact->birthday && $contact->birthday > 0) {
print 'Date de naissance : '.dolibarr_print_date($contact->birthday); print 'Date de naissance : '.dolibarr_print_date($contact->birthday);
if ($contact->birthday_alert) if ($contact->birthday_alert)
print ' (alerte active)<br>'; print ' (alerte anniversaire active)<br>';
else else
print ' (alerte inactive)<br>'; print ' (alerte anniversaire inactive)<br>';
} }
print "<br>"; print "<br>";