1.1.3

option for start date and properties as expressions
NOD507 · Mar 8, 2016 · e7eb6e8 · e7eb6e8
1 parent 57c7095
commit e7eb6e8
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 11 deletions.
diff --git a/CalendarSettings.js b/CalendarSettings.js
@@ -33,6 +33,12 @@ define([], function() {
                             type: "string",
                             expression: "optional"
                         },
+                        startDate: {
+                            ref: "props.startDate",
+                            label: "start Date MM/DD/YYYY",
+                            type: "string",
+                            expression: "optional"
+                        },
                         CustomRangesSwitch:{
                             type: "boolean",
                             component: "switch",
@@ -59,61 +65,71 @@ define([], function() {
 		                        type: "string",  
                                 ref: "props.locale",
 								label: "Locale",
-								defaultValue: "en"
+								defaultValue: "en",
+                                expression: "optional"
                             },
                            Format:{
 		                        type: "string",  
                                 ref: "props.format",
 								label: "Format",
-								defaultValue: "DD/MM/YYYY"
+								defaultValue: "DD/MM/YYYY",
+                                expression: "optional"
                             },
                             Separator:{
 		                        type: "string",  
                                 ref: "props.separator",
 								label: "Separator",
-								defaultValue: " - "
+								defaultValue: " - ",
+                                expression: "optional"
                             },
                             CustomRange:{
 		                        type: "string",  
                                 ref: "props.customRangeLabel",
 								label: "Custom Range",
-								defaultValue: "Range"
+								defaultValue: "Range",
+                                expression: "optional"
                             },
 						    defaultText: {
 								type: "string",  
                                 ref: "props.defaultText",
 								label: "Default Text",
+                                expression: "optional",
 								defaultValue: "Select date range"
 							},
                             Today:{
                                 type: "string",  
                                 ref: "props.today",
 								label: "Today",
-								defaultValue: "Today"
+								defaultValue: "Today",
+                                expression: "optional"
                             },
                             Yesterday:{
                                 type: "string",  
                                 ref: "props.yesterday",
 								label: "Yesterday",
-								defaultValue: "Yesterday"
+								defaultValue: "Yesterday",
+                                expression: "optional"
                             },
                             LastDays:{
                                 type: "string",  
                                 ref: "props.lastXDays",
 								label: "Last $ days",
-								defaultValue: "Last $ days"
+								defaultValue: "Last $ days",
+                                expression: "optional"
                             },
                             ThisMonth:{
                                 type: "string",  
                                 ref: "props.thisMonth",
 								label: "This Month",
-								defaultValue: "This Month"
+								defaultValue: "This Month",
+                                expression: "optional"
                             },
                             LastMonth:{
                                 type: "string",  
                                 ref: "props.lastMonth",
 								label: "Last Month",
-								defaultValue: "Last Month"
+								defaultValue: "Last Month",
+                                expression: "optional"
                             }
 
 					}

diff --git a/DateRangePicker.js b/DateRangePicker.js
@@ -111,6 +111,7 @@ define(["qlik", "jquery", "./lib/moment.min", "./CalendarSettings", "css!./css/s
                 var isFirstPaint = $element.children().attr("id") !== parentElement;
                 var minDate = moment(layout.props.minDate,"MM/DD/YYYY");
                 var maxDate = moment(layout.props.maxDate,"MM/DD/YYYY");
+                var startDate = moment(layout.props.startDate,"MM/DD/YYYY");
 
                 moment.locale(layout.props.locale);
 
@@ -150,6 +151,10 @@ define(["qlik", "jquery", "./lib/moment.min", "./CalendarSettings", "css!./css/s
                 if(maxDate.isValid()){
                   config.maxDate = maxDate
                 }
+
+                if(startDate.isValid()){
+                  config.startDate = startDate
+                }
 
                 if (layout.props.CustomRangesEnabled) {
                     config.locale.customRangeLabel = layout.props.customRangeLabel;
@@ -220,6 +225,11 @@ define(["qlik", "jquery", "./lib/moment.min", "./CalendarSettings", "css!./css/s
 
                     var _start = start || _dummy;
                     var _end = end || _dummy;
+                    var _startDate = moment();
+
+                    if(startDate.isValid()){
+                        _startDate = startDate;
+                    }
 
                     if (_start._i.toString() !== 'Invalid Date' && _end._i.toString() !== 'Invalid Date') {
 
@@ -235,7 +245,7 @@ define(["qlik", "jquery", "./lib/moment.min", "./CalendarSettings", "css!./css/s
 
                     }
                     else {
-                        $('#' + dateRangeId).data('daterangepicker').setStartDate(moment());
+                        $('#' + dateRangeId).data('daterangepicker').setStartDate(_startDate);
                         $('#' + dateRangeId).data('daterangepicker').setEndDate(null);
                         $('#' + dateRangeId + ' span').html(layout.props.defaultText)
                     }

diff --git a/DateRangePicker.qext b/DateRangePicker.qext
@@ -2,7 +2,7 @@
 	"name": "DateRangePicker",
 	"description": "",
 	"type": "visualization",
-	"version": "1.1.2",
+	"version": "1.1.3",
 	"icon": "table",
 	"preview": "preview.png",
 	"author": "Nodier Torres",

diff --git a/README.md b/README.md
@@ -9,6 +9,9 @@ Also at Calendar Settings can choose all language locales that moment.js support
 
 ![preview](https://raw.githubusercontent.com/NOD507/SenseDateRangePicker/master/dateRangePicker.gif) 
 
+#### 1.1.3
+ * option for start date and properties as expressions
+
 #### 1.1.2
  * option for min and max date