Skip to content

fix: TT-140 time entry info is lost if project is selected at last #636

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 3 commits into from
Feb 8, 2021
Merged

fix: TT-140 time entry info is lost if project is selected at last #636

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
0a6f842
fix: TT-140 time entry info is lost if project is selected at last
LEON12699 Feb 3, 2021
997af76
fix: TT-140 implement toast improve color and correct border
LEON12699 Feb 5, 2021
4133133
fix: TT-140 change message toast
LEON12699 Feb 8, 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
220 changes: 118 additions & 102 deletions src/app/modules/shared/components/details-fields/details-fields.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
<form [formGroup]="entryForm" (ngSubmit)="onSubmit()">
<label *ngIf='canMarkEntryAsWIP'><input id='isEntryRunning' type="checkbox" (change)="onGoingToWorkOnThisChange($event)" [checked]="goingToWorkOnThis"> I am working on
this</label>
<label *ngIf="canMarkEntryAsWIP">
<input
id="isEntryRunning"
type="checkbox"
(change)="onGoingToWorkOnThisChange($event)"
[checked]="goingToWorkOnThis"
/>
I am working on this
</label>

<div class="form-group row">
<label class="col-12 col-sm-2 col-form-label">Project:</label>
<div class="col-12 col-sm-10 autocomplete">
<ng-autocomplete
(selected)='onSelectedProject($event)'
(inputCleared)='onClearedComponent($event)'
(selected)="onSelectedProject($event)"
(inputCleared)="onClearedComponent($event)"
formControlName="project_name"
[data]="listProjects"
[searchKeyword]="keyword"
historyIdentifier="projectsSelected"
notFoundText="No projects found"
placeHolder="Enter the project name"
[itemTemplate]="itemTemplate"
[notFoundTemplate]="notFoundTemplate">
[notFoundTemplate]="notFoundTemplate"
[class.valid]="project_name.invalid"
>
</ng-autocomplete>

<ng-template #itemTemplate let-item>
Expand All @@ -33,108 +42,115 @@
<!-- <app-loading-bar *ngIf="(isLoading$ | async)"></app-loading-bar> -->
</div>
</div>
<div (click)="onclickFormAction(!(project_id.value && project_name.value))">
<fieldset [disabled]="!(project_id.value && project_name.value)">
<div class="form-group row">
<label class="col-12 col-sm-2 col-form-label">Activity:</label>
<div class="col-12 col-sm-10">
<select
[class.is-invalid]="activity_id.invalid && activity_id.touched"
required
id="activity_id"
class="custom-select"
formControlName="activity_id"
>
<option value="" selected="selected"></option>
<option *ngFor="let activity of activities" value="{{ activity.id }}">{{ activity.name }}</option>
</select>
</div>
<div
class="invalid-feedback"
*ngIf="(activity_id.dirty || activity_id.touched) && activity_id.invalid && activity_id.errors.required"
></div>
</div>

<div class="form-group row">
<label class="col-12 col-sm-2 col-form-label">Ticket:</label>
<div class="col-12 col-sm-10">
<input
formControlName="uri"
id="uri"
type="text"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
/>
</div>
</div>

<div class="form-group row">
<label class="col-12 col-sm-2">Date in:</label>
<div class="col-12 col-sm-4">
<input
formControlName="start_date"
id="start_date"
type="date"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
[class.is-invalid]="start_date.invalid && start_date.touched"
required
/>
</div>

<label class="col-12 col-sm-2">Time in:</label>
<div class="col-12 col-sm-4">
<ngx-timepicker-field
[format]="24"
formControlName="start_hour"
id="start_hour"
[disabled]="!(project_name.value && project_id.value)"
class="timepicker-input"
></ngx-timepicker-field>
</div>
</div>

<div class="form-group row" *ngIf="!goingToWorkOnThis">
<label class="col-12 col-sm-2">Date out:</label>
<div class="col-12 col-sm-4">
<input
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
/>
</div>

