Changeset 1337

Timestamp:

2009-06-24 13:53:19 (3 years ago)

Author:

mpo

Message:

fixing bug that was creating was creating a wrong week-key for weeks at the end of the month
<a id="w27y2010" href="#">29-06-2009</a>

+ adding readability enhancements

File:

• tupper/trunk/tupper-site/src/main/kauri/static/js/time.js (modified) (2 diffs)

tupper/trunk/tupper-site/src/main/kauri/static/js/time.js

@@ -364 +364 @@
     $("#weeks tbody").empty();
     for(var i = 0; i < data.length; i++){
+        
+        var dataDay = data[i].start.substring(0,2)*1;
+        var dataMonth = data[i].start.substring(3,5)*1;
+        var dataYear = data[i].start.substring(6,10)*1;
+            
         line = "<tr class='"
-        if (currentWeek == data[i].nr && data[i].start.substring(6,10)*1 == new Date().getFullYear()){
+        if (currentWeek == data[i].nr && dataYear == new Date().getFullYear()){
             line = line + " this_week"
         }
-        if (selected_week == data[i].nr && data[i].start.substring(6,10)*1 == week.split("y")[1]){
+        if (selected_week == data[i].nr && dataYear == week.split("y")[1]){
             line = line + " selected "
         }
-        line = line + "'><td>" + data[i].nr + '</td><td><a href="#" id="w'+ data[i].nr + "y";
-        if((data[i].start.substring(0,2)*1) + 7 >31){
-            line += data[i].start.substring(6,10)*1 + 1;
-        }else{
-            line += data[i].start.substring(6,10);
-        }
+        line = line + "'><td>" + data[i].nr + '</td><td><a href="#" id="w'+ data[i].nr + "y" + dataYear;
+        
         line += '">' + data[i].start + "</a></td>";
         for(var j = 0; j < data[i].time.length; j++){
@@ -394 +395 @@
                 }
                 weekdate = new Date();
-                weekdate.setYear(data[i].start.substring(6,10)*1);
-                weekdate.setDate(data[i].start.substring(0,2)*1);
-                weekdate.setMonth(data[i].start.substring(3,5)*1 -1);
+                weekdate.setYear(dataYear);
+                weekdate.setDate(dataDay);
+                weekdate.setMonth(dataMonth - 1);
                 var yearErlier = (weekdate.getFullYear() < new Date().getFullYear());
                 var monthErlier = (weekdate.getMonth() < new Date().getMonth());