data/dolibarr.netdiag
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: data:f602ab771d7f4dbceaf8188d2ed6b8c96cbda743
Branches Tags
data:main
..
compare: data:f2a5958adbba0933a18060652e332e0e36488bf4
Branches Tags
data:main

No commits in common. "f602ab771d7f4dbceaf8188d2ed6b8c96cbda743" and "f2a5958adbba0933a18060652e332e0e36488bf4" have entirely different histories.
f602ab771d ... f2a5958adb

5 changed files with 5 additions and 39 deletions
Show stats Expand all files Collapse all files

5
api/protocols.php
View file

@ -193,10 +193,7 @@ foreach ($measIn as $m) {
$meas->label = isset($m['label']) ? (string) $m['label'] : '';
$meas->params = isset($m['params']) ? json_encode($m['params'], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) : null;
$meas->result = isset($m['result']) ? json_encode($m['result'], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) : null;
// Nur bekannte Bewertungen uebernehmen. Ein unbekannter Wert landete sonst
// als Array-Index in Karte und PDF und lief dort ins Leere.
$st = isset($m['measureStatus']) ? (int) $m['measureStatus'] : 0;
$meas->measure_status = ($st >= 0 && $st <= 3) ? $st : 1;
$meas->measure_status = isset($m['measureStatus']) ? (int) $m['measureStatus'] : 0;
$meas->date_measure = netdiag_api_timestamp($m['dateMeasure'] ?? 0);
$meas->tms = dol_now();
if ($meas->create($user, 1) <= 0) {

1
langs/de_DE/netdiag.lang
View file

@ -59,4 +59,3 @@ NetDiagMeasurements = Messungen
NetDiagMeasureOk = OK
NetDiagMeasureWarn = Warnung
NetDiagMeasureFail = Fehler
NetDiagMeasureUnmeasurable = Nicht messbar

1
langs/en_US/netdiag.lang
View file

@ -59,4 +59,3 @@ NetDiagMeasurements = Measurements
NetDiagMeasureOk = OK
NetDiagMeasureWarn = Warning
NetDiagMeasureFail = Fail
NetDiagMeasureUnmeasurable = Not measurable

19
lib/netdiag_pdf.lib.php
View file

@ -132,35 +132,20 @@ function netdiagGeneratePdf($db, $protocol, $outputlangs)
// Messungen
$pdf->SetFont('', 'B', 12);
$pdf->Cell(0, 7, $outputlangs->transnoentities("NetDiagMeasurements").' ('.count($measurements).')', 0, 1, 'L');
// Status 3 = "nicht messbar": der Test konnte nicht durchgeführt werden.
// Bewusst grau und mit eigenem Zeichen — weder grün (wäre gelogen) noch rot
// (wäre eine Aussage über das Kundennetz, die die Messung nicht hergibt).
$statuslabels = array(
0 => $outputlangs->transnoentities("NetDiagMeasureOk"),
1 => $outputlangs->transnoentities("NetDiagMeasureWarn"),
2 => $outputlangs->transnoentities("NetDiagMeasureFail"),
3 => $outputlangs->transnoentities("NetDiagMeasureUnmeasurable"),
);
// Zusätzlich ein Zeichen, damit die Ampel auch im Schwarz-Weiß-Ausdruck lesbar bleibt
$statusmarks = array(0 => 'OK', 1 => '!', 2 => 'X', 3 => '?');
$statuslabels = array(0 => 'OK', 1 => $outputlangs->transnoentities("NetDiagMeasureWarn"), 2 => $outputlangs->transnoentities("NetDiagMeasureFail"));
foreach ($measurements as $m) {
$st = (int) $m->measure_status;
if ($st < 0 || $st > 3) {
$st = 1; // unbekannter Wert -> als Warnung behandeln, nie als OK
}
if ($st == 2) {
$pdf->SetFillColor(230, 130, 130);
} elseif ($st == 1) {
$pdf->SetFillColor(245, 215, 130);
} elseif ($st == 3) {
$pdf->SetFillColor(210, 210, 210);
} else {
$pdf->SetFillColor(170, 215, 170);
}
$pdf->SetFont('', 'B', 9);
$title = ($m->category ? '['.$m->category.'] ' : '').$m->tool.($m->label ? ' — '.$m->label : '');
$pdf->Cell(150, 6, dol_trunc($title, 80), 1, 0, 'L');
$pdf->Cell(30, 6, $statusmarks[$st].' '.$statuslabels[$st], 1, 1, 'C', true);
$pdf->Cell(30, 6, $statuslabels[$st], 1, 1, 'C', true);
$pdf->SetFont('', '', 8);
$pdf->MultiCell(180, 5, netdiagPdfFlattenResult($m->result), 1, 'L');
}

18
netdiagprotocol_card.php
View file

@ -201,18 +201,8 @@ print '</table></div>';
// Messungen
$measObj = new NetDiagMeasurement($db);
$measurements = $measObj->fetchAllByProtocol($object->id);
$statuslabels = array(
0 => 'NetDiagMeasureOk',
1 => 'NetDiagMeasureWarn',
2 => 'NetDiagMeasureFail',
3 => 'NetDiagMeasureUnmeasurable',
);
$statuscss = array(
0 => 'badge-status4',
1 => 'badge-status1',
2 => 'badge-status8',
3 => 'badge-status0', // grau: Test war nicht durchfuehrbar
);
$statuslabels = array(0 => 'NetDiagMeasureOk', 1 => 'NetDiagMeasureWarn', 2 => 'NetDiagMeasureFail');
$statuscss = array(0 => 'badge-status4', 1 => 'badge-status1', 2 => 'badge-status8');
print '<br>';
print load_fiche_titre($langs->trans("NetDiagMeasurements").' ('.count($measurements).')', '', 'fa-wave-square');
print '<div class="div-table-responsive-no-min"><table class="noborder centpercent">';
@ -223,10 +213,6 @@ print '<th>'.$langs->trans("Result").'</th><th class="center">'.$langs->trans("M
print '</tr>';
foreach ($measurements as $m) {
$st = (int) $m->measure_status;
// Unbekannte Werte nie als OK durchgehen lassen (Array-Zugriff waere sonst leer)
if ($st < 0 || $st > 3) {
$st = 1;
}
print '<tr class="oddeven">';
print '<td class="nowraponall">'.dol_print_date($m->date_measure, 'dayhour').'</td>';
print '<td>'.dol_escape_htmltag($m->category).'</td>';