From be459fa946a3153e2d187e5b623ceda2d35e3f31 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 21 Jan 2013 12:12:50 -0500
Subject: [PATCH] Fix first day of the week in datepickers

Fixes #2188
---
 UI/Scheduler/UIxComponentEditor.h               |  1 +
 UI/Scheduler/UIxComponentEditor.m               |  9 +++++++++
 UI/Templates/SchedulerUI/UIxComponentEditor.wox |  1 +
 UI/WebServerResources/UIxAppointmentEditor.js   |  4 ++--
 UI/WebServerResources/UIxAttendeesEditor.js     |  6 ++++--
 UI/WebServerResources/UIxPreferences.js         |  3 ++-
 UI/WebServerResources/UIxRecurrenceEditor.js    |  3 ++-
 UI/WebServerResources/UIxTaskEditor.js          |  6 +++---
 UI/WebServerResources/generic.js                | 13 +++++++++++++
 9 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/UI/Scheduler/UIxComponentEditor.h b/UI/Scheduler/UIxComponentEditor.h
index 2a9f64910..4e292b8ea 100644
--- a/UI/Scheduler/UIxComponentEditor.h
+++ b/UI/Scheduler/UIxComponentEditor.h
@@ -178,6 +178,7 @@
 /* access */
 - (BOOL) isMyComponent;
 - (BOOL) canEditComponent;
+- (unsigned int) firstDayOfWeek;
 
 /* helpers */
 - (NSString *) completeURIForMethod: (NSString *) _method;
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index beacfa1db..ced89c05e 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -2532,6 +2532,15 @@ RANGE(2);
   return [[self clientObject] ownerInContext: context];
 }
 
