Debug the list of print jobs

This commit is contained in:
Laurent Destailleur 2024-10-25 19:05:51 +02:00
parent 1739acf715
commit ea64d0baa0
5 changed files with 25 additions and 16 deletions

View file

@ -62,7 +62,7 @@ print load_fiche_titre($langs->trans("ExternalResources"), '', 'title_setup');
print '<div class="fichecenter"><div class="fichehalfleft">';
print '<div class="divsection wordwrap">';
print '<div class="float paddingright">'.img_picto_common('', 'dolibarr_box.png', 'height="100"').'</div>';
print '<div class="floatright paddingright">'.img_picto_common('', 'dolibarr_box.png', 'height="100"').'</div>';
print $langs->trans("DolibarrLicense").' : ';
print '<ul><li>';
print '<a href="https://www.gnu.org/copyleft/gpl.html" target="_blank">GNU-GPL v3+</a></li>';

View file

@ -342,6 +342,7 @@ if ($mode == 'overwrite') {
print img_info().' '.$langs->trans("SomeTranslationAreUncomplete");
$urlwikitranslatordoc = 'https://wiki.dolibarr.org/index.php/Translator_documentation';
print ' ('.str_replace('{s1}', '<a href="'.$urlwikitranslatordoc.'" target="_blank" rel="noopener noreferrer external">'.$langs->trans("Here").'</a>', $langs->trans("SeeAlso", '{s1}')).')<br>';
print '<br>';
print $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("TranslationKey"), $langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n";
print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."<br>\n";
print '</span></div>';
@ -511,7 +512,7 @@ if ($mode == 'searchkey') {
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre_filter"><td>';
print '<tr class="liste_titre liste_titre_filter"><td>';
//print $formadmin->select_language($langcode,'langcode',0,null,$langs->trans("All"),0,0,'',1);
print $formadmin->select_language($langcode, 'langcode', 0, array(), 0, 0, 0, 'maxwidth250', 1);
print '</td>'."\n";

View file

@ -1191,6 +1191,7 @@ function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
$newmenu->add('/admin/system/modules.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Modules'), 2);
$newmenu->add('/admin/triggers.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Triggers'), 2);
$newmenu->add('/admin/system/filecheck.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('FileCheck'), 2);
$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('ExternalResources'), 2);
}
$newmenu->add('/admin/system/browser.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoBrowser'), 1);
$newmenu->add('/admin/system/os.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoOS'), 1);
@ -1205,7 +1206,6 @@ function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
$newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Restore"), 1);
$newmenu->add("/admin/tools/update.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("MenuUpgrade"), 1);
$newmenu->add("/admin/tools/purge.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Purge"), 1);
$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('ExternalResources'), 1);
if (isModEnabled('product') || isModEnabled('service')) {
$langs->load("products");

View file

@ -291,7 +291,8 @@ class printing_printipp extends PrintingDriver
*/
public function listJobs($module = null)
{
global $conf;
global $langs;
$error = 0;
$html = '';
include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
@ -304,7 +305,8 @@ class printing_printipp extends PrintingDriver
$ipp->setAuthentication($this->user, $this->password);
}
// select printer uri for module order, propal,...
$sql = "SELECT rowid,printer_uri,printer_name FROM ".MAIN_DB_PREFIX."printer_ipp WHERE module = '".$this->db->escape((string) $module)."'";
$sql = "SELECT rowid, printer_uri, printer_name";
$sql .= " FROM ".MAIN_DB_PREFIX."printer_ipp WHERE module = '".$this->db->escape((string) $module)."'";
$result = $this->db->query($sql);
if ($result) {
$obj = $this->db->fetch_object($result);
@ -324,22 +326,27 @@ class printing_printipp extends PrintingDriver
}
$html .= '<table width="100%" class="noborder">';
$html .= '<tr class="liste_titre">';
$html .= '<td>Id</td>';
$html .= '<td>Owner</td>';
$html .= '<td>Printer</td>';
$html .= '<td>File</td>';
$html .= '<td>Status</td>';
$html .= '<td>Cancel</td>';
$html .= '<td>ID</td>';
$html .= '<td>'.$langs->trans("Date").'</td>';
$html .= '<td>'.$langs->trans("Owner").'</td>';
$html .= '<td>'.$langs->trans("Printer").'</td>';
$html .= '<td>'.$langs->trans("File").'</td>';
$html .= '<td>'.$langs->trans("Status").'</td>';
$html .= '<td>Job URI</td>';
$html .= '</tr>'."\n";
$jobs = $ipp->jobs_attributes;
//$html .= '<pre>'.print_r($jobs,true).'</pre>';
//$html .= '<pre>'.print_r($jobs, true).'</pre>';
foreach ($jobs as $value) {
$html .= '<tr class="oddeven">';
$html .= '<td>'.$value->job_id->_value0.'</td>';
$html .= '<td>'.$value->date_time_at_creation->_value0.'</td>';
$html .= '<td>'.$value->job_originating_user_name->_value0.'</td>';
$html .= '<td>'.$value->printer_uri->_value0.'</td>';
$html .= '<td>'.$value->job_name->_value0.'</td>';
$html .= '<td>'.$value->job_printer_uri->_value0.'</td>';
$file = $value->job_name->_value0;
$html .= '<td class="tdoverflowmax200" title="'.dolPrintHTMLForAttribute($file).'">'.dolPrintHTML($file).'</td>';
$html .= '<td>'.$value->job_state->_value0.'</td>';
$html .= '<td>'.$value->job_uri->_value0.'</td>';
$html .= '</tr>';

View file

@ -89,6 +89,8 @@ $leftmenuwidth = 240;
@phan-var-force array{h:int,l:int,s:int,a:int} $colortextlinkHsla
';
$borderradius = getDolGlobalString('THEME_ELDY_USEBORDERONTABLE') ? getDolGlobalInt('THEME_ELDY_BORDER_RADIUS', 6) : 0;
?>
/* <style type="text/css" > */
@ -1150,7 +1152,7 @@ div.urllink input {
.divsection {
padding: 10px;
border: 2px solid #DFDFDF;
border-radius: 10px;
border-radius: <?php echo $borderradius; ?>px;
margin-top: 5px;
margin-bottom: 20px;
/* background-color: rgba(0, 0, 0, 0.02); */
@ -4257,7 +4259,6 @@ table.nointerlines tr:not(:last-child) td {
/* Management of border radius */
<?php $borderradius = getDolGlobalString('THEME_ELDY_USEBORDERONTABLE') ? getDolGlobalInt('THEME_ELDY_BORDER_RADIUS', 6) : 0; ?>
table.noborder:not(.cal_month, .paymenttable) {
border-radius: <?php echo $borderradius; ?>px;
}