From 1fc8d987d585ce56355a1cf504b10e530b8383e6 Mon Sep 17 00:00:00 2001
From: wactbprot <thsteinbock@web.de>
Date: Fri, 6 Sep 2013 17:01:25 +0200
Subject: [PATCH] eow
---
lists/merge.js | 30 ++++++++++++++++++++----------
views/events/map.js | 30 +++++++++++++++++++++++-------
2 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/lists/merge.js b/lists/merge.js
index 1af855f..aea8f7b 100644
--- a/lists/merge.js
+++ b/lists/merge.js
@@ -7,23 +7,33 @@ function(head, req) {
start(share.startJson);
while(row = getRow()) {
var rv = row.value,
- signature = row.value.signature;
-
- if(data[signature]){
- data[signature].id.push(rv.id);
- data[signature].sign.push(rv.sign);
+ signature = row.value.signature;
+ if(data[signature]){
+ data[signature].data
+ .push({Id: rv.id,
+ Sign: rv.sign,
+ Standard: rv.standard,
+ Type: rv.type
+ }
+ );
+
}else{
data[signature] = {};
- data[signature].id = [rv.id];
- data[signature].sign = [rv.sign];
+ data[signature].data = [
+ {Id: rv.id,
+ Sign: rv.sign,
+ Standard: rv.standard,
+ Type: rv.type
+ }
+ ];
data[signature].title = rv.title;
data[signature].start = rv.start;
data[signature].end = rv.end;
}
}
for(var k in data){
- mergedEvents.push(data[k]);
- }
+ mergedEvents.push(data[k]);
+ }
send(toJSON( mergedEvents));
-}
\ No newline at end of file
+}
diff --git a/views/events/map.js b/views/events/map.js
index 37c5703..9308c52 100644
--- a/views/events/map.js
+++ b/views/events/map.js
@@ -1,12 +1,25 @@
function(doc) {
var compstr = "schedule",
- share = require("views/lib/share");
+ share = require("views/lib/share"),
+ co0Name = "~",
+ customer= "~" ;
if(doc.Calibration){
var dc = doc.Calibration;
if(dc.Presettings){
var dcp = dc.Presettings,
- dcpc = dcp.Customer,
- customer = dcpc ? dcpc.Name : "?";
+ dcm = dc.Measurement;
+ // try to find customer name
+ if(dcp.Customer &&
+ dcp.Customer.Name){
+ customer = dcp.Customer.Name;
+ }
+ // try to find customer device name
+ if(dcm &&
+ dcm.CalibrationObject &&
+ dcm.CalibrationObject[0] &&
+ dcm.CalibrationObject[0].Name){
+ co0Name = dcm.CalibrationObject[0].Name;
+ }
if(dcp.Date){
if(share.isArray(dcp.Date)){
@@ -28,10 +41,13 @@ function(doc) {
var keyObj = dateObj.Value.split(" ")[0],
startDate = share.vlDateString(dateObj.Value).split(" ")[0],
- valObj = { id : doc._id,
- sign : dc.Sign,
- title : dc.Standard + ": " + customer,
- start : startDate
+ valObj = { id : doc._id,
+ sign : dc.Sign,
+ standard: dc.Standard,
+ type : dc.Type,
+ co0Name : co0Name,
+ title : dc.Standard + ": " + customer,
+ start : startDate
};
if(dateObj.Duration){
valObj.end = share.addDays(dateObj.Duration, dateObj.Value).split(" ")[0];
--
GitLab