Merge pull request #661 from srahulbadami/Develop_20.05

TimeZone Fixes

Pipfile

@@ -47,7 +47,7 @@ djangorestframework = "*"
 django_filter = "*"
 cffi = "*"
 django-mdeditor = "*"
-django-bootstrap-datepicker-plus = "*"
+django-tz-detect = "*"
 
 [dev-packages]
 

bugheist/settings.py

@@ -65,7 +65,8 @@
     'rest_framework.authtoken',
     'django_cron',
     'mdeditor',
-    'bootstrap_datepicker_plus'
+    'bootstrap_datepicker_plus',
+    'tz_detect'
 )
 
 CRON_CLASSES = [
@@ -82,6 +83,7 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'whitenoise.middleware.WhiteNoiseMiddleware',
+    'tz_detect.middleware.TimezoneMiddleware',
 )
 
 TESTING = len(sys.argv) > 1 and sys.argv[1] == 'test'

bugheist/urls.py

@@ -105,6 +105,7 @@
                   url(r'^api/v1/issue/update/$', csrf_exempt(website.views.UpdateIssue)),       
                   url(r'^api/v1/scoreboard/$', website.views.get_scoreboard),
                   url(r'^error/', website.views.throw_error, name='post_error'),
+                  url(r'^tz_detect/', include('tz_detect.urls')),
               ] 
 
 if settings.DEBUG:

website/forms.py

@@ -17,9 +17,7 @@ class Meta:
         model = UserProfile
         fields = ('user_avatar',)
 
-class HuntForm (forms.Form):
+class HuntForm (forms.Form): 
     content = MDTextFormField ()
-
-class DateTimeForm(forms.Form):
-    start_date = forms.DateTimeField(
-        widget=DateTimePickerInput())
+    start_date = forms.DateTimeField(widget=forms.DateTimeInput(attrs={'class': 'col-sm-6', 'readonly' : True}),label='', required=False ) 
+    end_date = forms.DateTimeField(widget=forms.DateTimeInput(attrs={'class': 'col-sm-6', 'readonly' : True}),label='', required=False)

website/static/js/dt.js

@@ -0,0 +1,38 @@
+
+var MtrDatepickerDemo = (function() {
+
+	var datepickers = [];
+	var exportSettings;
+
+	var init = function(config, settings) {
+		exportSettings = settings;
+		var datepicker = new MtrDatepicker(config);
+		datepickers.push(datepicker);
+
+		var exportFormatsContainer = document.getElementById(settings.exportFormats);
+	 	datepickerChange(exportFormatsContainer, datepicker,settings.exportFormats);
+
+	 	datepicker.onChange('all', function() {
+			datepickerChange(exportFormatsContainer, datepicker, settings.exportFormats);
+		});
+
+		return datepicker;
+	};
+
+	function datepickerChange(resultElement, datepicker, elemId) {
+		var result = datepicker.format('YYYY-MM-DD HH:mm');
+		console.log("HERE")
+		if(elemId=="datepicker-1-res"){
+			$("#id_start_date").val(result);
+		}
+		else if(elemId=="datepicker-2-res"){
+			$("#id_end_date").val(result);
+		}
+		resultElement.innerHTML = result;
+	}
+
+	return {
+		init: init
+	};
+
+})();