Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 2 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"src/assets"
],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
"node_modules/datatables.net-dt/css/jquery.dataTables.css",
"node_modules/datatables.net-responsive-dt/css/responsive.dataTables.css",
"./node_modules/bootstrap/dist/css/bootstrap.min.css",
Expand Down Expand Up @@ -106,6 +107,7 @@
"src/assets"
],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
"src/styles.scss"
],
"scripts": []
Expand Down
60 changes: 45 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"@angular/compiler": "~10.2.2",
"@angular/core": "~10.2.2",
"@angular/forms": "~10.2.2",
"@angular/material": "^11.2.3",
"@angular/material-moment-adapter": "^11.2.9",
"@angular/platform-browser": "~10.2.2",
"@angular/platform-browser-dynamic": "~10.2.2",
"@angular/router": "~10.2.2",
Expand Down
7 changes: 6 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ import { StoreModule } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { DragDropModule } from '@angular/cdk/drag-drop';

import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatInputModule } from '@angular/material/input';
import { MatMomentDateModule } from '@angular/material-moment-adapter';
import { NgxPaginationModule } from 'ngx-pagination';
import { AutocompleteLibModule } from 'angular-ng-autocomplete';

Expand Down Expand Up @@ -134,6 +136,9 @@ const maskConfig: Partial<IConfig> = {
],
imports: [
NgxMaskModule.forRoot(maskConfig),
MatInputModule,
MatDatepickerModule,
MatMomentDateModule,
CommonModule,
BrowserModule,
BrowserAnimationsModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@
<label class="col-12 col-sm-2">Date in:</label>
<div class="col-12 col-sm-4">
<input
matInput
formControlName="start_date"
id="start_date"
type="date"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
Expand All @@ -93,7 +93,11 @@
(ngModelChange)="onStartDateChange($event)"
[max]="getCurrentDate()"
onkeydown="return false"
(click)="datepickerStartDate.opened ? datepickerStartDate.close() : datepickerStartDate.open()"
(dateInput)="start_date.setValue($event.value.format('YYYY-MM-DD'))"
[matDatepicker]="datepickerStartDate"
/>
<mat-datepicker #datepickerStartDate></mat-datepicker>
</div>

<label class="col-12 col-sm-2">Time in:</label>
Expand All @@ -112,17 +116,21 @@
<label class="col-12 col-sm-2">Date out:</label>
<div class="col-12 col-sm-4">
<input
matInput
formControlName="end_date"
id="end_date"
type="date"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
[class.is-invalid]="end_date.invalid && end_date.touched"
required
[max]="getCurrentDate()"
onkeydown="return false"
(click)="datepickerEndDate.opened ? datepickerEndDate.close() : datepickerEndDate.open()"
(dateInput)="end_date.setValue($event.value.format('YYYY-MM-DD'))"
[matDatepicker]="datepickerEndDate"
/>
<mat-datepicker #datepickerEndDate></mat-datepicker>
</div>

<label class="col-12 col-sm-2">Time out:</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -489,14 +489,14 @@ describe('DetailsFieldsComponent', () => {
});

it('on get current date should return expected date', () => {
const expectedDate = new Date().toISOString().split('T')[0];
const expectedDate = moment(new Date()).format(DATE_FORMAT_YEAR);

expect(component.getCurrentDate()).toEqual(expectedDate);
});

it('on the input with id #start_date we could get the id and max value', () => {
fixture.detectChanges();
const expectedDate = new Date().toISOString().split('T')[0];
const expectedDate = moment(new Date()).format(DATE_FORMAT_YEAR);
const startDateInput: HTMLInputElement = fixture.debugElement.
nativeElement.querySelector(`input[id="start_date"],input[max="${component.getCurrentDate()}"]`);

Expand All @@ -506,7 +506,7 @@ describe('DetailsFieldsComponent', () => {

it('on the input with id #end_date we could get the current Date ', () => {
fixture.detectChanges();
const expectedDate = new Date().toISOString().split('T')[0];
const expectedDate = moment(new Date()).format(DATE_FORMAT_YEAR);
const endDateInput = fixture.debugElement.nativeElement.querySelector('[id=end_date]');

expect(endDateInput.id).toEqual('end_date');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { EntryActionTypes } from './../../../time-clock/store/entry.actions';
import { SaveEntryEvent } from './save-entry-event';
import { ProjectSelectedEvent } from './project-selected-event';
import { get } from 'lodash';
import { DATE_FORMAT } from 'src/environments/environment';
import { DATE_FORMAT, DATE_FORMAT_YEAR } from 'src/environments/environment';
import { TechnologiesComponent } from '../technologies/technologies.component';

type Merged = TechnologyState & ProjectState & ActivityState & EntryState;
Expand Down Expand Up @@ -192,7 +192,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
}

getCurrentDate(): string {
return new Date().toISOString().split('T')[0];
return moment(new Date()).format(DATE_FORMAT_YEAR);
}

get project_id() {
Expand Down
6 changes: 5 additions & 1 deletion src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,8 @@ body {

.timepicker-backdrop-overlay {
z-index: 1100 !important;
}
}

.cdk-overlay-container {
z-index: 1100 !important;
}