From 1fb79d2dc01592b7fb022b8133649954b443ea66 Mon Sep 17 00:00:00 2001 From: wactbprot <thsteinbock@web.de> Date: Fri, 12 Jan 2018 09:46:31 +0100 Subject: [PATCH] umsort. --- templates/body.html | 39 ++++++++++++++++++++------------------- templates/header.html | 23 ++++++++++++----------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/templates/body.html b/templates/body.html index 4d532b3..9faf752 100644 --- a/templates/body.html +++ b/templates/body.html @@ -40,11 +40,22 @@ <td class="no_{{Number}}" title="Ansprechpartner" data-row="{{Number}}"> {{ContactName}} </td> - <td class="no_{{Number}}" data-row="{{Number}}"> - <a href="mailto:{{ContactEmail}}">{{ContactEmail}}</a> + + <td class="no_{{Number}}" title="Gegenstand" data-row="{{Number}}"> + <a href="http://a73434.berlin.ptb.de:5984/_utils/#/database/vl_db/_design/share/_view/CalibrationObject?key=%22{{DeviceName}}%22"> + {{DeviceType}} </td> - <td class="no_{{Number}}" title="Telefonnummer des Ansprechpartners" data-row="{{Number}}"> - <a href="tel:{{ContactPhone}}"> {{ContactPhone}} </a> + <td class="no_{{Number}}" title="Name des Kalibrierziels (Typ)" data-row="{{Number}}"> + <a href="http://a73434.berlin.ptb.de:5984/_utils/#/database/vl_db/_design/share/_view/ToDo?key=%22{{ToDoName}}({{ToDoType}})%22">{{ToDoName}} ({{ToDoType}})</a> + </td> + <td class="no_{{Number}} {{Standard}}" title="Normal" data-row="{{Number}}"> + {{Standard}} + </td> + <td class="no_{{Number}}" title="Messbeauftragter" data-row="{{Number}}"> + {{MeasMaintainer}} + </td> + <td class="no_{{Number}}" title="Gebühr" data-row="{{Number}}"> + {{Fee}} </td> <td class="no_{{Number}}" title="Erstelldatum" data-row="{{Number}}"> @@ -80,21 +91,11 @@ <td class="no_{{Number}} {{DateTerminated}}" title="technisch abgeschlossen" data-row="{{Number}}"> {{DateTerminated}} </td> - - <td class="no_{{Number}}" title="Gegenstand" data-row="{{Number}}"> - <a href="http://a73434.berlin.ptb.de:5984/_utils/#/database/vl_db/_design/share/_view/CalibrationObject?key=%22{{DeviceName}}%22"> - {{DeviceType}} - </td> - <td class="no_{{Number}}" title="Name des Kalibrierziels (Typ)" data-row="{{Number}}"> - <a href="http://a73434.berlin.ptb.de:5984/_utils/#/database/vl_db/_design/share/_view/ToDo?key=%22{{ToDoName}}({{ToDoType}})%22">{{ToDoName}} ({{ToDoType}})</a> - </td> - <td class="no_{{Number}} {{Standard}}" title="Normal" data-row="{{Number}}"> - {{Standard}} - </td> - <td class="no_{{Number}}" title="Messbeauftragter" data-row="{{Number}}"> - {{MeasMaintainer}} + <td class="no_{{Number}}" data-row="{{Number}}"> + <a href="mailto:{{ContactEmail}}">{{ContactEmail}}</a> </td> - <td class="no_{{Number}}" title="Gebühr" data-row="{{Number}}"> - {{Fee}} + <td class="no_{{Number}}" title="Telefonnummer des Ansprechpartners" data-row="{{Number}}"> + <a href="tel:{{ContactPhone}}"> {{ContactPhone}} </a> </td> + </tr> diff --git a/templates/header.html b/templates/header.html index b1ce97f..e942c9e 100644 --- a/templates/header.html +++ b/templates/header.html @@ -53,8 +53,12 @@ <th>Debitorennummer</th> <th>Typ</th> <th>Ansprechpart.</th> - <th>Email</th> - <th>Tel.</th> + + <th>Gegenstand<sup><a href="#db-doc-info">1)</a></sup></th> + <th>Kalibrierziel<sup><a href="#db-doc-info">1)</a></sup></th> + <th>Standard</th> + <th>Messbeauftragter</th> + <th>Standardgebühr</th> <th>Erstelldatum</th> <th>Anfragedatum</th> @@ -62,15 +66,12 @@ <th>Start Messung</th> <th>Datum KS</th> - <th>Dateien</th> + <th>Dateien</th> - <th>Fakturaanforderung </th> - <th>Faktura</th> - <th>tech. abgeschl.</th> + <th>Fakturaanforderung </th> + <th>Faktura</th> + <th>tech. abgeschl.</th> - <th>Gegenstand<sup><a href="#db-doc-info">1)</a></sup></th> - <th>Kalibrierziel<sup><a href="#db-doc-info">1)</a></sup></th> - <th>Standard</th> - <th>Messbeauftragter</th> - <th>Standardgebühr</th> + <th>Email</th> + <th>Tel.</th> </tr> -- GitLab