Skip to content
Snippets Groups Projects
Commit 60bc7609 authored by wactbprot's avatar wactbprot
Browse files

vorgang farbe

parent 00d47af8
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
lists/sum.js
+ 0
− 5
View file @ 60bc7609
......@@ -22,11 +22,6 @@ function(head, req) {
var rv = row.value,
ak = rv.Certificate + rv.Year;
if(rv.CustomerSign){
rv.CustomerDocId = "cus-" + rv.CustomerSign.toLowerCase();
rv.CustCommentAvailable = rv.CustomerComment ? "info" : "none";
}
if(all[ak]){
for(var k in rv){
all[ak][k] = rv[k];
......
templates/body.html
+ 25
− 19
View file @ 60bc7609
<tr>
<tr class="ref_{{OrderNumber}}" data-ref="{{OrderNumber}}">
<!--
<td> {{}} </td>
-->
......@@ -6,7 +6,7 @@
{{OrderNumber}}
</td>
<td class="no_{{Number}}" title="KS" data-row="{{Number}}">
<a href="http://a73434.berlin.ptb.de:5984/vl_db/applications/diwan2.html?id={{id}}"
<a target="_blank" href="http://a73434.berlin.ptb.de:5984/vl_db/applications/diwan2.html?id={{id}}"
target="_blank"><b>{{Certificate}}</b></a>
</td>
<td class="no_{{Number}}" title="Aktenzeichen" data-row="{{Number}}">
......@@ -15,19 +15,25 @@
<td class="no_{{Number}}" title="allgemeines Aktenzeichen" data-row="{{Number}}">
<b> {{CommonReferenceNo}} </b>
</td>
<td class="no_{{Number}} {{SAP}}" title="SAP" data-row="{{Number}}">
<a href="http://a73434.berlin.ptb.de:5984/vl_db/applications/sofa.html?key={{CommonReferenceNo}}">{{SAP}}</a>
<td class="ref_{{OrderNumber}} no_{{Number}} {{SAP}}" title="SAP" data-row="{{Number}}">
<a target="_blank" href="http://a73434.berlin.ptb.de:5984/vl_db/applications/sofa.html?key={{CommonReferenceNo}}">{{SAP}}</a>
</td>
<td class="no_{{Number}} {{CustCommentAvailable}}"
title="{{CustomerComment}}" data-row="{{Number}}">
{{CustomerName}}
<td class="ref_{{OrderNumber}} no_{{Number}} {{CustCommentAvailable}}"
title="Kundenname" data-row="{{Number}}">
<a target="_blank" href="http://a73434:5984/vl_db/applications/ottomane.html?key=%22{{CustomerSign}}%20({{CustomerName}})%22">
{{CustomerName}}</a>
</td>
<td class="no_{{Number}}"
title="Kommentar zum Kunden" data-row="{{Number}}">
{{CustomerComment}}
</td>
<td class="no_{{Number}}" title="Kundenkürzel (Link zum Kundendokument)" data-row="{{Number}}">
<a href="http://a73434.berlin.ptb.de:5984/_utils/#database/vl_db/{{CustomerDocId}}">
<a target="_blank" href="http://a73434:5984/vl_db/applications/ottomane.html?key=%22{{CustomerSign}}%20({{CustomerName}})%22">
{{CustomerSign}}</a>
</td>
<td class="no_{{Number}} {{CustomerReference}}" title="Aktenzeichen des Kunden" data-row="{{Number}}">
<td class="ref_{{OrderNumber}} no_{{Number}} {{CustomerReference}}" title="Aktenzeichen des Kunden" data-row="{{Number}}">
{{CustomerReference}}
</td>
......@@ -42,13 +48,13 @@
</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">
<a target="_blank" 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>
<a target="_blank" 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}}">
<td class="ref_{{OrderNumber}} no_{{Number}} {{Standard}}" title="Normal" data-row="{{Number}}">
{{Standard}}
</td>
<td class="no_{{Number}}" title="Messbeauftragter" data-row="{{Number}}">
......@@ -76,32 +82,32 @@
<td class="no_{{Number}}" title="KS-Dateien" data-row="{{Number}}">
{{#CertAttachments}}
<a href="../../../../{{CertId}}/{{.}}">{{.}}</a> <br>
<a target="_blank" href="../../../../{{CertId}}/{{.}}">{{.}}</a> <br>
{{/CertAttachments}}
</td>
<td class="no_{{Number}}" title="BUR-Dateien" data-row="{{Number}}">
{{#BurAttachments}}
<a href="../../../../{{BurId}}/{{.}}">{{.}}</a> <br>
<a target="_blank" href="../../../../{{BurId}}/{{.}}">{{.}}</a> <br>
{{/BurAttachments}}
</td>
<td class="no_{{Number}}" title="Fakturaanforderung" data-row="{{Number}}">
<a href="http://a73434.berlin.ptb.de:5984/vl_db/applications/sofa.html?key={{CommonReferenceNo}}">{{Fakturaanforderung}}</a>
<a target="_blank" href="http://a73434.berlin.ptb.de:5984/vl_db/applications/sofa.html?key={{CommonReferenceNo}}">{{Fakturaanforderung}}</a>
</td>
<td class="no_{{Number}}" title="" data-row="{{Number}}">
<a href="http://a73434.berlin.ptb.de:5984/vl_db/applications/sofa.html?key={{CommonReferenceNo}}">{{Faktura}}</a>
<a target="_blank" href="http://a73434.berlin.ptb.de:5984/vl_db/applications/sofa.html?key={{CommonReferenceNo}}">{{Faktura}}</a>
</td>
<td class="no_{{Number}} {{DateTerminated}}" title="technisch abgeschlossen" data-row="{{Number}}">
<td class="ref_{{OrderNumber}} no_{{Number}} {{DateTerminated}}" title="technisch abgeschlossen" data-row="{{Number}}">
{{DateTerminated}}
</td>
<td class="no_{{Number}}" data-row="{{Number}}">
<a href="mailto:{{ContactEmail}}">{{ContactEmail}}</a>
<a target="_blank" href="mailto:{{ContactEmail}}">{{ContactEmail}}</a>
</td>
<td class="no_{{Number}}" title="Telefonnummer des Ansprechpartners" data-row="{{Number}}">
<a href="tel:{{ContactPhone}}"> {{ContactPhone}} </a>
<a target="_blank" href="tel:{{ContactPhone}}"> {{ContactPhone}} </a>
</td>
</tr>
templates/foot.html
+ 1
− 12
View file @ 60bc7609
......@@ -8,17 +8,6 @@
den Knopf "Aus Bestand".
</p>
</body>
<script>
$( "td" ).click(function() {
var $this = $( this )
var no = $this.data("row");
$no = $(".no_" + no);
if($this.hasClass("selected")){
$no.removeClass("selected");
}else{
$no.addClass("selected");
}
<script type="text/javascript" src="../../js/index.js"></script>
});
</script>
</html>
templates/header.html
+ 9
− 5
View file @ 60bc7609
......@@ -2,7 +2,8 @@
<html>
<head>
<meta charset="utf-8">
<script type="text/javascript" src="../../../../lib/js/jquery3.js"></script>
<script type="text/javascript"
src="../../js/jquery-3.1.1.min.js"></script>
<title>{{Title}}</title>
<style type="text/css">
body {
......@@ -11,10 +12,12 @@
font-family: Helvetica, Arial, sans-serif;
line-height: 100%;
}
.ref_odd {
background-color:#f5e598;
}
.vl { background-color:#FFFFE0;border-collapse:collapse;white-space:nowrap; }
.vl th { background-color:#BDB76B;color:white; }
.vl td, .vl th { padding:5px;border:1px solid #BDB76B; }
.vl th { background-color:#1b1a0b;color:white; }
.vl td, .vl th { padding:5px;border:1px solid #8a8673; }
.CE3 { color:white;background-color: #AA9A39; }
.FM1 { color:white;background-color: #452F74; }
......@@ -38,7 +41,7 @@
<p>
<a href="http://a75436.berlin.ptb.de/vaclab/vl-az/issues">Fehler, Anmerkung ect.</a>
</p>
<table class="vl" border="1">
<table id="az" class="vl" border="1">
<tr>
<th>Vorgang</th>
<th>KS</th>
......@@ -47,6 +50,7 @@
<th>SAP</th>
<th>Kunde</th>
<th>Kommentar zum Kunden</th>
<th>Kürzel</th>
<th>AZ (Kunde)<sup><a href="#db-doc-info">1)</a></sup></th>
......
views/all/map.js
+ 13
− 38
View file @ 60bc7609
......@@ -6,7 +6,8 @@ function(doc) {
, commonPrefix = "7.5-1V"
if(doc.Bureaucracy){
var db = doc.Bureaucracy;
var db = doc.Bureaucracy
, cust= db.Customer
if(db.Certificate && db.Certificate.length > 0) {
for(var i = 0; i < db.Certificate.length; i++) {
......@@ -23,10 +24,20 @@ function(doc) {
att.push(a);
}
}
emit(db.Year +"_" + sortOrderNumber ,
{Certificate: db.Certificate[i],
Year: db.Year,
CommonReferenceNo : db.CommonReferenceNo,
CustomerReference: db.CustomerSign,
CustomerName: cust.Name,
CustomerSign: cust.Sign,
CustomerComment: cust.Comment,
DebitorenNr: cust.DebitorenNr,
CustomerType: cust.Type,
ContactName: cust.Contact.Name,
ContactEmail: cust.Contact.Email,
ContactPhone: cust.Contact.Phone,
BurId:doc._id,
BurAttachments: att,
Faktura:f,
......@@ -67,39 +78,12 @@ function(doc) {
, DateTerm = PresDate["terminated"] ? PresDate["terminated"] : waiting
, DateMeas = MeasDate ? MeasDate.split(" ")[0] : "";
// --- Customer
var CustomerName = missing
, CustomerSign = missing
, CustomerComment = missing
, DebitorenNr = missing
, CustomerType = missing
, ContactName = missing
, ContactEmail = missing
, ContactPhone = missing;
if(dcc) {
CustomerName = dcc.Name ? dcc.Name : missing;
CustomerSign = dcc.Sign ? dcc.Sign : missing;
CustomerComment = dcc.Comment;
DebitorenNr = dcc.DebitorenNr ? dcc.DebitorenNr: missing;
CustomerType = dcc.Type ? dcc.Type : missing;
if(dcc.Contact) {
ContactName = dcc.Contact.Name
ContactEmail = dcc.Contact.Email
ContactPhone = dcc.Contact.Phone
}
}
// --- Presettings
var ReferenceNo = missing
, CustomerReference = missing;
if(pcp) {
ReferenceNo = pcp.ReferenceNo;
if(pcp.CustomerSign) {
CustomerReference = pcp.CustomerSign.length < 2 ? none : pcp.CustomerSign;
}
}
var spltRefNo = ReferenceNo.split("-")
......@@ -141,21 +125,12 @@ function(doc) {
Year: dc.Year,
OrderNumber: OrderNumber,
Certificate: dc.Certificate,
CustomerName: CustomerName,
CustomerSign: CustomerSign,
CustomerComment: CustomerComment,
DebitorenNr: DebitorenNr,
CustomerType: CustomerType,
ContactName: ContactName,
ContactEmail: ContactEmail,
ContactPhone: ContactPhone,
DateGen: DateGen,
DateCust: DateCust,
DateSchedule: DateSchedule,
DateTerminated: DateTerm,
DateMeas: DateMeas,
ReferenceNo: ReferenceNo,
CustomerReference: CustomerReference,
ToDoName: ToDoName,
ToDoType: ToDoType,
Standard: Standard,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment