Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactored, bugfix and added functionality #92

Closed
wants to merge 3 commits into from
Closed

Refactored, bugfix and added functionality #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1148114
Fixed missing 'showTodayButton' implementation
alkoschuster Oct 7, 2015
88d8c4d
Fixed missing 'showTodayButton' implementation
alkoschuster Oct 7, 2015
d0649fa
- Made 'showTodayButton' fully functional
alkoschuster Oct 9, 2015
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
11 changes: 10 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ angular.module('mainModuleName', ['ionic', 'ionic-datepicker']){
to: new Date(2018, 8, 25), //Optional
callback: function (val) { //Mandatory
datePickerCallback(val);
}
},
subTitleLabel: 'SubTitle', //Optional
showTodayButton: true, //Optional
reverseTheYears: false, //Optional
};
````

Expand Down Expand Up @@ -133,6 +136,12 @@ var datePickerCallback = function (val) {
}
};
````
**s) subTitleLabel**(Optional) : The label for 'SubTitle' of the ionic-datepicker popup. Default value is an empty string.

**t) showTodayButton**(Optional) : Set `false` if you do not wish to show the `Today` button. Default value is `true`.

**u) reverseTheYears**(Optional) : Set `true` if you want the years in the select button to appear in reverse (descending) order. Default value is `false`.


