= 0) || dayList[row + $index].disabled)}"
ng-click="dateSelected(dayList[row + $index])">
diff --git a/src/ionic-datepicker.provider.js b/src/ionic-datepicker.provider.js
index 43ecd7b0..082960f6 100644
--- a/src/ionic-datepicker.provider.js
+++ b/src/ionic-datepicker.provider.js
@@ -14,14 +14,16 @@ angular.module('ionic-datepicker.provider', [])
templateType: 'popup',
showTodayButton: false,
closeOnSelect: false,
- disableWeekdays: []
+ disableWeekdays: [],
+ enableWeekNumber: false,
+ weekNumberLabel: 'CW'
};
this.configDatePicker = function (inputObj) {
angular.extend(config, inputObj);
};
- this.$get = ['$rootScope', '$ionicPopup', '$ionicModal', 'IonicDatepickerService', function ($rootScope, $ionicPopup, $ionicModal, IonicDatepickerService) {
+ this.$get = ['$rootScope', '$ionicPopup', '$ionicModal', 'IonicDatepickerService' , '$filter', function ($rootScope, $ionicPopup, $ionicModal, IonicDatepickerService, $filter) {
var provider = {};
@@ -56,12 +58,10 @@ angular.module('ionic-datepicker.provider', [])
if ($scope.currentDate.getMonth() === 11) {
$scope.currentDate.setFullYear($scope.currentDate.getFullYear());
}
- $scope.currentDate.setDate(1);
$scope.currentDate.setMonth($scope.currentDate.getMonth() + 1);
$scope.data.currentMonth = $scope.mainObj.monthsList[$scope.currentDate.getMonth()];
$scope.data.currentYear = $scope.currentDate.getFullYear();
- $scope.monthChanged($scope.currentDate.getMonth());
- refreshDateList(new Date());
+ refreshDateList($scope.currentDate);
changeDaySelected();
};
@@ -78,7 +78,7 @@ angular.module('ionic-datepicker.provider', [])
if (!selectedDate || Object.keys(selectedDate).length === 0) return;
$scope.selctedDateEpoch = selectedDate.epoch;
if ($scope.mainObj.closeOnSelect) {
- $scope.mainObj.callback($scope.selctedDateEpoch);
+ $scope.mainObj.callback($scope.selctedDateEpoch,'closed');
if ($scope.mainObj.templateType.toLowerCase() == 'popup') {
$scope.popup.close();
} else {
@@ -140,6 +140,7 @@ angular.module('ionic-datepicker.provider', [])
$scope.dayList.push({
date: tempDate.getDate(),
+ weekNumber: weekNumber(tempDate),
month: tempDate.getMonth(),
year: tempDate.getFullYear(),
day: tempDate.getDay(),
@@ -183,6 +184,25 @@ angular.module('ionic-datepicker.provider', [])
changeDaySelected();
};
+ // set weeknumber
+ function weekNumber(myDate) {
+ if ($scope.mainObj.enableWeekNumber) {
+ return $scope.mainObj.weekNumberLabel + ' ' + ISO8601_week_no(myDate);
+ }
+ }
+ function ISO8601_week_no(dt) {
+ var tdt = new Date(dt.valueOf());
+ var dayn = (dt.getDay() + 6) % 7;
+ tdt.setDate(tdt.getDate() - dayn + 3);
+ var firstThursday = tdt.valueOf();
+ tdt.setMonth(0, 1);
+ if (tdt.getDay() !== 4)
+ {
+ tdt.setMonth(0, 1 + ((4 - tdt.getDay()) + 7) % 7);
+ }
+ return 1 + Math.ceil((firstThursday - tdt) / 604800000);
+ }
+
//Setting up the initial object
function setInitialObj(ipObj) {
$scope.mainObj = angular.copy(ipObj);
@@ -197,6 +217,7 @@ angular.module('ionic-datepicker.provider', [])
$scope.weeksList.push($scope.mainObj.weeksList.shift());
}
$scope.disableWeekdays = $scope.mainObj.disableWeekdays;
+ $scope.enableWeekNumber = $scope.mainObj.enableWeekNumber;
refreshDateList($scope.mainObj.inputDate);
setDisabledDates($scope.mainObj);
@@ -242,6 +263,7 @@ angular.module('ionic-datepicker.provider', [])
if (ipObj.disableWeekdays && config.disableWeekdays) {
$scope.mainObj.disableWeekdays = ipObj.disableWeekdays.concat(config.disableWeekdays);
}
+
setInitialObj($scope.mainObj);
if (!$scope.mainObj.closeOnSelect) {
@@ -269,7 +291,7 @@ angular.module('ionic-datepicker.provider', [])
disabled: false
};
$scope.dateSelected(today_obj);
-
+
refreshDateList(new Date());
$scope.selctedDateEpoch = resetHMSM(today).getTime();
$scope.mainObj.callback($scope.selctedDateEpoch);
diff --git a/src/ionic-datepicker.service.js b/src/ionic-datepicker.service.js
index b9e4485c..b5e5788a 100644
--- a/src/ionic-datepicker.service.js
+++ b/src/ionic-datepicker.service.js
@@ -1,21 +1,25 @@
+
+
angular.module('ionic-datepicker.service', [])
- .service('IonicDatepickerService', function () {
+ .service('IonicDatepickerService', function () {
+
+ this.monthsList = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+
+ this.getYearsList = function (from, to) {
+ var yearsList = [];
+ var minYear = 1900;
+ var maxYear = 2100;
- this.monthsList = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+ minYear = from ? new Date(from).getFullYear() : minYear;
+ maxYear = to ? new Date(to).getFullYear() : maxYear;
- this.getYearsList = function (from, to) {
- var yearsList = [];
- var minYear = 1900;
- var maxYear = 2100;
+ for (var i = minYear; i <= maxYear; i++) {
+ yearsList.push(i);
+ }
- minYear = from ? new Date(from).getFullYear() : minYear;
- maxYear = to ? new Date(to).getFullYear() : maxYear;
+ return yearsList;
+ };
+ });
- for (var i = minYear; i <= maxYear; i++) {
- yearsList.push(i);
- }
- return yearsList;
- };
- });
diff --git a/src/scss/ionic-datepicker.styles.scss b/src/scss/ionic-datepicker.styles.scss
index aca282ea..5d8c82de 100644
--- a/src/scss/ionic-datepicker.styles.scss
+++ b/src/scss/ionic-datepicker.styles.scss
@@ -240,6 +240,19 @@
left: 5%;
}
+.ionic_datepicker_modal {
+ .date_cell {
+ position: relative;
+ .weeknumber {
+ position: absolute;
+ top: -15px;
+ right: 1px;
+ font-weight: normal;
+ font-size: 9px;
+ }
+ }
+}
+
.date_col {
cursor: pointer;
}