Skip to content

fix: 📱 improve forms of time-entries page #533

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 1 commit into from
Oct 13, 2020
Merged

fix: 📱 improve forms of time-entries page #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
172 changes: 87 additions & 85 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
Expand Up @@ -2,13 +2,9 @@
<label *ngIf='canMarkEntryAsWIP'><input id='isEntryRunning' type="checkbox" (change)="onGoingToWorkOnThisChange($event)" [checked]="goingToWorkOnThis"> I am working on
this</label>

<div class="input-group input-group-sm mb-3">

<div class="input-group-prepend">
<span class="input-group-text span-width">Project</span>
</div>

<div class="form-control autocomplete">
<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)'
Expand Down Expand Up @@ -36,110 +32,116 @@
</ng-template>
<!-- <app-loading-bar *ngIf="(isLoading$ | async)"></app-loading-bar> -->
</div>


</div>

<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text span-width">Activity</span>

<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>
<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
class="invalid-feedback"
*ngIf="(activity_id.dirty || activity_id.touched) && activity_id.invalid && activity_id.errors.required"
></div>
</div>

<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text span-width">Ticket</span>

<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>
<input
formControlName="uri"
id="uri"
type="text"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
/>
</div>

<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text span-width">Date</span>

<div class="form-group row">
<label class="col-12 col-sm-2 col-form-label">Date:</label>
<div class="col-12 col-sm-10">
<input
formControlName="entry_date"
id="entry_date"
type="date"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
[class.is-invalid]="entry_date.invalid && entry_date.touched"
required
/>
</div>
<input
formControlName="entry_date"
id="entry_date"
type="date"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
[class.is-invalid]="entry_date.invalid && entry_date.touched"
required
/>
</div>
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text span-width">Time in</span>


<div class="form-group row">
<label class="col-12 col-sm-2 col-form-label pr-0">Time in:</label>
<div class="col-12 col-sm-4">
<input
[clearIfNotMatch]="true"
[showMaskTyped]="true"
[dropSpecialCharacters]="false"
matInput
mask="Hh:m0:s0"
onClick="this.select();"
formControlName="start_hour"
id="start_hour"
type="text"
class="form-control"
aria-label="Small"
[class.is-invalid]="start_hour.invalid && start_hour.touched"
required
aria-describedby="inputGroup-sizing-sm"
/>
</div>
<input
[clearIfNotMatch]="true"
[showMaskTyped]="true"
[dropSpecialCharacters]="false"
matInput
mask="Hh:m0:s0"
onClick="this.select();"
formControlName="start_hour"
id="start_hour"
type="text"
class="form-control"
aria-label="Small"
[class.is-invalid]="start_hour.invalid && start_hour.touched"
required
aria-describedby="inputGroup-sizing-sm"
/>
<div class="input-group-prepend" *ngIf="!goingToWorkOnThis">
<span class="input-group-text span-width">Time out</span>

<label class="col-12 col-sm-2 col-form-label pr-0" *ngIf="!goingToWorkOnThis">Time out:</label>
<div class="col-12 col-sm-4" *ngIf="!goingToWorkOnThis">
<input
*ngIf="!goingToWorkOnThis"
[clearIfNotMatch]="true"
[showMaskTyped]="true"
[dropSpecialCharacters]="false"
matInput
onClick="this.select();"
mask="Hh:m0:s0"
formControlName="end_hour"
type="text"
id="end_hour"
class="form-control"
aria-label="Small"
[class.is-invalid]="end_hour.invalid && end_hour.touched"
required
aria-describedby="inputGroup-sizing-sm"
/>
</div>
<input
*ngIf="!goingToWorkOnThis"
[clearIfNotMatch]="true"
[showMaskTyped]="true"
[dropSpecialCharacters]="false"
matInput
onClick="this.select();"
mask="Hh:m0:s0"
formControlName="end_hour"
type="text"
id="end_hour"
class="form-control"
aria-label="Small"
[class.is-invalid]="end_hour.invalid && end_hour.touched"
required
aria-describedby="inputGroup-sizing-sm"
/>
</div>


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


<div class="form-group text-left">
<label for="NotesTextarea">Description</label>
<label for="NotesTextarea">Description:</label>
<textarea maxlength="1500" formControlName="description" class="form-control" id="NotesTextarea"
rows="3"></textarea>
</div>
Expand Down
28 changes: 0 additions & 28 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 @@ -60,32 +60,6 @@
}
}

.ng-autocomplete {
width: 100%;
}

.autocomplete::ng-deep .autocomplete-container {
border: 1px solid #ced4da;
border-radius: 0 0.25rem 0.25rem 0;
box-shadow: none;
height: 2rem;

.input-container {
height: 100%;

input {
border-radius: 0.25rem;
height: 100%;
}
}
}

.validation::ng-deep {
.autocomplete .autocomplete-container {
border: 1px solid red;
}
}


input[type="date"]::-webkit-calendar-picker-indicator {
position: absolute;
Expand Down Expand Up @@ -114,10 +88,8 @@ input[type="date"]::-webkit-clear-button {
}

.autocomplete {
width: 80%;
display: block;
background-clip: padding-box;
border: none;
margin: 0em;
padding: 0em;
}
2 changes: 1 addition & 1 deletion src/app/modules/time-clock/pages/time-clock.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<app-time-entries-summary></app-time-entries-summary>

<div style="width: 70%;">
<div class="entry-container">

<div class="row pb-4">
<div class="col-12">
Expand Down
10 changes: 10 additions & 0 deletions src/app/modules/time-clock/pages/time-clock.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,13 @@
background-color: $primary;
color: white;
}

.entry-container{
width: 100%;
}

@media (min-width: 992px) {
.entry-container{
width: 70%;
}
}