5) Then use the below format in your template / html file

Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ionic-datepicker",
"version": "0.9.0",
"version": "0.9.1",
"authors": [
"rajeshwarpatlolla <rajeshwar.patlolla@gmail.com>"
],
Expand Down
2 changes: 1 addition & 1 deletion dist/ionic-datepicker.bundle.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ionic-datepicker",
"version": "0.9.0",
"version": "0.9.1",
"description": "A date picker for IONIC framework",
"main": [
"./dist/ionic-datepicker.bundle.min.js"
Expand Down
34 changes: 19 additions & 15 deletions src/ionic-datepicker-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ <h1 class="title">{{titleLabel}}</h1>
<div class="selected_date_full">{{selectedDateFull | date:"dd-MM-yyyy"}}</div>
<div class="row">
<div class="col col-10 left_arrow" ng-click="prevMonth()"
ng-class="{'pointer_events_none':(enableDatesFrom.isSet && enableDatesFrom.epoch > currentMonthFirstDayEpoch)}">
<button class="button-clear font_22px"
ng-class="{'color_blue':((enableDatesFrom.isSet && enableDatesFrom.epoch < currentMonthFirstDayEpoch) || (!enableDatesFrom.isSet))}">
<i class="icon ion-chevron-left"></i>
ng-class="{'pointer_events_none':(enableDatesFrom.epoch > currentMonthFirstDayEpoch)}">
<button class="button-clear font_22px">
<i class="icon ion-chevron-left" ng-class="{'color_blue':(enableDatesFrom.epoch < currentMonthFirstDayEpoch)}"></i>
</button>
</div>
<div class="col col-80 drop_down">
<div class="row select_section">
<div class="col col-50 month_dropdown">
<div class="col col-50 month_select">
<div class="list">
<label class="item item-input item-select">
<select ng-model="currentMonth" ng-change="monthChanged(currentMonth)" class="month_select">
Expand All @@ -27,7 +26,7 @@ <h1 class="title">{{titleLabel}}</h1>
</label>
</div>
</div>
<div class="col col-50 year_dropdown">
<div class="col col-50 year_select">
<div class="list">
<label class="item item-input item-select">
<select ng-model="currentYear" ng-change="yearChanged(currentYear)" class="year_select">
Expand All @@ -41,10 +40,9 @@ <h1 class="title">{{titleLabel}}</h1>
</div>
</div>
<div class="col col-10 right_arrow" ng-click="nextMonth()"
ng-class="{'pointer_events_none':(enableDatesTo.isSet && enableDatesTo.epoch < currentMonthLastDayEpoch)}">
<button class="button-clear font_22px"
ng-class="{'color_blue':((enableDatesTo.isSet && enableDatesTo.epoch > currentMonthLastDayEpoch) || (!enableDatesTo.isSet))}">
<i class="icon ion-chevron-right"></i>
ng-class="{'pointer_events_none':(enableDatesTo.epoch < currentMonthLastDayEpoch)}">
<button class="button-clear font_22px">
<i class="icon ion-chevron-right" ng-class="{'color_blue':(enableDatesTo.epoch > currentMonthLastDayEpoch)}"></i>
</button>
</div>
</div>
Expand All @@ -60,7 +58,7 @@ <h1 class="title">{{titleLabel}}</h1>
'date_selected': (dayList[$parent.$index * numColumns + $index].dateString === selctedDateStringCopy && dayList[$parent.$index * numColumns + $index].day != undefined) ,
'today' : (dayList[$parent.$index * numColumns + $index].date == today.date && dayList[$parent.$index * numColumns + $index].month == today.month && dayList[$parent.$index * numColumns + $index].year == today.year)}">
<div class="date_cell" ng-click="dateSelected(dayList[$parent.$index * numColumns + $index])"
ng-class="{'pointer_events_none':(disabledDates.indexOf(dayList[$parent.$index * numColumns + $index].epochLocal) > -1) || (enableDatesFrom.isSet && enableDatesFrom.epoch > dayList[$parent.$index * numColumns + $index].epochLocal) || (enableDatesTo.isSet && enableDatesTo.epoch < dayList[$parent.$index * numColumns + $index].epochLocal)}">
ng-class="{'pointer_events_none':(disabledDates.indexOf(dayList[$parent.$index * numColumns + $index].epochLocal) > -1) || (enableDatesFrom.epoch > dayList[$parent.$index * numColumns + $index].epochLocal) || (enableDatesTo.epoch < dayList[$parent.$index * numColumns + $index].epochLocal)}">
{{ dayList[$parent.$index * numColumns + $index].date }}
</div>
</div>
Expand All @@ -72,11 +70,17 @@ <h1 class="title">{{titleLabel}}</h1>
</div>
</div>
</ion-content>
<ion-footer-bar ng-class="modalFooterColor">
<ion-footer-bar ng-class="modalFooterColor">
<div class="row no_padding">
<div class="col-33 text-center" ng-click="closeIonicDatePickerModal()"><button class="button button-clear">{{closeLabel}}</button></div>
<div class="col-34 text-center" ng-click="setIonicDatePickerTodayDate()"><button class="button button-clear">{{todayLabel}}</button></div>
<div class="col-33 text-center" ng-click="setIonicDatePickerDate()"><button class="button button-clear">{{setLabel}}</button></div>
<div class="text-center" ng-class="{'col-33': showTodayButton, 'col-50': !showTodayButton}" ng-click="closeIonicDatePickerModal()">
<button class="button button-clear">{{closeLabel}}</button>
</div>
<div class="col-34 text-center ng-hide" ng-show="showTodayButton" ng-click="setIonicDatePickerTodayDate()">
<button class="button button-clear">{{todayLabel}}</button>
</div>
<div class="text-center" ng-class="{'col-33': showTodayButton, 'col-50': !showTodayButton}" ng-click="setIonicDatePickerDate()">
<button class="button button-clear">{{setLabel}}</button>
</div>
</div>
</ion-footer-bar>
</ion-modal-view>
20 changes: 9 additions & 11 deletions src/ionic-datepicker-popup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@
<div class="selected_date_full">{{selectedDateFull | date:"dd-MM-yyyy"}}</div>
<div class="row no_padding">
<div class="col col-10 left_arrow" ng-click="prevMonth()"
ng-class="{'pointer_events_none':(enableDatesFrom.isSet && enableDatesFrom.epoch > currentMonthFirstDayEpoch)}">
<button class="button-clear"
ng-class="{'color_blue':((enableDatesFrom.isSet && enableDatesFrom.epoch < currentMonthFirstDayEpoch) || (!enableDatesFrom.isSet))}">
<i class="icon ion-chevron-left"></i>
ng-class="{'pointer_events_none':(enableDatesFrom.epoch > currentMonthFirstDayEpoch)}">
<button class="button-clear">
<i class="icon ion-chevron-left" ng-class="{'color_blue':(enableDatesFrom.epoch < currentMonthFirstDayEpoch)}"></i>
</button>
</div>
<div class="col col-80 drop_down no_padding">
<div class="row select_section">
<div class="col col-50 month_dropdown">
<div class="col col-50 month_select">
<div class="list">
<label class="item item-input item-select">
<select ng-model="currentMonth" ng-change="monthChanged(currentMonth)" class="month_select">
Expand All @@ -21,7 +20,7 @@
</label>
</div>
</div>
<div class="col col-50 year_dropdown">
<div class="col col-50 year_select">
<div class="list">
<label class="item item-input item-select">
<select ng-model="currentYear" ng-change="yearChanged(currentYear)" class="year_select">
Expand All @@ -35,10 +34,9 @@
</div>
</div>
<div class="col col-10 right_arrow" ng-click="nextMonth()"
ng-class="{'pointer_events_none':(enableDatesTo.isSet && enableDatesTo.epoch < currentMonthLastDayEpoch)}">
<button class="button-clear"
ng-class="{'color_blue':((enableDatesTo.isSet && enableDatesTo.epoch > currentMonthLastDayEpoch) || (!enableDatesTo.isSet))}">
<i class="icon ion-chevron-right"></i>
ng-class="{'pointer_events_none':(enableDatesTo.epoch < currentMonthLastDayEpoch)}">
<button class="button-clear">
<i class="icon ion-chevron-right" ng-class="{'color_blue':(enableDatesTo.epoch > currentMonthLastDayEpoch)}"></i>
</button>
</div>
</div>
Expand All @@ -53,7 +51,7 @@
'date_selected': (dayList[$parent.$index * numColumns + $index].dateString === selctedDateStringCopy && dayList[$parent.$index * numColumns + $index].day != undefined) ,
'today' : (dayList[$parent.$index * numColumns + $index].date == today.date && dayList[$parent.$index * numColumns + $index].month == today.month && dayList[$parent.$index * numColumns + $index].year == today.year)}">
<div class="date_cell" ng-click="dateSelected(dayList[$parent.$index * numColumns + $index])"
ng-class="{'pointer_events_none':(disabledDates.indexOf(dayList[$parent.$index * numColumns + $index].epochLocal) > -1) || (enableDatesFrom.isSet && enableDatesFrom.epoch > dayList[$parent.$index * numColumns + $index].epochLocal) || (enableDatesTo.isSet && enableDatesTo.epoch < dayList[$parent.$index * numColumns + $index].epochLocal)}">
ng-class="{'pointer_events_none':(disabledDates.indexOf(dayList[$parent.$index * numColumns + $index].epochLocal) > -1) || (enableDatesFrom.epoch > dayList[$parent.$index * numColumns + $index].epochLocal) || (enableDatesTo.epoch < dayList[$parent.$index * numColumns + $index].epochLocal)}">
{{ dayList[$parent.$index * numColumns + $index].date }}
</div>
</div>
Expand Down
Loading