diff --git a/www/js/diary/list.js b/www/js/diary/list.js index d753eb1b3..3b9e85dc2 100644 --- a/www/js/diary/list.js +++ b/www/js/diary/list.js @@ -128,31 +128,38 @@ angular.module('emission.main.diary.list',['ui-leaflet', } } - $scope.datepickerObject = { - - todayLabel: $translate.instant('list-datepicker-today'), //Optional - closeLabel: $translate.instant('list-datepicker-close'), //Optional - setLabel: $translate.instant('list-datepicker-set'), //Optional - monthsList: moment.monthsShort(), - weeksList: moment.weekdaysMin(), - titleLabel: $translate.instant('diary.list-pick-a-date'), - setButtonType : 'button-positive', //Optional - todayButtonType : 'button-stable', //Optional - closeButtonType : 'button-stable', //Optional - inputDate: new Date(), //Optional - from: new Date(2015, 1, 1), - to: new Date(), - mondayFirst: true, //Optional - templateType: 'popup', //Optional - showTodayButton: 'true', //Optional - modalHeaderColor: 'bar-positive', //Optional - modalFooterColor: 'bar-positive', //Optional - callback: $scope.setCurrDay, //Mandatory - dateFormat: 'dd MMM yyyy', //Optional - closeOnSelect: true //Optional + $scope.getDatePickerObject = function() { + return { + todayLabel: $translate.instant('list-datepicker-today'), //Optional + closeLabel: $translate.instant('list-datepicker-close'), //Optional + setLabel: $translate.instant('list-datepicker-set'), //Optional + monthsList: moment.monthsShort(), + weeksList: moment.weekdaysMin(), + titleLabel: $translate.instant('diary.list-pick-a-date'), + setButtonType : 'button-positive', //Optional + todayButtonType : 'button-stable', //Optional + closeButtonType : 'button-stable', //Optional + inputDate: new Date(), //Optional + from: new Date(2015, 1, 1), + to: new Date(), + mondayFirst: true, //Optional + templateType: 'popup', //Optional + showTodayButton: 'true', //Optional + modalHeaderColor: 'bar-positive', //Optional + modalFooterColor: 'bar-positive', //Optional + callback: $scope.setCurrDay, //Mandatory + dateFormat: 'dd MMM yyyy', //Optional + closeOnSelect: true //Optional + } }; - $scope.pickDay = function () { + $scope.datepickerObject = $scope.getDatePickerObject(); + + $ionicPlatform.on("resume", function() { + $scope.datepickerObject = $scope.getDatePickerObject(); + }); + + $scope.pickDay = function() { ionicDatePicker.openDatePicker($scope.datepickerObject); } diff --git a/www/manual_lib/ionic-datepicker/ionic-datepicker.bundle.min.js b/www/manual_lib/ionic-datepicker/ionic-datepicker.bundle.min.js index 69f8959d2..70a4f41b9 100644 --- a/www/manual_lib/ionic-datepicker/ionic-datepicker.bundle.min.js +++ b/www/manual_lib/ionic-datepicker/ionic-datepicker.bundle.min.js @@ -1 +1 @@ -"undefined"!=typeof document&&function(e,t){var n=e.createElement("style");if(e.getElementsByTagName("head")[0].appendChild(n),n.styleSheet)n.styleSheet.disabled||(n.styleSheet.cssText=t);else try{n.innerHTML=t}catch(e){n.innerText=t}}(document,"/**/\n.padding_zero {\n padding: 0;\n}\n\n.ionic_datepicker_popup .font_bold {\n font-weight: bold;\n}\n\n.ionic_datepicker_popup .padding_top_zero {\n padding-top: 0;\n}\n\n.ionic_datepicker_popup .padding_left_5px {\n padding-left: 5px;\n}\n\n.ionic_datepicker_popup .padding_right_5px {\n padding-right: 5px;\n}\n\n.ionic_datepicker_popup .month_year_section {\n padding: 5px 0;\n}\n\n.ionic_datepicker_popup .calendar_grid {\n height: 215px;\n}\n\n.ionic_datepicker_popup .calendar_grid .weeks_row {\n padding: 0;\n}\n\n.ionic_datepicker_popup .today {\n border: 1px solid #009688;\n border-radius: 50%;\n}\n\n.ionic_datepicker_popup .selected_date {\n background-color: #009688;\n border-radius: 50%;\n color: #ffffff;\n font-weight: bold;\n}\n\n.ionic_datepicker_popup .popup-head {\n background-color: #009688;\n display: none;\n}\n\n.ionic_datepicker_popup .popup-head .popup-title {\n color: #ffffff;\n}\n\n.ionic_datepicker_popup .popup-head .popup-sub-title {\n color: #ffffff;\n}\n\n.ionic_datepicker_popup .popup-body {\n background-color: #ffffff;\n}\n\n.ionic_datepicker_popup .popup-body .selected_date_full {\n background-color: #009688;\n margin: -10px -10px 0 -10px;\n height: 45px;\n text-align: center;\n font-weight: bold;\n color: #ffffff;\n line-height: 45px;\n font-size: 18px;\n}\n\n.ionic_datepicker_popup .popup-body .select_section {\n padding: 1px 5px;\n}\n\n.ionic_datepicker_popup .popup-body .pointer_events_none {\n pointer-events: none;\n color: #aaaaaa !important;\n}\n\n.ionic_datepicker_popup .popup-body .month_select, .ionic_datepicker_popup .popup-body .year_select {\n border: none;\n border-bottom: 1px solid #009688;\n padding: 0;\n}\n\n.ionic_datepicker_popup .popup-body .month_select .input-label, .ionic_datepicker_popup .popup-body .year_select .input-label {\n padding: 2px 0;\n width: 0;\n}\n\n.ionic_datepicker_popup .popup-body .month_select select, .ionic_datepicker_popup .popup-body .year_select select {\n left: 10px;\n border: none;\n padding: 0;\n}\n\n.ionic_datepicker_popup .popup-body .month_select:after, .ionic_datepicker_popup .popup-body .year_select:after {\n right: 5px;\n color: #009688;\n}\n\n.ionic_datepicker_popup .popup-body .show_nav {\n padding: 5px 0 0 0;\n}\n\n.ionic_datepicker_popup .popup-body .show_nav .prev_btn_section {\n padding: 5px 0;\n text-align: left;\n}\n\n.ionic_datepicker_popup .popup-body .show_nav .prev_btn_section button {\n padding: 0;\n}\n\n.ionic_datepicker_popup .popup-body .show_nav .next_btn_section {\n padding: 5px 0;\n text-align: right;\n}\n\n.ionic_datepicker_popup .popup-body .show_nav .next_btn_section button {\n padding: 0;\n}\n\n.ionic_datepicker_popup .popup-body .button-clear {\n color: #009688;\n}\n\n.ionic_datepicker_popup .popup-buttons {\n padding: 0;\n min-height: 45px;\n}\n\n.ionic_datepicker_popup .popup-buttons button {\n background-color: #009688;\n border-radius: 0;\n margin-right: 1px;\n color: #ffffff;\n}\n\n.ionic_datepicker_popup .row + .row {\n padding: 0;\n}\n\n.ionic_datepicker_modal .header, .ionic_datepicker_modal .footer {\n background-color: #009688;\n}\n\n.ionic_datepicker_modal .header .title, .ionic_datepicker_modal .header .button, .ionic_datepicker_modal .footer .title, .ionic_datepicker_modal .footer .button {\n color: #ffffff;\n}\n\n.ionic_datepicker_modal .footer .button-block {\n margin: 0;\n}\n\n.ionic_datepicker_modal .today {\n border: 1px solid #009688;\n}\n\n.ionic_datepicker_modal .selected_date {\n background-color: #009688;\n color: #ffffff;\n font-weight: bold;\n}\n\n.ionic_datepicker_modal .pointer_events_none {\n pointer-events: none;\n color: #aaaaaa !important;\n}\n\n.ionic_datepicker_modal .select_section {\n padding: 1px 5px;\n}\n\n.ionic_datepicker_modal .button-clear {\n color: #009688;\n}\n\n.ionic_datepicker_modal .month_select, .ionic_datepicker_modal .year_select {\n border: none;\n border-bottom: 1px solid #009688;\n padding: 0;\n}\n\n.ionic_datepicker_modal .month_select .input-label, .ionic_datepicker_modal .year_select .input-label {\n padding: 2px 0;\n width: 0;\n}\n\n.ionic_datepicker_modal .month_select select, .ionic_datepicker_modal .year_select select {\n left: 10px;\n border: none;\n padding: 0 10px;\n}\n\n.ionic_datepicker_modal .month_select:after, .ionic_datepicker_modal .year_select:after {\n right: 5px;\n color: #009688;\n}\n\n.ionic_datepicker_modal .padding_left_5px {\n padding-left: 5px;\n}\n\n.ionic_datepicker_modal .padding_right_5px {\n padding-right: 5px;\n}\n\n.ionic_datepicker_modal .date_col {\n height: 50px;\n line-height: 50px;\n}\n\n.ionic_datepicker_modal .font_bold {\n font-weight: bold;\n}\n\n.ionic_datepicker_modal .font_22px {\n font-size: 22px;\n}\n\n.platform-android .ionic_datepicker_modal .bar .title.title-left {\n text-align: center;\n}\n\n.platform-android .ionic_datepicker_modal select {\n left: 25%;\n}\n\n.platform-ios .ionic_datepicker_modal select {\n left: 5%;\n}\n\n.date_col {\n cursor: pointer;\n}"),function(t){try{t=angular.module("ionic-datepicker.templates")}catch(e){t=angular.module("ionic-datepicker.templates",[])}t.run(["$templateCache",function(e){e.put("ionic-datepicker-modal.html",'

{{mainObj.titleLabel || selctedDateEpoch | date : mainObj.dateFormat}}

{{dayList[row + col].date}}
')}])}(),function(t){try{t=angular.module("ionic-datepicker.templates")}catch(e){t=angular.module("ionic-datepicker.templates",[])}t.run(["$templateCache",function(e){e.put("ionic-datepicker-popup.html",'
{{mainObj.titleLabel || selctedDateEpoch | date : mainObj.dateFormat}}
{{dayList[row + col].date}}
')}])}(),angular.module("ionic-datepicker",["ionic","ionic-datepicker.service","ionic-datepicker.provider","ionic-datepicker.templates"]),angular.module("ionic-datepicker.provider",[]).provider("ionicDatePicker",function(){var s={titleLabel:null,setLabel:"Set",todayLabel:"Today",closeLabel:"Close",inputDate:new Date,mondayFirst:!0,weeksList:["S","M","T","W","T","F","S"],monthsList:["Jan","Feb","March","April","May","June","July","Aug","Sept","Oct","Nov","Dec"],templateType:"popup",showTodayButton:!1,closeOnSelect:!1,disableWeekdays:[]};this.configDatePicker=function(e){angular.extend(s,e)},this.$get=["$rootScope","$ionicPopup","$ionicModal","IonicDatepickerService",function(e,n,t,r){var a={},l=e.$new();function p(e){return e.setHours(0),e.setMinutes(0),e.setSeconds(0),e.setMilliseconds(0),e}l.today=p(new Date).getTime(),l.disabledDates=[],l.data={},l.prevMonth=function(){1===l.currentDate.getMonth()&&l.currentDate.setFullYear(l.currentDate.getFullYear()),l.currentDate.setMonth(l.currentDate.getMonth()-1),l.data.currentMonth=l.mainObj.monthsList[l.currentDate.getMonth()],l.data.currentYear=l.currentDate.getFullYear(),i(l.currentDate),o()},l.nextMonth=function(){11===l.currentDate.getMonth()&&l.currentDate.setFullYear(l.currentDate.getFullYear()),l.currentDate.setDate(1),l.currentDate.setMonth(l.currentDate.getMonth()+1),l.data.currentMonth=l.mainObj.monthsList[l.currentDate.getMonth()],l.data.currentYear=l.currentDate.getFullYear(),l.monthChanged(l.currentDate.getMonth()),i(new Date),o()};var o=function(){var e=new Date(l.selctedDateEpoch);e.setMonth(l.currentDate.getMonth()),e.setYear(l.currentDate.getFullYear()),l.selctedDateEpoch=e.getTime(),l.mainObj.callback(l.selctedDateEpoch)};function i(e){e=p(e),l.currentDate=angular.copy(e);var t,n,a=new Date(e.getFullYear(),e.getMonth(),1).getDate(),o=new Date(e.getFullYear(),e.getMonth()+1,0).getDate();l.monthsList=[],l.mainObj.monthsList&&12===l.mainObj.monthsList.length?l.monthsList=l.mainObj.monthsList:l.monthsList=r.monthsList,l.yearsList=r.getYearsList(l.mainObj.from,l.mainObj.to),l.dayList=[],l.firstDayEpoch=p(new Date(e.getFullYear(),e.getMonth(),a)).getTime(),l.lastDayEpoch=p(new Date(e.getFullYear(),e.getMonth(),o)).getTime();for(var i=a;i<=o;i++)n=(t=new Date(e.getFullYear(),e.getMonth(),i)).getTime()l.toDate||0<=l.mainObj.disableWeekdays.indexOf(t.getDay()),l.dayList.push({date:t.getDate(),month:t.getMonth(),year:t.getFullYear(),day:t.getDay(),epoch:t.getTime(),disabled:n});var c=l.dayList[0].day-l.mainObj.mondayFirst;c=c<0?6:c;for(var d=0;d

{{mainObj.titleLabel || selctedDateEpoch | date : mainObj.dateFormat}}

{{dayList[row + col].date}}
')}])}(),function(t){try{t=angular.module("ionic-datepicker.templates")}catch(e){t=angular.module("ionic-datepicker.templates",[])}t.run(["$templateCache",function(e){e.put("ionic-datepicker-popup.html",'
{{mainObj.titleLabel || selctedDateEpoch | date : mainObj.dateFormat}}
{{dayList[row + col].date}}
')}])}(),angular.module("ionic-datepicker",["ionic","ionic-datepicker.service","ionic-datepicker.provider","ionic-datepicker.templates"]),angular.module("ionic-datepicker.provider",[]).provider("ionicDatePicker",function(){var s={titleLabel:null,setLabel:"Set",todayLabel:"Today",closeLabel:"Close",inputDate:new Date,mondayFirst:!0,weeksList:["S","M","T","W","T","F","S"],monthsList:["Jan","Feb","March","April","May","June","July","Aug","Sept","Oct","Nov","Dec"],templateType:"popup",showTodayButton:!1,closeOnSelect:!1,disableWeekdays:[]};this.configDatePicker=function(e){angular.extend(s,e)},this.$get=["$rootScope","$ionicPopup","$ionicModal","IonicDatepickerService",function(e,n,t,r){var a={},l=e.$new();function p(e){return e.setHours(0),e.setMinutes(0),e.setSeconds(0),e.setMilliseconds(0),e}l.today=p(new Date).getTime(),l.disabledDates=[],l.data={},l.prevMonth=function(){1===l.currentDate.getMonth()&&l.currentDate.setFullYear(l.currentDate.getFullYear()),l.currentDate.setMonth(l.currentDate.getMonth()-1),l.data.currentMonth=l.mainObj.monthsList[l.currentDate.getMonth()],l.data.currentYear=l.currentDate.getFullYear(),i(l.currentDate),o()},l.nextMonth=function(){11===l.currentDate.getMonth()&&l.currentDate.setFullYear(l.currentDate.getFullYear()),l.currentDate.setDate(1),l.currentDate.setMonth(l.currentDate.getMonth()+1),l.data.currentMonth=l.mainObj.monthsList[l.currentDate.getMonth()],l.data.currentYear=l.currentDate.getFullYear(),l.monthChanged(l.currentDate.getMonth()),i(new Date),o()};var o=function(){var e=new Date(l.selctedDateEpoch);e.setMonth(l.currentDate.getMonth()),e.setYear(l.currentDate.getFullYear()),l.selctedDateEpoch=e.getTime(),l.mainObj.callback(l.selctedDateEpoch)};function i(e){e=p(e),l.currentDate=angular.copy(e);var t,n,a=new Date(e.getFullYear(),e.getMonth(),1).getDate(),o=new Date(e.getFullYear(),e.getMonth()+1,0).getDate();l.monthsList=[],l.mainObj.monthsList&&12===l.mainObj.monthsList.length?l.monthsList=l.mainObj.monthsList:l.monthsList=r.monthsList,l.yearsList=r.getYearsList(l.mainObj.from,l.mainObj.to),l.dayList=[],l.firstDayEpoch=p(new Date(e.getFullYear(),e.getMonth(),a)).getTime(),l.lastDayEpoch=p(new Date(e.getFullYear(),e.getMonth(),o)).getTime();for(var i=a;i<=o;i++)n=(t=new Date(e.getFullYear(),e.getMonth(),i)).getTime()l.toDate||0<=l.mainObj.disableWeekdays.indexOf(t.getDay()),l.dayList.push({date:t.getDate(),month:t.getMonth(),year:t.getFullYear(),day:t.getDay(),epoch:t.getTime(),disabled:n});for(var c=(c=l.dayList[0].day-l.mainObj.mondayFirst)<0?6:c,d=0;d