Add notify date column to Fax Queue (#6349)

* Add notify date column to Fax Queue

* Update app_languages.php

* Update fax_queue_edit.php

* Update app_languages.php
This commit is contained in:
AlexC 2022-04-25 10:25:04 -06:00 committed by GitHub
parent c2e147e099
commit ecd99d90bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 61 additions and 1 deletions

View File

@ -481,6 +481,26 @@
$text['label-fax_retry_date']['sv-se'] = '';
$text['label-fax_retry_date']['uk-ua'] = '';
$text['label-fax_notify_date']['en-us'] = 'Notify Date';
$text['label-fax_notify_date']['ar-eg'] = '';
$text['label-fax_notify_date']['de-at'] = '';
$text['label-fax_notify_date']['de-ch'] = '';
$text['label-fax_notify_date']['de-de'] = '';
$text['label-fax_notify_date']['es-cl'] = '';
$text['label-fax_notify_date']['es-mx'] = '';
$text['label-fax_notify_date']['fr-ca'] = '';
$text['label-fax_notify_date']['fr-fr'] = '';
$text['label-fax_notify_date']['he-il'] = '';
$text['label-fax_notify_date']['it-it'] = '';
$text['label-fax_notify_date']['nl-nl'] = '';
$text['label-fax_notify_date']['pl-pl'] = '';
$text['label-fax_notify_date']['pt-br'] = '';
$text['label-fax_notify_date']['pt-pt'] = '';
$text['label-fax_notify_date']['ro-ro'] = '';
$text['label-fax_notify_date']['ru-ru'] = '';
$text['label-fax_notify_date']['sv-se'] = '';
$text['label-fax_notify_date']['uk-ua'] = '';
$text['description-fax_retry_date']['en-us'] = 'Date the fax was retried';
$text['description-fax_retry_date']['ar-eg'] = '';
$text['description-fax_retry_date']['de-at'] = '';
@ -501,6 +521,26 @@
$text['description-fax_retry_date']['sv-se'] = '';
$text['description-fax_retry_date']['uk-ua'] = '';
$text['description-fax_notify_date']['en-us'] = 'Date the fax was notified';
$text['description-fax_notify_date']['ar-eg'] = '';
$text['description-fax_notify_date']['de-at'] = '';
$text['description-fax_notify_date']['de-ch'] = '';
$text['description-fax_notify_date']['de-de'] = '';
$text['description-fax_notify_date']['es-cl'] = '';
$text['description-fax_notify_date']['es-mx'] = '';
$text['description-fax_notify_date']['fr-ca'] = '';
$text['description-fax_notify_date']['fr-fr'] = '';
$text['description-fax_notify_date']['he-il'] = '';
$text['description-fax_notify_date']['it-it'] = '';
$text['description-fax_notify_date']['nl-nl'] = '';
$text['description-fax_notify_date']['pl-pl'] = '';
$text['description-fax_notify_date']['pt-br'] = '';
$text['description-fax_notify_date']['pt-pt'] = '';
$text['description-fax_notify_date']['ro-ro'] = '';
$text['description-fax_notify_date']['ru-ru'] = '';
$text['description-fax_notify_date']['sv-se'] = '';
$text['description-fax_notify_date']['uk-ua'] = '';
$text['label-fax_retry_count']['en-us'] = 'Retry Count';
$text['label-fax_retry_count']['ar-eg'] = '';
$text['label-fax_retry_count']['de-at'] = '';
@ -621,4 +661,4 @@
$text['description-fax_command']['sv-se'] = '';
$text['description-fax_command']['uk-ua'] = '';
?>
?>

View File

@ -148,6 +148,9 @@
$sql .= "q.fax_retry_date, ";
$sql .= "to_char(timezone(:time_zone, q.fax_retry_date), 'DD Mon YYYY') as fax_retry_date_formatted, \n";
$sql .= "to_char(timezone(:time_zone, q.fax_retry_date), 'HH12:MI:SS am') as fax_retry_time_formatted, \n";
$sql .= "q.fax_notify_date, ";
$sql .= "to_char(timezone(:time_zone, q.fax_notify_date), 'DD Mon YYYY') as fax_notify_date_formatted, \n";
$sql .= "to_char(timezone(:time_zone, q.fax_notify_date), 'HH12:MI:SS am') as fax_notify_time_formatted, \n";
$sql .= "q.fax_retry_count, ";
$sql .= "q.fax_accountcode, ";
$sql .= "q.fax_command ";
@ -260,6 +263,7 @@
echo th_order_by('fax_file', $text['label-fax_file'], $order_by, $order);
echo th_order_by('fax_status', $text['label-fax_status'], $order_by, $order);
echo th_order_by('fax_retry_date', $text['label-fax_retry_date'], $order_by, $order);
echo th_order_by('fax_notify_date', $text['label-fax_notify_date'], $order_by, $order);
echo th_order_by('fax_retry_count', $text['label-fax_retry_count'], $order_by, $order);
if (permission_exists('fax_queue_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
echo " <td class='action-button'>&nbsp;</td>\n";
@ -292,6 +296,7 @@
echo " <td>".escape($row['fax_file'])."</td>\n";
echo " <td>".escape($row['fax_status'])."</td>\n";
echo " <td>".escape($row['fax_retry_date_formatted'])." ".escape($row['fax_retry_time_formatted'])."</td>\n";
echo " <td>".escape($row['fax_notify_date_formatted'])." ".escape($row['fax_notify_time_formatted'])."</td>\n";
echo " <td>".escape($row['fax_retry_count'])."</td>\n";
if (permission_exists('fax_queue_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
echo " <td class='action-button'>\n";

View File

@ -63,6 +63,7 @@
$fax_file = $_POST["fax_file"];
$fax_status = $_POST["fax_status"];
$fax_retry_date = $_POST["fax_retry_date"];
$fax_notify_date = $_POST["fax_notify_date"];
$fax_retry_count = $_POST["fax_retry_count"];
$fax_accountcode = $_POST["fax_accountcode"];
$fax_command = $_POST["fax_command"];
@ -160,6 +161,7 @@
$array['fax_queue'][0]['fax_file'] = $fax_file;
$array['fax_queue'][0]['fax_status'] = $fax_status;
$array['fax_queue'][0]['fax_retry_date'] = $fax_retry_date;
$array['fax_queue'][0]['fax_notify_date'] = $fax_notify_date;
$array['fax_queue'][0]['fax_retry_count'] = $fax_retry_count;
$array['fax_queue'][0]['fax_accountcode'] = $fax_accountcode;
$array['fax_queue'][0]['fax_command'] = $fax_command;
@ -198,6 +200,7 @@
$sql .= " fax_file, ";
$sql .= " fax_status, ";
$sql .= " fax_retry_date, ";
$sql .= " fax_notify_date, ";
$sql .= " fax_retry_count, ";
$sql .= " fax_accountcode, ";
$sql .= " fax_command ";
@ -220,6 +223,7 @@
$fax_file = $row["fax_file"];
$fax_status = $row["fax_status"];
$fax_retry_date = $row["fax_retry_date"];
$fax_notify_date = $row["fax_notify_date"];
$fax_retry_count = $row["fax_retry_count"];
$fax_accountcode = $row["fax_accountcode"];
$fax_command = $row["fax_command"];
@ -391,6 +395,17 @@
echo "</td>\n";
echo "</tr>\n";
echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-fax_notify_date']."\n";
echo "</td>\n";
echo "<td class='vtable' style='position: relative;' align='left'>\n";
echo " <input class='formfld' type='text' name='fax_retry_date' maxlength='255' value='".escape($fax_notify_date)."'>\n";
echo "<br />\n";
echo $text['description-fax_notify_date']."\n";
echo "</td>\n";
echo "</tr>\n";
echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-fax_retry_count']."\n";