Changeset 1338 for tupper

Timestamp:

2009-06-24 15:20:44 (3 years ago)

Author:

mpo

Message:

Completing previous commit (r1337)

• correctly wrapping around the year end (1st week with start-date in the old year)
• more readability and logic cleanup

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

@@ -368 +368 @@
         var dataMonth = data[i].start.substring(3,5)*1;
         var dataYear = data[i].start.substring(6,10)*1;
+        var dataWeek = data[i].nr;
+        var dataWeekYear = (dataWeek == 1 && dataMonth == 12) ? dataYear +1 : dataYear; //first week of year can start in previous year
             
-        line = "<tr class='"
-        if (currentWeek == data[i].nr && dataYear == new Date().getFullYear()){
-            line = line + " this_week"
-        }
-        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" + dataYear;
+        line = "<tr class='";
+        if (currentWeek == dataWeek && dataYear == currentYear){
+            line = line + " this_week";
+        }
+        if (selected_week == dataWeek && dataYear == week.split("y")[1]){
+            line = line + " selected ";
+        }
+        line = line + "'><td>" + dataWeek + '</td><td><a href="#" id="w'+ dataWeek + "y" + dataWeekYear;
         
         line += '">' + data[i].start + "</a></td>";
@@ -385 +387 @@
                 case "sick": line = line + "sick";break;
             }
-            if(j > 4){
+            if(j > 4){ //days indexed 5 and 6
                 line = line + " weekend";
             }
-            if(data[i].time[j].time > 7){
+            
+            if( data[i].time[j].time >= 8 ){ //worked enough, future or past
                 line = line + " daytime_ok";
-            }else{
-                if(data[i].time[j].time !== 0 && data[i].time[j].time < 7){
-                    line = line + " daytime_nok";
-                }
-                weekdate = new Date();
-                weekdate.setYear(dataYear);
-                weekdate.setDate(dataDay);
-                weekdate.setMonth(dataMonth - 1);
-                var yearErlier = (weekdate.getFullYear() < new Date().getFullYear());
-                var monthErlier = (weekdate.getMonth() < new Date().getMonth());
-                var dayErlier = ((weekdate.getMonth() == new Date().getMonth()) && (weekdate.getDate()< new Date().getDate()));
-                //if( yearErlier || (!yearErlier && monthErlier) || (yearErlier && dayErlier)){
-                if((data[i].nr < currentWeek && weekdate.getFullYear() <= currentYear) || (currentWeek && weekdate.getFullYear() < currentYear)){
-                    line = line + " daytime_nok";
-                }
-            }
+            } else if( data[i].time[j].time !== 0  // some filled in, but not enough is filled in, even in the future
+                    || (dataWeek < currentWeek && dataWeekYear <= currentYear) ){ // nothing filled in, but stuff from the past!
+                line = line + " daytime_nok";
+            }//else we have no opinion: neutral styling
+
             line = line + '">'
             if(data[i].time[j].time === 0){