Changeset 1425

Timestamp:

17/12/09 17:14:06 (3 months ago)

Author:

bruno

Message:

* fixing wrong year usage

• in some cases the current year was used instead of the selected_year, leading to problems working with other years than the current
  
• after saving, the 'selected week' is now correctly highlighted (before it always jumped back to the current week)
  

* selected_week and selected_year:

• are now only initialized once on page load
  
• always contain the numeric values now (I hope)
  

Files:

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

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

@@ -2 +2 @@
-var dataURI = "";
-var performancesForm = null;
-0
+currentWeek
-var selected_year = currentYear;
-var editChild = null;
@@ -18 +18 @@
-        $.getJSON(urlPerf, fillPerformances);
-
-        var current_week = week.split("y")[0].substring(1, week.split("y")[0].length);
-        //alert(current_week);
-        var year = new Date().getFullYear();
-        var firstweek = selected_week - 6;
-        var lastweek = firstweek + 11;
-
-        var url = baseUri + "week/" + selectedEmpl +"/";
-year + "-w" + lastweek + "y" + 
+selected_year + "-w" + lastweek + "y" + selected_
-
-        $.getJSON(url, fillWeeks);
@@ -109 +106 @@
-
-    $("#copy_previous_data").click(function(){
-*1
+
-        url = baseUri + "performance/" + selectedEmpl + "/" + week;
-        copiedFromPrevious = true;
@@ -273 +270 @@
-    
-function getInitWeeks(){
-    selected_week = currentWeek;
-    var year = new Date().getFullYear();
-    var firstweek = selected_week - 6;
-    var lastweek = firstweek + 11;
-
-    // server does lenient interpretation of the week range
-year + "-w" + lastweek + "y" + 
+selected_year + "-w" + lastweek + "y" + selected_
-    var url = baseUri + "week/" + selectedEmpl +"/" + weekRange;
-
@@ -286 +281 @@
-    
-function getInitPerformances(){
-
-
-
-
-
-
-
+
+
+
-    performancesForm.initDataURIs({
-        "dataURI": url
@@ -323 +314 @@
-    //        $(".pager td:first").text("Previous Weeks Incomplete");
-    //      }
-    selected_week = currentWeek;
-    var data = json[0].data;
-    $("#weeks tbody").empty();
@@ -338 +328 @@
-            line = line + " this_week";
-        }
-dataYear == week.split("y")[1]
+selected_year == dataYear
-            line = line + " selected ";
-        }
@@ -377 +367 @@
-            selected_year = week.substring(3,week.length);
-        }else{
-
-
+
+
+
+
+
+
-        url = baseUri + "performance/" + selectedEmpl + "/" + week; //--------------------------//
-        $.getJSON(url,fillPerformances);