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

add js behaviour on auvalidation and automail

Browse Source 
remove todo
This commit is contained in:
jpb 2022-06-08 17:08:05 +02:00
parent 40bd04bc3f
commit bf10e8f687
1 changed files with 58 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
htdocs/holiday/card_group.php
View File

@ -318,8 +318,8 @@ if (empty($reshook)) {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
$error++; $error++;
} else { } else {
// AUTO APPROUVAL /VALIDATED
//@TODO changer le nom si approuved / validated //@TODO changer le nom si validated
if ($autoValidation) { if ($autoValidation) {
$htemp = new Holiday($db); $htemp = new Holiday($db);
$htemp->fetch($result); $htemp->fetch($result);
@ -332,10 +332,11 @@ if (empty($reshook)) {
$error++; $error++;
} }
// we can auto send mail if we are in auto validation behavior // we can auto send mail if we are in auto validation behavior
//@todo jquery disable if checkbox autovalidation unchecked
if ($AutoSendMail && !$error) { if ($AutoSendMail && !$error) {
// send a mail to the user // send a mail to the user
sendMail($result, $cancreate, $now, $autoValidation); $returnSendMail = sendMail($result, $cancreate, $now, $autoValidation);
if (!empty($returnSendMail->msg)) setEventMessage($returnSendMail->msg,$returnSendMail->style);
} }
} }
} }
@ -413,6 +414,13 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
print '<script type="text/javascript"> print '<script type="text/javascript">
$( document ).ready(function() { $( document ).ready(function() {
if( $("input[name=autoValidation]").is(":checked") ){
$("#AutoSendMail").prop("disabled", false);
} else {
$("#AutoSendMail").prop("disabled", true);
}
$("input.button-save").click("submit", function(e) { $("input.button-save").click("submit", function(e) {
console.log("Call valider()"); console.log("Call valider()");
if (document.demandeCP.date_debut_.value != "") if (document.demandeCP.date_debut_.value != "")
@ -438,7 +446,16 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
alert("'.dol_escape_js($langs->transnoentities('NoDateDebut')).'"); alert("'.dol_escape_js($langs->transnoentities('NoDateDebut')).'");
return false; return false;
} }
}); })
$("#autoValidation").change(function(){
if( $("input[name=autoValidation]").is(":checked") ){
$("#AutoSendMail").prop("disabled", false);
} else {
$("#AutoSendMail").prop("disabled", true);
$("#AutoSendMail").prop("checked", false);
}
})
}); });
</script>'."\n"; </script>'."\n";
@ -448,12 +465,8 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
print '<input type="hidden" name="token" value="'.newToken().'" />'."\n"; print '<input type="hidden" name="token" value="'.newToken().'" />'."\n";
print '<input type="hidden" name="action" value="add" />'."\n"; print '<input type="hidden" name="action" value="add" />'."\n";
print dol_get_fiche_head(); print dol_get_fiche_head();
//print '<span>'.$langs->trans('DelayToRequestCP',$object->getConfCP('delayForRequest')).'</span><br><br>';
print '<table class="border centpercent">'; print '<table class="border centpercent">';
print '<tbody>'; print '<tbody>';
@ -485,13 +498,6 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
$sql .= ' WHERE 1=1 '; $sql .= ' WHERE 1=1 ';
$sql .= !empty($morefilter) ? $morefilter : ''; $sql .= !empty($morefilter) ? $morefilter : '';
if ($cancreate && !$cancreateall) {
} else {
//$sql .= ' AND u.fk_user = '.$user->id;
//$sql .= ' OR u.rowid ='.$user->id;
}
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {
while ($obj = $db->fetch_object($resql)) { while ($obj = $db->fetch_object($resql)) {
@ -586,13 +592,13 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
//auto validation ON CREATE //auto validation ON CREATE
print '<tr><td>'.$langs->trans("AutoApprovalOnCreate").'</td><td>'; print '<tr><td>'.$langs->trans("AutoApprovalOnCreate").'</td><td>';
print '<input type="checkbox" name="autoValidation" value="1"'.($autoValidation ? ' checked="checked"' : '').'>'; print '<input type="checkbox" id="autoValidation" name="autoValidation" value="1"'.($autoValidation ? ' checked="checked"' : '').'>';
print '</td></tr>'."\n"; print '</td></tr>'."\n";
//no auto SEND MAIL //no auto SEND MAIL
print '<tr><td>'.$langs->trans("AutoSendMail").'</td><td>'; print '<tr><td>'.$langs->trans("AutoSendMail").'</td><td>';
print '<input type="checkbox" name="AutoSendMail" value="1"'.($AutoSendMail ? ' checked="checked"' : '').'>'; print '<input type="checkbox" id="AutoSendMail" name="AutoSendMail" value="1"'.($AutoSendMail ? ' checked="checked"' : '').'>';
print '</td></tr>'."\n"; print '</td></tr>'."\n";
// Description // Description
@ -641,6 +647,11 @@ if (is_object($db)) {
*/ */
function sendMail($id, $cancreate, $now, $autoValidation) function sendMail($id, $cancreate, $now, $autoValidation)
{ {
$objStd = new stdClass();
$objStd->msg = '';
$objStd->status = 'success';
$objStd->error = 0;
$objStd->style = '';
global $db, $user, $conf, $langs; global $db, $user, $conf, $langs;
@ -657,19 +668,21 @@ function sendMail($id, $cancreate, $now, $autoValidation)
$verif = $object->validate($user); $verif = $object->validate($user);
// If no SQL error, we redirect to the request form
if ($verif > 0) { if ($verif > 0) {
// To // To
$destinataire = new User($db); $destinataire = new User($db);
$destinataire->fetch($object->fk_validator); $destinataire->fetch($object->fk_validator);
$emailTo = $destinataire->email; $emailTo = $destinataire->email;
//@todo make object return errors
//@todo remove redisrection here !
if (!$emailTo) { if (!$emailTo) {
dol_syslog("Expected validator has no email, so we redirect directly to finished page without sending email"); dol_syslog("Expected validator has no email, so we redirect directly to finished page without sending email");
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit; $objStd->error++;
$objStd->msg = $langs->trans('ErroremailTo');
$objStd->status = 'error';
$objStd->style="warnings";
return $objStd;
} }
// From // From
@ -729,26 +742,34 @@ function sendMail($id, $cancreate, $now, $autoValidation)
$result = $mail->sendfile(); $result = $mail->sendfile();
if (!$result) { if (!$result) {
setEventMessages($mail->error, $mail->errors, 'warnings');
$action = ''; $objStd->error++;
$objStd->msg = $langs->trans('ErroreSendmail');
$objStd->style="warnings";
$objStd->status = 'error';
} else { } else {
//@todo make object return errors
//@todo remove redisrection here ! $objStd->msg = $langs->trans('mailSended');
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
} }
return $objStd;
} else { } else {
//@todo make object return errors
//@todo remove redisrection here ! $objStd->error++;
setEventMessages($object->error, $object->errors, 'errors'); $objStd->msg = $langs->trans('ErroreVerif');
$action = ''; $objStd->status = 'error';
$objStd->style="errors";
return $objStd;
} }
} }
} else { } else {
//@todo make object return errors
//@todo remove redisrection here ! $objStd->error++;
setEventMessage($langs->trans('ErrorloadUserOnSendingMail'), 'warning'); $objStd->msg = $langs->trans('ErrorloadUserOnSendingMail');
$objStd->status = 'error';
$objStd->style="warnings";
return $objStd;
} }
return 'objerrors'; return $objStd;
} }