+- (unsigned int) firstDayOfWeek
+{
+  SOGoUserDefaults *ud;
+
+  ud = [[context activeUser] userDefaults];
+
+  return [ud firstDayOfWeek];
+}
+
 // returns the raw content of the object
 - (WOResponse *) rawAction
 {
diff --git a/UI/Templates/SchedulerUI/UIxComponentEditor.wox b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
index 499fe986a..586f86150 100644
--- a/UI/Templates/SchedulerUI/UIxComponentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
@@ -22,6 +22,7 @@
     var attendees = <var:string value="jsonAttendees" const:escapeHTML="NO"/>;
     var ownerLogin = '<var:string value="ownerLogin"/>';
     var emailAlarmsEnabled = <var:string value="emailAlarmsEnabled"/>;
+    var firstDayOfWeek = <var:string value="firstDayOfWeek"/>;
     <var:if condition="eventIsReadOnly" const:negate="YES"
 	    ><var:if condition="hasOrganizer">var organizer = <var:string value="jsonOrganizer" const:escapeHTML="NO"/>;</var:if
 	    >var owners = <var:string value="calendarOwnerList.jsonRepresentation" const:escapeHTML="NO"/>;</var:if
diff --git a/UI/WebServerResources/UIxAppointmentEditor.js b/UI/WebServerResources/UIxAppointmentEditor.js
index f6b1286f5..77711d471 100644
--- a/UI/WebServerResources/UIxAppointmentEditor.js
+++ b/UI/WebServerResources/UIxAppointmentEditor.js
@@ -348,14 +348,14 @@ function initTimeWidgets(widgets) {
     this.timeWidgets = widgets;
 
     if (widgets['start']['date']) {
-        jQuery(widgets['start']['date']).closest('.date').datepicker({autoclose: true});
+        jQuery(widgets['start']['date']).closest('.date').datepicker({autoclose: true, weekStart: firstDayOfWeek});
         jQuery(widgets['start']['date']).change(onAdjustTime);
         widgets['start']['time'].on("time:change", onAdjustTime);
         widgets['start']['time'].addInterface(SOGoTimePickerInterface);
     }
 
     if (widgets['end']['date']) {
-        jQuery(widgets['end']['date']).closest('.date').datepicker({autoclose: true});
+        jQuery(widgets['end']['date']).closest('.date').datepicker({autoclose: true, weekStart: firstDayOfWeek});
         jQuery(widgets['end']['date']).change(onAdjustTime);
         widgets['end']['time'].on("time:change", onAdjustTime);
         widgets['end']['time'].addInterface(SOGoTimePickerInterface);
diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js
index 8094b02af..e01ed1cc5 100644
--- a/UI/WebServerResources/UIxAttendeesEditor.js
+++ b/UI/WebServerResources/UIxAttendeesEditor.js
@@ -1644,13 +1644,15 @@ document.observe("dom:loaded", onFreeBusyLoadHandler);
 function initTimeWidgets(widgets) {
     this.timeWidgets = widgets;
 
-    jQuery(widgets['start']['date']).closest('.date').datepicker({autoclose: true, position: 'above'});
+    jQuery(widgets['start']['date']).closest('.date').datepicker(
+        { autoclose: true, position: 'above', weekStart: parentvar('firstDayOfWeek') });
     jQuery(widgets['start']['date']).change(onAdjustTime);
     widgets['start']['time'].on("time:change", onAdjustTime);
     widgets['start']['time'].addInterface(SOGoTimePickerInterface);
     widgets['start']['time'].setPosition('above');
 
-    jQuery(widgets['end']['date']).closest('.date').datepicker({autoclose: true, position: 'above'});
+    jQuery(widgets['end']['date']).closest('.date').datepicker(
+        { autoclose: true, position: 'above', weekStart: parentvar('firstDayOfWeek') });
     jQuery(widgets['end']['date']).change(onAdjustTime);
     widgets['end']['time'].on("time:change", onAdjustTime);
     widgets['end']['time'].addInterface(SOGoTimePickerInterface);
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 1a5754e48..73d69539e 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -220,7 +220,8 @@ function initPreferences() {
 
     button = $("enableVacationEndDate");
     if (button) {
-        jQuery("#vacationEndDate_date").closest(".date").datepicker({autoclose: true, position: 'above'});
+        jQuery("#vacationEndDate_date").closest(".date").datepicker(
+            { autoclose: true, position: 'above', weekStart: $('weekStartDay').getValue() });
         button.on("click", function(event) {
             if (this.checked)
                 $("vacationEndDate_date").enable();
diff --git a/UI/WebServerResources/UIxRecurrenceEditor.js b/UI/WebServerResources/UIxRecurrenceEditor.js
index a83c76491..02d81977e 100644
--- a/UI/WebServerResources/UIxRecurrenceEditor.js
+++ b/UI/WebServerResources/UIxRecurrenceEditor.js
@@ -396,7 +396,8 @@ function onRecurrenceLoadHandler() {
     initializeFormValues();
     initializeSelectors();
     initializeWindowButtons();
-    jQuery('#endDate_date').closest('.date').datepicker({autoclose: true});
+    jQuery('#endDate_date').closest('.date').datepicker(
+        { autoclose: true, weekStart: parentvar('firstDayOfWeek') });
     escapeAlertMessages();
 }
 
diff --git a/UI/WebServerResources/UIxTaskEditor.js b/UI/WebServerResources/UIxTaskEditor.js
index 5a0351937..be1be3eb9 100644
--- a/UI/WebServerResources/UIxTaskEditor.js
+++ b/UI/WebServerResources/UIxTaskEditor.js
@@ -271,9 +271,9 @@ this.onAdjustDueTime = function(event) {
 this.initTimeWidgets = function (widgets) {
 	this.timeWidgets = widgets;
    
-        jQuery(widgets['start']['date']).closest('.date').datepicker({autoclose: true});
-        jQuery(widgets['due']['date']).closest('.date').datepicker({autoclose: true});
-        jQuery('#statusTime_date').closest('.date').datepicker({autoclose: true});
+        jQuery(widgets['start']['date']).closest('.date').datepicker({autoclose: true, weekStart: firstDayOfWeek});
+        jQuery(widgets['due']['date']).closest('.date').datepicker({autoclose: true, weekStart: firstDayOfWeek});
+        jQuery('#statusTime_date').closest('.date').datepicker({autoclose: true, weekStart: firstDayOfWeek});
 
         jQuery(widgets['start']['date']).change(onAdjustTime);
 	widgets['start']['time'].on("time:change", onAdjustDueTime);
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 93394c4bf..c19f6f16f 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1871,6 +1871,19 @@ function parent$(element) {
     return (p ? p.getElementById(element) : null);
 }
 
+function parentvar(name) {
+    var div = $("popupFrame");
+
+    if (div)
+        p = parent;
+    else if (this.opener)
+        p = this.opener;
+    else
+        p = null;
+
+    return (p ? p[name] : null);
+}
+
 /* stubs */
 function refreshCurrentFolder(id) {
 }