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

Update timepicker to ionic 5 #5

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update timepicker to ionic 5 #5

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
284c8e5
Update project to Angular 8 and Ionic 5.
dguardadoh May 5, 2020
884a910
Fix error that occurred when hour, minute or seconds was selected.
dguardadoh May 5, 2020
0cda1e4
Fix bug that happened when time was 00:00
dguardadoh May 6, 2020
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
48 changes: 24 additions & 24 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,54 +19,54 @@
},
"private": true,
"dependencies": {
"@angular/common": "^7.2.2",
"@angular/core": "^7.2.2",
"@angular/forms": "^7.2.2",
"@angular/common": "~8.1.2",
"@angular/core": "~8.1.2",
"@angular/forms": "~8.1.2",
"@angular/http": "^7.2.2",
"@angular/platform-browser": "^7.2.2",
"@angular/platform-browser-dynamic": "^7.2.2",
"@angular/router": "^7.2.2",
"@angular/platform-browser": "~8.1.2",
"@angular/platform-browser-dynamic": "~8.1.2",
"@angular/router": "~8.1.2",
"@ionic-native/core": "^5.0.0",
"@ionic-native/device": "^5.5.1",
"@ionic-native/device": "^5.21.5",
"@ionic-native/splash-screen": "^5.0.0",
"@ionic-native/status-bar": "^5.0.0",
"@ionic/angular": "^4.1.0",
"@ionic/angular": "^5.0.1",
"core-js": "^2.5.4",
"moment": "^2.24.0",
"rxjs": "~6.5.1",
"zone.js": "~0.8.29",
"zone.js": "~0.9.1",
"tslib": "^1.9.0"
},
"devDependencies": {
"@angular-devkit/architect": "~0.13.8",
"@angular-devkit/build-angular": "~0.13.8",
"@angular-devkit/architect": "~0.801.2",
"@angular-devkit/build-angular": "~0.801.2",
"@angular-devkit/build-ng-packagr": "~0.11.0",
"@angular-devkit/core": "~7.3.8",
"@angular-devkit/schematics": "~7.3.8",
"@angular/cli": "~7.3.8",
"@angular/compiler": "~7.2.2",
"@angular/compiler-cli": "~7.2.2",
"@angular/language-service": "~7.2.2",
"@ionic/angular-toolkit": "~1.5.1",
"@types/jasmine": "~2.8.8",
"@angular-devkit/core": "~8.1.2",
"@angular-devkit/schematics": "~8.1.2",
"@angular/cli": "~8.1.2",
"@angular/compiler": "~8.1.2",
"@angular/compiler-cli": "~8.1.2",
"@angular/language-service": "~8.1.2",
"@ionic/angular-toolkit": "~2.2.0",
"@types/jasmine": "~3.3.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~12.0.0",
"codelyzer": "~4.5.0",
"jasmine-core": "~2.99.1",
"codelyzer": "~5.0.0",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.1.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"ng-packagr": "^4.2.0",
"node-sass": "^4.12.0",
"protractor": "~5.4.0",
"ts-node": "~8.1.0",
"tsickle": ">=0.29.0",
"tslib": "^1.9.0",
"tslint": "~5.16.0",
"typescript": "~3.1.6"
"typescript": "~3.4.3"
},
"description": "An Ionic project"
}
2 changes: 1 addition & 1 deletion ...cts/ionic-timepicker/src/lib/ionic-timepicker-modal/ionic-timepicker-modal.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}