<div class="form-group row">
<label class="col-12 col-sm-2 col-form-label">Activity:</label>
<div class="col-12 col-sm-10">
<select
[class.is-invalid]="activity_id.invalid"
required
id="activity_id"
class="custom-select"
formControlName="activity_id"
>
<option value="" selected="selected"></option>
<option *ngFor="let activity of activities" value="{{ activity.id }}">{{ activity.name }}</option>
</select>
</div>
<div
class="invalid-feedback"
*ngIf="(activity_id.dirty || activity_id.touched) && activity_id.invalid && activity_id.errors.required"
></div>
</div>


<div class="form-group row">
<label class="col-12 col-sm-2 col-form-label">Ticket:</label>
<div class="col-12 col-sm-10">
<input
formControlName="uri"
id="uri"
type="text"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
/>
</div>
</div>


<div class="form-group row">
<label class="col-12 col-sm-2">Date in:</label>
<div class="col-12 col-sm-4">
<input
formControlName="start_date"
id="start_date"
type="date"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
[class.is-invalid]="start_date.invalid && start_date.touched"
required
/>
</div>

<label class="col-12 col-sm-2">Time in:</label>
<div class="col-12 col-sm-4">
<ngx-timepicker-field
[format]="24"
formControlName="start_hour"
id="start_hour"
></ngx-timepicker-field>
</div>
</div>
<label class="col-12 col-sm-2">Time out:</label>
<div class="col-12 col-sm-4">
<ngx-timepicker-field
[format]="24"
formControlName="end_hour"
id="end_hour"
[disabled]="!(project_name.value && project_id.value)"
class="timepicker-input"
></ngx-timepicker-field>
</div>
</div>

<app-technologies
(technologyAdded)="onTechnologiesUpdated($event)"
(technologyRemoved)="onTechnologiesUpdated($event)"
[selectedTechnologies]="selectedTechnologies"
>
</app-technologies>

<div class="form-group row" *ngIf="!goingToWorkOnThis">
<label class="col-12 col-sm-2">Date out:</label>
<div class="col-12 col-sm-4">
<input
formControlName="end_date"
id="end_date"
type="date"
<div class="form-group text-left">
<label for="NotesTextarea">Description:</label>
<textarea
maxlength="1500"
formControlName="description"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
[class.is-invalid]="end_date.invalid && end_date.touched"
required
/>
</div>

<label class="col-12 col-sm-2">Time out:</label>
<div class="col-12 col-sm-4">
<ngx-timepicker-field
[format]="24"
formControlName="end_hour"
id="end_hour"
></ngx-timepicker-field>
</div>
</div>


<app-technologies
(technologyAdded)="onTechnologiesUpdated($event)"
(technologyRemoved)="onTechnologiesUpdated($event)"
[selectedTechnologies]="selectedTechnologies"
>
</app-technologies>


<div class="form-group text-left">
<label for="NotesTextarea">Description:</label>
<textarea maxlength="1500" formControlName="description" class="form-control" id="NotesTextarea"
rows="3"></textarea>
id="NotesTextarea"
rows="3"
>
</textarea>
</div>
</fieldset>
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-primary">Save</button>
Expand Down
10 changes: 10 additions & 0 deletions src/app/modules/shared/components/details-fields/details-fields.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,13 @@ input[type="date"]::-webkit-clear-button {
border: none;
margin: 0em;
}

.valid ::ng-deep .autocomplete-container ::ng-deep .input-container ::ng-deep input {
border: 1px solid $primary;
border-radius: 0.25rem;
}

.timepicker-input ::ng-deep div{
border-radius: 0.25rem;
}

6 changes: 6 additions & 0 deletions src/app/modules/shared/components/details-fields/details-fields.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,12 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
this.saveEntry.emit({ entry, shouldRestartEntry: this.shouldRestartEntry });
}

onclickFormAction(isProjectSelected: boolean){
if (isProjectSelected){
this.toastrService.warning('Please, first select a project');
}
}

onGoingToWorkOnThisChange(event: any) {
this.goingToWorkOnThis = event.currentTarget.checked;
if (!this.goingToWorkOnThis) {
Expand Down