Skip to content

TT-107 feat: Limit the year selector in UI to the current year #604

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

Merged
merged 6 commits into from
Jan 7, 2021
Merged

TT-107 feat: Limit the year selector in UI to the current year #604

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
743c2af
TT-107 feat: Limit the year selector in UI to the current year
scastillo-jp Jan 5, 2021
32894ef
TT-107 fix: code cov
scastillo-jp Jan 5, 2021
c51e9d2
TT-107 fix: resolve comments
scastillo-jp Jan 5, 2021
1b7ebe6
TT-107 fix: order variables
scastillo-jp Jan 5, 2021
6209d10
TT-107 fix: resolve a comment
scastillo-jp Jan 5, 2021
ebf99e9
TT-107 fix: improve changes
scastillo-jp Jan 6, 2021
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
27 changes: 17 additions & 10 deletions src/app/modules/shared/components/month-picker/month-picker.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
<div class="card-header">
<div class="d-flex align-items-center">
<button class="btn mr-auto" (click)="changeYear('subtract')">
<i class="fa fa-chevron-left"></i>
</button>
<p>
{{selectedYearText}}
</p>
<button class="btn ml-auto" (click)="changeYear('add')">
<i class="fa fa-chevron-right"></i>
</button>
<div class="row align-items-center">
<div class="col-sm-4">
<button class="btn mr-auto" (click)="changeYear('subtract')">
<i class="fa fa-chevron-left"></i>
</button>
</div>
<div class="col-sm-4">
<p class="text-center year-text">
{{selectedYearText}}
</p>
</div>

<div class="col-sm-4 text-right">
<button *ngIf="showArrowNext" class="btn ml-auto" (click)="changeYear('add')">
<i class="fa fa-chevron-right"></i>
</button>
</div>
</div>
</div>
<div class="row content-months">
Expand Down
4 changes: 4 additions & 0 deletions src/app/modules/shared/components/month-picker/month-picker.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
margin: 0;
}

.year-text {
margin-bottom: 0;
}

.month {
background: $primary;
color: white;
Expand Down
12 changes: 7 additions & 5 deletions src/app/modules/shared/components/month-picker/month-picker.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ describe('MonthPickerComponent', () => {
expect(component.changeYear).toHaveBeenCalled();
expect(component.selectedYearText).toEqual(incrementYear);
expect(component.selectedYearMoment.format('Y')).toEqual(incrementYear);
expect(component.showArrowNext).toEqual(false);
});


it('should subtract a year to current year', () => {
component.selectedYearMoment = moment();
const decrementYear = moment().subtract(1, 'year').format('Y');
Expand All @@ -58,12 +58,14 @@ describe('MonthPickerComponent', () => {
expect(component.selectedYearMoment.format('Y')).toEqual(decrementYear);
});


it('selectMonth should call selectDate', () => {
component.selectedYear = 2020;
const monthSelect = new Date().getMonth();
const yearSelect = new Date().getFullYear();
spyOn(component, 'selectDate');
component.selectMonth(10);
expect(component.selectDate).toHaveBeenCalledWith(10, 2020);

component.selectMonth(monthSelect);

expect(component.selectDate).toHaveBeenCalledWith(monthSelect, yearSelect);
});

});
5 changes: 4 additions & 1 deletion src/app/modules/shared/components/month-picker/month-picker.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ export class MonthPickerComponent implements OnInit {
selectedMonthIndex: number;
selectedYearMoment: moment.Moment;
selectedYear: number;

selectedYearText: string;
months: Array<string> = [];
currentYear = new Date().getFullYear();
showArrowNext = false;

constructor() {
this.selectedYearMoment = moment();
Expand All @@ -40,6 +41,8 @@ export class MonthPickerComponent implements OnInit {

const monthIndex = changeAction === 'add' ? 0 : 11;
this.selectMonth(monthIndex);

this.showArrowNext = this.selectedYear < this.currentYear ?? true;
}

selectMonth(monthIndex: number) {
Expand Down