ion-footer {
height: 44px;
height: 57px;

ion-toolbar {
--min-height: 100%;
Expand Down
34 changes: 26 additions & 8 deletions projects/ionic-timepicker/src/lib/ionic-timepicker-modal/ionic-timepicker-modal.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ const moment = moment_;

export class IonicTimepickerModalComponent implements OnInit, OnDestroy {

@ViewChild('sliderHours') sliderHours: IonSlides;
@ViewChild('sliderMinutes') sliderMinutes: IonSlides;
@ViewChild('sliderSeconds') sliderSeconds: IonSlides;
@ViewChild('sliderMeridian') sliderMeridian: IonSlides;
@ViewChild('sliderHours', { static: false }) sliderHours: IonSlides;
@ViewChild('sliderMinutes', { static: false }) sliderMinutes: IonSlides;
@ViewChild('sliderSeconds', { static: false }) sliderSeconds: IonSlides;
@ViewChild('sliderMeridian', { static: false }) sliderMeridian: IonSlides;

hoursArray: any = [];
minutesArray: any = [];
Expand Down Expand Up @@ -93,7 +93,7 @@ export class IonicTimepickerModalComponent implements OnInit, OnDestroy {
inItTimePicker(): Observable<any> {
const myObservable = new Observable(observer => {
if (this.navParams.get('selectedTime')) {
console.log('Selected time =>', this.navParams.get('selectedTime'));
// console.log('Selected time =>', this.navParams.get('selectedTime'));
this.selectedTime = this.navParams.get('selectedTime');
}
this.mainObj = this.initTimePickerObject(this.navParams.get('objConfig'));
Expand All @@ -115,17 +115,35 @@ export class IonicTimepickerModalComponent implements OnInit, OnDestroy {

// get slider hours active index
onChangeHoursSlide(event) {
this.sliderHoursActiveIndex = event.target.swiper.realIndex;
if (event.target.swiper.previousIndex === 0 && this.selectedTime === undefined) {
this.sliderHoursActiveIndex = event.target.swiper.realIndex;
} else if ( event.target.swiper.previousIndex === 0 && event.target.swiper.realIndex !== 0) {
this.sliderHoursActiveIndex = event.target.swiper.realIndex - event.target.swiper.loopedSlides;
} else {
this.sliderHoursActiveIndex = event.target.swiper.realIndex;
}
}

// get slider minutes active index
onChangeMinutesSlide(event) {
this.sliderMinutesActiveIndex = event.target.swiper.realIndex;
if (event.target.swiper.previousIndex === 0 && this.selectedTime === undefined) {
this.sliderMinutesActiveIndex = event.target.swiper.realIndex;
} else if ( event.target.swiper.previousIndex === 0 && event.target.swiper.realIndex !== 0) {
this.sliderMinutesActiveIndex = event.target.swiper.realIndex - event.target.swiper.loopedSlides;
} else {
this.sliderMinutesActiveIndex = event.target.swiper.realIndex;
}
}

// get slider seconds active index
onChangeSecondsSlide(event) {
this.sliderSecondsActiveIndex = event.target.swiper.realIndex;
if (event.target.swiper.previousIndex === 0 && this.selectedTime === undefined) {
this.sliderSecondsActiveIndex = event.target.swiper.realIndex;
} else if ( event.target.swiper.previousIndex === 0 && event.target.swiper.realIndex !== 0) {
this.sliderSecondsActiveIndex = event.target.swiper.realIndex - event.target.swiper.loopedSlides;
} else {
this.sliderSecondsActiveIndex = event.target.swiper.realIndex;
}
}

// get slider seconds active index
Expand Down
6 changes: 3 additions & 3 deletions src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ion-app>
<ion-split-pane>
<ion-menu>
<ion-split-pane contentId="main-content">
<ion-menu contentId="main-content" type="overlay">
<ion-header>
<ion-toolbar>
<ion-title>Menu</ion-title>
Expand All @@ -18,6 +18,6 @@
</ion-list>
</ion-content>
</ion-menu>
<ion-router-outlet main></ion-router-outlet>
<ion-router-outlet id="main-content"></ion-router-outlet>
</ion-split-pane>
</ion-app>
4 changes: 2 additions & 2 deletions src/app/home/home.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { IonicModule } from '@ionic/angular';
import { RouterModule } from '@angular/router';

import { HomePage } from './home.page';
// import { IonicTimepickerModule } from '../../../projects/ionic-timepicker/src/lib/ionic-timepicker.module';
import { IonicTimepickerModule } from 'ionic-timepicker';
import { IonicTimepickerModule } from '../../../projects/ionic-timepicker/src/lib/ionic-timepicker.module';
// import { IonicTimepickerModule } from 'ionic-timepicker';

@NgModule({
imports: [
Expand Down
4 changes: 2 additions & 2 deletions src/app/reactive-form/reactive-form.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { Routes, RouterModule } from '@angular/router';
import { IonicModule } from '@ionic/angular';

import { ReactiveFormPage } from './reactive-form.page';
// import { IonicTimepickerModule } from '../../../projects/ionic-timepicker/src/lib/ionic-timepicker.module';
import { IonicTimepickerModule } from 'ionic-timepicker';
import { IonicTimepickerModule } from '../../../projects/ionic-timepicker/src/lib/ionic-timepicker.module';
// import { IonicTimepickerModule } from 'ionic-timepicker';

const routes: Routes = [
{
Expand Down
4 changes: 2 additions & 2 deletions src/app/template-driven-form/template-driven-form.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { FormsModule } from '@angular/forms';
import { Routes, RouterModule } from '@angular/router';
import { IonicModule } from '@ionic/angular';
import { TemplateDrivenFormPage } from './template-driven-form.page';
// import { IonicTimepickerModule } from '../../../projects/ionic-timepicker/src/lib/ionic-timepicker.module';
import { IonicTimepickerModule } from 'ionic-timepicker';
import { IonicTimepickerModule } from '../../../projects/ionic-timepicker/src/lib/ionic-timepicker.module';
// import { IonicTimepickerModule } from 'ionic-timepicker';

const routes: Routes = [
{
Expand Down
3 changes: 2 additions & 1 deletion src/app/timepicker-button/timepicker-button.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { Routes, RouterModule } from '@angular/router';
import { IonicModule } from '@ionic/angular';

import { TimepickerButtonPage } from './timepicker-button.page';
import { IonicTimepickerModule } from 'ionic-timepicker';
import { IonicTimepickerModule } from '../../../projects/ionic-timepicker/src/lib/ionic-timepicker.module';
// import { IonicTimepickerModule } from 'ionic-timepicker';

const routes: Routes = [
{
Expand Down
6 changes: 4 additions & 2 deletions src/app/timepicker-button/timepicker-button.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { IonicTimepickerModule } from 'ionic-timepicker';
import { IonicTimepickerModalComponent } from 'ionic-timepicker';
// import { IonicTimepickerModule } from 'ionic-timepicker';
import { IonicTimepickerModule } from '../../../projects/ionic-timepicker/src/lib/ionic-timepicker.module';
// import { IonicTimepickerModalComponent } from 'ionic-timepicker';
import { IonicTimepickerModalComponent } from '../../../projects/ionic-timepicker/src/lib/ionic-timepicker-modal/ionic-timepicker-modal.component';

@Component({
selector: 'app-timepicker-button',
Expand Down
4 changes: 2 additions & 2 deletions src/app/timepicker-component/timepicker-component.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { Routes, RouterModule } from '@angular/router';
import { IonicModule } from '@ionic/angular';

import { TimepickerComponentPage } from './timepicker-component.page';
// import { IonicTimepickerModule } from '../../../projects/ionic-timepicker/src/lib/ionic-timepicker.module';
import { IonicTimepickerModule } from 'ionic-timepicker';
import { IonicTimepickerModule } from '../../../projects/ionic-timepicker/src/lib/ionic-timepicker.module';
// import { IonicTimepickerModule } from 'ionic-timepicker';

const routes: Routes = [
{
Expand Down
4 changes: 2 additions & 2 deletions src/app/timepicker-directive/timepicker-directive.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { FormsModule } from '@angular/forms';
import { Routes, RouterModule } from '@angular/router';
import { IonicModule } from '@ionic/angular';
import { TimepickerDirectivePage } from './timepicker-directive.page';
// import { IonicTimepickerModule } from '../../../projects/ionic-timepicker/src/lib/ionic-timepicker.module';
import { IonicTimepickerModule } from 'ionic-timepicker';
import { IonicTimepickerModule } from '../../../projects/ionic-timepicker/src/lib/ionic-timepicker.module';
// import { IonicTimepickerModule } from 'ionic-timepicker';

const routes: Routes = [
{
Expand Down