Skip to content
This repository was archived by the owner on Jun 5, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-date-range-picker",
"version": "0.4.15",
"version": "0.4.16",
"authors": [
"Tymon Tobolski <tymon.tobolski@monterail.com>",
"Krzysztof Jung <krzysztof.jung@monterail.com>"
Expand Down
10 changes: 6 additions & 4 deletions build/angular-date-range-picker.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions build/angular-date-range-picker.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 9 additions & 7 deletions src/angular-date-range-picker.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -60,31 +60,33 @@ angular.module("dateRangePicker").directive "dateRangePicker", ["$compile", "$ti
model: "=ngModel" # can't use ngModelController, we need isolated scope
customSelectOptions: "="
ranged: "="
isoWeek: "="
pastDates: "@"
callback: "&"

link: ($scope, element, attrs) ->
$scope.localWeekUnitName = if $scope.isoWeek then "isoWeek" else "week"
$scope.quickListDefinitions = $scope.customSelectOptions
$scope.quickListDefinitions ?= [
{
label: "This week",
range: moment().range(
moment().startOf("week").startOf("day"),
moment().endOf("week").startOf("day")
moment().startOf($scope.localWeekUnitName).startOf("day"),
moment().endOf($scope.localWeekUnitName).startOf("day")
)
}
{
label: "Next week",
range: moment().range(
moment().startOf("week").add(1, "week").startOf("day"),
moment().add(1, "week").endOf("week").startOf("day")
moment().startOf($scope.localWeekUnitName).add(1, "week").startOf("day"),
moment().add(1, "week").endOf($scope.localWeekUnitName).startOf("day")
)
}
{
label: "This fortnight",
range: moment().range(
moment().startOf("week").startOf("day"),
moment().add(1, "week").endOf("week").startOf("day")
moment().startOf($scope.localWeekUnitName).startOf("day"),
moment().add(1, "week").endOf($scope.localWeekUnitName).startOf("day")
)
}
{
Expand Down Expand Up @@ -154,7 +156,7 @@ angular.module("dateRangePicker").directive "dateRangePicker", ["$compile", "$ti
_prepare = () ->
$scope.months = []
startIndex = $scope.range.start.year()*12 + $scope.range.start.month()
startDay = moment().startOf("week").day()
startDay = moment().startOf($scope.localWeekUnitName).day()

$scope.range.by "days", (date) ->
d = date.day() - startDay
Expand Down
2 changes: 1 addition & 1 deletion test/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<h1>Date range picker</h1>
<date-range-picker ng-model="range"></date-range-picker>
<pre>{{ range.start.toDate() }} - {{ range.end.toDate() }}</pre>
<date-range-picker ng-model="range2" ranged="true" callback="fireCallback(range2)"></date-range-picker>
<date-range-picker ng-model="range2" ranged="true" iso-week="true" callback="fireCallback(range2)"></date-range-picker>
<button ng-click="change()">Change</button>
</div>
<div>
Expand Down