Skip to content

O
opening-hours
Commit 84607fc2 authored by Johannes Bill's avatar Johannes Bill
Browse files
Options

changed shorttext

parent 7c248af7
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 7 deletions
lib/dateView.js
View file @ 84607fc2
...@@ -143,6 +143,8 @@ function createWeekViewVerticalRaw(dataObj, now, className, offset, addDayOfWeek ...@@ -143,6 +143,8 @@ function createWeekViewVerticalRaw(dataObj, now, className, offset, addDayOfWeek
var startDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() - offset); var startDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() - offset);
var endDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() + noOfDays - offset); var endDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() + noOfDays - offset);
var oHours = transformData(dataObj, startDate, endDate); var oHours = transformData(dataObj, startDate, endDate);
console.log(require("util").inspect(oHours, {depth: null}));
var hasMaybe = hoursMaybe(oHours); var hasMaybe = hoursMaybe(oHours);
var maxItems = getMaxNoOfItemsPerDay(oHours); var maxItems = getMaxNoOfItemsPerDay(oHours);
...@@ -382,8 +384,8 @@ function create3MonthView(dataObj, now) { ...@@ -382,8 +384,8 @@ function create3MonthView(dataObj, now) {
function getView(dataObj, now) { function getView(dataObj, now) {
var content = '<div class="view-container">'; var content = '<div class="view-container">';
content += module.exports.week(dataObj, now); content += module.exports.week(dataObj, now);
//content += module.exports.weekViewV(dataObj, now); content += module.exports.weekV(dataObj, now);
content += module.exports.twoWeekV(dataObj, now); //content += module.exports.twoWeekV(dataObj, now);
content += module.exports.threeMonth(dataObj, now); content += module.exports.threeMonth(dataObj, now);
content += '</div>'; content += '</div>';
return content; return content;
...@@ -520,7 +522,7 @@ function asString(dataObj, now) { ...@@ -520,7 +522,7 @@ function asString(dataObj, now) {
if (data.length == 0) { if (data.length == 0) {
return { return {
isOpen: false, isOpen: false,
text: ["Jetzt nicht geöffnet", "nächster Öffnungstermin unbekannt"], text: ["Jetzt nicht geöffnet", "weitere Öffnungszeiten nicht bekannt"],
status: "red" status: "red"
}; };
} }
...@@ -572,7 +574,7 @@ function asString(dataObj, now) { ...@@ -572,7 +574,7 @@ function asString(dataObj, now) {
} }
return { return {
isOpen: open, isOpen: open,
text: [firstText, secondText], text: [firstText, secondText].join(", "),
status: status status: status
} }
} }
......
serverTest/getHours.js
View file @ 84607fc2
...@@ -12,9 +12,9 @@ var data = Object.keys(ohoursMap).map(function (key) { ...@@ -12,9 +12,9 @@ var data = Object.keys(ohoursMap).map(function (key) {
return obj; return obj;
}); });
//data = data.filter(function (e) { data = data.filter(function (e) {
// return e.name == "Hofladen Lang"; return e.name.match(/Preuschl Alfred/i);
//}); });
console.log(data.length); console.log(data.length);
var getData = module.exports.getData = function (now, cb) { var getData = module.exports.getData = function (now, cb) {
......
test/test.html 0 → 100644
View file @ 84607fc2
<!DOCTYPE html>
<html>
<head lang="en">
<meta charset="UTF-8">
<title></title>
<style>
div.week.container {
background-color: lightgrey;
width: 500px;
height: 300px;
}
table {
border-collapse: collapse;
position: relative;
width: 100%;
height: 100%;
}
td {
border: 1px solid black;
}
</style>
</head>
<body>
<div class="week container">
</div>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment