Skip to content

TT-39 fix: comments #588

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 9 commits into from
Dec 29, 2020
Merged

TT-39 fix: comments #588

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8cdf916
TT-39 feat: allow switching among year
scastillo-jp Dec 16, 2020
e839109
TT-39 fix: resolve tests
scastillo-jp Dec 17, 2020
da55e06
TT-39 fix: creating test
scastillo-jp Dec 21, 2020
e23f6e8
TT-39 fix: code coverage
scastillo-jp Dec 22, 2020
5582e15
TT-39 fix: resolve comments
scastillo-jp Dec 24, 2020
d472a63
TT-39 fix: code coverage
scastillo-jp Dec 24, 2020
42aea4b
TT-39 fix: testing increment() and decrement()
scastillo-jp Dec 28, 2020
fc2587a
TT-39 fix: code refactor
Dec 29, 2020
881c520
TT-39 fix: variable refactor
Dec 29, 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
Prev Previous commit
Next Next commit
TT-39 fix: resolve comments
  • Loading branch information
@scastillo-jp
scastillo-jp authored and Guido Quezada committed Dec 28, 2020
commit 5582e153ea546fe3e14c70e8a88870c3dc69987c
4 changes: 2 additions & 2 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
Expand Up @@ -11,12 +11,12 @@
</button>
</div>
</div>
<div class="row">
<div class="row content-months">
<div class="spacing col-xl-1 col-lg-1 col-md-2 col-sm-2 col-xs-4" *ngFor="let month of months; let i = index">
<button class="btn btn-light btn-block"
[ngClass]="{'btn-primary': isSelectedMonth(i)}"
(click)="selectMonth(i)">
<small>{{ month.slice(0, 3) }}</small>
</button>
</div>
</div>
</div>
5 changes: 4 additions & 1 deletion 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 @@ -5,6 +5,9 @@
line-height: 1.2em;
font-weight: bold;
}
.content-months {
margin: 0;
}

.month {
background: $primary;
Expand All @@ -24,4 +27,4 @@
}
.spacing {
padding: 0.1em;
}
}
5 changes: 3 additions & 2 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 @@ -25,8 +25,9 @@ describe('MonthPickerComponent', () => {
});

it('should emit monthIndex and year', () => {
const month = 2;
const year = 2020;
const month = new Date().getMonth();
const year = new Date().getFullYear();

spyOn(component.dateSelected, 'emit');
expect(component.dateSelected.emit({ monthIndex: month, year: year }));
});
Expand Down
1 change: 0 additions & 1 deletion src/app/modules/time-entries/pages/time-entries.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import { TimeEntriesComponent } from './time-entries.component';
import { ActionsSubject } from '@ngrx/store';
import { EntryActionTypes } from './../../time-clock/store/entry.actions';
import { NgxMaterialTimepickerModule } from 'ngx-material-timepicker';
import { months } from 'moment';

describe('TimeEntriesComponent', () => {
type Merged = TechnologyState & ProjectState & EntryState;
Expand Down
2 changes: 0 additions & 2 deletions src/app/modules/time-entries/pages/time-entries.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
ngOnInit(): void {

this.store.dispatch(new entryActions.LoadEntries(this.selectedMonthIndex, this.year));
console.log('year', this.store.dispatch(new entryActions.LoadEntries(this.currentMonth, this.year)));

this.loadActiveEntry();

Expand Down Expand Up @@ -86,7 +85,6 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
this.canMarkEntryAsWIP = this.isEntryRunningEqualsToEntryToEdit(this.getEntryRunning(ds.data), this.entry)
|| this.isTheEntryToEditTheLastOne(ds.data);
});
console.log('entryId', this.entryId);
}

private isEntryRunningEqualsToEntryToEdit(entryRunning: Entry, entryToEdit: Entry) {
Expand Down