Skip to content
Snippets Groups Projects
Commit 884fe21d authored by Rico van Endern's avatar Rico van Endern
Browse files

Merged in dev (pull request #41)


Zeitfehler behoben

Approved-by: default avatarRico van Endern <rico.vanendern@udo.edu>
parents 2a024c16 3406cc8b
Branches
No related tags found
No related merge requests found
...@@ -28,7 +28,6 @@ this.show = function() { ...@@ -28,7 +28,6 @@ this.show = function() {
active : currentTab active : currentTab
}); });
}, this.tabtime*1000); }, this.tabtime*1000);
} }
this.hide = function() { this.hide = function() {
...@@ -47,6 +46,7 @@ function isNextDay() { ...@@ -47,6 +46,7 @@ function isNextDay() {
if (new Date().getHours() >= 15) { if (new Date().getHours() >= 15) {
return true; return true;
} }
return false;
} }
function calcDateAPI() { function calcDateAPI() {
......
...@@ -32,9 +32,8 @@ this.hide = function() { ...@@ -32,9 +32,8 @@ this.hide = function() {
function isOverDate(day, month, year){ function isOverDate(day, month, year){
console.log("DEBUG: input"+day +" "+ month+" "+year); console.log("DEBUG: input"+day +" "+ month+" "+year);
var d = new Date(); var d = new Date();
if((d.getFullYear() > year) || (d.getFullYear() == year && d.getMonth() > month) || (d.getFullYear() == year && d.getMonth() == month && d.getDate() > day)){ if((d.getFullYear() > year) || (d.getFullYear() == year && d.getMonth() > month) || (d.getFullYear() == year && d.getMonth()+1 == month && d.getDate() > day)){
return true; return true;
} else { } else {
return false; return false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment